From 50e87a68f4778b2dc1425d4bbe8d27e4ed8f9f4e Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 2 Dec 2004 08:29:23 +0000 Subject: [PATCH] Synch to No Gnus 200412020825. --- lisp/ChangeLog | 11 +++++++++++ lisp/message.el | 5 ++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b976013..5554b4b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2004-12-02 Katsumi Yamaoka + + * message.el (message-forward-make-body-mml): Remove headers + according to message-forward-ignored-headers if a message is + decoded. + +2004-12-02 Romain Francoise + + * message.el (message-forward-make-body-plain): Always remove + headers according to message-forward-ignored-headers. + 2004-12-01 Teodor Zlatanov * spam.el (spam-summary-prepare-exit): remove the diff --git a/lisp/message.el b/lisp/message.el index f2f2243..e27c770 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -6953,8 +6953,7 @@ Optional NEWS will use news to forward instead of mail." (setq e (point)) (insert "\n-------------------- End of forwarded message --------------------\n") - (when (and (not current-prefix-arg) - message-forward-ignored-headers) + (when message-forward-ignored-headers (save-restriction (narrow-to-region b e) (goto-char b) @@ -7000,7 +6999,7 @@ Optional NEWS will use news to forward instead of mail." (goto-char (point-max)))) (setq e (point)) (insert "<#/mml>\n") - (when (and (not current-prefix-arg) + (when (and (not message-forward-decoded-p) message-forward-ignored-headers) (save-restriction (narrow-to-region b e) -- 1.7.10.4