diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-09-17 21:26:19 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-09-17 21:26:19 -0700 |
| commit | 9019d095dfd04fffc000c2f00515c661f1a083f3 (patch) | |
| tree | ddcd065dd6eb778ac519c4d7afc3dae34b9ed631 /lisp/image.el | |
| parent | 67645389fc19c3573bb94f9f7d94195ac0b7b48f (diff) | |
| download | emacs-9019d095dfd04fffc000c2f00515c661f1a083f3.tar.gz | |
* image.el (image-multi-frame-p): Remove --without-x warning/error.
Diffstat (limited to 'lisp/image.el')
| -rw-r--r-- | lisp/image.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/image.el b/lisp/image.el index 8afe3e14b10..91cc3addb06 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -625,13 +625,14 @@ The actual return value is a cons (NIMAGES . DELAY), where NIMAGES is the number of frames (or sub-images) in the image and DELAY is the delay in seconds that the image specifies between each frame. DELAY may be nil, in which case you might want to use `image-default-frame-delay'." - (let* ((metadata (image-metadata image)) - (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)) - (cons images delay)))) + (when (fboundp 'image-metadata) + (let* ((metadata (image-metadata image)) + (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)) + (cons images delay))))) (defun image-animated-p (image) "Like `image-multi-frame-p', but returns nil if no delay is specified." |