From: James Cherti <contact@jamescherti.com>
Date: Tue, 24 Jun 2025 17:25:40 +0000 (-0400)
Subject: Fix yaml-ts-mode comment-start-skip to improve commenting/uncommenting
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=484296f08ff4b4a3d9aaf5587388a30ba2ab2520;p=emacs.git

Fix yaml-ts-mode comment-start-skip to improve commenting/uncommenting

* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode): Fix 'comment-start-skip'
value to resolve an issue when commenting/uncommenting using the
'comment-or-uncomment-region' function.  The previous 'comment-start-skip'
value left some "-" uncommented after commenting and uncommenting
multiple YAML indented blocks (bug#78892).

Copyright-paperwork-exempt: yes
(cherry picked from commit faae9f572ab3027c46800575a12a72c8c0eee7c1)
---

diff --git a/lisp/textmodes/yaml-ts-mode.el b/lisp/textmodes/yaml-ts-mode.el
index 58ed06de886..cadae19af1e 100644
--- a/lisp/textmodes/yaml-ts-mode.el
+++ b/lisp/textmodes/yaml-ts-mode.el
@@ -187,7 +187,7 @@ Return nil if there is no name or if NODE is not a defun node."
     ;; Comments.
     (setq-local comment-start "# ")
     (setq-local comment-end "")
-    (setq-local comment-start-skip "#+\\s-*")
+    (setq-local comment-start-skip "#+ *")
 
     ;; Indentation.
     (setq-local indent-tabs-mode nil)