Synch to No Gnus 200509051616.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3042d5c..a66d478 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2005-09-05  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * message.el (message-tab-body-function): Fixed mismatched custom
+       type.
+
+       * gnus.el (gnus-group-change-level-function): Ditto.
+
+       * gnus-msg.el (gnus-outgoing-message-group):  Ditto.
+
+       * gnus-art.el (gnus-signature-limit)
+       (gnus-article-mime-part-function): Ditto.
+
 2005-09-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mml.el (mml-mode): Silence the byte compiler.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 9957a3c..bb43598 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -255,7 +255,8 @@ no signature in the buffer.  If it is a string, it will be used as a
 regexp.  If it matches, the text in question is not a signature.
 
 This can also be a list of the above values."
-  :type '(choice (integer :value 200)
+  :type '(choice (const nil)
+                (integer :value 200)
                 (number :value 4.0)
                 (function :value fun)
                 (regexp :value ".*"))
@@ -921,7 +922,8 @@ see http://www.cs.indiana.edu/picons/ftp/index.html"
 This is meant for people who want to do something automatic based
 on parts -- for instance, adding Vcard info to a database."
   :group 'gnus-article-mime
-  :type 'function)
+  :type '(choice (const nil)
+                function))
 
 (defcustom gnus-mime-multipart-functions nil
   "An alist of MIME types to functions to display them."

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index a1e69f6..40610bf 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -72,8 +72,10 @@ message in, you can set this variable to a function that checks the
 current newsgroup name and then returns a suitable group name (or list
 of names)."
   :group 'gnus-message
-  :type '(choice (string :tag "Group")
-                (function)))
+  :type '(choice (const nil)
+                (function)
+                (string :tag "Group")
+                (repeat :tag "List of groups" (string :tag "Group"))))
 
 (defcustom gnus-mailing-list-groups nil
   "*If non-nil a regexp matching groups that are really mailing lists.

diff --git a/lisp/gnus.el b/lisp/gnus.el
index afccbb0..7b1bacb 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -2418,7 +2418,8 @@ following hook:
   "Function run when a group level is changed.
 It is called with three parameters -- GROUP, LEVEL and OLDLEVEL."
   :group 'gnus-group-levels
-  :type 'function)
+  :type '(choice (const nil)
+                function))
 
 ;;; Face thingies.
 

diff --git a/lisp/message.el b/lisp/message.el
index e95020d..1ffad3f 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -7464,7 +7464,8 @@ If nil, the function bound in `text-mode-map' or `global-map' is executed."
   :version "22.1"
   :group 'message
   :link '(custom-manual "(message)Various Commands")
-  :type 'function)
+  :type '(choice (const nil)
+                function))
 
 (defun message-tab ()
   "Complete names according to `message-completion-alist'.