diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-05-29 20:24:30 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-05-29 20:24:30 -0700 |
| commit | dd8620de6ec3fc50494f3bba4d324b0f73af4e4b (patch) | |
| tree | d082a65e7c266684d7b0a99d9e5d7ad04cd2405e | |
| parent | ceca95b18eea3d3be1ac46df15b98ad846eaa770 (diff) | |
| download | emacs-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.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/shr.el | 13 | ||||
| -rw-r--r-- | lisp/image.el | 7 |
4 files changed, 19 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7c702f0aa4b..66e8c227d1e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2013-05-30 Glenn Morris <rgm@gnu.org> + * image.el (image-animated-p): Tweak definition. + * net/rlogin.el (rlogin-program, rlogin-explicit-args): Default to ssh. (rlogin-process-connection-type): Tweak default. Add set-after. (rlogin-host): Doc fix. diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 3cfca4525f0..b45abb618d8 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2013-05-30 Glenn Morris <rgm@gnu.org> + + * shr.el (shr-put-image): Silence compiler. + 2013-05-29 Glenn Morris <rgm@gnu.org> * gnus-ems.el (set-process-plist): Every supported Emacs has this. diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index 2d2272d6c11..9284da4c4b3 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el @@ -631,12 +631,13 @@ size, and full-buffer size." (overlay-put overlay 'face 'default))) (insert-image image (or alt "*"))) (put-text-property start (point) 'image-size size) - (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)) + (when (cond ((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))) + ((fboundp 'image-animated-p) + (image-animated-p image))) (image-animate image nil 60))) image) (insert alt))) 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) |