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 --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 76d4cb419cbff83dcd25b1ce123be12fd7af915d..651877e0240f7338381ad12c8de3d3e79b11cfc0 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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-04  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * message.el: Don't autoload former message-utils variables.

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 59b0178de421299ac806d94e4f3537bc04f7a39e..bd75f8576ff85aa66e4befb0d0296a32ab62ebb3 100644 (file)
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -665,6 +665,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")))))