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

fix(lib): doom/reload-*: void-function doom-with-context

Browse source 
This macro used to be `doom-with-context`, but was renamed in the middle
of backporting f9201eb218, but these references were missed.

Fix: #6849
Amend: f9201eb218
This commit is contained in:
Henrik Lissner 2022-09-26 12:06:42 +02:00
parent 3f16c82877
commit 95bdc3b566
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/lib/config.el
View file

@ -81,7 +81,7 @@ Runs `doom-after-reload-hook' afterwards."
(interactive) (interactive)
(mapc #'require (cdr doom-incremental-packages)) (mapc #'require (cdr doom-incremental-packages))
(doom--if-compile (format "%S sync -e" doom-bin) (doom--if-compile (format "%S sync -e" doom-bin)
(doom-with-context '(reload modules) (doom-context-with '(reload modules)
(doom-run-hooks 'doom-before-reload-hook) (doom-run-hooks 'doom-before-reload-hook)
(doom-load (file-name-concat doom-user-dir doom-module-init-file) t) (doom-load (file-name-concat doom-user-dir doom-module-init-file) t)
(with-demoted-errors "PRIVATE CONFIG ERROR: %s" (with-demoted-errors "PRIVATE CONFIG ERROR: %s"
@ -106,7 +106,7 @@ line."
(interactive) (interactive)
(require 'doom-profiles) (require 'doom-profiles)
;; TODO: Make this more robust ;; TODO: Make this more robust
(doom-with-context 'reload (doom-context-with 'reload
(dolist (file (mapcar #'car doom-profile-generators)) (dolist (file (mapcar #'car doom-profile-generators))
(when (string-match-p "/[0-9]+-loaddefs[.-]" file) (when (string-match-p "/[0-9]+-loaddefs[.-]" file)
(load (doom-path doom-profile-dir doom-profile-init-dir-name file) (load (doom-path doom-profile-dir doom-profile-init-dir-name file)
@ -122,7 +122,7 @@ Doing so from within Emacs will taint your shell environment.
An envvar file contains a snapshot of your shell environment, which can be An envvar file contains a snapshot of your shell environment, which can be
imported into Emacs." imported into Emacs."
(interactive) (interactive)
(doom-with-context 'reload (doom-context-with 'reload
(let ((default-directory doom-emacs-dir)) (let ((default-directory doom-emacs-dir))
(with-temp-buffer (with-temp-buffer
(doom-load-envvars-file doom-env-file) (doom-load-envvars-file doom-env-file)