mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00
Code Issues Releases Activity

load-history may contain nil "filenames"

Browse Source 
* lisp/emacs-lisp/package.el (package--list-loaded-files): Handle
`(nil ...)' elements in `load-history'.
This commit is contained in:
Sam Steingold 2014-12-17 16:57:09 -05:00
parent a2c489badd
commit 92bad2aa05
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
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.

9
lisp/emacs-lisp/package.el
View File

@ -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))