* search.el: Support changing search context regex

; Fix quoting style in comments in itree.[ch] files

* src/itree.c:
* src/itree.h: Fix quoting style in comments.

(cherry picked from commit e8b8a1121a8d1826f0ff8874e38594bfaedddfac)

Always print the expanded directory name for Eshell's "pwd" command

* lisp/eshell/em-dirs.el (eshell-pwd-convert-function): Default to
'expand-file-name' on all systems.

* etc/NEWS: Announce this change.

(cherry picked from commit ef440f59a170c3c69948fca863f368e397d503b4)

Ensure `move-frame-functions' trigger on macOS frame resize

* src/nsterm.m ([EmacsView windowWillResize:toSize:]): Call
windowDidMove to ensure that MOVE_FRAME_EVENT events are
generated when a frame is resized.  (Bug#74074)

(cherry picked from commit 3e36267b25ea9730e4acd8b0f47c5e967cea9e94)

; * lisp/net/eww.el (eww-submit): Fix last change (bug#65973).

(cherry picked from commit 4b4ca233675b7a820feca5893e5279327ab76795)

When submitting files in EWW, only send the file's basename

* lisp/net/eww.el (eww-submit): Send the basename, not the full
filename (bug#65973).

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

* lisp/net/newst-plainview.el: Fix Bug#74198

* lisp/net/newst-plainview.el
(newsticker--do-mark-item-at-point-as-read): Save feed cache immediately
when item state is changed. (Bug#74198)

(cherry picked from commit acce03eb549ec102dc2bda2e509551f03dc60175)

Enable guidance for Northern Iroquoian input methods

* lisp/leim/quail/iroquoian.el: Set GUIDANCE argument of
'quail-define-package' forms to non-nil.  (Bug#74170)

(cherry picked from commit 63d4c4b9ce469c596de9b38977ad7bf6e28349eb)

New input methods for Northern Iroquoian languages

* lisp/leim/quail/iroquoian.el: New file.  (Bug#74170)

* etc/NEWS: Announce the new input methods.

(cherry picked from commit 04b055797a4b51392658548e4847cb7513354c67)

; * etc/symbol-releases.eld: Add 'read-number'.

(cherry picked from commit e8cf271e64e69852da983da432423396b5b01b2b)

* etc/symbol-releases.eld: Add version=, version<, version<=.

(cherry picked from commit 19ce31ecab8361ef8b44c8a1777d09cf9a902714)

* lisp/net/newst-plainview.el (newsticker--buffer-do-insert-text): Bug#74197

Use "[logo: <feed name>]" instead of "<feed name>" for the string
holding the logo image.

(cherry picked from commit b5845eb5ef54162da6f0735880b36315ca984852)

* lisp/term/w32-win.el (w32--textual-mime-types): Escape literal `+`

(cherry picked from commit 42fe3420e476045228a219579343f16da29256cf)

Fix wrong value of `when` and `unless` with empty body (bug#74215)

Reported by Brennan Vincent.

* lisp/subr.el (when, unless): Return nil when the body is empty.
* test/lisp/subr-tests.el (subr-test-when): Add test cases.

(cherry picked from commit 9ee9154247454c18f9f75d0d32592b817d7e977a)

Several Tramp cleanups

* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
Move setting of sentinel up.

* lisp/net/tramp-cache.el (tramp-get-connection-property)
(tramp-set-connection-property): Don't raise a debug message for
the `tramp-cache-version' key.

* lisp/net/tramp.el (tramp-convert-file-attributes): Don't cache
"file-attributes-ID-FORMAT".

* test/lisp/net/tramp-tests.el (tramp--test-enabled): Cleanup also
`tramp-compat-temporary-file-directory'.
(tramp-test32-shell-command): Use `async-shell-command-width' of 512.
(tramp-test36-vc-registered): Remove double let* entry.

(cherry picked from commit 1e3d72d962b8b736741747a5ec4595e08965ef49)

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

