Synch to Gnus 200308070502.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28d1f20..fe581ba 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -11,6 +11,8 @@
        * message.el (message-archive-note): Ditto.
        (message-subscribed-address-file): Ditto.
        (message-user-fqdn): Ditto.
+       * spam-report.el (spam-report-gmane-regex): Ditto.
+       * spam.el (spam-blackhole-good-server-regex): Ditto.
 
        * gnus-start.el (gnus-save-killed-list): Fix last change.
        * message.el (message-courtesy-message): Ditto.

diff --git a/lisp/spam-report.el b/lisp/spam-report.el
index 0d4c3e2..288a05e 100644 (file)
--- a/lisp/spam-report.el
+++ b/lisp/spam-report.el
@@ -39,7 +39,8 @@
 If you are using spam.el, consider setting gnus-spam-process-newsgroups 
 or the gnus-group-spam-exit-processor-report-gmane group/topic parameter 
 instead."
-  :type 'regexp
+  :type '(radio (const nil)
+               (regexp :format "%t: %v\n" :size 0 :value "^nntp\+.*:gmane\."))
   :group 'spam-report)
 
 (defcustom spam-report-gmane-spam-header 

diff --git a/lisp/spam.el b/lisp/spam.el
index 6d25e7e..38ea176 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -241,7 +241,8 @@ All unmarked article in such group receive the spam mark on group entry."
 
 (defcustom spam-blackhole-good-server-regex nil
   "String matching IP addresses that should not be checked in the blackholes"
-  :type 'regexp
+  :type '(radio (const nil)
+               (regexp :format "%t: %v\n" :size 0))
   :group 'spam)
 
 (defcustom spam-face 'gnus-splash-face