Commit c146ad85 authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen Committed by Katsumi Yamaoka
Browse files

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.
parent 468d09d4
2011-06-26 Lars Magne Ingebrigtsen <larsi@gnus.org> 2011-06-26 Lars Magne Ingebrigtsen <larsi@gnus.org>
   
* dgnushack.el: Bind `gnutls-available-p' to `ignore' on XEmacs to * gnus-art.el (gnus-article-stop-animations): New function to stop any
avoid compiler warnings. 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.
   
* auth-source.el (with-auth-source-epa-overrides): Fix compilation * auth-source.el (with-auth-source-epa-overrides): Fix compilation
error with `find-file-hooks' on Emacs 22. error with `find-file-hooks' on Emacs 22.
...@@ -554,12 +560,6 @@ ...@@ -554,12 +560,6 @@
* Makefile.in (fail-on-warning): New rule to compile with warnings as * Makefile.in (fail-on-warning): New rule to compile with warnings as
errors. errors.
   
* dgnushack.el (dgnushack-compile-error-on-warn): New function to call
dgnushack-compile with error-on-warn enabled, and to signal an error if
clean compilation failed.
(dgnushack-compile): New argument 'error-on-warn'. If non-nil, compile
with `byte-compile-error-on-warn'. Return nil if errors occured.
2011-04-06 Teodor Zlatanov <tzz@lifelogs.com> 2011-04-06 Teodor Zlatanov <tzz@lifelogs.com>
   
* gnus-registry.el: Don't use ERT if it's not available. Load it * gnus-registry.el: Don't use ERT if it's not available. Load it
......
...@@ -4509,6 +4509,7 @@ commands: ...@@ -4509,6 +4509,7 @@ commands:
t))) t)))
(with-current-buffer name (with-current-buffer name
(set (make-local-variable 'gnus-article-edit-mode) nil) (set (make-local-variable 'gnus-article-edit-mode) nil)
(gnus-article-stop-animations)
(when gnus-article-mime-handles (when gnus-article-mime-handles
(mm-destroy-parts gnus-article-mime-handles) (mm-destroy-parts gnus-article-mime-handles)
(setq gnus-article-mime-handles nil)) (setq gnus-article-mime-handles nil))
...@@ -4533,6 +4534,12 @@ commands: ...@@ -4533,6 +4534,12 @@ commands:
(gnus-start-date-timer gnus-article-update-date-headers)) (gnus-start-date-timer gnus-article-update-date-headers))
(current-buffer))))) (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 ;; Set article window start at LINE, where LINE is the number of lines
;; from the head of the article. ;; from the head of the article.
(defun gnus-article-set-window-start (&optional line) (defun gnus-article-set-window-start (&optional line)
......
...@@ -914,6 +914,9 @@ Uses `gnus-registry-marks' to find what shortcuts to install." ...@@ -914,6 +914,9 @@ Uses `gnus-registry-marks' to find what shortcuts to install."
(make-obsolete 'gnus-registry-user-format-function-M (make-obsolete 'gnus-registry-user-format-function-M
'gnus-registry-article-marks-to-chars "24.1") ? 'gnus-registry-article-marks-to-chars "24.1") ?
(defalias 'gnus-registry-user-format-function-M
'gnus-registry-article-marks-to-chars)
;; use like this: ;; use like this:
;; (defalias 'gnus-user-format-function-M 'gnus-registry-article-marks-to-chars) ;; (defalias 'gnus-user-format-function-M 'gnus-registry-article-marks-to-chars)
(defun gnus-registry-article-marks-to-chars (headers) (defun gnus-registry-article-marks-to-chars (headers)
......
...@@ -7298,6 +7298,7 @@ If FORCE (the prefix), also save the .newsrc file(s)." ...@@ -7298,6 +7298,7 @@ If FORCE (the prefix), also save the .newsrc file(s)."
(run-hooks 'gnus-summary-prepare-exit-hook) (run-hooks 'gnus-summary-prepare-exit-hook)
(when (gnus-buffer-live-p gnus-article-buffer) (when (gnus-buffer-live-p gnus-article-buffer)
(with-current-buffer gnus-article-buffer (with-current-buffer gnus-article-buffer
(gnus-article-stop-animations)
(mm-destroy-parts gnus-article-mime-handles) (mm-destroy-parts gnus-article-mime-handles)
;; Set it to nil for safety reason. ;; Set it to nil for safety reason.
(setq gnus-article-mime-handle-alist nil) (setq gnus-article-mime-handle-alist nil)
...@@ -9579,6 +9580,7 @@ C-u g', show the raw article." ...@@ -9579,6 +9580,7 @@ C-u g', show the raw article."
;; Destroy any MIME parts. ;; Destroy any MIME parts.
(when (gnus-buffer-live-p gnus-article-buffer) (when (gnus-buffer-live-p gnus-article-buffer)
(with-current-buffer gnus-article-buffer (with-current-buffer gnus-article-buffer
(gnus-article-stop-animations)
(mm-destroy-parts gnus-article-mime-handles) (mm-destroy-parts gnus-article-mime-handles)
;; Set it to nil for safety reason. ;; Set it to nil for safety reason.
(setq gnus-article-mime-handle-alist nil) (setq gnus-article-mime-handle-alist nil)
......
...@@ -526,7 +526,9 @@ the URL of the image to the kill buffer instead." ...@@ -526,7 +526,9 @@ the URL of the image to the kill buffer instead."
(when (and (> (current-column) 0) (when (and (> (current-column) 0)
(> (car (image-size image t)) 400)) (> (car (image-size image t)) 400))
(insert "\n")) (insert "\n"))
(insert-image image (or alt "*"))) (insert-image image (or alt "*"))
(when (image-animated-p image)
(image-animate image nil 60)))
image) image)
(insert alt))) (insert alt)))
...@@ -557,10 +559,6 @@ the URL of the image to the kill buffer instead." ...@@ -557,10 +559,6 @@ the URL of the image to the kill buffer instead."
:width window-width :width window-width
:ascent 100) :ascent 100)
image))) image)))
(when (and (fboundp 'create-animated-image)
(eq (image-type data nil t) 'gif))
(setq image (create-animated-image data 'gif t
:ascent 100)))
image))) image)))
;; url-cache-extract autoloads url-cache. ;; url-cache-extract autoloads url-cache.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment