lisp/gnus/registry.el (registry-prune): Fix registry pruning routine

2 files changed, 11 insertions, 4 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5b10d45e814..95ead23cb51 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-01  Eric Abrahamsen  <eric@ericabrahamsen.net>
+
+        * registry.el (registry-prune): Re-use `registry-full' in
+        `registry-prune'.  It's a bit of redundant work, but safer.
+        Also ensure that target-size is an integer.
+
 2015-03-31  Daiki Ueno  <ueno@gnu.org>
 
         * plstore.el (plstore--decrypt): Clear entry in
diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el
index e4ba0bc547f..96a89fca1b7 100644
--- a/lisp/gnus/registry.el
+++ b/lisp/gnus/registry.el
@@ -341,11 +341,12 @@ 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
+         (floor (- (oref db max-size)
+                   (* (oref db max-size)
+                      (oref db prune-factor)))))
         candidates)
-    (if (> size (oref db max-size))
+    (if (registry-full db)
         (progn
           (setq candidates
                 (registry-collect-prune-candidates