diff options
| author | Eli Zaretskii | 2019-09-28 10:25:08 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2019-09-28 10:25:08 +0300 |
| commit | 3a48ce43d37e6d7e14a51ddfc8ead9c67a1bec41 (patch) | |
| tree | f254afc6a5fec2c3b95bc49715b533f1c5558b03 | |
| parent | 10b81b269fe97afc76e1ab911046f140848719f0 (diff) | |
| download | emacs-3a48ce43d37e6d7e14a51ddfc8ead9c67a1bec41.tar.gz 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)
| -rw-r--r-- | lisp/startup.el | 5 |
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." | |||
| 510 | "/.emacs.d/")))) | 510 | "/.emacs.d/")))) |
| 511 | (if (or (file-exists-p emacs-d-dir) | 511 | (if (or (file-exists-p emacs-d-dir) |
| 512 | (if (eq system-type 'windows-nt) | 512 | (if (eq system-type 'windows-nt) |
| 513 | (directory-files (concat "~" user-name) nil | 513 | (if (file-directory-p (concat "~" user-name)) |
| 514 | "\\`[._]emacs\\(\\.elc?\\)?\\'") | 514 | (directory-files (concat "~" user-name) nil |
| 515 | "\\`[._]emacs\\(\\.elc?\\)?\\'")) | ||
| 515 | (file-exists-p (concat "~" init-file-user | 516 | (file-exists-p (concat "~" init-file-user |
| 516 | (if (eq system-type 'ms-dos) | 517 | (if (eq system-type 'ms-dos) |
| 517 | "/_emacs" | 518 | "/_emacs" |