* doc-view.el (doc-view-initiate-display): Add yes-or-no-p if

rendering of pngs is not possible instead of messaging a long
description.

2 files changed, 14 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e3a342032a2..df01e56c679 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-17  Tassilo Horn  <tassilo@member.fsf.org>
+
+        * doc-view.el (doc-view-initiate-display): Add yes-or-no-p if
+        rendering of pngs is not possible instead of messaging a long
+        description.
+
 2009-07-17  David De La Harpe Golden  <david@harpegolden.net>
 
         * w32-fns.el (x-selection-owner-p): New function.
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index ce6a7fd0ba9..3ea4fcecfde 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -1078,15 +1078,14 @@ If BACKWARD is non-nil, jump to the previous match."
                   "editing or viewing the document."))))
     (message
      "%s"
-     (substitute-command-keys
-      (concat "No PNG support available or some conversion utility for "
-              (file-name-extension doc-view-buffer-file-name)" files is missing.  "
-              "Type \\[doc-view-toggle-display] to switch to "
-              (if (eq doc-view-doc-type 'ps)
-                  "ps-mode"
-                "fundamental-mode")
-              ", \\[doc-view-open-text] to show the doc as text in a separate buffer "
-              " or \\[doc-view-kill-proc-and-buffer] to kill this buffer.")))))
+     (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))))
 
 (defvar bookmark-make-record-function)