awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-01 12:17:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove doom-bin-dir

Browse Source 
Or rather, moves its into lib/config.el, which is the only place that
uses it.
This commit is contained in:
Henrik Lissner
2024-12-07 17:56:47 -05:00
parent a06287cc23
commit 881eea137f
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/doom.el
View File

@ -272,12 +272,6 @@ where the module's group and name was deduced from the first and second level of
directories. For example: if $DOOMDIR/modules/ is an entry, a
$DOOMDIR/modules/lang/ruby/ directory represents a ':lang ruby' module.")
(defvar doom-bin-dir (expand-file-name "bin/" doom-emacs-dir)
"Where Doom's executables are stored.
Defaults to $EMACSDIR/bin, where $EMACSDIR is `doom-emacs-dir'. Must end in a
slash.")
;; DEPRECATED: .local will be removed entirely in 3.0
(defvar doom-local-dir
(if-let* ((localdir (getenv-internal "DOOMLOCALDIR")))

7
lisp/lib/config.el
View File

@ -28,9 +28,10 @@
(defmacro doom--if-compile (command on-success &optional on-failure)
(declare (indent 2))
`(let ((doom-bin "doom")
(default-directory doom-emacs-dir)
(exec-path (cons doom-bin-dir exec-path)))
`(let* ((doom-bin "doom")
(doom-bin-dir (expand-file-name "bin/" doom-emacs-dir))
(default-directory doom-emacs-dir)
(exec-path (cons doom-bin-dir exec-path)))
(when (and (featurep :system 'windows)
(string-match-p "cmdproxy.exe$" shell-file-name))
(unless (executable-find "pwsh")