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

Don't inline DOOMDIR in doom-private-dir

Browse source 
Breaks DOOMDIR when config is byte-compiled, as mentioned in #900
This commit is contained in:
Henrik Lissner 2018-09-19 18:18:28 -04:00
parent fd7f498858
commit cc28aacecb
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/core.el
View file

@ -57,14 +57,14 @@ Use this for files that change often, like cache files.")
"Where the Doom manual is stored.") "Where the Doom manual is stored.")
(defvar doom-private-dir (defvar doom-private-dir
(eval-when-compile (or (getenv "DOOMDIR")
(or (getenv "DOOMDIR") (eval-when-compile
(let ((xdg-path (let ((xdg-path
(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 xdg-path) xdg-path)))
"~/.doom.d/")) "~/.doom.d/")
"Where your private customizations are placed. Must end in a slash. Respects "Where your private customizations are placed. Must end in a slash. Respects
XDG directory conventions if ~/.config/doom exists.") XDG directory conventions if ~/.config/doom exists.")