diff options
-rw-r--r-- | early-init.el | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/early-init.el b/early-init.el index aca65d2..113f261 100644 --- a/early-init.el +++ b/early-init.el | |||
@@ -38,7 +38,7 @@ This applies values in `+emacs--startup-restore-alist'." | |||
38 | "Set VARIABLE to VALUE during startup, but restore to RESTORE. | 38 | "Set VARIABLE to VALUE during startup, but restore to RESTORE. |
39 | If RESTORE is nil or not passed, save the original value and | 39 | If RESTORE is nil or not passed, save the original value and |
40 | restore that." | 40 | restore that." |
41 | (unless nil ;after-init-time | 41 | (unless after-init-time |
42 | (setf (alist-get variable +emacs--startup-restore-alist) | 42 | (setf (alist-get variable +emacs--startup-restore-alist) |
43 | (or restore (symbol-value variable))) | 43 | (or restore (symbol-value variable))) |
44 | (set-default variable value))) | 44 | (set-default variable value))) |
@@ -51,7 +51,8 @@ restore that." | |||
51 | (+set-during-startup 'inhibit-message t) | 51 | (+set-during-startup 'inhibit-message t) |
52 | 52 | ||
53 | ;; Debug during init | 53 | ;; Debug during init |
54 | (+set-during-startup 'debug-on-error t) | 54 | (unless (eq debug-on-error 'startup) |
55 | (+set-during-startup 'debug-on-error 'init)) | ||
55 | 56 | ||
56 | ;;; Set up extra load paths and functionality | 57 | ;;; Set up extra load paths and functionality |
57 | 58 | ||
@@ -138,10 +139,11 @@ See `no-littering' for examples.") | |||
138 | ;; Setup `setup' | 139 | ;; Setup `setup' |
139 | 140 | ||
140 | (add-to-list 'setup-modifier-list 'setup-wrap-to-demote-errors) | 141 | (add-to-list 'setup-modifier-list 'setup-wrap-to-demote-errors) |
141 | ;; (advice-add 'setup :before (defun +setup-before (&rest args) | 142 | (unless (memq debug-on-error '(nil init)) |
142 | ;; (message "Setup: %S" args))) | 143 | (define-advice setup (:before (head &rest args) +setup-before) |
143 | ;; (advice-add 'setup :after (defun +setup-after (&rest args) | 144 | (message "[Setup] %S" head)) |
144 | ;; (message "Setup: %S...Done." args))) | 145 | (define-advice setup (:after (head &rest args) +setup-after) |
146 | (message "[Setup] %S...done" head))) | ||
145 | 147 | ||
146 | ;;; Appendix | 148 | ;;; Appendix |
147 | 149 | ||