From b3810a6b6c8054311cdc432df318899b8202026e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 9 Nov 2014 23:12:37 -0800 Subject: [PATCH] * lisp/startup.el (command-line): Handle nil elements in load-path. --- lisp/ChangeLog | 4 ++++ lisp/startup.el | 1 + 2 files changed, 5 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6f981860abb..1cbb84eae41 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-11-10 Glenn Morris + + * startup.el (command-line): Handle nil elements in load-path. + 2014-11-08 Glenn Morris * 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)) -- 2.11.4.GIT