[Emacs-diffs] emacs-24 r117499: * lisp/image.el (image-multi-frame-p): Fix thinko

[Glenn Morris]

------------------------------------------------------------
revno: 117499
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18334
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-09-14 16:59:57 -0700
message:
  * lisp/image.el (image-multi-frame-p): Fix thinko
  do not force a delay if none was specified.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/image.el                  image.el-20091113204419-o5vbwnq5f7feedwu-1320

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-09-12 06:26:46 +0000
+++ b/lisp/ChangeLog    2014-09-14 23:59:57 +0000
@@ -1,3 +1,8 @@
+2014-09-14  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * window.el (fit-window-to-buffer): Doc fix.

=== modified file 'lisp/image.el'
--- a/lisp/image.el     2014-02-25 21:59:14 +0000
+++ b/lisp/image.el     2014-09-14 23:59:57 +0000
@@ -637,8 +637,8 @@
           (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)