Commit 92bad2aa authored by Sam Steingold's avatar Sam Steingold

load-history may contain nil "filenames"

* lisp/emacs-lisp/package.el (package--list-loaded-files): Handle
`(nil ...)' elements in `load-history'.
parent a2c489ba
2014-12-17 Sam Steingold <sds@gnu.org>
* emacs-lisp/package.el (package--list-loaded-files): Handle
`(nil ...)' elements in `load-history'.
2014-12-17 Teodor Zlatanov <tzz@lifelogs.com>
* net/tramp-sh.el (tramp-histfile-override): New variable.
......
......@@ -559,12 +559,15 @@ Return the max version (as a string) if the package is held at a lower version."
"Recursively list all files in DIR which correspond to loaded features.
Returns the `file-name-sans-extension' of each file, relative to
DIR, sorted by most recently loaded last."
(let* ((history (mapcar (lambda (x) (file-name-sans-extension (car x)))
load-history))
(let* ((history (delq nil
(mapcar (lambda (x)
(let ((f (car x)))
(and f (file-name-sans-extension f))))
load-history)))
(dir (file-truename dir))
;; List all files that have already been loaded.
(list-of-conflicts
(remove
(delq
nil
(mapcar
(lambda (x) (let* ((file (file-relative-name x dir))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment