Merge remote-tracking branch 'origin/master' into feature/android

1 files changed, 29 insertions, 0 deletions

diff --git a/src/editfns.c b/src/editfns.c
index e72d86d84d0..8164316aabe 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -59,6 +59,11 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #ifdef WINDOWSNT
 # include "w32common.h"
 #endif
+
+#ifdef HAVE_TREE_SITTER
+#include "treesit.h"
+#endif
+
 static void update_buffer_properties (ptrdiff_t, ptrdiff_t);
 static Lisp_Object styled_format (ptrdiff_t, Lisp_Object *, bool);
 
@@ -2399,6 +2404,14 @@ Both characters must have the same length of multi-byte form.  */)
               if (NILP (noundo))
                 record_change (pos, 1);
               for (i = 0; i < len; i++) *p++ = tostr[i];
+
+#ifdef HAVE_TREE_SITTER
+              /* In the previous branch, replace_range() notifies
+                 changes to tree-sitter, but in this branch, we
+                 modified buffer content manually, so we need to
+                 notify tree-sitter manually.  */
+              treesit_record_change (pos_byte, pos_byte + len, pos_byte + len);
+#endif
             }
           last_changed =  pos + 1;
         }
@@ -2598,6 +2611,15 @@ It returns the number of characters changed.  */)
                     *p++ = *str++;
                   signal_after_change (pos, 1, 1);
                   update_compositions (pos, pos + 1, CHECK_BORDER);
+
+#ifdef HAVE_TREE_SITTER
+                  /* In the previous branch, replace_range() notifies
+                     changes to tree-sitter, but in this branch, we
+                     modified buffer content manually, so we need to
+                     notify tree-sitter manually.  */
+                  treesit_record_change (pos_byte, pos_byte + len,
+                                         pos_byte + len);
+#endif
                 }
               characters_changed++;
             }
@@ -4771,6 +4793,13 @@ ring.  */)
       adjust_markers_bytepos (start1, start1_byte, end2, end2_byte, 0);
     }
 
+#ifdef HAVE_TREE_SITTER
+  /* I don't think it's common to transpose two far-apart regions, so
+     amalgamating the edit into one should be fine.  This is what the
+     signal_after_change below does, too.  */
+  treesit_record_change (start1_byte, end2_byte, end2_byte);
+#endif
+
   signal_after_change (start1, end2 - start1, end2 - start1);
   return Qnil;
 }