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

diff --cc configure.ac
Simple merge

diff --cc etc/NEWS
index 840705d86131a37ab36d4b33f2c1048919dfa0b1,2d63593ff17e1e08350f15a9f18d4f6f99c38ecb..c212fb29cc6272e70a01724e3d1b41b75f1ba8ac
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -252,24 -199,52 +211,72 @@@ This user option has been obsoleted in 
  \f
  * Lisp Changes in Emacs 30.1
  
 ++++
 +** New variables describing the names of built in programs.
 +The new variables 'ctags-program-name', 'ebrowse-program-name',
 +'etags-program-name', 'hexl-program-name', 'emacsclient-program-name'
 +and 'movemail-program-name' should be used instead of "ctags",
 +"ebrowse", "etags", "hexl", and "emacsclient", when starting one of
 +these built in programs in a subprocess.
 +
 ++++
 +** 'x-popup-menu' now understands touch screen events.
 +When a 'touchscreen-begin' or 'touchscreen-end' event is passed as the
 +POSITION argument, it will behave as if that event was a mouse event.
 +
+++++
 +** New functions for handling touch screen events.
 +The new functions 'touch-screen-track-tap' and
 +'touch-screen-track-drag' handle tracking common touch screen gestures
 +from within a command.
 +
+ ** Functions and variables to transpose sexps
+ 
+ +++
+ *** New helper variable 'transpose-sexps-function'.
+ Emacs now can set this variable to customize the behavior of the
+ 'transpose-sexps' function.
+ 
+ +++
+ *** New function 'transpose-sexps-default-function'.
+ The previous implementation is moved into its own function, to be
+ bound by 'transpose-sexps-function'.
+ 
+ *** New function 'treesit-transpose-sexps'.
+ Tree-sitter now unconditionally sets 'transpose-sexps-function' for all
+ tree-sitter enabled modes.  This functionality utilizes the new
+ 'transpose-sexps-function'.
+ 
+ ** Functions and variables to move by program statements
+ 
+ *** New variable 'forward-sentence-function'.
+ Major modes can now set this variable to customize the behavior of the
+ 'forward-sentence' command.
+ 
+ *** New function 'forward-sentence-default-function'.
+ The previous implementation of 'forward-sentence' is moved into its
+ own function, to be bound by 'forward-sentence-function'.
+ 
+ *** New buffer-local variable 'treesit-sentence-type-regexp'.
+ Similarly to 'treesit-defun-type-regexp', this variable is used to
+ define "sentences" in tree-sitter enabled modes.
+ 
+ *** New function 'treesit-forward-sentence'.
+ All tree-sitter enabled modes that define 'treesit-sentence-type-regexp'
+ now set 'forward-sentence-function' to call 'treesit-forward-sentence'.
+ 
+ ** Functions and variables to move by program sexps
+ 
+ *** New buffer-local variable 'treesit-sexp-type-regexp'.
+ Similarly to 'treesit-defun-type-regexp', this variable is used to
+ define "sexps" in tree-sitter enabled modes.
+ 
+ *** New function 'treesit-forward-sexp'.
+ Tree-sitter conditionally sets 'forward-sexp-function' for major modes
+ that have defined 'treesit-sexp-type-regexp' to enable sexp-related
+ motion commands.
++>>>>>>> origin/master
+ 
  ** New or changed byte-compilation warnings
  
  ---

diff --cc lisp/startup.el
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/pdumper.c
Simple merge