diff options
-rw-r--r-- | lisp/ChangeLog | 4 | ||||
-rw-r--r-- | lisp/doc-view.el | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 87cde39808d..b5487896f74 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-04-16 Stefan Monnier <monnier@iro.umontreal.ca> + + * doc-view.el (doc-view-start-process): Handle url-handler directories. + 2013-04-15 Dmitry Gutov <dgutov@yandex.ru> * progmodes/ruby-mode.el (ruby-beginning-of-defun) diff --git a/lisp/doc-view.el b/lisp/doc-view.el index 6217f5d0a3f..b1f399d5b73 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el @@ -881,8 +881,8 @@ Should be invoked when the cached images aren't up-to-date." (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 (if (file-readable-p default-directory) - default-directory + (let* ((default-directory (or (unhandled-file-name-directory + default-directory) (expand-file-name "~/"))) (proc (apply 'start-process name doc-view-conversion-buffer program args))) |