Mercurial > emacs
changeset 108778:6c819187f088
* image.el (image-animated-p): When delay between animated images is 0,
set it to 10 (0.1 sec). (Bug#6258)
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Tue, 25 May 2010 18:54:53 +0300 |
| parents | 04bc013ba171 |
| children | f2b6722a5113 |
| files | lisp/ChangeLog lisp/image.el |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)