From: Vincenzo Pupillo <v.pupillo@gmail.com>
Date: Mon, 22 Apr 2024 19:05:49 +0000 (+0200)
Subject: Cover more c-ts-common-comment-indent-new-line (bug#70520)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f9378ff660b12ef8d2019c69298b0cb5a2570f6;p=emacs.git

Cover more c-ts-common-comment-indent-new-line (bug#70520)

* lisp/progmodes/c-ts-common.el:
(c-ts-common-comment-indent-new-line): Handles the case of comments in a
comment block that begin with whitespaces.

(cherry picked from commit 1f443c277a1215ab6353c47161819af155638110)
---

diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el
index 735126e1eac..025703d7fce 100644
--- a/lisp/progmodes/c-ts-common.el
+++ b/lisp/progmodes/c-ts-common.el
@@ -317,7 +317,16 @@ and /* */ comments.  SOFT works the same as in
     (let ((prefix (match-string 1)))
       (if soft (insert-and-inherit ?\n) (newline 1))
       (delete-region (line-beginning-position) (point))
-      (insert prefix)))))
+      (insert prefix)))
+
+   ;; Line starts with whitespaces
+   ((save-excursion
+      (beginning-of-line)
+      (looking-at (rx (* " "))))
+    (let ((whitespaces (match-string 0)))
+      (if soft (insert-and-inherit ?\n) (newline 1))
+      (delete-region (line-beginning-position) (point))
+      (insert whitespaces)))))
 
 ;;; Statement indent