[Emacs-diffs] /srv/bzr/emacs/trunk r110014: gnus-art.el (gnus-article-stop-animations): Use gnus-timer--function that is an alias to timer--function

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 110014
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2012-09-13 11:14:30 +0000
message:
  gnus-art.el (gnus-article-stop-animations): Use gnus-timer--function that is 
an alias to timer--function
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-art.el
  lisp/gnus/gnus-util.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-09-13 06:09:45 +0000
+++ b/lisp/gnus/ChangeLog       2012-09-13 11:14:30 +0000
@@ -1,3 +1,9 @@
+2012-09-13  Katsumi Yamaoka  <address@hidden>
+
+       * gnus-util.el (gnus-timer--function): New function.
+
+       * gnus-art.el (gnus-article-stop-animations): Use it.
+
 2012-09-13  Paul Eggert  <address@hidden>
 
        Fix glitches caused by addition of psec to timers.

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2012-09-13 06:09:45 +0000
+++ b/lisp/gnus/gnus-art.el     2012-09-13 11:14:30 +0000
@@ -4554,7 +4554,7 @@
 (defun gnus-article-stop-animations ()
   (dolist (timer (and (boundp 'timer-list)
                      timer-list))
-    (when (eq (timer--function timer) 'image-animate-timeout)
+    (when (eq (gnus-timer--function timer) 'image-animate-timeout)
       (cancel-timer timer))))
 
 (defun gnus-stop-downloads ()

=== modified file 'lisp/gnus/gnus-util.el'
--- a/lisp/gnus/gnus-util.el    2012-09-07 04:07:00 +0000
+++ b/lisp/gnus/gnus-util.el    2012-09-13 11:14:30 +0000
@@ -1964,6 +1964,11 @@
 (defun gnus-bound-and-true-p (sym)
   (and (boundp sym) (symbol-value sym)))
 
+(if (fboundp 'timer--function)
+    (defalias 'gnus-timer--function 'timer--function)
+  (defun gnus-timer--function (timer)
+    (elt timer 5)))
+
 (provide 'gnus-util)
 
 ;;; gnus-util.el ends here