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

edfdb22f · Glenn Morris · 03400ec3 · edfdb22f · edfdb22f
Commit edfdb22f authored Nov 09, 2014 by Glenn Morris
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

lisp/ChangeLog lisp/ChangeLog +4 -0

lisp/startup.el lisp/startup.el +1 -0

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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):

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