diff options
| author | Glenn Morris | 2014-09-14 16:59:57 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-09-14 16:59:57 -0700 |
| commit | d4dc0e1691a15efd1ea0a8793cf889e683a37933 (patch) | |
| tree | a77b8d6482755fb327bfbc10141e8fcd99b6ffc3 /lisp/image.el | |
| parent | 9ed670023f6d7534f0e812417fe13ab3cfadaa7a (diff) | |
| download | emacs-d4dc0e1691a15efd1ea0a8793cf889e683a37933.tar.gz emacs-d4dc0e1691a15efd1ea0a8793cf889e683a37933.zip | |
* 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/image.el')
| -rw-r--r-- | lisp/image.el | 4 |
1 files changed, 2 insertions, 2 deletions
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'." | |||
| 637 | (images (plist-get metadata 'count)) | 637 | (images (plist-get metadata 'count)) |
| 638 | (delay (plist-get metadata 'delay))) | 638 | (delay (plist-get metadata 'delay))) |
| 639 | (when (and images (> images 1)) | 639 | (when (and images (> images 1)) |
| 640 | (if (or (not (numberp delay)) (< delay 0)) | 640 | (and delay (or (not (numberp delay)) (< delay 0)) |
| 641 | (setq delay image-default-frame-delay)) | 641 | (setq delay image-default-frame-delay)) |
| 642 | (cons images delay))))) | 642 | (cons images delay))))) |
| 643 | 643 | ||
| 644 | (defun image-animated-p (image) | 644 | (defun image-animated-p (image) |