[Emacs-diffs] /srv/bzr/emacs/trunk r100438: * image.el (image-animated-p): When delay between animated images is 0,

[Juri Linkov]

------------------------------------------------------------
revno: 100438
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Tue 2010-05-25 18:54:53 +0300
message:
  * image.el (image-animated-p): When delay between animated images is 0,
  set it to 10 (0.1 sec).  (Bug#6258)
modified:
  lisp/ChangeLog
  lisp/image.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-25 13:29:04 +0000
+++ b/lisp/ChangeLog    2010-05-25 15:54:53 +0000
@@ -1,3 +1,8 @@
+2010-05-25  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>  (tiny change)
 
        * net/tramp.el (tramp-handle-insert-directory): Don't use

=== modified file 'lisp/image.el'
--- a/lisp/image.el     2010-05-22 16:48:01 +0000
+++ b/lisp/image.el     2010-05-25 15:54:53 +0000
@@ -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)