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

diff --cc configure.ac
Simple merge

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

diff --cc etc/NEWS
index b2a44e4fd06b462cbe8a3fb6563f34a107d7e849,d0dab7552120589d9cc7a3bf4c465ddf8478f3dd..7dc621e11e3250abe4233e8f4f4910b4f8dee0a1
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -24,12 -24,16 +24,22 @@@ applies, and please also update docstri
  \f
  * Installation Changes in Emacs 30.1
  
 +** Emacs has been ported to the Android operating system.
 +This requires Emacs to be compiled on another computer.  The Android
 +NDK, SDK, and a suitable Java compiler must also be installed.
 +
 +See the file 'java/INSTALL' for more details.
 +
+ ---
+ ** Emacs now defaults to ossaudio library for sound on NetBSD and OpenBSD.
+ Previously configure used ALSA libraries if installed on the
+ system when configured '--with-sound=yes' (which is the default), with
+ fallback to libossaudio.  The libossaudio library included with the
+ base system is now used even if ALSA is found to avoid relying on
+ external packages and to resolve potential incompatibilities between
+ Linux and BSD versions of ALSA.  Use '--with-sound=alsa' to build with
+ ALSA on these operating systems instead.
+ 
  \f
  * Startup Changes in Emacs 30.1
  
@@@ -104,11 -102,15 +114,20 @@@ plus, minus, check-mark, start, etc
  The 'tool-bar-position' frame parameter can be set to 'bottom' on all
  window systems other than Nextstep.
  
 ++++
 +** New global minor mode 'modifier-bar-mode'.
 +When this minor mode is enabled, buttons representing modifier keys
 +are displayed along the tool bar.
 +
+ ---
+ ** New user option 'uniquify-dirname-transform'.
+ This can be used to customize how buffer names are uniquified, by
+ making arbitrary transforms on the buffer's directory name (whose
+ components are used to uniquify buffer names when they clash).  You
+ can use this to distinguish between buffers visiting files with the
+ same base name that belong to different projects by using the provided
+ transform function 'project-uniquify-dirname-transform'.
+ 
  ** cl-print
  
  *** You can expand the "..." truncation everywhere.

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