From: Juri Linkov <juri@linkov.net>
Date: Tue, 22 Apr 2025 16:53:32 +0000 (+0300)
Subject: * lisp/treesit-x.el: Quote :parent in define-treesit-generic-mode.
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=56a8b35ab73954a3161acd60d7a27baf3ae5d55e;p=emacs.git

* lisp/treesit-x.el: Quote :parent in define-treesit-generic-mode.

(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)
---

diff --git a/lisp/treesit-x.el b/lisp/treesit-x.el
index 662c5c7ff3b..1de4b9765e8 100644
--- a/lisp/treesit-x.el
+++ b/lisp/treesit-x.el
@@ -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