Synch to No Gnus 200412020825.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b976013..5554b4b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2004-12-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * 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  <romain@orebokech.com>
+
+       * message.el (message-forward-make-body-plain): Always remove
+       headers according to message-forward-ignored-headers.
+
 2004-12-01  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * spam.el (spam-summary-prepare-exit): remove the

diff --git a/lisp/message.el b/lisp/message.el
index f2f2243..e27c770 100644 (file)
--- 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)