[Emacs-diffs] Changes to emacs/lisp/image-mode.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      07/02/03 01:01:01

Index: image-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/image-mode.el,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- image-mode.el       31 Jan 2007 12:37:08 -0000      1.19
+++ image-mode.el       3 Feb 2007 01:01:01 -0000       1.20
@@ -174,10 +174,15 @@
       (if (called-interactively-p)
          (message "Repeat this command to go back to displaying the file as 
text")))))
 
-(put 'image-toggle-display 'disabled "\
-WARNING: Displaying images can be a security risk.
-Please make sure you're using up-to-date image libraries
-and the images displayed come from a trusted source.")
+;; Don't override the setting from .emacs.
+;;;###autoload (put 'image-toggle-display 'disabled t)
+
+(if (get 'image-toggle-display 'disabled)
+    (put 'image-toggle-display 'disabled "\
+
+Warning: Displaying images in Emacs could be a security risk.
+Please ensure that you are using up-to-date image libraries
+and that the images being displayed come from a trusted source."))
 
 (provide 'image-mode)