From 1d113068206db537f062ef9a1c3f38de98797200 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 18 Dec 2014 22:47:26 +0000 Subject: [PATCH] registry.el (registry-db): Set default slot later --- lisp/ChangeLog | 5 +++++ lisp/registry.el | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d476e2a9a..5f2580199 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-18 Paul Eggert + + * registry.el (registry-db): Set default slot later. + This is because its value is not a literal integer. + 2014-12-18 Teodor Zlatanov * registry.el (registry-db): Fix default registry-db max-size. diff --git a/lisp/registry.el b/lisp/registry.el index 162e87644..f0b315420 100644 --- a/lisp/registry.el +++ b/lisp/registry.el @@ -27,7 +27,7 @@ ;; version: a float -;; max-size: an integer, default 5000000 +;; max-size: an integer, default most-positive-fixnum ;; prune-factor: a float between 0 and 1, default 0.1 @@ -110,7 +110,7 @@ :type (or null float) :documentation "The registry version.") (max-size :initarg :max-size - :initform 5000000 + ;; :initform most-positive-fixnum ;; see below :type integer :custom integer :documentation "The maximum number of registry entries.") @@ -135,6 +135,8 @@ (data :initarg :data :type hash-table :documentation "The data hashtable."))) +;; Do this separately, since defclass doesn't allow expressions in :initform. +(oset-default registry-db max-size most-positive-fixnum) (defmethod initialize-instance :BEFORE ((this registry-db) slots) "Check whether a registry object needs to be upgraded." -- 2.11.4.GIT