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

do not force a delay if none was specified.

Fixes: debbugs:18334

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)