From d7a0267c8d6be2a9885de797b25ec8f4a61b8895 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 21 Jan 2007 03:53:13 +0000 Subject: Add 2007 to copyright years. --- lisp/gnus/gnus-art.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/gnus/gnus-art.el') diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 9160f6f5002..c3d41d6fb66 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -1,7 +1,7 @@ ;;; gnus-art.el --- article mode commands for Gnus ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. +;; 2005, 2006, 2007 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news -- cgit v1.2.3 From b28080e33a9255254cfb7f6772704387202d9a8a Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Wed, 24 Jan 2007 07:13:07 +0000 Subject: Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 196) - Update from CVS 2007-01-23 Reiner Steib * 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 --- lisp/gnus/ChangeLog | 7 +++++++ lisp/gnus/gnus-art.el | 2 +- lisp/gnus/gnus-score.el | 8 ++++---- 3 files changed, 12 insertions(+), 5 deletions(-) (limited to 'lisp/gnus/gnus-art.el') diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 7dc3133b632..7197ca2705f 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,10 @@ +2007-01-23 Reiner Steib + + * 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 * nnsoup.el (nnsoup-directory, nnsoup-packer, nnsoup-packet-directory): diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index c3d41d6fb66..e757406f00d 100644 --- 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 b658cde1df3..fd8fedd2011 100644 --- 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) -- cgit v1.2.3