Merge from origin/emacs-29

20125ad97b4 ; admin/authors.el (authors-aliases): Update for Emacs 29.2.
92a7132bd6c ; * etc/NEWS: Clean up for Emacs 29.2.
314ac2e4317 ; * lisp/mail/rmail.el (rmail-show-message-verbose-min): ...
2cb1b76696b diff-mode: Support committing diff with file deletions
b96aa528f64 * lisp/net/eww.el (eww-retrieve): Fix args of eww-render ...

diff --cc admin/authors.el
index 9fa8036ff235e8d0be15ae9957972ecae6cabf59,083023a3dad6eef1aaee4e5af366cb99ccb09302..6c74f4dd7a16bba10c819a30d738741d3f327730
--- 1/admin/authors.el
--- 2/admin/authors.el
+++ b/admin/authors.el
@@@ -215,11 -247,14 +215,13 @@@ files."
      ("Satyaki Das" "Indexed search by Satyaki Das")
      ("Sébastien Vauban" "Sebastien Vauban")
      ("Sergey Litvinov" "Litvinov Sergey")
 -    ("Simen Heggestøyl" "simenheg@gmail\\.com")
 +    ("Simen Heggestøyl" "simenheg@gmail.com")
      (nil "prime.wizard")
      ("Shun-ichi Goto" "Shun-ichi GOTO")
+     ;; The trailing dash is a kludge, so this contributor is not ignored.
+     ("skykanin-" "skykanin@users\\.noreply\\.github\\.com")
      ;; There are other Stefans.
  ;;;    ("Stefan Monnier" "Stefan")
 -    (nil "ssnnoo")
      ("Steven L. Baur" "SL Baur" "Steven L Baur")
      ("Stewart M. Clamen" "Stewart Clamen")
      ("Stuart D. Herring" "Stuart Herring" "Davis Herring")

diff --cc etc/NEWS
index e854873b8d085a028908cdb6e0c5695fadbb4d81,1a0e1f37366579f3c0106e74b2a1fd764a83c41c..0af275787d16a95e85ff5dc96bf8fd621e27a2b6
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -15,42 -15,11 +15,36 @@@ in older Emacs versions
  You can narrow news to a specific version by calling 'view-emacs-news'
  with a prefix argument or by typing 'C-u C-h C-n'.
  
- Temporary note:
- +++ indicates that all relevant manuals in doc/ have been updated.
- --- means no change in the manuals is needed.
- When you add a new item, use the appropriate mark if you are sure it
- applies, and please also update docstrings as needed.
- 
  \f
 -* Installation Changes in Emacs 29.2
 +* 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.
 +
 +---
 +** Native compilation is now enabled by default.
 +'configure' will enable the Emacs Lisp native compiler, so long as
 +libgccjit is present and functional on the system.  To disable native
 +compilation, configure Emacs with the option:
 +
 +    ./configure --with-native-compilation=no
 +
 +---
 +** 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 29.2
 +* Startup Changes in Emacs 30.1
  
  ** On GNU/Linux, Emacs is now the default application for 'org-protocol'.
  Org mode provides a way to quickly capture bookmarks, notes, and links

diff --cc lisp/mail/rmail.el
Simple merge

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

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