Synch to Gnus 200308301411.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d3899f0..c9f5c83 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-30  Simon Josefsson  <jas@extundo.com>
+
+       * mail-source.el (mail-source-fetch-imap): Pass correct buffer to
+       imap-open, reverts 2003-03-17 change.  Reverse remove before
+       calling gnus-compress-sequence.  From Gaute Strokkenes
+       <gs234@srcf.ucam.org> (tiny change).
+
 2003-08-29  Simon Josefsson  <jas@extundo.com>
 
        * gnus-group.el (gnus-group-delete-group): Doc fix.  Suggested by

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 0ae90a8..0574473 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -977,14 +977,13 @@ This only works when `display-time' is enabled."
 (defun mail-source-fetch-imap (source callback)
   "Fetcher for imap sources."
   (mail-source-bind (imap source)
-    (let* ((from (format "%s:%s:%s" server user port))
-          (found 0)
-          (buffer-name " *imap source*")
-          (buf (get-buffer-create (generate-new-buffer-name buffer-name)))
-          (mail-source-string (format "imap:%s:%s" server mailbox))
-          (imap-shell-program (or (list program) imap-shell-program))
-          remove)
-      (if (and (imap-open server port stream authentication buffer-name)
+    (let ((from (format "%s:%s:%s" server user port))
+         (found 0)
+         (buf (generate-new-buffer " *imap source*"))
+         (mail-source-string (format "imap:%s:%s" server mailbox))
+         (imap-shell-program (or (list program) imap-shell-program))
+         remove)
+      (if (and (imap-open server port stream authentication buf)
               (imap-authenticate
                user (or (cdr (assoc from mail-source-password-cache))
                         password) buf)
@@ -1018,6 +1017,7 @@ This only works when `display-time' is enabled."
              (nnheader-ms-strip-cr))
            (incf found (mail-source-callback callback server))
            (when (and remove fetchflag)
+             (setq remove (nreverse remove))
              (imap-message-flags-add
               (imap-range-to-message-set (gnus-compress-sequence remove))
               fetchflag nil buf))