summaryrefslogtreecommitdiff
path: root/lisp/startup.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-11-09 23:12:37 -0800
committerGlenn Morris <rgm@gnu.org>2014-11-09 23:12:37 -0800
commitedfdb22f674312389ccf5d5e37efa4d3f1516994 (patch)
treee0dcfe5cccbd304098750311baf59bcbde067541 /lisp/startup.el
parent03400ec3333041b38153e002d0a242b09a55b23b (diff)
downloademacs-edfdb22f674312389ccf5d5e37efa4d3f1516994.tar.gz
* lisp/startup.el (command-line): Handle nil elements in load-path.
Diffstat (limited to 'lisp/startup.el')
-rw-r--r--lisp/startup.el1
1 files changed, 1 insertions, 0 deletions
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))