[Emacs-diffs] /srv/bzr/emacs/trunk r107263: Merge changes made in No Gnus

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 107263
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sun 2012-02-12 22:20:48 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-art.el
  lisp/gnus/gnus-sum.el
  lisp/gnus/nnimap.el
  lisp/gnus/nnml.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-02-11 22:13:29 +0000
+++ b/lisp/gnus/ChangeLog       2012-02-12 22:20:48 +0000
@@ -1,3 +1,14 @@
+2012-02-12  Lars Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * sieve-manage.el (sieve-manage-default-stream):

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2012-01-19 07:21:25 +0000
+++ b/lisp/gnus/gnus-art.el     2012-02-12 22:20:48 +0000
@@ -4582,6 +4582,10 @@
     (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)

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2012-02-11 22:13:29 +0000
+++ b/lisp/gnus/gnus-sum.el     2012-02-12 22:20:48 +0000
@@ -7319,6 +7319,7 @@
       (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 @@
       (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)

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2012-02-09 06:05:43 +0000
+++ b/lisp/gnus/nnimap.el       2012-02-12 22:20:48 +0000
@@ -1539,7 +1539,8 @@
 
 (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 @@
                             vanished highestmodseq)
                       articles)
                groups)
-         (goto-char end)
+         (if (eq flag-sequence 'qresync)
+             (goto-char end)
+           (setq end (point)))
          (setq articles nil))))
     groups))
 

=== modified file 'lisp/gnus/nnml.el'
--- a/lisp/gnus/nnml.el 2012-01-19 07:21:25 +0000
+++ b/lisp/gnus/nnml.el 2012-02-12 22:20:48 +0000
@@ -1298,6 +1298,9 @@
          (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)