summaryrefslogtreecommitdiff
path: root/lisp/image.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-05-29 20:24:30 -0700
committerGlenn Morris <rgm@gnu.org>2013-05-29 20:24:30 -0700
commitdd8620de6ec3fc50494f3bba4d324b0f73af4e4b (patch)
treed082a65e7c266684d7b0a99d9e5d7ad04cd2405e /lisp/image.el
parentceca95b18eea3d3be1ac46df15b98ad846eaa770 (diff)
downloademacs-dd8620de6ec3fc50494f3bba4d324b0f73af4e4b.tar.gz
emacs-dd8620de6ec3fc50494f3bba4d324b0f73af4e4b.tar.bz2
emacs-dd8620de6ec3fc50494f3bba4d324b0f73af4e4b.zip
* image.el (image-animated-p): Tweak definition.
* gnus/shr.el (shr-put-image): Silence compiler.
Diffstat (limited to 'lisp/image.el')
-rw-r--r--lisp/image.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/image.el b/lisp/image.el
index ec7b41bf126..804dc3af5ea 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -624,7 +624,12 @@ in which case you might want to use `image-default-frame-delay'."
(setq delay image-default-frame-delay))
(cons images delay))))
-(define-obsolete-function-alias 'image-animated-p 'image-multi-frame-p "24.4")
+(defun image-animated-p (image)
+ "Like `image-multi-frame-p', but returns nil if no delay is specified."
+ (let ((multi (image-multi-frame-p image)))
+ (and (cdr multi) multi)))
+
+(make-obsolete 'image-animated-p 'image-multi-frame-p "24.4")
;; "Destructively"?
(defun image-animate (image &optional index limit)