; Improve commentary of last change.

(cherry picked from commit 8ef44ca64eb40485751207096ee69930895364d9)

Support hyphen in Bash function names

* lisp/progmodes/sh-script.el (sh-imenu-generic-expression): Add
hyphen to function-name regexp.

Copyright-paperwork-exempt: yes
(cherry picked from commit 2ea0919550366babfea1de6468ef9e8b1857b478)

; Skip commit b38eb6da1d164b50f4b727b2539cf02c40b73123

; Skip commit eec1a68b009961e74d08a57bdbba5b0851dbe42f

; Skip commit a52ad71cc5d036f1973ff2e504e45992fec3fc04

Support PHP 8.4 and more reliable indentation (bug#74525)

Added support for PHP 8.4 property hook. More reliable CSS and
Javascript syntax indentation when there are attributes in
<script> and <style>.

* lisp/progmodes/php-ts-mode.el:
(php-ts-mode--language-source-alist): Switch to the latest php
grammar.
(php-ts-mode--js-css-tag-bol): CSS and Javascript indentation is
now more more reliable in different formatting styles.
(php-ts-mode--test-property-hook-clause-p): New function that
tests property_hook support.
(php-ts-mode--font-lock-settings): Use the new function.
(php-ts-mode--colorize-css-value): The function now behaves
exactly like the one in css-ts-mode.
(php-ts-mode--feature-list): Changed the list to match
css-ts-mode.

(cherry picked from commit 9fdb764898dd4f40f562f8540767a18c827fe7d3)

Don't inadvertently reset frame scroll bar sizes (Bug#74435)

* src/frame.c (gui_set_scroll_bar_width)
(gui_set_scroll_bar_height): When the new size equals the old one
do not reset size to default size (Bug#74435).

(cherry picked from commit bda0bce9e4313c496fcfdcf4b6abeba3f68e5fac)

Mention special variables in lexical binding documentation

* doc/lispref/variables.texi (Lexical Binding): Briefly mention
special variables and their semantics.  (Bug#74540)

(cherry picked from commit 3f99cdaf26dc606012384a6f191dc9d96483d437)

Allow to go back to using 'ruby-mode' after loading 'ruby-ts-mode'

* lisp/progmodes/ruby-ts-mode.el (major-mode-remap-defaults):
Remap 'ruby-mode' to 'ruby-ts-mode'.  Add commentary.
* lisp/progmodes/ruby-mode.el (major-mode-remap-defaults): Remove
any remappings of ruby-mode'.
* lisp/progmodes/c-ts-mode.el: Fix a typo in a comment.  (Bug#74339)

(cherry picked from commit 0ef0f18f163c37a9d5c0b63c34eb3f37016a0d5e)

Extend Tramp tests

* test/lisp/net/tramp-tests.el (tramp-test47-read-password)
(tramp-test47-read-otp-password, tramp-test47-read-fingerprint):
Use `tramp-default-remote-shell' and
`tramp-connection-properties'.  Cleanup at the end.
(tramp-test47-read-security-key): New test.

(cherry picked from commit e54c218d661c2d2f6f693342d2cf78d4be754d65)

* src/lisp.h (EQ): Improve generated code.

Outside compilation 'symbols_with_pos_enabled' is always false, so ask
the compiler to organize the most likely execution path in a sequential
fashion in order to favor run-time performance.

(cherry picked from commit b0ba0d42b0fdf70a20cd7a070128db8abe4a0826)

; Minor Tramp cleanup

* lisp/net/tramp-message.el (tramp-warning): Fix `lwarn' call.

* lisp/net/tramp-sh.el (tramp-sh-handle-make-process): Don't set
connection property "remote-pid", it's unused.

(cherry picked from commit 8184f64ab0025afb0b901b9cae3917e6f722974b)

Delete obsolete section in admin/notes/repo

* admin/notes/repo: Delete section "How to merge changes from emacs-24
to master", which is documented in admin/notes/git-workflow.  Also
delete out-of-date autoload advice.

(cherry picked from commit fc17e8727d48c32f2610c6fe7c17147bff7be52b)

Improve documentation for 'while-let'

* doc/lispref/control.texi (Conditionals): Reorganise describing
what's overlapping between the macros (and between the macros
and let*), and then improve the documentation for 'while-let'.

(cherry picked from commit 3e396b2c5bb8abdc16218ca8c9d617b9dcf9f01e)

Remove mention of treesit-defun-prefer-top-level (bug#74474)

treesit-defun-prefer-top-level is removed before Emacs 29
released and was replaced by treesit-defun-tactic.  These
statements that set it doesn't do anything other than introduce
confusion, so we should remove them.

* lisp/progmodes/c-ts-mode.el (c-ts-base-mode):
* lisp/progmodes/js.el (js-ts-mode):
* lisp/progmodes/php-ts-mode.el (php-ts-mode):
* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
* lisp/progmodes/typescript-ts-mode.el:
(typescript-ts-base-mode):
Remove statements setting treesit-defun-prefer-top-level.

(cherry picked from commit 50b91ed458df8f04359996b31b18fb318ba64a47)

Fix NS non-native fullscreen on initial frame load (bug#59790)

* src/nsterm.m ([EmacsView toggleFullScreen:]): Reset fs_is_native

(cherry picked from commit 03ae07291e85fd353595806c3ce1ad3315c47649)

Fix user options for listing and marking diary files

* lisp/calendar/diary-lib.el (diary-nongregorian-listing-hook)
(diary-nongregorian-marking-hook): Add Chinese functions to the
list of variable's options.  (Bug#74498)

(cherry picked from commit 8261d7224d30feca885e031d901923c550606db0)

Make 'jsonrpc-default-request-timeout' a defcustom

* lisp/jsonrpc.el (jsonrpc-default-request-timeout): New
defcustom, replaces a defconst.
(jsonrpc): New customization group.

* etc/NEWS: Announce the change.  (Bug#74338)

(cherry picked from commit d9531793206021f1ad842cbc73df939aadf5f745)

; Improve example of display-buffer-alist category in ELisp Reference

* doc/lispref/windows.texi (Choosing Window): Use 'add-to-list'
and add an example how to override display-buffer-alist entries
such as 'inhibit-same-window' by matching the window
using the 'category' condition (bug#74457).

(cherry picked from commit 5339c6f69eef7aaccd0570a3b70fdf0066b678bc)

Update MS-Windows build instructions

* nt/INSTALL.W64:
* nt/README.W32: Update the name of the MSYS2 libtree-sitter
distribution.  Reported by Nerd <hiweedmandriva3@163.com>.
(Bug#74429)

(cherry picked from commit e14007ad631120a3f7521e503c8de86aca849bad)

Remove spurious Gnus M-# binding

New command 'search-button'

Drop ffap.el

; * etc/NEWS: Fix typo and wording of a recently-added entry.

(cherry picked from commit bef9eeb05981ee5fe09c202116d725f9c69b9520)

; * etc/NEWS: Fix typos and wording of last added entry.

(cherry picked from commit 51fb0331b3cd9e3c22c11c503899a60e65c64ffe)

Add command symbol property 'repeat-continue-only' for 'repeat-mode'

* lisp/repeat.el: (repeat-post-hook): Ignore commands
with 'repeat-continue-only' symbol property
when repeat was not in progress (bug#74140).

* test/lisp/repeat-tests.el (repeat-tests-continue-only): New test.
(repeat-tests-bind-keys): Prepare for :continue-only.

(cherry picked from commit 64c289590b56ea08d646b74f1a4b5de0a1faa2e2)

* test/lisp/repeat-tests.el: Improve using new key mnemonics (bug#74140).

(repeat-tests-repeat-map): Use :repeat keywords with :enter and :exit
for 'defvar-keymap'.
(with-repeat-mode): Add new arg 'map' to defmacro.
(repeat-tests-check-key, repeat-tests-exit-key)
(repeat-tests-keep-prefix): Use new key mnemonics.
(repeat-tests-exit-command): New test.
(repeat-tests-bind-keys): New test for 'bind-keys' from 'use-package'.

(cherry picked from commit 9784c20dba1f00b583c92f83c08156ef000ec0b9)

; Skip commit e4abb06e5bf982a4688de0638b1eeecf4ff38d95

Make Xref commands follow 'display-buffer' customizations

* lisp/progmodes/xref.el (xref--show-pos-in-buf): Append
'(category . xref-jump)' to display-buffer action argument, when
the target window or frame is not made explicit by the command.
(xref--switch-to-buffer): New function (bug#74361).
Do the switch through 'pop-to-buffer' and use the new category.
(xref-go-back, xref-go-forward, xref-pop-to-location): Use it.
* etc/NEWS: Describe the change.

(cherry picked from commit 0624fe6f8497a677ae354da0a604dbf82e69400a)

* lisp/files.el (major-mode-remap-alist): Add :tag annotations to :type.

(cherry picked from commit 298bbf3cd76ffaf0c88a6a9ec56aa33c4103b8e6)

; * doc/misc/tramp.texi (Frequently Asked Questions): Minor edits.

(cherry picked from commit 775290efdf18e67bd0726190fe86326c112a27bf)

Support fingerprint readers in Tramp

* doc/misc/tramp.texi (Frequently Asked Questions): Speak about
fingerprint readers.

* lisp/net/tramp-sh.el (tramp-actions-before-shell):
Use `tramp-fingerprint-prompt-regexp'.

* lisp/net/tramp.el (tramp-wrong-passwd-regexp): Add fingerprint
messages.
(tramp-fingerprint-prompt-regexp, tramp-use-fingerprint):
New defcustoms.
(tramp-action-fingerprint, tramp-action-show-message): New defuns.
(tramp-action-show-and-confirm-message): Start check at (point-min).

* test/lisp/net/tramp-tests.el (tramp-test47-read-fingerprint):
New test.

(cherry picked from commit 3fe787ad4d5894df5b540dbd195128118c949c7c)

(undo-delta): Handle `apply` elements (bug#74523)

* lisp/simple.el (undo-delta): Handle `apply` elements.

* test/lisp/simple-tests.el (simple-tests--undo-apply): New test.
(simple-tests--undo-equiv-table): Adjust test so it's not influenced by
previous operation.

(cherry picked from commit 83968cbeee06cc0fff932d5052e431b478276841)

Extend Tramp FAQ

* doc/misc/tramp.texi (Frequently Asked Questions): Improve index.
Recommend `small-temporary-file-directory' for ssh sockets.

(cherry picked from commit 0d466151109f41e84ec4183ba47d88dba1eb360c)

Silence warning message in NS (bug#59790)

* src/nsterm.m ([EmacsWindow createToolbar:]): Disable toolbar when
fullscreen.

(cherry picked from commit cf3ea44eb56364190ea9f2b905f74902c49de416)

Remove NS non-native fullscreen pause (bug#28443)

* src/nsterm.m (ns_fullscreen_hook): Remove timer workaround

(cherry picked from commit 20aa29b03739c496106f166ef84562c602b9ddb2)

Remove 'eshell-escape-arg'

Eshell no longer needs this function, since all command parsing is
performed first, with special syntax annotated with text properties as
needed, as opposed to marking literal text with a property (bug#54486).

* lisp/eshell/em-pred.el (eshell-modifier-alist): Make "q" modifier
obsolete.
(eshell-modifier-help-string): Remove mention of "q".

* lisp/eshell/esh-arg.el (eshell-escape-arg): Make obsolete.
(eshell-parse-backslash, eshell-parse-literal-quote)
(eshell-parse-double-quote): Don't call 'eshell-escape-arg'.

* lisp/eshell/esh-var.el (eshell-parse-variable): Don't call
'eshell-escape-arg'.

* test/lisp/eshell/em-extpipe-tests.el (em-extpipe-test-2)
(em-extpipe-test-9, em-extpipe-test-11): Remove 'eshell-escape-arg'.

* test/lisp/eshell/em-pred-tests.el (em-pred-test/modifier-quote):
Remove test.

* test/lisp/eshell/esh-var-tests.el
(esh-var-test/quoted-interp-var-indices)
(esh-var-test/quote-interp-var-indices-subcommand): Remove workaround in
tests.

* doc/misc/eshell.texi (Argument Modifiers): Remove documentation of
obsolete "q" modifier.

(cherry picked from commit b4655ff99b512f30220f22226514267d78a70605)

(dir-locals-collect-variables): Don't autoload if not needed (bug#74349)

While dir-local settings for `c-mode` may require (auto)loading `cc-mode.el`
to get all the `safe-local-variable` properties, they may not.  So before
(auto)loading that file, make sure we don't already have all the
`safe-local-variable` properties we need.

* lisp/files.el (dir-locals--load-mode-if-needed): New function.
(hack-one-local-variable): Don't inf-loop if `eval` calls a major mode.
(dir-locals-collect-variables): Use `dir-locals--load-mode-if-needed`.

(cherry picked from commit f713258416f224b93e4f25b2db24d5e8797bcbff)

Avoid loading 'rx' at runtime in 'lua-ts-mode'

* lisp/progmodes/lua-ts-mode.el (lua-ts-inferior-lua):
Replace 'rx-to-string' and substitution with 'rx' and 'literal'.
(Bug#74499)

(cherry picked from commit e71d714a815e1088f8cfe946b1e431356ec85b24)

; Skip commit eb1756a8a551d345397b0ef52cac8b8c62f4f1f2

; * etc/symbol-releases.eld: Rearrange.

(cherry picked from commit 043830577332a6b32209bed8fa2efca24ed56ab0)

; * etc/symbol-releases.eld: Add if-let/when-let.

(cherry picked from commit 80a2c74f3be935b115b00b0c15532d0ff2079dad)

; Fix bootstrap

* lisp/net/tramp.el (tramp-initial-file-name-regexp)
(tramp-autoload-file-name-regexp): Don't use `rx' in autoloaded
objects.  (Bug#74490)

(cherry picked from commit abcc8c717d80ddffaa68a30ff59bc71d35eb52e3)

; Skip commit d4cb3b30f18f4ac2c4a2ed21a4084d2209987382

; Skip commit 30bcba27c8c8c89c4ba9d81fc96edf173329a7e6

Rust ts: fontify as type the possible suffix of number literals

* lisp/progmodes/rust-ts-mode.el
(rust-ts-mode--fontify-number-literal): Perform the improved
fontification of numbers.  (Bug#73877)
* test/lisp/progmodes/rust-ts-mode-tests.el:
* test/lisp/progmodes/rust-ts-mode-resources/font-lock.rs:
* test/lisp/progmodes/rust-ts-mode-resources/font-lock-number.rs:
Add tests for the new optional fontification of the possible type
suffix of numbers.

(cherry picked from commit 902696c3ae3ed046208c57de923362bb609da6df)

Improve robustness of auth-source-pass.el

* lisp/auth-source-pass.el (auth-source-pass--read-entry):
Ensure, that `epa-file-handler' is active.  (Bug#67937)

(cherry picked from commit 1b33c00f4c28d730b17293f94ce5325f7e916bc8)

; Skip commit 1c2e0615fb87727bc2aa1f871353c999b67c792a

; Skip commit 097b685aa1c781afc298062f1cc76ab058cdb1a1

Skip proced refine tests on Darwin

* test/lisp/proced-tests.el (proced-refine-test)
(proced-refine-with-update-test): Skip if the system is Darwin.

(cherry picked from commit 74a972cace6816753475c3c21f5b164a9a9342dd)

Use prefix argument in 'package-install-selected-packages'

* lisp/emacs-lisp/package.el (package-install-selected-packages):
When invoked with a prefix argument, skip user confirmation when
installing packages.
* etc/NEWS: Announce the prefix argument usage.  (Bug#73932)

(cherry picked from commit c66c0942ea9ac10e6d6324e472150de403a03b69)

Add noconfirm to 'package-autoremove'

* lisp/emacs-lisp/package.el (package-autoremove):
Add optional argument NOCONFIRM to skip user confirmation when removing
packages.
* etc/NEWS: Announce the new argument.  (Bug#73932)

(cherry picked from commit b4e2d9a3af3dbd0ac7fa944e9386f667feb1c124)

; Fix recent additions to the manuals

* doc/lispref/objects.texi (Type Specifiers):
* doc/lispref/functions.texi (Declare Form):
* doc/emacs/help.texi (Name Help): Fix wording and markup.
(Bug#73626)

(cherry picked from commit c50ce03afc1ee636d5678844fcf982b7ac0a7f8f)

; * lisp/term/w32-win.el (tree-sitter--library-abi): Declare to rm warning.

(cherry picked from commit c818c5bbafde627ed277c599815c27f8cd40f891)

; Better clarify function types in C-h f (bug#73626)

* doc/emacs/help.texi (Name Help): Better clarify function types.

(cherry picked from commit b71d3b2f52ff186e2e7e9724890aa08d0fc9796b)

; Introduce type specifiers to the elisp manual (bug#73626)

* doc/lispref/objects.texi (Programming Types): Add 'Type Specifiers' entry.
(Type Specifiers): Add node.
* doc/lispref/functions.texi (Declare Form): Add 'Type Specifiers'
reference.

(cherry picked from commit 59b3eae481d59d901ff64de1a827d3dd656a4fc9)

Future-proof loading tree-sitter library on MS-Windows

* src/treesit.c (syms_of_treesit) <tree-sitter--library-abi>: New
internal variable.

* lisp/term/w32-win.el (dynamic-library-alist): Use
'tree-sitter--library-abi' to select a proper libtree-sitter DLL
version.

(cherry picked from commit 83fc3cf53a4b54a4ec3bf464cfea97f74522cd8d)

; Improve documentation of 'category' in display-buffer actions

* doc/lispref/windows.texi (Choosing Window)
(Buffer Display Action Alists): Add cross-references.
* doc/lispref/buffers.texi (Buffer List):

* lisp/subr.el (buffer-match-p): Improve documentation of
'category' condition.  (Bug#74361)

(cherry picked from commit 3eb3018682595208076fe7beea1175e123cf1966)

; More accurate documentation of 'set-mark-command'

* doc/emacs/mark.texi (Setting Mark, Global Mark Ring): Explain
that activating an existing mark doesn't set a new mark, and
doesn't push the mark onto the global mark ring.  (Bug#74438)

(cherry picked from commit 4d80c4f4858916becd528b236b29085d29cf3706)

Fix overriding 'c-ts-mode' by 'c-mode'

* lisp/progmodes/c-ts-mode.el: Remove all c- and c++-mode
associations from 'major-mode-remap-defaults' before installing
entries that remap to 'c-ts-mode' and 'c++-ts-mode'.  (Bug#74339)

(cherry picked from commit 70dd5705e11f2259dd1890cee6c72ddcf9d7dd33)

; Improve vc-dir help-echo

* lisp/vc/vc-git.el (vc-git-stash-shared-help)
(vc-git-stash-list-help, vc-git-stash-menu-map): Improve help-echo
text.

(cherry picked from commit 331610aef0572eacb2846f817e979aa5e29170b7)

; Avoid assertion violations in "temacs -Q"

* src/lread.c (build_load_history): Use Fequal to compare strings.

(cherry picked from commit 9c484d510121e0d545f952bc016586ead61d3f10)

lisp/progmodes/c-ts-mode.el: Demote loading c-ts-mode as a configuration

See bug#74367.

(cherry picked from commit 8dc9dfdc381f5b75594572bfb3bbfb5126bc4a88)

; In PROBLEMS mention issue with .Xresources on Gnome desktop (Bug#73244)

* etc/PROBLEMS: Mention issue with specifying frame size in
.Xresources when running Emacs on Gnome desktop (Bug#73244).

(cherry picked from commit 426bce8a6754a112b38a5c6ded75497a0be08718)

; Skip commit fc52cb8d74151bcac18d534529517a0a1845ad2e

Improve the documentation of major-mode remapping

* etc/NEWS (example):
* doc/emacs/files.texi (Reverting):
* doc/emacs/modes.texi (Choosing Modes): Improve the documentation
of 'major-mode-remap-alist' and mode remapping.  (Bug#74339)

(cherry picked from commit 81816800628f1eef1928eee3ccf9a2f8b53ab9a7)

; Skip commit 0856360d80c6cded703e4e32f1a49653fbcba485

Improve 'which-key-special-keys' docstring

* lisp/which-key.el (which-key-special-keys): Explain the format
and use 'setopt'.

(cherry picked from commit d4f81f716ae0ced72e26b403972adf95f02dbdd0)

Don't error in Proced tests if %CPU is a NaN

* test/lisp/proced-tests.el (proced--cpu-at-point): New function.
(proced--assert-process-valid-cpu-refinement)
(proced-refine-test, proced-refine-with-update-test): If %CPU for any
process visited is a NaN skip the test.
(proced-update-preserves-pid-at-point-test): Fix typo in comment.
(proced--assert-process-valid-cpu-refinement-explainer): Add process
attributes to the explainer along with tweaking how the process %CPU is
obtained to account for circumstances where it's not numeric (most
notably '-nan').

(cherry picked from commit 926d47ab2ca72054f1a5c774916927160a839dc1)

Fix bug#74511

Unbreak tramp-sh.el

; Fix typos

(cherry picked from commit 7cb77385d38b96377d404a2ab0e778b2dfce5c77)

* cus-face.el: Provide completion for font families (bug#74362)

* lisp/cus-edit.el (custom-face--font-cache-timeout): New var.
(custom-face--font-completion): New function.
* lisp/cus-face.el (custom-face-attributes): Use it.

(cherry picked from commit ea550488233833baafda90a3f258f96953381274)

man.el: Guess flags for `man -k` to fix bug#73656

* lisp/man.el (Man-man-k-flags): New var.
(Man-completion-table): Use it.

(cherry picked from commit 347750461e71eec4668fb265cd29cffce45783f2)

; Fix last change

(cherry picked from commit b6181c9ec9f7dcbb1c5657537ccc52dc7a3bf6ac)

Tramp: Be more conservative in removing temporary files

* test/lisp/net/tramp-tests.el (Commentary): Extend.
(tramp--test-enabled): Exclude also old FUSE mount points from
deletion.

(cherry picked from commit b6e78f7d8cc6ac6b2fdea0761879e0d65f493191)

; Fix documentation of new header-line faces (bug#73862)

* doc/emacs/display.texi (Standard Faces): Fix wording.

* etc/NEWS: Fix entry about new header-line faces.

(cherry picked from commit cd490c6470d93bf4093a8e3ea411fa179b235f07)

* src/pdumper.c (dump_interval_node): Fix itree_node struct hash.

(cherry picked from commit 7ded1064cf4d9fde32c7a89473ef9476520cd556)

Fix font-lock in 'lisp-mode'

* lisp/emacs-lisp/lisp-mode.el (lisp-fdefs): Fix regexps for
"\\<>" and similar constructs.  (Bug#74307)

(cherry picked from commit 200c877cd48aa0f7638fdd5157555374f0f7bfc8)

; Fix last change

* doc/emacs/display.texi (Standard Faces): Fix indexing.

* lisp/faces.el (header-line-active, header-line-inactive): Fix
the :version tag.  (Bug#73862)

(cherry picked from commit f630520be97a9dda5e4b93765dbd82b6e9b298d0)

Add new `header-line-active' and `header-line-inactive' faces

This is all intended to parallel the 'mode-line-active' and
'mode-line-inactive' distinction.
* doc/emacs/display.texi (Standard Faces): Document the new faces.

* lisp/faces.el (header-line-active, header-line-inactive): New
faces.

* src/dispextern.h (CURRENT_HEADER_LINE_ACTIVE_FACE_ID_3)
(CURRENT_HEADER_LINE_ACTIVE_FACE_ID): New macros based on mode
line equivalents.
(face_id): New face IDs.
* src/xdisp.c (window_box_height, pos_visible_p, init_iterator)
(window_text_pixel_size, display_mode_lines, display_mode_line)
(format-mode-line): Replace all uses of HEADER_LINE_FACE_ID with
either a new macro or the new face IDs.
* src/xfaces.c (syms_of_xfaces): New lisp symbols.
(lookup_basic_face, realize_basic_faces): Map new face IDs to
their lisp symbols.  (Bug#73862)

(cherry picked from commit a4014c058b547d4f9c8c61c6737c85c2636fdb34)

Fix customization type of erc-spelling-dictionaries

* lisp/erc/erc-spelling.el (erc-spelling-dictionaries): Update :type
specification to reflect shape expected by `erc-spelling-init', and
improve description in doc string.  (Bug#74363)

Copyright-paperwork-exempt: yes
(cherry picked from commit 29098a291f535c8e2be114171308169f025de43f)

Use helper to get erc-networks--id symbol as string

* lisp/erc/erc-networks.el (erc-networks--id-string): New function.
(erc-networks--construct-target-buffer-name)
(erc-networks--ensure-unique-server-buffer-name)
(erc-networks--rename-server-buffer): Use it.
* lisp/erc/erc-nicks.el (erc-nicks-list-faces): Use it.
* lisp/erc/erc-status-sidebar.el (erc-status-sidebar-pad-hierarchy): Use it.
* lisp/erc/erc.el (erc-generate-new-buffer-name)
(erc-log-irc-protocol)
(erc--auth-source-determine-params-defaults)
(erc-format-target-and/or-network): Use it.
* test/lisp/erc/erc-networks-tests.el (erc-networks--id-string): New test.

(cherry picked from commit 7fc048ca7781f9ba04d953f79fb29646c92cf35d)

; Fix TRAMP manual indexing

* doc/misc/tramp.texi (Customizing Methods): Make sure @item comes
after @cindex.

(cherry picked from commit d25689d6e2cfd387edbc77b01c03d0ae767f8cf0)

Remove Tramp temp files if advised during tests

* lisp/net/tramp-fuse.el (tramp-fuse-name-prefix): New defconst.
(tramp-fuse-mount-point): Use it.

* test/lisp/net/tramp-tests.el (tramp-test-name-prefix): New defconst.
(tramp--test-make-temp-name, tramp-test40-make-nearby-temp-file)
(tramp-test47-read-password, tramp-test47-read-otp-password):
Use it.
(tramp--test-enabled-checked): Move down.
(tramp--test-enabled): Delete all Tramp temp files when
environment variable $TRAMP_TEST_CLEANUP_TEMP_FILES is set.
(tramp-test02-file-name-dissect-separate):
Adapt `tramp-crypt-directories' according to syntax.
(tramp-test47-read-password):
Let-bind `tramp-connection-properties' instead of modifying
`tramp-methods'.

(cherry picked from commit 310ce93d02c5317be589803fbde96fd20b96e496)

* lisp/subr.el (read-number): Document collision with 'format-prompt'.

(cherry picked from commit c29c54410ea889bafc1bb4a29664827bc893b7d4)

; Fix TRAMP manual indexing

* doc/misc/tramp.texi (Inline methods):
(External methods):
(GVFS-based methods):
(FUSE-based methods):
(Customizing Methods):
(Remote shell setup):
(Change file name syntax):
(Archive file names):
(Frequently Asked Questions): Make sure @item comes after
@cindex and similar indexing commands.

(cherry picked from commit 68337106f910602a32dca0597137291582c6e45a)

New user option bibtex-entry-ask-for-key

(cherry picked from commit cc9188b1900079f87d76cc8b7493d64a9ccd9d36)

Don't clobber stickiness text properties when printing Eshell prompt

* lisp/eshell/em-prompt.el (eshell--append-text-property): New
function...
(eshell-emit-prompt): ... use it.

* test/lisp/eshell/em-prompt-tests.el
(em-prompt-test/field-properties/merge-stickiness): New test.
(em-prompt-test/field-properties, em-prompt-test/after-failure): Reorder
stickiness values (bug#74230).

(cherry picked from commit df288d2e4148e6e72f21752a510f98536e7705ac)

Fix errors in Tramp's password cache expiration

* doc/misc/tramp.texi (Password handling): Mention expiration of
cached passwords when a session timeout happens.

* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection): Rename
file property "process-attributes" to connection property
" process-attributes".

* lisp/net/tramp.el (tramp-read-passwd):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-send-command):
Rename connection property "password-vector" to "pw-vector".

* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
Use connection property "hop-vector".

* lisp/net/tramp.el (tramp-get-process-attributes)
(tramp-handle-list-system-processes): Rename file property
"process-attributes" to connection property " process-attributes".
(tramp-compute-multi-hops): Check for
`tramp-sh-file-name-handler-p', it works only for this.
(tramp-action-password, tramp-process-actions): Use connection
property "hop-vector".
(tramp-read-passwd, tramp-clear-passwd): Rewrite.  (Bug#74105)

(cherry picked from commit 6d42c70fd3e2e63c8f993a10c83dee7425f185d5)

Fix drag-n-drop on MS-Windows

* src/w32fns.c (struct w32_drop_target): New member 'ref_count'.
(w32_drop_target_AddRef): Increment reference count.
(w32_drop_target_Release): Decrement reference count, and free the
target only if the reference count is zero.
(w32_createwindow): Initialize reference count.  (Bug#74312)

(cherry picked from commit b83a45eab53b8e6d8f3be45c0acb9a42a5262cb0)

; Skip commit 5b19ca56f1d91a65c0068160790e2cb512bb2067

Add song viewer to 'mpc' (Bug#74200)

* lisp/mpc.el (mpc-describe-song): New command.
(mpc-mode-map): Bind "d" to 'mpc-describe-song'.
(mpc-mode-menu): Add menu item.
(mpc-secs-to-time): Ensure secs argument is an integer.
(mpc-song-viewer-empty, mpc-song-viewer-tag):
(mpc-song-viewer-value): New face.
(mpc-song-viewer-tags): New option.

(cherry picked from commit 32f070fa3dfccd29abad6e7566ed9121e3f1da39)

; TRAMP manual spelling and grammar fixes

* doc/misc/tramp.texi (FUSE-based methods):
(Firewalls):
(Predefined connection information):
(Remote programs):
(Remote shell setup):
(Ssh setup):
(Home directories):
(Remote processes):
(Renaming remote files):
(Archive file names):
(Bug Reports):
(Frequently Asked Questions): Use "can" instead of "could" where
it makes sense.

(cherry picked from commit 8f6ff233ef11e7cc19c524228f48b732a98aa284)

Improve font-locking and indentation in 'php-ts-mode'

* lisp/progmodes/php-ts-mode.el (php-ts-mode--language-source-alist):
Updated to latest version of PHP grammar.
(php-ts-mode--indent-styles): 'namespace_use_declaration' is now
correctly indented.
(php-ts-mode--operators): Support of the "argument unpacking
operator".
(php-ts-mode--font-lock-settings): 'nullsafe_member_call_expression'
is now highlighted correctly.
(php-ts-mode--comment-indent-new-line): Delete trailing whitespace
before inserting newline (see bug#73900 for more information).
Bug#74239

(cherry picked from commit f69f54c454eb3c0f8ff8c55cfd2b7832ea1709cf)

Fix some 'lua-ts-mode' options (Bug#74235)

* lisp/progmodes/lua-ts-mode.el (lua-ts-luacheck-program):
(lua-ts-inferior-program): Switch to 'file' type and remove 'nil'
as a choice.
(lua-ts-inferior-lua): Ensure 'lua-ts-inferior-program' is set.

(cherry picked from commit 27aacbd172f3b94926073250ef81a226616d1e45)

; Update the xwidgets-on-NS text due to fixing bug#60703

* etc/TODO: Update the xwidgets-on-NS text (bug#74295).

(cherry picked from commit a0613372a7bbc19f87f19c49153eca262eb750c1)

Improve comment indenting in 'lua-ts-mode'

* lisp/progmodes/lua-ts-mode.el (lua-ts--simple-indent-rules):
Align single line comments with the surrounding context.
(lua-ts--comment-first-sibling-matcher): Check that comment is
the first sibling.
(lua-ts--multi-line-comment-start): New function.
* test/lisp/progmodes/lua-ts-mode-resources/indent.erts:
Add tests.  (Bug#74298)

(cherry picked from commit d592832504554c6ee30bea263e55dc84feaec18d)

; Skip commit 6bc44ccf287a398d47563ddf60d13784cd64720f

Delete commented out help--describe-vector implementation

This was an attempt at lifting 'help--describe-vector' to Lisp that
turned out to be prohibitively slow.  It is still there in the Git log
if we need to refer back to it.  Currently, it is just dead weight, so
delete it.

* lisp/help.el: Delete commented out code.

(cherry picked from commit 96656c77e282939a84b19a9ccbbea5fbea948e33)