* lisp/startup.el (command-line): Handle nil elements in load-path.

2 files changed, 5 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c3ecb7536e0..33777c5afa4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-10  Glenn Morris  <rgm@gnu.org>
+
+        * startup.el (command-line): Handle nil elements in load-path.
+
 2014-11-08  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/bytecomp.el (byte-compile-report-error):
diff --git a/lisp/startup.el b/lisp/startup.el
index 54ed53e69c8..17930b4a7b0 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1319,6 +1319,7 @@ the `--debug-init' option to view a complete error backtrace."
   (let (warned)
     (dolist (dir load-path)
       (and (not warned)
+           (stringp dir)
            (string-match-p "/[._]emacs\\.d/?\\'" dir)
            (string-equal (file-name-as-directory (expand-file-name dir))
                          (expand-file-name user-emacs-directory))