shr.el (shr-put-image): Silence compiler

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10d5afc..d3398ad 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-30  Glenn Morris  <rgm@gnu.org>
+
+       * shr.el (shr-put-image): Silence compiler.
+
 2013-05-29  Glenn Morris  <rgm@gnu.org>
 
        * gnus-ems.el (set-process-plist): Every supported Emacs has this.

diff --git a/lisp/shr.el b/lisp/shr.el
index 2d2272d..9284da4 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -631,12 +631,13 @@ size, and full-buffer size."
                  (overlay-put overlay 'face 'default)))
            (insert-image image (or alt "*")))
          (put-text-property start (point) 'image-size size)
-         (when (if (fboundp 'image-multi-frame-p)
-                   ;; Only animate multi-frame things that specify a
-                   ;; delay; eg animated gifs as opposed to
-                   ;; multi-page tiffs.  FIXME?
-                   (cdr (image-multi-frame-p image))
-                 (image-animated-p image))
+         (when (cond ((fboundp 'image-multi-frame-p)
+                      ;; Only animate multi-frame things that specify a
+                      ;; delay; eg animated gifs as opposed to
+                      ;; multi-page tiffs.  FIXME?
+                      (cdr (image-multi-frame-p image)))
+                     ((fboundp 'image-animated-p)
+                      (image-animated-p image)))
            (image-animate image nil 60)))
        image)
     (insert alt)))