diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2007-02-03 01:01:01 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2007-02-03 01:01:01 +0000 |
| commit | 49f1a2f46131da62ae96be4d760c3ceae966a3e0 (patch) | |
| tree | 1310e5eb0fdb3b9a70ab46d1cd8a22aea5d586c6 /lisp/image-mode.el | |
| parent | a6ed414a2a47ef1ed260dc40060e10779f4a9ae4 (diff) | |
| download | emacs-49f1a2f46131da62ae96be4d760c3ceae966a3e0.tar.gz | |
Use autoload to avoid overriding disabled setting applied in .emacs.
Diffstat (limited to 'lisp/image-mode.el')
| -rw-r--r-- | lisp/image-mode.el | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 13a689b6061..fdc331a08be 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -174,10 +174,15 @@ and showing the image as an image." (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) |