summaryrefslogtreecommitdiff
path: root/lisp/startup.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2019-09-28 10:25:08 +0300
committerEli Zaretskii <eliz@gnu.org>2019-09-28 10:25:08 +0300
commit3a48ce43d37e6d7e14a51ddfc8ead9c67a1bec41 (patch)
treef254afc6a5fec2c3b95bc49715b533f1c5558b03 /lisp/startup.el
parent10b81b269fe97afc76e1ab911046f140848719f0 (diff)
downloademacs-3a48ce43d37e6d7e14a51ddfc8ead9c67a1bec41.tar.gz
emacs-3a48ce43d37e6d7e14a51ddfc8ead9c67a1bec41.tar.bz2
emacs-3a48ce43d37e6d7e14a51ddfc8ead9c67a1bec41.zip
Fix running on MS-Windows with non-existing home directory
* lisp/startup.el (startup--xdg-or-homedot): Don't access a non-existent user home directory on windows-nt systems. (Bug#37536)
Diffstat (limited to 'lisp/startup.el')
-rw-r--r--lisp/startup.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 6e2094d678c..863e9aed16d 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -510,8 +510,9 @@ DIRS are relative."
"/.emacs.d/"))))
(if (or (file-exists-p emacs-d-dir)
(if (eq system-type 'windows-nt)
- (directory-files (concat "~" user-name) nil
- "\\`[._]emacs\\(\\.elc?\\)?\\'")
+ (if (file-directory-p (concat "~" user-name))
+ (directory-files (concat "~" user-name) nil
+ "\\`[._]emacs\\(\\.elc?\\)?\\'"))
(file-exists-p (concat "~" init-file-user
(if (eq system-type 'ms-dos)
"/_emacs"