Commit b2ee3a27 authored by Glenn Morris's avatar Glenn Morris
Browse files

* lisp/startup.el (command-line): Handle altered user-emacs-directory

in load-path warning.

Fixes: debbugs:18512
parent 07e80dac
2014-10-04 Glenn Morris <rgm@gnu.org>
* startup.el (command-line):
Handle altered user-emacs-directory in load-path warning. (Bug#18512)
2014-10-04 Martin Rudalics <rudalics@gmx.at>
 
* window.el (window-full-height-p): Make it behave correctly for
......
......@@ -1286,7 +1286,11 @@ the `--debug-init' option to view a complete error backtrace."
(let (warned)
(dolist (dir load-path)
(and (not warned)
(string-match-p "/[._]emacs\\.d/?\\'" dir)
(string-match-p
(format "/%s/?\\'"
(regexp-quote
(file-name-nondirectory
(directory-file-name user-emacs-directory)))) dir)
(string-equal (file-name-as-directory (expand-file-name dir))
(expand-file-name user-emacs-directory))
(setq warned t)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment