changeset 109593:e77efe427ead

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.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Fri, 30 Jul 2010 02:02:05 +0000
parents b54c435793d9 (current diff) d5c206ebf542 (diff)
children fe23ee097a54 9a965dbf641e
files
diffstat 2 files changed, 19 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Thu Jul 29 22:16:18 2010 +0200
+++ b/lisp/gnus/ChangeLog	Fri Jul 30 02:02:05 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
--- a/lisp/gnus/nnmail.el	Thu Jul 29 22:16:18 2010 +0200
+++ b/lisp/gnus/nnmail.el	Fri Jul 30 02:02:05 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)