# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1110322864 0
# Node ID bbb951948fa804935ca970c0dfec4cf8fdaabe23
# Parent  aa8999e30efb4b7fae6e6d74733bbd79e7ab0645
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-165

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 37)

   - Update from CVS

2005-03-08  Bjorn Solberg <bjorn_ding@hekneby.org>  (tiny change)

   * lisp/gnus/nnimap.el (nnimap-retrieve-headers-from-server): Sort NOV
   buffer (since IMAP server might return FETCH response out of
   order, and the nntp buffer must be sorted).

diff -r aa8999e30efb -r bbb951948fa8 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Tue Mar 08 21:51:48 2005 +0000
+++ b/lisp/gnus/ChangeLog	Tue Mar 08 23:01:04 2005 +0000
@@ -1,3 +1,9 @@
+2005-03-08  Bjorn Solberg <bjorn_ding@hekneby.org>  (tiny change)
+
+	* nnimap.el (nnimap-retrieve-headers-from-server): Sort NOV
+	buffer (since IMAP server might return FETCH response out of
+	order, and the nntp buffer must be sorted).
+
 2005-03-04  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* message.el: Don't autoload former message-utils variables.
diff -r aa8999e30efb -r bbb951948fa8 lisp/gnus/nnimap.el
--- a/lisp/gnus/nnimap.el	Tue Mar 08 21:51:48 2005 +0000
+++ b/lisp/gnus/nnimap.el	Tue Mar 08 23:01:04 2005 +0000
@@ -665,6 +665,8 @@
 			    (if (imap-capability 'IMAP4rev1)
 				(format "BODY.PEEK[HEADER.FIELDS %s])" headers)
 			      (format "RFC822.HEADER.LINES %s)" headers)))))
+      (with-current-buffer nntp-server-buffer
+	(sort-numeric-fields 1 1 (buffer-size)))
       (and (numberp nnmail-large-newsgroup)
 	   (> nnimap-length nnmail-large-newsgroup)
 	   (nnheader-message 6 "nnimap: Retrieving headers...done")))))