diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-12-07 02:37:42 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-12-07 02:37:42 +0000 |
| commit | 5e9fde5e5991e89ccb4c88bf57b6cbfb9da18b25 (patch) | |
| tree | 7c3172b3f07b3b3cded84309bc662efddf81f7f6 | |
| parent | 2f2f5242243fdc427357c304b5fb880c04171542 (diff) | |
| download | emacs-5e9fde5e5991e89ccb4c88bf57b6cbfb9da18b25.tar.gz | |
Make it work for non-file buffers (bug#5102).
* doc-view.el (doc-view-current-cache-dir):
Use doc-view-buffer-file-name rather than buffer-file-name.
(doc-view-mode): Use buffer-name when buffer-file-name is nil.
| -rw-r--r-- | lisp/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/doc-view.el | 12 |
2 files changed, 17 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9d17dff0d72..ca5bc660b26 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2009-12-07 Stefan Monnier <monnier@iro.umontreal.ca> + + Make it work for non-file buffers (bug#5102). + * doc-view.el (doc-view-current-cache-dir): + Use doc-view-buffer-file-name rather than buffer-file-name. + (doc-view-mode): Use buffer-name when buffer-file-name is nil. + 2009-12-06 Óscar Fuentes <ofv@wanadoo.es> * vc-bzr.el (vc-bzr-annotate-command): Handle the case where the @@ -5,8 +12,8 @@ 2009-12-06 Dan Nicolaescu <dann@ics.uci.edu> - * vc-git.el (vc-git-print-log): Handle a limit argument. Display - the short log in graph form and with labels. + * vc-git.el (vc-git-print-log): Handle a limit argument. + Display the short log in graph form and with labels. (vc-git-log-view-mode): Handle labels. Make vc-revert change VC state from 'added to 'unregistered. diff --git a/lisp/doc-view.el b/lisp/doc-view.el index 311ab826c69..d8985cf9072 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el @@ -563,7 +563,7 @@ It's a subdirectory of `doc-view-cache-directory'." (setq doc-view-current-cache-dir (file-name-as-directory (expand-file-name - (concat (file-name-nondirectory buffer-file-name) + (concat (file-name-nondirectory doc-view-buffer-file-name) "-" (let ((file doc-view-buffer-file-name)) (with-temp-buffer @@ -1228,6 +1228,7 @@ toggle between displaying the document or editing it as text. (set (make-local-variable 'doc-view-buffer-file-name) (cond (jka-compr-really-do-compress + ;; FIXME: there's a risk of name conflicts here. (expand-file-name (file-name-nondirectory (file-name-sans-extension buffer-file-name)) @@ -1237,10 +1238,13 @@ toggle between displaying the document or editing it as text. ;; supposed to return nil for things like local files accessed via ;; `su' or via file://... ((let ((file-name-handler-alist nil)) - (not (file-readable-p buffer-file-name))) + (not (and buffer-file-name (file-readable-p buffer-file-name)))) + ;; FIXME: there's a risk of name conflicts here. (expand-file-name - (file-name-nondirectory buffer-file-name) - doc-view-cache-directory)) + (if buffer-file-name + (file-name-nondirectory buffer-file-name) + (buffer-name)) + doc-view-cache-directory)) (t buffer-file-name))) (when (not (string= doc-view-buffer-file-name buffer-file-name)) (write-region nil nil doc-view-buffer-file-name)) |