More about group name charset.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd21ad1..d394a47 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-16 18:15:24  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-group.el (gnus-group-apropos): Group name charset.
+
 2000-05-16 17:55:57  Karl Kleinpaste <karl@charcoal.com>
 
        * gnus-util.el (gnus-put-text-property-excluding-newlines): Improve.

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 0d53d3c..671e35c 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -907,7 +907,7 @@ The following commands are available:
       result)))
 
 (defsubst gnus-group-name-decode (string charset)
-  (if (and charset (featurep 'mule))
+  (if (and string charset (featurep 'mule))
       (mm-decode-coding-string string charset)
     string))
 
@@ -3304,11 +3304,13 @@ to use."
        (while groups
          ;; Groups may be entered twice into the list of groups.
          (when (not (string= (car groups) prev))
-           (insert (setq prev (car groups)) "\n")
-           (when (and gnus-description-hashtb
-                      (setq des (gnus-gethash (car groups)
-                                              gnus-description-hashtb)))
-             (insert "  " des "\n")))
+           (setq prev (car groups))
+           (let ((charset (gnus-group-name-charset nil prev)))
+             (insert (gnus-group-name-decode prev charset) "\n")
+             (when (and gnus-description-hashtb
+                        (setq des (gnus-gethash (car groups)
+                                                gnus-description-hashtb)))
+               (insert "  " (gnus-group-name-decode des charset) "\n"))))
          (setq groups (cdr groups)))
        (goto-char (point-min))))
     (pop-to-buffer obuf)))