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

diff --cc configure.ac
Simple merge

diff --cc etc/NEWS
index a266ffe75e6de5e2e151d3e9e802a4cf59f814df,d3eafaadf1923b161061ed1055af5a4ba4c70e0d..840705d86131a37ab36d4b33f2c1048919dfa0b1
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -65,12 -59,13 +65,19 @@@ This allows the user to customize the p
  \f
  * Editing Changes in Emacs 30.1
  
 ++++
 +** Emacs now has better support for touchscreen events.
 +Many touch screen gestures are now implemented, as is support for
 +tapping buttons and opening menus.
 +
 +
+ ---
+ ** On X, Emacs now supports input methods which perform "string conversion".
+ This means an input method can now ask Emacs to delete text
+ surrounding point and replace it with something else, as well as query
+ Emacs for surrounding text.  If your input method allows you to "undo"
+ mistaken compositions, this will now work as well.
+ 
  ---
  ** New command 'kill-matching-buffers-no-ask'.
  This works like 'kill-matching-buffers', but without asking for

diff --cc lisp/image/wallpaper.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/xterm.c
Simple merge