[Emacs-diffs] emacs/lisp ChangeLog image-mode.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/11/28 20:45:23

Modified files:
        lisp           : ChangeLog image-mode.el 

Log message:
        (image-minor-mode): Exit more gracefully when the image
        cannot be displayed (e.g. when doing C-x C-f some-new-file.svg RET).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16760&r2=1.16761
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/image-mode.el?cvsroot=emacs&r1=1.58&r2=1.59

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16760
retrieving revision 1.16761
diff -u -b -r1.16760 -r1.16761
--- ChangeLog   28 Nov 2009 20:28:51 -0000      1.16760
+++ ChangeLog   28 Nov 2009 20:45:19 -0000      1.16761
@@ -1,5 +1,8 @@
 2009-11-28  Stefan Monnier  <address@hidden>
 
+       * image-mode.el (image-minor-mode): Exit more gracefully when the image
+       cannot be displayed (e.g. when doing C-x C-f some-new-file.svg RET).
+
        * man.el (Man-completion-table): Make it easier to enter "<sec> <name>".
 
        * eshell/em-prompt.el (eshell-prompt-function): Abbreviate pwd, since

Index: image-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/image-mode.el,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- image-mode.el       11 Nov 2009 05:49:13 -0000      1.58
+++ image-mode.el       28 Nov 2009 20:45:22 -0000      1.59
@@ -362,18 +362,26 @@
     (image-mode-setup-winprops)
     (add-hook 'change-major-mode-hook (lambda () (image-minor-mode -1)) nil t)
     (if (display-images-p)
+        (condition-case err
+            (progn
        (if (not (image-get-display-property))
            (image-toggle-display)
          (setq cursor-type nil truncate-lines t
-               image-type (plist-get (cdr (image-get-display-property)) 
:type)))
-      (setq image-type "text")
-      (use-local-map image-mode-text-map))
-    (if (display-images-p)
-       (message "%s" (concat
+                      image-type (plist-get (cdr (image-get-display-property))
+                                            :type)))
+              (message "%s"
+                       (concat
                       (substitute-command-keys
                        "Type \\[image-toggle-display] to view the image as ")
                       (if (image-get-display-property)
-                          "text" "an image") ".")))))
+                            "text" "an image") ".")))
+          (error
+           (image-toggle-display-text)
+           (funcall
+            (if (called-interactively-p 'any) 'error 'message)
+            "Cannot display image: %s" (cdr err))))
+      (setq image-type "text")
+      (use-local-map image-mode-text-map))))
 
 ;;;###autoload
 (defun image-mode-maybe ()