From 893c344b4e4787949f65c842536e0a5597e537c8 Mon Sep 17 00:00:00 2001 From: Yuan Fu Date: Sat, 21 Oct 2023 21:08:44 -0700 Subject: [PATCH] Fix the use of adaptive-fill-regexp in treesit indent preset * lisp/treesit.el (treesit-simple-indent-presets): adaptive-fill-regexp don't have a capture group (the group in the default value is supposed to be a non-capture group), so don't use the group. Also, in the second diff hunk, replace looking-at with looking-at-p so it doesn't override match data that we use later. --- lisp/treesit.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lisp/treesit.el b/lisp/treesit.el index 18a6131b71d..c37e7b6b5b7 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -1217,8 +1217,10 @@ See `treesit-simple-indent-presets'.") (goto-char bol) (setq this-line-has-prefix - (and (looking-at adaptive-fill-regexp) - (match-string 1))) + (and (looking-at-p adaptive-fill-regexp) + (not (string-match-p + (rx bos (* whitespace) eos) + (match-string 0))))) (forward-line -1) (and (>= (point) comment-start-bol) @@ -1226,7 +1228,7 @@ See `treesit-simple-indent-presets'.") (looking-at adaptive-fill-regexp) ;; If previous line is an empty line, don't ;; indent. - (not (looking-at (rx (* whitespace) eol))) + (not (looking-at-p (rx (* whitespace) eol))) ;; Return the anchor. If the indenting line ;; has a prefix and the previous line also ;; has a prefix, indent to the beginning of -- 2.39.2