From: Miles Bader Date: Tue, 24 Oct 2006 10:42:21 +0000 (+0000) Subject: Merge from gnus--rel--5.10 X-Git-Tag: emacs-pretest-22.0.90~20 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c86d4601c99527b56d3892637a667ea515f6fb85;p=emacs.git 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 * 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 * lisp/gnus/message.el (message-headers-to-generate): Fix typo in docstring. 2006-10-19 Reiner Steib * lisp/gnus/gnus.el (gnus-mime): Remove unused custom group. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-482 --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index dba2c407b21..766a92c1dbd 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,18 @@ +2006-10-20 Katsumi Yamaoka + + * 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 + + * message.el (message-headers-to-generate): Fix typo in docstring. + +2006-10-19 Reiner Steib + + * gnus.el (gnus-mime): Remove unused custom group. + 2006-10-13 Andreas Seltenreich * mm-uu.el (mm-uu-pgp-signed-extract-1): Use RFC 2440 definition of 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)))))) diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 8dcd0753e59..fb0ef25c916 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -5208,13 +5208,13 @@ If SELECT-ARTICLES, only select those articles from GROUP." (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) diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 8554b1332f1..94e890b02c3 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -279,10 +279,6 @@ is restarted, and sometimes reloaded." :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 @@ used to 899, you would say something along these lines: :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 @@ Check the NNTPSERVER environment variable and the (when (re-search-forward "[^ \t\n\r]+" nil t) (match-string 0)))))) +;;;###autoload (defcustom gnus-select-method (condition-case nil (nconc diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 36a969fdefd..fc3859345f3 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -5514,7 +5514,7 @@ between beginning of field and beginning of line." (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)