From: Stefan Monnier Date: Sun, 8 Mar 2015 10:01:22 +0000 (+0000) Subject: *registry.el: Use slot names rather than initarg names X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=3db33f4ceedbdbba5d08e4f0698449fbca97a51e *registry.el: Use slot names rather than initarg names --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c92b5a188..4178f61c9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -5,6 +5,15 @@ (gnus-notifications-action): Allow mark as read. (gnus-notifications-notify): Show uption to mark as read. +2015-03-07 Stefan Monnier + + * registry.el (registry-lookup-breaks-before-lexbind, registry-lookup) + (registry-search, registry-delete, registry-size, registry-insert) + (registry-reindex, registry-collect-prune-candidates): + * gnus-registry.el (gnus-registry-fixup-registry) + (gnus-registry-remove-extra-data): Use slot names rather than initarg + names in `oref' and `oset'. + 2015-02-25 Adam Sjøgren * message.el (message-insert-formatted-citation-line): Change %F to diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el index 2017ea2f8..ac903a250 100644 --- a/lisp/gnus-registry.el +++ b/lisp/gnus-registry.el @@ -276,20 +276,20 @@ This can slow pruning down. Set to nil to perform no sorting." (defun gnus-registry-fixup-registry (db) (when db - (let ((old (oref db :tracked))) - (oset db :precious + (let ((old (oref db tracked))) + (oset db precious (append gnus-registry-extra-entries-precious '())) - (oset db :max-size + (oset db max-size (or gnus-registry-max-entries most-positive-fixnum)) - (oset db :prune-factor + (oset db prune-factor (or gnus-registry-prune-factor 0.1)) - (oset db :tracked + (oset db tracked (append gnus-registry-track-extra '(mark group keyword))) - (when (not (equal old (oref db :tracked))) + (when (not (equal old (oref db tracked))) (gnus-message 9 "Reindexing the Gnus registry (tracked change)") (registry-reindex db)))) db) @@ -1242,7 +1242,7 @@ from your existing entries." (when extra (let ((db gnus-registry-db)) (registry-reindex db) - (loop for k being the hash-keys of (oref db :data) + (loop for k being the hash-keys of (oref db data) using (hash-value v) do (let ((newv (delq nil (mapcar #'(lambda (entry) (unless (member (car entry) extra) diff --git a/lisp/registry.el b/lisp/registry.el index bafb5c8f2..27133db16 100644 --- a/lisp/registry.el +++ b/lisp/registry.el @@ -173,7 +173,7 @@ (defmethod registry-lookup ((db registry-db) keys) "Search for KEYS in the registry-db THIS. Returns an alist of the key followed by the entry in a list, not a cons cell." - (let ((data (oref db :data))) + (let ((data (oref db data))) (delq nil (mapcar (lambda (k) @@ -184,7 +184,7 @@ Returns an alist of the key followed by the entry in a list, not a cons cell." (defmethod registry-lookup-breaks-before-lexbind ((db registry-db) keys) "Search for KEYS in the registry-db THIS. Returns an alist of the key followed by the entry in a list, not a cons cell." - (let ((data (oref db :data))) + (let ((data (oref db data))) (delq nil (loop for key in keys when (gethash key data) @@ -245,7 +245,7 @@ The test order is to check :all first, then :member, then :regex." (let ((all (plist-get spec :all)) (member (plist-get spec :member)) (regex (plist-get spec :regex))) - (loop for k being the hash-keys of (oref db :data) + (loop for k being the hash-keys of (oref db data) using (hash-values v) when (or ;; :all non-nil returns all @@ -261,10 +261,10 @@ The test order is to check :all first, then :member, then :regex." If KEYS is nil, use SPEC to do a search. Updates the secondary ('tracked') indices as well. With assert non-nil, errors out if the key does not exist already." - (let* ((data (oref db :data)) + (let* ((data (oref db data)) (keys (or keys (apply 'registry-search db spec))) - (tracked (oref db :tracked))) + (tracked (oref db tracked))) (dolist (key keys) (let ((entry (gethash key data))) @@ -291,8 +291,8 @@ With assert non-nil, errors out if the key does not exist already." (defmethod registry-size ((db registry-db)) "Returns the size of the registry-db object THIS. -This is the key count of the :data slot." - (hash-table-count (oref db :data))) +This is the key count of the `data' slot." + (hash-table-count (oref db data))) (defmethod registry-full ((db registry-db)) "Checks if registry-db THIS is full." @@ -304,7 +304,7 @@ This is the key count of the :data slot." Updates the secondary ('tracked') indices as well. Errors out if the key exists already." - (assert (not (gethash key (oref db :data))) nil + (assert (not (gethash key (oref db data))) nil "Key already exists in database") (assert (not (registry-full db)) @@ -312,10 +312,10 @@ Errors out if the key exists already." "registry max-size limit reached") ;; store the entry - (puthash key entry (oref db :data)) + (puthash key entry (oref db data)) ;; store the secondary indices - (dolist (tr (oref db :tracked)) + (dolist (tr (oref db tracked)) ;; for every value in the entry under that key... (dolist (val (cdr-safe (assq tr entry))) (let* ((value-keys (registry-lookup-secondary-value db tr val))) @@ -326,8 +326,8 @@ Errors out if the key exists already." (defmethod registry-reindex ((db registry-db)) "Rebuild the secondary indices of registry-db THIS." (let ((count 0) - (expected (* (length (oref db :tracked)) (registry-size db)))) - (dolist (tr (oref db :tracked)) + (expected (* (length (oref db tracked)) (registry-size db)))) + (dolist (tr (oref db tracked)) (let (values) (maphash (lambda (key v) @@ -340,7 +340,7 @@ Errors out if the key exists already." (let* ((value-keys (registry-lookup-secondary-value db tr val))) (push key value-keys) (registry-lookup-secondary-value db tr val value-keys)))) - (oref db :data)))))) + (oref db data)))))) (defmethod registry-prune ((db registry-db) &optional sortfunc) "Prunes the registry-db object DB. @@ -377,7 +377,7 @@ entries first and return candidates from beginning of list." (let* ((precious (oref db :precious)) (precious-p (lambda (entry-key) (cdr (memq (car entry-key) precious)))) - (data (oref db :data)) + (data (oref db data)) (candidates (cl-loop for k being the hash-keys of data using (hash-values v) when (notany precious-p v)