Synch to No Gnus 200411252322.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9806112..65b37a1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2004-11-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * message.el (message-hidden-headers): Fix the way to avoid a bug
+       in the `repeat' widget in Emacs 21.3 or earlier.
+
+2004-11-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
        * message.el (message-hidden-headers): Default to "^References:".
        From Reiner Steib <Reiner.Steib@gmx.de>; improve customization type.
        (message-strip-forbidden-properties): Remove check for obsolete

diff --git a/lisp/message.el b/lisp/message.el
index 4748b52..b8de923 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1314,13 +1314,14 @@ starting with `not' and followed by regexps."
   :group 'message
   :link '(custom-manual "(message)Message Headers")
   :type '(choice
-         (regexp :tag "regexp" :format "%t\nRegexp: %v" :size 1)
-         (group :tag "(regexp ...)" :format "(regexp ...)\n%v" :inline t
-                (repeat :format "%v%i" (regexp :format "%t: %v\n" :size 1)))
-         (cons :tag "(not regexp ...)"
+         :format "%{%t%}: %[Value Type%] %v"
+         (regexp :menu-tag "regexp" :format "regexp\n%t: %v")
+         (repeat :menu-tag "(regexp ...)" :format "(regexp ...)\n%v%i"
+                 (regexp :format "%t: %v"))
+         (cons :menu-tag "(not regexp ...)" :format "(not regexp ...)\n%v"
                (const not)
                (repeat :format "%v%i"
-                       (regexp :format "%t: %v\n" :size 1)))))
+                       (regexp :format "%t: %v")))))
 
 (defcustom message-cite-articles-with-x-no-archive t
   "If non-nil, cite text from articles that has X-No-Archive set."