# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1280455264 0
# Node ID d5c206ebf54243dcf7cce76648d2f167b3bc8da8
# Parent  1fb35da4a09700d7983fcd1323fce1c00180c437
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 -r 1fb35da4a097 -r d5c206ebf542 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Thu Jul 29 23:01:42 2010 +0000
+++ b/lisp/gnus/ChangeLog	Fri Jul 30 02:01:04 2010 +0000
@@ -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 -r 1fb35da4a097 -r d5c206ebf542 lisp/gnus/nnmail.el
--- a/lisp/gnus/nnmail.el	Thu Jul 29 23:01:42 2010 +0000
+++ b/lisp/gnus/nnmail.el	Fri Jul 30 02:01:04 2010 +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)