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

diff --cc etc/NEWS
index 673db8c8f4f7e8c45cd41c2c4c7d62f215f30ba5,3bef9d2ed2a284ea91a88a9b75e53938718928c5..1dc4f7898e737b88c827ba1f6045acbc49bba0a1
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -399,24 -381,10 +399,28 @@@ hooks named after the feature name, lik
  * 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 variable 'safe-local-variable-directories'.
+ This variable names directories in which Emacs will treat all
+ directory-local variables as safe.
+ 
  ** New variable 'inhibit-auto-fill' to temporarily prevent auto-fill.
  
  ** Functions and variables to transpose sexps

diff --cc lisp/files.el
Simple merge

diff --cc lisp/progmodes/prog-mode.el
Simple merge

diff --cc src/lread.c
Simple merge