[Emacs-diffs] emacs-24 r117412: Merge commit 117599 from trunk.

[Tassilo Horn]

------------------------------------------------------------
revno: 117412
revision-id: address@hidden
parent: address@hidden
committer: Tassilo Horn <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-07-28 11:32:25 +0200
message:
  Merge commit 117599 from trunk.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/doc-view.el               docview.el-20091113204419-o5vbwnq5f7feedwu-6334

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-07-27 13:01:07 +0000
+++ b/lisp/ChangeLog    2014-07-28 09:32:25 +0000
@@ -1,3 +1,8 @@
+2014-07-28  Stephen Berman  <address@hidden>
+
+       * doc-view.el (doc-view-open-text): Don't require that the
+       document is saved in a file (e.g., email attachment).
+
 2014-07-27  Eli Zaretskii  <address@hidden>
 
        * window.el (window--pixel-to-total): Use FRAME's root window, not

=== modified file 'lisp/doc-view.el'
--- a/lisp/doc-view.el  2014-04-04 17:42:55 +0000
+++ b/lisp/doc-view.el  2014-07-28 09:32:25 +0000
@@ -1402,11 +1402,12 @@
   (interactive)
   (if doc-view--current-converter-processes
       (message "DocView: please wait till conversion finished.")
-    (let ((txt (expand-file-name "doc.txt" (doc-view--current-cache-dir))))
+    (let ((txt (expand-file-name "doc.txt" (doc-view--current-cache-dir)))
+         (bname (or buffer-file-name (buffer-name))))
       (if (file-readable-p txt)
          (let ((name (concat "Text contents of "
-                             (file-name-nondirectory buffer-file-name)))
-               (dir (file-name-directory buffer-file-name)))
+                             (file-name-nondirectory bname)))
+               (dir (or (file-name-directory bname) default-directory)))
            (with-current-buffer (find-file txt)
              (rename-buffer name)
              (setq default-directory dir)))