Mercurial > emacs
changeset 73487:d34b38862f88
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 | db25befb2938 |
| children | 20cd037496f9 |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-group.el lisp/gnus/gnus-sum.el lisp/gnus/gnus.el lisp/gnus/message.el |
| diffstat | 5 files changed, 31 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Mon Oct 23 19:20:15 2006 +0000 +++ b/lisp/gnus/ChangeLog Tue Oct 24 10:42:21 2006 +0000 @@ -1,3 +1,18 @@ +2006-10-20 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-group.el (gnus-group-make-doc-group): Work for non-ASCII group + names. + + * gnus-sum.el (gnus-select-newsgroup): Decode group name. + +2006-10-19 Katsumi Yamaoka <yamaoka@jpl.org> + + * message.el (message-headers-to-generate): Fix typo in docstring. + +2006-10-19 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus.el (gnus-mime): Remove unused custom group. + 2006-10-13 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> * mm-uu.el (mm-uu-pgp-signed-extract-1): Use RFC 2440 definition of
--- 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))))))
--- a/lisp/gnus/gnus-sum.el Mon Oct 23 19:20:15 2006 +0000 +++ b/lisp/gnus/gnus-sum.el Tue Oct 24 10:42:21 2006 +0000 @@ -5208,13 +5208,13 @@ (when (equal major-mode 'gnus-summary-mode) (gnus-kill-buffer (current-buffer))) (error "Couldn't activate group %s: %s" - group (gnus-status-message group)))) + (gnus-group-decoded-name group) (gnus-status-message group)))) (unless (gnus-request-group group t) (when (equal major-mode 'gnus-summary-mode) (gnus-kill-buffer (current-buffer))) (error "Couldn't request group %s: %s" - group (gnus-status-message group))) + (gnus-group-decoded-name group) (gnus-status-message group))) (when gnus-agent (gnus-agent-possibly-alter-active group (gnus-active group) info)
--- a/lisp/gnus/gnus.el Mon Oct 23 19:20:15 2006 +0000 +++ b/lisp/gnus/gnus.el Tue Oct 24 10:42:21 2006 +0000 @@ -279,10 +279,6 @@ :link '(custom-manual "(gnus)Various Various") :group 'gnus) -(defgroup gnus-mime nil - "Variables for controlling the Gnus MIME interface." - :group 'gnus) - (defgroup gnus-exit nil "Exiting Gnus." :link '(custom-manual "(gnus)Exiting Gnus") @@ -1243,6 +1239,7 @@ :group 'gnus-server :type 'file) +;;;###autoload (defun gnus-getenv-nntpserver () "Find default nntp server. Check the NNTPSERVER environment variable and the @@ -1254,6 +1251,7 @@ (when (re-search-forward "[^ \t\n\r]+" nil t) (match-string 0)))))) +;;;###autoload (defcustom gnus-select-method (condition-case nil (nconc
--- a/lisp/gnus/message.el Mon Oct 23 19:20:15 2006 +0000 +++ b/lisp/gnus/message.el Tue Oct 24 10:42:21 2006 +0000 @@ -5514,7 +5514,7 @@ (defun message-headers-to-generate (headers included-headers excluded-headers) "Return a list that includes all headers from HEADERS. -If INCLUDED-HEADERS is a list, just include those headers. If if is +If INCLUDED-HEADERS is a list, just include those headers. If it is t, include all headers. In any case, headers from EXCLUDED-HEADERS are not included." (let ((result nil)