Synch to Gnus 200312282038.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9e3cb92..3a3713b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-28  Adrian Lanz  <lanz@fowi.ethz.ch>
+
+       * mail-source.el (mail-source-fetch-imap): This small patch
+       (against a recent CVS version of mail-source.el) prevents storing
+       identical entries for imap mail sources, when retrieving mail
+       messages from an imap server within the same Gnus session several
+       times.
+
 2003-12-28  Jesper Harder  <harder@ifa.au.dk>
 
        * mm-view.el (mm-text-html-washer-alist): Use

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index efc11ad..b06f55d 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -1004,8 +1004,8 @@ This only works when `display-time' is enabled."
              (set-buffer-multibyte nil)
              ;; remember password
              (with-current-buffer buf
-               (when (or imap-password
-                         (assoc from mail-source-password-cache))
+               (when (and imap-password
+                          (not (assoc from mail-source-password-cache)))
                  (push (cons from imap-password) mail-source-password-cache)))
              ;; if predicate is nil, use all uids
              (dolist (uid (imap-search (or predicate "1:*") buf))