Merge remote-tracking branch 'origin/no-gnus'

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b4639f..5422660 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2012-02-12  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-art.el (gnus-stop-downloads): Stop `url-queue' downloads on
+       group exit.
+
+       * nnimap.el (nnimap-parse-flags): Parse correctly when we have mixed
+       QRESYNC/FETCH output.
+
 2012-02-11  Glenn Morris  <rgm@gnu.org>
 
        * sieve-manage.el (sieve-manage-default-stream):

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 2839a60..7305839 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -45,6 +45,7 @@
 (require 'mm-uu)
 (require 'message)
 (require 'mouse)
+(require 'url-queue)
 
 (autoload 'gnus-msg-mail "gnus-msg" nil t)
 (autoload 'gnus-button-mailto "gnus-msg")
@@ -4582,6 +4583,9 @@ commands:
     (when (eq (elt timer 5) 'image-animate-timeout)
       (cancel-timer timer))))
 
+(defun gnus-stop-downloads ()
+  (setq url-queue nil))
+
 ;; 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)

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 566e9df..dfd1421 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7328,6 +7328,7 @@ If FORCE (the prefix), also save the .newsrc file(s)."
       (when (gnus-buffer-live-p gnus-article-buffer)
        (with-current-buffer gnus-article-buffer
          (gnus-article-stop-animations)
+         (gnus-stop-downloads)
          (mm-destroy-parts gnus-article-mime-handles)
          ;; Set it to nil for safety reason.
          (setq gnus-article-mime-handle-alist nil)
@@ -9676,6 +9677,7 @@ C-u g', show the raw article."
       (when (gnus-buffer-live-p gnus-article-buffer)
        (with-current-buffer gnus-article-buffer
          (gnus-article-stop-animations)
+         (gnus-stop-downloads)
          (mm-destroy-parts gnus-article-mime-handles)
          ;; Set it to nil for safety reason.
          (setq gnus-article-mime-handle-alist nil)