mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00
Code Issues Releases Activity

Make image-mode respect `imagemagick-types-inhibit'

Browse Source 
* lisp/image-mode.el (image--imagemagick-wanted-p): New function
(bug#29584).
(image-toggle-display-image): Use it to see whether we want to use
imagemagick.
This commit is contained in:
Lars Ingebrigtsen 2018-04-14 15:36:53 +02:00
parent 42141da5b0
commit c768fe1be0
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etc/NEWS
View File

@ -551,6 +551,13 @@ such decisions (if they are to be made at all) are left to
higher-level functions.
** image-mode
*** image-mode started using ImageMagick by default for all images
some years back. It now respects `imagemagick-types-inhibit' as a way
to disable that.
+++
** The new function 'read-answer' accepts either long or short answers
depending on the new customizable variable 'read-answer-short'.

8
lisp/image-mode.el
View File

@ -758,7 +758,7 @@ was inserted."
(edges (and (null image-transform-resize)
(window-inside-pixel-edges
(get-buffer-window (current-buffer)))))
(type (if (fboundp 'imagemagick-types)
(type (if (image--imagemagick-wanted-p filename)
'imagemagick
(image-type file-or-data nil data-p)))
(image (if (not edges)
@ -803,6 +803,12 @@ was inserted."
(if (called-interactively-p 'any)
(message "Repeat this command to go back to displaying the file as text"))))
(defun image--imagemagick-wanted-p (filename)
(and (fboundp 'imagemagick-types)
(not (eq imagemagick-types-inhibit t))
(not (memq (intern (upcase (file-name-extension filename)) obarray)
imagemagick-types-inhibit))))
(defun image-toggle-hex-display ()
"Toggle between image and hex display."
(interactive)