Synch to No Gnus 200503080040.

[elisp/gnus.git-] / lisp / nnimap.el

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 6f79f95..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")))))
@@ -1504,8 +1506,8 @@ function is generally only called when Gnus is shutting down."
   ;; return articles not deleted
   articles)
 
-(deffoo nnimap-request-move-article (article group server
-                                            accept-form &optional last)
+(deffoo nnimap-request-move-article (article group server accept-form 
+                                            &optional last move-is-internal)
   (when (nnimap-possibly-change-server server)
     (save-excursion
       (let ((buf (get-buffer-create " *nnimap move*"))
@@ -1513,12 +1515,12 @@ function is generally only called when Gnus is shutting down."
            (nnimap-current-move-group group)
            (nnimap-current-move-server nnimap-current-server)
            result)
-       (gnus-message 9 "nnimap-request-move-article: this is an %s move"
-                     (if gnus-sum-hint-move-is-internal
+       (gnus-message 10 "nnimap-request-move-article: this is an %s move"
+                     (if move-is-internal
                          "internal"
                        "external"))
        ;; request the article only when the move is NOT internal
-       (and (or gnus-sum-hint-move-is-internal
+       (and (or move-is-internal
                 (nnimap-request-article article group server))
             (save-excursion
               (set-buffer buf)