Mercurial > emacs

diff lisp/gnus/gnus-group.el @ 73487:d34b38862f88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 153-155) - Merge from emacs--devo--0 - Update from CVS 2006-10-20 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/gnus-group.el (gnus-group-make-doc-group): Work for non-ASCII group names. * lisp/gnus/gnus-sum.el (gnus-select-newsgroup): Decode group name. 2006-10-19 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/message.el (message-headers-to-generate): Fix typo in docstring. 2006-10-19 Reiner Steib <Reiner.Steib@gmx.de> * lisp/gnus/gnus.el (gnus-mime): Remove unused custom group. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-482
author Miles Bader <miles@gnu.org>
date Tue, 24 Oct 2006 10:42:21 +0000
parents 770285b3deb5
children 361d95731e62 7eeafaaa9eab
line wrap: on
line diff
--- a/lisp/gnus/gnus-group.el	Mon Oct 23 19:20:15 2006 +0000
+++ b/lisp/gnus/gnus-group.el	Tue Oct 24 10:42:21 2006 +0000
@@ -2680,13 +2680,18 @@
 			  (t (setq err (format "%c unknown. " char))
 			     nil))))
       (setq type found)))
-  (let* ((file (expand-file-name file))
-	 (name (gnus-generate-new-group-name
-		(gnus-group-prefixed-name
-		 (file-name-nondirectory file) '(nndoc "")))))
+  (setq file (expand-file-name file))
+  (let ((name (gnus-generate-new-group-name
+	       (gnus-group-prefixed-name
+		(file-name-nondirectory file) '(nndoc ""))))
+	(encodable (mm-coding-system-p 'utf-8)))
     (gnus-group-make-group
-     (gnus-group-real-name name)
-     (list 'nndoc file
+     (if encodable
+	 (mm-encode-coding-string (gnus-group-real-name name) 'utf-8)
+       (gnus-group-real-name name))
+     (list 'nndoc (if encodable
+		      (mm-encode-coding-string file 'utf-8)
+		    file)
 	   (list 'nndoc-address file)
 	   (list 'nndoc-article-type (or type 'guess))))))