]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix c-ts-mode comment indentation (bug#60270)
authorYuan Fu <casouri@gmail.com>
Wed, 11 Jan 2023 09:26:21 +0000 (01:26 -0800)
committerYuan Fu <casouri@gmail.com>
Fri, 13 Jan 2023 01:11:37 +0000 (17:11 -0800)
* lisp/progmodes/c-ts-mode.el (c-ts-mode--indent-styles): Move the
star rule up.

lisp/progmodes/c-ts-mode.el

index 5c7df4b21413e2be0287d32bf0d6e19ae2fa022f..e53ed390ba13ed84363fe49723bad72b9993649c 100644 (file)
@@ -122,11 +122,13 @@ MODE is either `c' or `cpp'."
            ((node-is "else") parent-bol 0)
            ((node-is "case") parent-bol 0)
            ((node-is "preproc_arg") no-indent)
+           ;; `c-ts-mode--looking-at-star' has to come before
+           ;; `c-ts-mode--comment-2nd-line-matcher'.
+           ((and (parent-is "comment") c-ts-mode--looking-at-star)
+            c-ts-mode--comment-start-after-first-star -1)
            (c-ts-mode--comment-2nd-line-matcher
             c-ts-mode--comment-2nd-line-anchor
             1)
-           ((and (parent-is "comment") c-ts-mode--looking-at-star)
-            c-ts-mode--comment-start-after-first-star -1)
            ((parent-is "comment") prev-adaptive-prefix 0)
            (c-ts-mode--top-level-label-matcher point-min 1)
            ((node-is "labeled_statement") parent-bol 0)