Load core-os sooner & in all sessions
Indirectly fixes set-env! errors when using it from your init files.
This commit is contained in:
parent
1c4f785df1
commit
0d925cda5e
3 changed files with 7 additions and 9 deletions
|
@ -1,8 +0,0 @@
|
||||||
;;; core/autoload/os.el -*- lexical-binding: t; no-byte-compile: t -*-
|
|
||||||
|
|
||||||
;; FIXME obsolete :env
|
|
||||||
;;;###autoload
|
|
||||||
(def-setting! :env (&rest vars)
|
|
||||||
:obsolete set-env!
|
|
||||||
(when (featurep 'exec-path-from-shell)
|
|
||||||
`(exec-path-from-shell-copy-envs ,@vars)))
|
|
|
@ -15,6 +15,12 @@
|
||||||
(defmacro set-env! (&rest _vars)
|
(defmacro set-env! (&rest _vars)
|
||||||
"Inject VARS from your shell environment into Emacs.")
|
"Inject VARS from your shell environment into Emacs.")
|
||||||
|
|
||||||
|
;; FIXME obsolete :env
|
||||||
|
(def-setting! :env (&rest vars)
|
||||||
|
:obsolete set-env!
|
||||||
|
(when (featurep 'exec-path-from-shell)
|
||||||
|
`(exec-path-from-shell-copy-envs ,@vars)))
|
||||||
|
|
||||||
(cond (IS-MAC
|
(cond (IS-MAC
|
||||||
(setq mac-command-modifier 'meta
|
(setq mac-command-modifier 'meta
|
||||||
mac-option-modifier 'alt
|
mac-option-modifier 'alt
|
||||||
|
|
|
@ -342,10 +342,10 @@ to least)."
|
||||||
noninteractive)
|
noninteractive)
|
||||||
(user-error "Your package autoloads are missing! Run `bin/doom refresh' to regenerate them")))
|
(user-error "Your package autoloads are missing! Run `bin/doom refresh' to regenerate them")))
|
||||||
;; Initialize Doom core
|
;; Initialize Doom core
|
||||||
|
(require 'core-os)
|
||||||
(unless noninteractive
|
(unless noninteractive
|
||||||
(add-hook! 'emacs-startup-hook
|
(add-hook! 'emacs-startup-hook
|
||||||
#'(doom|post-init doom|display-benchmark))
|
#'(doom|post-init doom|display-benchmark))
|
||||||
(require 'core-os)
|
|
||||||
(require 'core-ui)
|
(require 'core-ui)
|
||||||
(require 'core-editor)
|
(require 'core-editor)
|
||||||
(require 'core-projects)
|
(require 'core-projects)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue