; Skip commit e0f964c16df4951e3d1ad6d43371ce2a09ede28c

; Skip commit eb18f7288b3817378b98c1b81d723cf4a1b1e4f5

Skip *.dylib files in 'loaddefs-generate'

* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate): Add .dylib
to extensions of files that are skipped.  (Bug#74001)

(cherry picked from commit 8e37b537160c1560048ac53529ef09de7561963c)

Highlight namespace name in "use" clause.

* lisp/progmodes/php-ts-mode.el (php-ts-mode--font-lock-settings):
New rule to highlight namespace name in "use" clause.  (Bug#73975)

(cherry picked from commit 0d8d5f10ffc62da35c4d317ed4363995e5e62f65)

; * lisp/loadup.el: Improve file abstract

(cherry picked from commit d3e98487d08eaed69db827ce489b69da1c7a084e)

; * doc/lispref/control.texi (Conditionals): Fix markup.

(cherry picked from commit 1a91d37a21c43e4941f6c5913bcab507161e6be6)

Improve Tramp VC cache

* lisp/net/tramp-sh.el (tramp-vc-file-name-handler):
Add `file-directory-p', which is used in
`vc-find-root'.  (Bug#74026)

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

* lisp/progmodes/cc-langs.el (c-cpp-matchers): Remove an unneeded let*.

(cherry picked from commit c2fcb6ca5c4baea5eed39376be12c21e03a960c2)

; * lisp/emacs-lisp/cond-star.el: Require cl-lib.

(cherry picked from commit 2a6af880b0958d527a4d32005ef9acf3bc4ea030)

; Reformat a couple of recently added long strings

* lisp/vc/vc-git.el (vc-git--assert-allowed-rewrite)
(vc-git-modify-change-comment): Reformat long strings by
prefixing an escaped newline.

(cherry picked from commit 4b9daca842419f94226d40adc9f7844d18dfffa9)

cond*: Add support for Pcase patterns

* lisp/emacs-lisp/cond-star.el (cond*): Adjust docstring.
(match*): Prefer `_VAR` syntax.
(cond*-convert-condition): Add support for `pcase*`.
* doc/lispref/control.texi (cond* Macro): Document `pcase*`.
* test/lisp/emacs-lisp/cond-star-tests.el: New file.

(cherry picked from commit d44b94a63d2d407fca5d5ec41fcb92d7b765972e)

; Fix coding style of Uniscribe files

* src/w32dwrite.c (EMACS_DWRITE_UNUSED, IDWriteFontFaceVtbl)
(IDWriteFontFace, IDWriteRenderingParamsVtbl)
(IDWriteRenderingParams, IDWriteFontVtbl, IDWriteFont)
(IDWriteBitmapRenderTargetVtbl, IDWriteBitmapRenderTarget)
(IDWriteBitmapRenderTarget1, IDWriteGdiInteropVtbl)
(IDWriteGdiInterop, IDWriteFactoryVtbl, IDWriteFactory)
(IDWriteColorGlyphRunEnumeratorVtbl)
(IDWriteColorGlyphRunEnumerator, IDWriteFactory2Vtbl)
(IDWriteFactory2, get_font_face, text_extents_internal)
(w32_initialize_direct_write, w32_dwrite_draw)
(w32_use_direct_write):

* src/w32font.c (w32font_text_extents, w32font_draw):

* src/w32uniscribe.c (uniscribe_open): Correct coding style.

(cherry picked from commit 574e97575f4331f43fc079b3bfa6d74213bc2559)

CC Mode: correct handling of properties on #include <...>

In C, Pike, and IDL Modes, deleting and reinserting such a <
could create havoc with the category/syntax-table properties on
the < and >.  Also the contents of <...> should only get paren
properties when the #include is present and correct.

* lisp/progmodes/cc-fonts.el (c-cpp-matchers): Replace the
c-make-font-lock-search-function which put properties on the
<...> with a simple matcher.

* lisp/progmodes/cc-langs.el
(c-get-state-before-change-functions)
(c-before-font-lock-functions): Add respectively
c-before-change-include-<> and c-after-change-include-<> in the
C, Pike and IDL entries of these variables.

* lisp/progmodes/cc-mode.el (c-before-change-include-<>)
(c-after-change-include-<>): New functions.

(cherry picked from commit 76268160ba9262a8479589427b8e783db0242260)

; * src/w32dwrite.c (Fw32_dwrite_reinit): Doc fix.

(cherry picked from commit 3d508157e03597b00c46c82d42a60742c01a0250)

; Minor fixes to last changes

* src/w32font.h:
* src/w32font.c:
* src/w32dwrite.c:
* etc/NEWS: Minor fixes of last changes.  (Bug#73730)

(cherry picked from commit 222a5207c4d8fa31103637018ae0a7bdb74dd660)

Implement drawing text with DirectWrite on MS-Windows.

This adds support for color fonts.
* configure.ac: Add src/w32drite to W32_OBJ.
* src/w32dwrite.c: New file.
(w32-initialize-direct-write): New function, initialize the
DirectWrite library if it is available, and required global
variables.
(w32_use_direct_write): New function, check if DirectWrite
is available and activated by the user.
(w32_dwrite_encode_char): New function, replacement for HarfBuzz's
'encode_char'.
(w32_dwrite_text_extents): New function, replacement for w32font
text_extents.
(w32_dwrite_draw): New function, replacement for w32font draw.
(w32_dwrite_free_cached_face): New function, used in the font
deletion process to also delete DirectWrite data.
(verify_hr): New function, verify COM method results.
(release_com): New function, release a COM object.
(w32-dwrite-available): New function, returns true if DirectWrite
is available.
(w32-dwrite-reinit): New function, reinitialize DirectWrite,
optionally setting some rendering parameters.
* src/w32font.c (w32font_text_extents): If DirectWrite is enabled,
call 'w32_dwrite_text_extents'.
(w32font_draw): If DirectWrite is enabled, call 'w32_dwrite_draw'.
* src/w32uniscribe.c: (w32hb_encode_char): If DirectWrite is enabled,
call 'w32_dwrite_encode_char'.
(syms_of_w32uniscribe_for_pdumper): Initialize DirectWrite.
(uniscribe_close): Free DirectWrite data for the font.

Bug#73730

(cherry picked from commit edf37e811cafa4092b13969613fa83f6e6d69ab3)

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

(cherry picked from commit 517711c373b9c80811371014fc5a7786aa7548eb)

Improve drag and drop on MS-Windows (bug#3468)

Add support for 'dnd-scroll-margin' and 'dnd-indicate-insertion-point'
by calling 'dnd-handle-movement' when dragging the mouse.

* lisp/term/w32-win.el (w32-drag-n-drop): Call 'dnd-handle-movement'
when applicable.
* src/w32fns.c (w32_handle_drag_movement): New function, sends a
WM_EMACS_DRAGOVER message.
(w32_drop_target_DragEnter): Call 'w32_handle_drag_movement'.
(w32_drop_target_DragOver): Call 'w32_handle_drag_movement'.
* src/w32term.c: (w32_read_socket): Handle WM_EMACS_DRAGOVER,
sending a drag-n-drop event.
* src/w32term.h: Define new WM_EMACS_DRAGOVER message.

(cherry picked from commit 3eb2a85d10e0ad7b50e96ee4e80ba08b3a71b9ae)

Cease binding M-& in Gnus

; Remove some outdated Flymake tests

; * lisp/filet.el: Minor tweaks

save-buffers-kill-emacs: Adjust confirmation prompt when restarting

* lisp/files.el (save-buffers-kill-emacs): When restarting, ask
"Really restart Emacs?".

(cherry picked from commit df677f65fd1b4f0d16e59d5df9735139d2a667c8)

vc-modify-change-comment: Revert Log View buffer

* lisp/vc/vc.el (vc-modify-change-comment): Revert the Log View
buffer after modifying the change comment.

(cherry picked from commit 9729353ba019d9e7f603515dbf88cbc8807bb120)

Fix error message in charset.c

* src/charset.c (Fdefine_charset_internal): Don't reference
uninitialized value in error message.  (Bug#73985)

(cherry picked from commit f33bc659c9110682174157086c60203d55725d20)

; Touch up & fix documentation changes from last commit

(cherry picked from commit fefc3005d46f4ac41af624d4591b052df92e4bd0)

vc-clone: Make interactive; call vc-guess-url-backend

* lisp/vc/vc.el (vc-clone): Make interactive.  Call
vc-guess-url-backend.  Always return DIRECTORY if it names a
directory.  New optional argument OPEN-DIR.
(vc--remotes-history): New defvar.
* etc/NEWS: Announce these changes.

(cherry picked from commit be29879850028d316592ba82cd859d31a67c1ffe)

Move package-vc-heuristic-alist and related to vc.el

* lisp/emacs-lisp/package-vc.el (package-vc--backend-type)
(package-vc-heuristic-alist, package-vc--guess-backend): Rename
to vc-cloneable-backends-custom-type, vc-clone-heuristic-alist
and vc-guess-url-backend respectively, and move to
lisp/vc/vc.el.  Make package-vc-heuristic-alist an obsolete
alias.
(package-vc--clone, package-vc--read-package-name)
(package-vc-install, package-vc-checkout): Use
vc-guess-url-backend.
* lisp/vc/vc.el (vc-cloneable-backends-custom-type)
(vc-clone-heuristic-alist, vc-guess-url-backend): New defconst,
defcustom and defun, respectively: renamed and moved here from
lisp/emacs-lisp/package-vc.el.

(cherry picked from commit 98b02f56d12f2f39a6667d33d50f9e551a267d6d)

; Drop two outdated calls to 'require'

* lisp/emacs-lisp/backtrace.el (require):
* lisp/wid-edit.el (require): Don't require subr-x.  if-let,
when-let and friends have all been in subr.el for a while.

(cherry picked from commit db587ae8ba7d7b281f6935ed5d038b7ecf4abd5d)

* doc/misc/tramp.texi (Bug Reports): Explain bisecting.

(cherry picked from commit 767493ccb693f65cf8621cd82f0ecf92be976f55)

; Skip commit 8903106bb783c2825233c149b6799960aacdea57

Update special conditionals documentation

* doc/lispref/control.texi (Conditionals): Document if-let* and
when-let*, not if-let and when-let.  Document and-let*.

(cherry picked from commit eae798486a965ec176bef3cc343625c164986c3f)

vc-allow-rewriting-published-history: Use nil->ask->t

* lisp/vc/vc.el (vc-allow-rewriting-published-history): Use
increasingly permissive values nil->ask->t rather than
nil->t->no-ask.  Recommend `ask' or nil.
* lisp/vc/vc-git.el (vc-git--assert-allowed-rewrite): Update
accordingly.

(cherry picked from commit 3bb1b85b78b8079e160dcb10774fe82c2daa1b4d)

; Update the NEWS entry to mention project-prompter correctly

(cherry picked from commit bc8f416ee97795e77a36d6dd25a2a037bdc4a5c4)

project-prompter: Update the docstring for the recent change

* lisp/progmodes/project.el (project-prompter):
Update the docstring too (bug#70833).

(cherry picked from commit efaec5f61df967e2a4b85c5607f559f92f220ca9)

; * test/lisp/proced-tests.el (proced--within-buffer): Instrument macro.

Do not merge with master

(cherry picked from commit 75584a3a9614541478cf05edc6223de8db3d350c)

configure.ac: Fix FIONREAD check with gcc-14 on Solaris

Before this fix, it would fail to build with gcc-14 with the error:
conftest.c: In function 'main':
conftest.c:265:11: error: implicit declaration of function 'ioctl'
 [-Wimplicit-function-declaration]
  265 | int foo = ioctl (0, FIONREAD, &foo);
      |           ^~~~~

Solaris documents ioctl() as being defined in <unistd.h>.

* configure.ac: Fix FIONREAD check with gcc-14 on Solaris.
Ref:
https://lists.gnu.org/r/emacs-devel/2024-10/msg00195.html

Copyright-paperwork-exempt: yes
(cherry picked from commit 5e5689a2a40cd16d7593a0c7ddea5511adc3bf22)

; Improve documentation of 'native-compile-directory' (bug#73303)

* lisp/emacs-lisp/comp.el (native-compile-directory): Doc fix.

* doc/lispref/compile.texi (Native-Compilation Functions):
Document 'native-compile-directory'.

* etc/NEWS: Improve wording.

(cherry picked from commit c037b253975da883594f10f48e0be53d81a32756)

; vc-git-modify-change-comment: Restore ignoring --amend

This was accidentally lost when installing this new feature on
master.

(cherry picked from commit e756d4373bdf1b076ee284c46637855908dd10d7)

; Improve comment from last change

(cherry picked from commit f5451b6a0668f4dc9992562b62ed37a199f1fdad)

vc-git-modify-change-comment: Check for other autosquashing

* lisp/vc/vc-git.el (vc-git-modify-change-comment): Check that a
rebase with --autosquash won't make any other changes and give
the user a chance to abort.

(cherry picked from commit c259db1d454a27cc79217f4740b1ecdb4bb28114)

; Insert missing quotation in FIXME

(cherry picked from commit 87766c88d5f343017972558d364eff024884f71a)

Support modifying VC change comments for Git

* lisp/vc/vc.el (vc-allow-rewriting-published-history): New option.
* lisp/vc/vc-git.el (vc-git--assert-allowed-rewrite)
(vc-git-modify-change-comment): New functions (bug#64055).

(vc-git--current-branch): Factor out of vc-git-dir--branch-headers.
(vc-git--log-edit-extract-headers): Factor out of vc-git-checkin.

* etc/NEWS: Announce the new support and option.

(cherry picked from commit 00149f18ea90c0c1dae525581ef4924201336be3)

Document and-let* vs. when-let* usage convention

* lisp/subr.el (and-let*): Document and/and-let*
vs. when/when-let* usage convention (some discussion in
bug#73853).
(when-let*): Add cross-reference to and-let*.

(cherry picked from commit 09e05f7ee4de89f5f1dd95aa9498feccfa9a78d6)

Fix error when splicing Eshell globs and a glob expands to itself

This could happen when 'eshell-extended-glob' determines that a "glob"
is not really a glob.  This mainly happens for remote file names with a
"~" in them, like "/ssh:remote:~/file.txt".

* lisp/eshell/em-glob.el (eshell-extended-glob): Return a list when
'eshell-glob-splice-results' is non-nil.
* test/lisp/eshell/em-glob-tests.el
(em-glob-test/expand/splice-results)
em-glob-test/expand/no-splice-results): Extend tests.

(cherry picked from commit b7a375f5c49ac86399b9af7a6a74720ed294abd7)

* etc/package-keyring.gpg: Update expiration and add new key

(cherry picked from commit 2289e162268b82d1d757c2354bf3fdf92316e91d)

Avoid crashes when scrolling images under winner-mode

* src/window.c (window_scroll_pixel_based): Fix calculation of a
window's vscroll.  (Bug#73933)

(cherry picked from commit 48024096fea5ccdeb79dab5793a6f7a293b95919)

; * doc/lispref/display.texi (Fontsets): Clarify wording.

(cherry picked from commit c35d6ba9f07b0a8417ef116359049c0dd63e12b5)

; * doc/lispref/display.texi (Fontsets): Fix typo.

(cherry picked from commit 88a1a32fc57817d5e0e1f79b83ff23d7274cbace)

; Add indexing for 'use-default-font-for-symbols'

* doc/emacs/mule.texi (Modifying Fontsets):
* doc/lispref/display.texi (Fontsets): Index
'use-default-font-for-symbols'.

(cherry picked from commit 6be47058cd741e5868f5c2fdef0fd59e296f18b6)

* src/lread.c (READ_AND_BUFFER): Reject negative chars (bug#73914).

(cherry picked from commit 681f70ea04a30bb43bb87448a6d71458d773d247)

* test/Makefile.in: Do not show emacs-module-tests.log by default.

(cherry picked from commit ac4151e0023f4bf17eb128036c006618332f1ac0)

Fix 'php-ts-mode': better indentation and font locking

Incomplete compound_statement or colon_block (statement-group
without a closing brace or closing keyword) that are not inside
a function or method are not recognized as such by tree-sitter-php.
A new function 'php-ts-mode--open-statement-group-heuristic'
handles this case.  Font locking of magic methods and better
support for alternative control structure syntax.
Support for latest grammar version.
* lisp/progmodes/php-ts-mode.el
(php-ts-mode--language-source-alist): Updated grammar version.
(php-ts-mode--possibly-braceless-keyword-re): Regular expression
for braceless keyword.
(php-ts-mode--open-statement-group-heuristic): New function.
(php-ts-mode--parent-html-bol): Use the new function and doc fix.
(php-ts-mode--parent-html-heuristic): Use the new function and doc
fix.
(php-ts-mode--indent-styles): Use the new function and add
'colon_block' support.
(php-ts-mode--class-magic-methods): New predefined magic methods
list.
(php-ts-mode--test-namespace-name-as-prefix-p): Doc fix.
(php-ts-mode--test-namespace-aliasing-clause-p): Fix the test and
doc.
(php-ts-mode--test-namespace-use-group-clause-p): Doc fix.
(php-ts-mode--test-visibility-modifier-operation-clause-p): New
function for the new asymmetric property visibility feature of
PHP 8.4.
(php-ts-mode--font-lock-settings): Font lock for class magic methods
and alternative syntax.  Better font lock for 'instanceof'.  Use
'font-lock-function-call-face' for scoped and member call expression.
(bug#73779)

(cherry picked from commit 4e0cb960dbd95c8001b08c62682b085292184b87)

* lisp/filet.el: Add Commentary

; Update lisp/ldefs-boot.el

Improve filet.el

Drop flymake-proc.el

Drop flymake-cc.el

* filet.el: New file

Do not rely on package.el

* lisp/dired-aux.el (dired-query): Simplify prompt

(eglot--connect): Guard against dead buffers

Remove debug message

Fix bootstrap further

Fix bootstrap

Drop newly added 'dired-yank'

Add 'native-compile-directory' (bug#73303)

* lisp/emacs-lisp/comp.el (native-compile-directory): New function.
* etc/NEWS (native-compile-directory): Add to NEWS.

(cherry picked from commit 246d68bd2a5468bd428a0406402e7ad2b3005314)

* Rework 'comp-lookup-eln'

* lisp/emacs-lisp/comp.el (comp-lookup-eln): Rework to use
'comp-eln-load-path-eff'.

(cherry picked from commit 202adfcfcc2ed20fa91d8377107618c8113f7106)

; Fix a recent change to EWW

* lisp/net/eww.el (eww--guess-content-type): Save excursion.

(cherry picked from commit f58652a41978974855be0993d42ace225b64efed)

; Skip commit a9cf51d5f01cb7067c547af2905ab391979b18f4

; Improve documentation of 'eww-guess-content-type-functions'

* lisp/net/eww.el (eww-guess-content-type-functions): Doc fix.

* etc/NEWS: Announce 'eww-guess-content-type-functions'.

Bug#73133

(cherry picked from commit 9fdc03e8f9868bb9253a0df9bf0c1b718e8576a8)

Add customization to let EWW guess content-type if needed

* lisp/net/eww.el (eww-guess-content-type-functions): New user option.
(eww--guess-content-type, eww--html-if-doctype): New functions.
(eww-render): Call 'eww--guess-content-type' (bug#73133).

(cherry picked from commit 9074a9f496b04ab58588b71f51d7830782fc7a29)

* lisp/files.el (require-with-check): Provide more info in the error message

Rather than only show the "new" file to be loaded, show also the
name of the currently loaded file, to clarify the conflict.

(cherry picked from commit 8a2fbddf17b4beb31d19161769066a4c1bd8bab0)

Fix a race condition when running Eshell startup scripts

Previously, these scripts could run before all the Eshell modules had
fully-initialized.

* lisp/eshell/esh-mode.el (eshell-after-initialize-hook): New hook...
(eshell-mode): ... run it.

* lisp/eshell/em-script.el (eshell-run-startup-scripts): New function...
(eshell-script-initialize): ... add it to
'eshell-after-initialize-hook'.

* etc/NEWS: Announce 'eshell-after-initialize-hook'.

(cherry picked from commit 605f26cf70ab3d7c5ea635c19cd2a280812a4ddc)

Let 'tex-view' show PDFs made without a DVI (bug#73854)

* lisp/textmodes/tex-mode.el (tex-print-file): Update doc string
to mention 'tex-compile'.
(tex-compile-commands): Add entries for 'evince' and 'mupdf'.
(tex-compile): Set 'tex-print-file'.

(cherry picked from commit 1f8fbae8df764e9d24f1b824de7369d82e36abae)

; Reapply a fix for recent change in eww.el

* lisp/net/eww.el (eww--list-buffers-display-table)
(eww-buffers-mode): Fix coding conventions.

(cherry picked from commit e289f7dbb4f04776e8327e7865a9082078c084a9)

Revert "; Fix last change."

This reverts commit 75fa0cc1ae2b53fe169fdcfef52bee6719eb38a7.
The large part of it was committed by accident.

(cherry picked from commit 88a6a17adb7eff84e05d93ea357ae3eff9a84c48)

; Make utility functions for getting the Eshell non-special regexps

* lisp/eshell/esh-arg.el (eshell-inside-quote-regexp)
(eshell-outside-quote-regexp): Rename to...
(eshell--non-special-inside-quote-regexp)
(eshell--non-special-outside-quote-regexp): ... these, and add
defsubsts.
(eshell-arg-initialize): Don't initialize regexp variables.
(eshell-parse-non-special): ... use them.

* lisp/eshell/em-glob.el (eshell-glob-chars-regexp): Use 'rx-to-string'.

(cherry picked from commit b573aaab76b55ec276b9190570b3ca3ae72cb416)

Make all the entries in 'eshell-parse-argument-hook' named functions

* lisp/eshell/esh-arg.el (eshell-parse-number, eshell-parse-non-special)
(eshell-parse-whitespace, eshell-parse-comment): New functions...
(eshell-parse-argument-hook): ... use them.

(cherry picked from commit 212cf3125611b123707feac6f7ffd55a230bc568)

; Undo WIP accidentally included in recent commit

(cherry picked from commit 14624ff0fb7aec095a8846c3de5b089c93aa85da)

; * lisp/eshell/esh-var.el (eshell-glob-function): Remove unused defvar.

(cherry picked from commit fc6854cbd4733ef4247f5d9fd99d88d7b79c4dc4)

Be more careful about applying spliced arguments

Previously, this could 'nonc' to a list that shouldn't be modified.

* lisp/eshell/esh-cmd.el (eshell-rewrite-named-command): Use 'append'
instead of 'nconc'.

* test/lisp/eshell/esh-var-tests.el (esh-var-test/interp-var-splice):
(esh-var-test/quoted-interp-var-splice): New tests.

(cherry picked from commit 183c5efc0fe80074a40ebebb684d787baf578ffe)

; Fix last change.

* lisp/net/eww.el (eww--list-buffers-display-table)
(eww-buffers-mode): Fix coding conventions.

(cherry picked from commit 75fa0cc1ae2b53fe169fdcfef52bee6719eb38a7)

Use vtable in eww-list-buffers and add function eww-buffer-list

* lisp/net/eww.el (eww-buffer-list): New function.
(eww-list-buffers): Move logic to...
(eww--list-buffers-display-table, eww--list-buffers-get-data):
... these, and use 'vtable'.
(eww-buffer-select, eww-buffer-show, eww-buffer-kill)
(eww-buffers-mode-map): Use 'vtable-current-object'.
(eww-buffers-mode): Set 'revert-buffer-function'

(cherry picked from commit d3975cc925a856c872016df734563ce0709f3efc)

; Skip commit 53e84f8cfa85bb53c92936a3be73ab1445a89459

; Skip commit 2114a955c23c213168f012f5e480edae46561fd2

; * lisp/vc/log-view.el (log-view-modify-change-comment): Add FIXME.

(cherry picked from commit 6c928e490d3347cc309eda51cefbc46fba955650)

Minor changes of last commit

* lisp/autorevert.el (auto-revert--last-time): Init with 0 (Epoch).
(auto-revert-notify-handler): Simplify.

(cherry picked from commit 0bdaab7655787d717d69581e30346233e293c6f2)

Enhance the auto-revert to avoid revert a buffer in short time

* lisp/autorevert.el (auto-revert--last-time): New defvar.
(auto-revert-handler, auto-revert-notify-handler): Use it.
* test/lisp/autorevert-tests.el (with-auto-revert-test): Set
`auto-revert--lockout-interval' correctly.

(cherry picked from commit 545c54aea1ecccf84eaebbe3a3cb7b5fbc5716f8)

; Avoid byte-compiler warning in mpc.el

* lisp/mpc.el (mpc-cmd-crossfade): Move after definition of
'mpc-crossfade-time', because the function uses it.

(cherry picked from commit 80627a31c67b383393c53bd87dd21b7f0de3844e)

Fix 'min-width' calculation in 'visual-wrap-prefix-mode'

* lisp/visual-wrap.el (visual-wrap--content-prefix): Remove 'min-width'
before computing the pixel width to avoid miscalculation (bug#73882).

(cherry picked from commit 81a5beb8af020e4c92a77d61c8aa5e637e2dc945)

Add ability to crossfade between songs in 'mpc'

* lisp/mpc.el (mpc-cmd-crossfade):
(mpc-toggle-crossfade): New function.
(mpc-crossfade-time): New option.
(mpc-mode-menu): Add menu item to toggle crossfade.  (Bug#73891)

(cherry picked from commit 08f3bc1b8e6a3583c8ccda02a7cf1b59c8d3f514)

; * lisp/vc/log-view.el (log-view-modify-change-comment): Add FIXME.

(cherry picked from commit de0800c511740de7ad4dcb7dda0a0083a094d749)

Lazily convert numeric strings to Lisp numbers in Eshell

This should reduce the number of issues with Eshell converting strings
to numbers too aggressively and losing information (e.g. "001" -> 1)
while still allowing almost all of the beneficial uses, like summing a
list of numeric strings with '+'.

* lisp/eshell/esh-util.el (eshell--do-mark-numeric-string): New
function.
(eshell-convert-to-number): Make obsolete in favor of...
(eshell-mark-numeric-string): ... this.  Update callers.

* lisp/eshell/esh-arg.el (eshell--numberlike-p): New function...
(eshell-concat-1): ... use it.

* test/lisp/eshell/esh-util-tests.el:  Reimplement type conversion tests
to use 'eshell-convertible-to-number-p' instead.

* test/lisp/eshell/esh-var-tests.el
(esh-var-test/interp-var-splice-concat, esh-var-test/interp-concat-cmd)
(esh-var-test/interp-convert-var-split-indices)
(esh-var-test/interp-convert-quoted-var-split-indices)
(esh-var-test/interp-convert-cmd-multiline)
(esh-var-test/interp-convert-cmd-split-indices): Adjust tests to check
the new behavior.

* doc/misc/eshell.texi (Type Conversion): New section.
(Expansion): Clarify concatenation behavior.

(cherry picked from commit 43d5b7a04c4b1a8a7d57f25824df2e8720d2c567)

; Skip commit 902029b1410ef9128380f9a307721ea6ab008529

New FAQ about Ctrl keys on xterm

* doc/misc/efaq.texi
(Some Ctrl-modified keys do not work on xterm): New section
(bug#73813).

(cherry picked from commit a61bf74225737a7c87b95d604b6e8c2ce9686296)

Autoload 'message-narrow-to-headers-or-head' in mml.el

* lisp/gnus/mml.el (message-narrow-to-headers-or-head): Autoload
it.  (Bug#73815)

(cherry picked from commit f353fcc8506f510401982ec148b94120422f28cd)

; Skip commit c1791a2749468a120bbb8b1023b041f2370fc679

Fix etags tagging by multiline regexps

* lib-src/etags.c (regex_tag_multiline): Fix off-by-one error in
determining the end of the tag matched by a multiline regexp.
(Bug#73771)

* test/manual/etags/ETAGS.good_4:
* test/manual/etags/ETAGS.good_5:
* test/manual/etags/ETAGS.good_6: Adjust test results to the above
change.

(cherry picked from commit d0be0965ca344caab7879b2ac2373a68025c9ba2)

Hide default-directory absolute file name in dired-hide-details-mode

* lisp/dired.el (dired-hide-details-hide-absolute-location):
New user option.
(dired-insert-directory, dired-build-subdir-alist): Use it to
hide absolute file name of the directory.
(dired-hide-details-mode): Update doc string.
* test/lisp/dired-tests.el
(dired-test-hide-absolute-location-enabled)
(dired-test-hide-absolute-location-disabled): New tests

* etc/NEWS: Announce the new feature.

Bug#72272

(cherry picked from commit 7cbca90569472af5643905fca5b7ab2dea67f876)

Rewrite Speedbar expansion for all descendants (bug#73533)

Rewrite 'speedbar-expand-line-descendants' to avoid getting into
an infinite loop by reaching max-lisp-eval-depth.  The new
method avoids querying and displaying information for every
movement, instead using a single message to indicate that
expansion is in progress, and so is significantly faster.  The
narrowing per item introduced by the fix for bug#35014 is
removed because it prevented expanded descendant items when the
top-level item was already expanded.
* lisp/speedbar.el (speedbar--get-line-indent-level): New
function to return the indentation level of the current line.
(speedbar-expand-line-descendants): Use simpler line motion and
no recursion.  Output messages indicating when expansion is in
progress and when it is completed.  Fix expansion of descendants
where the top-level item was already expanded.

(cherry picked from commit bcc4e64fa7aab9f44e3a7bcdf651a32ec52866c2)