Tweak recent gnus-registry.el changes

Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg01748.html

* lisp/gnus/gnus-registry.el (gnus-registry-max-pruned-entries)
(gnus-registry-prune-factor, gnus-registry-default-sort-function):
Fix :version.
(gnus-registry-default-sort-function): Improve :type.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 64608d3bda05d111d9e1e6cdf3bbd81945981167..76683310b3e28510d66bab27840fc0246d2aeeb6 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-30  Glenn Morris  <rgm@gnu.org>
+
+       * gnus-registry.el (gnus-registry-max-pruned-entries)
+       (gnus-registry-prune-factor, gnus-registry-default-sort-function):
+       Fix :version.
+       (gnus-registry-default-sort-function): Improve :type.
+
 2015-01-29  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * nnimap.el (nnimap-request-group): Allow running this function on

diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 9cfca1290c5c7e6a10e2795dc7e84da02b5b4a72..2017ea2f826e6ef324acaa295d6d5c434993d128 100644 (file)
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -176,7 +176,8 @@ nnmairix groups are specifically excluded because they are ephemeral."
 (make-obsolete-variable 'gnus-registry-max-track-groups nil "23.4")
 (make-obsolete-variable 'gnus-registry-entry-caching nil "23.4")
 (make-obsolete-variable 'gnus-registry-trim-articles-without-groups nil "23.4")
-(make-obsolete-variable 'gnus-registry-max-pruned-entries nil "24.4")
+;; FIXME it was simply deleted.
+(make-obsolete-variable 'gnus-registry-max-pruned-entries nil "25.1")
 
 (defcustom gnus-registry-track-extra '(subject sender recipient)
   "Whether the registry should track extra data about a message.
@@ -253,21 +254,18 @@ exactly how much less.  For example, given a maximum size of
 cut the registry back to \(- 50000 \(* 50000 0.1\)\) -> 45000
 entries.  The pruning process is constrained by the presence of
 \"precious\" entries."
-  :version "24.4"
+  :version "25.1"
   :group 'gnus-registry
   :type 'float)
 
 (defcustom gnus-registry-default-sort-function
   #'gnus-registry-sort-by-creation-time
   "Sort function to use when pruning the registry.
-
-Entries which sort to the front of the list will be pruned
-first.
-
+Entries that sort to the front of the list are pruned first.
 This can slow pruning down.  Set to nil to perform no sorting."
-  :version "24.4"
+  :version "25.1"
   :group 'gnus-registry
-  :type 'symbol)
+  :type '(choice (const :tag "No sorting" nil) function))
 
 (defun gnus-registry-sort-by-creation-time (l r)
   "Sort older entries to front of list."