summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2022-12-03 12:21:00 +0200
committerEli Zaretskii <eliz@gnu.org>2022-12-03 12:21:00 +0200
commit11c3c54d8ade69003f441918b607f073e6fa39f1 (patch)
treeafdc4ae86959a5e17f8622a63914a8e6e7f9a0e7
parent401f76cc3d6210dd546bbb22f2ae60d529e59fbe (diff)
downloademacs-11c3c54d8ade69003f441918b607f073e6fa39f1.tar.gz
Fix handling of relative directories in "--init-directory=DIR"
* lisp/startup.el (command-line): Interpret non-absolute file names in '--init-directory' relative to the directory from which Emacs is started. (Bug#59795)
-rw-r--r--lisp/startup.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index d985d57d3c7..6270de2ace6 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1261,7 +1261,9 @@ please check its value")
(setq user-emacs-directory (or argval (pop args))
user-emacs-directory (if (stringp user-emacs-directory)
(file-name-as-directory
- user-emacs-directory)
+ (expand-file-name
+ user-emacs-directory
+ command-line-default-directory))
user-emacs-directory)
argval nil))
((member argi '("-u" "-user"))