diff options
author | Miles Bader <miles@gnu.org> | 2006-10-24 10:42:21 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2006-10-24 10:42:21 +0000 |
commit | c86d4601c99527b56d3892637a667ea515f6fb85 (patch) | |
tree | 3dab6304af37e6f0b212e7a8df52070f47661f87 /lisp/gnus/gnus-group.el | |
parent | 7eb605c752b669ea2aa89040f512f91ce4a3de63 (diff) | |
download | emacs-c86d4601c99527b56d3892637a667ea515f6fb85.tar.gz |
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
Diffstat (limited to 'lisp/gnus/gnus-group.el')
-rw-r--r-- | lisp/gnus/gnus-group.el | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index c34e339c5b1..c6a0d599ac4 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -2680,13 +2680,18 @@ If called with a prefix argument, ask for the file type." (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)))))) |