procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/image.el (image-multi-frame-p): Fix thinko

Browse source 
do not force a delay if none was specified.

Fixes: debbugs:18334
This commit is contained in:
Glenn Morris 2014-09-14 16:59:57 -07:00
parent 9ed670023f
commit d4dc0e1691
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2014-09-14 Glenn Morris <rgm@gnu.org>
* image.el (image-multi-frame-p): Fix thinko - do not force
a delay if none was specified. (Bug#18334)
2014-09-12 Kan-Ru Chen <kanru@kanru.info>
* window.el (fit-window-to-buffer): Doc fix.

4
lisp/image.el
View file

@ -637,8 +637,8 @@ in which case you might want to use `image-default-frame-delay'."
(images (plist-get metadata 'count))
(delay (plist-get metadata 'delay)))
(when (and images (> images 1))
(if (or (not (numberp delay)) (< delay 0))
(setq delay image-default-frame-delay))
(and delay (or (not (numberp delay)) (< delay 0))
(setq delay image-default-frame-delay))
(cons images delay)))))
(defun image-animated-p (image)