; Skip commit 0c97e6aeca257833f97517459514145f663d8a93

; Skip commit ce3d4cd6b39b8b574cf0b9ab535a00717d10c073

; define-globalized-minor-mode: Fix info node link in docstring.

(cherry picked from commit 0fb20adf8e777c6fc7b0aeda7c004b933528f478)

; * lisp/dired-aux.el (dired-vc-deduce-fileset): Fix last change.

(cherry picked from commit 6418099ad99388afaa1de7435de3b9c29e1128f3)

; Skip commit 1abc54ffe1674fecfb2bbef5109eb95c4c0da99d

; Skip commit d63746d5191fb6e4ee6e39addfc1a05e0e0214b1

; Delete unnecessary global autoload from last change.

(cherry picked from commit 423c6a4dc07f1336f4eb55ae2779f0640bbbd858)

dired-vc-deduce-fileset: Call vc-backend-for-registration

* lisp/vc/vc.el (vc-backend-for-registration):
* lisp/dired-aux.el (vc-backend-for-registration): Autoload.
(dired-vc-deduce-fileset): Call vc-backend-for-registration when
vc-responsible-backend returns nil (bug#78987).

(cherry picked from commit b406c44c824ba87d516c01466bdd1688cc55fc6f)

Avoid crashes when profiling multi-threaded Lisp (bug#76970)

* src/eval.c (backtrace_p): Check 'current_thread' before
dereferencing it.

(cherry picked from commit fce86c7e9523b9b6c29241ae9d1dea340f0d849c)

; * doc/emacs/custom.texi (Init File): Mention "M-x customize".

(cherry picked from commit 6dd8266bc4a76fc5fb696f08a26579324202a97e)

; Skip commit e0270c563a7fa04601860552962087a7d7d044b7

; Skip commit c6ce81c15d6e26d36b9cb8aa366d7aaf2e4eb805

; Skip commit ae46edff68e8d5729207ed849df83ecb039e11bb

; Skip commit f746762e74adeac8beaa73abcf20ee5e74298597

; Skip commit a8b0f5adfa46a596409a97d13fd74394e0605e17

; Skip commit 5c75ec6ae52a5b06ad0424ce805f5ea0432b6e90

* src/fns.c (Flength): Fix char table length off-by-one bug.

(cherry picked from commit 52b96d3a7e27e0cdc3f53041f2f18cbe2c095a86)

; vc-git-find-revision: Fix last change to this function.

(cherry picked from commit 8ff6e7fe58466e413b5eed22ea93869e60da8d3d)

VC: Fix displaying the async command buffer during async checkins

* lisp/vc/vc-dispatcher.el (vc--display-async-command-buffer):
New function, factored out of vc-do-async-command.
(vc-do-async-command): Use it.
(vc-finish-logentry): Bind vc--inhibit-async-window when running
the log operation, then call vc--display-async-command-buffer
again ourselves after performing other window changes.

(cherry picked from commit 10024cc06557493e50c913cf5cba3c01a3588410)

Apply vc-use-incoming-outgoing-prefixes to vc-dir-mode-map too

* lisp/vc/vc-dir.el (vc-use-incoming-outgoing-prefixes):
* lisp/vc/vc-hooks.el: Apply vc-use-incoming-outgoing-prefixes
to the corresponding bindings in vc-dir-mode-map, too.

(cherry picked from commit 5d048521e2715be75bd5ce0b3bc3d8aaacd2f46c)

; Improve manual docs for incoming and outgoing diff commands

(cherry picked from commit 0814a93a040fffbf9d0be75b1ebdf432c0ce5f3c)

vc-git-find-revision: Pass --filters to git-cat-file

* lisp/vc/vc-git.el (vc-git-find-revision): Pass --filters to
git-cat-file.  Problem reported and fix suggested by Oscar
Fuentes <ofv@wanadoo.es>.

(cherry picked from commit 191109e25e51b986e1029b5a5010ced07507a73a)

; Fix indexing in Emacs user manual

* doc/emacs/frames.texi (Creating Frames):
* doc/emacs/windows.texi (Pop Up Window): Fix indexing and
wording.  (Bug#78945)

(cherry picked from commit 723cb4da47a5a82b4c64fdd6f9004d739ca6c12d)

Update documentation and NEWS with SVG changes (bug#77841)

* doc/lispref/display.texi (SVG Images):
* etc/NEWS: Document changes to SVG foreground color handling.

(cherry picked from commit 2e3ee3e44803849b085a498fd4e64f84243e6c28)

Move CSS into the SVG wrapper

This allows CSS to be used with librsvg < 2.48.

* src/image.c (svg_load_image): Move CSS construction and include
"color".  Also append the CSS passed in by the user rather than
replacing it.

(cherry picked from commit 9f5d17cd7219f72066488c6c57f77e4db9ca2563)

Use css to set SVG foreground in docview

* lisp/doc-view.el (doc-view-insert-image): Use CSS to set the fill
attribute to the desired foreground color.

(cherry picked from commit 8b200c041924904074b996addaec0b4ccfb1a024)

Change foreground color handling for SVG files (bug#77841)

* etc/images/checkbox-mixed.svg:
* etc/images/checked.svg:
* etc/images/conceal.svg:
* etc/images/down.svg:
* etc/images/gnus/gnus-pointer.svg:
* etc/images/left.svg:
* etc/images/outline-close.svg:
* etc/images/outline-open.svg:
* etc/images/radio-checked.svg:
* etc/images/radio-mixed.svg:
* etc/images/radio.svg:
* etc/images/reveal.svg:
* etc/images/right.svg:
* etc/images/symbols/check-mark_16.svg:
* etc/images/symbols/chevron_down_16.svg:
* etc/images/symbols/chevron_left_16.svg:
* etc/images/symbols/chevron_right_16.svg:
* etc/images/symbols/chevron_up_16.svg:
* etc/images/symbols/cross_16.svg:
* etc/images/symbols/cross_circle_16.svg:
* etc/images/symbols/cross_circle_fill_16.svg:
* etc/images/symbols/dot_large_16.svg:
* etc/images/symbols/dot_medium_16.svg:
* etc/images/symbols/dot_small_16.svg:
* etc/images/symbols/heart_16.svg:
* etc/images/symbols/heart_fill_16.svg:
* etc/images/symbols/heart_half_16.svg:
* etc/images/symbols/menu_16.svg:
* etc/images/symbols/minus_16.svg:
* etc/images/symbols/minus_circle_16.svg:
* etc/images/symbols/minus_circle_fill_16.svg:
* etc/images/symbols/plus_16.svg:
* etc/images/symbols/plus_circle_16.svg:
* etc/images/symbols/plus_circle_fill_16.svg:
* etc/images/symbols/star_16.svg:
* etc/images/symbols/star_fill_16.svg:
* etc/images/symbols/star_half_16.svg:
* etc/images/unchecked.svg:
* etc/images/up.svg: Set 'fill' color to 'currentcolor'.
* etc/images/symbols/README: Add explanation of change to instructions.
* src/image.c: Remove setting of the 'fill' color in the default SVG
stylesheet.

(cherry picked from commit 4d145d08da86a05187f99ab6352637241e146547)

Fix browse-url-tests-delete-temp-file

* test/lisp/net/browse-url-tests.el (browse-url-tests-delete-temp-file):
Fix test.

(cherry picked from commit 6d0812e57a6857bd6cb955a2d73859100d2cd256)

Fix handling of `browse-url-temp-file-name'

* lisp/net/browse-url.el (browse-url--temp-file-setup):
Add `browse-url-delete-temp-file' to `write-file-functions'.
(browse-url-of-file, browse-url-delete-temp-file): Fix handling of
`browse-url-temp-file-name'.  (Bug#78830)

(cherry picked from commit 9f82300bb049c716d59575eaee29262e38c5e8d2)

; Skip commit 18ff84df0cdeddf01a5199893180da4f5c1732af

; * src/fileio.c: Remove version from commentary (bug#78983).

(cherry picked from commit b51b01f682990df0df51ace51154fb96dadcc867)

Unintern Qget_file_char and Qget_emacs_mule_file_char

These symbols are used in the reader as special constants and can't be
passed from Lisp (Emacs would crash).

* src/lread.c (syms_of_lread): Unintern.
(init_source): Use BASE_EQ.

(cherry picked from commit b83f2d16fbd327e04186c5ae94f90bb907294573)

Speed up low-level parts of the reader and refactor

Inspect the given 'readcharfun' source once, before using it, instead of
for each character read.  This moves a bunch of branches away from the
critical path, with separate functions for different source types.
Replace some preprocessor macros with functions.

* src/lread.c (READCHAR, UNREAD, READCHAR_REPORT_MULTIBYTE)
(FROM_FILE_P): Remove; use corresponding functions instead.
All callers adapted.
(source_t): New struct that takes the place of the `readcharfun` and
`readbyte` arguments in many places.
(init_source)
(source_buffer_get, source_buffer_unget)
(source_marker_get, source_marker_unget)
(source_string_get, source_string_unget)
(source_file_get, source_file_unget)
(source_function_get, source_function_unget)
(from_file_p, unreadbyte_from_file):
New.
(readbyte_from_stdio): Replace `readbyte_from_file`.
(readchar, unreadchar): Rewrite.
(lisp_file_lexical_cookie, readevalloop, read_internal_start):
Create a source_t for use during reading.  All signatures and functions
called adapted.
(read_char_escape): Remove check for an error that can no longer occur.

(cherry picked from commit cd3727f7e0607a152a97b534ee09a2cb8ac6cb84)

Cache only the last string in 'tab-bar-format-align-right' (bug#78953)

* lisp/tab-bar.el (tab-bar--align-right-cache):
Rename from 'tab-bar--align-right-hash'.
(tab-bar-format-align-right): Use it to store
the string in the car, and the width in the cdr.

(cherry picked from commit 99080d0c04931b5d45026e1ee44526bbbb8dfdef)

Eldoc: Run eldoc-display-functions with original buffer (bug#78530)

Also bump eldoc version so Eglot can require the new version
later.

* lisp/emacs-lisp/eldoc.el (eldoc--invoke-strategy): Run the
hook with the original buffer as the current buffer. This way
we're certain that the buffer-local value of
'eldoc-display-functions' is used.
(eldoc-display-functions): Update docstring.

(cherry picked from commit b85d9048f4a32c7c50894e991423d021d9f95317)

; * src/lread.c (read_internal_start): Simplify.

This removes code that became dead in the non-recursive reader reform.

(cherry picked from commit f605e6ede36de1bb91cbefaca24cbd987961dd84)

Nativecomp don't materialize non-materializable objects (bug#78606)

The native compiler should not try to generate in rendered code
immediate floats produced by the constrain on the '=' operator.

* test/src/comp-tests.el (comp-test-78606-1): Add test.
* test/src/comp-resources/comp-test-funcs.el (comp-test-78606-1-f): New
function.
* src/comp.c (emit_mvar_rval): Check if an immediate is materializable.
* lisp/emacs-lisp/comp.el (comp-ctxt): Add 'non-materializable-objs-h'
slot.
(comp--fwprop-insn): Update call.
* lisp/emacs-lisp/comp-cstr.el (comp-cstr-=): Add parameter.

(cherry picked from commit 48a5917681dd53b8b75764f4e1455a6c24f95498)

Call eieio--class-* accessors only on eieio classes (bug#78786)

* lisp/emacs-lisp/eieio-core.el (eieio-oref, eieio-oref-default):
(eieio-oset, eieio-oset-default): Don't look for class slots except in
eieio classes.
* test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
(eieio-test-defstruct-slot-value): New test.

(cherry picked from commit 6a5d9cb07d6ef8c8913acb304eea365c85d82449)

Fix crashes when "emacsclient -nw" frames are suspended (bug#78980)

* src/frame.c (frame_redisplay_p): Start loop with 'f', not its parent
frame.  Simplify return expression.

(cherry picked from commit a76506f131b2d47b0e1dc59ecd6c581e431d298c)

; * doc/lispref/parsing.texi (Using Parser): Fix wording.

(cherry picked from commit 115a4fd940beadef72208c0137eb90fc76cefc32)

; * lisp/treesit.el (treesit-parser-changed-regions): Declare.

(cherry picked from commit 8497cfeaeac832ff98730388567526a42b321d85)

print_error_message: Handle user-error to the echo area specially

* src/print.c (print_error_message): For a user-error that is to
be printed to the echo area, use message3 in order to preserve
fontification.

(cherry picked from commit b03f11d9ac867833a504a2184620e531fbe43a44)

* lisp/vc/vc.el (vc-find-revision-no-save): Call read-only-mode.

(cherry picked from commit 72eb20f93f1b7693b54d21081235dfb804c94adc)

Amend last change to 'kill-this-buffer'

* lisp/menu-bar.el (kill-this-buffer): Take using window tool bar
into account (bug#78809).

(cherry picked from commit 8b86978895b2dacce2830de0cdc680a00b274b58)

; Skip commit 05ecb2b8f0216aa3f391ee661aad4d61fd6aed0e

Handle invalid frame_or_window slots in tty input events (Bug#78966)

* src/frame.c (make_terminal_frame): Initialize terminal's
top_frame slot if it has not been set up yet (Bug#78966).
* src/keyboard.c (kbd_buffer_get_event): Do not assume that the
event's frame_or_window slot always produces a valid frame
(Bug#78966).
(tty_read_avail_input): Try to make sure that the input event we
create has a valid frame_or_window slot (Bug#78966).  Add assertion
to that purpose.

(cherry picked from commit 2fc402cb0bb62f3c401528246742501a8d42bf14)

Handle multiple mouse events in display-buffer-override-next-command

* lisp/window.el (display-buffer-override-next-command):
Use 'mouse-event-p' to wait for more following mouse events.

* lisp/frame.el (other-frame-prefix):
* lisp/tab-bar.el (other-tab-prefix):
* lisp/windmove.el (windmove-display-in-direction):
* lisp/window.el (other-window-prefix, same-window-prefix):
Update the docstring to explain the behavior in regard
to multiple consecutive mouse events (bug#78945).

(cherry picked from commit 280d6f70a356dc24a7026c00cbcbd116c2f7c7ed)

Ditch the async range update in tree-sitter (bug#78402)

Right now in treesit-outline-search -> treesit-navigate-thing, a
freshly created tree-sitter node becomes outdated within the
function.  I'm not sure _exactly_ how it happend, but it might
look like this: we first get a node from, say, html parser, then
get another node from, say, liquid parser.  Creating the node
from liquid parser causes a reparse which updated the range of
the html parser, which rendered the html node outdated.

There're several problems with the current design, let's start
with the most obvious one: we add
treesit--font-lock-mark-ranges-to-fontify as a notifier of the
primar parser in treesit-major-mode-setup.  Now, if a ts major
mode inherits another major mode, treesit-major-mode-setup will
be called twice, once in the parent mode and once in the child
node, and two parsers will have the notifier.  But
treesit--font-lock-mark-ranges-to-fontify is designed to run
only once.

I believe this bug, together with some mysterious async
execution order, led to the problems we saw in the bug report.
My solution is to just make everything synchronous.

So I added treesit-parser-changed-regions, and modified
treesit--font-lock-mark-ranges-to-fontify to use it.  Now we
don't need to add the notifier to the primary parser anymore.

I also applied the tree-sitter-outline change we discussed in
the bug report.  (Change to treesit-outline-search, and remove
treesit--after-change.)

* lisp/treesit.el:
(treesit--font-lock-mark-ranges-to-fontify): Remove the unused
PARSER arg.
(treesit--pre-redisplay): Make use of
treesit-parser-changed-regions.
(treesit-outline-search): Call treesit--pre-redisplay in the
beginning.
(treesit--after-change): Remove function.
(treesit-major-mode-setup): Don't add notifier to primary parser.

(cherry picked from commit 159ddd27ee6b6c8cd261c6ff495e66ddb6166685)

Add a synchronous way to get parser change ranges (bug#78402)

This commit only adds the new function, the fix for the bug is
in the next commit.

* doc/lispref/parsing.texi (Using Parser): Add docs.
* lisp/treesit.el (treesit): Add shortdoc.
* src/treesit.c (treesit_get_affected_ranges): New function
extracted from treesit_call_after_change_functions.
(treesit_call_after_change_functions): Extract out.
(treesit_ensure_parsed): Return affected regions.
(Ftreesit_parser_changed_regions): New function that returns the
affected regions.

(cherry picked from commit 564b947745b2a685edcd93eb8f0d8825352030b8)

Cache 'string-pixel-width' in 'tab-bar-format-align-right' (bug#78953)

* lisp/tab-bar.el (tab-bar--align-right-hash): New internal variable.
(tab-bar-format-align-right): Use memoization for 'string-pixel-width'.

(cherry picked from commit c4674bfa3ae830eedf3d1c2b27fe623e11e7fb25)

Fix tab-bar-format-align-right to not call tab-bar-format-global twice

* lisp/tab-bar.el (tab-bar-format-align-right): Add optional arg 'rest'
to handle it specially in 'tab-bar-format-list'.  Use the value from 'rest'
instead of calling format functions twice by 'tab-bar-format-list'.
(tab-bar-format-list): When 'format-list' contains the item
'tab-bar-format-align-right', collect the rest of formatted items
and call 'tab-bar-format-align-right' explicitly with the collected
list (bug#78953).

(cherry picked from commit 8b1978fa6e929101b6a766cfbb94c3b27b142fa7)

; Skip commit 87cae92e7cbbc7a6eb6558d7bd9238b56db35f57

; Fix last change

* lisp/international/latexenc.el
(latexenc-find-file-coding-system): Check if `TeX-master' is
really set to a string globally.  (AUCTeX bug#78841)

(cherry picked from commit db46d5e8333e1eefcd7b3848d401f14d2bd7192f)

Cheaper char counting when reading symbols

* src/lread.c (read0): Strength reduction.

(cherry picked from commit c120a338e6ef15888338fbd499caf5c1c02777e4)

Refactor buffering code in the Lisp reader

Abstract the buffering in the reader with a struct and plain functions
instead of rather unhygienic preprocessor macros.

* src/lread.c (READ_AND_BUFFER, INVALID_SYNTAX_WITH_BUFFER):
Removed, replaced with...
(readbuf_t, readbuf_grow, add_char_to_buffer, read_and_buffer)
(invalid_syntax_with_buffer): ...these new functions and struct.
(read0): Use new code instead of old preprocessor macros.

(cherry picked from commit 32a0367554334c14fc1a9242fa6bfc45abe3d032)

; * src/lread.c (skip_lazy_string): more precise comment

The bool vector compat hack is there for a bug in Emacs 19 only.

(cherry picked from commit 501bb04e53ee43736d941d0bd492cf88ea6b3385)

; vc-git-checkin, vc-hg-checkin: Delete unused lexical variable.

(cherry picked from commit 83da45ddd0a941b67651890f138d2c64e398eb79)

* lisp/vc/vc.el (with-vc-properties): Fix macro variable capture.

(cherry picked from commit 6227a0412d419e6bda2b5ac2517bae8517868c10)

Resolve FIXME regarding running vc-checkin-hook

Running vc-checkin-hook needs to be delayed in the case of an
async checkin.  As a quick fix we had been relying on the
backend checkin functions to run the hook in the async case.
This restores handling running the hook in generic code even for
the async case.

* lisp/vc/vc.el (vc-checkin): Always pass vc-checkin-hook to
vc-start-logentry.  Return the result of calling the backend
'checkin-patch' or 'checkin' function to vc-finish-logentry.
* lisp/vc/vc-dispatcher.el (vc-finish-logentry): If the log
operation returns a cons of the form (async . #<process ...>),
use vc-exec-after to delay vc-resynch-buffer and hooks until the
async process completes.  Approach suggested by Dmitry Gutov.
* lisp/vc/vc-git.el (vc-git-checkin):
* lisp/vc/vc-hg.el (vc-hg-checkin): For an async checkin, return
a cons (async . #<process ...>) containing the async checkin
process.  No longer run vc-checkin-hook.

* lisp/vc/vc.el (with-vc-properties): Return the result of
evaluating FORM.
* lisp/vc/vc-dispatcher.el (vc-exec-after): Change to PROC's
buffer before calling vc-set-mode-line-busy-indicator.

(cherry picked from commit 6c0c985cee4e1ce4798a4ab192e8ca36013e7fa1)

; * doc/emacs/maintaining.texi (VC With A Merging VCS): Fix wording.

(cherry picked from commit f85f3c30ddc986e6d6c6ae738cee578556cc0eac)

; Fix typos

* lisp/emacs-lisp/warnings.el (warning-display-at-bottom): Fix typo.
* lisp/replace.el (query-replace-help): Typo fix.

(cherry picked from commit ebb65d41630786f1dac7727f9490d52d8f55e2f9)

Read non-ASCII chars from unibyte string sources as raw bytes

Previously, latin-1 was incorrectly assumed (bug#70988).

* src/lread.c (readchar): Convert to raw byte.
* test/src/lread-tests.el (lread-unibyte-string-source): New test.

(cherry picked from commit d13693ef4ec9428e2356b0de29913d533c5c4382)

Print non-ASCII chars in unibyte symbols as raw bytes

Previously, latin-1 was incorrectly assumed (bug#70988).

* src/print.c (print_object): Call the correct function.
* test/src/print-tests.el (print-unibyte-symbols): New test.

(cherry picked from commit f2f76756211fd5a0914734c738508f522c4b2ccd)

Read characters from functions as multibyte

Previously, latin-1 was incorrectly assumed (bug#70988).

* src/lread.c (readchar): Set multibyte flag.
* test/src/lread-tests.el (lread-function-source): New test.

(cherry picked from commit 553a6c407f28c4faa832c8cda462267ef75bff38)

Turn compiler macro defalias messages into warnings

* lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-defalias):
Turn messages into warnings to make them more visible to the user and
provide a source location (bug#78792).

(cherry picked from commit 0de646b6a16dac8cf185c32b02d4d575830c6a31)

Use short revisions by default when navigating to revisions

* lisp/vc/vc-annotate.el (vc-annotate-revision-previous-to-line)
(vc-annotate-show-diff-revision-at-line-internal)
(vc-annotate-warp-revision): Let-bind 'vc-use-short-revision'
around calls to 'previous-revision' and 'next-revision'.

* lisp/vc/vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Handle 'vc-use-short-revision' option (bug#78900).

(cherry picked from commit e88af5fff7fbb148a5ddad377219336dc22500b1)

Show "readable" status in the EWW mode line

* lisp/net/eww.el (eww-display-html): Check whether a readable form of
the document exists; if not, don't set ':readable' to t.
(eww-readable): Check whether a readable form of the document exists; if
not, warn the user and don't add to history.
(eww-readable-dom): Return nil if no readable form exists.
(eww-mode): Check the ':readable' property of 'eww-data' to show
"readable" state in the mode line.

* test/lisp/net/eww-tests.el
(eww-test/readable/default-readable/non-readable-page): New test
(bug#78958).

(cherry picked from commit d3c75a3d2de6aa2609b1afef0ae2d1a6e833e9bc)

(Ftranspose_regions): Fix bug#76124

* src/editfns.c (Ftranspose_regions): Be careful that ELisp code could
move the gap from under our feet.

* test/src/editfns-tests.el (editfns-tests--bug76124): New test.

(cherry picked from commit b93d49a3787085407a9dd57d678d0fc552878fcc)

lisp/mpc.el (mpc-describe-song): Don't quote lambdas

(cherry picked from commit 4732b8921db04187612b45555863ecc1df6be552)

Log Edit: Don't auto-fill within the headers

* lisp/vc/log-edit.el (log-edit-do-auto-fill): New function.
(log-edit-mode): Set normal-auto-fill-function to it.

(cherry picked from commit 90a0771379360882979aa13f7cc97fc1cfd4b41a)

vc-checkin: Check whether the fileset or patches have changed

* lisp/vc/vc-dispatcher.el (vc-finish-logentry): Delay popping
to vc-parent-buffer until after calling the log operation.
That way if the log operation exits early, the current buffer
remains *vc-log*.
(vc-dir-marked-files, dired-get-marked-files): Declare.
(vc-dispatcher--explicit-marks-p): New function.
* lisp/vc/vc.el (vc-checkin): Check the user isn't likely to be
surprised by what is included in the checkin.  Specifically,
check whether the fileset or patches implied by vc-parent-buffer
are unchanged.
* doc/emacs/maintaining.texi (VC With A Merging VCS): Explain
how the fileset or patch string is fixed once *vc-log* pops up.

(cherry picked from commit 7a0bfa3ee7fa447a0fe994ac8f64bcb5752cacb2)

; Move text about C-x v v from Diff mode buffers into main list

* doc/emacs/maintaining.texi (VC With A Merging VCS): Move text
about C-x v v from a Diff mode buffer into the bulleted list.

(cherry picked from commit 67ddf2157659e9cd6fb9b109049da66c7abe4ffb)

; * lisp/vc/log-edit.el (log-edit): Clarify vc-log-fileset.

(cherry picked from commit 08c5f68e0b92a994e41f572a1face6be5b95f1d4)

Adapt filenotify-tests.el for Emba

* test/infra/gitlab-ci.yml (.filenotify-gio-template): Enable also
for scheduled jobs.

* test/lisp/filenotify-tests.el (file-notify--test-cleanup):
Fix docstring.
(file-notify--deftest-remote): Use `file-notify--test-cleanup'.
(file-notify-test03-events, file-notify-test05-file-validity)
(file-notify-test06-dir-validity)
(file-notify-test07-many-events)
(file-notify-test09-watched-file-in-watched-dir): Adapt tests.
(file-notify-test03-events-remote)
(file-notify-test04-autorevert-remote)
(file-notify-test07-many-events-remote)
(file-notify-test09-watched-file-in-watched-dir-remote): Do not
tag as :unstable.

(cherry picked from commit 771370dea50834d585664bfd3ca7320d24a94611)

; Skip commit 0550d036b71a129e79c17856142735aac0081205

lisp/help-mode.el (help-mode-context-menu): Don't quote lambda

(cherry picked from commit 8786dfedc98ea56be2407d7183d48cbbc1b673df)

Add file notification handler for Tramp's "smb" method.

* etc/NEWS: Mention new file notification handler for Tramp "smb".

* lisp/filenotify.el (file-notify--expand-file-name): Fix the
remote case.
(file-notify-callback): Extend for "smb-notify".
(file-notify--call-handler): Fix debug message.

* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-file-notify-add-watch):
* lisp/net/tramp-sh.el (tramp-sh-gio-monitor-process-filter):
Use connection property "file-monitor".

* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Use `tramp-smb-handle-file-notify-add-watch'.
(tramp-smb-handle-delete-directory): Do not error if there is a
pending deletion of a directory under file-watch.
(tramp-smb-handle-file-notify-add-watch)
(tramp-smb-notify-process-filter): New defuns.
(tramp-smb-send-command): New optional argument NOOUTPUT.
(tramp-smb-wait-for-output): Improve debug message.

* lisp/net/tramp.el (tramp-directory-watched): New defun.
(tramp-accept-process-output, tramp-wait-for-regexp):
Improve debug message.

* test/lisp/filenotify-tests.el (top): Filter also for
"smb-notify".  Set some other Tramp related variables.
(file-notify--test-wait-for-events)
(file-notify--test-with-actions-check)
(file-notify--test-with-actions): Add debug message.
(file-notify--test-cleanup, file-notify--deftest-remote):
Keep Tramp debugs buffer.
(file-notify--test-monitor): Check for "smb-notify".
(file-notify--deftest-remote): Call `file-notify-rm-all-watches'.
(file-notify--test-make-temp-name): Use a better name for parent
directory.
(file-notify--test-event-handler): Use `string-match-p'.
(file-notify--test-with-actions): Check also for the `stopped'
event as limit.
(file-notify-test03-events, file-notify-test04-autorevert)
(file-notify-test05-file-validity)
(file-notify-test07-many-events, file-notify-test08-backup)
(file-notify-test09-watched-file-in-watched-dir): Adapt tests for
"smb-notify".
(file-notify-test12-unmount): Skip for "smb-notify".

(cherry picked from commit aa8afabd493ce67924685bc6cfafec551380a094)

; Skip commit 0a1db9b57322884df0bf677b96d8568e194521d3

Sync src/treesit.c with master

(eieio--validate-slot-value): Don't break on struct objects

Nowadays `eieio-oset` applies to more than just EIEIO objects.
The old code tended to work OK but only because `eieio--class-slots`
is usually compiled/inlined without checks.

* lisp/emacs-lisp/eieio-core.el (eieio--validate-slot-value):
Don't assume CLASS is an EIEIO class.

(cherry picked from commit 4024a7d541ca049ca9b28bce54c225bf9691f944)

; Skip commit d1677d0a926c148ef4fce65251311fc8dc796464

; Skip commit a4712609b7ec920ca6883e71e782e2dac552a154

; * lisp/progmodes/cc-engine.el: Fix trailing whitespace.

(cherry picked from commit 4d14891850bec0dc73fc9284f2e0ddcd20e43fc1)

; Skip commit 49d0342a00f00336f3fbb87912ee48d01d59889a

; Skip commit 8e49ced04c1941f9f8df6613013a135e1039ce3c

; * lisp/vc/log-edit.el (log-edit-diff-fileset): Update comment.

(cherry picked from commit ae55c0fd2d5da16377c63750c4cc5483e57af855)

Don't call vc-buffer-sync-fileset when committing a patch

* lisp/vc/vc-dispatcher.el (vc-finish-logentry): Move call to
vc-buffer-sync-fileset from here ...
* lisp/vc/vc.el (vc-checkin): ... to here, and conditionalize so
as not to call when committing a patch.  Also fix comment.

(cherry picked from commit 45d148680367b73fc19d511b4abe5a4bb961ebc2)

; Skip commit 6b470d98482f0f5b2beaa7c5e92572cb2ad62fb5

; Skip commit 7e56ffd51bc5a00919f6a6af99fe9d329331a126

; VC: Improve REMOTE-LOCATION docstrings, qualify remark in comment.

(cherry picked from commit 3480abd67d1ca3b96fb314e2aca6510c18767eff)

Fix 'ediff-before-setup-hook'

* lisp/vc/ediff-util.el
(ediff-clone-buffer-for-region-comparison): Wrap body in
'save-window-excursion', to make sure original window
configuration is restored after quitting 'ediff-regions-linewise'.
Suggested by Aaron Zeng <azeng@janestreet.com>.  (Bug#78897)

(cherry picked from commit 34dad30e49e4d7768d74f2d32544845a893b0796)

; Skip commit 97ceb544b3668e2c4a9154db59359c974d47909d

; Skip commit c61d2587bbfc1692971b3144716ab5f01b09231f

; * lisp/replace.el (query-replace-help): Fix help text (bug#78916).

(cherry picked from commit 3f7787c9794c44b277108afae1c1d4b81ff716de)

; * lisp/emacs-lisp/warnings.el (warning-display-at-bottom): Doc fix.

(cherry picked from commit b10596a63034ebda8be134ba05fd4fcea8b2f246)

Handle ts_node_type return NULL (bug#78938)

* src/treesit.c (treesit_traverse_match_predicate): Handle the
case when ts_node_type returns NULL.
(Ftreesit_node_type): Add some comment.

(cherry picked from commit 060f964906b64fa8a63a120af9e2380d11d30604)

; * doc/emacs/maintaining.texi (VC Change Log): Fix wording and markup.

(cherry picked from commit 763c3cd081a833940961373a73705640b1808636)

; Skip commit 22daed7ce0e3fbe55608a92c81deee24933b266d

vc-find-revision-no-save: Finish entering read-only-mode

* lisp/vc/vc.el (vc-find-revision-no-save): After setting
buffer-read-only to non-nil, also run read-only-mode-hook,
and if view-read-only is non-nil, call view-mode-enter.

(cherry picked from commit 215fc3a354c36b2294b3dd45e72555bb4b4cb364)

Improve documentation of 'warning-display-at-bottom'

* lisp/emacs-lisp/warnings.el (warning-display-at-bottom):
* doc/lispref/display.texi (Warning Options):
* doc/emacs/windows.texi (Temporary Displays):
* etc/NEWS: Improve documentation of 'warning-display-at-bottom'.
See https://lists.gnu.org/archive/html/emacs-devel/2025-07/msg00024.html
for more details.

(cherry picked from commit 5bdacbe460a3dbc1777b8d06767c9c323c4fee23)