diff options
| author | Tassilo Horn <tassilo@member.fsf.org> | 2008-04-14 11:02:31 +0000 |
|---|---|---|
| committer | Tassilo Horn <tassilo@member.fsf.org> | 2008-04-14 11:02:31 +0000 |
| commit | 3c03f2cef091f5fc2664248fb16074d2d95dde0f (patch) | |
| tree | b7e6e8e6c0651871b3f4dc7b88fe9a15baae46d9 /lisp/doc-view.el | |
| parent | dd7d19d7ce68900957eae8d93de0e144ca52dc88 (diff) | |
| download | emacs-3c03f2cef091f5fc2664248fb16074d2d95dde0f.tar.gz emacs-3c03f2cef091f5fc2664248fb16074d2d95dde0f.tar.bz2 emacs-3c03f2cef091f5fc2664248fb16074d2d95dde0f.zip | |
(doc-view-start-process): Don't set
default-directory to "~/" if the current value is valid. This
broke PS files that run other files in the same directory.
Diffstat (limited to 'lisp/doc-view.el')
| -rw-r--r-- | lisp/doc-view.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/doc-view.el b/lisp/doc-view.el index dec372614b6..942e3521d27 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el @@ -559,9 +559,11 @@ Should be invoked when the cached images aren't up-to-date." (funcall (process-get proc 'callback)))))) (defun doc-view-start-process (name program args callback) - ;; Make sure the process is started in an existing directory, - ;; (rather than some file-name-handler-managed dir, for example). - (let* ((default-directory (expand-file-name "~/")) + ;; Make sure the process is started in an existing directory, (rather than + ;; some file-name-handler-managed dir, for example). + (let* ((default-directory (if (file-readable-p default-directory) + default-directory + (expand-file-name "~/"))) (proc (apply 'start-process name doc-view-conversion-buffer program args))) (push proc doc-view-current-converter-processes) @@ -585,7 +587,7 @@ Should be invoked when the cached images aren't up-to-date." (list (format "-r%d" (round doc-view-resolution)) (concat "-sOutputFile=" png) pdf-ps)) - (lambda () + (lambda () (when doc-view-current-timer (cancel-timer doc-view-current-timer) (setq doc-view-current-timer nil)) |