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

diff --cc etc/NEWS
index a63a2f837f50cc7cc6cca1610d1098d20d78b8b9,d20d9f65ac9daecab651dacb9fdb65208e4acb3c..74ad886db07439041bb2efc00041926a4aa00016
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -337,25 -319,8 +337,27 @@@ hooks named after the feature name, lik
  \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.
 +
+ ** New var 'inhibit-auto-fill' to temporarily prevent auto-fill.
+ 
  ** Functions and variables to transpose sexps
  
  +++

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/net/eww.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/xdisp.c
Simple merge