Synch to No Gnus 200412150840.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b1f275f..6c1c92d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-group.el (gnus-group-expire-articles-1): Decode group name.
+       (gnus-group-set-current-level): Decode group name.
+
 2004-12-15  Maciek Pasternacki  <maciekp@japhy.fnord.org>  (tiny change)
 
        * nnrss.el (nnrss-fetch): Signal an error if w3-parse-buffer also

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index afb458c..d2636f8 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -3262,7 +3262,8 @@ Uses the process/prefix convention."
 
 (defun gnus-group-expire-articles-1 (group)
   (when (gnus-check-backend-function 'request-expire-articles group)
-    (gnus-message 6 "Expiring articles in %s..." group)
+    (gnus-message 6 "Expiring articles in %s..."
+                 (gnus-group-decoded-name group))
     (let* ((info (gnus-get-info group))
           (expirable (if (gnus-group-total-expirable-p group)
                          (cons nil (gnus-list-of-read-articles group))
@@ -3287,7 +3288,8 @@ Uses the process/prefix convention."
            (gnus-request-expire-articles
             (gnus-uncompress-sequence (cdr expirable)) group))))
        (gnus-close-group group))
-      (gnus-message 6 "Expiring articles in %s...done" group)
+      (gnus-message 6 "Expiring articles in %s...done"
+                   (gnus-group-decoded-name group))
       ;; Return the list of un-expired articles.
       (cdr expirable))))
 
@@ -3324,7 +3326,8 @@ Uses the process/prefix convention."
   (dolist (group (gnus-group-process-prefix n))
     (gnus-group-remove-mark group)
     (gnus-message 6 "Changed level of %s from %d to %d"
-                 group (or (gnus-group-group-level) gnus-level-killed)
+                 (gnus-group-decoded-name group)
+                 (or (gnus-group-group-level) gnus-level-killed)
                  level)
     (gnus-group-change-level
      group level (or (gnus-group-group-level) gnus-level-killed))