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

fix(cli): don't load subdirs.el again

Browse source 
Doom loaded subdirs.el's in `load-path`, but doesn't need to. This
normally wasn't an issue because subdirs.el files are typically
idempotent, but there is one case where it isn't: on nixpkgs, with
certain configurations on top of programs.emacs (see
NixOS/nixpkgs#267548), which will cause file-missing errors trying to
load the user's site-lisp afterwards (see #7681).

Ref: NixOS/nixpkgs#267548
Fix: #7681
Amend: 6c0b7e1530
This commit is contained in:
Henrik Lissner 2024-09-01 12:55:04 -04:00
parent 086aed32b2
commit 2bc6dd2a96
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lisp/doom-cli.el
View file

@ -30,20 +30,9 @@
;; information to the user, like deprecation notices, file-loaded messages, ;; information to the user, like deprecation notices, file-loaded messages,
;; and linter warnings. With this, that output is suppressed. ;; and linter warnings. With this, that output is suppressed.
(quiet! (quiet!
(require 'cl nil t) (require 'cl nil t) ; "Package cl is deprecated"
(unless site-run-file (unless site-run-file ; unset in doom.el
(let ((site-run-file "site-start") (when-let ((site-run-file (get 'site-run-file 'initial-value)))
(tail load-path)
(lispdir (expand-file-name "../lisp" data-directory))
dir)
(while tail
(setq dir (car tail))
(let ((default-directory dir))
(load (expand-file-name "subdirs.el") t inhibit-message t))
(unless (string-prefix-p lispdir dir)
(let ((default-directory dir))
(load (expand-file-name "leim-list.el") t inhibit-message t)))
(setq tail (cdr tail)))
(load site-run-file t inhibit-message)))) (load site-run-file t inhibit-message))))
(setq-default (setq-default