From b5244046e1ea76b26b7acd516929502463b05eaf Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Mon, 30 May 2011 22:11:52 +0000 Subject: 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. --- lisp/gnus/nnimap.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp/gnus/nnimap.el') diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 6882ed63135..dc8b38b8f9a 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -190,7 +190,7 @@ textual parts.") (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 @@ textual parts.") (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))) -- cgit v1.2.1