; Merge from master.

diff --cc configure.ac
index 0c174c6a7b5aea2aa508b2b1b2d0005d2499c8db,484ce980a52ba852cd3185e3e3554952d776f6d7..bf97dd017c5eb6e78ee32db02fe3cc6366f3a887
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -3971,8 -3956,25 +3996,18 @@@ LIBMODULES
  HAVE_MODULES=no
  MODULES_OBJ=
  NEED_DYNLIB=no
 -case $opsys in
 -  cygwin|mingw32) MODULES_SUFFIX=".dll" ;;
 -  darwin) MODULES_SUFFIX=".dylib" ;;
 -  *) MODULES_SUFFIX=".so" ;;
 -esac
 -case "${opsys}" in
 -  darwin) MODULES_SECONDARY_SUFFIX='.so' ;;
 -  *) MODULES_SECONDARY_SUFFIX='' ;;
 -esac
 +MODULES_SUFFIX="${DYNAMIC_LIB_SUFFIX}"
 +MODULES_SECONDARY_SUFFIX="${DYNAMIC_LIB_SECONDARY_SUFFIX}"
+ 
+ # pgtkterm.c uses dlsym
+ if test $window_system = pgtk; then
+   case $opsys in
+     gnu|gnu-linux)
+     LIBMODULES="-ldl"
+     ;;
+   esac
+ fi
+ 
  if test "${with_modules}" != "no"; then
    case $opsys in
      gnu|gnu-linux)

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

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

diff --cc src/Makefile.in
index 6ae55b19e164be24be71634506e28d74ddf1f37a,7d15b7afd513c0a8541029c4845f34601d8e3c01..a21af42c0b97c295ce1bf104ae75c2ff3c157d91
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -404,9 -406,9 +410,9 @@@ EMACS_CFLAGS=-Demacs $(MYCPPFLAGS) -I. 
    $(XINPUT_CFLAGS) $(WEBP_CFLAGS) $(WEBKIT_CFLAGS) $(LCMS2_CFLAGS) \
    $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
    $(HARFBUZZ_CFLAGS) $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \
 -  $(LIBSYSTEMD_CFLAGS) $(JSON_CFLAGS) $(XSYNC_CFLAGS) \
 +  $(LIBSYSTEMD_CFLAGS) $(JSON_CFLAGS) $(XSYNC_CFLAGS) $(TREE_SITTER_CFLAGS) \
    $(LIBGNUTLS_CFLAGS) $(NOTIFY_CFLAGS) $(CAIRO_CFLAGS) \
-   $(WERROR_CFLAGS) $(HAIKU_CFLAGS)
+   $(WERROR_CFLAGS) $(HAIKU_CFLAGS) $(XCOMPOSITE_CFLAGS) $(XSHAPE_CFLAGS)
  ALL_CFLAGS = $(EMACS_CFLAGS) $(WARN_CFLAGS) $(CFLAGS)
  ALL_OBJC_CFLAGS = $(EMACS_CFLAGS) \
    $(filter-out $(NON_OBJC_CFLAGS),$(WARN_CFLAGS)) $(CFLAGS) \
@@@ -563,7 -565,7 +569,7 @@@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUS
     $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(GETADDRINFO_A_LIBS) $(LCMS2_LIBS) \
     $(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) $(LIBMODULES) $(LIBSYSTEMD_LIBS) \
     $(JSON_LIBS) $(LIBGMP) $(LIBGCCJIT_LIBS) $(XINPUT_LIBS) $(HAIKU_LIBS) \
-    $(TREE_SITTER_LIBS) $(SQLITE3_LIBS)
 -   $(SQLITE3_LIBS) $(XCOMPOSITE_LIBS) $(XSHAPE_LIBS)
++   $(TREE_SITTER_LIBS) $(SQLITE3_LIBS) $(XCOMPOSITE_LIBS) $(XSHAPE_LIBS)
  
  ## FORCE it so that admin/unidata can decide whether this file is
  ## up-to-date.  Although since charprop depends on bootstrap-emacs,

diff --cc src/alloc.c
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/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/print.c
Simple merge