load-history may contain nil "filenames"

* lisp/emacs-lisp/package.el (package--list-loaded-files): Handle
`(nil ...)' elements in `load-history'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a5672e52bdb438a510f344b4b4fae3f047c46a07..87c39447d0c91f3e7a44e98831a1dc5f0472187a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 60beebd8a5f619d78ec907193e5e4de4dec417a8..199eac5cf6c6f0f2fb1c290a7323ad7fe3ecd9c3 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -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))