Merge changes made in No Gnus

nnml.el (nnml-request-compact-group): Delete the marks file after compaction (bug#10800).
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.

5 files changed, 25 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e5d49365042..09861b95606 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,14 @@
+2012-02-12  Lars Ingebrigtsen  <larsi@gnus.org>
+
+	* nnml.el (nnml-request-compact-group): Delete the marks file after
+	compaction (bug#10800).
+
+	* 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/gnus-art.el b/lisp/gnus/gnus-art.el
index b282afd961c..048f8956567 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4582,6 +4582,10 @@ commands:
     (when (eq (elt timer 5) 'image-animate-timeout)
       (cancel-timer timer))))
 
+(defun gnus-stop-downloads ()
+  (when (boundp 'url-queue)
+    (set (intern "url-queue" obarray) 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/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 4316efacea6..8ae8d0b8ae2 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -7319,6 +7319,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)
@@ -9656,6 +9657,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)
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index de4d248c624..73f9b917e7b 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1539,7 +1539,8 @@ textual parts.")
 
 (defun nnimap-parse-flags (sequences)
   (goto-char (point-min))
-  ;; Change \Delete etc to %Delete, so that the reader can read it.
+  ;; Change \Delete etc to %Delete, so that the Emacs Lisp reader can
+  ;; read it.
   (subst-char-in-region (point-min) (point-max)
 			?\\ ?% t)
   ;; Remove any MODSEQ entries in the buffer, because they may contain
@@ -1610,7 +1611,9 @@ textual parts.")
 			     vanished highestmodseq)
 		       articles)
 		groups)
-	  (goto-char end)
+	  (if (eq flag-sequence 'qresync)
+	      (goto-char end)
+	    (setq end (point)))
 	  (setq articles nil))))
     groups))
 
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index acb23ed1693..b8652600ae7 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -1298,6 +1298,9 @@ Use the nov database for the current group if available."
 	  (nnml-save-nov)
 	  ;; b/ Save the active file:
 	  (nnmail-save-active nnml-group-alist nnml-active-file)
+	  (let ((marks (nnml-group-pathname group nnml-marks-file-name server)))
+	    (when (file-exists-p marks)
+	      (delete-file marks)))
 	  t)))))
 
 (defun nnml-request-compact (&optional server)