mirrors/doomemacs
1
Fork 0
mirror of https://github.com/doomemacs/doomemacs.git synced 2026-03-08 15:50:40 -07:00
Code Issues Projects Releases Wiki Activity

fix: loading site-lisp in interactive sessions

Browse source 
1b8ea91 accidentally inhibited site-lisp in all sessions.

Amend: 1b8ea914de
Fix: #8682
This commit is contained in:
Henrik Lissner 2026-02-15 13:43:44 -05:00
parent 5a9c459ac8
commit 290003ae7a
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lisp/doom.el
View file

@ -525,16 +525,6 @@ uses a straight or package.el command directly).")
;; later (see `startup--load-user-init-file@undo-hacks').
(advice-add #'tool-bar-setup :override #'ignore)
;; PERF,UX: site-lisp files are often obnoxiously noisy (emitting output
;; that isn't useful to end-users, like load messages, deprecation
;; notices, and linter warnings). Displaying these in the minibuffer
;; causes unnecessary redraws at startup which can impact startup time
;; drastically and cause flashes of white. It also pollutes the logs. I
;; suppress it here and load it myself, later, in a more controlled way
;; (see `doom-initialize').
(put 'site-run-file 'initial-value site-run-file)
(setq site-run-file nil)
(define-advice startup--load-user-init-file (:around (fn &rest args) undo-hacks 95)
"Undo Doom's startup optimizations to prep for the user's session."
(unwind-protect (apply fn args)
@ -861,19 +851,16 @@ appropriately against `noninteractive' or the `cli' context."
(require 'doom-cli)
(add-hook 'doom-cli-initialize-hook #'doom-finalize)
;; HACK: bin/doom suppresses site-lisp to silence otherwise the
;; unavoidable output it produces (like deprecation notices,
;; file-loaded messages, and linter warnings). This output can confuse
;; or alarm consumers Doom-derived CLIs, and are rarely important or
;; actionable for the end-user. Turn on debug mode if you actually
;; want to see it!
;; HACK: site-lisp files can be obnoxiously noisy (emitting output that
;; can pollute logs and isn't useful to (and may even alarm)
;; end-users, like file load messages, deprecation notices, and linter
;; warnings). bin/doom suppresses site-lisp in its shebang line so we
;; can load it here with output suppressed (unless debug mode is on).
(quiet!!
(require 'cl nil t) ; "Package cl is deprecated"
(unless site-run-file
(when-let* ((site-file (get 'site-run-file 'initial-value)))
(let ((inhibit-startup-screen inhibit-startup-screen))
(setq site-run-file site-file)
(load site-run-file t)))))))
(let ((inhibit-startup-screen inhibit-startup-screen))
(load "site-start" t))))))
;; A last ditch opportunity to undo hacks or do extra configuration before
;; the session is complicated by user config and packages.