Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 196)

   - Update from CVS

2007-01-23  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-score.el (gnus-home-score-file, gnus-home-adapt-file): Fix
   custom choice.

   * lisp/gnus/gnus-art.el (gnus-signature-limit): Fix custom choice.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-612

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7dc3133b6324dbdd303bbfdc445bed1b1850de23..7197ca2705fdf697fa4fefc4bd7c473fd4d60225 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-23  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-score.el (gnus-home-score-file, gnus-home-adapt-file): Fix
+       custom choice.
+
+       * gnus-art.el (gnus-signature-limit): Fix custom choice.
+
 2007-01-19  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * nnsoup.el (nnsoup-directory, nnsoup-packer, nnsoup-packet-directory):

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index c3d41d6fb66d01c2462bc10c2c18f98a50bfd80b..e757406f00d43a48dcb5b4a69db0feafb5844264 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -242,7 +242,7 @@ regexp.  If it matches, the text in question is not a signature."
   :type '(choice (const nil)
                 (integer :value 200)
                 (number :value 4.0)
-                (function :value fun)
+                function
                 (regexp :value ".*"))
   :group 'gnus-article-signature)
 

diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index b658cde1df30ae2e32dea826e0d8fe567ed9d6e4..fd8fedd2011042e0ecad5c001157d7f8f451afbb 100644 (file)
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -204,10 +204,10 @@ It can be:
   :type '(choice string
                 (repeat (choice string
                                 (cons regexp (repeat file))
-                                (function :value fun)))
+                                function))
                 (function-item gnus-hierarchial-home-score-file)
                 (function-item gnus-current-home-score-file)
-                (function :value fun)))
+                function))
 
 (defcustom gnus-home-adapt-file nil
   "Variable to control where new adaptive score entries are to go.
@@ -217,8 +217,8 @@ This variable allows the same syntax as `gnus-home-score-file'."
   :type '(choice string
                 (repeat (choice string
                                 (cons regexp (repeat file))
-                                (function :value fun)))
-                (function :value fun)))
+                                function))
+                function))
 
 (defcustom gnus-default-adaptive-score-alist
   `((gnus-kill-file-mark)