2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 64124bc183d..7e962f73068 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * gnus-registry.el (gnus-registry-handle-action)
diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el
index 1c83b939d80..6ee1c316643 100644
--- a/lisp/gnus/registry.el
+++ b/lisp/gnus/registry.el
@@ -371,7 +371,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