From: yamaoka <yamaoka>
Date: Wed, 23 Aug 2000 05:58:08 +0000 (+0000)
Subject: Synch with `t-gnus-6_14'.
X-Git-Tag: t-gnus-6_14-quimby-before-installer-changed-~133
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d19d878d63af88690d21861d61e566d905fc96a;p=elisp%2Fgnus.git-

Synch with `t-gnus-6_14'.
---

diff --git a/ChangeLog b/ChangeLog
index 6596728..026794e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,25 @@
+2000-08-23  Katsumi Yamaoka <yamaoka@jpl.org>
+
+	* lisp/gnus-group.el (gnus-group-rename-group): Inhibit renaming of
+	zombie or killed groups.
+
 2000-08-21  Katsumi Yamaoka <yamaoka@jpl.org>
 
-	* nnheader.el (nnheader-replace-chars-in-string): Use `static-if'.
-	* message.el (message-replace-chars-in-string): Ditto.
+	* lisp/nnheader.el (nnheader-replace-chars-in-string): Use
+	`static-if'.
+	* lisp/message.el (message-replace-chars-in-string): Ditto.
 
 2000-08-19  TSUCHIYA Masatoshi  <tsuchiya@pine.kuee.kyoto-u.ac.jp>
 
-	* nnshimbun.el (nnshimbun-type-definition): Follow changes of ZDNet.
+	* lisp/nnshimbun.el (nnshimbun-type-definition): Follow changes of
+	ZDNet.
 	(nnshimbun-make-text-or-html-contents): Ditto.
 	(nnshimbun-make-html-contents): Ditto.
 
 2000-08-18  TSUCHIYA Masatoshi  <tsuchiya@pine.kuee.kyoto-u.ac.jp>
             Akihiro Arisawa  <ari@atesoft.advantest.co.jp>
 
-	* nnshimbun.el: Add `mew' and `xemacs' support.
+	* lisp/nnshimbun.el: Add `mew' and `xemacs' support.
 
 2000-08-17  Katsumi Yamaoka <yamaoka@jpl.org>
 
diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index bb08203..4d56096 100644
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -2054,10 +2054,12 @@ and NEW-NAME will be prompted for."
 
   (gnus-message 6 "Renaming group %s to %s..." group new-name)
   (prog1
-      (if (not (gnus-request-rename-group group new-name))
+      (if (progn
+	    (gnus-group-goto-group group)
+	    (not (when (< (gnus-group-group-level) gnus-level-zombie)
+		   (gnus-request-rename-group group new-name))))
 	  (gnus-error 3 "Couldn't rename group %s to %s" group new-name)
 	;; We rename the group internally by killing it...
-	(gnus-group-goto-group group)
 	(gnus-group-kill-group)
 	;; ... changing its name ...
 	(setcar (cdar gnus-list-of-killed-groups) new-name)