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

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5030da876727c9796deb2b1c23b9c72288249fb0..dd6d20969ff1cee1b0a8b804bb7a1733502b7db9 100644 (file)
--- 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 1294ca7cd69a3137e5cbc2de24680d40b6243dea..886f4da53dc2b0e04806474d9f86b35125b4727d 100644 (file)
--- 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)))