Handle the case where EMACSDIR has no trailing slash
This commit is contained in:
parent
8f8d796ecd
commit
805976b8bd
1 changed files with 4 additions and 1 deletions
5
bin/doom
5
bin/doom
|
@ -12,7 +12,10 @@
|
||||||
(let* ((loaddir (file-name-directory (file-truename load-file-name)))
|
(let* ((loaddir (file-name-directory (file-truename load-file-name)))
|
||||||
(emacsdir (getenv "EMACSDIR"))
|
(emacsdir (getenv "EMACSDIR"))
|
||||||
(user-emacs-directory
|
(user-emacs-directory
|
||||||
(abbreviate-file-name (or emacsdir (expand-file-name "../" loaddir)))))
|
(abbreviate-file-name
|
||||||
|
(if emacsdir
|
||||||
|
(file-name-as-directory emacsdir)
|
||||||
|
(expand-file-name "../" loaddir)))))
|
||||||
|
|
||||||
;;
|
;;
|
||||||
(load (expand-file-name "core/core.el" user-emacs-directory) nil t)
|
(load (expand-file-name "core/core.el" user-emacs-directory) nil t)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue