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

Fix locality of makefile commands

Browse source
This commit is contained in:
Henrik Lissner 2018-04-04 00:01:11 -04:00
parent 0026f08e27
commit b1ddcf1787
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,5 +1,5 @@
# Ensure emacs always runs from this makefile's PWD # Ensure emacs always runs from this makefile's PWD
EMACS = emacs -q --eval "(setq noninteractive 'doom)" EMACS = emacs -q --eval "(setq user-emacs-directory default-directory load-prefer-newer t)"
DOOM = $(EMACS) --batch -l init.el DOOM = $(EMACS) --batch -l init.el
DOOMI = $(subst --batch,,$(DOOM)) DOOMI = $(subst --batch,,$(DOOM))

6
core/core.el
View file

@ -9,9 +9,7 @@ line or use --debug-init to enable this.")
;; ;;
(defvar doom-emacs-dir (defvar doom-emacs-dir
(if (eq noninteractive 'doom) (eval-when-compile (file-truename user-emacs-directory))
default-directory
(eval-when-compile (file-truename user-emacs-directory)))
"The path to this emacs.d directory.") "The path to this emacs.d directory.")
(defvar doom-core-dir (concat doom-emacs-dir "core/") (defvar doom-core-dir (concat doom-emacs-dir "core/")
@ -52,7 +50,6 @@ XDG directory conventions if ~/.config/doom exists.")
(defconst EMACS26+ (not (version< emacs-version "26"))) (defconst EMACS26+ (not (version< emacs-version "26")))
(defconst EMACS27+ (not (version< emacs-version "27"))) (defconst EMACS27+ (not (version< emacs-version "27")))
(setq user-emacs-directory doom-emacs-dir)
;;; ;;;
;; UTF-8 as the default coding system ;; UTF-8 as the default coding system
@ -71,7 +68,6 @@ XDG directory conventions if ~/.config/doom exists.")
debug-on-error (and (not noninteractive) doom-debug-mode) debug-on-error (and (not noninteractive) doom-debug-mode)
ffap-machine-p-known 'reject ; don't ping things that look like domain names ffap-machine-p-known 'reject ; don't ping things that look like domain names
idle-update-delay 2 ; update ui less often idle-update-delay 2 ; update ui less often
load-prefer-newer (or (eq noninteractive 'doom) doom-debug-mode)
;; keep the point out of the minibuffer ;; keep the point out of the minibuffer
minibuffer-prompt-properties '(read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt) minibuffer-prompt-properties '(read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt)
;; History & backup settings (save nothing, that's what git is for) ;; History & backup settings (save nothing, that's what git is for)