From e19b91f946a99aa812a21bbeff654569bad945d2 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 30 Jan 2023 20:25:59 +0200 Subject: [PATCH] Revert "Fix incremental build failures with tree-sitter" This reverts commit 176830fe2bb1c80ee128e515f6223cddc8b0a2ca. That commit isn't needed, since the problem was fixed in another way, in the defcustom's :set function. --- lisp/treesit.el | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lisp/treesit.el b/lisp/treesit.el index 059707b0123..d11e57fef8a 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -86,7 +86,6 @@ (declare-function treesit-search-subtree "treesit.c") (declare-function treesit-search-forward "treesit.c") -(declare-function treesit-subtree-stat "treesit.c") (declare-function treesit-induce-sparse-tree "treesit.c") (declare-function treesit-subtree-stat "treesit.c") @@ -267,14 +266,12 @@ If INCLUDE-NODE is non-nil, return NODE if it satisfies PRED." Use the first parser in the parser list if LANGUAGE is omitted. If LANGUAGE is non-nil, use the first parser for LANGUAGE in the parser list, or create one if none exists." - ;; Otherwise the incremental build is broken without tree-sitter. - (when (treesit-available-p) - (if-let ((parser - (if language - (treesit-parser-create language) - (or (car (treesit-parser-list)) - (signal 'treesit-no-parser (list (current-buffer))))))) - (treesit-parser-root-node parser)))) + (if-let ((parser + (if language + (treesit-parser-create language) + (or (car (treesit-parser-list)) + (signal 'treesit-no-parser (list (current-buffer))))))) + (treesit-parser-root-node parser))) (defun treesit-filter-child (node pred &optional named) "Return children of NODE that satisfies predicate PRED. -- 2.39.5