[Emacs-diffs] /srv/bzr/emacs/trunk r111812: * lisp/gnus/shr.el (shr-put-image): Use image-multi-frame-p if available.

[Glenn Morris]

------------------------------------------------------------
revno: 111812
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-02-16 16:38:03 -0800
message:
  * lisp/gnus/shr.el (shr-put-image): Use image-multi-frame-p if available.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/shr.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-02-16 19:56:50 +0000
+++ b/lisp/gnus/ChangeLog       2013-02-17 00:38:03 +0000
@@ -1,3 +1,7 @@
+2013-02-17  Glenn Morris  <address@hidden>
+
+       * shr.el (shr-put-image): Use image-multi-frame-p if available.
+
 2013-02-16  Glenn Morris  <address@hidden>
 
        * shr.el (shr-put-image): Only animate images that specify a delay.

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2013-02-16 19:56:50 +0000
+++ b/lisp/gnus/shr.el  2013-02-17 00:38:03 +0000
@@ -615,8 +615,12 @@
                  (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)))