summaryrefslogtreecommitdiff
path: root/lisp/image.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/image.el')
-rw-r--r--lisp/image.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/image.el b/lisp/image.el
index db113020866..b58b1dc9542 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -992,11 +992,12 @@ default is 20%."
image))
(defun image--get-imagemagick-and-warn ()
- (unless (or (fboundp 'imagemagick-types) (image-scaling-p))
+ (unless (or (fboundp 'imagemagick-types) (image-transforms-p))
(error "Cannot rescale images on this terminal"))
(let ((image (image--get-image)))
(image-flush image)
- (when (fboundp 'imagemagick-types)
+ (when (and (fboundp 'imagemagick-types)
+ (not (image-transforms-p)))
(plist-put (cdr image) :type 'imagemagick))
image))