Merge from origin/emacs-29

d0147ff9e50 * lisp/emacs-lisp/shortdoc.el: More and better `substring...
fa06249a9fb Fix "C-x RET r" when the new encoding is UTF
679e9d7c56e ; Mention MinGW64 GCC 13.1 problems in PROBLEMS
fdc1a12ed1a Fix "vc-print-log does not erase buffer" and associated p...
d507aa7336b Add selector_expression indentation rule
1f664a0af75 Add "nixd" LSP server to Eglot
e962cf4ba72 Fix building --with-native-compilation=aot from release t...
4ca371e9cc7 Fix bug#64152 (Minibuffer sometimes goes "modal")
a0ccf1859cc Disable target-async by default in gdb-mi.el
2bad5829ff7 Revert "Fix parsing of dn line if WITHDN is non-nil"
7637e361d3b Don't truncate filenames with "emacs.el" in them
2591eb1190a Improve documentation of 'minibuffer-message'
6f211bc57b9 Eglot: again fix positions of coinciding inlay hint overl...
a24e9e3fee5 ; Update ChangeLog.4 and etc/AUTHORS.

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

diff --cc etc/PROBLEMS
Simple merge

diff --cc lisp/Makefile.in
Simple merge

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

diff --cc lisp/minibuffer.el
Simple merge

diff --cc lisp/progmodes/cc-fonts.el
index d220af2ab0e0cdae49b92e3ec769fd3fe1f643cc,e6c6c65f59c91569e1837665ba15b6fb919a3e25..baf57d6839a5dddebb34ce70580e4b21cbdf0de0
--- 1/lisp/progmodes/cc-fonts.el
--- 2/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@@ -2659,9 -2623,7 +2659,9 @@@ need for `c-font-lock-extra-types'."
    ;; prevent a repeat invocation.  See elisp/lispref page "Search-based
    ;; fontification".
    (let (pos)
-     (while 
 -    (while (c-syntactic-re-search-forward c-using-key limit 'end)
++    (while
 +      (and (< (point) limit)
 +           (c-syntactic-re-search-forward c-using-key limit 'end))
        (while  ; Do one declarator of a comma separated list, each time around.
          (progn
            (c-forward-syntactic-ws)

diff --cc lisp/progmodes/eglot.el
index dff79ba7773638085cf19bd90a33c97fdc0cb5d8,890f1e91b860d26d4d0be98c253f1a1ede5babea..e2478f2dde3cf2bd7c59ada329d844857a2a1ed8
--- 1/lisp/progmodes/eglot.el
--- 2/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@@ -230,8 -230,7 +230,8 @@@ chosen (interactively or automatically)
                                   . ,(eglot-alternatives '("digestif" "texlab")))
                                  (erlang-mode . ("erlang_ls" "--transport" "stdio"))
                                  ((yaml-ts-mode yaml-mode) . ("yaml-language-server" "--stdio"))
-                                 (nix-mode . ,(eglot-alternatives '("nil" "rnix-lsp")))
+                                 (nix-mode . ,(eglot-alternatives '("nil" "rnix-lsp" "nixd")))
 +                                (nickel-mode . ("nls"))
                                  (gdscript-mode . ("localhost" 6008))
                                  ((fortran-mode f90-mode) . ("fortls"))
                                  (futhark-mode . ("futhark" "lsp"))

diff --cc lisp/progmodes/gdb-mi.el
Simple merge

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

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

diff --cc src/Makefile.in
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xterm.c
Simple merge