[Emacs-diffs] Changes to emacs/lisp/doc-view.el,v

[Reiner Steib]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Reiner Steib <rsteib>   07/12/03 07:24:36

Index: doc-view.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/doc-view.el,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- doc-view.el 25 Nov 2007 20:11:47 -0000      1.24
+++ doc-view.el 3 Dec 2007 07:24:34 -0000       1.25
@@ -234,8 +234,12 @@
 
 (defvar doc-view-current-image nil
   "Only used internally.")
-(defvar doc-view-current-overlay)
-(defvar doc-view-pending-cache-flush nil)
+
+(defvar doc-view-current-overlay nil
+  "Only used internally.")
+
+(defvar doc-view-pending-cache-flush nil
+  "Only used internally.")
 
 (defvar doc-view-current-info nil
   "Only used internally.")
@@ -887,8 +891,7 @@
 
 (defun doc-view-initiate-display ()
   ;; Switch to image display if possible
-  (if (and (display-images-p)
-          (image-type-available-p 'png))
+  (if (doc-view-mode-p (intern (file-name-extension buffer-file-name)))
       (progn
        (doc-view-buffer-message)
        (setq doc-view-current-page (or doc-view-current-page 1))
@@ -905,8 +908,9 @@
     (message
      "%s"
      (substitute-command-keys
-      (concat "No image (png) support available.  Type 
\\[doc-view-toggle-display] "
-             "to switch to an editing mode.")))))
+      (concat "No image (png) support available or some conversion utility for 
"
+             (file-name-extension buffer-file-name)" files is missing.  "
+             "Type \\[doc-view-toggle-display] to switch to an editing 
mode.")))))
 
 ;;;###autoload
 (defun doc-view-mode ()