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

diff --cc configure.ac
index a2b24e396160b5c2fc27ff260b5c12d8fc9c2536,4590ed3506e3076af19a09819b9a8c4307457ec5..43827e07a5fa01a507a51d1dc86ae2aea6afdbb8
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -3163,30 -3184,10 +3185,30 @@@ if test "${with_json}" != no; the
    fi
  fi
  
- AC_SUBST(JSON_LIBS)
- AC_SUBST(JSON_CFLAGS)
- AC_SUBST(JSON_OBJ)
+ AC_SUBST([JSON_LIBS])
+ AC_SUBST([JSON_CFLAGS])
+ AC_SUBST([JSON_OBJ])
  
 +HAVE_TREE_SITTER=no
 +TREE_SITTER_OBJ=
 +
 +if test "${with_tree_sitter}" != "no"; then
 +   dnl TODO: we should use tree-sitter >= 0.20.2, but right now all
 +   dnl tree-sitter libraries distributed are versioned at 0.0, so for
 +   dnl the easy of development we'll just leave the version
 +   dnl requirement at 0.0 for now.
 +  EMACS_CHECK_MODULES([TREE_SITTER], [tree-sitter >= 0.0],
 +    [HAVE_TREE_SITTER=yes], [HAVE_TREE_SITTER=no])
 +  if test "${HAVE_TREE_SITTER}" = yes; then
 +    AC_DEFINE(HAVE_TREE_SITTER, 1, [Define if using tree-sitter.])
 +    TREE_SITTER_OBJ="treesit.o"
 +  fi
 +fi
 +
 +AC_SUBST(TREE_SITTER_LIBS)
 +AC_SUBST(TREE_SITTER_CFLAGS)
 +AC_SUBST(TREE_SITTER_OBJ)
 +
  NOTIFY_OBJ=
  NOTIFY_SUMMARY=no
  
@@@ -4034,26 -4056,8 +4077,26 @@@ if test "${HAVE_ZLIB}" = "yes"; the
       LIBZ=
    fi
  fi
- AC_SUBST(LIBZ)
+ AC_SUBST([LIBZ])
  
 +### Dynamic library support
 +case $opsys in
 +  cygwin|mingw32) DYNAMIC_LIB_SUFFIX=".dll" ;;
 +  darwin) DYNAMIC_LIB_SUFFIX=".dylib" ;;
 +  *) DYNAMIC_LIB_SUFFIX=".so" ;;
 +esac
 +case "${opsys}" in
 +  darwin) DYNAMIC_LIB_SECONDARY_SUFFIX='.so' ;;
 +  *) DYNAMIC_LIB_SECONDARY_SUFFIX='' ;;
 +esac
 +AC_DEFINE_UNQUOTED(DYNAMIC_LIB_SUFFIX, "$DYNAMIC_LIB_SUFFIX",
 +  [System extension for dynamic libraries])
 +AC_DEFINE_UNQUOTED(DYNAMIC_LIB_SECONDARY_SUFFIX, "$DYNAMIC_LIB_SECONDARY_SUFFIX",
 +  [Alternative system extension for dynamic libraries.])
 +
 +AC_SUBST(DYNAMIC_LIB_SUFFIX)
 +AC_SUBST(DYNAMIC_LIB_SECONDARY_SUFFIX)
 +
  ### Dynamic modules support
  LIBMODULES=
  HAVE_MODULES=no

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

diff --cc lisp/emacs-lisp/cl-preloaded.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/buffer.h
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/insdel.c
Simple merge

diff --cc src/json.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/print.c
Simple merge