lisp/gnus/message.el (message-expand-group): Decode group names

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 8793ea14f5abe7ea7e00242d8eafbc9bbd88cbb0..00f4369613029b9f5035e5b4be0899eaa180db28 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * message.el (message-expand-group): Decode group names.
+
 2013-05-16  Julien Danjou  <julien@danjou.info>
 
        * gnus-notifications.el (gnus-notifications-notify): Use photo-file as

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 501a2e6f832fbc24dee7a50c185dc0a74c02bb33..2a1ad892c2e9dc34b120e5d16239e9cdb7a63a27 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7960,19 +7960,29 @@ those headers."
 
 (defun message-expand-group ()
   "Expand the group name under point."
-  (let* ((b (save-excursion
-             (save-restriction
-               (narrow-to-region
-                (save-excursion
-                  (beginning-of-line)
-                  (skip-chars-forward "^:")
-                  (1+ (point)))
-                (point))
-               (skip-chars-backward "^, \t\n") (point))))
-        (completion-ignore-case t)
-         (e (progn (skip-chars-forward "^,\t\n ") (point)))
-        (hashtb (and (boundp 'gnus-active-hashtb) gnus-active-hashtb)))
-    (message-completion-in-region e b hashtb)))
+  (let ((b (save-excursion
+            (save-restriction
+              (narrow-to-region
+               (save-excursion
+                 (beginning-of-line)
+                 (skip-chars-forward "^:")
+                 (1+ (point)))
+               (point))
+              (skip-chars-backward "^, \t\n") (point))))
+       (completion-ignore-case t)
+       (e (progn (skip-chars-forward "^,\t\n ") (point)))
+       group collection)
+    (when (and (boundp 'gnus-active-hashtb)
+              gnus-active-hashtb)
+      (mapatoms
+       (lambda (symbol)
+        (setq group (symbol-name symbol))
+        (push (if (string-match "[^\000-\177]" group)
+                  (gnus-group-decoded-name group)
+                group)
+              collection))
+       gnus-active-hashtb))
+    (message-completion-in-region e b collection)))
 
 (defalias 'message-completion-in-region
   (if (fboundp 'completion-in-region)