[Emacs-diffs] emacs/lisp ChangeLog doc-view.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/07/17 19:43:53

Modified files:
        lisp           : ChangeLog doc-view.el 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15819&r2=1.15820
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/doc-view.el?cvsroot=emacs&r1=1.87&r2=1.88

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15819
retrieving revision 1.15820
diff -u -b -r1.15819 -r1.15820
--- ChangeLog   17 Jul 2009 15:45:08 -0000      1.15819
+++ ChangeLog   17 Jul 2009 19:43:49 -0000      1.15820
@@ -1,3 +1,9 @@
+2009-07-17  Tassilo Horn  <address@hidden>
+
+       * 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  <address@hidden>
 
        * w32-fns.el (x-selection-owner-p): New function.

Index: doc-view.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/doc-view.el,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- doc-view.el 2 Apr 2009 21:12:56 -0000       1.87
+++ doc-view.el 17 Jul 2009 19:43:53 -0000      1.88
@@ -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)