Merge from emacs-24; up to 117698

[gnu-emacs] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index a1d1c3120fb1604f2b5cba11993cd641ecd393f4..c04b16c43c460e662b24228b1065ffd00d37429b 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1286,6 +1286,7 @@ the `--debug-init' option to view a complete error backtrace."
   (let (warned)
     (dolist (dir load-path)
       (and (not warned)
+          (stringp dir)
           (string-equal (file-name-as-directory (expand-file-name dir))
                         (expand-file-name user-emacs-directory))
           (setq warned t)