* 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 822abf9c0fe34d73a0026c27e49924b53d6ff0b8..b696eb61ab9a878c969bf54015b8d02eac24b0f2 100644 (file)
--- 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 ef39fa7909f5ebebbe6da4c5f5616ae2116b3e53..8430d36a62790dc15d67db78103a6e06dfd50b46 100644 (file)
--- 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)