branch: elpa/haskell-ts-mode
commit c96d6861983896f2b6fcbc62719612b8efe23f16
Author: Pranshu Sharma <pran...@bauherren.ovh>
Commit: Pranshu Sharma <pran...@bauherren.ovh>

    Move the derived parent thing out of haskell-mode
---
 haskell-ts-mode.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/haskell-ts-mode.el b/haskell-ts-mode.el
index a2bbdafbc0..efd7c894bd 100644
--- a/haskell-ts-mode.el
+++ b/haskell-ts-mode.el
@@ -472,10 +472,7 @@ when `haskell-ts-prettify-words' is non-nil.")
   (setq-local treesit-font-lock-settings haskell-ts-font-lock)
   (setq-local treesit-font-lock-feature-list
               haskell-ts-font-lock-feature-list)
-  (treesit-major-mode-setup)
-  ;; derive from `haskell-mode' on emacs v30+
-  (when (functionp 'derived-mode-add-parents)
-    (derived-mode-add-parents 'haskell-ts-mode '(haskell-mode))))
+  (treesit-major-mode-setup))
 
 (defun haskell-ts--fontify-func (node face)
   (if (string= "variable" (treesit-node-type node))
@@ -554,4 +551,8 @@ If region is not active, reload the whole file."
 
 (provide 'haskell-ts-mode)
 
+;; derive from `haskell-mode' on emacs v30+
+(when (functionp 'derived-mode-add-parents)
+  (derived-mode-add-parents 'haskell-ts-mode '(haskell-mode)))
+
 ;;; haskell-ts-mode.el ends here

Reply via email to