Remove X-Gnus headers when forward.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4ce825..818d235 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-10 09:33:36  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-forward): Remove show-mml condition.
+       (message-forward-ignored-headers): Remove X-Gnus headers.
+
 2000-06-08  Simon Josefsson  <simon@josefsson.org>
 
        * gnus-cus.el (gnus-extra-group-parameters): Add uidvalidity.

diff --git a/lisp/message.el b/lisp/message.el
index cb258e3..a2a6156 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -320,7 +320,7 @@ The provided functions are:
   :group 'message-interface
   :type 'regexp)
 
-(defcustom message-forward-ignored-headers "Content-Transfer-Encoding"
+(defcustom message-forward-ignored-headers "^Content-Transfer-Encoding:\\|^X-Gnus"
   "*All headers that match this regexp will be deleted when forwarding a message."
   :group 'message-forwarding
   :type '(choice (const :tag "None" nil)
@@ -4080,9 +4080,7 @@ Optional DIGEST will use digest to forward."
            (narrow-to-region (point) 
                              (or (search-forward "\n\n" nil t) (point)))
            (delete-region (point-min) (point-max)))
-       (when (and (or message-forward-show-mml
-                      (not message-forward-as-mime))
-                  (not current-prefix-arg)
+       (when (and (not current-prefix-arg)
                   message-forward-ignored-headers)
          (save-restriction
            (narrow-to-region b e)