(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).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78a20ea5e43eb92fa30675c5d72a13691942db71..7adc4359c58b0b0dd8d5c14472d9f9f77ca38cf0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 30b3f56956e0648b3287002bd7b1b8514d0ac9f2..b4fd17ca45325d4ddd266f6c10719c17290c9aea 100644 (file)
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -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)