Merge from origin/emacs-29

ae8f815613c Update files for Emacs 29.3

3 files changed, 685 insertions, 55 deletions

diff --git a/ChangeLog.4 b/ChangeLog.4
index f0ae386f7fe..86fd1eb10d8 100644
--- a/ChangeLog.4
+++ b/ChangeLog.4
@@ -1,3 +1,595 @@
+2024-03-24  Ihor Radchenko  <yantar92@posteo.net>
+
+	org--confirm-resource-safe: Fix prompt when prompting in non-file Org buffers
+
+	* lisp/org/org.el (org--confirm-resource-safe): When called from
+	non-file buffer, do not put stray "f" in the prompt.
+
+	org-file-contents: Consider all remote files unsafe
+
+	* lisp/org/org.el (org-file-contents): When loading files, consider all
+	remote files (like TRAMP-fetched files) unsafe, in addition to URLs.
+
+	org-latex-preview: Add protection when `untrusted-content' is non-nil
+
+	* lisp/org/org.el (org--latex-preview-when-risky): New variable
+	controlling how to handle LaTeX previews in Org files from untrusted
+	origin.
+	(org-latex-preview): Consult `org--latex-preview-when-risky' before
+	generating previews.
+	This patch adds a layer of protection when LaTeX preview is requested
+	for an email attachment, where `untrusted-content' is set to non-nil.
+
+	* lisp/gnus/mm-view.el (mm-display-inline-fontify): Mark contents untrusted.
+	* lisp/files.el (untrusted-content): New variable.
+
+	The new variable is to be used when buffer contents comes from untrusted
+	source.
+
+	org-macro--set-templates: Prevent code evaluation
+
+	* lisp/org/org-macro.el (org-macro--set-templates): Get rid of any
+	risk to evaluate code when `org-macro--set-templates' is called as a
+	part of major mode initialization.  This way, no code evaluation is
+	ever triggered when user merely opens the file or when
+	`mm-display-org-inline' invokes Org major mode to fontify mime part
+	preview in email messages.
+
+2024-03-24  Eli Zaretskii  <eliz@gnu.org>
+
+	* admin/authors.el (authors-aliases): Add ignored authors.
+
+	* etc/NEWS: Update for Emacs 29.3
+
+2024-03-21  Andrea Corallo  <akrl@sdf.org>
+
+	* Fix missing `comp-files-queue' update (bug#63415).
+
+	* lisp/emacs-lisp/comp.el (native--compile-async): Update
+	`comp-files-queue' for real.
+
+2024-03-21  Basil L. Contovounesios  <basil@contovou.net>
+
+	Clarify description of format-spec truncation
+
+	* doc/lispref/strings.texi (Custom Format Strings): Mention that
+	precision specifier affects both '<' and '>' truncation (bug#69822).
+	* lisp/format-spec.el (format-spec, format-spec--do-flags): Use same
+	terminology as 'format', especially when referring to its behavior.
+
+2024-03-21  Eli Zaretskii  <eliz@gnu.org>
+
+	More accurate documentation of 'rmail-mail-new-frame'
+
+	* doc/emacs/rmail.texi (Rmail Reply): More accurate documentation
+	of the effects of 'rmail-mail-new-frame'.  (Bug#69738)
+
+2024-03-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix documentation of M-SPC in user manual
+
+	* doc/emacs/killing.texi (Deletion): Fix documentation of
+	'cycle-spacing'.  (Bug#69905)
+
+2024-03-17  Michael Albinus  <michael.albinus@gmx.de>
+
+	* admin/notes/bugtracker: Minor copyedit.
+
+2024-03-16  Theodor Thornhill  <theo@thornhill.no>
+
+	Tweak regexp for object initializers in csharp-mode (bug#69571)
+
+	* lisp/progmodes/csharp-mode.el (csharp-guess-basic-syntax): Add
+	handling to not consider ended statements as object init openers.
+	* test/lisp/progmodes/csharp-mode-resources/indent.erts: New test
+	resources.
+	* test/lisp/progmodes/csharp-mode-tests.el: Add test for this particular
+	issue.
+
+2024-03-16  Konstantin Kharlamov  <Hi-Angel@yandex.ru>
+
+	`term-mode': mention the keymap to add keybindings to
+
+	A user typically expects a keymap for mode `foo' to be called
+	`foo-mode-map'.  term-mode has `term-mode-map' too, but for
+	user-defined bindings to have effect they have to be put to
+	`term-raw-map' instead.  So let's mention that.
+	* lisp/term.el (term-mode) (term-mode-map) (term-raw-map): Mention
+	the keymaps to add keybindings to for `term-mode'.  (Bug#69786)
+
+2024-03-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'shortdoc-copy-function-as-kill'
+
+	* lisp/emacs-lisp/shortdoc.el (shortdoc-copy-function-as-kill):
+	Fix handling of functions with no arguments.  (Bug#69720)
+
+2024-03-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'edebug-print-*' variables
+
+	* lisp/emacs-lisp/edebug.el (edebug-print-length)
+	(edebug-print-level): Fix doc strings and customization labels.
+	Suggested by Matt Trzcinski <matt@excalamus.com>.  (Bug#69745)
+
+2024-03-11  F. Jason Park  <jp@neverwas.me>
+
+	Fix 'with-sqlite-transaction'
+
+	* lisp/sqlite.el (with-sqlite-transaction): Tuck misplaced body
+	of else form back into feature-test control structure whence it
+	escaped.  (Bug#67142)
+
+	* test/lisp/sqlite-tests.el: New file to accompany
+	test/src/sqlite-tests.el.
+
+2024-03-01  Dan Jacobson  <jidanni@jidanni.org>  (tiny change)
+
+	Fix typos in vnvni.el.
+
+	* lisp/leim/quail/vnvni.el ("vietnamese-vni"): Fix typos.  (Bug#69485)
+
+2024-02-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid assertion violations in bidi.c
+
+	* src/bidi.c (bidi_resolve_brackets): Move assertion about
+	'resolved_level' to where it belongs.  This avoids unnecessary
+	aborts when the character is not a bracket type and doesn't need
+	BPA resolution.  (Bug#69421)
+
+2024-02-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/files.el (hack-one-local-variable): Use `set-auto-mode-0`
+
+	This fixes bug#69373.
+
+2024-02-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix infinite recursion in gdb-mi.el
+
+	* lisp/progmodes/gdb-mi.el: (gdb-clear-partial-output)
+	(gdb-clear-inferior-io):  Set inhibit-read-only, to avoid
+	signaling errors in process filter.  (Bug#69327)
+
+2024-02-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'help-quick-toggle'
+
+	* lisp/help.el (help-quick-sections): Fix "kill-region" command.
+	Add a doc string.  (Bug#69345)
+
+2024-02-21  Juri Linkov  <juri@linkov.net>
+
+	* doc/lispref/modes.texi (Tabulated List Mode): Update.
+
+	In the description of 'tabulated-list-format' document
+	the missing value 'props' that was added long ago.
+
+2024-02-21  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/net/tramp.el (tramp-methods): Fix typo in docstring.  (Bug#69294)
+
+2024-02-17  Dmitry Gutov  <dmitry@gutov.dev>
+
+	java-ts-mode: Indentation for opening brace on a separate line
+
+	* lisp/progmodes/java-ts-mode.el (java-ts-mode--indent-rules):
+	Support putting the opening brace on a separate line (bug#67556).
+
+	* test/lisp/progmodes/java-ts-mode-resources/indent.erts:
+	Add a test.
+
+2024-02-17  Philip Kaludercic  <philipk@posteo.net>
+
+	Removed decommissioned PGP keyservers
+
+	* lisp/epa-ks.el (epa-keyserver): Update the user option type of
+	`epa-keyserver'.
+
+	See https://mail.gnu.org/archive/html/emacs-devel/2023-11/msg00857.html.
+
+2024-02-17  Ihor Radchenko  <yantar92@posteo.net>
+
+	org: Fix security prompt for downloading remote resource
+
+	* lisp/org/org.el (org--confirm-resource-safe): Do not assume that
+	resource is safe when user replies "n" (do not download).
+
+	Reported-by: Max Nikulin <manikulin@gmail.com>
+	Link: https://orgmode.org/list/upj6uk$b7o$1@ciao.gmane.io
+
+2024-02-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "Update to Org 9.6.19"
+
+	This reverts commit 07a392f445eb21c5e4681027eee9d981300a4309.
+	It was installed by mistake.
+
+2024-02-17  Kyle Meyer  <kyle@kyleam.com>
+
+	Update to Org 9.6.19
+
+2024-02-15  Philipp Stephani  <p.stephani2@gmail.com>
+
+	Remove references to phst@google.com.
+
+	I don't work for Google any more, so I'll use my private address going
+	forward.
+
+	* .mailmap: Remove references to phst@google.com.
+
+2024-02-14  Stefan Kangas  <stefankangas@gmail.com>
+
+	* BUGS: Note how to report critical security issues.
+
+2024-02-14  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add cross-reference to ELisp manual Caveats
+
+	* doc/lispref/intro.texi (Caveats): Add cross-reference to Emacs manual.
+	Talking about "contributing code" makes little sense in a section about
+	reporting mistakes in the ELisp manual, so skip that part.
+
+2024-02-14  Joseph Turner  <joseph@breatheoutbreathe.in>
+
+	Improve directory prompt used by package-vc-checkout
+
+	* lisp/emacs-lisp/package-vc.el (package-vc--read-package-name): Use
+	read-directory-name instead of read-file-name.  (Bug#66114)
+
+2024-02-14  Michael Albinus  <michael.albinus@gmx.de>
+
+	Minor Tramp doc adaption
+
+	* doc/misc/tramp.texi (Frequently Asked Questions): Be more
+	precise with FIDO2 keys.
+
+	* lisp/net/tramp.el: Adapt comments.
+
+2024-02-12  Daniel Martín  <mardani29@yahoo.es>
+
+	;; Fix typo in the Tramp documentation
+
+2024-02-11  Andrea Corallo  <acorallo@gnu.org>
+
+	* Improve reproducibility of inferred values by native comp
+
+	* lisp/emacs-lisp/comp-cstr.el (comp-normalize-valset): Do not try to
+	reorder conses using 'sxhash-equal' as its behavior is not reproducible
+	over different sessions.
+
+2024-02-10  Loïc Lemaître  <loic.lemaitre@gmail.com>  (tiny change)
+
+	Handle typescript ts grammar breaking change for function_expression
+
+	Starting from version 0.20.4 of the typescript/tsx grammar, "function"
+	becomes "function_expression". The right expression is used depending
+	on the grammar version.
+
+	* lisp/progmodes/typescript-ts-mode.el
+	(tsx-ts-mode--font-lock-compatibility-function-expression):
+	New function (bug#69024).
+	(typescript-ts-mode--font-lock-settings): Use it.
+
+2024-02-10  Eli Zaretskii  <eliz@gnu.org>
+
+	Don't quote 't' in doc strings
+
+	* lisp/outline.el (outline-minor-mode-use-buttons): Doc fix.
+	Patch by Arash Esbati <arash@gnu.org>.  (Bug#69012)
+
+2024-02-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp: Handle PIN requests from security keys (don't merge)
+
+	* doc/misc/tramp.texi (Frequently Asked Questions): Clarify FIDO entry.
+
+	* lisp/net/tramp-sh.el (tramp-actions-before-shell)
+	(tramp-actions-copy-out-of-band):
+	Use `tramp-security-key-pin-regexp'.
+
+	* lisp/net/tramp.el (tramp-security-key-pin-regexp): New defcustom.
+	(tramp-action-otp-password, tramp-read-passwd): Trim password prompt.
+	(tramp-action-show-and-confirm-message): Expand for PIN requests.
+
+2024-02-08  Stefan Kangas  <stefankangas@gmail.com>
+
+	* admin/notes/kind-communication: New file.
+
+2024-02-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Don't skip links to "." and ".." in Dired when marking files
+
+	* lisp/dired.el (dired-mark): Skip "." and "..", but not symlinks
+	to those two.  (Bug#38729)  (Bug#68814)
+
+2024-02-06  Joseph Turner  <joseph@breatheoutbreathe.in>
+
+	Pass unquoted filename to user-supplied MUSTMATCH predicate
+
+	* lisp/minibuffer.el (read-file-name-default): Pass REQUIRE-MATCH
+	argument through substitute-in-file-name.
+	* lisp/minibuffer.el (read-file-name): Update docstring.
+
+	Resolves bug#68815.
+
+2024-02-04  Juri Linkov  <juri@linkov.net>
+
+	* doc/lispref/parsing.texi (Retrieving Nodes): Improve documentation.
+
+	Update optional arguments 'predicate' and 'include-node'
+	of 'treesit-node-top-level'.
+
+2024-02-03  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	Fix incompatibility with tree-sitter-javascript >= 0.20.2
+
+	Starting from version 0.20.2 the grammar's primary expression
+	"function" has been renamed to "function_expression".  A new
+	function checks if the new primary expression is available,
+	and if so, it returns the correct rules.
+	* lisp/progmodes/js.el
+	(js--treesit-font-lock-compatibility-definition-feature): New
+	function.
+	(js--treesit-font-lock-settings): Use it.  (Bug#68879)
+
+2024-02-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid signaling errors from 'pixel-fill-region'
+
+	* lisp/textmodes/pixel-fill.el (pixel-fill-region): Make sure the
+	selected window displays the current buffer.  This is important
+	when this function is called inside 'with-current-buffer' or
+	similar forms which temporarily change the buffer displayed in the
+	selected window.  (Bug#67791)
+
+2024-02-02  nibon7  <nibon7@163.com>
+
+	eglot: Add nushell language server
+
+	* lisp/progmodes/eglot.el (eglot-server-programs): Add nushell
+	language server.  (Bug#68823)
+
+2024-02-02  Piotr Kwiecinski  <piotr.kwiecinski@codemanufacture.com>  (tiny change)
+
+	eglot: Add php-ts-mode to eglot-server-programs
+
+	* lisp/progmodes/eglot.el (eglot-server-programs): Add
+	php-ts-mode.  (Bug#68870)
+
+2024-02-02  dalu  <mou.tong@outlook.com>  (tiny change)
+
+	Support kotlin-ts-mode in Eglot
+
+	* lisp/progmodes/eglot.el (eglot-server-programs): Support
+	kotlin-ts-mode.  (Bug#68865)
+
+2024-02-01  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix stale cache in Tramp  (do not merge with master)
+
+	* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):
+	Flush file properties when needed.  (Bug#68805)
+
+2024-02-01  Ulrich Müller  <ulm@gentoo.org>
+
+	* configure.ac: Include X11/Xlib.h for XOpenDisplay.  (Bug#68842)
+
+	Do not merge to master.
+
+2024-02-01  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve `desktop-save-mode` docstring
+
+	* lisp/desktop.el (desktop-save-mode): Improve docstring.
+
+2024-01-28  Joseph Turner  <joseph@breatheoutbreathe.in>
+
+	Fix completing-read functional REQUIRE-MATCH behavior
+
+	* lisp/minibuffer.el (completion--complete-and-exit): If
+	minibuffer-completion-confirm is a function which returns nil,
+	immediately fail to complete.
+
+	See bug#66187.
+
+2024-01-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix "emacs -nw" on MS-Windows
+
+	* src/w32term.c (w32_flip_buffers_if_dirty): Do nothing if F is
+	not a GUI frame.  This avoids rare crashes in "emacs -nw".
+	* src/w32console.c (initialize_w32_display): Set the
+	ENABLE_EXTENDED_FLAGS bit in 'prev_console_mode'.
+
+	(cherry picked from commit e1970c99f097715fc5bb3b88154799bfe13de90f)
+
+2024-01-28  Michael Albinus  <michael.albinus@gmx.de>
+
+	Handle wrong login program in Tramp
+
+	* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Exit remote
+	shell when login fails.
+
+2024-01-27  Jim Porter  <jporterbugs@gmail.com>
+
+	* doc/lispref/package.texi (Multi-file Packages): Document ".elpaignore".
+
+	(cherry picked from commit 744a10a4d722a361bc21561b4162045e4ec97ed6)
+
+2024-01-27  Eshel Yaron  <me@eshelyaron.com>
+
+	Avoid signaling errors in emoji.el on empty input
+
+	* lisp/international/emoji.el (emoji--read-emoji):  Signal
+	user-error on empty input.  (Bug#68671)
+
+	Do not merge to master.
+
+2024-01-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix description of when "\xNNN" is considered a unibyte character
+
+	* doc/lispref/objects.texi (Non-ASCII in Strings): More accurate
+	description of when a hexadecimal escape sequence yields a unibyte
+	character.  (Bug#68751)
+
+2024-01-26  Randy Taylor  <dev@rjt.dev>
+
+	Simplify imenu setup for {cmake,dockerfile}-ts-modes
+
+	* lisp/progmodes/cmake-ts-mode.el (treesit-induce-sparse-tree,
+	treesit-node-child, treesit-node-start, cmake-ts-mode--imenu,
+	cmake-ts-mode--imenu-1): Remove.
+	(treesit-search-subtree): Declare.
+	(cmake-ts-mode--function-name): New function.
+	(cmake-ts-mode): Use it.
+
+	* lisp/progmodes/dockerfile-ts-mode.el (treesit-induce-sparse-tree,
+	treesit-node-start, dockerfile-ts-mode--imenu,
+	dockerfile-ts-mode--imenu-1): Remove.
+	(dockerfile-ts-mode--stage-name): New function.
+	(dockerfile-ts-mode): Use it.
+
+2024-01-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of profiler commands
+
+	* doc/lispref/debugging.texi (Profiling): Document more commands.
+	Improve indexing.  (Bug#68693)
+
+2024-01-23  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Fix broken links to Freedesktop notifications spec
+
+	* doc/lispref/os.texi (Desktop Notifications):
+	* lisp/notifications.el: Replace broken developer.gnome.org links
+	with specifications.freedesktop.org (bug#67939).
+
+2024-01-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix nasty cut'n'waste error in Tramp
+
+	* lisp/net/tramp.el (tramp-parse-passwd): Use `tramp-parse-passwd-group'.
+	Reported by Tim Landscheidt <tim@tim-landscheidt.de>.
+
+2024-01-21  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix image-dired-tags-db-file void variable error
+
+	* lisp/image/image-dired-tags.el (image-dired-sane-db-file):
+	Require 'image-dired'.  (Bug#68636)
+
+2024-01-21  Matthew Smith  <matthew@gentoo.org>  (tiny change)
+
+	typescript-ts-mode: Skip test if tsx grammar missing
+
+	typescript-ts-mode-test-indentation depends on both the tree-sitter
+	typescript grammar, and the tree-sitter tsx grammar.  If only the
+	typescript is installed, the tests will run and then fail unexpectedly
+	after tsx fails to load.
+
+	* test/lisp/progmodes/typescript-ts-mode-tests.el
+	(typescript-ts-mode-test-indentation): Skip test if tsx grammar is
+	missing.
+
+2024-01-20  Stefan Kangas  <stefankangas@gmail.com>
+
+	* admin/README: Document the run-codespell script.
+
+	* admin/README: Fix entry on coccinelle subdirectory.
+
+2024-01-20  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add script admin/run-codespell and supporting files
+
+	* admin/codespell/README:
+	* admin/codespell/codespell.dictionary:
+	* admin/codespell/codespell.exclude:
+	* admin/codespell/codespell.ignore:
+	* admin/codespell/codespell.rc:
+	* admin/run-codespell: New files.
+
+2024-01-20  Michael Albinus  <michael.albinus@gmx.de>
+
+	Sync with Tramp 2.6.3-pre (don't merge with master)
+
+	* doc/misc/tramp.texi (Obtaining @value{tramp}): Mention the ELPA
+	Tramp manual.
+	(Remote processes): Adapt index.
+
+	* doc/misc/trampver.texi:
+	* lisp/net/trampver.el (tramp-version): Set to "2.6.3-pre".
+
+	* lisp/net/tramp.el (tramp-local-host-regexp): Extend.  Adapt :version.
+	(tramp-signal-process): PROCESS can also be a string.
+	(tramp-skeleton-directory-files):
+	* lisp/net/tramp-cache.el (with-tramp-saved-file-property)
+	(with-tramp-saved-file-properties)
+	(with-tramp-saved-connection-property)
+	(with-tramp-saved-connection-properties): Use `setf' but `setq' in macro.
+
+	* lisp/net/tramp-compat.el (tramp-compat-funcall): Declare debug.
+
+	* lisp/net/tramp-crypt.el (tramp-crypt-file-name-p): Exclude lock files.
+	(tramp-crypt-file-name-handler-alist): Use `identity' for
+	`abbreviate-file-name'.
+	(tramp-crypt-add-directory, tramp-crypt-remove-directory):
+	Adapt docstrings.
+	(tramp-crypt-cleanup-connection): New defun.  Add it to
+	`tramp-cleanup-connection-hook'
+
+	* lisp/net/tramp.el (tramp-skeleton-file-name-all-completions):
+	Handle "." and "..".
+
+	* lisp/net/tramp-adb.el (tramp-adb-handle-file-name-all-completions):
+	* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-name-all-completions):
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-file-name-all-completions):
+	Remove special handling of "." an "..".
+
+	* lisp/net/tramp-sh.el (tramp-pipe-stty-settings): New defcustom.
+	(tramp-sh-handle-make-process): Use it.  (Bug#62093)
+
+	* test/lisp/net/tramp-tests.el (tramp-test18-file-attributes):
+	Adapt test.
+	(tramp-test31-signal-process): Extend.
+
+2024-01-20  Eli Zaretskii  <eliz@gnu.org>  (tiny change)
+
+	Update Polish translation of tutorial
+
+	* etc/tutorials/TUTORIAL.pl: Update text about scroll bar.  New
+	text by Christopher Yeleighton <giecrilj@stegny.2a.pl>.
+	(Bug#68599)
+
+2024-01-19  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/misc/gnus.texi (Summary Mail Commands): Fix command name.
+
+2024-01-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Bump Emacs version to 29.2.50.
+
+	* README:
+	* configure.ac:
+	* nt/README.W32:
+	* msdos/sed2v2.inp:
+	* etc/NEWS: Bump Emacs version to 29.2.50.
+
+2024-01-18  Eli Zaretskii  <eliz@gnu.org>
+
+	* Update etc/HISTORY and ChangeLog.4 for 29.2 release.
+
+2024-01-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Bump Emacs version to 29.2
+
+	* README:
+	* configure.ac:
+	* nt/README.W32:
+	* msdos/sed2v2.inp: Bump Emacs version to 29.2.
+
 2024-01-18  Eli Zaretskii  <eliz@maintain0p.gnu.org>
 
 	* Version 29.2 released.
@@ -120914,7 +121506,7 @@
 
 This file records repository revisions from
 commit f2ae39829812098d8269eafbc0fcb98959ee5bb7 (exclusive) to
-commit 92a7132bd6c76a43860fa01ca3363857d8dfc8f3 (inclusive).
+commit 8d8253f89915f1d9b45791d46cf974c6bdcc1457 (inclusive).
 See ChangeLog.3 for earlier changes.
 
 ;; Local Variables:
diff --git a/etc/AUTHORS b/etc/AUTHORS
index 5fc54f1909f..8a541e8a7e2 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -45,7 +45,7 @@ Adam Hupp: changed emacs.py emacs2.py emacs3.py gud.el
   progmodes/python.el
 
 Adam Porter: changed tab-line.el cl-macs.el map.el control.texi
-  map-tests.el pcase-tests.el tab-bar.el
+  map-tests.el pcase-tests.el tab-bar.el variables.texi
 
 Adam Sjøgren: changed mml2015.el shr.el spam.el xterm.c blink.xpm
   braindamaged.xpm cry.xpm dead.xpm evil.xpm forced.xpm frown.xpm
@@ -537,7 +537,7 @@ Aubrey Jaffer: changed info.el unexelf.c
 
 August Feng: changed bookmark.el
 
-Augustin Chéneau: changed treesit.el
+Augustin Chéneau: changed c-ts-mode.el treesit.el
 
 Augusto Stoffel: co-wrote ansi-osc.el
 and changed progmodes/python.el isearch.el eglot.el comint.el eldoc.el
@@ -555,6 +555,8 @@ Axel Boldt: changed ehelp.el electric.el
 
 Axel Svensson: changed characters.el display.texi x-win.el
 
+Aymeric Agon-Rambosson: changed indent.el
+
 Bahodir Mansurov: changed quail/cyrillic.el
 
 Bake Timmons: changed gnus.texi mail-source.el
@@ -583,7 +585,7 @@ Bartosz Duszel: changed allout.el bib-mode.el cc-cmds.el hexl.el icon.el
 Basil L. Contovounesios: changed simple.el subr.el message.el eww.el
   modes.texi custom.el text.texi bibtex.el gnus-sum.el internals.texi
   js.el customize.texi display.texi files.texi gnus-group.el gnus-win.el
-  gnus.texi gravatar.el json.el map.el shr.el and 345 other files
+  gnus.texi gravatar.el json.el map.el shr.el and 346 other files
 
 Bastian Beischer: changed semantic/complete.el calc-yank.el include.el
   mru-bookmark.el refs.el senator.el
@@ -984,7 +986,7 @@ Christoph Dittmann: changed ox-beamer.el
 
 Christophe de Dinechin: co-wrote ns-win.el
 
-Christophe Deleuze: changed icalendar.el image-dired.el
+Christophe Deleuze: changed ange-ftp.el icalendar.el image-dired.el
 
 Christoph Egger: changed configure.ac
 
@@ -1016,7 +1018,8 @@ Christopher Thorne: changed dired.el progmodes/grep.el
 Christopher Wellons: changed emacs-lisp/cl-lib.el hashcash.el
   viper-cmd.el viper-ex.el viper-init.el viper.el
 
-Christophe Troestler: changed gnus-icalendar.el epg.el newcomment.el
+Christophe Troestler: changed rust-ts-mode.el gnus-icalendar.el epg.el
+  newcomment.el
 
 Christoph Göttschkes: changed make-mode.el
 
@@ -1186,6 +1189,9 @@ Daniel LaLiberte: wrote edebug.el isearch.el
 and co-wrote hideif.el
 and changed cust-print.el mlconvert.el eval-region.el
 
+Daniel Laurens Nicolai: changed doc-view.el facemenu.el files.el
+  misc.texi re-builder.el searching.texi
+
 Daniel Lenski: changed speedbar.el
 
 Daniel Lopez: changed progmodes/compile.el
@@ -1196,7 +1202,7 @@ Daniel Martín: changed c-ts-mode.el nsterm.m shortdoc.el ns-win.el
   simple.el diff-mode-tests.el erc.texi files.el files.texi indent.erts
   msdos-xtra.texi progmodes/python.el search.texi .lldbinit basic.texi
   c-ts-mode-tests.el cmacexp.el compilation.txt compile-tests.el
-  compile.texi configure.ac and 46 other files
+  compile.texi configure.ac and 47 other files
 
 Daniel McClanahan: changed lisp-mode.el
 
@@ -1240,6 +1246,8 @@ Dani Moncayo: changed msys-to-w32 Makefile.in configure.ac buffers.texi
   dired.texi display.texi emacs-lisp-intro.texi files.texi killing.texi
   make-dist mark.texi msysconfig.sh simple.el text.texi version.el
 
+Dan Jacobson: changed vnvni.el
+
 Dan Nicolaescu: wrote iris-ansi.el romanian.el vc-dir.el
 and co-wrote hideshow.el
 and changed vc.el configure.ac vc-hg.el vc-git.el src/Makefile.in
@@ -1475,6 +1483,9 @@ and changed complete.el
 
 Denis Stünkel: changed ibuf-ext.el
 
+Denis Zubarev: changed treesit-tests.el progmodes/python.el
+  python-tests.el treesit.c
+
 Deniz Dogan: changed rcirc.el simple.el css-mode.el TUTORIAL.sv
   commands.texi erc-backend.el erc-log.el erc.el image.el iswitchb.el
   lisp-mode.el process.c progmodes/python.el quickurl.el rcirc.texi
@@ -1564,10 +1575,10 @@ Dmitry Gorbik: changed org.el
 Dmitry Gutov: wrote elisp-mode-tests.el jit-lock-tests.el json-tests.el
   vc-hg-tests.el xref-tests.el
 and changed xref.el ruby-mode.el project.el vc-git.el ruby-ts-mode.el
-  elisp-mode.el etags.el ruby-mode-tests.el js.el vc.el package.el
-  vc-hg.el symref/grep.el dired-aux.el ruby-ts-mode-tests.el simple.el
-  progmodes/python.el treesit.el log-edit.el ruby-ts.rb rust-ts-mode.el
-  and 157 other files
+  elisp-mode.el js.el etags.el ruby-mode-tests.el vc.el package.el
+  vc-hg.el symref/grep.el treesit.el dired-aux.el progmodes/python.el
+  ruby-ts-mode-tests.el simple.el typescript-ts-mode.el log-edit.el
+  ruby-ts.rb and 159 other files
 
 Dmitry Kurochkin: changed isearch.el
 
@@ -1666,9 +1677,9 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c]
   chartab-tests.el coding-tests.el etags-tests.el rxvt.el tty-colors.el
 and co-wrote help-tests.el
 and changed xdisp.c display.texi w32.c msdos.c simple.el w32fns.c
-  files.el fileio.c keyboard.c emacs.c text.texi configure.ac w32term.c
+  files.el fileio.c keyboard.c emacs.c configure.ac text.texi w32term.c
   dispnew.c frames.texi w32proc.c files.texi xfaces.c window.c
-  dispextern.h lisp.h and 1334 other files
+  dispextern.h lisp.h and 1341 other files
 
 Eliza Velasquez: changed server.el
 
@@ -1814,7 +1825,7 @@ Ernesto Alfonso: changed simple.el
 
 E Sabof: changed hi-lock.el image-dired.el
 
-Eshel Yaron: changed eglot.el emacs.texi eww.el indent.texi
+Eshel Yaron: changed eglot.el emacs.texi emoji.el eww.el indent.texi
 
 Espen Skoglund: wrote pascal.el
 
@@ -1926,7 +1937,7 @@ F. Jason Park: changed erc.el erc-backend.el erc-tests.el foonet.eld
   barnet.eld erc-scenarios-misc.el erc-services.el erc-common.el
   erc-networks-tests.el erc-scenarios-base-reconnect.el
   erc-scenarios-common.el socks-tests.el auth-source-pass-tests.el
-  auth-source-pass.el erc-join.el erc-sasl-tests.el and 104 other files
+  auth-source-pass.el erc-join.el erc-sasl-tests.el and 106 other files
 
 Flemming Hoejstrup Hansen: changed forms.el
 
@@ -2087,6 +2098,8 @@ George D. Plymale Ii: changed esh-cmd.el
 
 George Kettleborough: changed org-clock.el org-timer.el
 
+George Kuzler: changed calc.el
+
 George McNinch: changed nnir.el
 
 Georges Brun-Cottan: wrote easy-mmode.el
@@ -2172,7 +2185,7 @@ Gregor Schmid: changed intervals.c intervals.h tcl-mode.el textprop.c
 
 Gregory Chernov: changed nnslashdot.el
 
-Gregory Heytings: changed xdisp.c editfns.c keyboard.c subr.el buffer.c
+Gregory Heytings: changed xdisp.c editfns.c subr.el keyboard.c buffer.c
   dispextern.h lisp.h buffer.h display.texi efaq.texi files.el isearch.el
   minibuffer.el Makefile.in bytecode.c composite.c positions.texi
   bytecomp.el emake help-fns.el lread.c and 78 other files
@@ -2345,7 +2358,7 @@ Igor Saprykin: changed ftfont.c
 
 Ihor Radchenko: wrote org-fold-core.el org-fold.el org-persist.el
 and changed ox.el fns.c emacsclient.desktop help-mode.el oc.el
-  org-element.el
+  org-element.el org.el
 
 Iku Iwasa: changed auth-source-pass-tests.el auth-source-pass.el
 
@@ -2556,11 +2569,10 @@ and changed gnus-score.el gnus-logic.el
 
 Jan Vroonhof: changed gnus-cite.el gnus-msg.el nntp.el
 
-Jared Finder: changed menu-bar.el term.c commands.texi frame.c isearch.el
-  mouse.el tmm.el wid-edit.el xt-mouse.el artist.el dispnew.c
-  ediff-wind.el ediff.el faces.el foldout.el frames.texi keyboard.c
-  lread.c mouse-drag.el progmodes/compile.el ruler-mode.el
-  and 7 other files
+Jared Finder: changed menu-bar.el term.c commands.texi xt-mouse.el
+  frame.c isearch.el mouse.el tmm.el wid-edit.el artist.el dired.el
+  dispnew.c ediff-wind.el ediff.el faces.el foldout.el frames.texi
+  keyboard.c lread.c mouse-drag.el progmodes/compile.el and 9 other files
 
 Jarek Czekalski: changed keyboard.c callproc.c mini.texi minibuf.c
   misc.texi server.el shell.el w32fns.c xgselect.c
@@ -2626,7 +2638,7 @@ and changed idlw-rinfo.el idlw-toolbar.el comint.el idlwave.texi vc.el
 
 Jean Abou Samra: changed scheme.el
 
-Jean-Christophe Helary: changed emacs-lisp-intro.texi ns-win.el
+Jean-Christophe Helary: changed back.texi emacs-lisp-intro.texi ns-win.el
   package-tests.el package.el strings.texi subr-x.el ucs-normalize.el
 
 Jean Forget: changed cal-french.el
@@ -2704,6 +2716,9 @@ Jérémie Courrèges-Anglas: changed kqueue.c org.texi ox-latex.el
 Jeremy Bertram Maitin-Shepard: changed erc.el erc-backend.el
   erc-button.el erc-track.el mml.el
 
+Jeremy Bryant: changed abbrev.el cl-extra.el emacs-lisp/cl-lib.el
+  files.texi functions.texi simple.el
+
 Jérémy Compostella: changed tramp-sh.el mml.el battery.el keyboard.c
   windmove.el window.el xdisp.c
 
@@ -2767,7 +2782,7 @@ Jim Porter: changed eshell.texi esh-cmd.el esh-var-tests.el
   esh-util.el eshell-tests-helpers.el em-pred.el esh-arg.el
   esh-cmd-tests.el tramp.el em-pred-tests.el em-dirs-tests.el server.el
   em-basic.el em-extpipe-tests.el esh-opt-tests.el esh-opt.el
-  and 92 other files
+  and 94 other files
 
 Jim Radford: changed gnus-start.el
 
@@ -3046,7 +3061,7 @@ and changed xterm.c xfns.c keyboard.c screen.c dispnew.c xdisp.c window.c
 
 Joseph M. Kelsey: changed fileio.c skeleton.el
 
-Joseph Turner: changed package-vc.el subr.el
+Joseph Turner: changed package-vc.el minibuffer.el subr.el
 
 Josh Elsasser: changed eglot.el README.md configure.ac
 
@@ -3129,7 +3144,7 @@ Juri Linkov: wrote compose.el emoji.el files-x.el misearch.el
 and changed isearch.el simple.el info.el replace.el dired.el dired-aux.el
   progmodes/grep.el minibuffer.el window.el subr.el vc.el outline.el
   mouse.el diff-mode.el repeat.el image-mode.el files.el menu-bar.el
-  search.texi startup.el progmodes/compile.el and 473 other files
+  search.texi startup.el display.texi and 473 other files
 
 Jussi Lahdenniemi: changed w32fns.c ms-w32.h msdos.texi w32.c w32.h
   w32console.c w32heap.c w32inevt.c w32term.h
@@ -3422,7 +3437,7 @@ Konstantin Kharlamov: changed smerge-mode.el diff-mode.el files.el
   ada-mode.el autorevert.el calc-aent.el calc-ext.el calc-lang.el
   cc-mode.el cperl-mode.el css-mode.el cua-rect.el dnd.el ebnf-abn.el
   ebnf-dtd.el ebnf-ebx.el emacs-module-tests.el epg.el faces.el
-  gnus-art.el gtkutil.c and 27 other files
+  gnus-art.el gtkutil.c and 28 other files
 
 Konstantin Kliakhandler: changed org-agenda.el
 
@@ -3598,6 +3613,8 @@ Lluís Vilanova: changed ede/linux.el
 
 Logan Perkins: changed keyboard.c
 
+Loïc Lemaître: changed typescript-ts-mode.el
+
 Luca Capello: changed mm-encode.el
 
 Lucas Werkmeister: changed emacs.c emacs.service nxml-mode.el
@@ -3645,6 +3662,8 @@ Lute Kamstra: changed modes.texi emacs-lisp/debug.el generic-x.el
 
 Lynn Slater: wrote help-macro.el
 
+Maciej Kalandyk: changed progmodes/python.el
+
 Maciek Pasternacki: changed nnrss.el
 
 Madan Ramakrishnan: changed org-agenda.el
@@ -3935,11 +3954,15 @@ Matthew Mundell: changed calendar.texi diary-lib.el files.texi
 
 Matthew Newton: changed imenu.el
 
+Matthew Smith: changed typescript-ts-mode-tests.el
+
 Matthew Tromp: changed ielm.el
 
 Matthew White: changed buffer.c bookmark-tests.el bookmark.el
   test-list.bmk
 
+Matthew Woodcraft: changed eglot.texi
+
 Matthias Dahl: changed faces.el process.c process.h
 
 Matthias Förste: changed files.el
@@ -3986,11 +4009,11 @@ Matt Simmons: changed message.el
 Matt Swift: changed dired.el editfns.c lisp-mode.el mm-decode.el
   outline.el progmodes/compile.el rx.el simple.el startup.el
 
-Mauro Aranda: changed wid-edit.el cus-edit.el custom.el wid-edit-tests.el
-  widget.texi perl-mode.el custom-tests.el checkdoc-tests.el checkdoc.el
-  cperl-mode-tests.el cus-edit-tests.el cus-theme.el customize.texi
-  files.texi gnus.texi octave.el pong.el align.el auth-source.el
-  autorevert.el base.el and 56 other files
+Mauro Aranda: changed wid-edit.el cus-edit.el widget.texi custom.el
+  wid-edit-tests.el perl-mode.el custom-tests.el checkdoc-tests.el
+  checkdoc.el cperl-mode-tests.el cus-edit-tests.el cus-theme.el
+  customize.texi files.texi gnus.texi octave.el pong.el align.el
+  auth-source.el autorevert.el base.el and 62 other files
 
 Maxime Edouard Robert Froumentin: changed gnus-art.el mml.el
 
@@ -4013,7 +4036,7 @@ and co-wrote tramp-cache.el tramp-sh.el tramp.el
 and changed tramp.texi tramp-adb.el trampver.el trampver.texi dbusbind.c
   files.el ange-ftp.el files.texi file-notify-tests.el dbus.texi
   gitlab-ci.yml autorevert.el tramp-fish.el kqueue.c Dockerfile.emba
-  os.texi tramp-gw.el test/Makefile.in README shell.el files-tests.el
+  os.texi tramp-gw.el test/Makefile.in README files-x.el shell.el
   and 309 other files
 
 Michael Ben-Gershon: changed acorn.h configure.ac riscix1-1.h riscix1-2.h
@@ -4197,8 +4220,8 @@ Mike Kazantsev: changed erc-dcc.el
 
 Mike Kupfer: changed mh-comp.el mh-e.el mh-mime.el mh-utils.el files.el
   ftcrfont.c mh-compat.el mh-utils-tests.el emacs-mime.texi files.texi
-  gnus-mh.el gnus.texi mh-acros.el mh-e.texi mh-identity.el mh-scan.el
-  xftfont.c
+  gnus-mh.el gnus.texi mh-acros.el mh-e.texi mh-funcs.el mh-identity.el
+  mh-scan.el xftfont.c
 
 Mike Lamb: changed em-unix.el esh-util.el pcmpl-unix.el
 
@@ -4258,10 +4281,8 @@ Mohsin Kaleem: changed eglot.el
 
 Mon Key: changed animate.el imap.el syntax.el
 
-Morgan J. Smith: changed gnus-group-tests.el
-
-Morgan Smith: changed image-dired.el minibuffer-tests.el minibuffer.el
-  vc-git.el window.el
+Morgan Smith: changed image-dired.el doc-view.el gnus-group-tests.el
+  minibuffer-tests.el minibuffer.el url-vars.el vc-git.el window.el
 
 Morten Welinder: wrote [many MS-DOS files] arc-mode.el desktop.el
   dosfns.c internal.el msdos.h pc-win.el
@@ -4274,6 +4295,8 @@ Mosur Mohan: changed etags.c
 
 Motorola: changed buff-menu.el
 
+Mou Tong: changed eglot.el
+
 Muchenxuan Tong: changed org-agenda.el org-mobile.el org-timer.el
 
 Murata Shuuichirou: changed coding.c
@@ -4341,6 +4364,8 @@ Nevin Kapur: changed nnmail.el gnus-sum.el nnimap.el gnus-group.el
 
 Nguyen Thai Ngoc Duy: co-wrote vnvni.el
 
+Niall Dooley: changed eglot.el
+
 Niall Mansfield: changed etags.c
 
 Nic Ferrier: changed ert.el tramp.el
@@ -4455,7 +4480,8 @@ and changed rsz-mini.el emacs-buffer.gdb comint.el files.el Makefile
 
 Noah Lavine: changed tramp.el
 
-Noah Peart: changed treesit.el
+Noah Peart: changed typescript-ts-mode.el indent.erts js.el treesit.el
+  c-ts-mode.el js-tests.el js-ts-indents.erts
 
 Noah Swainland: changed calc.el goto-addr.el misc.texi
 
@@ -4720,7 +4746,8 @@ Peter O'Gorman: changed configure.ac frame.h hpux10-20.h termhooks.h
 
 Peter Oliver: changed emacsclient.desktop emacsclient-mail.desktop
   Makefile.in emacs-mail.desktop server.el configure.ac emacs.desktop
-  emacs.metainfo.xml misc.texi perl-mode.el ruby-mode-tests.el vc-sccs.el
+  emacs.metainfo.xml emacsclient.1 misc.texi perl-mode.el
+  ruby-mode-tests.el vc-sccs.el
 
 Peter Povinec: changed term.el
 
@@ -4760,7 +4787,7 @@ Petri Kaurinkoski: changed configure.ac iris4d.h irix6-0.h irix6-5.h
 Petr Salinger: changed configure.ac gnu-kfreebsd.h
 
 Petteri Hintsanen: changed sequences.texi Makefile.in emacs/Makefile.in
-  lispintro/Makefile.in lispref/Makefile.in misc/Makefile.in
+  lispintro/Makefile.in lispref/Makefile.in misc/Makefile.in tab-bar.el
 
 Phil Hagelberg: wrote ert-x-tests.el
 and changed package.el pcmpl-unix.el subr.el
@@ -4802,7 +4829,7 @@ and changed emacs-module.c emacs-module-tests.el configure.ac json.c
   process.c eval.c internals.texi json-tests.el process-tests.el
   pdumper.c alloc.c emacs-module.h.in emacs.c lread.c nsterm.m
   bytecomp.el lisp.h seccomp-filter.c callproc.c cl-macs.el gtkutil.c
-  and 188 other files
+  and 189 other files
 
 Phillip Dixon: changed eglot.el
 
@@ -4851,6 +4878,8 @@ Piet van Oostrum: changed data.c fileio.c flyspell.el smtpmail.el
 
 Pinku Surana: changed sql.el
 
+Piotr Kwiecinski: changed eglot.el
+
 Piotr Trojanek: changed gnutls.c process.c
 
 Piotr Zieliński: wrote org-mouse.el
@@ -4946,8 +4975,8 @@ Randall Smith: changed dired.el
 
 Randal Schwartz: wrote pp.el
 
-Randy Taylor: changed build.sh eglot.el batch.sh dockerfile-ts-mode.el
-  rust-ts-mode.el go-ts-mode.el c-ts-mode.el cmake-ts-mode.el
+Randy Taylor: changed build.sh dockerfile-ts-mode.el eglot.el batch.sh
+  rust-ts-mode.el cmake-ts-mode.el go-ts-mode.el c-ts-mode.el
   cus-theme.el font-lock.el java-ts-mode.el js.el json-ts-mode.el
   modes.texi progmodes/python.el project.el sh-script.el
   typescript-ts-mode.el yaml-ts-mode.el
@@ -5495,6 +5524,8 @@ Simon Thum: changed ob-maxima.el
 
 Skip Collins: changed w32fns.c w32term.c w32term.h
 
+Skykanin-: changed eglot.el
+
 Sławomir Nowaczyk: changed emacs.py progmodes/python.el TUTORIAL.pl
   flyspell.el ls-lisp.el w32proc.c
 
@@ -5527,7 +5558,7 @@ and co-wrote help-tests.el keymap-tests.el
 and changed image-dired.el efaq.texi package.el cperl-mode.el help.el
   subr.el checkdoc.el bookmark.el simple.el dired.el files.el gnus.texi
   dired-x.el keymap.c image-mode.el erc.el ediff-util.el speedbar.el
-  woman.el browse-url.el bytecomp-tests.el and 1678 other files
+  woman.el browse-url.el bytecomp-tests.el and 1690 other files
 
 Stefan Merten: co-wrote rst.el
 
@@ -5581,7 +5612,7 @@ and changed wdired.el todo-mode.texi wdired-tests.el diary-lib.el
   dired.el dired-tests.el doc-view.el files.el info.el minibuffer.el
   outline.el todo-test-1.todo allout.el eww.el find-dired.el frames.texi
   hl-line.el menu-bar.el mouse.el otodo-mode.el simple.el
-  and 63 other files
+  and 64 other files
 
 Stephen C. Gilardi: changed configure.ac
 
@@ -5791,10 +5822,10 @@ Theodore Jump: changed makefile.nt makefile.def w32-win.el w32faces.c
 
 Theodor Thornhill: changed typescript-ts-mode.el java-ts-mode.el
   c-ts-mode.el eglot.el csharp-mode.el js.el css-mode.el project.el
-  json-ts-mode.el treesit.el c-ts-common.el eglot-tests.el EGLOT-NEWS
-  README.md c-ts-mode-tests.el compile-tests.el go-ts-mode.el
-  indent-bsd.erts indent.erts maintaining.texi mwheel.el
-  and 5 other files
+  indent.erts json-ts-mode.el treesit.el c-ts-common.el eglot-tests.el
+  EGLOT-NEWS README.md c-ts-mode-tests.el compile-tests.el
+  csharp-mode-tests.el go-ts-mode.el indent-bsd.erts
+  java-ts-mode-tests.el and 9 other files
 
 Theresa O'Connor: wrote json.el
 and changed erc.el erc-viper.el erc-log.el erc-track.el viper.el
@@ -6162,7 +6193,7 @@ Vincent Bernat: changed gnus-int.el nnimap.el xsettings.c
 
 Vincent Del Vecchio: changed info.el mh-utils.el
 
-Vincenzo Pupillo: changed cmake-ts-mode.el js.el typescript-ts-mode.el
+Vincenzo Pupillo: changed js.el cmake-ts-mode.el typescript-ts-mode.el
   java-ts-mode.el
 
 Vince Salvino: changed msdos.texi w32.c w32fns.c
@@ -6317,10 +6348,15 @@ W. Trevor King: changed xterm.el
 
 Xavier Maillard: changed gnus-faq.texi gnus-score.el mh-utils.el spam.el
 
+Xiaoyue Chen: changed esh-proc.el
+
 Xi Lu: changed etags.c htmlfontify.el ruby-mode.el CTAGS.good_crlf
   CTAGS.good_update Makefile TUTORIAL.cn crlf eww.el shortdoc.el
   tramp-sh.el
 
+Xiyue Deng: changed emacs-lisp-intro.texi functions.texi strings.texi
+  symbols.texi
+
 Xu Chunyang: changed eglot.el eww.el dom.el gud.el netrc.el
 
 Xue Fuqiao: changed display.texi emacs-lisp-intro.texi files.texi
@@ -6383,11 +6419,11 @@ Yoshinari Nomura: changed ox-html.el ox.el
 Yoshinori Koseki: wrote iimage.el
 and changed fontset.el message.el nnheader.el nnmail.el
 
-Yuan Fu: changed treesit.el treesit.c c-ts-mode.el parsing.texi
+Yuan Fu: changed treesit.el c-ts-mode.el treesit.c parsing.texi
   progmodes/python.el modes.texi js.el treesit-tests.el indent.erts
-  typescript-ts-mode.el css-mode.el treesit.h configure.ac
+  typescript-ts-mode.el treesit.h css-mode.el configure.ac
   java-ts-mode.el print.c sh-script.el c-ts-common.el gdb-mi.el
-  rust-ts-mode.el go-ts-mode.el starter-guide and 54 other files
+  rust-ts-mode.el go-ts-mode.el starter-guide and 55 other files
 
 Yuanle Song: changed rng-xsd.el
 
diff --git a/etc/HISTORY b/etc/HISTORY
index afa14cb2350..cfd4f1f6873 100644
--- a/etc/HISTORY
+++ b/etc/HISTORY
@@ -235,6 +235,8 @@ GNU Emacs 29.1 (2023-07-30) emacs-29.1
 
 GNU Emacs 29.2 (2024-01-18) emacs-29.2
 
+GNU Emacs 29.3 (2024-03-24) emacs-29.3
+
 
 ----------------------------------------------------------------------
 This file is part of GNU Emacs.