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

diff --cc configure.ac
Simple merge

diff --cc doc/lispref/modes.texi
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lisp/cus-theme.el
Simple merge

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/progmodes/python.el
Simple merge

diff --cc lisp/progmodes/sh-script.el
Simple merge

diff --cc lisp/textmodes/css-mode.el
Simple merge

diff --cc src/Makefile.in
index 4ee2843287d7317a9c1f44d8fe5284c388a2f4ab,059e6c717b45a60a786b0fb8f5609cc06a7ebb2b..da11e130b2acb966e168d0e3c540df6b968a61d6
--- 1/src/Makefile.in
--- 2/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/alloc.c
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/buffer.h
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/insdel.c
index b9fba4cd7473d942e2107b61a1d5179a4c83cc7c,03ce59b34099909d3b5394ca93c4e72cbec0c8df..d483736c039af0027d73e01ac2a0c6db87120bbc
--- 1/src/insdel.c
--- 2/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;
  }
  

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/search.c
Simple merge