(cherry picked from commit 3ff92054483ff92b19d3fe4b1ccf65a513fe58ca)

Support :transform-smoothing on images (MS-Windows) (bug#57166)

* src/dispextern.h (struct image): Add field 'smoothing' for
NTGUI.
* src/image.c (image_set_transform): Assign the 'smoothing'
field of the image struct.
* src/w32gdiplus.h: Add references to more GDI+ functions.
* src/w32image.c (gdiplus_init): Add references to more GDI+
functions.
* src/w32term.c (w32_draw_image_foreground): If the image is
marked for smoothing and GDI+ is available, draw it with GDI+
bilinear interpolation.
* etc/NEWS: New entry for this change.

(cherry picked from commit 4e8bf2977e6d1abf6d3cf82e9c1ae3dee5bfcda0)

Make 'yank-media' on MS-Windows require native image APIs

* src/w32select.c (convert_dibv5_to_png) [!HAVE_NATIVE_IMAGE_API]:
Fail if GDI+ cannot be used.  Patch by Cecilio Pardo
<cpardo@imayhem.com>.  (Bug#71909)

* etc/NEWS: Mention this dependency.

(cherry picked from commit 8a7910fb67e3b89de430d3b3e5009b145ec0c602)

pcomplete/find: Support new GNU find expressions

* lisp/pcmpl-gnu.el (pcomplete/find): Add expressions from new GNU find:
"-newerxy" (4.3.3) and "-files0-from" (4.9.0).  This list is now
complete as of GNU findutils 4.10.0, released on 2024-06-01.

(cherry picked from commit a0f8fb806ff5ce192671d90636aa14a12aa47b8a)

; * test/lisp/eshell/esh-cmd-tests.el: Fix last change.

(cherry picked from commit 9cfd13ff44e8d6f56a1025207c833ab45a7d51ba)

Add support for range objects in Eshell "for" loops

* lisp/eshell/esh-cmd.el (eshell-for-iterate): Add support for
'eshell-range' objects.

* test/lisp/eshell/esh-cmd-tests.el (esh-cmd-test/for-loop-range): New
test.

* doc/misc/eshell.texi (Control Flow): Update documentation.

* etc/NEWS: Announce this change.

(cherry picked from commit ee87af4f1603d2042afa641e74df0403a49af1c5)

Move more of Eshell range handling to the parser phase

* lisp/eshell/esh-util.el (eshell-range): New struct.
(eshell--range-string-p, eshell--string-to-range): New functions.

* lisp/eshell/esh-arg.el (eshell-parse-integer)
(eshell-parse-range-token): New functions...
(eshell-parse-argument-hook): ... add them.
(eshell--after-range-token-regexp): New defsubst.
(eshell-concat-1): Don't remove the 'number' property; we use that when
handling range arguments.
(eshell--range-token): New constant.
(eshell-unmark-range-token): New function.

* lisp/eshell/esh-var.el (eshell-parse-index): Update implementation to
use parsed range argument.

* test/lisp/eshell/esh-var-tests.el (esh-var-test/interp-var-indices):
Test range index using variables.

(cherry picked from commit ed9ea57e57a915e743100591d7a71d44a4b4c0e9)

Add QUOTED argument to 'eshell-stringify'

This will make it easier to reconstitute numbers that we converted to
strings.

* lisp/eshell/esh-util.el (eshell--numeric-string-p): New function.
(eshell-stringify, eshell-stringify-list): Add QUOTED argument.
(eshell-convert, eshell-list-to-string): Stringify as quoted.

* lisp/eshell/esh-arg.el (eshell--numberlike-p): Remove.
(eshell-concat-1): Pass along QUOTED.

* lisp/eshell/esh-cmd.el (eshell-lisp-command): Use
'eshell--numeric-string-p'.

* lisp/eshell/esh-var.el (eshell-parse-variable):
* lisp/eshell/em-cmpl.el (eshell-complete-parse-arguments): Stringify as
quoted.

(cherry picked from commit 4d69d3778a51427654965cbcc5bb03611034b656)

Improve handling of Eshell "for" loops

This fixes some errors with more-complex string forms, and also allows
iterating over sequences other than just lists.

* lisp/eshell/esh-cmd.el (eshell-for-iterate): New function...
(eshell-rewrite-for-command): ... use it.

* test/lisp/eshell/esh-cmd-tests.el (esh-cmd-test/for-loop): Test
multiple values.
(esh-cmd-test/for-loop-string, esh-cmd-test/for-loop-vector): New tests.
(esh-cmd-test/for-loop-mixed-args): Rename.

* test/lisp/eshell/esh-proc-tests.el
(esh-proc-test/sentinel/change-buffer): Make sure all the processes get
cleaned up.

(cherry picked from commit 08d5994b435c119bde8b8ac8f7152810d1814d1e)

; Skip commit b3c82f939c3ca35bd43e9a9a22b0f9d3e3fa29f2

; Skip commit 75c5aaae893b932c122d8855b0908f2b76e28c1a

; Skip commit 378661dcd6d49e16f653d3eb6b676f0bcea0923b

* Remove warning introduced by 8e7f5f97db6

* lisp/term/w32-win.el (w32--get-clipboard-data-media): Declare.

(cherry picked from commit 53f0151518c767bb97dc90fea63efb37d8311dd2)

Add support for 'yank-media' on MS-Windows

Adds the capacity to handle types different from strings to the
clipboard management functions on MS-Windows, and some logic
required to convert media types names and content to be what
yank-media and the modes that use it expect (bug#71909).
* lisp/term/w32-win.el (w32--selection-target-translations): New
variable that holds the name translations for media types.
(w32--translate-selection-target): New function, translate the
name of a media type.
(w32--translate-reverse-selection-target): New function, reverse
translation.
(w32--get-selection): Modified to translate target names when
asked for targets, and retrieve media types when asked for them.
(w32--mime-type-textual-p): New function, checks if a MIME type
is textual.
* lisp/textmodes/sgml-mode.el (html-mode--image-yank-handler):
Fixed the image save mechanism, that added line feed characters
on MS-Windows, breaking binary formats.
* src/w32image.c (gdiplus_init): Modified to fetch more
functions fromm gdiplus.
(get_encoder_clsid): Renamed to 'w32_gdip_get_encoder_clsid'
and made nonstatic.
(gdiplus_startup): Renamed to 'w32_gdiplus_startup' and
made nonstatic.
* src/w32select.c (stdfmt_name): Made global, was static
function.
(convert_dibv5_to_png): New function to convert DIBV5 clipboard
format to PNG.
(get_clipboard_format_name): New function get the name of a
format given its index.
(Fw32__get_clipboard_data_media): New function, retrieves and
converts media content.
(syms_of_w32select): Export new lisp functions.
* src/w32gdiplus.h: New file, for definitions in w32image.c
* doc/lispref/frames.texi: Updated with MS-Windows support.
* etc/NEWS: Added entry about new feature.

(cherry picked from commit 8e7f5f97db647ce6e9606364dc15d8bbd7ef6016)

; * etc/NEWS: Announce 'greek-polytonic'.  (Bug#73909)

(cherry picked from commit 5ee56b86938b7759dd92f507d03907280f48ffca)

Add greek-polytonic input method

(cherry picked from commit d276f45320b293a64f954e3e524a3718ddf87261)

Improve greek input method

* lisp/leim/quail/greek.el ("greek"): Add sequences for DIALYTIKA
TONOS (U+0385) and add proper bindings for double angle quotation
marks.  (Bug#73909)

(cherry picked from commit 7cda5fa4cf6ecdfda108284717a1531cfc442fe4)

* etc/symbol-releases.eld: Add 'set-transient-map'.

(cherry picked from commit d1b67b4a1c75e0d94892babc30da8ffd689f9d9e)

Remove Emacs 24.4 compat code from which-key

* lisp/which-key.el (which-key--show-page): Remove Emacs 24.4
compatibility code.

(cherry picked from commit 2a41f4ae766cf0b150cc8ec054b30e60e1a438d4)

Expand manual section on Time Stamps

* doc/emacs/files.texi (Time Stamps): Add examples of enabling
time stamping with add-hook and setting time-stamp-pattern as a
file-local variable.

(cherry picked from commit d245fb3964dcb404dc35a6f985c473f1ca879b33)

Fix color-lightening and darkening calculations

* lisp/color.el (color-lighten-hsl): Fix calculations (bug#74055).

* test/lisp/color-tests.el (color-tests-lighten-hsl)
(color-tests-lighten-name, color-tests-darken-hsl)
(color-tests-darken-name): Adjust test results.

(cherry picked from commit 435d7d4292e6803405c1ea65c73693f20eea2a58)

Revert "Fix color-lighten-hsl logic"

This reverts commit 656c2dd66e77a5fbeb99d358017e8327401fae05.
That commit was mistaken, see bug#74055.

(cherry picked from commit 99650746d916335bbe480c462af83009037632df)

; Skip commit 021c0ba116e00d20cb006e7441c20d21315ec202

; * lisp/net/eww.el (eww--html buffer-list): Fix comment style.

(cherry picked from commit 74d3232522f762742e9acaf9e62b9fd6d63ae380)

More lax doctype check in EWW (bug#73133)

The regexp to match doctype tags was simplified and will match
more legacy entries; also correct binding of 'case-fold-search'.
* lisp/net/eww.el (eww--html buffer-list): Update function.

(cherry picked from commit 6a0c2b8729c436ef4dfecf07737c86936cb94bd5)

; * src/nsterm.m (ns_draw_fringe_bitmap): Fix coding style.

(cherry picked from commit 0a6d46228d62ec07cc55c6bd8eaf0ec8a1da9af5)

Fix inconsistency in bitmap overlay drawing for macOS

* src/nsterm.m (ns_draw_fringe_bitmap): Respect 'overlay_p',
by not clearing fringe if set, as its done in xterm.  (Bug#71763)

(cherry picked from commit 87358e94047c7f86af1f1ac9d9469553dcd6a6e1)

; Update ldefs-boot.el

Drop hippie-exp.el

Improve eww-search-words

Rewrite dabbrev.el

Improve documentation of letter-case conversions

* doc/lispref/nonascii.texi (Character Properties):
* doc/lispref/strings.texi (Case Conversion, Case Tables):
Document that special-casing rules override the case-table
conversions.  (Bug#74155)

(cherry picked from commit f7b85fe986e74b649f8148ee407cf7a2327ff4a9)

Fix bugs in dabbrev-expand (bug#74090)

* lisp/dabbrev.el (dabbrev-expand): Use the buffer where the
expansion was found when setting the internal variables used to
determine the next expansion or a replacement expansion.

* test/lisp/dabbrev-tests.el (ert-x): Require for
'ert-with-temp-directory', 'ert-resource-directory' and
'ert-resource-file'.
(with-dabbrev-test): New macro.
(dabbrev-expand-test-same-buffer-{1,2,3,4})
(dabbrev-expand-test-other-buffer-{1,2,3,4})
(dabbrev-expand-test-minibuffer-{1,2,3,4}): New tests.

* test/lisp/dabbrev-resources/dabbrev-expand.el:
* test/lisp/dabbrev-resources/INSTALL_BEGIN: New test resources.

(cherry picked from commit f6c359cb66a0e9b851e3467b1ba9cab7efa8f744)
(cherry picked from commit 8113b5c562b88d4981231b0e332ced9fc20dc0b9)

; Skip commit 3101c5031e6eae31ac64392f312091ffa9bbd777

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

Work on proced-tests.el

* test/lisp/proced-tests.el
(proced--assert-process-valid-cpu-refinement-explainer): New function
for explaining refinement test failures in greater detail.

(cherry picked from commit 98796f95fa5ce7c38074429517c477cd01b0be37)

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