Synch to No Gnus 200412161232.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 417c6ac..f34f9a9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-group.el (gnus-group-make-rss-group): Unify non-ASCII group
+       names.
+
 2004-12-16  Simon Josefsson  <jas@extundo.com>
 
        * hashcash.el (hashcash-payment-alist): Fix custom :type.

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index d2636f8..28f3610 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -2675,10 +2675,15 @@ If there is, use Gnus to create an nnrss group"
              (desc  (read-from-minibuffer "Description: "
                                           (cdr (assoc 'description
                                                       feedinfo))))
-             (href (cdr (assoc 'href feedinfo))))
+             (href (cdr (assoc 'href feedinfo)))
+             (encodable (mm-coding-system-p 'utf-8)))
+         (when encodable
+           ;; Unify non-ASCII text.
+           (setq title (mm-decode-coding-string
+                        (mm-encode-coding-string title 'utf-8) 'utf-8)))
          (push (list title href desc)
                nnrss-group-alist)
-         (gnus-group-make-group (if (mm-coding-system-p 'utf-8)
+         (gnus-group-make-group (if encodable
                                     (mm-encode-coding-string title 'utf-8)
                                   title)
                                 '(nnrss ""))