# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1274802893 -10800
# Node ID 6c819187f0882920ea891d3df5f306c18a3cd280
# Parent  04bc013ba171d118d457e8ca7f70bcf490c59a0a
* image.el (image-animated-p): When delay between animated images is 0,
set it to 10 (0.1 sec).  (Bug#6258)

diff -r 04bc013ba171 -r 6c819187f088 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue May 25 15:33:55 2010 +0200
+++ b/lisp/ChangeLog	Tue May 25 18:54:53 2010 +0300
@@ -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 -r 04bc013ba171 -r 6c819187f088 lisp/image.el
--- a/lisp/image.el	Tue May 25 15:33:55 2010 +0200
+++ b/lisp/image.el	Tue May 25 18:54:53 2010 +0300
@@ -685,10 +685,13 @@
     (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))))))
 
 
 (provide 'image)