emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 4adb4b2ac50: Fix 'fill-paragraph' in 'yaml-ts-mode'


From: Eli Zaretskii
Subject: master 4adb4b2ac50: Fix 'fill-paragraph' in 'yaml-ts-mode'
Date: Thu, 1 Feb 2024 05:31:13 -0500 (EST)

branch: master
commit 4adb4b2ac507636a82373ed1323dabcb7ee9258d
Author: Graham Marlow <graham@mgmarlow.com>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix 'fill-paragraph' in 'yaml-ts-mode'
    
    * lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode--fill-paragraph):
    Avoid 'fill-paragraph' when outside of block_scalar or comment
    nodes.  (Bug#68781)
---
 lisp/textmodes/yaml-ts-mode.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/textmodes/yaml-ts-mode.el b/lisp/textmodes/yaml-ts-mode.el
index c0185457bc2..a8cb504ef03 100644
--- a/lisp/textmodes/yaml-ts-mode.el
+++ b/lisp/textmodes/yaml-ts-mode.el
@@ -128,7 +128,7 @@ boundaries.  JUSTIFY is passed to `fill-paragraph'."
   (save-restriction
     (widen)
     (let ((node (treesit-node-at (point))))
-      (when (string= "block_scalar" (treesit-node-type node))
+      (if (member (treesit-node-type node) '("block_scalar" "comment"))
         (let* ((start (treesit-node-start node))
                (end (treesit-node-end node))
                (start-marker (point-marker))
@@ -138,7 +138,8 @@ boundaries.  JUSTIFY is passed to `fill-paragraph'."
             (forward-line)
             (move-marker start-marker (point))
             (narrow-to-region (point) end))
-          (fill-region start-marker end justify))))))
+          (fill-region start-marker end justify))
+        t))))
 
 ;;;###autoload
 (define-derived-mode yaml-ts-mode text-mode "YAML"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]