aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2022-12-03 12:03:13 +0200
committerEli Zaretskii2022-12-03 12:03:13 +0200
commit401f76cc3d6210dd546bbb22f2ae60d529e59fbe (patch)
tree90018fd00715458177eccae9e58993f8da05986e
parent641ef36403b2d485bb4f500a7a6de33b6da7642c (diff)
downloademacs-401f76cc3d6210dd546bbb22f2ae60d529e59fbe.tar.gz
emacs-401f76cc3d6210dd546bbb22f2ae60d529e59fbe.zip
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.
-rw-r--r--lisp/startup.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 5e0a47d3f8f..d985d57d3c7 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1259,6 +1259,10 @@ please check its value")
1259 (setq init-file-user nil)) 1259 (setq init-file-user nil))
1260 ((member argi '("-init-directory")) 1260 ((member argi '("-init-directory"))
1261 (setq user-emacs-directory (or argval (pop args)) 1261 (setq user-emacs-directory (or argval (pop args))
1262 user-emacs-directory (if (stringp user-emacs-directory)
1263 (file-name-as-directory
1264 user-emacs-directory)
1265 user-emacs-directory)
1262 argval nil)) 1266 argval nil))
1263 ((member argi '("-u" "-user")) 1267 ((member argi '("-u" "-user"))
1264 (setq init-file-user (or argval (pop args)) 1268 (setq init-file-user (or argval (pop args))