* image.el (image-animated-p): When delay between animated images is 0,

set it to 10 (0.1 sec).  (Bug#6258)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af6a03fd1aabca4f817623235110e0ce446a971c..cfc0f92734649a8696f3b39914c357fa7cb6d833 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-25  Juri Linkov  <juri@jurta.org>
+
+       * image.el (image-animated-p): When delay between animated images
+       is 0, set it to 10 (0.1 sec).  (Bug#6258)
+
 2010-05-25  Christian Lynbech  <christian.lynbech@tieto.com>  (tiny change)
 
        * net/tramp.el (tramp-handle-insert-directory): Don't use

diff --git a/lisp/image.el b/lisp/image.el
index b3a0f1a8a7d794404b6f3e291200b1c29ab80534..287cca815706a95cefe5b208c2485df84adb41f8 100644 (file)
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -685,10 +685,13 @@ shall be displayed."
     (let* ((metadata (image-metadata image))
           (images (plist-get metadata 'count))
           (extdata (plist-get metadata 'extension-data))
-          (anim (plist-get extdata #xF9)))
-      (and (integerp images) (> images 1)
-          (stringp anim) (>= (length anim) 4)
-          (cons images (+ (aref anim 1) (* (aref anim 2) 256))))))))
+          (anim (plist-get extdata #xF9))
+          (tmo (and (integerp images) (> images 1)
+                    (stringp anim) (>= (length anim) 4)
+                    (+ (aref anim 1) (* (aref anim 2) 256)))))
+      (when tmo
+       (if (eq tmo 0) (setq tmo 10))
+       (cons images tmo))))))
 
 \f
 (provide 'image)