(message-forward-make-body-plain): Remove ignored

headers.  Tiny patch from Andre Srinivasan <andre@e2open.com>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27709ea..d0b4d86 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-29  Simon Josefsson  <jas@extundo.com>
+
+       * message.el (message-forward-make-body-plain): Remove ignored
+       headers.  Tiny patch from Andre Srinivasan <andre@e2open.com>.
+
 2003-10-28  Jesper Harder  <harder@ifa.au.dk>
 
        * message.el (message-forward-subject-name-subject)

diff --git a/lisp/message.el b/lisp/message.el
index 0cd7547..7d81f35 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -6016,7 +6016,15 @@ Optional DIGEST will use digest to forward."
       (goto-char (point-max)))
     (setq e (point))
     (insert
-     "\n-------------------- End of forwarded message --------------------\n")))
+     "\n-------------------- End of forwarded message --------------------\n")
+    (when (and (not current-prefix-arg)
+              message-forward-ignored-headers)
+      (save-restriction
+       (narrow-to-region b e)
+       (goto-char b)
+       (narrow-to-region (point)
+                         (or (search-forward "\n\n" nil t) (point)))
+       (message-remove-header message-forward-ignored-headers t)))))
 
 (defun message-forward-make-body-mime (forward-buffer)
   (insert "\n\n<#part type=message/rfc822 disposition=inline raw=t>\n")