From 73486191dfefe40d78e21f5e630b8793b5d5ff26 Mon Sep 17 00:00:00 2001 From: Yuan Fu Date: Tue, 23 Apr 2024 22:28:25 -0700 Subject: [PATCH] Make c-ts-common-comment-indent-new-line work for rust doc comment * lisp/progmodes/c-ts-common.el (c-ts-common-comment-indent-new-line): Support //! comment directives. (cherry picked from commit c8c319e0b024eb2441cda786c282a094a9cd30fb) --- lisp/progmodes/c-ts-common.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el index c06295b8a87..cc8254c5701 100644 --- a/lisp/progmodes/c-ts-common.el +++ b/lisp/progmodes/c-ts-common.el @@ -296,9 +296,10 @@ and /* */ comments. SOFT works the same as in ;; auto-fill or other smart features. (cond ;; Line starts with //, or ///, or ////... + ;; Or //! (used in rust). ((save-excursion (beginning-of-line) - (looking-at (rx "//" (group (* "/") (* " "))))) + (looking-at (rx "//" (group (* (any "/!")) (* " "))))) (let ((whitespaces (match-string 1))) (if soft (insert-and-inherit ?\n) (newline 1)) (delete-region (line-beginning-position) (point)) @@ -316,7 +317,7 @@ and /* */ comments. SOFT works the same as in ;; Line starts with *. ((save-excursion (beginning-of-line) - (looking-at (rx (group (* " ") (or "*" "|") (* " "))))) + (looking-at (rx (group (* " ") (any "*|") (* " "))))) (let ((prefix (match-string 1))) (if soft (insert-and-inherit ?\n) (newline 1)) (delete-region (line-beginning-position) (point)) -- 2.39.5