[Emacs-diffs] master ebe91f6 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

branch: master
commit ebe91f6026edf54d5de936d3d6b696d5c76ef705
Merge: 3521efc b5a5790
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 lisp/registry.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/registry.el b/lisp/registry.el
index 17dc23d..3d0502a 100644
--- a/lisp/registry.el
+++ b/lisp/registry.el
@@ -358,11 +358,12 @@ return LIMIT such candidates.  If SORTFUNC is provided, 
sort
 entries first and return candidates from beginning of list."
   (let* ((precious (oref db precious))
         (precious-p (lambda (entry-key)
-                      (cdr (memq (car entry-key) precious))))
+                      (cdr (memq (car-safe entry-key) precious))))
         (data (oref db data))
         (candidates (cl-loop for k being the hash-keys of data
                              using (hash-values v)
-                             when (cl-notany precious-p v)
+                             when (and (listp v)
+                                        (cl-notany precious-p v))
                              collect (cons k v))))
     ;; We want the full entries for sorting, but should only return a
     ;; list of entry keys.