diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-06-26 22:21:48 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-06-26 22:21:48 +0000 |
| commit | c146ad850532fa48b932be9c025f8b1b68f116a9 (patch) | |
| tree | 737706775a39c07114344ccc536006bbc73866a7 /lisp/gnus/gnus-art.el | |
| parent | 468d09d44ee9652802712053b0fc259891c431b7 (diff) | |
| download | emacs-c146ad850532fa48b932be9c025f8b1b68f116a9.tar.gz | |
Merge changes made in Gnus trunk.
gnus-art.el (gnus-article-stop-animations): New function to stop any animations going on at article exit time.
gnus-registry.el (gnus-registry-user-format-function-M): Reinstate, since removing it breaks people upgrading.
shr.el (shr-put-image): Use the new interface for animating images.
(shr-put-image): Animate for 60 seconds.
Diffstat (limited to 'lisp/gnus/gnus-art.el')
| -rw-r--r-- | lisp/gnus/gnus-art.el | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 3ebb5cc719b..6c3ad01eabf 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -4509,6 +4509,7 @@ commands: t))) (with-current-buffer name (set (make-local-variable 'gnus-article-edit-mode) nil) + (gnus-article-stop-animations) (when gnus-article-mime-handles (mm-destroy-parts gnus-article-mime-handles) (setq gnus-article-mime-handles nil)) @@ -4533,6 +4534,12 @@ commands: (gnus-start-date-timer gnus-article-update-date-headers)) (current-buffer))))) +(defun gnus-article-stop-animations () + (dolist (timer (and (boundp 'timer-list) + timer-list)) + (when (eq (aref timer 5) 'image-animate-timeout) + (cancel-timer timer)))) + ;; Set article window start at LINE, where LINE is the number of lines ;; from the head of the article. (defun gnus-article-set-window-start (&optional line) |