From 83ccc32ced9213f3256843b741ba15de0c18db3b Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Thu, 10 Sep 2009 00:12:07 +0000 Subject: [PATCH] * nnrss.el (nnrss-request-article): Remove binding of default-enable-multibyte-characters that has gotten needless by the 2007-07-13 change in rfc2047-encode-message-header. * mml.el (mml-insert-multipart): Error on the message header. (mml-insert-part): Error on the message header; position point at the end of a MIME tag. --- lisp/gnus/ChangeLog | 10 ++++++++++ lisp/gnus/mml.el | 19 +++++++++++-------- lisp/gnus/nnrss.el | 2 -- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 6175492932..7a140a5ee6 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,13 @@ +2009-09-10 Katsumi Yamaoka + + * nnrss.el (nnrss-request-article): Remove binding of + default-enable-multibyte-characters that has gotten needless by + the 2007-07-13 change in rfc2047-encode-message-header. + + * mml.el (mml-insert-multipart): Error on the message header. + (mml-insert-part): Error on the message header; position point at + the end of a MIME tag. + 2009-09-09 Katsumi Yamaoka * gnus-util.el (with-no-warnings): Define it for old Emacsen. diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el index f397ef2b47..24a8880675 100644 --- a/lisp/gnus/mml.el +++ b/lisp/gnus/mml.el @@ -1387,20 +1387,23 @@ TYPE is the MIME type to use." (file-name-nondirectory file)))))) (defun mml-insert-multipart (&optional type) - (interactive (list (completing-read "Multipart type (default mixed): " - '(("mixed") ("alternative") ("digest") ("parallel") - ("signed") ("encrypted")) - nil nil "mixed"))) + (interactive (if (message-in-body-p) + (list (completing-read "Multipart type (default mixed): " + '(("mixed") ("alternative") + ("digest") ("parallel") + ("signed") ("encrypted")) + nil nil "mixed")) + (error "Use this command in the message body"))) (or type (setq type "mixed")) (mml-insert-empty-tag "multipart" 'type type) (forward-line -1)) (defun mml-insert-part (&optional type) - (interactive - (list (mml-minibuffer-read-type ""))) - (mml-insert-tag 'part 'type type 'disposition "inline") - (forward-line -1)) + (interactive (if (message-in-body-p) + (list (mml-minibuffer-read-type "")) + (error "Use this command in the message body"))) + (mml-insert-tag 'part 'type type 'disposition "inline")) (declare-function message-subscribed-p "message" ()) (declare-function message-make-mail-followup-to "message" diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index b7c9a4fa2b..b51894d9a9 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el @@ -226,8 +226,6 @@ used to render text. If it is nil, text will simply be folded.") (link (nth 2 e)) (enclosure (nth 7 e)) (comments (nth 8 e)) - ;; Enable encoding of Newsgroups header in XEmacs. - (default-enable-multibyte-characters t) (rfc2047-header-encoding-alist (if (mm-coding-system-p 'utf-8) (cons '("Newsgroups" . utf-8) -- 2.20.1