emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Append slash to DOOMLOCALDIR & DOOMDIR

Browse source 
If needed.
This commit is contained in:
Henrik Lissner 2019-10-29 22:36:51 -04:00
parent 1d09e4655a
commit 63dfd298ca
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/core.el
View file

@ -53,7 +53,8 @@ decrease this. If you experience stuttering, increase this.")
"The root directory for Doom's modules. Must end with a slash.") "The root directory for Doom's modules. Must end with a slash.")
(defvar doom-local-dir (defvar doom-local-dir
(or (getenv "DOOMLOCALDIR") (if-let (localdir (getenv "DOOMLOCALDIR"))
(file-name-as-directory localdir)
(concat doom-emacs-dir ".local/")) (concat doom-emacs-dir ".local/"))
"Root directory for local storage. "Root directory for local storage.
@ -76,13 +77,14 @@ Use this for files that change often, like cache files. Must end with a slash.")
"Where Doom's documentation files are stored. Must end with a slash.") "Where Doom's documentation files are stored. Must end with a slash.")
(defvar doom-private-dir (defvar doom-private-dir
(or (getenv "DOOMDIR") (if-let (doomdir (getenv "DOOMDIR"))
(let ((xdg-path (file-name-as-directory doomdir)
(or (let ((xdgdir
(expand-file-name "doom/" (expand-file-name "doom/"
(or (getenv "XDG_CONFIG_HOME") (or (getenv "XDG_CONFIG_HOME")
"~/.config")))) "~/.config"))))
(if (file-directory-p xdg-path) xdg-path)) (if (file-directory-p xdgdir) xdgdir))
"~/.doom.d/") "~/.doom.d/"))
"Where your private configuration is placed. "Where your private configuration is placed.
Defaults to ~/.config/doom, ~/.doom.d or the value of the DOOMDIR envvar; Defaults to ~/.config/doom, ~/.doom.d or the value of the DOOMDIR envvar;