From bc3e5787b547dc8aedaa0753cc23d975ae72f19a Mon Sep 17 00:00:00 2001
From: Eric Abrahamsen <eric@ericabrahamsen.net>
Date: Sat, 21 Mar 2015 21:57:08 +0800
Subject: [PATCH] Use slot names in references to object slot values

* 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'.

Continuation of 3db33f4
---
 lisp/ChangeLog        |  7 +++++++
 lisp/gnus-registry.el |  2 +-
 lisp/registry.el      | 16 ++++++++--------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2e44b9c5d..02e65c1c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/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-registry.el b/lisp/gnus-registry.el
index 1d5887dad..f73f21694 100644
--- a/lisp/gnus-registry.el
+++ b/lisp/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/registry.el b/lisp/registry.el
index 3a4ffa2c8..c8d7d8501 100644
--- a/lisp/registry.el
+++ b/lisp/registry.el
@@ -205,8 +205,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)
@@ -302,7 +302,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.
@@ -361,11 +361,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
@@ -379,7 +379,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))
-- 
2.25.1