; * test/src/fileio-tests.el (fileio-tests--read-directory): New test.

(cherry picked from commit 29324fd0fa3755028466966b6eeb3cd0df1b442f)

Add more ways to exclude buffers in tab-line-mode. (Bug#78988)

* etc/NEWS: Announce changes.
* lisp/tab-line.el (tab-line-exclude-buffer): New user option.
(tab-line-mode--turn-on): Update conditions.

(cherry picked from commit 6053a7f1a4a862bee6a83ab5d69531672c7f9652)

Don’t optimize insert-file-contents for GNU

* src/fileio.c (Finsert_file_contents):
Remove a microoptimization for GNU/Linux and Android.

(cherry picked from commit 15570b7b95da3461feb51cf1bfe3b6337f5a67cd)

; Skip commit 9326784b785c110468c1804b969eefb8d8119fd8

insert-file-contents small gap bug

Problem reported by Zhengyi Fu (Bug#79031).
* src/fileio.c (Finsert_file_contents): Do not read more than
requested, even when the gap is so small that we use a local buffer.

(cherry picked from commit e450a7802c544b7fa14fe064c62de1f9b7098e81)

insert-file-contents likely-end memory objects

* src/fileio.c (Finsert_file_contents): Treat memory objects like
regular files when inferring likely end.  Simplify likely end
computation.

(cherry picked from commit 92dee45c5e4e7be1682a8a3aacdfd7d9c87cf286)

Port insert-file-contents dir behavior to Unix

* src/fileio.c (Finsert_file_contents): Port better to traditional
Unix platforms like Solaris, where in some cases 'read' can
succeed on directories.

(cherry picked from commit 8a1d368b6241d999668086fed3c20f634b9fb4d3)

Avoid syscall in dir-locals--all-files

* lisp/files.el (dir-locals--all-files):
Omit an unnecessary call to file-directory-p.

(cherry picked from commit b282cb98e498ded876b87e5e48fe74b8c45156ea)

Avoid some syscalls in locate-dominating-file

* lisp/files.el (locate-dominating-file): Do not call
file-directory-p each time through a loop ascending the directory
hierarchy, as the file must be a directory after the first loop
iteration.  Instead, call file-directory-p just once, before the
loop starts, and do this only if the file name is not already that
of a directory.

(cherry picked from commit 2074951c2adff43be49822c344d6cf3fee2e29a5)

Fix :box attribute of faces in Leuven themes.

* etc/themes/leuven-dark-theme.el:
* etc/themes/leuven-theme.el: Fix 'lui-highlight-face' face.
(Bug#79029)

(cherry picked from commit fe3ac1575a0103ac3f2030fe4a464a50f935abff)

; define-globalized-minor-mode: Fix capitalization.

(cherry picked from commit 86e32aed4a3506151c9a06df7f4dcdd2c4bbeca1)

; * lisp/vc/diff-mode.el (diff-mode): Scare-quote 'normal'.

(cherry picked from commit 24db9b79623a04207aeff5071f1389ad38f66672)

; vc-revert-buffer-internal: Capitalization fix.

(cherry picked from commit 48b3363ac4b2b297faedf2c9f62b48d465cd29c4)

view-mode-exit: Respect view-read-only

* lisp/view.el (view-mode-exit): When view-read-only is non-nil,
don't exit View mode if doing so would leave behind a read-only
buffer not in View mode.
(View-exit): Bind view-read-only to nil to override the above.

(cherry picked from commit 3d04506cf3d0f020f40043d2b8e8be604ba1c2c5)

vc-git-diff: Fix case where REV1 & REV2 are nil and no commits yet

* lisp/vc/vc-git.el (vc-git--empty-tree): New constant.
(vc-git-diff): When REV1 and REV2 are both nil and there are no
commits yet, diff against the empty tree object (bug#78987).

(cherry picked from commit aec5c5f037b72f2ab49b17f4e3f6655e0c2125b3)

; * src/xdisp.c: Fix typo.

(cherry picked from commit e4db6aa5459e5c654c7a2bf09c39457e0ad5eff0)

Fix insert-file-contents overlap check

In commit 61a8ce0280668980a4452b112103c9bc879e1f49 I mistakenly
focused on overlap in the buffer.  The code also needs to check
for overlap in the inserted file data.
Problem reported by Gerd Möllmann (Bug#79020).
* src/fileio.c (Finsert_file_contents): Prevent overlap in both
the buffer head and tail, and in the inserted file’s head and tail.
Also, shrink the file’s head if the file shrank to be smaller
than its head.

(cherry picked from commit 42548c25f74d4509a1d29cb419e1b2f7b4a12c10)

; Fix wording.

(cherry picked from commit a30372f42b2066df3172bedb5702a57e4d52ddd1)

; Skip commit 6ee0093b21957e05bd20efed9323e9ee268d2415

Add `redisplay_counter` to catch nested redisplays and abort outer one

The redisplay code is not re-entrant.  To allow running ELisp code
from within redisplay, we have some hacks (e.g. `inhibit-redisplay`)
that try to avoid the resulting breakage.
This commit adds another one of those hacks, which tries
to get closer to the core of the problem, thereby making it "safe"
to override `inhibit-redisplay`, e.g. to debug jit-lock code.

* src/dispextern.h (redisplay_counter): Declare.
* src/xdisp.c (redisplay_counter): Define.
(redisplay_internal) Increment it.
(dsafe__call): Use it, in case `inhibit-redisplay` is overridden.
* src/eval.c (call_debugger): Use it as well to refine the test
we already had.

(cherry picked from commit c3f3fe136cefc4c3aed960b175053e7c048aa979)

Improve autorevert-tests

* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.8.1-pre".

* lisp/autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(auto-revert-notify-handler, auto-revert--end-lockout):
Use `auto-revert-buffer'.
(auto-revert-notify-handler): Rearrange setting current buffer.
(auto-revert-handler): Add debug message.  Rearrange check.
Cancel lockout timer if running.

* lisp/net/tramp.el (tramp-barf-if-file-missing)
(with-parsed-tramp-file-name, tramp-skeleton-file-truename):
* lisp/net/tramp-archive.el (with-parsed-tramp-archive-file-name):
* lisp/net/tramp-message.el (tramp-with-demoted-errors):
Fix debug declatation.

* lisp/net/tramp-sh.el (tramp-sh-gio-monitor-process-filter): Do not
prepend remote prefix.

* test/lisp/autorevert-tests.el: Unify file notification libraries
"gio-monitor" and "gvfs-monitor-dir" to "gio".
(top): Set some Tramp related variables.
(auto-revert--timeout): Increase value.
(auto-revert--test-enabled-remote)
(auto-revert-test02-auto-revert-deleted-file): Do not check for
EMACS_HYDRA_CI environment variable.
(auto-revert--wait-for-revert): Fix regexp to search for.
(auto-revert--deftest-remote): Fix debug declatation.  Do not tag
:unstable.
(with-auto-revert-test): Fix debug declatation.  Adapt revert intervals.
(auto-revert-test*): Start with (file-notify-rm-all-watches).  Use
`buffer-string' and `string-match-p'.
(auto-revert-test00-auto-revert-mode): Unlock initial lockout.
(auto-revert-test01-auto-revert-several-files): Rearrange
temporary directory and file settings.
(auto-revert-test02-auto-revert-deleted-file): Adapt debug message.
(auto-revert-test03-auto-revert-tail-mode): Use `with-auto-revert-test'.
(auto-revert-test04-auto-revert-mode-dired):
Use `ert-with-temp-directory'.  Adapt prefix of tmpfile.
(auto-revert-test04-auto-revert-mode-dired)
(auto-revert-test05-global-notify, auto-revert-test06-write-file):
Wait for proper file modification.
(auto-revert-test--instrument-kill-buffer-hook): Fix debug message.
(auto-revert-test07-auto-revert-several-buffers): Use
`with-auto-revert-test.

* test/lisp/filenotify-tests.el: Unify file notification libraries
"gio-monitor" and "gvfs-monitor-dir" to "gio".
(file-notify--deftest-remote): Fix debug declatation.  Do not skip
for "gio".
(file-notify--test-with-actions): Fix debug declatation.

* test/lisp/net/tramp-tests.el (filenotify): Require.
(ert-remote-temporary-file-directory)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test45-asynchronous-requests): Do not check for
EMACS_HYDRA_CI environment variable.
(tramp-test46-file-notifications): New test.

(cherry picked from commit 4c9b37660771776563cf79bb3a2b6e692aa05ca2)

; * test/lisp/vc/vc-tests/vc-tests.el (vc-test--version-diff): Fix for Bzr.

(cherry picked from commit 0237e0d1a41a9095d7f1fdd32c0a123f60ffaace)

Fix shift-translation support of 'scroll-lock-mode' commands

* lisp/scroll-lock.el (scroll-lock-next-line-always-scroll)
(scroll-lock-next-line, scroll-lock-previous-line)
(scroll-lock-forward-paragraph, scroll-lock-backward-paragraph):
Make them support shift-translation, like the commands remapped to
them do.  (Bug#79022)

(cherry picked from commit 1ea3d7b1f7d45efa00f4fee5d33556d3c1ff7649)

; Improve cross-referencing in some VC docs.

(cherry picked from commit c82a62fa36237b354c47c1c4d2cb4db0e9100bf3)

; Wording fixes in VC docs.

(cherry picked from commit 8fb0e33a10f07799d693ddbfb4e99e1549b72032)

Allow trivially autoloading transient-define-group

* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload):
Allow uses of transient-define-group to be autoloaded using just
";;;autoload".

(cherry picked from commit 105ae06031a548e1afd7b7a992c1da783f498534)

vc-resynch-window: Check whether auto-revert-mode is bound

* lisp/vc/vc-dispatcher.el (auto-revert-mode): Delete
declaration.
(vc-resynch-window): Check whether auto-revert-mode is bound.

(cherry picked from commit e4ea991ed9a147ee44c85d2d512b47032e5cc4b3)

; Skip commit 5d9a67e4bd374a0f6741bc56a37190aa51062d69

(cl--class-allparents): Fix bug#78989

Give more control over ordering when linearizing the
parent graph and avoid pathological misbehavior (such as
placing `t` in the middle of the linearization instead of the
end) when we can't "do it right".

* lisp/subr.el (merge-ordered-lists): Degrade more gracefully in case
of inconsistent hierarchies and don't do it silently.

* lisp/emacs-lisp/cl-preloaded.el (cl--class-allparents): Use the local
ordering to break ties, as in the C3 algorithm.

(cherry picked from commit 7f1cae9637f9a9d4715e101eecad391748e3bd3c)

; Skip commit c8b6e90b4e1678846b8acefd59555ff3d8a376bd

; Skip commit f01fc3d61430559a2b4ec6682167df72ec9d7738

Fix the Android port

* src/fileio.c (emacs_full_read): Retype FD param to `emacs_fd'.
(Fcopy_file): Label newsize MAYBE_UNUSED.

(cherry picked from commit b2d5e4fe40b56913c9282b3e584336fed47474d2)

; Fix 'threads-join-error' test

* test/src/thread-tests.el (threads-thread-sleeps): New helper
function.
(threads-join-error): Fix to work as intended, and remove the
'unstable' tag.  (Bug#40823)

(cherry picked from commit d0f96de277ff89adae4bc29ce934b7fca1d9bf00)

; * lisp/window.el (window-state-put): Fix a typo (bug#79013).

(cherry picked from commit 756e7e524395cc3cdf5a0945c58af402e5054cfb)

* src/xdisp.c (tab-bar-truncate): New variable (bug#78953).

(tab_bar_height): Use it.

(cherry picked from commit 817f7829f9cdb47d2bcdee95ffc97830537c490d)

; Fix indentation.

(cherry picked from commit a8b65860a5e28ee0867e8506a17d74d4a9b7783a)

Speed up insert-file-contents reads

This change makes insert-file-contents-literally 30% faster on my
platform, when inserting xdisp.c.
* src/fileio.c (READ_BUF_SIZE): Remove, replacing with ...
(IO_BUFSIZE): ... this new constant from Coreutils.
All uses of READ_BUF_SIZE changed to either MAX_ALLOCA or
IO_BUFSIZE.

(cherry picked from commit 5bce6753e24d04ea3e4715fab53cc65c1b4ee8d7)

Avoid some tiny /proc file reads

* src/fileio.c (union read_non_regular):
New members buf and bufsize replace inserted and trytry.
(read_non_regular): Adjust to this new, simpler interface.
(Finsert_file_contents): If the gap is smaller than read_buf
and we want to read more than the gap, read into read_buf
first, to avoid lots of tiny reads from /proc files.

(cherry picked from commit c3f96d20eecdf0aa93f294a4f3fb96e16eec6a68)

insert-file-contents file shrinkage in scanback

* src/fileio.c (emacs_full_read): New function.
(Fcopy_file, Finsert_file_contents): Use it.
(Finsert_file_contents): Check for partial reads when scanning
backwards through the file’s tail, as this indicates the file
shrank while we read it.  Also, use emacs_full_read in other
situations where it’s simpler and should be a bit faster.

(cherry picked from commit 55f41ca3aa8fe487d10730708a7396137a2c9d18)

int → ptrdiff_t for read results

* src/fileio.c (Finsert_file_contents): Use ptrdiff_t, not int, to
store results returned by emacs_fd_read, which return ptrdiff_t.
This doesn’t fix any bugs since the values happen to fit in int,
but is a bit clearer and may simplify future changes.

(cherry picked from commit 8ac78986ff7028c249f136b3523dacf0693c22d3)

insert-file-contents unexpected end shrinkage

* src/fileio.c (Finsert_file_contents): If the file unexpectedly
shrinks while reading its tail backwards, give up searching for
the match end.

(cherry picked from commit f4adb56c9adc9b4f4715c656f1f8cfa7305479e5)

fileio.c comment spelling fix

(cherry picked from commit c35d09edcf04dc3e5cabdc7877c10b7600630d74)

insert-file-contents byte vs char confusion

* src/fileio.c (Finsert_file_contents): Use del_range_byte,
not del_range_1, since we are passing byte counts, not
character counts.  Problem reported by Pip Cet (Bug#77315).

(cherry picked from commit 4c4f68be4b7506502c6a4b133b02bb34f097496d)

Fix insert-file-contents overlap calculation

* src/fileio.c (Finsert_file_contents): Overlap is impossible, so
omit incorrect overflow adjustments that caused later index
calculations to go off the rails (Bug#77315).  Change a ‘ZV_BYTE’
to ‘same_at_end’ for clarity; they have the same value here.

(cherry picked from commit 61a8ce0280668980a4452b112103c9bc879e1f49)

insert-file-contents do not rely on st_size

This fix was prompted by Bug#77315.
* src/fileio.c (Finsert_file_contents): Do not rely on st_size for
anything other than a hint about the file size.  Trust only the
file size as revealed by a read that returns 0.

(cherry picked from commit e98da5cc3f394aef21b7ad3c46b104e057a8954b)

insert-file-contents file size hint improvement

* src/fileio.c (Finsert_file_contents): When reading yields 0,
update the file size hint to match.  This should improve its
accuracy.

(cherry picked from commit de0bb2e059f1c404ca328509f3eb90cdf90256c5)

insert-file-contents file end EOF fixes

* src/fileio.c (Finsert_file_contents):
When counting bytes at file end, don’t trust lseek to seek
to the end of the file.  Instead, read a bit after lseeking,
to make sure we get to the end, give up if we don’t get to EOF.
This works around problems on /proc filesystems
where lseek pretends the file is empty.
Update file_size_hint when reaching EOF.

(cherry picked from commit aee9b598312e282700c4eedf02b174b908479ce7)

Fix insert-file-contents integer overflows

* src/fileio.c (Finsert_file_contents): Change ‘total’ from
ptrdiff_t to off_t since it might not fit in ptrdiff_t.
Check for overflow when estimating the insertion size.

(cherry picked from commit 56091b6d5cccecf320796bd62e36adc64f45b614)

Remove ineffective overflow check

* src/fileio.c (Finsert_file_contents): Remove check for overflow.
The overflow is not possible, and the check was incorrectly
written and would not have caught it anyway.

(cherry picked from commit e6c684797361aec99b1b9eef139bab92679355ec)

insert-file-contents END enforcement

* src/fileio.c (Finsert_file_contents): When matching text
at buffer start, don’t go past END if specified.

(cherry picked from commit 535ab2d116c259820e18380336913abc57ac0376)

insert-file-contents initial offset fix

* src/fileio.c (Finsert_file_contents): Don’t assume that a
newly-opened file is at offset 0, even if it is a regular file.
This might not be true for files like /dev/stdin.

(cherry picked from commit e6c1f46fb1a703b4183814b580958f88fe9479a8)

insert-file-contents end offset infinity

* src/fileio.c (Finsert_file_contents): Simplify end_offset
calculation by defaulting to effectively infinity.

(cherry picked from commit 73ab98a8a2d7b5f990d464f140436ac831883397)

Refactor negative file size checking

* src/fileio.c (Finsert_file_contents): Check for negative file
sizes earlier, as it’s easy, avoids some unnecessary work, and
will simplify later changes.

(cherry picked from commit aa172be7d05f537509c37ef557774e550eecda7e)

Non-nil orig_filename in insert-file-contents

* src/fileio.c (Finsert_file_contents): Don’t let orig_filename be
nil, as that might mess up later diagnostics.

(cherry picked from commit b1ada33b5dfac62258e9e3cb957dbe722b7c8990)

Improve inserted file coding system finding

* src/fileio.c (Finsert_file_contents): When inserting a file into
a nonempty buffer, improve the heuristic for determining the
file’s coding system by not trusting lseek+SEEK_END, which is
unreliable in /proc or when the file is mutating.

(cherry picked from commit 6a9dbed40ccebc18fda6078058b1978e29ef98fa)

Improve insert-file-contents on non-regular files

This is part of a fix for Bug#77315,
and improves on the fix for Bug#71258.
* src/fileio.c (Finsert_file_contents): Do not pretend that
directories are regular files.  Instead, signal an error when
attempting to read from them in the usual case where the OS
prohibits that; and otherwise read from them.  However, when
visiting a directory report an error right away rather than
waiting until later, as this function is documented to not allow
visiting non-regular files.  Nest the struct stat into a small
code block, to keep the code simpler and so that the compiler can
see what parts are used and can issue better diagnostics if
uninitialized storage is accessed.  Be more skeptical of st_size,
when the file is not regular.

(cherry picked from commit 6d09a339ceb986de6d2a49ac8c20a7360f57b7d6)

Fix (find-file "/dev/null")

* lisp/files.el (find-file-noselect-1): When the file exists,
propagate any errors signaled by insert-file-contents,
instead of propagating them only when the file is unreadable.
This way, (find-file "/dev/null") gives a sensible diagnostic
"not a regular file" instead of the nonsense
"Maximum buffer size exceeded".

(cherry picked from commit b911029f96b14a03398198d5a849d6f4d0d1e071)

Don’t trust st_size when scanning file head+tail

* src/fileio.c (Finsert_file_contents): Do not look at st_size
when scanning the file’s head and tail for a coding system comment.
Instead, just use read and SEEK_END and don’t worry if the latter fails.
st_size and lseek might not work in a /proc file system.

(cherry picked from commit 0a3c8a4df3f9e15737e4e5b4aecd2e63d2abbc4f)

copy-file no longer trusts st_size

In copy-file, do not trust st_size, since it might change as we run,
or we might be in a /proc system where it is unreliable anyway.
Also, fix some other unlikely copy-file bugs while we’re here.
* src/fileio.c (Fcopy_file): Use O_TRUNC when opening a
destination that already exists.  This saves us the trouble
of having to call ftruncate with a possibly-bogus st_size;
the old motivation for using ftruncate is no longer compelling.
Do not assume ptrdiff_t is as wide as ssize_t; although this is
true on all known platforms, it’s easy to not assume it.
Don’t trust st_size.  Prefer SSIZE_MAX to TYPE_MAXIMUM (ssize_t).
Always read+write, regardless of whether copy_file_range failed.

(cherry picked from commit ffd65be2277b9a30e77a00ad69c9ba21459f72c5)

READ_BUF_SIZE → sizeof read_buf

* src/fileio.c (Finsert_file_contents): Minor refactoring.
This should help future patches which distinguish read_buf’s size
from other uses of READ_BUF_SIZE which may change.

(cherry picked from commit ae30a61c74215c3e02fb3c0d603894457a4cfef5)

insert-file-contents errno confusion

* src/fileio.c (read_non_regular): Return negation of
errno on failure, instead of -1.
(Finsert_file_contents): Signal with correct errno when a read fails.

(cherry picked from commit 490311f86a97fd8d6633e28143a26e7618f15e79)

org-persist.el: Silence fewer warnings and fix found warning

* lisp/org/org-persist.el: Minor cleanup.
(org-persist-directory, org-persist-remote-files)
(org-persist-default-expiry): Remove redundant `:group` arg.
(org-persist-collection-let): Document lack of hygiene.
Remove `with-no-warnings`.
(org-persist--find-index): Reindent, and simplify initialization of `r`.
(org-persist-associated-files:generic): Move before first use.

(cherry picked from commit 3998242664604e9e91830b10529cc2da6bd82d8e)

Work around GCC bug 121030

* configure.ac: Disable -Wanalyzer-use-of-uninitialized-value.

(cherry picked from commit f3d3a5803e174d1199c90f914b7b92c9ac4d970a)

Preserve source position of macro calls in macro expansions

This allows the byte compiler to give correct positions, those
of the invoking forms, when an error or warning is caused by
the innards of the invoked macros.

This fixes bug#73725 and bug#73746.

* lisp/emacs-lisp/macroexp.el (macroexp--posify-form-1)
(macroexp--posify-form): New functions.
(macroexp-preserve-posification): New macro.
(macroexp--compiler-macro, macroexp-macroexpand): Use the new
macro to preserve a calling form's position.

* lisp/emacs-lisp/byte-opt.el (byte-optimize-form): Use the new
macro to preserve source positions.

* test/lisp/emacs-lisp/bytecomp-resources/bad-error-position.el
* test/lisp/emacs-lisp/bytecomp-resources/bad-error-position-2.el:
New test files.
* test/lisp/emacs-lisp/bytecomp-tests.el: Two new tests using
the new test files.

(cherry picked from commit c44903b0118357336cca964bd210835ca4881e87)

; Fix documentation of a recent change

* doc/emacs/vc1-xtra.texi (VC Auto-Reverting): Fix wording and
cross-references.
* doc/emacs/emacs.texi (Top): Update @detailmenu.

(cherry picked from commit 1e3d76af5a7a16682e71f9df46f6788c0880cccd)

; Skip commit 85159f1dd0023e7bcc336c195ae5160dd2b94126

; Fixes to last change.

tramp-file-name-with-method can be set connection-local

* doc/misc/tramp.texi (Ad-hoc multi-hops):
tramp-file-name-with-method can be set connection-local.

* etc/NEWS: tramp-file-name-with-method can be set connection-local.
Presentational fixes and improvements.

* lisp/net/tramp-cmds.el (tramp-get-file-name-with-method): New defun.
(with-tramp-file-name-with-method, tramp-file-name-with-sudo): Use it.
(tramp-dired-find-file-with-sudo): Fix docstring.

(cherry picked from commit f1aa9482d1920a7fb9f01006b16bc25449a1c622)

New global minor mode vc-auto-revert-mode

* lisp/vc/vc-hooks.el (auto-revert-mode): Declare.
(vc-auto-revert-mode): New global minor mode.
(vc-turn-on-auto-revert-mode-for-tracked-files): New function.
* lisp/vc/vc-dispatcher.el (auto-revert-mode)
(auto-revert-buffers): Declare.
(vc-resynch-window): Don't call vc-revert-buffer-internal when
auto-revert-mode will revert the buffer.  Call
auto-revert-buffers to ensure that this reversion happens in a
timely manner.
* lisp/vc/vc.el (vc-register): Apply vc-auto-revert-mode to
buffers visiting newly registered files.
* lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
Improve the generated docstring.
* doc/emacs/vc1-xtra.texi (VC Auto-Reverting):
* etc/NEWS: Document the new minor mode.

(cherry picked from commit 9d750c7e8041437758c919f6088d6f3686847812)

vc-register: Fix setting backup-inhibited

* lisp/vc/vc.el (vc-register): Delete unreachable code trying to
use 'buffer-file-name' as one of the file names.  Properly set
'backup-inhibited' in any file-visiting buffers.

(cherry picked from commit 24bd93b35bbca55cadcc0c6bc1bf0bb7c689a049)

; 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