(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.

2 files changed, 12 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9348ba7924..bd495063f65 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-14  Tassilo Horn  <tassilo@member.fsf.org>
+
+        * doc-view.el (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.
+
 2008-04-14  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * vc.el (vc-status-kill-query): New function.
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))