[Emacs-diffs] /srv/bzr/emacs/trunk r100945: Encode names of nnml groups that nnmail-get-new-mail creates in active file.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 100945 [merge]
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2010-07-30 02:02:05 +0000
message:
  Encode names of nnml groups that nnmail-get-new-mail creates in active file.
  
  2010-07-30  Katsumi Yamaoka  <address@hidden>
   * nnmail.el (nnmail-get-new-mail-1): Encode group names possibly
   containing non-ASCII characters in active file for nnml back end.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nnmail.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-07-25 10:29:49 +0000
+++ b/lisp/gnus/ChangeLog       2010-07-30 02:01:04 +0000
@@ -1,3 +1,8 @@
+2010-07-30  Katsumi Yamaoka  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mml-smime.el (mml-smime-epg-verify): Also accept the older

=== modified file 'lisp/gnus/nnmail.el'
--- a/lisp/gnus/nnmail.el       2010-01-13 08:35:10 +0000
+++ b/lisp/gnus/nnmail.el       2010-07-30 02:01:04 +0000
@@ -1844,9 +1844,20 @@
       (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)