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

diff --cc doc/lispref/display.texi
Simple merge

diff --cc etc/NEWS
index a8fc7f4e37f3d90a8c6a63401396b879024391ca,567f19012eb393c7e1b0be6910ba32c6f3fe730f..85352fabebc46999e4d32a0a33aff2330595034b
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -715,30 -685,11 +715,34 @@@ provokes an error if used numerically
  \f
  * Lisp Changes in Emacs 30.1
  
+ ** 'defadvice' is marked as obsolete.
+ See (info "(elisp)Porting Old Advice") for help converting them
+ to use `advice-add` or `define-advice instead.
+ 
  +++
 +** New variable 'current-key-remap-sequence'.
 +It is bound to the key sequence that caused a call to a function bound
 +within `function-key-map' or `input-decode-map' around those calls.
 +
 ++++
 +** 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.

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

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