diff options
author | Andrea Corallo <akrl@sdf.org> | 2021-04-05 21:00:18 +0200 |
---|---|---|
committer | Andrea Corallo <akrl@sdf.org> | 2021-04-05 21:00:18 +0200 |
commit | 74b58f28ecbc6fe9d7a60c96c79acfdf2329ff73 (patch) | |
tree | b1e99508f836a1d12d17eb3072e14b0cfb2ba407 /lisp/image-mode.el | |
parent | 0a3e715e1f5e13874139b4678375b8f5704b800b (diff) | |
parent | 14d295871a93c37a33d558ec4e8d49a93b787d8e (diff) | |
download | emacs-74b58f28ecbc6fe9d7a60c96c79acfdf2329ff73.tar.gz emacs-74b58f28ecbc6fe9d7a60c96c79acfdf2329ff73.tar.bz2 emacs-74b58f28ecbc6fe9d7a60c96c79acfdf2329ff73.zip |
Merge remote-tracking branch 'savannah/master' into native-comp
Diffstat (limited to 'lisp/image-mode.el')
-rw-r--r-- | lisp/image-mode.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 2de16cb6afd..f4ff35f9c41 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -732,8 +732,9 @@ displays an image file as text." (setq image-type previous-image-type) ;; Enable image minor mode with `C-c C-c'. (image-minor-mode 1) - ;; Show the image file as text. - (image-toggle-display-text))) + (unless (image-get-display-property) + ;; Show the image file as text. + (image-toggle-display-text)))) (defun image-mode-as-hex () "Set a non-image mode as major mode in combination with image minor mode. |