From: yamaoka <yamaoka>
Date: Thu, 30 Dec 2004 13:13:19 +0000 (+0000)
Subject: Synch to No Gnus 200412301312.
X-Git-Tag: t-gnus-6_17_4-quimby-~610
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=1f6cd7c3f36b09b73aa070caae5a987cadd4bff4;p=elisp%2Fgnus.git-

Synch to No Gnus 200412301312.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a93c8c6..4d6b53b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-group.el (gnus-group-line-format-alist): Keep the forward
+	compatibility in %g and %c.
+
 2004-12-29  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-group.el (gnus-group-line-format-alist): Use decoded group
diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 2550fc8..925ad43 100644
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -497,9 +497,15 @@ simple manner.")
     (?T (gnus-range-length (cdr (assq 'tick gnus-tmp-marked))) ?d)
     (?i (+ (gnus-range-length (cdr (assq 'dormant gnus-tmp-marked)))
 	   (gnus-range-length (cdr (assq 'tick gnus-tmp-marked)))) ?d)
-    (?g gnus-tmp-decoded-group ?s)
+    (?g (if (boundp 'gnus-tmp-decoded-group)
+	    gnus-tmp-decoded-group
+	  gnus-tmp-group)
+	?s)
     (?G gnus-tmp-qualified-group ?s)
-    (?c (gnus-short-group-name gnus-tmp-decoded-group) ?s)
+    (?c (gnus-short-group-name (if (boundp 'gnus-tmp-decoded-group)
+				   gnus-tmp-decoded-group
+				 gnus-tmp-group))
+	?s)
     (?C gnus-tmp-comment ?s)
     (?D gnus-tmp-newsgroup-description ?s)
     (?o gnus-tmp-moderated ?c)