; * doc/lispref/frames.texi (Yanking Media): Add index entry.

(cherry picked from commit 8a4d13e370cb816438816a4af77f70f4d0de9618)

* lisp/files.el (require-with-check): Be a bit more lenient (bug74040)

(cherry picked from commit 0aae02a3741c397d6952e3128d434827aca0f912)

(with-peg-rules): Fix references to rulesets (bug#74018)

PEG rules get "compiled" to functions with name `peg-rule <RULE>`.
`define-peg-ruleset` instead defines it PEG rules with name
`peg-rule <RULESET> <RULE>`, so that they can be made visible
by `with-peg-rules` simply by adding local aliases from
`peg-rule <RULE>` to `peg-rule <RULESET> <RULE>`.

Apparently when I added `define-peg-ruleset` I somehow failed to
install some of the corresponding code in `with-peg-rules`, so
the aliases were not installed, making it "impossible" to use
rulesets.
[ I still have no idea how this happened and/or where
  the missing code went, so I "recreated" it.  ]

* lisp/progmodes/peg.el (with-peg-rules): Install the aliases
for the rulesets.
(peg--translate-rule-body): Try and preserve
location info when emitting a warning.

* test/lisp/progmodes/peg-tests.el (peg-test-myrules): New ruleset.
(peg-test-ruleset): New test.

(cherry picked from commit cc6a11f4832076acb7c0b5301eb1add026fabe4b)

; * etc/NEWS: Fix typo (bug#74066).

(cherry picked from commit 70f084db2ff36be2eb183a5c7f6aa88a44ff0d5e)

Tweak doc w.r.t to "void function" (bug#73886)

* doc/lispref/functions.texi (Function Cells): Avoid talking
about the function cell being void.

* src/data.c (Fboundp, Ffmakunbound, Fsymbol_function):
Don't suggest that "void" can be considered as a kind of value.

(cherry picked from commit 9e1abf11fc1c3285cfa631ec71f3836d54e2c8d8)

Fix flakey proced refine tests (Bug#73441)

* test/lisp/proced-tests.el (proced-refine-test)
(proced-refine-with-update-test): Use the much simpler CPU refinement
for testing 'proced-refine'.  The previous tests made the incorrect
assumption that refining on the PID of process A only filtered the
buffer to contain process A and its children, whereas in actuality
the children of process A's children, their children, and so on will
also be shown.
(proced-update-preserves-pid-at-point-test): Mark as unstable.

(cherry picked from commit 7a8ca202c5eeb810e5f86510c3ea46d3ec519222)

Another 'void' update

* doc/lispref/symbols.texi (Symbol Components): Another update due
to the change in 'void' function implementation.  (Bug#73886)

(cherry picked from commit 55a8cec013e8879da2c79cd8fbe387d8d2822166)

Don't start docstrings with "This function"

* lisp/calculator.el (calculator-add-operators):
* lisp/erc/erc-log.el (erc-generate-log-file-name-with-date)
(erc-generate-log-file-name-short):
* lisp/eshell/esh-mode.el (eshell-begin-on-new-line):
* lisp/progmodes/hideif.el (hif-merge-ifdef-region):
* lisp/tab-bar.el (tab-bar--event-to-item):
* lisp/textmodes/artist.el (artist-no-rb-unset-point2)
(artist-no-rb-unset-points):
* lisp/which-key.el (which-key--hide-popup): Don't start function
docstrings with "This function".

(cherry picked from commit 4df832750c811abc5ccbe7bfcefe1ad8f144af8e)

Mark unused reftex variable as obsolete

* lisp/textmodes/reftex-vars.el
(reftex-toc-split-windows-horizontally-fraction): Mark unused variable
as obsolete in favor of 'reftex-toc-split-windows-fraction'.

(cherry picked from commit 471716c67d0d00a2e90dd7dfbc2bb88820a248a2)

Improve evaluation of conditional Eshell forms

This simplifies the logic for building these forms and also fixes an
issue where a subcommand in a "&&" or "||" conditional had its output
suppressed.

* lisp/eshell/esh-cmd.el (eshell-structure-basic-command): Make
obsolete.
(eshell-silence-test-command): New function...
(eshell-rewrite-while-command, eshell-rewrite-if-command): ... use it,
and make the command form ourselves.
(eshell-parse-pipeline): Use 'and' and 'or' to make the conditional
command sequence.
(eshell-command-success): New macro.
(eshell-do-eval): Add support for 'and' and 'or' forms.

* test/lisp/eshell/esh-cmd-tests.el (esh-cmd-test/and-operator/output)
(esh-cmd-test/or-operator/output): New tests.

(cherry picked from commit 673c906a5b7255987c09f534de45e555fc7fc9ae)

; time-stamp: Reformat some long doc strings for clarity.

* lisp/time-stamp.el (time-stamp-format, time-stamp-pattern): Reformat
doc strings for clarity.
(group time-stamp): is a subgroup of "files", not "data".
The "data" group seems to be for editing non-text files.
* test/lisp/time-stamp-tests.el: Fix tense of some doc strings.

(cherry picked from commit ffda8dfe847094bd8488059be2f96270fe298fa5)

; Skip commit 872be2bb5febc5a720d6f4dbbd2fd30561385bb6

; Skip commit 1863028742977caf0d3f3973a94ef48eb040421b

Improve correctness of Eshell globs when using escape characters

This new implementation opts *in* to treating characters as glob
characters, rather than opting out.  This reduces the need to coordinate
with other parts of Eshell and should be harder to break (bug#74033).

* lisp/eshell/em-glob.el (eshell-parse-glob-chars): Return the
propertized globbing character directly.
(eshell--propertize-glob, eshell--glob-char-p)
(eshell--contains-glob-char-p, eshell--all-glob-chars-p): New functions.
(eshell-glob-p): Make obsolete.
(eshell-glob-regexp, eshell-glob-convert-1, eshell-glob-convert): Check
for 'eshell-glob-char' property.
(eshell-extended-glob): Remove text properties when returning no match.
(eshell--glob-anything): New constant.
(eshell-glob-entries): Propertize "*" to treat it as a glob.

* lisp/eshell/em-ls.el (eshell-ls--expand-wildcards): New function...
(eshell-ls--insert-directory): ... use it.

* test/lisp/eshell/em-glob-tests.el: Use 'eshell--propertize-glob' in
tests.
(em-glob-test/convert/literal-characters)
(em-glob-test/convert/mixed-literal-characters): New tests.

* lisp/eshell/em-glob.el (eshell-expand-glob): Rename from
'eshell-extended-glob'.  Update callers.
(eshell-extended-glob): New function to expand a GLOB that hasn't been
propertized yet, for use outside of Eshell command forms.
(eshell-parse-glob-chars): Return the propertized globbing character
directly.
(eshell-parse-glob-string, eshell--glob-char-p)
(eshell--contains-glob-char-p, eshell--all-glob-chars-p): New functions.
(eshell-glob-regexp, eshell-glob-convert-1, eshell-glob-convert): Check
for 'eshell-glob-char' property.
(eshell-glob-p): Make obsolete.
(eshell--glob-anything): New constant...
(eshell-glob-entries): ... use it.

* lisp/eshell/em-ls.el (eshell-ls--expand-wildcards): New function...
(eshell-ls--insert-directory): ... use it.

* test/lisp/eshell/em-glob-tests.el: Use 'eshell-parse-glob-string in
tests.
(em-glob-test/convert/literal-characters)
(em-glob-test/convert/mixed-literal-characters): New tests.

(cherry picked from commit 9682d385c103a9ee1afdeaf3e1711fa3d2001eee)

Fix and improve behavior of 'eshell/clear'

* lisp/eshell/esh-mode.el (eshell-clear): New function.
(eshell/clear): Fix incorrect behavior, and do the right thing when
'eshell-scroll-show-maximum-output' is nil.
(eshell/clear-scrollback): Call 'eshell/clear'.

* test/lisp/eshell/esh-mode-tests.el
(esh-mode-test/clear/eshell-command)
(esh-mode-test/clear/eshell-command/erase)
(esh-mode-test/clear/emacs-command)
(esh-mode-test/clear/emacs-command/erase): New tests.

* etc/NEWS: Mention the new 'eshell-command' (bug#73722).

(cherry picked from commit 98e24e369a3f6bed95cdf0b32ee03999f5dfb98b)

; Skip commit 9ff155183ca560fc9005027a65c53544afb772a1

project-tests: Add test assertion for bug#73801

* test/lisp/progmodes/project-tests.el
(project-vc-extra-root-markers-supports-wildcards): End with a
check that we didn't cache a wrong value for parent (bug#73801).

(cherry picked from commit 94a9e40e82d4180563d7bddfa0cc6c8990824f8d)

Don't remove trailing slash in Eshell "pwd" for remote root directories

* lisp/eshell/em-dirs.el (eshell/pwd): Check if 'file-local-name' of the
directory is the root dir.

(cherry picked from commit 33997047e891d5513c4f33ab78ad353746ed16e2)

; Skip commit 9fe7b8ca418002c6b253a8cb154edb1da24a8643

Fix 'yank-media' to allow yanking SVG data

* lisp/net/mailcap.el (mailcap-mime-type-to-extension): Return
"svg" for mime type 'image/svg+xml'.  Org-mode uses this.
* lisp/yank-media.el (yank-media--find-matching-media): If svg is
supported, don't filter out 'image/svg+xml'.  (Bug#74044)

(cherry picked from commit bf395fd8bcc68499479cd6df31319eca93509359)

shr.el: Define rendering rule for math tag

* lisp/net/shr.el (shr-tag-math): New function, see bug#73641.

(cherry picked from commit 9c5b6e88e7f851e239721a0fd855fbcd10b5b0a3)

; Skip commit f6c359cb66a0e9b851e3467b1ba9cab7efa8f744

Call tab-bar-tab-post-open-functions during tabs initialization

* lisp/tab-bar.el (tab-bar-tabs): Run the hook
'tab-bar-tab-post-open-functions' after creating the first tab
in the selected frame's tab-bar list of tabs (bug#74087).
Suggested by Ship Mints <shipmints@gmail.com>.

(cherry picked from commit 2c062dfdf50970766db179ccbad7ce71c541cd72)

; Skip commit 57fe24961fd1df04c9df1ba790932d6545f729e8

; Skip commit 1bf1753d79eaf8c972885f4f0a105ed42344362f

; Revise improvements to vc-git-stash-read

* lisp/vc/vc-git.el (vc-git-stash-read): Use a keyword argument.
Abbreviate the prompt reference to the most recent stash.
(vc-git-stash-pop): Update call to vc-git-stash-read.

(cherry picked from commit 679c0c7b940687a63937a361d0439c68b7bf4d51)

; * lisp/vc/vc-git.el (vc-git-stash-read): Use string-empty-p.

(cherry picked from commit 6a2e49e53f1072bf1b41e113531627024d8b9845)

; * lisp/vc/vc-git.el (vc-deduce-fileset): Declare.

(cherry picked from commit 4024c5db892b910ee66167479596131c8d64841f)

Improve prompting for git stashes

* lisp/vc/vc-git.el (vc-git-stash-read): New DEFAULT-MOST-RECENT
optional argument.  Use format-prompt.  Signal user-error
immediately if there are no stashes.  Rewrite docstring.
(vc-git-stash-show, vc-git-stash-apply, vc-git-stash-pop)
(vc-git-stash-delete): Drop trailing ": " from prompts.
(vc-git-stash-pop): Pass non-nil DEFAULT-MOST-RECENT to
vc-git-stash-read.

(cherry picked from commit 90ffe8a36b16801eaf0ca9b0ffca07156cf3c26d)

VC Git: Use vc-deduce-fileset to determine what to stash

* lisp/vc/vc-git.el (vc-git--deduce-files-for-stash): New function.
(vc-git-stash, vc-git-stash-snapshot): Use it to determine what
to stash.  Update and expand docstrings.
(vc-git-stash-snapshot): No longer unconditionally snapshot all
uncommitted changes across the whole working tree.

(cherry picked from commit 4a49c50a4c351503a94c223da05888e5fd3d4fa1)

Further simplify tmm.el

Fix bug#74091

Avoid messing with 'deactivate-mark'

Drop 'text-clone-create'

Fix c-ts-common-comment-indent-new-line (bug#73900)

* lisp/progmodes/c-ts-common.el:
(c-ts-common-comment-indent-new-line): Delete trailing
whitespace before inserting newline.  The insert-line-break
function is the same as in c-indent-new-comment-line.

(cherry picked from commit 9aa186592634212fcdb2dbafdfd0c52a2475ba96)

; * lisp/vc/log-edit.el (log-edit-diff-function): Tweak formatting.

(cherry picked from commit 15b9d99cef63f6743e49d350136157bd42d362e9)

* lisp/vc/log-edit.el (log-edit-diff-function): Document.

(cherry picked from commit c7a1fafa992b217014430fb30fd09c8e037227e0)

Fix the call to treesit-thing-defined-p

* lisp/treesit.el (treesit-defun-at-point): Add the necessary
2nd argument.

(cherry picked from commit 1551c306f30cc139b321056c03206df4b71eae5c)

project--completing-read-strict: Move some common processing here

* lisp/progmodes/project.el (project--completing-read-strict):
Add new optional argument, COMMON-PARENT-DIRECTORY.  Move the
absolute->relative processing of MB-DEFAULT and the contents of
HIST here.
(project--read-file-cpd-relative): From here.  So that
'project--read-file-absolute' can also benefit from those
conversions.
(project--read-file-absolute): Pass the new argument.
(project-read-file-name-function): Update value tags.

(cherry picked from commit c0cb369ab188ea7ae0d3271d19c0cecce7be0329)

project--read-file-cpd-relative: Move out the 'included-cpd' logic

* lisp/progmodes/project.el (project-find-dir):
Use 'project-files-relative-names'.  Include "./" here rather than
(project--read-file-cpd-relative): ...doing it here.

(cherry picked from commit a6626a00dc4b459e57d700e5bb7524cd3e0a55f8)

Fix window selection after log-edit-show-diff

* lisp/vc/vc.el (vc-diff-patch-string): Use display-buffer, not
pop-to-buffer, for consistency with log-edit-diff-fileset.
(vc-modify-change-comment): Use save-selected-window around
vc-diff-internal to avoid leaving the *vc-diff* window selected,
for consistency with log-edit-diff-fileset.

(cherry picked from commit 40cf6f9009209b8c3363d057882611cd5d56f853)

; Skip commit 41f347c1d1a03c38861d4b422211b6042d87ed06

; Skip commit 7681eacc399612625b38d9504407722bde23dc22

Call PF correctly from pcase--edebug-match-pat-args

Also correct a doc string and insert commentary.  This fixes
bug#74052.

* lisp/emacs-lisp/edebug.el
(edebug--match-&-spec-op <&interpose>): Correct and complete
the doc string, which now says MUST call exactly once, and
documents the return values of FUN, PF and
edebug--match-&-spec-op.  Also remove an unneeded `(...)
construct.

* lisp/emacs-lisp/pcase.el (pcase--edebug-match-pat-args): Call
PF also for the main cases handled.

(cherry picked from commit fb5915665522f747daa8dfa11e91dc406d18edb7)

CC Mode: Add/remove defun buffer locally to post-command-hook

Also remove no longer existing hook.

* lisp/progmodes/cc-mode (c-leave-cc-mode-mode): remove-hook
c-post-command buffer locally.  Delete removal of non-existent
c-post-gc-hook.
(c-basic-common-init): add-hook c-post-command buffer locally.

(cherry picked from commit c05a13ef0dc69497e275b627dbc8e2b25ece7711)

Fix C-c C-d and C-c C-w during log-view-modify-change-comment

* lisp/vc/vc-dispatcher.el (log-edit-diff-fileset)
(log-edit-diff-patch): Declare.
(vc-log-edit, vc-start-logentry): New optional argument
DIFF-FUNCTION to specify log-edit-diff-function in the generated
Log Edit buffer.
* lisp/vc/vc.el (vc-modify-change-comment): Pass the new
DIFF-FUNCTION argument to vc-start-logentry.

(cherry picked from commit fc3de939b9059dd4436134f08e7fa7149087c317)

More workarounds for GDB bug 32313

* src/eval.c (backtrace_args): Same treatment as
backtrace_function.

(cherry picked from commit b7b55dfc03c4d36ae77812c16d15142a6f6f27df)

Fix definitions of Eshell "xtra" functions

* lisp/eshell/em-xtra.el (eshell-parse-command): Remove unnecessary
autoload.
(eshell/substitute): Pass the correct number of arguments to
'cl-substitute'.
(eshell/count, eshell/union, eshell/mismatch, eshell/intersection)
(eshell/set-difference, eshell/set-exclusive-or): Use named arguments
for the required arguments (bug#73738).

(cherry picked from commit ea685170063b59855322ceffdeaaab4acaf8e388)

project-try-vc: Fix the "sometimes wrong cache" issue

* lisp/progmodes/project.el (project-try-vc--search):
Extract from 'project-try-vc'.
(project-try-vc): Use it.
(project-try-vc--search): Call itself recursively directly, to
avoid creating invalid cache entry (bug#73801).

(cherry picked from commit 29b30eb49f8bd8bad4f9e24dd56f32d62bf70121)

Work around GDB bug 32313 when debugging Emacs internals

Problem reported by Eli Zaretskii in:
https://lists.gnu.org/r/emacs-devel/2024-10/msg00653.html
* src/eval.c (backtrace_function_body): Rename from
backtrace_function, and make it static.
(GDB_FUNCPTR): New macro.
(backtrace_function): New function pointer, for GDB only.

(cherry picked from commit ebf3fb9a2295520ef8ce1756086fd9bbd3d04e9e)

Update modus-themes to their version 4.6.0

* doc/misc/modus-themes.org
(Differences between loading and enabling)
(Option for which themes to toggle)
(Option for which themes to rotate, DIY Palette override presets)
(DIY Add padding to the mode line)
(DIY Remap face with local value): Fix typos.
(DIY Add support for solaire-mode): Fix some symbols.
(Full support for packages or face groups)
(Indirectly covered packages): Add newly supported packages.
(DIY Add support for combobulate):,
(DIY Add support for engrave-faces, DIY Add support for howm)
(DIY Add support for meow-mode): Document how to style those
packages.
(Acknowledgements): Update names of people who have in one way
or another contributed to the project.

* etc/themes/modus-operandi-deuteranopia-theme.el:
* etc/themes/modus-operandi-theme.el:
* etc/themes/modus-operandi-tinted-theme.el:
* etc/themes/modus-operandi-tritanopia-theme.el:
* etc/themes/modus-vivendi-deuteranopia-theme.el:
* etc/themes/modus-vivendi-theme.el:
* etc/themes/modus-vivendi-tinted-theme.el:
* etc/themes/modus-vivendi-tritanopia-theme.el:
* etc/themes/modus-themes.el: Make refinements to supported
faces, add support for more faces, and tweak palette entries.

Release notes: <https://protesilaos.com/codelog/2024-10-27-modus-themes-4.6.0/>.

(cherry picked from commit 9e40d3f2a1c2b5388a4eab72dbe506a21816f69b)

Fix doc string of 'wdired-use-dired-vertical-movement'

* lisp/wdired.el (wdired-use-dired-vertical-movement): Remove the
incorrect reference to 'track-eol'.  (Bug#73917)

(cherry picked from commit c78b4d2b31d9b763aa506d8498f70b3e651bbbf5)

Update the documentation of void functions

* doc/lispref/functions.texi (Function Cells):
* src/data.c (Ffboundp, Ffmakunbound, Fsymbol_function): Update
documentation to the changes of how void functions are represented
since Emacs 24.5.  (Bug#73886)

(cherry picked from commit b0aaee93fde245b972a0d69b60328550f53bc043)

; * lisp/vc/log-edit.el (log-edit-diff-function): Grammar fix.

(cherry picked from commit 299a1f240750595d7b0132aec5eb3a2b58c9d943)

; Skip commit 4704dd39de0427466ca3585ab284b7302b0ef2d7

Allow escape from 'read-key'

* lisp/emacs-lisp/backtrace.el (backtrace-mode-map): Add a binding
for 'abort-recursive-edit'.  (Bug#73584)

(cherry picked from commit 734d5e2f294e13ef762bd3bfd644551f7f94e9fa)

Accept texi2any for version identification

* lisp/info.el (Info-file-supports-index-cookies): Accept texi2any
for version identification.  (Bug#74042)

(cherry picked from commit 4af5b794015a64f67d878d43ac6cde1bb39b3bd9)

; Fix typos

(cherry picked from commit 67a27ff53bf0f8473cb6b58ad85298e066b8def4)

; * src/w32dwrite.c (syms_of_w32dwrite): Init 'w32-inhibit-dwrite'.

(cherry picked from commit aaefb67f54513e8375ec8356d09bf2e6f25b9116)

; Fix problem with DirectWrite (MS-Windows)

Negative lbearings were not handled.

* src/w32dwrite.c (w32_dwrite_draw): Modified to handle negative
lbearing.

(cherry picked from commit 702d5ec56684b87dbe7c46d35c6926a46a0697e9)

vc-git-resolve-conflicts: Extend unstage-maybe to similar operations

* lisp/vc/vc-git.el (vc-git-resolve-when-done): When
vc-git-resolve-conflicts is unstage-maybe, don't clear the
staging area during a rebase, am, revert or cherry-pick.
(vc-git-resolve-conflicts): Update docstring in light of changes
to vc-git-resolve-when-done.
(vc-git--cmds-in-progress): Detect reverts and cherry-pick
operations in progress.

(cherry picked from commit d7d5b2ec9a747fac48bd50152e2023d33e78393c)

; Skip commit bd2b064438601271549c137c53e301ae4ebabd55

; Skip commit d354300993e6a48e2d3e72a7e89348cc06b326fb

vc-git-log-edit-toggle-amend: Honor vc-allow-rewriting-published-history

* etc/NEWS: Update the entry for
vc-allow-rewriting-published-history.

* lisp/vc/vc-git.el (vc-git-log-edit-toggle-amend):
Add a check against published history (bug#64055).

(cherry picked from commit 2030b8c7f24a10024ab973149b10194fd50dd2bb)

Fix Eshell incompatibility with "[" command when eshell-pred is disabled

* lisp/eshell/em-pred.el (eshell-pred-initialize): Ensure that
'eshell-parse-arg-modifier' is called before 'eshell-parse-glob-chars'.

* lisp/eshell/em-glob.el (eshell-glob-initialize): Use a number for hook
depth to be clearer.
(eshell-parse-glob-chars): Simplify; since eshell-pred's hook now runs
first, the extra code is no longer necessary.

* test/lisp/eshell/em-glob-tests.el
(em-glob-test/test-command-without-pred): New test.

(cherry picked from commit 523aade3ea11c188e30e3889f031d1848129cf82)

; Ensure 'eshell-split-filename' doesn't expand the filename first

* lisp/eshell/esh-util.el (eshell-split-filename): Never expand the
filename.

* lisp/eshell/em-glob.el (eshell-glob-p): A leading "~" isn't a globbing
character.

* test/lisp/eshell/esh-util-tests.el
(esh-util-test/split-filename/absolute)
(esh-util-test/split-filename/relative)
(esh-util-test/split-filename/user)
(esh-util-test/split-filename/remote-absolute)
(esh-util-test/split-filename/remote-relative)
(esh-util-test/split-filename/remote-user): New tests.

(cherry picked from commit d6fe32e531044b518ae5b6b39377378cbf13292d)

Fix bootstrap on MS-Windows

* src/w32uniscribe.c (syms_of_w32uniscribe): Don't call
'syms_of_w32dwrite' here...
* src/emacs.c (main): ...call it here.  Reported by Andy Moreton
<andrewjmoreton@gmail.com>.

(cherry picked from commit 02510606f6d0e431e36634b8290e648b3a47af18)

Add delete-selection-local-mode.

* lisp/delsel.el (delete-selection-local-mode): Add local version of
'delete-selection-mode'.  The local mode sets the value of the variable
'delete-selection-mode' to maintain compatibility with packages and
features that consider the existing mode.

* doc/emacs/mark.texi (Using Region): Describe
'delete-selection-local-mode'.

* etc/NEWS: Describe 'delete-selection-local-mode'.

(cherry picked from commit e0b21b6c4de4d7f0b7ad9ae112755435f501835e)

; Skip commit 3f94b979d8070c2f6ac1a09638424b8a69b5cbc5

* lisp/editorconfig.el (editorconfig--get-indentation): Fix bug#73991

(cherry picked from commit dd52839dd9d5f5af1f961e3ace2554931ec66510)

; Skip commit ed1d691184df4b50da6b8e1a207e9ccd88aa9ffb

; Skip commit bbc8a5830af7681ef5aea08ae309707a0c989599

; 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)