[Emacs-diffs] emacs/lisp ChangeLog doc-view.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/12/07 02:37:47

Modified files:
        lisp           : ChangeLog doc-view.el 

Log message:
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16849&r2=1.16850
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/doc-view.el?cvsroot=emacs&r1=1.93&r2=1.94

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16849
retrieving revision 1.16850
diff -u -b -r1.16849 -r1.16850
--- ChangeLog   6 Dec 2009 23:27:55 -0000       1.16849
+++ ChangeLog   7 Dec 2009 02:37:42 -0000       1.16850
@@ -1,3 +1,10 @@
+2009-12-07  Stefan Monnier  <address@hidden>
+
+       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  <address@hidden>
 
        * vc-bzr.el (vc-bzr-annotate-command): Handle the case where the
@@ -5,8 +12,8 @@
 
 2009-12-06  Dan Nicolaescu  <address@hidden>
 
-       * 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.

Index: doc-view.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/doc-view.el,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- doc-view.el 30 Nov 2009 16:15:23 -0000      1.93
+++ doc-view.el 7 Dec 2009 02:37:46 -0000       1.94
@@ -563,7 +563,7 @@
     (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 @@
     (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,9 +1238,12 @@
          ;; 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
+           (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))