From 9ba69c8e626ea2b4aedfc74b143f8625db0bee46 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Mon, 15 Jul 2024 10:50:21 +0100 Subject: [PATCH] fix(language/toml): switch back to conf-toml-mode --- modules/languages/siren-toml.el | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/modules/languages/siren-toml.el b/modules/languages/siren-toml.el index 6fd67e8f..649ea2fb 100644 --- a/modules/languages/siren-toml.el +++ b/modules/languages/siren-toml.el @@ -8,21 +8,24 @@ (require 'siren-prog-mode) -;; Requires Emacs 29.x or later for built-in treesit support. -(if (fboundp 'toml-ts-mode) - (use-package toml-ts-mode - :straight (:type built-in) - :mode "\\.toml\\'" "Cargo\\.lock\\'" - :hook - (toml-ts-mode . siren-toml-mode-setup) - :preface - (require 'siren-treesit) - :config - (siren-treesit-auto-ensure-grammar 'toml)) - (use-package conf-toml-mode - :straight (:type built-in) - :mode "\\.toml\\'" "Cargo\\.lock\\'" - :hook (conf-toml-mode . siren-toml-mode-setup))) +;; TODO: Revisit toml-ts-mode at some point the future. It's a bit buggy at the +;; moment. +;; +;; (if (fboundp 'toml-ts-mode) +;; (use-package toml-ts-mode +;; :straight (:type built-in) +;; :mode "\\.toml\\'" "Cargo\\.lock\\'" +;; :hook +;; (toml-ts-mode . siren-toml-mode-setup) +;; :preface +;; (require 'siren-treesit) +;; :config +;; (siren-treesit-auto-ensure-grammar 'toml))) + +(use-package conf-toml-mode + :straight (:type built-in) + :mode "\\.toml\\'" "Cargo\\.lock\\'" + :hook (conf-toml-mode . siren-toml-mode-setup)) (defun siren-toml-mode-setup () "Default tweaks for `toml-mode'."