Sync.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2bacaa4..818d235 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2000-06-08 12:34:26  Urban Engberg <ue@ccieurope.com>
 
        * gnus-demon.el (gnus-demon-scan-mail): Bind nnmail-fetched-sources.

diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el
index 801c0e8..95a9c87 100644 (file)
--- a/lisp/gnus-cus.el
+++ b/lisp/gnus-cus.el
@@ -256,7 +256,9 @@ Each entry has the form (NAME TYPE DOC), where NAME is the parameter
 itself (a symbol), TYPE is the parameters type (a sexp widget), and
 DOC is a documentation string for the parameter.")
 
-(defconst gnus-extra-group-parameters nil
+(defconst gnus-extra-group-parameters
+  '((uidvalidity (string :tag "IMAP uidvalidity") "\
+Server-assigned value attached to IMAP groups, used to maintain consistency."))
   "Alist of group parameters that are not also topic parameters.
 
 Each entry has the form (NAME TYPE DOC), where NAME is the parameter

diff --git a/lisp/message.el b/lisp/message.el
index 443d2b4..c341828 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -427,7 +427,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)