From: Yuan Fu <casouri@gmail.com>
Date: Mon, 21 Nov 2022 20:54:35 +0000 (-0800)
Subject: Merge remote-tracking branch 'savannah/master' into feature/tree-sitter
X-Git-Tag: emacs-29.0.90~1616
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aaeaa310f0391f5a5193e1a3d6e026986c4f2c0c;p=emacs.git

Merge remote-tracking branch 'savannah/master' into feature/tree-sitter
---

aaeaa310f0391f5a5193e1a3d6e026986c4f2c0c
diff --cc src/Makefile.in
index 4ee2843287d,059e6c717b4..da11e130b2a
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@ -429,25 -426,26 +429,26 @@@ ALL_CXX_CFLAGS = $(EMACS_CFLAGS) 
  
  ## lastfile must follow all files whose initialized data areas should
  ## be dumped as pure by dump-emacs.
- base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
- 	charset.o coding.o category.o ccl.o character.o chartab.o bidi.o \
- 	$(CM_OBJ) term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ) $(DBUS_OBJ) \
- 	emacs.o keyboard.o macros.o keymap.o sysdep.o \
- 	bignum.o buffer.o filelock.o insdel.o marker.o \
- 	minibuf.o fileio.o dired.o \
- 	cmds.o casetab.o casefiddle.o indent.o search.o regex-emacs.o undo.o \
- 	alloc.o pdumper.o data.o doc.o editfns.o callint.o \
- 	eval.o floatfns.o fns.o sort.o font.o print.o lread.o $(MODULES_OBJ) \
- 	syntax.o $(UNEXEC_OBJ) bytecode.o comp.o $(DYNLIB_OBJ) \
- 	process.o gnutls.o callproc.o \
- 	region-cache.o sound.o timefns.o atimer.o \
+ base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o     \
+ 	charset.o coding.o category.o ccl.o character.o chartab.o bidi.o       \
+ 	$(CM_OBJ) term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ) $(DBUS_OBJ)    \
+ 	emacs.o keyboard.o macros.o keymap.o sysdep.o 			       \
+ 	bignum.o buffer.o filelock.o insdel.o marker.o 			       \
+ 	minibuf.o fileio.o dired.o 					       \
+ 	cmds.o casetab.o casefiddle.o indent.o search.o regex-emacs.o undo.o   \
+ 	alloc.o pdumper.o data.o doc.o editfns.o callint.o 		       \
+ 	eval.o floatfns.o fns.o sort.o font.o print.o lread.o $(MODULES_OBJ)   \
+ 	syntax.o $(UNEXEC_OBJ) bytecode.o comp.o $(DYNLIB_OBJ) 		       \
+ 	process.o gnutls.o callproc.o 					       \
+ 	region-cache.o sound.o timefns.o atimer.o 			       \
  	doprnt.o intervals.o textprop.o composite.o xml.o lcms.o $(NOTIFY_OBJ) \
- 	$(XWIDGETS_OBJ) \
- 	profiler.o decompress.o \
- 	thread.o systhread.o sqlite.o treesit.o \
- 	$(if $(HYBRID_MALLOC),sheap.o) \
- 	$(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
- 	$(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ) $(JSON_OBJ) \
+ 	$(XWIDGETS_OBJ) 						       \
+ 	profiler.o decompress.o 					       \
 -	thread.o systhread.o sqlite.o 					       \
++	thread.o systhread.o sqlite.o  treesit.o			       \
+ 	itree.o 							       \
+ 	$(if $(HYBRID_MALLOC),sheap.o) 					       \
+ 	$(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ)        \
+ 	$(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ) $(JSON_OBJ) 	       \
  	$(HAIKU_OBJ) $(PGTK_OBJ)
  doc_obj = $(base_obj) $(NS_OBJC_OBJ)
  obj = $(doc_obj) $(HAIKU_CXX_OBJ)
diff --cc src/insdel.c
index b9fba4cd747,03ce59b3409..d483736c039
--- a/src/insdel.c
+++ b/src/insdel.c
@@@ -1930,14 -1856,6 +1895,12 @@@ del_range_2 (ptrdiff_t from, ptrdiff_t 
  
    check_markers ();
  
-   evaporate_overlays (from);
- 
 +#ifdef HAVE_TREE_SITTER
 +  eassert (from_byte <= to_byte);
 +  eassert (from_byte >= 0);
 +  treesit_record_change (from_byte, to_byte, from_byte);
 +#endif
 +
    return deletion;
  }