Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
b2ee3a27
Commit
b2ee3a27
authored
Oct 04, 2014
by
Glenn Morris
Browse files
* lisp/startup.el (command-line): Handle altered user-emacs-directory
in load-path warning. Fixes: debbugs:18512
parent
07e80dac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/startup.el
lisp/startup.el
+5
-1
No files found.
lisp/ChangeLog
View file @
b2ee3a27
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
...
...
lisp/startup.el
View file @
b2ee3a27
...
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment