Synch to Gnus 200308070034.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f2cda0..cbe1744 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-registry.el (gnus-registry-max-entries): Fix customization
+       type.
+       * gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
+       * gnus.el (gnus-refer-article-method): Ditto.
+       * message.el (message-courtesy-message): Ditto.
+
 2003-08-06  Jesper Harder  <harder@ifa.au.dk>
 
        * gnus-art.el (gnus-header-face-alist): Fix "Newsgroups" entry.

diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index c7663f5..8b7ecaf 100644 (file)
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -78,7 +78,8 @@ Registry entries are considered empty when they have no groups."
 (defcustom gnus-registry-max-entries nil
   "Maximum number of entries in the registry, nil for unlimited."
   :group 'gnus-registry
-  :type 'integer)
+  :type '(radio (const :format "Unlimited " nil)
+               (integer :format "Maximum number: %v\n" :size 0)))
 
 ;; Function(s) missing in Emacs 20
 (when (memq nil (mapcar 'fboundp '(puthash)))

diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index 865ecdc..18d5275 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -239,7 +239,8 @@ This variable allows the same syntax as `gnus-home-score-file'."
 (defcustom gnus-adaptive-word-length-limit nil
   "*Words of a length lesser than this limit will be ignored when doing adaptive scoring."
   :group 'gnus-score-adapt
-  :type 'integer)
+  :type '(radio (const :format "Unlimited " nil)
+               (integer :format "Maximum length: %v\n" :size 0)))
 
 (defcustom gnus-ignored-adaptive-words nil
   "List of words to be ignored when doing adaptive word scoring."

diff --git a/lisp/gnus.el b/lisp/gnus.el
index dd82e1d..dc91dce 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1275,6 +1275,7 @@ It can also be a list of select methods, as well as the special symbol
 list, Gnus will try all the methods in the list until it finds a match."
   :group 'gnus-server
   :type '(choice (const :tag "default" nil)
+                (const current)
                 (const :tag "Google" (nnweb "refer" (nnweb-type google)))
                 gnus-select-method
                 (repeat :menu-tag "Try multiple"

diff --git a/lisp/message.el b/lisp/message.el
index 445b5f2..03f3f0a 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -178,7 +178,7 @@ If the string contains the format spec \"%s\", the Newsgroups
 the article has been posted to will be inserted there.
 If this variable is nil, no such courtesy message will be added."
   :group 'message-sending
-  :type 'string)
+  :type '(radio (const nil) (string :size 0)))
 
 (defcustom message-ignored-bounced-headers
   "^\\(Received\\|Return-Path\\|Delivered-To\\):"