From: Miles Bader Date: Fri, 9 Nov 2007 09:46:02 +0000 (+0000) Subject: Merge from gnus--devo--0 X-Git-Tag: emacs-pretest-23.0.90~9829 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4d8a28ecb866de25881ddaee2899c406f7ff3a35;p=emacs.git Merge from gnus--devo--0 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-924 --- diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index c9e77908619..63f9a6e596f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,9 @@ +2007-11-09 Reiner Steib + + * gnus-news.texi: Fix spelling. + `message-insert-formatted-citation-line', not + `message-insert-formated-citation-line'. + 2007-11-07 Michael Albinus * tramp.texi (Overview): Mention also the PuTTY integration under diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi index 821354717e2..0c08a93883b 100644 --- a/doc/misc/gnus-news.texi +++ b/doc/misc/gnus-news.texi @@ -175,7 +175,7 @@ named @code{message-signature-directory}. @item The option @code{message-citation-line-format} controls the format of the "Whomever writes:" line. You need to set @code{message-citation-line-function} to -@code{message-insert-formated-citation-line} as well. +@code{message-insert-formatted-citation-line} as well. @end itemize @item Changes in back ends diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index bc07acae287..7ac757f24e2 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,7 +1,23 @@ +2007-11-05 Reiner Steib + + * message.el (message-citation-line-function) + (message-insert-formatted-citation-line): Fix spelling of + `message-insert-formated-citation-line'. + 2007-11-03 Reiner Steib * gnus-sum.el (gnus-summary-highlight): Mark as risky local variable. +2007-11-02 Katsumi Yamaoka + + * nnml.el (nnml-request-rename-group): Bind file-name-coding-system to + nnmail-pathname-coding-system. + + * gnus-group.el (gnus-group-rename-group): Encode non-ASCII group name + that a user enters; decode group names in messages. + + * gnus-msg.el (gnus-inews-do-gcc): Encode non-ASCII group names. + 2007-11-01 Reiner Steib * mm-util.el (mm-charset-eval-alist): Mark as risky local variable. diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 97eb37a81ee..942a1cf4947 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -2613,14 +2613,19 @@ be removed from the server, even when it's empty." When used interactively, GROUP is the group under point and NEW-NAME will be prompted for." (interactive - (list - (gnus-group-group-name) - (progn - (unless (gnus-check-backend-function - 'request-rename-group (gnus-group-group-name)) - (error "This back end does not support renaming groups")) - (gnus-read-group "Rename group to: " - (gnus-group-real-name (gnus-group-group-name)))))) + (let ((group (gnus-group-group-name)) + method new-name) + (unless (gnus-check-backend-function 'request-rename-group group) + (error "This back end does not support renaming groups")) + (setq new-name (gnus-read-group + "Rename group to: " + (gnus-group-real-name (gnus-group-decoded-name group))) + method (gnus-info-method (gnus-get-info group))) + (list group (mm-encode-coding-string + new-name + (gnus-group-name-charset + method + (gnus-group-prefixed-name new-name method)))))) (unless (gnus-check-backend-function 'request-rename-group group) (error "This back end does not support renaming groups")) @@ -2639,29 +2644,34 @@ and NEW-NAME will be prompted for." (gnus-group-real-name new-name) (gnus-info-method (gnus-get-info group))))) - (when (gnus-active new-name) - (error "The group %s already exists" new-name)) + (let ((decoded-group (gnus-group-decoded-name group)) + (decoded-new-name (gnus-group-decoded-name new-name))) + (when (gnus-active new-name) + (error "The group %s already exists" decoded-new-name)) - (gnus-message 6 "Renaming group %s to %s..." group new-name) - (prog1 - (if (progn - (gnus-group-goto-group group) - (not (when (< (gnus-group-group-level) gnus-level-zombie) - (gnus-request-rename-group group new-name)))) - (gnus-error 3 "Couldn't rename group %s to %s" group new-name) - ;; We rename the group internally by killing it... - (gnus-group-kill-group) - ;; ... changing its name ... - (setcar (cdar gnus-list-of-killed-groups) new-name) - ;; ... and then yanking it. Magic! - (gnus-group-yank-group) - (gnus-set-active new-name (gnus-active group)) - (gnus-message 6 "Renaming group %s to %s...done" group new-name) - new-name) - (setq gnus-killed-list (delete group gnus-killed-list)) - (gnus-set-active group nil) - (gnus-dribble-touch) - (gnus-group-position-point))) + (gnus-message 6 "Renaming group %s to %s..." + decoded-group decoded-new-name) + (prog1 + (if (progn + (gnus-group-goto-group group) + (not (when (< (gnus-group-group-level) gnus-level-zombie) + (gnus-request-rename-group group new-name)))) + (gnus-error 3 "Couldn't rename group %s to %s" + decoded-group decoded-new-name) + ;; We rename the group internally by killing it... + (gnus-group-kill-group) + ;; ... changing its name ... + (setcar (cdar gnus-list-of-killed-groups) new-name) + ;; ... and then yanking it. Magic! + (gnus-group-yank-group) + (gnus-set-active new-name (gnus-active group)) + (gnus-message 6 "Renaming group %s to %s...done" + decoded-group decoded-new-name) + new-name) + (setq gnus-killed-list (delete group gnus-killed-list)) + (gnus-set-active group nil) + (gnus-dribble-touch) + (gnus-group-position-point)))) (defun gnus-group-edit-group (group &optional part) "Edit the group on the current line." diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el index 941222adfd5..891ed1bc269 100644 --- a/lisp/gnus/gnus-msg.el +++ b/lisp/gnus/gnus-msg.el @@ -1633,8 +1633,11 @@ this is a reply." (message-tokenize-header gcc " ,"))) ;; Copy the article over to some group(s). (while (setq group (pop groups)) - (unless (gnus-check-server - (setq method (gnus-inews-group-method group))) + (setq method (gnus-inews-group-method group) + group (mm-encode-coding-string + group + (gnus-group-name-charset method group))) + (unless (gnus-check-server method) (error "Can't open server %s" (if (stringp method) method (car method)))) (unless (gnus-request-group group nil method) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index dd9aacc98cf..895c36a6beb 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -914,7 +914,7 @@ the signature is inserted." "*Function called to insert the \"Whomever writes:\" line. Predefined functions include `message-insert-citation-line' and -`message-insert-formated-citation-line' (see the variable +`message-insert-formatted-citation-line' (see the variable `message-citation-line-format'). Note that Gnus provides a feature where the reader can click on @@ -923,7 +923,7 @@ people who read your message will have to change their Gnus configuration. See the variable `gnus-cite-attribution-suffix'." :type '(choice (function-item :tag "plain" message-insert-citation-line) - (function-item :tag "formatted" message-insert-formated-citation-line) + (function-item :tag "formatted" message-insert-formatted-citation-line) (function :tag "Other")) :link '(custom-manual "(message)Insertion Variables") :group 'message-insertion) @@ -3688,14 +3688,14 @@ This function uses `mail-citation-hook' if that is non-nil." "Cite function in the standard Message manner." (message-cite-original-1 nil)) -(defun message-insert-formated-citation-line (&optional from date) - "Function that inserts a formated citation line. +(defun message-insert-formatted-citation-line (&optional from date) + "Function that inserts a formatted citation line. See `message-citation-line-format'." ;; The optional args are for testing/debugging. They will disappear later. ;; Example: ;; (with-temp-buffer - ;; (message-insert-formated-citation-line + ;; (message-insert-formatted-citation-line ;; "John Doe " ;; (current-time)) ;; (buffer-string)) diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el index 6f45b0b6fa0..0f159181026 100644 --- a/lisp/gnus/nnml.el +++ b/lisp/gnus/nnml.el @@ -539,7 +539,8 @@ non-nil.") (deffoo nnml-request-rename-group (group new-name &optional server) (nnml-possibly-change-directory group server) (let ((new-dir (nnml-group-pathname new-name nil server)) - (old-dir (nnml-group-pathname group nil server))) + (old-dir (nnml-group-pathname group nil server)) + (file-name-coding-system nnmail-pathname-coding-system)) (when (ignore-errors (make-directory new-dir t) t)