Re: master d20acfe: Fix Gnus registry pruning and sorting, and rename file

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]

On 12/18/2014 07:35 AM, Andreas Schwab wrote:
> No, the problem is that 'most-positive-fixnum is a symbol

I attempted to work around the problem by installing the attached 
patch.  Please let me know if it's not right.

[-- Attachment #2: 0001-registry.el-registry-db-Set-default-slot-later.patch --]
[-- Type: text/x-patch, Size: 1746 bytes --]

From 22e70c0440941ff8f77f990292bd20d79da3f99e Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 18 Dec 2014 13:00:15 -0800
Subject: [PATCH] * registry.el (registry-db): Set default slot later.

This is because its value is not a literal integer.
---
 lisp/gnus/ChangeLog   | 5 +++++
 lisp/gnus/registry.el | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 34dd919..6f0ea0f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* registry.el (registry-db): Set default slot later.
+	This is because its value is not a literal integer.
+
 2014-12-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* mm-util.el (mm-with-unibyte-current-buffer): Mark obsolete and
diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el
index d086d64..cc18407 100644
--- a/lisp/gnus/registry.el
+++ b/lisp/gnus/registry.el
@@ -98,7 +98,7 @@
             :type (or null float)
             :documentation "The registry version.")
    (max-size :initarg :max-size
-             :initform most-positive-fixnum
+             ;; :initform most-positive-fixnum ;; see below
              :type integer
              :custom integer
              :documentation "The maximum number of registry entries.")
@@ -123,6 +123,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."
-- 
1.9.3