]> git.eshelyaron.com Git - emacs.git/commitdiff
* lisp/treesit-x.el: Quote :parent in define-treesit-generic-mode.
authorJuri Linkov <juri@linkov.net>
Tue, 22 Apr 2025 16:53:32 +0000 (19:53 +0300)
committerEshel Yaron <me@eshelyaron.com>
Tue, 22 Apr 2025 17:58:37 +0000 (19:58 +0200)
(define-treesit-generic-mode): Support quoted symbol for parent.
(liquid-generic-ts-mode): Quote :parent like quoted all other properties.

(cherry picked from commit a7f35dc1770266ec7661c5af58611540489c5256)

lisp/treesit-x.el

index 662c5c7ff3b2a68eff971bc952f9767b45f9ad1b..1de4b9765e823df80c3db00b2556f90426e50779 100644 (file)
@@ -123,7 +123,8 @@ of `define-treesit-generic-mode'.
          (add-to-list 'auto-mode-alist (cons re ',mode)))
 
        (define-derived-mode ,mode
-         ,(or parent 'fundamental-mode)
+         ,(or (if (eq (car-safe parent) 'quote) (cadr parent) parent)
+              'fundamental-mode)
          ,(or name pretty-name)
          ,(or docstring
               (concat (or name pretty-name) " mode.\n"
@@ -214,7 +215,7 @@ of `define-treesit-generic-mode'.
   :source "https://github.com/hankthetank27/tree-sitter-liquid"
   :auto-mode "\\.liquid\\'"
   :name "Liquid"
-  :parent mhtml-ts-mode
+  :parent 'mhtml-ts-mode
 
   (setq-local treesit-range-settings
               (append treesit-range-settings