diff options
| author | Paul Eggert | 2014-12-18 13:00:15 -0800 |
|---|---|---|
| committer | Paul Eggert | 2014-12-18 13:00:42 -0800 |
| commit | 777c8235f118fa9aec2465b61cca0bdc220fd419 (patch) | |
| tree | 0e252fe3e9155e9a8deec0c49db604e32723b05b | |
| parent | 17589518728e247e7574e9b61502c3ff5cf9dc67 (diff) | |
| download | emacs-777c8235f118fa9aec2465b61cca0bdc220fd419.tar.gz emacs-777c8235f118fa9aec2465b61cca0bdc220fd419.zip | |
* registry.el (registry-db): Set default slot later.
This is because its value is not a literal integer.
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/registry.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 34dd9191512..6f0ea0f57de 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-12-18 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * registry.el (registry-db): Set default slot later. | ||
| 4 | This is because its value is not a literal integer. | ||
| 5 | |||
| 1 | 2014-12-18 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-12-18 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * mm-util.el (mm-with-unibyte-current-buffer): Mark obsolete and | 8 | * mm-util.el (mm-with-unibyte-current-buffer): Mark obsolete and |
diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el index d086d642772..cc1840762cb 100644 --- a/lisp/gnus/registry.el +++ b/lisp/gnus/registry.el | |||
| @@ -98,7 +98,7 @@ | |||
| 98 | :type (or null float) | 98 | :type (or null float) |
| 99 | :documentation "The registry version.") | 99 | :documentation "The registry version.") |
| 100 | (max-size :initarg :max-size | 100 | (max-size :initarg :max-size |
| 101 | :initform most-positive-fixnum | 101 | ;; :initform most-positive-fixnum ;; see below |
| 102 | :type integer | 102 | :type integer |
| 103 | :custom integer | 103 | :custom integer |
| 104 | :documentation "The maximum number of registry entries.") | 104 | :documentation "The maximum number of registry entries.") |
| @@ -123,6 +123,8 @@ | |||
| 123 | (data :initarg :data | 123 | (data :initarg :data |
| 124 | :type hash-table | 124 | :type hash-table |
| 125 | :documentation "The data hashtable."))) | 125 | :documentation "The data hashtable."))) |
| 126 | ;; Do this separately, since defclass doesn't allow expressions in :initform. | ||
| 127 | (oset-default registry-db max-size most-positive-fixnum) | ||
| 126 | 128 | ||
| 127 | (defmethod initialize-instance :BEFORE ((this registry-db) slots) | 129 | (defmethod initialize-instance :BEFORE ((this registry-db) slots) |
| 128 | "Check whether a registry object needs to be upgraded." | 130 | "Check whether a registry object needs to be upgraded." |