Commit 1c6c2e3c authored by Tassilo Horn's avatar Tassilo Horn
Browse files

Merge commit 2014-07-28T09:07:56Z! from trunk.

parent 6ea6889a
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
......@@ -1402,11 +1402,12 @@ For now these keys are useful:
(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)))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment