Merge from origin/emacs-29

842dbf500e0 * Fix `batch-byte+native-compile' target directory.
8dbd5aa1eef Avoid crashes in 'display_count_lines' when current buffe...
47b4f4cf783 ; * doc/emacs/mini.texi (Completion Commands): Fix a typo...
78999d52136 Update csharp tree-sitter support due to upstream changes
556cb01b48e Substitute command keys in 'ielm-header' at use time
99367078e50 ; * etc/PROBLEMS: Add entry about XIM problems (bug#65205).
03e897c08fa Fix rare crashes in redisplay due to problems with fontsets
b1ba06a1e4b Fix a typo in 'leuven-dark-theme.el'
e80a9dcabb9 ; * admin/git-bisect-start: Update failing commits
9091f42784b ; * admin/git-bisect-start: Update failing commits
344ac529ca9 ; * etc/PROBLEMS: Fix typo.
bccf848b26c Adapt Tramp test
71bc060e403 Properly expand the JSX indentation rules in 'js-ts-mode'
889cfb42ed9 * Add `emacs-lisp-native-compile' to easy-menu.
4535aafa8a3 * lisp/progmodes/elisp-mode.el (emacs-lisp-mode-menu): Si...
173af0cad51 * Introduce `emacs-lisp-native-compile'.
063d7d89d7a Fix the -x switch in non-X builds
5a7fb0b39b7 Document that `set-mouse-color' does not work everywhere
d06fc72496f ; * doc/emacs/dired.texi (Misc Dired Features): Fix last ...
97b8ac376b5 Fix the effects and documentation of 'dired-free-space'
75c72e59f69 ; Fix typo
6d11b7b3007 Fix cross-reference to eldoc in eglot manual
913e50aba6c Add native-compilation to Emacs Lisp mode menu
b93107c20b2 Fix emacs-lisp-native-compile-and-load eln target directo...

diff --cc doc/emacs/dired.texi
Simple merge

diff --cc doc/emacs/mini.texi
Simple merge

diff --cc etc/PROBLEMS
Simple merge

diff --cc etc/themes/leuven-dark-theme.el
Simple merge

diff --cc lisp/dired.el
Simple merge

diff --cc lisp/emacs-lisp/comp.el
index b35e1b97e9dab5298ac628e5dbc3ab52841be808,0c70789be7125d87fa1f4cadfcbc0709aabf83f3..bb85ef2bc06a080a3db86170eb40910017acff56
--- 1/lisp/emacs-lisp/comp.el
--- 2/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@@ -1429,13 -1390,10 +1429,10 @@@ clashes.
              (alist-get 'no-native-compile byte-native-qualities))
      (throw 'no-native-compile nil))
    (unless byte-to-native-top-level-forms
 -    (signal 'native-compiler-error-empty-byte filename))
 +    (signal 'native-compiler-error-empty-byte (list filename)))
    (unless (comp-ctxt-output comp-ctxt)
-     (setf (comp-ctxt-output comp-ctxt) (comp-el-to-eln-filename
-                                         filename
-                                         (or native-compile-target-directory
-                                             (when byte+native-compile
-                                               (car (last native-comp-eln-load-path)))))))
+     (setf (comp-ctxt-output comp-ctxt)
+           (comp-el-to-eln-filename filename native-compile-target-directory)))
    (setf (comp-ctxt-speed comp-ctxt) (alist-get 'native-comp-speed
                                                 byte-native-qualities)
          (comp-ctxt-debug comp-ctxt) (alist-get 'native-comp-debug

diff --cc lisp/help.el
Simple merge

diff --cc lisp/ielm.el
Simple merge

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

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

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

diff --cc src/emacs.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/xdisp.c
Simple merge

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

diff --cc test/src/comp-tests.el
Simple merge