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/loadhist.el | |
parent | cb95d771a230716562b359c6a49e8ae1b822af14 (diff) | |
download | emacs-8eb94161b3419f3dd345871928ea37d986791963.tar.gz emacs-8eb94161b3419f3dd345871928ea37d986791963.tar.bz2 emacs-8eb94161b3419f3dd345871928ea37d986791963.zip |
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/loadhist.el')
-rw-r--r-- | lisp/loadhist.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/loadhist.el b/lisp/loadhist.el index 5070a00aaf5..4e5d8e0f38d 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -96,7 +96,8 @@ A library name is equivalent to the file name that `load-library' would load." (let ((provides (file-provides file)) (dependents nil)) (dolist (x load-history dependents) - (when (file-set-intersect provides (file-requires (car x))) + (when (and (stringp (car x)) + (file-set-intersect provides (file-requires (car x)))) (push (car x) dependents))))) (defun read-feature (prompt &optional loaded-p) |