Merge branch 'emacs-29'

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

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

diff --cc etc/EGLOT-NEWS
index 37ee94f17301a3f9aa1c127f5311dc1125edd047,088bdd28bf3860da686f154955e010047de0f4b6..569481a8dc112f20ecf7985d095acc0c5c430254
--- 1/etc/EGLOT-NEWS
--- 2/etc/EGLOT-NEWS
+++ b/etc/EGLOT-NEWS
@@@ -99,16 -20,13 +99,16 @@@ been added to 'eglot-stay-out-of'
  \f
  * Changes in Eglot 1.12.29 (Eglot bundled with Emacs 29.1)
  
- ** Eglot can upgrade itself to the latest version.
+ ** Eglot has a new command to upgrade to the latest version.
  
- The new command 'eglot-upgrade-eglot' works around behaviour in the
- existing 'package-install' command and the new 'package-upgrade'
- command which would prevent the user from easily grabbing the latest
- version as usual.
+ The new command 'eglot-upgrade-eglot' allows easily grabbing the
+ latest version of Eglot from ELPA.  This might be more convenient than
+ using the more general command 'package-install', which by default
+ will not upgrade "built-in" packages, those that come with Emacs.
  
 +\f
 +* Changes in Eglot 1.12 (13/03/2023)
 +
  ** LSP inlay hints are now supported.
  Inlay hints are small text annotations not unlike diagnostics, but
  designed to help readability instead of indicating problems.  For

diff --cc lisp/emacs-lisp/easy-mmode.el
Simple merge

diff --cc lisp/emacs-lisp/lisp.el
Simple merge

diff --cc lisp/emacs-lisp/package-vc.el
Simple merge

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

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

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/treesit.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/xdisp.c
Simple merge