[Emacs-diffs] /srv/bzr/emacs/trunk r112780: * image.el (image-animated-p): Tweak definition.

[Glenn Morris]

------------------------------------------------------------
revno: 112780
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-05-29 20:24:30 -0700
message:
  * image.el (image-animated-p): Tweak definition.
  * gnus/shr.el (shr-put-image): Silence compiler.
modified:
  lisp/ChangeLog
  lisp/gnus/ChangeLog
  lisp/gnus/shr.el
  lisp/image.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-30 03:22:45 +0000
+++ b/lisp/ChangeLog    2013-05-30 03:24:30 +0000
@@ -1,5 +1,7 @@
 2013-05-30  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-05-29 02:40:43 +0000
+++ b/lisp/gnus/ChangeLog       2013-05-30 03:24:30 +0000
@@ -1,3 +1,7 @@
+2013-05-30  Glenn Morris  <address@hidden>
+
+       * shr.el (shr-put-image): Silence compiler.
+
 2013-05-29  Glenn Morris  <address@hidden>
 
        * gnus-ems.el (set-process-plist): Every supported Emacs has this.

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2013-05-19 22:49:17 +0000
+++ b/lisp/gnus/shr.el  2013-05-30 03:24:30 +0000
@@ -631,12 +631,13 @@
                  (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)))

=== modified file 'lisp/image.el'
--- a/lisp/image.el     2013-02-20 07:57:33 +0000
+++ b/lisp/image.el     2013-05-30 03:24:30 +0000
@@ -624,7 +624,12 @@
          (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)