* lisp/gnus/shr.el (shr-put-image): Use image-multi-frame-p if available.

2 files changed, 10 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5030da87672..dd6d20969ff 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-17  Glenn Morris  <rgm@gnu.org>
+
+        * shr.el (shr-put-image): Use image-multi-frame-p if available.
+
 2013-02-16  Glenn Morris  <rgm@gnu.org>
 
         * shr.el (shr-put-image): Only animate images that specify a delay.
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 1294ca7cd69..886f4da53dc 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -615,8 +615,12 @@ size, and full-buffer size."
                   (overlay-put overlay 'face 'default)))
             (insert-image image (or alt "*")))
           (put-text-property start (point) 'image-size size)
-          ;; Only animate multi-frame things that specify a delay.  FIXME?
-          (when (cdr (image-animated-p image))
+          (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))
             (image-animate image nil 60)))
         image)
     (insert alt)))