[gnus git] branch master updated: m0-11-192-ge2e8ae6 =2= Allow registry to reach full size before pruning ; registry.el: Fix call to cl-subseq

       via  e2e8ae604f14d1acecb17a8213ebc3b891fd5e17 (commit)
       via  dbe7b81359e9b798fadbcff064dbd7d374860d88 (commit)
      from  1e00b407e8d568d2ecaf980815d39702ffa343fc (commit)


- Log -----------------------------------------------------------------
commit e2e8ae604f14d1acecb17a8213ebc3b891fd5e17
Author: Eric Abrahamsen <[email protected]>
Date:   Thu Mar 19 13:42:43 2015 +0800

    Allow registry to reach full size before pruning
    
    * lisp/registry.el (registry-prune): Compare current size to max-size,
      not post-prune target size.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2199e39..2e44b9c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2015-03-19  Eric Abrahamsen  <[email protected]>
 
+	* registry.el (registry-prune): Allow registry to reach full size
+	before pruning.
+
+2015-03-19  Eric Abrahamsen  <[email protected]>
+
 	* registry.el (registry-collect-prune-candidates): Fix call to
 	cl-subseq.
 
diff --git a/lisp/registry.el b/lisp/registry.el
index a5d8239..3a4ffa2 100644
--- a/lisp/registry.el
+++ b/lisp/registry.el
@@ -365,7 +365,7 @@ Returns the number of deleted entries."
 			(* (oref db :max-size)
 			   (oref db :prune-factor))))
 	candidates)
-    (if (> size target-size)
+    (if (> size (oref db :max-size))
 	(progn
 	  (setq candidates
 		(registry-collect-prune-candidates

commit dbe7b81359e9b798fadbcff064dbd7d374860d88
Author: Eric Abrahamsen <[email protected]>
Date:   Thu Mar 19 13:37:38 2015 +0800

    registry.el: Fix call to cl-subseq
    
    * lisp/registry.el (registry-collect-prune-candidates): Earlier
      versions of cl-subseq would, if you asked for a subsequence longer
      than the sequence itself, pad its result with `nil's. It now errors,
      so don't ask it to do that.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a3a2a9..2199e39 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-19  Eric Abrahamsen  <[email protected]>
+
+	* registry.el (registry-collect-prune-candidates): Fix call to
+	cl-subseq.
+
 2015-03-11  Katsumi Yamaoka  <[email protected]>
 
 	* registry.el (registry-db): Temporary fix old Emacsen compilation.
diff --git a/lisp/registry.el b/lisp/registry.el
index e4c37a6..a5d8239 100644
--- a/lisp/registry.el
+++ b/lisp/registry.el
@@ -391,7 +391,7 @@ entries first and return candidates from beginning of list."
     ;; list of entry keys.
     (when sortfunc
       (setq candidates (sort candidates sortfunc)))
-    (delq nil (cl-subseq (mapcar #'car candidates) 0 limit))))
+    (cl-subseq (mapcar #'car candidates) 0 (min limit (length candidates)))))
 
 (provide 'registry)
 ;;; registry.el ends here

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog   |   10 ++++++++++
 lisp/registry.el |    4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project