From fad4acb570b24107b573ec75a32811d26b6fb6b6 Mon Sep 17 00:00:00 2001 From: Adam Goldsmith Date: Thu, 22 Aug 2024 01:39:33 -0400 Subject: [PATCH] Configure treesit-auto before combobulate to avoid overwriting hooks --- .emacs.d/init.el | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 04de75c..f2aebd4 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1135,6 +1135,15 @@ :autoload smali-mode :mode "\\.smali\\'") +(use-package treesit-auto :demand :if (package-installed-p 'treesit-auto) + :config + (setq treesit-auto-install 'prompt) + (treesit-auto-add-to-auto-mode-alist 'all) + (global-treesit-auto-mode t) + + ;; Awful hack to avoid changing a bunch of things right now + (setq python-ts-mode-hook python-mode-hook)) + (use-package combobulate :demand :vc (:fetcher github :repo mickeynp/combobulate) :hook ((python-ts-mode . combobulate-mode) @@ -1167,15 +1176,6 @@ (setf (car (alist-get 'isort apheleia-formatters)) '(pet-executable-find "isort")))) -(use-package treesit-auto :demand :if (package-installed-p 'treesit-auto) - :config - (setq treesit-auto-install 'prompt) - (treesit-auto-add-to-auto-mode-alist 'all) - (global-treesit-auto-mode t) - - ;; Awful hack to avoid changing a bunch of things right now - (setq python-ts-mode-hook python-mode-hook)) - ;;; Local Variables (add-to-list 'safe-local-eval-forms '(outline-hide-body)) ;; Local Variables: