diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /test/manual/image-size-tests.el | |
parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'test/manual/image-size-tests.el')
-rw-r--r-- | test/manual/image-size-tests.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/manual/image-size-tests.el b/test/manual/image-size-tests.el index 489b3972932..44846a7a67a 100644 --- a/test/manual/image-size-tests.el +++ b/test/manual/image-size-tests.el @@ -1,4 +1,4 @@ -;;; image-size-tests.el -- tests for image scaling +;;; image-size-tests.el --- tests for image scaling -*- lexical-binding: t; -*- ;; Copyright (C) 2017-2021 Free Software Foundation, Inc. @@ -45,7 +45,8 @@ (= (cdr size) height)))) (defun image-size-tests () - (unless (imagemagick-types) + (unless (and (fboundp 'imagemagick-types) + (imagemagick-types)) (error "This only makes sense if ImageMagick is installed")) ;; Test the image that's wider than it is tall. ;; Default sizes. |