Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
1c6c2e3c
Commit
1c6c2e3c
authored
Jul 28, 2014
by
Tassilo Horn
Browse files
Merge commit 2014-07-28T09:07:56Z!tsdh@gnu.org from trunk.
parent
6ea6889a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/doc-view.el
lisp/doc-view.el
+4
-3
No files found.
lisp/ChangeLog
View file @
1c6c2e3c
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
...
...
lisp/doc-view.el
View file @
1c6c2e3c
...
...
@@ -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
b
uffer-file-
name
)))
(
dir
(
file-name-directory
b
uffer-file-name
)))
(
file-name-nondirectory
bname
)))
(
dir
(
or
(
file-name-directory
b
name
)
default-directory
)))
(
with-current-buffer
(
find-file
txt
)
(
rename-buffer
name
)
(
setq
default-directory
dir
)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment