Synch to No Gnus 200412291457.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 79b84ff..a93c8c6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,10 @@
 2004-12-29  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * gnus-group.el (gnus-group-make-rss-group): Exclude `/'s.
+       * gnus-group.el (gnus-group-line-format-alist): Use decoded group
+       name for only %g and %c.
+       (gnus-group-insert-group-line): Bind gnus-tmp-decoded-group instead
+       of gnus-tmp-group to decoded group name.
+       (gnus-group-make-rss-group): Exclude `/'s from group names.
 
 2004-12-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 5cf2b22..2550fc8 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -497,9 +497,9 @@ 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-group ?s)
+    (?g gnus-tmp-decoded-group ?s)
     (?G gnus-tmp-qualified-group ?s)
-    (?c (gnus-short-group-name gnus-tmp-group) ?s)
+    (?c (gnus-short-group-name gnus-tmp-decoded-group) ?s)
     (?C gnus-tmp-comment ?s)
     (?D gnus-tmp-newsgroup-description ?s)
     (?o gnus-tmp-moderated ?c)
@@ -1494,8 +1494,8 @@ if it is a string, only list groups matching REGEXP."
      (point)
      (prog1 (1+ (point))
        ;; Insert the text.
-       (let ((gnus-tmp-group (gnus-group-name-decode
-                             gnus-tmp-group group-name-charset)))
+       (let ((gnus-tmp-decoded-group (gnus-group-name-decode
+                                     gnus-tmp-group group-name-charset)))
         (eval gnus-group-line-format-spec)))
      `(gnus-group ,(gnus-intern-safe gnus-tmp-group gnus-active-hashtb)
                  gnus-unread ,(if (numberp number)