Encode names of nnml groups that nnmail-get-new-mail creates in active file.

2010-07-30  Katsumi Yamaoka  <yamaoka@jpl.org>
 * nnmail.el (nnmail-get-new-mail-1): Encode group names possibly
 containing non-ASCII characters in active file for nnml back end.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 13a06be..bbf42d3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * nnmail.el (nnmail-get-new-mail-1): Encode group names possibly
+       containing non-ASCII characters in active file for nnml back end.
+
 2010-07-24  David Engster  <dengste@eml.cc>
 
        * mml-smime.el (mml-smime-epg-verify): Also accept the older

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 8bf0cbf..537d98c 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1844,9 +1844,20 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
       (if (zerop total)
          (nnheader-message 4 "%s: Reading incoming mail (no new mail)...done"
                            method (car source))
-       (nnmail-save-active
-        (nnmail-get-value "%s-group-alist" method)
-        (nnmail-get-value "%s-active-file" method))
+       (let ((group-alist (nnmail-get-value "%s-group-alist" method))
+             (active-file (nnmail-get-value "%s-active-file" method))
+             encoded)
+         ;; Encode group names possibly containing non-ASCII characters.
+         (cond ((eq method 'nnml)
+                (nnmail-save-active
+                 (dolist (elem group-alist (nreverse encoded))
+                   (push (cons (nnml-encoded-group-name (car elem)
+                                                        gnus-command-method)
+                               (cdr elem))
+                         encoded))
+                 active-file))
+               (t
+                (nnmail-save-active group-alist active-file))))
        (when exit-func
          (funcall exit-func))
        (run-hooks 'nnmail-read-incoming-hook)