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

; Skip commit d16453a20ee437e07b504153a1706c7ed3ee1176

VC: New incoming & outgoing diff commands (bug#62940)

* lisp/vc/vc-hooks.el (vc-incoming-prefix-map)
(vc-outgoing-prefix-map): New keymaps.
(vc-use-incoming-outgoing-prefixes): New user option.
* lisp/vc/vc.el (vc-root-diff-incoming, vc-root-diff-outgoing):
New commands (bug#62940).
* doc/emacs/maintaining.texi (VC Change Log):
* etc/NEWS: Document the new commands and option.

(cherry picked from commit af78b4d333e81a544ebf10d57067cca8c2fc732f)

; * lisp/vc/vc-hooks.el (vc-call-backend): Improve docstring.

In fact we don't use vc-call all that much.

(cherry picked from commit 76ae048b3f4a62bf933bedc835bd141089849bfd)

New history variable for VC remote locations

* lisp/vc/vc.el (vc-remote-location-history): New variable.
(vc--maybe-read-remote-location): Use it.

(cherry picked from commit 625a9f9bce77e47bd71d7f74e8011c716e0645cc)

; * lisp/vc/vc-dispatcher.el: Delete obsolete TODO.

(cherry picked from commit 07347f9ce64de07452dbb73ba30c05b8bfdef7b7)

; * lisp/vc/vc.el (vc-revert-files): Fix superfluous backquotation.

(cherry picked from commit f7184c6e6fc3be9a6f01110e5c0f9ac73bb1aa98)

Handle the case when ts_node_type returns NULL (bug#78938)

* src/treesit.c (Ftreesit_node_type): Handle NULL.

(cherry picked from commit 30dae2ad23963bc902101544cbbe2c5698beddd7)

; * lisp/progmodes/php-ts-mode.el: Docstring fixes

(php-ts-mode-alternative-php-program-name, php-ts-mode--executable):
Improve documentation.

(cherry picked from commit 1ea68b930c045596706534abb3b7fcbcbc7a5b6d)

Retain the <base> tag when making a page in EWW document readable

The base tag is necessary to correctly resolve relative links.

* lisp/net/eww.el (eww-readable-dom): Retain the base tag in addition to
the title/link tags.  (Bug#78948)
* test/lisp/net/eww-tests.el (eww-test--wordy-page): Add a base tag.
(eww-test/readable/default-readable): Test that the base tag is retained.

(cherry picked from commit f10bf71151b7f5d0e1d7d183c11261b257d4d022)

lisp/dired.el (dired-mode-immediate-menu): Don't quote `lambda`

(cherry picked from commit 2cb7387e6fa0d5a85d18f7b35e3be508c690c12f)

lisp/dired-x.el (dired-omit-lines): Don't quote `lambda`

(cherry picked from commit 5f44515539eac4cd1ecb0057120475fe217bbc69)

Factor out some common code from VC incoming/outgoing functions

* lisp/vc/vc.el (vc--maybe-read-remote-location)
(vc--incoming-revision): New functions, factored out.
(vc-log-incoming, vc-default-log-incoming, vc-log-outgoing)
(vc-default-log-outgoing): Use them.

(cherry picked from commit 8c6d549f6ffd623e30fef9aeb73ccb1194bcfb58)

; * lisp/vc/vc-hg.el (vc-hg-command): Improve docstring.

(cherry picked from commit f1fe815b43c87b147e3e6cc5cd600cd66cc65b7f)

VC: Make incoming-revision backend function responsible for fetching

* lisp/vc/vc-hg.el (vc-hg-incoming-revision): Pull the incoming
revision if we don't have it.
(vc-hg-mergebase): Don't invoke 'hg pull'.
* lisp/vc/vc.el: Document that the incoming-revision backend
function, for distributed VCS, should fetch the incoming
revision into local storage.

(cherry picked from commit 37a9a9495e795f225b1736c56e37c3965de6c58c)

Don't ignore mouse release event in display-buffer-override-next-command

* lisp/window.el (display-buffer-override-next-command):
Don't exit on mouse down event, thus waiting for the incoming
mouse up event (bug#78945).

(cherry picked from commit 3b6e8c5e3c464efbf01d51f39d044cf9d24f5eaf)

Avoid segfaults due to C-g when a thread does GC

* src/keyboard.c (handle_interrupt): Don't forcibly switch threads
if a non-main thread was in GC when the signal handler was called.

(cherry picked from commit 205d69e7e64cf23df0bc7a52b1149f6130c117b5)

; Skip commit f48c283e885bbc5feee0804bc12f1cb633249316

uniquify-get-unique-names: Return a list with propertized strings

* lisp/uniquify.el (uniquify-get-unique-names): Return a list of
strings, and add text property 'uniquify-orig-buffer' to each,
pointing at the corresponding buffers (bug#77312).

* lisp/progmodes/project.el (project--read-project-buffer):
Look up that property's values here and build the alist.

(cherry picked from commit 76877a6b08492c555744cfebda3224df91dec82a)

Ensure <style> and <template> HTML tags are never "readable" in EWW

This helps fix EWW readable mode on some web pages that use these tags,
like the FSF blog.

* lisp/net/eww.el (eww--walk-readability): Check for <style> and
<template> tags.

(cherry picked from commit fa77689b1e352febb2cf9bdd38c595937ae8089e)

cus-edit.el: Don't quote lambdas and improve macro declaration

* lisp/cus-edit.el (custom-reset-extended-menu): Don't quote lambdas.
(custom-dirlocals-with-buffer): Add indent and debug info.

(cherry picked from commit f732a44af801a11467b160d5efc0c7aa7d11266e)

(load-path-filter): Loading can happen in the middle of completion

* lisp/startup.el (load-path-filter-cache-directory-files):
Don't get confused by the context's `completion-regexp-list`.

(cherry picked from commit b3b83b3603e9922c48eb782102933c6ac7fd16e9)

; Skip commit 7f35bf97067ef42492d01cc61aab3d1681228357

Update to Transient v0.9.3-8-gecd64f17

(cherry picked from commit d8cdbc9f615cc5b5daa075fb5c9832fe61ffce26)

; * lisp/transient.el: Fix section outline levels.

In [1: 77a4c63fda5] "all" code sections were needlessly nested
below the ";;; Code:" section, which I do not like but can live
with.  However, a few sections were missed; nest them here too.
Also put the "frontmatter" code, which in my libraries usually
is the only code located in the ";;; Code:" section, into a new
";;;; Frontmatter" sub-section.  That way it is possible again
to cycle to the "show all headings but no code" state.

1: 2025-06-04 77a4c63fda5ca5d4c6d82092eaa06f1eb9b51302
   (outline--hidden-headings-paths): Fix slow saves (bug#78665)
(cherry picked from commit d4615d026bdfc0d40982070149fe9c55f0a661ee)

; * lisp/transient.el: Remove extra semicolon added to eof comment.

(cherry picked from commit 5125395db4284eb13b579d56fd0320631225164a)

VC-Hg: Use generic log-incoming & log-outgoing

* lisp/vc/vc-hg.el (vc-hg-print-log): Implement string LIMIT for
this backend.  Use a DAG range when 'vc-log-view-type' is
'log-outgoing'.  Document differences between -rN:M and -rN::M.
(vc-hg-log-view-mode): Treat 'log-incoming' and 'log-outgoing'
values for 'vc-log-view-type' as short logs too.
(vc-hg-log-incoming, vc-hg-log-outgoing): Delete.

(cherry picked from commit 3dfc98858712b39610716a08e2bb8211fea134de)

vc-hg-mergebase: Try a pull if first attempt fails

* lisp/vc/vc-hg.el (vc-hg-mergebase): If the first attempt
fails, execute a pull, then try again.
(vc-hg-incoming-revision): Use 'hg identify' not 'hg incoming'.

(cherry picked from commit 106048b06258e96764bcc3284893b10199b11b0b)

Revert "admin/gitmerge.el (gitmerge-resolve): Use `replace-region-contents`"

This reverts commit 17d976e22e9b0ba10dcbe1655a93bc4d165d7097
because the change is not worth the risk.

(cherry picked from commit 549232e2e45c77852d2ecd278fe233ea93ce172e)

; * lisp/emacs-lisp/bytecomp.el (compilation-safety): Doc fix (bug#78394).

(cherry picked from commit 985ad1da76d2ea1ef70765fe8b4fb62fc975ae0a)

EUDC: Fix checkdoc errors

* lisp/net/eudc.el (eudc--plist-member)
(eudc-format-inline-expansion-result): Fix checkdoc errors.

(cherry picked from commit ab568bce0c9b9f5cc478ebdcdeea6d93e0c711ae)

; Skip commit 9a7917f8868beb340e8532b6b48dd9825a5c7267

Update `fill-region-as-paragraph-semlf' to follow fill.el protocols

Update the `fill-region-as-paragraph-semlf' function to follow the
`fill-region-as-paragraph-function' protocol.  This allows us to
reimplement the `fill-paragraph-semlf' function using `fill-paragraph'
and `fill-region-as-paragraph-function'.
* lisp/textmodes/fill.el (fill-region-as-paragraph-semlf): Make this
function compatible with `fill-region-as-paragraph-function'.  Avoid
narrowing.
(fill-paragraph-semlf): Reimplement using `fill-paragraph' and
`fill-region-as-paragraph-function'.
* test/lisp/textmodes/fill-tests.el (fill-test-semlf-fill-region): Add
test.
(fill-test-fill-paragraph-semlf-fill-paragraph-function): Remove test.
(fill-test-fill-paragraph-semlf, fill-test-semlf)
(fill-test-fill-paragraph-semlf-justify, fill-test-semlf-justify)
(fill-test-fill-paragraph-semlf-sentence-end-double-space)
(fill-test-semlf-sentence-end-double-space)
(fill-test-fill-paragraph-semlf-fill-column, fill-test-semlf-fill-column)
(fill-test-fill-paragraph-semlf-punctuation-marks)
(fill-test-semlf-punctuation-marks, fill-test-fill-paragraph-semlf-twice)
(fill-test-semlf-twice, fill-test-fill-paragraph-semlf-fill-prefix)
(fill-test-semlf-fill-prefix)
(fill-test-fill-paragraph-semlf-indented-block)
(fill-test-semlf-indented-block, fill-test-fill-paragraph-semlf-revert)
(fill-test-semlf-revert, fill-test-fill-paragraph-semlf-emacs-lisp-mode)
(fill-test-semlf-emacs-lisp-mode, fill-test-fill-paragraph-semlf-c-mode)
(fill-test-semlf-c-mode, fill-test-fill-paragraph-semlf-org-mode)
(fill-test-semlf-org-mode, fill-test-fill-paragraph-semlf-markdown-mode)
(fill-test-semlf-markdown-mode): User shorter function names consistent
with erts file names.
* test/lisp/textmodes/fill-resources/semlf-fill-region.erts: Add test
data.
* test/lisp/textmodes/fill-resources/semlf-fill-paragraph-function.erts:
Delete file.
* test/lisp/textmodes/fill-resources/semlf-emacs-lisp-mode.erts: Remove
newlines around indented block.
* doc/lispref/text.texi (Filling): Highlight that
`fill-region-as-paragraph-function' changes the behavior of
`fill-paragraph'.

(cherry picked from commit 0ac21120cf12f151c7505d7b18601d533ea7f931)

; * doc/lispref/functions.texi (Mapping Functions): Fix wording (bug#78930).

(cherry picked from commit de18407f513ccd7adbd521d0422dd1fb552b5935)

lisp/autoinsert.el (auto-insert-alist): Don't quote 'lambda'

(cherry picked from commit 3efdb553e4845eca0e637e3eefad483c3b15e021)

admin/gitmerge.el (gitmerge-resolve): Use `replace-region-contents`

(cherry picked from commit 17d976e22e9b0ba10dcbe1655a93bc4d165d7097)

; Skip commit db6cbee742ff45bbd52a86cc1823386879beb7e6

Better fix for ignoring 'tab-bar-lines' in daemon's initial frame

* lisp/tab-bar.el (tab-bar--update-tab-bar-lines):
Revert '(not (daemonp))' to update 'default-frame-alist'
even in daemon mode (bug#78896).

* lisp/frame.el (frame-notice-user-settings): For daemon's
initial frame don't modify the frame parameter 'tab-bar-lines'.

(cherry picked from commit b13c583bc7303780b22e7bf4c4fb832fadfc36a7)

Display SVG images inline in Gnus

* lisp/gnus/mm-decode.el (mm-inline-media-tests): Add "image/svg+xml".

(cherry picked from commit 7fd846f61ea74c6438c7ce3def7555a591279514)

; * lisp/vc/vc-git.el (vc-git-print-log): Improve wording.

(cherry picked from commit 7bf2a61623ae463e922c82f6326e9c4468fd67c9)

VC: Fix several START-REVISION versus LIMIT issues

* lisp/vc/vc-git.el (vc-git-print-log): When LIMIT and
START-REVISION are both supplied, use START-REVISION as the
newest commit, and LIMIT as a base (problem was introduced in
the commit adding 'vc-diff-mergebase' and 'vc-log-mergebase').
* lisp/vc/vc.el (vc-default-log-incoming)
(vc-default-log-outgoing): Fix order of START-REVISION and LIMIT
arguments passed to 'print-log' backend function.
(vc-log-mergebase): Fix order of START-REVISION and LIMIT
arguments passed to 'vc-print-log-internal'.

(cherry picked from commit d23b605f754d07a9abf298353d7d17197094477b)

Update from Gnulib by running admin/merge-gnulib

(cherry picked from commit 30bfb03adfa88e94c9f81eacbd125f96a32432c0)

Adapt Tramp versions

* doc/misc/trampver.texi:
* lisp/net/trampver.el (tramp-version): Adapt Tramp versions.

(cherry picked from commit bd04818e53be49f2a087de8a92cb02549f8c2407)

; * test/lisp/textmodes/fill-tests.el (markdown-mode): Declare.

(cherry picked from commit 036c95bbf67368b8efff70f41274130c60865f33)

Add variable `fill-region-as-paragraph-function'

Add the variable `fill-region-as-paragraph-function' to provide
a way to override how functions like `fill-region' fill text.
* doc/lispref/text.texi (Filling): Document
`fill-region-as-paragraph-function' variable.
* doc/emacs/text.texi (Fill Commands): Reference
`fill-region-as-paragraph-function' variable.
* lisp/textmodes/fill.el (fill-region-as-paragraph-function):
Add variable.
(fill-region-as-paragraph): Convert into
`fill-region-as-paragraph-function' wrapper.
(fill-region-as-paragraph-default): Rename old
`fill-region-as-paragraph' function.
(fill-region-as-paragraph-semlf): Update calls to
`fill-region-as-paragraph-default'.
(fill-region): Add reference to `fill-region-as-paragraph-function'
in doc string.
* test/lisp/textmodes/fill-tests.el (fill-test-fill-region): Add
test case for the `fill-region' function.
* test/lisp/textmodes/fill-resources/fill-region.erts: Add test
data.  (Bug#78816)

(cherry picked from commit 99ec286d7803fa59f770013a2135f23918510103)