master 89199f16ae 4/4: ; Fix last change in test/manual/image-tests.el

[Stefan Kangas]

branch: master
commit 89199f16aef2b1a2e79f22dddd7322f9f4fdd1fc
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    ; Fix last change in test/manual/image-tests.el
    
    * test/manual/image-tests.el (image-skip-unless):
    (image-tests-image-metadata/gif): Fix last change.
---
 test/manual/image-tests.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/manual/image-tests.el b/test/manual/image-tests.el
index f867047d08..7f1eab9512 100644
--- a/test/manual/image-tests.el
+++ b/test/manual/image-tests.el
@@ -32,9 +32,9 @@
 ;;; Code:
 
 (defmacro image-skip-unless (format &rest condition)
-  `(skip-unless (or (and (display-images-p)
-                         (image-type-available-p ,format))
-                    ,@condition)))
+  `(skip-unless (and (and (display-images-p)
+                          (image-type-available-p ,format))
+                     ,@condition)))
 
 (defconst image-tests--images
   `((gif . ,(expand-file-name "test/data/image/black.gif"
@@ -222,7 +222,8 @@
 ;;       contain metadata.
 
 (ert-deftest image-tests-image-metadata/gif ()
-  (image-skip-unless 'gif (not w32-use-native-image-API))
+  (image-skip-unless 'gif
+                (not (bound-and-true-p w32-use-native-image-API)))
   (should (memq 'delay
                 (image-metadata
                  (create-image (cdr (assq 'gif image-tests--images)))))))