Synch to No Gnus 200503080040.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e9f37b..599cff3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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-06  Kevin Greiner  <kevin.greiner@compsol.cc>
 
        * gnus-start.el (gnus-convert-old-newsrc): Fixed numeric

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 0811bc3..06e5419 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -711,6 +711,8 @@ If EXAMINE is non-nil the group is selected read-only."
                            (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")))))