diff options
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/gnus/gnus-registry.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/registry.el | 16 |
3 files changed, 16 insertions, 9 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 63a28266e42..762e3e7e0d0 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,10 @@ +2015-03-21 Eric Abrahamsen <eric@ericabrahamsen.net> + + * registry.el (registry-lookup-secondary, registry-full) + (registry-prune, registry-collect-prune-candidates): + * gnus-registry.el (gnus-registry-load): Use slot names rather than + initarg names in `oref' and `oset'. + 2015-03-19 Eric Abrahamsen <eric@ericabrahamsen.net> * registry.el (registry-prune): Allow registry to reach full size diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el index 1d5887dad26..f73f21694bf 100644 --- a/lisp/gnus/gnus-registry.el +++ b/lisp/gnus/gnus-registry.el @@ -335,7 +335,7 @@ This is not required after changing `gnus-registry-cache-file'." old-file-name file))) (progn (gnus-registry-read old-file-name) - (setf (oref gnus-registry-db :file) file) + (setf (oref gnus-registry-db file) file) (gnus-message 1 "Registry filename changed to %s" file)) (gnus-registry-remake-db t)))) (error diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el index e0f944addc1..e4ba0bc547f 100644 --- a/lisp/gnus/registry.el +++ b/lisp/gnus/registry.el @@ -185,8 +185,8 @@ When CREATE is not nil, create the secondary index hashtable if needed." (when create (puthash tracksym (make-hash-table :size 800 :rehash-size 2.0 :test 'equal) - (oref db :tracker)) - (gethash tracksym (oref db :tracker)))))) + (oref db tracker)) + (gethash tracksym (oref db tracker)))))) (defmethod registry-lookup-secondary-value ((db registry-db) tracksym val &optional set) @@ -282,7 +282,7 @@ This is the key count of the `data' slot." (defmethod registry-full ((db registry-db)) "Checks if registry-db THIS is full." (>= (registry-size db) - (oref db :max-size))) + (oref db max-size))) (defmethod registry-insert ((db registry-db) key entry) "Insert ENTRY under KEY into the registry-db THIS. @@ -341,11 +341,11 @@ from the front of the list are deleted first. Returns the number of deleted entries." (let ((size (registry-size db)) - (target-size (- (oref db :max-size) - (* (oref db :max-size) - (oref db :prune-factor)))) + (target-size (- (oref db max-size) + (* (oref db max-size) + (oref db prune-factor)))) candidates) - (if (> size (oref db :max-size)) + (if (> size (oref db max-size)) (progn (setq candidates (registry-collect-prune-candidates @@ -359,7 +359,7 @@ Returns the number of deleted entries." Proposes only entries without the :precious keys, and attempts to return LIMIT such candidates. If SORTFUNC is provided, sort entries first and return candidates from beginning of list." - (let* ((precious (oref db :precious)) + (let* ((precious (oref db precious)) (precious-p (lambda (entry-key) (cdr (memq (car entry-key) precious)))) (data (oref db data)) |