[Emacs-diffs] /srv/bzr/emacs/trunk r102835: (doc-view-initiate-display): Fall back to normal mode when

[Tassilo Horn]

------------------------------------------------------------
revno: 102835
committer: Tassilo Horn <address@hidden>
branch nick: trunk
timestamp: Thu 2011-01-13 21:17:15 +0100
message:
  (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).
modified:
  lisp/ChangeLog
  lisp/doc-view.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-13 19:48:26 +0000
+++ b/lisp/ChangeLog    2011-01-13 20:17:15 +0000
@@ -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

=== modified file 'lisp/doc-view.el'
--- a/lisp/doc-view.el  2011-01-13 19:48:26 +0000
+++ b/lisp/doc-view.el  2011-01-13 20:17:15 +0000
@@ -1243,11 +1243,11 @@
      (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)