(doc-view-initiate-display): Fall back to normal mode when

doc-view-mode cannot be enabled, also when extracting the document
text into a separate buffer (bug#6446).
This commit is contained in:
Tassilo Horn 2011-01-13 21:17:15 +01:00
parent 5b3553158d
commit 1281bd51e8
2 changed files with 8 additions and 5 deletions

View file

@ -3,6 +3,9 @@
* doc-view.el (doc-view-open-text): Use meaningful text buffer
name. Keep original document's directory as default-directory
(bug#6446).
(doc-view-initiate-display): Fall back to normal mode when
doc-view-mode cannot be enabled, also when extracting the document
text into a separate buffer (bug#6446).
* simple.el (shell-command): Don't error out if shell command
buffer contains text with non-nil read-only property when erasing

View file

@ -1243,11 +1243,11 @@ If BACKWARD is non-nil, jump to the previous match."
(concat "No PNG support is available, or some conversion utility for "
(file-name-extension doc-view-buffer-file-name)
" files is missing."))
(if (and (executable-find doc-view-pdftotext-program)
(y-or-n-p
"Unable to render file. View extracted text instead? "))
(doc-view-open-text)
(doc-view-toggle-display))))
(when (and (executable-find doc-view-pdftotext-program)
(y-or-n-p
"Unable to render file. View extracted text instead? "))
(doc-view-open-text))
(doc-view-toggle-display)))
(defvar bookmark-make-record-function)