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

diff --cc etc/NEWS
index 4bc25eaffd8ab9c56878f574846e2db324931bdf,9529282f047d013015c76088abf8d7044fd04bc5..18e57dd99dfa1a3d5c6eb4d911d67b650c042c3a
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -473,26 -455,8 +473,26 @@@ hooks named after the feature name, lik
  * Lisp Changes in Emacs 30.1
  
  +++
- ** New variable 'safe-local-variable-directories'.
- This variable names directories in which Emacs will treat all
 +** 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 user option 'safe-local-variable-directories'.
+ This user option names directories in which Emacs will treat all
  directory-local variables as safe.
  
  ** New variable 'inhibit-auto-fill' to temporarily prevent auto-fill.