diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-09-14 16:59:57 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-09-14 16:59:57 -0700 |
| commit | d4dc0e1691a15efd1ea0a8793cf889e683a37933 (patch) | |
| tree | a77b8d6482755fb327bfbc10141e8fcd99b6ffc3 /lisp | |
| parent | 9ed670023f6d7534f0e812417fe13ab3cfadaa7a (diff) | |
| download | emacs-d4dc0e1691a15efd1ea0a8793cf889e683a37933.tar.gz | |
* lisp/image.el (image-multi-frame-p): Fix thinko
do not force a delay if none was specified.
Fixes: debbugs:18334
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/image.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 822abf9c0fe..b696eb61ab9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/image.el b/lisp/image.el index ef39fa7909f..8430d36a627 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -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) |