From 2d7ef23c08c4e1ebe8b2712d821d2d5837f83f3d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 17 Feb 2013 08:36:08 +0000 Subject: [PATCH] shr.el (shr-put-image): Use image-multi-frame-p if available --- lisp/ChangeLog | 4 ++++ lisp/shr.el | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d50750be4..6f3e88db7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-02-17 Glenn Morris + + * shr.el (shr-put-image): Use image-multi-frame-p if available. + 2013-02-16 Glenn Morris * shr.el (shr-put-image): Only animate images that specify a delay. diff --git a/lisp/shr.el b/lisp/shr.el index 1294ca7cd..886f4da53 100644 --- a/lisp/shr.el +++ b/lisp/shr.el @@ -615,8 +615,12 @@ size, and full-buffer size." (overlay-put overlay 'face 'default))) (insert-image image (or alt "*"))) (put-text-property start (point) 'image-size size) - ;; Only animate multi-frame things that specify a delay. FIXME? - (when (cdr (image-animated-p image)) + (when (if (fboundp 'image-multi-frame-p) + ;; Only animate multi-frame things that specify a + ;; delay; eg animated gifs as opposed to + ;; multi-page tiffs. FIXME? + (cdr (image-multi-frame-p image)) + (image-animated-p image)) (image-animate image nil 60))) image) (insert alt))) -- 2.25.1