From: Yuan Fu <casouri@gmail.com>
Date: Wed, 18 Jun 2025 00:33:08 +0000 (-0700)
Subject: Remove obsolete tree-sitter type-regexp vars
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=465343854a71018bce0741743f8815d75014251c;p=emacs.git

Remove obsolete tree-sitter type-regexp vars

* lisp/treesit.el (treesit-text-type-regexp):
(treesit-sexp-type-regexp):
(treesit-sentence-type-regexp): Remove variables.

(cherry picked from commit eb3f08935630e882abfc456440d340ae72969414)
---

diff --git a/lisp/treesit.el b/lisp/treesit.el
index dae9a3bc575..14979f07887 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -2965,17 +2965,6 @@ BACKWARD and ALL are the same as in `treesit-search-forward'."
 
 ;;; Sexp functions
 
-(make-obsolete 'treesit-sexp-type-regexp
-               "`treesit-sexp-type-regexp' will be removed soon, use `treesit-thing-settings' instead." "30.1")
-
-(defvar-local treesit-sexp-type-regexp nil
-  "A regexp that matches the node type of sexp nodes.
-
-A sexp node is a node that is bigger than punctuation, and
-delimits medium sized statements in the source code.  It is,
-however, smaller in scope than sentences.  This is used by
-`treesit-forward-sexp' and friends.")
-
 (defvar-local treesit-sexp-thing nil
   "A thing that matches the sexp nodes for `forward-sexp'.
 This is used by `treesit-forward-sexp' and `treesit-forward-list'.")
@@ -3494,29 +3483,6 @@ set, Emacs also looks for definition of defun in
             (throw 'done nil)
           (setq arg (if (> arg 0) (1+ arg) (1- arg))))))))
 
-(make-obsolete 'treesit-text-type-regexp
-               "`treesit-text-type-regexp' will be removed soon, use `treesit-thing-settings' instead." "30.1")
-
-(defvar-local treesit-text-type-regexp "\\`comment\\'"
-  "A regexp that matches the node type of textual nodes.
-
-A textual node is a node that is not normal code, such as
-comments and multiline string literals.  For example,
-\"(line|block)_comment\" in the case of a comment, or
-\"text_block\" in the case of a string.  This is used by
-`prog-fill-reindent-defun' and friends.")
-
-(make-obsolete 'treesit-sentence-type-regexp
-               "`treesit-sentence-type-regexp' will be removed soon, use `treesit-thing-settings' instead." "30.1")
-
-(defvar-local treesit-sentence-type-regexp nil
-  "A regexp that matches the node type of sentence nodes.
-
-A sentence node is a node that is bigger than a sexp, and
-delimits larger statements in the source code.  It is, however,
-smaller in scope than defuns.  This is used by
-`treesit-forward-sentence' and friends.")
-
 (defun treesit-forward-sentence (&optional arg)
   "Tree-sitter `forward-sentence-function' implementation.