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

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 104440
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2011-05-30 22:11:52 +0000
message:
  Merge changes made in Gnus trunk.
  
  gnus-group.el (gnus-group-mark-article-read): It's possible that we want to 
have `gnus-newsgroup-unselected' kept sorted.  If this isn't done, then 
unselected articles may be marked as read.
  pop3.el (pop3-open-server): Erase the buffer after the greeting, since not 
doing this seems to lead to a race condition in pop3-logon.
  nnvirtual.el (nnvirtual-request-article): Bind `gnus-command-method' so that 
the call chain it correct when we call "upwards".
  gnus-sum.el (gnus-select-newsgroup): Auto-expiry doesn't make sense in 
read-only groups.
  gnus-group.el (gnus-group-mark-article-read): Ditto.
  message.el (message-cite-reply-position): Doc string fix.
  nnimap.el (nnimap-transform-headers): Simplify regexp to hopefully avoid 
regexp overflow.
   (nnimap-transform-split-mail): Ditto.
  pop3.el (pop3-retr): Error out if the server closes the connection.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-group.el
  lisp/gnus/gnus-sum.el
  lisp/gnus/message.el
  lisp/gnus/nnimap.el
  lisp/gnus/nnvirtual.el
  lisp/gnus/pop3.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-05-30 17:21:59 +0000
+++ b/lisp/gnus/ChangeLog       2011-05-30 22:11:52 +0000
@@ -1,3 +1,28 @@
+2011-05-30  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * gnus-group.el (gnus-group-mark-article-read): It's possible that we
+       want to have `gnus-newsgroup-unselected' kept sorted.  If this isn't
+       done, then unselected articles may be marked as read.
+
+       * pop3.el (pop3-open-server): Erase the buffer after the greeting,
+       since not doing this seems to lead to a race condition in pop3-logon.
+
+       * nnvirtual.el (nnvirtual-request-article): Bind `gnus-command-method'
+       so that the call chain it correct when we call "upwards".
+
+       * gnus-sum.el (gnus-select-newsgroup): Auto-expiry doesn't make sense
+       in read-only groups.
+
+       * gnus-group.el (gnus-group-mark-article-read): Ditto.
+
+       * message.el (message-cite-reply-position): Doc string fix.
+
+       * nnimap.el (nnimap-transform-headers): Simplify regexp to hopefully
+       avoid regexp overflow.
+       (nnimap-transform-split-mail): Ditto.
+
+       * pop3.el (pop3-retr): Error out if the server closes the connection.
+
 2011-05-30  Stefan Monnier  <address@hidden>
 
        * mml1991.el (mml1991-mailcrypt-encrypt): Remove use of ill-designed

=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el   2011-05-27 00:55:07 +0000
+++ b/lisp/gnus/gnus-group.el   2011-05-30 22:11:52 +0000
@@ -3567,7 +3567,8 @@
        (gnus-add-marked-articles group 'tick nil nil 'force)
        (gnus-add-marked-articles group 'dormant nil nil 'force))
       ;; Do auto-expirable marks if that's required.
