; Skip commit cb1b65f3923d5dcb88767f6736603ffbc4272557

Work around GCC bug 117423

Problem reported by Oliver Reiter and Pip Cet (Emacs bug#78473).
It looks like GCC tree-sra is trouble in general with how Emacs
uses unions, so disable tree-sra until the GCC bug is fixed.
* configure.ac (C_SWITCH_MACHINE): Also work around GCC bug 117423.

(cherry picked from commit 9dfc605654bea7a1346da224cf7e1eec850e05c4)

; * lisp/disp-table.el (standard-display-unicode-special-glyphs): Fix typo.

(cherry picked from commit 8605221ef604d8f7663f1fb16e2f2ea872a7ce84)

* lisp/treesit.el: New variables for 'down-list' and 'up-list'.

(treesit-sexp-type-down-list, treesit-sexp-type-up-list):
New buffer-local variables.
(treesit-down-list): Use 'treesit-sexp-type-down-list'.
(treesit-up-list): Use 'treesit-sexp-type-up-list'.

* lisp/progmodes/elixir-ts-mode.el (elixir-ts-mode):
Set 'treesit-sexp-type-down-list' and
'treesit-sexp-type-up-list' to 'list'.

(cherry picked from commit 822b6cca1e1f80ab6bd28d03f29d288cc6f6ad0e)

Fix todo-mode item insertion bug (bug#78506)

* lisp/calendar/todo-mode.el (todo-insert-item--next-param): Unset
transient keymap on completing default or copy item insertion
command, to ensure that the next Todo mode key is recognized.

(cherry picked from commit e0c6f3e765684a7f6d93702ad3ca4abe2b802579)

Add support for Pyrefly LSP for Python

* lisp/progmodes/eglot.el (eglot-server-programs): Add config
for Pyrefly.  (Bug#78492)

(cherry picked from commit 328b316764f0b06f7b8c774e9855ff2426a13bfe)

; Skip commit c526646d70d12889319a0178449b0ec060679627

Adapt Tramp version in customize-package-emacs-version-alist

* lisp/net/trampver.el (customize-package-emacs-version-alist):
Add Tramp version integrated in Emacs 30.1.

(cherry picked from commit 661fa578d5133d334c0b34781773229c09d47da4)

; Skip commit 0045a56d558d70572f3dd746d62b23661e841df7

; Skip commit 1136aed6dc5f8a2b7fad78bcd5dcd7eeba863e14

; Skip commit dfcde786ada0918326be849a263e2b8352db9d35

; Bump Emacs version to 30.1.90

* README:
* configure.ac:
* exec/configure.ac:
* java/AndroidManifest.xml.in (Version-code):
* nt/README.W32:
* msdos/sed2v2.inp: Bump Emacs version to 30.1.90.

(cherry picked from commit 4c110212604d5d825abe95418db5dd822b7e9375)

* lisp/tab-line.el (tab-line-move-tab-forward): New command.

(tab-line-move-tab-backward): New command.
(tab-line-mode-map): Bind 'C-x M-<left>' to
'tab-line-move-tab-backward' and 'C-x M-<right>' to
'tab-line-move-tab-forward'.
(tab-line-switch-repeat-map): Bind 'M-<left>' to
'tab-line-move-tab-backward' and 'M-<right>' to
'tab-line-move-tab-forward'.
Suggested by pinmacs <pinmacs@cas.cat>.

(cherry picked from commit 87fa5f565d70c514bd47b59bb0ef0cba8750e983)

lisp/progmodes/hideshow.el (hs--get-ellipsis): Simplify

Mostly using `truncate-string-ellipsis`.

(cherry picked from commit d8bf84f7f45620070f5666c023ca977eebf4dd90)

Fix 'completion-ignore-case' with 'completion--file-name-table'

509cbe1c35b3d "Improve env var handling in read-file-name"
caused 'try-completion' and 'all-completion' operations with
'completion--file-name-table' to no longer update the case of
text which was already present in the input string.  That is,
completions would be returned ignoring case, but the completions
would have letter-casing which matched the input string rather
than matching the actual file names.
This was caused by unnecessarily replacing text in the returned
file name completions with text from the input string ORIG,
which in turn was caused by the desire to preserve text from
ORIG even after 'substitute-in-file-name' changed it.  Fix this
by detecting when ORIG was not substantially changed by
'substitute-in-file-name'; in that case, the returned file name
completions also don't need substantial changes.
* lisp/minibuffer.el (completion--file-name-table): Use text
from the completions, not the input string.  (Bug#78323)
* test/lisp/minibuffer-tests.el (completion-table-test-quoting):
Test with 'completion-ignore-case' as well.

(cherry picked from commit cd364a2119b81f58e0d8f6579809dceb86a8f63c)

Fix thinko in 'fit-frame-to-buffer-1' (Bug#78418)

* lisp/window.el (fit-frame-to-buffer-1): Don't add extra line
when character sizes evenly divide decorations sizes
(Bug#78418).

(cherry picked from commit 0de59ded25aa9f1751edb7170c51a98be70b7edf)

; Fix last change

(cherry picked from commit baa33c3806074453a4410dd0128d47b576b5ed0c)

eww.el: Misc changes

* lisp/net/eww.el (eww--parse-html-region): Don't decode when it's a no-op.
(eww-display-raw): Simplify.
(eww-mode): Prefer #' to quote function names.
(eww-switch-to-buffer): Use `completion-table-with-metadata` instead of
`completion-extra-properties`.  Don't prompt the user when there's only
one choice.
(eww-buffer-list): Use `eww--buffer-p`.

(cherry picked from commit 860a6c86c5696513707f980dffbe7c58f0f52b7b)

eww.el: Use `track-changes`

* lisp/net/eww.el: Require `track-changes`.
(eww-display-document): Don't `inhibit-modification-hooks` any more.
Use `track-changes-register` *at the end* instead.
(eww-mode): Don't use `after-change-functions` any more.
(eww--track-changes): New function.
(eww--process-text-input): Rename from `eww-process-text-input`.
Try and be more careful: don't presume `point` is near
the modification.  Check for a form both at BEG and at END.
Don't rely on `:start/:end` pointing to the right places.
Use `:length` instead and shrink the field back to its original length
when possible.
(eww-size-text-inputs): Set `:length` rather than `:start/:end`.

(cherry picked from commit 168b67b1eeb2e2b79d2e5f3712d8ebfda31fd753)

lisp/net/eww.el: Remove redundant `:group` arguments

(cherry picked from commit 48c66f26c1454c449ac40407651d22dc5cc57424)

Generate tree-sitter compatibility report on emba

* test/infra/Dockerfile.emba (emacs-tree-sitter): Generate
compatibility report.

* test/infra/gitlab-ci.yml (.job-template): Modify artifacts preparation.
(build-tree-sitter): Add artifact.

(cherry picked from commit c8294f3a0fc5eb3302cd3513fb99333d21fab33e)

Factor out vc-git--with-apply-temp-to-staging

* lisp/vc/vc-git.el (vc-git--with-apply-temp-to-staging): New macro.
(vc-git-checkin): Use it.

(cherry picked from commit a4424fb8cd2d638ee348ee7fd08d0e5f397fad75)

; Skip commit 913b4e1c97c0b8ec279cfcf62ed40b5b58393e44

Improve reporting of language-grammar library ABI version mismatch

* lisp/treesit.el (treesit-ready-p): More accurate wording of
message when grammar library fails to load.

* src/treesit.c (treesit_load_language): Improve message when
reporting library ABI version mismatch.  Suggested by Soham
Gumaste <sohamg2@gmail.com>.

(cherry picked from commit 38789e9a2878846cadb72fef58cc24872fe46ae4)

editorconfig.el: Fix bug#78097

When there is no `.editorconfig` variable, the
`file-name-directory` call can signal an error, but that can
happen only if `editorconfig-get-local-variables-functions`
added entries "out of thin air".  So just skip running that hook
to avoid this corner case.

* lisp/editorconfig.el (editorconfig--get-dir-local-variables):
Don't run `editorconfig-get-local-variables-functions` when we found no
EditorConfig settings.

(cherry picked from commit 28a8bd6061d99c71ca2ac17868dfc8cf36a1c728)

Prevent double frees in closing fonts provided by the Haiku font driver

* src/haikufont.c (haikufont_close): Clear INFO->metrics,
glyphs, be_font after they are released and do not attempt to
access them if NULL.  (bug#77478)

(cherry picked from commit b9b52f009289ede7967a176bc6ed069c87514794)

(eww-switch-to-buffer): Don't let-bind `completion-extra-properties`

* lisp/net/eww.el (eww--buffer-p): New function.
(eww-switch-to-buffer): Use it.  And set `completion-extra-properties`
buffer-locally rather than let-binding it.

(cherry picked from commit f77f464637c6ce86d5d69963543f86bc517ad14c)

Support 'dired-hide-details-mode' in find-lisp.el

* lisp/find-lisp.el (find-lisp-find-dired-insert-file): Call
'dired-insert-set-properties' to support 'dired-hide-details-mode'
in the resulting Dired display.  (Bug#78455)

(cherry picked from commit e05f76667d5e723d5a817848ca2db1252827778a)

* doc/lispref/searching.texi (Rx Notation): Fix example (bug#76731)

The example purporting to match C comments was wrong.
Reported by Yue Yi, whose proposed remedy is used here.

(cherry picked from commit 2606e3dd994d2d75850630707c00c0156afced9a)

* src/lread.c (read0): Don't allow radix 0 or 1.

This was just a silly mistake introduced in Emacs 29.  Found by Pip Cet.

(cherry picked from commit e888bd990dcc82690ae33052f2aaec3ca827960c)

; Fix a recent change in hideshow.el

* lisp/progmodes/hideshow.el (hs--get-ellipsis): Don't assume
'standard-display-table' is defined.

(cherry picked from commit 6571a2d70b44135ba04baf5d3eabc83fc4c0f085)

Fix saving abbrevs by 'abbrev-edit-save-buffer'

* lisp/abbrev.el (abbrev-edit-save-buffer): Reset
'abbrevs-changed'.  Suggested by Rick <rbielaws@gmail.com>.
(Bug#78435)

(cherry picked from commit 299d3a440121ff6692a85615ff97e6ad4dde91db)

; Remove confusing text from ELisp manual

* doc/lispref/variables.texi (Defining Variables): Remove outdated
confusing warning.  For the details, see
https://lists.gnu.org/archive/html/emacs-devel/2025-05/msg00332.html.

(cherry picked from commit 399d05332eda348ae7552cdff674e4c8973be815)

; * lisp/progmodes/hideshow.el (hs--get-ellipsis): Doc fix (bug#78234).

(cherry picked from commit 214c0ba3c76b69d8e3ee1ff639782f9380d9054c)

Prettify and improve hideshow (bug#78234)

Buttonize the ellipsis and optionally display in the ellipsis
the total number of hidden lines.
* lisp/progmodes/hideshow.el (hs-display-lines-hidden): New
user option.
(hs-ellipsis): New face.
(hs-make-overlay): Tweak.
(hs--get-ellipsis): New function.
* doc/emacs/programs.texi (Hideshow): Update documentation.
* etc/NEWS: Announce changes.

(cherry picked from commit 8b6e1d8435712a1d312244f9fe3a43d8b346f49a)

; Skip commit 719b2fd580b79c6e2463a295cad58cd2066fa1b7

Fix DTSTART date when exporting `diary-float'

Instead of using current date as DTSTART and then excluding it
when it doesn't match the `diary-float' rule, just use the first
date which matches the rule in `icalendar-recurring-start-year'.
* lisp/calendar/icalendar.el (icalendar--convert-float-to-ical):
Compute the correct date.
* test/lisp/calendar/icalendar-tests.el: Add a test for the
reported test case.  (Bug#78085)

(cherry picked from commit c1153963b5db351d3fbe8f661e17efb55ebb2cb8)

; Fix last change

* lisp/pulse.el (pulse-faces, pulse-face-duration):
* etc/NEWS: Fix documentation of last change.  (Bug#77715)

(cherry picked from commit 3b2b0424cf9458d8f59b283139f46e1515989df3)

New pulse functions for pulse faces and new file for ring bell fns

These new pulse functions allow pulse any defined face briefly.
The new file contains functions intended to be used in
`ring-bell-function' as alternatives to `visible-bell'.
* lisp/pulse.el (pulse-face-duration): New user option.
(pulse-flash-face): New function.
* lisp/ring-bell-fns.el (flash-face-attributes)
(flash-face-faces): New user options.
(flash-face-bell-function, flash-echo-area-bell-function):
New functions.  (bug#77715)

* etc/NEWS: Announce changes

(cherry picked from commit b25139a5322ae809fe32d91d55e2212cc91b1b38)

Allow nil as valid value for 'url-cookie-save-interval'

* lisp/url/url-cookie.el (url-cookie-save-interval): Fix doc
string and :type.  (Bug#78303)

(cherry picked from commit 44c808773403ee200fcfaf340b11d9244bf5b398)

* lisp/treesit.el (treesit-simple-imenu): Restore the previous behavior.

Use 'treesit-parser-list' again to not depend on the cursor's position
(bug#78456).

(cherry picked from commit 7d7d821c495abcd740fd20f6a8df6da5bd920cd3)

; * doc/emacs/cmdargs.texi (General Variables): More accurate wording.

(cherry picked from commit feecb1fbc60d6d027a766aaf08fb50feeaaeb192)

; Improve documentation of the -L command-line option

* doc/emacs/cmdargs.texi (Action Arguments): Mention that '-L' is
in effect only after the init files are loaded.

(cherry picked from commit 18e1aabbeaa284ef86a1d77de434dd2acde418c3)

typescript-ts-mode: align ternary-chain branches (bug#78187)

* lisp/progmodes/typescript-ts-mode.el:
(typescript-ts-mode--indent-rules): Make sure each new ternary
branch is aligned with the previous one.
* test/lisp/progmodes/typescript-ts-mode-resources/indent.erts:
(Chained ternary expressions): New test.

(cherry picked from commit c80fbe3f2355ab7182dcba98ed9717f0231aab00)

; Skip commit 9659f8aa344f73164bece7408d63991531fc115d

; Fix wording of recently-added documentation

* src/eval.c (Fset_buffer_local_toplevel_value)
(Fbuffer_local_toplevel_value):
* doc/lispref/variables.texi (Default Value): Fix wording of
documentation.

(cherry picked from commit db198e0e59bff0c1cb28a591928377f5a0e9d158)

; Skip commit 16bfbc6fe312526cec8a331a759615ffe3eb4523

vc-git-checkin: Fix calling 'git apply --cached' remotely

* lisp/vc/vc-git.el (vc-git-checkin)
(vc-git--stash-staged-changes): Fix calling 'git apply --cached'
remotely (bug#78405).

(cherry picked from commit 511e3d4e798c70d4a9a6216e0c5ff04e36600ea7)

default_toplevel_binding, local_toplevel_binding: Loop upwards

* src/eval.c (default_toplevel_binding, local_toplevel_binding):
Loop upwards, not downwards, given that we want the earliest
relevant binding present in the stack.

(cherry picked from commit f70bb4d7677ba308bf15f445ecc99e30754bad84)

New top-level buffer-local value functions

* src/eval.c (local_toplevel_binding)
(Fbuffer_local_toplevel_value, Fset_buffer_local_toplevel_value)
(syms_of_eval): New functions.
* doc/lispref/variables.texi (Default Value):
* lisp/subr.el (setq-local):
* etc/NEWS: Document them.
* test/lisp/emacs-lisp/lisp-tests.el
(core-elisp-tests-4-toplevel-values): New test.
* lisp/progmodes/xref.el (xref--show-xref-buffer)
(xref-show-definitions-buffer-at-bottom):
* lisp/vc/vc-dispatcher.el (vc-setup-buffer):
Use set-buffer-local-toplevel-value.

(cherry picked from commit 45627ca7ccd0e84452d497997a7f75535ed83864)

Scroll with mouse wheel in calendar (bug#78298)

* lisp/calendar/calendar.el (calendar-mode-map): Add scrolling
with mouse wheel.
* etc/NEWS: Announce the change.

(cherry picked from commit 825d64aa57801dee2d95ab5d4f7f57b656764a48)

cl-extra-tests.el: Follow convention

* test/lisp/emacs-lisp/cl-extra-tests.el (multiples-of)
(unsigned-byte): Stick to the tradition of accepting nil.

(cherry picked from commit b644823443bf4b9f2257d1409024094bb5b608d2)

; Time Stamps doc: Clearer customize recipe

* doc/emacs/files.texi (Time Stamps): Reorder the customize sentence so
that the key words come in the order you would use them.

(cherry picked from commit f0ac271da385a81a3f537f48a67d59d0057f921e)

; * doc/lispref/variables.texi (Default Value): Update.

Frame-local variables have been removed.

(cherry picked from commit 49c06df224a10f4b39b24025476e4de588292228)

; Skip commit cbea5997c077878b757b0168762f1a114ee1e484

; Skip commit 0bf956235e3475f93bd3c146da05a0f87afab714

* lisp/autorevert.el (auto-revert-remote-files): Adapt docstring.

(cherry picked from commit eaf01d034c0c20f5dc205331de22761016887707)

; Improve documentation of ls-lisp.el

* lisp/ls-lisp.el (ls-lisp-format-time-list)
(ls-lisp-use-localized-time-format, ls-lisp-format-time): Doc
fixes.

(cherry picked from commit e32bb816adbbd070bbb2bf42b06feb4b6d917b5b)

; * lisp/emacs-lisp/comp.el (native-compile-prune-cache): Doc fix.

(cherry picked from commit 2d5f2434706a17055325432d6eb2b711ac785220)

Improve Electric Pair mode documentation (bug#78021)

* doc/emacs/programs.texi (Matching): Clarify and improve
documentation of Electric Pair mode.

* lisp/elec-pair.el: Improve description in header line.  Add text
and a reference to the Emacs user manual in the Commentary section.
(electric-pair-skip-self, electric-pair-inhibit-predicate)
(electric-pair-preserve-balance)
(electric-pair-delete-adjacent-pairs)
(electric-pair-open-newline-between-pairs)
(electric-pair-skip-whitespace)
(electric-pair-skip-whitespace-function)
(electric-pair-analyze-conversion)
(electric-pair--skip-whitespace)
(electric-pair-text-syntax-table, electric-pair--with-syntax)
(electric-pair-syntax-info, electric-pair--insert)
(electric-pair--syntax-ppss, electric-pair--balance-info)
(electric-pair-inhibit-if-helps-balance)
(electric-pair-skip-if-helps-balance)
(electric-pair-open-newline-between-pairs-psif)
(electric-pair-mode): Clarify and improve doc strings and some comments.
(electric-pair-post-self-insert-function): Restructure doc string
to shorten overlong first line, and reformat overlong lines of code.

(cherry picked from commit bb735331650a9b5ac3c28ed8e1d9459059bd1195)

Use JSX comments on jsx treesit nodes in js-ts-mode and tsx-ts-mode

* lisp/progmodes/js.el (js--treesit-comment-jsx): New internal variable.
(js--treesit-comment-setup): New function.
(js-ts-mode): Set buffer-local 'comment-setup-function' to
'js--treesit-comment-setup'.

* lisp/progmodes/typescript-ts-mode.el (typescript-ts-base-mode):
Set buffer-local 'comment-setup-function' to 'js--treesit-comment-setup'.

(cherry picked from commit 8bccccedb65a6d3991c41398effa9317adaec873)

lisp/emacs-lisp/cl-preloaded.el (cl--define-derived-type): Fix corner case

(cherry picked from commit 81cbff70f29c5138859b75b9a7369e0019c457b6)

lisp/emacs-lisp/cl-macs.el (cl--define-derived-type): Fix thinko

(cherry picked from commit b8f23179dacc7477f1c680fef38bb2bc70ac4fca)

Fix description of a remapped command's bindings

* lisp/help-fns.el (help-fns--key-bindings): Qualify the
description of any menu-bar bindings by remapping.  (Bug#78391)

(cherry picked from commit ebeeced9e3ca94bbb679730155a2582bc12f8ea7)

Eglot: Fix parsing file:// URIs on MS-Windows

* lisp/progmodes/eglot.el (eglot-uri-to-path): Remove the leading
slash in MS-Windows file names only if they begin with a slash.
This adjusts the function to the recent fix for bug#76982 in
'url-generic-parse-url', which previously would produce file names
that begin with an extra slash.  (Bug#78392)

(cherry picked from commit b3e280faba98d2ca7e4feef1017e3bebf53f036a)

; Skip commit 4b4276d64f47fad6e485b6da8cf908204f167f61

; * src/buffer.c (Fgenerate_new_buffer_name): Fix typo.

(cherry picked from commit e17001b2e181ae5f6d568573788e94f19e1cff0a)

; * lisp/vc/diff-mode.el (diff-mode-shared-map): Document.

(cherry picked from commit a8309895ae83a18dbdfe4afae49152e98bee1e6f)

* test/README: Tests in *-tests/ directories are also performed.

(cherry picked from commit d1be1c91e0618da5129fcc5a8d42146277efac57)

help.el: Don't abuse `inhibit-modification-hooks`

* lisp/help.el (substitute-command-keys):
Set `inhibit-modification-hooks` locally so it doesn't affect
downstream function.
(help--window-setup): Don't let-bind `inhibit-modification-hooks`.
It was introduced accidentally in commit cd87a5c7a18e.

(cherry picked from commit 40559bf71cd5efdf4c88ab43bc7e55abf3a66c20)

(hash-table-contains-p): Don't allocate memory (bug#78162)

* lisp/subr.el (static-when): Remove spurious extra `progn` and improve
warning message's location info.
(hash-table-contains-p): Don't allocate memory (bug#78162).
Suggested by Daniel Mendler <mail@daniel-mendler.de>.

(cherry picked from commit 872658764823bb805796002c46c0e6e4456e65b7)

comint.el: Cosmetic changes

* lisp/comint.el: Prefer #' to quote function names.
(comint-mode): Turn some of the `make-local-variable`s to `setq-local`
or `defval-local`.
(comint-osc-hyperlink): Delete bogus alias.
(comint-replace-by-expanded-history-before-point): Use `looking-at-p`.
(comint-history-isearch-wrap): Share a bit more code.

(cherry picked from commit 0c3cf0e16c1f28b1c50ecd5918af5802801e51b2)

; Skip commit 396c8873f3bf992635fce12478313ce1e1d84017

* lisp/treesit.el (treesit--parser-overlay-offset): New variable.

(treesit-parsers-at): Use it (bug#77906).
(treesit-forward-sexp, treesit--forward-list-with-default)
(treesit-up-list): Let-bind 'treesit--parser-overlay-offset'.

(cherry picked from commit 824e4868db312f0cd9e735cf13d54466c4af5934)

; RefTeX: Describe activation with use-package

* doc/misc/reftex.texi (Installation): Add examples how to
activate RefTeX with use-package.
Fix markup.

(cherry picked from commit c53f53f11b0dbf4417bc8b478659f8ec33b182b4)

simple.el (delete-trailing-whitespace-mode): New minor mode (bug#78264)

Partly motivated by bug#78097.

* lisp/simple.el (delete-trailing-whitespace-if-possible): New function.
(delete-trailing-whitespace-mode): New minor mode.

* lisp/editorconfig.el (editorconfig-trim-whitespaces-mode):
Change default to `delete-trailing-whitespace-mode`.
(editorconfig--get-trailing-ws): Simplify accordingly.
(editorconfig--add-hook-safe-p): Delete function.  Don't touch
`safe-local-eval-function` any more.

(cherry picked from commit 8a19c249f813e9f3830308e40f0205d7665f78a3)

Require key and cert when searching for client cert

* lisp/net/network-stream.el (network-stream-certificate):
Require :key and :cert when searching auth sources for a client
certificate.  (Bug#78189)

(cherry picked from commit d11570d80ee18932ffb0ceed552313ada2879bcb)

Improve handling of tests in *-tests subdirs

* test/Makefile.in (subdir_template): Add rules for *-tests subdirs.

* test/infra/Makefile.in: Remove special handling of eieio, faceup
and so-long.  Add recipes for *-tests subdirs.  Filter out rules
for *-tests subdirs.

* test/infra/test-jobs.yml: Regenerate.

(cherry picked from commit b91efd401d68f22510856008ce79121b8b9bd199)

Fix filelock-tests on MS-Windows

* test/src/filelock-tests.el (filelock-tests-file-locked-p-spoiled)
(filelock-tests-unlock-spoiled)
(filelock-tests-kill-buffer-spoiled): Don't special-case
MS-Windows, as it was evidently fixed to signal the same error as
Posix systems.

(cherry picked from commit 8b67e566b9fe156b6be8be0a6381052fa79abc2c)

diff-mode-shared-map: Don't inherit from special-mode-map

* lisp/vc/diff-mode.el (diff-mode-shared-map): No longer inherit
from special-mode-map.
(diff-mode-map): Tidy up list of unbindings now that we no
longer need to override any bindings from special-mode-map.
(minor-mode-map-alist): <diff-mode-read-only>: Ensure that the
minor mode keymap continues to inherit from special-mode-map by
calling make-composed-keymap here.

Co-authored-by: Stefan Monnier <monnier@iro.umontreal.ca>
(cherry picked from commit 4ddafede8d7bebdaa795279cc4c527e5fe425add)

Avoid unnecessary calls to GetFileAttributes on MS-Windows

* src/w32.c (access_attrs): New function, refactored from
'faccessat'.
(faccessat): Call 'access_attrs' early to determine whether the
file doesn't exist, and if so, avoid calling 'chase_symlinks'.
Also avoid calling 'chase_symlinks' if it is known that the file
cannot be a symlink, given its attributes.  (Bug#78341)

(cherry picked from commit 882c849034a909a62179c38ee01cc08572fa1a68)

Add test for file time-stamp granularity on MS-Windows

* test/src/fileio-tests.el
(fileio-tests-w32-time-stamp-granularity): New test.

(cherry picked from commit 7d84ffc2ded59a1d32b902cf7487a6486e0d9869)

Support sub-second file time-stamps on MS-Windows

* nt/inc/sys/stat.h (struct stat): New members for nsec part of
file times.

* lib-src/ntlib.c (convert_time):
* src/w32.c (convert_time): Accept an additional argument
TIME_NSEC and set it to the sub-second part of time.  All callers
changed.

(cherry picked from commit 3975094f1d96680fe73232ca4216733904ebecd0)

Tweak .clangd to work with gcc-compiled Emacs (bug#78367)

A Gcc configuration of Emacs emits -fstrict-flex-arrays but
clangd doesn't understand that.  This causes spurious errors of
"unknown flag" that prevent analysis.  So tweak .clangd to the
nearest clang equivalent (which is very similar).

* .clangd (CompileFlags): Remove -fstrict-flex-arrays, add
-fstrict-flex-arrays=3.

(cherry picked from commit 9df2074a06fefa0b5bfe9714b45c383fa45d6650)

Eglot: fix call hierarchy navigation again (bug#78367, bug#78250)

* lisp/progmodes/eglot.el (eglot--hierarchy-label): Fix again.

(cherry picked from commit c69c18b732c2b1cd772dc7e15c0ea3074a3492bc)

diff-mode-map: Unhide some additional M-<foo>

* lisp/vc/diff-mode.el (diff-mode-map): Don't inherit M-?,
M-SPC, M-DEL and M-S-SPC bindings through from special-mode-map.

(cherry picked from commit 5b73625714ff6357170d83bff8fafa8d4c6a47c4)

lisp/emacs-lisp/cl-macs.el (cl--define-derived-type): Fix partial bootstrap

(cherry picked from commit dfafe1830f06634ec779fd62f7081d4cc4f6d3e7)

lisp/net/browse-url.el (browse-url-interactive-arg): Fix bug#78026

Don't burp when run from a timer where (this-command-keys) will
usually return an empty vector.

(cherry picked from commit 66990628b8f91554e05aa2bee9a657149ac0037c)

; * src/callint.c (Fcall_interactively): Refine docstring.

sh-script.el: Improve consistency in variable-use fontification.

sh-mode--treesit-settings: Ensure all variable use is treated the
same way.
Before this patch the following commands would all be treated differently:

    echo "${var}"
    echo "$var"
    echo ${var}
    echo $var

Now they are treated the same.
* lisp/progmodes/sh-script.el (sh-mode--treesit-settings): Tweak
rules.  (Bug#78167)

(cherry picked from commit 7265be09cebc9ee752b688b7a85fb1ac18b45ef5)

Fix indentation of XML comments

* lisp/nxml/nxml-mode.el (nxml-compute-indent-in-delimited-token):
Fix indentation in XML comments with empty lines.  Patch by John
Ciolfi <ciolfi@mathworks.com>.  (Bug#73206)

(cherry picked from commit 0d493864cee2ea1d7661d51b973db58667b6b65b)

; Skip commit 013ed9799e68d83b478320b0a31180f8047d13b1

Improve Tramp's make-process handling for Solaris

* lisp/net/tramp-sh.el (tramp-sh-handle-make-process):
Disable buffering also for remote Solaris hosts.
Reported by Stacey Marshall <stacey.marshall@gmail.com>.

(cherry picked from commit 1a2c29b5317357ba451fdd6f308675a1c6cbba2e)

Document 'time-stamp-time-zone' in Emacs Manual

* doc/emacs/files.texi (Time Stamp Customization): Document
time-stamp-time-zone.

(cherry picked from commit a7dffc2ea38583db39eaec5f21fd0d8fa5571ab4)

Make treesit--simple-indent-eval more permissive (bug#78065)

* lisp/treesit.el (treesit--simple-indent-eval): Allow EXP to be
anything, so higher-order indent presets can take anything as an
argument: t, nil, symbols, keywords, etc.

(cherry picked from commit 0b4eb525b69822c6b503982ef49980c72c8d0232)

Adapt Tramp tests

* test/lisp/net/tramp-tests.el (tramp-test29-start-file-process)
(tramp-test30-make-process): Adapt tests.

(cherry picked from commit ed7b55f6bf1b8d0ceb40c9e196d8b31fd6afc21e)

; * doc/lispref/tips.texi (Library Headers): Fix wording (bug#78253).

(cherry picked from commit b172a1478c16067d88b3a79eed857f265cafb1b7)

; * lisp/gnus/mail-source.el (mail-sources): Fix a typo (bug#78235).

(cherry picked from commit 81629b2b2ba282136bc5055bbaa0302321306e61)

Improve flymake diagnostics list next-error support

; * doc/emacs/vc1-xtra.texi (General VC Options): Fix markup.

(cherry picked from commit 63f73de839b3142a3587ccb6edecc78d5232bced)