emacs-diffs
[Top][All Lists]
Advanced

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

emacs-29 401f76cc3d: Make sure 'user-emacs-directory' ends in a slash


From: Eli Zaretskii
Subject: emacs-29 401f76cc3d: Make sure 'user-emacs-directory' ends in a slash
Date: Sat, 3 Dec 2022 05:04:48 -0500 (EST)

branch: emacs-29
commit 401f76cc3d6210dd546bbb22f2ae60d529e59fbe
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Make sure 'user-emacs-directory' ends in a slash
    
    * lisp/startup.el (command-line): Make sure 'user-emacs-directory'
    has the form of a directory.
---
 lisp/startup.el | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lisp/startup.el b/lisp/startup.el
index 5e0a47d3f8..d985d57d3c 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1259,6 +1259,10 @@ please check its value")
          (setq init-file-user nil))
         ((member argi '("-init-directory"))
          (setq user-emacs-directory (or argval (pop args))
+                user-emacs-directory (if (stringp user-emacs-directory)
+                                         (file-name-as-directory
+                                          user-emacs-directory)
+                                       user-emacs-directory)
                 argval nil))
         ((member argi '("-u" "-user"))
          (setq init-file-user (or argval (pop args))



reply via email to

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