Mercurial > emacs
changeset 75401:22f89b72ef50
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 24 Jan 2007 07:13:07 +0000 |
| parents | e838db0a01ed |
| children | 122ece8ca23d |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-art.el lisp/gnus/gnus-score.el |
| diffstat | 3 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Wed Jan 24 07:12:55 2007 +0000 +++ b/lisp/gnus/ChangeLog Wed Jan 24 07:13:07 2007 +0000 @@ -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):
--- a/lisp/gnus/gnus-art.el Wed Jan 24 07:12:55 2007 +0000 +++ b/lisp/gnus/gnus-art.el Wed Jan 24 07:13:07 2007 +0000 @@ -242,7 +242,7 @@ :type '(choice (const nil) (integer :value 200) (number :value 4.0) - (function :value fun) + function (regexp :value ".*")) :group 'gnus-article-signature)
--- a/lisp/gnus/gnus-score.el Wed Jan 24 07:12:55 2007 +0000 +++ b/lisp/gnus/gnus-score.el Wed Jan 24 07:13:07 2007 +0000 @@ -204,10 +204,10 @@ :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 @@ :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)