From: Glenn Morris Date: Sun, 14 Sep 2014 23:59:57 +0000 (-0700) Subject: * lisp/image.el (image-multi-frame-p): Fix thinko X-Git-Tag: emacs-24.3.94~36 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4dc0e1691a15efd1ea0a8793cf889e683a37933;p=emacs.git * lisp/image.el (image-multi-frame-p): Fix thinko do not force a delay if none was specified. Fixes: debbugs:18334 --- 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 + + * 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 * 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)