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/emacs-lisp | |
| 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/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 458bfad3279..5e8864ec73f 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -756,7 +756,8 @@ DIR, sorted by most recently loaded last." (let* ((history (delq nil (mapcar (lambda (x) (let ((f (car x))) - (and f (file-name-sans-extension f)))) + (and (stringp f) + (file-name-sans-extension f)))) load-history))) (dir (file-truename dir)) ;; List all files that have already been loaded. |