diff options
| author | Glenn Morris | 2013-09-17 21:26:19 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-09-17 21:26:19 -0700 |
| commit | 9019d095dfd04fffc000c2f00515c661f1a083f3 (patch) | |
| tree | ddcd065dd6eb778ac519c4d7afc3dae34b9ed631 /lisp/image.el | |
| parent | 67645389fc19c3573bb94f9f7d94195ac0b7b48f (diff) | |
| download | emacs-9019d095dfd04fffc000c2f00515c661f1a083f3.tar.gz emacs-9019d095dfd04fffc000c2f00515c661f1a083f3.zip | |
* 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 | |||
| 625 | the number of frames (or sub-images) in the image and DELAY is the delay | 625 | the number of frames (or sub-images) in the image and DELAY is the delay |
| 626 | in seconds that the image specifies between each frame. DELAY may be nil, | 626 | in seconds that the image specifies between each frame. DELAY may be nil, |
| 627 | in which case you might want to use `image-default-frame-delay'." | 627 | in which case you might want to use `image-default-frame-delay'." |
| 628 | (let* ((metadata (image-metadata image)) | 628 | (when (fboundp 'image-metadata) |
| 629 | (images (plist-get metadata 'count)) | 629 | (let* ((metadata (image-metadata image)) |
| 630 | (delay (plist-get metadata 'delay))) | 630 | (images (plist-get metadata 'count)) |
| 631 | (when (and images (> images 1)) | 631 | (delay (plist-get metadata 'delay))) |
| 632 | (if (or (not (numberp delay)) (< delay 0)) | 632 | (when (and images (> images 1)) |
| 633 | (setq delay image-default-frame-delay)) | 633 | (if (or (not (numberp delay)) (< delay 0)) |
| 634 | (cons images delay)))) | 634 | (setq delay image-default-frame-delay)) |
| 635 | (cons images delay))))) | ||
| 635 | 636 | ||
| 636 | (defun image-animated-p (image) | 637 | (defun image-animated-p (image) |
| 637 | "Like `image-multi-frame-p', but returns nil if no delay is specified." | 638 | "Like `image-multi-frame-p', but returns nil if no delay is specified." |