aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2016-07-19 07:34:54 +0000
committerKatsumi Yamaoka2016-07-19 07:34:54 +0000
commit439f3c3e567692b6823923d569a06ac206d1c3be (patch)
tree082a9d165257cadb0c1b8ccf00df6d2ab0bdb5b7
parent99fe98d37a39d26f5dea424926d0e0a082655fe5 (diff)
downloademacs-439f3c3e567692b6823923d569a06ac206d1c3be.tar.gz
emacs-439f3c3e567692b6823923d569a06ac206d1c3be.zip
Make gif animation work (bug#24004)
* lisp/image.el (image-animate-timeout): Fix the logic that tests if an animation is too big (bug#24004).
-rw-r--r--lisp/image.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/image.el b/lisp/image.el
index ad219361366..08df7d4aa1a 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -792,9 +792,10 @@ If the image has a non-nil :speed property, it acts as a multiplier
792for the animation speed. A negative value means to animate in reverse." 792for the animation speed. A negative value means to animate in reverse."
793 (when (and (buffer-live-p (plist-get (cdr image) :animate-buffer)) 793 (when (and (buffer-live-p (plist-get (cdr image) :animate-buffer))
794 ;; Delayed more than two seconds more than expected. 794 ;; Delayed more than two seconds more than expected.
795 (when (> (- (float-time) target-time) 2) 795 (or (<= (- (float-time) target-time) 2)
796 (message "Stopping animation; animation possibly too big") 796 (progn
797 nil)) 797 (message "Stopping animation; animation possibly too big")
798 nil)))
798 (image-show-frame image n t) 799 (image-show-frame image n t)
799 (let* ((speed (image-animate-get-speed image)) 800 (let* ((speed (image-animate-get-speed image))
800 (time (float-time)) 801 (time (float-time))