Mercurial > emacs
changeset 75626:85c419892123
Use autoload to avoid overriding disabled setting applied in .emacs.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 03 Feb 2007 01:01:01 +0000 |
| parents | b338973597bf |
| children | d20bdbec004c |
| files | lisp/image-mode.el |
| diffstat | 1 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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)