diff options
| author | Chong Yidong | 2007-02-03 01:01:01 +0000 |
|---|---|---|
| committer | Chong Yidong | 2007-02-03 01:01:01 +0000 |
| commit | 49f1a2f46131da62ae96be4d760c3ceae966a3e0 (patch) | |
| tree | 1310e5eb0fdb3b9a70ab46d1cd8a22aea5d586c6 | |
| parent | a6ed414a2a47ef1ed260dc40060e10779f4a9ae4 (diff) | |
| download | emacs-49f1a2f46131da62ae96be4d760c3ceae966a3e0.tar.gz emacs-49f1a2f46131da62ae96be4d760c3ceae966a3e0.zip | |
Use autoload to avoid overriding disabled setting applied in .emacs.
| -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." | |||
| 174 | (if (called-interactively-p) | 174 | (if (called-interactively-p) |
| 175 | (message "Repeat this command to go back to displaying the file as text"))))) | 175 | (message "Repeat this command to go back to displaying the file as text"))))) |
| 176 | 176 | ||
| 177 | (put 'image-toggle-display 'disabled "\ | 177 | ;; Don't override the setting from .emacs. |
| 178 | WARNING: Displaying images can be a security risk. | 178 | ;;;###autoload (put 'image-toggle-display 'disabled t) |
| 179 | Please make sure you're using up-to-date image libraries | 179 | |
| 180 | and the images displayed come from a trusted source.") | 180 | (if (get 'image-toggle-display 'disabled) |
| 181 | (put 'image-toggle-display 'disabled "\ | ||
| 182 | |||
| 183 | Warning: Displaying images in Emacs could be a security risk. | ||
| 184 | Please ensure that you are using up-to-date image libraries | ||
| 185 | and that the images being displayed come from a trusted source.")) | ||
| 181 | 186 | ||
| 182 | (provide 'image-mode) | 187 | (provide 'image-mode) |
| 183 | 188 | ||