diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-03-01 11:44:52 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-03-01 11:44:52 +0200 |
| commit | 8eb94161b3419f3dd345871928ea37d986791963 (patch) | |
| tree | 0f0d5f78d2e90d413bc7d92de49cce6b80892d4c /lisp/apropos.el | |
| parent | cb95d771a230716562b359c6a49e8ae1b822af14 (diff) | |
| download | emacs-8eb94161b3419f3dd345871928ea37d986791963.tar.gz | |
Be more defensive regarding elements of 'load-history'
* lisp/loadhist.el (file-dependents):
* lisp/apropos.el (apropos-library):
* lisp/help-fns.el (help-fns--autoloaded-p, help--loaded-p):
* lisp/emacs-lisp/package.el (package--list-loaded-files):
Don't assume 'load-history' elements must have a string as their
'car'. (Bug#34462)
Diffstat (limited to 'lisp/apropos.el')
| -rw-r--r-- | lisp/apropos.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/apropos.el b/lisp/apropos.el index 6614645f74e..1b86f5bcde3 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -681,7 +681,7 @@ the output includes key-bindings of commands." (re (concat "\\(?:\\`\\|[\\/]\\)" (regexp-quote file) "\\(\\.\\|\\'\\)"))) (while (and lh (null lh-entry)) - (if (and (caar lh) (string-match re (caar lh))) + (if (and (stringp (caar lh)) (string-match re (caar lh))) (setq lh-entry (car lh)) (setq lh (cdr lh))))) (unless lh-entry (error "Unknown library `%s'" file))) |