From a537d359615db259a8a2683c5cd5af4f2a1e8dad Mon Sep 17 00:00:00 2001
From: Zedhugh Chen <zedhugh@gmail.com>
Date: Mon, 4 Nov 2024 06:00:52 +0800
Subject: [PATCH] fix bug of some versions of emacs and tree-sitter environment

---
 lisp/init-package.el    | 2 +-
 lisp/init-treesit.el    | 3 +++
 lisp/init-typescript.el | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lisp/init-package.el b/lisp/init-package.el
index 7b1f22c..610a0ac 100644
--- a/lisp/init-package.el
+++ b/lisp/init-package.el
@@ -52,6 +52,6 @@ Do this recursively for subdirectories of DIR."
 ;; "compat" "transient"
 (dolist (pkg '("compat" "transient"))
   (unless (locate-library pkg)
-    (add-pkg-in-pkg-dir)))
+    (add-pkg-in-pkg-dir pkg)))
 
 (provide 'init-package)
diff --git a/lisp/init-treesit.el b/lisp/init-treesit.el
index 8e9f200..f2c01e0 100644
--- a/lisp/init-treesit.el
+++ b/lisp/init-treesit.el
@@ -4,6 +4,9 @@
   (and (fboundp 'treesit-available-p) (treesit-available-p))
   "Built-in `treesit' available.")
 
+(setq treesit-extra-load-path
+      (list (file-name-concat creature/config-dir "tree-sitter")))
+
 (when creature/treesit-available
   (unless (featurep 'treesit) (require 'treesit))
   (when (treesit-ready-p 'javascript)
diff --git a/lisp/init-typescript.el b/lisp/init-typescript.el
index c6c5ece..8563f0d 100644
--- a/lisp/init-typescript.el
+++ b/lisp/init-typescript.el
@@ -8,7 +8,7 @@
           (add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-ts-mode))
           (add-to-list 'auto-mode-alist '("\\.tsx\\'" . tsx-ts-mode)))
 
-      (add-subdirs-to-load-path (expand-file-name "optional-pkg" creature/config-dir))
+      (add-dir-and-subdirs-to-load-path (expand-file-name "optional-pkg" creature/config-dir))
       (require 'typescript-mode)
 
       (define-derived-mode typescript-tsx-mode typescript-mode "Tsx"