-      (when (gnus-group-auto-expirable-p group)
+      (when (and (gnus-group-auto-expirable-p group)
+                (not (gnus-group-read-only-p group)))
         (gnus-range-map
         (lambda (article)
           (gnus-add-marked-articles group 'expire (list article))
@@ -4630,10 +4631,11 @@
                  (push n gnus-newsgroup-unselected))
                (setq n (1+ n)))
              (setq gnus-newsgroup-unselected
-                   (nreverse gnus-newsgroup-unselected)))))
+                   (sort gnus-newsgroup-unselected '<)))))
       (gnus-activate-group group)
       (gnus-group-make-articles-read group (list article))
-      (when (gnus-group-auto-expirable-p group)
+      (when (and (gnus-group-auto-expirable-p group)
+                (not (gnus-group-read-only-p group)))
        (gnus-add-marked-articles
         group 'expire (list article))))))
 

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2011-05-20 01:00:46 +0000
+++ b/lisp/gnus/gnus-sum.el     2011-05-30 22:11:52 +0000
@@ -5715,7 +5715,8 @@
       (gnus-summary-remove-list-identifiers)
       ;; Check whether auto-expire is to be done in this group.
       (setq gnus-newsgroup-auto-expire
-           (gnus-group-auto-expirable-p group))
+           (and (gnus-group-auto-expirable-p group)
+                (not (gnus-group-read-only-p group))))
       ;; Set up the article buffer now, if necessary.
       (unless (and gnus-single-article-buffer
                   (equal gnus-article-buffer "*Article*"))

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2011-05-13 02:16:09 +0000
+++ b/lisp/gnus/message.el      2011-05-30 22:11:52 +0000
@@ -1091,7 +1091,7 @@
 probably want to set this variable only for specific groups,
 e.g. using `gnus-posting-styles':
 
-  (eval (set (make-local-variable 'message-cite-reply-above) 'above))"
+  (eval (set (make-local-variable 'message-cite-reply-position) 'above))"
   :type '(choice (const :tag "Reply inline" 'traditional)
                 (const :tag "Reply above" 'above)
                 (const :tag "Reply below" 'below))

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2011-05-02 03:37:06 +0000
+++ b/lisp/gnus/nnimap.el       2011-05-30 22:11:52 +0000
@@ -190,7 +190,7 @@
   (let (article bytes lines size string)
     (block nil
       (while (not (eobp))
-       (while (not (looking-at "^\\* [0-9]+ FETCH.*UID \\([0-9]+\\)"))
+       (while (not (looking-at "\\* [0-9]+ FETCH.+UID \\([0-9]+\\)"))
          (delete-region (point) (progn (forward-line 1) (point)))
          (when (eobp)
            (return)))
@@ -1904,7 +1904,7 @@
   (let (article bytes)
     (block nil
       (while (not (eobp))
-       (while (not (looking-at "^\\* [0-9]+ FETCH.*UID \\([0-9]+\\)"))
+       (while (not (looking-at "\\* [0-9]+ FETCH.+UID \\([0-9]+\\)"))
          (delete-region (point) (progn (forward-line 1) (point)))
          (when (eobp)
            (return)))

=== modified file 'lisp/gnus/nnvirtual.el'
--- a/lisp/gnus/nnvirtual.el    2011-01-25 04:08:28 +0000
+++ b/lisp/gnus/nnvirtual.el    2011-05-30 22:11:52 +0000
@@ -194,10 +194,11 @@
            (when buffer
              (set-buffer buffer))
            (let* ((gnus-override-method nil)
-                  (method (gnus-find-method-for-group
-                           nnvirtual-last-accessed-component-group)))
-             (funcall (gnus-get-function method 'request-article)
-                      article nil (nth 1 method) buffer)))))
+                  (gnus-command-method
+                   (gnus-find-method-for-group
+                    nnvirtual-last-accessed-component-group)))
+             (funcall (gnus-get-function gnus-command-method 'request-article)
+                      article nil (nth 1 gnus-command-method) buffer)))))
       ;; This is a fetch by number.
       (let* ((amap (nnvirtual-map-article article))
             (cgroup (car amap)))

=== modified file 'lisp/gnus/pop3.el'
--- a/lisp/gnus/pop3.el 2011-05-02 01:45:17 +0000
+++ b/lisp/gnus/pop3.el 2011-05-30 22:11:52 +0000
@@ -319,6 +319,7 @@
                (substring response (or (string-match "<" response) 0)
                           (+ 1 (or (string-match ">" response) -1)))))
        (pop3-set-process-query-on-exit-flag (car result) nil)
+       (erase-buffer)
        (car result)))))
 
 ;; Support functions
@@ -514,6 +515,8 @@
   (let ((start pop3-read-point) end)
     (with-current-buffer (process-buffer process)
       (while (not (re-search-forward "^\\.\r\n" nil t))
+       (unless (memq (process-status process) '(open run))
+         (error "pop3 server closed the connection"))
        (pop3-accept-process-output process)
        (goto-char start))
       (setq pop3-read-point (point-marker))