emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 3a48ce4: Fix running on MS-Windows with non-existin


From: Eli Zaretskii
Subject: [Emacs-diffs] master 3a48ce4: Fix running on MS-Windows with non-existing home directory
Date: Sat, 28 Sep 2019 03:26:03 -0400 (EDT)

branch: master
commit 3a48ce43d37e6d7e14a51ddfc8ead9c67a1bec41
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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)
---
 lisp/startup.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/startup.el b/lisp/startup.el
index 6e2094d..863e9ae 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"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]