From: Eric Abrahamsen <eric@ericabrahamsen.net>
Date: Thu, 19 Mar 2015 05:37:38 +0000 (+0800)
Subject: registry.el: Fix call to cl-subseq
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=dbe7b81359e9b798fadbcff064dbd7d374860d88

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 3a3a2a9a5..2199e3942 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-19  Eric Abrahamsen  <eric@ericabrahamsen.net>
+
+	* registry.el (registry-collect-prune-candidates): Fix call to
+	cl-subseq.
+
 2015-03-11  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* registry.el (registry-db): Temporary fix old Emacsen compilation.
diff --git a/lisp/registry.el b/lisp/registry.el
index e4c37a698..a5d8239e6 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