From: yamaoka <yamaoka>
Date: Tue, 8 Mar 2005 22:11:41 +0000 (+0000)
Subject: Synch to No Gnus 200503082041.
X-Git-Tag: t-gnus-6_17_4-quimby-~532
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dda91213fe649e7ab2f0086662f4b9acbb1d897;p=elisp%2Fgnus.git-

Synch to No Gnus 200503082041.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 599cff3..2ba3d2d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-08  Juergen Kreileder <jk@blackdown.de>  (tiny change)
+
+	* nnimap.el (nnimap-open-server): Ditto.
+
+	* imap.el (imap-authenticate): Fix typo.
+
 2005-03-08  Bjorn Solberg <bjorn_ding@hekneby.org>  (tiny change)
 
 	* nnimap.el (nnimap-retrieve-headers-from-server): Sort NOV
diff --git a/lisp/imap.el b/lisp/imap.el
index bb57de5..2d7d917 100644
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -1121,7 +1121,7 @@ password is remembered in the buffer."
   (with-current-buffer (or buffer (current-buffer))
     (if (not (eq imap-state 'nonauth))
 	(or (eq imap-state 'auth)
-	    (eq imap-state 'select)
+	    (eq imap-state 'selected)
 	    (eq imap-state 'examine))
       (make-local-variable 'imap-username)
       (make-local-variable 'imap-password)
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 06e5419..be300ec 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -829,7 +829,7 @@ If EXAMINE is non-nil the group is selected read-only."
     (or (and nnimap-server-buffer
 	     (imap-opened nnimap-server-buffer)
 	     (if (with-current-buffer nnimap-server-buffer
-		   (memq imap-state '(auth select examine)))
+		   (memq imap-state '(auth selected examine)))
 		 t
 	       (imap-close nnimap-server-buffer)
 	       (nnimap-open-connection server)))