diff options
| author | Stefan Monnier | 2013-04-15 20:51:46 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2013-04-15 20:51:46 -0400 |
| commit | efb3f01dbaff7162597297f75675d9880eb0a13a (patch) | |
| tree | 38567eacc3636c07ea686ab6a3eeed28a33f058e | |
| parent | fb549d640a32fb02bb8329727891de395e691c45 (diff) | |
| download | emacs-efb3f01dbaff7162597297f75675d9880eb0a13a.tar.gz emacs-efb3f01dbaff7162597297f75675d9880eb0a13a.zip | |
* lisp/doc-view.el (doc-view-start-process): Handle url-handler directories.
| -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 @@ | |||
| 1 | 2013-04-16 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * doc-view.el (doc-view-start-process): Handle url-handler directories. | ||
| 4 | |||
| 1 | 2013-04-15 Dmitry Gutov <dgutov@yandex.ru> | 5 | 2013-04-15 Dmitry Gutov <dgutov@yandex.ru> |
| 2 | 6 | ||
| 3 | * progmodes/ruby-mode.el (ruby-beginning-of-defun) | 7 | * 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." | |||
| 881 | (defun doc-view-start-process (name program args callback) | 881 | (defun doc-view-start-process (name program args callback) |
| 882 | ;; Make sure the process is started in an existing directory, (rather than | 882 | ;; Make sure the process is started in an existing directory, (rather than |
| 883 | ;; some file-name-handler-managed dir, for example). | 883 | ;; some file-name-handler-managed dir, for example). |
| 884 | (let* ((default-directory (if (file-readable-p default-directory) | 884 | (let* ((default-directory (or (unhandled-file-name-directory |
| 885 | default-directory | 885 | default-directory) |
| 886 | (expand-file-name "~/"))) | 886 | (expand-file-name "~/"))) |
| 887 | (proc (apply 'start-process name doc-view-conversion-buffer | 887 | (proc (apply 'start-process name doc-view-conversion-buffer |
| 888 | program args))) | 888 | program args))) |