]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix the use of adaptive-fill-regexp in treesit indent preset
authorYuan Fu <casouri@gmail.com>
Sun, 22 Oct 2023 04:08:44 +0000 (21:08 -0700)
committerYuan Fu <casouri@gmail.com>
Sun, 22 Oct 2023 04:12:59 +0000 (21:12 -0700)
* 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

index 18a6131b71d5cc7d083768addf64dd4029d6520a..c37e7b6b5b77ddd9288c254b96f55543090d64f6 100644 (file)
@@ -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