From 1c6c2e3c70ff2f666a1e3f29b8852d375c8392cd Mon Sep 17 00:00:00 2001 From: Tassilo Horn Date: Mon, 28 Jul 2014 11:32:25 +0200 Subject: [PATCH] Merge commit 2014-07-28T09:07:56Z!tsdh@gnu.org from trunk. --- lisp/ChangeLog | 5 +++++ lisp/doc-view.el | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fe7dec98983..f68ee42680d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-07-28 Stephen Berman + + * 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 * 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 09d5925b3e2..7d5f1e771d5 100644 --- 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))) -- 2.39.5