Merge commit 2014-07-28T09:07:56Z!tsdh@gnu.org from trunk.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fe7dec98983b7ab006f155e30da966fd4ccb05fb..f68ee42680da9d92cadf0ec20407af003b5d82a4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-28  Stephen Berman  <stephen.berman@gmx.net>
+
+       * 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  <eliz@gnu.org>
 
        * window.el (window--pixel-to-total): Use FRAME's root window, not

diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 09d5925b3e2cb644f7a13ba9a5fa293dd4c38b58..7d5f1e771d59535f32d86bffad2ab68666dd6a6a 100644 (file)
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -1402,11 +1402,12 @@ For now these keys are useful:
   (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)))