# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1247859829 0
# Node ID 53e13148fb6813f31b19b9612bfaacf06a80ba4c
# Parent  37177e1f2fcbd6dbf123227d1a311621c58d3801
* 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.

diff -r 37177e1f2fcb -r 53e13148fb68 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jul 17 15:45:08 2009 +0000
+++ b/lisp/ChangeLog	Fri Jul 17 19:43:49 2009 +0000
@@ -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 -r 37177e1f2fcb -r 53e13148fb68 lisp/doc-view.el
--- a/lisp/doc-view.el	Fri Jul 17 15:45:08 2009 +0000
+++ b/lisp/doc-view.el	Fri Jul 17 19:43:49 2009 +0000
@@ -1078,15 +1078,14 @@
 		  "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)