From: yamaoka <yamaoka>
Date: Wed, 16 Jun 2004 08:55:02 +0000 (+0000)
Subject: Synch to No Gnus 200406160854.
X-Git-Tag: t-gnus-6_17_4-quimby-~860
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78a147fda022ac79f5398b254c6f713bac89feae;p=elisp%2Fgnus.git-

Synch to No Gnus 200406160854.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1608795..e44e8a9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-srvr.el (gnus-server-set-info): Remove the server from
+	gnus-opened-servers since it has never been opened with the new
+	configuration yet.
+
 2004-06-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* nnheader.el (nnheader-nov-read-message-id): Pass the optional
diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el
index 2bd5c2a..240ff3b 100644
--- a/lisp/gnus-srvr.el
+++ b/lisp/gnus-srvr.el
@@ -1,5 +1,5 @@
 ;;; gnus-srvr.el --- virtual server support for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -391,7 +391,14 @@ The following commands are available:
       (if cached
 	  (setq gnus-server-method-cache
 		(delq cached gnus-server-method-cache)))
-      (if entry (setcdr entry info)
+      (if entry
+	  (progn
+	    ;; Remove the server from `gnus-opened-servers' since
+	    ;; it has never been opened with the new `info' yet.
+	    (setq gnus-opened-servers
+		  (delq (assoc (cdr entry) gnus-opened-servers)
+			gnus-opened-servers))
+	    (setcdr entry info))
 	(setq gnus-server-alist
 	      (nconc gnus-server-alist (list (cons server info))))))))