dev: merging from main

This commit is contained in:
Matt Nish-Lapidus 2024-04-18 11:25:17 -04:00
commit 08d20c7e62
11 changed files with 75 additions and 91 deletions

View file

@ -15,7 +15,9 @@
;; hooks, but not the body.
(add-hook! 'envrc-global-mode-hook
(defun +direnv-init-global-mode-earlier-h ()
(let ((fn #'envrc-global-mode-enable-in-buffers))
(let ((fn (if (fboundp #'envrc-global-mode-enable-in-buffers)
#'envrc-global-mode-enable-in-buffers ; Removed in Emacs 30.
#'envrc-global-mode-enable-in-buffer)))
(if (not envrc-global-mode)
(remove-hook 'change-major-mode-after-body-hook fn)
(remove-hook 'after-change-major-mode-hook fn)