From: yamaoka <yamaoka>
Date: Sun, 20 Oct 2002 01:44:36 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_8-05-quimby~21
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c15ad0b74e6bc889ee3a8e2cc33c2d0c687420e;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6e79990..e1de796 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,23 @@
+2002-10-20  Steve Youngs  <youngs@xemacs.org>
+
+	* pgg-parse.el (pgg-parse-public-key-algorithm-alist): XEmacs
+	doesn't have the 'alist custom type, use cons cells instead.
+	(pgg-parse-symmetric-key-algorithm-alist): Ditto.
+	(pgg-parse-hash-algorithm-alist): Ditto.
+	(pgg-parse-compression-algorithm-alist): Ditto.
+	(pgg-parse-signature-type-alist): Ditto.
+
+	* pgg-gpg.el (pgg-gpg-extra-args): Fix custom mismatch.
+
+	* pgg-pgp5.el (pgg-pgp5-extra-args): Ditto.
+
+	* pgg-pgp.el (pgg-pgp-extra-args): Ditto.
+
+2002-10-19  Simon Josefsson  <jas@extundo.com>
+
+	* nnimap.el (nnimap-open-server): Check imap-state in IMAP server
+	buffer.
+
 2002-10-18  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
 	* gnus-spec.el (gnus-make-format-preserve-properties) 
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 9e09f44..2623a3f 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -734,7 +734,8 @@ If EXAMINE is non-nil the group is selected read-only."
       (nnoo-change-server 'nnimap server defs))
     (or (and nnimap-server-buffer
 	     (imap-opened nnimap-server-buffer)
-	     (if (memq imap-state '(auth select examine))
+	     (if (with-current-buffer nnimap-server-buffer
+		   (memq imap-state '(auth select examine)))
 		 t
 	       (imap-close nnimap-server-buffer)
 	       (nnimap-open-connection server)))