From 762f2ca733a421ddd3d84d57913deeda348bb3ed Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Tue, 23 May 2023 23:11:22 +0100 Subject: [PATCH] fix(text-editing/treesit): correctly load on versions of Emacs without built-in treesit --- modules/text-editing/siren-treesit.el | 31 ++++++++++++++------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/modules/text-editing/siren-treesit.el b/modules/text-editing/siren-treesit.el index cd4d5eb..3dbff91 100644 --- a/modules/text-editing/siren-treesit.el +++ b/modules/text-editing/siren-treesit.el @@ -6,23 +6,24 @@ ;;; Code: -(require 'treesit) +(when (fboundp 'treesit-ready-p) + (require 'treesit) -(defun siren-treesit-prepare (mode source) - "Setup treesit for MODE with SOURCE." - (add-to-list 'treesit-language-source-alist source) - (let ((lang (car source))) - (advice-add mode :before `(lambda (&rest _) - (when (not (treesit-ready-p ',lang)) - (treesit-install-language-grammar ',lang)))))) + (defun siren-treesit-prepare (mode source) + "Setup treesit for MODE with SOURCE." + (add-to-list 'treesit-language-source-alist source) + (let ((lang (car source))) + (advice-add mode :before `(lambda (&rest _) + (when (not (treesit-ready-p ',lang)) + (treesit-install-language-grammar ',lang)))))) -(use-package treesit-auto - :demand t - :if (fboundp 'treesit-ready-p) - :custom - (treesit-auto-install nil) - :config - (global-treesit-auto-mode)) + (use-package treesit-auto + :demand t + :if (fboundp 'treesit-ready-p) + :custom + (treesit-auto-install nil) + :config + (global-treesit-auto-mode))) (provide 'siren-treesit) ;;; siren-treesit.el ends here