From 5e9f920ec706393fd9b3a0d260abd13259b26a0d Mon Sep 17 00:00:00 2001 From: Eric Abrahamsen Date: Mon, 30 Mar 2015 15:12:40 +0800 Subject: [PATCH] Fix registry pruning routine * lisp/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. --- lisp/registry.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lisp/registry.el b/lisp/registry.el index c8d7d85..551cee8 100644 --- a/lisp/registry.el +++ b/lisp/registry.el @@ -361,11 +361,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 + (round (- (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 -- 2.3.4