emacs-diffs
[Top][All Lists]
Advanced

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

master 502e861af7: Don't create HOME if it doesn't exist


From: Lars Ingebrigtsen
Subject: master 502e861af7: Don't create HOME if it doesn't exist
Date: Sun, 26 Jun 2022 08:35:05 -0400 (EDT)

branch: master
commit 502e861af75e32152346f17f034c92a0550ccea3
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Don't create HOME if it doesn't exist
    
    * lisp/files.el (locate-user-emacs-file): Don't create HOME if it
    doesn't exist (bug#47298).  This returns us to Emacs 26.3
    behaviour here.
---
 lisp/files.el | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lisp/files.el b/lisp/files.el
index a804f0088e..cc38f4e921 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1115,10 +1115,17 @@ directory if it does not exist."
             (if (file-directory-p user-emacs-directory)
                 (or (file-accessible-directory-p user-emacs-directory)
                     (setq errtype "access"))
-              (with-file-modes ?\700
-                (condition-case nil
-                    (make-directory user-emacs-directory t)
-                  (error (setq errtype "create")))))
+               ;; We don't want to create HOME if it doesn't exist.
+               (if (and (not (file-exists-p "~"))
+                        (string-prefix-p
+                         (expand-file-name "~")
+                         (expand-file-name user-emacs-directory)))
+                   (setq errtype "create")
+                 ;; Create `user-emacs-directory'.
+                (with-file-modes ?\700
+                  (condition-case nil
+                      (make-directory user-emacs-directory t)
+                    (error (setq errtype "create"))))))
             (when (and errtype
                        user-emacs-directory-warning
                        (not (get 'user-emacs-directory-warning 'this-session)))



reply via email to

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