mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

lisp/gnus/{registry.el,gnus-registry.el}: Use slot names in references to object slot values

Browse source
This commit is contained in:
Eric Abrahamsen 2015-03-21 23:59:30 +00:00 • committed by Katsumi Yamaoka
parent ad80180d0f
commit 6e1fac9bc7
3 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/gnus/ChangeLog
View file

@ -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

2
lisp/gnus/gnus-registry.el
View file

@ -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

16
lisp/gnus/registry.el
View file

@ -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))