diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2017-12-22 15:49:57 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2017-12-22 15:49:57 +0200 |
| commit | ebe91f6026edf54d5de936d3d6b696d5c76ef705 (patch) | |
| tree | defaba0ecd843660f1bc2c0ad347d9c3dd319c27 | |
| parent | 3521efce1a9c3094e9911445a7db23f87cd3e5f4 (diff) | |
| parent | b5a5790d2075a6cfcca32c7ad0809c76582e40ff (diff) | |
| download | emacs-ebe91f6026edf54d5de936d3d6b696d5c76ef705.tar.gz | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
| -rw-r--r-- | lisp/registry.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/registry.el b/lisp/registry.el index 17dc23d68e8..3d0502a8f42 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. |