# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1170464461 0
# Node ID 85c419892123000a85281be5e1267bcc3130831e
# Parent  b338973597bff8ccb5985f212f0cdcc1498f0d56
Use autoload to avoid overriding disabled setting applied in .emacs.

diff -r b338973597bf -r 85c419892123 lisp/image-mode.el
--- a/lisp/image-mode.el	Sat Feb 03 01:00:52 2007 +0000
+++ b/lisp/image-mode.el	Sat Feb 03 01:01:01 2007 +0000
@@ -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)