From 4e65e05ea4d29199def700c37f71e00c64eb0025 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Fri, 3 Apr 2026 01:44:04 +0200
Subject: [PATCH 001/463] Adjust return format of 'package--dependencies'

* lisp/emacs-lisp/package.el (package--dependencies): Return
required dependency version along with every dependency.
(package-menu--list-to-prompt): Discard required versions.
---
 lisp/emacs-lisp/package.el | 46 ++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 5cf2e535c99..00f1b615bf4 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2161,24 +2161,35 @@ from ELPA by either using `\\[package-upgrade]' or
 
 (defun package--dependencies (pkg)
   "Return a list of all transitive dependencies of PKG.
-If PKG is a package descriptor, the return value is a list of
-package descriptors.  If PKG is a symbol designating a package,
-the return value is a list of symbols designating packages."
+Each element of the resulting list is a cons-cell (NAME VERSION-LIST),
+where NAME is a symbol designating the package name and VERSION-LIST
+designates the least version number that any dependency of PKG requires.
+This format is intentionally meant to mirror that of
+`package-desc-reqs', which see.  PKG is either a symbol designating a
+package name known in the archives or a `package-desc' object."
   (when-let* ((desc (if (package-desc-p pkg) pkg
                       (cadr (assq pkg package-archive-contents)))))
     ;; Can we have circular dependencies?  Assume "nope".
-    (let ((all (named-let more ((pkg-desc desc))
-                 (let (deps)
-                   (dolist (req (package-desc-reqs pkg-desc))
-                     (setq deps (nconc
-                                 (catch 'found
-                                   (dolist (p (apply #'append (mapcar #'cdr (package--alist))))
-                                     (when (and (string= (car req) (package-desc-name p))
-                                                (version-list-<= (cadr req) (package-desc-version p)))
-                                       (throw 'found (more p)))))
-                                 deps)))
-                   (delete-dups (cons pkg-desc deps))))))
-      (remq pkg (mapcar (if (package-desc-p pkg) #'identity #'package-desc-name) all)))))
+    (let ((all (named-let rec ((pkg-desc desc) (min-version nil))
+                 (cl-loop for (name vlist) in (package-desc-reqs pkg-desc)
+                          if (eq name 'emacs)
+                          collect (list name vlist) into deps
+                          else append
+                          (cl-loop for p in (alist-get name package-archive-contents)
+                                   when (version-list-<= vlist (package-desc-version p))
+                                   return (rec p vlist)
+                                   ;; if we couldn't find a package in
+                                   ;; the archives, we fall back to
+                                   ;; returning the dependency as-is:
+                                   finally return (list (list name vlist)))
+                          into deps
+                          finally (return `((,(package-desc-name pkg-desc) ,min-version) . ,deps))))))
+      (mapcar
+       (lambda (ent)
+         (list (car ent) (seq-reduce (lambda (acc vlist)
+                                       (if (version-list-< acc vlist) vlist acc))
+                                     (mapcar #'cadr (cdr ent)) '())))
+       (seq-group-by #'car (delete-dups (cdr all)))))))
 
 (defun package-strip-rcs-id (str)
   "Strip RCS version ID from the version string STR.
@@ -3945,8 +3956,9 @@ dependencies."
                    (apply
                     #'nconc
                     (mapcar (lambda (package)
-                              (package--dependencies
-                               (package-desc-name package)))
+                              (mapcar #'car
+                                      (package--dependencies
+                                       (package-desc-name package))))
                             packages))))))
             (if (and include-dependencies deps)
                 (if (length= deps 1)

From 6a15c02a59d6caf171c7cb9b85f48ec845853445 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Fri, 3 Apr 2026 01:50:48 +0200
Subject: [PATCH 002/463] Recursively check dependencies for package
 compatibility

* lisp/emacs-lisp/package.el (package--compatible-packages): Add
new function.
(package-install): Use new function to restrict suggestions to
not include incompatible packages.
(package--incompatible-p): Check all dependencies to determine
package compatibility.
* etc/NEWS: Mention change.  (Bug#80695)
---
 etc/NEWS                   |  3 +++
 lisp/emacs-lisp/package.el | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 528eb09eff8..20f8acaea0e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3176,6 +3176,9 @@ presentation style of these suggestions using
 This user option controls what previous packages versions to keep on
 upgrade.  By default, this is set to nil, to keep the previous behavior.
 
+---
+*** Packages check recursive dependencies before installing.
+
 ** Rcirc
 
 +++
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 00f1b615bf4..c63eb5f181a 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2015,6 +2015,16 @@ package archive."
   :type 'boolean
   :version "29.1")
 
+(defun package--compatible-packages ()
+  "Return list of packages that can be installed.
+This excludes packages that are listed in the archives, but have
+incompatible dependencies (either not available at all or too old)."
+  (package-read-all-archive-contents)
+  (package--build-compatibility-table)
+  (cl-loop for (name . desc) in package-archive-contents
+           unless (any #'package--incompatible-p desc)
+           collect name))
+
 ;;;###autoload
 (defun package-install (pkg &optional dont-select interactive)
   "Install the package PKG.
@@ -2042,7 +2052,7 @@ had been enabled."
      (package--archives-initialize)
      (list (intern (completing-read
                     "Install package: "
-                    package-archive-contents
+                    (package--compatible-packages)
                     nil t))
            nil
            'interactive)))
@@ -3267,7 +3277,7 @@ of these dependencies, similar to the list returned by
         (package-version-join version)
       (unless shallow
         (let (out)
-          (dolist (dep (package-desc-reqs pkg) out)
+          (dolist (dep (package--dependencies pkg) out)
             (let ((dep-name (car dep)))
               (unless (eq 'emacs dep-name)
                 (let ((cv (gethash dep-name package--compatibility-table)))

From 0bfdb068f2f7031d6e8bb9cae8142be0bc4962ab Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Fri, 3 Apr 2026 02:09:33 +0200
Subject: [PATCH 003/463] List recursive dependencies in the package
 description

* lisp/emacs-lisp/package.el (describe-package-1): List and
indicate if a package will require a recursive dependency.
---
 lisp/emacs-lisp/package.el | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index c63eb5f181a..e5de0a2f519 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2699,7 +2699,7 @@ Helper function for `describe-package'."
                     (cadr (assq pkg package-archive-contents))))))
          (name (if desc (package-desc-name desc) pkg))
          (pkg-dir (if desc (package-desc-dir desc)))
-         (reqs (if desc (package-desc-reqs desc)))
+         (reqs (if desc (package--dependencies desc)))
          (required-by (if desc (package--used-elsewhere-p desc nil 'all)))
          (version (if desc (package-desc-version desc)))
          (archive (if desc (package-desc-archive desc)))
@@ -2786,10 +2786,11 @@ Helper function for `describe-package'."
       (package--print-help-section "Summary"
         (package-desc-summary desc)))
 
-    (setq reqs (if desc (package-desc-reqs desc)))
+    (setq reqs (if desc (package--dependencies desc)))
     (when reqs
       (package--print-help-section "Requires")
-      (let ((first t))
+      (let ((immediate (package-desc-reqs desc))
+            (first t))
         (dolist (req reqs)
           (let* ((name (car req))
                  (vers (cadr req))
@@ -2804,7 +2805,9 @@ Helper function for `describe-package'."
                    (insert ",\n               "))
                   (t (insert ", ")))
             (help-insert-xref-button text 'help-package name)
-            (insert reason)))
+            (insert (if (assq name immediate) ""
+                      (propertize "*" 'help-echo "Transitive dependency"))
+                    reason)))
         (insert "\n")))
     (when required-by
       (package--print-help-section "Required by")

From 0a62e6c304d880b9fcb91c9ce091200cd2436a52 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 5 Apr 2026 07:33:14 +0300
Subject: [PATCH 004/463] ; Fix documentation of last change

* lisp/emacs-lisp/package.el (package--compatible-packages): Doc
fix.

* etc/NEWS: Improve and expand wording in the new entry.
(Bug#80695)
---
 etc/NEWS                   | 5 ++++-
 lisp/emacs-lisp/package.el | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 20f8acaea0e..27dc86727e3 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3177,7 +3177,10 @@ This user option controls what previous packages versions to keep on
 upgrade.  By default, this is set to nil, to keep the previous behavior.
 
 ---
-*** Packages check recursive dependencies before installing.
+*** Packages are now checked for recursive dependencies before installing.
+If a package has dependencies not available on any of the archives in
+'package-archives', it will appear as unavailable, with the reasons
+stated in its description.
 
 ** Rcirc
 
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index e5de0a2f519..6a4848c6544 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2018,7 +2018,8 @@ package archive."
 (defun package--compatible-packages ()
   "Return list of packages that can be installed.
 This excludes packages that are listed in the archives, but have
-incompatible dependencies (either not available at all or too old)."
+incompatible dependencies (either too old or not available at all
+in any archive mentioned in `package-archives')."
   (package-read-all-archive-contents)
   (package--build-compatibility-table)
   (cl-loop for (name . desc) in package-archive-contents

From 6c227809559cad744de00419afa651812b65e7a6 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sat, 4 Apr 2026 23:45:28 -0400
Subject: [PATCH 005/463] Update to Org 9.8.1

---
 doc/misc/org-setup.org      |    6 +-
 doc/misc/org.org            | 1686 +++++++++++++++++++-----------
 etc/ORG-NEWS                |  928 +++++++++++++++-
 etc/org/OrgOdtStyles.xml    |    3 -
 etc/refcards/orgcard.tex    |    6 +-
 lisp/org/ob-C.el            |    1 -
 lisp/org/ob-R.el            |   75 +-
 lisp/org/ob-awk.el          |    7 +-
 lisp/org/ob-calc.el         |   31 +-
 lisp/org/ob-clojure.el      |   13 +-
 lisp/org/ob-comint.el       |  150 ++-
 lisp/org/ob-core.el         |  175 +++-
 lisp/org/ob-csharp.el       |  304 ++++++
 lisp/org/ob-ditaa.el        |  190 +++-
 lisp/org/ob-emacs-lisp.el   |    9 +-
 lisp/org/ob-eval.el         |   14 +-
 lisp/org/ob-exp.el          |   18 +-
 lisp/org/ob-fortran.el      |    1 +
 lisp/org/ob-gnuplot.el      |    6 +-
 lisp/org/ob-groovy.el       |    1 -
 lisp/org/ob-haskell.el      |    4 +-
 lisp/org/ob-js.el           |    9 +-
 lisp/org/ob-julia.el        |   35 +-
 lisp/org/ob-latex.el        |   37 +-
 lisp/org/ob-lisp.el         |   15 +-
 lisp/org/ob-lob.el          |   60 +-
 lisp/org/ob-lua.el          |  257 +----
 lisp/org/ob-maxima.el       |    6 +-
 lisp/org/ob-ocaml.el        |    1 -
 lisp/org/ob-python.el       |   46 +-
 lisp/org/ob-ref.el          |    4 +-
 lisp/org/ob-ruby.el         |   12 +-
 lisp/org/ob-scheme.el       |   82 +-
 lisp/org/ob-screen.el       |    1 -
 lisp/org/ob-sed.el          |    1 -
 lisp/org/ob-shell.el        |   80 +-
 lisp/org/ob-sql.el          |  100 +-
 lisp/org/ob-sqlite.el       |   11 +-
 lisp/org/ob-tangle.el       |   57 +-
 lisp/org/oc-basic.el        |  110 +-
 lisp/org/oc-biblatex.el     |    4 +-
 lisp/org/oc-bibtex.el       |   33 +-
 lisp/org/oc-csl.el          |   97 +-
 lisp/org/oc-natbib.el       |    4 +-
 lisp/org/oc.el              |   14 +-
 lisp/org/ol-bbdb.el         |   10 +-
 lisp/org/ol-bibtex.el       |    8 +-
 lisp/org/ol-docview.el      |    1 -
 lisp/org/ol-eshell.el       |    2 +-
 lisp/org/ol-gnus.el         |   33 +-
 lisp/org/ol-info.el         |   36 +-
 lisp/org/ol-man.el          |    5 +-
 lisp/org/ol.el              | 1051 ++++++++++++++++---
 lisp/org/org-agenda.el      |  488 +++++----
 lisp/org/org-archive.el     |  223 ++--
 lisp/org/org-attach.el      |   90 +-
 lisp/org/org-capture.el     |  698 ++++++++-----
 lisp/org/org-clock.el       |  120 ++-
 lisp/org/org-colview.el     |  184 ++--
 lisp/org/org-compat.el      |  332 +++++-
 lisp/org/org-crypt.el       |    1 -
 lisp/org/org-cycle.el       |   58 +-
 lisp/org/org-datetree.el    |  401 ++++---
 lisp/org/org-element-ast.el |   25 +-
 lisp/org/org-element.el     |  425 ++++----
 lisp/org/org-entities.el    |    1 +
 lisp/org/org-faces.el       |   22 +-
 lisp/org/org-fold-core.el   |   30 +-
 lisp/org/org-fold.el        |   26 +-
 lisp/org/org-footnote.el    |   26 +-
 lisp/org/org-goto.el        |   11 +-
 lisp/org/org-id.el          |   64 +-
 lisp/org/org-indent.el      |    2 -
 lisp/org/org-keys.el        |  180 ++--
 lisp/org/org-lint.el        |  107 +-
 lisp/org/org-list.el        |   43 +-
 lisp/org/org-macro.el       |    8 +-
 lisp/org/org-macs.el        |  194 ++--
 lisp/org/org-mobile.el      |    4 +-
 lisp/org/org-mouse.el       |   14 +-
 lisp/org/org-num.el         |    4 -
 lisp/org/org-pcomplete.el   |   53 +-
 lisp/org/org-persist.el     |  200 ++--
 lisp/org/org-plot.el        |   72 +-
 lisp/org/org-protocol.el    |   21 +-
 lisp/org/org-refile.el      |  128 +--
 lisp/org/org-src.el         |  315 +++---
 lisp/org/org-table.el       |  567 +++++-----
 lisp/org/org-timer.el       |   18 +-
 lisp/org/org-version.el     |    4 +-
 lisp/org/org.el             | 1976 +++++++++++++++++------------------
 lisp/org/ox-ascii.el        |    7 +-
 lisp/org/ox-beamer.el       |   10 +
 lisp/org/ox-html.el         |  161 ++-
 lisp/org/ox-icalendar.el    |   33 +-
 lisp/org/ox-latex.el        |  443 +++++---
 lisp/org/ox-man.el          |   56 +-
 lisp/org/ox-md.el           |   33 +-
 lisp/org/ox-odt.el          |  237 +++--
 lisp/org/ox-org.el          |    5 +-
 lisp/org/ox-publish.el      |   80 +-
 lisp/org/ox-texinfo.el      |  227 ++--
 lisp/org/ox.el              |  264 +++--
 103 files changed, 9454 insertions(+), 5087 deletions(-)
 create mode 100644 lisp/org/ob-csharp.el

diff --git a/doc/misc/org-setup.org b/doc/misc/org-setup.org
index 3519089180c..5d326906e9a 100644
--- a/doc/misc/org-setup.org
+++ b/doc/misc/org-setup.org
@@ -29,9 +29,9 @@
 
 # Contact Info
 #+texinfo_header: @set MAINTAINERSITE @uref{https://orgmode.org,maintainers webpage}
-#+texinfo_header: @set MAINTAINER Bastien Guerry
-#+texinfo_header: @set MAINTAINEREMAIL @email{bzg@gnu.org}
-#+texinfo_header: @set MAINTAINERCONTACT @uref{mailto:bzg@gnu.org,contact the maintainer}
+#+texinfo_header: @set MAINTAINER Ihor Radchenko
+#+texinfo_header: @set MAINTAINEREMAIL @email{yantar92@posteo.net}
+#+texinfo_header: @set MAINTAINERCONTACT @uref{mailto:yantar92@posteo.net,contact the maintainer}
 
 #+options: H:4 num:t toc:t author:t \n:nil ::t |:t ^:nil -:t f:t *:t <:t e:t ':t
 #+options: d:nil todo:nil pri:nil tags:not-in-toc stat:nil broken-links:mark
diff --git a/doc/misc/org.org b/doc/misc/org.org
index 9f80cf4885e..13b9ac2026a 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -19,7 +19,7 @@
 :END:
 #+cindex: summary
 
-Org Mode is an authoring tool and a TODO lists manager for GNU Emacs.
+Org mode is an authoring tool and a TODO list manager for GNU Emacs.
 It relies on a lightweight plain-text markup language used in files
 with the =.org= extension.
 
@@ -28,27 +28,27 @@ understand, and change them with any text editor.
 
 As an authoring tool, Org helps you write structured documents and
 provides exporting facilities.  Org files can also be used for literate
-programming and reproducible research.  As a TODO lists manager, Org
+programming and reproducible research.  As a TODO list manager, Org
 helps you organize your tasks in a flexible way, from daily needs to
-detailed project-planning, allowing logging, multiple views on your
+detailed project planning, allowing logging, multiple views of your
 tasks, exporting your agendas, etc.
 
 Org mode is implemented on top of Outline mode, which makes it
-possible to keep the content of large files well structured.
-Visibility cycling and structure editing help to work with the tree.
+possible to keep the content of large files well-structured.
+Visibility cycling and structure editing help you work with the tree.
 Tables are easily created with a built-in table editor.  Plain text
 URL-like links connect to websites, emails, Usenet messages, BBDB
 entries, and any files related to the projects.
 
-Org develops organizational tasks around notes files that contain
+Org develops organizational tasks around note files that contain
 lists or information about projects as plain text.  Project planning
-and task management make use of metadata which is part of an outline
-node.  Based on this data, specific entries can be extracted in
-queries and create dynamic /agenda views/ that also integrate the Emacs
+and task management make use of metadata, which is part of an outline
+node.  Based on this data, specific entries can be extracted via
+queries to create dynamic /agenda views/ that also integrate the Emacs
 calendar and diary.  Org can be used to implement many different
 project planning schemes, such as David Allen's GTD system.
 
-Org files can serve as a single source authoring system with export to
+Org files can serve as a single-source authoring system with export to
 many different formats such as HTML, LaTeX, Open Document, and
 Markdown.  New export backends can be derived from existing ones, or
 defined from scratch.
@@ -57,10 +57,10 @@ Org files can include source code blocks, which makes Org uniquely
 suited for authoring technical documents with code examples.  Org
 source code blocks are fully functional; they can be evaluated in
 place and their results can be captured in the file.  This makes it
-possible to create a single file reproducible research compendium.
+possible to create a single-file reproducible research compendium.
 
 Org keeps simple things simple.  When first fired up, it should feel
-like a straightforward, easy to use outliner.  Complexity is not
+like a straightforward, easy-to-use outliner.  Complexity is not
 imposed, but a large amount of functionality is available when needed.
 Org is a toolbox.  Many users actually run only a---very
 personal---fraction of Org's capabilities, and know that there is more
@@ -79,7 +79,8 @@ of Org, as well as additional information, frequently asked questions
 
 #+cindex: print edition
 An earlier version (7.3) of this manual was available as a paperback
-book from the Network Theory Ltd. publishing company, closed in 2009.
+book from the Network Theory Ltd. publishing company, which closed
+in 2009.
 
 ** Installation
 :PROPERTIES:
@@ -87,13 +88,13 @@ book from the Network Theory Ltd. publishing company, closed in 2009.
 :END:
 #+cindex: installation
 
-Org is included in distributions of GNU Emacs, you probably do not
+Org is included in distributions of GNU Emacs, so you probably do not
 need to install it.  Most users will simply activate Org and begin
 exploring its features.
 
-If, for one reason or another, you want to install Org on top of this
+If, for one reason or another, you want to install Org on top of the
 pre-packaged version, you can use the Emacs package system or clone
-Org's git repository.  We *strongly recommend* sticking to a single
+Org's Git repository.  We *strongly recommend* sticking to a single
 installation method.
 
 When installing Org on top of the pre-packaged version, please note
@@ -116,21 +117,22 @@ with {{{kbd(M-x list-packages)}}}.  See [[info:emacs::Package Menu][Package Menu
 #+attr_texinfo: :tag Important
 #+begin_quote
 You need to do this in a session where no =.org= file has been
-visited, i.e., where no Org built-in function have been loaded.
-Otherwise autoload Org functions will mess up the installation.
+visited, i.e., where no Org built-in functions have been loaded.
+Otherwise, autoloaded Org functions will mess up the installation.
 #+end_quote
 
-To avoid interference with built-in Org mode, you can use command line:
+To avoid interference with the built-in Org mode, you can use the
+command line (you need Emacs 30 or later):
 
 #+begin_src sh
 emacs -Q -batch -eval "(progn (require 'package) (package-initialize) (package-refresh-contents) (package-upgrade 'org))"
 #+end_src
 
 This approach has the advantage of isolating the upgrade process from
-a running Emacs session, ensuring that version conflicts can not
+a running Emacs session, ensuring that version conflicts cannot
 arise.
 
-*** Using Org's git repository
+*** Using Org's Git repository
 :PROPERTIES:
 :UNNUMBERED: notoc
 :END:
@@ -139,7 +141,9 @@ You can clone Org's repository and install Org like this:
 
 #+begin_example
 $ cd ~/src/
-$ git clone https://git.savannah.gnu.org/git/emacs/org-mode.git
+$ git clone https://https.git.savannah.nongnu.org/git/org-mode.git
+$ # alternatively, you can use mirror
+$ # git clone https://git.sr.ht/~bzg/org-mode
 $ cd org-mode/
 $ make autoloads
 #+end_example
@@ -155,7 +159,7 @@ Make sure you set the load path correctly in your Emacs init file:
 #+end_src
 
 You can also compile with =make=, generate the documentation with
-=make doc=, create a local configuration with =make config= and
+=make doc=, create a local configuration with =make config=, and
 install Org with =make install=.  Please run =make help= to get the
 list of compilation/installation options.
 
@@ -167,14 +171,15 @@ Org Build System page on [[https://orgmode.org/worg/dev/org-build-system.html][W
 :UNNUMBERED: notoc
 :END:
 
-Org's repository used to contain =contrib/= directory for add-ons
+Org's repository used to contain the =contrib/= directory for add-ons
 contributed by others.  As of Org 9.5, the directory has been moved to
 the dedicated org-contrib [[https://git.sr.ht/~bzg/org-contrib][repository]], which you can install
 separately as a [[https://elpa.nongnu.org/nongnu/org-contrib.html][package]] from NonGNU ELPA.
 
-There are enough valuable packages maintained outside of the Org repository.
-Worg has a list of [[https://orgmode.org/worg/org-contrib/index.html][org-contrib and external packages]], certainly it is not
-exhaustive.
+There are many valuable packages maintained outside the Org
+repository.  Worg has a list of
+[[https://orgmode.org/worg/org-contrib/index.html][org-contrib and
+external packages]]; it is certainly not exhaustive.
 
 ** Activation
 :PROPERTIES:
@@ -187,8 +192,8 @@ exhaustive.
 #+cindex: key bindings, global
 
 Org mode buffers need Font Lock to be turned on: this is the default
-in Emacs[fn:: If you do not use Font Lock globally turn it on in Org
-buffer with =(add-hook 'org-mode-hook #'turn-on-font-lock)=.].
+in Emacs[fn:: If you do not use Font Lock globally, turn it on in an
+Org buffer with =(add-hook 'org-mode-hook #'turn-on-font-lock)=.].
 
 There are compatibility issues between Org mode and some other Elisp
 packages (see [[*Packages that conflict with Org mode]]).  Please take the
@@ -201,7 +206,7 @@ For a better experience, the three Org commands ~org-store-link~,
 ~org-capture~ and ~org-agenda~ ought to be accessible anywhere in
 Emacs, not just in Org buffers.  To that effect, you need to bind them
 to globally available keys, like the ones reserved for users (see
-[[info:elisp::Key Binding Conventions]]).  Here are suggested bindings,
+[[info:elisp::Key Binding Conventions]]).  Here are suggested bindings;
 please modify the keys to your own liking in your [[info:emacs#Init File][personal init file]].
 
 #+begin_src emacs-lisp
@@ -247,13 +252,13 @@ ideas about it, please send an email to the Org mailing list
 [[mailto:emacs-orgmode@gnu.org]].  You can subscribe to the list
 [[https://lists.gnu.org/mailman/listinfo/emacs-orgmode][from this web
 page]].  If you are not a member of the mailing list, your mail will
-be passed to the list after a moderator has approved it[fn:: Please
+be passed to the list after a moderator approves it[fn:: Please
 consider subscribing to the mailing list in order to minimize the work
 the mailing list moderators have to do.].  We ask you to read and
 respect the
 [[https://www.gnu.org/philosophy/kind-communication.html][GNU Kind
 Communications Guidelines]] when sending messages on this mailing
-list.  Please allow up to one month for the response and followup if
+list.  Please allow up to one month for a response and follow up if
 no response is received on the bug report.
 
 #+findex: org-version
@@ -264,27 +269,27 @@ is quite possible that the bug has been fixed already.  If the bug
 persists, prepare a report and provide as much information as
 possible, including the version information of Emacs ({{{kbd(M-x
 emacs-version)}}}) and Org ({{{kbd(M-x org-version)}}}), as well as
-the Org related setup in the Emacs init file.  The easiest way to do
+the Org-related setup in the Emacs init file.  The easiest way to do
 this is to use the command
 
 : M-x org-submit-bug-report <RET>
 
 #+texinfo: @noindent
 which puts all this information into an Emacs mail buffer so that you
-only need to add your description.  If you are not sending the Email
-from within Emacs, please copy and paste the content into your Email
+only need to add your description.  If you are not sending the email
+from within Emacs, please copy and paste the content into your email
 program.
 
 Sometimes you might face a problem due to an error in your Emacs or
 Org mode setup.  Before reporting a bug, it is very helpful to start
-Emacs with minimal customizations and reproduce the problem.  Doing so
-often helps you determine if the problem is with your customization or
-with Org mode itself.  You can start a typical minimal session with
+Emacs with minimal customizations and to reproduce the problem.  Doing
+so often helps you determine if the problem is with your customization
+or with Org mode itself.  You can start a typical minimal session with
 a command like the example below.
 
 : $ emacs -Q -l /path/to/minimal-org.el
 
-However if you are using Org mode as distributed with Emacs, a minimal
+However, if you are using Org mode as distributed with Emacs, a minimal
 setup is not necessary.  In that case it is sufficient to start Emacs
 as =emacs -Q=.  The =minimal-org.el= setup file can have contents as
 shown below.
@@ -301,17 +306,17 @@ shown below.
 (add-to-list 'load-path (expand-file-name "/path/to/org-mode/lisp"))
 #+end_src
 
-If you are using Org mode version from Git repository, you can start
-minimal session using make.
+If you are using the Org mode version from the Git repository, you can
+start a minimal session using =make=.
 
 : # Bare Emacs
 : make repro
 : # or pass extra arguments
 : make repro REPRO_ARGS="-l /path/to/minimal/config.el /tmp/bug.org"
 
-If an error occurs, a "backtrace" can be very useful---see below on
-how to create one.  Often a small example file helps, along with clear
-information about:
+If an error occurs, a "backtrace" can be very useful---see below for
+instructions on how to create one.  Often a small example file helps,
+along with clear information about:
 
 1. What exactly did you do?
 2. What did you expect to happen?
@@ -324,7 +329,7 @@ information about:
 #+cindex: laggy
 #+cindex: not responsive
 If you experience degraded performance, you can record a "profile" and
-share it on the Org mailing list.  See below for the instructions how
+share it on the Org mailing list.  See below for instructions on how
 to record a useful profile.
 
 Thank you for helping to improve this program.
@@ -369,14 +374,14 @@ error occurred.  Here is how to produce a useful backtrace:
 :END:
 
 #+cindex: profiler
-Sometimes, Org is becoming slow for no apparent reason.  Such slowdown
+Sometimes, Org becomes slow for no apparent reason.  Such slowdown
 is often caused by interaction between third-party packages and Org
 mode.  However, identifying the root cause is not always straightforward.
 
 Emacs is able to record performance statistics, which can then be used
-to find out which functions are taking most of the time to execute.
-To record the statistics, one can use so-called profiler.  To use the
-Emacs profiler, we recommend the following steps:
+to find out which functions are taking the most time to execute.  To
+record the statistics, one can use a profiler.  To use the Emacs
+profiler, we recommend the following steps:
 
 1. Make sure that no profiler is currently active:
 
@@ -394,31 +399,31 @@ Emacs profiler, we recommend the following steps:
 
    This command will display a summary of the commands and functions
    that have been executed between ~profiler-start~ and
-   ~profiler-report~ invocations, with command taking most of the time
-   displayed on top.
+   ~profiler-report~ invocations, with the command taking the most
+   time displayed on top.
 
-   =<TAB>= key can be used to fold and unfold lines in the profiler
+   The =<TAB>= key can be used to fold and unfold lines in the profiler
    buffer.  The child items revealed upon unfolding are the functions
    and commands called by the unfolded parent.
 
-   The root causes are often buried deep inside sub-children items in
+   The root causes are often buried deep inside child items in
    the profiler.  You can press =B= (~profiler-report-render-reversed-calltree~)
-   to quickly reveal the actual function/command that takes most of
-   the time to run.
+   to quickly reveal the actual function/command that takes the most
+   time to run.
 
    Pressing =C= ~profiler-report-render-calltree~ will recover the
    original view.
 
 5. If you need further help, you can share the statistics data.
 
-   Just save the data by issuing
+   To save the data, issue
 
    : M-x profiler-report-write-profile <RET>
    : /path/to/profile-file-to-be-saved <RET>
 
-   Then, you can attached the saved file to your email to the Org
-   mailing list, alongside with details about what you did to trigger
-   the slowdown.
+   Then, you can attach the saved file to your email to the Org
+   mailing list, along with details about what you did to trigger the
+   slowdown.
 
    Note that the saved statistics will only contain the function names
    and how long their execution takes.  No private data will be
@@ -435,7 +440,7 @@ Emacs profiler, we recommend the following steps:
 :UNNUMBERED: notoc
 :END:
 
-Org uses various syntactical elements: TODO keywords, tags, property
+Org uses various syntactic elements: TODO keywords, tags, property
 names, keywords, blocks, etc.  In this manual we use the following
 conventions:
 
@@ -467,9 +472,9 @@ conventions:
 :END:
 
 The manual lists both the keys and the corresponding commands for
-accessing a functionality.  Org mode often uses the same key for
+accessing functionality.  Org mode often uses the same key for
 different functions, depending on context.  The command that is bound
-to such keys has a generic name, like ~org-metaright~.  In the manual
+to such keys has a generic name, like ~org-metaright~.  In the manual,
 we will, wherever possible, give the function that is internally
 called by the generic command.  For example, in the chapter on
 document structure, {{{kbd(M-RIGHT)}}} will be listed to call
@@ -484,13 +489,13 @@ call ~org-table-move-column-right~.
 #+cindex: document structure
 #+cindex: structure of document
 Org is an outliner.  Outlines allow a document to be organized in
-a hierarchical structure, which, least for me, is the best
+a hierarchical structure, which, at least for me, is the best
 representation of notes and thoughts.  An overview of this structure
 is achieved by folding, i.e., hiding large parts of the document to
 show only the general document structure and the parts currently being
 worked on.  Org greatly simplifies the use of outlines by compressing
-the entire show and hide functionalities into a single command,
-~org-cycle~, which is bound to the {{{kbd(TAB)}}} key.
+the show and hide functionality into a single command, ~org-cycle~,
+which is bound to the {{{kbd(TAB)}}} key.
 
 ** Headlines
 :PROPERTIES:
@@ -507,13 +512,13 @@ start on the left margin[fn:1] with one or more stars followed by
 a space.  For example:
 
 #+begin_example
-,* Top level headline
+,* First (top) level headline
 ,** Second level
 ,*** Third level
     some text
 ,*** Third level
     more text
-,* Another top level headline
+,* Another first (top) level headline
 #+end_example
 
 #+vindex: org-footnote-section
@@ -521,8 +526,8 @@ The name defined in ~org-footnote-section~ is reserved.  Do not use it
 as a title for your own headings.
 
 Some people find the many stars too noisy and would prefer an outline
-that has whitespace followed by a single star as headline starters.
-This can be achieved using an Org Indent minor mode.  See [[*A Cleaner
+that has whitespace followed by a single star as headline markers.
+This can be achieved using the Org Indent minor mode.  See [[*A Cleaner
 Outline View]] for more information.
 
 Headlines are not numbered.  However, you may want to dynamically
@@ -557,7 +562,7 @@ subtree, in order to structure the collapsed view.  See the variable
 
 Outlines make it possible to hide parts of the text in the buffer.
 Org uses just two commands, bound to {{{kbd(TAB)}}} and
-{{{kbd(S-TAB)}}} to change the visibility in the buffer.
+{{{kbd(S-TAB)}}}, to change the visibility in the buffer.
 
 #+attr_texinfo: :sep ,
 - {{{kbd(TAB)}}} (~org-cycle~) ::
@@ -604,19 +609,20 @@ Org uses just two commands, bound to {{{kbd(TAB)}}} and
   the very beginning of the buffer, but not on a headline, and
   ~org-cycle-global-at-bob~ is set to a non-~nil~ value.
 
-- {{{kbd(C-u C-u TAB)}}} (~org-set-startup-visibility~) ::
+- {{{kbd(C-u C-u TAB)}}} (~org-cycle-set-startup-visibility~) ::
 
   #+cindex: startup visibility
   #+kindex: C-u C-u TAB
-  #+findex: org-set-startup-visibility
+  #+findex: org-cycle-set-startup-visibility
   Switch back to the startup visibility of the buffer (see [[*Initial
   visibility]]).
 
-- {{{kbd(C-u C-u C-u TAB)}}} (~org-show-all~) ::
+- {{{kbd(C-u C-u C-u TAB)}}} (~org-fold-show-all~) ::
 
   #+cindex: show all, command
   #+kindex: C-u C-u C-u TAB
   #+findex: org-show-all
+  #+findex: org-fold-show-all
   Show all, including drawers.
 
 - {{{kbd(C-c C-r)}}} (~org-reveal~) ::
@@ -625,7 +631,7 @@ Org uses just two commands, bound to {{{kbd(TAB)}}} and
   #+kindex: C-c C-r
   #+findex: org-reveal
   Reveal context around point, showing the current entry, the
-  following heading and the hierarchy above.  It is useful for working
+  following heading, and the hierarchy above.  It is useful for working
   near a location that has been exposed by a sparse tree command (see
   [[*Sparse Trees]]) or an agenda command (see [[*Commands in the Agenda
   Buffer]]).  With a prefix argument, show, on each level, all sibling
@@ -639,11 +645,12 @@ Org uses just two commands, bound to {{{kbd(TAB)}}} and
   #+findex: org-show-branches
   Expose all the headings of the subtree, but not their bodies.
 
-- {{{kbd(C-c TAB)}}} (~org-show-children~) ::
+- {{{kbd(C-c TAB)}}} (~org-fold-show-children~) ::
 
   #+cindex: show children, command
   #+kindex: C-c TAB
   #+findex: org-show-children
+  #+findex: org-fold-show-children
   Expose all direct children of the subtree.  With a numeric prefix
   argument {{{var(N)}}}, expose all children down to level
   {{{var(N)}}}.
@@ -654,7 +661,7 @@ Org uses just two commands, bound to {{{kbd(TAB)}}} and
   #+findex: org-tree-to-indirect-buffer
   Show the current subtree in an indirect buffer[fn:2].  With
   a numeric prefix argument {{{var(N)}}}, go up to level {{{var(N)}}}
-  and then take that tree.  If {{{var(N)}}} is negative then go up
+  and then take that tree.  If {{{var(N)}}} is negative, then go up
   that many levels.  With a {{{kbd(C-u)}}} prefix, do not remove the
   previously used indirect buffer.
 
@@ -695,10 +702,10 @@ Furthermore, any entries with a =VISIBILITY= property (see [[*Properties
 and Columns]]) get their visibility adapted accordingly.  Allowed values
 for this property are =folded=, =children=, =content=, and =all=.
 
-- {{{kbd(C-u C-u TAB)}}} (~org-set-startup-visibility~) ::
+- {{{kbd(C-u C-u TAB)}}} (~org-cycle-set-startup-visibility~) ::
 
   #+kindex: C-u C-u TAB
-  #+findex: org-set-startup-visibility
+  #+findex: org-cycle-set-startup-visibility
   Switch back to the startup visibility of the buffer, i.e., whatever
   is requested by startup options and =VISIBILITY= properties in
   individual entries.
@@ -712,14 +719,14 @@ for this property are =folded=, =children=, =content=, and =all=.
 #+vindex: org-fold-catch-invisible-edits
 #+vindex: org-fold-catch-invisible-edits-commands
 Sometimes you may inadvertently edit an invisible part of the buffer
-and be confused on what has been edited and how to undo the mistake.
+and be confused about what has been edited and how to undo the mistake.
 By default, Org prevents such edits for a limited set of user
 commands.  Users can control which commands are affected by
 customizing ~org-fold-catch-invisible-edits-commands~.
 
 The strategy used to decide if a given edit is dangerous is controlled
 by ~org-fold-catch-invisible-edits~.  See the docstring of this option
-on the available strategies.  Set the option to ~nil~ to disable
+for the available strategies.  Set the option to ~nil~ to disable
 catching invisible edits completely.
 
 ** Motion
@@ -778,7 +785,7 @@ The following commands jump to other headlines in the buffer.
   | {{{kbd(/)}}}              | Do a Sparse-tree search         |
 
   #+texinfo: @noindent
-  The following keys work if you turn off ~org-goto-auto-isearch~
+  The following keys work if you turn off ~org-goto-auto-isearch~.
 
   #+attr_texinfo: :columns 0.3 0.7
   | {{{kbd(n)}}} / {{{kbd(p)}}}   | Next/previous visible headline.    |
@@ -812,7 +819,7 @@ The following commands jump to other headlines in the buffer.
   #+kindex: M-RET
   #+findex: org-meta-return
   #+vindex: org-M-RET-may-split-line
-  Insert a new heading, item or row.
+  Insert a new heading, item, or row.
 
   If the command is used at the /beginning/ of a line, and if there is
   a heading or a plain list item (see [[*Plain Lists]]) at point, the new
@@ -874,8 +881,7 @@ The following commands jump to other headlines in the buffer.
   #+cindex: transient mark mode
   When there is an active region---i.e., when Transient Mark mode is
   active---promotion and demotion work on all headlines in the region.
-  To select a region of headlines, it is best to place both point and
-  mark at the beginning of a line, mark at the beginning of the first
+  To select a region of headlines, it is best to set mark at the beginning of the first
   headline, and point at the line just after the last headline to
   change.
 
@@ -907,14 +913,14 @@ The following commands jump to other headlines in the buffer.
 
   #+kindex: C-c @@
   #+findex: org-mark-subtree
-  Mark the subtree at point.  Hitting repeatedly marks subsequent
+  Mark the subtree at point.  Hitting it repeatedly marks subsequent
   subtrees of the same level as the marked subtree.
 
 - {{{kbd(C-c C-x C-w)}}} (~org-cut-subtree~) ::
 
   #+kindex: C-c C-x C-w
   #+findex: org-cut-subtree
-  Kill subtree, i.e., remove it from buffer but save in kill ring.
+  Kill subtree, i.e., remove it from the buffer but save in kill ring.
   With a numeric prefix argument N, kill N sequential subtrees.
 
 - {{{kbd(C-c C-x M-w)}}} (~org-copy-subtree~) ::
@@ -958,7 +964,7 @@ The following commands jump to other headlines in the buffer.
   #+findex: org-clone-subtree-with-time-shift
   Clone a subtree by making a number of sibling copies of it.  You are
   prompted for the number of copies to make, and you can also specify
-  if any timestamps in the entry should be shifted.  This can be
+  whether any timestamps in the entry should be shifted.  This can be
   useful, for example, to create a number of tasks related to a series
   of lectures to prepare.  For more details, see the docstring of the
   command ~org-clone-subtree-with-time-shift~.
@@ -975,7 +981,7 @@ The following commands jump to other headlines in the buffer.
   #+kindex: C-c ^
   #+findex: org-sort
   Sort same-level entries.  When there is an active region, all
-  entries in the region are sorted.  Otherwise the children of the
+  entries in the region are sorted.  Otherwise, the children of the
   current headline are sorted.  The command prompts for the sorting
   method, which can be alphabetically, numerically, by time---first
   timestamp with active preferred, creation time, scheduled time,
@@ -1027,17 +1033,17 @@ keys have different functionality.
 #+cindex: folding, sparse trees
 #+cindex: occur, command
 
+#+vindex: org-fold-show-context-detail
 #+vindex: org-show-context-detail
 An important feature of Org mode is the ability to construct /sparse
 trees/ for selected information in an outline tree, so that the entire
 document is folded as much as possible, but the selected information
 is made visible along with the headline structure above it[fn:: See
-also the variable ~org-show-context-detail~ to decide how much context
+also the variable ~org-fold-show-context-detail~ to decide how much context
 is shown around each match.].  Just try it out and you will see
 immediately how it works.
 
-Org mode contains several commands creating such trees, all these
-commands can be accessed through a dispatcher:
+Org mode contains several commands creating such trees, all of which can be accessed through a dispatcher:
 
 - {{{kbd(C-c /)}}} (~org-sparse-tree~) ::
 
@@ -1055,7 +1061,7 @@ commands can be accessed through a dispatcher:
   Prompts for a regexp (see [[*Regular Expressions]]) and shows a
   sparse tree with all matches.  If the match is in a headline, the
   headline is made visible.  If the match is in the body of an entry,
-  headline and body are made visible.  In order to provide minimal
+  the headline and body are made visible.  In order to provide minimal
   context, also the full hierarchy of headlines above the match is
   shown, as well as the headline following the match.  Each match is
   also highlighted; the highlights disappear when the buffer is
@@ -1080,7 +1086,7 @@ commands can be accessed through a dispatcher:
   Jump to the previous sparse tree match in this buffer.
 
 #+vindex: org-agenda-custom-commands
-For frequently used sparse trees of specific search strings, you can
+For frequently used sparse trees for specific search strings, you can
 use the variable ~org-agenda-custom-commands~ to define fast keyboard
 access to specific sparse trees.  These commands will then be
 accessible through the agenda dispatcher (see [[*The Agenda Dispatcher]]).
@@ -1102,7 +1108,7 @@ tags, or properties and are discussed later in this manual.
 #+cindex: printing sparse trees
 #+cindex: visible text, printing
 To print a sparse tree, you can use the Emacs command
-~ps-print-buffer-with-faces~ which does not print invisible parts of
+~ps-print-buffer-with-faces~, which does not print invisible parts of
 the document.  Or you can use the command {{{kbd(C-c C-e C-v)}}} to
 export only the visible part of the document and print the resulting
 file.
@@ -1139,18 +1145,18 @@ Org knows ordered lists, unordered lists, and description lists.
 
 - /Description/ list items are unordered list items, and contain the
   separator =::= to distinguish the description /term/ from the
-  description.
+  description text.
 
 Items belonging to the same list must have the same indentation on the
 first line.  In particular, if an ordered list reaches number =10.=,
 then the 2-digit numbers must be written left-aligned with the other
-numbers in the list.  An item ends before the next line that is less
-or equally indented than its bullet/number.
+numbers in the list.  An item ends before the next line that has an
+indentation less than or equal to its bullet/number.
 
 A list ends whenever every item has ended, which means before any line
-less or equally indented than items at top level.  It also ends before
-two blank lines.  In that case, all items are closed.  Here is an
-example:
+with an indentation less than or equal to that of the top-level items.
+It also ends before two blank lines.  In that case, all items are
+closed.  Here is an example:
 
 #+begin_example
 ,* Lord of the Rings
@@ -1181,7 +1187,7 @@ indented to signal that they belong to a particular item.
 If you find that using a different bullet for a sub-list---than that
 used for the current list-level---improves readability, customize the
 variable ~org-list-demote-modify-bullet~.  To get a greater difference
-of indentation between items and theirs sub-items, customize
+of indentation between items and their sub-items, customize
 ~org-list-indent-offset~.
 
 #+vindex: org-list-automatic-rules
@@ -1210,17 +1216,18 @@ to disable them individually.
   the item to meaningful levels in the list and eventually get it back
   to its initial position.
 
-- {{{kbd(M-RET)}}} (~org-insert-heading~) ::
+- {{{kbd(M-RET)}}} (~org-insert-item~) ::
 
   #+kindex: M-RET
-  #+findex: org-insert-heading
+  #+findex: org-insert-item
+  #+findex: org-meta-return
   #+vindex: org-M-RET-may-split-line
   Insert new item at current level.  With a prefix argument, force a
   new heading (see [[*Structure Editing]]).  If this command is used
   in the middle of an item, that item is /split/ in two, and the
   second part becomes the new item[fn:: If you do not want the item to
   be split, customize the variable ~org-M-RET-may-split-line~.].  If
-  this command is executed /before item's body/, the new item is
+  this command is executed /before the item's body/, the new item is
   created /before/ the current one.
 
 - {{{kbd(M-S-RET)}}} ::
@@ -1245,7 +1252,7 @@ to disable them individually.
 
   #+kindex: M-UP
   #+kindex: M-DOWN
-  Move the item including subitems up/down[fn:: See
+  Move the item including sub-items up/down[fn:: See
   ~org-list-use-circular-motion~ for a cyclic behavior.], i.e., swap
   with previous/next item of same indentation.  If the list is
   ordered, renumbering is automatic.
@@ -1261,7 +1268,7 @@ to disable them individually.
 
   #+kindex: M-S-LEFT
   #+kindex: M-S-RIGHT
-  Decrease/increase the indentation of the item, including subitems.
+  Decrease/increase the indentation of the item, including sub-items.
   Initially, the item tree is selected based on current indentation.
   When these commands are executed several times in direct succession,
   the initially selected region is used, even if the new indentation
@@ -1299,23 +1306,22 @@ to disable them individually.
 
   #+kindex: C-c *
   Turn a plain list item into a headline---so that it becomes
-  a subheading at its location.  See [[*Structure Editing]], for
+  a subheading at its location.  See [[*Structure Editing]] for
   a detailed explanation.
 
 - {{{kbd(C-c C-*)}}} ::
 
   #+kindex: C-c C-*
   Turn the whole plain list into a subtree of the current heading.
-  Checkboxes (see [[*Checkboxes]]) become =TODO=, respectively =DONE=,
-  keywords when unchecked, respectively checked.
+  Checkboxes (see [[*Checkboxes]]) become =TODO= or =DONE= keywords when unchecked or checked, respectively.
 
 - {{{kbd(S-LEFT)}}}, {{{kbd(S-RIGHT)}}} ::
 
   #+vindex: org-support-shift-select
   #+kindex: S-LEFT
   #+kindex: S-RIGHT
-  This command also cycles bullet styles when point is in on the
-  bullet or anywhere in an item line, details depending on
+  This command also cycles bullet styles when point is on the bullet
+  or anywhere in an item line, with details depending on
   ~org-support-shift-select~.
 
 - {{{kbd(C-c ^)}}} ::
@@ -1333,7 +1339,7 @@ to disable them individually.
 #+cindex: visibility cycling, drawers
 
 Sometimes you want to keep information associated with an entry, but
-you normally do not want to see it.  For this, Org mode has /drawers/.
+you do not normally want to see it.  For this, Org mode has /drawers/.
 They can contain anything but a headline and another drawer.  Drawers
 look like this:
 
@@ -1361,14 +1367,14 @@ Completion over drawer keywords is also possible using
 {{{kbd(M-TAB)}}}[fn:6].
 
 Visibility cycling (see [[*Visibility Cycling]]) on the headline hides and
-shows the entry, but keep the drawer collapsed to a single line.  In
+shows the entry, but keeps the drawer collapsed to a single line.  In
 order to look inside the drawer, you need to move point to the drawer
 line and press {{{kbd(TAB)}}} there.
 
 You can also arrange for state change notes (see [[Tracking TODO state
 changes]]) and clock times (see [[*Clocking Work Time]]) to be stored in
-a =LOGBOOK= drawer.  If you want to store a quick note there, in
-a similar way to state changes, use
+a =LOGBOOK= drawer.  If you want to store a quick note there,
+similarly to state changes, use
 
 - {{{kbd(C-c C-z)}}} ::
 
@@ -1382,7 +1388,7 @@ a similar way to state changes, use
 #+vindex: org-hide-block-startup
 #+cindex: blocks, folding
 
-Org mode uses =#+BEGIN= ... =#+END= blocks for various purposes from
+Org mode uses =#+BEGIN= ... =#+END= blocks for various purposes, from
 including source code examples (see [[*Literal Examples]]) to capturing
 time logging information (see [[*Clocking Work Time]]).  These blocks can
 be folded and unfolded by pressing {{{kbd(TAB)}}} in the =#+BEGIN=
@@ -1432,7 +1438,7 @@ header lines.  A table might look like this:
 #+end_example
 
 A table is re-aligned automatically each time you press
-{{{kbd(TAB)}}}, {{{kbd(RET)}}} or {{{kbd(C-c C-c)}}} inside the table.
+{{{kbd(TAB)}}}, {{{kbd(RET)}}}, or {{{kbd(C-c C-c)}}} inside the table.
 {{{kbd(TAB)}}} also moves to the next field---{{{kbd(RET)}}} to the
 next row---and creates new table rows at the end of the table or
 before horizontal lines.  The indentation of the table is set by the
@@ -1452,7 +1458,7 @@ fields.  Even faster would be to type =|Name|Phone|Age= followed by
 
 When typing text into a field, Org treats {{{kbd(DEL)}}},
 {{{kbd(Backspace)}}}, and all character keys in a special way, so that
-inserting and deleting avoids shifting other fields.  Also, when
+inserting and deleting avoid shifting other fields.  Also, when
 typing /immediately/ after point was moved into a new field with
 {{{kbd(TAB)}}}, {{{kbd(S-TAB)}}} or {{{kbd(RET)}}}, the field is
 automatically made blank.  If this behavior is too unpredictable for
@@ -1523,14 +1529,14 @@ you, configure the option ~org-table-auto-blank-field~.
 
   #+kindex: M-a
   #+findex: org-table-beginning-of-field
-  Move to beginning of the current table field, or on to the previous
+  Move to beginning of the current table field, or onto the previous
   field.
 
 - {{{kbd(M-e)}}} (~org-table-end-of-field~) ::
 
   #+kindex: M-e
   #+findex: org-table-end-of-field
-  Move to end of the current table field, or on to the next field.
+  Move to end of the current table field, or onto the next field.
 
 *** Column and row editing
 :PROPERTIES:
@@ -1559,7 +1565,7 @@ you, configure the option ~org-table-auto-blank-field~.
 
   #+kindex: M-S-RIGHT
   #+findex: org-table-insert-column
-  Insert a new column at point position.  Move the recent column and
+  Insert a new column at point position.  Move the current column and
   all cells to the right of this column to the right.
 
 - {{{kbd(M-UP)}}} (~org-table-move-row-up~) ::
@@ -1704,12 +1710,12 @@ you, configure the option ~org-table-auto-blank-field~.
   #+kindex: S-RET
   #+findex: org-table-copy-down
   #+vindex: org-table-copy-increment
-  When current field is empty, copy from first non-empty field above.
-  When not empty, copy current field down to next row and move point
+  When the current field is empty, copy from the first non-empty field above.
+  When it is not empty, copy the current field down to the next row and move point
   along with it.
 
   Depending on the variable ~org-table-copy-increment~, integer and
-  time stamp field values, and fields prefixed or suffixed with
+  time stamp field values, as well as fields prefixed or suffixed with
   a whole number, can be incremented during copy.  Also, a ~0~ prefix
   argument temporarily disables the increment.
 
@@ -1737,11 +1743,11 @@ you, configure the option ~org-table-auto-blank-field~.
 - {{{kbd(M-x org-table-import)}}} ::
 
   #+findex: org-table-import
-  Import a file as a table.  The table should be TAB or whitespace
-  separated.  Use, for example, to import a spreadsheet table or data
-  from a database, because these programs generally can write
-  TAB-separated text files.  This command works by inserting the file
-  into the buffer and then converting the region to a table.  Any
+  Import a file as a table.  The table should be TAB- or
+  whitespace-separated.  Use, for example, to import a spreadsheet
+  table or data from a database, because these programs generally can
+  write TAB-separated text files.  This command works by inserting the
+  file into the buffer and then converting the region to a table.  Any
   prefix argument is passed on to the converter, which uses it to
   determine the separator.
 
@@ -1793,7 +1799,7 @@ The alignment of a column is determined automatically from the
 fraction of number-like versus non-number fields in the column.
 
 #+vindex: org-table-automatic-realign
-Editing a field may modify alignment of the table.  Moving
+Editing a field may modify the alignment of the table.  Moving
 a contiguous row or column---i.e., using {{{kbd(TAB)}}} or
 {{{kbd(RET)}}}---automatically re-aligns it.  If you want to disable
 this behavior, set ~org-table-automatic-realign~ to ~nil~.  In any
@@ -1860,7 +1866,7 @@ with the following tools:
   Expand all columns.
 
 To see the full text of a shrunk field, hold the mouse over it:
-a tool-tip window then shows the full contents of the field.
+a tooltip window then shows the full contents of the field.
 Alternatively, {{{kbd(C-h .)}}} (~display-local-help~) reveals them,
 too.  For convenience, any change near the shrunk part of a column
 expands it.
@@ -1887,8 +1893,7 @@ automatically upon exporting the document.
 #+cindex: grouping columns in tables
 
 When Org exports tables, it does so by default without vertical lines
-because that is visually more satisfying in general.  Occasionally
-however, vertical lines can be useful to structure a table into groups
+because that is visually more satisfying in general.  Occasionally, however, vertical lines can be useful to structure a table into groups
 of columns, much like horizontal lines can do for groups of rows.  In
 order to specify column groups, you can use a special row where the
 first field contains only =/=.  The further fields can either contain
@@ -1998,12 +2003,12 @@ The row specification only counts data lines and ignores horizontal
 separator lines, or "hlines".  Like with columns, you can use absolute
 row numbers =@1=, =@2=, ..., =@N=, and row numbers relative to the
 current row like =@+3= or =@-1=.  =@<= and =@>= are immutable
-references the first and last row in the table, respectively.  You may
-also specify the row relative to one of the hlines: =@I= refers to the
-first hline, =@II= to the second, etc.  =@-I= refers to the first such
-line above the current line, =@+I= to the first such line below the
-current line.  You can also write =@III+2= which is the second data
-line after the third hline in the table.
+references to the first and last row in the table, respectively.  You
+may also specify the row relative to one of the hlines: =@I= refers to
+the first hline, =@II= to the second, etc.  =@-I= refers to the first
+such line above the current line, =@+I= to the first such line below
+the current line.  You can also write =@III+2= which is the second
+data line after the third hline in the table.
 
 =@0= and =$0= refer to the current row and column, respectively, i.e.,
 to the row/column for the field being computed.  Also, if you omit
@@ -2092,7 +2097,7 @@ and ~org-table-current-column~.  Examples:
 For the second and third examples, table {{{var(FOO)}}} must have at
 least as many rows or columns as the current table.  Note that this is
 inefficient[fn:: The computation time scales as O(N^2) because table
-{{{var(FOO)}}} is parsed for each field to be copied.] for large
+{{{var(FOO)}}} is parsed for each field to be copied.] for a large
 number of rows.
 
 **** Named references
@@ -2154,7 +2159,7 @@ valid in the referenced table.
 When {{{var(NAME)}}} has the format =@ROW$COLUMN=, it is substituted
 with the name or ID found in this field of the current table.  For
 example =remote($1, @@>$2)= \Rightarrow =remote(year_2013, @@>$1)=.  The format
-=B3= is not supported because it can not be distinguished from a plain
+=B3= is not supported because it cannot be distinguished from a plain
 table name or ID.
 
 *** Formula syntax for Calc
@@ -2238,23 +2243,21 @@ variable ~org-calc-default-modes~.
 
   Literal, for Lisp formulas only.  See the next section.
 
-Unless you use large integer numbers or high-precision calculation and
-display for floating point numbers you may alternatively provide
-a ~printf~ format specifier to reformat the Calc result after it has
-been passed back to Org instead of letting Calc already do the
-formatting[fn:9].  A few examples:
+You may also provide a ~format~ specifier (similar to ~printf~)[fn:9]
+to reformat the Calc result after it has been passed back to Org
+instead of letting Calc handle the formatting.  A few examples:
 
-| =$1+$2=            | Sum of first and second field                    |
-| =$1+$2;%.2f=       | Same, format result to two decimals              |
-| =exp($2)+exp($1)=  | Math functions can be used                       |
-| =$0;%.1f=          | Reformat current cell to 1 decimal               |
-| =($3-32)*5/9=      | Degrees F \to C conversion                         |
-| =$c/$1/$cm=        | Hz \to cm conversion, using =constants.el=         |
-| =tan($1);Dp3s1=    | Compute in degrees, precision 3, display SCI 1   |
-| =sin($1);Dp3%.1e=  | Same, but use ~printf~ specifier for display     |
-| =vmean($2..$7)=    | Compute column range mean, using vector function |
-| =vmean($2..$7);EN= | Same, but treat empty fields as 0                |
-| =taylor($3,x=7,2)= | Taylor series of $3, at x=7, second degree       |
+| =$1+$2=            | Sum of first and second field                       |
+| =$1+$2;%.2f=       | Same, format result to two decimals                 |
+| =exp($2)+exp($1)=  | Math functions can be used                          |
+| =$0;%.1f=          | Reformat current cell to 1 decimal                  |
+| =($3-32)*5/9=      | Fahrenheit to Celsius conversion                    |
+| =$c/$1/$cm=        | Herz to centimeter conversion, using =constants.el= |
+| =tan($1);Dp3s1=    | Compute in degrees, precision 3, display SCI 1      |
+| =sin($1);Dp3%.1e=  | Same, but use ~format~ specifier for display        |
+| =vmean($2..$7)=    | Compute column range mean, using vector function    |
+| =vmean($2..$7);EN= | Same, but treat empty fields as 0                   |
+| =taylor($3,x=7,2)= | Taylor series of $3, at x=7, second degree          |
 
 Calc also contains a complete set of logical operations (see [[info:calc#Logical Operations][Logical
 Operations]]).  For example
@@ -2267,7 +2270,7 @@ Operations]]).  For example
 - =if("$1" =​= "nan" || "$2" =​= "nan", string(""), $1 + $2); E f-1= ::
 
   Sum of the first two columns.  When at least one of the input fields
-  is empty the Org table result field is set to empty.  =E= is
+  is empty, the Org table result field is set to empty.  =E= is
   required to not convert empty fields to 0.  =f-1= is an optional
   Calc format string similar to =%.1f= but leaves empty results empty.
 
@@ -2275,7 +2278,7 @@ Operations]]).  For example
 
   Mean value of a range unless there is any empty field.  Every field
   in the range that is empty is replaced by =nan= which lets =vmean=
-  result in =nan=.  Then =typeof == 12= detects the =nan= from ~vmean~
+  return =nan=.  Then =typeof == 12= detects the =nan= from ~vmean~
   and the Org table result field is set to empty.  Use this when the
   sample set is expected to never have missing values.
 
@@ -2289,7 +2292,7 @@ Operations]]).  For example
 
 - =vmean($1..$7); EN= ::
 
-  To complete the example before: Mean value of a range with empty
+  To complete the previous example: Mean value of a range with empty
   fields counting as samples with value 0.  Use this only when
   incomplete sample sets should be padded with 0 to the full size.
 
@@ -2311,8 +2314,8 @@ A formula is evaluated as a Lisp form when it starts with a
 single-quote followed by an opening parenthesis.  Cell table
 references are interpolated into the Lisp form before execution.  The
 evaluation should return either a string or a number.  Evaluation
-modes and a ~printf~ format used to render the returned values can be
-specified after a semicolon.
+modes and a ~format~ string (similar to ~printf~)[fn:9] used to render
+the returned values can be specified after a semicolon.
 
 By default, references are interpolated as literal Lisp strings: the
 field content is replaced in the Lisp form stripped of leading and
@@ -2351,7 +2354,7 @@ example:
 
 #+texinfo: @noindent
 extracts the part of the string in column 1 between the character
-positions specified in the integers in column 2 and 3 and it is easier
+positions specified in the integers in column 2 and 3, and it is easier
 to read than the equivalent:
 
 : '(substring $1 (string-to-number $2) (string-to-number $3))
@@ -2362,7 +2365,7 @@ interpret everything past =;= as format specifier:
 : '(concat $1 ";")
 
 #+texinfo: @noindent
-You can put an extra tailing =;= to indicate that all the earlier
+You can put an extra trailing =;= to indicate that all the earlier
 instances of =;= belong to the formula itself:
 
 : '(concat $1 ";");
@@ -2479,7 +2482,7 @@ same formula is used in all fields of that column, with the following
 very convenient exceptions: (i) If the table contains horizontal
 separator hlines with rows above and below, everything before the
 first such hline is considered part of the table /header/ and is not
-modified by column formulas.  Therefore a header is mandatory when you
+modified by column formulas.  Therefore, a header is mandatory when you
 use column formulas and want to add hlines to group rows, like for
 example to separate a total row at the bottom from the summand rows
 above.  (ii) Fields that already get a value from a field/range
@@ -2494,7 +2497,7 @@ current column, evaluated and the current field replaced with the
 result.  If the field contains only ===, the previously stored formula
 for this column is used.  For each column, Org only remembers the most
 recently used formula.  In the =TBLFM= keyword, column formulas look
-like =$4=$1+$2=.  The left-hand side of a column formula can not be
+like =$4=$1+$2=.  The left-hand side of a column formula cannot be
 the name of column, it must be the numeric column reference or =$>=.
 
 Instead of typing an equation into the field, you may also use the
@@ -2548,7 +2551,7 @@ Org has three predefined Emacs Lisp functions for lookups in tables.
   #+findex: org-lookup-all
   Similar to ~org-lookup-first~, but searches for /all/ elements for
   which {{{var(PREDICATE)}}} is non-~nil~, and returns /all/
-  corresponding values.  This function can not be used by itself in
+  corresponding values.  This function cannot be used by itself in
   a formula, because it returns a list of values.  However, powerful
   lookups can be built when this function is combined with other Emacs
   Lisp functions.
@@ -2782,7 +2785,7 @@ becomes the string =#ERROR=.  If you want to see what is going on
 during variable substitution and calculation in order to find a bug,
 turn on formula debugging in the Tbl menu and repeat the calculation,
 for example by pressing {{{kbd(C-u C-u C-c = RET)}}} in a field.
-Detailed information are displayed.
+Detailed information is displayed.
 
 *** Updating the table
 :PROPERTIES:
@@ -3065,16 +3068,16 @@ For more information and examples see the [[https://orgmode.org/worg/org-tutoria
 - =min= ::
 
   Provides a minimum axis value that may be used by a plot type.
-  Implicitly assumes the =y= axis is being referred to.  Can
-  explicitly provide a value for a either the =x= or =y= axis with
-  =xmin= and =ymin=.
+  Implicitly assumes the =y= axis is being referred to.  You can
+  explicitly provide a value for the =x= or =y= axis with =xmin= and
+  =ymin=.
 
 - =max= ::
 
   Provides a maximum axis value that may be used by a plot type.
-  Implicitly assumes the =y= axis is being referred to.  Can
-  explicitly provide a value for a either the =x= or =y= axis with
-  =xmax= and =ymax=.
+  Implicitly assumes the =y= axis is being referred to.  You can
+  explicitly provide a value for the =x= or =y= axis with =xmax= and
+  =ymax=.
 
 - =ticks= ::
 
@@ -3129,7 +3132,7 @@ Draw an ASCII bar in a table.
 {{{var(VALUE)}}} is the value to plot.
 
 {{{var(MIN)}}} is the value displayed as an empty bar.  {{{var(MAX)}}}
-is the value filling all the {{{var(WIDTH)}}}.  Sources values outside
+is the value filling all the {{{var(WIDTH)}}}.  Source values outside
 this range are displayed as =too small= or =too large=.
 
 {{{var(WIDTH)}}} is the number of characters of the bar plot.  It
@@ -3155,7 +3158,7 @@ links to other files, Usenet articles, emails, and much more.
 #+cindex: angle bracket links
 #+cindex: plain links
 Org recognizes plain URIs, possibly wrapped within angle
-brackets[fn:10], and activate them as clickable links.
+brackets[fn:10], and activates them as clickable links.
 
 #+cindex: bracket links
 The general link format, however, looks like this:
@@ -3171,8 +3174,7 @@ or alternatively
 #+cindex: backslashes, in links
 Some =\=, =[= and =]= characters in the {{{var(LINK)}}} part need to
 be "escaped", i.e., preceded by another =\= character.  More
-specifically, the following characters, and only them, must be
-escaped:
+specifically, only the following characters must be escaped:
 
 1. all =[= and =]= characters,
 2. every =\= character preceding either =]= or =[=,
@@ -3206,7 +3208,7 @@ incomplete and the internals are again displayed as plain text.
 Inserting the missing bracket hides the link internals again.  To show
 the internal structure of all links, use the menu: Org \rarr
 Hyperlinks \rarr Literal links, customize ~org-link-descriptive~, or use
-=literallinks= [[*Summary of In-Buffer Settings][startup option]].
+the =literallinks= [[*Summary of In-Buffer Settings][startup option]].
 
 ** Internal Links
 :PROPERTIES:
@@ -3273,7 +3275,7 @@ The last sentence will appear as =Here we refer to item 2= when
 exported.
 
 In non-Org files, the search looks for the words in the link text.  In
-the above example the search would be for =target=.
+the above example, the search would be for =target=.
 
 Following a link pushes a mark onto Org's own mark ring.  You can
 return to the previous position with {{{kbd(C-c &)}}}.  Using this
@@ -3330,8 +3332,8 @@ Here is the full set of built-in link types:
 
   File links.  File name may be remote, absolute, or relative.
 
-  As a special case, "file" prefix may be omitted if the file name
-  is complete, e.g., it starts with =./=, or =/=.
+  As a special case, the "file" prefix may be omitted if the file name
+  is complete, e.g., it starts with =./= or =/=.
 
 - =attachment= ::
 
@@ -3393,6 +3395,15 @@ Here is the full set of built-in link types:
 
   Execute a shell command upon activation.
 
+- =shortdoc= ::
+
+  Link to short documentation summary for an Emacs Lisp function group.
+  [fn::You can run =M-x shortdoc-display-group= to list all known
+  documentation groups.]
+
+  For more information, see [[info:emacs#Name Help][Name Help]]
+  and [[info:elisp#Documentation Groups][Documentation Groups]].
+
 
 For =file:= and =id:= links, you can additionally specify a line
 number, or a text search string, separated by =::=.  In Org files, you
@@ -3434,7 +3445,9 @@ options:
 | irc        | =irc:/irc.com/#emacs/bob=                                          |
 | help       | =help:org-store-link=                                              |
 | info       | =info:org#External links=                                          |
-| shell      | =shell:ls *.org=                                                   |
+| shortdoc   | =shortdoc:text-properties=                                         |
+|            | =shortdoc:text-properties::#get-pos-property=                      |
+| shell      | =shell:ls *.org= (synchronous), =shell:inkscape&= (asynchronous)   |
 | elisp      | =elisp:(find-file "Elisp.org")= (Elisp form to evaluate)           |
 |            | =elisp:org-agenda= (interactive Elisp command)                     |
 
@@ -3488,7 +3501,7 @@ it into an Org file, and to follow the link.
 #+findex: org-store-link
 #+cindex: storing links
 The main function is ~org-store-link~, called with {{{kbd(M-x
-org-store-link)}}}.  Because of its importance, we suggest to bind it
+org-store-link)}}}.  Because of its importance, we suggest binding it
 to a widely available key (see [[*Activation]]).  It stores a link to the
 current location.  The link is stored for later insertion into an Org
 buffer---see below.  The kind of link that is created depends on the
@@ -3498,7 +3511,7 @@ current buffer:
 
   For Org files, if there is a =<<target>>= at point, the link points
   to the target.  If there is a named block (using =#+name:=) at
-  point, the link points to that name.  Otherwise it points to the
+  point, the link points to that name.  Otherwise, it points to the
   current headline, which is also the description.
 
   #+vindex: org-id-link-to-org-use-id
@@ -3507,7 +3520,7 @@ current buffer:
   If the headline has a =CUSTOM_ID= property, store a link to this
   custom ID.  In addition or alternatively, depending on the value of
   ~org-id-link-to-org-use-id~, create and/or use a globally unique
-  =ID= property for the link[fn:: The Org Id library must first be
+  =ID= property for the link[fn:: The ~org-id~ library must first be
   loaded, either through ~org-customize~, by enabling ~id~ in
   ~org-modules~, or by adding =(require 'org-id)= in your Emacs init
   file.].  So using this command in Org buffers potentially creates
@@ -3566,7 +3579,7 @@ current buffer:
   #+vindex: org-irc-links-to-logs
   For IRC links, if the variable ~org-irc-link-to-logs~ is non-~nil~,
   create a =file= style link to the relevant point in the logs for the
-  current conversation.  Otherwise store an =irc= style link to the
+  current conversation.  Otherwise, store an =irc= style link to the
   user/channel/server under the point.
 
 - /Other files/ ::
@@ -3633,9 +3646,9 @@ generally, act on links.
   argument, insert a link to a file.  You may use file name completion
   to select the name of the file.  The path to the file is inserted
   relative to the directory of the current Org file, if the linked
-  file is in the current directory or in a sub-directory of it, or if
+  file is in the current directory or in a subdirectory of it, or if
   the path is written relative to the current directory using =../=.
-  Otherwise an absolute path is used, if possible with =~/= for your
+  Otherwise, an absolute path is used, if possible with =~/= for your
   home directory.  You can force an absolute path with two
   {{{kbd(C-u)}}} prefixes.
 
@@ -3651,14 +3664,14 @@ generally, act on links.
   #+findex: org-open-at-point
   #+vindex: org-file-apps
   Open link at point.  This launches a web browser for URL (using
-  ~browse-url-at-point~), run VM/MH-E/Wanderlust/Rmail/Gnus/BBDB for
-  the corresponding links, and execute the command in a shell link.
+  ~browse-url-at-point~), runs VM/MH-E/Wanderlust/Rmail/Gnus/BBDB for
+  the corresponding links, and executes the command in a shell link.
   When point is on an internal link, this command runs the
   corresponding search.  When point is on the tags part of a headline,
   it creates the corresponding tags view (see [[*Matching tags and
   properties]]).  If point is on a timestamp, it compiles the agenda for
   that date.  Furthermore, it visits text and remote files in =file=
-  links with Emacs and select a suitable application for local
+  links with Emacs and selects a suitable application for local
   non-text files.  Classification of files is based on file extension
   only.  See option ~org-file-apps~.  If you want to override the
   default application and visit the file with Emacs, use
@@ -3666,8 +3679,8 @@ generally, act on links.
   a {{{kbd(C-u C-u)}}} prefix.
 
   #+vindex: org-link-frame-setup
-  If point is on a headline, but not on a link, offer all links in the
-  headline and entry text.  If you want to setup the frame
+  If point is on a headline, but not on a link, Org offers all links
+  in the headline and entry text.  If you want to set up the frame
   configuration for following links, customize ~org-link-frame-setup~.
 
 - {{{kbd(RET)}}} ::
@@ -3681,7 +3694,7 @@ generally, act on links.
 
   #+kindex: mouse-2
   #+kindex: mouse-1
-  On links, {{{kbd(mouse-1)}}} and {{{kbd(mouse-2)}}} opens the link
+  On links, {{{kbd(mouse-1)}}} and {{{kbd(mouse-2)}}} open the link
   just as {{{kbd(C-c C-o)}}} does.
 
 - {{{kbd(mouse-3)}}} ::
@@ -3718,7 +3731,7 @@ generally, act on links.
   #+kindex: C-c C-x C-n
   #+findex: org-next-link
   #+cindex: links, finding next/previous
-  Move forward/backward to the next link in the buffer.  At the limit
+  Move forward/backward to the next/previous link in the buffer.  At the limit
   of the buffer, the search fails once, and then wraps around.  The
   key bindings for this are really too long; you might want to bind
   this also to {{{kbd(M-n)}}} and {{{kbd(M-p)}}}.
@@ -3750,7 +3763,7 @@ You might want to bind them to globally available keys.  See
 #+cindex: link abbreviations
 #+cindex: abbreviation, links
 
-Long URL can be cumbersome to type, and often many similar links are
+Long URLs can be cumbersome to type, and often many similar links are
 needed in a document.  For this you can use link abbreviations.  An
 abbreviated link looks like this
 
@@ -3776,10 +3789,10 @@ replacement text.  Here is an example:
 If the replacement text contains the string =%s=, it is replaced with
 the tag.  Using =%h= instead of =%s= percent-encodes the tag (see the
 example above, where we need to encode the URL parameter).  Using
-=%(my-function)= passes the tag to a custom Lisp function, and replace
+=%(my-function)= passes the tag to a custom Lisp function, and replaces
 it by the resulting string.
 
-If the replacement text do not contain any specifier, it is simply
+If the replacement text does not contain any specifier, it is simply
 appended to the string in order to create the link.
 
 Instead of a string, you may also specify a Lisp function to create
@@ -3860,7 +3873,7 @@ link, together with explanations for each:
   Search for a link target =<<My Target>>=, or do a text search for
   =my target=, similar to the search in internal links, see [[*Internal
   Links]].  In HTML export (see [[*HTML Export]]), such a file link becomes
-  a HTML reference to the corresponding named anchor in the linked
+  an HTML reference to the corresponding named anchor in the linked
   file.
 
 - =*My Target= ::
@@ -3968,7 +3981,7 @@ The most important commands to work with TODO entries are:
   Select the following/preceding TODO state, similar to cycling.
   Useful mostly if more than two TODO states are possible (see
   [[*Extended Use of TODO Keywords]]).  See also [[*Packages that conflict
-  with Org mode]], for a discussion of the interaction with
+  with Org mode]] for a discussion of the interaction with
   shift-selection.  See also the variable
   ~org-treat-S-cursor-todo-selection-as-state-change~.
 
@@ -3979,7 +3992,7 @@ The most important commands to work with TODO entries are:
   #+vindex: org-todo-keywords
   #+findex: org-show-todo-tree
   View TODO items in a /sparse tree/ (see [[*Sparse Trees]]).  Folds the
-  entire buffer, but shows all TODO items---with not-DONE state---and
+  entire buffer, but shows all TODO items---with a not-DONE state---and
   the headings hierarchy above them.  With a prefix argument, or by
   using {{{kbd(C-c / T)}}}, search for a specific TODO.  You are
   prompted for the keyword, and you can also give a list of keywords
@@ -3996,7 +4009,7 @@ The most important commands to work with TODO entries are:
   buffer.  The new buffer is in Org Agenda mode, which provides
   commands to examine and manipulate the TODO entries from the new
   buffer (see [[*Commands in the Agenda Buffer]]).  See [[*The global TODO
-  list]], for more information.
+  list]] for more information.
 
 - {{{kbd(S-M-RET)}}} (~org-insert-todo-heading~) ::
 
@@ -4058,8 +4071,8 @@ and {{{kbd(S-LEFT)}}} to go forward and backward through the states.
 If you define many keywords, you can use in-buffer completion (see
 [[*Completion]]) or a special one-key selection scheme (see [[*Fast
 access to TODO states]]) to insert these words into the buffer.
-Changing a TODO state can be logged with a timestamp, see [[*Tracking
-TODO state changes]], for more information.
+Changing a TODO state can be logged with a timestamp; see [[*Tracking
+TODO state changes]] for more information.
 
 *** TODO keywords as types
 :PROPERTIES:
@@ -4086,9 +4099,9 @@ Using TODO types, it would be set up like this:
 #+end_src
 
 In this case, different keywords do not indicate states, but rather
-different types.  So the normal work flow would be to assign a task to
+different types.  So the normal workflow would be to assign a task to
 a person, and later to mark it DONE.  Org mode supports this style by
-adapting the workings of the command {{{kbd(C-c C-t)}}}[fn:: This is
+adapting the working of the command {{{kbd(C-c C-t)}}}[fn:: This is
 also true for the {{{kbd(t)}}} command in the agenda buffer.].  When
 used several times in succession, it still cycles through all names,
 in order to first select the right type for a task.  But when you
@@ -4126,7 +4139,7 @@ The keywords should all be different, this helps Org mode keep track
 of which subsequence should be used for a given entry.  In this setup,
 {{{kbd(C-c C-t)}}} only operates within a sub-sequence, so it switches
 from =DONE= to (nothing) to =TODO=, and from =FIXED= to (nothing) to
-=REPORT=.  Therefore you need a mechanism to initially select the
+=REPORT=.  Therefore, you need a mechanism to initially select the
 correct sequence.  In addition to typing a keyword or using completion
 (see [[*Completion]]), you may also apply the following commands:
 
@@ -4140,7 +4153,7 @@ correct sequence.  In addition to typing a keyword or using completion
   above example, {{{kbd(C-u C-u C-c C-t)}}} or {{{kbd(C-S-RIGHT)}}}
   would jump from =TODO= or =DONE= to =REPORT=, and any of the words
   in the second row to =CANCELED=.  Note that the {{{kbd(C-S-)}}} key
-  binding conflict with shift-selection (see [[*Packages that conflict
+  binding conflicts with shift-selection (see [[*Packages that conflict
   with Org mode]]).
 
 - {{{kbd(S-RIGHT)}}}, {{{kbd(S-LEFT)}}} ::
@@ -4348,7 +4361,7 @@ command ~org-todo~ with a prefix argument.
 - {{{kbd(C-u C-c C-t)}}} (~org-todo~) ::
 
   #+kindex: C-u C-c C-t
-  Prompt for a note and record a the time of the TODO state change.
+  Prompt for a note and record the time of the TODO state change.
   The note is inserted as a list item below the headline, but can also
   be placed into a drawer, see [[*Tracking TODO state changes]].
 
@@ -4379,7 +4392,7 @@ of the DONE states, a line =CLOSED: [timestamp]= is inserted just
 after the headline.  If you turn the entry back into a TODO item
 through further state cycling, that line is removed again.  If you
 turn the entry back to a non-TODO state (by pressing {{{kbd(C-c C-t
-SPC)}}} for example), that line is also removed, unless you set
+SPC)}}}, for example), that line is also removed, unless you set
 ~org-closed-keep-when-no-todo~ to non-~nil~.  If you want to record a
 note along with the timestamp, use[fn:: The corresponding in-buffer
 setting is: =#+STARTUP: lognotedone=.]
@@ -4404,9 +4417,9 @@ entry with a =Closing Note= heading.
 You might want to automatically keep track of when a state change
 occurred and maybe take a note about this change.  You can either
 record just a timestamp, or a time-stamped note.  These records are
-inserted after the headline as an itemized list, newest first[fn:: See
-the variable ~org-log-states-order-reversed~.].  When taking a lot of
-notes, you might want to get the notes out of the way into a drawer
+inserted after the headline as an itemized list, the newest first[fn::
+See the variable ~org-log-states-order-reversed~.].  When taking a lot
+of notes, you might want to get the notes out of the way into a drawer
 (see [[*Drawers]]).  Customize the variable ~org-log-into-drawer~ to
 get this behavior---the recommended drawer for this is called
 =LOGBOOK=[fn:: Note that the =LOGBOOK= drawer is unfolded when
@@ -4435,9 +4448,9 @@ and that a note is recorded when switching to =WAIT= or
 entering the state, a timestamp should be recorded when /leaving/ the
 =WAIT= state, if and only if the /target/ state does not configure
 logging for entering it.  So it has no effect when switching from
-=WAIT= to =DONE=, because =DONE= is configured to record a timestamp
-only.  But when switching from =WAIT= back to =TODO=, the =/!= in the
-=WAIT= setting now triggers a timestamp even though =TODO= has no
+=WAIT= to =DONE=, because =DONE= is configured to record only a
+timestamp.  But when switching from =WAIT= back to =TODO=, the =/!= in
+the =WAIT= setting now triggers a timestamp even though =TODO= has no
 logging configured.
 
 You can use the exact same syntax for setting logging preferences local
@@ -4499,7 +4512,7 @@ A habit has the following properties:
 
 4. The TODO may also have minimum and maximum ranges specified by
    using the syntax =.+2d/3d=, which says that you want to do the task
-   at least every three days, but at most every two days.
+   at least every three days, but, at most, every two days.
 
 5. State logging for the DONE state is enabled (see [[*Tracking TODO
    state changes]]), in order for historical data to be represented in
@@ -4528,7 +4541,7 @@ actual habit with some history:
    - State "DONE"       from "TODO"       [2009-09-12 Sat]
 #+end_example
 
-What this habit says is: I want to shave at most every 2 days---given
+What this habit says is: I want to shave, at most, every 2 days---given
 by the =SCHEDULED= date and repeat interval---and at least every
 4 days.  If today is the 15th, then the habit first appears in the
 agenda (see [[*Agenda Views]]) on Oct 17, after the minimum of 2 days has
@@ -4601,7 +4614,7 @@ right after the TODO keyword, like this:
 #+vindex: org-priority-faces
 By default, Org mode supports three priorities: =A=, =B=, and =C=.
 =A= is the highest priority.  An entry without a cookie is treated as
-equivalent if it had priority =B=.  Priorities make a difference only
+if it had priority =B=.  Priorities make a difference only
 for sorting in the agenda (see [[*Weekly/daily agenda]]).  Outside the
 agenda, they have no inherent meaning to Org mode.  The cookies are
 displayed with the face defined by the variable ~org-priority-faces~,
@@ -4613,9 +4626,9 @@ You can also use numeric values for priorities, such as
 
 When using numeric priorities, you need to set ~org-priority-highest~,
 ~org-priority-lowest~ and ~org-priority-default~ to integers, which
-must all be strictly inferior to 65.
+must all be a non-negative integer between 0 and 64, inclusive.
 
-Priorities can be attached to any outline node; they do not need to be
+Priorities can be attached to any heading; they do not need to be
 TODO items.
 
 #+attr_texinfo: :sep ;
@@ -4640,7 +4653,7 @@ TODO items.
   Increase/decrease the priority of the current headline[fn:: See also
   the option ~org-priority-start-cycle-with-default~.].  Note that
   these keys are also used to modify timestamps (see [[*Creating
-  Timestamps]]).  See also [[*Packages that conflict with Org mode]],
+  Timestamps]]).  See also [[*Packages that conflict with Org mode]]
   for a discussion of the interaction with shift-selection.
 
 #+vindex: org-priority-highest
@@ -4648,8 +4661,10 @@ TODO items.
 #+vindex: org-priority-default
 You can change the range of allowed priorities by setting the
 variables ~org-priority-highest~, ~org-priority-lowest~, and
-~org-priority-default~.  For an individual buffer, you may set these
-values (highest, lowest, default) like this (please make sure that the
+~org-priority-default~.  Valid priority values are single uppercase
+Latin alphabetical characters A-Z, and non-negative integers in between 0
+and 64, inclusive.  For an individual buffer, you may set these values
+(highest, lowest, default) like this (please make sure that the
 highest priority is earlier in the alphabet than the lowest priority):
 
 #+cindex: @samp{PRIORITIES}, keyword
@@ -4689,7 +4704,7 @@ updated each time the TODO status of a child changes, or when pressing
 
 #+cindex: @samp{COOKIE_DATA}, property
 If a heading has both checkboxes and TODO children below it, the
-meaning of the statistics cookie become ambiguous.  Set the property
+meaning of the statistics cookie becomes ambiguous.  Set the property
 =COOKIE_DATA= to either =checkbox= or =todo= to resolve this issue.
 
 #+vindex: org-hierarchical-todo-statistics
@@ -4719,7 +4734,7 @@ all children are done, you can use the following setup:
 #+end_src
 
 Another possibility is the use of checkboxes to identify (a hierarchy
-of) a large number of subtasks (see [[*Checkboxes]]).
+of) subtasks (see [[*Checkboxes]]).
 
 ** Checkboxes
 :PROPERTIES:
@@ -4731,7 +4746,7 @@ of) a large number of subtasks (see [[*Checkboxes]]).
 Every item in a plain list[fn:16] (see [[*Plain Lists]]) can be made into
 a checkbox by starting it with the string =[ ]=.  This feature is
 similar to TODO items (see [[*TODO Items]]), but is more lightweight.
-Checkboxes are not included into the global TODO list, so they are
+Checkboxes are not included in the global TODO list, so they are
 often great to split a task into a number of simple steps.  Or you can
 use them in a shopping list.
 
@@ -4753,9 +4768,9 @@ Here is an example of a checkbox list.
 #+cindex: @samp{COOKIE_DATA}, property
 #+vindex: org-checkbox-hierarchical-statistics
 The =[2/4]= and =[1/3]= in the first and second line are cookies
-indicating how many checkboxes present in this entry have been checked
+indicating how many of the checkboxes present in this entry have been checked
 off, and the total number of checkboxes present.  This can give you an
-idea on how many checkboxes remain, even without opening a folded
+idea of how many checkboxes remain, even without opening a folded
 entry.  The cookies can be placed into a headline or into (the first
 line of) a plain list item.  Each cookie covers checkboxes of direct
 children structurally below the headline/item on which the cookie
@@ -4774,7 +4789,7 @@ resolve this issue.
 #+cindex: blocking, of checkboxes
 #+cindex: checkbox blocking
 #+cindex: @samp{ORDERED}, property
-If the current outline node has an =ORDERED= property, checkboxes must
+If the current heading has an =ORDERED= property, checkboxes must
 be checked off in sequence, and an error is thrown if you try to check
 off a box while there are unchecked boxes above it.
 
@@ -4902,12 +4917,12 @@ mode has extensive support for tags.
 #+vindex: org-tag-faces
 Every headline can contain a list of tags; they occur at the end of
 the headline.  Tags are normal words containing letters, numbers, =_=,
-and =@=.  Tags must be preceded and followed by a single colon, e.g.,
-=:work:=.  Several tags can be specified, as in =:work:urgent:=.  Tags
-by default are in bold face with the same color as the headline.  You
-may specify special faces for specific tags using the variable
-~org-tag-faces~, in much the same way as you can for TODO keywords
-(see [[*Faces for TODO keywords]]).
+=@=, =#=, and =%=.  Tags must be preceded and followed by a single
+colon, e.g., =:work:=.  Several tags can be specified, as in
+=:work:urgent:=.  Tags by default are in bold face with the same color
+as the headline.  You may specify special faces for specific tags
+using the variable ~org-tag-faces~, in much the same way as you can
+for TODO keywords (see [[*Faces for TODO keywords]]).
 
 ** Tag Inheritance
 :PROPERTIES:
@@ -4991,13 +5006,13 @@ also a special command for inserting tags:
 #+vindex: org-complete-tags-always-offer-all-agenda-tags
 #+vindex: org-tag-alist
 #+cindex: @samp{TAGS}, keyword
-Org supports tag insertion based on a /list of tags/.  By default this
+Org supports tag insertion based on a /list of tags/.  By default, this
 list is constructed dynamically, containing all tags currently used in
 the buffer[fn:: To extend this default list to all tags used in all
 agenda files (see [[*Agenda Views]]), customize the variable
 ~org-complete-tags-always-offer-all-agenda-tags~.].  You may also
 globally specify a hard list of tags with the variable
-~org-tag-alist~.  Finally you can set the default tags for a given
+~org-tag-alist~.  Finally, you can set the default tags for a given
 file using the =TAGS= keyword, like
 
 #+begin_example
@@ -5020,7 +5035,7 @@ by adding a =STARTUP= keyword to that file:
 
 : #+STARTUP: noptag
 
-By default Org mode uses the standard minibuffer completion facilities
+By default, Org mode uses the standard minibuffer completion facilities
 for entering tags.  However, it also implements another, quicker, tag
 selection method called /fast tag selection/.  This allows you to
 select and deselect tags with just a single key press.  For this to
@@ -5175,9 +5190,9 @@ nesting them creates a tag hierarchy.
 One use-case is to create a taxonomy of terms (tags) that can be used
 to classify nodes in a document or set of documents.
 
-When you search for a group tag, it return matches for all members in
+When you search for a group tag, it returns matches for all members in
 the group and its subgroups.  In an agenda view, filtering by a group
-tag displays or hide headlines tagged with at least one of the members
+tag displays or hides headlines tagged with at least one of the members
 of the group or any of its subgroups.  This makes tag searches and
 filters even more flexible.
 
@@ -5187,7 +5202,7 @@ mandatory so that Org can parse this line correctly:
 
 : #+TAGS: [ GTD : Control Persp ]
 
-In this example, =GTD= is the group tag and it is related to two other
+In this example, =GTD= is the group tag, and it is related to two other
 tags: =Control=, =Persp=.  Defining =Control= and =Persp= as group
 tags creates a hierarchy of tags:
 
@@ -5296,12 +5311,12 @@ related information into special lists.
   only TODO items.
 
 These commands all prompt for a match string which allows basic
-Boolean logic like =+boss+urgent-project1=, to find entries with tags
-=boss= and =urgent=, but not =project1=, or =Kathy|Sally= to find
-entries which are tagged, like =Kathy= or =Sally=.  The full syntax of
-the search string is rich and allows also matching against TODO
-keywords, entry levels and properties.  For a complete description
-with many examples, see [[*Matching tags and properties]].
+Boolean logic, such as =+boss+urgent-project1= to find entries with
+tags =boss= and =urgent=, but not =project1= or =Kathy|Sally= to find
+entries tagged with either =Kathy= or =Sally=.  The full syntax of the
+search string is rich and allows also matching against TODO keywords,
+entry levels and properties.  For a complete description with many
+examples, see [[*Matching tags and properties]].
 
 * Properties and Columns
 :PROPERTIES:
@@ -5310,7 +5325,7 @@ with many examples, see [[*Matching tags and properties]].
 #+cindex: properties
 
 A property is a key-value pair associated with an entry.  Properties
-can be set so they are associated with a single entry, with every
+can be set, so they are associated with a single entry, with every
 entry in a tree, or with the whole buffer.
 
 There are two main applications for properties in Org mode.  First,
@@ -5389,16 +5404,17 @@ Properties can also be defined using lines like:
 #+cindex: @samp{+} suffix, in properties
 If you want to add to the value of an existing property, append a =+=
 to the property name.  The following results in the property =var=
-having the value =foo=1 bar=2=.
+having the values =foo= and =bar=.
 
 #+begin_example
-,#+PROPERTY: var  foo=1
-,#+PROPERTY: var+ bar=2
+,#+PROPERTY: var  foo
+,#+PROPERTY: var+ bar
 #+end_example
 
-It is also possible to add to the values of inherited properties.  The
-following results in the =Genres= property having the value =Classic
-Baroque= under the =Goldberg Variations= subtree.
+Using the appended =+=, it is also possible to add to the values of
+inherited properties.  The following results in the =Genres= property
+having the values =Classic=, =Baroque=, and =Keyboard music= under the
+=Goldberg Variations= subtree.
 
 #+begin_example
 ,* CD collection
@@ -5414,10 +5430,13 @@ Baroque= under the =Goldberg Variations= subtree.
     :Publisher: Deutsche Grammophon
     :NDisks:    1
     :Genres+:   Baroque
+    :Genres+:   Keyboard music
     :END:
 #+end_example
 
-Note that a property can only have one entry per drawer.
+Note that a property can only have multiple entries per drawer when
+used with the appended =+=.  When a property has multiple entries
+without =+=, the result is undefined.
 
 #+vindex: org-global-properties
 Property values set with the global variable ~org-global-properties~
@@ -5638,7 +5657,7 @@ least for the special applications for which they are used:
 :END:
 
 A great way to view and edit properties in an outline tree is /column
-view/.  In column view, each outline node is turned into a table row.
+view/.  In column view, each heading is turned into a table row.
 Columns in this table provide access to properties of the entries.
 Org mode implements columns by overlaying a tabular structure over the
 headline of each item.  While the headlines have been turned into
@@ -5713,7 +5732,7 @@ optional.  The individual parts have the following meaning:
 - {{{var(PROPERTY)}}} ::
 
   The property that should be edited in this column.  Special
-  properties representing meta data are allowed here as well (see
+  properties representing metadata are allowed here as well (see
   [[*Special Properties]]).
 
 - {{{var(TITLE)}}} ::
@@ -5723,10 +5742,22 @@ optional.  The individual parts have the following meaning:
 
 - {{{var(SUMMARY-TYPE)}}} ::
 
-  The summary type.  If specified, the column values for parent nodes
-  are computed from the children[fn:: If more than one summary type
-  applies to the same property, the parent values are computed
-  according to the first of them.].
+  The summary type.  If specified, the column values for parent
+  headings are computed from the direct children.  If there is any
+  existing property defined for the parent nodes, it is not used in
+  the calculations.
+
+  When there is an existing property in parent heading, Org does not
+  only overlay the computed value in the column view, but also
+  overwrites the property value in parent's property drawer[fn:: If
+  more than column definition is requested for the same property, only
+  the first definition will trigger writing to the property drawer.
+  For example, =%EFFORT{mean} %EFFORT(Sum){:}= will write the mean
+  value of =EFFORT= property; not the sum.  If the first column
+  definition does not have summary type (=%EFFORT %EFFORT{mean}=),
+  nothing will be written to the property drawer].
+
+  Summary type is ignored for special properties.
 
   Supported summary types are:
 
@@ -5777,7 +5808,7 @@ constraints.].
 
 #+begin_example
 :COLUMNS:  %25ITEM %9Approved(Approved?){X} %Owner %11Status \
-                   %10Time_Estimate{:} %CLOCKSUM %CLOCKSUM_T
+                   %10Time_Estimate{:}
 :Owner_ALL:    Tammy Mark Karl Lisa Don
 :Status_ALL:   "In progress" "Not started yet" "Finished" ""
 :Approved_ALL: "[ ]" "[X]"
@@ -5795,9 +5826,55 @@ all values.  The =Approved= column does have a modified title
 (=Approved?=, with a question mark).  Summaries are created for the
 =Time_Estimate= column by adding time duration expressions like HH:MM,
 and for the =Approved= column, by providing an =[X]= status if all
-children have been checked.  The =CLOCKSUM= and =CLOCKSUM_T= columns
-are special, they lists the sums of CLOCK intervals in the subtree,
-either for all clocks or just for today.
+children have been checked.
+
+The =CLOCKSUM= and =CLOCKSUM_T= column properties are special, they
+list the sums of =CLOCK:= intervals in the subtree, either for all
+clocks (=CLOCKSUM=) or just for today (=CLOCKSUM_T=).  Unlike =:=
+summary type that ignores property values in parent headings, all the
+=CLOCK:= intervals are summed up, including =CLOCK:= lines within
+parent headings.
+
+***** Summaries in deeply nested hierarchy
+
+When computing summaries of deeply nested headings, the summaries are
+computed recursively, from the deepest level to the shallowest.  Here
+is an example:
+
+#+begin_example
+,#+BEGIN: columnview :indent t :format "%ITEM %EFFORT{:mean}" :id global
+| ITEM               | EFFORT  |
+|--------------------+---------|
+| Top level          | 3h 0min |
+| \_  Intermediate 1 | 1h 0min |
+| \_        Leaf 1   | 1h      |
+| \_    Leaf 2       | 1h      |
+| \_    Leaf 3       | 1h      |
+| \_  Intermediate 2 | 5h      |
+,#+END:
+
+,* Top level
+,** Intermediate 1
+:PROPERTIES:
+:EFFORT:   *unused*, will be set to 1h 0min (mean of the leaf nodes)
+:END:
+,***** Leaf 1
+:PROPERTIES:
+:EFFORT: 1h
+:END:
+,*** Leaf 2
+:PROPERTIES:
+:EFFORT: 1h
+:END:
+,*** Leaf 3
+:PROPERTIES:
+:EFFORT: 1h
+:END:
+,** Intermediate 2
+:PROPERTIES:
+:EFFORT: 5h
+:END:
+#+end_example
 
 *** Using column view
 :PROPERTIES:
@@ -5895,7 +5972,7 @@ either for all clocks or just for today.
   #+kindex: a
   #+findex: org-columns-edit-allowed
   Edit the list of allowed values for this property.  If the list is
-  found in the hierarchy, the modified values is stored there.  If no
+  found in the hierarchy, the modified values are stored there.  If no
   list is found, the new value is stored in the first entry that is
   part of the current column view.
 
@@ -6075,7 +6152,7 @@ The following commands insert or update the dynamic block:
   you have several clock table blocks, column-capturing blocks or
   other dynamic blocks in a buffer.
 
-You can add formulas to the column view table and you may add plotting
+You can add formulas to the column view table, and you may add plotting
 instructions in front of the table---these survive an update of the
 block.  If there is a =TBLFM= keyword after the table, the table is
 recalculated automatically after an update.
@@ -6243,11 +6320,10 @@ format.
 
   #+kindex: C-u C-c .
   #+vindex: org-time-stamp-rounding-minutes
-  #+vindex: org-timestamp-rounding-minutes
   When called with a prefix argument, use the alternative format which
   contains date and time.  The default time can be rounded to
   multiples of 5 minutes.  See the option
-  ~org-timestamp-rounding-minutes~.
+  ~org-time-stamp-rounding-minutes~.
 
   #+kindex: C-u C-u C-c .
   With two prefix arguments, insert an active timestamp with the
@@ -6365,7 +6441,7 @@ various inputs are interpreted, the items filled in by Org mode are in
 | =2012 w4 fri=  | \rArr{} Friday of ISO week 4 in 2012            |
 | =2012-w04-5=   | \rArr{} Same as above                           |
 
-Furthermore you can specify a relative date by giving, as the /first/
+Furthermore, you can specify a relative date by giving, as the /first/
 thing in the input: a plus/minus sign, a number and a letter---=h=,
 =d=, =w=, =m= or =y=---to indicate a change in hours, days, weeks,
 months, or years.  With =h= the date is relative to the current time,
@@ -6386,14 +6462,14 @@ the abbreviation of day name, the date is the Nth such day, e.g.:
 #+vindex: parse-time-months
 #+vindex: parse-time-weekdays
 The function understands English month and weekday abbreviations.  If
-you want to use un-abbreviated names and/or other languages, configure
+you want to use unabbreviated names and/or other languages, configure
 the variables ~parse-time-months~ and ~parse-time-weekdays~.
 
 #+vindex: org-read-date-force-compatible-dates
 Not all dates can be represented in a given Emacs implementation.  By
-default Org mode forces dates into the compatibility range 1970--2037
+default, Org mode forces dates into the compatibility range 1970--2037
 which works on all Emacs implementations.  If you want to use dates
-outside of this range, read the docstring of the variable
+outside this range, read the docstring of the variable
 ~org-read-date-force-compatible-dates~.
 
 You can specify a time range by giving start and end times or by
@@ -6499,7 +6575,7 @@ following consequences:
   disappears from the buffer after /all/ (invisible) characters
   belonging to the ISO timestamp have been removed.
 
-- If the custom timestamp format is longer than the default and you
+- If the custom timestamp format is longer than the default, and you
   are using dates in tables, table alignment will be messed up.  If
   the custom format is shorter, things do work as expected.
 
@@ -6535,7 +6611,7 @@ immediately after the task they refer to.
   You can specify a different lead time for warnings for a specific
   deadlines using the following syntax.  Here is an example with
   a warning period of 5 days =DEADLINE: <2004-02-29 Sun -5d>=.  This
-  warning is deactivated if the task gets scheduled and you set
+  warning is deactivated if the task gets scheduled, and you set
   ~org-agenda-skip-deadline-prewarning-if-scheduled~ to ~t~.
 
 - =SCHEDULED= ::
@@ -6587,7 +6663,7 @@ repeater.  However, the use of diary expression entries like
 #+texinfo: @noindent
 in scheduling and deadline timestamps is limited.  Org mode does not
 know enough about the internals of each function to issue early and
-late warnings.  However, it shows the item on each day where the
+late warnings.  However, it shows the item on each day when the
 expression entry matches.
 
 *** Inserting deadlines or schedules
@@ -6606,7 +6682,7 @@ schedule an item:[fn:24]
   #+vindex: org-log-redeadline
   Insert =DEADLINE= keyword along with a stamp.  The insertion happens
   in the line directly following the headline.  Remove any =CLOSED=
-  timestamp .  When called with a prefix argument, also remove any
+  timestamp.  When called with a prefix argument, also remove any
   existing deadline from the entry.  Depending on the variable
   ~org-log-redeadline~, take a note when changing an existing
   deadline[fn:: Note the corresponding =STARTUP= options
@@ -6730,14 +6806,14 @@ special repeaters =++= and =.+=.  For example:
 #+begin_example
 ,** TODO Call Father
    DEADLINE: <2008-02-10 Sun ++1w>
-   Marking this DONE shifts the date by at least one week, but also
+   Marking this as DONE shifts the date by at least one week, but also
    by as many weeks as it takes to get this date into the future.
    However, it stays on a Sunday, even if you called and marked it
    done on Saturday.
 
 ,** TODO Empty kitchen trash
    DEADLINE: <2008-02-08 Fri 20:00 ++1d>
-   Marking this DONE shifts the date by at least one day, and also
+   Marking this as DONE shifts the date by at least one day, and also
    by as many days as it takes to get the timestamp into the future.
    Since there is a time in the timestamp, the next deadline in the
    future will be on today's date if you complete the task before
@@ -6745,11 +6821,11 @@ special repeaters =++= and =.+=.  For example:
 
 ,** TODO Check the batteries in the smoke detectors
    DEADLINE: <2005-11-01 Tue .+1m>
-   Marking this DONE shifts the date to one month after today.
+   Marking this as DONE shifts the date to one month after today.
 
 ,** TODO Wash my hands
    DEADLINE: <2019-04-05 08:00 Fri .+1h>
-   Marking this DONE shifts the date to exactly one hour from now.
+   Marking this as DONE shifts the date to exactly one hour from now.
 #+end_example
 
 #+vindex: org-agenda-skip-scheduled-repeats-after-deadline
@@ -6831,8 +6907,8 @@ about what to do with it.
   #+vindex: org-clock-in-prepare-hook
   While the clock is running, Org shows the current clocking time in
   the mode line, along with the title of the task.  The clock time
-  shown is all time ever clocked for this task and its children.  If
-  the task has an effort estimate (see [[*Effort Estimates]]), the
+  shown is all time ever clocked in for this task and its children.
+  If the task has an effort estimate (see [[*Effort Estimates]]), the
   mode line displays the current clocking time against it[fn:: To add
   an effort estimate "on the fly", hook a function doing this to
   ~org-clock-in-prepare-hook~.].  If the task is a repeating one (see
@@ -6841,7 +6917,7 @@ about what to do with it.
   =LAST_REPEAT= property.].  You can exercise more control over show
   time with the =CLOCK_MODELINE_TOTAL= property.  It may have the
   values =current= to show only the current clocking instance, =today=
-  to show all time clocked on this tasks today---see also the variable
+  to show all time clocked on this task today---see also the variable
   ~org-extend-today-until~, ~all~ to include all time, or ~auto~ which
   is the default[fn:: See also the variable
   ~org-clock-mode-line-total~.].  Clicking with {{{kbd(mouse-1)}}}
@@ -6932,7 +7008,7 @@ about what to do with it.
 
   #+kindex: C-c C-x C-j
   #+findex: or-clock-goto
-  Jump to the headline of the currently clocked in task.  With
+  Jump to the headline of the currently clocked-in task.  With
   a {{{kbd(C-u)}}} prefix argument, select the target task from a list
   of recently clocked tasks.
 
@@ -6953,7 +7029,7 @@ agenda]]) to show which tasks have been worked on or closed during
 a day.
 
 *Important:* note that both ~org-clock-out~ and ~org-clock-in-last~
-can have a global keybinding and do not modify the window disposition.
+can have a global key binding and do not modify the window disposition.
 
 *** The clock table
 :PROPERTIES:
@@ -7128,7 +7204,7 @@ using the =:formatter= parameter.
 
   An integer to limit the width of the headline column in the Org
   table.  If you write it like =50!=, then the headline is also
-  shortened in export.
+  shortened during export.
 
 - =:indent= ::
 
@@ -7279,7 +7355,7 @@ choices to correct the discrepancy:
   #+kindex: K
   If you use the shift key and press {{{kbd(K)}}}, it keeps however
   many minutes you request and then immediately clock out of that
-  task.  If you keep all of the minutes, this is the same as just
+  task.  If you keep all the minutes, this is the same as just
   clocking out of the current task.
 
 - {{{kbd(s)}}} ::
@@ -7354,7 +7430,7 @@ arguments with ~org-clock-in~ and two {{{kbd(C-u C-u)}}} with
 #+cindex: auto clocking out after idle time
 
 #+vindex: org-clock-auto-clockout-timer
-When you often forget to clock out before being idle and you don't
+When you often forget to clock out before being idle, and you don't
 want to manually set the clocking time to take into account, you can
 set ~org-clock-auto-clockout-timer~ to a number of seconds and add
 =(org-clock-auto-clockout-insinuate)= to your =.emacs= file.
@@ -7558,8 +7634,8 @@ special command:
   Refile the entry or region at point.  This command offers possible
   locations for refiling the entry and lets you select one with
   completion.  The item (or all items in the region) is filed below
-  the target heading as a subitem.  Depending on
-  ~org-reverse-note-order~, it is either the first or last subitem.
+  the target heading as a sub-item.  Depending on
+  ~org-reverse-note-order~, it is either the first or last sub-item.
 
   By default, all level 1 headlines in the current buffer are
   considered to be targets, but you can have more complex definitions
@@ -7623,7 +7699,7 @@ special command:
   value of ~org-reverse-note-order~ applies to the current buffer.  So
   if ~org-refile~ would append the entry as the last entry under the
   target header, ~org-refile-reverse~ will prepend it as the first
-  entry, and vice-versa.
+  entry, and vice versa.
 
 ** Archiving
 :PROPERTIES:
@@ -7652,7 +7728,7 @@ global searches like the construction of agenda views fast.
 #+cindex: external archiving
 
 The most common archiving action is to move a project tree to another
-file, the archive file.
+file, called the archive file.
 
 - {{{kbd(C-c C-x C-s)}}} or short {{{kbd(C-c $)}}} (~org-archive-subtree~) ::
 
@@ -7702,7 +7778,7 @@ location as the value (see [[*Properties and Columns]]).
 #+vindex: org-archive-save-context-info
 When a subtree is moved, it receives a number of special properties
 that record context information like the file from where the entry
-came, its outline path the archiving time etc.  Configure the variable
+came, its outline path, the archiving time etc.  Configure the variable
 ~org-archive-save-context-info~ to adjust the amount of information
 added.
 
@@ -7728,8 +7804,8 @@ its location in the outline tree, but behaves in the following way:
   It does not open when you attempt to do so with a visibility cycling
   command (see [[*Visibility Cycling]]).  You can force cycling archived
   subtrees with {{{kbd(C-c C-TAB)}}}, or by setting the option
-  ~org-cycle-open-archived-trees~.  Also normal outline commands, like
-  ~org-show-all~, open archived subtrees.
+  ~org-cycle-open-archived-trees~.  Also, normal outline commands, like
+  ~org-fold-show-all~, open archived subtrees.
 
 -
   #+vindex: org-sparse-tree-open-archived-trees
@@ -7842,11 +7918,10 @@ You may also define a global key for capturing new material (see
 
   #+findex: org-capture
   Display the capture templates menu.  If you have templates defined
-  (see [[*Capture templates]]), it offers these templates for selection or
-  use a new Org outline node as the default template.  It inserts the
-  template into the target file and switch to an indirect buffer
-  narrowed to this new node.  You may then insert the information you
-  want.
+  (see [[*Capture templates]]), it offers these templates for
+  selection.  It inserts the template into the target file and
+  switches to an indirect buffer narrowed to this new node.  You may
+  then insert the information you want.
 
 - {{{kbd(C-c C-c)}}} (~org-capture-finalize~) ::
 
@@ -7929,7 +8004,7 @@ configuration would look like:
 (setq org-capture-templates
       '(("t" "Todo" entry (file+headline "~/org/gtd.org" "Tasks")
          "* TODO %?\n  %i\n  %a")
-        ("j" "Journal" entry (file+datetree "~/org/journal.org")
+        ("j" "Journal" entry (file+olp+datetree "~/org/journal.org")
          "* %?\nEntered on %U\n  %i\n  %a")))
 #+end_src
 
@@ -7967,7 +8042,7 @@ Now lets look at the elements of a template definition.  Each entry in
 
 - keys ::
 
-  The keys that selects the template, as a string, characters only,
+  The keys that select the template, as a string, characters only,
   for example ="a"=, for a template to be selected with a single key,
   or ="bt"= for selection with two keys.  When using several keys,
   keys using the same prefix key must be sequential in the list and
@@ -8023,15 +8098,15 @@ Now lets look at the elements of a template definition.  Each entry in
   Specification of where the captured item should be placed.  In Org
   files, targets usually define a node.  Entries will become children
   of this node.  Other types will be added to the table or list in the
-  body of this node.  Most target specifications contain a file name.
-  If that file name is the empty string, it defaults to
+  body of this node.  Most target specifications contain a
+  =<file-spec>=.  If it is the empty string, it defaults to
   ~org-default-notes-file~.  A file can also be given as a variable or
   as a function called with no argument.  When an absolute path is not
   specified for a target, it is taken as relative to ~org-directory~.
 
   Valid values are:
 
-  - =(file "path/to/file")= ::
+  - =(file <file-spec>)= ::
 
     Text will be placed at the beginning or end of that file.
 
@@ -8039,19 +8114,31 @@ Now lets look at the elements of a template definition.  Each entry in
 
     Filing as child of this entry, or in the body of the entry.
 
-  - =(file+headline "filename" "node headline")= ::
+  - =(file+headline <file-spec> "node headline")= ::
+
+  - =(file+headline <file-spec> function-returning-string)= ::
+
+  - =(file+headline <file-spec> symbol-containing-string)= ::
 
     Fast configuration if the target heading is unique in the file.
 
-  - =(file+olp "filename" "Level 1 heading" "Level 2" ...)= ::
+  - =(file+olp <file-spec> "Level 1 heading" "Level 2" ...)= ::
+
+  - =(file+olp <file-spec> function-returning-list-of-strings)= ::
+
+  - =(file+olp <file-spec> symbol-containing-list-of-strings)= ::
 
     For non-unique headings, the full path is safer.
 
-  - =(file+regexp "filename" "regexp to find location")= ::
+  - =(file+regexp <file-spec> "regexp to find location")= ::
 
     Use a regular expression to position point.
 
-  - =(file+olp+datetree "filename" [ "Level 1 heading" ...])= ::
+  - =(file+olp+datetree <file-spec> [ "Level 1 heading" ...])= ::
+
+  - =(file+olp+datetree <file-spec> function-returning-list-of-strings)= ::
+
+  - =(file+olp+datetree <file-spec> symbol-containing-list-of-strings)= ::
 
     This target[fn:30] creates a heading in a date tree[fn:31] for
     today's date.  If the optional outline path is given, the tree
@@ -8059,7 +8146,7 @@ Now lets look at the elements of a template definition.  Each entry in
     level.  Check out the ~:time-prompt~ and ~:tree-type~ properties
     below for additional options.
 
-  - =(file+function "filename" function-finding-location)= ::
+  - =(file+function <file-spec> function-finding-location)= ::
 
     A function to find the right location in the file.
 
@@ -8079,7 +8166,7 @@ Now lets look at the elements of a template definition.  Each entry in
 - template ::
 
   The template for creating the capture item.  If you leave this
-  empty, an appropriate default template will be used.  Otherwise this
+  empty, an appropriate default template will be used.  Otherwise, this
   is a string with escape codes, which will be replaced depending on
   time and context of the capture call.  You may also get this
   template string from a file[fn:: When the file name is not absolute,
@@ -8153,10 +8240,20 @@ Now lets look at the elements of a template definition.  Each entry in
 
   - ~:tree-type~ ::
 
-    Use ~week~ to make a week tree instead of the month-day tree,
-    i.e., place the headings for each day under a heading with the
-    current ISO week.  Use ~month~ to group entries by month
-    only.  Default is to group entries by day.
+    Default is to group entries by day.  Use ~week~ to make a week
+    tree instead of the month-day tree, i.e., place the headings for
+    each day under a heading with the current ISO week.  Use ~month~
+    to group entries by month only.  Use any subset of ~(year quarter
+    month week day)~ to group by the specified levels.  In case
+    ~month~ and ~week~ are both specified, weeks are assigned to the
+    month containing Thursday, to be consistent with the ISO year-week
+    rule.  In case ~quarter~ and ~week~ but not ~month~ are specified,
+    quarters are 13-week periods; otherwise they are 3-month periods.
+
+    #+findex: org-datetree-find-create-hierarchy
+    ~:tree-type~ can also be a function, in which it should take the
+    date as an argument and generate a list of pairs for
+    ~org-datetree-find-create-hierarchy~.
 
   - ~:unnarrowed~ ::
 
@@ -8218,12 +8315,13 @@ given here:
 
 - =%(EXP)= ::
 
-  Evaluate Elisp expression {{{var(EXP)}}} and replace it with the
-  result.  The {{{var(EXP)}}} form must return a string.  Only
-  placeholders pre-existing within the template, or introduced with
-  =%[file]=, are expanded this way.  Since this happens after
-  expanding non-interactive "%-escapes", those can be used to fill the
+  Evaluate Elisp expression ~(EXP)~ and replace it with the result.
+  The ~(EXP)~ form must return a string.  Only placeholders
+  pre-existing within the template, or introduced with =%[file]=, are
+  expanded this way.  Since this happens after expanding
+  non-interactive "%-escapes", those can be used to fill the
   expression.
+  Examples: =%(org-id-new)=, =%(eval default-directory)=
 
 - =%<FORMAT>= ::
 
@@ -8283,7 +8381,7 @@ given here:
 
 - =%n= ::
 
-  User name (taken from ~user-full-name~).
+  Username (taken from ~user-full-name~).
 
 - =%f= ::
 
@@ -8307,7 +8405,7 @@ given here:
 
 - =%^t= ::
 
-  Like =%t=, but prompt for date.  Similarly =%^T=, =%^u=, =%^U=.  You
+  Like =%t=, but prompt for date.  Similarly, =%^T=, =%^u=, =%^U=.  You
   may define a prompt like =%^{Birthday}t=.
 
 - =%^C= ::
@@ -8338,17 +8436,22 @@ given here:
 
 - =%\N= ::
 
-  Insert the text entered at the {{{var(N)}}}th =%^{PROMPT}=, where
-  {{{var(N)}}} is a number, starting from 1.
+  Insert the text entered at the {{{var(N)}}}th =%^{PROMPT}= (but not
+  =%^{PROMPT}X=), where {{{var(N)}}} is a number, starting from 1.
+
+- =%\*N= ::
+
+  Same as =%\N=, but include all the prompts.
 
 - =%?= ::
 
   After completing the template, position point here.
 
 #+vindex: org-store-link-props
+#+vindex: org-link-store-props
 For specific link types, the following keywords are defined[fn:: If
 you define your own link types (see [[*Adding Hyperlink Types]]), any
-property you store with ~org-store-link-props~ can be accessed in
+property you store with ~org-link-store-props~ can be accessed in
 capture templates in a similar way.]:
 
 #+vindex: org-link-from-user-regexp
@@ -8402,24 +8505,25 @@ See the docstring of the variable for more information.
 :END:
 #+cindex: attachments
 
-It is often useful to associate reference material with an outline
-node.  Small chunks of plain text can simply be stored in the subtree
-of a project.  Hyperlinks (see [[*Hyperlinks]]) can establish associations
-with files that live elsewhere on a local, or even remote, computer,
-like emails or source code files belonging to a project.
+It is often useful to associate reference material with a heading or
+subtree.  Small chunks of plain text can simply be stored in the
+subtree of a project.  Hyperlinks (see [[*Hyperlinks]]) can establish
+associations with files that live elsewhere on a local, or even
+remote, computer, like emails or source code files belonging to a
+project.
 
 Another method is /attachments/, which are files located in a
-directory belonging to an outline node.  Org uses directories either
-named by a unique ID of each entry, or by a =DIR= property.
+directory belonging to heading/subtree.  Org uses directories named
+either by the =ID= property of a heading or by a =DIR= property.
 
 *** Attachment defaults and dispatcher
 :PROPERTIES:
 :DESCRIPTION: How to access attachment commands
 :END:
 
-By default, Org attach uses ID properties when adding attachments to
-outline nodes.  This makes working with attachments fully automated.
-There is no decision needed for folder-name or location.  ID-based
+By default, Org attach uses =ID= properties when adding attachments to
+headings.  This makes working with attachments fully automated.  There
+is no decision needed for folder-name or location.  =ID=-based
 directories are by default located in the =data/= directory, which
 lives in the same directory where your Org file lives[fn:: If you move
 entries or Org files from one directory to another, you may want to
@@ -8437,7 +8541,7 @@ The following commands deal with attachments:
   #+kindex: C-c C-a
   #+findex: org-attach
   The dispatcher for commands related to the attachment system.  After
-  these keys, a list of commands is displayed and you must press an
+  these keys, a list of commands is displayed, and you must press an
   additional key to select a command:
 
   - {{{kbd(a)}}} (~org-attach-attach~) ::
@@ -8533,7 +8637,7 @@ The following commands deal with attachments:
     property and asks the user to either move content inside that
     folder, if an =ID= property is set, delete the content, or to
     leave the attachment directory as is but no longer attached to the
-    outline node.
+    heading.
 
 *** Attachment options
 :PROPERTIES:
@@ -8556,13 +8660,13 @@ mentioning.
 
 - ~org-attach-use-inheritance~ ::
   #+vindex: org-attach-use-inheritance
-  By default folders attached to an outline node are inherited from
-  parents according to ~org-use-property-inheritance~.  If one instead
-  want to set inheritance specifically for Org attach that can be done
-  using ~org-attach-use-inheritance~.  Inheriting documents through
-  the node hierarchy makes a lot of sense in most cases.  Especially
-  when using attachment links (see [[*Attachment links]]).  The following
-  example shows one use case for attachment inheritance:
+  By default folders attached to a heading are inherited from parents
+  according to ~org-use-property-inheritance~.  If one instead want to
+  set inheritance specifically for Org attach that can be done using
+  ~org-attach-use-inheritance~.  Inheriting documents through the node
+  hierarchy makes a lot of sense in most cases.  Especially when using
+  attachment links (see [[*Attachment links]]).  The following example
+  shows one use case for attachment inheritance:
 
   #+begin_example
   ,* Chapter A ...
@@ -8646,8 +8750,8 @@ default settings.
 :END:
 
 Attached files and folders can be referenced using attachment links.
-This makes it easy to refer to the material added to an outline node.
-Especially if it was attached using the unique ID of the entry!
+This makes it easy to refer to the material added to heading/subtree.
+Especially if it was attached using the unique =ID= of the heading!
 
 #+begin_example
 ,* TODO Some task
@@ -8664,7 +8768,7 @@ See [[*External Links]] for more information about these links.
 :DESCRIPTION: Everything safely stored away
 :END:
 
-If the directory attached to an outline node is a Git repository, Org
+If the directory attached to a heading is a Git repository, Org
 can be configured to automatically commit changes to that repository
 when it sees them.
 
@@ -8988,7 +9092,7 @@ commands:
   #+findex: org-toggle-sticky-agenda
   Toggle sticky agenda views.  By default, Org maintains only a single
   agenda buffer and rebuilds it each time you change the view, to make
-  sure everything is always up to date.  If you switch between views
+  sure everything is always up-to-date.  If you switch between views
   often and the build time bothers you, you can turn on sticky agenda
   buffers (make this the default by customizing the variable
   ~org-agenda-sticky~).  With sticky agendas, the dispatcher only
@@ -9632,7 +9736,7 @@ If the agenda integrates the Emacs diary (see [[*Weekly/daily agenda]]),
 time specifications in diary entries are recognized as well.
 
 For agenda display, Org mode extracts the time and displays it in
-a standard 24 hour format as part of the prefix.  The example times in
+a standard 24-hour format as part of the prefix.  The example times in
 the previous paragraphs would end up in the agenda like this:
 
 #+begin_example
@@ -9683,10 +9787,12 @@ done depends on the type of view.
   time-of-day specification.  These entries are shown at the beginning
   of the list, as a /schedule/ for the day.  After that, items remain
   grouped in categories, in the sequence given by ~org-agenda-files~.
-  Within each category, items are sorted by urgency, which is composed
-  of the base priority (see [[*Priorities]]; 2000 for priority =A=, 1000
-  for =B=, and 0 for =C=), plus additional increments for overdue
-  scheduled or deadline items.
+  Within each category, items are sorted by urgency, which is derived
+  from the priority (see [[*Priorities]]), plus additional increments
+  for overdue scheduled or deadline items.  The lowest priority is
+  scored as 0, the next as 1000, and continues in steps of 1000 until
+  reaching the highest priority, e.g., =C=, =B=, =A= are scored as 0,
+  1000, and 2000, respectively.
 
 - For the TODO list, items remain in the order of categories, but
   within each category, sorting takes place according to urgency.  The
@@ -9782,6 +9888,7 @@ filter elements are accumulated.
         '(("Effort_ALL". "0 0:10 0:30 1:00 2:00 3:00 4:00")))
   #+end_src
 
+  #+vindex: org-agenda-sort-noeffort-is-high
   #+vindex: org-sort-agenda-noeffort-is-high
   You can then filter for an effort by first typing an operator, one
   of {{{kbd(<)}}}, {{{kbd(>)}}} and {{{kbd(=)}}}, and then the
@@ -9790,7 +9897,7 @@ filter elements are accumulated.
   restricts to entries with effort smaller-or-equal, equal, or
   larger-or-equal than the selected value.  For application of the
   operator, entries without a defined effort are treated according to
-  the value of ~org-sort-agenda-noeffort-is-high~.  To clear the
+  the value of ~org-agenda-sort-noeffort-is-high~.  To clear the
   filter, press {{{kbd(_)}}} twice (once to call the command again,
   and once at the first prompt).
 
@@ -10070,7 +10177,7 @@ the other commands, point needs to be in the desired line.
   A numeric prefix argument may be used to jump directly to a specific
   day of the month.  When setting month view, a year may be encoded in
   the prefix argument as well.  For example, {{{kbd(200712 m)}}} jumps
-  to December, 2007.  If such a year specification has only one or two
+  to December 2007.  If such a year specification has only one or two
   digits, it is expanded into one of the 30 next years or the last 69
   years.
 
@@ -10210,11 +10317,11 @@ the other commands, point needs to be in the desired line.
   #+vindex: org-agenda-start-with-entry-text-mode
   #+vindex: org-agenda-entry-text-maxlines
   Toggle entry text mode.  In entry text mode, a number of lines from
-  the Org outline node referenced by an agenda line are displayed
-  below the line.  The maximum number of lines is given by the
-  variable ~org-agenda-entry-text-maxlines~.  Calling this command
-  with a numeric prefix argument temporarily modifies that number to
-  the prefix value.
+  the Org heading referenced by an agenda line are displayed below the
+  line.  The maximum number of lines is given by the variable
+  ~org-agenda-entry-text-maxlines~.  Calling this command with a
+  numeric prefix argument temporarily modifies that number to the
+  prefix value.
 
 - {{{kbd(G)}}} (~org-agenda-toggle-time-grid~) ::
 
@@ -10304,9 +10411,9 @@ the other commands, point needs to be in the desired line.
   #+kindex: t
   #+findex: org-agenda-todo
   Change the TODO state of the item, both in the agenda and in the
-  original Org file.  A prefix arg is passed through to the ~org-todo~
-  command, so for example a {{{kbd(C-u)}}} prefix are will trigger
-  taking a note to document the state change.
+  original Org file.  A prefix argument is passed through to the
+  ~org-todo~ command, so for example a {{{kbd(C-u)}}} prefix are will
+  trigger taking a note to document the state change.
 
 - {{{kbd(C-S-RIGHT)}}} (~org-agenda-todo-nextset~) ::
 
@@ -10858,7 +10965,7 @@ as they operate on the current buffer only.
 Another possibility is the construction of agenda views that comprise
 the results of /several/ commands, each of which creates a block in
 the agenda buffer.  The available commands include ~agenda~ for the
-daily or weekly agenda (as created with {{{kbd(a)}}}) , ~alltodo~ for
+daily or weekly agenda (as created with {{{kbd(a)}}}), ~alltodo~ for
 the global TODO list (as constructed with {{{kbd(t)}}}), ~stuck~ for
 the list of stuck projects (as obtained with {{{kbd(#)}}}) and the
 matching commands discussed above: ~todo~, ~tags~, and ~tags-todo~.
@@ -10881,7 +10988,7 @@ Here are two examples:
 This defines {{{kbd(h)}}} to create a multi-block view for stuff you
 need to attend to at home.  The resulting agenda buffer contains your
 agenda for the current week, all TODO items that carry the tag =home=,
-and also all lines tagged with =garden=.  Finally the command
+and also all lines tagged with =garden=.  Finally, the command
 {{{kbd(o)}}} provides a similar view for office tasks.
 
 *** Setting options for custom commands
@@ -10905,7 +11012,7 @@ at the right spot in ~org-agenda-custom-commands~.  For example:
          ((org-agenda-sorting-strategy '(priority-down))
           (org-agenda-prefix-format "  Mixed: ")))
         ("U" tags-tree "+boss-urgent"
-         ((org-show-context-detail 'minimal)))
+         ((org-fold-show-context-detail 'minimal)))
         ("N" search ""
          ((org-agenda-files '("~org/notes.org"))
           (org-agenda-text-search-extra-files nil)))))
@@ -11157,7 +11264,7 @@ environment.  This causes the following issues:
    If any of the columns has a summary type defined (see [[*Column
    attributes]]), turning on column view in the agenda visits all
    relevant agenda files and make sure that the computations of this
-   property are up to date.  This is also true for the special
+   property are up-to-date.  This is also true for the special
    =CLOCKSUM= property.  Org then sums the values displayed in the
    agenda.  In the daily/weekly agenda, the sums cover a single day;
    in all other views they cover the entire block.
@@ -11386,7 +11493,7 @@ becomes =&nbsp;= in HTML and =~= in LaTeX.
 #+cindex: special symbols, in-buffer display
 If you would like to see entities displayed as UTF-8 characters, use
 the following command[fn:: You can turn this on by default by setting
-the variable ~org-pretty-entities~, or on a per-file base with the
+the variable ~org-pretty-entities~, or on a per-file basis with the
 =STARTUP= option =entitiespretty=.]:
 
 - {{{kbd(C-c C-x \)}}} (~org-toggle-pretty-entities~) ::
@@ -11413,7 +11520,7 @@ converted into dashes, and =...= becomes a compact set of dots.
 #+cindex: @TeX{} interpretation
 #+cindex: @LaTeX{} interpretation
 
-Plain ASCII is normally sufficient for almost all note taking.
+Plain ASCII is normally sufficient for almost all note-taking.
 Exceptions include scientific notes, which often require mathematical
 symbols and the occasional formula.  LaTeX[fn:37] is widely used to
 typeset scientific documents.  Org mode supports embedding LaTeX code
@@ -11450,7 +11557,7 @@ snippets are identified as LaTeX source code:
   between, and if the closing =$= is followed by whitespace or
   punctuation (but not a dash).
 
-  Sometimes, it may necessary to have a literal dollar symbol even
+  Sometimes, it may be necessary to have a literal dollar symbol even
   when it is recognized as LaTeX math delimiter.  Org provides =\dollar= and
   =\USD= entities (see [[*Special Symbols]]) that are rendered as =$= for
   such scenarios.  Also, see [[*Escape Character]].
@@ -11532,13 +11639,14 @@ CDLaTeX mode is a minor mode that is normally used in combination with
 a major LaTeX mode like AUCTeX in order to speed-up insertion of
 environments and math templates.  Inside Org mode, you can make use of
 some of the features of CDLaTeX mode.  You need to install
-=cdlatex.el= and =texmathp.el= (the latter comes also with AUCTeX)
-from [[https://elpa.nongnu.org/][NonGNU ELPA]] with the [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Package-Installation.html][Emacs packaging system]] or alternatively from
-[[https://staff.fnwi.uva.nl/c.dominik/Tools/cdlatex/]].  Do not use
-CDLaTeX mode itself under Org mode, but use the special version Org
-CDLaTeX minor mode that comes as part of Org.  Turn it on for the
-current buffer with {{{kbd(M-x org-cdlatex-mode)}}}, or for all Org
-files with
+=cdlatex.el= and =texmathp.el= (the latter comes also with AUCTeX).
+The =cdlatex= package can be installed from
+[[https://elpa.nongnu.org/nongnu/cdlatex.html][NonGNU ELPA]] with the
+[[https://www.gnu.org/software/emacs/manual/html_node/emacs/Package-Installation.html][Emacs
+packaging system]].  Do not use CDLaTeX mode itself under Org mode,
+but use the special version Org CDLaTeX minor mode that comes as part
+of Org.  Turn it on for the current buffer with {{{kbd(M-x
+org-cdlatex-mode)}}}, or for all Org files with
 
 #+begin_src emacs-lisp
 (add-hook 'org-mode-hook #'turn-on-org-cdlatex)
@@ -11685,7 +11793,7 @@ labels, and use them as targets for special hyperlinks like
 =[[(name)]]=---i.e., the reference name enclosed in single
 parentheses.  In HTML, hovering the mouse over such a link
 remote-highlights the corresponding code line[fn:: This requires some
-Javascript which is /not/ automatically included in the HTML output:
+JavaScript which is /not/ automatically included in the HTML output:
 you have to customize the variable =org-html-head-include-scripts= to
 ~t~ to have it included (it is ~nil~ by default).], which is kind of cool.
 
@@ -11694,7 +11802,7 @@ source code[fn:: Adding =-k= to =-n -r= /keeps/ the labels in the
 source code while using line numbers for the links, which might be
 useful to explain those in an Org mode example code.].  With the =-n=
 switch, links to these references are labeled by the line numbers from
-the code listing.  Otherwise links use the labels with no parentheses.
+the code listing.  Otherwise, links use the labels with no parentheses.
 Here is an example:
 
 #+begin_example -l "(dumb-reference:%s)"
@@ -11751,7 +11859,77 @@ buffer, and insert it with the proper formatting like =(ref:label)= at
 the end of the current line.  Then the label is stored as a link
 =(label)=, for retrieval with {{{kbd(C-c C-l)}}}.
 
-** Images
+** Images and link previews
+:PROPERTIES:
+:DESCRIPTION: Preview links in the buffer
+:END:
+
+Org mode can display previews of hyperlinks (see [[*Hyperlinks]])
+inside Org buffers.  By default, only image links[fn::Image links are
+=file:= and =attachment:= links to existing image files; Emacs can
+only display the linked images listed in ~image-types~ variable] can
+be previewed inline, where the images are displayed in place of the
+link path.
+
+You can customize the previews as described in [[*Adding Hyperlink
+preview]].  Link previews do not have to display images -- any kind of
+display decoration (see [[info:elisp#Overlay Properties]]) can be
+used.
+
+You can preview the supported link types in the whole buffer, in the
+current section, active region or at point with the following commands:
+
+- {{{kbd(C-c C-x C-v)}}} (~org-link-preview~) ::
+
+  #+kindex: C-c C-x C-v
+  #+findex: org-link-preview
+  Create inline previews for external links in the active region, if
+  any; the link at point, if there is such; or in the current section
+  otherwise.  With a prefix argument, clear link previews at point or
+  in the current entry.  With a double prefix argument, preview all
+  links in the buffer.  With triple prefix argument, hide previews for
+  all links in the buffer.
+
+  By default, only links without descriptions are previewed.  You
+  can force displaying previews for all supported links (including
+  links with descriptions) using a numeric argument of ~1~.  This
+  will toggle all previews in the active region, the link at point
+  or the current section.  A numeric prefix argument of ~11~ will
+  toggle previews in the whole buffer instead.
+
+  #+vindex: org-startup-with-link-previews
+  Org mode can display link previews automatically when opening
+  buffers.  Either customize ~org-startup-with-link-previews~ or use
+  the =#+STARTUP: linkpreviews= keyword to enable previews for that
+  specific buffer when opening it.  =#+STARTUP: nolinkpreviews= will
+  disable previews on startup in the buffer.
+
+- {{{kbd(C-c C-x C-M-v)}}} (~org-link-preview-refresh~) ::
+
+  #+kindex: C-c C-x C-M-v
+  #+findex: org-link-preview-refresh
+  Assure inline display of external link previews in the whole buffer
+  and refresh them.
+
+- {{{kbd(M-x org-link-preview-region)}}} ::
+
+  #+findex: org-link-preview-region
+  Create inline previews for external links in the active region, or
+  the buffer.  With a prefix argument, also preview links with a text
+  description part.
+
+- {{{kbd(M-x org-link-preview-clear)}}} ::
+
+  #+findex: org-link-preview-clear
+  Clear external link previews in the active region, or the buffer.
+
+#+vindex: org-cycle-inline-images-display
+Link previews can also be displayed when cycling the folding state.
+When the custom option ~org-cycle-link-previews-display~ is set,
+supported link types under the subtree (including images) will be
+displayed automatically.
+
+*** Images
 :PROPERTIES:
 :DESCRIPTION: Display an image.
 :END:
@@ -11776,95 +11954,76 @@ make sure that the link is on a line by itself and precede it with
 [[./img/a.jpg]]
 #+end_example
 
-Such images can be displayed within the buffer with the following
-command:
+When link previews are displayed as images, the image size and
+alignment can be further customized.
 
-- {{{kbd(C-c C-x C-v)}}} (~org-toggle-inline-images~) ::
+#+vindex: org-image-actual-width
+#+vindex: org-image-max-width
+#+cindex: @samp{ORG-IMAGE-ACTUAL-WIDTH}, property
+By default, Org mode displays inline images according to their
+actual width, but no wider than ~fill-column~ characters.
 
-  #+kindex: C-c C-x C-v
-  #+findex: org-toggle-inline-images
-  #+vindex: org-startup-with-inline-images
-  Toggle the inline display of linked images.  When called with a
-  prefix argument, also display images that do have a link
-  description.  You can ask for inline images to be displayed at
-  startup by configuring the variable
-  ~org-startup-with-inline-images~[fn:: The variable
-  ~org-startup-with-inline-images~ can be set within a buffer with the
-  =STARTUP= options =inlineimages= and =noinlineimages=.].
-
-
-  #+vindex: org-image-actual-width
-  #+vindex: org-image-max-width
-  #+cindex: @samp{ORG-IMAGE-ACTUAL-WIDTH}, property
-  By default, Org mode displays inline images according to their
-  actual width, but no wider than ~fill-column~ characters.
-
-  You can customize the displayed image width using
-  ~org-image-actual-width~ variable (globally) or
-  =ORG-IMAGE-ACTUAL-WIDTH= property (subtree-level)[fn:: The width can
-  be customized in Emacs >= 24.1, built with imagemagick support.].
-  Their value can be the following:
-  - (default) Non-~nil~, use the actual width of images when inlining
-    them.  If the actual width is too wide, limit it according to
-    ~org-image-max-width~.
-  - When set to a number, use imagemagick (when available) to set the
-    image's width to this value.
-  - When set to a number in a list, try to get the width from any
-    =#+ATTR.*= keyword if it matches a width specification like:
-    #+begin_example
-    ,#+ATTR_HTML: :width 300px
-    #+end_example
-    and fall back on that number if none is found.
-  - When set to ~nil~, try to get the width from an =#+ATTR.*= keyword
-    and fall back on the original width or ~org-image-max-width~ if
-    none is found.
-
-  ~org-image-max-width~ limits the maximum displayed image width, but
-  only when the image width is not set explicitly.  Possible maximum
-  width can be set to:
-  - (default) ~fill-column~, limit width to ~fill-column~ number of
-    characters.
-  - ~window~, limit width to current window width.
-  - integer number, limit width to that specified number of pixels.
-  - ~nil~, do not limit the width.
-
-  #+vindex: org-image-align
-  Org mode can left-align, center or right-align the display of inline
-  images.  This setting is controlled (globally) by ~org-image-align~.
-  Only standalone images are affected, corresponding to links with no
-  surrounding text in their paragraph except for whitespace.  Its
-  value can be the following:
-  - (default) The symbol ~left~, which inserts the image where the
-    link appears in the buffer.
-  - The symbol ~center~, which will preview links centered in the
-    Emacs window.
-  - The symbol ~right~, which will preview links right-aligned in the
-    Emacs window.
-
-  Inline image alignment can be specified for each link using the
-  =#+ATTR.*= keyword if it matches an alignment specification like:
+You can customize the displayed image width using
+~org-image-actual-width~ variable (globally) or
+=ORG-IMAGE-ACTUAL-WIDTH= property (subtree-level)[fn:: The width can
+be customized in Emacs >= 24.1, built with ImageMagick support.].
+Their value can be the following:
+- (default) Non-~nil~, use the actual width of images when inlining
+  them.  If the actual width is too wide, limit it according to
+  ~org-image-max-width~.
+- When set to a number, use ImageMagick (when available) to set the
+  image's width to this value.
+- When set to a number in a list, try to get the width from any
+  =#+ATTR.*= keyword if it matches a width specification like:
   #+begin_example
-  ,#+ATTR_HTML: :align center
+  ,#+ATTR_HTML: :width 300px
   #+end_example
-  Org will use the alignment specification from any =#+ATTR.*=
-  keyword, such as =#+ATTR_HTML= or =#+ATTR_LATEX=, but =#+ATTR_ORG=
-  (if present) will override the others.  For instance, this link
-  #+begin_example
-  ,#+ATTR_HTML: :align right
-  ,#+ATTR_ORG: :align center
-  [[/path/to/image/file.png]]
-  #+end_example
-  will be displayed centered in Emacs but exported right-aligned to
-  HTML.
+  and fall back on that number if none is found.
+- When set to ~nil~, try to get the width from an =#+ATTR.*= keyword
+  and fall back on the original width or ~org-image-max-width~ if
+  none is found.
 
-  When =#+ATTR_ORG= is not set, inline image alignment is also read
-  from the =:center= attribute supported by some export backends (like
-  HTML, LaTeX and Beamer.)
+~org-image-max-width~ limits the maximum displayed image width, but
+only when the image width is not set explicitly.  Possible maximum
+width can be set to:
+- (default) ~fill-column~, limit width to ~fill-column~ number of
+  characters.
+- ~window~, limit width to current window width.
+- integer number, limit width to that specified number of pixels.
+- ~nil~, do not limit the width.
 
-#+vindex: org-cycle-inline-images-display
-Inline images can also be displayed when cycling the folding state.
-When custom option ~org-cycle-inline-images-display~ is set, the
-visible inline images under subtree will be displayed automatically.
+#+vindex: org-image-align
+Org mode can left-align, center or right-align the display of inline
+images.  This setting is controlled (globally) by ~org-image-align~.
+Only standalone images are affected, corresponding to links with no
+surrounding text in their paragraph except for whitespace.  Its
+value can be the following:
+- (default) The symbol ~left~, which inserts the image where the
+  link appears in the buffer.
+- The symbol ~center~, which will preview links centered in the
+  Emacs window.
+- The symbol ~right~, which will preview links right-aligned in the
+  Emacs window.
+
+Inline image alignment can be specified for each link using the
+=#+ATTR.*= keyword if it matches an alignment specification like:
+#+begin_example
+,#+ATTR_HTML: :align center
+#+end_example
+Org will use the alignment specification from any =#+ATTR.*=
+keyword, such as =#+ATTR_HTML= or =#+ATTR_LATEX=, but =#+ATTR_ORG=
+(if present) will override the others.  For instance, this link
+#+begin_example
+,#+ATTR_HTML: :align right
+,#+ATTR_ORG: :align center
+[[/path/to/image/file.png]]
+#+end_example
+will be displayed centered in Emacs but exported right-aligned to
+HTML.
+
+When =#+ATTR_ORG= is not set, inline image alignment is also read from
+the =:center= attribute supported by some export backends (like HTML,
+LaTeX and Beamer.)
 
 ** Captions
 :PROPERTIES:
@@ -12107,7 +12266,7 @@ further alter what is exported, and how.
   #+kindex: C-c C-e C-f
 
   Toggle force-publishing export.  Publish functions normally only
-  publish changed files (see [[**Triggering Publication]]).  Forced
+  publish changed files (see [[*Triggering Publication]]).  Forced
   publishing causes files to be published even if their timestamps do
   not indicate the file has been changed.
 
@@ -12188,7 +12347,7 @@ global variables, include:
   #+cindex: @samp{DATE}, keyword
   #+vindex: org-export-date-timestamp-format
   A date or a timestamp[fn:: The variable
-  ~org-export-date-timestamp-format~ defines how this timestamp are
+  ~org-export-date-timestamp-format~ defines how this timestamp is
   exported.].
 
 - =EMAIL= ::
@@ -12372,9 +12531,10 @@ following arguments.
 - ~H~ ::
 
   #+vindex: org-export-headline-levels
-  Set the number of headline levels for export
-  (~org-export-headline-levels~).  Below that level, headlines are
-  treated differently.  In most backends, they become list items.
+  Set the last headline level for export as a headline
+  (~org-export-headline-levels~).  For descendants of that level,
+  headlines are treated differently.  In most backends, they become
+  list items.
 
 - ~inline~ ::
 
@@ -12493,7 +12653,7 @@ The table of contents includes all headlines in the document.  Its
 depth is therefore the same as the headline levels in the file.  If
 you need to use a different depth, or turn it off entirely, set the
 ~org-export-with-toc~ variable accordingly.  You can achieve the same
-on a per file basis, using the following =toc= item in =OPTIONS=
+on a per-file basis, using the following =toc= item in =OPTIONS=
 keyword:
 
 #+begin_example
@@ -12588,7 +12748,7 @@ example, to include your =.emacs= file, you could use:
 #+texinfo: @noindent
 There are three positional arguments after the include keyword, they are:
 1. The file name, this is the sole mandatory argument.  Org neither
-   checks for correctness or validates the content in any way.
+   checks for correctness nor validates the content in any way.
 2. The block name to wrap the file content in.  When this is
    =example=, =export=, or =src= the content is escaped by
    ~org-escape-code-in-string~.  Arbitrary block names may be given,
@@ -12598,7 +12758,7 @@ There are three positional arguments after the include keyword, they are:
 
 #+cindex: @samp{minlevel}, include
 If an included file is not specified as having any markup language,
-Org assumes it be in Org format and proceeds as usual with a few
+Org assumes it to be in Org format and proceeds as usual with a few
 exceptions.  Org makes the footnote labels (see [[*Creating Footnotes]])
 in the included file local to that file.  The contents of the included
 file belong to the same structure---headline, item---containing the
@@ -12655,9 +12815,11 @@ The following command allows navigating to the included document:
 #+cindex: @samp{MACRO}, keyword
 
 #+vindex: org-export-global-macros
-Macros replace text snippets during export.  Macros are defined
-globally in ~org-export-global-macros~, or document-wise with the
-following syntax:
+#+vindex: org-export-replace-macros
+Macros replace text snippets during export[fn::The macro replacement
+can be disabled by setting ~org-export-replace-macros~ to nil (default
+is t).].  Macros are defined globally in ~org-export-global-macros~,
+or document-wise with the following syntax:
 
 : #+MACRO: name   replacement text; $1, $2 are arguments
 
@@ -12722,7 +12884,7 @@ Org comes with following pre-defined macros:
   understood by ~format-time-string~.  If the second argument to the
   ~modification-time~ macro is non-~nil~, Org uses =vc.el= to retrieve
   the document's modification time from the version control system.
-  Otherwise Org reads the file attributes.
+  Otherwise, Org reads the file attributes.
 
 - ={{{input-file}}}= ::
 
@@ -12774,16 +12936,17 @@ exported.
 
 #+cindex: @samp{BEGIN_COMMENT}
 #+cindex: comment block
-Likewise, regions surrounded by =#+BEGIN_COMMENT= ... =#+END_COMMENT=
-are not exported.
+Likewise, comment blocks =#+BEGIN_COMMENT= ... =#+END_COMMENT= are not
+exported. [fn::Just like in [[*Literal Examples]], you need to escape
+leading =*= with =,= to avoid interpreting them as headings.]
 
 #+cindex: comment trees
 Finally, a =COMMENT= keyword at the beginning of an entry, but after
 any other keyword or priority cookie, comments out the entire subtree.
 In this case, the subtree is not exported and no code block within it
-is executed either[fn:: For a less drastic behavior, consider using a
-select tag (see [[*Export Settings]]) instead.].  The command below
-helps changing the comment status of a headline.
+is executed or tangled[fn:: For less restrictive export limitations,
+consider using a select tag (see [[*Export Settings]]) instead.].  The
+command below helps to change the comment status of a headline.
 
 - {{{kbd(C-c ;)}}} (~org-toggle-comment~) ::
   #+kindex: C-c ;
@@ -12933,6 +13096,10 @@ high-quality interactive slides for presentations.  Beamer is a LaTeX
 document class for creating presentations in PDF, HTML, and other
 popular display formats.
 
+We strongly recommend familiarizing yourself with Beamer terminology
+before reading the rest of this chapter.  See
+<https://en.wikipedia.org/wiki/Beamer_(LaTeX)> and references therein.
+
 *** Beamer export commands
 :PROPERTIES:
 :DESCRIPTION: For creating Beamer documents.
@@ -13075,6 +13242,11 @@ should in principle be exportable as a Beamer presentation.
   frames.  It is also useful for properly closing a =column=
   environment.
 
+  #+cindex: @samp{BEAMER_SUBTITLE}, property
+  If =BEAMER_SUBTITLE= is set, Org exports its value as the subtitle
+  for the headline's frame. This property has no effect on headlines
+  which are not exported as frames.
+
   #+cindex: @samp{BEAMER_ACT}, property
   #+cindex: @samp{BEAMER_OPT}, property
   When =BEAMER_ACT= is set for a headline, Org export translates that
@@ -13191,6 +13363,7 @@ Here is an example of an Org document ready for Beamer export.
 ,#+AUTHOR: Carsten Dominik
 ,#+OPTIONS: H:2 toc:t num:t
 ,#+LATEX_CLASS: beamer
+,#+STARTUP: beamer
 ,#+LATEX_CLASS_OPTIONS: [presentation]
 ,#+BEAMER_THEME: Madrid
 ,#+COLUMNS: %45ITEM %10BEAMER_ENV(Env) %10BEAMER_ACT(Act) %4BEAMER_COL(Col)
@@ -13261,7 +13434,7 @@ settings described in [[*Export Settings]].
 
   #+cindex: @samp{DESCRIPTION}, keyword
   This is the document's description, which the HTML exporter inserts
-  it as a HTML meta tag in the HTML file.  For long descriptions, use
+  it as an HTML meta tag in the HTML file.  For long descriptions, use
   multiple =DESCRIPTION= lines.  The exporter takes care of wrapping
   the lines properly.
 
@@ -13456,11 +13629,11 @@ name, and date.
 
 *** Exporting to minimal HTML
 :PROPERTIES:
-:DESCRIPTION: Exporting HTML without CSS, Javascript, etc.
+:DESCRIPTION: Exporting HTML without CSS, JavaScript, etc.
 :ALT_TITLE: Bare HTML
 :END:
 
-If you want to output a minimal HTML file, with no CSS, no Javascript,
+If you want to output a minimal HTML file, with no CSS, no JavaScript,
 no preamble or postamble, here are the variable you would need to set:
 
 #+vindex: org-html-head
@@ -13486,7 +13659,7 @@ no preamble or postamble, here are the variable you would need to set:
 :END:
 
 The HTML export backend transforms =<= and =>= to =&lt;= and =&gt;=.
-To include raw HTML code in the Org file so the HTML export backend
+To include raw HTML code in the Org file, so the HTML export backend
 can insert that HTML code in the output, use this inline syntax:
 =@@html:...@@=.  For example:
 
@@ -13515,9 +13688,17 @@ Headlines are exported to =<h1>=, =<h2>=, etc.  Each headline gets the
 see [[*Internal Links]].
 
 #+vindex: org-html-self-link-headlines
-When ~org-html-self-link-headlines~ is set to a non-~nil~ value, the
-text of the headlines is also wrapped in =<a>= tags.  These tags have
-a =href= attribute making the headlines link to themselves.
+Headlines can contain a link to themselves.  To enable it, you can:
+
+- Set the variable ~org-html-self-link-headlines~ to a non-~nil~ value
+- In an Org file, use ~html-self-link-headlines~ option
+  : #+OPTIONS: html-self-link-headlines:t
+
+
+#+texinfo: @noindent
+When enabled, the text of the headlines is wrapped in =<a>= tags.
+These tags have a =href= attribute making the headlines link to
+themselves.
 
 *** Links in HTML export
 :PROPERTIES:
@@ -13574,6 +13755,11 @@ following lines before the table in the Org file:
 ,#+ATTR_HTML: :border 2 :rules all :frame border
 #+end_example
 
+Note that table attributes are deprecated in HTML5 in favor of CSS.
+When the doctype is set to HTML5 (see [[*HTML doctypes]]), Org ignores
+~org-html-table-default-attributes~.  =#+ATTR_HTML:= is still
+respected, but not recommended.
+
 The HTML export backend preserves column groupings in Org tables (see
 [[*Column Groups]]) when exporting to HTML.
 
@@ -13632,11 +13818,13 @@ backend by default in-lines that image.  For example:
 =the image=.  For more details, see the variable
 ~org-html-inline-images~.
 
+#+vindex: org-html-inline-image-rules
 On the other hand, if the description part of the Org link is itself
-another link, such as =file:= or =https:= URL pointing to an image, the
-HTML export backend in-lines this image and links to the main image.
-This Org syntax enables the backend to link low-resolution thumbnail
-to the high-resolution version of the image, as shown in this example:
+another link, such as =file:= or =https:= URL pointing to an image
+(the exact rule is defined in ~org-html-inline-image-rules~), the HTML
+export backend in-lines this image and links to the main image.  This
+Org syntax enables the backend to link low-resolution thumbnail to the
+high-resolution version of the image, as shown in this example:
 
 : [[file:highres.jpg][file:thumb.jpg]]
 
@@ -13665,15 +13853,15 @@ as-is.
 #+cindex: dvisvgm
 #+cindex: ImageMagick
 
-#+vindex: org-html-mathjax-options~
+#+vindex: org-html-mathjax-options
 LaTeX math snippets (see [[*LaTeX fragments]]) can be displayed in two
 different ways on HTML pages.  The default is to use the
 [[https://www.mathjax.org][MathJax]], which should work out of the box
 with Org[fn:: By default, Org loads MathJax from
 [[https://www.jsdelivr.com/][jsDelivr]], as recommended in
 [[https://docs.mathjax.org/en/latest/web/start.html][Getting Started
-with MathJax Components]].][fn:47].  Some MathJax display options can
-be configured via ~org-html-mathjax-options~, or in the buffer.  For
+with MathJax Components]].][fn:47].  Some MathJax options can be
+configured via ~org-html-mathjax-options~, or in the buffer.  For
 example, with the following settings,
 
 #+begin_example
@@ -13682,11 +13870,17 @@ example, with the following settings,
 
 #+texinfo: @noindent
 equation labels are displayed on the left margin and equations are
-five em from the left margin.
+five ems from the left margin.
+
+To use a local copy of MathJax, use =path= option:
+
+#+begin_example
+,#+HTML_MATHJAX: path:the/path/to/mathjax.js
+#+end_example
 
 #+vindex: org-html-mathjax-template
 See the docstring of ~org-html-mathjax-options~ for all supported
-variables.  The MathJax template can be configure via
+variables.  The MathJax template can be configured via
 ~org-html-mathjax-template~.
 
 If you prefer, you can also request that LaTeX fragments are processed
@@ -13821,7 +14015,7 @@ styles for a particular headline, you can use the ID specified in
 a =CUSTOM_ID= property.  You can also assign a specific class to
 a headline with the =HTML_HEADLINE_CLASS= property.
 
-Never change the ~org-html-style-default~ constant.  Instead use other
+Never change the ~org-html-style-default~ constant.  Instead, use other
 simpler ways of customizing as described above.
 
 *** JavaScript supported display of web pages
@@ -13887,7 +14081,7 @@ options described below:
 - =ftoc:= ::
 
   Does the CSS of the page specify a fixed position for the "toc"?  If
-  yes, the toc is displayed as a section.
+  yes, the TOC is displayed as a section.
 
 - =ltoc:= ::
 
@@ -13977,7 +14171,7 @@ from https://mirrors.ctan.org/info/latex-doc-ptr/latex-doc-ptr.pdf]
   any buffer.
 
 #+vindex: org-latex-compiler
-#+vindex: org-latex-bibtex-compiler
+#+vindex: org-latex-bib-compiler
 #+vindex: org-latex-default-packages-alist
 #+cindex: pdflatex
 #+cindex: xelatex
@@ -13990,7 +14184,7 @@ LaTeX export backend finds the compiler version to use from
 ~org-latex-compiler~ variable or the =#+LATEX_COMPILER= keyword in the
 Org file.  See the docstring for the
 ~org-latex-default-packages-alist~ for loading packages with certain
-compilers.  Also see ~org-latex-bibtex-compiler~ to set the
+compilers.  Also see ~org-latex-bib-compiler~ to set the
 bibliography compiler[fn:48].
 
 *** LaTeX specific export settings
@@ -14021,7 +14215,7 @@ general options (see [[*Export Settings]]).
   #+vindex: org-export-default-language
 
   Language code of the primary document language.  When =LANGUAGE=
-  keyword is not not specified use the value of
+  keyword is not specified use the value of
   ~org-export-default-language~ (by default - =en=, American English)
 
   The list of language codes supported by Org is stored in the
@@ -14075,6 +14269,11 @@ general options (see [[*Export Settings]]).
   hyperref settings.  See ~org-latex-classes~ for adjusting the
   structure and order of the LaTeX headers.
 
+- =LATEX_CLASS_PRE= ::
+
+  #+cindex: @samp{LATEX_CLASS_PRE}, keyword
+  Arbitrary lines to prepend before the LaTeX preamble.
+
 - =KEYWORDS= ::
 
   #+cindex: @samp{KEYWORDS}, keyword
@@ -14094,7 +14293,7 @@ general options (see [[*Export Settings]]).
   #+vindex: org-latex-subtitle-format
   The document's subtitle.  It is typeset as per
   ~org-latex-subtitle-format~.  If ~org-latex-subtitle-separate~ is
-  non-~nil~, it is typed outside of the ~\title~ macro.  See
+  non-~nil~, it is typed outside the ~\title~ macro.  See
   ~org-latex-hyperref-template~ for customizing metadata items.  See
   ~org-latex-title-command~ for typesetting description into the
   document's front matter.
@@ -14166,6 +14365,16 @@ A sample Org file with the above headers:
   some more text
 #+end_example
 
+#+cindex: @samp{LATEX_CLASS_PRE}, keyword
+The LaTeX export backend prepends values from =LATEX_CLASS_PRE=
+keywords before the LaTeX preamble. Use this option when you want to
+set the values passed to packages included in the document class. For
+example, to use extended names for the ~xcolor~ package, use
+
+#+begin_example
+,#+LATEX_CLASS_PRE: \PassOptionsToPackage{dvipsnames}{xcolor}
+#+end_example
+
 #+cindex: @samp{LANGUAGE}, keyword
 #+vindex: org-export-default-language
 LaTeX packages =babel= or =polyglossia= can also be loaded in a
@@ -14214,6 +14423,18 @@ This would produce in LaTeX (with the actual =polyglossia= syntax):
 \setotherlanguage{french}
 #+end_example
 
+#+vindex: org-latex-use-sans
+The LaTeX backend normally exports using the Roman font family
+specified in the document class or by the user in the
+=LATEX_HEADER=. Setting the option ~org-latex-use-sans~ to =t= will
+force the LaTeX compiler to use the Sans font as default. You can also
+include it in the document options with:
+
+#+begin_example
+#+OPTIONS: latex-use-sans:t
+#+end_example
+
+
 *** Quoting LaTeX code
 :PROPERTIES:
 :DESCRIPTION: Incorporating literal @LaTeX{} code.
@@ -14222,7 +14443,7 @@ This would produce in LaTeX (with the actual =polyglossia= syntax):
 When the available LaTeX export customizations are not sufficient to
 fine-tune the desired output, it is possible to insert any arbitrary
 LaTeX code (see [[*Embedded LaTeX]]).  There are three ways to embed such
-code in the Org file and they all use different quoting syntax.
+code in the Org file, and they all use different quoting syntax.
 
 #+cindex: inline, in @LaTeX{} export
 Inserting in-line quoted with @ symbols:
@@ -14347,7 +14568,7 @@ include:
   =:math-arguments= comes in use for matrix macros that require more
   than one argument, such as =qbordermatrix=.
 
-LaTeX table attributes help formatting tables for a wide range of
+LaTeX table attributes help to format tables for a wide range of
 situations, such as matrix product or spanning multiple pages:
 
 #+begin_example
@@ -14383,7 +14604,7 @@ Set the caption with the LaTeX command
 The LaTeX export backend processes image links in Org files that do
 not have descriptions, such as these links =[[file:img.jpg]]= or
 =[[./img.jpg]]=, as direct image insertions in the final PDF output.  In
-the PDF, they are no longer links but actual images embedded on the
+the PDF, they are no longer links, but actual images embedded on the
 page.  The LaTeX export backend uses =\includegraphics= macro to
 insert the image.  But for TikZ (https://sourceforge.net/projects/pgf/)
 images, the backend uses an ~\input~ macro wrapped within
@@ -14749,6 +14970,42 @@ some text in German...
 \end{foreigndisplayquote}
 #+end_example
 
+*** Controlling the way the table of contents is generated
+#+cindex: LaTeX ToC export
+
+When exporting your document to LaTeX, only numbered sections will be
+included. This is closer to LaTeX and different to how other exporters
+work (see [[*Table of Contents]]). If you need an unnumbered section
+to appear in the table of contents, use the property =UNNUMBERED= and
+set it to =toc=:
+
+#+begin_example
+:PROPERTIES:
+:UNNUMBERED: toc
+:END:
+#+end_example
+
+#+cindex: LaTeX ToC export a la ~org~
+#+cindex: @samp{org-latex-toc-include-unnumbered}
+If you want the LaTeX exporter to behave like other exporters,
+customise the variable ~org-latex-toc-include-unnumbered~ and
+set it to ~t~:
+
+#+begin_example
+(setq org-latex-toc-include-unnumbered t)
+#+end_example
+
+or add this setting in the local variables.
+
+In this case, unnumbered sections will be included in the table of
+contents, unless you set the =UNNUMBERED= property to =notoc=:
+
+#+begin_example
+:PROPERTIES:
+:UNNUMBERED: notoc
+:END:
+#+end_example
+
 ** Markdown Export
 :PROPERTIES:
 :DESCRIPTION: Exporting to Markdown.
@@ -14764,7 +15021,7 @@ Since "md" backend is built on top of the HTML backend (see [[*HTML
 Export]]), it converts every Org construct not defined in Markdown
 syntax, such as tables, to HTML.
 
-Do note that the original markdown syntax has differences with other
+Do note that the original Markdown syntax has differences with other
 commonly used Markdown flavors.  See
 https://en.wikipedia.org/wiki/Markdown for more details.
 
@@ -14940,7 +15197,7 @@ way to extend (see [[*ODT export commands]]).
 :UNNUMBERED: notoc
 :END:
 
-The Org export backend is made to be inter-operable with a wide range
+The Org export backend is made to be interoperable with a wide range
 of text document format converters.  Newer generation converters, such
 as LibreOffice and Pandoc, can handle hundreds of formats at once.
 Org provides a consistent interaction with whatever converter is
@@ -15457,7 +15714,7 @@ factory styles used by the exporter.
   - =FILE.odt= or =FILE.ott= and a subset of included files ::
 
     Use the =styles.xml= contained in the specified OpenDocument Text
-    or Template file.  Additionally extract the specified member files
+    or Template file.  Additionally, extract the specified member files
     and embed those within the final ODT document.
 
     Use this option if the =styles.xml= file references additional
@@ -16164,7 +16421,7 @@ This option controls how exactly @code{do-something} does its thing.
 #+end_example
 
 #+texinfo: @noindent
-Command in parenthesis, as done above, is optional.
+Command in parentheses, as done above, is optional.
 
 *** Tables in Texinfo export
 :PROPERTIES:
@@ -16378,6 +16635,12 @@ certain built-in types (see ~icalendar-export-sexp-enumerate-all~),
 are exported up to ~icalendar-export-sexp-enumeration-days~ into
 future.].
 
+#+vindex: org-agenda-default-appointment-duration
+If a timestamp contains a time, but doesn't have an explicit end time
+(i.e. time range), then by default the exported event will have a
+duration of 2 hours, but this can be overridden with
+~org-agenda-default-appointment-duration~.
+
 #+vindex: org-icalendar-include-todo
 The iCalendar export backend can also incorporate TODO entries based
 on the configuration of the ~org-icalendar-include-todo~ variable.
@@ -16457,12 +16720,12 @@ multi-line summary, location, or description using =<PROPERTY>+=
 syntax (see [[*Property Syntax]]):
 
 : * Meeting at location with multi-line address
-: <2024-01-08 Mon 14:20-15:00>
 : :PROPERTIES:
 : :LOCATION:  Someplace
 : :LOCATION+: Some Street 5
 : :LOCATION+: 12345 Small Town
 : :END:
+: <2024-01-08 Mon 14:20-15:00>
 
 #+vindex: org-icalendar-include-body
 When Org entries do not have =SUMMARY=, =DESCRIPTION=, =LOCATION= and
@@ -16482,7 +16745,7 @@ The =CLASS= property can be used to specify a per-entry visibility
 class or access restrictions, and is applied to any entry with class
 information.  The iCalendar standard defines three visibility classes:
 - =PUBLIC= :: The entry is publicly visible (this is the default).
-- =CONFIDENTIAL= :: Only a limited group of clients get access to the
+- =CONFIDENTIAL= :: Only a limited group of clients gets access to the
   event.
 - =PRIVATE= :: The entry can be retrieved only by its owner.
 The server should treat unknown class properties the same as
@@ -16532,6 +16795,7 @@ for usage and configuration details.
 #+vindex: org-export-before-processing-hook
 #+vindex: org-export-before-processing-functions
 #+vindex: org-export-before-parsing-hook
+#+vindex: org-export-before-parsing-functions
 The export process executes two hooks before the actual exporting
 begins.  The first hook, ~org-export-before-processing-functions~,
 runs before any expansions of macros, Babel code, and include keywords
@@ -16644,7 +16908,7 @@ debugging.
 :END:
 
 #+findex: org-export-as
-Org mode export is a multi-step process that works on a temporary copy
+Org mode export is a multistep process that works on a temporary copy
 of the buffer.  The export process consists of 4 major steps:
 
 1. Process the temporary copy, making necessary changes to the buffer
@@ -16675,7 +16939,8 @@ export keywords, does not contribute to the export output.]:
 3. Remove commented subtrees in the whole buffer (see [[*Comment
    Lines]]);
 
-4. Replace macros in the whole buffer (see [[*Macro Replacement]]);
+4. Replace macros in the whole buffer (see [[*Macro Replacement]]),
+   unless ~org-export-replace-macros~ is nil;
 
 5. When ~org-export-use-babel~ is non-nil (default), process code
    blocks:
@@ -16730,7 +16995,7 @@ Parse the temporary buffer, creating AST:
 
    - Clocks, drawers, fixed-width environments, footnotes, LaTeX
      environments and fragments, node properties, planning lines,
-     property drawers, statistics cookies, timestamps, etc according
+     property drawers, statistics cookies, timestamps, etc. according
      to =#+OPTIONS= keyword (see [[*Export Settings]]);
 
    - Table rows containing width and alignment markers, unless the
@@ -16797,7 +17062,7 @@ Post-process the exported text:
 :END:
 
 Some parts of the conversion process can be extended for certain
-elements so as to introduce a new or revised translation.  That is how
+elements to introduce a new or revised translation.  That is how
 the HTML export backend was extended to handle Markdown format.  The
 extensions work seamlessly so any aspect of filtering not done by the
 extended backend is handled by the original backend.  Of all the
@@ -16978,7 +17243,7 @@ where to put published files.
 - ~:publishing-directory~ ::
 
   Directory where output files are published.  You can directly
-  publish to a webserver using a file name syntax appropriate for the
+  publish to a web server using a file name syntax appropriate for the
   Emacs tramp package.  Or you can publish to a local directory and
   use external tools to upload your website (see [[*Uploading Files]]).
 
@@ -17061,7 +17326,7 @@ non-Org files, you always need to specify the publishing function:
 
 - ~:htmlized-source~ ::
 
-  Non-~nil~ means, publish htmlized source.
+  Non-~nil~ means, publish an htmlized version of the source.
 
 The function must accept three arguments: a property list containing
 at least a ~:publishing-directory~ property, the name of the file to
@@ -17367,7 +17632,7 @@ to include attachments such as JPG, CSS or PNG files in the project
 definition since the third-party tool syncs them.
 
 Publishing to a local directory is also much faster than to a remote
-one, so that you can afford more easily to republish entire projects.
+one, so that you can more easily afford to republish entire projects.
 If you set ~org-publish-use-timestamps-flag~ to ~nil~, you gain the
 main benefit of re-including any changed external files such as source
 example files you might include with =INCLUDE= keyword.  The timestamp
@@ -17517,7 +17782,7 @@ resources.  For example, consider the following Org mode snippet
 : Org mode is used by various communities [cite:teaching: @orgteaching;
 : and TeX: @orgtex].  [cite/author/caps:@orgtex] uses Org mode to simplify
 : writing scientific publications, while [cite/author/caps:@orgteaching]
-: experiment with Org babel to improve teaching.
+: experiments with Org babel to improve teaching.
 :
 : #+print_bibliography:
 
@@ -17664,8 +17929,8 @@ Org currently includes the following export processors:
     large number of publishers' styles).  It only supports LaTeX's
     =\cite= and =\nocite= commands.
 
-  - natbib :: as with the bibtex processor, but using the LaTeX
-    package =natbib=, allowing more stylistic variants that LaTeX's
+  - natbib :: as with the =bibtex= processor, but using the LaTeX
+    package =natbib=, allowing more stylistic variants than LaTeX's
     =\cite= command.
 
   - biblatex :: this backend allows the use of data and formats
@@ -17893,7 +18158,7 @@ A source code block conforms to this structure:
 ,#+END_SRC
 #+end_example
 
-Do not be put-off by having to remember the source block syntax.  Org
+Do not be put off by having to remember the source block syntax.  Org
 mode offers a command for wrapping existing text in a block (see
 [[*Structure Templates]]).  Org also works with other completion systems
 in Emacs, some of which predate Org and have custom domain-specific
@@ -17912,7 +18177,7 @@ or
 
 - =#+NAME: <name>= ::
 
-  Optional.  Names the source block so it can be called, like
+  Optional.  Names the source block, so it can be called, like
   a function, from other source blocks or inline code to evaluate or
   to capture the results.  Code from other blocks, other files, and
   from table formulas (see [[*The Spreadsheet]]) can use the name to
@@ -17934,7 +18199,8 @@ or
   block.  See [[*Languages]], for identifiers of supported languages.
 
   When =<language>= identifier is omitted, the block also cannot
-  have =<switches>= and =<header arguments>=.
+  have =<switches>= and =<header arguments>=.  Otherwise, the first
+  switch/argument will be treated as =<language>=.
 
   Language identifier is also used to fontify code blocks in Org
   buffers, when ~org-src-fontify-natively~ is set to non-~nil~.  See
@@ -18027,7 +18293,7 @@ Org expand =:noweb= references by default.
             (assq-delete-all :noweb org-babel-default-header-args)))
 #+end_src
 
-#+cindex: language specific default header arguments
+#+cindex: language-specific default header arguments
 #+cindex: default header arguments per language
 Each language can have separate default header arguments by
 customizing the variable ~org-babel-default-header-args:<LANG>~, where
@@ -18076,7 +18342,7 @@ Properties defined through ~org-set-property~ function, bound to
 {{{kbd(C-c C-x p)}}}, apply to all active languages.  They override
 properties set in ~org-babel-default-header-args~.
 
-#+cindex: language specific header arguments properties
+#+cindex: language-specific header arguments properties
 #+cindex: header arguments per language
 Language-specific header arguments are also read from properties
 =header-args:<LANG>= where {{{var(<LANG>)}}} is the language
@@ -18554,11 +18820,12 @@ variable ~default-directory~.  Setting =mkdirp= header argument to
 a non-~nil~ value creates the directory, if necessary.
 
 Setting =dir= to the symbol ~attach~ or the string ~"'attach"~ will
-set =dir= to the directory returned by ~(org-attach-dir)~, set =:mkdir
-yes=, and insert any file paths, as when using =:results file=, which
-are under the node's attachment directory using =attachment:= links
-instead of the usual =file:= links.  Any returned path outside of the
-attachment directory will use =file:= links as per usual.
+set =dir= to the directory returned by ~(org-attach-dir)~, set
+=:mkdirp yes=, and insert any file paths, as when using =:results
+file=, which are under the node's attachment directory using
+=attachment:= links instead of the usual =file:= links.  Any returned
+path outside the attachment directory will use =file:= links as per
+usual.
 
 For example, to save the plot file in the =Work/= folder of the home
 directory---notice tilde is expanded:
@@ -18626,9 +18893,9 @@ to the end of the code block for execution.
 #+cindex: @samp{RESULTS}, keyword
 
 A note about security: With code evaluation comes the risk of harm.
-Org safeguards by prompting for user's permission before executing any
-code in the source block.  To customize this safeguard, or disable it,
-see [[*Code Evaluation and Security Issues]].
+Org provides safeguards by prompting for the user's permission before
+executing any code.  To customize this safeguard, or disable it, see
+[[*Code Evaluation and Security Issues]].
 
 *** How to evaluate source code
 :PROPERTIES:
@@ -19063,7 +19330,7 @@ follows from the type specified above.
   When used along with =file= type, the result is a link to the file
   specified in =:file= header argument.  However, unlike plain =file=
   type, code block output is not written to the disk.  The block is
-  expected to generate the file by its side-effects only, as in the
+  expected to generate the file by its side effects only, as in the
   following example:
 
   #+begin_example
@@ -19093,10 +19360,10 @@ follows from the type specified above.
 
 #+cindex: @samp{wrap}, header argument
 The =wrap= header argument unconditionally marks the results block by
-appending strings to =#+BEGIN_= and =#+END_=.  If no string is
-specified, Org wraps the results in a =#+BEGIN_results=
-... =#+END_results= block.  It takes precedent over the =results=
-value listed above.  E.g.,
+appending strings to =#+BEGIN_= and =#+END_=, except if the value is
+=nil= or =no=.  If no string is specified, Org wraps the results in a
+=#+BEGIN_results= ... =#+END_results= block.  It takes precedent over
+the =results= value listed above.  E.g.,
 
 #+begin_example
 ,#+BEGIN_SRC emacs-lisp :results html :wrap EXPORT markdown
@@ -19238,7 +19505,7 @@ blocks, see [[*Literal Examples]].  To selectively export subtrees of an
 Org document, see [[*Exporting]].
 
 #+cindex: @samp{exports}, header argument
-The =exports= header argument is to specify if that part of the Org
+The =exports= header argument specifies whether that part of the Org
 file is exported to, say, HTML or LaTeX formats.
 
 - =code= ::
@@ -19248,7 +19515,7 @@ file is exported to, say, HTML or LaTeX formats.
 
 - =results= ::
 
-  The results of evaluation of the code is included in the exported
+  The results of evaluation of the code are included in the exported
   file.  Example: =:exports results=.
 
 - =both= ::
@@ -19258,17 +19525,17 @@ file is exported to, say, HTML or LaTeX formats.
 
 - =none= ::
 
-  Neither the code nor the results of evaluation is included in the
+  Neither the code nor the results of evaluation are included in the
   exported file.  Whether the code is evaluated at all depends on
   other options.  Example: =:exports none=.
 
-If a source block is named using =NAME= keyword, the same name will be
+If a source block is named using the =NAME= keyword, the same name will be
 assigned to the results of evaluation.  This way, fuzzy links pointing
 to the named source blocks exported using =:exports results= will
 remain valid and point to the results of evaluation.
 
 Results of evaluation of a named block can also be explicitly named
-using a separate =NAME= keyword.  The name value set via =NAME=
+using a separate =NAME= keyword.  The name value set via the =NAME=
 keyword will be preferred over the parent source block.
 
 : #+NAME: code name
@@ -19284,23 +19551,31 @@ keyword will be preferred over the parent source block.
 : Another [[results name][link]] will point to the results.
 
 Explicit setting of the result name may be necessary when a named code
-block is exported using =:exports both=.  Links to such block may
-arbitrarily point either to the code block or to its results when
-results do not have a distinct name.
+block is exported using =:exports both=.  Links to such a block may
+point arbitrarily either to the code block or to its results when
+the results do not have a distinct name.
 
 Note that all the links pointing to a source block exported using
-=:exports none= will be broken.  This will make export process fail,
+=:exports none= will be broken.  This will cause the export process to fail,
 unless broken links are allowed during export (see [[*Export Settings]]).
 
 #+vindex: org-export-use-babel
-To stop Org from evaluating code blocks to speed exports, use the
-header argument =:eval never-export= (see [[*Evaluating Code Blocks]]).
-To stop Org from evaluating code blocks for greater security, set the
-~org-export-use-babel~ variable to ~nil~, but understand that header
-arguments will have no effect.
+You can prevent Org from evaluating code blocks for speed or security
+reasons:
+
+- To speed up export, use the header argument =:eval never-export=
+  (see [[*Evaluating Code Blocks]]).
+- For greater security, set the ~org-export-use-babel~ variable to
+  ~nil~, but understand that header arguments will have no effect in
+  this case.
+
+If results of evaluation are not marked for export (=:exports code= or
+=:exports none=), Org will not evaluate them, even for =:eval yes=.
+The only exception is when a code block uses =:session= - such blocks
+are evaluated according to their =:eval= header argument.
 
 Turning off evaluation comes in handy when batch processing.  For
-example, markup languages for wikis, which have a high risk of
+example, markup languages for wikis have a high risk of
 untrusted code.  Stopping code block evaluation also stops evaluation
 of all header arguments of the code block.  This may not be desirable
 in some circumstances.  So during export, to allow evaluation of just
@@ -19362,6 +19637,10 @@ to source file(s).
   file name as being relative to the directory of the Org file's
   location.  Example: =:tangle FILENAME=.
 
+#+cindex: comment trees
+Additionally, code blocks inside commented subtrees (see [[*Comment
+Lines]]) are never exported.
+
 #+cindex: @samp{mkdirp}, header argument
 The =mkdirp= header argument creates parent directories for tangled
 files if the directory does not exist.  A =yes= value enables
@@ -19381,6 +19660,14 @@ already exist in the code block.
   Wrap the code block in comments.  Include links pointing back to the
   place in the Org file from where the code was tangled.
 
+  #+findex: org-store-link
+  #+vindex: org-id-link-to-org-use-id
+  Do note that Org will use ~org-store-link~ ([[*Handling Links]]) to
+  store link to code block.  Such link may not be unique if the parent
+  heading title is a duplicate of earlier heading or changes after
+  tangling.  We recommend setting ~org-id-link-to-org-use-id~ to t to
+  make sure that the link points to the correct heading.
+
 - =yes= ::
 
   Kept for backward compatibility; same as =link=.
@@ -19434,7 +19721,7 @@ unexpected results (=444= is the same as =o674=).
 Two other shorthands are recognized, ls-style strings like
 =rw-r--r--=, and chmod-style permissions like =g+w=.
 Note that chmod-style permissions are based on
-~org-babel-tangle-default-file-mode~, which is =#o544= by default.
+~org-babel-tangle-default-file-mode~, which is =#o644= by default.
 
 When =:tangle-mode= and =:shebang= are both specified, the give
 =:tangle-mode= will override the permissions from =:shebang=.  When
@@ -19443,7 +19730,7 @@ multiple source code blocks tangle to a single file with conflicting
 
 #+cindex: @samp{no-expand}, header argument
 By default Org expands code blocks during tangling.  The =no-expand=
-header argument turns off such expansions.  Note that one side-effect
+header argument turns off such expansions.  Note that one side effect
 of expansion by ~org-babel-expand-src-block~ also assigns values (see
 [[*Environment of a Code Block]]) to variables.  Expansions also replace
 noweb references with their targets (see [[*Noweb Reference Syntax]]).
@@ -19526,7 +19813,7 @@ code block header arguments:
 #+cindex: code block, languages
 
 Code blocks in dozens of languages are supported.  See Worg website
-for [[https://orgmode.org/worg/org-contrib/babel/languages/index.html][language specific documentation]].
+for [[https://orgmode.org/worg/org-contrib/babel/languages/index.html][language-specific documentation]].
 
 #+vindex: org-babel-load-languages
 By default, only Emacs Lisp is enabled for evaluation.  To enable or
@@ -19582,14 +19869,13 @@ group ~org-edit-structure~.
 - ~org-src-lang-modes~ ::
 
   #+vindex: org-src-lang-modes
-  If an Emacs major-mode named ~<LANG>-mode~ exists, where
+  If an Emacs major mode named ~<LANG>-mode~ exists, where
   {{{var(<LANG>)}}} is the language identifier from code block's
-  header line, then the edit buffer uses that major mode.  Use this
+  header line, then the edit buffer uses that major mode.  If the
+  major mode does not exist, or the language identifier is omitted,
+  then the edit buffer falls back to Fundamental mode.  Use this
   variable to arbitrarily map language identifiers to major modes.
 
-  When language identifier is omitted in the src block, Org mode's
-  behavior is undefined.
-
 - ~org-src-window-setup~ ::
 
   #+vindex: org-src-window-setup
@@ -20243,11 +20529,11 @@ including the user-defined ones.
 #+cindex: odd-levels-only outlines
 #+cindex: clean outline view
 
-Org's outline with stars and no indents can look cluttered for short
-documents.  For /book-like/ long documents, the effect is not as
-noticeable.  Org provides an alternate stars and indentation scheme,
-as shown on the right in the following table.  It displays only one
-star and indents text to line up with the heading:
+Org's outline, with its stars and lack of indents, can look cluttered
+in short documents. For /book-like/ long documents, the effect is not
+as noticeable.  Org provides an alternate stars and indentation
+scheme, as shown on the right in the following table.  It displays
+only one star and indents text to line up with the heading:
 
 #+begin_example
 ,* Top level headline             |    * Top level headline
@@ -20410,7 +20696,7 @@ option ~org-startup-numerated~ to =t=, or locally on a file by using
 #+cindex: @kbd{C-c C-c}, overview
 
 The {{{kbd(C-c C-c)}}} key in Org serves many purposes depending on
-the context.  It is probably the most over-worked, multi-purpose key
+the context.  It is probably the most over-worked, multipurpose key
 combination in Org.  Its uses are well documented throughout this
 manual, but here is a consolidated list for easy reference.
 
@@ -20421,7 +20707,7 @@ manual, but here is a consolidated list for easy reference.
 
 - If point is in one of the special =KEYWORD= lines, scan the buffer
   for these lines and update the information.  Also reset the Org file
-  cache used to temporary store the contents of URLs used as values
+  cache used to temporarily store the contents of URLs used as values
   for keywords like =SETUPFILE=.
 
 - If point is inside a table, realign the table.
@@ -20526,7 +20812,7 @@ changes.
   #+vindex: org-priority-lowest
   #+vindex: org-priority-default
   This line sets the limits and the default for the priorities.  All
-  three must be either letters A--Z or numbers 0--9.  The highest
+  three must be either letters A--Z or numbers 0--64.  The highest
   priority must have a lower ASCII number than the lowest priority.
 
 - =#+PROPERTY: Property_Name Value= ::
@@ -20822,7 +21108,7 @@ should really read as plain text.  Org may use a specific escape
 character in some situations, i.e., a backslash in macros (see [[*Macro
 Replacement]]) and links (see [[*Link Format]]), or a comma in source and
 example blocks (see [[*Literal Examples]]).  In the general case, however,
-we suggest to use the zero width space.  You can insert one with any
+we suggest using the zero width space.  You can insert one with any
 of the following:
 
 : C-x 8 <RET> zero width space <RET>
@@ -21016,10 +21302,10 @@ In Emacs, shift-selection combines motions of point with shift key to
 enlarge regions.  Emacs sets this mode by default.  This conflicts
 with Org's use of {{{kbd(S-<cursor>)}}} commands to change timestamps,
 TODO keywords, priorities, and item bullet types, etc.  Since
-{{{kbd(S-<cursor>)}}} commands outside of specific contexts do not do
+{{{kbd(S-<cursor>)}}} commands outside specific contexts do not do
 anything, Org offers the variable ~org-support-shift-select~ for
 customization.  Org mode accommodates shift selection by (i) making it
-available outside of the special contexts where special commands
+available outside the special contexts where special commands
 apply, and (ii) extending an existing active region even if point
 moves across a special context.
 
@@ -21102,7 +21388,7 @@ moves across a special context.
   #+cindex: @file{yasnippet.el}
   The way Org mode binds the {{{kbd(TAB)}}} key (binding to ~[tab]~
   instead of ~"\t"~) overrules YASnippet's access to this key.  The
-  following code fixed this problem:
+  following code fixes this problem:
 
   #+begin_src emacs-lisp
   (add-hook 'org-mode-hook
@@ -21232,14 +21518,14 @@ name, e.g., =Org: store-link= and enter this as /Location/:
 
 #+begin_example
 javascript:location.href='org-protocol://store-link?' +
-      new URLSearchParams({url:location.href, title:document.title});
+      new URLSearchParams({url:location.href, title:document.title});void(0);
 #+end_example
 
 Title is an optional parameter.  Another expression was recommended earlier:
 
 #+begin_example
 javascript:location.href='org-protocol://store-link?url='+
-      encodeURIComponent(location.href);
+      encodeURIComponent(location.href);void(0);
 #+end_example
 
 The latter form is compatible with older Org versions from 9.0 to 9.4.
@@ -21252,7 +21538,7 @@ The latter form is compatible with older Org versions from 9.0 to 9.4.
 #+cindex: protocol, capture
 
 Activating the "capture" handler pops up a =Capture= buffer in Emacs,
-using acapture template.
+using a capture template.
 
 : emacsclient "org-protocol://capture?template=X&url=URL&title=TITLE&body=BODY"
 
@@ -21264,6 +21550,7 @@ javascript:location.href='org-protocol://capture?' +
       new URLSearchParams({
             template: 'x', url: window.location.href,
             title: document.title, body: window.getSelection()});
+      void(0);
 #+end_example
 
 You might have seen another expression:
@@ -21272,7 +21559,7 @@ You might have seen another expression:
 javascript:location.href='org-protocol://capture?template=x'+
       '&url='+encodeURIComponent(window.location.href)+
       '&title='+encodeURIComponent(document.title)+
-      '&body='+encodeURIComponent(window.getSelection());
+      '&body='+encodeURIComponent(window.getSelection());void(0);
 #+end_example
 
 It is a bit more cluttered than the former one, but it is compatible
@@ -21304,8 +21591,8 @@ sources when reading a document.  To that effect, you can use
 a bookmark with the following location:
 
 #+begin_example
-javascript:location.href='org-protocol://open-source?&url='+
-      encodeURIComponent(location.href)
+javascript:location.href='org-protocol://open-source?url='+
+      encodeURIComponent(location.href);void(0)
 #+end_example
 
 #+vindex: org-protocol-project-alist
@@ -21365,8 +21652,7 @@ adding ~:rewrites~ rules like this:
 
 #+texinfo: @noindent
 Since =example.com/$= is used as a regular expression, it maps
-=https://example.com/=, =https://example.com=,
-=https://www.example.com/= and similar to
+=https://example.com/=, =https://www.example.com/= and similar to
 =/home/user/example/index.php=.
 
 The ~:rewrites~ rules are searched as a last resort if and only if no
@@ -21597,13 +21883,15 @@ value as ~org-attach-method~ (~cp~ by default).]
 
 #+cindex: pasting files, images from clipboard
 Starting from Emacs 29, Org mode supports ~yank-media~ command to yank
-images from the clipboard and files from a file manager.
+images from the clipboard, files from a file manager and tables copied
+from LibreOffice Calc documents.
 
 #+vindex: org-yank-image-save-method
 When yanking images from clipboard, Org saves the image on disk and
-inserts the image link to Org buffer.  Images are either saved as
-attachments to heading (default) or to a globally defined directory.
-The save location is controlled by ~org-yank-image-save-method~.
+inserts the image link to Org buffer.  Images can be saved as
+attachments to heading (default), to a globally defined directory, or
+to a directory returned by a function call.  The save location is
+controlled by ~org-yank-image-save-method~.
 
 #+vindex: org-yank-image-file-name-function
 The yanked images are saved under automatically generated name.  You
@@ -21615,6 +21903,52 @@ of ~org-yank-dnd-method~.  Image files pasted this way also respect
 the value of ~org-yank-image-save-method~ when the action to perform
 is =attach=.
 
+Tables copied from LibreOffice Calc documents are yanked as Org
+tables.
+
+** Repeating commands
+:PROPERTIES:
+:DESCRIPTION: Repeating navigation commands
+:END:
+
+#+cindex: repeat-mode, org-mode
+#+cindex: repeating navigation commands
+When ~repeat-mode~ is turned on, headline motion commands, link and
+block navigation commands by only pressing a single key.  For example,
+instead of typing {{{kbd(C-c C-n)}}} repeatedly, you can just type
+{{{kbd(C-c C-n n n n p u ...)}}} to move to different headlines.  When
+a key not in the map is pressed, it exits ~repeat-mode~ and the
+command corresponding to the key is executed (see the
+[[info:emacs#Repeating][Emacs user manual]] for more details).
+
+By default, the following commands are made repeatable in separate
+keymaps.
+
+~org-navigation-repeat-map~:
+
+| Command                           | Key binding        | Repeat key   |
+|-----------------------------------+--------------------+--------------|
+| ~org-next-visible-heading~        | {{{kbd(C-c C-n)}}} | {{{kbd(n)}}} |
+| ~org-previous-visible-heading~    | {{{kbd(C-c C-p)}}} | {{{kbd(p)}}} |
+| ~org-forward-heading-same-level~  | {{{kbd(C-c C-f)}}} | {{{kbd(f)}}} |
+| ~org-backward-heading-same-level~ | {{{kbd(C-c C-b)}}} | {{{kbd(b)}}} |
+| ~org-up-heading~                  | {{{kbd(C-c C-u)}}} | {{{kbd(u)}}} |
+
+
+~org-block-navigation-repeat-map~:
+
+| Command              | Key binding        | Repeat key   |
+|----------------------+--------------------+--------------|
+| ~org-next-block~     | {{{kbd(C-c M-f)}}} | {{{kbd(f)}}} |
+| ~org-previous-block~ | {{{kbd(C-c M-b)}}} | {{{kbd(b)}}} |
+
+~org-link-navigation-repeat-map~:
+
+| Command             | Key binding            | Repeat key   |
+|---------------------+------------------------+--------------|
+| ~org-next-link~     | {{{kbd(C-c C-x C-n)}}} | {{{kbd(n)}}} |
+| ~org-previous-link~ | {{{kbd(C-c C-x C-p)}}} | {{{kbd(p)}}} |
+
 * Hacking
 :PROPERTIES:
 :DESCRIPTION: How to hack your way around.
@@ -21631,7 +21965,7 @@ of Org.
 :END:
 #+cindex: hooks
 
-Org has a large number of hook variables for adding functionality.  A
+Org has numerous hook variables for adding functionality.  A
 complete list of hooks with documentation is maintained by the Worg
 project at https://orgmode.org/worg/doc.html#hooks.
 
@@ -21641,7 +21975,7 @@ project at https://orgmode.org/worg/doc.html#hooks.
 :END:
 #+cindex: add-on packages
 
-Various authors wrote a large number of add-on packages for Org.  Some
+Various authors wrote many add-on packages for Org.  Some
 of these packages used to be part of the =org-mode= repository but are
 now hosted in a separate =org-contrib= repository
 [[https://git.sr.ht/~bzg/org-contrib][here]].  A Worg page with more
@@ -21742,15 +22076,76 @@ A review of =ol-man.el=:
    For example, ~org-man-store-link~ is responsible for storing a link
    when ~org-store-link~ (see [[*Handling Links]]) is called from a buffer
    displaying a man page.  It is passed an argument ~interactive?~
-   which this function does not use, but other store functions use to
+   which this function does not use, but other store functions used to
    behave differently when a link is stored interactively by the user.
    It first checks if the major mode is appropriate.  If check fails,
    the function returns ~nil~, which means it isn't responsible for
-   creating a link to the current buffer.  Otherwise the function
+   creating a link to the current buffer.  Otherwise, the function
    makes a link string by combining the =man:= prefix with the man
    topic.  It also provides a default description.  The function
    ~org-insert-link~ can insert it back into an Org buffer later on.
 
+** Adding Hyperlink preview
+:PROPERTIES:
+:DESCRIPTION: Preview behavior for new hyperlink types.
+:END:
+#+cindex: hyperlinks, adding preview behavior
+
+By default, Org supports previewing external links for links of type
+=file= and =attachment= that point to image files. (See [[*Images]].)
+
+Support for previewing other link types inline can be added to Org in
+the following way:
+
+1. Add a =:preview= link parameter to the link type using
+   ~org-link-set-parameters~.  As an example, here we add previews for
+   the =docview= link type.
+
+   #+begin_src emacs-lisp
+(org-link-set-parameters
+ "docview" :preview #'org-link-docview-preview)
+   #+end_src
+
+2. The value of the =:preview= parameter must be a function that
+   accepts three arguments:
+   - an overlay placed from the start to the end of the link,
+   - the link path, as a string, and
+   - the syntax node for the link.
+   It must return a non-nil value to indicate preview success.  A
+   value of =nil= implies that the preview failed, and the overlay
+   placed on the link will be removed.
+
+   In our example, we use the =convert= program (part of the
+   =imagemagick= suite of tools) to create the thumbnail that is
+   displayed inline.
+
+   #+begin_src emacs-lisp
+(defun org-link-docview-preview (ov path _elem)
+  "Preview file at PATH in overlay OV.
+
+_ELEM is the syntax node of the link element."
+  (when (executable-find "convert")
+    (let* ((path (expand-file-name (substitute-in-file-name path)))
+           (output-file (expand-file-name (concat "org-docview-preview-"
+                                                  (substring (sha1 path) 0 10)
+                                                  ".png")
+                                          temporary-file-directory)))
+      ;; Create or find preview for path
+      (when (or (file-readable-p output-file)
+                (= 0 (call-process
+                      "convert"
+                      nil (get-buffer-create "*Org Docview Preview Output*") nil
+                      "-thumbnail" "x320" "-colorspace" "rgb"
+                      "-background" "white" "-alpha" "remove" "-strip"
+                      (concat path "[0]") output-file)))
+        ;; If preview image is available, display it via the overlay
+        (overlay-put ov 'display (create-image output-file))))))
+   #+end_src
+
+3. Now previews of docview links for supported document types (PDF,
+   djvu) are generated (along with image file previews) when calling
+   ~org-link-preview~.
+
 ** Adding Export Backends
 :PROPERTIES:
 :DESCRIPTION: How to write new export backends.
@@ -21862,7 +22257,7 @@ of these strategies:
 - Put the table after an "end" statement.  For example ~\bye~ in TeX
   and ~\end{document}~ in LaTeX.
 
-- Comment and un-comment each line of the table during edits.  The
+- Comment and uncomment each line of the table during edits.  The
   {{{kbd(M-x orgtbl-toggle-comment)}}} command makes toggling easy.
 
 *** A LaTeX example of radio tables
@@ -21916,7 +22311,7 @@ After editing, {{{kbd(C-c C-c)}}} inserts the translated table at the
 target location, between the two marker lines.
 
 For hand-made custom tables, note that the translator needs to skip
-the first two lines of the source table.  Also the command has to
+the first two lines of the source table.  Also, the command has to
 /splice/ out the target table without the header and footer.
 
 #+begin_example
@@ -22123,11 +22518,11 @@ For a global condition applicable to agenda views, use the
 condition with ~org-agenda-skip-function~ for custom searching.
 
 This example defines a function for a custom view showing TODO items
-with =waiting= status.  Manually this is a multi-step search process,
+with =waiting= status.  Manually this is a multistep search process,
 but with a custom view, this can be automated as follows:
 
 The custom function searches the subtree for the =waiting= tag and
-returns ~nil~ on match.  Otherwise it gives the location from where
+returns ~nil~ on match.  Otherwise, it gives the location from where
 the search continues.
 
 #+begin_src emacs-lisp
@@ -22569,7 +22964,7 @@ skipping facilities.  Valid arguments are:
 #+end_defun
 
 The mapping routine can call any arbitrary function, even functions
-that change meta data or query the property API (see [[*Using the
+that change metadata or query the property API (see [[*Using the
 Property API]]).  Here are some handy functions:
 
 #+attr_texinfo: :options org-todo &optional arg
@@ -22658,11 +23053,11 @@ Before I get to this list, a few special mentions are in order:
 
 - Bastien Guerry ::
 
-  Bastien has written a large number of extensions to Org (most of
+  Bastien has written numerous extensions to Org (most of
   them integrated into the core by now), including the LaTeX exporter
   and the plain list parser.  His support during the early days was
   central to the success of this project.  Bastien also invented Worg,
-  helped establishing the Web presence of Org, and sponsored hosting
+  helped to establish the Web presence of Org, and sponsored hosting
   costs for the orgmode.org website.  Bastien stepped in as maintainer
   of Org between 2011 and 2013, at a time when I desperately needed
   a break.
@@ -22699,42 +23094,32 @@ know what I am missing here!
 :UNNUMBERED: notoc
 :END:
 
-I (Bastien) have been maintaining Org between 2011 and 2013.  This
-appendix would not be complete without adding a few more
-acknowledgments and thanks.
-
-I am first grateful to Carsten for his trust while handing me over the
-maintainership of Org.  His unremitting support is what really helped
-me getting more confident over time, with both the community and the
-code.
-
-When I took over maintainership, I knew I would have to make Org more
-collaborative than ever, as I would have to rely on people that are
-more knowledgeable than I am on many parts of the code.  Here is
-a list of the persons I could rely on, they should really be
-considered co-maintainers, either of the code or the community:
+I started maintaining Org in January 2011 and officially stepped down
+in December 2024, when Ihor Radchenko agreed to become the new Org
+maintainer.  I was active for the first few years, then my involvement
+slowly decreased thanks to the help of new core contributors whom I'd
+like to thank.
 
 - Eric Schulte ::
 
-  Eric is maintaining the Babel parts of Org.  His reactivity here
-  kept me away from worrying about possible bugs here and let me focus
-  on other parts.
+  Eric has been maintaining the Babel parts of Org.  His reactivity
+  here kept me away from worrying about possible bugs here and let me
+  focus on other parts.
 
 - Nicolas Goaziou ::
 
-  Nicolas is maintaining the consistency of the deepest parts of Org.
+  Nicolas was maintaining the consistency of the deepest parts of Org.
   His work on =org-element.el= and =ox.el= has been outstanding, and
-  it opened the doors for many new ideas and features.  He rewrote
-  many of the old exporters to use the new export engine, and helped
-  with documenting this major change.  More importantly (if that's
-  possible), he has been more than reliable during all the work done
-  for Org 8.0, and always very reactive on the mailing list.
+  it opened the doors for many new ideas and features.  He rewrote old
+  exporters and helped with documenting this change.  More importantly
+  (if that's possible), he has been more than reliable during all the
+  work done for Org 8.0.
 
 - Achim Gratz ::
 
   Achim rewrote the building process of Org, turning some /ad hoc/
-  tools into a flexible and conceptually clean process.  He patiently
-  coped with the many hiccups that such a change can create for users.
+  scripts into a stable process.  He patiently coped with the many
+  hiccups that such a change can create for users.
 
 - Nick Dokos ::
 
@@ -22743,10 +23128,31 @@ considered co-maintainers, either of the code or the community:
   overestimate such a great help, and the list would not be so active
   without him.
 
+- Kyle Meyer ::
+
+  Kyle is maintaining [[https://list.orgmode.org][list.orgmode.org]]
+  and takes care of backporting upstream GNU Emacs changes into Org's
+  repository.  He also helped tremendously on the mailing list and in
+  private, patiently answering questions, competently providing advice
+  and solutions.
+
+- Ihor Radchenko ::
+
+  Ihor became Org maintainer in December 2024, and I'm very grateful
+  to him for agreeing to take on this role.  His responsiveness on the
+  mailing list, his determination to improve Org as a core format and
+  an ecosystem of tools, his clarity about strategic changes that need
+  to be made make him an asset for the Org community.
+
 I received support from so many users that it is clearly impossible to
 be fair when shortlisting a few of them, but Org's history would not
 be complete if the ones above were not mentioned in this manual.
 
+Of course, I'm also grateful grateful to Carsten for his trust while
+handing me over the maintainership of Org.  His unremitting support is
+what really helped me getting more confident over time, with both the
+community and the code.
+
 ** List of Contributions
 :PROPERTIES:
 :UNNUMBERED: notoc
@@ -22795,7 +23201,7 @@ be complete if the ones above were not mentioned in this manual.
   also asked for a way to narrow wide table columns.
 
 - Thomas\nbsp{}S.\nbsp{}Dye contributed documentation on Worg and helped
-  integrating the Org Babel documentation into the manual.
+  to integrate the Org Babel documentation into the manual.
 
 - Christian Egli converted the documentation into Texinfo format,
   inspired the agenda, patched CSS formatting into the HTML exporter,
@@ -22820,7 +23226,7 @@ be complete if the ones above were not mentioned in this manual.
 - Eric Fraga drove the development of Beamer export with ideas and
   testing.
 
-- Barry Gidden did proofreading the manual in preparation for the book
+- Barry Gidden proofread the manual in preparation for the book
   publication through Network Theory Ltd.
 
 - Niels Giesen had the idea to automatically archive DONE trees.
@@ -22862,7 +23268,7 @@ be complete if the ones above were not mentioned in this manual.
 
 - Jason\nbsp{}F.\nbsp{}McBrayer suggested agenda export to CSV format.
 
-- Kyle Meyer helped setting up the [[https://public-inbox.org/][public-inbox]] archive of the [[https://orgmode.org/list/][Org
+- Kyle Meyer helped to set up the [[https://public-inbox.org/][public-inbox]] archive of the [[https://orgmode.org/list/][Org
   mailing list]] and has been fixing many bugs.
 
 - Max Mikhanosha came up with the idea of refiling.
@@ -22935,14 +23341,15 @@ be complete if the ones above were not mentioned in this manual.
   literal examples, and remote highlighting for referenced code lines.
 
 - Stathis Sideris wrote the =ditaa.jar= ASCII to PNG converter that is
-  now packaged into the [[https://git.sr.ht/~bzg/org-contrib][org-contrib]] repository.
+  available as a package in some operating systems or can be
+  downloaded from [[https://github.com/stathissideris/ditaa]].
 
 - Daniel Sinder came up with the idea of internal archiving by locking
   subtrees.
 
 - Dale Smith proposed link abbreviations.
 
-- James TD Smith has contributed a large number of patches for
+- James TD Smith has contributed numerous patches for
   useful tweaks and features.
 
 - Adam Spiers asked for global linking commands, inspired the link
@@ -23098,11 +23505,10 @@ on the value of the variable ~constants-unit-system~.  You can use the
 =STARTUP= options =constSI= and =constcgs= to set this value for the
 current buffer.
 
-[fn:9] The printf reformatting is limited in precision because the
-value passed to it is converted into an "integer" or "double".  The
-"integer" is limited in size by truncating the signed value to 32
-bits.  The "double" is limited in precision to 64 bits overall which
-leaves approximately 16 significant decimal digits.
+[fn:9] ~format~ is similar to ~printf~ in ~C~ and other languages, but
+can handle arbitrary-precision integers and other Elisp objects.
+Consult [[info:elisp#Formatting Strings]] and the docstring of
+~format~ for details.
 
 [fn:10] Plain URIs are recognized only for a well-defined set of
 schemes.  See [[*External Links]].  Unlike URI syntax, they cannot contain
@@ -23137,7 +23543,7 @@ are using both ~org-log-done~ and state change logging.  However, it
 never prompts for two notes: if you have configured both, the state
 change recording note takes precedence and cancel the closing note.
 
-[fn:16] With the exception of description lists.  But you can allow it
+[fn:16] Except for description lists.  But you can allow it
 by modifying ~org-list-automatic-rules~ accordingly.
 
 [fn:17] For both =TIMESTAMP= and =TIMESTAMP_IA=: the word "first"
@@ -23272,7 +23678,7 @@ variable ~org-preview-latex-default-process~ accordingly.
 version 1.34 of the =htmlize.el= package, which you need to install).
 Fontified code chunks in LaTeX can be achieved using either the
 [[https://www.ctan.org/pkg/listings][listings]] LaTeX package, [[https://www.ctan.org/pkg/minted][minted]] LaTeX package, or by using
-[[https://elpa.gnu.org/packages/engrave-faces.html][engrave-faces]] .  Refer to ~org-latex-src-block-backend~ for details.
+[[https://elpa.gnu.org/packages/engrave-faces.html][engrave-faces]].  Refer to ~org-latex-src-block-backend~ for details.
 
 [fn:41] Source code in code blocks may also be evaluated either
 interactively or on export.  See [[*Working with Source Code]] for more
@@ -23283,8 +23689,10 @@ Beamer---, the =org-latex-package-alist= variable needs further
 configuration.  See [[LaTeX specific export settings]].
 
 [fn:43] At the moment, some export backends do not obey this
-specification.  For example, LaTeX export excludes every unnumbered
-headline from the table of contents.
+specification.  For example, LaTeX export excludes by default
+every unnumbered headline from the table of contents, unless you set
+the custom variable =org-latex-toc-include-unnumbered= to =t= or add
+=:UNNUMBERED: toc= to the section's properties.
 
 [fn:44] Note that ~org-link-search-must-match-exact-headline~ is
 locally bound to non-~nil~.  Therefore, ~org-link-search~ only matches
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 3302f50ec69..2aaddcef575 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -4,13 +4,930 @@ ORG NEWS -- history of user-visible changes.   -*- mode: org; coding: utf-8 -*-
 
 #+LINK: doc https://orgmode.org/worg/doc.html#%s
 #+LINK: msg https://list.orgmode.org/%s/
-#+LINK: git https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=%s
+#+LINK: git https://git.savannah.nongnu.org/cgit/org-mode.git/commit/?id=%s
+#+macro: kbd (eval (org-texinfo-kbd-macro $1))
 
 Copyright (C) 2012-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Org bug reports to mailto:emacs-orgmode@gnu.org.
 
+* Version 9.8
+** Important announcements and breaking changes
+
+# Here, we list the *most important* changes and changes that _likely_
+# require user action for most Org mode users.
+# Sorted from most important to least important.
+
+*** You may need to update =org-protocol= bookmarklets for browsers
+
+In Firefox 133 and Firefox 128.5 ESR, the previously suggested
+JavaScript bookmarklets replace the current page with the bookmarklet URL
+text.  We have updated the manual with new bookmarklets that do not
+have this problem.
+
+The new bookmarklets have ~void(0);~ appended at the end, so that they
+do not return anything.
+
+Example:
+
+#+begin_example
+javascript:location.href='org-protocol://store-link?url='+
+      encodeURIComponent(location.href);void(0);
+#+end_example
+
+*** =C-c C-x C-v= command toggling inline image display has been reworked
+
+Previously, =C-c C-x C-v= always toggled image display in the whole
+buffer (or narrowed part of the buffer).  With prefix argument, it
+also forced displaying image links with description.
+
+Now, =C-c C-x C-v= is bound to a new command ~org-link-preview~, which
+uses different defaults:
+
+1. When the region is active, images in the region are previewed
+
+2. Otherwise, if there is an image at point, it is toggled.  If there
+   is no image at point, images in the current entry are previewed
+
+3. With the =C-u= argument, image previews in the active region or at
+   point are cleared instead
+
+4. The =C-u C-u= argument unconditionally shows all images in the
+   accessible portion of the buffer
+
+5. The =C-u C-u C-u= argument unconditionally clears all images in the
+   accessible portion of the buffer
+
+6. Displaying images over links with description can be forced using
+   numeric argument:
+   - ~C-u 1~ for toggling all images at point/current entry
+   - ~C-u 11~ for toggling all images in buffer
+
+(The first five of these prefix argument behaviors are the same as that of
+the ~org-latex-preview~ command.)
+
+In addition to images, ~org-link-preview~ can also be used to preview
+Org links of all types for which preview behavior is defined, see
+[[#link-preview][previews for arbitrary link types]].
+
+The old ~org-toggle-inline-images~ command is obsolete but still
+available.  You can bind it back to =C-c C-x C-v= by adding the
+following to your config:
+#+begin_src emacs-lisp
+(eval-after-load 'org-keys
+  (org-defkey org-mode-map (kbd "C-c C-x C-v") #'org-toggle-inline-images))
+#+end_src
+
+*** Org mode no longer treats =:results drawer= as verbatim output
+
+Previously, =:results drawer= left the code block results verbatim in
+some scenarios.  This is no longer the case, in line with the manual
+and the intended purpose of this option.  However, the fix may have
+brought subtle changes in the code block output for users who made use
+of the previous erroneous behavior.  If you use =:results drawer= in your
+Org documents, please watch out for potential changes in the code evaluation.
+
+*** Diary-style timestamps are exported together with active timestamps
+
+~org-export-with-timestamps~ and ~org-icalendar-with-timestamps~ now
+treat diary-style timestamps as a type of active timestamp for
+purposes of export.
+
+This mainly affects iCalendar export, where diary timestamps will now
+be included when only active timestamps are exported (the default).
+
+This should have minimal impact on non-iCalendar exporters, since
+~org-export-with-timestamps~ was already ~t~ by default.  However,
+users who manually set ~org-export-with-timestamps~ to ~active~ will
+now have diary timestamps included as well.
+
+To use the old behavior and export active timestamps only without
+diary timestamps, users can set ~org-export-with-timestamps~ and
+~org-icalendar-with-timestamps~ to ~active-exclude-diary~.
+
+*** ~org-element-drawer-parser~ assigns ~:pre-blank~ property
+
+Previously, the whole contents of drawer, including blank lines at the beginning were
+parsed as paragraph.  Now, the blank lines at the beginning are stored in ~:pre-blank~
+property, just as in other greater elements.
+
+*** ~org-element-org-data-parser~ now returns syntax node with ~:pre-blank~ property
+
+Previously, parsing ~org-data~ syntax node did not record information
+about blank lines at the beginning of the document.  Now, the number
+of blank lines is recorded in ~:pre-blank~ property.
+
+~org-element-org-data-interpreter~ takes into account this information.
+
+*** Emacs 26 and Emacs 27 support has been dropped
+
+We maintain compatibility with the latest Emacs release, and two
+versions prior the latest.  The latest is Emacs 30, so we drop
+everything before Emacs 28.
+
+** New features
+
+# We list the most important features, and the features that may
+# require user action to be used.
+
+*** Some navigation commands can now be repeated
+
+When ~repeat-mode~ is turned on, the following navigation commands can
+be repeated:
+
+| Command                           | Key binding            | Repeat key   |
+|-----------------------------------+------------------------+--------------|
+| ~org-next-visible-heading~        | {{{kbd(C-c C-n)}}}     | {{{kbd(n)}}} |
+| ~org-previous-visible-heading~    | {{{kbd(C-c C-p)}}}     | {{{kbd(p)}}} |
+| ~org-forward-heading-same-level~  | {{{kbd(C-c C-f)}}}     | {{{kbd(f)}}} |
+| ~org-backward-heading-same-level~ | {{{kbd(C-c C-b)}}}     | {{{kbd(b)}}} |
+| ~org-up-heading~                  | {{{kbd(C-c C-u)}}}     | {{{kbd(u)}}} |
+| ~org-next-block~                  | {{{kbd(C-c M-f)}}}     | {{{kbd(f)}}} |
+| ~org-previous-block~              | {{{kbd(C-c M-b)}}}     | {{{kbd(b)}}} |
+| ~org-next-link~                   | {{{kbd(C-c C-x C-n)}}} | {{{kbd(n)}}} |
+| ~org-previous-link~               | {{{kbd(C-c C-x C-p)}}} | {{{kbd(p)}}} |
+
+The keybindings in the repeat-maps can be changed by customizing
+~org-navigation-repeat-map~, ~org-link-navigation-repeat-map~, and
+~org-block-navigation-repeat-map~.
+
+See the new [[info:org#Repeating commands]["Repeating commands"]] section in Org mode manual.
+
+*** New babel backend for C# code blocks
+
+Org now officially enables C# code block evaluation based on the .NET SDK.
+The old backend that does not use .NET SDK remains in org-contrib
+and will be removed in a future release. The built-in =ob-csharp.el= should be
+considered the official successor.
+
+*** All Org link types can be previewed
+:PROPERTIES:
+:CUSTOM_ID: link-preview
+:END:
+
+Org links support a new parameter =:preview= that can be used to
+preview arbitrary link types.  The value of this parameter should be a
+function that is called to preview links of the corresponding type
+(see ~org-link-parameters~).
+
+The new preview system does not bring any brand-new link previews, but
+open the possibility for third-party packages to implement custom previews
+without having to use non-ideal hacks.
+
+On the user side, the existing image link previews should now run
+smoother, especially in Org buffers that have a lot of image links to
+preview.  The new previews are less blocking, previewing link in
+batches, without fully blocking Emacs.  See the new
+~org-link-preview-batch-size~ and ~org-link-preview-delay~ options.
+
+*** New =%\*N= placeholder in ~org-capture-templates~
+
+The new placeholder is like =%\N=, but gives access not only to the
+=%^{prompt}= values, but also to =%^{prompt}X= values.
+
+*** Alignment of image previews can be customized
+
+This feature was added in Org 9.7 but was not documented in the release notes.  See [[https://orgmode.org/worg/org-release-notes.html#preview-align][retrospectively added news entry]].
+
+*** ~org-open-at-point-global~ now accepts prefix argument
+
+The argument is passed through to ~org-link-open~, allowing alternative
+way to open links, if link ~:follow~ function supports it.
+
+*** ox-latex: Table of contents generation has been fixed and augmented
+
+The LaTeX exporter differs from other exporters in that it does not
+include unnumbered sections in the table of contents by default.  To
+include an unnumbered section, set the property =:UNNUMBERED: toc= on
+the section.
+
+Alternatively, you can set the new custom variable
+~org-latex-toc-include-unnumbered~ to include unnumbered sections by
+default, aligning with other exporters' behavior.  In that case, to
+exclude a section from the table of contents, mark it as =:UNNUMBERED:
+notoc= in its properties.
+
+*** Tables copied from LibreOffice Calc documents can be pasted as Org tables
+
+Tables copied into the clipboard from LibreOffice Calc documents can
+now be pasted as an Org table using ~yank-media~.
+
+*** Ditaa code blocks can use ditaa executable, and can produce SVG output
+
+In order to use a ditaa executable instead of a JAR file, you can set
+~org-ditaa-default-exec-mode~ to ~'ditaa~.  The location of the
+executable can be configured via ~org-ditaa-exec~.
+
+SVG output can now be generated; note, however, that this requires a
+ditaa version of at least 0.11.0.
+
+*** New datetree capture ~:tree-type~ options
+:PROPERTIES:
+:CUSTOM_ID: 9.8-datetree-treetype
+:END:
+
+For datetree capture, ~:tree-type~ can now be any subset of ~(year
+quarter month week day)~ to construct a datetree with the specified
+levels.  For back-compatibility, the default value of ~nil~ is an
+alias for ~(year month day)~, ~month~ is an alias for ~(year month)~,
+and ~week~ is an alias for ~(year week day)~.
+
+If ~:tree-type~ is a superset of ~(month week)~, then weeks are
+assigned to the month containing Thursday, to be consistent with the
+ISO-8601 year-week rule.  If ~:tree-type~ contains ~(quarter week)~
+but does not contain ~month~, then quarters are defined as 13-week
+periods (the final quarter of a 53-week year has 14-weeks).
+Otherwise, quarters are defined as 3-month periods.
+
+Additionally, ~:tree-type~ can be a function, in which case it should
+take the date as an argument, and generate a list of pairs for
+~org-datetree-find-create-hierarchy~.  This allows for creating new
+types of datetrees (e.g. for lunar calendars, academic calendars,
+retail 4-4-5 calendars, etc).
+
+*** New =shortdoc= link type
+
+You can now create links to =shortdoc= documentation groups for Emacs
+Lisp functions (see =M-x shortdoc-display-group=).  Requires Emacs 28
+or newer.
+
+*** Beamer export supports setting frame subtitles
+
+If a headline is exported as a frame, and has its =BEAMER_SUBTITLE=
+property set, the value is used as the subtitle.
+
+*** =:wrap= header argument can now be explicitly disabled
+
+Previously, presence of =:wrap= argument (inherited or not) in code
+block headers always made the block results wrapped. There was no way
+to disable wrapping if =:wrap= was specified in the inherited header
+arguments. Now, =:wrap no= or =:wrap nil= will explicitly disable
+wrapping.
+
+*** =ob-sqlite=: Added ability to open a database in readonly mode
+
+Added option ~:readonly~ to =ob-sqlite=.
+
+With ~:readonly yes~, the database is opened in readonly mode. For
+example:
+
+#+begin_example
+,#+begin_src sqlite :db /tmp/rip.db  :readonly yes  :exports both
+create table rip(a,b);
+,#+end_src
+#+end_example
+
+This results in an error such as:
+
+#+begin_example
+Runtime error near line 2: attempt to write a readonly database (8)
+[ Babel evaluation exited with code 1 ]
+#+end_example
+
+** New and changed options
+
+# Changes dealing with changing default values of customizations,
+# adding new customizations, or changing the interpretation of the
+# existing customizations.
+
+*** New option ~org-edit-keep-region~
+
+Since Org 9.7, structure editing commands do not deactivate region
+after editing.  Now, this is configurable via the new option.
+
+*** =xelatex= can be used for LaTeX previews
+
+A new process =xelatex= is added to ~org-preview-process-alist~ to
+allow generating LaTeX fragment preview through =xdv= file produced by
+XeLaTeX, which has better support for Unicode.
+
+You can now set ~org-preview-latex-default-process~ to ~'xelatex~.
+
+*** New link preview system
+**** New option ~org-link-preview-batch-size~
+
+Org link previews are generated asynchronously and a few at a time, in
+batches.  This option controls the number of links that are previewed
+in each batch.
+
+**** New option ~org-link-preview-delay~
+
+Org link previews are generated asynchronously.  This option controls
+the minimum idle time in seconds between previews of batches of links.
+
+*** New and changed export options
+**** ~org-html-style-default~ now highlights =#+begin_src c= (lowercase) blocks
+
+The default value has been changed, adding ~pre.src-c:before {
+content: 'C'; }~ (lowercase =c=) that parallels ~pre.src-C:before {
+content: 'C'; }~ (uppercase =C=).
+
+**** ~org-odt-with-latex~ accepts any method from ~org-preview-latex-process-alist~
+
+Previously, only a few conversion methods (~dvipng~, ~imagemagick~,
+~dvisvgm~) could be used to render LaTeX fragments as images when
+exporting to ODT.  Now any method in ~org-preview-latex-process-alist~
+can be used.
+
+**** New environment =onlyenv= in ~org-beamer-environments-default~
+
+The =onlyenv= environment limits showing parts of an animated Beamer
+slide to specific animation steps.
+
+#+begin_example
+,***** Comment
+:PROPERTIES:
+:BEAMER_env: onlyenv
+:BEAMER_act: <2->
+:END:
+This text will be displayed on animation step 2 and later.
+#+end_example
+
+**** =ox-html=: Headline self links can be enabled from an Org mode file
+
+Previously HTML export could add, to each headline, a link to itself.
+To enable it, you had to use the variable
+~org-html-self-link-headlines~.
+
+Now, it's also possible to enable it per Org mode file by adding:
+: #+OPTIONS: html-self-link-headlines:t
+
+**** Allow disabling macro replacement during export
+
+New custom option ~org-export-replace-macros~ controls whether Org
+mode replaces macros in the buffer before export.  Set it to nil to
+disable macro replacement.
+
+This variable has no effect on the ={{{results...}}}= macros for inline
+code block results.
+
+**** New option ~org-cite-bibtex-bibliography-style~
+
+This option adds a fallback bibliography style for BibTeX when none is
+provided in the =#+CITE_EXPORT= options.  The default style is
+"plain".
+
+**** New option ~org-cite-csl-bibtex-titles-to-sentence-case~
+
+When this option is non-nil then title fields in BibTeX bibliography
+entries are converted to sentence-case before being formatted
+according to a CSL style, except for entries with a =langid= field
+specifying a non-English language.  When nil, this conversion is
+limited to entries having a =langid= field specifying a variant of
+English.  The default value is ~t~ as the CSL standard assumes that
+English titles are specified in sentence-case but the BibTeX
+bibliography format requires them to be written in title-case.
+
+**** New option ~org-latex-mathml-directory~
+
+This option specifies the path where MathML files generated from LaTeX
+fragments are stored.
+
+**** New option ~org-latex-use-sans~
+
+This option specifies the PDF should be typeset using the Sans font
+specified in the document class (or the user) instead of the default
+font (i.e. the Roman font).
+
+**** New option ~#+LATEX_CLASS_PRE~
+
+This option prepends LaTeX code before the LaTeX preamble.
+
+**** New option ~org-odt-with-forbidden-chars~
+
+The new export option controls how to deal with characters that are forbidden
+inside ODT documents during export.
+
+The ODT documents must follow XML1.0 specification and cannot contain
+certain Unicode characters.  For example, form feed characters like ^L
+are disallowed.
+
+By default, =ox-odt= will strip such characters and display warning.
+You may return to the previous behavior by setting
+~org-odt-with-forbidden-chars~ to t.
+
+Note that Emacs warnings can always be suppressed by clicking on ⛔
+symbol or by customizing ~warning-suppress-types~.
+
+**** New option ~org-md-link-org-files-as-md~
+
+This option makes it possible to disable mapping of linked org files
+to markdown during export to Markdown. This is analogous to how
+~org-html-link-org-files-as-html~ works in export to HTML.
+
+*** New context available to save in archived headings
+
+~org-archive-save-context-info~ can now contain ~olid~ symbol to save
+parent heading ID in the archived heading.
+
+*** New hook ~org-archive-finalize-hook~
+
+Hook run after successfully archiving a subtree in final location.
+Unlike ~org-archive-hook~, which runs in the source Org buffer, the
+new hook is called with point on the subtree in the destination file.
+
+*** Headline/olp target in ~org-capture-templates~ can be a function/variable
+
+The variable ~org-capture-templates~ accepts a target specification as
+function or symbol for headline (~file+headline~) and olp (~file+olp~
+and ~file+olp+datetree~).
+
+*** The default value of ~org-babel-latex-process-alist~ is no longer taken from ~org-preview-latex-process-alist~
+
+The default value used to be pulled from =dvipng= process type from
+~org-preview-latex-process-alist~.  Now, it defaults to using
+=latexmk= (when available), or running =latex= multiple times, so that
+all the references are resolved in the generated PNG.
+
+*** ~org-tags-sort-function~ can now be a list of functions
+
+~org-tags-sort-function~ can now be set to a list of functions.
+Subsequent sorting functions will be used if two tags are found to be
+equivalent.  See docstring for more information.
+
+*** New tags sorting function ~org-tags-sort-hierarchy~
+
+By setting ~org-tags-sort-function~ to ~org-tags-sort-hierarchy~, tags
+are sorted taking their hierarchy into account.  See
+[[info:org#Tag Hierarchy][Tag Hierarchy]] for how to set up a tag
+hierarchy.
+
+*** New option ~org-cite-basic-complete-key-crm-separator~
+
+This option makes ~org-cite~'s ~basic~ insert processor use
+~completing-read-multiple~ instead of the default consecutive prompts.
+It can also be set to dynamically compute ~crm-separator~ so that the
+separator does not appear in completion candidates.
+
+*** ~org-yank-image-save-method~ can be a function producing directory name
+
+In previous versions, ~org-yank-image-save-method~ could be either a
+symbol ~attach~ or a string -- directory name.  Now it can also be a
+function, which will be called with no arguments and its return value
+will be used as a directory to save the image to.
+
+*** ~org-refile-targets~ can now match all headlines in the target file(s)
+
+Candidate refile targets may now be specified with the symbol ~t~ to
+indicate that all headlines within the specified file are to be
+considered.  For example, setting ~org-refile-targets~ to ~((nil . t))~
+will allow one to refile to any heading within the current buffer.
+
+*** In =ob-ditaa=, the output type is now controlled consistently with other babel backends
+
+Output file type is determined as specified in Babel documentation:
+the suffix of =:file= is the primary determinant, and =:file-ext=
+secondary.  Header arguments =:pdf= and =:eps= are supported for
+backwards compatibility.  Default output type is still PNG.
+
+** New functions and changes in function arguments
+
+# This also includes changes in function behavior from Elisp perspective.
+
+*** The deprecated =show= parameter to =org-priority= has been removed
+
+The =show= parameter for the =org-priority= function was deprecated in
+Org 9.2 (released in 2017). Sufficient time has passed, and it is being
+removed as part of refactoring for numeric priorities.
+
+*** ~org-attach-attach~ now returns a link to file stored
+
+Previously, ~org-attach-attach~ did not have any specified default value.
+Now, it returns a list =(LINK DESCRIPTION)= to the file stored.
+The link obeys non-nil ~org-attach-store-link-p~ setting.
+When ~org-attach-store-link-p~ is nil, an =attachment:= link is returned.
+
+*** New functions exposing link formatting done by ~org-insert-link~
+
+New function ~org-link-get-description~ exposes handling ~:insert-description~
+link parameter and ~org-link-make-description-function~.
+
+New function ~org-link-make-string-for-buffer~ exposes link and description
+cleanups performed by ~org-insert-link~, including cleaning up =<...>= brackets,
+stripping current buffer file path from the link, and adjusting =file:= links
+according to ~org-link-file-path-type~.
+
+*** ob-comint: New optional arguments controlling prompt handling
+
+The new argument ~prompt-handling~ in ~org-babel-comint-with-output~
+and ~org-babel-comint-async-register~ allows Babel languages to
+specify how prompts should be handled in comint output.  If equal to
+~filter-prompts~, prompts are removed from output before it is passed
+on to language-specific processing.  If equal to
+~disable-prompt-filtering~, then the prompt filtering is skipped.  If
+unset, then the default behavior is the same as ~filter-prompts~ for
+backwards compatibility.
+
+Prompt filtering is needed for some Babel languages, such as ob-shell,
+which leave extra prompts in the output as a side effect of
+evaluation.  However, other Babel languages, like ob-python, don't
+leave extra prompts after evaluation, and skipping the prompt
+filtering can be more robust for such languages (as this avoids
+removing false positive prompts).
+
+*** Elisp functions for new datetree tree-types
+
+Accompanying the [[#9.8-datetree-treetype][new datetree capture ~:tree-type~ options]], on the
+elisp level ~org-datetree-find-create-entry~ and
+~org-datetree-find-create-hierarchy~ generalize
+~org-datetree-find-date-create~, ~org-datetree-find-month-create~, and
+~org-datetree-find-iso-week-create~ to new datetree types.
+
+*** New function ~org-src-get-lang-mode-if-bound~
+
+The new function is like ~org-src-get-lang-mode~, except that it
+ensures the returned major mode for the given language is bound, and
+so available to the user.  If the mode is not bound, the function can
+optionally return a fallback mode and display a message when doing so.
+The function was added so that Org can fall back to Fundamental mode
+for source blocks where the appropriate major mode is unavailable.
+
+*** New function ~org-gnus-no-new-news-other-frame~ (to be used in ~org-link-frame-setup~)
+
+The new function is like ~org-gnus-no-new-news~, but always opens the
+link in other frame.
+
+*** New function ~org-string-width-invisibility-spec~
+
+The new function constructs an invisibility spec without folds and
+ellipses, suitable for ~org-string-width~. This can be helpful for
+performance if ~org-string-width~ is called multiple times.
+
+*** New command ~org-link-preview~ to preview Org links
+
+This command replaces ~org-toggle-inline-images~, which is now
+obsolete.
+
+*** New command ~org-link-preview-region~ to preview Org links in a region or the buffer
+
+This command replaces ~org-display-inline-images~, which is now
+obsolete.
+
+*** New command ~org-link-preview-clear~ to clear Org link previews in a region or the buffer
+
+This command replaces ~org-remove-inline-images~, which is now
+obsolete.
+
+*** New command ~org-link-preview-refresh~ to refresh Org link previews in the buffer
+
+This command replaces ~org-redisplay-inline-images~, which is now
+obsolete.
+
+*** ~org-html-head~ and ~org-html-head-extra~ can now be specified as functions
+
+Previously, ~org-html-head~ and ~org-html-head-extra~ could only be
+specified directly as strings.  Now, they can be set to functions that
+accept the INFO channel and return a string.  This makes it possible
+to dynamically generate the content of the resulting ~<head>~ tag in
+the resulting HTML document.
+
+*** ~org-element-create~ now ignores ~nil~​s in CHILDREN argument
+
+When CHILDREN contains ~nil~ elements, they are skipped.  This way,
+
+#+begin_src emacs-lisp
+(let ((children nil))
+  (org-element-create 'section nil children)) ; => (section nil)
+#+end_src
+
+will yield expected results rather than assigning literal ~nil~ as a child.
+
+*** ~org-clock-get-clock-string~ now takes an optional ~max-length~ argument
+
+When a ~max-length~ is passed to ~org-clock-get-clock-string~, it will first
+attempt to truncate the headline and add an ellipsis in order to make the entire
+clock string fit under the length limit. If the length limit is too small to
+accommodate even a single character of the headline, after accounting for spaces
+and the surrounding parentheses, it will omit the headline entirely and just
+show as much of the clock as fits under the limit.
+
+*** ~org-string-width~ now takes an optional ~invisibility-spec~ argument
+
+For performance, if the invisibility spec has been constructed, it can
+be passed in as ~invisibility-spec~ instead of having it be
+constructed again.
+
+** Removed or renamed functions and variables
+
+*** Obsolete functions and variables removed from ~org-datetree~
+
+Due to the refactoring of ~org-datetree~ to support the [[#9.8-datetree-treetype][new datetree
+capture ~:tree-type~ options]], the internal variable
+~org-datetree-base-level~ has been removed, as well as the
+undocumented helper function ~org-datetree-insert-line~.
+
+*** Obsolete functions ~org-let~ and ~org-let2~ are removed
+
+If any code is still using these ancient functions, it should move to ~cl-progv~.
+
+*** ~org-show-empty-lines-in-parent~ is now obsolete
+
+This function is unused in Org code and does not appear to be used in third-party code.
+To be removed in future releases.
+
+*** ~org-edit-src-content-indentation~ is renamed to ~org-src-content-indentation~
+
+The new name highlights that the customization affects more than
+editing.  ~org-src-content-indentation~ also affects detangling,
+printing Org syntax tree (for example, during export to Org), and
+indentation of src and example blocks in Org buffers.
+
+*** ~org-cycle-display-inline-images~ is renamed to ~org-cycle-display-link-previews~
+
+Inline image previews in Org mode are now provided by the more general
+link previews feature.  The behavior with regard to image links is
+unchanged.
+
+*** ~org-cycle-inline-images-display~ is renamed to ~org-cycle-link-previews-display~
+
+The behavior is unchanged, except in that the new variable now affects
+previews of supported link types besides image links.
+
+*** ~org-startup-with-inline-images~ is renamed to ~org-startup-with-link-previews~
+
+The behavior is unchanged, except in that the new variable now affects
+previews of supported link types besides image links.
+
+*** =ob-ditaa=: =org-babel-ditaa-java-cmd= renamed and =org-ditaa-jar-option= made obsolete
+
+To align with other customizable variable names, which do not contain
+the word =babel=, variable =org-babel-ditaa-java-cmd= has been renamed
+to =org-ditaa-java-exec=.  The old variable =org-babel-ditaa-java-cmd=
+is still available as an obsolete alias.
+
+Variable =org-ditaa-jar-option= did not serve any sensible purpose and
+has been made obsolete. Its value is still used in place of default
+parameter -jar if the variable is defined.
+
+** Miscellaneous
+*** =ob-calc.el=: Vector and matrix are now inserted as Org tables by default
+
+~ob-calc~ now formats vector and matrix results as Org tables.  This
+conversion can be overridden using the ~:results verbatim~ keyword on
+a per source block basis.
+
+To get back the old behavior, add
+
+#+begin_example
+(with-eval-after-load 'ob-calc
+  (setq org-babel-header-args:calc
+        (append '(:results . "verbatim") org-babel-header-args:calc)))
+#+end_example
+
+to your configuration.
+
+The new behavior follows general babel backend rules (auto-detecting
+result type), but may affect the existing usage.
+
+*** ~orgtbl-to-generic~ retains special rows when exporting to Org
+
+Previously, special table rows were unconditionally removed when
+export to Org.  Now, the defaults follow what ox-org does - to retain
+special rows by default.  See [[https://orgmode.org/worg/org-release-notes.html#ox-org-special-table-rows][previous change]].
+
+To retain the old behavior, add ~:with-special-rows nil~ to PARAMS argument:
+
+: (orgtbl-to-generic table '(:with-special-rows nil)
+
+*** ~org-babel-lob-ingest~ no longer performs noweb expansion when ingesting blocks
+
+Previously, ~org-babel-lob-ingest~ would expand noweb references when
+adding source blocks to the Library of Babel.  Now, blocks are stored
+with unexpanded noweb references.
+
+Noweb expansion is handled appropriately when blocks are actually used
+via ~org-babel-execute-src-block~ or ~org-babel-exp-do-export~, with
+the correct context (~:tangle~, ~:export~, or ~:eval~).
+
+This change is unlikely to affect most users, but code that directly
+accesses ~org-babel-library-of-babel~ may observe the difference.
+
+*** Trailing =-= is now allowed in plain links
+
+Previously, plain links like
+
+: https://domain/test-
+
+did not include the trailing =-= punctuation.
+
+Now, the =-= is allowed at the end, and is considered a part of the plain link.
+
+#+begin_quote
+These types of links will likely be encountered for sites where anchor
+targets are automatically generated from documentation headings which
+are questions.
+         https://list.orgmode.org/orgmode/87sexh9ddv.fsf@ice9.digital/
+#+end_quote
+
+*** Update of statistics cookies now respects narrowing
+
+Calling ~org-update-statistics-cookies~ with a prefix argument will
+now only update cookies in the accessible portion of the buffer.
+
+*** ox-man: Support specifying =#+DATE:= and ~org-export-with-date~
+
+Previously, ox-man ignored =#+DATE:= keyword even when
+~org-export-with-date~ is set to non-nil.  Now, the date is exported
+and specified in the =footer-middle= argument of =.TH= macro (see ~man
+7 man~).
+
+*** ox-man: Support specifying =:release= and =:header= in =#+MAN_CLASS_OPTIONS:= in addition to =:section-id=
+
+The newly added =:release= and =:header= options of =#+MAN_CLASS_OPTIONS=
+are respectively mapped to the =footer-inside= and =header-middle=
+arguments of the =.TH= macro (see ~man 7 groff_man~).
+
+*** ~org-capture~ target pointing to headline is now handled uniformly for =plain= entry type
+
+Previously, when using ~file+regexp~, ~file+function~ or ~function~, =plain= entries
+were inserted right at the point according to regexp/function, even when point is
+on an existing headline.
+
+Now, when target points to an existing headline, =plain= entries are
+inserted inside its body, honoring ~:prepend~ property.  This is more
+consistent with how ~item~, ~checkitem~, and ~table-line~ templates
+are handled.
+
+*** ~org-lint~ now checks priorities
+
+Warnings are raised on headlines containing out-of-bounds, invalid
+(e.g., =[#-1]=, =[#AA]=), or malformed (e.g., =[#1=, =[#A=)
+priorities.
+
+*** In Dot code blocks, ~graphviz-dot-mode~ is used if available
+
+Previously, when editing Dot code blocks with =M-x org-edit-special=,
+Dot code would open in Fundamental mode, even when specialized mode is
+installed. The new behavior is more DWIM.
+
+*** Source blocks fall back to Fundamental mode
+
+Org now falls back to Fundamental mode for source blocks when the
+appropriate major mode is unavailable.
+
+*** Priority speed commands adapt to user options
+
+Previously, =1=, =2=, and =3= would insert priorities =A=, =B=, and
+=C=, which causes errors when using numeric priorities.  These now
+insert ~org-priority-highest~, ~org-priority-default~, and
+~org-priority-lowest~, respectively.
+
+*** ~org-store-link~ no longer asks to select store function when called noninteractively
+
+Previously, when multiple store functions are available to store link
+at point, ~org-store-link~ would always ask user which store function
+to use.
+
+Now, when ~org-store-link~ is called noninteractively (~interactive?~
+argument is nil), the first matching store function is used.
+Interactively, the previous behavior is retained.
+
+*** Org mode may throw an error when attempting to include remote unsafe resource noninteractively
+
+Previously, when ~org-resource-download-policy~ is ~ask~ (default),
+and Emacs is running in batch mode, Org mode simply skipped unsafe
+remote resources in the =#+include:='s.  Now, an error is thrown to
+avoid seemingly ignored =#+include= statements when publishing via
+batch scripts.
+
+*** HTML export wraps ~<code>~ around all the exported src blocks
+
+HTML export always uses ~<pre>~ tag around exported src blocks.
+In addition, previously, HTML export used ~<code>~ tag around src
+blocks when ~org-html-klipsify-src~ is non-nil.
+
+Now, both ~<pre>~ and ~<code>~ tags are *always* wrapped around the
+export src blocks.
+
+*** ~yank-media~ and DND handlers now honor the user option ~org-file-link-type~
+
+When inserting file: links, ~yank-media~ and DND handlers now respect
+the user option ~org-file-link-type~.
+
+*** ~org-timer-done-hook~ is now run before the timer is stopped
+
+Previously, ~org-timer-countdown-timer~ and ~org-timer-start-time~
+were unset when the hook is run.  Now, they still hold the timer info.
+
+*** ox-latex: LaTeX images are now stored alongside the exported =.html= file
+
+Previously, LaTeX images (when HTML export does use images for LaTeX)
+were stored alongside the original =.org= file.  Now, they are stored
+alongside the =.html= file.
+
+This change will make links to LaTeX images point to the folder
+containing =.html= file, not the =.org= file.
+
+*** Org mode no longer prevents =flyspell= from spell-checking inside =LOGBOOK= drawers
+
+Previously, spell-checking via =flyspell= was disabled inside
+=LOGBOOK= (or ~org-log-into-drawer~) drawers.  Now, it is no longer
+the case.  It can be useful to see spelling mistakes inside notes
+added via ~org-add-note~ command.
+
+*** ~ob-R~ and ~ob-julia~ no longer use ESS settings for working directory
+
+Previously, without =:dir= parameter, R and Julia code blocks could
+query for working directory during evaluation.  This was because
+~ess-ask-for-ess-directory~ setting was obeyed.
+
+Now, ~ess-ask-for-ess-directory~, ~ess-directory-function~, and
+~ess-directory~ are all ignored during code block evaluation (except
+when session is already running).  In other words, R and Julia code
+blocks now conform to the "16.4 Environment of a Code Block" section
+of Org mode manual that prescribes Org buffer directory or ~:dir~
+value to be used as working dir to run the code blocks.
+
+*** ~org-cancel-repeater~ now cancels all the repeaters inside entry
+
+Previously, ~org-cancel-repeater~ only canceled repeater in the first
+active timestamp inside heading.  Now, all the repeaters are
+canceled.
+
+The function is renamed to ~org-cancel-repeaters~ accordingly (the old
+name is still kept as an alias).
+
+*** ~org-refile~ now saves current position to Org mark ring when jumping to heading
+
+When ~org-refile~ is called with =C-u= or =C-u C-u= prefix argument
+(to jump to heading or to jump to the last refiled heading), it saves
+point to Org mark ring before jumping. Then, the user can return back
+via ~org-mark-ring-goto~.
+
+*** =org-attach= now considers symlinked files when searching pre-existing attach dirs
+
+When Org buffer is opened from a symlink, Org mode looks into the
+original file directory when searching if an attachment directory already exists.
+This way, attachments will remain accessible when opening symlinked Org file.
+
+When no attach dir exists, Org mode will still prefer creating it in
+the "default" directory - where the symlink is located.
+
+*** Texinfo exporter now supports links in headings
+
+The Texinfo exporter no longer removes links from headings.  This
+applies to all headings, below and above the =H= and =toc= export
+=#+OPTIONS:=.
+
+*** Texinfo exporter now considers numeric =toc= values in =#+OPTIONS:=
+
+For example, given =H:3= and =toc:2= in =#+OPTIONS:=, all headings at
+the 1st and 2nd level appear in the table of contents and those at the
+3rd level do not.
+
+*** =ob-tangle= now tangles source blocks that do not specify a =language= if an inherited property sets a tangle filename
+
+Previously, all source blocks that did not specify a =language= where
+ignored by ~org-babel-tangle-collect-blocks~. Now, if it inherits a
+:tangle header argument with a value other than =no= or =yes= (that is, a
+filename), a source block without =language= will get tangled to that
+file.
+
+*** BibTeX is tangled with the standard =.bib= file extension
+
+Previously, =bibtex= source blocks located in a file named =NAME.org=
+were tangled into a file named =NAME.bibtex=.  Now, they are tangled
+into a file named =FILE.bib=, using the standard extension =.bib=,
+matching the rest of the ecosystem, including BibTeX and LaTeX.
+
+*** LaTeX export now respects ~org-latex-with...~ options in the PDF metadata
+
+Previously, the LaTeX exporter handled the PDF metadata =pdfcreator=,
+=pdfauthor= and =pdftitle= as defined in
+~org-latex-hyperref-template~. This has changed, and these three fields
+will be defined as empty and not produce any metadata if their
+corresponding ~org-latex-with-author~, ~org-latex-with-title~, or
+~org-latex-with-creator~ option is set to ~nil~.
+
+*** Fancy HTML5 export uses ~<time>~ element for timestamps
+Previously, timestamps would always be rendered inside a ~<span
+class="timestamp">~. Now, if both ~org-html-doctype~ is ~html5~ and
+~org-html-html5-fancy~ is enabled, org will use the semantic
+~<time>~ element. This will also have the ~timestamp~ class, but
+additionally set the ~datetime~ attribute with a machine-readable
+variant of the timestamp. The format used for the attribute can be
+customized using ~org-html-datetime-formats~.
+
+*** Export dispatcher supports arrow keys and mouse wheel
+
+Previously, the arrow keys and the mouse wheel were ignored in the
+export dispatcher, ~org-export-dispatch~ bound to =C-c C-e=.  Now,
+they scroll the text in the export dispatcher window.
+
+*** Add completion for ID links
+
+Completion is enabled for ID links inserted with ~org-insert-link~.
+Completion candidates, by default, will be sourced from all files
+known to contain headlines with IDs.  You can use new option
+~org-id-completion-targets~ to change where the candidates are
+searched.
+
+*** Pre-populate the description for BBDB links
+
+When inserting BBDB links, use the full name as the default link
+description, instead of nothing.
+
 * Version 9.7
 
 ** Important announcements and breaking changes
@@ -285,6 +1202,9 @@ Images dropped also respect the value of ~org-yank-image-save-method~
 when ~org-yank-dnd-method~ is =attach=.
 
 *** Alignment of image previews can be customized
+:PROPERTIES:
+:CUSTOM_ID: preview-align
+:END:
 
 Previously, all the image previews were always left-aligned.
 
@@ -1634,6 +2554,9 @@ Previously, all the header arguments where stripped from src blocks
 during export.  Now, header arguments are preserved.
 
 *** =ox-org= now exports special table rows by default
+:PROPERTIES:
+:CUSTOM_ID: ox-org-special-table-rows
+:END:
 
 Previously, when exporting to Org, special table rows (for example,
 width cookies) were not exported.   Now, they are exported by default.
@@ -4205,10 +5128,13 @@ wget -c "https://ben.akrin.com/crackzor/crackzor_1.0.c.gz"
 #+end_example
 
 *** Add ~:session~ support of ob-js for js-comint
+
 #+begin_src js :session "*Javascript REPL*"
 console.log("stardiviner")
 #+end_src
 
+# SIC, JavaScript miscapitalized in `js-comint.el'.
+
 *** Add ~:session~ support of ob-js for Indium
 #+begin_src js :session "*JS REPL*"
 console.log("stardiviner")
diff --git a/etc/org/OrgOdtStyles.xml b/etc/org/OrgOdtStyles.xml
index 1a8edee99b4..982773278d7 100644
--- a/etc/org/OrgOdtStyles.xml
+++ b/etc/org/OrgOdtStyles.xml
@@ -404,9 +404,6 @@
   <style:style style:name="OrgTags" style:family="text"/>
 
   <style:style style:name="OrgPriority" style:family="text"/>
-  <style:style style:name="OrgPriority-A" style:family="text" style:parent-style-name="OrgPriority"/>
-  <style:style style:name="OrgPriority-B" style:family="text" style:parent-style-name="OrgPriority"/>
-  <style:style style:name="OrgPriority-C" style:family="text" style:parent-style-name="OrgPriority"/>
 
   <style:style style:name="OrgTimestamp" style:display-name="OrgTimestamp" style:family="text">
     <style:text-properties style:font-name="Courier New" fo:background-color="transparent" style:font-name-asian="NSimSun" style:font-name-complex="Courier New"/>
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 69f67100541..73d7543e853 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,6 +1,6 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{9.7.11}
-\def\versionyear{2024}          % latest update
+\def\orgversionnumber{9.8.1}
+\def\versionyear{2026}          % latest update
 \input emacsver.tex
 
 %**start of header
@@ -401,7 +401,7 @@ \section{Tables}
 formula, \kbd{:=} a field formula.
 
 \key{Example: Add Col1 and Col2}{|=\$1+\$2      |}
-\key{... with printf format specification}{|=\$1+\$2;\%.2f|}
+\key{... with printf-style format specification}{|=\$1+\$2;\%.2f|}
 \key{... with constants from constants.el}{|=\$1/\$c/\$cm |}
 \metax{sum from 2nd to 3rd hline}{|:=vsum(@II..@III)|}
 \key{apply current column formula}{| = |}
diff --git a/lisp/org/ob-C.el b/lisp/org/ob-C.el
index 59f5a0429a4..416a61aff3e 100644
--- a/lisp/org/ob-C.el
+++ b/lisp/org/ob-C.el
@@ -482,7 +482,6 @@ int get_column_num (int nbcols, const char** header, const char* column)
 (defun org-babel-C-header-to-C (head type)
   "Convert an elisp list of header table into a C or D vector
 specifying a variable with the name of the table."
-  (unless noninteractive (message "%S" type))
   (let ((table (car head))
         (headers (cdr head))
         (typename (pcase type
diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el
index 0141b357d0a..2d6492421db 100644
--- a/lisp/org/ob-R.el
+++ b/lisp/org/ob-R.el
@@ -35,13 +35,24 @@
 (require 'cl-lib)
 (require 'ob)
 
+(require 'subr-x) ; For `string-trim-right', Emacs < 28
+
 (declare-function orgtbl-to-tsv "org-table" (table params))
 (declare-function run-ess-r "ext:ess-r-mode" (&optional start-args))
-(declare-function inferior-ess-send-input "ext:ess-inf" ())
 (declare-function ess-make-buffer-current "ext:ess-inf" ())
 (declare-function ess-eval-buffer "ext:ess-inf" (vis))
 (declare-function ess-wait-for-process "ext:ess-inf"
 		  (&optional proc sec-prompt wait force-redisplay))
+(declare-function ess-send-string "ext:ess-inf"
+                  (process string &optional visibly message type))
+
+(defvar ess-current-process-name) ; ess-custom.el
+(defvar ess-local-process-name)   ; ess-custom.el
+(defvar ess-ask-for-ess-directory) ; ess-custom.el
+(defvar ess-directory-function) ; ess-custom.el
+(defvar ess-directory) ; ess-custom.el
+(defvar ess-gen-proc-buffer-name-function) ; ess-custom.el
+(defvar ess-eval-visibly) ; ess-custom.el
 
 (defconst org-babel-header-args:R
   '((width		 . :any)
@@ -239,7 +250,10 @@ Retrieve variables from PARAMS."
 	     (min (if lengths (apply 'min lengths) 0)))
         ;; Ensure VALUE has an orgtbl structure (depth of at least 2).
         (unless (listp (car value)) (setq value (mapcar 'list value)))
-	(let ((file (orgtbl-to-tsv value '(:fmt org-babel-R-quote-tsv-field)))
+	(let ((file (orgtbl-to-tsv
+                     value
+                     '( :fmt org-babel-R-quote-tsv-field
+                        :with-special-rows nil)))
 	      (header (if (or (eq (nth 1 value) 'hline) colnames-p)
 			  "TRUE" "FALSE"))
 	      (row-names (if rownames-p "1" "NULL")))
@@ -254,19 +268,17 @@ Retrieve variables from PARAMS."
 	  (t                (format "%s <- %S" name (prin1-to-string value))))))
 
 
-(defvar ess-current-process-name) ; dynamically scoped
-(defvar ess-local-process-name)   ; dynamically scoped
-(defvar ess-ask-for-ess-directory) ; dynamically scoped
-(defvar ess-gen-proc-buffer-name-function) ; defined in ess-inf.el
-(defun org-babel-R-initiate-session (session params)
-  "Create or return the current R SESSION buffer.
-Use PARAMS to set default directory when creating a new session."
+(defun org-babel-R-initiate-session (session _params)
+  "Create or return the current R SESSION buffer."
   (unless (string= session "none")
     (let* ((session (or session "*R*"))
-	   (ess-ask-for-ess-directory
-	    (and (boundp 'ess-ask-for-ess-directory)
-		 ess-ask-for-ess-directory
-		 (not (cdr (assq :dir params)))))
+           ;; Force using `default-directory', as we promise in the
+           ;; manual.  The caller should have taken care about setting
+           ;; it according to :dir if necessary.
+           ;; https://ess.r-project.org/Manual/ess.html#Changing-the-startup-actions
+	   (ess-ask-for-ess-directory nil)
+           (ess-directory-function nil)
+           (ess-directory nil)
            ;; Make ESS name the process buffer as SESSION.
            (ess-gen-proc-buffer-name-function
             (lambda (_) session)))
@@ -442,26 +454,20 @@ last statement in BODY, as elisp."
 	  (org-babel-import-elisp-from-file tmp-file '(16)))
 	column-names-p)))
     (output
-     (mapconcat
-      'org-babel-chomp
-      (butlast
-       (delq nil
-	     (mapcar
-	      (lambda (line) (when (> (length line) 0) line))
-	      (mapcar
-	       (lambda (line) ;; cleanup extra prompts left in output
-		 (if (string-match
-		      "^\\([>+.]\\([ ][>.+]\\)*[ ]\\)"
-		      (car (split-string line "\n")))
-		     (substring line (match-end 1))
-		   line))
-	       (with-current-buffer session
-		 (let ((comint-prompt-regexp (concat "^" comint-prompt-regexp)))
-		   (org-babel-comint-with-output (session org-babel-R-eoe-output)
-		     (insert (mapconcat 'org-babel-chomp
-					(list body org-babel-R-eoe-indicator)
-					"\n"))
-		     (inferior-ess-send-input)))))))) "\n"))))
+     (let ((tmp-src-file (org-babel-temp-file "R-")))
+       (with-temp-file tmp-src-file
+         (insert (concat
+                  (org-babel-chomp body) "\n" org-babel-R-eoe-indicator)))
+       (with-current-buffer session
+         (org-babel-chomp
+          (string-trim-right
+           (org-babel-comint-with-output
+             (session org-babel-R-eoe-output nil nil 'disable-prompt-filtering)
+           (ess-send-string (get-buffer-process (current-buffer))
+                            (format "source('%s', echo=F, print.eval=T)"
+                                    (org-babel-process-file-name
+			             tmp-src-file 'noquote))))
+           (rx (literal org-babel-R-eoe-output) (zero-or-more anychar)))))))))
 
 (defun org-babel-R-process-value-result (result column-names-p)
   "R-specific processing of return value.
@@ -486,7 +492,8 @@ by `org-babel-comint-async-filter'."
    session (current-buffer)
    "^\\(?:[>.+] \\)*\\[1\\] \"ob_comint_async_R_\\(start\\|end\\|file\\)_\\(.+\\)\"$"
    'org-babel-chomp
-   'ob-session-async-R-value-callback)
+   'ob-session-async-R-value-callback
+   'disable-prompt-filtering)
   (cl-case result-type
     (value
      (let ((tmp-file (org-babel-temp-file "R-")))
diff --git a/lisp/org/ob-awk.el b/lisp/org/ob-awk.el
index aba2f3fa620..09ccab5e5f5 100644
--- a/lisp/org/ob-awk.el
+++ b/lisp/org/ob-awk.el
@@ -61,7 +61,6 @@
   "Execute a block of Awk code BODY with org-babel.
 PARAMS is a plist of src block parameters .
 This function is called by `org-babel-execute-src-block'."
-  (unless noninteractive (message "Executing Awk source code block"))
   (let* ((result-params (cdr (assq :result-params params)))
          (cmd-line (cdr (assq :cmd-line params)))
          (in-file (cdr (assq :in-file params)))
@@ -112,7 +111,11 @@ table."
   (let ((echo-var (lambda (v) (if (stringp v) v (format "%S" v)))))
     (cond
      ((and (listp var) (listp (car var)))
-      (orgtbl-to-generic var  (list :sep (or sep "\t") :fmt echo-var)))
+      (orgtbl-to-generic
+       var
+       (list :sep (or sep "\t")
+             :fmt echo-var
+             :with-special-rows nil)))
      ((listp var)
       (mapconcat echo-var var "\n"))
      (t (funcall echo-var var)))))
diff --git a/lisp/org/ob-calc.el b/lisp/org/ob-calc.el
index de29f75ba46..1126180d8f1 100644
--- a/lisp/org/ob-calc.el
+++ b/lisp/org/ob-calc.el
@@ -37,8 +37,6 @@
 (require 'calc-trail)
 (require 'calc-store)
 
-(declare-function calc-store-into    "calc-store" (&optional var))
-(declare-function calc-recall        "calc-store" (&optional var))
 (declare-function math-evaluate-expr "calc-ext"   (x))
 
 (defvar org-babel-default-header-args:calc nil
@@ -114,11 +112,30 @@
                   ))))))
      (mapcar #'org-trim
 	     (split-string (org-babel-expand-body:calc body params) "[\n\r]"))))
-  (save-excursion
-    (with-current-buffer "*Calculator*"
-      (prog1
-          (calc-eval (calc-top 1))
-        (calc-pop 1)))))
+  (let ((result (prog1
+                    ;; Cannot use 'top' as SEPARATOR reliably when the
+                    ;; top of the stack has a vector.
+                    (calc-eval (calc-top 1) 'raw)
+                  (calc-eval 1 'pop)))
+        (calc-line-numbering)
+        lisp-table)
+    (org-babel-reassemble-table
+     (org-babel-result-cond (cdr (assq :result-params params))
+       (calc-eval result)
+       (if (Math-vectorp result)
+           (progn
+             (dolist (r (if (math-matrixp result)
+                            (cdr result) ; Ignore the 'vec item.
+                          (list result)))
+               (setq r (cdr r))         ; Ignore the 'vec item.
+               (push (mapcar (lambda (x) (math-format-stack-value (list x 1 nil))) r)
+                     lisp-table))
+             (setq lisp-table (nreverse lisp-table)))
+         (calc-eval result)))
+     (org-babel-pick-name
+      (cdr (assq :colname-names params)) (cdr (assq :colnames params)))
+     (org-babel-pick-name
+      (cdr (assq :rowname-names params)) (cdr (assq :rownames params))))))
 
 (defun org-babel-calc-maybe-resolve-var (el)
 "Resolve user variables in EL.
diff --git a/lisp/org/ob-clojure.el b/lisp/org/ob-clojure.el
index 58fd4044763..8f07d3d3f67 100644
--- a/lisp/org/ob-clojure.el
+++ b/lisp/org/ob-clojure.el
@@ -53,7 +53,6 @@
 (require 'ob)
 
 (declare-function cider-current-connection "ext:cider-client" (&optional type))
-(declare-function cider-current-ns "ext:cider-client" ())
 (declare-function inf-clojure "ext:inf-clojure" (cmd))
 (declare-function inf-clojure-cmd "ext:inf-clojure" (project-type))
 (declare-function inf-clojure-eval-string "ext:inf-clojure" (code))
@@ -155,21 +154,21 @@ or set the `:backend' header argument"))))
 	 (result-params (cdr (assq :result-params params)))
 	 (print-level nil)
 	 (print-length nil)
-	 ;; Remove comments, they break (let [...] ...) bindings
-	 (body (replace-regexp-in-string "^[ 	]*;+.*$" "" body))
 	 (body (org-trim
 		(concat
 		 ;; Source block specified namespace :ns.
 		 (and (cdr (assq :ns params)) (format "(ns %s)\n" ns))
 		 ;; Variables binding.
 		 (if (null vars) (org-trim body)
-		   (format "(let [%s]\n%s)"
+                   ;; Remove comments, they break (let [...] ...) bindings
+                   (let ((body (replace-regexp-in-string "^[    ]*;+.*$" "" body)))
+                     (format "(let [%s]\n%s)"
 			   (mapconcat
 			    (lambda (var)
 			      (format "%S '%S" (car var) (cdr var)))
 			    vars
 			    "\n      ")
-			   body))))))
+			   body)))))))
     ;; If the result param is set to "output" we don't have to do
     ;; anything special and just let the backend handle everything
     (if (member "output" result-params)
@@ -237,8 +236,8 @@ or set the `:backend' header argument"))))
 			     "clojure" (format "clojure -A%s" alias)
 			     cmd0)
 		    cmd0)))
-	(setq
-         org-babel-comint-prompt-regexp-old comint-prompt-regexp
+	(setq-local
+         org-babel-comint-prompt-regexp-fallback comint-prompt-regexp
          comint-prompt-regexp inf-clojure-comint-prompt-regexp)
 	(funcall-interactively #'inf-clojure cmd)
 	(goto-char (point-max))))
diff --git a/lisp/org/ob-comint.el b/lisp/org/ob-comint.el
index daf2b5d54e7..7e89e26bade 100644
--- a/lisp/org/ob-comint.el
+++ b/lisp/org/ob-comint.el
@@ -36,8 +36,13 @@
 
 (require 'ob-core)
 (require 'org-compat)
+(require 'org-element-ast)
+
 (require 'comint)
 
+(declare-function org-element-context "org-element" (&optional element))
+(defvar org-element-inline-src-block-regexp)
+
 (defun org-babel-comint-buffer-livep (buffer)
   "Check if BUFFER is a comint buffer with a live process."
   (let ((buffer (when buffer (get-buffer buffer))))
@@ -58,7 +63,8 @@ executed inside the protection of `save-excursion' and
 	   (let ((comint-input-filter (lambda (_input) nil)))
 	     ,@body))))))
 
-(defvar-local org-babel-comint-prompt-regexp-old nil
+(defvaralias 'org-babel-comint-prompt-regexp-old 'org-babel-comint-prompt-regexp-fallback)
+(defvar org-babel-comint-prompt-regexp-fallback nil
   "Fallback regexp used to detect prompt.")
 
 (defcustom org-babel-comint-fallback-regexp-threshold 5.0
@@ -69,11 +75,11 @@ This is useful when prompt unexpectedly changes."
   :package-version '(Org . "9.7"))
 
 (defun org-babel-comint--set-fallback-prompt ()
-  "Swap `comint-prompt-regexp' and `org-babel-comint-prompt-regexp-old'."
-  (when org-babel-comint-prompt-regexp-old
+  "Swap `comint-prompt-regexp' and `org-babel-comint-prompt-regexp-fallback'."
+  (when org-babel-comint-prompt-regexp-fallback
     (let ((tmp comint-prompt-regexp))
-      (setq comint-prompt-regexp org-babel-comint-prompt-regexp-old
-            org-babel-comint-prompt-regexp-old tmp))))
+      (setq comint-prompt-regexp org-babel-comint-prompt-regexp-fallback
+            org-babel-comint-prompt-regexp-fallback tmp))))
 
 (defun org-babel-comint--prompt-filter (string &optional prompt-regexp)
   "Remove PROMPT-REGEXP from STRING.
@@ -100,15 +106,33 @@ PROMPT-REGEXP defaults to `comint-prompt-regexp'."
        (setq string (substring string (match-end 0))))
   string)
 
+(defun org-babel-comint--remove-prompts-p (prompt-handling)
+  "Helper to decide whether to remove prompts from comint output.
+Parses the symbol in PROMPT-HANDLING, which can be
+`filter-prompts', in which case prompts should be removed; or
+`disable-prompt-filtering', in which case prompt filtering is
+skipped.  For backward-compatibility, the default value of `nil'
+is equivalent to `filter-prompts'."
+  (cond
+   ((eq prompt-handling 'disable-prompt-filtering) nil)
+   ((eq prompt-handling 'filter-prompts) t)
+   ((eq prompt-handling nil) t)
+   (t (error (format "Unrecognized prompt handling behavior %s"
+                     prompt-handling)))))
+
 (defmacro org-babel-comint-with-output (meta &rest body)
   "Evaluate BODY in BUFFER and return process output.
 Will wait until EOE-INDICATOR appears in the output, then return
 all process output.  If REMOVE-ECHO and FULL-BODY are present and
-non-nil, then strip echo'd body from the returned output.  META
-should be a list containing the following where the last two
-elements are optional.
+non-nil, then strip echo'd body from the returned output.
+PROMPT-HANDLING may be either of the symbols `filter-prompts', in
+which case the output is split by `comint-prompt-regexp' and
+returned as a list; or, `disable-prompt-filtering', which
+suppresses this behavior and returns the full output as a string.
+META should be a list containing the following where the last
+three elements are optional.
 
- (BUFFER EOE-INDICATOR REMOVE-ECHO FULL-BODY)
+ (BUFFER EOE-INDICATOR REMOVE-ECHO FULL-BODY PROMPT-HANDLING)
 
 This macro ensures that the filter is removed in case of an error
 or user `keyboard-quit' during execution of body."
@@ -116,7 +140,8 @@ or user `keyboard-quit' during execution of body."
   (let ((buffer (nth 0 meta))
 	(eoe-indicator (nth 1 meta))
 	(remove-echo (nth 2 meta))
-	(full-body (nth 3 meta)))
+	(full-body (nth 3 meta))
+        (prompt-handling (nth 4 meta)))
     `(org-babel-comint-in-buffer ,buffer
        (let* ((string-buffer "")
 	      (comint-output-filter-functions
@@ -124,7 +149,7 @@ or user `keyboard-quit' during execution of body."
                        (setq string-buffer (concat string-buffer text)))
 		     comint-output-filter-functions))
 	      dangling-text)
-	 ;; got located, and save dangling text
+         ;; got located, and save dangling text
 	 (goto-char (process-mark (get-buffer-process (current-buffer))))
 	 (let ((start (point))
 	       (end (point-max)))
@@ -134,38 +159,37 @@ or user `keyboard-quit' during execution of body."
 	 ,@body
 	 ;; wait for end-of-evaluation indicator
          (let ((start-time (current-time)))
-	   (while (progn
-		    (goto-char comint-last-input-end)
-		    (not (save-excursion
-		         (and (re-search-forward
-			       (regexp-quote ,eoe-indicator) nil t)
-			      (re-search-forward
-			       comint-prompt-regexp nil t)))))
+	   (while (not (save-excursion
+		         (and (string-match
+			       (regexp-quote ,eoe-indicator) string-buffer)
+			      (string-match
+			       comint-prompt-regexp string-buffer))))
 	     (accept-process-output
               (get-buffer-process (current-buffer))
               org-babel-comint-fallback-regexp-threshold)
-             (when (and org-babel-comint-prompt-regexp-old
+             (when (and org-babel-comint-prompt-regexp-fallback
                         (> (float-time (time-since start-time))
                            org-babel-comint-fallback-regexp-threshold)
                         (progn
 		          (goto-char comint-last-input-end)
 		          (save-excursion
                             (and
-                             (re-search-forward
-			      (regexp-quote ,eoe-indicator) nil t)
-			     (re-search-forward
-                              org-babel-comint-prompt-regexp-old nil t)))))
+                             (string-match
+			      (regexp-quote ,eoe-indicator) string-buffer)
+			     (string-match
+                              org-babel-comint-prompt-regexp-fallback string-buffer)))))
                (org-babel-comint--set-fallback-prompt))))
 	 ;; replace cut dangling text
-	 (goto-char (process-mark (get-buffer-process (current-buffer))))
+         (goto-char (process-mark (get-buffer-process (current-buffer))))
 	 (insert dangling-text)
 
          ;; remove echo'd FULL-BODY from input
          (and ,remove-echo ,full-body
               (setq string-buffer (org-babel-comint--echo-filter string-buffer ,full-body)))
 
-         ;; Filter out prompts.
-         (org-babel-comint--prompt-filter string-buffer)))))
+         (if (org-babel-comint--remove-prompts-p ,prompt-handling)
+             (org-babel-comint--prompt-filter string-buffer)
+           string-buffer)))))
 
 (defun org-babel-comint-input-command (buffer cmd)
   "Pass CMD to BUFFER.
@@ -189,14 +213,14 @@ statement (not large blocks of code)."
         (accept-process-output
          (get-buffer-process buffer)
          org-babel-comint-fallback-regexp-threshold)
-        (when (and org-babel-comint-prompt-regexp-old
+        (when (and org-babel-comint-prompt-regexp-fallback
                    (> (float-time (time-since start-time))
                       org-babel-comint-fallback-regexp-threshold)
                    (progn
 		     (goto-char comint-last-input-end)
 		     (save-excursion
 		       (re-search-forward
-                        org-babel-comint-prompt-regexp-old nil t))))
+                        org-babel-comint-prompt-regexp-fallback nil t))))
           (org-babel-comint--set-fallback-prompt))))))
 
 (defun org-babel-comint-eval-invisibly-and-wait-for-file
@@ -239,6 +263,9 @@ Its single argument is a string consisting of output from the
 comint process.  It should return a string that will be passed
 to `org-babel-insert-result'.")
 
+(defvar-local org-babel-comint-async-remove-prompts-p t
+  "Whether prompts should be detected and removed from async output.")
+
 (defvar-local org-babel-comint-async-dangling nil
   "Dangling piece of the last process output, as a string.
 Used when `org-babel-comint-async-indicator' is spread across multiple
@@ -290,8 +317,7 @@ STRING contains the output originally inserted into the comint buffer."
 		          (with-current-buffer buf
 			    (save-excursion
 			      (goto-char (point-min))
-			      (when (search-forward tmp-file nil t)
-			        (org-babel-previous-src-block)
+			      (when (org-babel-comint-async--find-src tmp-file)
                                 (let* ((info (org-babel-get-src-block-info))
                                        (params (nth 2 info))
                                        (result-params
@@ -326,17 +352,22 @@ STRING contains the output originally inserted into the comint buffer."
 		      until (and (equal (match-string 1) "start")
 				 (equal (match-string 2) uuid))
 		      finally return (+ 1 (match-end 0)))))
-                   ;; Remove prompt
-                   (res-promptless (org-trim (string-join (mapcar #'org-trim (org-babel-comint--prompt-filter res-str-raw)) "\n") "\n"))
 		   ;; Apply user callback
-		   (res-str (funcall org-babel-comint-async-chunk-callback res-promptless)))
+		   (res-str (funcall org-babel-comint-async-chunk-callback
+                                     (if org-babel-comint-async-remove-prompts-p
+                                         (org-trim (string-join
+                                                    (mapcar #'org-trim
+                                                            (org-babel-comint--prompt-filter
+                                                             res-str-raw))
+                                                    "\n")
+                                                   t)
+                                       res-str-raw))))
 	      ;; Search for uuid in associated org-buffers to insert results
 	      (cl-loop for buf in org-buffers
 		       until (with-current-buffer buf
 			       (save-excursion
 			         (goto-char (point-min))
-			         (when (search-forward uuid nil t)
-				   (org-babel-previous-src-block)
+			         (when (org-babel-comint-async--find-src uuid)
                                    (let* ((info (org-babel-get-src-block-info))
                                           (params (nth 2 info))
                                           (result-params
@@ -348,20 +379,63 @@ STRING contains the output originally inserted into the comint buffer."
 	      ;; Remove uuid from the list to search for
 	      (setq uuid-list (delete uuid uuid-list)))))))))
 
+(defun org-babel-comint-async--find-src (uuid-or-tmpfile)
+  "Find source block associated with an async comint result.
+UUID-OR-TMPFILE is the uuid or tmpfile associated with the result.
+Returns non-nil if the source block is succesfully found, and moves
+point there.
+
+This function assumes that UUID-OR-TMPFILE was previously inserted as
+the source block's result, as a placeholder until the true result
+becomes ready.  It may fail to find the source block if the buffer was
+modified so that UUID-OR-TMPFILE is no longer the result of the source
+block, or if it has been copied elsewhere into the buffer (this is a
+limitation of the current async implementation)."
+  (goto-char (point-min))
+  (when (search-forward uuid-or-tmpfile nil t)
+    (let ((uuid-pos (point)))
+      (and (re-search-backward
+            ;; find the nearest preceding src or inline-src block
+            (rx (or (regexp org-babel-src-block-regexp)
+                    (regexp org-element-inline-src-block-regexp)))
+            nil t)
+           ;; check it's actually a src block and not verbatim text
+           (org-element-type-p (org-element-context)
+                               '(inline-src-block src-block))
+           ;; Check result contains the uuid. There isn't a simple way
+           ;; to extract the result value that works in all cases
+           ;; (e.g. inline blocks or results drawers), so instead
+           ;; check the result region contains the found uuid position
+           (let ((result-where (org-babel-where-is-src-block-result)))
+             (when result-where
+               (save-excursion
+                 (goto-char result-where)
+                 (and
+                  (>= uuid-pos (org-element-property :begin (org-element-context)))
+                  (< uuid-pos (org-element-property :end (org-element-context)))))))))))
+
 (defun org-babel-comint-async-register
     (session-buffer org-buffer indicator-regexp
-		    chunk-callback file-callback)
+		    chunk-callback file-callback
+                    &optional prompt-handling)
   "Set local org-babel-comint-async variables in SESSION-BUFFER.
 ORG-BUFFER is added to `org-babel-comint-async-buffers' if not
 present.  `org-babel-comint-async-indicator',
 `org-babel-comint-async-chunk-callback', and
 `org-babel-comint-async-file-callback' are set to
-INDICATOR-REGEXP, CHUNK-CALLBACK, and FILE-CALLBACK
-respectively."
+INDICATOR-REGEXP, CHUNK-CALLBACK, and FILE-CALLBACK respectively.
+PROMPT-HANDLING may be either of the symbols `filter-prompts', in
+which case prompts matching `comint-prompt-regexp' are filtered
+from output before it is passed to CHUNK-CALLBACK, or
+`disable-prompt-filtering', in which case this behavior is
+disabled.  For backward-compatibility, the default value of `nil'
+is equivalent to `filter-prompts'."
   (org-babel-comint-in-buffer session-buffer
     (setq org-babel-comint-async-indicator indicator-regexp
 	  org-babel-comint-async-chunk-callback chunk-callback
 	  org-babel-comint-async-file-callback file-callback)
+    (setq org-babel-comint-async-remove-prompts-p
+          (org-babel-comint--remove-prompts-p prompt-handling))
     (unless (memq org-buffer org-babel-comint-async-buffers)
       (setq org-babel-comint-async-buffers
 	    (cons org-buffer org-babel-comint-async-buffers)))
diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el
index d0809a6c3e8..a8ca1ccd080 100644
--- a/lisp/org/ob-core.el
+++ b/lisp/org/ob-core.el
@@ -42,30 +42,26 @@
     nil))
 
 (defvar org-babel-library-of-babel)
-(defvar org-edit-src-content-indentation)
+(defvar org-src-content-indentation)
 (defvar org-link-file-path-type)
 (defvar org-src-lang-modes)
 (defvar org-babel-tangle-uncomment-comments)
 
 (declare-function org-attach-dir "org-attach" (&optional create-if-not-exists-p no-fs-check))
-(declare-function org-at-item-p "org-list" ())
-(declare-function org-at-table-p "org" (&optional table-type))
+(declare-function org-at-table-p "org-table" (&optional table-type))
 (declare-function org-babel-lob-execute-maybe "ob-lob" ())
 (declare-function org-babel-ref-goto-headline-id "ob-ref" (id))
 (declare-function org-babel-ref-headline-body "ob-ref" ())
 (declare-function org-babel-ref-parse "ob-ref" (assignment))
 (declare-function org-babel-ref-resolve "ob-ref" (ref))
-(declare-function org-babel-ref-split-args "ob-ref" (arg-string))
 (declare-function org-babel-tangle-comment-links "ob-tangle" (&optional info))
 (declare-function org-current-level "org" ())
-(declare-function org-cycle "org-cycle" (&optional arg))
 (declare-function org-edit-src-code "org-src" (&optional code edit-buffer-name))
 (declare-function org-edit-src-exit "org-src"  ())
-(declare-function org-src-preserve-indentation-p "org-src" (node))
+(declare-function org-src-preserve-indentation-p "org-src" (&optional node))
 (declare-function org-element-at-point "org-element" (&optional pom cached-only))
-(declare-function org-element-at-point-no-context "org-element" (&optional pom))
 (declare-function org-element-context "org-element" (&optional element))
-(declare-function org-element-normalize-string "org-element" (s))
+(declare-function org-element-normalize-string "org-element" (s &optional keep-newlines))
 (declare-function org-element-property "org-element-ast" (property node))
 (declare-function org-element-begin "org-element" (node))
 (declare-function org-element-end "org-element" (node))
@@ -79,34 +75,26 @@
 (declare-function org-entry-get "org" (pom property &optional inherit literal-nil))
 (declare-function org-escape-code-in-region "org-src" (beg end))
 (declare-function org-forward-heading-same-level "org" (arg &optional invisible-ok))
-(declare-function org-in-commented-heading-p "org" (&optional no-inheritance))
+(declare-function org-in-commented-heading-p "org" (&optional no-inheritance element))
 (declare-function org-indent-block "org" ())
 (declare-function org-indent-line "org" ())
-(declare-function org-list-get-list-end "org-list" (item struct prevs))
-(declare-function org-list-prevs-alist "org-list" (struct))
-(declare-function org-list-struct "org-list" ())
-(declare-function org-list-to-generic "org-list" (LIST PARAMS))
 (declare-function org-list-to-lisp "org-list" (&optional delete))
 (declare-function org-list-to-org "org-list" (list &optional params))
 (declare-function org-macro-escape-arguments "org-macro" (&rest args))
 (declare-function org-mark-ring-push "org" (&optional pos buffer))
 (declare-function org-narrow-to-subtree "org" (&optional element))
 (declare-function org-next-block "org" (arg &optional backward block-regexp))
-(declare-function org-open-at-point "org" (&optional in-emacs reference-buffer))
+(declare-function org-open-at-point "org" (&optional arg))
 (declare-function org-previous-block "org" (arg &optional block-regexp))
-(declare-function org-fold-show-context "org-fold" (&optional key))
 (declare-function org-src-coderef-format "org-src" (&optional element))
 (declare-function org-src-coderef-regexp "org-src" (fmt &optional label))
 (declare-function org-src-get-lang-mode "org-src" (lang))
 (declare-function org-table-align "org-table" ())
 (declare-function org-table-convert-region "org-table" (beg0 end0 &optional separator))
 (declare-function org-table-end "org-table" (&optional table-type))
-(declare-function org-table-import "org-table" (file arg))
 (declare-function org-table-to-lisp "org-table" (&optional txt))
-(declare-function org-unescape-code-in-string "org-src" (s))
 (declare-function orgtbl-to-generic "org-table" (table params))
 (declare-function orgtbl-to-orgtbl "org-table" (table params))
-(declare-function tramp-compat-make-temp-file "tramp-compat" (filename &optional dir-flag))
 
 (defgroup org-babel nil
   "Code block evaluation and management in `org-mode' documents."
@@ -216,8 +204,8 @@ When matching, reference is stored in match group 1."
 
 (defvar org-babel-src-block-regexp
   (concat
-   ;; (1) indentation                 (2) lang
-   "^\\([ \t]*\\)#\\+begin_src[ \t]+\\([^ \f\t\n\r\v]+\\)[ \t]*"
+   ;; (1) indentation                      (2) lang
+   "^\\([ \t]*\\)#\\+begin_src\\(?:[ \t]+\\([^ \f\t\n\r\v]*\\)\\)?[ \t]*"
    ;; (3) switches
    "\\([^\":\n]*\"[^\"\n*]*\"[^\":\n]*\\|[^\":\n]*\\)"
    ;; (4) header arguments
@@ -358,18 +346,27 @@ a window into the `org-babel-get-src-block-info' function."
 	(full (lambda (it) (> (length it) 0)))
 	(printf (lambda (fmt &rest args) (princ (apply #'format fmt args)))))
     (when info
-      (with-help-window (help-buffer)
-	(let ((name        (nth 4 info))
-	      (lang        (nth 0 info))
-	      (switches    (nth 3 info))
-	      (header-args (nth 2 info)))
+      (let* ((name        (nth 4 info))
+	     (language    (nth 0 info))
+	     (switches    (nth 3 info))
+	     (header-args (nth 2 info))
+	     (property-header-args
+              (org-entry-get (point) "header-args" t))
+             (property-header-args-language
+              (org-entry-get (point) (concat "header-args:" language) t)))
+	(with-help-window (help-buffer)
 	  (when name            (funcall printf "Name: %s\n"     name))
-	  (when lang            (funcall printf "Lang: %s\n"     lang))
+	  (when language        (funcall printf "Language: %s\n"     language))
+          ;; Show header arguments that have been set through
+          ;; properties (i.e. in property drawers or through
+          ;; #+PROPERTY)
 	  (funcall printf "Properties:\n")
-	  (funcall printf "\t:header-args \t%s\n" (org-entry-get (point) "header-args" t))
-	  (funcall printf "\t:header-args:%s \t%s\n" lang (org-entry-get (point) (concat "header-args:" lang) t))
-
+	  (funcall printf "\t:header-args \t%s\n" property-header-args)
+	  (funcall printf "\t:header-args:%s \t%s\n" language property-header-args-language)
+          ;; Show switches
 	  (when (funcall full switches) (funcall printf "Switches: %s\n" switches))
+          ;; Show default header arguments and header arguments that
+          ;; have been explicitly set in the current code block.
 	  (funcall printf "Header Arguments:\n")
 	  (dolist (pair (sort header-args
 			      (lambda (a b) (string< (symbol-name (car a))
@@ -722,9 +719,17 @@ Otherwise, return a list with the following pattern:
 	       lang
 	       (org-babel--normalize-body datum)
 	       (apply #'org-babel-merge-params
-		      (if inline org-babel-default-inline-header-args
-			org-babel-default-header-args)
-		      (and (boundp lang-headers) (eval lang-headers t))
+                      ;; Use `copy-tree' to avoid creating shared structure
+                      ;; with the `org-babel-default-header-args-*' variables:
+                      ;; modifications by `org-babel-generate-file-param'
+                      ;; below would modify the shared structure, thereby
+                      ;; modifying the variables.
+                      (copy-tree
+                       (if inline org-babel-default-inline-header-args
+                         org-babel-default-header-args)
+                       t)
+                      (and (boundp lang-headers)
+                           (copy-tree (eval lang-headers t) t))
 		      (append
 		       ;; If DATUM is provided, make sure we get node
 		       ;; properties applicable to its location within
@@ -748,11 +753,19 @@ Otherwise, return a list with the following pattern:
 (defun org-babel--expand-body (info)
   "Expand noweb references in src block and remove any coderefs.
 The src block is defined by its INFO, as returned by
-`org-babel-get-src-block-info'."
+`org-babel-get-src-block-info'.
+
+This function uses the :eval context for noweb expansion because it is
+called when code needs to be evaluated, either by
+`org-babel-execute-src-block' or `org-babel-confirm-evaluate'.  The :eval
+context is appropriate even during export or tangling when the code block
+needs to be evaluated to generate results.  It is distinct from the :export
+and :tangle contexts which are used when generating the source code body for
+display in exported documents or tangled files."
   (let ((coderef (nth 6 info))
 	(expand
 	 (if (org-babel-noweb-p (nth 2 info) :eval)
-	     (org-babel-expand-noweb-references info)
+	     (org-babel-expand-noweb-references info nil :eval)
 	   (nth 1 info))))
     (if (not coderef) expand
       (replace-regexp-in-string
@@ -986,7 +999,7 @@ arguments and pop open the results in a preview buffer."
 							(symbol-name (car el2)))))))
          (body (setf (nth 1 info)
 		     (if (org-babel-noweb-p params :eval)
-			 (org-babel-expand-noweb-references info) (nth 1 info))))
+			 (org-babel-expand-noweb-references info nil :eval) (nth 1 info))))
          (expand-cmd (intern (concat "org-babel-expand-body:" lang)))
 	 (assignments-cmd (intern (concat "org-babel-variable-assignments:"
 					  lang)))
@@ -1076,10 +1089,19 @@ completion from lists of common args and values."
       (unless (= (char-before (point)) ?\ ) (insert " "))
       (insert ":" header-arg) (when value (insert " " value)))))
 
+(defun org-babel-in-src-block-header-p ()
+  "Return non-nil when `point' is in the header line of the source block."
+  (let ((beg (org-babel-where-is-src-block-head)))
+    (when beg
+      (let ((end (save-excursion (goto-char beg) (end-of-line) (point))))
+        (and (>= (point) beg) (<= (point) end))))))
+
 ;; Add support for completing-read insertion of header arguments after ":"
 (defun org-babel-header-arg-expand ()
-  "Call `org-babel-enter-header-arg-w-completion' in appropriate contexts."
-  (when (and (equal (char-before) ?\:) (org-babel-where-is-src-block-head))
+  "Call `org-babel-enter-header-arg-w-completion' in appropriate contexts
+(the header line of a source block)."
+  (when (and (equal (char-before) ?\:)
+             (org-babel-in-src-block-header-p))
     (org-babel-enter-header-arg-w-completion (match-string 2))))
 
 (defun org-babel-enter-header-arg-w-completion (&optional lang)
@@ -1117,7 +1139,7 @@ session."
 		   (user-error "No src code block at point")
 		 (setf (nth 1 info)
 		       (if (org-babel-noweb-p params :eval)
-			   (org-babel-expand-noweb-references info)
+			   (org-babel-expand-noweb-references info nil :eval)
 			 (nth 1 info)))))
          (session (cdr (assq :session params)))
 	 (dir (cdr (assq :dir params)))
@@ -1240,6 +1262,9 @@ evaluation mechanisms."
    (save-match-data (org-element-context))
    '(babel-call inline-babel-call inline-src-block src-block)))
 
+(defvar org-babel-results-buffer-name "*Org Babel Results*"
+  "The buffer name of Org Babel evaluate results.")
+
 ;;;###autoload
 (defun org-babel-open-src-block-result (&optional re-run)
   "Open results of source block at point.
@@ -1263,7 +1288,7 @@ exist."
        (if (looking-at org-link-bracket-re) (org-open-at-point)
 	 (let ((r (org-babel-format-result (org-babel-read-result)
 					   (cdr (assq :sep arguments)))))
-	   (pop-to-buffer (get-buffer-create "*Org Babel Results*"))
+	   (pop-to-buffer (get-buffer-create org-babel-results-buffer-name))
 	   (erase-buffer)
 	   (insert r)))
        t))
@@ -1379,8 +1404,8 @@ buffer."
 	 (while (re-search-forward "call_\\S-\\|^[ \t]*#\\+CALL:" nil t)
 	   (let ((,datum (org-element-context)))
 	     (when (org-element-type-p ,datum '(babel-call inline-babel-call))
-	       (goto-char (or (org-element-post-affiliated datum)
-                              (org-element-begin datum)))
+	       (goto-char (or (org-element-post-affiliated ,datum)
+                              (org-element-begin ,datum)))
 	       (let ((,end (copy-marker (org-element-end ,datum))))
 		 ,@body
 		 (goto-char ,end)
@@ -1484,7 +1509,7 @@ CONTEXT specifies the context of evaluation.  It can be `:eval',
 	   (lang (nth 0 info))
 	   (params (nth 2 info))
 	   (body (if (org-babel-noweb-p params context)
-		     (org-babel-expand-noweb-references info)
+		     (org-babel-expand-noweb-references info nil context)
 		   (nth 1 info)))
 	   (expand-cmd (intern (concat "org-babel-expand-body:" lang)))
 	   (assignments-cmd (intern (concat "org-babel-variable-assignments:"
@@ -2136,7 +2161,14 @@ block of the same language as the previous."
                   (list (point))))
                (n (- (length parts) 2)) ;; 1 or 2 parts in `dolist' below.
                ;; `post-blank' caches the property before setting it to 0.
-               (post-blank (org-element-property :post-blank copy)))
+               (post-blank (org-element-property :post-blank copy))
+               (to-uppercase
+                (lambda (str)
+                  (string-match "^[ \t]*#\\+\\(begin_src\\)" str)
+                  (setq str (replace-match "BEGIN_SRC" t t str 1))
+                  (string-match "^[ \t]*#\\+\\(end_src\\)" str)
+                  (setq str (replace-match "END_SRC" t t str 1))
+                  str)))
           ;; Point or region are within body when parts is in increasing order.
           (unless (apply #'<= parts)
             (user-error "Select within the source block body to split it"))
@@ -2156,7 +2188,12 @@ block of the same language as the previous."
           ;; Set `:post-blank' to 0.  We take care of spacing between blocks.
           (org-element-put-property copy :post-blank 0)
           (org-element-put-property copy :value (car parts))
-          (insert (org-element-interpret-data copy))
+          (let ((copy-str (org-element-interpret-data copy)))
+            ;; `org-element-interpret-data' produces lower-case
+            ;; #+begin_src .. #+end_src
+            (when upper-case-p
+              (setq copy-str (funcall to-uppercase copy-str)))
+            (insert copy-str))
           ;; `org-indent-block' may see another `org-element' (e.g. paragraph)
           ;; immediately after the block.  Ensure to indent the inserted block
           ;; and move point to its end.
@@ -2173,7 +2210,12 @@ block of the same language as the previous."
             (when (= n 0)
               ;; Use `post-blank' to reset the property of the last block.
               (org-element-put-property copy :post-blank post-blank))
-            (insert (org-element-interpret-data copy))
+            (let ((copy-str (org-element-interpret-data copy)))
+              ;; `org-element-interpret-data' produces lower-case
+              ;; #+begin_src .. #+end_src
+              (when upper-case-p
+                (setq copy-str (funcall to-uppercase copy-str)))
+              (insert copy-str))
             ;; Ensure to indent the inserted block and move point to its end.
             (org-babel-previous-src-block 1)
             (org-indent-block)
@@ -2683,6 +2725,10 @@ result:
 			   (opening-line (concat "#+begin_" full))
 			   (closing-line (concat "#+end_" type)))
 		      (cond
+                       ;; Do nothing if type is "no" or "nil"
+                       ((or (org-string-equal-ignore-case type "nil")
+                            (org-string-equal-ignore-case type "no"))
+                        nil)
 		       ;; Escape contents from "export" wrap.  Wrap
 		       ;; inline results within an export snippet with
 		       ;; appropriate value.
@@ -2835,7 +2881,9 @@ If called with prefix argument ARG, remove all result blocks in the
 buffer."
   (interactive "P")
   (if arg
-      (org-babel-map-src-blocks nil (org-babel-remove-result))
+      (progn
+        (org-babel-map-src-blocks nil (org-babel-remove-result))
+        (org-babel-map-call-lines nil (org-babel-remove-result)))
     (org-babel-remove-result)))
 
 (defun org-babel-result-end ()
@@ -2953,7 +3001,7 @@ used as a string to be appended to #+begin_example line."
 		      (indent-rigidly
 		       (point-min)
 		       (point-max)
-		       (+ ind org-edit-src-content-indentation))
+		       (+ ind org-src-content-indentation))
 		      (buffer-string))))))
       (delete-region body-start
 		     (org-with-wide-buffer
@@ -3025,6 +3073,8 @@ parameters when merging lists."
 		 (setf (cddr (nth variable-index vars))
 		       (concat (symbol-name name) "=" value))
 		 (cl-incf variable-index)))
+              ((null (cdr pair)) ;; Empty :var, ignore
+               nil)
 	      (t (error "Variable \"%s\" must be assigned a default value"
 			(cdr pair))))))
 	  (`(:results . ,value)
@@ -3089,7 +3139,7 @@ CONTEXT may be one of :tangle, :export or :eval."
 (defvar org-babel-expand-noweb-references--cache-buffer nil
   "Cons (BUFFER . MODIFIED-TICK) for cached noweb references.
 See `org-babel-expand-noweb-references--cache'.")
-(defun org-babel-expand-noweb-references (&optional info parent-buffer)
+(defun org-babel-expand-noweb-references (&optional info parent-buffer context)
   "Expand Noweb references in the body of the current source code block.
 
 When optional argument INFO is non-nil, use the block defined by INFO
@@ -3098,6 +3148,24 @@ instead.
 The block is assumed to be located in PARENT-BUFFER or current buffer
 \(when PARENT-BUFFER is nil).
 
+CONTEXT specifies the context of expansion and can be one of :tangle,
+:export, or :eval.  When CONTEXT is nil, it defaults to :eval.
+
+Note: CONTEXT does not affect whether the top-level block is expanded -
+that is determined by the caller and the block's own :noweb setting.
+The context only determines which noweb header arguments are honored when
+recursively expanding nested references within referenced blocks.
+
+For recursive expansion:
+- :tangle context: expands blocks with :noweb tangle, :noweb yes, etc.
+- :export context: expands blocks with :noweb export, :noweb yes, etc.
+- :eval context: expands blocks with :noweb eval, :noweb yes, etc.
+
+This is important for recursive expansion: when a block with :noweb tangle
+references another block that also contains noweb references, those nested
+references should only be expanded if the referenced block's :noweb setting
+permits expansion in the tangle context.
+
 For example the following reference would be replaced with the
 body of the source-code block named `example-block'.
 
@@ -3125,7 +3193,8 @@ defined by `org-babel-lob'.  For example
 would set the value of argument \"a\" equal to \"9\".  Note that
 these arguments are not evaluated in the current source-code
 block but are passed literally to the \"example-block\"."
-  (let* ((parent-buffer (or parent-buffer (current-buffer)))
+  (let* ((context (or context :eval))
+         (parent-buffer (or parent-buffer (current-buffer)))
 	 (info (or info (org-babel-get-src-block-info 'no-eval)))
          (lang (nth 0 info))
          (body (nth 1 info))
@@ -3159,8 +3228,9 @@ block but are passed literally to the \"example-block\"."
 	          (expand-body
 	            (i)
 	            ;; Expand body of code represented by block info I.
-	            `(let ((b (if (org-babel-noweb-p (nth 2 ,i) :eval)
-			          (org-babel-expand-noweb-references ,i)
+	            `(let ((b (if (org-babel-noweb-p (nth 2 ,i) context)
+			          (org-babel-expand-noweb-references
+			           ,i parent-buffer context)
 		                (nth 1 ,i))))
 	               (if (not comment) b
 		         (let ((cs (org-babel-tangle-comment-links ,i)))
@@ -3501,8 +3571,7 @@ Execute TABLE-FORMS when result should be considered sexp and parsed."
 	         (member "file" ,params)
 	         (and (or (member "output" ,params)
 			  (member "raw"    ,params)
-			  (member "org"    ,params)
-			  (member "drawer" ,params))
+			  (member "org"    ,params))
 		      (not (member "table" ,params))))
 	     ,scalar-form
 	   ,@table-forms)))))
diff --git a/lisp/org/ob-csharp.el b/lisp/org/ob-csharp.el
new file mode 100644
index 00000000000..7bd30e1514c
--- /dev/null
+++ b/lisp/org/ob-csharp.el
@@ -0,0 +1,304 @@
+;;; ob-csharp.el --- org-babel functions for csharp evaluation -*- lexical-binding: t -*-
+
+;; Copyright (C) 2024-2026 Free Software Foundation, Inc.
+
+;; Author:     Maximilian Kueffner
+;; Maintainer: Maximilian Kueffner <poverobuosodonati@gmail.com>
+;; Keywords: literate programming, reproducible research
+;; Homepage: https://orgmode.org
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Requirements:
+
+;; Some .NET runtime environment should be installed.
+;; The `dotnet' command should be available to the system's environment
+;; (PATH discoverable for example).
+
+;;; Code:
+(require 'ob)
+
+;; file extension for C#
+(add-to-list 'org-babel-tangle-lang-exts '("csharp" . "cs"))
+
+;; default header arguments for C#
+(defvar org-babel-default-header-args:csharp
+  '((main . ((no)))
+    (nugetconfig . :any)
+    (framework . :any)
+    (class . ((no nil :any)))
+    (references . :any)
+    (usings . :any)
+    (cmdline . :any))
+  "Csharp specific header arguments.")
+
+(defcustom org-babel-csharp-compiler "dotnet"
+  "The program to call for compiling a csharp project."
+  :group 'org-babel
+  :package-version '(Org. "9.8")
+  :type 'string
+  :risky t)
+
+(defun org-babel-csharp--default-compile-command (dir-proj-sln bin-dir)
+  "Construct the default compilation command for C#.
+
+DIR-PROJ-SLN is either a directory containing a \".csproj\" or \".sln\" file
+or a full path to either of these.
+BIN-DIR is the directory for the compiled output."
+  (format "%s build --output %S %S"
+          org-babel-csharp-compiler bin-dir dir-proj-sln))
+
+(defun org-babel-csharp--default-restore-command (project-file)
+  "Construct the default restore command for C# projects.
+
+PROJECT-FILE is a path to a \".csproj\" file on which the restore command
+takes effect."
+  (format "%s restore %S" org-babel-csharp-compiler project-file))
+
+(defun org-babel-csharp--find-dotnet-version ()
+  "Get a list of dotnet major versions from a list of dotnet sdks."
+  (cl-delete-if #'(lambda (v) (= 0 v))
+             (delete-dups
+              (mapcar #'(lambda (n)
+                          (let ((fr (string-match "^[0-9.]+\\." n))
+                                (to (string-match "\\." n)))
+                            (string-to-number (substring n fr to))))
+                      (split-string
+                       (shell-command-to-string
+                        (format "%s --list-sdks" org-babel-csharp-compiler))
+                       "\n")))))
+
+(defcustom org-babel-csharp-default-target-framework
+  (format "net%s.0"
+          (let ((net-sdks (org-babel-csharp--find-dotnet-version)))
+            (when net-sdks
+              (apply #'max net-sdks))))
+  "The desired target framework to use."
+  :group 'org-babel
+  :package-version '(Org. "9.8")
+  :type 'string
+  :safe #'stringp)
+
+(defcustom org-babel-csharp-generate-compile-command
+  #'org-babel-csharp--default-compile-command
+  "A function creating the compile command.
+
+It must take two parameters intended for the target binary directory and
+a .sln file, .csproj file, or a base directory where either can be found."
+  :group 'org-babel
+  :package-version '(Org. "9.8")
+  :type 'function
+  :risky t)
+
+(defcustom org-babel-csharp-generate-restore-command
+  #'org-babel-csharp--default-restore-command
+  "A function creating a project restore command.
+
+It must take one parameter defining the project to perform a restore on."
+  :group 'org-babel
+  :package-version '(Org. "9.8")
+  :type 'function
+  :risky t)
+
+(defcustom org-babel-csharp-additional-project-flags nil
+  "Will be passed in the \"PropertyGroup\" defining the project.
+
+This is taken as-is. It should be a string in XML-format."
+  :group 'org-babel
+  :package-version '(Org. "9.8")
+  :type '(choice string (const nil))
+  :safe (lambda (x) (or (eq x nil) (stringp x))))
+
+(defun org-babel-csharp--generate-project-file (refs framework)
+  "Generate the file content to be used in a csproj-file.
+
+REFS is a list of references. Check `org-babel-csharp--format-refs' for
+the allowed semantics.
+FRAMEWORK is the target framework."
+  (unless framework
+    (error "framework cannot be nil"))
+  (concat "<Project Sdk=\"Microsoft.NET.Sdk\">\n\n  "
+          (when refs
+            (org-babel-csharp--format-refs refs))
+          "\n\n  <PropertyGroup>"
+          "\n    <OutputType>Exe</OutputType>\n"
+          (format "\n    <TargetFramework>%s</TargetFramework>" framework)
+          "\n    <ImplicitUsings>enable</ImplicitUsings>"
+          "\n    <Nullable>enable</Nullable>"
+          (when org-babel-csharp-additional-project-flags
+            (format "\n    %s" org-babel-csharp-additional-project-flags))
+          "\n  </PropertyGroup>"
+          "\n</Project>"))
+
+(defun org-babel-csharp--format-usings (usings)
+  "Format USINGS into a string suitable for inclusion in a C# source file.
+
+USINGS should be a list of strings, each representing a using directive.
+Returns a string with each using directive on a new line."
+  (mapconcat
+   (lambda (u)
+     (unless (stringp u) (error "Usings must be of type string."))
+     (format "using %s;" u))
+   usings "\n"))
+
+(defun org-babel-expand-body:csharp (body params)
+  "Expand a block of C# code in BODY according to PARAMS.
+
+See `org-babel-default-header-args:csharp' for available parameters."
+  (let* ((main-p (not (string= (cdr (assq :main params)) "no")))
+         (class (pcase (alist-get :class params)
+                  ("no" nil)
+                  (`nil "Program")
+                  (_ (alist-get :class params))))
+         (namespace "org.babel.autogen")
+         (usings (alist-get :usings params)))
+    (with-temp-buffer
+      (when (alist-get :prologue params)
+        (insert (alist-get :prologue params) "\n"))
+      (insert "namespace " namespace ";\n")
+      (when usings
+        (insert (format "\n%s\n" (org-babel-csharp--format-usings usings))))
+      (when class
+        (insert "\nclass " class "\n{\n"))
+      (when main-p
+        (insert "static void Main(string[] args)\n{\n"))
+      (insert (if (alist-get :var params)
+                  (mapconcat #'identity (org-babel-variable-assignments:csharp params) "\n")
+                "")
+              "\n")
+      (insert body)
+      (when main-p
+        (insert "\n}"))
+      (when class
+        (insert "\n}"))
+      (when (alist-get :epilogue params)
+        (insert "\n" (alist-get :epilogue params)))
+      (buffer-string))))
+
+(defun org-babel-csharp--format-refs (refs)
+  "Format REFS into a string suitable for inclusion in a .csproj file.
+
+REFS should be a list of strings or cons cells, each representing a reference.
+If an entry is a cons cell, the car denotes the reference name and
+the cdr is the version.
+
+Returns a formatted string representing the references, categorized into
+project reference, assembly reference, and package reference.
+Reference types are distinguished by their file extension.
+'.csproj' is interpreted as a project reference,
+'.dll' as an assembly reference.
+When a version is present, it will be treated as a package reference."
+  (let ((projectref)
+        (assemblyref)
+        (systemref))
+    (dolist (ref refs)
+      (let* ((version (if (consp ref)
+                          (cdr ref)
+                        nil))
+             (ref-string (if (consp ref)
+                             (car ref)
+                           ref))
+             (full-ref (if version
+                           (file-truename (car ref))
+                         (file-truename ref))))
+        (cond
+         ((string= "csproj" (file-name-extension full-ref))
+          (setf projectref
+                (concat projectref
+                        (format "\n    <ProjectReference Include=\"%s\" />"
+                                full-ref))))
+         ((string= "dll" (file-name-extension full-ref))
+          (setf assemblyref
+                (concat assemblyref
+                        (format "\n    <Reference Include=%S>\n      <HintPath>%s</HintPath>\n    </Reference>"
+                                (file-name-base full-ref) full-ref))))
+         (t (setf systemref
+                  (concat systemref
+                          (format "\n    <PackageReference Include=%s />"
+                                  (if version
+                                      (format "%S Version=%S" ref-string version)
+                                    (format "%S" ref-string)))))))))
+    (format "%s\n\n  %s\n\n  %s"
+            (if projectref
+                (format "<ItemGroup>%s\n  </ItemGroup>" projectref)
+              "")
+            (if assemblyref
+                (format "<ItemGroup>%s\n  </ItemGroup>" assemblyref)
+              "")
+            (if systemref
+                (format "<ItemGroup>%s\n  </ItemGroup>" systemref)
+              ""))))
+
+(defun org-babel-execute:csharp (body params)
+  "Execute a block of Csharp code with org-babel.
+This function is called by `org-babel-execute-src-block'"
+  (let* ((full-body (org-babel-expand-body:csharp body params))
+         (base-dir  (make-temp-name (file-name-concat org-babel-temporary-directory "obcs")))
+         (project-name (file-name-base base-dir))
+         (bin-dir (file-name-concat base-dir "bin"))
+         (framework (or (alist-get :framework params) org-babel-csharp-default-target-framework))
+         (program-file (file-name-concat base-dir "Program.cs"))
+         (project-file (file-name-concat base-dir (concat project-name ".csproj")))
+         (nuget-file (alist-get :nugetconfig params))
+         (cmdline (alist-get :cmdline params))
+         (cmdline (if cmdline cmdline ""))
+         (restore-cmd (funcall org-babel-csharp-generate-restore-command project-file))
+         (compile-cmd (funcall org-babel-csharp-generate-compile-command
+                               (file-truename project-file)
+                               (file-truename bin-dir)))
+         (run-cmd (format "%S %S" (file-truename (file-name-concat bin-dir project-name)) cmdline)))
+    (unless (org-babel-csharp--find-dotnet-version)
+      (error "Could not find a .NET SDK for compiling."))
+    (unless (file-exists-p base-dir)
+      (make-directory base-dir))
+    (with-temp-file program-file
+      (insert full-body))
+    (with-temp-file project-file
+      (insert
+       (let ((refs (alist-get :references params)))
+         (org-babel-csharp--generate-project-file refs framework))))
+    (when (and nuget-file (file-exists-p (file-truename nuget-file)))
+      (copy-file nuget-file (file-name-concat base-dir (file-name-nondirectory (file-truename nuget-file)))))
+    ;; nuget restore
+    (org-babel-eval restore-cmd "")
+    (let ((compile-result (org-babel-eval compile-cmd "")))
+      (when (string-match ": error" compile-result)
+        (org-babel-eval-error-notify 1 compile-result)))
+    (let ((results (org-babel-eval run-cmd "")))
+      (when results
+        (setq results (org-remove-indentation results))
+        ;; results
+        (org-babel-reassemble-table
+	 (org-babel-result-cond (cdr (assq :result-params params))
+	   results
+	   (let ((tmp-file (org-babel-temp-file "c-")))
+	     (with-temp-file tmp-file (insert results))
+	     (org-babel-import-elisp-from-file tmp-file)))
+	 (org-babel-pick-name
+	  (cdr (assq :colname-names params)) (cdr (assq :colnames params)))
+	 (org-babel-pick-name
+	  (cdr (assq :rowname-names params)) (cdr (assq :rownames params))))))))
+
+(defun org-babel-variable-assignments:csharp (params)
+  "Return a list of C# variable assignments from header arguments."
+  (mapcar
+   #'(lambda (pair) (format "var %s = %S;" (car pair) (cdr pair)))
+   (org-babel--get-vars params)))
+
+(provide 'ob-csharp)
+;;; ob-csharp.el ends here
diff --git a/lisp/org/ob-ditaa.el b/lisp/org/ob-ditaa.el
index 068cc1c6bbe..55d375a8589 100644
--- a/lisp/org/ob-ditaa.el
+++ b/lisp/org/ob-ditaa.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2009-2026 Free Software Foundation, Inc.
 
-;; Author: Eric Schulte
+;; Authors: Eric Schulte, Jarmo Hurri
 ;; Keywords: literate programming, reproducible research
 ;; URL: https://orgmode.org
 
@@ -25,15 +25,52 @@
 
 ;; Org-Babel support for evaluating ditaa source code.
 ;;
-;; This differs from most standard languages in that
+;; Source code blocks of type ditaa have some special features:
 ;;
-;; 1) there is no such thing as a "session" in ditaa
+;; - there is no such thing as a "session"
 ;;
-;; 2) we are generally only going to return results of type "file"
+;; - :export results is the default
 ;;
-;; 3) we are adding the "file" and "cmdline" header arguments
+;; - only results of type "file" are returned
 ;;
-;; 4) there are no variables (at least for now)
+;; - there are no variables
+;;
+;; - three different variants of "ditaa" exist: a ditaa executable
+;;   (shell script), ditaa.jar Java archive and DitaaEPS.jar Java
+;;   archive; the third one is a fork generating eps output, and is
+;;   also a prerequisite for producing pdf output; ob-ditaa supports
+;;   all three of these; if ditaa.jar or DitaaEPS.jar is used, paths
+;;   to file(s) must be set; the following table summarizes which
+;;   variant is used in which case; column mode refers to
+;;   `org-ditaa-default-exec-mode'
+;;
+;;   | mode           | output   | command                                             |
+;;   |----------------+----------+-----------------------------------------------------|
+;;   | `ditaa'        | png, svg | `org-ditaa-exec'                                    |
+;;   | `jar'          | png, svg | `org-ditaa-java-exec' -jar `org-ditaa-jar-path'     |
+;;   | `ditaa', `jar' | eps      | `org-ditaa-java-exec' -jar `org-ditaa-eps-jar-path' |
+;;   | `ditaa', `jar' | pdf      | `org-ditaa-java-exec' -jar `org-ditaa-eps-jar-path' |
+;;
+;; - standard header argument "cmdline" controls command line parameters passed to ditaa
+;; - the following header arguments are added:
+;;   "java" : additional parameters passed to java if ditaa run via a jar
+;;
+
+;;; Requirements:
+
+;; at least one of the following:
+;;
+;; ditaa (executable)
+;; - packaged in some distributions
+;; - configurable via `org-ditaa-exec'
+;;
+;; ditaa.jar | when exec mode is `jar'
+;; - `org-ditaa-jar-path' must point to this jar file
+;; - see https://github.com/stathissideris/ditaa
+;;
+;; DitaaEps.jar | when generating eps or pdf output
+;; - `org-ditaa-eps-jar-path' must point to this jar file
+;; - see https://sourceforge.net/projects/ditaa-addons/files/DitaaEps/
 
 ;;; Code:
 
@@ -44,11 +81,39 @@
 (require 'org-compat)
 
 (defvar org-babel-default-header-args:ditaa
-  '((:results . "file")
+  '((:results . "file graphics")
     (:exports . "results")
-    (:java . "-Dfile.encoding=UTF-8"))
+    (:file-ext . "png"))
   "Default arguments for evaluating a ditaa source block.")
 
+(defcustom org-ditaa-default-exec-mode 'jar
+  "Method to use for ditaa diagram generation when generating png or svg output.
+`jar' means to use java together with a JAR.
+The JAR must be set via `org-ditaa-jar-path'.
+
+`ditaa' means to use the ditaa executable.
+The executable can be configured via `org-ditaa-exec'."
+
+  :group 'org-babel
+  :package-version '(Org . "9.8")
+  :type '(choice (const :tag "Use java together with a JAR file." jar)
+                 (const :tag "Use ditaa executable." ditaa))
+  :safe (lambda (x) (memq x '(jar ditaa))))
+
+(defcustom org-ditaa-exec "ditaa"
+  "File name of the ditaa executable."
+  :group 'org-babel
+  :package-version '(Org . "9.8")
+  :type 'string
+  :risky t)
+
+(define-obsolete-variable-alias 'org-babel-ditaa-java-cmd 'org-ditaa-java-exec "9.8")
+(defcustom org-ditaa-java-exec "java"
+  "Java executable to use when evaluating ditaa blocks using a JAR."
+  :group 'org-babel
+  :type 'string
+  :risky t)
+
 (defcustom org-ditaa-jar-path (expand-file-name
 			       "ditaa.jar"
 			       (file-name-as-directory
@@ -58,65 +123,82 @@
 				  (expand-file-name
 				   "../contrib"
 				   (file-name-directory (org-find-library-dir "org")))))))
-  "Path to the ditaa jar executable."
-  :group 'org-babel
-  :type 'string)
-
-(defcustom org-babel-ditaa-java-cmd "java"
-  "Java executable to use when evaluating ditaa blocks."
+  "Path to the ditaa.jar file."
   :group 'org-babel
   :type 'string)
 
 (defcustom org-ditaa-eps-jar-path
   (expand-file-name "DitaaEps.jar" (file-name-directory org-ditaa-jar-path))
-  "Path to the DitaaEps.jar executable."
+  "Path to the DitaaEps.jar executable.
+Used when generating eps or pdf output."
   :group 'org-babel
   :version "24.4"
   :package-version '(Org . "8.0")
   :type 'string)
 
-(defcustom org-ditaa-jar-option "-jar"
-  "Option for the ditaa jar file.
-Do not leave leading or trailing spaces in this string."
-  :group 'org-babel
-  :version "24.1"
-  :type 'string)
+(make-obsolete-variable 'org-ditaa-jar-option
+                        "(ob-ditaa) variable org-ditaa-jar-option is obsolete"
+                        "9.8")
+
+(defun ob-ditaa--ensure-jar-file (file)
+  "Return FILE if it exists, signal error otherwise."
+  (if (file-exists-p file)
+      file
+    (error "(ob-ditaa) Could not find jar file %s" file)))
 
 (defun org-babel-execute:ditaa (body params)
-  "Execute BODY of Ditaa code with org-babel according to PARAMS.
+  "Execute BODY of ditaa code with org-babel according to PARAMS.
 This function is called by `org-babel-execute-src-block'."
-  (let* ((out-file (or (cdr (assq :file params))
-		       (error
-			"Ditaa code block requires :file header argument")))
-	 (cmdline (cdr (assq :cmdline params)))
-	 (java (cdr (assq :java params)))
-	 (in-file (org-babel-temp-file "ditaa-"))
-	 (eps (cdr (assq :eps params)))
-	 (eps-file (when eps
-		     (org-babel-process-file-name (concat in-file ".eps"))))
-	 (pdf-cmd (when (and (or (string= (file-name-extension out-file) "pdf")
-				 (cdr (assq :pdf params))))
-		    (concat
-		     "epstopdf"
-		     " " eps-file
-		     " -o=" (org-babel-process-file-name out-file))))
-	 (cmd (concat org-babel-ditaa-java-cmd
-		      " " java " " org-ditaa-jar-option " "
-		      (shell-quote-argument
-		       (expand-file-name
-			(if eps org-ditaa-eps-jar-path org-ditaa-jar-path)))
-		      " " cmdline
-		      " " (org-babel-process-file-name in-file)
-		      " " (if pdf-cmd
-			      eps-file
-			    (org-babel-process-file-name out-file)))))
-    (unless (file-exists-p org-ditaa-jar-path)
-      (error "Could not find ditaa.jar at %s" org-ditaa-jar-path))
-    (with-temp-file in-file (insert body))
-    (unless noninteractive (message cmd))
-    (shell-command cmd)
-    (when pdf-cmd (unless noninteractive (message pdf-cmd)) (shell-command pdf-cmd))
-    nil)) ;; signal that output has already been written to file
+  (let* ((out-file (org-babel-graphical-output-file params))
+         (out-file-suffix (file-name-extension out-file))
+         ;; backwards-compatibility of :eps and :pdf header arguments
+         ;; notice that these take precedence over file type (suffix)
+         (legacy-eps (cdr (assq :eps params)))
+         (legacy-pdf (cdr (assq :pdf params))))
+    (when (and legacy-eps legacy-pdf)
+      (error "(ob-ditaa) Both :eps and :pdf legacy output types specified"))
+    (let* ((legacy-output-type (or legacy-eps legacy-pdf))
+           (eps (or legacy-eps (string= out-file-suffix "eps")))
+           (pdf (or legacy-pdf (string= out-file-suffix "pdf")))
+           (svg (and (not legacy-output-type) (string= out-file-suffix "svg")))
+           (png (and (not legacy-output-type)
+                     (or (string= out-file-suffix "png")
+                         (not (or svg pdf eps))))) ;; default output type is png
+           (ditaa-options (cdr (assq :cmdline params)))
+	   (java-options (cdr (assq :java params)))
+           (use-eps-jar (or eps pdf))
+           (exec-form (if (or (equal org-ditaa-default-exec-mode 'jar) use-eps-jar)
+                          (concat org-ditaa-java-exec
+                                  (when java-options (concat " " java-options))
+                                  " "
+                                  ;; use obsolete variable instead of default param if defined
+                                  (if (boundp 'org-ditaa-jar-option) org-ditaa-jar-option "-jar")
+                                  " "
+                                  (shell-quote-argument
+                                   (ob-ditaa--ensure-jar-file (if use-eps-jar org-ditaa-eps-jar-path
+                                                                org-ditaa-jar-path))))
+                        org-ditaa-exec))
+	   (in-file (org-babel-temp-file "ditaa-"))
+           (ditaa-out-file (org-babel-process-file-name (if pdf (concat in-file ".eps") out-file)))
+           (ditaa-coding-system 'utf-8)
+	   (cmd (concat exec-form
+                        (when ditaa-options (concat " " ditaa-options))
+                        (when svg (concat " " "--svg"))
+                        " " "-e" " " (symbol-name ditaa-coding-system)
+                        " " in-file " " ditaa-out-file)))
+      ;; verify that output file type is specified - note that this
+      ;; error should in fact never happen, since default png type is
+      ;; set above if no other supported type is specified
+      (unless (or eps pdf svg png)
+        (error (concat "(ob-ditaa) Unknown output file extension: " out-file-suffix)))
+      (with-temp-file in-file
+        (set-buffer-file-coding-system ditaa-coding-system)
+        (insert body))
+      (shell-command cmd)
+      (when pdf
+        (shell-command (concat "epstopdf" " " ditaa-out-file " "
+		               "-o=" (org-babel-process-file-name out-file))))
+      nil))) ;; signal that output has already been written to file
 
 (defun org-babel-prep-session:ditaa (_session _params)
   "Return an error because ditaa does not support sessions."
diff --git a/lisp/org/ob-emacs-lisp.el b/lisp/org/ob-emacs-lisp.el
index 3d3fd43600e..416f8618507 100644
--- a/lisp/org/ob-emacs-lisp.el
+++ b/lisp/org/ob-emacs-lisp.el
@@ -32,11 +32,6 @@
 
 (require 'ob-core)
 
-(declare-function org-babel--get-vars "ob" (params))
-(declare-function org-babel-result-cond "ob" (result-params scalar-form &rest table-forms))
-(declare-function org-babel-reassemble-table "ob" (table colnames rownames))
-(declare-function org-babel-pick-name "ob" (names selector))
-
 (defconst org-babel-header-args:emacs-lisp '((lexical . :any))
   "Emacs-lisp specific header arguments.")
 
@@ -77,7 +72,7 @@ by `org-edit-src-code'.")
 		       (org-babel-expand-body:emacs-lisp body params)))
 	 (result (eval (read (if (or (member "code" result-params)
 				     (member "pp" result-params))
-				 (concat "(pp " body ")")
+				 (concat "(pp-to-string " body ")")
 			       body))
 		       (org-babel-emacs-lisp-lexical lexical))))
     (when (and session (not (equal session "none")))
@@ -102,7 +97,7 @@ Convert LEXICAL into the form appropriate for `lexical-binding'
 and the LEXICAL argument to `eval'."
   (if (listp lexical)
       lexical
-    (not (null (member lexical '("yes" "t"))))))
+    (not (null (member lexical '("yes" "t" t))))))
 
 (defun org-babel-edit-prep:emacs-lisp (info)
   "Set `lexical-binding' in Org edit buffer.
diff --git a/lisp/org/ob-eval.el b/lisp/org/ob-eval.el
index c1bcdd709be..b7b79a50163 100644
--- a/lisp/org/ob-eval.el
+++ b/lisp/org/ob-eval.el
@@ -33,7 +33,8 @@
 
 (eval-when-compile (require 'subr-x))  ; For `string-empty-p', Emacs < 29
 
-(defvar org-babel-error-buffer-name "*Org-Babel Error Output*")
+(defvar org-babel-error-buffer-name "*Org-Babel Error Output*"
+  "The buffer name Org Babel evaluate error output.")
 (declare-function org-babel-temp-file "ob-core" (prefix &optional suffix))
 
 (defun org-babel-eval-error-notify (exit-code stderr)
@@ -160,15 +161,8 @@ This buffer is named by `org-babel-error-buffer-name'."
   "Return system `shell-file-name', defaulting to /bin/sh.
 Unfortunately, `executable-find' does not support file name
 handlers.  Therefore, we could use it in the local case only."
-  ;; FIXME: Since Emacs 27, `executable-find' accepts optional second
-  ;; argument supporting remote hosts.
-  (cond ((and (not (file-remote-p default-directory))
-	      (executable-find shell-file-name))
-	 shell-file-name)
-	((file-executable-p
-	  (concat (file-remote-p default-directory) shell-file-name))
-	 shell-file-name)
-	("/bin/sh")))
+  (if (executable-find shell-file-name 'respect-remote)
+      shell-file-name "/bin/sh"))
 
 (provide 'ob-eval)
 
diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el
index 985dab20b49..655fe382a1f 100644
--- a/lisp/org/ob-exp.el
+++ b/lisp/org/ob-exp.el
@@ -45,7 +45,7 @@
                              drop-locals))
 (declare-function org-in-commented-heading-p "org" (&optional no-inheritance element))
 (declare-function org-in-archived-heading-p "org" (&optional no-inheritance element))
-(declare-function org-src-preserve-indentation-p "org-src" (node))
+(declare-function org-src-preserve-indentation-p "org-src" (&optional node))
 
 (defcustom org-export-use-babel t
   "Switch controlling code evaluation and header processing during export.
@@ -215,7 +215,7 @@ this template."
 					(string= "yes"
 						 (cdr (assq :noweb params))))
 				   (org-babel-expand-noweb-references
-				    info org-babel-exp-reference-buffer)
+				    info org-babel-exp-reference-buffer :export)
 				 (nth 1 info)))
 			 (goto-char begin)
 			 (let ((replacement
@@ -306,10 +306,7 @@ this template."
 				        ;; Do not use tabs for block
 				        ;; indentation.
 				        (when (fboundp 'indent-tabs-mode)
-					  (indent-tabs-mode -1)
-					  ;; FIXME: Emacs 26
-					  ;; compatibility.
-					  (setq-local indent-tabs-mode nil))
+					  (indent-tabs-mode -1))
 				        (insert replacement)
 				        (skip-chars-backward " \r\t\n")
 				        (indent-line-to ind)
@@ -321,10 +318,7 @@ this template."
 				      ;; Do not use tabs for block
 				      ;; indentation.
 				      (when (fboundp 'indent-tabs-mode)
-					(indent-tabs-mode -1)
-					;; FIXME: Emacs 26
-					;; compatibility.
-					(setq-local indent-tabs-mode nil))
+					(indent-tabs-mode -1))
 				      (insert replacement)
 				      (indent-rigidly
 				       1 (point) ind)
@@ -423,7 +417,7 @@ replaced with its value."
 	     (org-babel-noweb-wrap) "" (nth 1 info))
 	  (if (org-babel-noweb-p (nth 2 info) :export)
 	      (org-babel-expand-noweb-references
-	       info org-babel-exp-reference-buffer)
+	       info org-babel-exp-reference-buffer :export)
 	    (nth 1 info))))
   (org-fill-template
    (if (eq type 'inline)
@@ -462,7 +456,7 @@ inhibit insertion of results into the buffer."
     (let ((lang (nth 0 info))
 	  (body (if (org-babel-noweb-p (nth 2 info) :eval)
 		    (org-babel-expand-noweb-references
-		     info org-babel-exp-reference-buffer)
+		     info org-babel-exp-reference-buffer :eval)
 		  (nth 1 info)))
 	  (info (copy-sequence info))
 	  (org-babel-current-src-block-location (point-marker)))
diff --git a/lisp/org/ob-fortran.el b/lisp/org/ob-fortran.el
index c802c248d22..ca457c325ed 100644
--- a/lisp/org/ob-fortran.el
+++ b/lisp/org/ob-fortran.el
@@ -4,6 +4,7 @@
 
 ;; Authors: Sergey Litvinov
 ;;       Eric Schulte
+;; Maintainer: Ken Mankoff <km@kenmankoff.com>
 ;; Keywords: literate programming, reproducible research, fortran
 ;; URL: https://orgmode.org
 
diff --git a/lisp/org/ob-gnuplot.el b/lisp/org/ob-gnuplot.el
index 2112dc13cd4..eda902f9efd 100644
--- a/lisp/org/ob-gnuplot.el
+++ b/lisp/org/ob-gnuplot.el
@@ -209,7 +209,6 @@ This function is called by `org-babel-execute-src-block'."
           (let ((script-file (org-babel-temp-file "gnuplot-script-")))
             (with-temp-file script-file
               (insert (concat body "\n")))
-            (unless noninteractive (message "gnuplot \"%s\"" script-file))
             (setq output
                   (shell-command-to-string
 		   (format
@@ -217,8 +216,7 @@ This function is called by `org-babel-execute-src-block'."
 		    (org-babel-process-file-name
 		     script-file
 		     (if (member system-type '(cygwin windows-nt ms-dos))
-			 t nil)))))
-            (unless noninteractive (message "%s" output)))
+			 t nil))))))
         (with-temp-buffer
           (insert (concat body "\n"))
           (gnuplot-mode)
@@ -231,7 +229,6 @@ This function is called by `org-babel-execute-src-block'."
   "Prepare SESSION according to the header arguments in PARAMS."
   (let* ((session (org-babel-gnuplot-initiate-session session))
          (var-lines (org-babel-variable-assignments:gnuplot params)))
-    (unless noninteractive (message "%S" session))
     (org-babel-comint-in-buffer session
       (dolist (var-line  var-lines)
 	(insert var-line)
@@ -320,6 +317,7 @@ Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
 		`( :sep "\t" :fmt org-babel-gnuplot-quote-tsv-field
                    ;; Two setting below are needed to make :fmt work.
                    :raw t
+                   :with-special-rows nil
                    :backend ,ob-gnuplot-data)
 		params)))))
   data-file)
diff --git a/lisp/org/ob-groovy.el b/lisp/org/ob-groovy.el
index 4573fd31414..b2161864496 100644
--- a/lisp/org/ob-groovy.el
+++ b/lisp/org/ob-groovy.el
@@ -52,7 +52,6 @@ parameters may be used, like groovy -v"
 (defun org-babel-execute:groovy (body params)
   "Execute Groovy BODY according to PARAMS.
 This function is called by `org-babel-execute-src-block'."
-  (unless noninteractive (message "Executing Groovy source code block"))
   (let* ((processed-params (org-babel-process-params params))
          (session (org-babel-groovy-initiate-session (nth 0 processed-params)))
          (result-params (nth 2 processed-params))
diff --git a/lisp/org/ob-haskell.el b/lisp/org/ob-haskell.el
index a1246ca5804..f0efb15cd70 100644
--- a/lisp/org/ob-haskell.el
+++ b/lisp/org/ob-haskell.el
@@ -57,7 +57,7 @@
 (add-to-list 'org-babel-tangle-lang-exts '("haskell" . "hs"))
 
 (defvar org-babel-default-header-args:haskell
-  '((:padlines . "no")))
+  '((:padline . "no")))
 
 (defvar org-babel-haskell-lhs2tex-command "lhs2tex")
 
@@ -153,7 +153,7 @@ This function should only be called by `org-babel-execute:haskell'."
   (add-hook 'inferior-haskell-hook
             (lambda ()
               (setq-local
-               org-babel-comint-prompt-regexp-old comint-prompt-regexp
+               org-babel-comint-prompt-regexp-fallback comint-prompt-regexp
                comint-prompt-regexp
                (concat haskell-prompt-regexp "\\|^λ?> "))))
   (org-babel-haskell-with-session session params
diff --git a/lisp/org/ob-js.el b/lisp/org/ob-js.el
index 7c345ed1f9a..d025886fbdc 100644
--- a/lisp/org/ob-js.el
+++ b/lisp/org/ob-js.el
@@ -1,4 +1,4 @@
-;;; ob-js.el --- Babel Functions for Javascript      -*- lexical-binding: t; -*-
+;;; ob-js.el --- Babel Functions for JavaScript      -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2010-2026 Free Software Foundation, Inc.
 
@@ -73,10 +73,10 @@
   ;; parenthesis are not shadowed if the last line of the body is a
   ;; line comment.
   "require('process').stdout.write(require('util').inspect(function(){%s\n}()));"
-  "Javascript code to print value of body.")
+  "JavaScript code to print value of body.")
 
 (defun org-babel-execute:js (body params)
-  "Execute Javascript BODY according to PARAMS.
+  "Execute JavaScript BODY according to PARAMS.
 This function is called by `org-babel-execute-src-block'."
   (let* ((org-babel-js-cmd (or (cdr (assq :cmd params)) org-babel-js-cmd))
 	 (session (cdr (assq :session params)))
@@ -158,7 +158,7 @@ specifying a variable of the same value."
     session))
 
 (defun org-babel-variable-assignments:js (params)
-  "Return list of Javascript statements assigning the block's variables.
+  "Return list of JavaScript statements assigning the block's variables.
 The variables are defined in PARAMS."
   (mapcar
    (lambda (pair) (format "var %s=%s;"
@@ -183,6 +183,7 @@ Return the initialized session."
 	(run-skewer)
 	(skewer-repl)
 	session-buffer)))
+   ;; SIC, JavaScript miscapitalized in `js-comint.el'.
    ((string= "*Javascript REPL*" session)
     (org-require-package 'js-comint)
     (let ((session-buffer "*Javascript REPL*"))
diff --git a/lisp/org/ob-julia.el b/lisp/org/ob-julia.el
index ce54774dff4..0c73e144c51 100644
--- a/lisp/org/ob-julia.el
+++ b/lisp/org/ob-julia.el
@@ -43,8 +43,15 @@
 (declare-function inferior-ess-send-input "ext:ess-inf" ())
 (declare-function ess-make-buffer-current "ext:ess-inf" ())
 (declare-function ess-eval-buffer "ext:ess-inf" (vis))
-(declare-function ess-wait-for-process "ext:ess-inf"
-		  (&optional proc sec-prompt wait force-redisplay))
+
+(defvar ess-current-process-name) ; ess-custom.el
+(defvar ess-local-process-name)   ; ess-custom.el
+(defvar ess-eval-visibly)         ; ess-custom.el
+(defvar ess-local-customize-alist); ess-custom.el
+(defvar ess-gen-proc-buffer-name-function) ; ess-custom.el
+(defvar ess-ask-for-ess-directory) ; ess-custom.el
+(defvar ess-directory-function) ; ess-custom.el
+(defvar ess-directory) ; ess-custom.el
 
 (defvar org-babel-header-args:julia
   '((width		 . :any)
@@ -66,11 +73,6 @@
   :group 'org-babel
   :type 'string)
 
-(defvar ess-current-process-name) ; dynamically scoped
-(defvar ess-local-process-name)   ; dynamically scoped
-(defvar ess-eval-visibly-p)       ; dynamically scoped
-(defvar ess-local-customize-alist); dynamically scoped
-(defvar ess-gen-proc-buffer-name-function) ; defined in ess-inf.el
 (defun org-babel-julia-associate-session (session)
   "Associate R code buffer with an R session.
 Make SESSION be the inferior ESS process associated with the
@@ -167,7 +169,10 @@ This function is called by `org-babel-execute-src-block'."
              (min (if lengths (apply #'min lengths) 0)))
         ;; Ensure VALUE has an orgtbl structure (depth of at least 2).
         (unless (listp (car value)) (setq value (list value)))
-        (let ((file (orgtbl-to-csv value '(:fmt org-babel-julia-quote-csv-field))))
+        (let ((file (orgtbl-to-csv
+                     value
+                     '( :fmt org-babel-julia-quote-csv-field
+                        :with-special-rows nil))))
           (if (= max min)
               (format "%s = begin
     using CSV
@@ -181,13 +186,17 @@ end"
     (format "%s = %s" name (org-babel-julia-quote-csv-field value))))
 
 (defvar ess-ask-for-ess-directory) ; dynamically scoped
-(defun org-babel-julia-initiate-session (session params)
+(defun org-babel-julia-initiate-session (session _params)
   "If there is not a current julia process then create one."
   (unless (string= session "none")
     (let* ((session (or session "*Julia*"))
-	   (ess-ask-for-ess-directory
-	    (and (bound-and-true-p ess-ask-for-ess-directory)
-                 (not (cdr (assq :dir params)))))
+           ;; Force using `default-directory', as we promise in the
+           ;; manual.  The caller should have taken care about setting
+           ;; it according to :dir if necessary.
+           ;; https://ess.r-project.org/Manual/ess.html#Changing-the-startup-actions
+	   (ess-ask-for-ess-directory nil)
+           (ess-directory-function nil)
+           (ess-directory nil)
            ;; Make ESS name the process buffer as SESSION.
            (ess-gen-proc-buffer-name-function
             (lambda (_) session)))
@@ -293,7 +302,7 @@ last statement in BODY, as elisp."
        (let ((ess-local-customize-alist t)
              (ess-local-process-name
 	      (process-name (get-buffer-process session)))
-	     (ess-eval-visibly-p nil))
+	     (ess-eval-visibly nil))
 	 (ess-eval-buffer nil)))
      (let ((tmp-file (org-babel-temp-file "julia-")))
        (org-babel-comint-eval-invisibly-and-wait-for-file
diff --git a/lisp/org/ob-latex.el b/lisp/org/ob-latex.el
index ebf4c7e2307..930e218e6b5 100644
--- a/lisp/org/ob-latex.el
+++ b/lisp/org/ob-latex.el
@@ -41,9 +41,6 @@
 (declare-function org-latex-compile "ox-latex" (texfile &optional snippet))
 (declare-function org-latex-guess-inputenc "ox-latex" (header))
 (declare-function org-splice-latex-header "org" (tpl def-pkg pkg snippets-p &optional extra))
-(declare-function org-at-heading-p "org" (&optional _))
-(declare-function org-back-to-heading "org" (&optional invisible-ok))
-(declare-function org-next-visible-heading "org" (arg))
 
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("latex" . "tex"))
@@ -80,13 +77,14 @@
 (defcustom org-babel-latex-preamble
   (lambda (_)
     "\\documentclass[preview]{standalone}
-\\def\\pgfsysdriver{pgfsys-tex4ht.def}
 ")
   "Closure which evaluates at runtime to the LaTeX preamble.
 
 It takes 1 argument which is the parameters of the source block."
   :group 'org-babel
-  :type 'function)
+  :package-version '(Org . "9.8")
+  :type 'function
+  :risky t)
 
 (defcustom org-babel-latex-begin-env
   (lambda (_)
@@ -130,16 +128,29 @@ exporting the literal LaTeX source."
   :type '(repeat (string)))
 
 (defcustom org-babel-latex-process-alist
-  `(,(cons 'png (alist-get 'dvipng org-preview-latex-process-alist)))
+  `((png :programs ("latex" "dvipng") :description "dvi > png"
+	 :message
+	 "you need to install the programs: latex and dvipng."
+	 :image-input-type "dvi" :image-output-type "png"
+	 :image-size-adjust (1.0 . 1.0) :latex-compiler
+         ,(if (and (executable-find "latexmk") (executable-find "perl"))
+              '("latexmk -f -pdf -latex -interaction=nonstopmode -output-directory=%o %f")
+            '("latex -interaction nonstopmode -output-directory %o %f"
+              "latex -interaction nonstopmode -output-directory %o %f"
+              "latex -interaction nonstopmode -output-directory %o %f"))
+	 :image-converter ("dvipng -D %D -T tight -o %O %f")
+	 :transparent-image-converter
+	 ("dvipng -D %D -T tight -bg Transparent -o %O %f")))
   "Definitions of external processes for LaTeX result generation.
 See `org-preview-latex-process-alist' for more details.
 
 The following process symbols are recognized:
 - `png' :: Process used to produce .png output."
   :group 'org-babel
-  :package-version '(Org . "9.7")
+  :package-version '(Org . "9.8")
   :type '(alist :tag "LaTeX to image backends"
-		:value-type (plist)))
+		:value-type (plist))
+  :risky t)
 
 (defun org-babel-expand-body:latex (body params)
   "Expand BODY according to PARAMS, return the expanded body."
@@ -249,6 +260,8 @@ This function is called by `org-babel-execute-src-block'."
 	 ((or (string= "pdf" extension) imagemagick)
 	  (with-temp-file tex-file
 	    (require 'ox-latex)
+            (defvar org-latex-compiler)
+            (declare-function org-latex--remove-packages "ox-latex" (pkg-alist info))
 	    (insert
 	     (org-latex-guess-inputenc
 	      (org-splice-latex-header
@@ -259,8 +272,12 @@ This function is called by `org-babel-execute-src-block'."
 		 (lambda (el)
 		   (unless (and (listp el) (string= "hyperref" (cadr el)))
 		     el))
-		 org-latex-default-packages-alist))
-	       org-latex-packages-alist
+		 (org-latex--remove-packages
+                  org-latex-default-packages-alist
+                  (list :latex-compiler org-latex-compiler))))
+               (org-latex--remove-packages
+	        org-latex-packages-alist
+                (list :latex-compiler org-latex-compiler))
 	       nil))
 	     (if fit "\n\\usepackage[active, tightpage]{preview}\n" "")
 	     (if border (format "\\setlength{\\PreviewBorder}{%s}" border) "")
diff --git a/lisp/org/ob-lisp.el b/lisp/org/ob-lisp.el
index 308e7954efb..2d005ee5e4e 100644
--- a/lisp/org/ob-lisp.el
+++ b/lisp/org/ob-lisp.el
@@ -61,13 +61,14 @@ Valid values include `slime-eval' and `sly-eval'."
   :type 'symbol)
 
 (defcustom org-babel-lisp-dir-fmt
-  "(let ((*default-pathname-defaults* #P%S\n)) %%s\n)"
+  "(cl:let ((cl:*default-pathname-defaults* #P%S\n)) %%s\n)"
   "Format string used to wrap code bodies to set the current directory.
 For example a value of \"(progn ;; %s\\n   %%s)\" would ignore the
 current directory string."
   :group 'org-babel
-  :version "24.1"
-  :type 'string)
+  :package-version '(Org . "9.8")
+  :type 'string
+  :risky t)
 
 (defun org-babel-expand-body:lisp (body params)
   "Expand BODY according to PARAMS, return the expanded body."
@@ -77,10 +78,10 @@ current directory string."
          (prologue (cdr (assq :prologue params)))
          (epilogue (cdr (assq :epilogue params)))
 	 (body (if (null vars) (org-trim body)
-		 (concat "(let ("
+		 (concat "(cl:let ("
 			 (mapconcat
 			  (lambda (var)
-			    (format "(%S (quote %S))" (car var) (cdr var)))
+			    (format "(%S (cl:quote %S))" (car var) (cdr var)))
 			  vars "\n      ")
 			 ")\n"
                          (and prologue (concat prologue "\n"))
@@ -89,7 +90,7 @@ current directory string."
                          ")"))))
     (if (or (member "code" result-params)
 	    (member "pp" result-params))
-	(format "(pprint %s)" body)
+	(format "(cl:pprint %s)" body)
       body)))
 
 (defun org-babel-execute:lisp (body params)
@@ -115,7 +116,7 @@ a property list containing the parameters of the block."
                                                 default-directory)))
                                      (format
                                       (if dir (format org-babel-lisp-dir-fmt dir)
-                                        "(progn %s\n)")
+                                        "(cl:progn %s\n)")
                                       (buffer-substring-no-properties
                                        (point-min) (point-max)))))
                                 (cdr (assq :package params)))))))
diff --git a/lisp/org/ob-lob.el b/lisp/org/ob-lob.el
index 6571a912d21..f9a7e90578f 100644
--- a/lisp/org/ob-lob.el
+++ b/lisp/org/ob-lob.el
@@ -59,10 +59,6 @@ should not be inherited from a source block.")
       (let* ((info (org-babel-get-src-block-info 'no-eval))
 	     (source-name (nth 4 info)))
 	(when source-name
-	  (setf (nth 1 info)
-		(if (org-babel-noweb-p (nth 2 info) :eval)
-		    (org-babel-expand-noweb-references info)
-		  (nth 1 info)))
 	  (let ((source (intern source-name)))
 	    (setq org-babel-library-of-babel
 		  (cons (cons source info)
@@ -86,11 +82,13 @@ if so then run the appropriate source block from the Library."
       (org-babel-execute-src-block nil info nil (org-element-type datum))
       t)))
 
-(defun org-babel-lob--src-info (ref)
+(defun org-babel-lob--src-info (ref &optional eval)
   "Return internal representation for Babel data referenced as REF.
 REF is a string.  This function looks into the current document
 for a Babel call or source block.  If none is found, it looks
-after REF in the Library of Babel."
+after REF in the Library of Babel.
+When EVAL is non-nil, evaluate src block parameters.
+"
   (let ((name ref)
 	(file nil))
     ;; Extract the remote file, if specified in the reference.
@@ -112,7 +110,7 @@ after REF in the Library of Babel."
 		(when (equal name (org-element-property :name element))
 		  (throw :found
 			 (pcase (org-element-type element)
-			   (`src-block (org-babel-get-src-block-info t element))
+			   (`src-block (org-babel-get-src-block-info (not eval) element))
 			   (`babel-call (org-babel-lob-get-info element))
 			   ;; Non-executable data found.  Since names
 			   ;; are supposed to be unique throughout
@@ -131,6 +129,12 @@ remote variable references; a process which could likely result
 in the execution of other code blocks, and do not evaluate Lisp
 values in parameters.
 
+The evaluation happens in the context of DATUM (babel call or inline
+babel call) for its local arguments, while evaluation of the references
+code block happens in the context (with point at) of that block.
+`org-babel-current-src-block-location' is bound to DATUM position
+during evaluation.
+
 Return nil when not on an appropriate location.  Otherwise return
 a list compatible with `org-babel-get-src-block-info', which
 see."
@@ -138,34 +142,36 @@ see."
 	 (type (org-element-type context))
 	 (reference (org-element-property :call context)))
     (when (memq type '(babel-call inline-babel-call))
-      (pcase (org-babel-lob--src-info reference)
-	(`(,language ,body ,header ,_ ,_ ,_ ,coderef)
-	 (let ((begin (org-element-property (if (eq type 'inline-babel-call)
-						:begin
-					      :post-affiliated)
-					    context)))
+      (let* ((begin (org-element-property (if (eq type 'inline-babel-call)
+					      :begin
+					    :post-affiliated)
+					  context))
+             ;; Signal downstream to lisp parameter values about current location.
+             (org-babel-current-src-block-location begin))
+        (pcase (org-babel-lob--src-info reference (if no-eval nil 'eval))
+	  (`(,language ,body ,header ,_ ,_ ,_ ,coderef)
 	   (list language
-		 body
-		 (apply #'org-babel-merge-params
-			header
-			org-babel-default-lob-header-args
-			(append
-			 (org-with-point-at begin
+	         body
+	         (apply #'org-babel-merge-params
+		        header
+		        org-babel-default-lob-header-args
+		        (append
+		         (org-with-point-at begin
 			   (org-babel-params-from-properties language no-eval))
-			 (list
+		         (list
 			  (org-babel-parse-header-arguments
 			   (org-element-property :inside-header context) no-eval)
 			  (let ((args (org-element-property :arguments context)))
 			    (and args
-				 (mapcar (lambda (ref) (cons :var ref))
-					 (org-babel-ref-split-args args))))
+			         (mapcar (lambda (ref) (cons :var ref))
+				         (org-babel-ref-split-args args))))
 			  (org-babel-parse-header-arguments
 			   (org-element-property :end-header context) no-eval))))
-		 nil
-		 (org-element-property :name context)
-		 begin
-		 coderef)))
-	(_ nil)))))
+	         nil
+	         (org-element-property :name context)
+	         begin
+	         coderef))
+          (_ nil))))))
 
 (provide 'ob-lob)
 
diff --git a/lisp/org/ob-lua.el b/lisp/org/ob-lua.el
index 1d5ed687618..0870ead04af 100644
--- a/lisp/org/ob-lua.el
+++ b/lisp/org/ob-lua.el
@@ -23,18 +23,7 @@
 
 ;;; Commentary:
 
-;; Org-Babel support for evaluating Lua source code.
-
-;; Requirements:
-;; for session support, lua-mode is needed.
-;;
-;; lua-mode is not part of GNU Emacs/orgmode, but can be obtained
-;; from NonGNU ELPA (see `M-x list-packages').
-;;
-;; The source repository is here:
-;; https://github.com/immerrr/lua-mode
-
-;; However, sessions are not yet working.
+;; Org Babel support for evaluating Lua source code.
 
 ;;; Code:
 
@@ -45,10 +34,6 @@
 (require 'org-macs)
 (require 'cl-lib)
 
-(declare-function lua-shell "ext:lua-mode" (&optional argprompt))
-(declare-function lua-toggle-shells "ext:lua-mode" (arg))
-(declare-function run-lua "ext:lua" (cmd &optional dedicated show))
-
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("lua" . "lua"))
 
@@ -62,7 +47,7 @@
   :type 'string)
 
 (defcustom org-babel-lua-mode 'lua-mode
-  "Preferred lua mode for use in running lua interactively.
+  "Preferred Lua mode for use in running Lua interactively.
 This will typically be `lua-mode'."
   :group 'org-babel
   :version "26.1"
@@ -70,7 +55,7 @@ This will typically be `lua-mode'."
   :type 'symbol)
 
 (defcustom org-babel-lua-hline-to "None"
-  "Replace hlines in incoming tables with this when translating to Lua."
+  "Replace `hlines' in incoming tables with this when translating to Lua."
   :group 'org-babel
   :version "26.1"
   :package-version '(Org . "8.3")
@@ -92,11 +77,10 @@ This will typically be `lua-mode'."
 (defun org-babel-execute:lua (body params)
   "Execute Lua BODY according to PARAMS.
 This function is called by `org-babel-execute-src-block'."
-  (let* ((session (org-babel-lua-initiate-session
-		   (cdr (assq :session params))))
+  (let* ((session (cdr (assq :session params)))
          (result-params (cdr (assq :result-params params)))
          (result-type (cdr (assq :result-type params)))
-	 (return-val (when (and (eq result-type 'value) (not session))
+	 (return-val (when (eq result-type 'value)
 		       (cdr (assq :return params))))
 	 (preamble (cdr (assq :preamble params)))
          (full-body
@@ -104,7 +88,9 @@ This function is called by `org-babel-execute-src-block'."
 	   (concat body (if return-val (format "\nreturn %s" return-val) ""))
 	   params (org-babel-variable-assignments:lua params)))
          (result (org-babel-lua-evaluate
-		  session full-body result-type result-params preamble)))
+		  full-body result-type result-params preamble)))
+    (when (and session (not (equal session "none")))
+      (user-error "Sessions not supported for Lua"))
     (org-babel-reassemble-table
      result
      (org-babel-pick-name (cdr (assq :colname-names params))
@@ -112,28 +98,6 @@ This function is called by `org-babel-execute-src-block'."
      (org-babel-pick-name (cdr (assq :rowname-names params))
 			  (cdr (assq :rownames params))))))
 
-(defun org-babel-prep-session:lua (session params)
-  "Prepare SESSION according to the header arguments in PARAMS.
-VARS contains resolved variable references."
-  (let* ((session (org-babel-lua-initiate-session session))
-	 (var-lines
-	  (org-babel-variable-assignments:lua params)))
-    (org-babel-comint-in-buffer session
-      (mapc (lambda (var)
-              (end-of-line 1) (insert var) (comint-send-input)
-              (org-babel-comint-wait-for-output session))
-	    var-lines))
-    session))
-
-(defun org-babel-load-session:lua (session body params)
-  "Load BODY into SESSION."
-  (save-window-excursion
-    (let ((buffer (org-babel-prep-session:lua session params)))
-      (with-current-buffer buffer
-        (goto-char (process-mark (get-buffer-process (current-buffer))))
-        (insert (org-babel-chomp body)))
-      buffer)))
-
 ;; helper functions
 
 (defun org-babel-variable-assignments:lua (params)
@@ -168,9 +132,9 @@ specifying a variable of the same value."
        (if (stringp var) (substring-no-properties var) var)))))
 
 (defun org-babel-lua-table-or-string (results)
-  "Convert RESULTS into an appropriate elisp value.
+  "Convert RESULTS into an appropriate Emacs Lisp value.
 If the results look like a list or tuple, then convert them into an
-Emacs-lisp table, otherwise return the results as a string."
+Emacs Lisp table, otherwise return the results as a string."
   (let ((res (org-babel-script-escape results)))
     (if (listp res)
         (mapcar (lambda (el) (if (eq el 'None)
@@ -180,76 +144,6 @@ Emacs-lisp table, otherwise return the results as a string."
 
 (defvar org-babel-lua-buffers '((:default . "*Lua*")))
 
-(defun org-babel-lua-session-buffer (session)
-  "Return the buffer associated with SESSION."
-  (cdr (assoc session org-babel-lua-buffers)))
-
-(defun org-babel-lua-with-earmuffs (session)
-  "Return buffer name for SESSION, as *SESSION*."
-  (let ((name (if (stringp session) session (format "%s" session))))
-    (if (and (string= "*" (substring name 0 1))
-	     (string= "*" (substring name (- (length name) 1))))
-	name
-      (format "*%s*" name))))
-
-(defun org-babel-session-buffer:lua (session &optional _)
-  "Return session buffer name for SESSION."
-  (or (org-babel-lua-session-buffer session)
-      (org-babel-lua-with-earmuffs session)))
-
-(defun org-babel-lua-without-earmuffs (session)
-"Remove stars around *SESSION*, leaving SESSION."
-  (let ((name (if (stringp session) session (format "%s" session))))
-    (if (and (string= "*" (substring name 0 1))
-	     (string= "*" (substring name (- (length name) 1))))
-	(substring name 1 (- (length name) 1))
-      name)))
-
-(defvar lua-default-interpreter)
-(defvar lua-which-bufname)
-(defvar lua-shell-buffer-name)
-(defun org-babel-lua-initiate-session-by-key (&optional session)
-  "Initiate a Lua session.
-If there is not a current inferior-process-buffer in SESSION
-then create.  Return the initialized session."
-  ;; (require org-babel-lua-mode)
-  (save-window-excursion
-    (let* ((session (if session (intern session) :default))
-           (lua-buffer (org-babel-lua-session-buffer session))
-	   ;; (cmd (if (member system-type '(cygwin windows-nt ms-dos))
-	   ;; 	    (concat org-babel-lua-command " -i")
-	   ;; 	  org-babel-lua-command))
-	   )
-      (cond
-       ((and (eq 'lua-mode org-babel-lua-mode)
-             (fboundp 'lua-start-process)) ; lua-mode.el
-        ;; Make sure that lua-which-bufname is initialized, as otherwise
-        ;; it will be overwritten the first time a Lua buffer is
-        ;; created.
-        ;;(lua-toggle-shells lua-default-interpreter)
-        ;; `lua-shell' creates a buffer whose name is the value of
-        ;; `lua-which-bufname' with '*'s at the beginning and end
-        (let* ((bufname (if (and lua-buffer (buffer-live-p lua-buffer))
-                            (replace-regexp-in-string ;; zap surrounding *
-                             "^\\*\\([^*]+\\)\\*$" "\\1" (buffer-name lua-buffer))
-                          (concat "Lua-" (symbol-name session))))
-               (lua-which-bufname bufname))
-          (lua-start-process)
-          (setq lua-buffer (org-babel-lua-with-earmuffs bufname))))
-       (t
-	(error "No function available for running an inferior Lua")))
-      (setq org-babel-lua-buffers
-            (cons (cons session lua-buffer)
-                  (assq-delete-all session org-babel-lua-buffers)))
-      session)))
-
-(defun org-babel-lua-initiate-session (&optional session _params)
-  "Create a session named SESSION according to PARAMS."
-  (unless (string= session "none")
-    (error "Sessions currently not supported, work in progress")
-    (org-babel-lua-session-buffer
-     (org-babel-lua-initiate-session-by-key session))))
-
 (defvar org-babel-lua-eoe-indicator "--eoe"
   "A string to indicate that evaluation has completed.")
 
@@ -263,38 +157,56 @@ function dump(it, indent)
    if indent == nil then
       indent = ''
    end
+
    if type(it) == 'table' and %s then
-      local count = 0
-      for _ in pairs(it) do
-         count = count + 1
-      end
       local result = ''
+
       if #indent ~= 0 then
          result = result .. '\\n'
       end
-      for key, value in pairs(it) do
+
+      local keys = {}
+      for key in pairs(it) do
+        table.insert(keys, key)
+      end
+
+      table.sort(keys)
+
+      for index, key in pairs(keys) do
+         local value = it[key]
          result = result
             .. indent
             .. dump(key)
             .. ' = '
             .. dump(value, indent .. '  ')
-         count = count - 1
-         if count ~= 0 then
+         if index ~= #keys then
             result = result .. '\\n'
          end
       end
+
       return result
    else
-      return tostring(it)
+      return string.gsub(tostring(it), '\"', '\\\"')
    end
 end
 
 function combine(...)
   local result = {}
+
   for index = 1, select('#', ...) do
     result[index] = dump(select(index, ...))
   end
-  return table.concat(result, '%s')
+
+  if #result == 1 then
+    local value = result[1]
+    if string.find(value, '[%%(%%[{]') == 1 then
+      return '\"' .. value .. '\"'
+    else
+      return value
+    end
+  end
+
+  return '\"' .. table.concat(result, '%s') .. '\"'
 end
 
 output = io.open('%s', 'w')
@@ -302,19 +214,6 @@ output:write(combine(main()))
 output:close()")
 
 (defun org-babel-lua-evaluate
-    (session body &optional result-type result-params preamble)
-  "Evaluate BODY in SESSION as Lua code.
-RESULT-TYPE and RESULT-PARAMS are passed to
-`org-babel-lua-evaluate-session' or
-`org-babel-lua-evaluate-external-process'.
-PREAMBLE is passed to `org-babel-lua-evaluate-external-process'."
-  (if session
-      (org-babel-lua-evaluate-session
-       session body result-type result-params)
-    (org-babel-lua-evaluate-external-process
-     body result-type result-params preamble)))
-
-(defun org-babel-lua-evaluate-external-process
     (body &optional result-type result-params preamble)
   "Evaluate BODY in external Lua process.
 If RESULT-TYPE equals `output' then return standard output as a
@@ -350,88 +249,6 @@ PREAMBLE string is appended to BODY."
       raw
       (org-babel-lua-table-or-string (org-trim raw)))))
 
-(defun org-babel-lua-evaluate-session
-    (session body &optional result-type result-params)
-  "Pass BODY to the Lua process in SESSION.
-If RESULT-TYPE equals `output' then return standard output as a
-string.  If RESULT-TYPE equals `value' then return the value of the
-last statement in BODY, as Emacs Lisp."
-  (let* ((send-wait (lambda () (comint-send-input nil t) (sleep-for 0.005)))
-	 (dump-last-value
-	  (lambda
-	    (tmp-file pp)
-	    (mapc
-	     (lambda (statement) (insert statement) (funcall send-wait))
-	     (if pp
-		 (list
-		  "-- table to string
-function t2s(t, indent)
-   if indent == nil then
-      indent = \"\"
-   end
-   if type(t) == \"table\" then
-      ts = \"\"
-      for k,v in pairs(t) do
-         if type(v) == \"table\" then
-            ts = ts .. indent .. t2s(k,indent .. \"  \") .. \" = \\n\" ..
-               t2s(v, indent .. \"  \")
-         else
-            ts = ts .. indent .. t2s(k,indent .. \"  \") .. \" = \" ..
-               t2s(v, indent .. \"  \") .. \"\\n\"
-         end
-      end
-      return ts
-   else
-      return tostring(t)
-   end
-end
-"
-		  (concat "fd:write(_))
-fd:close()"
-			  (org-babel-process-file-name tmp-file 'noquote)))
-	       (list (format "fd=io.open(\"%s\", \"w\")
-fd:write( _ )
-fd:close()"
-			     (org-babel-process-file-name tmp-file
-                                                          'noquote)))))))
-	 (input-body (lambda (body)
-		       (mapc (lambda (line) (insert line) (funcall send-wait))
-			     (split-string body "[\r\n]"))
-		       (funcall send-wait)))
-         (results
-          (pcase result-type
-            (`output
-             (mapconcat
-              #'org-trim
-              (butlast
-               (org-babel-comint-with-output
-                   (session org-babel-lua-eoe-indicator t body)
-                 (funcall input-body body)
-                 (funcall send-wait) (funcall send-wait)
-                 (insert org-babel-lua-eoe-indicator)
-                 (funcall send-wait))
-               2) "\n"))
-            (`value
-             (let ((tmp-file (org-babel-temp-file "lua-")))
-               (org-babel-comint-with-output
-                   (session org-babel-lua-eoe-indicator nil body)
-                 (let ((comint-process-echoes nil))
-                   (funcall input-body body)
-                   (funcall dump-last-value tmp-file
-                            (member "pp" result-params))
-                   (funcall send-wait) (funcall send-wait)
-                   (insert org-babel-lua-eoe-indicator)
-                   (funcall send-wait)))
-               (org-babel-eval-read-file tmp-file))))))
-    (unless (string= (substring org-babel-lua-eoe-indicator 1 -1) results)
-      (org-babel-result-cond result-params
-	results
-        (org-babel-lua-table-or-string results)))))
-
-(defun org-babel-lua-read-string (string)
-  "Strip single quotes from around Lua STRING."
-  (org-unbracket-string "'" "'" string))
-
 (provide 'ob-lua)
 
 ;;; ob-lua.el ends here
diff --git a/lisp/org/ob-maxima.el b/lisp/org/ob-maxima.el
index 79bdeac6c36..a55fcc69524 100644
--- a/lisp/org/ob-maxima.el
+++ b/lisp/org/ob-maxima.el
@@ -110,11 +110,13 @@ output.  See `org-babel-maxima-expand'.")
 	       "\n")))
 
 (defvar org-babel-maxima--output-filter-regexps
-  '("batch"                     ;; remove the `batch' or `batchload' line
+  '("(linenum:0,$"               ;; remove fragment from command-line (see `org-babel-execute:maxima')
+    "batch"                     ;; remove the `batch' or `batchload' line
     "^rat: replaced .*$"        ;; remove notices from `rat'
     "^;;; Loading #P"           ;; remove notices from the lisp implementation
     "^read and interpret"       ;; remove notice from `batch'
     "^(%\\([i]-?[0-9]+\\))[ ]$" ;; remove empty input lines from `batch'-ing
+    "^Loading .+maxima-init\\.mac" ;; remove message about loading init file
     )
   "Regexps to remove extraneous lines from Maxima's output.
 See `org-babel-maxima--output-filter'.")
@@ -131,7 +133,6 @@ Return nil if LINE is zero-length or it matches a regexp in
 (defun org-babel-execute:maxima (body params)
   "Execute Maxima BODY according to PARAMS.
 This function is called by `org-babel-execute-src-block'."
-  (unless noninteractive (message "Executing Maxima source code block"))
   (let ((result-params (split-string (or (cdr (assq :results params)) "")))
 	(result
 	 (let* ((cmdline (or (cdr (assq :cmdline params)) ""))
@@ -151,7 +152,6 @@ This function is called by `org-babel-execute-src-block'."
                               (format "(linenum:0, %s(%S))$" batch/load in-file))
                              cmdline)))
 	   (with-temp-file in-file (insert (org-babel-maxima-expand body params)))
-	   (unless noninteractive (message cmd))
            ;; " | grep -v batch | grep -v 'replaced' | sed '/^$/d' "
 	   (let ((raw (org-babel-eval cmd "")))
              (mapconcat
diff --git a/lisp/org/ob-ocaml.el b/lisp/org/ob-ocaml.el
index 8ba02b02a64..0b8984b6f18 100644
--- a/lisp/org/ob-ocaml.el
+++ b/lisp/org/ob-ocaml.el
@@ -44,7 +44,6 @@
 (require 'org-macs)
 
 (declare-function tuareg-run-caml "ext:tuareg" ())
-(declare-function tuareg-run-ocaml "ext:tuareg" ())
 (declare-function tuareg-interactive-send-input "ext:tuareg" ())
 
 (defvar org-babel-tangle-lang-exts)
diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el
index 0cf65ed0aed..1cb683492e1 100644
--- a/lisp/org/ob-python.el
+++ b/lisp/org/ob-python.el
@@ -36,6 +36,8 @@
 (require 'org-macs)
 (require 'python)
 
+(require 'subr-x) ; For `string-trim-right', Emacs < 28
+
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("python" . "py"))
 
@@ -158,14 +160,14 @@ file to save the graphics to.")
 
 (defconst org-babel-python--def-format-value "\
 def __org_babel_python_format_value(result, result_file, result_params):
-    with open(result_file, 'w') as f:
+    with open(result_file, 'w') as __org_babel_python_tmpfile:
         if 'graphics' in result_params:
             result.savefig(result_file)
         elif 'pp' in result_params:
             import pprint
-            f.write(pprint.pformat(result))
+            __org_babel_python_tmpfile.write(pprint.pformat(result))
         elif 'list' in result_params and isinstance(result, dict):
-            f.write(str(['{} :: {}'.format(k, v) for k, v in result.items()]))
+            __org_babel_python_tmpfile.write(str(['{} :: {}'.format(k, v) for k, v in result.items()]))
         else:
             if not set(result_params).intersection(\
 ['scalar', 'verbatim', 'raw']):
@@ -198,7 +200,7 @@ def __org_babel_python_format_value(result, result_file, result_params):
                             result = result.tolist()
                         else:
                             result = repr(result)
-            f.write(str(result))"
+            __org_babel_python_tmpfile.write(str(result))"
   "Python function to format value result and save it to file.")
 
 (defun org-babel-variable-assignments:python (params)
@@ -451,31 +453,22 @@ __org_babel_python_format_value(main(), '%s', %s)")
 (defun org-babel-python-send-string (session body)
   "Pass BODY to the Python process in SESSION.
 Return output."
-  (with-current-buffer session
-    (let* ((string-buffer "")
-	   (comint-output-filter-functions
-	    (cons (lambda (text) (setq string-buffer
-				       (concat string-buffer text)))
-		  comint-output-filter-functions))
-	   (body (format "\
+  (org-babel-chomp
+   (string-trim-right
+    (org-babel-comint-with-output
+        ((org-babel-session-buffer:python session)
+         org-babel-python-eoe-indicator
+         nil nil 'disable-prompt-filtering)
+      (python-shell-send-string (format "\
 try:
 %s
 except:
     raise
 finally:
     print('%s')"
-			 (org-babel-python--shift-right body 4)
-			 org-babel-python-eoe-indicator)))
-      (let ((python-shell-buffer-name
-	     (org-babel-python-without-earmuffs session)))
-	(python-shell-send-string body))
-      ;; same as `python-shell-comint-end-of-output-p' in emacs-25.1+
-      (while (not (and (python-shell-comint-end-of-output-p string-buffer)
-                       (string-match
-		        org-babel-python-eoe-indicator
-		        string-buffer)))
-	(accept-process-output (get-buffer-process (current-buffer))))
-      (org-babel-chomp (substring string-buffer 0 (match-beginning 0))))))
+			                (org-babel-python--shift-right body 4)
+			                org-babel-python-eoe-indicator)))
+    (rx (literal org-babel-python-eoe-indicator) (zero-or-more anychar)))))
 
 (defun org-babel-python-evaluate-session
     (session body &optional result-type result-params graphics-file)
@@ -495,8 +488,8 @@ non-nil, then save graphical results to that file instead."
             (pcase result-type
 	      (`output
 	       (let ((body (format "\
-with open('%s') as f:
-    exec(compile(f.read(), f.name, 'exec'))"
+with open('%s') as __org_babel_python_tmpfile:
+    exec(compile(__org_babel_python_tmpfile.read(), __org_babel_python_tmpfile.name, 'exec'))"
 				   (org-babel-process-file-name
 				    tmp-src-file 'noquote))))
 		 (org-babel-python-send-string session body)))
@@ -538,7 +531,8 @@ by `org-babel-comint-async-filter'."
   (org-babel-comint-async-register
    session (current-buffer)
    "ob_comint_async_python_\\(start\\|end\\|file\\)_\\(.+\\)"
-   'org-babel-chomp 'org-babel-python-async-value-callback)
+   'org-babel-chomp 'org-babel-python-async-value-callback
+   'disable-prompt-filtering)
   (pcase result-type
     (`output
      (let ((uuid (org-id-uuid)))
diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el
index fcb7c5c7280..14c5ce4a9c3 100644
--- a/lisp/org/ob-ref.el
+++ b/lisp/org/ob-ref.el
@@ -66,7 +66,7 @@
 (declare-function org-find-property "org" (property &optional value))
 (declare-function org-id-find-id-file "org-id" (id))
 (declare-function org-id-find-id-in-file "org-id" (id file &optional markerp))
-(declare-function org-in-commented-heading-p "org" (&optional no-inheritance))
+(declare-function org-in-commented-heading-p "org" (&optional no-inheritance element))
 (declare-function org-narrow-to-subtree "org" (&optional element))
 (declare-function org-fold-show-context "org-fold" (&optional key))
 
@@ -236,7 +236,7 @@ to \"0:-1\"."
 	  (if (or (= 0 (length portion)) (string-match ind-re portion))
 	      (mapcar
 	       (lambda (n) (nth n lis))
-	       (apply 'org-number-sequence
+	       (apply #'number-sequence
 		      (if (and (> (length portion) 0) (match-string 2 portion))
 			  (list
 			   (funcall wrap (string-to-number (match-string 2 portion)))
diff --git a/lisp/org/ob-ruby.el b/lisp/org/ob-ruby.el
index 76c83de5d53..003fc809e45 100644
--- a/lisp/org/ob-ruby.el
+++ b/lisp/org/ob-ruby.el
@@ -192,7 +192,7 @@ Session settings (`:ruby' header arg value) are taken from PARAMS."
             (when new-session?
               (with-current-buffer session-buffer
                 (setq-local
-                 org-babel-comint-prompt-regexp-old comint-prompt-regexp
+                 org-babel-comint-prompt-regexp-fallback comint-prompt-regexp
                  comint-prompt-regexp (concat "^" org-babel-ruby-prompt))
                 (insert org-babel-ruby-define-prompt ";")
                 (insert "_org_prompt_mode=conf.prompt_mode;conf.prompt_mode=:CUSTOM;")
@@ -213,20 +213,18 @@ Session settings (`:ruby' header arg value) are taken from PARAMS."
 
 (defvar org-babel-ruby-wrapper-method
   "
-def main()
+results = (lambda do
 %s
-end
-results = main()
+end).call
 File.open('%s', 'w'){ |f| f.write((results.class == String) ? results : results.inspect) }
 ")
 
 (defvar org-babel-ruby-pp-wrapper-method
   "
 require 'pp'
-def main()
+results = (lambda do
 %s
-end
-results = main()
+end).call
 File.open('%s', 'w') do |f|
   $stdout = f
   pp results
diff --git a/lisp/org/ob-scheme.el b/lisp/org/ob-scheme.el
index 5534472e507..0cd1be8e026 100644
--- a/lisp/org/ob-scheme.el
+++ b/lisp/org/ob-scheme.el
@@ -66,11 +66,10 @@
 (declare-function geiser-eval--retort-output "ext:geiser-eval" (ret))
 (declare-function geiser-eval--retort-result-str "ext:geiser-eval" (ret prefix))
 (declare-function geiser-eval--retort-error "ext:geiser-eval" (ret))
-(declare-function geiser-eval--retort-error-msg "ext:geiser-eval" (err))
 (declare-function geiser-eval--error-msg "ext:geiser-eval" (err))
 
 (defcustom org-babel-scheme-null-to 'hline
-  "Replace `null' and empty lists in scheme tables with this before returning."
+  "Replacement for `()' and `null' in tabulated Scheme results."
   :group 'org-babel
   :version "26.1"
   :package-version '(Org . "9.1")
@@ -86,7 +85,7 @@
   "Expand :var header arguments given as VARS."
   (mapconcat
    (lambda (var)
-     (format "(define %S %S)" (car var) (cdr var)))
+     (format "(define %S '%S)" (car var) (cdr var)))
    vars
    "\n"))
 
@@ -131,12 +130,17 @@ If the variables HOST and PORT are set, connect to the running Scheme REPL."
   (let ((buffer (org-babel-scheme-get-session-buffer name)))
     (or buffer
 	(progn
-          (if (fboundp 'geiser)
-              (if (and host port)
-                  (geiser-connect impl host port)
-                (geiser impl))
-            ;; Obsolete since Geiser 0.26.
-	    (run-geiser impl))
+          (let ((geiser-repl-window-allow-split nil)
+	        (geiser-repl-use-other-window nil)
+                (switch-to-buffer-obey-display-actions t)
+                (display-buffer-overriding-action '(display-buffer-no-window
+                                                    (allow-no-window t))))
+            (if (fboundp 'geiser)
+                (if (and host port)
+                    (geiser-connect impl host port)
+                  (geiser impl))
+              ;; Obsolete since Geiser 0.26.
+	      (run-geiser impl)))
 	  (when name
 	    (rename-buffer name t)
 	    (org-babel-scheme-set-session-buffer name (current-buffer)))
@@ -185,9 +189,7 @@ is true; otherwise returns the last value."
       (let ((beg (point)))
         (insert code)
         (geiser-mode)
-        (let ((geiser-repl-window-allow-split nil)
-	      (geiser-repl-use-other-window nil))
-	  (let ((repl-buffer (save-current-buffer
+        (let ((repl-buffer (save-current-buffer
 			       (org-babel-scheme-get-repl impl repl host port))))
 	    (when (not (eq impl (org-babel-scheme-get-buffer-impl
 			       (current-buffer))))
@@ -226,15 +228,15 @@ is true; otherwise returns the last value."
 		    (let ((msg (geiser-eval--error-msg err)))
 		      (org-babel-eval-error-notify
 		       nil
-		       (concat (if (listp msg) (car msg) msg) "\n")))))))))))
+		       (concat (if (listp msg) (car msg) msg) "\n"))))))))))
     result))
 
 (defun org-babel-scheme--table-or-string (results)
-  "Convert RESULTS into an appropriate elisp value.
-If the results look like a list or tuple, then convert them into an
-Emacs-lisp table, otherwise return the results as a string."
+  "Convert RESULTS into an appropriate Elisp value.
+If the results are in the form of a proper list, then convert them into
+an Emacs Lisp table, otherwise return the results as a string."
   (let ((res (and results (org-babel-script-escape results))))
-    (cond ((listp res)
+    (cond ((proper-list-p res)
            (mapcar (lambda (el)
 		     (if (or (null el) (eq el 'null))
 			 org-babel-scheme-null-to
@@ -242,6 +244,14 @@ Emacs-lisp table, otherwise return the results as a string."
                    res))
 	  (t res))))
 
+(defun org-babel-scheme--get-impl (&optional params)
+  "Return Scheme implementation to be used according to PARAMS."
+  (or (when (cdr (assq :scheme params))
+	(intern (cdr (assq :scheme params))))
+      geiser-scheme-implementation
+      geiser-default-implementation
+      (car geiser-active-implementations)))
+
 (defun org-babel-execute:scheme (body params)
   "Execute a block of Scheme code with org-babel.
 This function is called by `org-babel-execute-src-block'."
@@ -251,11 +261,7 @@ This function is called by `org-babel-execute-src-block'."
 			      (buffer-name source-buffer))))
     (save-excursion
       (let* ((result-type (cdr (assq :result-type params)))
-	     (impl (or (when (cdr (assq :scheme params))
-			 (intern (cdr (assq :scheme params))))
-		       geiser-scheme-implementation
-		       geiser-default-implementation
-		       (car geiser-active-implementations)))
+	     (impl (org-babel-scheme--get-impl params))
              (host (cdr (assq :host params)))
              (port (cdr (assq :port params)))
 	     (session (org-babel-scheme-make-session-name
@@ -281,6 +287,38 @@ This function is called by `org-babel-execute-src-block'."
 	    result
 	    (org-babel-scheme--table-or-string table)))))))
 
+(defun org-babel-scheme-initiate-session (session params)
+  "Return scheme buffer for SESSION according to PARAMS.
+
+Creates new session buffer if necessary."
+  (let ((impl (org-babel-scheme--get-impl params))
+        (host (cdr (assq :host params)))
+        (port (cdr (assq :port params))))
+    (save-current-buffer
+      (org-babel-scheme-get-repl impl
+                                 session
+                                 host
+                                 port))))
+
+(defun org-babel-prep-session:scheme (session params)
+  "Prepare SESSION according to header arguments in PARAMS."
+  (let ((repl (org-babel-scheme-initiate-session session params)))
+    (org-babel-scheme-execute-with-geiser
+     (org-babel-scheme-expand-header-arg-vars (org-babel--get-vars params))
+     nil
+     (org-babel-scheme--get-impl params)
+     session)
+    repl))
+
+(defun org-babel-load-session:scheme (session body params)
+  "Load BODY into SESSION.
+
+Also evaluates any variable assignments in PARAMS before loading BODY."
+  (with-current-buffer (org-babel-prep-session:scheme session params)
+    (goto-char (process-mark (get-buffer-process (current-buffer))))
+    (insert (org-babel-chomp body))
+    (current-buffer)))
+
 (provide 'ob-scheme)
 
 ;;; ob-scheme.el ends here
diff --git a/lisp/org/ob-screen.el b/lisp/org/ob-screen.el
index 9eb477a8311..37feda8f6bb 100644
--- a/lisp/org/ob-screen.el
+++ b/lisp/org/ob-screen.el
@@ -52,7 +52,6 @@ In case you want to use a different screen than one selected by your $PATH")
 (defun org-babel-execute:screen (body params)
   "Send BODY via screen to a terminal using Babel, according to PARAMS.
 \"default\" session is used when none is specified in the PARAMS."
-  (unless noninteractive (message "Sending source code block to interactive terminal session..."))
   (save-window-excursion
     (let* ((session (cdr (assq :session params)))
            (socket (org-babel-screen-session-socketname session)))
diff --git a/lisp/org/ob-sed.el b/lisp/org/ob-sed.el
index a44765e4328..331302b6f0c 100644
--- a/lisp/org/ob-sed.el
+++ b/lisp/org/ob-sed.el
@@ -65,7 +65,6 @@
 BODY is the source inside a sed source block and PARAMS is an
 association list over the source block configurations.  This
 function is called by `org-babel-execute-src-block'."
-  (unless noninteractive (message "Executing sed source code block"))
   (let* ((result-params (cdr (assq :result-params params)))
          (cmd-line (cdr (assq :cmd-line params)))
          (in-file (cdr (assq :in-file params)))
diff --git a/lisp/org/ob-shell.el b/lisp/org/ob-shell.el
index 4641935c7d5..e3767ac0630 100644
--- a/lisp/org/ob-shell.el
+++ b/lisp/org/ob-shell.el
@@ -57,6 +57,9 @@
     ("fish" . "function fish_prompt\n\techo \"%s\"\nend")
     ;; prompt2 is like PS2 in POSIX shells.
     ("csh" . "set prompt=\"%s\"\nset prompt2=\"\"")
+    ;; Disable bracketed paste - it messes up out processing and,
+    ;; apparently, comint.el.  Also, unset "%   \r" prompts.
+    ("zsh" . "setopt nopromptcr;unset zle_bracketed_paste;PROMPT_COMMAND=;PS1=\"%s\";PS2=")
     ;; PROMPT_COMMAND can override PS1 settings.  Disable it.
     ;; Disable PS2 to avoid garbage in multi-line inputs.
     (t . "PROMPT_COMMAND=;PS1=\"%s\";PS2="))
@@ -85,6 +88,24 @@ is modified outside the Customize interface."
                 (shell-file-name name))
 	    (org-babel-execute:shell body params))))
       (put fname 'definition-name 'org-babel-shell-initialize))
+    (let ((fname (intern (concat "org-babel-prep-session:" name))))
+      (defalias fname
+        (lambda (session params)
+	  (:documentation
+           (format "Prepare %s SESSION according to the header arguments specified in PARAMS." name))
+	  (let ((explicit-shell-file-name name)
+                (shell-file-name name))
+	    (org-babel-prep-session:shell session params))))
+      (put fname 'definition-name 'org-babel-shell-initialize))
+    (let ((fname (intern (format "org-babel-%s-initiate-session" name))))
+      (defalias fname
+        (lambda (session _params)
+	  (:documentation
+           (format "Initiate %s session named SESSION." name))
+	  (let ((explicit-shell-file-name name)
+                (shell-file-name name))
+	    (org-babel-sh-initiate-session session))))
+      (put fname 'definition-name 'org-babel-shell-initialize))
     (defalias (intern (concat "org-babel-variable-assignments:" name))
       #'org-babel-variable-assignments:shell
       (format "Return list of %s statements assigning to the block's \
@@ -245,8 +266,11 @@ var of the same value."
   (let ((echo-var (lambda (v) (if (stringp v) v (format "%S" v)))))
     (cond
      ((and (listp var) (or (listp (car var)) (eq (car var) 'hline)))
-      (orgtbl-to-generic var  (list :sep (or sep "\t") :fmt echo-var
-				    :hline hline)))
+      (orgtbl-to-generic
+       var
+       (list :sep (or sep "\t") :fmt echo-var
+	     :hline hline
+             :with-special-rows nil)))
      ((listp var)
       (mapconcat echo-var var "\n"))
      (t (funcall echo-var var)))))
@@ -255,18 +279,36 @@ var of the same value."
   "String to indicate that evaluation has completed.")
 (defvar org-babel-sh-eoe-output "org_babel_sh_eoe"
   "String to indicate that evaluation has completed.")
-(defvar org-babel-sh-prompt "org_babel_sh_prompt> "
+(defvar org-babel-sh-prompt
+  ;; FIXME: Emacs 27 CI fails non-interactively.  Play it safe and
+  ;; keep the old prompt until we drop Emacs 27 support.
+  (if (version< emacs-version "28") "org_babel_sh_prompt> " "𒆸 ")
   "String to set prompt in session shell.")
 
+(defvar-local org-babel-sh--prompt-initialized nil
+  "When non-nil, ob-shell already initialized the prompt in current buffer.")
+
+(defalias 'org-babel-shell-initiate-session #'org-babel-sh-initiate-session)
 (defun org-babel-sh-initiate-session (&optional session _params)
   "Initiate a session named SESSION according to PARAMS."
   (when (and session (not (string= session "none")))
     (save-window-excursion
-      (or (org-babel-comint-buffer-livep session)
+      (or (and (org-babel-comint-buffer-livep session)
+               (buffer-local-value
+                'org-babel-sh--prompt-initialized
+                (get-buffer session))
+               session)
           (progn
-	    (shell session)
-            ;; Set unique prompt for easier analysis of the output.
-            (org-babel-comint-wait-for-output (current-buffer))
+            (if (org-babel-comint-buffer-livep session)
+                (set-buffer session)
+	      (shell session)
+              ;; Set unique prompt for easier analysis of the output.
+              (org-babel-comint-wait-for-output (current-buffer)))
+            (setq-local
+             org-babel-comint-prompt-regexp-fallback comint-prompt-regexp
+             comint-prompt-regexp
+             (concat "^" (regexp-quote org-babel-sh-prompt)
+                     " *"))
             (org-babel-comint-input-command
              (current-buffer)
              (format
@@ -274,11 +316,7 @@ var of the same value."
                               org-babel-shell-set-prompt-commands))
                   (alist-get t org-babel-shell-set-prompt-commands))
               org-babel-sh-prompt))
-            (setq-local
-             org-babel-comint-prompt-regexp-old comint-prompt-regexp
-             comint-prompt-regexp
-             (concat "^" (regexp-quote org-babel-sh-prompt)
-                     " *"))
+            (setq org-babel-sh--prompt-initialized t)
 	    ;; Needed for Emacs 23 since the marker is initially
 	    ;; undefined and the filter functions try to use it without
 	    ;; checking.
@@ -314,22 +352,28 @@ return the value of the last statement in BODY."
 		  (stdin-file (org-babel-temp-file "sh-stdin-"))
 		  (padline (not (string= "no" (cdr (assq :padline params))))))
 	      (with-temp-file script-file
-		(when shebang (insert shebang "\n"))
+		(if shebang
+                    (insert shebang "\n")
+                  ;; Provide shell name explicitly.
+                  ;; This is necessary because running, for example,
+                  ;; dash script-for-dash.sh will use /bin/sh.
+                  (insert (format "#!/usr/bin/env %s" shell-file-name) "\n"))
 		(when padline (insert "\n"))
 		(insert body))
 	      (set-file-modes script-file #o755)
 	      (with-temp-file stdin-file (insert (or stdin "")))
 	      (with-temp-buffer
                 (with-connection-local-variables
+                 ;; `with-connection-local-variables' will override
+                 ;; `shell-file-name' and `shell-command-swtich' as
+                 ;; needed for the remote connection.
                  (apply #'process-file
-                        (if shebang (file-local-name script-file)
-                          shell-file-name)
+                        shell-file-name
 		        stdin-file
                         (current-buffer)
                         nil
-                        (if shebang (when cmdline (list cmdline))
-                          (list shell-command-switch
-                                (concat (file-local-name script-file)  " " cmdline)))))
+                        (list shell-command-switch
+                              (concat (file-local-name script-file)  " " (format "%s" cmdline)))))
 		(buffer-string))))
 	   (session			; session evaluation
             (if async
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 68867059503..1d8234835a3 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -117,23 +117,27 @@ corresponding :engine source block header argument."
 
 (defun org-babel-sql-dbstring-mysql (host port user password database)
   "Make MySQL cmd line args for database connection.  Pass nil to omit that arg."
-  (combine-and-quote-strings
+  (mapconcat
+   #'identity
    (delq nil
-	 (list (when host     (concat "-h" host))
+	 (list (when host     (concat "-h" (shell-quote-argument host)))
 	       (when port     (format "-P%d" port))
-	       (when user     (concat "-u" user))
-	       (when password (concat "-p" password))
-	       (when database (concat "-D" database))))))
+	       (when user     (concat "-u" (shell-quote-argument user)))
+	       (when password (concat "-p" (shell-quote-argument password)))
+	       (when database (concat "-D" (shell-quote-argument database)))))
+   " "))
 
 (defun org-babel-sql-dbstring-postgresql (host port user database)
   "Make PostgreSQL command line args for database connection.
 Pass nil to omit that arg."
-  (combine-and-quote-strings
+  (mapconcat
+   #'identity
    (delq nil
-	 (list (when host (concat "-h" host))
+	 (list (when host (concat "-h" (shell-quote-argument host)))
 	       (when port (format "-p%d" port))
-	       (when user (concat "-U" user))
-	       (when database (concat "-d" database))))))
+	       (when user (concat "-U" (shell-quote-argument user)))
+	       (when database (concat "-d" (shell-quote-argument database)))))
+   " "))
 
 (defun org-babel-sql-dbstring-oracle (host port user password database)
   "Make Oracle command line arguments for database connection.
@@ -149,8 +153,12 @@ or
   <user>/<password>@<database>
 
 using its alias."
+  (when user (setq user (shell-quote-argument user)))
+  (when password (setq password (shell-quote-argument password)))
+  (when database (setq database (shell-quote-argument database)))
+  (when host (setq host (shell-quote-argument host)))
   (cond ((and user password database host port)
-	 (format "%s/%s@%s:%s/%s" user password host port database))
+	 (format "%s/%s@%s:%d/%s" user password host port database))
 	((and user password database)
 	 (format "%s/%s@%s" user password database))
 	(t (user-error "Missing information to connect to database"))))
@@ -161,10 +169,10 @@ using its alias."
 SQL Server on Windows and Linux platform."
   (mapconcat #'identity
 	     (delq nil
-		   (list (when host (format "-S \"%s\"" host))
-			 (when user (format "-U \"%s\"" user))
-			 (when password (format "-P \"%s\"" password))
-			 (when database (format "-d \"%s\"" database))))
+		   (list (when host (format "-S \"%s\"" (shell-quote-argument host)))
+			 (when user (format "-U \"%s\"" (shell-quote-argument user)))
+			 (when password (format "-P \"%s\"" (shell-quote-argument password)))
+			 (when database (format "-d \"%s\"" (shell-quote-argument database)))))
 	     " "))
 
 (defun org-babel-sql-dbstring-sqsh (host user password database)
@@ -172,10 +180,10 @@ SQL Server on Windows and Linux platform."
 \"sqsh\" is one method to access Sybase or MS SQL via Linux platform"
   (mapconcat #'identity
              (delq nil
-                   (list  (when host     (format "-S \"%s\"" host))
-                          (when user     (format "-U \"%s\"" user))
-                          (when password (format "-P \"%s\"" password))
-                          (when database (format "-D \"%s\"" database))))
+                   (list  (when host     (format "-S \"%s\"" (shell-quote-argument host)))
+                          (when user     (format "-U \"%s\"" (shell-quote-argument user)))
+                          (when password (format "-P \"%s\"" (shell-quote-argument password)))
+                          (when database (format "-D \"%s\"" (shell-quote-argument database)))))
              " "))
 
 (defun org-babel-sql-dbstring-vertica (host port user password database)
@@ -183,11 +191,11 @@ SQL Server on Windows and Linux platform."
 Pass nil to omit that arg."
   (mapconcat #'identity
 	     (delq nil
-		   (list (when host     (format "-h %s" host))
+		   (list (when host     (format "-h %s" (shell-quote-argument host)))
 			 (when port     (format "-p %d" port))
-			 (when user     (format "-U %s" user))
+			 (when user     (format "-U %s" (shell-quote-argument user)))
 			 (when password (format "-w %s" (shell-quote-argument password) ))
-			 (when database (format "-d %s" database))))
+			 (when database (format "-d %s" (shell-quote-argument database)))))
 	     " "))
 
 (defun org-babel-sql-dbstring-saphana (host port instance user password database)
@@ -195,13 +203,15 @@ Pass nil to omit that arg."
 Pass nil to omit that arg."
   (mapconcat #'identity
              (delq nil
-                   (list (and host port (format "-n %s:%s" host port))
-                         (and host (not port) (format "-n %s" host))
+                   (list (and host port (format "-n %s:%s"
+                                                (shell-quote-argument host)
+                                                port))
+                         (and host (not port) (format "-n %s" (shell-quote-argument host)))
                          (and instance (format "-i %d" instance))
-                         (and user (format "-u %s" user))
+                         (and user (format "-u %s" (shell-quote-argument user)))
                          (and password (format "-p %s"
                                                (shell-quote-argument password)))
-                         (and database (format "-d %s" database))))
+                         (and database (format "-d %s" (shell-quote-argument database)))))
              " "))
 
 (defun org-babel-sql-convert-standard-filename (file)
@@ -276,21 +286,23 @@ This function is called by `org-babel-execute-src-block'."
 				   (or cmdline "")
 				   (org-babel-process-file-name in-file)
 				   (org-babel-process-file-name out-file)))
-		    ((postgresql postgres) (format
-					    "%s%s --set=\"ON_ERROR_STOP=1\" %s -A -P \
+		    ((postgresql postgres)
+                     (format
+		      "%s%s --set=\"ON_ERROR_STOP=1\" %s -A -P \
 footer=off -F \"\t\"  %s -f %s -o %s %s"
-					    (if dbpassword
-						(format "PGPASSWORD=%s " dbpassword)
-					      "")
-                                            (or (bound-and-true-p
-                                                 sql-postgres-program)
-                                                "psql")
-					    (if colnames-p "" "-t")
-					    (org-babel-sql-dbstring-postgresql
-					     dbhost dbport dbuser database)
-					    (org-babel-process-file-name in-file)
-					    (org-babel-process-file-name out-file)
-					    (or cmdline "")))
+		      (if dbpassword
+			  (format "PGPASSWORD=%s "
+                                  (shell-quote-argument dbpassword))
+			"")
+                      (or (bound-and-true-p
+                           sql-postgres-program)
+                          "psql")
+		      (if colnames-p "" "-t")
+		      (org-babel-sql-dbstring-postgresql
+		       dbhost dbport dbuser database)
+		      (org-babel-process-file-name in-file)
+		      (org-babel-process-file-name out-file)
+		      (or cmdline "")))
 		    (sqsh (format "sqsh %s %s -i %s -o %s -m csv"
 				  (or cmdline "")
 				  (org-babel-sql-dbstring-sqsh
@@ -375,7 +387,7 @@ SET COLSEP '|'
 	      (goto-char (point-max))
 	      (forward-char -1))
 	    (write-file out-file))))
-	(org-table-import out-file (if (string= engine "sqsh") '(4) '(16)))
+	(org-table-import out-file (if (memq (intern engine) '(saphana sqsh)) '(4) '(16)))
 	(org-babel-reassemble-table
 	 (mapcar (lambda (x)
 		   (if (string= (car x) header-delim)
@@ -406,9 +418,11 @@ argument mechanism."
                       (insert (orgtbl-to-csv
                                val (if sqlite
                                        nil
-                                     '(:fmt (lambda (el) (if (stringp el)
-                                                        el
-                                                      (format "%S" el))))))))
+                                     '( :fmt (lambda (el)
+                                               (if (stringp el)
+                                                   el
+                                                 (format "%S" el)))
+                                        :with-special-rows nil)))))
                     data-file)
                 (if (stringp val) val (format "%S" val))))
 	    body t t)))
diff --git a/lisp/org/ob-sqlite.el b/lisp/org/ob-sqlite.el
index 8478edc3fb6..35c0ed9ac3b 100644
--- a/lisp/org/ob-sqlite.el
+++ b/lisp/org/ob-sqlite.el
@@ -36,7 +36,6 @@
 
 (declare-function org-table-convert-region "org-table"
 		  (beg0 end0 &optional separator))
-(declare-function orgtbl-to-csv "org-table" (table params))
 (declare-function org-table-to-lisp "org-table" (&optional txt))
 
 (defvar org-babel-default-header-args:sqlite '())
@@ -52,7 +51,8 @@
     (line      . :any)
     (list      . :any)
     (separator . :any)
-    (nullvalue . :any))
+    (nullvalue . :any)
+    (readonly-p . ((yes no))))
   "Sqlite specific header args.")
 
 (defun org-babel-expand-body:sqlite (body params)
@@ -76,7 +76,8 @@ This function is called by `org-babel-execute-src-block'."
 	(db (cdr (assq :db params)))
 	(separator (cdr (assq :separator params)))
 	(nullvalue (cdr (assq :nullvalue params)))
-	(headers-p (equal "yes" (cdr (assq :colnames params))))
+        (headers-p (equal "yes" (cdr (assq :colnames params))))
+        (readonly-p (equal "yes" (cdr (assq :readonly params))))
 	(others (delq nil (mapcar
 			   (lambda (arg) (car (assq arg params)))
 			   (list :header :echo :bail :column
@@ -85,7 +86,7 @@ This function is called by `org-babel-execute-src-block'."
       (insert
        (org-babel-eval
 	(org-fill-template
-	 "%cmd %header %separator %nullvalue %others %csv %db "
+	 "%cmd %header %separator %nullvalue %others %csv %readonly %db "
 	 (list
 	  (cons "cmd" org-babel-sqlite3-command)
 	  (cons "header" (if headers-p "-header" "-noheader"))
@@ -103,6 +104,8 @@ This function is called by `org-babel-execute-src-block'."
 			      (member :html others) separator)
 			  ""
 			"-csv"))
+	  (cons "readonly"
+		(if readonly-p "-readonly" ""))
           (cons "db" (or db ""))))
 	;; body of the code block
 	(org-babel-expand-body:sqlite body params)))
diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el
index 5094787bc41..9d4c914c27f 100644
--- a/lisp/org/ob-tangle.el
+++ b/lisp/org/ob-tangle.el
@@ -41,14 +41,12 @@
 (declare-function org-back-to-heading "org" (&optional invisible-ok))
 (declare-function org-before-first-heading-p "org" ())
 (declare-function org-element-lineage "org-element-ast" (datum &optional types with-self))
-(declare-function org-element-property "org-element-ast" (property node))
 (declare-function org-element-begin "org-element" (node))
 (declare-function org-element-at-point "org-element" (&optional pom cached-only))
 (declare-function org-element-type-p "org-element-ast" (node types))
 (declare-function org-heading-components "org" ())
-(declare-function org-in-commented-heading-p "org" (&optional no-inheritance))
-(declare-function org-in-archived-heading-p "org" (&optional no-inheritance))
-(declare-function outline-previous-heading "outline" ())
+(declare-function org-in-commented-heading-p "org" (&optional no-inheritance element))
+(declare-function org-in-archived-heading-p "org" (&optional no-inheritance element))
 (defvar org-id-link-to-org-use-id) ; Dynamically scoped
 
 (defgroup org-babel-tangle nil
@@ -58,18 +56,20 @@
 
 (defcustom org-babel-tangle-lang-exts
   '(("emacs-lisp" . "el")
-    ("elisp" . "el"))
+    ("elisp" . "el")
+    ("bibtex" . "bib"))
   "Alist mapping languages to their file extensions.
 The key is the language name, the value is the string that should
 be inserted as the extension commonly used to identify files
 written in this language.  If no entry is found in this list,
 then the name of the language is used."
   :group 'org-babel-tangle
-  :version "24.1"
+  :package-version '(Org . "9.8")
   :type '(repeat
 	  (cons
 	   (string "Language name")
-	   (string "File Extension"))))
+	   (string "File Extension")))
+  :safe #'listp)
 
 (defcustom org-babel-tangle-use-relative-file-links t
   "Use relative path names in links from tangled source back the Org file."
@@ -159,9 +159,10 @@ result.  The default value is `org-remove-indentation'."
   :type 'function)
 
 (defcustom org-babel-tangle-default-file-mode #o644
-  "The default mode used for tangled files, as an integer.
-The default value 420 correspands to the octal #o644, which is
-read-write permissions for the user, read-only for everyone else."
+  "The default mode, an integer value, only used when the :tangle-mode
+header argument specifies chmod-style symbolic notation.  The default
+value 420 corresponds to the octal #o644, which is read-write
+permissions for the user, read-only for everyone else."
   :group 'org-babel-tangle
   :package-version '(Org . "9.6")
   :type 'integer)
@@ -181,7 +182,7 @@ replace contents otherwise."
 	  (const :tag "Replace contents, but keep the same file" nil)
           (const :tag "Re-create file" t)
           (const :tag "Re-create when read-only" auto))
-  :safe t)
+  :safe #'symbolp)
 
 (defun org-babel-find-file-noselect-refresh (file)
   "Find file ensuring that the latest changes on disk are represented in the file."
@@ -227,13 +228,11 @@ Return list of the tangled file names."
              (org-babel-tangle nil target-file lang-re)))))
 
 (defun org-babel-tangle-publish (_ filename pub-dir)
-  "Tangle FILENAME and place the results in PUB-DIR."
-  (unless (file-exists-p pub-dir)
-    (make-directory pub-dir t))
-  (setq pub-dir (file-name-as-directory pub-dir))
-  ;; Rename files to avoid copying to same file when publishing to ./
-  ;; `copy-file' would throw an error when copying file to self.
-  (mapc (lambda (el) (rename-file el pub-dir t))
+  "Tangle FILENAME and copy the tangled file to PUB-DIR."
+  (require 'ox-publish)
+  (declare-function org-publish-attachment "ox-publish"
+                    (plist filename pub-dir))
+  (mapc (lambda (el) (org-publish-attachment nil el pub-dir))
         (org-babel-tangle-file filename)))
 
 ;;;###autoload
@@ -269,7 +268,7 @@ matching a regular expression."
 	       (or (cdr (assq :tangle (nth 2 (org-babel-get-src-block-info 'no-eval))))
 		   (user-error "Point is not in a source code block"))))
 	    path-collector
-            (source-file buffer-file-name))
+            (source-file (org-base-buffer-file-name)))
 	(mapc ;; map over file-names
 	 (lambda (by-fn)
 	   (let ((file-name (car by-fn)))
@@ -290,8 +289,8 @@ matching a regular expression."
 			     (tangle-mode (funcall get-spec :tangle-mode)))
 		        (unless (string-equal block-lang lang)
 			  (setq lang block-lang)
-			  (let ((lang-f (org-src-get-lang-mode lang)))
-			    (when (fboundp lang-f) (ignore-errors (funcall lang-f)))))
+                          (when-let* ((lang-f (org-src-get-lang-mode-if-bound lang)))
+                            (ignore-errors (funcall lang-f))))
 		        ;; if file contains she-bangs, then make it executable
 		        (when she-bang
 			  (unless tangle-mode (setq tangle-mode #o755)))
@@ -509,9 +508,13 @@ code blocks by target file."
 	       (src-lang (nth 0 info))
 	       (src-tfile (cdr (assq :tangle (nth 2 info)))))
 	  (unless (or (string= src-tfile "no")
-                      (not src-lang) ;; src block without lang
+                      ;; src block without lang
+                      (and (not src-lang) (string= src-tfile "yes"))
 		      (and tangle-file (not (equal tangle-file src-tfile)))
-		      (and lang-re (not (string-match-p lang-re src-lang))))
+                      ;; lang-re but either no lang or lang doesn't match
+		      (and lang-re
+                           (or (not src-lang)
+                               (not (string-match-p lang-re src-lang)))))
 	    ;; Add the spec for this block to blocks under its tangled
 	    ;; file name.
 	    (let* ((block (org-babel-tangle-single-block counter))
@@ -531,10 +534,7 @@ code blocks by target file."
 The PARAMS are the 3rd element of the info for the same src block."
   (unless (string= "no" (cdr (assq :comments params)))
     (save-match-data
-      (let* ((l (org-no-properties
-                 (cl-letf (((symbol-function 'org-store-link-functions)
-                            (lambda () nil)))
-                   (org-store-link nil))))
+      (let* ((l (org-no-properties (org-store-link nil)))
              (bare (and l
                         (string-match org-link-bracket-re l)
                         (match-string 1 l))))
@@ -580,7 +580,8 @@ non-nil, return the full association list to be used by
           (let ((body (if (org-babel-noweb-p params :tangle)
                           (if (string= "strip-tangle" (cdr (assq :noweb (nth 2 info))))
                             (replace-regexp-in-string (org-babel-noweb-wrap) "" (nth 1 info))
-			    (org-babel-expand-noweb-references info))
+			    (org-babel-expand-noweb-references
+			     info nil :tangle))
 			(nth 1 info))))
 	    (with-temp-buffer
 	      (insert
diff --git a/lisp/org/oc-basic.el b/lisp/org/oc-basic.el
index 6c757c1bc22..c57e8761e98 100644
--- a/lisp/org/oc-basic.el
+++ b/lisp/org/oc-basic.el
@@ -92,9 +92,9 @@
 (declare-function org-element-type-p "org-element-ast" (node types))
 (declare-function org-element-contents "org-element-ast" (node))
 
-(declare-function org-export-data "org-export" (data info))
-(declare-function org-export-derived-backend-p "org-export" (backend &rest backends))
-(declare-function org-export-raw-string "org-export" (contents))
+(declare-function org-export-data "ox" (data info))
+(declare-function org-export-derived-backend-p "ox" (backend &rest backends))
+(declare-function org-export-raw-string "ox" (contents))
 
 
 ;;; Customization
@@ -140,6 +140,31 @@
   :type 'face
   :safe #'facep)
 
+(defcustom org-cite-basic-complete-key-crm-separator nil
+  "When non-nil, use `completing-read-multiple' with this as the separator.
+When nil, use multiple `completing-read' prompts.  When set to a string,
+it should be a regexp to be used as `crm-separator' (which see).  The
+regexp string can carry the text properties `separator', which if
+present `completing-read-multiple' will show as part of the prompt.
+When set to symbol `dynamic', use \";;...\" as a separator with the
+number of \";\" sufficient so that none of the completion candidates
+contain the separator."
+  :group 'org-cite
+  :package-version '(Org . "9.8")
+  :type
+  '(choice
+    (const
+     :tag
+     "Use \";;\" as the separator."
+     (propertize "[ \t]*;;[ \t]*" 'separator ";;"))
+    (const
+     :tag
+     "Dynamically compute \";\"+ with the needed length."
+     dynamic)
+    (string :tag "Custom regexp for the separator.")
+    (const :tag "Prompt multiple times." nil))
+  :safe (lambda (obj) (or (string-or-null-p obj) (member obj '(dynamic)))))
+
 
 ;;; Internal variables
 (defvar org-cite-basic--bibliography-cache nil
@@ -884,6 +909,39 @@ Return nil if there are no bibliography files or no entries."
         (puthash entries t org-cite-basic--completion-cache)
         org-cite-basic--completion-cache)))))
 
+(defun org-cite-basic--complete-key-dynamic-crm-separator
+    (completion-candidates separator)
+  "Return a repeated version of SEPARATOR as needed.
+The number of appeared SEPARATORs in the returned string is sufficient
+so that none of COMPLETION-CANDIDATES contains it.  SEPARATOR should be
+a literal string."
+  (let* ((dyn-sep separator)
+         (consecutive-sep-regexp
+          (format "%s+" (regexp-opt (list separator)))))
+    (with-temp-buffer
+      (dolist (cand completion-candidates)
+        (when (stringp cand)
+          (insert cand "\n")))
+      (goto-char (point-min))
+      (while (re-search-forward consecutive-sep-regexp nil t)
+        (while (<= (length dyn-sep) (length (match-string 0)))
+          (setq dyn-sep (concat dyn-sep separator)))))
+    dyn-sep))
+
+(defvar crm-separator) ; defined in crm.el
+
+(defun org-cite-basic--crm-indicate-prompt (orig-prompt)
+  "Return annotated ORIG-PROMPT with `crm-separator'.
+For Emacs version 31 and above, just return ORIG-PROMPT."
+  (cond
+   ((boundp 'crm-prompt)
+    orig-prompt)
+   (t
+    (let ((sep
+           (or (get-text-property 0 'separator crm-separator)
+               (string-replace "[ \t]*" "" crm-separator))))
+      (format "[list separated by %s] %s" sep orig-prompt)))))
+
 (defun org-cite-basic--complete-key (&optional multiple)
   "Prompt for a reference key and return a citation reference string.
 
@@ -895,12 +953,39 @@ Raise an error when no bibliography is set in the buffer."
   (let* ((table
           (or (org-cite-basic--key-completion-table)
               (user-error "No bibliography set")))
-         (prompt
-          (lambda (text)
-            (completing-read text table nil t))))
-    (if (null multiple)
-        (let ((key (gethash (funcall prompt "Key: ") table)))
-          (org-string-nw-p key))
+         (prompt-single
+          (lambda (text) (completing-read text table nil t)))
+         (choice-to-citation
+          (lambda (choice)
+            (let ((key (gethash choice table)))
+              (org-string-nw-p key)))))
+    (cond
+     ((null multiple)
+      (funcall choice-to-citation
+               (completing-read "Key: " table nil t)))
+     (org-cite-basic-complete-key-crm-separator
+      (let*
+          ((crm-separator
+            (pcase org-cite-basic-complete-key-crm-separator
+              ((pred stringp)
+               org-cite-basic-complete-key-crm-separator)
+              (`dynamic
+               (let
+                   ((repeated-sep
+                     (regexp-quote
+                      (org-cite-basic--complete-key-dynamic-crm-separator
+                       (hash-table-keys table) ";"))))
+                 (propertize (format "[ \t]*%s[ \t]*" repeated-sep)
+                             'separator
+                             repeated-sep)))))
+           (prompt (org-cite-basic--crm-indicate-prompt "Keys: ")))
+        ;; FIXME: Use `seq-keep' after we drop Emacs 28 support.
+        (delq
+         nil
+         (seq-map
+          choice-to-citation
+          (completing-read-multiple prompt table nil t)))))
+     (t
       (let* ((keys nil)
              (build-prompt
               (lambda ()
@@ -908,11 +993,12 @@ Raise an error when no bibliography is set in the buffer."
                     (format "Key (empty input exits) %s: "
                             (mapconcat #'identity (reverse keys) ";"))
                   "Key (empty input exits): "))))
-        (let ((key (funcall prompt (funcall build-prompt))))
+        (let ((key (funcall prompt-single (funcall build-prompt))))
           (while (org-string-nw-p key)
             (push (gethash key table) keys)
-            (setq key (funcall prompt (funcall build-prompt)))))
-        keys))))
+            (setq key
+                  (funcall prompt-single (funcall build-prompt)))))
+        keys)))))
 
 
 ;;; Register processor
diff --git a/lisp/org/oc-biblatex.el b/lisp/org/oc-biblatex.el
index c72505cd0f9..4e6fac48eb6 100644
--- a/lisp/org/oc-biblatex.el
+++ b/lisp/org/oc-biblatex.el
@@ -72,7 +72,7 @@
 
 (declare-function org-element-property "org-element-ast" (property node))
 (declare-function org-element-parent "org-element-ast" (node))
-(declare-function org-export-data "org-export" (data info))
+(declare-function org-export-data "ox" (data info))
 
 
 ;;; Customization
@@ -179,7 +179,7 @@ a style in `org-cite-biblatex-styles'."
           (cons :tag "Shortcut"
                 (string :tag "Name")
                 (string :tag "Full name")))
-  :safe t)
+  :safe #'listp)
 
 
 ;;; Internal functions
diff --git a/lisp/org/oc-bibtex.el b/lisp/org/oc-bibtex.el
index 559f118e66f..3adab69179e 100644
--- a/lisp/org/oc-bibtex.el
+++ b/lisp/org/oc-bibtex.el
@@ -43,7 +43,35 @@
 
 (declare-function org-element-property "org-element-ast" (property node))
 
-(declare-function org-export-data "org-export" (data info))
+(declare-function org-export-data "ox" (data info))
+
+(defcustom org-cite-bibtex-bibliography-style "plain"
+  "Default BibTeX bibliography style.
+
+BibTeX provides the following default styles:
+
+  \"plain\"   Sorted numbered entries
+  \"abbrv\"   Sorted numbered entries with abbreviated author name
+  \"unsrt\"   Unsorted numbered entries
+  \"alpha\"   Alphabetized entries with unique short id
+  \"acm\"     ACM Transactions
+  \"apalike\" APA-like
+  \"ieeetr\"  IEEE Transactions
+  \"siam\"    SIAM"
+  :group 'org-cite
+  :package-version '(Org . "9.8")
+  :type
+  '(choice
+    (const :tag "Plain" "plain")
+    (const :tag "Abbreviated" "abbrv")
+    (const :tag "Unsorted" "unsrt")
+    (const :tag "Alphabetic" "alpha")
+    (const :tag "ACM" "acm")
+    (const :tag "APA-like" "apalike")
+    (const :tag "IEEE" "ieeetr")
+    (const :tag "SIAM" "siam")
+    (string :tag "Other"))
+  :safe #'stringp)
 
 
 ;;; Export capability
@@ -51,7 +79,8 @@
   "Print references from bibliography FILES.
 FILES is a list of absolute file names.  STYLE is the bibliography style, as
 a string or nil."
-  (concat (and style (format "\\bibliographystyle{%s}\n" style))
+  (concat (format "\\bibliographystyle{%s}\n"
+                  (or style org-cite-bibtex-bibliography-style))
           (format "\\bibliography{%s}"
                   (mapconcat #'file-name-sans-extension
                              files
diff --git a/lisp/org/oc-csl.el b/lisp/org/oc-csl.el
index 1368cf44651..3eeaacfbeaa 100644
--- a/lisp/org/oc-csl.el
+++ b/lisp/org/oc-csl.el
@@ -124,7 +124,6 @@
 (require 'citeproc nil t)
 (declare-function citeproc-style-cite-note "ext:citeproc")
 (declare-function citeproc-proc-style "ext:citeproc")
-(declare-function citeproc-bt-entry-to-csl "ext:citeproc")
 (declare-function citeproc-locale-getter-from-dir "ext:citeproc")
 (declare-function citeproc-create "ext:citeproc")
 (declare-function citeproc-citation-create "ext:citeproc")
@@ -137,13 +136,12 @@
 (declare-function citeproc-style-cite-superscript-p "ext:citeproc")
 
 (declare-function org-element-interpret-data "org-element" (data))
-(declare-function org-element-map "org-element" (data types fun &optional info first-match no-recursion with-affiliated))
+(declare-function org-element-map "org-element" (data types fun &optional info first-match no-recursion with-affiliated no-undefer))
 (declare-function org-element-property "org-element-ast" (property node))
-(declare-function org-element-put-property "org-element-ast" (node property value))
 
-(declare-function org-export-data "org-export" (data info))
-(declare-function org-export-derived-backend-p "org-export" (backend &rest backends))
-(declare-function org-export-get-footnote-number "org-export" (footnote info &optional data body-first))
+(declare-function org-export-data "ox" (data info))
+(declare-function org-export-derived-backend-p "ox" (backend &rest backends))
+(declare-function org-export-get-footnote-number "ox" (footnote info &optional data body-first))
 
 
 ;;; Customization
@@ -321,6 +319,24 @@ in the bibliography measured in characters."
   :type 'string
   :package-version '(Org . "9.7"))
 
+(defcustom org-cite-csl-bibtex-titles-to-sentence-case t
+  "Convert bibtex title fields to sentence-case by default.
+
+When non-nil, title fields in bibtex bibliography entries are
+converted to sentence-case before being formatted according to a
+CSL style, except for entries with a `langid' field specifying a
+non-English language.  When nil, title conversion is limited to
+entries having a `langid' field specifying a variant of English.
+
+Conversion of titles to sentence-case by default is in most cases
+useful because the CSL standard assumes that English titles are
+specified in sentence-case but the bibtex bibliography format
+requires them to be written in title-case."
+  :group 'org-cite
+  :package-version '(Org . "9.8")
+  :type 'boolean
+  :safe #'booleanp)
+
 
 ;;; Internal variables
 (defconst org-cite-csl--etc-dir
@@ -579,7 +595,8 @@ property in INFO."
              (processor
               (citeproc-create
                (org-cite-csl--style-file info)
-               (citeproc-hash-itemgetter-from-any bibliography)
+               (citeproc-hash-itemgetter-from-any
+                bibliography (not org-cite-csl-bibtex-titles-to-sentence-case))
                (org-cite-csl--locale-getter)
                locale)))
         (plist-put info :cite-citeproc-processor processor)
@@ -803,6 +820,35 @@ INFO is the export state, as a property list."
               "\\[CSL-MAXLABEL-CHARS\\]" ,(number-to-string max-offset)))
     result))
 
+(defun org-cite-csl--generate-html-head (info)
+  "Generate the CSL-related part of the HTML head.
+INFO is the export state, as a property list.  Return the generated head
+fragment or nil if no fragment should be inserted."
+  (let* ((parameters (cadr (org-cite-csl--rendered-bibliographies info)))
+	 (head-part
+	  (concat
+	   (and (cdr (assq 'second-field-align parameters))
+		(let* ((max-offset (cdr (assq 'max-offset parameters)))
+		       (char-width
+			(string-to-number org-cite-csl-html-label-width-per-char))
+		       (char-width-unit
+			(progn
+			  (string-match (number-to-string char-width)
+					org-cite-csl-html-label-width-per-char)
+			  (substring org-cite-csl-html-label-width-per-char
+				     (match-end 0)))))
+		  (format
+		   "<style>.csl-left-margin{float: left; padding-right: 0em;}
+ .csl-right-inline{margin: 0 0 0 %d%s;}</style>"
+		   (* max-offset char-width)
+		   char-width-unit)))
+	   (and (cdr (assq 'hanging-indent parameters))
+		(format
+		 "<style>.csl-entry{text-indent: -%s; margin-left: %s;}</style>"
+		 org-cite-csl-html-hanging-indent
+		 org-cite-csl-html-hanging-indent)))))
+    (and (not (string= "" head-part)) head-part)))
+
 
 ;;; Export capability
 (defun org-cite-csl-render-citation (citation _style _backend info)
@@ -820,37 +866,20 @@ INFO is the export state, as a property list."
   "Export bibliography.
 INFO is the export state, as a property list."
   (org-require-package 'citeproc)
-  (pcase-let*  ((format (org-cite-csl--output-format info))
-                (`(,outputs ,parameters) (org-cite-csl--rendered-bibliographies info))
-                (output (cdr (assoc props outputs))))
+  (let* ((format (org-cite-csl--output-format info))
+	 (outputs (car (org-cite-csl--rendered-bibliographies info)))
+	 (output (cdr (assoc props outputs))))
     (pcase format
       ('html
-       (concat
-        (and (cdr (assq 'second-field-align parameters))
-             (let* ((max-offset (cdr (assq 'max-offset parameters)))
-                    (char-width
-                     (string-to-number org-cite-csl-html-label-width-per-char))
-                    (char-width-unit
-                     (progn
-                       (string-match (number-to-string char-width)
-                                     org-cite-csl-html-label-width-per-char)
-                       (substring org-cite-csl-html-label-width-per-char
-                                  (match-end 0)))))
-               (format
-                "<style>.csl-left-margin{float: left; padding-right: 0em;}
- .csl-right-inline{margin: 0 0 0 %d%s;}</style>"
-                (* max-offset char-width)
-                char-width-unit)))
-        (and (cdr (assq 'hanging-indent parameters))
-             (format
-              "<style>.csl-entry{text-indent: -%s; margin-left: %s;}</style>"
-              org-cite-csl-html-hanging-indent
-              org-cite-csl-html-hanging-indent))
-        output))
+       (unless (plist-get info :html-head-csl-styles-added)
+	 (if-let* ((head-part (org-cite-csl--generate-html-head info)))
+	     (plist-put info :html-head
+                        (concat (plist-get info :html-head) head-part)))
+	 (plist-put info :html-head-csl-styles-added t))
+       output)
       ('org-latex output)
       (_
-       ;; Parse Org output to re-export it during the regular export
-       ;; process.
+       ;; Parse Org output to re-export it during the regular export process.
        (org-cite-parse-elements output)))))
 
 (defun org-cite-csl-finalizer (output _keys _files _style _backend info)
diff --git a/lisp/org/oc-natbib.el b/lisp/org/oc-natbib.el
index 7e42713461c..f6997464d67 100644
--- a/lisp/org/oc-natbib.el
+++ b/lisp/org/oc-natbib.el
@@ -48,9 +48,7 @@
 
 (require 'oc)
 
-(declare-function org-element-property "org-element-ast" (property node))
-
-(declare-function org-export-data "org-export" (data info))
+(declare-function org-export-data "ox" (data info))
 
 
 ;;; Customization
diff --git a/lisp/org/oc.el b/lisp/org/oc.el
index 35e7674a8a6..fc0c62ef621 100644
--- a/lisp/org/oc.el
+++ b/lisp/org/oc.el
@@ -80,8 +80,8 @@
 (declare-function org-element-extract "org-element-ast" (node))
 (declare-function org-element-insert-before "org-element-ast" (node location))
 (declare-function org-element-lineage "org-element-ast" (datum &optional types with-self))
-(declare-function org-element-map "org-element" (data types fun &optional info first-match no-recursion with-affiliated))
-(declare-function org-element-normalize-string "org-element" (s))
+(declare-function org-element-map "org-element" (data types fun &optional info first-match no-recursion with-affiliated no-undefer))
+(declare-function org-element-normalize-string "org-element" (s &optional keep-newlines))
 (declare-function org-element-parse-buffer "org-element" (&optional granularity visible-only keep-deferred))
 (declare-function org-element-parse-secondary-string "org-element" (string restriction &optional parent))
 (declare-function org-element-context "org-element" (&optional element))
@@ -95,14 +95,14 @@
 (declare-function org-element-parent "org-element-ast" (node))
 (declare-function org-element-put-property "org-element-ast" (node property value))
 (declare-function org-element-restriction "org-element" (element))
-(declare-function org-element-set "org-element-ast" (old new))
+(declare-function org-element-set "org-element-ast" (old new &optional keep-props))
 (declare-function org-element-type "org-element-ast" (node &optional anonymous))
 (declare-function org-element-type-p "org-element-ast" (node types))
 
-(declare-function org-export-derived-backend-p "org-export" (backend &rest backends))
-(declare-function org-export-get-next-element "org-export" (blob info &optional n))
-(declare-function org-export-get-previous-element "org-export" (blob info &optional n))
-(declare-function org-export-raw-string "org-export" (s))
+(declare-function org-export-derived-backend-p "ox" (backend &rest backends))
+(declare-function org-export-get-next-element "ox" (blob info &optional n))
+(declare-function org-export-get-previous-element "ox" (blob info &optional n))
+(declare-function org-export-raw-string "ox" (s))
 
 (defvar org-complex-heading-regexp)
 (defvar org-element-all-objects)
diff --git a/lisp/org/ol-bbdb.el b/lisp/org/ol-bbdb.el
index 9e876b00b74..ede4890eaa1 100644
--- a/lisp/org/ol-bbdb.el
+++ b/lisp/org/ol-bbdb.el
@@ -114,7 +114,6 @@
 (declare-function bbdb-records "ext:bbdb" (&optional dont-check-disk already-in-db-buffer))
 (declare-function bbdb-split "ext:bbdb" (string separators))
 (declare-function bbdb-string-trim "ext:bbdb" (string))
-(declare-function bbdb-record-get-field "ext:bbdb" (record field))
 (declare-function bbdb-search-name "ext:bbdb-com" (regexp &optional layout))
 (declare-function bbdb-search-organization "ext:bbdb-com" (regexp &optional layout))
 
@@ -222,6 +221,7 @@ date year)."
 			 :follow #'org-bbdb-open
 			 :export #'org-bbdb-export
 			 :complete #'org-bbdb-complete-link
+                         :insert-description #'org-bbdb-describe-link
 			 :store #'org-bbdb-store-link)
 
 ;;; Implementation
@@ -499,7 +499,7 @@ must be positive"))
 	      dates)))))
 
 (defun org-bbdb-complete-link ()
-  "Read a bbdb link with name completion."
+  "Read a BBDB link with name completion."
   (org-require-package 'bbdb-com "bbdb")
   (let ((rec (bbdb-completing-read-record "Name: ")))
     (concat "bbdb:"
@@ -507,6 +507,12 @@ must be positive"))
 				  (car rec)
 				rec)))))
 
+(defun org-bbdb-describe-link (link desc)
+  "Return a description for a BBDB link."
+  (or (org-string-nw-p desc)
+      (if (string-prefix-p "bbdb:" link)
+          (string-remove-prefix "bbdb:" link))))
+
 (defun org-bbdb-anniv-export-ical ()
   "Extract anniversaries from BBDB and convert them to icalendar format."
   (org-require-package 'bbdb)
diff --git a/lisp/org/ol-bibtex.el b/lisp/org/ol-bibtex.el
index 2828c7564e2..e860f24b52a 100644
--- a/lisp/org/ol-bibtex.el
+++ b/lisp/org/ol-bibtex.el
@@ -123,11 +123,7 @@
 (defvar org-property-end-re)
 (defvar org-special-properties)
 (defvar org-window-config-before-follow-link)
-
-(declare-function bibtex-beginning-of-entry "bibtex" ())
-(declare-function bibtex-generate-autokey "bibtex" ())
-(declare-function bibtex-parse-entry "bibtex" (&optional content))
-(declare-function bibtex-url "bibtex" (&optional pos no-browse))
+(defvar org-tag--invalid-char-re)
 
 (declare-function org-back-to-heading "org" (&optional invisible-ok))
 (declare-function org-entry-get "org" (pom property &optional inherit literal-nil))
@@ -754,7 +750,7 @@ entry at point."
 			 (funcall
 			  togtag
 			  (replace-regexp-in-string
-			   "[^[:alnum:]_@#%]" ""
+			   org-tag--invalid-char-re ""
 			   (replace-regexp-in-string "[ \t]+" "_" kw))))
 		     (org-bibtex-put (car pair) (cdr pair) insert-raw)))
 	(_ (org-bibtex-put (car pair) (cdr pair) insert-raw))))
diff --git a/lisp/org/ol-docview.el b/lisp/org/ol-docview.el
index e3fcf6d0a16..2a1968009f5 100644
--- a/lisp/org/ol-docview.el
+++ b/lisp/org/ol-docview.el
@@ -48,7 +48,6 @@
 (require 'doc-view)
 (require 'ol)
 
-(declare-function doc-view-goto-page "doc-view" (page))
 (declare-function image-mode-window-get "image-mode" (prop &optional winprops))
 (declare-function org-open-file "org" (path &optional in-emacs line search))
 
diff --git a/lisp/org/ol-eshell.el b/lisp/org/ol-eshell.el
index 2d704601211..2b48e7412ac 100644
--- a/lisp/org/ol-eshell.el
+++ b/lisp/org/ol-eshell.el
@@ -30,7 +30,7 @@
 (require 'esh-mode)
 (require 'ol)
 
-(declare-function eshell/pwd "em-dirs.el" (&rest args))
+(declare-function eshell/pwd "em-dirs" ())
 
 (org-link-set-parameters "eshell"
 			 :follow #'org-eshell-open
diff --git a/lisp/org/ol-gnus.el b/lisp/org/ol-gnus.el
index 53598b69499..1964efdd72f 100644
--- a/lisp/org/ol-gnus.el
+++ b/lisp/org/ol-gnus.el
@@ -46,7 +46,6 @@
 
 (declare-function gnus-activate-group "gnus-start" (group &optional scan dont-check method dont-sub-check))
 (declare-function gnus-find-method-for-group "gnus" (group &optional info))
-(declare-function gnus-article-show-summary "gnus-art" ())
 (declare-function gnus-group-group-name "gnus-group")
 (declare-function gnus-group-jump-to-group "gnus-group" (group &optional prompt))
 (declare-function gnus-group-read-group "gnus-group" (&optional all no-article group select-articles))
@@ -227,8 +226,13 @@ If `org-store-link' was called with a prefix arg the meaning of
 (defun org-gnus-follow-link (&optional group article)
   "Follow a Gnus link to GROUP and ARTICLE."
   (require 'gnus)
-  (funcall (cdr (assq 'gnus org-link-frame-setup)))
-  (when gnus-other-frame-object (select-frame gnus-other-frame-object))
+  (funcall (org-link-frame-setup-function 'gnus))
+  (when gnus-other-frame-object
+    (if (not (frame-live-p gnus-other-frame-object))
+        ;; Error out in case org-link-frame-setup did not take care of setting up
+        ;; the gnus frame if was activate previously.
+        (error "Couldn't select \'gnus-other-frame-object\', make sure it is active"))
+    (select-frame gnus-other-frame-object))
   (let ((group (org-no-properties group))
 	(article (org-no-properties article)))
     (cond
@@ -260,11 +264,24 @@ If `org-store-link' was called with a prefix arg the meaning of
 	 (message "Couldn't follow Gnus link.  The linked group is empty."))))
      (group (gnus-group-jump-to-group group)))))
 
-(defun org-gnus-no-new-news ()
-  "Like `\\[gnus]' but doesn't check for new news."
-  (cond ((gnus-alive-p) nil)
-	(org-gnus-no-server (gnus-no-server))
-	(t (gnus))))
+(defun org-gnus-no-new-news (&optional other-frame)
+  "Like `\\[gnus]' but doesn't check for new news.
+In case of OTHER-FRAME or `gnus-other-frame-object' call `gnus-other-frame'.
+
+Ensures that `gnus-other-frame' is activated correctly if dead."
+  (let ((action (cond  (org-gnus-no-server #'gnus-no-server)
+	               (t #'gnus))))
+    (cond ((or other-frame gnus-other-frame-object)
+           (let ((gnus-other-frame-function action)
+                 (gnus-other-frame-resume-function action))
+             (gnus-other-frame)))
+          (t (if (not (gnus-alive-p))
+                 (funcall action))))))
+
+(defun org-gnus-no-new-news-other-frame ()
+  "Like `org-gnus-no-new-news' but always in another frame."
+    (org-gnus-no-new-news t))
+
 
 (provide 'ol-gnus)
 
diff --git a/lisp/org/ol-info.el b/lisp/org/ol-info.el
index add99e9c1ac..b65fcc8b932 100644
--- a/lisp/org/ol-info.el
+++ b/lisp/org/ol-info.el
@@ -38,7 +38,7 @@
 ;; Declare external functions and variables
 
 (declare-function Info-find-node "info"
-                  (filename nodename &optional no-going-back strict-case))
+                  (filename nodename &optional no-going-back strict-case noerror))
 (defvar Info-current-file)
 (defvar Info-current-node)
 
@@ -68,11 +68,12 @@
   (org-info-follow-link path))
 
 (defun org-info--link-file-node (path)
-  "Extract file name and node from info link PATH.
+  "Extract the file name and Info node from the Info link PATH.
 
-Return cons consisting of file name and node name or \"Top\" if node
-part is not specified.  Components may be separated by \":\" or by \"#\".
-File may be a virtual one, see `Info-virtual-files'."
+Return a cons consisting of the file name and node name or \"Top\" if
+the node part is not specified.  Components may be separated by \":\"
+or by \"#\".  The file name may be a virtual one, see
+`Info-virtual-files'."
   (if (not path)
       '("dir" . "Top")
     (string-match "\\`\\([^#:]*\\)\\(?:[#:]:?\\(.*\\)\\)?\\'" path)
@@ -84,7 +85,7 @@ File may be a virtual one, see `Info-virtual-files'."
        (if (org-string-nw-p node) (org-trim node) "Top")))))
 
 (defun org-info-description-as-command (link desc)
-  "Info link description that can be pasted as command.
+  "Return an Info link description that can be evaluated as a command.
 
 For the following LINK
 
@@ -99,8 +100,8 @@ that may be executed as shell command or evaluated by
 in Emacs.
 
 Calling convention is similar to `org-link-make-description-function'.
-DESC has higher priority and returned when it is not nil or empty string.
-If LINK is not an info link then DESC is returned."
+DESC has higher priority and returned when it is both non-nil and
+non-empty.  If LINK is not an Info link, DESC is returned."
   (let* ((prefix "info:")
          (need-file-node (and (not (org-string-nw-p desc))
                               (string-prefix-p prefix link))))
@@ -144,19 +145,20 @@ Taken from <https://www.gnu.org/software/emacs/manual/html_mono/.>")
     ("libc" . "https://www.gnu.org/software/libc/manual/html_mono/libc.html")
     ("make" . "https://www.gnu.org/software/make/manual/make.html"))
   "Alist of documents generated from Texinfo source.
-When converting info links to HTML, links to any one of these manuals are
+When converting Info links to HTML, links to any one of these manuals are
 converted to use these URL."
   :group 'org-link
   :type '(alist :key-type string :value-type string)
   :package-version '(Org . "9.7")
-  :safe t)
+  :safe #'listp)
 
 (defun org-info-map-html-url (filename)
-  "Return URL or HTML file associated to Info FILENAME.
-If FILENAME refers to an official GNU document, return a URL pointing to
-the official page for that document, e.g., use \"gnu.org\" for all Emacs
-related documents.  Otherwise, append \".html\" extension to FILENAME.
-See `org-info-emacs-documents' and `org-info-other-documents' for details."
+  "Return the URL or HTML file associated with the Info FILENAME.
+If FILENAME refers to an official GNU document, return the URL of the
+official page for that document, e.g., use \"gnu.org\" for all Emacs
+related documents.  Otherwise, append \".html\" to the FILENAME.  See
+`org-info-emacs-documents' and `org-info-other-documents' for
+details."
   (cond ((cdr (assoc filename org-info-other-documents)))
         ((member filename org-info-emacs-documents)
          (format "https://www.gnu.org/software/emacs/manual/html_mono/%s.html"
@@ -164,7 +166,7 @@ See `org-info-emacs-documents' and `org-info-other-documents' for details."
         (t (concat filename ".html"))))
 
 (defun org-info--expand-node-name (node)
-  "Expand Info NODE to HTML cross reference."
+  "Expand the Info NODE to an HTML cross reference."
   ;; See (info "(texinfo) HTML Xref Node Name Expansion") for the
   ;; expansion rule.
   (let ((node (replace-regexp-in-string
@@ -177,7 +179,7 @@ See `org-info-emacs-documents' and `org-info-other-documents' for details."
 	  (t node))))
 
 (defun org-info-export (path desc format)
-  "Export an info link.
+  "Export an Info link.
 See `org-link-parameters' for details about PATH, DESC and FORMAT."
   (pcase-let ((`(,manual . ,node) (org-info--link-file-node path)))
     (pcase format
diff --git a/lisp/org/ol-man.el b/lisp/org/ol-man.el
index 4bb44cc43b1..2121b8539ff 100644
--- a/lisp/org/ol-man.el
+++ b/lisp/org/ol-man.el
@@ -2,7 +2,6 @@
 ;;
 ;; Copyright (C) 2020-2026 Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Maintainer: Bastien Guerry <bzg@gnu.org>
 ;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
@@ -52,7 +51,8 @@ If PATH contains extra ::STRING which will use `occur' to search
 matched strings in man buffer."
   (require 'man) ; For `Man-translate-references'
   (string-match "\\(.*?\\)\\(?:::\\(.*\\)\\)?$" path)
-  (let* ((command (match-string 1 path))
+  (let* ((search (match-string 2 path))
+         (command (match-string 1 path))
          ;; FIXME: Remove after we drop Emacs 29 support.
          ;; Working around security bug #66390.
          (command (if (not (equal (Man-translate-references ";id") ";id"))
@@ -65,7 +65,6 @@ matched strings in man buffer."
                                (mapcar #'shell-quote-argument
                                        (split-string command "\\s-+"))
                                " ")))
-         (search (match-string 2 path))
          (buffer (funcall org-man-command command)))
     (when search
       (with-current-buffer buffer
diff --git a/lisp/org/ol.el b/lisp/org/ol.el
index 4cd0ad37338..24ac9deb181 100644
--- a/lisp/org/ol.el
+++ b/lisp/org/ol.el
@@ -46,11 +46,13 @@
 
 (declare-function calendar-cursor-to-date "calendar" (&optional error event))
 (declare-function dired-get-filename "dired" (&optional localp no-error-if-not-filep))
-(declare-function org-at-heading-p "org" (&optional _))
 (declare-function org-back-to-heading "org" (&optional invisible-ok))
 (declare-function org-before-first-heading-p "org" ())
 (declare-function org-do-occur "org" (regexp &optional cleanup))
 (declare-function org-element-at-point "org-element" (&optional pom cached-only))
+(declare-function org-element-parse-secondary-string "org-element"
+                  (string restriction &optional parent))
+(declare-function org-element-restriction "org-element" (element))
 (declare-function org-element-cache-refresh "org-element" (pos))
 (declare-function org-element-cache-reset "org-element" (&optional all no-persistence))
 (declare-function org-element-context "org-element" (&optional element))
@@ -74,14 +76,17 @@
 (declare-function org-cycle-overview "org-cycle" ())
 (declare-function org-restart-font-lock "org" ())
 (declare-function org-run-like-in-org-mode "org" (cmd))
-(declare-function org-fold-show-context "org-fold" (&optional key))
 (declare-function org-src-coderef-format "org-src" (&optional element))
 (declare-function org-src-coderef-regexp "org-src" (fmt &optional label))
 (declare-function org-src-edit-buffer-p "org-src" (&optional buffer))
 (declare-function org-src-source-buffer "org-src" ())
 (declare-function org-src-source-type "org-src" ())
-(declare-function org-time-stamp-format "org" (&optional long inactive))
-(declare-function outline-next-heading "outline" ())
+(declare-function org-time-stamp-format "org" (&optional long inactive custom))
+(declare-function image-flush "image" (spec &optional frame))
+(declare-function org-entry-end-position "org" ())
+(declare-function org-element-contents-begin "org-element" (node))
+(declare-function org-element-contents-end "org-element" (node))
+(declare-function org-property-or-variable-value "org" (var &optional inherit))
 
 
 ;;; Customization
@@ -171,6 +176,18 @@ link.
 
   The default face is `org-link'.
 
+`:preview'
+
+  Function to run to generate an in-buffer preview for the link.  It
+  must accept three arguments:
+  - an overlay placed from the start to the end of the link
+  - the link path, as a string
+  - the syntax node for the link
+
+  This function must return a non-nil value to indicate success.
+  A return value of nil implies that the preview failed, and the
+  overlay placed on the link will be removed.
+
 `:help-echo'
 
   String or function used as a value for the `help-echo' text
@@ -194,9 +211,10 @@ link.
   Face used when hovering over the link.  Default is
   `highlight'."
   :group 'org-link
-  :package-version '(Org . "9.1")
+  :package-version '(Org . "9.8")
   :type '(alist :tag "Link display parameters"
-		:value-type plist))
+		:value-type plist)
+  :risky t)
 
 (defun org-link--set-link-display (symbol value)
   "Set `org-link-descriptive' (SYMBOL) to VALUE.
@@ -331,6 +349,7 @@ For Gnus, use any of
     `gnus'
     `gnus-other-frame'
     `org-gnus-no-new-news'
+    `org-gnus-no-new-news-other-frame'
 For FILE, use any of
     `find-file'
     `find-file-other-window'
@@ -342,6 +361,7 @@ For the calendar, use the variable `calendar-setup'.
 For BBDB, it is currently only possible to display the matches in
 another window."
   :group 'org-link-follow
+  :package-version  '(Org . "9.8")
   :type '(list
 	  (cons (const vm)
 		(choice
@@ -357,7 +377,8 @@ another window."
 		(choice
 		 (const gnus)
 		 (const gnus-other-frame)
-		 (const org-gnus-no-new-news)))
+		 (const org-gnus-no-new-news)
+                 (const org-gnus-no-new-news-other-frame)))
 	  (cons (const file)
 		(choice
 		 (const find-file)
@@ -366,7 +387,8 @@ another window."
 	  (cons (const wl)
 		(choice
 		 (const wl)
-		 (const wl-other-frame)))))
+		 (const wl-other-frame))))
+  :risky t)
 
 (defcustom org-link-search-must-match-exact-headline 'query-to-create
   "Control fuzzy link behavior when specific matches not found.
@@ -479,7 +501,7 @@ The following %-escapes will be replaced by corresponding information:
 %T   full \"To\" field
 %t   first name in \"To\" field, address if no name
 %c   correspondent.  Usually \"from NAME\", but if you sent it yourself, it
-     will be \"to NAME\".  See also the variable `org-from-is-user-regexp'.
+     will be \"to NAME\".  See also the variable `org-link-from-user-regexp'.
 %s   subject
 %d   date
 %m   message-id.
@@ -521,6 +543,86 @@ links more efficient."
   :type 'boolean
   :safe #'booleanp)
 
+(defcustom org-link-preview-delay 0.05
+  "Idle delay in seconds between link previews when using `org-link-preview'.
+Links are previewed in batches (see
+`org-link-preview-batch-size') spaced out by this delay.  Set
+this to a small number for more immediate previews, but at the
+expense of higher lag."
+  :group 'org-link
+  :package-version '(Org . "9.8")
+  :type 'number
+  :safe #'numberp)
+
+(defcustom org-link-preview-batch-size 6
+  "Number of links that are previewed at once with `org-link-preview'.
+Links are previewed asynchronously, in
+batches spaced out in time (see `org-link-preview-delay').  Set
+this to a large integer for more immediate previews, but at the
+expense of higher lag."
+  :group 'org-link
+  :package-version '(Org . "9.8")
+  :type 'natnum
+  :safe #'natnump)
+
+(defcustom org-display-remote-inline-images 'skip
+  "How to display remote inline images.
+Possible values of this option are:
+
+skip        Don't display remote images.
+download    Always download and display remote images.
+t
+cache       Display remote images, and open them in separate buffers
+            for caching.  Silently update the image buffer when a file
+            change is detected."
+  :group 'org-appearance
+  :package-version '(Org . "9.7")
+  :type '(choice
+	  (const :tag "Ignore remote images" skip)
+	  (const :tag "Always display remote images" download)
+	  (const :tag "Display and silently update remote images" cache))
+  :safe #'symbolp)
+
+(defcustom org-image-max-width 'fill-column
+  "When non-nil, limit the displayed image width.
+This setting only takes effect when `org-image-actual-width' is set to
+t or when #+ATTR* is set to t.
+
+Possible values:
+- `fill-column' :: limit width to `fill-column'
+- `window'      :: limit width to window width
+- integer       :: limit width to number in pixels
+- float         :: limit width to that fraction of window width
+- nil             :: do not limit image width"
+  :group 'org-appearance
+  :package-version '(Org . "9.7")
+  :type '(choice
+          (const :tag "Do not limit image width" nil)
+          (const :tag "Limit to `fill-column'" fill-column)
+          (const :tag "Limit to window width" window)
+          (integer :tag "Limit to a number of pixels")
+          (float :tag "Limit to a fraction of window width"))
+  :safe (lambda (x) (or (numberp x) (member x '(nil 'fill-column 'window)))))
+
+(defcustom org-image-align 'left
+  "How to align images previewed using `org-link-preview-region'.
+
+Only stand-alone image links are affected by this setting.  These
+are links without surrounding text.
+
+Possible values of this option are:
+
+left     Insert image at specified position.
+center   Center image previews.
+right    Right-align image previews."
+  :group 'org-appearance
+  :package-version '(Org . "9.7")
+  :type '(choice
+          (const :tag "Left align (or don\\='t align) image previews" left)
+	  (const :tag "Center image previews" center)
+	  (const :tag "Right align image previews" right))
+  :safe #'symbolp)
+
 ;;; Public variables
 
 (defconst org-target-regexp (let ((border "[^<>\n\r \t]"))
@@ -649,6 +751,29 @@ exact and fuzzy text search.")
 (defvar org-link--search-failed nil
   "Non-nil when last link search failed.")
 
+(defvar-local org-link-preview-overlays nil)
+;; Preserve when switching modes or when restarting Org.
+;; If we clear the overlay list and later enable Or mode, the existing
+;; image overlays will never be cleared by `org-link-preview'
+;; and `org-link-preview-clear'.
+(put 'org-link-preview-overlays 'permanent-local t)
+
+(defvar-local org-link-preview--timer nil
+  "Timer for previewing Org links in buffer.
+
+This timer creates previews for specs in
+`org-link-preview--queue'.")
+
+(defvar-local org-link-preview--queue nil
+  "Queue of pending previews for Org links in buffer.
+
+Each element of this queue is a list of the form
+
+(PREVIEW-FUNC OVERLAY PATH LINK)
+
+where PREVIEW-FUNC places a preview of PATH using OVERLAY.  LINK
+is the Org element being previewed.")
+
 
 ;;; Internal Functions
 
@@ -846,10 +971,12 @@ Return t when a link has been stored in `org-link-store-props'."
        ;; function.
        (apply #'org-link-store-props
               (cdr (assoc-string
-                    (completing-read
-                     (format "Store link with (default %s): " name)
-                     (mapcar #'car results-alist)
-                     nil t nil nil (symbol-name name))
+                    (if (not interactive?)
+                        (car (nth 0 results-alist))
+                      (completing-read
+                       (format "Store link with (default %s): " name)
+                       (mapcar #'car results-alist)
+                       nil t nil nil (symbol-name name)))
                     results-alist)))
        t))))
 
@@ -881,7 +1008,229 @@ Return t when a link has been stored in `org-link-store-props'."
          (setq desc search-desc))))
     (cons link desc)))
 
+(defun org-link-preview--get-overlays (&optional beg end)
+  "Return link preview overlays between BEG and END."
+  (let* ((beg (or beg (point-min)))
+         (end (or end (point-max)))
+         (overlays (overlays-in beg end))
+         result)
+    (dolist (ov overlays result)
+      (when (memq ov org-link-preview-overlays)
+        (push ov result)))))
+
+(defun org-link-preview--remove-overlay (ov after _beg _end &optional _len)
+  "Remove link-preview overlay OV if a corresponding region is modified.
+
+AFTER is true when this function is called post-change."
+  (when (and ov after)
+    (setq org-link-preview-overlays (delq ov org-link-preview-overlays))
+    ;; Clear image from cache to avoid image not updating upon
+    ;; changing on disk.  See Emacs bug#59902.
+    (when-let* ((disp (overlay-get ov 'display))
+                ((if (fboundp 'imagep)
+                     (imagep disp)
+                   (eq 'image (car-safe disp)))))
+      (image-flush disp))
+    (delete-overlay ov)))
+
 
+
+;;;; Utilities for image preview display
+
+;; For without-x builds.
+(declare-function image-flush "image" (spec &optional frame))
+
+(defun org--create-inline-image (file width)
+  "Create image located at FILE, or return nil.
+WIDTH is the width of the image.  The image may not be created
+according to the value of `org-display-remote-inline-images'."
+  (let* ((remote? (file-remote-p file))
+	 (file-or-data
+	  (pcase org-display-remote-inline-images
+	    ((guard (not remote?)) file)
+	    (`download (with-temp-buffer
+			 (set-buffer-multibyte nil)
+			 (insert-file-contents-literally file)
+			 (buffer-string)))
+	    ((or `cache `t)
+             (let ((revert-without-query '(".")))
+	       (with-current-buffer (find-file-noselect file)
+		 (buffer-string))))
+	    (`skip nil)
+	    (other
+	     (message "Invalid value of `org-display-remote-inline-images': %S"
+		      other)
+	     nil))))
+    (when file-or-data
+      (create-image file-or-data
+		    (and (image-type-available-p 'imagemagick)
+			 width
+			 'imagemagick)
+		    remote?
+		    :width width
+                    :max-width
+                    (pcase org-image-max-width
+                      (`fill-column (* fill-column (frame-char-width (selected-frame))))
+                      (`window (window-width nil t))
+                      ((pred integerp) org-image-max-width)
+                      ((pred floatp) (floor (* org-image-max-width (window-width nil t))))
+                      (`nil nil)
+                      (_ (error "Unsupported value of `org-image-max-width': %S"
+                                org-image-max-width)))
+                    :scale 1))))
+
+(declare-function org-export-read-attribute "ox"
+                  (attribute element &optional property))
+(defvar visual-fill-column-width) ; Silence compiler warning
+(defun org-display-inline-image--width (link)
+  "Determine the display width of the image LINK, in pixels.
+- When `org-image-actual-width' is t, the image's pixel width is used.
+- When `org-image-actual-width' is a number, that value will is used.
+- When `org-image-actual-width' is nil or a list, :width attribute of
+  #+attr_org or the first #+attr_...  (if it exists) is used to set the
+  image width.  A width of X% is divided by 100.  If the value is a
+  float between 0 and 2, it interpreted as that proportion of the text
+  width in the buffer.
+
+  If no :width attribute is given and `org-image-actual-width' is a
+  list with a number as the car, then that number is used as the
+  default value."
+  ;; Apply `org-image-actual-width' specifications.
+  ;; Support subtree-level property "ORG-IMAGE-ACTUAL-WIDTH" specified
+  ;; width.
+  (let ((org-image-actual-width (org-property-or-variable-value 'org-image-actual-width)))
+    (cond
+     ((eq org-image-actual-width t) nil)
+     ((listp org-image-actual-width)
+      (require 'ox)
+      (let* ((par (org-element-lineage link 'paragraph))
+             ;; Try to find an attribute providing a :width.
+             ;; #+ATTR_ORG: :width ...
+             (attr-width (org-export-read-attribute :attr_org par :width))
+             (width-unreadable?
+              (lambda (value)
+                (or (not (stringp value))
+                    (unless (string= value "t")
+                      (or (not (string-match
+                              (rx bos (opt "+")
+                                  (or
+                                   ;; Number of pixels
+                                   ;; must be a lone number, not
+                                   ;; things like 4in
+                                   (seq (1+ (in "0-9")) (? "px") eos)
+                                   ;; Numbers ending with %
+                                   (seq (1+ (in "0-9.")) (group-n 1 "%"))
+                                   ;; Fractions
+                                   (seq (0+ (in "0-9")) "." (1+ (in "0-9")))))
+                              value))
+                          (let ((number (string-to-number value)))
+                            (and (floatp number)
+                                 (not (match-string 1 value)) ; X%
+                                 (not (<= 0.0 number 2.0)))))))))
+             ;; #+ATTR_BACKEND: :width ...
+             (attr-other
+              (catch :found
+                (org-element-properties-map
+                 (lambda (prop _)
+                   (when (and
+                          (not (eq prop :attr_org))
+                          (string-match-p "^:attr_" (symbol-name prop))
+                          (not (funcall width-unreadable? (org-export-read-attribute prop par :width))))
+                     (throw :found prop)))
+                 par)))
+             (attr-width
+              (if (not (funcall width-unreadable? attr-width))
+                  attr-width
+                ;; When #+attr_org: does not have readable :width
+                (and attr-other
+                     (org-export-read-attribute attr-other par :width))))
+             (width
+              (cond
+               ;; Treat :width t as if `org-image-actual-width' were t.
+               ((string= attr-width "t") nil)
+               ;; Fallback to `org-image-actual-width' if no interprable width is given.
+               ((funcall width-unreadable? attr-width)
+                (car org-image-actual-width))
+               ;; Convert numeric widths to numbers, converting percentages.
+               ((string-match-p "\\`[[+]?[0-9.]+%" attr-width)
+                (/ (string-to-number attr-width) 100.0))
+               (t (string-to-number attr-width)))))
+        (if (and (floatp width) (<= 0.0 width 2.0))
+            ;; A float in [0,2] should be interpereted as this portion of
+            ;; the text width in the window.  This works well with cases like
+            ;; #+attr_latex: :width 0.X\{line,page,column,etc.}width,
+            ;; as the "0.X" is pulled out as a float.  We use 2 as the upper
+            ;; bound as cases such as 1.2\linewidth are feasible.
+            (round (* width
+                      (window-pixel-width)
+                      (/ (or (and (bound-and-true-p visual-fill-column-mode)
+                                  (or visual-fill-column-width auto-fill-function))
+                             (when auto-fill-function fill-column)
+                             (- (window-text-width) (line-number-display-width)))
+                         (float (window-total-width)))))
+          width)))
+     ((numberp org-image-actual-width)
+      org-image-actual-width)
+     (t nil))))
+
+(defun org-image--align (link)
+  "Determine the alignment of the image LINK.
+LINK is a link object.
+
+In decreasing order of priority, this is controlled:
+- Per image by the value of `:center' or `:align' in the
+affiliated keyword `#+attr_org'.
+- By the `#+attr_html' or `#+attr_latex` keywords with valid
+  `:center' or `:align' values.
+- Globally by the user option `org-image-align'.
+
+The result is either nil or one of the strings \"left\",
+\"center\" or \"right\".
+
+\"center\" will cause the image preview to be centered, \"right\"
+will cause it to be right-aligned.  A value of \"left\" or nil
+implies no special alignment."
+  (let ((par (org-element-lineage link 'paragraph)))
+    ;; Only align when image is not surrounded by paragraph text:
+    (when (and par ; when image is not in paragraph, but in table/headline/etc, do not align
+               (= (org-element-begin link)
+                  (save-excursion
+                    (goto-char (org-element-contents-begin par))
+                    (skip-chars-forward "\t ")
+                    (point)))           ;account for leading space
+                                        ;before link
+               (<= (- (org-element-contents-end par)
+                     (org-element-end link))
+                  1))                  ;account for trailing newline
+                                        ;at end of paragraph
+      (save-match-data
+        ;; Look for a valid ":center t" or ":align left|center|right"
+        ;; attribute.
+        ;;
+        ;; An attr_org keyword has the highest priority, with
+        ;; any attr.* next.  Choosing between these is
+        ;; unspecified.
+        (let ((center-re ":\\(center\\)[[:space:]]+t\\b")
+              (align-re ":align[[:space:]]+\\(left\\|center\\|right\\)\\b")
+              attr-align)
+          (catch 'exit
+            (org-element-properties-mapc
+             (lambda (propname propval)
+               (when (and propval
+                          (string-match-p ":attr.*" (symbol-name propname)))
+                 (setq propval (car-safe propval))
+                 (when (or (string-match center-re propval)
+                           (string-match align-re propval))
+                   (setq attr-align (match-string 1 propval))
+                   (when (eq propname :attr_org)
+                     (throw 'exit t)))))
+             par))
+          (if attr-align
+              (when (member attr-align '("center" "right")) attr-align)
+            ;; No image-specific keyword, check global alignment property
+            (when (memq org-image-align '(center right))
+              (symbol-name org-image-align))))))))
+
 ;;; Public API
 
 (defun org-link-types ()
@@ -943,7 +1292,13 @@ This should be called after the variable `org-link-parameters' has changed."
                    (group
 		    (1+ (or (regex ,non-space-bracket)
 			    ,parenthesis))
-		    (or (regexp "[^[:punct:] \t\n]")
+		    (or (regexp "[^[:punct:][:space:]\n]")
+                        ;; Allow "-" punctuation, as an exception
+                        ;; See https://list.orgmode.org/orgmode/87sexh9ddv.fsf@ice9.digital/
+                        ;; This is also in line with the heuristics
+                        ;; above - it also does not include "-"
+                        ;; punctuation.
+                        ?-
 		        ?/
 		        ,parenthesis)))))
           org-link-bracket-re
@@ -1087,6 +1442,45 @@ E.g. \"%C3%B6\" becomes the German o-Umlaut."
      (concat (make-string (/ (- (match-end 1) (match-beginning 1)) 2) ?\\)))
    link nil t 1))
 
+(defun org-link-get-description (link &optional default-description)
+  "Return description for LINK.
+When link has :insert-description link property defined, set description
+accordingly.  Otherwise, try `org-link-make-description-function'.
+When the above two methods are not defined, return DEFAULT-DESCRIPTION."
+  (let* ((abbrevs org-link-abbrev-alist-local)
+         (all-prefixes (append (mapcar #'car abbrevs)
+			       (mapcar #'car org-link-abbrev-alist)
+			       (org-link-types)))
+         (type
+          (cond
+           ((and all-prefixes
+                 (string-match (rx-to-string `(: string-start (submatch (or ,@all-prefixes)) ":")) link))
+            (match-string 1 link))
+           ((file-name-absolute-p link) "file")
+           ((string-match "\\`\\.\\.?/" link) "file"))))
+    (cond
+     ((org-link-get-parameter type :insert-description)
+      (let ((def (org-link-get-parameter type :insert-description)))
+        (condition-case nil
+            (cond
+             ((stringp def) def)
+             ((functionp def)
+              (funcall def link default-description)))
+          (error
+           (message "Can't get link description from org link parameter `:insert-description': %S"
+                    def)
+           (sit-for 2)
+           nil))))
+     (org-link-make-description-function
+      (condition-case nil
+          (funcall org-link-make-description-function link default-description)
+        (error
+         (message "Can't get link description from %S"
+                  org-link-make-description-function)
+         (sit-for 2)
+         nil)))
+     (t default-description))))
+
 (defun org-link-make-string (link &optional description)
   "Make a bracket link, consisting of LINK and DESCRIPTION.
 LINK is escaped with backslashes for inclusion in buffer."
@@ -1110,6 +1504,70 @@ LINK is escaped with backslashes for inclusion in buffer."
 	      (org-link-escape link)
 	      (if description (format "[%s]" description) "")))))
 
+(defun org-link-make-string-for-buffer (link &optional description interactive-p)
+  "Format LINK with DESCRIPTION for current buffer.
+When BUFFER is nil, format LINK for current buffer.
+When DESCRIPTION is nil, set it according to :insert-description link
+parameter or `org-link-make-description-function'.
+When current buffer is a file buffer and link points to that file,
+strip the file name from the link.
+Make sure that file: link follows `org-link-file-path-type'.
+Strip <..> brackets from LINK, if it is a plain link.
+
+When INTERACTIVE-P is non-nil, prompt user for description.
+
+Return link with description, as a string."
+  (when (and (string-match org-link-plain-re link)
+	     (not (string-match org-ts-regexp link)))
+    ;; URL-like link, normalize the use of angular brackets.
+    (setq link (org-unbracket-string "<" ">" link)))
+
+  ;; Check if we are linking to the current file with a search
+  ;; option If yes, simplify the link by using only the search
+  ;; option.
+  (when (and (buffer-file-name (buffer-base-buffer))
+	     (let ((case-fold-search nil))
+	       (string-match "\\`file:\\(.+?\\)::" link)))
+    (let ((path (match-string-no-properties 1 link))
+	  (search (substring-no-properties link (match-end 0))))
+      (save-match-data
+	(when (equal (file-truename (buffer-file-name (buffer-base-buffer)))
+		     (file-truename path))
+	  ;; We are linking to this same file, with a search option
+	  (setq link search)))))
+
+  ;; Check if we can/should use a relative path.  If yes, simplify
+  ;; the link.
+  (let ((case-fold-search nil))
+    (when (string-match "\\`\\(file\\|docview\\):" link)
+      (let* ((type (match-string-no-properties 0 link))
+	     (path-start (match-end 0))
+	     (search (and (string-match "::\\(.*\\)\\'" link path-start)
+			  (match-string 1 link)))
+	     (path
+	      (if search
+		  (substring-no-properties
+		   link path-start (match-beginning 0))
+		(substring-no-properties link (match-end 0))))
+             ;; file:::search
+             (path (if (org-string-nw-p path) path (buffer-file-name)))
+	     (origpath path))
+	(setq path (org-link--normalize-filename path org-link-file-path-type))
+	(setq link (concat type path (and search (concat "::" search))))
+	(when (equal description origpath)
+	  (setq description path)))))
+
+  (unless description
+    (setq description (org-link-get-description link)))
+
+  (when interactive-p
+    (setq description (read-string "Description: " description)))
+
+  (unless (org-string-nw-p description)
+    (setq description nil))
+
+  (org-link-make-string link description))
+
 (defun org-store-link-functions ()
   "List of functions that are called to create and store a link.
 
@@ -1152,35 +1610,53 @@ Abbreviations are defined in `org-link-abbrev-alist'."
       (if (not as)
 	  link
 	(setq rpl (cdr as))
-        ;; Drop any potentially dangerous text properties like
-        ;; `modification-hooks' that may be used as an attack vector.
-        (substring-no-properties
-	 (cond
-	  ((symbolp rpl) (funcall rpl tag))
-	  ((string-match "%(\\([^)]+\\))" rpl)
-           (let ((rpl-fun-symbol (intern-soft (match-string 1 rpl))))
-             ;; Using `unsafep-function' is not quite enough because
-             ;; Emacs considers functions like `getenv' safe, while
-             ;; they can potentially be used to expose private system
-             ;; data to attacker if abbreviated link is clicked.
-             (if (or (eq t (get rpl-fun-symbol 'org-link-abbrev-safe))
-                     (eq t (get rpl-fun-symbol 'pure)))
-                 (replace-match
-	          (save-match-data
-	            (funcall (intern-soft (match-string 1 rpl)) tag))
-	          t t rpl)
-               (org-display-warning
-                (format "Disabling unsafe link abbrev: %s
+        (cl-macrolet
+            ((eval-or-disable (&rest body)
+               "Run BODY and disable AS abbrev if it errs."
+               `(condition-case err
+	            (progn ,@body)
+                  (error
+                   (org-display-warning
+                    (format "Disabling link abbrev %s <- %s after expansion failure: %S"
+                            rpl link (error-message-string err)))
+                   (setq org-link-abbrev-alist-local (delete as org-link-abbrev-alist-local)
+	                 org-link-abbrev-alist (delete as org-link-abbrev-alist))
+                   link))))
+          ;; Drop any potentially dangerous text properties like
+          ;; `modification-hooks' that may be used as an attack vector.
+          (substring-no-properties
+           (cond
+            ((symbolp rpl)
+             (eval-or-disable
+              (let ((expanded (funcall rpl tag)))
+                (unless (stringp expanded)
+                  (error "%s did not return a string: %S" rpl expanded))
+                expanded)))
+            ((string-match "%(\\([^)]+\\))" rpl)
+             (let ((rpl-fun-symbol (intern-soft (match-string 1 rpl))))
+               ;; Using `unsafep-function' is not quite enough because
+               ;; Emacs considers functions like `getenv' safe, while
+               ;; they can potentially be used to expose private system
+               ;; data to attacker if abbreviated link is clicked.
+               (if (or (eq t (get rpl-fun-symbol 'org-link-abbrev-safe))
+                       (eq t (get rpl-fun-symbol 'pure)))
+                   (eval-or-disable
+                    (replace-match
+                     (save-match-data
+                       (funcall rpl-fun-symbol tag))
+                     t t rpl))
+                 (org-display-warning
+                  (format "Disabling unsafe link abbrev: %s
 You may mark function safe via (put '%s 'org-link-abbrev-safe t)"
-                        rpl (match-string 1 rpl)))
-               (setq org-link-abbrev-alist-local (delete as org-link-abbrev-alist-local)
-                     org-link-abbrev-alist (delete as org-link-abbrev-alist))
-               link
-	       )))
-	  ((string-match "%s" rpl) (replace-match (or tag "") t t rpl))
-	  ((string-match "%h" rpl)
-	   (replace-match (url-hexify-string (or tag "")) t t rpl))
-	  (t (concat rpl tag))))))))
+                          rpl (match-string 1 rpl)))
+                 (setq org-link-abbrev-alist-local (delete as org-link-abbrev-alist-local)
+                       org-link-abbrev-alist (delete as org-link-abbrev-alist))
+                 link
+                 )))
+            ((string-match "%s" rpl) (replace-match (or tag "") t t rpl))
+            ((string-match "%h" rpl)
+             (replace-match (url-hexify-string (or tag "")) t t rpl))
+            (t (concat rpl tag)))))))))
 
 (defun org-link-open (link &optional arg)
   "Open a link object LINK.
@@ -1251,6 +1727,9 @@ Optional argument ARG is passed to `org-open-file' when S is a
 	     (goto-char (point-min))
 	     (org-element-link-parser)))
     (`nil (user-error "No valid link in %S" s))
+    ((and link (guard (not (equal (org-element-end link) (1+ (length s))))))
+     (user-error "Garbage after link in %S (%S)"
+                 s (substring s (1- (org-element-end link)))))
     (link (org-link-open link arg))))
 
 (defun org-link-search (s &optional avoid-pos stealth new-heading-container)
@@ -1270,7 +1749,7 @@ will be used to search in all files.
 When AVOID-POS is given, ignore matches near that position.
 
 When optional argument STEALTH is non-nil, do not modify
-visibility around point, thus ignoring `org-show-context-detail'
+visibility around point, thus ignoring `org-fold-show-context-detail'
 variable.
 
 When optional argument NEW-HEADING-CONTAINER is an element, any
@@ -1549,6 +2028,263 @@ If there is no description, use the link target."
   (unless (equal (substring s -1) ">") (setq s (concat s ">")))
   s)
 
+;;;###autoload
+(defun org-link-preview (&optional arg beg end)
+  "Toggle display of link previews in the buffer.
+
+When region BEG..END is active, preview links in the
+region.
+
+When point is at a link, display a preview for that link only.
+Otherwise, display previews for links in current entry.
+
+With numeric prefix ARG 1, also preview links with description in
+the active region, at point or in the current section.
+
+With prefix ARG `\\[universal-argument]', clear link previews at
+point or in the current entry.
+
+With prefix ARG `\\[universal-argument] \\[universal-argument]',
+ display link previews in the accessible portion of the
+ buffer.  With numeric prefix ARG 11, do the same, but include
+ links with descriptions.
+
+With prefix ARG `\\[universal-argument] \\[universal-argument] \\[universal-argument]',
+hide all link previews in the accessible portion of the buffer.
+
+This command is designed for interactive use.  From Elisp, you can
+also use `org-link-preview-region'."
+  (interactive (cons current-prefix-arg
+                     (when (use-region-p)
+                       (list (region-beginning) (region-end)))))
+  (let* ((include-linked
+          (cond
+           ((member arg '(nil (4) (16)) ) nil)
+           ((member arg '(1 11)) 'include-linked)
+           (t 'include-linked)))
+         (interactive? (called-interactively-p 'any))
+         (toggle-previews
+          (lambda (&optional beg end scope remove)
+            (let* ((beg (or beg (point-min)))
+                   (end (or end (point-max)))
+                   (old (org-link-preview--get-overlays beg end))
+                   (scope (or scope (format "%d:%d" beg end))))
+              (if remove
+                  (progn
+                    (org-link-preview-clear beg end)
+                    (when interactive?
+                      (message
+                       "[%s] Inline link previews turned off (removed %d images)"
+                       scope (length old))))
+	        (org-link-preview-region include-linked t beg end)
+                (when interactive?
+                  (let ((new (org-link-preview--get-overlays beg end)))
+                    (message
+                     (if new
+		         (format "[%s] Displaying %d images inline %s"
+			         scope (length new)
+                                 (if include-linked "(including images with description)"
+                                   ""))
+                       (if (equal scope "buffer")
+		           (format "[%s] No images to display inline" scope)
+                         (format
+                          (substitute-command-keys
+                           "[%s] No images to display inline.  Use `\\[universal-argument] \\[universal-argument]' or 11 argument to preview the whole buffer")
+                          scope)))))))))))
+    (cond
+     ;; Region selected :: display previews in region.
+     ((and beg end)
+      (funcall toggle-previews beg end "region"
+               (and (equal arg '(4)) 'remove)))
+     ;; C-u argument: clear image at point or in entry
+     ((equal arg '(4))
+      (if-let* ((ov (cdr (get-char-property-and-overlay
+                         (point) 'org-image-overlay))))
+          ;; clear link preview at point
+          (funcall toggle-previews
+                   (overlay-start ov) (overlay-end ov)
+                   "preview at point" 'remove)
+        ;; Clear link previews in entry
+        (funcall toggle-previews
+                 (if (org-before-first-heading-p) (point-min)
+                   (save-excursion
+                     (org-with-limited-levels (org-back-to-heading t) (point))))
+                 (org-with-limited-levels (org-entry-end-position))
+                 "current section" 'remove)))
+     ;; C-u C-u or C-11 argument :: display images in the whole buffer.
+     ((member arg '(11 (16))) (funcall toggle-previews nil nil "buffer"))
+     ;; C-u C-u C-u argument :: unconditionally hide images in the buffer.
+     ((equal arg '(64)) (funcall toggle-previews nil nil "buffer" 'remove))
+     ;; Argument nil or 1, no region selected :: display images in
+     ;; current section or image link at point.
+     ((and (member arg '(nil 1)) (null beg) (null end))
+      (let ((context (org-element-context)))
+        ;; toggle display of inline image link at point.
+        (if (org-element-type-p context 'link)
+            (let* ((ov (cdr-safe (get-char-property-and-overlay
+                                  (point) 'org-image-overlay)))
+                   (remove? (and ov (memq ov org-link-preview-overlays)
+                                 'remove)))
+              (funcall toggle-previews
+                       (org-element-begin context)
+                       (org-element-end context)
+                       "image at point" remove?))
+          (let ((beg (if (org-before-first-heading-p) (point-min)
+	               (save-excursion
+	                 (org-with-limited-levels (org-back-to-heading t) (point)))))
+                (end (org-with-limited-levels (org-entry-end-position))))
+            (funcall toggle-previews beg end "current section")))))
+     ;; Any other non-nil argument.
+     ((not (null arg)) (funcall toggle-previews beg end "region")))))
+
+;;;###autoload
+(defun org-link-preview-refresh ()
+  "Assure display of link previews in buffer and refresh them."
+  (interactive)
+  (org-link-preview-region nil t (point-min) (point-max)))
+
+(defun org-link-preview-region (&optional include-linked refresh beg end)
+  "Display link previews.
+
+A previewable link type is one that has a `:preview' link
+parameter, see `org-link-parameters'.
+
+By default, a file link or attachment is previewable if it
+follows either of these conventions:
+
+  1. Its path is a file with an extension matching return value
+     from `image-file-name-regexp' and it has no contents.
+
+  2. Its description consists in a single link of the previous
+     type.  In this case, that link must be a well-formed plain
+     or angle link, i.e., it must have an explicit \"file\" or
+     \"attachment\" type.
+
+File links are equipped with the keymap `image-map'.
+
+When optional argument INCLUDE-LINKED is non-nil, links with a
+text description part will also be inlined.  This can be nice for
+a quick look at those images, but it does not reflect what
+exported files will look like.
+
+When optional argument REFRESH is non-nil, refresh existing
+images between BEG and END.  This will create new image displays
+only if necessary.
+
+BEG and END define the considered part.  They default to the
+buffer boundaries with possible narrowing."
+  (interactive "P")
+  (when refresh (org-link-preview-clear beg end))
+  (org-with-point-at (or beg (point-min))
+    (let ((case-fold-search t)
+          preview-queue)
+      ;; Collect links to preview
+      (while (re-search-forward org-link-any-re end t)
+        (forward-char -1)               ;ensure we are on the link
+        (when-let*
+            ((link (org-element-lineage (org-element-context) 'link t))
+             (path (or
+                    ;; Link without description or link with description
+                    ;; that is requested to be previewed anyway.
+                    (and (or include-linked
+                             (not (org-element-contents-begin link)))
+                         (org-element-property :path link))
+                    ;; Special case: link with description where
+                    ;; description is itself a sole link
+                    (and (org-element-contents-begin link)
+                         (setq link
+                               (org-with-point-at (org-element-contents-begin link)
+                                 (org-element-put-property
+                                  (org-element-link-parser) :parent link)))
+                         (org-element-type-p link 'link)
+                         (equal (org-element-end link)
+                                (org-element-contents-end
+                                 (org-element-parent link)))
+                         (org-element-property :path link))))
+             (linktype (org-element-property :type link))
+             (preview-func (org-link-get-parameter linktype :preview)))
+          ;; Create an overlay to hold the preview
+          (let ((ov (or (cdr-safe (get-char-property-and-overlay
+                                   (org-element-begin link) 'org-image-overlay))
+                        (make-overlay
+                         (org-element-begin link)
+                         (progn
+		           (goto-char
+		            (org-element-end link))
+		           (unless (eolp) (skip-chars-backward " \t"))
+		           (point))))))
+            (overlay-put ov 'modification-hooks
+                         (list 'org-link-preview--remove-overlay))
+            (push ov org-link-preview-overlays)
+            (push (list preview-func ov path link) preview-queue))))
+      ;; Collect previews in buffer-local LIFO preview queue
+      (setq org-link-preview--queue
+            (nconc (nreverse preview-queue) org-link-preview--queue))
+      ;; Run preview possibly asynchronously
+      (when org-link-preview--queue
+        (org-link-preview--process-queue (current-buffer))))))
+
+(defun org-link-preview--process-queue (org-buffer)
+  "Preview pending Org link previews in ORG-BUFFER.
+
+Previews are generated from the specs in
+`org-link-preview--queue', which see."
+  (and (buffer-live-p org-buffer)
+       (with-current-buffer org-buffer
+         (cl-loop
+          for spec in org-link-preview--queue
+          for ov = (cadr spec)    ;SPEC is (preview-func ov path link)
+          for count from org-link-preview-batch-size above 0
+          do (pop org-link-preview--queue)
+          if (overlay-buffer ov) do
+          (if (apply spec)
+              (overlay-put ov 'org-image-overlay t)
+            ;; Preview was unsuccessful, delete overlay
+            (delete-overlay ov)
+            (setq org-link-preview-overlays
+                  (delq ov org-link-preview-overlays)))
+          else do (cl-incf count) end
+          finally do
+          (setq org-link-preview--timer
+                (and org-link-preview--queue
+                     (run-with-idle-timer
+                      (time-add (or (current-idle-time) 0)
+                                org-link-preview-delay)
+                      nil #'org-link-preview--process-queue org-buffer)))))))
+
+(defun org-link-preview-clear (&optional beg end)
+  "Clear link previews in region BEG to END."
+  (interactive (and (use-region-p) (list (region-beginning) (region-end))))
+  (let* ((beg (or beg (point-min)))
+         (end (or end (point-max)))
+         (overlays (overlays-in beg end)))
+    (dolist (ov overlays)
+      (when (memq ov org-link-preview-overlays)
+        ;; Remove pending preview tasks between BEG and END
+        (when-let* ((spec (cl-find ov org-link-preview--queue
+                                   :key #'cadr)))
+          (setq org-link-preview--queue (delq spec org-link-preview--queue)))
+        ;; Remove placed overlays between BEG and END
+        (when-let* ((image (overlay-get ov 'display)))
+          (when (if (fboundp 'imagep) (imagep image) (eq 'image (car-safe image)))
+            (image-flush image)))
+        (setq org-link-preview-overlays (delq ov org-link-preview-overlays))
+        (delete-overlay ov)))
+    ;; Clear removed overlays.
+    (dolist (ov org-link-preview-overlays)
+      (unless (overlay-buffer ov)
+        (setq org-link-preview-overlays (delq ov org-link-preview-overlays))))))
+
+(defun org-link-frame-setup-function (link-type)
+  "Return the frame setup function for the link type LINK-TYPE.
+This signals an error if the value of the key LINK-TYPE in
+`org-link-frame-setup' is not a function."
+  (let ((fun (cdr (assq link-type org-link-frame-setup))))
+    (if (functionp fun)
+        fun
+      (error "The frame setup configuration `%S' for `%s' link type is ill-defined"
+             fun link-type))))
+
 
 ;;; Built-in link types
 
@@ -1571,7 +2307,46 @@ PATH is the sexp to evaluate, as a string."
 (org-link-set-parameters "elisp" :follow #'org-link--open-elisp)
 
 ;;;; "file" link type
-(org-link-set-parameters "file" :complete #'org-link-complete-file)
+(org-link-set-parameters "file"
+                         :complete #'org-link-complete-file
+                         :preview #'org-link-preview-file)
+
+(defun org-link-preview-file (ov path link)
+  "Display image file PATH in overlay OV for LINK.
+
+LINK is the Org element being previewed.
+
+Equip each image with the keymap `image-map'.
+
+This is intended to be used as the `:preview' link property of
+file links, see `org-link-parameters'."
+  (when (display-graphic-p)
+    (require 'image)
+    (when-let* ((file-full (expand-file-name path))
+                (file (substitute-in-file-name file-full))
+                ((string-match-p (image-file-name-regexp) file))
+                ((file-exists-p file)))
+      (let* ((width (org-display-inline-image--width link))
+	     (align (org-image--align link))
+             (image (org--create-inline-image file width)))
+        (when image            ; Add image to overlay
+	  ;; See bug#59902.  We cannot rely
+          ;; on Emacs to update image if the file
+          ;; has changed.
+          (image-flush image)
+	  (overlay-put ov 'display image)
+	  (overlay-put ov 'face 'default)
+	  (overlay-put ov 'keymap image-map)
+          (when align
+            (overlay-put
+             ov 'before-string
+             (propertize
+              " " 'face 'default
+              'display
+              (pcase align
+                ("center" `(space :align-to (- center (0.5 . ,image))))
+                ("right"  `(space :align-to (- right ,image)))))))
+          t)))))
 
 ;;;; "help" link type
 (defun org-link--open-help (path _)
@@ -1600,6 +2375,52 @@ PATH is a symbol name, as a string."
                          :follow #'org-link--open-help
                          :store #'org-link--store-help)
 
+(defvar shortdoc--groups)
+(declare-function shortdoc-display-group "shortdoc"
+                  (group &optional function same-window))
+(defun org-link--open-shortdoc (path _)
+  "Open a \"shortdoc\" type link.
+PATH is a group name, \"group::#function\" or \"group::search
+string\"."
+  (string-match "\\`\\([^:]*\\)\\(?:::\\(.*\\)\\'\\)?" path)
+  (let* ((group (match-string 1 path))
+         (str (match-string 2 path))
+         (fn (and str
+                  (eq ?# (string-to-char str))
+                  (intern-soft (substring str 1)))))
+    (condition-case nil
+        (progn
+          (shortdoc-display-group group fn)
+          (and str (not fn) (search-forward str nil t)))
+      (error (user-error "Unknown shortdoc group or malformed link: `%s'"
+                         path)))))
+
+(defun org-link--store-shortdoc (&optional _interactive?)
+  "Store \"shortdoc\" type link."
+  (when (derived-mode-p 'shortdoc-mode)
+    (let* ((buffer (buffer-name))
+           (group (when (string-match "*Shortdoc \\(.*\\)\\*" buffer)
+                    (match-string 1 buffer))))
+      (if (and group (assoc (intern-soft group) shortdoc--groups))
+          (org-link-store-props :type "shortdoc"
+                                :link (format "shortdoc:%s" group)
+                                :description nil)
+        (user-error "Unknown shortdoc group: %s" group)))))
+
+(defun org-link--complete-shortdoc ()
+  "Create a \"shortdoc\" link using completion."
+  (concat "shortdoc:"
+          (completing-read "Shortdoc summary for functions in: "
+                           (mapcar #'car shortdoc--groups))))
+
+;; FIXME: Remove the condition when we drop Emacs 27 support.
+;;;; "shortdoc" link type
+(when (version<= "28.0.90" emacs-version)
+  (org-link-set-parameters "shortdoc"
+                           :follow #'org-link--open-shortdoc
+                           :store #'org-link--store-shortdoc
+                           :complete #'org-link--complete-shortdoc))
+
 ;;;; "http", "https", "mailto", "ftp", and "news" link types
 (dolist (scheme '("ftp" "http" "https" "mailto" "news"))
   (org-link-set-parameters scheme
@@ -1731,7 +2552,7 @@ NAME."
 	    (move-beginning-of-line 2)
 	    (set-mark (point)))))
     (setq org-store-link-plist nil)
-    ;; Negate `org-context-in-file-links' when given a single universal arg.
+    ;; Negate `org-link-context-for-files' when given a single universal arg.
     (let ((org-link-context-for-files (org-xor org-link-context-for-files
                                                (equal arg '(4))))
           link desc search agenda-link) ;; description
@@ -1884,6 +2705,31 @@ NAME."
             (org-link--add-to-stored-links link desc)))
         (car org-stored-links)))))
 
+(defun org-link--normalize-filename (filename &optional method)
+  "Return FILENAME as required by METHOD.
+METHOD defaults to the value of `org-link-file-path-type'."
+  (setq method (or method org-link-file-path-type))
+  (cond
+   ((eq method 'absolute)
+    (abbreviate-file-name (expand-file-name filename)))
+   ((eq method 'noabbrev)
+    (expand-file-name filename))
+   ((eq method 'relative)
+    (file-relative-name filename))
+   ((functionp method)
+    (funcall method filename))
+   (t
+    (save-match-data
+      (if (string-match (concat "^" (regexp-quote
+				     (expand-file-name
+				      (file-name-as-directory
+				       default-directory))))
+			(expand-file-name filename))
+	  ;; We are linking a file with relative path name.
+	  (substring (expand-file-name filename)
+		     (match-end 0))
+	(abbreviate-file-name (expand-file-name filename)))))))
+
 ;;;###autoload
 (defun org-insert-link (&optional complete-file link-location description)
   "Insert a link.  At the prompt, enter the link.
@@ -1943,7 +2789,7 @@ non-interactively, don't allow editing the default description."
 	 (all-prefixes (append (mapcar #'car abbrevs)
 			       (mapcar #'car org-link-abbrev-alist)
 			       (org-link-types)))
-         entry link-original)
+         entry)
     (cond
      (link-location)		      ; specified by arg, just use it.
      ((org-in-regexp org-link-bracket-re 1)
@@ -2037,107 +2883,20 @@ non-interactively, don't allow editing the default description."
       (or entry (push link org-link--insert-history))
       (setq desc (or desc (nth 1 entry)))))
 
-    (setq link-original link)
-    (when (and (string-match org-link-plain-re link)
-	       (not (string-match org-ts-regexp link)))
-      ;; URL-like link, normalize the use of angular brackets.
-      (setq link (org-unbracket-string "<" ">" link)))
+    (let (new-link)
+      (let ((org-link-file-path-type
+             (if (equal complete-file '(16))
+                 'absolute
+               org-link-file-path-type)))
+        (setq new-link (org-link-make-string-for-buffer
+                        link (or description desc)
+                        (called-interactively-p 'any))))
 
-    ;; Check if we are linking to the current file with a search
-    ;; option If yes, simplify the link by using only the search
-    ;; option.
-    (when (and (buffer-file-name (buffer-base-buffer))
-	       (let ((case-fold-search nil))
-		 (string-match "\\`file:\\(.+?\\)::" link)))
-      (let ((path (match-string-no-properties 1 link))
-	    (search (substring-no-properties link (match-end 0))))
-	(save-match-data
-	  (when (equal (file-truename (buffer-file-name (buffer-base-buffer)))
-		       (file-truename path))
-	    ;; We are linking to this same file, with a search option
-	    (setq link search)))))
-
-    ;; Check if we can/should use a relative path.  If yes, simplify
-    ;; the link.
-    (let ((case-fold-search nil))
-      (when (string-match "\\`\\(file\\|docview\\):" link)
-	(let* ((type (match-string-no-properties 0 link))
-	       (path-start (match-end 0))
-	       (search (and (string-match "::\\(.*\\)\\'" link)
-			    (match-string 1 link)))
-	       (path
-		(if search
-		    (substring-no-properties
-		     link path-start (match-beginning 0))
-		  (substring-no-properties link (match-end 0))))
-	       (origpath path))
-	  (cond
-	   ((or (eq org-link-file-path-type 'absolute)
-		(equal complete-file '(16)))
-	    (setq path (abbreviate-file-name (expand-file-name path))))
-	   ((eq org-link-file-path-type 'noabbrev)
-	    (setq path (expand-file-name path)))
-	   ((eq org-link-file-path-type 'relative)
-	    (setq path (file-relative-name path)))
-	   ((functionp org-link-file-path-type)
-	    (setq path (funcall org-link-file-path-type path)))
-	   (t
-	    (save-match-data
-	      (if (string-match (concat "^" (regexp-quote
-					     (expand-file-name
-					      (file-name-as-directory
-					       default-directory))))
-				(expand-file-name path))
-		  ;; We are linking a file with relative path name.
-		  (setq path (substring (expand-file-name path)
-					(match-end 0)))
-		(setq path (abbreviate-file-name (expand-file-name path)))))))
-	  (setq link (concat type path (and search (concat "::" search))))
-	  (when (equal desc origpath)
-	    (setq desc path)))))
-
-    (let* ((type
-            (cond
-             ((and all-prefixes
-                   (string-match (rx-to-string `(: string-start (submatch (or ,@all-prefixes)) ":")) link))
-              (match-string 1 link))
-             ((file-name-absolute-p link) "file")
-             ((string-match "\\`\\.\\.?/" link) "file")))
-           (initial-input
-            (cond
-             (description)
-             (desc)
-             ((org-link-get-parameter type :insert-description)
-              (let ((def (org-link-get-parameter type :insert-description)))
-                (condition-case nil
-                    (cond
-                     ((stringp def) def)
-                     ((functionp def)
-                      (funcall def link desc)))
-                  (error
-                   (message "Can't get link description from org link parameter `:insert-description': %S"
-                            def)
-                   (sit-for 2)
-                   nil))))
-             (org-link-make-description-function
-              (condition-case nil
-                  (funcall org-link-make-description-function link desc)
-                (error
-                 (message "Can't get link description from %S"
-                          org-link-make-description-function)
-                 (sit-for 2)
-                 nil))))))
-      (setq desc (if (called-interactively-p 'any)
-                     (read-string "Description: " initial-input)
-                   initial-input)))
-
-    (when (funcall (if (equal complete-file '(64)) 'not 'identity)
-                   (not org-link-keep-stored-after-insertion))
-      (setq org-stored-links (delq (assoc link-original org-stored-links)
-                                   org-stored-links)))
-    (unless (org-string-nw-p desc) (setq desc nil))
-    (when remove (apply #'delete-region remove))
-    (insert (org-link-make-string link desc))
+      (when (funcall (if (equal complete-file '(64)) 'not 'identity)
+                     (not org-link-keep-stored-after-insertion))
+        (setq org-stored-links (delq (assoc link org-stored-links) org-stored-links)))
+      (when remove (apply #'delete-region remove))
+      (insert new-link))
     ;; Redisplay so as the new link has proper invisible characters.
     (sit-for 0)))
 
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index bfa9ca8ead0..dd86a716ac7 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -75,11 +75,9 @@
 (declare-function calendar-persian-date-string  "cal-persia" (&optional date))
 (declare-function calendar-check-holidays       "holidays" (date))
 
-(declare-function org-columns-remove-overlays "org-colview" ())
 (declare-function org-datetree-find-date-create "org-datetree"
 		  (date &optional keep-restriction))
 (declare-function org-columns-quit              "org-colview" ())
-(declare-function diary-date-display-form       "diary-lib"  (&optional type))
 (declare-function org-mobile-write-agenda-for-mobile "org-mobile" (file))
 (declare-function org-habit-insert-consistency-graphs
 		  "org-habit" (&optional line))
@@ -1346,7 +1344,7 @@ When set to the symbol `next' only the first future repeat is shown."
   :group 'org-agenda-daily/weekly
   :type 'boolean
   :package-version '(Org . "9.7")
-  :safe t)
+  :safe #'booleanp)
 
 (defcustom org-agenda-prefer-last-repeat nil
   "Non-nil sets date for repeated entries to their last repeat.
@@ -1637,16 +1635,16 @@ symbols are recognized:
 
 time-up            Put entries with time-of-day indications first, early first.
 time-down          Put entries with time-of-day indications first, late first.
-timestamp-up       Sort by any timestamp, early first.
-timestamp-down     Sort by any timestamp, late first.
-scheduled-up       Sort by scheduled timestamp, early first.
-scheduled-down     Sort by scheduled timestamp, late first.
-deadline-up        Sort by deadline timestamp, early first.
-deadline-down      Sort by deadline timestamp, late first.
-ts-up              Sort by active timestamp, early first.
-ts-down            Sort by active timestamp, late first.
-tsia-up            Sort by inactive timestamp, early first.
-tsia-down          Sort by inactive timestamp, late first.
+timestamp-up       Sort by any timestamp date, early first.
+timestamp-down     Sort by any timestamp date, late first.
+scheduled-up       Sort by scheduled timestamp date, early first.
+scheduled-down     Sort by scheduled timestamp date, late first.
+deadline-up        Sort by deadline timestamp date, early first.
+deadline-down      Sort by deadline timestamp date, late first.
+ts-up              Sort by active timestamp date, early first.
+ts-down            Sort by active timestamp date, late first.
+tsia-up            Sort by inactive timestamp date, early first.
+tsia-down          Sort by inactive timestamp date, late first.
 category-keep      Keep the default order of categories, corresponding to the
 		   sequence in `org-agenda-files'.
 category-up        Sort alphabetically by category, A-Z.
@@ -1750,7 +1748,8 @@ An alist with one entry per agenda type.  The keys of the
 sublists are `agenda', `todo', `search' and `tags'.  The values
 are format strings.
 
-This format works similar to a printf format, with the following meaning:
+This format works similar to a `format' string, with the following
+meaning:
 
   %c   the category of the item, \"Diary\" for entries from the diary,
        or as given by the CATEGORY keyword or derived from the file name
@@ -1761,12 +1760,20 @@ This format works similar to a printf format, with the following meaning:
   %t   the HH:MM time-of-day specification if one applies to the entry
   %s   Scheduling/Deadline information, a short string
   %b   show breadcrumbs, i.e., the names of the higher levels
-  %(expression) Eval EXPRESSION and replace the control string
-                by the result
+  %(expression) Eval `(EXPRESSION)' and replace the control string by
+                the result.
 
-All specifiers work basically like the standard `%s' of printf, but may
-contain two additional characters: a question mark just after the `%'
-and a whitespace/punctuation character just before the final letter.
+
+`(EXPRESSION)' is evaluated with point and buffer associated with
+agenda entry/line being rendered.  For example, heading lines will be
+evaluated with point in the Org buffer at that corresponding heading.
+However, diary records will not be evaluated in an Org buffer, but
+inside diary buffer.  Auxiliary agenda lines like time grids will be
+evaluated with the point inside agenda buffer itself.
+
+All specifiers work basically like the standard `%s' of `format', but
+may contain two additional characters: a question mark just after the
+`%' and a whitespace/punctuation character just before the final letter.
 
 If the first character after `%' is a question mark, the entire field
 will only be included if the corresponding value applies to the current
@@ -2018,23 +2025,24 @@ When t, the highest priority entries are bold, lowest priority italic.
 However, settings in `org-priority-faces' will overrule these faces.
 When this variable is the symbol `cookies', only fontify the
 cookies, not the entire task.
-This may also be an association list of priority faces, whose
-keys are the character values of `org-priority-highest',
-`org-priority-default', and `org-priority-lowest' (the default values
-are ?A, ?B, and ?C, respectively).  The face may be a named face, a
-color as a string, or a list like `(:background \"Red\")'.
-If it is a color, the variable `org-faces-easy-properties'
-determines if it is a foreground or a background color."
+
+This may also be an association list of priority faces, whose keys are
+priorities and values are faces.  The face may be a named face, a color
+as a string, or a list like `(:background \"Red\")'.  If it is a color,
+the variable `org-faces-easy-properties' determines if it is a
+foreground or a background color."
   :group 'org-agenda-line-format
   :type '(choice
 	  (const :tag "Never" nil)
 	  (const :tag "Defaults" t)
 	  (const :tag "Cookies only" cookies)
-	  (repeat :tag "Specify"
-		  (list (character :tag "Priority" :value ?A)
-			(choice    :tag "Face    "
-				   (string :tag "Color")
-				   (sexp :tag "Face"))))))
+          (alist :tag "Association list"
+                 :key-type (choice :tag "Priority"
+                                   (character :tag "Character" :value ?A)
+                                   (natnum :tag "Number" :value 1))
+                 :value-type (choice :tag "Face    "
+			             (string :tag "Color")
+			             (sexp :tag "Face")))))
 
 (defcustom org-agenda-day-face-function nil
   "Function called to determine what face should be used to display a day.
@@ -2391,7 +2399,7 @@ The following commands are available:
     (list
      (vector
       (if (get 'org-agenda-files 'org-restrict)
-	  "Restricted to single file"
+	  "Restricted to Single File"
 	"Edit File List")
       '(org-edit-agenda-file-list)
       (not (get 'org-agenda-files 'org-restrict)))
@@ -2829,7 +2837,7 @@ type."
   :version "24.4"
   :package-version '(Org . "8.0")
   :group 'org-agenda-custom-commands
-  :type '(choice (symbol :tag "No limit" nil)
+  :type '(choice (const :tag "No limit" nil)
 		 (integer :tag "Max number of entries")
 		 (repeat
 		  (cons (choice :tag "Agenda type"
@@ -2847,7 +2855,7 @@ type."
   :version "24.4"
   :package-version '(Org . "8.0")
   :group 'org-agenda-custom-commands
-  :type '(choice (symbol :tag "No limit" nil)
+  :type '(choice (const :tag "No limit" nil)
 		 (integer :tag "Max number of TODOs")
 		 (repeat
 		  (cons (choice :tag "Agenda type"
@@ -2865,7 +2873,7 @@ type."
   :version "24.4"
   :package-version '(Org . "8.0")
   :group 'org-agenda-custom-commands
-  :type '(choice (symbol :tag "No limit" nil)
+  :type '(choice (const :tag "No limit" nil)
 		 (integer :tag "Max number of tagged entries")
 		 (repeat
 		  (cons (choice :tag "Agenda type"
@@ -2883,7 +2891,7 @@ to limit entries to in this type."
   :version "24.4"
   :package-version '(Org . "8.0")
   :group 'org-agenda-custom-commands
-  :type '(choice (symbol :tag "No limit" nil)
+  :type '(choice (const :tag "No limit" nil)
 		 (integer :tag "Max number of minutes")
 		 (repeat
 		  (cons (choice :tag "Agenda type"
@@ -3571,8 +3579,7 @@ This ensures the export commands can easily use it."
 	    (set-buffer bufname)
 	    (while files
 	      (cl-progv vars vals
-	        (org-agenda-write (expand-file-name (pop files) dir)
-	                          nil t bufname))))
+	        (org-agenda-write (expand-file-name (pop files) dir) nil t))))
 	  (and (get-buffer bufname)
 	       (kill-buffer bufname)))))))
 
@@ -3590,7 +3597,7 @@ This ensures the export commands can easily use it."
 
 (defvar org-mobile-creating-agendas) ; defined in org-mobile.el
 (defvar org-agenda-write-buffer-name "Agenda View")
-(defun org-agenda-write (file &optional open nosettings agenda-bufname)
+(defun org-agenda-write (file &optional open nosettings _)
   "Write the current buffer (an agenda view) as a file.
 
 Depending on the extension of the file name, plain text (.txt),
@@ -3603,9 +3610,7 @@ With prefix argument OPEN, open the new file immediately.  If
 NOSETTINGS is given, do not scope the settings of
 `org-agenda-exporter-settings' into the export commands.  This is
 used when the settings have already been scoped and we do not
-wish to overrule other, higher priority settings.  If
-AGENDA-BUFFER-NAME is provided, use this as the buffer name for
-the agenda to write."
+wish to overrule other, higher priority settings."
   (interactive "FWrite agenda to file: \nP")
   (if (or (not (file-writable-p file))
 	  (and (file-exists-p file)
@@ -3652,7 +3657,7 @@ the agenda to write."
 		(message "Org file written to %s" file)))
 	     ((member extension '("html" "htm"))
               (org-require-package 'htmlize)
-	      (declare-function htmlize-buffer "htmlize" (&optional buffer))
+	      (declare-function htmlize-buffer "ext:htmlize" (&optional buffer))
 	      (set-buffer (htmlize-buffer (current-buffer)))
 	      (when org-agenda-export-html-style
 		;; replace <style> section with org-agenda-export-html-style
@@ -3684,12 +3689,7 @@ the agenda to write."
 	      (org-icalendar-export-current-agenda (expand-file-name file)))
 	     (t
               (write-region nil nil file)
-              (message "Plain text written to %s" file)))))))
-    (set-buffer (or agenda-bufname
-		    ;; FIXME: I'm pretty sure called-interactively-p
-                    ;; doesn't do what we want here!
-		    (and (called-interactively-p 'any) (buffer-name))
-		    org-agenda-buffer-name)))
+              (message "Plain text written to %s" file))))))))
   (when open (org-open-file file)))
 
 (defun org-agenda-remove-marked-text (property &optional value)
@@ -4130,7 +4130,7 @@ agenda display, configure `org-agenda-finalize-hook'."
 		    org-priority-highest)
 	      l (or (get-char-property (point) 'org-priority-lowest)
 		    org-priority-lowest)
-	      p (string-to-char (match-string 2))
+	      p (org-priority-to-value (match-string 2))
 	      b (match-beginning 1)
 	      e (if (eq org-agenda-fontify-priorities 'cookies)
 		    (1+ (match-end 2))
@@ -4819,7 +4819,7 @@ is active."
 	    (setq rtn (list (format "ORG-AGENDA-ERROR: No such org-file %s"
 				    file))))
 	  (with-current-buffer buffer
-	    (with-syntax-table (org-search-syntax-table)
+	    (org-with-syntax-table (org-search-syntax-table)
 	      (unless (derived-mode-p 'org-mode)
 		(error "Agenda file %s is not in Org mode" file))
 	      (let ((case-fold-search t))
@@ -6779,10 +6779,13 @@ scheduled items with an hour specification like [h]h:mm."
 		      'help-echo
 		      (format "mouse-2 or RET jump to org file %s"
 			      (abbreviate-file-name buffer-file-name))))
+         ;; Group 1: starting date timestamp without braces
+         ;; Group 2: ending date timestamp without braces
 	 (regexp (if org-agenda-include-inactive-timestamps
                      org-tr-regexp-both org-tr-regexp))
-	 (d0 (calendar-absolute-from-gregorian date))
-         face marker hdmarker ee txt d1 d2 s1 s2 category level
+	 (agenda-today (calendar-absolute-from-gregorian date))
+         face marker hdmarker block-list txt start-day end-day
+         category level
 	 todo-state tags pos head donep inherited-tags effort
 	 effort-minutes inactive?)
     (goto-char (point-min))
@@ -6793,37 +6796,36 @@ scheduled items with an hour specification like [h]h:mm."
         (setq inactive? (eq ?\[ (char-after (match-beginning 0))))
 	(let ((start-time (match-string 1))
 	      (end-time (match-string 2)))
-	  (setq s1 (match-string 1)
-		s2 (match-string 2)
-		d1 (time-to-days
-		    (condition-case err
-			(org-time-string-to-time s1)
-		      (error
-		       (error
-			"Bad timestamp %S at %d in buffer %S\nError was: %s"
-			s1
-			pos
-			(current-buffer)
-			(error-message-string err)))))
-		d2 (time-to-days
-		    (condition-case err
-			(org-time-string-to-time s2)
-		      (error
-		       (error
-			"Bad timestamp %S at %d in buffer %S\nError was: %s"
-			s2
-			pos
-			(current-buffer)
-			(error-message-string err))))))
-	  (when (and (> (- d0 d1) -1) (> (- d2 d0) -1))
-	    ;; Only allow days between the limits, because the normal
+	  (setq start-day (time-to-days
+		           (condition-case err
+			       (org-time-string-to-time start-time)
+		             (error
+		              (error
+			       "Bad timestamp %S at %d in buffer %S\nError was: %s"
+			       start-time
+			       pos
+			       (current-buffer)
+			       (error-message-string err)))))
+		end-day (time-to-days
+		         (condition-case err
+			     (org-time-string-to-time end-time)
+		           (error
+		            (error
+			     "Bad timestamp %S at %d in buffer %S\nError was: %s"
+			     end-time
+			     pos
+                             (current-buffer)
+			     (error-message-string err))))))
+	  (when (and (> (- agenda-today start-day) -1)
+                     (> (- end-day agenda-today) -1))
+            ;; Only allow days between the limits, because the normal
 	    ;; date stamps will catch the limits.
 	    (save-excursion
 	      (setq todo-state (org-get-todo-state))
 	      (setq donep (member todo-state org-done-keywords))
 	      (when (and donep org-agenda-skip-timestamp-if-done)
 		(throw :skip t))
-              (setq face (if (= d1 d2)
+              (setq face (if (= start-day end-day)
                              'org-agenda-calendar-event
                            'org-agenda-calendar-daterange))
 	      (setq marker (org-agenda-new-marker (point))
@@ -6849,29 +6851,36 @@ scheduled items with an hour specification like [h]h:mm."
 		(let ((remove-re
 		       (if org-agenda-remove-timeranges-from-blocks
 			   (concat
-			    "<" (regexp-quote s1) ".*?>"
+			    "<" (regexp-quote start-time) ".*?>"
 			    "--"
-			    "<" (regexp-quote s2) ".*?>")
+			    "<" (regexp-quote end-time) ".*?>")
 			 nil)))
-		  (setq txt (org-agenda-format-item
-                             (concat
-                              (when inactive? org-agenda-inactive-leader)
-			      (format
-			       (nth (if (= d1 d2) 0 1)
-				    org-agenda-timerange-leaders)
-			       (1+ (- d0 d1)) (1+ (- d2 d1))))
-			     (org-add-props head nil
-                               'effort effort
-                               'effort-minutes effort-minutes)
-                             level category tags
-			     (cond
-                              ((and (= d1 d0) (= d2 d0))
-			       (concat "<" start-time ">--<" end-time ">"))
-                              ((= d1 d0)
-			       (concat "<" start-time ">"))
-			      ((= d2 d0)
-			       (concat "<" end-time ">")))
-			     remove-re))))
+                  ;; `org-agenda-format-item' automatically creates a
+                  ;; time range when
+                  ;; `org-agenda-default-appointment-duration' is
+                  ;; non-nil and only start/end time is given.
+                  ;; We do not want it here, when the range spans
+                  ;; multiple days.
+                  (let ((org-agenda-default-appointment-duration nil))
+		    (setq txt (org-agenda-format-item
+                               (concat
+                                (when inactive? org-agenda-inactive-leader)
+			        (format
+			         (nth (if (= start-day end-day) 0 1)
+				      org-agenda-timerange-leaders)
+			         (1+ (- agenda-today start-day)) (1+ (- end-day start-day))))
+			       (org-add-props head nil
+                                 'effort effort
+                                 'effort-minutes effort-minutes)
+                               level category tags
+			       (cond
+                                ((and (= start-day agenda-today) (= end-day agenda-today))
+			         (concat "<" start-time ">--<" end-time ">"))
+                                ((= start-day agenda-today)
+			         (concat "<" start-time ">"))
+			        ((= end-day agenda-today)
+			         (concat "<" end-time ">")))
+			       remove-re)))))
 	      (org-add-props txt props
                 'face face
 		'org-marker marker 'org-hd-marker hdmarker
@@ -6881,10 +6890,10 @@ scheduled items with an hour specification like [h]h:mm."
 		'todo-state todo-state
                 'urgency (org-get-priority txt)
 		'priority (org-get-priority txt))
-	      (push txt ee))))
+	      (push txt block-list))))
 	(goto-char pos)))
     ;; Sort the entries by expiration date.
-    (nreverse ee)))
+    (nreverse block-list)))
 
 ;;; Agenda presentation and sorting
 
@@ -6973,58 +6982,71 @@ Any match of REMOVE-RE will be removed from TXT."
 	     (time-grid-trailing-characters (nth 2 org-agenda-time-grid))
 	     (extra (or (and (not habitp) extra) ""))
 	     time
-	     (ts (when dotime (concat
-			       (if (stringp dotime) dotime "")
-			       (and org-agenda-search-headline-for-time
-                                    ;; Do not search inside
-                                    ;; timestamps.  They are handled
-                                    ;; separately.
-                                    (replace-regexp-in-string
-                                     org-ts-regexp-both ""
-                                     txt)))))
-	     (time-of-day (and dotime (org-get-time-of-day ts)))
-	     stamp plain s0 s1 s2 rtn srp l
+	     (string-containing-time
+              (when dotime (concat
+			    (if (stringp dotime) dotime "")
+			    (and org-agenda-search-headline-for-time
+                                 ;; Do not search inside
+                                 ;; timestamps.  They are handled
+                                 ;; separately.
+                                 (replace-regexp-in-string
+                                  org-ts-regexp-both ""
+                                  txt)))))
+	     (time-of-day (and dotime (org-get-time-of-day string-containing-time)))
+	     timestamp-range? plain-time? date-range-same-day?
+             time-string start-time end-time rtn
 	     duration breadcrumbs)
 	(and (derived-mode-p 'org-mode) buffer-file-name
 	     (add-to-list 'org-agenda-contributing-files buffer-file-name))
 	(when (and dotime time-of-day)
 	  ;; Extract starting and ending time and move them to prefix
-	  (when (or (setq stamp (string-match org-stamp-time-of-day-regexp ts))
-		    (setq plain (string-match org-plain-time-of-day-regexp ts)))
-	    (setq s0 (match-string 0 ts)
-		  srp (and stamp (match-end 3))
-		  s1 (match-string (if plain 1 2) ts)
-		  s2 (match-string (if plain 8 (if srp 4 6)) ts))
+	  (when (or (setq timestamp-range?
+                          (string-match org-stamp-time-of-day-regexp
+                                        string-containing-time))
+		    (setq plain-time?
+                          (string-match org-plain-time-of-day-regexp
+                                        string-containing-time)))
+	    (setq time-string (match-string 0 string-containing-time)
+		  date-range-same-day? (and timestamp-range? (match-end 3))
+		  start-time (match-string (if plain-time? 1 2)
+                                           string-containing-time)
+		  end-time (match-string (if plain-time? 8
+                                           (if date-range-same-day? 4 6))
+                                         string-containing-time))
 
 	    ;; If the times are in TXT (not in DOTIMES), and the prefix will list
 	    ;; them, we might want to remove them there to avoid duplication.
 	    ;; The user can turn this off with a variable.
 	    (when (and org-prefix-has-time
-		       org-agenda-remove-times-when-in-prefix (or stamp plain)
-		       (string-match (concat (regexp-quote s0) " *") txt)
+		       org-agenda-remove-times-when-in-prefix
+                       (or timestamp-range? plain-time?)
+		       (string-match (concat (regexp-quote time-string) " *") txt)
 		       (not (equal ?\] (string-to-char (substring txt (match-end 0)))))
 		       (if (eq org-agenda-remove-times-when-in-prefix 'beg)
 			   (= (match-beginning 0) 0)
 			 t))
 	      (setq txt (replace-match "" nil nil txt))))
           ;; Normalize the time(s) to 24 hour.
-	  (when s1 (setq s1 (org-get-time-of-day s1 t)))
-	  (when s2 (setq s2 (org-get-time-of-day s2 t)))
+	  (when start-time (setq start-time (org-get-time-of-day start-time t)))
+	  (when end-time (setq end-time (org-get-time-of-day end-time t)))
 	  ;; Try to set s2 if s1 and
 	  ;; `org-agenda-default-appointment-duration' are set
-	  (when (and s1 (not s2) org-agenda-default-appointment-duration)
-	    (setq s2
-		  (org-duration-from-minutes
-		   (+ (org-duration-to-minutes s1 t)
+	  (when (and start-time (not end-time)
+                     org-agenda-default-appointment-duration)
+	    (setq end-time
+	          (org-duration-from-minutes
+	           (+ (org-duration-to-minutes start-time t)
 		      org-agenda-default-appointment-duration)
-		   nil t)))
+	           nil t)))
 	  ;; Compute the duration
-	  (when s2
-	    (setq duration (- (org-duration-to-minutes s2)
-			      (org-duration-to-minutes s1))))
+	  (when end-time
+	    (setq duration (- (org-duration-to-minutes end-time)
+			      (org-duration-to-minutes start-time))))
           ;; Format S1 and S2 for display.
-	  (when s1 (setq s1 (format "%5s" (org-get-time-of-day s1 'overtime))))
-	  (when s2 (setq s2 (org-get-time-of-day s2 'overtime))))
+	  (when start-time
+            (setq start-time (format "%5s" (org-get-time-of-day start-time 'overtime))))
+	  (when end-time
+            (setq end-time (org-get-time-of-day end-time 'overtime))))
 	(when (string-match org-tag-group-re txt)
 	  ;; Tags are in the string
 	  (if (or (eq org-agenda-remove-tags t)
@@ -7061,26 +7083,27 @@ Any match of REMOVE-RE will be removed from TXT."
                              ;; particular heading.
                              "")))
 		    (if (equal "" s) "" (concat s org-agenda-breadcrumbs-separator))))))
-	(setq time (cond (s2 (concat
-			      (org-agenda-time-of-day-to-ampm-maybe s1)
-			      "-" (org-agenda-time-of-day-to-ampm-maybe s2)
-			      (when org-agenda-timegrid-use-ampm " ")))
-			 (s1 (concat
-			      (org-agenda-time-of-day-to-ampm-maybe s1)
-			      (if org-agenda-timegrid-use-ampm
-                                  (concat time-grid-trailing-characters " ")
-                                time-grid-trailing-characters)))
+	(setq time (cond (end-time
+                          (concat
+			   (org-agenda-time-of-day-to-ampm-maybe start-time)
+			   "-" (org-agenda-time-of-day-to-ampm-maybe end-time)
+			   (when org-agenda-timegrid-use-ampm " ")))
+			 (start-time
+                          (concat
+			   (org-agenda-time-of-day-to-ampm-maybe start-time)
+			   (if org-agenda-timegrid-use-ampm
+                               (concat time-grid-trailing-characters " ")
+                             time-grid-trailing-characters)))
 			 (t ""))
 	      category (if (symbolp category) (symbol-name category) category)
 	      level (or with-level ""))
 	(if (string-match org-link-bracket-re category)
-	    (progn
-	      (setq l (string-width (or (match-string 2) (match-string 1))))
-	      (when (< l (or org-prefix-category-length 0))
-		(setq category (copy-sequence category))
-		(org-add-props category nil
+	    (let ((link-width (string-width (or (match-string 2) (match-string 1)))))
+	      (when (< link-width (or org-prefix-category-length 0))
+	        (setq category (copy-sequence category))
+	        (org-add-props category nil
 		  'extra-space (make-string
-				(- org-prefix-category-length l 1) ?\ ))))
+			        (- org-prefix-category-length link-width 1) ?\ ))))
 	  (when (and org-prefix-category-max-length
 		     (>= (length category) org-prefix-category-max-length))
 	    (setq category (substring category 0 (1- org-prefix-category-max-length)))))
@@ -7345,6 +7368,15 @@ The optional argument TYPE tells the agenda type."
 	(max-entries (cond ((listp org-agenda-max-entries)
 			    (cdr (assoc type org-agenda-max-entries)))
 			   (t org-agenda-max-entries))))
+    ;; Make sure that read-only is not set on entries.  Agenda expects
+    ;; all the inserted text to be editable, while e.g. column view
+    ;; may apply read-only text properties in org buffers.
+    (mapc (lambda (entry)
+            (remove-text-properties
+             0 (length entry)
+             '(read-only nil)
+             entry))
+          list)
     (when org-agenda-before-sorting-filter-function
       (setq list
 	    (delq nil
@@ -7356,7 +7388,7 @@ The optional argument TYPE tells the agenda type."
       (setq list (org-agenda-limit-entries
 		  list 'effort-minutes max-effort
 		  (lambda (e) (or e (if org-agenda-sort-noeffort-is-high
-					32767 -1))))))
+					most-positive-fixnum -1))))))
     (when max-todo
       (setq list (org-agenda-limit-entries list 'todo-state max-todo)))
     (when max-tags
@@ -7473,7 +7505,7 @@ The optional argument TYPE tells the agenda type."
 
 (defsubst org-cmp-effort (a b)
   "Compare the effort values of string A and B."
-  (let* ((def (if org-agenda-sort-noeffort-is-high 32767 -1))
+  (let* ((def (if org-agenda-sort-noeffort-is-high most-positive-fixnum -1))
 	 ;; `effort-minutes' property is not directly accessible from
 	 ;; the strings, but is stored as a property in `txt'.
 	 (ea (or (get-text-property
@@ -7546,8 +7578,8 @@ The optional argument TYPE tells the agenda type."
     (cond ((not (or ta tb)) nil)
 	  ((not ta) +1)
 	  ((not tb) -1)
-	  ((funcall (or org-tags-sort-function #'org-string<) ta tb) -1)
-	  ((funcall (or org-tags-sort-function #'org-string<) tb ta) +1))))
+	  ((org-tags-sort ta tb) -1)
+	  ((org-tags-sort tb ta) +1))))
 
 (defsubst org-cmp-time (a b)
   "Compare the time-of-day values of strings A and B."
@@ -7563,15 +7595,14 @@ When TYPE is \"scheduled\", \"deadline\", \"timestamp\" or
 \"timestamp_ia\", compare within each of these type.  When TYPE
 is the empty string, compare all timestamps without respect of
 their type."
-  (let* ((def (if org-agenda-sort-notime-is-late 99999999 -1))
-	 (ta (or (and (string-match type (or (get-text-property 1 'type a) ""))
-		      (get-text-property 1 'ts-date a))
-		 def))
-	 (tb (or (and (string-match type (or (get-text-property 1 'type b) ""))
-		      (get-text-property 1 'ts-date b))
-		 def)))
-    (cond ((if ta (and tb (< ta tb)) tb) -1)
-	  ((if tb (and ta (< tb ta)) ta) +1))))
+  (cl-flet ((get-timestamp (entry)
+              (or (and (string-match type (or (get-text-property 1 'type entry) ""))
+                       (get-text-property 1 'ts-date entry))
+                  (if org-agenda-sort-notime-is-late most-positive-fixnum -1))))
+    (let ((ta (get-timestamp a))
+          (tb (get-timestamp b)))
+      (cond ((< ta tb) -1)
+            ((< tb ta) +1)))))
 
 (defsubst org-cmp-habit-p (a b)
   "Compare the todo states of strings A and B."
@@ -7581,68 +7612,54 @@ their type."
 	  ((and (not ha) hb) +1))))
 
 (defun org-entries-lessp (a b)
-  "Predicate for sorting agenda entries."
-  ;; The following variables will be used when the form is evaluated.
-  ;; So even though the compiler complains, keep them.
-  (let ((ss org-agenda-sorting-strategy-selected))
-    (org-dlet
-	((timestamp-up    (and (org-em 'timestamp-up 'timestamp-down ss)
-			       (org-cmp-ts a b "")))
-	 (timestamp-down  (if timestamp-up (- timestamp-up) nil))
-	 (scheduled-up    (and (org-em 'scheduled-up 'scheduled-down ss)
-			       (org-cmp-ts a b "scheduled")))
-	 (scheduled-down  (if scheduled-up (- scheduled-up) nil))
-	 (deadline-up     (and (org-em 'deadline-up 'deadline-down ss)
-			       (org-cmp-ts a b "deadline")))
-	 (deadline-down   (if deadline-up (- deadline-up) nil))
-	 (tsia-up         (and (org-em 'tsia-up 'tsia-down ss)
-			       (org-cmp-ts a b "timestamp_ia")))
-	 (tsia-down       (if tsia-up (- tsia-up) nil))
-	 (ts-up           (and (org-em 'ts-up 'ts-down ss)
-			       (org-cmp-ts a b "timestamp")))
-	 (ts-down         (if ts-up (- ts-up) nil))
-	 (time-up         (and (org-em 'time-up 'time-down ss)
-			       (org-cmp-time a b)))
-	 (time-down       (if time-up (- time-up) nil))
-	 (stats-up        (and (org-em 'stats-up 'stats-down ss)
-			       (org-cmp-values a b 'org-stats)))
-	 (stats-down      (if stats-up (- stats-up) nil))
-	 (priority-up     (and (org-em 'priority-up 'priority-down ss)
-			       (org-cmp-values a b 'priority)))
-	 (priority-down   (if priority-up (- priority-up) nil))
-	 (urgency-up     (and (org-em 'urgency-up 'urgency-down ss)
-			      (org-cmp-values a b 'urgency)))
-	 (urgency-down   (if urgency-up (- urgency-up) nil))
-	 (effort-up       (and (org-em 'effort-up 'effort-down ss)
-			       (org-cmp-effort a b)))
-	 (effort-down     (if effort-up (- effort-up) nil))
-	 (category-up     (and (or (org-em 'category-up 'category-down ss)
-				   (memq 'category-keep ss))
-			       (org-cmp-category a b)))
-	 (category-down   (if category-up (- category-up) nil))
-	 (category-keep   (if category-up +1 nil))
-	 (tag-up          (and (org-em 'tag-up 'tag-down ss)
-			       (org-cmp-tag a b)))
-	 (tag-down        (if tag-up (- tag-up) nil))
-	 (todo-state-up   (and (org-em 'todo-state-up 'todo-state-down ss)
-			       (org-cmp-todo-state a b)))
-	 (todo-state-down (if todo-state-up (- todo-state-up) nil))
-	 (habit-up        (and (org-em 'habit-up 'habit-down ss)
-			       (org-cmp-habit-p a b)))
-	 (habit-down      (if habit-up (- habit-up) nil))
-	 (alpha-up        (and (org-em 'alpha-up 'alpha-down ss)
-			       (org-cmp-alpha a b)))
-	 (alpha-down      (if alpha-up (- alpha-up) nil))
-	 (need-user-cmp   (org-em 'user-defined-up 'user-defined-down ss))
-	 user-defined-up user-defined-down)
-      (when (and need-user-cmp org-agenda-cmp-user-defined
-	         (functionp org-agenda-cmp-user-defined))
-	(setq user-defined-up
-	      (funcall org-agenda-cmp-user-defined a b)
-	      user-defined-down (if user-defined-up (- user-defined-up) nil)))
-      (cdr (assoc
-	    (eval (cons 'or org-agenda-sorting-strategy-selected) t)
-	    '((-1 . t) (1 . nil) (nil . nil)))))))
+  "Predicate for sorting agenda entries A and B."
+  (catch :org-entries-lessp-return
+    (dolist (strategy org-agenda-sorting-strategy-selected)
+      (when-let*
+          ((result
+            (cl-case strategy
+              (timestamp-up    (org-cmp-ts a b ""))
+              (timestamp-down  (org-cmp-ts b a ""))
+              (scheduled-up    (org-cmp-ts a b "scheduled"))
+              (scheduled-down  (org-cmp-ts b a "scheduled"))
+              (deadline-up     (org-cmp-ts a b "deadline"))
+              (deadline-down   (org-cmp-ts b a "deadline"))
+              (tsia-up         (org-cmp-ts a b "timestamp_ia"))
+              (tsia-down       (org-cmp-ts b a "timestamp_ia"))
+              (ts-up           (org-cmp-ts a b "timestamp"))
+              (ts-down         (org-cmp-ts b a "timestamp"))
+              (time-up         (org-cmp-time a b))
+              (time-down       (org-cmp-time b a))
+              (stats-up        (org-cmp-values a b 'org-stats))
+              (stats-down      (org-cmp-values b a 'org-stats))
+              (priority-up     (org-cmp-values a b 'priority))
+              (priority-down   (org-cmp-values b a 'priority))
+              (urgency-up      (org-cmp-values a b 'urgency))
+              (urgency-down    (org-cmp-values b a 'urgency))
+              (effort-up       (org-cmp-effort a b))
+              (effort-down     (org-cmp-effort b a))
+              (category-up     (org-cmp-category a b))
+              (category-down   (org-cmp-category b a))
+              (category-keep   (and (org-cmp-category a b) +1))
+              (tag-up          (org-cmp-tag a b))
+              (tag-down        (org-cmp-tag b a))
+              (todo-state-up   (org-cmp-todo-state a b))
+              (todo-state-down (org-cmp-todo-state b a))
+              (habit-up        (org-cmp-habit-p a b))
+              (habit-down      (org-cmp-habit-p b a))
+              (alpha-up        (org-cmp-alpha a b))
+              (alpha-down      (org-cmp-alpha b a))
+              (user-defined-up (unless (functionp org-agenda-cmp-user-defined)
+                                 (error "Please set `org-agenda-cmp-user-defined' to a function or remove `user-defined-up' from `org-agenda-sorting-strategy'"))
+                               (funcall org-agenda-cmp-user-defined a b))
+              (user-defined-down (unless (functionp org-agenda-cmp-user-defined)
+                                   (error "Please set `org-agenda-cmp-user-defined' to a function or remove `user-defined-down' from `org-agenda-sorting-strategy'"))
+                                 (funcall org-agenda-cmp-user-defined b a))
+              (t (error "Invalid value %S in `org-agenda-sorting-strategy'" strategy)))))
+        (cond
+         ((eq -1 result) (throw :org-entries-lessp-return t))
+         ((eq 1 result) (throw :org-entries-lessp-return nil)))))
+    nil))
 
 ;;; Agenda restriction lock
 
@@ -8182,6 +8199,9 @@ the variable `org-agenda-auto-exclude-function'."
 
 (defun org-agenda-filter-completion-function (string _predicate &optional flag)
   "Complete a complex filter string.
+
+See the Info Node `(org) Filtering/limiting agenda items'.
+
 FLAG specifies the type of completion operation to perform.  This
 function is passed as a collection function to `completing-read',
 which see."
@@ -8213,7 +8233,7 @@ which see."
       (`lambda (assoc string table)) ;exact match?
       (`(boundaries . ,suffix)
        (let ((end (if (string-match "[-+<>=]" suffix)
-                      (match-string 0 suffix)
+                      (match-beginning 0)
                     (length suffix))))
          `(boundaries ,(or begin 0) . ,end)))
       (`nil
@@ -8460,7 +8480,7 @@ If the line does not have an effort defined, return nil."
   ;; current line but is stored as a property in `txt'.
   (let ((effort (get-text-property 0 'effort-minutes (org-get-at-bol 'txt))))
     (funcall op
-	     (or effort (if org-agenda-sort-noeffort-is-high 32767 -1))
+	     (or effort (if org-agenda-sort-noeffort-is-high most-positive-fixnum -1))
 	     value)))
 
 (defun org-agenda-filter-expand-tags (filter &optional no-operator)
@@ -8774,7 +8794,7 @@ See also:
 	   (list (car args) sd span)))
       (org-agenda-redo)
       (org-agenda-find-same-or-today-or-agenda cnt))
-    (set-window-start nil wstart)))
+    (set-window-start nil wstart 'noforce)))
 
 (defun org-agenda-earlier (arg)
   "Go backward in time by the current span in the agenda buffer.
@@ -9243,8 +9263,12 @@ When called with a prefix argument, include all archive files as well."
 		     (org-agenda-error)))
 	 (buffer (marker-buffer marker))
 	 (pos (marker-position marker)))
-    (switch-to-buffer-other-window buffer)
-    (widen)
+    (pop-to-buffer
+     buffer
+     `((display-buffer-reuse-window display-buffer-pop-up-window)
+       (reuse-indirect . buffer)))
+    (unless (<= (point-min) pos (point-max))
+      (widen))
     (push-mark)
     (goto-char pos)
     (when (derived-mode-p 'org-mode)
@@ -9637,7 +9661,7 @@ if it was hidden in the outline."
 (defun org-agenda-cycle-show (&optional n)
   "Show the current entry in another window, with default settings.
 
-Default settings are taken from `org-show-context-detail'.  When
+Default settings are taken from `org-fold-show-context-detail'.  When
 use repeatedly in immediate succession, the remote entry will
 cycle through visibility
 
@@ -10106,15 +10130,15 @@ When called programmatically, FORCE-DIRECTION can be `set', `up',
   (org-agenda-date-later (- arg) what))
 
 (defun org-agenda-date-later-minutes (arg)
-  "Change the time of this item, in units of `org-timestamp-rounding-minutes'."
+  "Change the time of this item, in units of `org-time-stamp-rounding-minutes'."
   (interactive "p")
-  (setq arg (* arg (cadr org-timestamp-rounding-minutes)))
+  (setq arg (* arg (cadr org-time-stamp-rounding-minutes)))
   (org-agenda-date-later arg 'minute))
 
 (defun org-agenda-date-earlier-minutes (arg)
-  "Change the time of this item, in units of `org-timestamp-rounding-minutes'."
+  "Change the time of this item, in units of `org-time-stamp-rounding-minutes'."
   (interactive "p")
-  (setq arg (* arg (cadr org-timestamp-rounding-minutes)))
+  (setq arg (* arg (cadr org-time-stamp-rounding-minutes)))
   (org-agenda-date-earlier arg 'minute))
 
 (defun org-agenda-date-later-hours (arg)
diff --git a/lisp/org/org-archive.el b/lisp/org/org-archive.el
index 599391a339f..e128a276efe 100644
--- a/lisp/org/org-archive.el
+++ b/lisp/org/org-archive.el
@@ -36,7 +36,6 @@
 
 (declare-function org-datetree-find-date-create "org-datetree" (date &optional keep-restriction))
 (declare-function org-inlinetask-remove-END-maybe "org-inlinetask" ())
-(declare-function org-timestamp-to-now "org" (timestamp-string &optional seconds))
 
 ;; From org-element.el
 (defvar org-element--cache-avoid-synchronous-headline-re-parsing)
@@ -136,6 +135,7 @@ For each symbol present in the list, a property will be created in
 the archived entry, with a prefix \"ARCHIVE_\", to remember this
 information."
   :group 'org-archive
+  :package-version '(Org . "9.8")
   :type '(set :greedy t
 	      (const :tag "Time" time)
 	      (const :tag "File" file)
@@ -144,13 +144,30 @@ information."
 	      (const :tag "Priority" priority)
 	      (const :tag "Inherited tags" itags)
 	      (const :tag "Outline path" olpath)
-	      (const :tag "Local tags" ltags)))
+	      (const :tag "Outline parent id" olid)
+	      (const :tag "Local tags" ltags))
+  :safe #'listp)
 
-(defvar org-archive-hook nil
+(defcustom org-archive-hook nil
   "Hook run after successfully archiving a subtree.
 Hook functions are called with point on the subtree in the
 original file.  At this stage, the subtree has been added to the
-archive location, but not yet deleted from the original file.")
+archive location, but not yet deleted from the original file."
+  :group 'org-archive
+  :type 'hook
+  :risky t)
+
+(defcustom org-archive-finalize-hook nil
+  "Hook run after successfully archiving a subtree in final location.
+Hook functions are called with point on the subtree in the
+destination file.  Compare this with `org-archive-hook', which
+runs in the original file.  At this stage, the subtree has been
+added to the archive location, but not yet deleted from the
+original file."
+  :group 'org-archive
+  :package-version '(Org . "9.8")
+  :type 'hook
+  :risky t)
 
 ;;;###autoload
 (defun org-add-archive-files (files)
@@ -207,8 +224,9 @@ an error if LOCATION is not a valid archive location."
   "Move the current subtree to the archive.
 The archive can be a certain top-level heading in the current
 file, or in a different file.  The tree will be moved to that
-location, the subtree heading be marked DONE, and the current
-time will be added.
+location.  If `org-archive-mark-done' is non-nil and the subtree
+has a TODO keyword, the subtree heading will be marked DONE.
+And the current time will be added.
 
 When called with a single prefix argument FIND-DONE, find whole
 trees without any open TODO items and archive them (after getting
@@ -299,6 +317,9 @@ direct children of this heading."
 		    (olpath . ,(mapconcat #'identity
 					  (org-get-outline-path)
 					  "/"))
+                    (olid . ,(org-with-wide-buffer
+                              (and (org-up-heading-safe)
+	                           (org-entry-get (point) "ID"))))
 		    (time . ,time)
 		    (todo . ,(org-entry-get (point) "TODO")))))
 	    ;; We first only copy, in case something goes wrong
@@ -306,103 +327,103 @@ direct children of this heading."
 	    ;; which would lead to duplication of subtrees
 	    (let (this-command) (org-copy-subtree 1 nil t))
 	    (set-buffer buffer)
-	    ;; Enforce Org mode for the archive buffer
-	    (if (not (derived-mode-p 'org-mode))
-		;; Force the mode for future visits.
-		(let ((org-insert-mode-line-in-empty-file t)
-		      (org-inhibit-startup t))
-		  (call-interactively 'org-mode)))
-	    (when (and newfile-p org-archive-file-header-format)
-	      (goto-char (point-max))
-	      (insert (format org-archive-file-header-format
-			      (buffer-file-name this-buffer))))
-	    (when datetree-date
-	      (require 'org-datetree)
-	      (org-datetree-find-date-create datetree-date)
-	      (org-narrow-to-subtree))
-	    ;; Force the TODO keywords of the original buffer
-	    (let ((org-todo-line-regexp tr-org-todo-line-regexp)
-		  (org-todo-keywords-1 tr-org-todo-keywords-1)
-		  (org-todo-kwd-alist tr-org-todo-kwd-alist)
-		  (org-done-keywords tr-org-done-keywords)
-		  (org-todo-regexp tr-org-todo-regexp)
-		  (org-todo-line-regexp tr-org-todo-line-regexp))
-	      (goto-char (point-min))
-	      (org-fold-show-all '(headings blocks))
-	      (if (and heading (not (and datetree-date (not datetree-subheading-p))))
-		  (progn
-		    (if (re-search-forward
-			 (concat "^" (regexp-quote heading)
-				 "\\([ \t]+:\\(" org-tag-re ":\\)+\\)?[ \t]*$")
-			 nil t)
-			(goto-char (match-end 0))
-		      ;; Heading not found, just insert it at the end
-		      (goto-char (point-max))
-		      (or (bolp) (insert "\n"))
-		      ;; datetrees don't need too much spacing
-		      (insert (if datetree-date "" "\n") heading "\n")
-		      (end-of-line 0))
-		    ;; Make the subtree visible
-		    (org-fold-show-subtree)
-		    (if org-archive-reversed-order
-			(progn
-			  (org-back-to-heading t)
-			  (outline-next-heading))
-		      (org-end-of-subtree t))
-		    (skip-chars-backward " \t\r\n")
-		    (and (looking-at "[ \t\r\n]*")
-			 ;; datetree archives don't need so much spacing.
-			 (replace-match (if datetree-date "\n" "\n\n"))))
-		;; No specific heading, just go to end of file, or to the
-		;; beginning, depending on `org-archive-reversed-order'.
-		(if org-archive-reversed-order
+            (org-with-wide-buffer
+	      ;; Enforce Org mode for the archive buffer
+	      (if (not (derived-mode-p 'org-mode))
+		  ;; Force the mode for future visits.
+		  (let ((org-insert-mode-line-in-empty-file t)
+		        (org-inhibit-startup t))
+		    (call-interactively 'org-mode)))
+	      (when (and newfile-p org-archive-file-header-format)
+	        (goto-char (point-max))
+	        (insert (format org-archive-file-header-format
+			        (buffer-file-name this-buffer))))
+	      (when datetree-date
+	        (require 'org-datetree)
+	        (org-datetree-find-date-create datetree-date)
+	        (org-narrow-to-subtree))
+	      ;; Force the TODO keywords of the original buffer
+	      (let ((org-todo-line-regexp tr-org-todo-line-regexp)
+		    (org-todo-keywords-1 tr-org-todo-keywords-1)
+		    (org-todo-kwd-alist tr-org-todo-kwd-alist)
+		    (org-done-keywords tr-org-done-keywords)
+		    (org-todo-regexp tr-org-todo-regexp)
+		    (org-todo-line-regexp tr-org-todo-line-regexp))
+	        (goto-char (point-min))
+	        (if (and heading (not (and datetree-date (not datetree-subheading-p))))
 		    (progn
-		      (goto-char (point-min))
-		      (unless (org-at-heading-p) (outline-next-heading)))
-		  (goto-char (point-max))
-		  ;; Subtree narrowing can let the buffer end on
-		  ;; a headline.  `org-paste-subtree' then deletes it.
-		  ;; To prevent this, make sure visible part of buffer
-		  ;; always terminates on a new line, while limiting
-		  ;; number of blank lines in a date tree.
-		  (unless (and datetree-date (bolp)) (insert "\n"))))
-	      ;; Paste
-	      (org-paste-subtree (org-get-valid-level level (and heading 1)))
-	      ;; Shall we append inherited tags?
-	      (and inherited-tags
-		   (or (and (eq org-archive-subtree-add-inherited-tags 'infile)
-			    infile-p)
-		       (eq org-archive-subtree-add-inherited-tags t))
-		   (org-set-tags all-tags))
-	      ;; Mark the entry as done
-	      (when (and org-archive-mark-done
-			 (let ((case-fold-search nil))
-			   (looking-at org-todo-line-regexp))
-			 (or (not (match-end 2))
-			     (not (member (match-string 2) org-done-keywords))))
-		(let (org-log-done org-todo-log-states)
-		  (org-todo
-		   (car (or (member org-archive-mark-done org-done-keywords)
-			    org-done-keywords)))))
+		      (if (re-search-forward
+			   (concat "^" (regexp-quote heading)
+				   "\\([ \t]+:\\(" org-tag-re ":\\)+\\)?[ \t]*$")
+			   nil t)
+			  (goto-char (match-end 0))
+		        ;; Heading not found, just insert it at the end
+		        (goto-char (point-max))
+		        (or (bolp) (insert "\n"))
+		        ;; datetrees don't need too much spacing
+		        (insert (if datetree-date "" "\n") heading "\n")
+		        (end-of-line 0))
+		      ;; Make the subtree visible
+		      (org-fold-show-subtree)
+		      (if org-archive-reversed-order
+			  (progn
+			    (org-back-to-heading t)
+			    (outline-next-heading))
+		        (org-end-of-subtree t))
+		      (skip-chars-backward " \t\r\n")
+		      (and (looking-at "[ \t\r\n]*")
+			   ;; datetree archives don't need so much spacing.
+			   (replace-match (if datetree-date "\n" "\n\n"))))
+		  ;; No specific heading, just go to end of file, or to the
+		  ;; beginning, depending on `org-archive-reversed-order'.
+		  (if org-archive-reversed-order
+		      (progn
+		        (goto-char (point-min))
+		        (unless (org-at-heading-p) (outline-next-heading)))
+		    (goto-char (point-max))
+		    ;; Subtree narrowing can let the buffer end on
+		    ;; a headline.  `org-paste-subtree' then deletes it.
+		    ;; To prevent this, make sure visible part of buffer
+		    ;; always terminates on a new line, while limiting
+		    ;; number of blank lines in a date tree.
+		    (unless (and datetree-date (bolp)) (insert "\n"))))
+	        ;; Paste
+	        (org-paste-subtree (org-get-valid-level level (and heading 1)))
+	        ;; Shall we append inherited tags?
+	        (and inherited-tags
+		     (or (and (eq org-archive-subtree-add-inherited-tags 'infile)
+			      infile-p)
+		         (eq org-archive-subtree-add-inherited-tags t))
+		     (org-set-tags all-tags))
+	        ;; Mark the entry as done
+	        (when (and org-archive-mark-done
+			   (let ((case-fold-search nil))
+			     (looking-at org-todo-line-regexp))
+			   (or (not (match-end 2))
+			       (not (member (match-string 2) org-done-keywords))))
+		  (let (org-log-done org-todo-log-states)
+		    (org-todo
+		     (car (or (member org-archive-mark-done org-done-keywords)
+			      org-done-keywords)))))
 
-	      ;; Add the context info.
-	      (dolist (item org-archive-save-context-info)
-		(let ((value (cdr (assq item context))))
-		  (when (org-string-nw-p value)
-		    (org-entry-put
-		     (point)
-		     (concat "ARCHIVE_" (upcase (symbol-name item)))
-		     value))))
-	      ;; Save the buffer, if it is not the same buffer and
-	      ;; depending on `org-archive-subtree-save-file-p'.
-	      (unless (eq this-buffer buffer)
-		(when (or (eq org-archive-subtree-save-file-p t)
-			  (eq org-archive-subtree-save-file-p
-			      (if (boundp 'org-archive-from-agenda)
-				  'from-agenda
-				'from-org)))
-		  (save-buffer)))
-	      (widen))))
+	        ;; Add the context info.
+	        (dolist (item org-archive-save-context-info)
+		  (let ((value (cdr (assq item context))))
+		    (when (org-string-nw-p value)
+		      (org-entry-put
+		       (point)
+		       (concat "ARCHIVE_" (upcase (symbol-name item)))
+		       value))))
+                (run-hooks 'org-archive-finalize-hook)
+	        ;; Save the buffer, if it is not the same buffer and
+	        ;; depending on `org-archive-subtree-save-file-p'.
+	        (unless (eq this-buffer buffer)
+		  (when (or (eq org-archive-subtree-save-file-p t)
+			    (eq org-archive-subtree-save-file-p
+			        (if (boundp 'org-archive-from-agenda)
+				    'from-agenda
+				  'from-org)))
+		    (save-buffer)))))))
 	;; Here we are back in the original buffer.  Everything seems
 	;; to have worked.  So now run hooks, cut the tree and finish
 	;; up.
diff --git a/lisp/org/org-attach.el b/lisp/org/org-attach.el
index a19c237e4f2..67b430e71aa 100644
--- a/lisp/org/org-attach.el
+++ b/lisp/org/org-attach.el
@@ -433,22 +433,42 @@ adjust `org-attach-id-to-path-function-list'"
       (make-directory attach-dir t))
     attach-dir))
 
-(defun org-attach-dir-from-id (id  &optional existing)
+(defun org-attach-dir-from-id (id &optional existing)
   "Return a folder path based on `org-attach-id-dir' and ID.
 Try id-to-path functions in `org-attach-id-to-path-function-list'
 ignoring nils.  If EXISTING is non-nil, then return the first path
-found in the filesystem.  Otherwise return the first non-nil value."
+found in the filesystem.  Otherwise return the first non-nil value.
+
+The existing paths are searched in
+1. `org-attach-id-dir';
+2. in \"data/\" dir - the default value of `org-attach-id-dir';
+3. if current buffer is a symlink, (1) and (2) searches are repeated
+   in the `default-directory' of symlink target."
   (let ((fun-list org-attach-id-to-path-function-list)
         (base-dir (expand-file-name org-attach-id-dir))
-        (default-base-dir (expand-file-name "data/"))
+        (fallback-dirs (list (expand-file-name "data/")))
         preferred first)
+    (when (and (buffer-file-name)
+               (file-symlink-p (buffer-file-name)))
+      (let ((default-directory
+             (file-name-directory
+              (file-truename (buffer-file-name)))))
+        (cl-pushnew (expand-file-name org-attach-id-dir) fallback-dirs)
+        (cl-pushnew (expand-file-name "data/") fallback-dirs)))
+    (setq fallback-dirs (delete base-dir fallback-dirs))
+    (setq fallback-dirs (seq-filter #'file-directory-p fallback-dirs))
     (while (and fun-list
                 (not preferred))
       (let* ((name (funcall (car fun-list) id))
              (candidate (and name (expand-file-name name base-dir)))
-             ;; Try the default value `org-attach-id-dir' as a fallback.
-             (candidate2 (and name (not (equal base-dir default-base-dir))
-                              (expand-file-name name default-base-dir))))
+             ;; Try the default value `org-attach-id-dir', and linked
+             ;; dirs if buffer is a symlink as a fallback.
+             (fallback-candidates
+              (and name (mapcar
+                         (lambda (dir) (expand-file-name name dir))
+                         fallback-dirs)))
+             (fallback-candidates
+              (seq-filter #'file-directory-p fallback-candidates)))
         (setq fun-list (cdr fun-list))
         (when candidate
           (if (or (not existing) (file-directory-p candidate))
@@ -456,10 +476,9 @@ found in the filesystem.  Otherwise return the first non-nil value."
             (unless first
               (setq first candidate)))
           (when (and existing
-                     candidate2
-                     (not (file-directory-p candidate))
-                     (file-directory-p candidate2))
-            (setq preferred candidate2)))))
+                     fallback-candidates
+                     (not (file-directory-p candidate)))
+            (setq preferred (car fallback-candidates))))))
     (or preferred first)))
 
 (defun org-attach-check-absolute-path (dir)
@@ -567,7 +586,13 @@ if it would overwrite an existing filename."
   "Move/copy/link FILE into the attachment directory of the current outline node.
 If VISIT-DIR is non-nil, visit the directory with `dired'.
 METHOD may be `cp', `mv', `ln', `lns' or `url' default taken from
-`org-attach-method'."
+`org-attach-method'.
+
+Return a list (LINK DESCRIPTION), representing the file stored.
+When `org-attach-store-link-p' is non-nil, LINK and DESCRIPTION will
+be the same as in the link stored.
+When `org-attach-store-link-p' is nil, LINK will be an attachment: link
+and DESCRIPTION be the file name."
   (interactive
    (list
     (read-file-name "File to keep as an attachment: "
@@ -580,7 +605,8 @@ METHOD may be `cp', `mv', `ln', `lns' or `url' default taken from
   (setq method (or method org-attach-method))
   (when (file-directory-p file)
     (setq file (directory-file-name file)))
-  (let ((basename (file-name-nondirectory file)))
+  (let ((basename (file-name-nondirectory file))
+        link description)
     (let* ((attach-dir (org-attach-dir 'get-create))
            (attach-file (expand-file-name basename attach-dir)))
       (cond
@@ -599,20 +625,25 @@ METHOD may be `cp', `mv', `ln', `lns' or `url' default taken from
       (run-hook-with-args 'org-attach-after-change-hook attach-dir)
       (org-attach-tag)
       (cond ((eq org-attach-store-link-p 'attached)
-	     (push (list (concat "attachment:" (file-name-nondirectory attach-file))
-			 (file-name-nondirectory attach-file))
-		   org-stored-links))
+             (setq link (concat "attachment:" (file-name-nondirectory attach-file))
+                   description (file-name-nondirectory attach-file))
+	     (push (list link description) org-stored-links))
             ((eq org-attach-store-link-p t)
-             (push (list (concat "file:" file)
-			 (file-name-nondirectory file))
-		   org-stored-links))
+             (setq link (concat "file:" file)
+                   description (file-name-nondirectory file))
+             (push (list link description) org-stored-links))
 	    ((eq org-attach-store-link-p 'file)
-	     (push (list (concat "file:" attach-file)
-			 (file-name-nondirectory attach-file))
-		   org-stored-links)))
+             (setq link (concat "file:" attach-file)
+                   description (file-name-nondirectory attach-file))
+	     (push (list link description) org-stored-links))
+            (t
+             ;; Do not save link, just return.
+             (setq link (concat "attachment:" (file-name-nondirectory attach-file))
+                   description (file-name-nondirectory attach-file))))
       (if visit-dir
           (dired attach-dir)
-        (message "File %S is now an attachment" basename)))))
+        (message "File %S is now an attachment" basename))
+      (list link description))))
 
 (defun org-attach-attach-cp ()
   "Attach a file by copying it."
@@ -753,7 +784,7 @@ Basically, this adds the path to the attachment directory."
 
 (defun org-attach-expand-links (_)
   "Expand links in current buffer.
-It is meant to be added to `org-export-before-parsing-hook'."
+It is meant to be added to `org-export-before-parsing-functions'."
   (save-excursion
     (while (re-search-forward "attachment:" nil t)
       (let ((link (org-element-context)))
@@ -778,9 +809,18 @@ It is meant to be added to `org-export-before-parsing-hook'."
 See `org-open-file' for details about ARG."
   (org-link-open-as-file (org-attach-expand file) arg))
 
+(defun org-attach-preview-file (ov path link)
+  "Preview attachment with PATH in overlay OV.
+
+LINK is the Org link element being previewed."
+  (org-with-point-at (org-element-begin link)
+    (org-link-preview-file
+     ov (org-attach-expand path) link)))
+
 (org-link-set-parameters "attachment"
 			 :follow #'org-attach-follow
-                         :complete #'org-attach-complete-link)
+                         :complete #'org-attach-complete-link
+                         :preview #'org-attach-preview-file)
 
 (defun org-attach-complete-link ()
   "Advise the user with the available files in the attachment directory."
@@ -833,7 +873,7 @@ Idea taken from `gnus-dired-attach'."
          (get-window-with-predicate
           (lambda (window)
             (with-current-buffer (window-buffer window)
-              (eq major-mode 'org-mode))))))
+              (derived-mode-p 'org-mode))))))
     (unless other-win
       (user-error
        "Can't attach to subtree.  No window displaying an Org buffer"))
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index 50ecfbfd3ec..6f1d3bc39b8 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -59,6 +59,7 @@
 (declare-function org-clock-update-mode-line "org-clock" (&optional refresh))
 (declare-function org-datetree-find-date-create "org-datetree" (date &optional keep-restriction))
 (declare-function org-datetree-find-month-create "org-datetree" (d &optional keep-restriction))
+(declare-function org-datetree-find-create-hierarchy "org-datetree" (hier-pairs &optional keep-restriction legacy-prop))
 (declare-function org-decrypt-entry "org-crypt" ())
 (declare-function org-element-at-point "org-element" (&optional pom cached-only))
 (declare-function org-element-lineage "org-element-ast" (datum &optional types with-self))
@@ -67,7 +68,6 @@
 (declare-function org-element-post-affiliated "org-element" (node))
 (declare-function org-encrypt-entry "org-crypt" ())
 (declare-function org-insert-link "ol" (&optional complete-file link-location default-description))
-(declare-function org-link-make-string "ol" (link &optional description))
 (declare-function org-table-analyze "org-table" ())
 (declare-function org-table-current-dline "org-table" ())
 (declare-function org-table-fix-formulas "org-table" (key replace &optional limit delta remove))
@@ -182,10 +182,12 @@ type         The type of entry.  Valid types are:
                plain       text to be inserted as it is.
 
 target       Specification of where the captured item should be placed.
-             In Org files, targets usually define a node.  Entries will
-             become children of this node, other types will be added to the
-             table or list in the body of this node.
+             In Org files, targets usually define a node.  Entries
+             (type `entry') will become children of this node, other
+             types will be added to the table or list in the body of
+             this node.
 
+             <file-spec>
              Most target specifications contain a file name.  If that file
              name is the empty string, it defaults to `org-default-notes-file'.
              A file can also be given as a variable or as a function called
@@ -194,41 +196,73 @@ target       Specification of where the captured item should be placed.
 
              Valid values are:
 
-             (file \"path/to/file\")
+             (file <file-spec>)
                  Text will be placed at the beginning or end of that file
 
              (id \"id of existing Org entry\")
                  File as child of this entry, or in the body of the entry
 
-             (file+headline \"path/to/file\" \"node headline\")
+             (file+headline <file-spec> \"node headline\")
+             (file+headline <file-spec> function-returning-string)
+             (file+headline <file-spec> symbol-containing-string)
                  Fast configuration if the target heading is unique in the file
 
-             (file+olp \"path/to/file\" \"Level 1 heading\" \"Level 2\" ...)
+             (file+olp <file-spec> \"Level 1 heading\" \"Level 2\" ...)
+             (file+olp <file-spec> function-returning-list-of-strings)
+             (file+olp <file-spec> symbol-containing-list-of-strings)
                  For non-unique headings, the full outline path is safer
 
-             (file+regexp  \"path/to/file\" \"regexp to find location\")
-                 File to the entry matching regexp
+             (file+regexp  <file-spec> \"regexp to find location\")
+                 File to the entry containing matching regexp
 
-             (file+olp+datetree \"path/to/file\" \"Level 1 heading\" ...)
+             (file+olp+datetree <file-spec> \"Level 1 heading\" ...)
+             (file+olp+datetree <file-spec> function-returning-list-of-strings)
+             (file+olp+datetree <file-spec> symbol-containing-list-of-strings)
                  Will create a heading in a date tree for today's date.
                  If no heading is given, the tree will be on top level.
                  To prompt for date instead of using TODAY, use the
                  :time-prompt property.  To create a week-tree, use the
                  :tree-type property.
 
-             (file+function \"path/to/file\" function-finding-location)
+             (file+function <file-spec> function-finding-location)
                  A function to find the right location in the file
 
              (clock)
                 File to the entry that is currently being clocked
 
              (here)
-                The position of point
+                The exact position to insert the template
 
              (function function-finding-location)
                 Most general way: write your own function which both visits
                 the file and moves point to the right location
 
+
+             For (here) target, the template will be always inserted
+             in place.
+
+             When the target points to headline, the template will
+             be inserted into the headline body (for non-`entry' types)
+             or as an immediate child.
+
+             When the target points to text inside heading body, the
+             exact place where the template will be inserted depends
+             on its type:
+
+             entry      will be inserted as a child of the Org
+                        heading the point is in.
+
+             item,      will be inserted in the nearest existing Org
+             checkitem  list, if there is one.  The list will be
+                        searched from the point to the end of current
+                        heading body.
+
+             table-line will be inserted into the nearest table, if any
+                        searching from point to the end of current
+                        heading body.
+
+             plain      plain text will be inserted in place.
+
 template     The template for creating the capture item.
              If it is an empty string or nil, a default template based on
              the entry type will be used (see the \"type\" section above).
@@ -285,7 +319,13 @@ properties are:
 
  :tree-type          When `week', make a week tree instead of the month-day
                      tree.  When `month', make a month tree instead of the
-                     month-day tree.
+                     month-day tree.  When any subset of
+                     `(year quarter month week day)', create a
+                     datetree hierarchy with the specified
+                     levels.  Can also be a function, in which
+                     case it should take the date as an argument
+                     and generate a list of pairs to pass to
+                     `org-datetree-find-create-hierarchy'.
 
  :unnarrowed         Do not narrow the target buffer, simply show the
                      full buffer.  Default is to narrow it so that you
@@ -334,6 +374,7 @@ be replaced with content and expanded:
               %-escapes, those can be used to fill the expression.
               The evaluation happens with Org mode set as major mode
               in a temporary buffer.
+              Examples: %(org-id-new), %(eval default-directory)
   %<...>      The result of `format-time-string' on the ... format
               specification.
   %t          Time stamp, date only.  The time stamp is the current
@@ -376,8 +417,10 @@ be replaced with content and expanded:
               prompt/completions.  Default value and completions as in
               %^{prompt|default|...}X are allowed.
   %?          After completing the template, position cursor here.
-  %\\1 ... %\\N Insert the text entered at the nth %^{prompt}, where N
-              is a number, starting from 1.
+  %\\1 ... %\\N Insert the text entered at the nth %^{prompt} (but not
+              %^{prompt}X), where N is a number, starting from 1.
+  %\\*1...%\\*N Same as \\N, but for all the prompts, including
+              %^{prompt} and %^{prompt}X.
 
 Apart from these general escapes, you can access information specific to
 the link type that is created.  For example, calling `org-capture' in emails
@@ -402,13 +445,18 @@ calendar                |  %:type %:date
 When you need to insert a literal percent sign in the template,
 you can escape ambiguous cases with a backward slash, e.g., \\%i."
   :group 'org-capture
-  :package-version '(Org . "9.7")
+  :package-version '(Org . "9.8")
   :set (lambda (s v) (set-default-toplevel-value s (org-capture-upgrade-templates v)))
   :type
   (let ((file-variants '(choice :tag "Filename       "
 				(file :tag "Literal")
 				(function :tag "Function")
-				(variable :tag "Variable"))))
+				(variable :tag "Variable")))
+        (olp-variants '(choice :tag "Outline path"
+                               (repeat :tag "Outline path" :inline t
+				       (string :tag "Headline"))
+			       (function :tag "Function")
+			       (variable :tag "Variable"))))
     `(repeat
       (choice :value ("" "" entry (file "~/org/notes.org") "")
 	      (list :tag "Multikey description"
@@ -433,12 +481,14 @@ you can escape ambiguous cases with a backward slash, e.g., \\%i."
 			    (list :tag "File & Headline"
 				  (const :format "" file+headline)
 				  ,file-variants
-				  (string :tag "  Headline"))
+				  (choice :tag "Headline"
+				          (string   :tag "Headline")
+				          (function :tag "Function")
+				          (variable :tag "Variable")))
 			    (list :tag "File & Outline path"
 				  (const :format "" file+olp)
 				  ,file-variants
-				  (repeat :tag "Outline path" :inline t
-					  (string :tag "Headline")))
+				  ,olp-variants)
 			    (list :tag "File & Regexp"
 				  (const :format "" file+regexp)
 				  ,file-variants
@@ -446,19 +496,23 @@ you can escape ambiguous cases with a backward slash, e.g., \\%i."
 			    (list :tag "File [ & Outline path ] & Date tree"
 				  (const :format "" file+olp+datetree)
 				  ,file-variants
-				  (option (repeat :tag "Outline path" :inline t
-						  (string :tag "Headline"))))
+                                  ,(append
+                                    olp-variants
+                                    '((const :tag "Date tree at top level" nil))))
 			    (list :tag "File & function"
 				  (const :format "" file+function)
 				  ,file-variants
 				  (function :tag "  Function"))
 			    (list :tag "Current clocking task"
 				  (const :format "" clock))
+                            (list :tag "The position at point"
+				  (const :format "" here))
 			    (list :tag "Function"
 				  (const :format "" function)
 				  (function :tag "  Function")))
 		    (choice :tag "Template       "
 			    (string)
+                            (const :tag "Empty" nil)
 			    (list :tag "File"
 				  (const :format "" file)
 				  (file :tag "Template file"))
@@ -480,7 +534,8 @@ you can escape ambiguous cases with a backward slash, e.g., \\%i."
 				     ((const :format "%v " :tree-type) (const week))
 				     ((const :format "%v " :unnarrowed) (const t))
 				     ((const :format "%v " :table-line-pos) (string))
-				     ((const :format "%v " :kill-buffer) (const t)))))))))
+				     ((const :format "%v " :kill-buffer) (const t))))))))
+  :risky t)
 
 (defcustom org-capture-before-finalize-hook nil
   "Hook that is run right before a capture process is finalized.
@@ -610,21 +665,29 @@ key for the capture template otherwise associated with \"d\".
 to avoid duplicates.)"
   :version "24.3"
   :group 'org-capture
-  :type '(repeat (list :tag "Rule"
-		       (string :tag "        Capture key")
-		       (string :tag "Replace by template")
-		       (repeat :tag "Available when"
-			       (choice
-			        (cons :tag "Condition"
-				      (choice
-				       (const :tag "In file" in-file)
-				       (const :tag "Not in file" not-in-file)
-				       (const :tag "In buffer" in-buffer)
-				       (const :tag "Not in buffer" not-in-buffer)
-				       (const :tag "In mode" in-mode)
-				       (const :tag "Not in mode" not-in-mode))
-				      (regexp))
-			        (function :tag "Custom function"))))))
+  :type
+  (let ((available-when
+         '(repeat :tag "Available when"
+		  (choice
+		   (cons :tag "Condition"
+			 (choice
+			  (const :tag "In file" in-file)
+			  (const :tag "Not in file" not-in-file)
+			  (const :tag "In buffer" in-buffer)
+			  (const :tag "Not in buffer" not-in-buffer)
+			  (const :tag "In mode" in-mode)
+			  (const :tag "Not in mode" not-in-mode))
+			 (regexp))
+		   (function :tag "Custom function")))))
+    `(repeat
+      (choice
+       (list :tag "Short rule"
+	     (string :tag "        Capture key")
+	     ,available-when)
+       (list :tag "Full rule"
+	     (string :tag "        Capture key")
+	     (string :tag "Replace by template")
+	     ,available-when)))))
 
 (defcustom org-capture-use-agenda-date nil
   "Non-nil means use the date at point when capturing from agendas.
@@ -716,7 +779,6 @@ of the day at point (if any) or the current HH:MM time."
 	(condition-case error
 	    (org-capture-put :template (org-capture-fill-template))
 	  ((error quit)
-	   (if (get-buffer "*Capture*") (kill-buffer "*Capture*"))
 	   (error "Capture abort: %s" (error-message-string error))))
 
 	(setq org-capture-clock-keep (org-capture-get :clock-keep))
@@ -794,7 +856,7 @@ captured item after finalizing."
   (when (and org-capture-clock-was-started
 	     (equal org-clock-marker org-capture-clock-was-started))
     ;; Looks like the clock we started is still running.
-    (if org-capture-clock-keep
+    (if (and org-capture-clock-keep (not org-note-abort))
 	;; User may have completed clocked heading from the template.
 	;; Refresh clock mode line.
 	(org-clock-update-mode-line t)
@@ -983,7 +1045,7 @@ for `entry'-type templates"))
   (org-capture-put
    :initial-target-region
    ;; Check if the buffer is currently narrowed
-   (when (org-buffer-narrowed-p)
+   (when (buffer-narrowed-p)
      (cons (point-min) (point-max))))
   ;; store the current point
   (org-capture-put :initial-target-position (point)))
@@ -1011,7 +1073,7 @@ Store them in the capture property list."
 	    (org-capture-put-target-region-and-position)
 	    (goto-char position))
 	   (_ (error "Cannot find target ID \"%s\"" id))))
-	(`(file+headline ,path ,(and headline (pred stringp)))
+	(`(file+headline ,path ,headline)
 	 (set-buffer (org-capture-target-buffer path))
 	 ;; Org expects the target file to be in Org mode, otherwise
 	 ;; it throws an error.  However, the default notes files
@@ -1025,6 +1087,7 @@ Store them in the capture property list."
 	 (org-capture-put-target-region-and-position)
 	 (widen)
 	 (goto-char (point-min))
+         (setq headline (org-capture-expand-headline headline))
 	 (if (re-search-forward (format org-complex-heading-regexp-format
 					(regexp-quote headline))
 				nil t)
@@ -1034,8 +1097,9 @@ Store them in the capture property list."
 	   (insert "* " headline "\n")
 	   (forward-line -1)))
 	(`(file+olp ,path . ,(and outline-path (guard outline-path)))
-	 (let ((m (org-find-olp (cons (org-capture-expand-file path)
-				      outline-path))))
+	 (let* ((expanded-file-path (org-capture-expand-file path))
+                (m (org-find-olp (cons expanded-file-path
+				       (apply #'org-capture-expand-olp expanded-file-path outline-path)))))
 	   (set-buffer (marker-buffer m))
 	   (org-capture-put-target-region-and-position)
 	   (widen)
@@ -1056,8 +1120,9 @@ Store them in the capture property list."
 		 (and (derived-mode-p 'org-mode) (org-at-heading-p)))))
 	(`(file+olp+datetree ,path . ,outline-path)
 	 (let ((m (if outline-path
-		      (org-find-olp (cons (org-capture-expand-file path)
-					  outline-path))
+		      (let ((expanded-file-path (org-capture-expand-file path)))
+                        (org-find-olp (cons expanded-file-path
+					    (apply #'org-capture-expand-olp expanded-file-path outline-path))))
 		    (set-buffer (org-capture-target-buffer path))
 		    (point-marker))))
 	   (set-buffer (marker-buffer m))
@@ -1072,10 +1137,22 @@ Store them in the capture property list."
 	   ;; yesterday, if we are extending dates for a couple of
 	   ;; hours)
 	   (funcall
-	    (pcase (org-capture-get :tree-type)
-	      (`week #'org-datetree-find-iso-week-create)
+            (pcase (org-capture-get :tree-type)
+              (`week #'org-datetree-find-iso-week-create)
 	      (`month #'org-datetree-find-month-create)
-	      (_ #'org-datetree-find-date-create))
+	      (`day #'org-datetree-find-date-create)
+              ((pred not) #'org-datetree-find-date-create)
+              ;; NOTE function case needs to be before list case to
+              ;; handle lambda forms correctly
+              ((and (pred functionp) fun)
+               (lambda (d keep-restriction)
+                 (org-datetree-find-create-hierarchy
+                  (funcall fun d) keep-restriction)))
+              ((and (pred listp) grouping)
+               (lambda (d keep-restriction)
+                 (funcall #'org-datetree-find-create-entry grouping
+                          d keep-restriction)))
+              (_ (error "Unrecognized :tree-type")))
 	    (calendar-gregorian-from-absolute
 	     (cond
 	      (org-overriding-default-time
@@ -1142,6 +1219,36 @@ Store them in the capture property list."
 			      (org-decrypt-entry)
 			      (and (org-back-to-heading t) (point))))))))
 
+(defun org-capture-expand-headline (headline)
+  "Expand functions, symbols and headline names for HEADLINE.
+When HEADLINE is a function, call it.  When it is a variable, return
+its value.  When it is a string, return it.  In any other case, signal
+an error."
+  (let* ((final-headline (cond ((stringp headline) headline)
+                               ((functionp headline) (funcall headline))
+                               ((and (symbolp headline) (boundp headline))
+                                (symbol-value headline))
+                               (t nil))))
+    (or final-headline
+        (error "org-capture: Invalid headline target: %S" headline))))
+
+(defun org-capture-expand-olp (file &rest olp)
+  "Expand functions, symbols and outline paths in FILE for OLP.
+When OLP is a function, call it with no arguments while the current
+buffer is the FILE-visiting buffer.  When it is a variable, return its
+value.  When it is a list of string, return it.  In any other case,
+signal an error."
+  (let* ((first (car olp))
+         (final-olp (cond ((not (memq nil (mapcar #'stringp olp))) olp)
+                          ((and (not (cdr olp)) (functionp first))
+                           (with-current-buffer (find-file-noselect file)
+                             (funcall first)))
+                          ((and (not (cdr olp)) (symbolp first) (boundp first))
+                           (symbol-value first))
+                          (t nil))))
+    (or final-olp
+        (error "org-capture: Invalid outline path target: %S" olp))))
+
 (defun org-capture-expand-file (file)
   "Expand functions, symbols and file names for FILE.
 When FILE is a function, call it.  When it is a form, evaluate
@@ -1197,6 +1304,8 @@ may have been stored before."
 	(exact-position (org-capture-get :exact-position))
 	(insert-here? (org-capture-get :insert-here))
 	(level 1))
+    (unless (string-match org-outline-regexp-bol template)
+      (setq template (concat "* " template)))
     (org-capture-verify-tree template)
     (when exact-position (goto-char exact-position))
     (cond
@@ -1226,7 +1335,12 @@ may have been stored before."
           (org-fold-region (max 1 (1- (point-max))) (point-max) nil))))
     (let ((origin (point-marker)))
       (unless (bolp) (insert "\n"))
-      (org-capture-empty-lines-before)
+      (org-capture-empty-lines-before
+       (or (org-capture-get :empty-lines-before)
+	   (org-capture-get :empty-lines)
+           (when (and (org--blank-before-heading-p)
+                      (not (org-previous-line-empty-p)))
+             1)))
       (let ((beg (point)))
 	(save-restriction
 	  (when insert-here? (narrow-to-region beg beg))
@@ -1305,6 +1419,8 @@ may have been stored before."
 	(org-capture-empty-lines-before
 	 (and item
 	      (not prepend?)
+              ;; FIXME: We should obey `org-blank-before-new-entry'
+              ;; when :empty-lines* is not given.
 	      (min 1 (or (org-capture-get :empty-lines-before)
 			 (org-capture-get :empty-lines)
 			 0)))))
@@ -1353,13 +1469,14 @@ may have been stored before."
 (defun org-capture-place-table-line ()
   "Place the template as a table line."
   (require 'org-table)
-  (let ((text
-	 (pcase (org-trim (org-capture-get :template))
-	   ((pred (string-match-p org-table-border-regexp))
-	    "| %?Bad template |")
-	   (text (concat text "\n"))))
-	(table-line-pos (org-capture-get :table-line-pos))
-	beg end)
+  (let* ((template (org-trim (org-capture-get :template)))
+         (text
+	  (pcase template
+	    ((pred (string-match-p org-table-border-regexp))
+	     (concat "| " template))
+	    (text (concat text "\n"))))
+	 (table-line-pos (org-capture-get :table-line-pos))
+	 beg end)
     (cond
      ((org-capture-get :exact-position)
       (org-with-point-at (org-capture-get :exact-position)
@@ -1439,7 +1556,7 @@ the text of the entry, before the first child.  If not, place the
 template at the beginning or end of the file.
 Of course, if exact position has been required, just put it there."
   (cond
-   ((org-capture-get :exact-position)
+   ((org-capture-get :insert-here)
     (goto-char (org-capture-get :exact-position)))
    ((org-capture-get :target-entry-p)
     ;; Place the text into this entry.
@@ -1448,6 +1565,8 @@ Of course, if exact position has been required, just put it there."
 	(org-end-of-meta-data t)
       ;; Go to end of the entry text, before the next headline.
       (outline-next-heading)))
+   ((org-capture-get :exact-position)
+    (goto-char (org-capture-get :exact-position)))
    (t
     ;; Beginning or end of file.
     (goto-char (if (org-capture-get :prepend) (point-min) (point-max)))))
@@ -1628,7 +1747,10 @@ The template may still contain \"%?\" for cursor positioning.
 INITIAL content and/or ANNOTATION may be specified, but will be overridden
 by their respective `org-store-link-plist' properties if present.
 
-Expansion occurs in a temporary Org mode buffer."
+Expansion occurs in a temporary Org mode buffer that will be displayed
+if the template expansion triggers user prompt.  Beware that displaying
+the temporary buffer may alter point position in the already displayed
+buffers."
   (let* ((template (or template (org-capture-get :template)))
 	 (buffer (org-capture-get :buffer))
 	 (file (buffer-file-name (or (buffer-base-buffer buffer) buffer)))
@@ -1695,222 +1817,246 @@ Expansion occurs in a temporary Org mode buffer."
       (setq template "")
       (message "no template") (ding)
       (sit-for 1))
-    (save-window-excursion
-      (switch-to-buffer-other-window (get-buffer-create "*Capture*"))
-      (erase-buffer)
-      (setq buffer-file-name nil)
-      (setq mark-active nil)
-      (insert template)
-      (org-mode)
-      (goto-char (point-min))
-      ;; %[] insert contents of a file.
-      (save-excursion
-	(while (re-search-forward "%\\[\\(.+\\)\\]" nil t)
-	  (let ((filename (expand-file-name (match-string 1)))
-		(beg (copy-marker (match-beginning 0)))
-		(end (copy-marker (match-end 0))))
-	    (unless (org-capture-escaped-%)
-	      (delete-region beg end)
-	      (set-marker beg nil)
-	      (set-marker end nil)
-	      (condition-case error
-		  (insert-file-contents filename)
-		(error
-		 (insert (format "%%![could not insert %s: %s]"
-				 filename
-				 error))))))))
-      ;; Mark %() embedded elisp for later evaluation.
-      (org-capture-expand-embedded-elisp 'mark)
-      ;; Expand non-interactive templates.
-      (let ((regexp "%\\(:[-A-Za-z]+\\|<\\([^>\n]+\\)>\\|[aAcfFikKlLntTuUx]\\)"))
-	(save-excursion
-	  (while (re-search-forward regexp nil t)
-	    ;; `org-capture-escaped-%' may modify buffer and cripple
-	    ;; match-data.  Use markers instead.  Ditto for other
-	    ;; templates.
-	    (let ((pos (copy-marker (match-beginning 0)))
-		  (end (copy-marker (match-end 0)))
-		  (value (match-string 1))
-		  (time-string (match-string 2)))
-	      (unless (org-capture-escaped-%)
-		(delete-region pos end)
-		(set-marker pos nil)
-		(set-marker end nil)
-		(let* ((inside-sexp? (org-capture-inside-embedded-elisp-p))
-		       (replacement
-			(pcase (string-to-char value)
-			  (?< (format-time-string time-string time))
-			  (?:
-			   (or (plist-get org-store-link-plist (intern value))
-			       ""))
-			  (?i
-			   (if inside-sexp? v-i
-			     ;; Outside embedded Lisp, repeat leading
-			     ;; characters before initial place holder
-			     ;; every line.
-			     (let ((lead (concat "\n"
-						 (org-current-line-string t))))
-			       (replace-regexp-in-string "\n" lead v-i nil t))))
-			  (?a v-a)
-			  (?A v-A)
-			  (?c v-c)
-			  (?f v-f)
-			  (?F v-F)
-			  (?k v-k)
-			  (?K v-K)
-			  (?l v-l)
-			  (?L v-L)
-			  (?n v-n)
-			  (?t v-t)
-			  (?T v-T)
-			  (?u v-u)
-			  (?U v-U)
-			  (?x v-x))))
-		  (insert
-		   (if inside-sexp?
-		       ;; Escape sensitive characters.
-		       (replace-regexp-in-string "[\\\"]" "\\\\\\&" replacement)
-		     replacement))))))))
-      ;; Expand %() embedded Elisp.  Limit to Sexp originally marked.
-      (org-capture-expand-embedded-elisp)
-      ;; Expand interactive templates.  This is the last step so that
-      ;; template is mostly expanded when prompting happens.  Turn on
-      ;; Org mode and set local variables.  This is to support
-      ;; completion in interactive prompts.
-      (let ((org-inhibit-startup t)) (org-mode))
-      (org-clone-local-variables buffer "\\`org-")
-      (let (strings)			; Stores interactive answers.
-	(save-excursion
-	  (let ((regexp "%\\^\\(?:{\\([^}]*\\)}\\)?\\([CgGLptTuU]\\)?"))
-	    (while (re-search-forward regexp nil t)
-	      (let* ((items (and (match-end 1)
-				 (save-match-data
-				   (split-string (match-string-no-properties 1)
-						 "|"))))
-		     (key (match-string 2))
-		     (beg (copy-marker (match-beginning 0)))
-		     (end (copy-marker (match-end 0)))
-		     (prompt (nth 0 items))
-		     (default (nth 1 items))
-		     (completions (nthcdr 2 items)))
-		(unless (org-capture-escaped-%)
-		  (delete-region beg end)
-		  (set-marker beg nil)
-		  (set-marker end nil)
-		  (pcase key
-		    ((or "G" "g")
-		     (let* ((org-last-tags-completion-table
-			     (org-global-tags-completion-table
-			      (cond ((equal key "G") (org-agenda-files))
-				    (file (list file))
-				    (t nil))))
-			    (org-add-colon-after-tag-completion t)
-			    (ins (mapconcat
-				  #'identity
-				  (let ((crm-separator "[ \t]*:[ \t]*"))
-                                    (completing-read-multiple
-				     (if prompt (concat prompt ": ") "Tags: ")
-				     org-last-tags-completion-table nil nil nil
-				     'org-tags-history))
-				  ":")))
-		       (when (org-string-nw-p ins)
-			 (unless (eq (char-before) ?:) (insert ":"))
-			 (insert ins)
-			 (unless (eq (char-after) ?:) (insert ":"))
-			 (when (org-at-heading-p) (org-align-tags)))))
-		    ((or "C" "L")
-		     (let ((insert-fun (if (equal key "C") #'insert
-					 (lambda (s) (org-insert-link 0 s)))))
-		       (pcase org-capture--clipboards
-			 (`nil nil)
-			 (`(,value) (funcall insert-fun value))
-			 (`(,first-value . ,_)
-			  (funcall insert-fun
-				   (read-string "Clipboard/kill value: "
-						first-value
-						'org-capture--clipboards
-						first-value)))
-			 (_ (error "Invalid `org-capture--clipboards' value: %S"
-				   org-capture--clipboards)))))
-		    ("p"
-		     ;; We remove keyword properties inherited from
-		     ;; target buffer so `org-read-property-value' has
-		     ;; a chance to find allowed values in sub-trees
-		     ;; from the target buffer.
-		     (setq-local org-keyword-properties nil)
-		     (let* ((origin (set-marker (make-marker)
-						(org-capture-get :pos)
-						(org-capture-get :buffer)))
-			    ;; Find location from where to get allowed
-			    ;; values.  If `:target-entry-p' is
-			    ;; non-nil, the current headline in the
-			    ;; target buffer is going to be a parent
-			    ;; headline, so location is fine.
-			    ;; Otherwise, find the parent headline in
-			    ;; the target buffer.
-			    (pom (if (org-capture-get :target-entry-p) origin
-				   (let ((level (progn
-						  (while (org-up-heading-safe))
-						  (org-current-level))))
-				     (org-with-point-at origin
-				       (let ((l (if (org-at-heading-p)
-						    (org-current-level)
-						  most-positive-fixnum)))
-					 (while (and l (>= l level))
-					   (setq l (org-up-heading-safe)))
-					 (if l (point-marker)
-					   (point-min-marker)))))))
-			    (value
-			     (org-read-property-value prompt pom default)))
-		       (org-set-property prompt value)))
-		    ((or "t" "T" "u" "U")
-		     ;; These are the date/time related ones.
-		     (let* ((upcase? (equal (upcase key) key))
-			    (org-end-time-was-given nil)
-			    (time (org-read-date upcase? t nil prompt)))
-		       (org-insert-timestamp
-			time (or org-time-was-given upcase?)
-			(member key '("u" "U"))
-			nil nil (list org-end-time-was-given))))
-		    (`nil
-		     ;; Load history list for current prompt.
-		     (setq org-capture--prompt-history
-			   (gethash prompt org-capture--prompt-history-table))
-                     (push (org-completing-read
-                            (org-format-prompt (or prompt "Enter string") default)
-			    completions
-			    nil nil nil 'org-capture--prompt-history default)
-			   strings)
-		     (insert (car strings))
-		     ;; Save updated history list for current prompt.
-		     (puthash prompt org-capture--prompt-history
-			      org-capture--prompt-history-table))
-		    (_
-		     (error "Unknown template placeholder: \"%%^%s\""
-			    key))))))))
-	;; Replace %n escapes with nth %^{...} string.
-	(setq strings (nreverse strings))
-	(save-excursion
-	  (while (re-search-forward "%\\\\\\([1-9][0-9]*\\)" nil t)
-	    (unless (org-capture-escaped-%)
-	      (replace-match
-	       (nth (1- (string-to-number (match-string 1))) strings)
-	       nil t)))))
-      ;; Make sure there are no empty lines before the text, and that
-      ;; it ends with a newline character or it is empty.
-      (skip-chars-forward " \t\n")
-      (delete-region (point-min) (line-beginning-position))
-      (goto-char (point-max))
-      (skip-chars-backward " \t\n")
-      (if (bobp) (delete-region (point) (line-end-position))
-	(end-of-line)
-	(delete-region (point) (point-max))
-	(insert "\n"))
-      ;; Return the expanded template and kill the capture buffer.
-      (untabify (point-min) (point-max))
-      (set-buffer-modified-p nil)
-      (prog1 (buffer-substring-no-properties (point-min) (point-max))
-	(kill-buffer (current-buffer))))))
+    (let ((capture-tmp-buffer (generate-new-buffer "*Capture*")))
+      (unwind-protect
+          (save-window-excursion
+            (switch-to-buffer-other-window capture-tmp-buffer)
+            (erase-buffer)
+            (setq buffer-file-name nil)
+            (setq mark-active nil)
+            (insert template)
+            (org-mode)
+            (goto-char (point-min))
+            ;; %[] insert contents of a file.
+            (save-excursion
+	      (while (re-search-forward "%\\[\\(.+\\)\\]" nil t)
+	        (let ((filename (expand-file-name (match-string 1)))
+		      (beg (copy-marker (match-beginning 0)))
+		      (end (copy-marker (match-end 0))))
+	          (unless (org-capture-escaped-%)
+	            (delete-region beg end)
+	            (set-marker beg nil)
+	            (set-marker end nil)
+	            (condition-case error
+		        (insert-file-contents filename)
+		      (error
+		       (insert (format "%%![could not insert %s: %s]"
+				       filename
+				       error))))))))
+            ;; Mark %() embedded elisp for later evaluation.
+            (org-capture-expand-embedded-elisp 'mark)
+            ;; Expand non-interactive templates.
+            (let ((regexp "%\\(:[-A-Za-z]+\\|<\\([^>\n]+\\)>\\|[aAcfFikKlLntTuUx]\\)"))
+	      (save-excursion
+	        (while (re-search-forward regexp nil t)
+	          ;; `org-capture-escaped-%' may modify buffer and cripple
+	          ;; match-data.  Use markers instead.  Ditto for other
+	          ;; templates.
+	          (let ((pos (copy-marker (match-beginning 0)))
+		        (end (copy-marker (match-end 0)))
+		        (value (match-string 1))
+		        (time-string (match-string 2)))
+	            (unless (org-capture-escaped-%)
+		      (delete-region pos end)
+		      (set-marker pos nil)
+		      (set-marker end nil)
+		      (let* ((inside-sexp? (org-capture-inside-embedded-elisp-p))
+		             (replacement
+			      (pcase (string-to-char value)
+			        (?< (format-time-string time-string time))
+			        (?:
+			         (or (plist-get org-store-link-plist (intern value))
+			             ""))
+			        (?i
+			         (if inside-sexp? v-i
+			           ;; Outside embedded Lisp, repeat leading
+			           ;; characters before initial place holder
+			           ;; every line.
+			           (let ((lead (concat "\n"
+						       (org-current-line-string t))))
+			             (replace-regexp-in-string "\n" lead v-i nil t))))
+			        (?a v-a)
+			        (?A v-A)
+			        (?c v-c)
+			        (?f v-f)
+			        (?F v-F)
+			        (?k v-k)
+			        (?K v-K)
+			        (?l v-l)
+			        (?L v-L)
+			        (?n v-n)
+			        (?t v-t)
+			        (?T v-T)
+			        (?u v-u)
+			        (?U v-U)
+			        (?x v-x))))
+		        (insert
+		         (if inside-sexp?
+		             ;; Escape sensitive characters.
+		             (replace-regexp-in-string "[\\\"]" "\\\\\\&" replacement)
+		           replacement))))))))
+            ;; Expand %() embedded Elisp.  Limit to Sexp originally marked.
+            (org-capture-expand-embedded-elisp)
+            ;; Expand interactive templates.  This is the last step so that
+            ;; template is mostly expanded when prompting happens.  Turn on
+            ;; Org mode and set local variables.  This is to support
+            ;; completion in interactive prompts.
+            (let ((org-inhibit-startup t)) (org-mode))
+            (org-clone-local-variables buffer "\\`org-")
+            (let (strings			; Stores interactive answers.
+                  strings-all                 ; ... include %^{prompt}X answers
+                  )
+	      (save-excursion
+	        (let ((regexp "%\\^\\(?:{\\([^}]*\\)}\\)?\\([CgGLptTuU]\\)?"))
+	          (while (re-search-forward regexp nil t)
+	            (let* ((items (and (match-end 1)
+				       (save-match-data
+				         (split-string (match-string-no-properties 1)
+						       "|"))))
+		           (key (match-string 2))
+		           (beg (copy-marker (match-beginning 0)))
+		           (end (copy-marker (match-end 0)))
+		           (prompt (nth 0 items))
+		           (default (nth 1 items))
+		           (completions (nthcdr 2 items)))
+		      (unless (org-capture-escaped-%)
+		        (delete-region beg end)
+		        (set-marker beg nil)
+		        (set-marker end nil)
+		        (pcase key
+		          ((or "G" "g")
+		           (let* ((org-last-tags-completion-table
+			           (org-global-tags-completion-table
+			            (cond ((equal key "G") (org-agenda-files))
+				          (file (list file))
+				          (t nil))))
+			          (org-add-colon-after-tag-completion t)
+			          (ins (mapconcat
+				        #'identity
+				        (let ((crm-separator "[ \t]*:[ \t]*"))
+                                          (completing-read-multiple
+				           (if prompt (concat prompt ": ") "Tags: ")
+				           org-last-tags-completion-table nil nil nil
+				           'org-tags-history))
+				        ":")))
+		             (when (org-string-nw-p ins)
+                               (push (concat ":" ins ":") strings-all)
+			       (unless (eq (char-before) ?:) (insert ":"))
+			       (insert ins)
+			       (unless (eq (char-after) ?:) (insert ":"))
+			       (when (org-at-heading-p) (org-align-tags)))))
+		          ((or "C" "L")
+		           (let ((insert-fun (if (equal key "C") #'insert
+					       (lambda (s) (org-insert-link 0 s)))))
+		             (pcase org-capture--clipboards
+			       (`nil nil)
+			       (`(,value)
+                                (funcall insert-fun value)
+                                (push value strings-all))
+			       (`(,first-value . ,_)
+			        (funcall insert-fun
+                                         (let ((val
+				                (read-string "Clipboard/kill value: "
+						             first-value
+						             'org-capture--clipboards
+						             first-value)))
+                                           (push val strings-all)
+                                           val)))
+			       (_ (error "Invalid `org-capture--clipboards' value: %S"
+				         org-capture--clipboards)))))
+		          ("p"
+		           ;; We remove keyword properties inherited from
+		           ;; target buffer so `org-read-property-value' has
+		           ;; a chance to find allowed values in sub-trees
+		           ;; from the target buffer.
+		           (setq-local org-keyword-properties nil)
+		           (let* ((origin (set-marker (make-marker)
+						      (org-capture-get :pos)
+						      (org-capture-get :buffer)))
+			          ;; Find location from where to get allowed
+			          ;; values.  If `:target-entry-p' is
+			          ;; non-nil, the current headline in the
+			          ;; target buffer is going to be a parent
+			          ;; headline, so location is fine.
+			          ;; Otherwise, find the parent headline in
+			          ;; the target buffer.
+			          (pom (if (org-capture-get :target-entry-p) origin
+				         (let ((level (progn
+						        (while (org-up-heading-safe))
+						        (org-current-level))))
+				           (org-with-point-at origin
+				             (let ((l (if (org-at-heading-p)
+						          (org-current-level)
+						        most-positive-fixnum)))
+					       (while (and l (>= l level))
+					         (setq l (org-up-heading-safe)))
+					       (if l (point-marker)
+					         (point-min-marker)))))))
+			          (value
+                                   (org-read-property-value prompt pom default)))
+		             (org-set-property prompt value)
+                             (push value strings-all)))
+		          ((or "t" "T" "u" "U")
+		           ;; These are the date/time related ones.
+		           (let* ((upcase? (equal (upcase key) key))
+			          (org-end-time-was-given nil)
+			          (time (org-read-date upcase? t nil prompt)))
+                             (push
+			      (org-insert-timestamp
+			       time (or org-time-was-given upcase?)
+			       (member key '("u" "U"))
+			       nil nil (list org-end-time-was-given))
+			      strings-all)))
+		          (`nil
+		           ;; Load history list for current prompt.
+		           (setq org-capture--prompt-history
+			         (gethash prompt org-capture--prompt-history-table))
+                           (push (org-completing-read
+                                  (org-format-prompt (or prompt "Enter string") default)
+			          completions
+			          nil nil nil 'org-capture--prompt-history default)
+			         strings)
+                           (push (car strings) strings-all)
+		           (insert (car strings))
+		           ;; Save updated history list for current prompt.
+		           (puthash prompt org-capture--prompt-history
+			            org-capture--prompt-history-table))
+		          (_
+		           (error "Unknown template placeholder: \"%%^%s\""
+			          key))))))))
+	      ;; Replace %n escapes with nth %^{...} string.
+	      (setq strings (nreverse strings))
+	      (save-excursion
+	        (while (re-search-forward "%\\\\\\([1-9][0-9]*\\)" nil t)
+	          (unless (org-capture-escaped-%)
+	            (replace-match
+	             (nth (1- (string-to-number (match-string 1))) strings)
+	             nil t))))
+	      ;; Replace %*n escapes with nth %^{...} string.
+	      (setq strings-all (nreverse strings-all))
+	      (save-excursion
+	        (while (re-search-forward "%\\\\\\(\\*\\([1-9][0-9]*\\)\\)" nil t)
+	          (unless (org-capture-escaped-%)
+	            (replace-match
+	             (nth (1- (string-to-number (match-string 2))) strings-all)
+	             nil t)))))
+            ;; Make sure there are no empty lines before the text, and that
+            ;; it ends with a newline character or it is empty.
+            (skip-chars-forward " \t\n")
+            (delete-region (point-min) (line-beginning-position))
+            (goto-char (point-max))
+            (skip-chars-backward " \t\n")
+            (if (bobp) (delete-region (point) (line-end-position))
+	      (end-of-line)
+	      (delete-region (point) (point-max))
+	      (insert "\n"))
+            ;; Return the expanded template and kill the capture buffer.
+            (untabify (point-min) (point-max))
+            (buffer-substring-no-properties (point-min) (point-max)))
+        (when (buffer-live-p capture-tmp-buffer)
+          (with-current-buffer capture-tmp-buffer
+            (set-buffer-modified-p nil)
+            (kill-buffer)))))))
 
 (defun org-capture-escaped-% ()
   "Non-nil if % was escaped.
@@ -1950,7 +2096,7 @@ marked Sexp are evaluated when this argument is nil."
        ;; Only mark valid and non-escaped sexp.
        ((org-capture-escaped-%) nil)
        (t
-	(let ((end (with-syntax-table emacs-lisp-mode-syntax-table
+	(let ((end (org-with-syntax-table emacs-lisp-mode-syntax-table
 		     (ignore-errors (scan-sexps (1- (point)) 1)))))
 	  (when end
 	    (put-text-property (- (point) 2) end 'org-embedded-elisp t))))))))
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index a9b7cfd7ae3..ce2d23a9b97 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -50,7 +50,6 @@
 (declare-function org-link-heading-search-string "ol" (&optional string))
 (declare-function org-link-make-string "ol" (link &optional description))
 (declare-function org-table-goto-line "org-table" (n))
-(declare-function org-dynamic-block-define "org" (type func))
 (declare-function w32-notification-notify "w32fns.c" (&rest params))
 (declare-function w32-notification-close "w32fns.c" (&rest params))
 (declare-function dbus-list-activatable-names "dbus" (&optional bus))
@@ -132,7 +131,7 @@ clocking out."
   "Rounding minutes when clocking in or out.
 The default value is 0 so that no rounding is done.
 When set to a non-integer value, use the car of
-`org-timestamp-rounding-minutes', like for setting a timestamp.
+`org-time-stamp-rounding-minutes', like for setting a timestamp.
 
 E.g. if `org-clock-rounding-minutes' is set to 5, time is 14:47
 and you clock in: then the clock starts at 14:45.  If you clock
@@ -144,7 +143,7 @@ out time will be 14:50."
   :package-version '(Org . "8.0")
   :type '(choice
 	  (integer :tag "Minutes (0 for no rounding)")
-	  (symbol  :tag "Use `org-time-stamp-rounding-minutes'" 'same-as-time-stamp)))
+	  (const   :tag "Use `org-time-stamp-rounding-minutes'" same-as-time-stamp)))
 
 (defcustom org-clock-out-remove-zero-time-clocks nil
   "Non-nil means remove the clock line when the resulting time is zero."
@@ -741,27 +740,80 @@ pointing to it."
 (defvar org-clock-update-period 60
   "Number of seconds between mode line clock string updates.")
 
-(defun org-clock-get-clock-string ()
+(defun org-clock-get-clock-string (&optional max-length)
   "Form a clock-string, that will be shown in the mode line.
 If an effort estimate was defined for the current item, use
-01:30/01:50 format (clocked/estimated).
-If not, show simply the clocked time like 01:50."
-  (let ((clocked-time (org-clock-get-clocked-time)))
-    (if org-clock-effort
-	(let* ((effort-in-minutes (org-duration-to-minutes org-clock-effort))
-	       (work-done-str
-		(propertize (org-duration-from-minutes clocked-time)
-			    'face
-			    (if (and org-clock-task-overrun
-				     (not org-clock-task-overrun-text))
-				'org-mode-line-clock-overrun
-			      'org-mode-line-clock)))
-	       (effort-str (org-duration-from-minutes effort-in-minutes)))
-	  (format (propertize "[%s/%s] (%s) " 'face 'org-mode-line-clock)
-		  work-done-str effort-str org-clock-heading))
-      (format (propertize "[%s] (%s) " 'face 'org-mode-line-clock)
-	      (org-duration-from-minutes clocked-time)
-	      org-clock-heading))))
+01:30/01:50 format (clocked/estimated).  If not, show simply
+the clocked time like 01:50.
+
+When the optional MAX-LENGTH argument is given, this function
+will preferentially truncate the headline in order to ensure
+that the entire clock string's length remains under the
+limit."
+  (let* ((max-string-length (or max-length 0))
+         (clocked-time (org-clock-get-clocked-time))
+         (clock-str (org-duration-from-minutes clocked-time))
+         (clock-format-str (propertize "[%s]" 'face 'org-mode-line-clock))
+         (clock-format-effort-str (propertize "[%s/%s]"
+                                              'face
+                                              'org-mode-line-clock))
+         (mode-line-str-with-headline (propertize "%s (%s) "
+                                                  'face
+                                                  'org-mode-line-clock))
+         (mode-line-str-without-headline (propertize "%s "
+                                                     'face
+                                                     'org-mode-line-clock))
+         (effort-estimate-str (if org-clock-effort
+                         (org-duration-from-minutes
+                          (org-duration-to-minutes
+                           org-clock-effort))
+                       nil))
+         (time-str (if (not org-clock-effort)
+                       (format clock-format-str clock-str)
+                     (format clock-format-effort-str
+                             (propertize clock-str
+                                         'face
+                                         (if (and org-clock-task-overrun
+                                                  (not
+                                                   org-clock-task-overrun-text))
+                                             'org-mode-line-clock-overrun
+                                           'org-mode-line-clock))
+                             effort-estimate-str)))
+         (spaces-and-parens-length (1+ (length
+                                        (format
+                                         mode-line-str-with-headline "" ""))))
+         (untruncated-length (+ spaces-and-parens-length (length time-str)
+                                (length org-clock-heading))))
+    ;; There are three cases for displaying the mode-line clock string.
+    ;; 1. MAX-STRING-LENGTH is zero or greater than UNTRUNCATED-LENGTH
+    ;;      - We can display the clock and the headline without truncation
+    ;; 2. MAX-STRING-LENGTH is above zero and less than or equal to
+    ;;    (+ SPACES-AND-PARENS-LENGTH (LENGTH TIME-STR))
+    ;;      - There isn't enough room to display any of the headline so just
+    ;;        display a (truncated) time string
+    ;; 3. ORG-CLOCK-STRING-LIMIT is greater than
+    ;;    (+ SPACES-AND-PARENS-LENGTH (LENGTH TIME-STR)) but less than
+    ;;    UNTRUNCATED-LENGTH
+    ;;      - Intelligently truncate the headline such that the total length of
+    ;;        the mode line string is less than ORG-CLOCK-STRING-LIMIT
+    (cond ((or (<= max-string-length 0)
+               (>= max-string-length untruncated-length))
+           (format mode-line-str-with-headline time-str org-clock-heading))
+          ((or (<= max-string-length 0)
+               (<= max-string-length (+ spaces-and-parens-length
+                                        (length time-str))))
+           (format mode-line-str-without-headline
+                   (substring time-str 0 (min (length time-str)
+                                              max-string-length))))
+          (t
+           (let ((heading-length (- max-string-length
+                                    (+ spaces-and-parens-length
+                                       (length time-str)))))
+             (format mode-line-str-with-headline
+                     time-str
+                     (string-join `(,(substring org-clock-heading
+                                                0 heading-length)
+                                    "…"))))))))
 
 (defun org-clock-get-last-clock-out-time ()
   "Get the last clock-out time for the current subtree."
@@ -781,15 +833,10 @@ When optional argument is non-nil, refresh cached heading."
   (when refresh (setq org-clock-heading (org-clock--mode-line-heading)))
   (setq org-mode-line-string
 	(propertize
-	 (let ((clock-string (org-clock-get-clock-string))
+	 (let ((clock-string (org-clock-get-clock-string org-clock-string-limit))
 	       (help-text "Org mode clock is running.\nmouse-1 shows a \
 menu\nmouse-2 will jump to task"))
-	   (if (and (> org-clock-string-limit 0)
-		    (> (length clock-string) org-clock-string-limit))
-	       (propertize
-		(substring clock-string 0 org-clock-string-limit)
-		'help-echo (concat help-text ": " org-clock-heading))
-	     (propertize clock-string 'help-echo help-text)))
+	   (propertize clock-string 'help-echo help-text))
 	 'local-map org-clock-mode-line-map
 	 'mouse-face 'mode-line-highlight))
   (if (and org-clock-task-overrun org-clock-task-overrun-text)
@@ -1245,14 +1292,11 @@ If `only-dangling-p' is non-nil, only ask to resolve dangling
 
 (defvar org-x11idle-exists-p
   ;; Check that x11idle exists.  But don't do that on DOS/Windows,
-  ;; since the command definitely does NOT exist there, and invoking
-  ;; COMMAND.COM on MS-Windows is a bad idea -- it hangs.
+  ;; since the command definitely does NOT exist there.
   (and (null (memq system-type '(windows-nt ms-dos)))
-       (eq 0 (call-process-shell-command
-              (format "command -v %s" org-clock-x11idle-program-name)))
+       (executable-find org-clock-x11idle-program-name)
        ;; Check that x11idle can retrieve the idle time
-       ;; FIXME: Why "..-shell-command" rather than just `call-process'?
-       (eq 0 (call-process-shell-command org-clock-x11idle-program-name))))
+       (eq 0 (call-process org-clock-x11idle-program-name))))
 
 (defun org-x11-idle-seconds ()
   "Return the current X11 idle time in seconds."
@@ -1287,6 +1331,8 @@ This routine returns a floating point number."
     (org-mac-idle-seconds))
    ((and (eq window-system 'x) org-x11idle-exists-p)
     (org-x11-idle-seconds))
+   ((fboundp 'w32-system-idle-time)
+    (/ (w32-system-idle-time) 1000.0))
    ((and
      org-logind-dbus-session-path
      (dbus-get-property
@@ -3251,7 +3297,7 @@ The details of what will be saved are regulated by the variable
 		 org-clock-has-been-used
 		 (not (file-exists-p org-clock-persist-file))))
     (with-temp-file org-clock-persist-file
-      (insert (format ";; %s - %s at %s\n"
+      (insert (format ";; %s - %s at %s  -*- lexical-binding: t; -*-\n"
 		      (file-name-nondirectory org-clock-persist-file)
 		      (system-name)
 		      (format-time-string (org-time-stamp-format t))))
@@ -3316,7 +3362,7 @@ The details of what will be saved are regulated by the variable
   "Query user when killing Emacs.
 This function is added to `kill-emacs-query-functions'."
   (let ((buf (org-clocking-buffer)))
-    (when (and buf (yes-or-no-p "Clock out and save? "))
+    (when (and buf (yes-or-no-p "Clock out before exiting? "))
       (with-current-buffer buf
         (org-clock-out)
         (save-buffer))))
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index f6e72bfd52f..8b97aa2ad01 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -39,12 +39,11 @@
 (declare-function org-clock-sum-today "org-clock" (&optional headline-filter))
 (declare-function org-element-extract "org-element-ast" (node))
 (declare-function org-element-interpret-data "org-element" (data))
-(declare-function org-element-map "org-element" (data types fun &optional info first-match no-recursion with-affiliated))
+(declare-function org-element-map "org-element" (data types fun &optional info first-match no-recursion with-affiliated no-undefer))
 (declare-function org-element-parse-secondary-string "org-element" (string restriction &optional parent))
 (declare-function org-element-property "org-element-ast" (property node))
 (declare-function org-element-restriction "org-element" (element))
 (declare-function org-element-type-p "org-element-ast" (node types))
-(declare-function org-dynamic-block-define "org" (type func))
 (declare-function org-link-display-format "ol" (s))
 (declare-function org-link-open-from-string "ol" (s &optional arg))
 (declare-function face-remap-remove-relative "face-remap" (cookie))
@@ -74,7 +73,7 @@ node `(org)Column attributes')."
 
 (defcustom org-columns-modify-value-for-display-function nil
   "Function that modifies values for display in column view.
-For example, it can be used to cut out a certain part from a time stamp.
+For example, it can be used to cut out a certain part from a timestamp.
 The function must take 2 arguments:
 
 column-title    The title of the column (*not* the property name)
@@ -107,9 +106,8 @@ or (LABEL SUMMARIZE COLLECT) where
   properties is set, e.g., to return VACATION_DAYS only if
   CONFIRMED is true.
 
-Note that the return value can become one value for an higher
-order summary, so the function is expected to handle its own
-output.
+Note that the return value can become one value for a higher-order
+summary, so the function is expected to handle its own output.
 
 Types defined in this variable take precedence over those defined
 in `org-columns-summary-types-default', which see."
@@ -151,10 +149,10 @@ This is the compiled version of the format.")
   "Currently active maximum column widths, as a vector.")
 
 (defvar-local org-columns-begin-marker nil
-  "Points to the position where last a column creation command was called.")
+  "Points to the position where a column creation command was last called.")
 
 (defvar-local org-columns-top-level-marker nil
-  "Points to the position where current columns region starts.")
+  "Points to the position where the current columns region starts.")
 
 (defvar org-columns--time 0.0
   "Number of seconds since the epoch, as a floating point number.")
@@ -179,7 +177,7 @@ This is the compiled version of the format.")
     ("@mean" . org-columns--summary-mean-age)
     ("@min"  . org-columns--summary-min-age)
     ("est+"  . org-columns--summary-estimate))
-  "Map operators to summarize functions.
+  "Map operators to summary functions.
 See `org-columns-summary-types' for details.")
 
 (defun org-columns-content ()
@@ -274,12 +272,12 @@ value for ITEM property."
 	(`(,(or "DEADLINE" "SCHEDULED" "TIMESTAMP") . ,_)
 	 (replace-regexp-in-string org-ts-regexp "[\\1]" value))
 	(`(,_ ,_ ,_ ,_ nil) value)
-	;; If PRINTF is set, assume we are displaying a number and
+	;; If FMT is set, assume we are displaying a number and
 	;; obey to the format string.
-	(`(,_ ,_ ,_ ,_ ,printf) (format printf (string-to-number value)))
+	(`(,_ ,_ ,_ ,_ ,fmt) (format fmt (string-to-number value)))
 	(_ (error "Invalid column specification format: %S" spec)))))
 
-(defun org-columns--collect-values (&optional compiled-fmt)
+(defun org-columns--collect-values (&optional compiled-fmt agenda-marker)
   "Collect values for columns on the current line.
 
 Return a list of triplets (SPEC VALUE DISPLAYED) suitable for
@@ -287,7 +285,11 @@ Return a list of triplets (SPEC VALUE DISPLAYED) suitable for
 
 This function assumes `org-columns-current-fmt-compiled' is
 initialized is set in the current buffer.  However, it is
-possible to override it with optional argument COMPILED-FMT."
+possible to override it with optional argument COMPILED-FMT.
+
+The optional argument AGENDA-MARKER is used when called from the
+agenda to pass a marker to the agenda line.
+"
   (let ((summaries (get-text-property (point) 'org-summaries)))
     (mapcar
      (lambda (spec)
@@ -299,11 +301,19 @@ possible to override it with optional argument COMPILED-FMT."
 			     ;; Effort property is not defined.  Try
 			     ;; to use appointment duration.
 			     org-agenda-columns-add-appointments-to-effort-sum
+                             agenda-marker
 			     (string= p (upcase org-effort-property))
-			     (get-text-property (point) 'duration)
-			     (propertize (org-duration-from-minutes
-					  (get-text-property (point) 'duration))
-					 'face 'org-warning))
+			     (get-text-property
+                              (marker-position agenda-marker)
+                              'duration
+                              (marker-buffer agenda-marker))
+			     (propertize
+                              (org-duration-from-minutes
+                               (get-text-property
+                                (marker-position agenda-marker)
+                                'duration
+                                (marker-buffer agenda-marker)))
+			      'face 'org-warning))
 			"")))
 	    ;; A non-nil COMPILED-FMT means we're calling from Org
 	    ;; Agenda mode, where we do not want leading stars for
@@ -498,7 +508,11 @@ substring whose `string-width' does not exceed WIDTH."
   "Inhibit recomputing of columns on column view startup.")
 (defvar org-columns-flyspell-was-active nil
   "Remember the state of `flyspell-mode' before column view.
-Flyspell-mode can cause problems in columns view, so it is turned off
+Flyspell mode can cause problems in columns view, so it is turned off
+for the duration of the command.")
+(defvar org-columns-org-num-was-active nil
+  "Remember the state of `org-num-mode' before column view.
+Org-num mode can cause problems in columns view, so it is turned off
 for the duration of the command.")
 
 (defvar header-line-format)
@@ -564,6 +578,8 @@ for the duration of the command.")
 	(remove-text-properties (point-min) (point-max) '(read-only t))))
     (when org-columns-flyspell-was-active
       (flyspell-mode 1))
+    (when org-columns-org-num-was-active
+      (org-num-mode 1))
     (when (local-variable-p 'org-colview-initial-truncate-line-value)
       (setq truncate-lines org-colview-initial-truncate-line-value))))
 
@@ -685,7 +701,7 @@ Where possible, use the standard interface for changing this line."
      ((eq major-mode 'org-agenda-mode)
       (org-columns--call action)
       ;; The following let preserves the current format, and makes
-      ;; sure that in only a single file things need to be updated.
+      ;; sure that only a single file needs to be updated.
       (let* ((org-overriding-columns-format org-columns-current-fmt)
 	     (buffer (marker-buffer pom))
 	     (org-agenda-contributing-files
@@ -801,8 +817,8 @@ an integer, select that value."
 
 (defun org-colview-construct-allowed-dates (s)
   "Construct a list of three dates around the date in S.
-This respects the format of the time stamp in S, active or non-active,
-and also including time or not.  S must be just a time stamp, no text
+This respects the format of the timestamp in S, active or non-active,
+and also including time or not.  S must be just a timestamp, no text
 around it."
   (when (and s (string-match (concat "^" org-ts-regexp3 "$") s))
     (let* ((time (org-parse-time-string s 'nodefaults))
@@ -873,7 +889,7 @@ Also sets `org-columns-top-level-marker' to the new position."
 Column view applies to the whole buffer if point is before the first
 headline.  Otherwise, it applies to the first ancestor setting
 \"COLUMNS\" property.  If there is none, it defaults to the current
-headline.  With a `\\[universal-argument]' prefix \ argument, GLOBAL,
+headline.  With a `\\[universal-argument]' prefix argument, GLOBAL,
 turn on column view for the whole buffer unconditionally.
 
 When COLUMNS-FMT-STRING is non-nil, use it as the column format."
@@ -909,6 +925,9 @@ When COLUMNS-FMT-STRING is non-nil, use it as the column format."
 	    (when (setq-local org-columns-flyspell-was-active
 			      (bound-and-true-p flyspell-mode))
 	      (flyspell-mode 0))
+            (when (setq-local org-columns-org-num-was-active
+			      (bound-and-true-p org-num-mode))
+	      (org-num-mode 0))
 	    (unless (local-variable-p 'org-colview-initial-truncate-line-value)
 	      (setq-local org-colview-initial-truncate-line-value
 			  truncate-lines))
@@ -918,15 +937,37 @@ When COLUMNS-FMT-STRING is non-nil, use it as the column format."
 	      (goto-char (car entry))
 	      (org-columns--display-here (cdr entry)))))))))
 
+(defun org-columns--summary-types-completion-function (string pred flag)
+  (let ((completion-table
+         (org-completion-table-with-metadata
+          (lambda (str pred comp)
+            (complete-with-action comp
+                                  (delete-dups
+                                   (cons '("" "")
+                                         (mapcar #'car
+                                                 (append org-columns-summary-types
+                                                         org-columns-summary-types-default))))
+                                  str pred))
+          `(metadata
+            . ((annotation-function
+                . ,(lambda (string)
+                     (let* ((doc (ignore-errors
+                                   (documentation
+                                    (cdr (assoc string
+                                                (append org-columns-summary-types
+                                                        org-columns-summary-types-default))))))
+                            (doc (and doc (substring doc 0 (string-search "\n" doc)))))
+                       (if doc (format " -- %s" doc) "")))))))))
+    (complete-with-action flag completion-table string pred)))
+
 (defun org-columns-new (&optional spec &rest attributes)
   "Insert a new column, to the left of the current column.
 Interactively fill attributes for new column.  When column format
 specification SPEC is provided, edit it instead.
 
-When optional argument attributes can be a list of columns
-specifications attributes to create the new column
-non-interactively.  See `org-columns-compile-format' for
-details."
+When optional argument ATTRIBUTES is provided, it should be a list of
+column specification attributes to create the new column
+non-interactively.  See `org-columns-compile-format' for details."
   (interactive)
   (let ((new (or attributes
 		 (let ((prop
@@ -935,8 +976,10 @@ details."
 			 (mapcar #'list (org-buffer-property-keys t nil t))
 			 nil nil (nth 0 spec))))
 		   (list prop
-			 (read-string (format "Column title [%s]: " prop)
-				      (nth 1 spec))
+                         ;; Discard useless whitespace-only titles.
+			 (org-string-nw-p
+                          (read-string (format "Column title [%s]: " prop)
+				       (nth 1 spec)))
 			 ;; Use `read-string' instead of `read-number'
 			 ;; to allow empty width.
 			 (let ((w (read-string
@@ -945,15 +988,10 @@ details."
 					(number-to-string (nth 2 spec))))))
 			   (and (org-string-nw-p w) (string-to-number w)))
 			 (org-string-nw-p
-			  (completing-read
-			   "Summary: "
-			   (delete-dups
-			    (cons '("")	;Allow empty operator.
-				  (mapcar (lambda (x) (list (car x)))
-					  (append
-					   org-columns-summary-types
-					   org-columns-summary-types-default))))
-			   nil t (nth 3 spec)))
+                          (completing-read
+                           "Summary: "
+                           'org-columns--summary-types-completion-function
+                           nil t (nth 3 spec)))
 			 (org-string-nw-p
 			  (read-string "Format: " (nth 4 spec))))))))
     (if spec
@@ -964,7 +1002,7 @@ details."
     (org-columns-redo)))
 
 (defun org-columns-delete ()
-  "Delete the column at point from columns view."
+  "Delete the column at point from column view."
   (interactive)
   (let ((spec (nth (org-current-text-column) org-columns-current-fmt-compiled)))
     (when (y-or-n-p (format "Are you sure you want to remove column %S? "
@@ -1158,13 +1196,13 @@ COMPILED is an alist, as returned by `org-columns-compile-format'."
   (mapconcat
    (lambda (spec)
      (pcase spec
-       (`(,prop ,title ,width ,op ,printf)
+       (`(,prop ,title ,width ,op ,fmt)
 	(concat "%"
 		(and width (number-to-string width))
 		prop
 		(and title (not (equal prop title)) (format "(%s)" title))
 		(cond ((not op) nil)
-		      (printf (format "{%s;%s}" op printf))
+		      (fmt (format "{%s;%s}" op fmt))
 		      (t (format "{%s}" op)))))))
    compiled " "))
 
@@ -1177,26 +1215,30 @@ property    the property name, as an upper-case string
 title       the title field for the columns, as a string
 width       the column width in characters, can be nil for automatic width
 operator    the summary operator, as a string, or nil
-printf      a printf format for computed values, as a string, or nil
+format      a `format' string for computed values, or nil
 
 This function updates `org-columns-current-fmt-compiled'."
   (setq org-columns-current-fmt-compiled nil)
   (let ((start 0))
     (while (string-match
-	    "%\\([0-9]+\\)?\\([[:alnum:]_-]+\\)\\(?:(\\([^)]+\\))\\)?\
-\\(?:{\\([^}]+\\)}\\)?\\s-*"
-	    fmt start)
+            (rx "%"
+                (optional (group (+ digit)))
+                (group (one-or-more (in alnum "_-")))
+                (optional "(" (group (zero-or-more (not (any ")")))) ")")
+                (optional "{" (group (zero-or-more (not (any "}")))) "}")
+                (zero-or-more space))
+            fmt start)
       (setq start (match-end 0))
       (let* ((width (and (match-end 1) (string-to-number (match-string 1 fmt))))
 	     (prop (match-string-no-properties 2 fmt))
-	     (title (or (match-string-no-properties 3 fmt) prop))
-	     (operator (match-string-no-properties 4 fmt)))
+	     (title (or (org-string-nw-p (match-string-no-properties 3 fmt)) prop))
+	     (operator (org-string-nw-p (match-string-no-properties 4 fmt))))
 	(push (if (not operator) (list (upcase prop) title width nil nil)
-		(let (printf)
+		(let (fmt)
 		  (when (string-match ";" operator)
-		    (setq printf (substring operator (match-end 0)))
+		    (setq fmt (substring operator (match-end 0)))
 		    (setq operator (substring operator 0 (match-beginning 0))))
-		  (list (upcase prop) title width operator printf)))
+		  (list (upcase prop) title width operator fmt)))
 	      org-columns-current-fmt-compiled)))
     (setq org-columns-current-fmt-compiled
 	  (nreverse org-columns-current-fmt-compiled))))
@@ -1243,7 +1285,7 @@ properties drawers."
 	 (inminlevel lmax)
 	 (last-level lmax)
 	 (property (car spec))
-	 (printf (nth 4 spec))
+	 (fmt (nth 4 spec))
          ;; Special properties cannot be collected nor summarized, as
          ;; they have their own way to be computed.  Therefore, ignore
          ;; any operator attached to them.
@@ -1275,7 +1317,7 @@ properties drawers."
 			(let ((values
                                (cl-loop for l from (1+ level) to lmax
                                         append (aref lvals l))))
-			  (and values (funcall summarize values printf))))))
+			  (and values (funcall summarize values fmt))))))
 	     ;; Leaf values are not summaries: do not mark them.
 	     (when summary
 	       (let* ((summaries-alist (get-text-property pos 'org-summaries))
@@ -1331,10 +1373,10 @@ column specification."
 	(org-columns--compute-spec spec (not (member property seen)))
 	(push property seen)))))
 
-(defun org-columns--summary-sum (values printf)
+(defun org-columns--summary-sum (values fmt)
   "Compute the sum of VALUES.
-When PRINTF is non-nil, use it to format the result."
-  (format (or printf "%s") (apply #'+ (mapcar #'string-to-number values))))
+When FMT is non-nil, use it to format the result."
+  (format (or fmt "%s") (apply #'+ (mapcar #'string-to-number values))))
 
 (defun org-columns--summary-currencies (values _)
   "Compute the sum of VALUES, with two decimals."
@@ -1363,22 +1405,22 @@ When PRINTF is non-nil, use it to format the result."
 				       check-boxes))
 		 (length check-boxes))))
 
-(defun org-columns--summary-min (values printf)
+(defun org-columns--summary-min (values fmt)
   "Compute the minimum of VALUES.
-When PRINTF is non-nil, use it to format the result."
-  (format (or printf "%s")
+When FMT is non-nil, use it to format the result."
+  (format (or fmt "%s")
 	  (apply #'min (mapcar #'string-to-number values))))
 
-(defun org-columns--summary-max (values printf)
+(defun org-columns--summary-max (values fmt)
   "Compute the maximum of VALUES.
-When PRINTF is non-nil, use it to format the result."
-  (format (or printf "%s")
+When FMT is non-nil, use it to format the result."
+  (format (or fmt "%s")
 	  (apply #'max (mapcar #'string-to-number values))))
 
-(defun org-columns--summary-mean (values printf)
+(defun org-columns--summary-mean (values fmt)
   "Compute the mean of VALUES.
-When PRINTF is non-nil, use it to format the result."
-  (format (or printf "%s")
+When FMT is non-nil, use it to format the result."
+  (format (or fmt "%s")
 	  (/ (apply #'+ (mapcar #'string-to-number values))
 	     (float (length values)))))
 
@@ -1600,7 +1642,7 @@ PARAMS is a property list of parameters:
     (funcall formatter (point) table params)))
 
 (defun org-columns-dblock-write-default (ipos table params)
-  "Write out a columnview table at position IPOS in the current buffer.
+  "Write out a column view table at position IPOS in the current buffer.
 TABLE is a table with data as produced by `org-columns--capture-view'.
 PARAMS is the parameter property list obtained from the dynamic block
 definition."
@@ -1752,8 +1794,9 @@ definition."
 			  ;; agenda buffer.  Since current buffer is
 			  ;; changing, we need to force the original
 			  ;; compiled-fmt there.
-			  (org-with-point-at m
-			    (org-columns--collect-values compiled-fmt)))
+                          (let ((agenda-marker (point-marker)))
+			    (org-with-point-at m
+			      (org-columns--collect-values compiled-fmt agenda-marker))))
 		    cache)))
 	  (forward-line))
 	(when cache
@@ -1762,6 +1805,9 @@ definition."
 	  (when (setq-local org-columns-flyspell-was-active
 			    (bound-and-true-p flyspell-mode))
 	    (flyspell-mode 0))
+          (when (setq-local org-columns-org-num-was-active
+			    (bound-and-true-p org-num-mode))
+	    (org-num-mode 0))
 	  (dolist (entry cache)
 	    (goto-char (car entry))
 	    (org-columns--display-here (cdr entry)))
@@ -1812,7 +1858,7 @@ This will add overlays to the date lines, to show the summary for each day."
 				    (line-end-position))))
 			 (list spec date date)))
 		      (`(,_ ,_ ,_ nil ,_) (list spec "" ""))
-		      (`(,_ ,_ ,_ ,operator ,printf)
+		      (`(,_ ,_ ,_ ,operator ,fmt)
 		       (let* ((summarize (org-columns--summarize operator))
 			      (values
 			       ;; Use real values for summary, not
@@ -1820,10 +1866,10 @@ This will add overlays to the date lines, to show the summary for each day."
 			       (delq nil
 				     (mapcar
 				      (lambda (e) (org-string-nw-p
-					           (nth 1 (assoc spec e))))
+					      (nth 1 (assoc spec e))))
 				      entries)))
 			      (final (if values
-					 (funcall summarize values printf)
+					 (funcall summarize values fmt)
 				       "")))
 			 (unless (equal final "")
 			   (put-text-property 0 (length final)
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 8261a48439a..0473148b5c9 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -61,13 +61,12 @@
 (declare-function org-element-contents-begin "org-element" (node))
 (declare-function org-element-contents-end "org-element" (node))
 (declare-function org-element-post-affiliated "org-element" (node))
-(declare-function org-end-of-subtree "org" (&optional invisible-ok to-heading))
+(declare-function org-end-of-subtree "org" (&optional invisible-ok to-heading element))
 (declare-function org-get-heading "org" (&optional no-tags no-todo no-priority no-comment))
 (declare-function org-get-tags "org" (&optional pos local))
 (declare-function org-fold-hide-block-toggle "org-fold" (&optional force no-error element))
 (declare-function org-link-display-format "ol" (s))
 (declare-function org-link-set-parameters "ol" (type &rest rest))
-(declare-function org-log-into-drawer "org" ())
 (declare-function org-make-tag-string "org" (tags))
 (declare-function org-next-visible-heading "org" (arg))
 (declare-function org-reduced-level "org" (l))
@@ -78,7 +77,6 @@
 (declare-function speedbar-line-directory "speedbar" (&optional depth))
 (declare-function table--at-cell-p "table" (position &optional object at-column))
 (declare-function ob-clojure-eval-with-cmd "ob-clojure" (cmd expanded))
-(declare-function org-fold-folded-p "org-fold" (&optional pos spec-or-alias))
 (declare-function org-fold-hide-sublevels "org-fold" (levels))
 (declare-function org-fold-hide-subtree "org-fold" ())
 (declare-function org-fold-region "org-fold" (from to flag &optional spec))
@@ -100,6 +98,19 @@
 (defvar org-table1-hline-regexp)
 (defvar org-fold-core-style)
 
+
+;;; Emacs < 31 compatibility
+(if (fboundp 'completion-table-with-metadata)
+    (defalias 'org-completion-table-with-metadata #'completion-table-with-metadata)
+  (defun org-completion-table-with-metadata (table metadata)
+    "Return new completion TABLE with METADATA.
+METADATA should be an alist of completion metadata.  See
+`completion-metadata' for a list of supported metadata."
+    (lambda (string pred action)
+      (if (eq action 'metadata)
+          `(metadata . ,metadata)
+        (complete-with-action action table string pred)))))
+
 
 ;;; Emacs < 29 compatibility
 
@@ -180,6 +191,33 @@ back to `window-text-pixel-size' otherwise."
           (set-window-buffer nil oldbuffer)
           (set-window-dedicated-p nil dedicatedp))))))
 
+
+(if (fboundp 'with-undo-amalgamate)
+    (defalias 'org-with-undo-amalgamate 'with-undo-amalgamate)
+  ;; Copied from Emacs source.
+  (defmacro org-with-undo-amalgamate (&rest body)
+    "Like `progn' but perform BODY with amalgamated undo barriers.
+
+This allows multiple operations to be undone in a single step.
+When undo is disabled this behaves like `progn'."
+    (declare (indent 0) (debug t))
+    (let ((handle (make-symbol "--change-group-handle--")))
+      `(let ((,handle (prepare-change-group))
+             ;; Don't truncate any undo data in the middle of this,
+             ;; otherwise Emacs might truncate part of the resulting
+             ;; undo step: we want to mimic the behavior we'd get if the
+             ;; undo-boundaries were never added in the first place.
+             (undo-outer-limit nil)
+             (undo-limit most-positive-fixnum)
+             (undo-strong-limit most-positive-fixnum))
+         (unwind-protect
+             (progn
+               (activate-change-group ,handle)
+               ,@body)
+           (progn
+             (accept-change-group ,handle)
+             (undo-amalgamate-change-group ,handle)))))))
+
 
 ;;; Emacs < 28.1 compatibility
 
@@ -207,7 +245,7 @@ inserted before concatenating."
              (mapcar
               (lambda (str)
                 (when (and str (not (seq-empty-p str))
-                           (string-match "\\(.+\\)/?" str))
+                           (string-match "\\(.+?\\)/?$" str))
                   (match-string 1 str)))
               (cons directory components)))
        "/"))))
@@ -292,20 +330,16 @@ older than 27.1"
       (if tree (push tree elems))
       (nreverse elems))))
 
-(defalias 'org-replace-region-contents
-  (if (> emacs-major-version 30)
-      #'replace-region-contents
-    ;; The `replace-region-contents' in Emacs<31 does not accept a buffer
-    ;; as SOURCE argument and does not preserve the position well enough.
-    (lambda (beg end source &optional max-secs max-costs)
-      (save-restriction
-        (narrow-to-region beg end)
-        (let ((eobp (eobp)))
-          (with-no-warnings
-            (if (< emacs-major-version 27)
-                (replace-buffer-contents source)
-              (replace-buffer-contents source max-secs max-costs)))
-          (if eobp (goto-char (point-max))))))))
+(with-no-warnings ; `replace-buffer-contents' is obsolete in Emacs 31
+  (cond
+   ((version< emacs-version "27.1")
+    (defsubst org-replace-buffer-contents (source &optional _max-secs _max-costs)
+      (replace-buffer-contents source)))
+   ((version< emacs-version "31")
+    (defalias 'org-replace-buffer-contents #'replace-buffer-contents))
+   (t
+    (defsubst org-replace-buffer-contents (source &optional max-secs max-costs)
+      (replace-region-contents (point-min) (point-max) source max-secs max-costs)))))
 
 (unless (fboundp 'proper-list-p)
   ;; `proper-list-p' was added in Emacs 27.1.  The function below is
@@ -502,6 +536,8 @@ Counting starts at 1."
 (define-obsolete-function-alias 'org-string-match-p 'string-match-p "9.0")
 
 ;;;; Functions and variables from previous releases now obsolete.
+(define-obsolete-variable-alias 'org-edit-src-content-indentation
+  'org-src-content-indentation "Org 9.8")
 (define-obsolete-variable-alias 'org-export-ignored-local-variables
   'org-element-ignored-local-variables "Org 9.7")
 (define-obsolete-function-alias 'org-habit-get-priority
@@ -718,19 +754,6 @@ This constant, for example, makes the below code not err:
                "use `org-element' library"
                "9.0")
 
-;; FIXME: Unused; obsoleted; to be removed.
-(defun org-let (list &rest body) ;FIXME: So many kittens are suffering here.
-  (declare (indent 1) (obsolete cl-progv "2021"))
-  (eval (cons 'let (cons list body))))
-
-;; FIXME: Unused; obsoleted; to be removed.
-(defun org-let2 (list1 list2 &rest body) ;FIXME: Where did our karma go?
-  (declare (indent 2) (obsolete cl-progv "2021"))
-  (eval (cons 'let (cons list1 (list (cons 'let (cons list2 body)))))))
-
-(make-obsolete 'org-let "to be removed" "9.6")
-(make-obsolete 'org-let2 "to be removed" "9.6")
-
 (define-obsolete-function-alias 'org--math-always-on
   'org--math-p "9.7")
 
@@ -1020,6 +1043,191 @@ use of this function is for the stuck project list."
 (define-obsolete-function-alias 'org-add-angle-brackets
   'org-link-add-angle-brackets "9.3")
 
+(declare-function org-link-preview--remove-overlay "ol"
+                  (ov after beg end &optional len))
+(declare-function org-link-preview--get-overlays "ol" (&optional beg end))
+(declare-function org-link-preview-clear "ol" (&optional beg end))
+(declare-function org-link-preview--remove-overlay "ol"
+                  (ov after beg end &optional len))
+(declare-function org-attach-expand "org-attach" (file))
+(declare-function org-display-inline-image--width "ol" (link))
+(declare-function org-image--align "ol" (link))
+(declare-function org--create-inline-image "ol" (file width))
+
+(define-obsolete-function-alias 'org-display-inline-remove-overlay
+  'org-link-preview--remove-overlay "9.8")
+(define-obsolete-function-alias 'org--inline-image-overlays
+  'org-link-preview--get-overlays "9.8")
+(define-obsolete-function-alias 'org-remove-inline-images
+  'org-link-preview-clear "9.8")
+(define-obsolete-function-alias 'org-redisplay-inline-images
+  'org-link-preview-refresh "9.8")
+(define-obsolete-variable-alias 'org-inline-image-overlays
+  'org-link-preview-overlays "9.8")
+(defvar org-link-preview-overlays)
+(defvar org-link-abbrev-alist-local)
+(defvar org-link-abbrev-alist)
+(defvar org-link-angle-re)
+(defvar org-link-plain-re)
+
+(make-obsolete 'org-display-inline-images
+               'org-link-preview-region "9.8")
+;; FIXME: Unused; obsoleted; to be removed
+(defun org-display-inline-images (&optional include-linked refresh beg end)
+  "Display inline images.
+
+An inline image is a link which follows either of these
+conventions:
+
+  1. Its path is a file with an extension matching return value
+     from `image-file-name-regexp' and it has no contents.
+
+  2. Its description consists in a single link of the previous
+     type.  In this case, that link must be a well-formed plain
+     or angle link, i.e., it must have an explicit \"file\" or
+     \"attachment\" type.
+
+Equip each image with the key-map `image-map'.
+
+When optional argument INCLUDE-LINKED is non-nil, also links with
+a text description part will be inlined.  This can be nice for
+a quick look at those images, but it does not reflect what
+exported files will look like.
+
+When optional argument REFRESH is non-nil, refresh existing
+images between BEG and END.  This will create new image displays
+only if necessary.
+
+BEG and END define the considered part.  They default to the
+buffer boundaries with possible narrowing."
+  (interactive "P")
+  (when (display-graphic-p)
+    (when refresh
+      (org-link-preview-clear beg end)
+      (when (fboundp 'clear-image-cache) (clear-image-cache)))
+    (let ((end (or end (point-max))))
+      (org-with-point-at (or beg (point-min))
+	(let* ((case-fold-search t)
+	       (file-extension-re (image-file-name-regexp))
+	       (link-abbrevs (mapcar #'car
+				     (append org-link-abbrev-alist-local
+					     org-link-abbrev-alist)))
+	       ;; Check absolute, relative file names and explicit
+	       ;; "file:" links.  Also check link abbreviations since
+	       ;; some might expand to "file" links.
+	       (file-types-re
+		(format "\\[\\[\\(?:file%s:\\|attachment:\\|[./~]\\)\\|\\]\\[\\(<?\\(?:file\\|attachment\\):\\)"
+			(if (not link-abbrevs) ""
+			  (concat "\\|" (regexp-opt link-abbrevs))))))
+	  (while (re-search-forward file-types-re end t)
+	    (let* ((link (org-element-lineage
+			  (save-match-data (org-element-context))
+			  'link t))
+                   (linktype (org-element-property :type link))
+		   (inner-start (match-beginning 1))
+		   (path
+		    (cond
+		     ;; No link at point; no inline image.
+		     ((not link) nil)
+		     ;; File link without a description.  Also handle
+		     ;; INCLUDE-LINKED here since it should have
+		     ;; precedence over the next case.  I.e., if link
+		     ;; contains filenames in both the path and the
+		     ;; description, prioritize the path only when
+		     ;; INCLUDE-LINKED is non-nil.
+		     ((or (not (org-element-contents-begin link))
+			  include-linked)
+		      (and (or (equal "file" linktype)
+                               (equal "attachment" linktype))
+			   (org-element-property :path link)))
+		     ;; Link with a description.  Check if description
+		     ;; is a filename.  Even if Org doesn't have syntax
+		     ;; for those -- clickable image -- constructs, fake
+		     ;; them, as in `org-export-insert-image-links'.
+		     ((not inner-start) nil)
+		     (t
+		      (org-with-point-at inner-start
+			(and (looking-at
+			      (if (char-equal ?< (char-after inner-start))
+				  org-link-angle-re
+				org-link-plain-re))
+			     ;; File name must fill the whole
+			     ;; description.
+			     (= (org-element-contents-end link)
+				(match-end 0))
+			     (progn
+                               (setq linktype (match-string 1))
+                               (match-string 2))))))))
+	      (when (and path (string-match-p file-extension-re path))
+		(let ((file (if (equal "attachment" linktype)
+				(progn
+                                  (require 'org-attach)
+				  (ignore-errors (org-attach-expand path)))
+                              (expand-file-name path))))
+                  ;; Expand environment variables.
+                  (when file (setq file (substitute-in-file-name file)))
+		  (when (and file (file-exists-p file))
+		    (let ((width (org-display-inline-image--width link))
+			  (align (org-image--align link))
+                          (old (get-char-property-and-overlay
+				(org-element-begin link)
+				'org-image-overlay)))
+		      (if (and (car-safe old) refresh)
+                          (image-flush (overlay-get (cdr old) 'display))
+			(let ((image (org--create-inline-image file width)))
+			  (when image
+			    (let ((ov (make-overlay
+				       (org-element-begin link)
+				       (progn
+					 (goto-char
+					  (org-element-end link))
+					 (unless (eolp) (skip-chars-backward " \t"))
+					 (point)))))
+                              ;; See bug#59902.  We cannot rely
+                              ;; on Emacs to update image if the file
+                              ;; has changed.
+                              (image-flush image)
+			      (overlay-put ov 'display image)
+			      (overlay-put ov 'face 'default)
+			      (overlay-put ov 'org-image-overlay t)
+			      (overlay-put
+			       ov 'modification-hooks
+			       (list 'org-link-preview--remove-overlay))
+			      (when (boundp 'image-map)
+				(overlay-put ov 'keymap image-map))
+                              (when align
+                                (overlay-put
+                                 ov 'before-string
+                                 (propertize
+                                  " " 'face 'default
+                                  'display
+                                  (pcase align
+                                    ("center" `(space :align-to (- center (0.5 . ,image))))
+                                    ("right"  `(space :align-to (- right ,image)))))))
+			      (push ov org-inline-image-overlays))))))))))))))))
+
+(make-obsolete 'org-toggle-inline-images
+               'org-link-preview "9.8")
+(declare-function org-link-preview-region "ol")
+;; FIXME: Unused; obsoleted; to be removed
+(defun org-toggle-inline-images (&optional include-linked beg end)
+  "Toggle the display of inline images.
+INCLUDE-LINKED is passed to `org-display-inline-images'."
+  (interactive "P")
+  (if (org-link-preview--get-overlays beg end)
+      (progn
+        (org-link-preview-clear beg end)
+        (when (called-interactively-p 'interactive)
+	  (message "Inline image display turned off")))
+    (org-link-preview-region include-linked nil beg end)
+    (when (called-interactively-p 'interactive)
+      (let ((new (org-link-preview--get-overlays beg end)))
+        (message (if new
+		     (format "%d images displayed inline"
+			     (length new))
+		   "No images to display inline"))))))
+
+
 ;; The function was made obsolete by commit 65399674d5 of 2013-02-22.
 ;; This make-obsolete call was added 2016-09-01.
 (make-obsolete 'org-capture-import-remember-templates
@@ -1032,7 +1240,7 @@ use of this function is for the stuck project list."
   (org-fold-show-all '(blocks)))
 
 (make-obsolete 'org-show-block-all
-	       "use `org-show-all' instead."
+	       "use `org-fold-show-all' instead."
 	       "9.2")
 
 (define-obsolete-function-alias 'org-get-tags-at 'org-get-tags "9.2")
@@ -1071,7 +1279,7 @@ When optional argument ELEMENT is a parsed drawer, as returned by
 
 When buffer positions BEG and END are provided, hide or show that
 region as a drawer without further ado."
-  (declare (obsolete "use `org-hide-drawer-toggle' instead." "9.4"))
+  (declare (obsolete "use `org-fold-hide-drawer-toggle' instead." "9.4"))
   (if (and beg end) (org-fold-region beg end flag 'drawer)
     (let ((drawer
 	   (or element
@@ -1094,9 +1302,9 @@ region as a drawer without further ado."
 
 (defun org-hide-block-toggle-maybe ()
   "Toggle visibility of block at point.
-Unlike to `org-hide-block-toggle', this function does not throw
+Unlike to `org-fold-hide-block-toggle', this function does not throw
 an error.  Return a non-nil value when toggling is successful."
-  (declare (obsolete "use `org-hide-block-toggle' instead." "9.4"))
+  (declare (obsolete "use `org-fold-hide-block-toggle' instead." "9.4"))
   (interactive)
   (org-fold-hide-block-toggle nil t))
 
@@ -1468,8 +1676,8 @@ This also applied for speedbar access."
 	   (let* ((m (point-marker))
 		  (item (propertize headline 'org-imenu-marker m 'org-imenu t)))
 	     (push m org-imenu-markers)
-	     (if (>= level last-level)
-		 (push (cons item m) (aref subs level))
+             (push (cons item m) (aref subs level))
+             (unless (>= level last-level)
 	       (push (cons item
 			   (cl-mapcan #'identity (cl-subseq subs (1+ level))))
 		     (aref subs level))
@@ -1567,19 +1775,21 @@ ELEMENT is the element at point."
 		  (when (looking-at-p "\\>") (backward-char))
 		  (org-element-context element))))
     (cl-case (org-element-type object)
-      ;; Prevent checks in links due to keybinding conflict with
-      ;; Flyspell.
       ((citation citation-reference code entity export-snippet inline-babel-call
-	         inline-src-block line-break latex-fragment link macro
+	         inline-src-block line-break latex-fragment macro
 	         statistics-cookie target timestamp verbatim)
        nil)
+      (link
+       ;; Only check link description
+       (when-let* ((cbeg (org-element-contents-begin object))
+                   (cend (org-element-contents-end object)))
+         (<= cbeg (point) cend)))
       (footnote-reference
        ;; Only in inline footnotes, within the definition.
        (and (eq (org-element-property :type object) 'inline)
-	    (< (save-excursion
-		 (goto-char (org-element-begin object))
-		 (search-forward ":" nil t 2))
-	       (point))))
+            (<= (org-element-contents-begin object)
+               (point)
+               (org-element-contents-end object))))
       (otherwise t))))
 
 (defun org-mode-flyspell-verify ()
@@ -1607,14 +1817,6 @@ ELEMENT is the element at point."
 	       (let ((case-fold-search t)) (looking-at "[ \t]*#\\+CAPTION:")))
 	     (> (point) (match-end 0))
 	     (org--flyspell-object-check-p element)))
-       ;; Ignore checks in LOGBOOK (or equivalent) drawer.
-       ((let ((log (org-log-into-drawer)))
-	  (and log
-	       (let ((drawer (org-element-lineage element 'drawer)))
-		 (and drawer
-		      (org-string-equal-ignore-case
-		       log (org-element-property :drawer-name drawer))))))
-	nil)
        (t
 	(cl-case (org-element-type element)
 	  ((comment quote-section) t)
@@ -1730,7 +1932,7 @@ key."
 ;;;; Simple
 
 (defun org-mark-jump-unhide (&rest _)
-  "Make the point visible with `org-show-context' after jumping to the mark."
+  "Make the point visible with `org-fold-show-context' after jumping to the mark."
   (when (and (derived-mode-p 'org-mode)
 	     (org-invisible-p))
     (org-fold-show-context 'mark-goto)))
@@ -1780,7 +1982,7 @@ key."
 	          (or (re-search-backward (concat "^\\(?:" outline-regexp "\\)")
 				          nil t)
                       (signal 'outline-before-first-heading nil))
-	          (setq found (and (or invisible-ok (not (org-fold-folded-p)))
+	          (setq found (and (or invisible-ok (not (org-invisible-p)))
 			           (point)))))
 	      (goto-char found)
 	      found)))
@@ -1809,7 +2011,7 @@ key."
   (if (derived-mode-p 'org-mode)
       (save-excursion
         (org-back-to-heading)
-        (if (not (org-fold-folded-p (line-end-position)))
+        (if (not (org-invisible-p (line-end-position)))
             (org-fold-hide-subtree)
           (org-fold-show-children)
           (org-fold-show-entry 'hide-drawers)))
@@ -1825,6 +2027,26 @@ key."
                         "configure `org-speed-commands' instead." "9.5")
 (provide 'org-compat)
 
+;;;; yank-media
+;; Emacs 29's pgtk port has a bug where it might fail to return the
+;; right TARGET.  Install a workaround for Emacs <=29 since the fix
+;; went to Emacs 30.  See bug#72254.
+;; Org bug report link: https://list.orgmode.org/orgmode/87ed7kttoa.fsf@k-7.ch
+;; This should be removed once we drop Emacs 29 support.
+(when (and (fboundp 'pgtk-get-selection-internal)
+           (<= emacs-major-version 29))
+  ;; Only define the method if it hasn't been previously defined.
+  (unless (cl-find-method 'gui-backend-get-selection nil
+                          '((eql 'CLIPBOARD) (eql 'TARGETS)
+                            ((&context . window-system) eql 'pgtk)))
+    (cl-defmethod gui-backend-get-selection ((selection-symbol (eql 'CLIPBOARD))
+                                             (target-type (eql 'TARGETS))
+                                             &context (window-system pgtk))
+      (let ((sel (pgtk-get-selection-internal selection-symbol target-type)))
+        (if (vectorp sel)
+            sel
+          (vector sel))))))
+
 ;; Local variables:
 ;; generated-autoload-file: "org-loaddefs.el"
 ;; End:
diff --git a/lisp/org/org-crypt.el b/lisp/org/org-crypt.el
index 3ba1579aba9..1ddc113b632 100644
--- a/lisp/org/org-crypt.el
+++ b/lisp/org/org-crypt.el
@@ -81,7 +81,6 @@
 (declare-function org-make-tags-matcher "org" (match &optional only-local-tags))
 (declare-function org-previous-visible-heading "org" (arg))
 (declare-function org-scan-tags "org" (action matcher todo-only &optional start-level))
-(declare-function org-set-property "org" (property value))
 (declare-function org-cycle-set-startup-visibility "org-cycle" ())
 
 (defgroup org-crypt nil
diff --git a/lisp/org/org-cycle.el b/lisp/org/org-cycle.el
index def8f7f3bd2..dbda887382e 100644
--- a/lisp/org/org-cycle.el
+++ b/lisp/org/org-cycle.el
@@ -40,27 +40,27 @@
 (declare-function org-element-post-affiliated "org-element" (node))
 (declare-function org-element-lineage "org-element-ast" (datum &optional types with-self))
 (declare-function org-element-at-point "org-element" (&optional pom cached-only))
-(declare-function org-display-inline-images "org" (&optional include-linked refresh beg end))
-(declare-function org-get-tags "org" (&optional pos local fontify))
+(declare-function org-link-preview-region "ol" (&optional include-linked refresh beg end))
+(declare-function org-get-tags "org" (&optional epom local))
 (declare-function org-subtree-end-visible-p "org" ())
 (declare-function org-narrow-to-subtree "org" (&optional element))
 (declare-function org-next-visible-heading "org" (arg))
 (declare-function org-at-property-p "org" ())
 (declare-function org-re-property "org" (property &optional literal allow-null value))
-(declare-function org-remove-inline-images "org" (&optional beg end))
-(declare-function org-item-beginning-re "org" ())
+(declare-function org-link-preview-clear "ol" (&optional beg end))
+(declare-function org-item-beginning-re "org-list" ())
 (declare-function org-at-heading-p "org" (&optional invisible-not-ok))
-(declare-function org-at-item-p "org" ())
+(declare-function org-at-item-p "org-list" ())
 (declare-function org-before-first-heading-p "org" ())
 (declare-function org-back-to-heading "org" (&optional invisible-ok))
-(declare-function org-end-of-subtree "org" (&optional invisible-ok to-heading))
+(declare-function org-end-of-subtree "org" (&optional invisible-ok to-heading element))
 (declare-function org-entry-end-position "org" ())
 (declare-function org-try-cdlatex-tab "org" ())
 (declare-function org-cycle-level "org" ())
 (declare-function org-table-next-field "org-table" ())
 (declare-function org-table-justify-field-maybe "org-table" (&optional new))
 (declare-function org-inlinetask-at-task-p "org-inlinetask" ())
-(declare-function org-inlinetask-toggle-visibility "org-inlinetask" ())
+(declare-function org-inlinetask-toggle-visibility "org-inlinetask" (&optional state))
 (declare-function org-list-get-all-items "org-list" (item struct prevs))
 (declare-function org-list-get-bottom-point "org-list" (struct))
 (declare-function org-list-prevs-alist "org-list" (struct))
@@ -71,7 +71,6 @@
 (declare-function org-list-struct "org-list" ())
 (declare-function org-cycle-item-indentation "org-list" ())
 
-(declare-function outline-previous-heading "outline" ())
 (declare-function outline-next-heading "outline" ())
 (declare-function outline-end-of-heading "outline" ())
 (declare-function outline-up-heading "outline" (arg &optional invisible-ok))
@@ -217,7 +216,7 @@ the values `folded', `children', or `subtree'."
 (defcustom org-cycle-hook '(org-cycle-hide-archived-subtrees
                             org-cycle-show-empty-lines
                             org-cycle-optimize-window-after-visibility-change
-                            org-cycle-display-inline-images)
+                            org-cycle-display-link-previews)
   "Hook that is run after `org-cycle' has changed the buffer visibility.
 The function(s) in this hook must accept a single argument which indicates
 the new state that was set by the most recent `org-cycle' command.  The
@@ -237,12 +236,17 @@ normal outline commands like `show-all', but not with the cycling commands."
   :group 'org-cycle
   :type 'boolean)
 
-(defcustom org-cycle-inline-images-display nil
-  "Non-nil means auto display inline images under subtree when cycling."
+(defvaralias 'org-cycle-inline-images-display
+  'org-cycle-link-previews-display
+  "Non-nil means auto display inline images under subtree when cycling.")
+
+(defcustom org-cycle-link-previews-display nil
+  "Non-nil means auto display link previews under subtree when cycling."
   :group 'org-startup
   :group 'org-cycle
-  :package-version '(Org . "9.6")
-  :type 'boolean)
+  :package-version '(Org . "9.8")
+  :type 'boolean
+  :safe #'booleanp)
 
 (defvaralias 'org-tab-first-hook 'org-cycle-tab-first-hook)
 (defvar org-cycle-tab-first-hook nil
@@ -514,7 +518,7 @@ Use `\\[org-edit-special]' to edit table.el tables"))
       (forward-line 1)
       (if (eq org-fold-core-style 'text-properties)
           (while (and (not (eobp))		;this is like `next-line'
-		      (org-fold-folded-p (1- (point))))
+		      (org-invisible-p (1- (point))))
 	    (goto-char (org-fold-next-visibility-change nil nil t))
 	    (and (eolp) (forward-line 1)))
         (while (and (not (eobp))		;this is like `next-line'
@@ -745,7 +749,9 @@ symbols `content', `all', `folded', `children', or `subtree'."
 The region to be covered depends on STATE when called through
 `org-cycle-hook'.  Lisp program can use t for STATE to get the
 entire buffer covered.  Note that an empty line is only shown if there
-are at least `org-cycle-separator-lines' empty lines before the headline."
+are at least `org-cycle-separator-lines' empty lines before the headline.
+
+Always show empty lines at the end of file."
   (when (/= org-cycle-separator-lines 0)
     (save-excursion
       (let* ((n (abs org-cycle-separator-lines))
@@ -778,11 +784,8 @@ are at least `org-cycle-separator-lines' empty lines before the headline."
   ;; Never hide empty lines at the end of the file.
   (save-excursion
     (goto-char (point-max))
-    (outline-previous-heading)
-    (outline-end-of-heading)
-    (when (and (looking-at "[ \t\n]+")
-               (= (match-end 0) (point-max)))
-      (org-fold-region (point) (match-end 0) nil 'outline))))
+    (skip-chars-backward " \t\n")
+    (org-fold-region (point) (point-max) nil 'outline)))
 
 (defun org-cycle-hide-archived-subtrees (state)
   "Re-hide all archived subtrees after a visibility state change.
@@ -804,12 +807,15 @@ STATE should be one of the symbols listed in the docstring of
 		       "Subtree is archived and stays closed.  Use \
 `\\[org-cycle-force-archived]' to cycle it anyway."))))))
 
-(defun org-cycle-display-inline-images (state)
+(defalias 'org-cycle-inline-images-display
+  'org-cycle-display-link-previews)
+
+(defun org-cycle-display-link-previews (state)
   "Auto display inline images under subtree when cycling.
-It works when `org-cycle-inline-images-display' is non-nil.
+It works when `org-cycle-link-previews-display' is non-nil.
 STATE is the current outline visibility state.  It should be one of
 symbols `content', `all', `folded', `children', or `subtree'."
-  (when org-cycle-inline-images-display
+  (when org-cycle-link-previews-display
     (pcase state
       ('children
        (org-with-wide-buffer
@@ -817,19 +823,19 @@ symbols `content', `all', `folded', `children', or `subtree'."
         ;; If has nested headlines, beg,end only from parent headline
         ;; to first child headline which reference to upper
         ;; let-binding `org-next-visible-heading'.
-        (org-display-inline-images
+        (org-link-preview-region
          nil nil
          (point-min) (progn (org-next-visible-heading 1) (point)))))
       ('subtree
        (org-with-wide-buffer
         (org-narrow-to-subtree)
         ;; If has nested headlines, also inline display images under all sub-headlines.
-        (org-display-inline-images nil nil (point-min) (point-max))))
+        (org-link-preview-region nil nil (point-min) (point-max))))
       ('folded
        (org-with-wide-buffer
         (org-narrow-to-subtree)
         (if (numberp (point-max))
-            (org-remove-inline-images (point-min) (point-max))
+            (org-link-preview-clear (point-min) (point-max))
           (ignore)))))))
 
 (provide 'org-cycle)
diff --git a/lisp/org/org-datetree.el b/lisp/org/org-datetree.el
index 1b396c12565..a1d565c44ae 100644
--- a/lisp/org/org-datetree.el
+++ b/lisp/org/org-datetree.el
@@ -24,23 +24,20 @@
 ;;
 ;;; Commentary:
 
-;; This file contains code to create entries in a tree where the top-level
-;; nodes represent years, the level 2 nodes represent the months, and the
-;; level 1 entries days.
+;; This file contains code to create entries in a tree where the
+;; top-level nodes represent years, the level 2 nodes represent the
+;; months, and the level 1 entries days.  It also implements
+;; extensions to the datetree that allow for other levels such as
+;; quarters and weeks.
 
 ;;; Code:
 
 (require 'org-macs)
 (org-assert-version)
 
+(require 'cal-iso)
 (require 'org)
-
-(defvar org-datetree-base-level 1
-  "The level at which years should be placed in the date tree.
-This is normally one, but if the buffer has an entry with a
-DATE_TREE (or WEEK_TREE for ISO week entries) property (any
-value), the date tree will become a subtree under that entry, so
-the base level will be properly adjusted.")
+(require 'org-element)
 
 (defcustom org-datetree-add-timestamp nil
   "When non-nil, add a time stamp matching date of entry.
@@ -59,174 +56,264 @@ If KEEP-RESTRICTION is non-nil, do not widen the buffer.
 When it is nil, the buffer will be widened to make sure an existing date
 tree can be found.  If it is the symbol `subtree-at-point', then the tree
 will be built under the headline at point."
-  (org-datetree--find-create-group d 'day keep-restriction))
+  (org-datetree-find-create-entry '(year month day) d keep-restriction))
 
 ;;;###autoload
 (defun org-datetree-find-month-create (d &optional keep-restriction)
   "Find or create a month entry for date D.
 Compared to `org-datetree-find-date-create' this function creates
-entries grouped by month instead of days.
+entries grouped by year-month instead of year-month-day.
 If KEEP-RESTRICTION is non-nil, do not widen the buffer.
 When it is nil, the buffer will be widened to make sure an existing date
 tree can be found.  If it is the symbol `subtree-at-point', then the tree
 will be built under the headline at point."
-  (org-datetree--find-create-group d 'month keep-restriction))
-
-(defun org-datetree--find-create-group
-    (d time-grouping &optional keep-restriction)
-  "Find or create an entry for date D.
-If time-period is day, group entries by day.
-If time-period is month, then group entries by month."
-  (setq-local org-datetree-base-level 1)
-  (save-restriction
-    (if (eq keep-restriction 'subtree-at-point)
-	(progn
-	  (unless (org-at-heading-p) (error "Not at heading"))
-	  (widen)
-	  (org-narrow-to-subtree)
-	  (setq-local org-datetree-base-level
-		      (org-get-valid-level (org-current-level) 1)))
-      (unless keep-restriction (widen))
-      ;; Support the old way of tree placement, using a property
-      (let ((prop (org-find-property "DATE_TREE")))
-	(when prop
-	  (goto-char prop)
-	  (setq-local org-datetree-base-level
-		      (org-get-valid-level (org-current-level) 1))
-	  (org-narrow-to-subtree))))
-    (goto-char (point-min))
-    (let ((year (calendar-extract-year d))
-	  (month (calendar-extract-month d))
-	  (day (calendar-extract-day d)))
-      (org-datetree--find-create
-       "\\([12][0-9]\\{3\\}\\)"
-       year nil nil nil t)
-      (org-datetree--find-create
-       "%d-\\([01][0-9]\\) \\w+"
-       year month nil nil t)
-      (when (eq time-grouping 'day)
-	(org-datetree--find-create
-         "%d-%02d-\\([0123][0-9]\\) \\w+"
-	 year month day nil t)))))
+  (org-datetree-find-create-entry '(year month) d keep-restriction))
 
 ;;;###autoload
 (defun org-datetree-find-iso-week-create (d &optional keep-restriction)
   "Find or create an ISO week entry for date D.
 Compared to `org-datetree-find-date-create' this function creates
-entries ordered by week instead of months.
+entries grouped by year-week-day instead of year-month-day.  If
+KEEP-RESTRICTION is non-nil, do not widen the buffer.  When it is
+nil, the buffer will be widened to make sure an existing date
+tree can be found.  If it is the symbol `subtree-at-point', then
+the tree will be built under the headline at point."
+  (org-datetree-find-create-entry '(year week day) d keep-restriction))
+
+;;;###autoload
+(defun org-datetree-find-create-entry
+    (time-grouping d &optional keep-restriction)
+  "Find or create an entry for date D.
+Moves point to the beginning of the entry.
+
+TIME-GROUPING specifies the grouping levels of the datetree, and
+should be a subset of `(year quarter month week day)'.  Weeks are
+assigned to years according to ISO-8601.  If TIME-GROUPING
+contains both `month' and `week', then weeks are assigned to the
+month containing Thursday, for consistency with the ISO-8601
+year-week rule.  If TIME-GROUPING contains `quarter' and `week'
+but not `month', quarters are defined as 13-week periods;
+otherwise they are defined as 3-month periods.
+
+If KEEP-RESTRICTION is non-nil, do not widen the buffer.  When it
+is nil, the buffer will be widened to make sure an existing date
+tree can be found.  If it is the symbol `subtree-at-point', then
+the tree will be built under the headline at point.
+
+If `org-datetree-add-timestamp' is non-nil and TIME-GROUPING
+includes `day' and a new entry is created, adds a time stamp
+after the new headline."
+  (when-let* ((setdiff (seq-difference time-grouping
+                                      '(year quarter month week day))))
+    (error (format "Unrecognized datetree grouping elements %s" setdiff)))
+  (let* ((year (calendar-extract-year d))
+	 (month (calendar-extract-month d))
+	 (day (calendar-extract-day d))
+         (time (org-encode-time 0 0 0 day month year))
+         (iso-date (calendar-iso-from-absolute
+		    (calendar-absolute-from-gregorian d)))
+         (week (nth 0 iso-date))
+         (nominal-year
+          (if (memq 'week time-grouping)
+              (nth 2 iso-date)
+            year))
+         (nominal-month
+          (if (memq 'week time-grouping)
+              (calendar-extract-month
+               ;; anchor on Thurs, to be consistent with weekyear
+               (calendar-gregorian-from-absolute
+                (calendar-iso-to-absolute
+                 `(,week 4 ,nominal-year))))
+            month))
+         (quarter (if (and (memq 'week time-grouping)
+                           (not (memq 'month time-grouping)))
+                      (min 4 (1+ (/ (1- week) 13)))
+                    (1+ (/ (1- nominal-month) 3))))
+         (found-p
+          (org-datetree-find-create-hierarchy
+           (append
+            (when (memq 'year time-grouping)
+              (list (list (number-to-string nominal-year)
+                          (org-datetree-comparefun-from-regex
+                           "\\([12][0-9]\\{3\\}\\)"))))
+            (when (memq 'quarter time-grouping)
+              (list (list (format "%d-Q%d" nominal-year quarter)
+                          (org-datetree-comparefun-from-regex
+                           "\\([12][0-9]\\{3\\}-Q[1-4]\\)"))))
+            (when (memq 'month time-grouping)
+              (list (list (format-time-string
+                           "%Y-%m %B" (org-encode-time 0 0 0 1 nominal-month
+                                                       nominal-year))
+                          (org-datetree-comparefun-from-regex
+                           "\\([12][0-9]\\{3\\}-[01][0-9]\\) \\w+"))))
+            (when (memq 'week time-grouping)
+              (list (list (format-time-string "%G-W%V" time)
+                          (org-datetree-comparefun-from-regex
+                           "\\([12][0-9]\\{3\\}-W[0-5][0-9]\\)"))))
+            (when (memq 'day time-grouping)
+              ;; Use regular date instead of ISO-week year/month
+              (list (list (format-time-string
+                           "%Y-%m-%d %A" (org-encode-time 0 0 0 day month year))
+                          (org-datetree-comparefun-from-regex
+                           "\\([12][0-9]\\{3\\}-[01][0-9]-[0123][0-9]\\) \\w+")))))
+           keep-restriction
+           ;; Support the old way of tree placement, using a property
+           (cond
+            ((seq-set-equal-p time-grouping '(year month day))
+             "DATE_TREE")
+            ((seq-set-equal-p time-grouping '(year month))
+             "DATE_TREE")
+            ((seq-set-equal-p time-grouping '(year week day))
+             "WEEK_TREE")))))
+    (when (memq 'day time-grouping)
+      (when (and (not found-p) org-datetree-add-timestamp)
+        (save-excursion
+          (end-of-line)
+          (insert "\n")
+          (org-indent-line)
+          (org-insert-timestamp
+           (org-encode-time 0 0 0 day month year)
+           nil
+           (eq org-datetree-add-timestamp 'inactive)))))))
+
+(defun org-datetree-comparefun-from-regex (sibling-regex)
+  "Construct comparison function based on regular expression.
+The generated comparison function can be used with
+`org-datetree-find-create-hierarchy'.  SIBLING-REGEX should be a
+regex that matches the headline and its siblings, with 1 match
+group.  Headlines are compared by the lexicographic ordering of
+match group 1.  The generated function returns -1 if the first
+argument is earlier, 1 if later, 0 if equal, or nil if either
+argument doesn't match."
+  (lambda (sibling-title new-title)
+    (let ((target-match (and (string-match sibling-regex new-title)
+                             (match-string 1 new-title)))
+          (sibling-match (and (string-match sibling-regex sibling-title)
+                              (match-string 1 sibling-title))))
+      (cond
+       ((not (and target-match sibling-match)) nil)
+       ((string< sibling-match target-match) -1)
+       ((string> sibling-match target-match) 1)
+       (t 0)))))
+
+(defun org-datetree-find-create-hierarchy
+    (hier-pairs &optional keep-restriction legacy-prop)
+  "Find or create entry in datetree using the full date hierarchy.
+Moves point to the beginning of the entry.  Returns non-nil if an
+existing entry was found, or nil if a new entry was created.
+
+HIER-PAIRS is a list whose first entry corresponds to the outermost element
+(e.g. year) and last entry corresponds to the innermost (e.g. day).
+Each entry of the list is a pair, the car is the headline for that level
+(e.g. \"2024\" or \"2024-12-28 Saturday\"), and the cadr is a
+string comparison function for sorting each headline among its
+siblings.  The comparison function should take 2 arguments,
+corresponding to the titles of 2 headlines, and return a negative
+number if the first headline is earlier, a positive number if the
+second headline is earlier, 0 or t if the headlines are at the
+same time, or `nil' if a headline isn't a valid datetree
+subheading.  For example, HIER-PAIRS could look like
+
+   ((\"2024\" compare-year-fun)
+    (\"2024-12 December\" compare-month-fun)
+    (\"2024-12-28 Saturday\" compare-day-fun))
+
+where compare-month-fun would be some function where
+(compare-month-fun \"2024-11 November\" \"2024-12 December\") is
+negative, and (compare-month-fun \"2024-12-December\" \"Potato\")
+is nil.  One way to construct such a comparison function is with
+`org-datetree-comparefun-from-regex'.
+
+If KEEP-RESTRICTION is non-nil, do not widen the buffer.
 When it is nil, the buffer will be widened to make sure an existing date
 tree can be found.  If it is the symbol `subtree-at-point', then the tree
-will be built under the headline at point."
-  (setq-local org-datetree-base-level 1)
-  (save-restriction
-    (if (eq keep-restriction 'subtree-at-point)
-	(progn
-	  (unless (org-at-heading-p) (error "Not at heading"))
-	  (widen)
-	  (org-narrow-to-subtree)
-	  (setq-local org-datetree-base-level
-		      (org-get-valid-level (org-current-level) 1)))
-      (unless keep-restriction (widen))
-      ;; Support the old way of tree placement, using a property
-      (let ((prop (org-find-property "WEEK_TREE")))
-	(when prop
-	  (goto-char prop)
-	  (setq-local org-datetree-base-level
-		      (org-get-valid-level (org-current-level) 1))
-	  (org-narrow-to-subtree))))
-    (goto-char (point-min))
-    (require 'cal-iso)
-    (let* ((year (calendar-extract-year d))
-	   (month (calendar-extract-month d))
-	   (day (calendar-extract-day d))
-	   (time (org-encode-time 0 0 0 day month year))
-	   (iso-date (calendar-iso-from-absolute
-		      (calendar-absolute-from-gregorian d)))
-	   (weekyear (nth 2 iso-date))
-	   (week (nth 0 iso-date)))
-      ;; ISO 8601 week format is %G-W%V(-%u)
-      (org-datetree--find-create
-       "\\([12][0-9]\\{3\\}\\)"
-       weekyear nil nil (format-time-string "%G" time) t)
-      (org-datetree--find-create
-       "%d-W\\([0-5][0-9]\\)"
-       weekyear week nil (format-time-string "%G-W%V" time) t)
-      ;; For the actual day we use the regular date instead of ISO week.
-      (org-datetree--find-create
-       "%d-%02d-\\([0123][0-9]\\) \\w+" year month day nil t))))
+will be built under the headline at point.
 
-(defun org-datetree--find-create
-    (regex-template year &optional month day insert match-title)
-  "Find the datetree matched by REGEX-TEMPLATE for YEAR, MONTH, or DAY.
-REGEX-TEMPLATE is passed to `format' with YEAR, MONTH, and DAY as
-arguments.
+If LEGACY-PROP is non-nil, the tree is located by searching for a
+headline with property LEGACY-PROP, supporting the old way of
+tree placement via a property."
+  (let ((level 1)
+        found-p)
+    (save-restriction
+      ;; get the datetree base and narrow to it
+      (if (eq keep-restriction 'subtree-at-point)
+          (progn
+	    (unless (org-at-heading-p) (error "Not at heading"))
+	    (widen)
+	    (org-narrow-to-subtree)
+            (setq level (org-get-valid-level (org-current-level) 1)))
+        (unless keep-restriction (widen))
+        ;; Support the old way of tree placement, using a property
+        (let ((prop (and legacy-prop (org-find-property legacy-prop))))
+          (when prop
+            (progn
+              (goto-char prop)
+	      (org-narrow-to-subtree)
+              (setq level (org-get-valid-level (org-current-level) 1))))))
+      (cl-loop
+       for pair in hier-pairs
+       do
+       (setq found-p (org-datetree--find-create-subheading
+                      (cadr pair) (car pair) level))
+       (setq level (1+ level))))
+    found-p))
 
-If MATCH-TITLE is non-nil, REGEX-TEMPLATE is matched against
-heading title and the exact regexp matched against heading line is:
+(defun org-datetree--find-create-subheading
+    (compare-fun new-title level)
+  "Find datetree subheading, or create it if it doesn't exist.
+After insertion, move point to beginning of the subheading, and
+narrow to its subtree.  Returns non-nil if the heading was found,
+or nil if a new heading was created.
 
-  (format org-complex-heading-regexp-format
-          (format regex-template year month day))
-
-If MATCH-TITLE is nil, the regexp matched against heading line is
-REGEX-TEMPLATE:
-
-  (format regex-template year month day)
-
-Match group 1 in REGEX-TEMPLATE is compared against the specified date
-component.  If INSERT is non-nil and there is no match then it is
-inserted into the buffer."
-  (when (or month day)
-    (org-narrow-to-subtree))
-  ;; ensure that the first match group in REGEX-TEMPLATE
-  ;; is the first inside `org-complex-heading-regexp-format'
-  (when (and match-title
-             (not (string-match-p "\\\\(\\?1:" regex-template))
-             (string-match "\\\\(" regex-template))
-    (setq regex-template (replace-match "\\(?1:" nil t regex-template)))
-  (let ((re (if match-title
-                (format org-complex-heading-regexp-format
-                        (format regex-template year month day))
-              (format regex-template year month day)))
-	match)
-    (goto-char (point-min))
-    (while (and (setq match (re-search-forward re nil t))
-                (goto-char (match-beginning 1))
-		(< (string-to-number (match-string 1)) (or day month year))))
-    (cond
-     ((not match)
+NEW-TITLE is the title of the subheading to be found or created.
+LEVEL is the level of the headline to be found or created.
+COMPARE-FUN is a function of 2 arguments for comparing headline
+titles; it should return a negative number if the first headline
+precedes the second, a positive number if the second number has
+precedence, 0 or t if the headlines are at the same time, and nil
+if a headline isn't a valid datetree subheading at this level."
+  (let* ((nstars (if org-odd-levels-only (1- (* 2 level)) level))
+         (heading-re (format "^\\*\\{%d\\}" nstars))
+         (sibling (car (org-element-cache-map
+                        (lambda (d)
+                          (when (= (org-element-property :level d) level)
+                            (let ((compare-result
+                                   (funcall compare-fun
+                                            (org-element-property :raw-value d)
+                                            new-title)))
+                              (and compare-result
+                                   (or (eq compare-result t) (>= compare-result 0))
+                                   d))))
+                        :granularity 'headline
+                        :restrict-elements '(headline)
+                        :next-re heading-re
+                        :fail-re heading-re
+                        :narrow t
+                        :limit-count 1))))
+    ;; go to headline, or first successor sibling, or end of buffer
+    (if sibling
+        (goto-char (org-element-property :begin sibling))
       (goto-char (point-max))
-      (unless (bolp) (insert "\n"))
-      (org-datetree-insert-line year month day insert))
-     ((= (string-to-number (match-string 1)) (or day month year))
-      (forward-line 0))
-     (t
-      (forward-line 0)
-      (org-datetree-insert-line year month day insert)))))
-
-(defun org-datetree-insert-line (year &optional month day text)
-  (delete-region (save-excursion (skip-chars-backward " \t\n") (point)) (point))
-  (when (org--blank-before-heading-p) (insert "\n"))
-  (insert "\n" (make-string org-datetree-base-level ?*) " \n")
-  (backward-char)
-  (when month (org-do-demote))
-  (when day (org-do-demote))
-  (if text
-      (insert text)
-    (insert (format "%d" year))
-    (when month
+      (unless (bolp) (insert "\n")))
+    (if (and sibling
+             (memq (funcall compare-fun
+                            (org-element-property :raw-value sibling)
+                            new-title)
+                   '(0 t)))
+        ;; narrow and return the matched headline
+        (progn
+          (org-narrow-to-subtree)
+          t)
+      ;; insert new headline, narrow, and return it
+      (delete-region (save-excursion (skip-chars-backward " \t\n") (point)) (point))
+      (when (org--blank-before-heading-p) (insert "\n"))
       (insert
-       (if day
-	   (format-time-string "-%m-%d %A" (org-encode-time 0 0 0 day month year))
-	 (format-time-string "-%m %B" (org-encode-time 0 0 0 1 month year))))))
-  (when (and day org-datetree-add-timestamp)
-    (save-excursion
-      (insert "\n")
-      (org-indent-line)
-      (org-insert-timestamp
-       (org-encode-time 0 0 0 day month year)
-       nil
-       (eq org-datetree-add-timestamp 'inactive))))
-  (forward-line 0))
+       (format "\n%s %s\n"
+               (make-string nstars ?*)
+               new-title))
+      (forward-line -1)
+      (org-narrow-to-subtree)
+      nil)))
 
 (defun org-datetree-file-entry-under (txt d)
   "Insert a node TXT into the date tree under date D."
diff --git a/lisp/org/org-element-ast.el b/lisp/org/org-element-ast.el
index 1dc00d2ab2c..ffa227ff2cb 100644
--- a/lisp/org/org-element-ast.el
+++ b/lisp/org/org-element-ast.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2023-2026 Free Software Foundation, Inc.
 
 ;; Author: Ihor Radchenko <yantar92 at posteo dot net>
+;; Maintainer: Ihor Radchenko <yantar92 at posteo dot net>
 ;; Keywords: data, lisp
 
 ;; This file is part of GNU Emacs.
@@ -136,6 +137,9 @@
 ;; properties.  This is useful to generate pure (in functional sense)
 ;; AST.
 ;;
+;; To force resolving deferred properties, you can use
+;; `org-element-properties-resolve'.
+;;
 ;; The properties listed in `org-element--standard-properties', except
 ;; `:deferred' and `:parent' are never considered to have deferred value.
 ;; This constraint makes org-element API significantly faster.
@@ -645,7 +649,7 @@ Return the modified NODE."
    (if force-undefer
        #'org-element--deferred-resolve-force-rec
      #'org-element--deferred-resolve-rec)
-   node 'set 'no-standard)
+   node 'set)
   node)
 
 (defsubst org-element-properties-mapc (fun node &optional undefer)
@@ -728,6 +732,11 @@ nodes.  This way,
 will yield expected results with contents of another node adopted into
 a newly created one.
 
+nil elements in CHILDREN are ignored.  This way,
+   (let ((children nil))
+     (org-element-create \\='section nil children))
+will yield expected results.
+
 When TYPE is `plain-text', CHILDREN must contain a single node -
 string.  Alternatively, TYPE can be a string.  When TYPE is nil or
 `anonymous', PROPS must be nil."
@@ -735,6 +744,12 @@ string.  Alternatively, TYPE can be a string.  When TYPE is nil or
                  (plistp props)
                (let ((len (proper-list-p props)))
                  (and len (cl-evenp len)))))
+  ;; Special case: CHILDREN is a single anonymous node
+  (when (and (= 1 (length children))
+             (org-element-type-p (car children) 'anonymous))
+    (setq children (car children)))
+  ;; Filter out nil values from CHILDREN
+  (setq children (delq nil children))
   ;; Assign parray.
   (when (and props (not (stringp type)) (not (eq type 'plain-text)))
     (let ((node (list 'dummy props)))
@@ -750,7 +765,7 @@ string.  Alternatively, TYPE can be a string.  When TYPE is nil or
                 (setq props (nbutlast props 2)
                       ptail nil)
               (setcar ptail (nth 2 ptail))
-              (setcdr ptail (seq-drop ptail 3))))))))
+              (setcdr ptail (cdddr ptail))))))))
   (pcase type
     ((or `nil `anonymous)
      (cl-assert (null props))
@@ -761,10 +776,7 @@ string.  Alternatively, TYPE can be a string.  When TYPE is nil or
     ((pred stringp)
      (if props (org-add-props type props) type))
     (_
-     (if (and (= 1 (length children))
-              (org-element-type-p (car children) 'anonymous))
-         (apply #'org-element-adopt (list type props) (car children))
-       (apply #'org-element-adopt (list type props) children)))))
+     (apply #'org-element-adopt (list type props) children))))
 
 (defun org-element-copy (datum &optional keep-contents)
   "Return a copy of DATUM.
@@ -822,6 +834,7 @@ When DATUM is `plain-text', all the properties are removed."
            (while contents
              (setcar contents (org-element-copy (car contents) t))
              (setq contents (cdr contents)))))
+       (org-element-resolve-deferred node-copy 'force)
        node-copy))))
 
 ;;;; AST queries
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index 7c14a4588f1..5f64cc1c1d0 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -76,20 +76,17 @@
 (require 'org-table)
 (require 'org-fold-core)
 
-(declare-function org-at-heading-p "org" (&optional _))
 (declare-function org-escape-code-in-string "org-src" (s))
 (declare-function org-src-preserve-indentation-p "org-src" (&optional node))
 (declare-function org-macro-escape-arguments "org-macro" (&rest args))
 (declare-function org-macro-extract-arguments "org-macro" (s))
-(declare-function org-reduced-level "org" (l))
 (declare-function org-unescape-code-in-string "org-src" (s))
 (declare-function org-inlinetask-outline-regexp "org-inlinetask" ())
 (declare-function outline-next-heading "outline" ())
-(declare-function outline-previous-heading "outline" ())
 
 (defvar org-complex-heading-regexp)
 (defvar org-done-keywords)
-(defvar org-edit-src-content-indentation)
+(defvar org-src-content-indentation)
 (defvar org-match-substring-regexp)
 (defvar org-odd-levels-only)
 (defvar org-property-drawer-re)
@@ -335,6 +332,12 @@ specially in `org-element--object-lex'.")
   (append org-element-recursive-objects '(paragraph table-row verse-block))
   "List of object or element types that can directly contain objects.")
 
+(defconst org-element-elements-no-affiliated
+  '(org-data comment clock headline inlinetask item
+             node-property planning property-drawer
+             section table-row)
+  "List of paragraph-level node types that cannot have affiliated keywords.")
+
 (defconst org-element-affiliated-keywords
   '("CAPTION" "DATA" "HEADER" "HEADERS" "LABEL" "NAME" "PLOT" "RESNAME" "RESULT"
     "RESULTS" "SOURCE" "SRCNAME" "TBLNAME")
@@ -504,7 +507,7 @@ past the brackets."
 			  (_ nil)))
 	  (pos (point)))
       (when syntax-table
-	(with-syntax-table syntax-table
+	(org-with-syntax-table syntax-table
 	  (let ((end (ignore-errors (scan-lists pos 1 0))))
 	    (when end
 	      (goto-char end)
@@ -533,13 +536,11 @@ created, all Org related local variables not in this list are copied
 to the new buffer.  Variables with an unreadable value are also
 ignored.")
 
-(cl-defun org-element--generate-copy-script (buffer
-                                             &key
-                                             copy-unreadable
-                                             drop-visibility
-                                             drop-narrowing
-                                             drop-contents
-                                             drop-locals)
+(cl-defun org-element--generate-copy-script
+    (buffer
+     &key
+     copy-unreadable drop-visibility drop-narrowing
+     drop-contents drop-text-properties drop-locals)
   "Generate a function duplicating BUFFER.
 
 The copy will preserve local variables, visibility, contents and
@@ -549,18 +550,21 @@ BUFFER, contents will be narrowed to that region instead.
 When optional key COPY-UNREADABLE is non-nil, do not ensure that all
 the copied local variables will be readable in another Emacs session.
 
-When optional keys DROP-VISIBILITY, DROP-NARROWING, DROP-CONTENTS, or
-DROP-LOCALS are non-nil, do not preserve visibility, narrowing,
-contents, or local variables correspondingly.
+When optional keys DROP-VISIBILITY, DROP-NARROWING, DROP-CONTENTS,
+DROP-TEXT-PROPERTIES, or DROP-LOCALS are non-nil, do not preserve
+visibility, narrowing, contents, text properties of contents, or local
+variables correspondingly.
 
 The resulting function can be evaluated at a later time, from
 another buffer, effectively cloning the original buffer there.
 
 The function assumes BUFFER's major mode is `org-mode'."
-  (declare-function org-fold-core--update-buffer-folds "org-fold-core" ())
-  (require 'org-fold-core)
   (with-current-buffer buffer
-    (let ((str (unless drop-contents (org-with-wide-buffer (buffer-string))))
+    (let ((str (unless drop-contents
+                 (org-with-wide-buffer
+                  (if drop-text-properties
+                      (substring-no-properties (buffer-string))
+                    (buffer-string)))))
           (narrowing
            (unless drop-narrowing
              (if (org-region-active-p)
@@ -849,6 +853,48 @@ and END-OFFSET."
   (org-unescape-code-in-string
    (org-element--substring element beg-offset end-offset)))
 
+(defvar org-element--cache-diagnostics-level 2
+  "Detail level of the diagnostics.")
+
+(defvar-local org-element--cache-diagnostics-ring nil
+  "Ring containing cache process log entries.
+The ring size is `org-element--cache-diagnostics-ring-size'.")
+
+(defvar org-element--cache-diagnostics-ring-size 5000
+  "Size of `org-element--cache-diagnostics-ring'.")
+
+(defvar org-element--cache-self-verify nil
+  "Activate extra consistency checks for the cache.
+
+This may cause serious performance degradation depending on the value
+of `org-element--cache-self-verify-frequency'.
+
+When set to symbol `backtrace', record and display backtrace log if
+any inconsistency is detected.")
+
+(defmacro org-element--cache-warn (format-string &rest args)
+  "Raise warning for org-element-cache.
+FORMAT-STRING and ARGS are the same arguments as in `format'."
+  `(let* ((format-string (funcall #'format ,format-string ,@args))
+          (format-string
+           (if (or (not org-element--cache-diagnostics-ring)
+                   (not (eq 'backtrace org-element--cache-self-verify)))
+               format-string
+             (prog1
+                 (concat (format "Warning(%s): "
+                                 (buffer-name (current-buffer)))
+                         format-string
+                         "\nBacktrace:\n  "
+                         (mapconcat #'identity
+                                    (ring-elements org-element--cache-diagnostics-ring)
+                                    "\n  "))
+               (setq org-element--cache-diagnostics-ring nil)))))
+     (if (and (boundp 'org-batch-test) org-batch-test)
+         (error "%s" (concat "org-element--cache: " format-string))
+       (push (concat "org-element--cache: " format-string) org--warnings)
+       (display-warning '(org-element org-element-cache)
+                        (concat "org-element--cache: " format-string)))))
+
 
 ;;; Greater elements
 ;;
@@ -944,6 +990,8 @@ Assume point is at the beginning of the block."
 		  :end end
 		  :contents-begin contents-begin
 		  :contents-end contents-end
+                  :robust-begin contents-begin
+                  :robust-end contents-end
 		  :post-blank (count-lines pos-before-blank end)
 		  :post-affiliated post-affiliated)
 	    (cdr affiliated))))))))
@@ -985,8 +1033,13 @@ Assume point is at beginning of drawer."
 	       (post-affiliated (point))
 	       ;; Empty drawers have no contents.
 	       (contents-begin (progn (forward-line)
+                                      (org-skip-whitespace)
+                                      (forward-line 0)
 				      (and (< (point) drawer-end-line)
 					   (point))))
+               (pre-blank (1- (count-lines
+                               post-affiliated
+                               (or contents-begin drawer-end-line))))
 	       (contents-end (and contents-begin drawer-end-line))
 	       (pos-before-blank (progn (goto-char drawer-end-line)
 					(forward-line)
@@ -998,9 +1051,20 @@ Assume point is at beginning of drawer."
 	   (nconc
 	    (list :begin begin
 		  :end end
+                  :pre-blank pre-blank
 		  :drawer-name name
 		  :contents-begin contents-begin
 		  :contents-end contents-end
+                  :robust-begin
+                  (and contents-begin
+                       ;; We might be dealing with broken properties
+                       ;; drawer. Every change inside is sensitive.
+                       (not (org-string-equal-ignore-case name "PROPERTIES"))
+                       ;; Inserting blank line at contents-begin
+                       ;; will trigger :pre-blank change and may not
+                       ;; be robust.
+                       (min (1+ contents-begin) contents-end))
+                  :robust-end contents-end
 		  :post-blank (count-lines pos-before-blank end)
 		  :post-affiliated post-affiliated)
 	    (cdr affiliated))))))))
@@ -1008,9 +1072,10 @@ Assume point is at beginning of drawer."
 (defun org-element-drawer-interpreter (drawer contents)
   "Interpret DRAWER element as Org syntax.
 CONTENTS is the contents of the element."
-  (format ":%s:\n%s:END:"
+  (format ":%s:\n%s%s:END:"
 	  (org-element-property :drawer-name drawer)
-	  contents))
+          (make-string (org-element-property :pre-blank drawer) ?\n)
+	  (or contents "")))
 
 
 ;;;; Dynamic Block
@@ -1060,6 +1125,8 @@ Assume point is at beginning of dynamic block."
 		    :arguments arguments
 		    :contents-begin contents-begin
 		    :contents-end contents-end
+                    :robust-begin contents-begin
+                    :robust-end contents-end
 		    :post-blank (count-lines pos-before-blank end)
 		    :post-affiliated post-affiliated)
 	      (cdr affiliated)))))))))
@@ -1334,9 +1401,9 @@ Throw `:org-element-deferred-retry' signal at the end."
                                (org-element--get-cached-string (match-string-no-properties 1)))))
 	     (todo-type
 	      (and todo (if (member todo org-done-keywords) 'done 'todo)))
-	     (priority (and (looking-at "\\[#.\\][ \t]*")
-			    (progn (goto-char (match-end 0))
-				   (aref (match-string 0) 2))))
+	     (priority (and (looking-at org-priority-regexp)
+                            (progn (goto-char (match-end 0))
+                                   (org-priority-to-value (match-string 2)))))
 	     (commentedp
 	      (and (let ((case-fold-search nil))
                      (looking-at org-element--headline-comment-re))
@@ -1344,10 +1411,13 @@ Throw `:org-element-deferred-retry' signal at the end."
 		     (goto-char (match-end 0))
                      (skip-chars-forward " \t"))))
 	     (title-start (point))
-	     (tags (when (re-search-forward
-			  "\\(:[[:alnum:]_@#%:]+:\\)[ \t]*$"
-			  (line-end-position)
-			  'move)
+	     (tags (when (progn
+                           ;; `org-tag-group-re' includes spaces before tags.
+                           ;; Start search before preceding spaces, if any.
+                           ;; If there are no spaces before point here,
+                           ;; We are not looking at the tags.
+                           (skip-chars-backward " \t")
+                           (re-search-forward org-tag-group-re (line-end-position) 'move))
 		     (goto-char (match-beginning 0))
                      (mapcar #'org-element--get-cached-string
 		             (org-split-string (match-string-no-properties 1) ":"))))
@@ -1494,8 +1564,8 @@ CONTENTS is the contents of the element."
 	  (concat (make-string (if org-odd-levels-only (1- (* level 2)) level)
 			       ?*)
 		  (and todo (concat " " todo))
+		  (and priority (format " [#%s]" (org-priority-to-string priority)))
 		  (and commentedp (concat " " org-element-comment-string))
-		  (and priority (format " [#%c]" priority))
 		  " "
 		  (if (and org-footnote-section
 			   (org-element-property :footnote-section-p headline))
@@ -1580,8 +1650,8 @@ Alter DATA by side effect."
   "Parse org-data.
 
 Return a new syntax node of `org-data' type containing `:begin',
-`:contents-begin', `:contents-end', `:end', `:post-blank',
-`:post-affiliated', and `:path' properties."
+`:pre-blank', `:contents-begin', `:contents-end', `:end',
+`:post-blank', `:post-affiliated', and `:path' properties."
   (org-with-wide-buffer
    (let* ((begin 1)
           (contents-begin (progn
@@ -1612,6 +1682,7 @@ Return a new syntax node of `org-data' type containing `:begin',
             :end end
             :robust-begin robust-begin
             :robust-end robust-end
+            :pre-blank (count-lines begin contents-begin)
             ;; Trailing blank lines in org-data, headlines, and
             ;; sections belong to the containing elements.
             :post-blank 0
@@ -1621,10 +1692,12 @@ Return a new syntax node of `org-data' type containing `:begin',
             :buffer (current-buffer)
             :deferred org-element--get-global-node-properties)))))
 
-(defun org-element-org-data-interpreter (_ contents)
+(defun org-element-org-data-interpreter (org-data contents)
   "Interpret ORG-DATA element as Org syntax.
 CONTENTS is the contents of the element."
-  contents)
+  (concat
+   (make-string (or (org-element-property :pre-blank org-data) 0) ?\n)
+   contents))
 
 ;;;; Inlinetask
 
@@ -1711,7 +1784,7 @@ CONTENTS is the contents of inlinetask."
 		      (format ":%s:" (mapconcat 'identity tag-list ":")))))
 	 (task (concat (make-string level ?*)
 		       (and todo (concat " " todo))
-		       (and priority (format " [#%c]" priority))
+		       (and priority (format " [#%s]" (org-priority-to-string priority)))
 		       (and title (concat " " title)))))
     (concat task
 	    ;; Align tags.
@@ -1969,6 +2042,14 @@ Return a new syntax node of `plain-list' type containing `:type',
 `:post-blank' and `:post-affiliated' properties.
 
 Assume point is at the beginning of the list."
+  (when (and structure (not (assq (point) structure)))
+    ;; STRUCT is corrupted - cannot find list inside.
+    (org-element--cache-warn
+     "Invalid :struct passed to plain-list parser at %S: %S
+If this warning appears regularly, please report the warning text to Org mode mailing list (M-x org-submit-bug-report)."
+     (point) structure)
+    ;; Try to recover
+    (setq structure nil))
   (save-excursion
     (let* ((struct (or structure (org-element--list-struct limit)))
 	   (type (cond ((looking-at-p "[ \t]*[A-Za-z0-9]") 'ordered)
@@ -2050,6 +2131,10 @@ Assume point is at the beginning of the property drawer."
 	       :end end
 	       :contents-begin (and contents-end contents-begin)
 	       :contents-end contents-end
+               ;; Changing anything inside property drawer may
+               ;; change property drawer to ordinary drawer.
+               :robust-begin nil
+               :robust-end nil
 	       :post-blank (count-lines before-blank end)
 	       :post-affiliated begin))))))
 
@@ -2100,6 +2185,8 @@ Assume point is at the beginning of the block."
 		    :end end
 		    :contents-begin contents-begin
 		    :contents-end contents-end
+                    :robust-begin contents-begin
+                    :robust-end contents-end
 		    :post-blank (count-lines pos-before-blank end)
 		    :post-affiliated post-affiliated)
 	      (cdr affiliated)))))))))
@@ -2198,6 +2285,8 @@ Assume point is at the beginning of the block."
 		    :end end
 		    :contents-begin contents-begin
 		    :contents-end contents-end
+                    :robust-begin contents-begin
+                    :robust-end contents-end
 		    :post-blank (count-lines pos-before-blank end)
 		    :post-affiliated post-affiliated)
 	      (cdr affiliated)))))))))
@@ -2562,10 +2651,10 @@ Return a new syntax node of `example-block' type containing `:begin',
 	 (let ((val (org-element-property :value example-block)))
 	   (cond
 	    ((org-src-preserve-indentation-p example-block) val)
-	    ((= 0 org-edit-src-content-indentation)
+	    ((= 0 org-src-content-indentation)
 	     (org-remove-indentation val))
 	    (t
-	     (let ((ind (make-string org-edit-src-content-indentation ?\s)))
+	     (let ((ind (make-string org-src-content-indentation ?\s)))
 	       (replace-regexp-in-string "^[ \t]*\\S-"
 					 (concat ind "\\&")
 					 (org-remove-indentation val))))))))
@@ -2649,11 +2738,13 @@ Assume point is at the beginning of the fixed-width area."
   (save-excursion
     (let* ((begin (car affiliated))
 	   (post-affiliated (point))
+           pos-before-blank
 	   (end-area
 	    (progn
 	      (while (and (< (point) limit)
 			  (looking-at-p "[ \t]*:\\( \\|$\\)"))
 		(forward-line))
+              (setq pos-before-blank (point))
 	      (if (bolp) (line-end-position 0) (point))))
 	   (end (progn (skip-chars-forward " \r\t\n" limit)
 		       (if (eobp) (point) (line-beginning-position)))))
@@ -2666,7 +2757,7 @@ Assume point is at the beginning of the fixed-width area."
 		      "^[ \t]*: ?" ""
 		      (buffer-substring-no-properties post-affiliated
 						      end-area))
-	      :post-blank (count-lines end-area end)
+	      :post-blank (count-lines pos-before-blank end)
 	      :post-affiliated post-affiliated)
 	(cdr affiliated))))))
 
@@ -3096,10 +3187,10 @@ Assume point is at the beginning of the block."
 	 (let ((val (org-element-property :value src-block)))
 	   (cond
 	    ((org-src-preserve-indentation-p src-block) val)
-	    ((zerop org-edit-src-content-indentation)
+	    ((zerop org-src-content-indentation)
 	     (org-remove-indentation val))
 	    (t
-	     (let ((ind (make-string org-edit-src-content-indentation ?\s)))
+	     (let ((ind (make-string org-src-content-indentation ?\s)))
 	       (replace-regexp-in-string "^[ \t]*\\S-"
 					 (concat ind "\\&")
 					 (org-remove-indentation val))))))))
@@ -3361,7 +3452,7 @@ Assume point is at the beginning of the citation."
                         (match-string-no-properties 1))))
 	   ;; Ignore blanks between cite type and prefix or key.
 	   (start (match-end 0))
-	   (closing (with-syntax-table org-element--pair-square-table
+	   (closing (org-with-syntax-table org-element--pair-square-table
 		      (ignore-errors (scan-lists begin 1 0)))))
       (save-excursion
 	(when (and closing
@@ -3602,7 +3693,7 @@ When at a footnote reference, return a new syntax node of
 `:end', `:contents-begin', `:contents-end' and `:post-blank' as
 properties.  Otherwise, return nil."
   (when (looking-at org-footnote-re)
-    (let ((closing (with-syntax-table org-element--pair-square-table
+    (let ((closing (org-with-syntax-table org-element--pair-square-table
 		     (ignore-errors (scan-lists (point) 1 0)))))
       (when closing
 	(save-excursion
@@ -3694,6 +3785,9 @@ Assume point is at the beginning of the babel call."
 
 ;;;; Inline Src Block
 
+(defconst org-element-inline-src-block-regexp "\\<src_\\([^ \t\n[{]+\\)[{[]"
+  "Regexp matching inline source blocks.")
+
 (defun org-element-inline-src-block-parser ()
   "Parse inline source block at point, if any.
 
@@ -3706,7 +3800,7 @@ Assume point is at the beginning of the inline source block."
   (save-excursion
     (catch :no-object
       (when (let ((case-fold-search nil))
-	      (looking-at "\\<src_\\([^ \t\n[{]+\\)[{[]"))
+	      (looking-at org-element-inline-src-block-regexp))
 	(goto-char (match-end 1))
 	(let ((begin (match-beginning 0))
 	      (language (org-element--get-cached-string
@@ -4278,8 +4372,6 @@ Assume point is at the target."
 
 (defconst org-element--timestamp-regexp
   (concat org-ts-regexp-both
-	  "\\|"
-	  "\\(?:<[0-9]+-[0-9]+-[0-9]+[^>\n]+?\\+[0-9]+[dwmy]>\\)"
 	  "\\|"
 	  "\\(?:<%%\\(?:([^>\n]+)\\)\\([^\n>]*\\)>\\)")
   "Regexp matching any timestamp type object.")
@@ -4709,14 +4801,7 @@ element it has to parse."
         ;; Property drawer.
         ((and (pcase mode
 	        (`planning (eq ?* (char-after (line-beginning-position 0))))
-	        ((or `property-drawer `top-comment)
-                 ;; See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63225#80
-                 (save-excursion
-                   (forward-line -1)   ; faster than beginning-of-line
-                   (skip-chars-forward "[:blank:]") ; faster than looking-at-p
-                   (or (not (eolp)) ; very cheap
-                       ;; Document-wide property drawer may be preceded by blank lines.
-                       (progn (skip-chars-backward " \t\n\r") (bobp)))))
+	        ((or `property-drawer `top-comment) t)
 	        (_ nil))
 	      (looking-at-p org-property-drawer-re))
 	 (org-element-property-drawer-parser limit))
@@ -4937,10 +5022,13 @@ When PARSE is non-nil, values from keywords belonging to
 ;; parts of the parse tree.
 
 (defun org-element-parse-buffer (&optional granularity visible-only keep-deferred)
-  "Recursively parse the buffer and return structure.
+  "Recursively parse the current Org mode buffer and return structure.
 If narrowing is in effect, only parse the visible part of the
 buffer.
 
+This function assumes that current major mode is `org-mode'.  When the
+major mode is different, the behaviour is undefined.
+
 Optional argument GRANULARITY determines the depth of the
 recursion.  It can be set to the following symbols:
 
@@ -4979,9 +5067,7 @@ pattern (TYPE PROPERTIES CONTENTS), where :
 
 The Org buffer has `org-data' as type and nil as properties.
 `org-element-map' function can be used to find specific elements
-or objects within the parse tree.
-
-This function assumes that current major mode is `org-mode'."
+or objects within the parse tree."
   (save-excursion
     (goto-char (point-min))
     (let ((org-data (org-element-org-data-parser))
@@ -5470,11 +5556,6 @@ to interpret.  Return Org syntax as a string."
 			(mapconcat (lambda (obj) (funcall fun obj parent))
 				   data
 				   ""))
-		       ;; Full Org document.
-		       ((eq type 'org-data)
-			(mapconcat (lambda (obj) (funcall fun obj parent))
-				   (org-element-contents data)
-				   ""))
 		       ;; Plain text: return it.
 		       ((stringp data) data)
 		       ;; Element or object without contents.
@@ -5514,53 +5595,59 @@ to interpret.  Return Org syntax as a string."
 		    (if (eq (org-element-class data parent) 'object)
 			(concat results (make-string blank ?\s))
 		      (concat (org-element--interpret-affiliated-keywords data)
-			      (org-element-normalize-string results)
+                              ;; Make sure that we have at least a
+                              ;; single newline after (if non-empty),
+                              ;; but keep any existing newlines (they
+                              ;; come from :post-blank inside
+                              ;; contents)
+			      (org-element-normalize-string results 'keep-newlines)
 			      (make-string blank ?\n)))))))))
     (funcall fun data nil)))
 
+(defun org-element--interpret-affiliated-keyword (key value)
+  "Interpret affiliated keyword with KEY and VALUE."
+  (let (dual)
+    (when (member key org-element-dual-keywords)
+      (setq dual (cdr value) value (car value)))
+    (concat "#+" (downcase key)
+            (and dual
+                 (format "[%s]" (org-element-interpret-data dual)))
+            ": "
+            (if (member key org-element-parsed-keywords)
+                (org-element-interpret-data value)
+              value)
+            "\n")))
+
 (defun org-element--interpret-affiliated-keywords (element)
   "Return ELEMENT's affiliated keywords as Org syntax.
 If there is no affiliated keyword, return the empty string."
-  (let ((keyword-to-org
-	 (lambda (key value)
-	   (let (dual)
-	     (when (member key org-element-dual-keywords)
-	       (setq dual (cdr value) value (car value)))
-	     (concat "#+" (downcase key)
-		     (and dual
-			  (format "[%s]" (org-element-interpret-data dual)))
-		     ": "
-		     (if (member key org-element-parsed-keywords)
-			 (org-element-interpret-data value)
-		       value)
-		     "\n")))))
-    (mapconcat
-     (lambda (prop)
-       (let ((value (org-element-property prop element))
-	     (keyword (upcase (substring (symbol-name prop) 1))))
-	 (when value
-	   (if (or (member keyword org-element-multiple-keywords)
-		   ;; All attribute keywords can have multiple lines.
-		   (string-match-p "^ATTR_" keyword))
-	       (mapconcat (lambda (line) (funcall keyword-to-org keyword line))
-			  value "")
-	     (funcall keyword-to-org keyword value)))))
-     ;; List all ELEMENT's properties matching an attribute line or an
-     ;; affiliated keyword, but ignore translated keywords since they
-     ;; cannot belong to the property list.
-     (let (acc)
-       (org-element-properties-mapc
-        (lambda (prop _ __)
-          (let  ((keyword (upcase (substring (symbol-name prop) 1))))
-            (when (or (string-match-p "^ATTR_" keyword)
-		      (and
-		       (member keyword org-element-affiliated-keywords)
-		       (not (assoc keyword
-			         org-element-keyword-translation-alist))))
-              (push prop acc))))
-        element t)
-       (nreverse acc))
-     "")))
+  ;; there are some elements that will never have affiliated keywords,
+  ;; so do nothing for these
+  (if (member (org-element-type element)
+              org-element-elements-no-affiliated)
+      ""
+    (let (acc)
+      ;; List all ELEMENT's properties matching an attribute line or an
+      ;; affiliated keyword, but ignore translated keywords since they
+      ;; cannot belong to the property list.
+      (org-element-properties-mapc
+       (lambda (prop value)
+         (when value
+           (let* ((keyword (upcase (substring (symbol-name prop) 1)))
+                  (attrp (string-prefix-p "ATTR_" keyword)))
+             (when (or attrp
+                       (and
+                        (member keyword org-element-affiliated-keywords)
+                        (not (assoc keyword
+                                  org-element-keyword-translation-alist))))
+               (push (if (or attrp ; All attribute keywords can have multiple lines.
+                             (member keyword org-element-multiple-keywords))
+                         (mapconcat (lambda (line) (org-element--interpret-affiliated-keyword keyword line))
+                                    value "")
+                       (org-element--interpret-affiliated-keyword keyword value))
+                     acc)))))
+       element t)
+      (apply #'concat (nreverse acc)))))
 
 ;; Because interpretation of the parse tree must return the same
 ;; number of blank lines between elements and the same number of white
@@ -5574,15 +5661,20 @@ If there is no affiliated keyword, return the empty string."
 ;; The second function, `org-element-normalize-contents', removes
 ;; global indentation from the contents of the current element.
 
-(defun org-element-normalize-string (s)
+(defun org-element-normalize-string (s &optional keep-newlines)
   "Ensure string S ends with a single newline character.
 
 If S isn't a string return it unchanged.  If S is the empty
 string, return it.  Otherwise, return a new string with a single
-newline character at its end."
+newline character at its end.
+
+When optional argument KEEP-NEWLINES is non-nil, keep any newlines that
+are present, even when there are more than one."
   (cond
    ((not (stringp s)) s)
    ((string= "" s) "")
+   (keep-newlines
+    (if (string-suffix-p "\n" s) s (concat s "\n")))
    (t (and (string-match "\\(\n[ \t]*\\)*\\'" s)
 	   (replace-match "\n" nil nil s)))))
 
@@ -5766,15 +5858,6 @@ seconds.")
   "Duration, as a time value, of the pause between synchronizations.
 See `org-element-cache-sync-duration' for more information.")
 
-(defvar org-element--cache-self-verify nil
-  "Activate extra consistency checks for the cache.
-
-This may cause serious performance degradation depending on the value
-of `org-element--cache-self-verify-frequency'.
-
-When set to symbol `backtrace', record and display backtrace log if
-any inconsistency is detected.")
-
 (defvar org-element--cache-self-verify-before-persisting nil
   "Perform consistency checks for the cache before writing to disk.
 
@@ -5797,16 +5880,6 @@ to be correct.  Setting this to a value less than 0.0001 is useless.")
 (defvar org-element--cache-map-statistics-threshold 0.1
   "Time threshold in seconds to log statistics for `org-element-cache-map'.")
 
-(defvar org-element--cache-diagnostics-level 2
-  "Detail level of the diagnostics.")
-
-(defvar-local org-element--cache-diagnostics-ring nil
-  "Ring containing cache process log entries.
-The ring size is `org-element--cache-diagnostics-ring-size'.")
-
-(defvar org-element--cache-diagnostics-ring-size 5000
-  "Size of `org-element--cache-diagnostics-ring'.")
-
 ;;;; Data Structure
 
 (defvar-local org-element--cache nil
@@ -5969,29 +6042,6 @@ FORMAT-STRING and ARGS are the same arguments as in `format'."
                  (make-ring org-element--cache-diagnostics-ring-size)))
          (ring-insert org-element--cache-diagnostics-ring format-string)))))
 
-(defmacro org-element--cache-warn (format-string &rest args)
-  "Raise warning for org-element-cache.
-FORMAT-STRING and ARGS are the same arguments as in `format'."
-  `(let* ((format-string (funcall #'format ,format-string ,@args))
-          (format-string
-           (if (or (not org-element--cache-diagnostics-ring)
-                   (not (eq 'backtrace org-element--cache-self-verify)))
-               format-string
-             (prog1
-                 (concat (format "Warning(%s): "
-                                 (buffer-name (current-buffer)))
-                         format-string
-                         "\nBacktrace:\n  "
-                         (mapconcat #'identity
-                                    (ring-elements org-element--cache-diagnostics-ring)
-                                    "\n  "))
-               (setq org-element--cache-diagnostics-ring nil)))))
-     (if (and (boundp 'org-batch-test) org-batch-test)
-         (error "%s" (concat "org-element--cache: " format-string))
-       (push (concat "org-element--cache: " format-string) org--warnings)
-       (display-warning '(org-element org-element-cache)
-                        (concat "org-element--cache: " format-string)))))
-
 (defsubst org-element--cache-key (element)
   "Return a unique key for ELEMENT in cache tree.
 
@@ -7036,6 +7086,14 @@ If you observe Emacs hangs frequently, please report this to Org mode mailing li
                (unless (save-excursion
                          (org-skip-whitespace)
                          (eobp))
+                 (unless (>= end (point))
+                   (org-element--cache-warn
+                    "Invalid LIMIT boundary during parsing. Please report it to Org mode mailing list (M-x org-submit-bug-report).\n Backtrace:\n%S"
+                    (when (and (fboundp 'backtrace-get-frames)
+                               (fboundp 'backtrace-to-string))
+                      (backtrace-to-string (backtrace-get-frames 'backtrace))
+                      (org-element-cache-reset)
+                      (error "org-element--cache: Emergency exit"))))
                  (setq element (org-element--current-element
 			        end 'element mode
 			        (org-element-property :structure parent))))
@@ -7307,18 +7365,12 @@ known element in cache (it may start after END)."
                 (or (and (memq type '( center-block dynamic-block
                                        quote-block special-block
                                        drawer))
-                         (or (not (eq type 'drawer))
-                             (not (string= "PROPERTIES" (org-element-property :drawer-name up))))
                          ;; Sensitive change.  This is
                          ;; unconditionally non-robust change.
                          (not org-element--cache-change-warning)
-		         (let ((cbeg (org-element-contents-begin up))
-                               (cend (org-element-contents-end up)))
-		           (and cbeg
-                                (<= cbeg beg)
-			        (or (> cend end)
-                                    (and (= cend end)
-                                         (= (+ end offset) (point-max)))))))
+		         (let ((rbeg (org-element-property :robust-begin up))
+                               (rend (org-element-property :robust-end up)))
+		           (and rbeg rend (<= rbeg beg) (>= rend end))))
                     (and (memq type '(headline section org-data))
 		         (let ((rbeg (org-element-property :robust-begin up))
                                (rend (org-element-property :robust-end up)))
@@ -7991,7 +8043,8 @@ the cache."
           ;; Bind variables used inside loop to avoid memory
           ;; re-allocation on every iteration.
           ;; See https://emacsconf.org/2021/talks/faster/
-          tmpnext-start tmpparent tmpelement)
+          tmpnext-start tmpparent tmpelement
+          func-match-data)
       (save-excursion
         (save-restriction
           (unless narrow (widen))
@@ -8062,30 +8115,29 @@ the cache."
                         ;; point.
                         (move-start-to-next-match
                           ;; Preserve match data that might be set by FUNC.
-                          (re) `(save-match-data
-                                  (if (or (not ,re)
-                                          (if org-element--cache-map-statistics
-                                              (progn
-                                                (setq before-time (float-time))
-                                                (prog1 (re-search-forward (or (car-safe ,re) ,re) nil 'move)
-                                                  (cl-incf re-search-time
-                                                           (- (float-time)
-                                                              before-time))))
-                                            (re-search-forward (or (car-safe ,re) ,re) nil 'move)))
-                                      (unless (or (< (point) (or start -1))
-                                                  (and data
-                                                       (< (point) (org-element-begin data))))
-                                        (if (cdr-safe ,re)
-                                            ;; Avoid parsing when we are 100%
-                                            ;; sure that regexp is good enough
-                                            ;; to find new START.
-                                            (setq start (match-beginning 0))
-                                          (setq start (max (or start -1)
-                                                           (or (org-element-begin data) -1)
-                                                           (or (org-element-begin (element-match-at-point)) -1))))
-                                        (when (>= start to-pos) (cache-walk-abort))
-                                        (when (eq start -1) (setq start nil)))
-                                    (cache-walk-abort))))
+                          (re) `(if (or (not ,re)
+                                        (if org-element--cache-map-statistics
+                                            (progn
+                                              (setq before-time (float-time))
+                                              (prog1 (re-search-forward (or (car-safe ,re) ,re) nil 'move)
+                                                (cl-incf re-search-time
+                                                         (- (float-time)
+                                                            before-time))))
+                                          (re-search-forward (or (car-safe ,re) ,re) nil 'move)))
+                                    (unless (or (< (point) (or start -1))
+                                                (and data
+                                                     (< (point) (org-element-begin data))))
+                                      (if (cdr-safe ,re)
+                                          ;; Avoid parsing when we are 100%
+                                          ;; sure that regexp is good enough
+                                          ;; to find new START.
+                                          (setq start (match-beginning 0))
+                                        (setq start (max (or start -1)
+                                                         (or (org-element-begin data) -1)
+                                                         (or (org-element-begin (element-match-at-point)) -1))))
+                                      (when (>= start to-pos) (cache-walk-abort))
+                                      (when (eq start -1) (setq start nil)))
+                                  (cache-walk-abort)))
                         ;; Find expected begin position of an element after
                         ;; DATA.
                         (next-element-start
@@ -8213,8 +8265,8 @@ the cache."
                            ;; PREV.
 		           (or (not prev)
 		               (not (org-element--cache-key-less-p
-		                     (org-element--cache-key data)
-			             (org-element--cache-key prev))))
+		                   (org-element--cache-key data)
+			           (org-element--cache-key prev))))
                            ;; ... or when we are before START.
                            (or (not start)
                                (not (> start (org-element-begin data)))))
@@ -8234,8 +8286,8 @@ the cache."
                     ;; and need to fill it.
                     (unless (or (and start (< (org-element-begin data) start))
 		                (and prev (not (org-element--cache-key-less-p
-				                (org-element--cache-key prev)
-				                (org-element--cache-key data)))))
+				              (org-element--cache-key prev)
+				              (org-element--cache-key data)))))
                       ;; DATA is at of after START and PREV.
 	              (if (or (not start) (= (org-element-begin data) start))
                           ;; DATA is at START.  Match it.
@@ -8277,6 +8329,8 @@ the cache."
                                 ;;
                                 ;; Call FUNC.  FUNC may move point.
                                 (setq org-element-cache-map-continue-from nil)
+                                (when func-match-data
+                                  (set-match-data func-match-data t))
                                 (if (org-with-base-buffer nil org-element--cache-map-statistics)
                                     (progn
                                       (setq before-time (float-time))
@@ -8289,6 +8343,7 @@ the cache."
                                         (cl-incf count-predicate-calls-fail)))
                                   (push (funcall func data) result)
                                   (when (car result) (cl-incf count-predicate-calls-match)))
+                                (setq func-match-data (match-data))
                                 ;; Set `last-match'.
                                 (setq last-match (car result))
                                 ;; If FUNC moved point forward, update
@@ -8511,7 +8566,7 @@ This function may modify the match data."
               (org-element-at-point (1+ epom) cached-only))))))))
 
 ;;;###autoload
-(defsubst org-element-at-point-no-context (&optional pom)
+(defun org-element-at-point-no-context (&optional pom)
   "Quickly find element at point or POM.
 
 It is a faster version of `org-element-at-point' that is not
@@ -8586,7 +8641,7 @@ This function may modify match data."
 	   (goto-char (org-element-begin element))
 	   (looking-at org-complex-heading-regexp)
 	   (let ((end (match-end 4)))
-	     (if (not end) (throw 'objects-forbidden element)
+	     (if (or (not end) (> pos end)) (throw 'objects-forbidden element)
 	       (goto-char (match-beginning 4))
 	       (when (looking-at org-element-comment-string)
 		 (goto-char (match-end 0)))
diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el
index bde0d49b6d9..8d2c0cc40c5 100644
--- a/lisp/org/org-entities.el
+++ b/lisp/org/org-entities.el
@@ -4,6 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>,
 ;;         Ulf Stegemann <ulf at zeitform dot de>
+;; Maintainer: Ihor Radchenko <yantar92 at posteo dot net>
 ;; Keywords: outlines, calendar, text
 ;; URL: https://orgmode.org
 ;;
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index d706baa6b79..b0f5ef9d7e7 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2004-2026 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
+;; Maintainer: Ihor Radchenko <yantar92 at posteo dot net>
 ;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
@@ -324,20 +325,23 @@ determines if it is a foreground or a background color."
 
 (defcustom org-priority-faces nil
   "Faces for specific Priorities.
-This is a list of cons cells, with priority character in the car
-and faces in the cdr.  The face can be a symbol, a color
-as a string, or a property list of attributes, like
+This is an association list, whose keys are priorities and values are
+faces.  The face can be a symbol, a color as a string, or a property
+list of attributes, like
     (:foreground \"blue\" :weight bold :underline t).
 If it is a color string, the variable `org-faces-easy-properties'
 determines if it is a foreground or a background color."
   :group 'org-faces
   :group 'org-todo
-  :type '(repeat
-	  (cons
-	   (character :tag "Priority")
-	   (choice    :tag "Face    "
-		      (string :tag "Color")
-		      (sexp :tag "Face")))))
+  :type '(choice (const :tag "Defaults" nil)
+                 (alist :tag "Association list"
+                        :key-type
+                        (choice :tag "Priority"
+                                (character :tag "Character" :value ?A)
+                                (natnum :tag "Number" :value 1))
+                        :value-type (choice :tag "Face    "
+		                            (string :tag "Color")
+		                            (sexp :tag "Face")))))
 
 (defvar org-tags-special-faces-re nil)
 (defun org-set-tag-faces (var value)
diff --git a/lisp/org/org-fold-core.el b/lisp/org/org-fold-core.el
index 8a220db7686..5aef5002f8e 100644
--- a/lisp/org/org-fold-core.el
+++ b/lisp/org/org-fold-core.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2020-2026 Free Software Foundation, Inc.
 ;;
 ;; Author: Ihor Radchenko <yantar92 at posteo dot net>
+;; Maintainer: Ihor Radchenko <yantar92 at posteo dot net>
 ;; Keywords: folding, invisible text
 ;; URL: https://orgmode.org
 ;;
@@ -27,6 +28,11 @@
 ;; This file contains library to control temporary invisibility
 ;; (folding and unfolding) of text in buffers.
 
+;; Do note that something being folded does not necessarily mean
+;; that it is invisible.  Folded regions might be permanently visible
+;; by the means of `:visible' folding spec or because isearch
+;; temporarily revealed the folds.
+
 ;; The file implements the following functionality:
 ;;
 ;; - Folding/unfolding regions of text
@@ -245,7 +251,7 @@
 ;; with `grab-invisible' option, folded regions copied to other
 ;; buffers (including buffers that do not use this library) will
 ;; remain invisible.  org-fold-core provides functions to work around
-;; this issue: `org-fold-core-remove-optimisation' and `org-fold-core-update-optimisation', but
+;; this issue: `org-fold-core-remove-optimization' and `org-fold-core-update-optimization', but
 ;; it is unlikely that a random external package will use them.
 
 ;; Another possible bottleneck is the fragility check after the change
@@ -276,8 +282,6 @@
 (require 'org-macs)
 (require 'org-compat)
 
-(declare-function isearch-filter-visible "isearch" (beg end))
-
 ;;; Customization
 
 (defcustom org-fold-core-style (if (version< emacs-version "29")
@@ -1070,8 +1074,9 @@ If SPEC-OR-ALIAS is omitted and FLAG is nil, unfold everything in the region."
                              (overlay-get ov 'invisible)
                              (org-fold-core-get-folding-spec-property
                               (overlay-get ov 'invisible) :isearch-open))
-                    (when (overlay-get ov 'invisible)
-                      (overlay-put ov 'org-invisible (overlay-get ov 'invisible)))
+                    (when-let* ((spec (overlay-get ov 'invisible)))
+                      (overlay-put ov 'org-invisible spec)
+                      (overlay-put ov (org-fold-core--property-symbol-get-create spec) nil))
                     (overlay-put ov 'invisible nil)
                     (when org-fold-core--isearch-active
                       (cl-pushnew ov org-fold-core--isearch-overlays)))))
@@ -1244,11 +1249,11 @@ This function is intended to be used as `isearch-filter-predicate'."
       (setq beg (car overlay-or-region)
             end (cdr overlay-or-region)))
     ;; FIXME: Reveal the match (usually point, but may sometimes go beyond the region).
-    (when (< beg (point) end)
-      (funcall org-fold-core-isearch-open-function (point)))
-    (if (overlayp overlay-or-region)
-        (delete-overlay overlay-or-region)
-      (org-fold-core-region beg end nil))))
+    (if (<= beg (point) end)
+        (funcall org-fold-core-isearch-open-function (point))
+      (if (overlayp overlay-or-region)
+          (delete-overlay overlay-or-region)
+        (org-fold-core-region beg end nil)))))
 
 (defun org-fold-core--isearch-show-temporary (region hide-p)
   "Temporarily reveal text in REGION.
@@ -1259,8 +1264,9 @@ REGION can also be an overlay in current buffer."
       (if hide-p
           (if (not (overlayp region))
               nil ;; FIXME: after isearch supports text properties.
-            (when (overlay-get region 'org-invisible)
-              (overlay-put region 'invisible (overlay-get region 'org-invisible))))
+            (when-let* ((spec (overlay-get region 'org-invisible)))
+              (overlay-put region 'invisible spec)
+              (overlay-put region (org-fold-core--property-symbol-get-create spec) spec)))
         ;; isearch expects all the temporarily opened overlays to exist.
         ;; See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=60399
         (org-fold-core--keep-overlays
diff --git a/lisp/org/org-fold.el b/lisp/org/org-fold.el
index aea1fe0accb..58debf4011f 100644
--- a/lisp/org/org-fold.el
+++ b/lisp/org/org-fold.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2020-2026 Free Software Foundation, Inc.
 ;;
 ;; Author: Ihor Radchenko <yantar92 at posteo dot net>
+;; Maintainer: Ihor Radchenko <yantar92 at posteo dot net>
 ;; Keywords: folding, invisible text
 ;; URL: https://orgmode.org
 ;;
@@ -58,29 +59,25 @@
 (defvar org-custom-properties-overlays)
 (defvar org-element-headline-re)
 
-(declare-function isearch-filter-visible "isearch" (beg end))
 (declare-function org-element-type "org-element-ast" (node &optional anonymous))
 (declare-function org-element-at-point "org-element" (&optional pom cached-only))
-(declare-function org-element-property "org-element-ast" (property node))
 (declare-function org-element-end "org-element" (node))
 (declare-function org-element-post-affiliated "org-element" (node))
-(declare-function org-element--current-element "org-element" (limit &optional granularity mode structure))
 (declare-function org-toggle-custom-properties-visibility "org" ())
 (declare-function org-item-re "org-list" ())
 (declare-function org-up-heading-safe "org" ())
-(declare-function org-get-tags "org" (&optional pos local fontify))
+(declare-function org-get-tags "org" (&optional epom local))
 (declare-function org-get-valid-level "org" (level &optional change))
 (declare-function org-before-first-heading-p "org" ())
 (declare-function org-goto-sibling "org" (&optional previous))
 (declare-function org-block-map "org" (function &optional start end))
 (declare-function org-map-region "org" (fun beg end))
-(declare-function org-end-of-subtree "org" (&optional invisible-ok to-heading))
+(declare-function org-end-of-subtree "org" (&optional invisible-ok to-heading element))
 (declare-function org-back-to-heading-or-point-min "org" (&optional invisible-ok))
 (declare-function org-back-to-heading "org" (&optional invisible-ok))
 (declare-function org-at-heading-p "org" (&optional invisible-not-ok))
 (declare-function org-cycle-hide-drawers "org-cycle" (state))
 
-(declare-function outline-show-branches "outline" ())
 (declare-function outline-hide-sublevels "outline" (levels))
 (declare-function outline-get-next-sibling "outline" ())
 (declare-function outline-invisible-p "outline" (&optional pos))
@@ -249,7 +246,7 @@ Also, see `org-fold-catch-invisible-edits'."
   ;; overlays for isearch.
   (setq-local org-fold-core--isearch-special-specs '(org-link))
   (org-fold-core-initialize
-   `((,(if (eq org-fold-core-style 'text-properties) 'org-fold-outline 'outline)
+   `((org-fold-outline
       (:ellipsis . ,ellipsis)
       (:fragile . ,#'org-fold--reveal-outline-maybe)
       (:isearch-open . t)
@@ -650,7 +647,7 @@ be shown."
   "Set visibility around point according to DETAIL.
 DETAIL is either nil, `minimal', `local', `ancestors',
 `ancestors-full', `lineage', `tree', `canonical' or t.  See
-`org-show-context-detail' for more information."
+`org-fold-show-context-detail' for more information."
   ;; Show current heading and possibly its entry, following headline
   ;; or all children.
   (if (and (org-at-heading-p) (not (eq detail 'local)))
@@ -745,15 +742,18 @@ This function is intended to be used as a member of
   (setq from (save-excursion (goto-char from) (line-beginning-position 0)))
   (cons from to))
 
-(defun org-fold--reveal-headline-at-point ()
+(defun org-fold--reveal-headline-at-point-delayed ()
   "Reveal header line and empty contents inside.
 Reveal the header line and, if present, also reveal its contents, when
 the contents consists of blank lines.
 
+Only perform actual unfolding in `post-command-hook' by calling
+`org-fold-core--region-delayed'.
+
 Assume that point is located at the header line."
   (org-with-wide-buffer
    (forward-line 0)
-   (org-fold-region
+   (org-fold-core--region-delayed
     (max (point-min) (1- (point)))
     (let ((endl (line-end-position)))
       (save-excursion
@@ -783,19 +783,19 @@ This function is intended to be used as :fragile property of
      (forward-line 0)
      ;; Make sure that headline is not partially hidden.
      (unless (org-fold-folded-p nil 'headline)
-       (org-fold--reveal-headline-at-point))
+       (org-fold--reveal-headline-at-point-delayed))
      ;; Never hide level 1 headlines
      (save-excursion
        (goto-char (line-end-position))
        (unless (>= (point) (cdr region))
          (when (re-search-forward (rx bol "* ") (cdr region) t)
-           (org-fold--reveal-headline-at-point))))
+           (org-fold--reveal-headline-at-point-delayed))))
      ;; Make sure that headline after is not partially hidden.
      (goto-char (cdr region))
      (forward-line 0)
      (unless (org-fold-folded-p nil 'headline)
        (when (looking-at-p org-element-headline-re)
-         (org-fold--reveal-headline-at-point)))
+         (org-fold--reveal-headline-at-point-delayed)))
      ;; Check the validity of headline
      (goto-char (car region))
      (backward-char)
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el
index 3ace40f4d8e..584ee4e1bbb 100644
--- a/lisp/org/org-footnote.el
+++ b/lisp/org/org-footnote.el
@@ -49,11 +49,11 @@
 (declare-function org-element-property "org-element-ast" (property node))
 (declare-function org-element-type "org-element-ast" (node &optional anonymous))
 (declare-function org-element-type-p "org-element-ast" (node types))
-(declare-function org-end-of-subtree "org"  (&optional invisible-ok to-heading))
+(declare-function org-end-of-subtree "org"  (&optional invisible-ok to-heading element))
 (declare-function org-fill-paragraph "org" (&optional justify region))
 (declare-function org-in-block-p "org" (names))
 (declare-function org-in-verbatim-emphasis "org" ())
-(declare-function org-inside-LaTeX-fragment-p "org" ())
+(declare-function org-inside-LaTeX-fragment-p "org" (&optional element))
 (declare-function org-inside-latex-macro-p "org" ())
 (declare-function org-mark-ring-push "org" (&optional pos buffer))
 (declare-function org-fold-show-context "org-fold" (&optional key))
@@ -248,13 +248,16 @@ otherwise."
 
 ;;;; Internal functions
 
-(defun org-footnote--allow-reference-p ()
-  "Non-nil when a footnote reference can be inserted at point."
+(defun org-footnote--allow-reference-p (&optional inline)
+  "Non-nil when a footnote reference can be inserted at point.
+When optional argument INLINE is non-nil, assume that the footnote
+reference is an inline or anonymous footnote (and can be placed at the
+beginning of the line)."
   ;; XXX: This is similar to `org-footnote-in-valid-context-p' but
   ;; more accurate and usually faster, except in some corner cases.
   ;; It may replace it after doing proper benchmarks as it would be
   ;; used in fontification.
-  (unless (bolp)
+  (unless (and (not inline) (bolp))
     (let* ((context (org-element-context))
 	   (type (org-element-type context)))
       (cond
@@ -401,7 +404,8 @@ References are sorted according to a deep-reading order."
 		   (dolist (r (mapcar (lambda (l) (assoc l references))
 				      (reverse
 				       (cdr (assoc (nth 0 ref) nested)))))
-		     (funcall add-reference r t))))))
+                     (unless (member r ordered) ; avoid infinite recursion when references link to each other
+		       (funcall add-reference r t)))))))
        (dolist (r (reverse references) (nreverse ordered))
 	 (funcall add-reference r nil))))))
 
@@ -665,8 +669,6 @@ This command prompts for a label.  If this is a label referencing an
 existing label, only insert the label.  If the footnote label is empty
 or new, let the user edit the definition of the footnote."
   (interactive)
-  (unless (org-footnote--allow-reference-p)
-    (user-error "Cannot insert a footnote here"))
   (let* ((all (org-footnote-all-labels))
 	 (label
           (unless (eq org-footnote-auto-label 'anonymous)
@@ -680,16 +682,24 @@ or new, let the user edit the definition of the footnote."
 		    (mapcar #'list all) nil nil
 		    (and (eq org-footnote-auto-label 'confirm) propose)))))))))
     (cond ((not label)
+           (unless (org-footnote--allow-reference-p 'anonymous)
+             (user-error "Cannot insert a footnote here"))
 	   (insert "[fn::]")
 	   (backward-char 1))
 	  ((member label all)
+           (unless (org-footnote--allow-reference-p)
+             (user-error "Cannot insert a footnote here"))
 	   (insert "[fn:" label "]")
 	   (message "New reference to existing note"))
 	  (org-footnote-define-inline
+           (unless (org-footnote--allow-reference-p 'inline)
+             (user-error "Cannot insert a footnote here"))
 	   (insert "[fn:" label ":]")
 	   (backward-char 1)
 	   (org-footnote-auto-adjust-maybe))
 	  (t
+           (unless (org-footnote--allow-reference-p)
+             (user-error "Cannot insert a footnote here"))
 	   (insert "[fn:" label "]")
 	   (let ((p (org-footnote-create-definition label)))
 	     ;; `org-footnote-goto-definition' needs to be called
diff --git a/lisp/org/org-goto.el b/lisp/org/org-goto.el
index bb8906c2303..e8292c49325 100644
--- a/lisp/org/org-goto.el
+++ b/lisp/org/org-goto.el
@@ -134,14 +134,9 @@ When nil, you can use these keybindings to navigate the buffer:
 	  (org-defkey map "\C-c\C-u" 'outline-up-heading)
 	  map)))
 
-;; `isearch-other-control-char' was removed in Emacs 24.4.
-(if (fboundp 'isearch-other-control-char)
-    (progn
-      (define-key org-goto-local-auto-isearch-map "\C-i" 'isearch-other-control-char)
-      (define-key org-goto-local-auto-isearch-map "\C-m" 'isearch-other-control-char))
-  (define-key org-goto-local-auto-isearch-map "\C-i" nil)
-  (define-key org-goto-local-auto-isearch-map "\C-m" nil)
-  (define-key org-goto-local-auto-isearch-map [return] nil))
+(define-key org-goto-local-auto-isearch-map "\C-i" nil)
+(define-key org-goto-local-auto-isearch-map "\C-m" nil)
+(define-key org-goto-local-auto-isearch-map [return] nil)
 
 (defun org-goto--local-search-headings (string bound noerror)
   "Search and make sure that any matches are in headlines."
diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el
index 85b913b0a4c..c33ea7fbbe9 100644
--- a/lisp/org/org-id.el
+++ b/lisp/org/org-id.el
@@ -80,8 +80,6 @@
 
 (declare-function message-make-fqdn "message" ())
 (declare-function org-goto-location "org-goto" (&optional _buf help))
-;; Declared inside `org-element-with-disabled-cache' macro.
-(declare-function org-element--cache-active-p "org-element.el" (&optional called-from-cache-change-func-p))
 
 ;;; Customization
 
@@ -295,6 +293,16 @@ This variable is only relevant when `org-id-track-globally' is set."
   :group 'org-id
   :type 'boolean)
 
+(defcustom org-id-completion-targets
+  '((nil . t)
+    (org-id-files . t))
+  "Candidate headings for completing \"id:\" links in `\\[org-insert-link]'.
+This variable has the same form as `org-refile-targets', which see."
+  :group 'org-id
+  :type (get 'org-refile-targets 'custom-type)
+  :package-version '(Org . "9.8")
+  :risky t)
+
 ;;; The API functions
 
 ;;;###autoload
@@ -354,7 +362,7 @@ TARGETS may be a setting for `org-refile-targets' to define
 eligible headlines.  When omitted, all headlines in the current
 file are eligible.  This function returns the ID of the entry.
 If necessary, the ID is created."
-  (let* ((org-refile-targets (or targets '((nil . (:maxlevel . 10)))))
+  (let* ((org-refile-targets (or targets '((nil . t))))
 	 (org-refile-use-outline-path
 	  (if (caar org-refile-targets) 'file t))
 	 (org-refile-target-verify-function nil)
@@ -631,7 +639,10 @@ If SILENT is non-nil, messages are suppressed."
 	    (let ((loc (file-name-directory org-id-locations-file)))
 	      (mapc (lambda (item)
 		      (unless (file-name-absolute-p (car item))
-			(setf (car item) (expand-file-name (car item) loc))))
+			(setf (car item)
+                              ;; Abbreviate as `org-id-add-location' does.
+                              (abbreviate-file-name
+                               (expand-file-name (car item) loc)))))
 		    org-id-locations)))
 	(error
          (message "Could not read `org-id-locations' from %s, setting it to nil"
@@ -705,8 +716,9 @@ This is to be able to write it to a file."
 	   (hash-table-p org-id-locations)
 	   (gethash id org-id-locations))
       ;; Fall back on current buffer
-      (buffer-file-name (or (buffer-base-buffer (current-buffer))
-			    (current-buffer)))))
+      (when (derived-mode-p 'org-mode)
+        (buffer-file-name (or (buffer-base-buffer (current-buffer))
+			      (current-buffer))))))
 
 (defun org-id-find-id-in-file (id file &optional markerp)
   "Return the position of the entry ID in FILE.
@@ -884,9 +896,47 @@ will be tried as an ID."
                          (org-element-lineage (org-element-at-point) 'headline t))))
     (org-fold-show-context)))
 
+(defun org-id-complete (&optional _arg)
+  "Complete IDs for `org-insert-link'.
+
+If a headline without an ID is selected, one will automatically be
+created."
+  (unless org-id-locations (org-id-locations-load))
+  (or (ignore-errors ; Catch the error if we have no refile targets.
+        (when-let* ((id (org-id-get-with-outline-path-completion
+                         (if (buffer-file-name) org-id-completion-targets
+                           ;; If the current buffer isn't associated
+                           ;; with a file, we can't include it so we
+                           ;; exclude all "targets" where the car is
+                           ;; nil.
+                           (seq-filter #'car org-id-completion-targets)))))
+          (concat "id:" id)))
+      (read-string "Link: " "id:")))
+
+(defun org-id-description (link desc)
+  "Return a description for an ID link, derived from the linked headline.
+
+Calling convention is similar to `org-link-make-description-function'.
+DESC has higher priority and is returned if it is both non-nil and
+non-empty.  Otherwise, if the passed LINK is an ID link and can be
+resolved to an existing headline, the target headline is returned.  If
+all else fails, DESC is returned as-is.
+
+TODO keywords, tags, and priorities are stripped from the description."
+  (or (org-string-nw-p desc)
+      (when-let* ((loc (org-id-find (string-remove-prefix "id:" link))))
+        (org-with-file-buffer (car loc)
+          (org-with-wide-buffer
+           (goto-char (cdr loc))
+           (org-link-display-format
+            (org-get-heading t t t t)))))
+      desc))
+
 (org-link-set-parameters "id"
   :follow #'org-id-open
-  :store #'org-id-store-link-maybe)
+  :store #'org-id-store-link-maybe
+  :complete #'org-id-complete
+  :insert-description #'org-id-description)
 
 (provide 'org-id)
 
diff --git a/lisp/org/org-indent.el b/lisp/org/org-indent.el
index 8e96a8cde1b..cedc30a5ee0 100644
--- a/lisp/org/org-indent.el
+++ b/lisp/org/org-indent.el
@@ -45,8 +45,6 @@
 
 (require 'cl-lib)
 
-(declare-function org-inlinetask-get-task-level "org-inlinetask" ())
-(declare-function org-inlinetask-in-task-p "org-inlinetask" ())
 (declare-function org-list-item-body-column "org-list" (item))
 (defvar org-inlinetask-show-first-star)
 
diff --git a/lisp/org/org-keys.el b/lisp/org/org-keys.el
index eb88ec430a3..739a719b9b4 100644
--- a/lisp/org/org-keys.el
+++ b/lisp/org/org-keys.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2018-2026 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;; Maintainer: Ihor Radchenko <yantar92 at posteo dot net>
 
 ;; This file is part of GNU Emacs.
 
@@ -37,29 +38,29 @@
 (require 'oc)
 
 (declare-function org-add-note "org" ())
-(declare-function org-agenda "org" (&optional arg org-keys restriction))
+(declare-function org-agenda "org-agenda" (&optional arg org-keys restriction))
 (declare-function org-agenda-file-to-front "org" (&optional to-end))
-(declare-function org-agenda-remove-restriction-lock "org" (&optional noupdate))
-(declare-function org-agenda-set-restriction-lock "org" (&optional type))
-(declare-function org-archive-subtree "org" (&optional find-done))
-(declare-function org-archive-subtree-default "org" ())
-(declare-function org-archive-subtree-default-with-confirmation "org" ())
-(declare-function org-archive-to-archive-sibling "org" ())
+(declare-function org-agenda-remove-restriction-lock "org-agenda" (&optional noupdate))
+(declare-function org-agenda-set-restriction-lock "org-agenda" (&optional type))
+(declare-function org-archive-subtree "org-archive" (&optional find-done))
+(declare-function org-archive-subtree-default "org-archive" ())
+(declare-function org-archive-subtree-default-with-confirmation "org-archive" ())
+(declare-function org-archive-to-archive-sibling "org-archive" ())
 (declare-function org-at-heading-p "org" (&optional ignored))
-(declare-function org-attach "org" ())
+(declare-function org-attach "org-attach" ())
 (declare-function org-backward-element "org" ())
 (declare-function org-backward-heading-same-level "org" (arg &optional invisible-ok))
-(declare-function org-backward-paragraph "org" ())
+(declare-function org-backward-paragraph "org" (&optional arg))
 (declare-function org-backward-sentence "org" (&optional arg))
 (declare-function org-beginning-of-line "org" (&optional n))
-(declare-function org-clock-cancel "org" ())
-(declare-function org-clock-display "org" (&optional arg))
-(declare-function org-clock-goto "org" (&optional select))
-(declare-function org-clock-in "org" (&optional select start-time))
-(declare-function org-clock-in-last "org" (&optional arg))
-(declare-function org-clock-out "org" (&optional switch-to-state fail-quietly at-time))
+(declare-function org-clock-cancel "org-clock" ())
+(declare-function org-clock-display "org-clock" (&optional arg))
+(declare-function org-clock-goto "org-clock" (&optional select))
+(declare-function org-clock-in "org-clock" (&optional select start-time))
+(declare-function org-clock-in-last "org-clock" (&optional arg))
+(declare-function org-clock-out "org-clock" (&optional switch-to-state fail-quietly at-time))
 (declare-function org-clone-subtree-with-time-shift "org" (n &optional shift))
-(declare-function org-columns "org" (&optional global columns-fmt-string))
+(declare-function org-columns "org-colview" (&optional global columns-fmt-string))
 (declare-function org-comment-dwim "org" (arg))
 (declare-function org-copy-special "org" ())
 (declare-function org-copy-visible "org" (beg end))
@@ -71,15 +72,15 @@
 (declare-function org-cut-special "org" ())
 (declare-function org-cut-subtree "org" (&optional n))
 (declare-function org-cycle "org-cycle" (&optional arg))
-(declare-function org-cycle-agenda-files "org-cycle" ())
+(declare-function org-cycle-agenda-files "org" ())
 (declare-function org-date-from-calendar "org" ())
-(declare-function org-dynamic-block-insert-dblock "org" (&optional arg))
+(declare-function org-dynamic-block-insert-dblock "org" (type &optional interactive-p))
 (declare-function org-dblock-update "org" (&optional arg))
 (declare-function org-deadline "org" (arg1 &optional time))
 (declare-function org-decrease-number-at-point "org" (&optional inc))
 (declare-function org-delete-backward-char "org" (n))
 (declare-function org-delete-char "org" (n))
-(declare-function org-delete-indentation "org" (&optional arg))
+(declare-function org-delete-indentation "org" (&optional arg beg end))
 (declare-function org-demote-subtree "org" ())
 (declare-function org-display-outline-path "org" (&optional file current separator just-return-string))
 (declare-function org-down-element "org" ())
@@ -89,7 +90,6 @@
 (declare-function org-emphasize "org" (&optional char))
 (declare-function org-end-of-line "org" (&optional n))
 (declare-function org-entry-put "org" (pom property value))
-(declare-function org-eval-in-calendar "org" (form &optional keepdate))
 (declare-function org-calendar-goto-today-or-insert-dot "org" ())
 (declare-function org-calendar-goto-today "org" ())
 (declare-function org-calendar-backward-month "org" ())
@@ -106,34 +106,34 @@
 (declare-function org-calendar-scroll-three-months-left "org" ())
 (declare-function org-calendar-scroll-three-months-right "org" ())
 (declare-function org-evaluate-time-range "org" (&optional to-buffer))
-(declare-function org-export-dispatch "org" (&optional arg))
-(declare-function org-feed-goto-inbox "org" (feed))
-(declare-function org-feed-update-all "org" ())
+(declare-function org-export-dispatch "ox" (&optional arg))
+(declare-function org-feed-goto-inbox "org-feed" (feed))
+(declare-function org-feed-update-all "org-feed" ())
 (declare-function org-fill-paragraph "org" (&optional justify region))
 (declare-function org-find-file-at-mouse "org" (ev))
-(declare-function org-footnote-action "org" (&optional special))
+(declare-function org-footnote-action "org-footnote" (&optional special))
 (declare-function org-cycle-force-archived "org-cycle" ())
 (declare-function org-force-self-insert "org" (n))
 (declare-function org-forward-element "org" ())
 (declare-function org-forward-heading-same-level "org" (arg &optional invisible-ok))
-(declare-function org-forward-paragraph "org" ())
+(declare-function org-forward-paragraph "org" (&optional arg))
 (declare-function org-forward-sentence "org" (&optional arg))
-(declare-function org-goto "org" (&optional alternative-interface))
+(declare-function org-goto "org-goto" (&optional alternative-interface))
 (declare-function org-goto-calendar "org" (&optional arg))
 (declare-function org-inc-effort "org" ())
 (declare-function org-increase-number-at-point "org" (&optional inc))
 (declare-function org-info-find-node "org" (&optional nodename))
-(declare-function org-insert-all-links "org" (arg &optional pre post))
+(declare-function org-insert-all-links "ol" (arg &optional pre post))
 (declare-function org-insert-drawer "org" (&optional arg drawer))
 (declare-function org-insert-heading-respect-content "org" (&optional invisible-ok))
-(declare-function org-insert-last-stored-link "org" (arg))
-(declare-function org-insert-link "org" (&optional complete-file link-location default-description))
+(declare-function org-insert-last-stored-link "ol" (arg))
+(declare-function org-insert-link "ol" (&optional complete-file link-location default-description))
 (declare-function org-insert-structure-template "org" (type))
 (declare-function org-insert-todo-heading "org" (arg &optional force-heading))
 (declare-function org-insert-todo-heading-respect-content "org" (&optional force-state))
 (declare-function org-kill-line "org" (&optional arg))
 (declare-function org-kill-note-or-show-branches "org" ())
-(declare-function org-list-make-subtree "org" ())
+(declare-function org-list-make-subtree "org-list" ())
 (declare-function org-mark-element "org" ())
 (declare-function org-mark-ring-goto "org" (&optional n))
 (declare-function org-mark-ring-push "org" (&optional pos buffer))
@@ -148,27 +148,29 @@
 (declare-function org-narrow-to-element "org" ())
 (declare-function org-narrow-to-subtree "org" (&optional element))
 (declare-function org-next-block "org" (arg &optional backward block-regexp))
-(declare-function org-next-link "org" (&optional search-backward))
+(declare-function org-next-link "ol" (&optional search-backward))
 (declare-function org-next-visible-heading "org" (arg))
 (declare-function org-open-at-mouse "org" (ev))
-(declare-function org-open-at-point "org" (&optional arg reference-buffer))
+(declare-function org-open-at-point "org" (&optional arg))
 (declare-function org-open-line "org" (n))
 (declare-function org-paste-special "org" (arg))
 (declare-function org-plot/gnuplot "org-plot" (&optional params))
 (declare-function org-previous-block "org" (arg &optional block-regexp))
-(declare-function org-previous-link "org" ())
+(declare-function org-previous-link "ol" ())
 (declare-function org-previous-visible-heading "org" (arg))
 (declare-function org-priority "org" (&optional action show))
+(defvar org-priority-highest)
+(defvar org-priority-default)
+(defvar org-priority-lowest)
 (declare-function org-promote-subtree "org" ())
-(declare-function org-redisplay-inline-images "org" ())
 (declare-function org-refile "org-refile" (&optional arg1 default-buffer rfloc msg))
 (declare-function org-refile-copy "org-refile" ())
 (declare-function org-refile-reverse "org-refile" (&optional arg default-buffer rfloc msg))
 (declare-function org-reftex-citation "org" ())
 (declare-function org-reload "org" (&optional arg1))
 (declare-function org-remove-file "org" (&optional file))
-(declare-function org-resolve-clocks "org" (&optional only-dangling-p prompt-fn last-valid))
-(declare-function org-return "org" (&optional indent))
+(declare-function org-resolve-clocks "org-clock" (&optional only-dangling-p prompt-fn last-valid))
+(declare-function org-return "org" (&optional indent arg interactive))
 (declare-function org-return-and-maybe-indent "org" ())
 (declare-function org-fold-reveal "org-fold" (&optional siblings))
 (declare-function org-schedule "org" (arg &optional time))
@@ -190,36 +192,36 @@
 (declare-function org-shiftright "org" (&optional arg))
 (declare-function org-shifttab "org" (&optional arg))
 (declare-function org-shiftup "org" (&optional arg))
-(declare-function org-fold-show-all "org-fold" (&optional types))
 (declare-function org-fold-show-children "org-fold" (&optional level))
 (declare-function org-fold-show-subtree "org-fold" ())
 (declare-function org-sort "org" (&optional with-case))
 (declare-function org-sparse-tree "org" (&optional arg type))
-(declare-function org-table-copy-down "org" (n))
-(declare-function org-table-create-or-convert-from-region "org" (arg))
+(declare-function org-table-copy-down "org-table" (n))
+(declare-function org-table-create-or-convert-from-region "org-table" (arg))
 (declare-function org-table-create-with-table\.el "org-table" ())
-(declare-function org-table-edit-field "org" (arg))
-(declare-function org-table-eval-formula "org" (&optional arg equation suppress-align suppress-const suppress-store suppress-analysis))
-(declare-function org-table-field-info "org" (arg))
-(declare-function org-table-rotate-recalc-marks "org" (&optional newchar))
-(declare-function org-table-sum "org" (&optional beg end nlast))
-(declare-function org-table-toggle-coordinate-overlays "org" ())
-(declare-function org-table-toggle-formula-debugger "org" ())
+(declare-function org-table-edit-field "org-table" (arg))
+(declare-function org-table-eval-formula "org-table" (&optional arg equation suppress-align suppress-const suppress-store suppress-analysis))
+(declare-function org-table-field-info "org-table" (arg))
+(declare-function org-table-rotate-recalc-marks "org-table" (&optional newchar))
+(declare-function org-table-sum "org-table" (&optional beg end nlast))
+(declare-function org-table-toggle-coordinate-overlays "org-table" ())
+(declare-function org-table-toggle-formula-debugger "org-table" ())
 (declare-function org-timestamp "org" (arg &optional inactive))
 (declare-function org-timestamp-inactive "org" (&optional arg))
-(declare-function org-timer "org" (&optional restart no-insert))
-(declare-function org-timer-item "org" (&optional arg))
-(declare-function org-timer-pause-or-continue "org" (&optional stop))
-(declare-function org-timer-set-timer "org" (&optional opt))
-(declare-function org-timer-start "org" (&optional offset))
-(declare-function org-timer-stop "org" ())
+(declare-function org-timer "org-timer" (&optional restart no-insert))
+(declare-function org-timer-item "org-timer" (&optional arg))
+(declare-function org-timer-pause-or-continue "org-timer" (&optional stop))
+(declare-function org-timer-set-timer "org-timer" (&optional opt))
+(declare-function org-timer-start "org-timer" (&optional offset))
+(declare-function org-timer-stop "org-timer" ())
 (declare-function org-todo "org" (&optional arg1))
-(declare-function org-toggle-archive-tag "org" (&optional find-done))
-(declare-function org-toggle-checkbox "org" (&optional toggle-presence))
-(declare-function org-toggle-radio-button "org" (&optional arg))
+(declare-function org-toggle-archive-tag "org-archive" (&optional find-done))
+(declare-function org-toggle-checkbox "org-list" (&optional toggle-presence))
+(declare-function org-toggle-radio-button "org-list" (&optional arg))
 (declare-function org-toggle-comment "org" ())
 (declare-function org-toggle-fixed-width "org" ())
-(declare-function org-toggle-inline-images "org" (&optional include-linked beg end))
+(declare-function org-link-preview "ol" (&optional arg beg end))
+(declare-function org-link-preview-refresh "ol" ())
 (declare-function org-latex-preview "org" (&optional arg))
 (declare-function org-toggle-narrow-to-subtree "org" ())
 (declare-function org-toggle-ordered-property "org" ())
@@ -233,6 +235,7 @@
 (declare-function org-update-statistics-cookies "org" (all))
 (declare-function org-yank "org" (&optional arg))
 (declare-function orgtbl-ascii-plot "org-table" (&optional ask))
+(declare-function outline-up-heading "outline" (arg &optional invisible-ok))
 
 
 
@@ -390,9 +393,9 @@ COMMANDS is a list of alternating OLDDEF NEWDEF command names."
 ;;; Global bindings
 
 ;;;; Outline functions
-(define-key org-mode-map [menu-bar headings] 'undefined)
-(define-key org-mode-map [menu-bar hide] 'undefined)
-(define-key org-mode-map [menu-bar show] 'undefined)
+(define-key org-mode-map [menu-bar headings] #'undefined)
+(define-key org-mode-map [menu-bar hide] #'undefined)
+(define-key org-mode-map [menu-bar show] #'undefined)
 
 (define-key org-mode-map [remap outline-mark-subtree] #'org-mark-subtree)
 (define-key org-mode-map [remap outline-show-subtree] #'org-fold-show-subtree)
@@ -410,6 +413,8 @@ COMMANDS is a list of alternating OLDDEF NEWDEF command names."
 (define-key org-mode-map [remap outline-previous-visible-heading]
   #'org-previous-visible-heading)
 (define-key org-mode-map [remap outline-show-children] #'org-fold-show-children)
+(defalias 'org-up-heading #'outline-up-heading)
+(define-key org-mode-map [remap outline-up-heading] #'org-up-heading)
 
 ;;;; Make `C-c C-x' a prefix key
 (org-defkey org-mode-map (kbd "C-c C-x") (make-sparse-keymap))
@@ -463,6 +468,37 @@ COMMANDS is a list of alternating OLDDEF NEWDEF command names."
 (org-defkey org-mode-map (kbd "C-S-<up>") #'org-shiftcontrolup)
 (org-defkey org-mode-map (kbd "C-S-<down>") #'org-shiftcontroldown)
 
+;;; Repeat-mode map.
+(defvar org-navigation-repeat-map (make-sparse-keymap)
+  "Repeat keymap for navigation commands.")
+(org-defkey org-navigation-repeat-map (kbd "b") #'org-backward-heading-same-level)
+(org-defkey org-navigation-repeat-map (kbd "f") #'org-forward-heading-same-level)
+(org-defkey org-navigation-repeat-map (kbd "n") #'org-next-visible-heading)
+(org-defkey org-navigation-repeat-map (kbd "p") #'org-previous-visible-heading)
+(org-defkey org-navigation-repeat-map (kbd "u") #'org-up-heading)
+(map-keymap
+ (lambda (_key cmd)
+   (put cmd 'repeat-map 'org-navigation-repeat-map))
+ org-navigation-repeat-map)
+
+(defvar org-link-navigation-repeat-map (make-sparse-keymap)
+  "Repeat keymap for link navigation commands.")
+(org-defkey org-link-navigation-repeat-map (kbd "n") #'org-next-link)
+(org-defkey org-link-navigation-repeat-map (kbd "p") #'org-previous-link)
+(map-keymap
+ (lambda (_ cmd)
+   (put cmd 'repeat-map 'org-link-navigation-repeat-map))
+ org-link-navigation-repeat-map)
+
+(defvar org-block-navigation-repeat-map (make-sparse-keymap)
+  "Repeat keymap for block navigation commands.")
+(org-defkey org-block-navigation-repeat-map (kbd "f") #'org-next-block)
+(org-defkey org-block-navigation-repeat-map (kbd "b") #'org-previous-block)
+(map-keymap
+ (lambda (_ cmd)
+   (put cmd 'repeat-map 'org-block-navigation-repeat-map))
+ org-block-navigation-repeat-map)
+
 ;;;; Extra keys for TTY access.
 
 ;;  We only set them when really needed because otherwise the
@@ -619,8 +655,8 @@ COMMANDS is a list of alternating OLDDEF NEWDEF command names."
 (org-defkey org-mode-map (kbd "C-c C-x x") #'org-dynamic-block-insert-dblock)
 (org-defkey org-mode-map (kbd "C-c C-x C-u") #'org-dblock-update)
 (org-defkey org-mode-map (kbd "C-c C-x C-l") #'org-latex-preview)
-(org-defkey org-mode-map (kbd "C-c C-x C-v") #'org-toggle-inline-images)
-(org-defkey org-mode-map (kbd "C-c C-x C-M-v") #'org-redisplay-inline-images)
+(org-defkey org-mode-map (kbd "C-c C-x C-v") #'org-link-preview)
+(org-defkey org-mode-map (kbd "C-c C-x C-M-v") #'org-link-preview-refresh)
 (org-defkey org-mode-map (kbd "C-c C-x \\") #'org-toggle-pretty-entities)
 (org-defkey org-mode-map (kbd "C-c C-x C-b") #'org-toggle-checkbox)
 (org-defkey org-mode-map (kbd "C-c C-x C-r") #'org-toggle-radio-button)
@@ -655,8 +691,13 @@ commands should be active.
 For example, to activate speed commands when the point is on any
 star at the beginning of the headline, you can do this:
 
-  (setq org-use-speed-commands
-      (lambda () (and (looking-at org-outline-regexp) (looking-back \"^\\**\"))))"
+  (setopt org-use-speed-commands
+          (lambda ()
+            (and (looking-at org-outline-regexp)
+                 (looking-back \"^\\\\**\"))))
+
+Note that prior to Emacs 29, `setopt' is unavailable, and
+`custom-set-variables' or `setq' is used instead."
   :group 'org-structure
   :type '(choice
 	  (const :tag "Never" nil)
@@ -719,10 +760,10 @@ hook.  The default setting is `org-speed-command-activate'."
     ("Meta Data Editing")
     ("t" . org-todo)
     ("," . (org-priority))
-    ("0" . (org-priority ?\ ))
-    ("1" . (org-priority ?A))
-    ("2" . (org-priority ?B))
-    ("3" . (org-priority ?C))
+    ("0" . (org-priority 'remove))
+    ("1" . (org-priority org-priority-highest))
+    ("2" . (org-priority org-priority-default))
+    ("3" . (org-priority org-priority-lowest))
     (":" . org-set-tags-command)
     ("e" . org-set-effort)
     ("E" . org-inc-effort)
@@ -748,7 +789,7 @@ interpreted as a descriptive headline that will be added when
 listing the speed commands in the Help buffer using the `?' speed
 command."
   :group 'org-structure
-  :package-version '(Org . "9.5")
+  :package-version '(Org . "9.8")
   :type '(repeat :value ("k" . ignore)
 		 (choice :value ("k" . ignore)
 			 (list :tag "Descriptive Headline" (string :tag "Headline"))
@@ -756,7 +797,8 @@ command."
 			       (string :tag "Command letter")
 			       (choice
 				(function)
-				(sexp))))))
+				(sexp)))))
+  :risky t)
 
 (defun org--print-speed-command (speed-command)
   "Print information about SPEED-COMMAND in help buffer.
diff --git a/lisp/org/org-lint.el b/lisp/org/org-lint.el
index c6e16f23c6a..04474b4b027 100644
--- a/lisp/org/org-lint.el
+++ b/lisp/org/org-lint.el
@@ -37,7 +37,7 @@
 
 ;; Checks currently implemented report the following:
 
-;; - duplicates CUSTOM_ID properties,
+;; - duplicate CUSTOM_ID properties,
 ;; - duplicate NAME values,
 ;; - duplicate targets,
 ;; - duplicate footnote definitions,
@@ -159,6 +159,16 @@ checker.  Currently, two properties are supported:
               (seq-remove (lambda (c) (eq name (org-lint-checker-name c)))
                           org-lint--checkers))))
 
+;;;###autoload
+(defun org-lint-remove-checker (name &rest names)
+  "Remove checker(s) from linter.
+NAME is the unique check identifier, as a non-nil symbol.  NAMES
+are additional check identifiers to be removed."
+  (let ((removelist (cons name names)))
+    (setq org-lint--checkers
+          (seq-remove (lambda (c) (memq (org-lint-checker-name c) removelist))
+                      org-lint--checkers))))
+
 
 ;;; Reports UI
 
@@ -470,7 +480,10 @@ Example:
       (when (= (org-element-post-blank keyword) 0)
         (let ((next-element (org-with-point-at (org-element-end keyword)
                               (org-element-at-point))))
-          (when (< (org-element-begin next-element) (org-element-post-affiliated next-element))
+          (when (and
+                 ;; KEYWORD being the last in the file is OK.
+                 (not (equal (org-element-begin next-element) (org-element-begin keyword)))
+                 (< (org-element-begin next-element) (org-element-post-affiliated next-element)))
             ;; A keyword followed without blank lines by an element with affiliated keywords.
             ;; The keyword may be confused with affiliated keywords.
             (list (org-element-begin keyword)
@@ -553,9 +566,8 @@ Use :header-args: instead"
     (lambda (b)
       (when-let* ((lang (org-element-property :language b)))
         (unless (or (functionp (intern (format "org-babel-execute:%s" lang)))
-                    ;; No babel backend, but there is corresponding
-                    ;; major mode.
-                    (fboundp (org-src-get-lang-mode lang)))
+                    ;; No Babel backend, but relevant major mode is bound.
+                    (org-src-get-lang-mode-if-bound lang))
 	  (list (org-element-property :post-affiliated b)
 	        (format "Unknown source block language: '%s'" lang)))))))
 
@@ -718,6 +730,10 @@ Use :header-args: instead"
 	(pcase type
 	  ((or "attachment" "file")
 	   (let* ((path (org-element-property :path l))
+                  (path (if (and (equal type "attachment")
+                                 (string-match "::\\(.*\\)\\'" path))
+		            (substring path 0 (match-beginning 0))
+                          path))
 		  (file (if (string= type "file")
 			    path
                           (org-with-point-at (org-element-begin l)
@@ -837,7 +853,6 @@ Use \"export %s\" instead"
 
 (defun org-lint-export-option-keywords (ast)
   "Check for options keyword properties without EXPORT in AST."
-  (require 'ox)
   (let (options reports common-options options-alist)
     (dolist (opt org-export-options-alist)
       (when (stringp (nth 1 opt))
@@ -872,6 +887,7 @@ Use \"export %s\" instead"
     reports))
 
 (defun org-lint-invalid-macro-argument-and-template (ast)
+  "Check for invalid macro arguments in AST."
   (let* ((reports nil)
          (extract-placeholders
 	  (lambda (template)
@@ -934,7 +950,7 @@ Use \"export %s\" instead"
 				    name))
 		      reports))))))))
     ;; Check arguments for macros.
-    (org-macro-initialize-templates)
+    (org-macro-initialize-templates org-export-global-macros)
     (let ((templates (append
 		      (mapcar (lambda (m) (cons m "$1"))
 			      '("author" "date" "email" "title" "results"))
@@ -1236,7 +1252,7 @@ Use \"export %s\" instead"
 	   (funcall verify
 		    datum
 		    nil
-		    (cl-mapcan #'org-babel-parse-header-arguments
+		    (cl-mapcan (lambda (s) (org-babel-parse-header-arguments s 'no-eval))
 			       (list
 				(org-element-property :inside-header datum)
 				(org-element-property :end-header datum)))))
@@ -1245,7 +1261,8 @@ Use \"export %s\" instead"
 		    datum
 		    (org-element-property :language datum)
 		    (org-babel-parse-header-arguments
-		     (org-element-property :parameters datum))))
+		     (org-element-property :parameters datum)
+                     'no-eval)))
 	  (`keyword
 	   (when (string= (org-element-property :key datum) "PROPERTY")
 	     (let ((value (org-element-property :value datum)))
@@ -1257,7 +1274,8 @@ Use \"export %s\" instead"
 			  datum
 			  (match-string 1 value)
 			  (org-babel-parse-header-arguments
-			   (substring value (match-end 0))))))))
+			   (substring value (match-end 0))
+                           'no-eval))))))
 	  (`node-property
 	   (let ((key (org-element-property :key datum)))
 	     (when (let ((case-fold-search t))
@@ -1269,12 +1287,13 @@ Use \"export %s\" instead"
 			datum
 			(match-string 1 key)
 			(org-babel-parse-header-arguments
-			 (org-element-property :value datum))))))
+			 (org-element-property :value datum)
+                         'no-eval)))))
 	  (`src-block
 	   (funcall verify
 		    datum
 		    (org-element-property :language datum)
-		    (cl-mapcan #'org-babel-parse-header-arguments
+		    (cl-mapcan (lambda (s) (org-babel-parse-header-arguments s 'no-eval))
 			       (cons (org-element-property :parameters datum)
 				     (org-element-property :header datum))))))))
     reports))
@@ -1339,7 +1358,8 @@ Use \"export %s\" instead"
 		     (concat
 		      (org-element-property :inside-header datum)
 		      " "
-		      (org-element-property :end-header datum))))))))
+		      (org-element-property :end-header datum)))))
+                 'no-eval)))
 	  (dolist (header datum-header-values)
 	    (let ((allowed-values
 		   (cdr (assoc-string (substring (symbol-name (car header)) 1)
@@ -1395,7 +1415,10 @@ Use \"export %s\" instead"
                            (org-export-resolve-link (car result) `(:parse-tree ,ast))
                          (org-link-broken nil))
                      (org-export-get-previous-element el nil))))
-        (when (org-element-type-p origin-block 'src-block)
+        (when (and (org-element-type-p origin-block 'src-block)
+                   (pcase-let ((`(,_ ,_ ,args . ,_)
+                                (org-babel-get-src-block-info 'light origin-block)))
+                     (not (member (alist-get :exports args) '("results" "both")))))
           (list (org-element-begin el)
                 (format "Links to \"%s\" will not be valid during export unless the parent source block has :exports results or both" result-name)))))))
 
@@ -1483,6 +1506,32 @@ Use \"export %s\" instead"
              (format "Bullet counter \"%s\" is not the same with item position %d.  Consider adding manual [@%d] counter."
                      bullet (car (last true-number)) bullet-number))))))))
 
+(defun org-lint-priority (ast)
+  "Report out-of-bounds, invalid, and malformed priorities.
+Raise warnings on headlines containing out-of-bounds, invalid (e.g.,
+`[#-1]', `[#AA]'), or malformed (e.g., `[#1', `[#A') priorities."
+  (let ((bad-priority-rx (rx line-start ?\[ ?#
+                             (group (zero-or-more (not (in ?\[ ?\]))))
+                             (group (zero-or-more ?\])))))
+    (org-element-map ast 'headline
+      (lambda (headline)
+        (if-let* ((priority (org-element-property :priority headline)))
+            (when (and (not (org-priority-valid-value-p priority))
+                       (org-priority-valid-value-p priority t))
+              (list (org-element-begin headline)
+                    (format "Out-of-bounds priority '%s'"
+                            (org-priority-to-string priority))))
+          (when-let* ((headline-value (org-element-property
+                                       :raw-value headline))
+                      (matches (string-match bad-priority-rx
+                                             headline-value)))
+            (list (org-element-begin headline)
+                  (if (string-empty-p (match-string 2 headline-value))
+                      (format "Malformed priority '%s'"
+                              (match-string 0 headline-value))
+                    (format "Invalid priority '%s'"
+                            (match-string 1 headline-value))))))))))
+
 (defun org-lint-LaTeX-$ (ast)
   "Report semi-obsolete $...$ LaTeX fragments.
 AST is the buffer parse tree."
@@ -1491,6 +1540,7 @@ AST is the buffer parse tree."
       (and (string-match-p "^[$][^$]" (org-element-property :value fragment))
            (list (org-element-begin fragment)
                  "Potentially confusing LaTeX fragment format.  Prefer using more reliable \\(...\\)")))))
+
 (defun org-lint-LaTeX-$-ambiguous (_)
   "Report LaTeX fragment-like text.
 AST is the buffer parse tree."
@@ -1507,6 +1557,7 @@ AST is the buffer parse tree."
            "$ symbol potentially matching LaTeX fragment boundary.  Consider using \\dollar entity.")
           report)))
      report)))
+
 (defun org-lint-timestamp-syntax (ast)
   "Report malformed timestamps.
 AST is the buffer parse tree."
@@ -1519,6 +1570,23 @@ AST is the buffer parse tree."
         (unless (equal expected actual)
           (list (org-element-property :begin timestamp)
                 (format "Potentially malformed timestamp %s.  Parsed as: %s" actual expected)))))))
+
+(defun org-lint-clock-syntax (ast)
+  "Report malformed clocks.
+AST is the buffer parse tree."
+  (org-element-map ast 'clock
+    (lambda (clock)
+      (let ((expected (string-trim-right (org-element-interpret-data clock)))
+            (actual (string-trim
+                     (buffer-substring-no-properties
+                      (org-element-property :begin clock)
+                      (org-element-property :end clock)))))
+        (unless (equal expected actual)
+          (list (org-element-property :begin clock)
+                (format "Potentially malformed CLOCK: line
+           %s
+Parsed as: %s" actual expected)))))))
+
 (defun org-lint-inactive-planning (ast)
   "Report inactive timestamp in SCHEDULED/DEADLINE.
 AST is the buffer parse tree."
@@ -1553,7 +1621,7 @@ AST is the buffer parse tree."
   #'org-lint-misplaced-heading :trust 'low)
 
 (org-lint-add-checker 'duplicate-custom-id
-  "Report duplicates CUSTOM_ID properties"
+  "Report duplicate CUSTOM_ID properties"
   #'org-lint-duplicate-custom-id
   :categories '(link))
 
@@ -1822,6 +1890,11 @@ AST is the buffer parse tree."
   #'org-lint-item-number
   :categories '(plain-list))
 
+(org-lint-add-checker 'priority
+  "Report out-of-bounds, invalid, and malformed priorities."
+  #'org-lint-priority
+  :categories '(markup))
+
 (org-lint-add-checker 'LaTeX-$
   "Report potentially confusing $...$ LaTeX markup."
   #'org-lint-LaTeX-$
@@ -1838,6 +1911,10 @@ AST is the buffer parse tree."
   "Report malformed timestamps."
   #'org-lint-timestamp-syntax
   :categories '(timestamp) :trust 'low)
+(org-lint-add-checker 'clock-syntax
+  "Report malformed clocks."
+  #'org-lint-clock-syntax
+  :categories '(timestamp) :trust 'low)
 (org-lint-add-checker 'planning-inactive
   "Report inactive timestamps in SCHEDULED/DEADLINE."
   #'org-lint-inactive-planning
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 5375c14fc56..687098c1c14 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -106,6 +106,7 @@
 
 (declare-function org-at-heading-p "org" (&optional invisible-ok))
 (declare-function org-back-to-heading "org" (&optional invisible-ok))
+(declare-function org-back-to-heading-or-point-min "org" (&optional invisible-ok))
 (declare-function org-before-first-heading-p "org" ())
 (declare-function org-current-level "org" ())
 (declare-function org-element-at-point "org-element" (&optional pom cached-only))
@@ -113,8 +114,8 @@
 (declare-function org-element-interpret-data "org-element" (data))
 (declare-function org-element-lineage "org-element-ast" (blob &optional types with-self))
 (declare-function org-element-macro-interpreter "org-element" (macro ##))
-(declare-function org-element-map "org-element" (data types fun &optional info first-match no-recursion with-affiliated))
-(declare-function org-element-normalize-string "org-element" (s))
+(declare-function org-element-map "org-element" (data types fun &optional info first-match no-recursion with-affiliated no-undefer))
+(declare-function org-element-normalize-string "org-element" (s &optional keep-newlines))
 (declare-function org-element-parse-buffer "org-element" (&optional granularity visible-only keep-deferred))
 (declare-function org-element-property "org-element-ast" (property node))
 (declare-function org-element-begin "org-element" (node))
@@ -125,7 +126,7 @@
 (declare-function org-element-post-blank "org-element" (node))
 (declare-function org-element-parent "org-element-ast" (node))
 (declare-function org-element-put-property "org-element-ast" (node property value))
-(declare-function org-element-set "org-element-ast" (old new))
+(declare-function org-element-set "org-element-ast" (old new &optional keep-props))
 (declare-function org-element-type-p "org-element-ast" (node types))
 (declare-function org-element-update-syntax "org-element" ())
 (declare-function org-end-of-meta-data "org" (&optional full))
@@ -147,9 +148,9 @@
 (declare-function org-mode "org" ())
 (declare-function org-narrow-to-subtree "org" (&optional element))
 (declare-function org-outline-level "org" ())
-(declare-function org-previous-line-empty-p "org" ())
 (declare-function org-reduced-level "org" (L))
 (declare-function org-set-tags "org" (tags))
+(declare-function org--deactivate-mark "org" ())
 (declare-function org-fold-show-subtree "org-fold" ())
 (declare-function org-fold-region "org-fold" (from to flag &optional spec))
 (declare-function org-sort-remove-invisible "org" (S))
@@ -1858,7 +1859,10 @@ Initial position of cursor is restored after the changes."
 	 (shift-body-ind
 	  ;; Shift the indentation between END and BEG by DELTA.
 	  ;; Start from the line before END.
-	  (lambda (end beg delta)
+          ;; Take care not to shift to or before IND, which is the
+          ;; containg list item indentation. (otherwise, we are going
+          ;; to break the list structure)
+	  (lambda (end beg delta ind)
 	    (goto-char end)
 	    (skip-chars-backward " \r\t\n")
 	    (forward-line 0)
@@ -1871,7 +1875,8 @@ Initial position of cursor is restored after the changes."
 		(org-inlinetask-goto-beginning))
 	       ;; Shift only non-empty lines.
 	       ((looking-at-p "^[ \t]*\\S-")
-		(indent-line-to (+ (org-current-text-indentation) delta))))
+		(indent-line-to (max (+ (org-current-text-indentation) delta)
+                                     (if ind (1+ ind) -1)))))
 	      (forward-line -1))))
 	 (modify-item
 	  ;; Replace ITEM first line elements with new elements from
@@ -1933,7 +1938,7 @@ Initial position of cursor is restored after the changes."
 	       (ind-shift (- (+ ind-pos (length bul-pos))
 			     (+ ind-old (length bul-old))))
 	       (end-pos (org-list-get-item-end pos old-struct)))
-	  (push (cons pos ind-shift) itm-shift)
+	  (push (list pos ind-shift ind-pos) itm-shift)
 	  (unless (assq end-pos old-struct)
 	    ;; To determine real ind of an ending position that
 	    ;; is not at an item, we have to find the item it
@@ -1955,7 +1960,7 @@ Initial position of cursor is restored after the changes."
 	       (down (car all-ends))
 	       (itemp (assq up struct))
 	       (delta
-		(if itemp (cdr (assq up itm-shift))
+		(if itemp (nth 1 (assq up itm-shift))
 		  ;; If we're not at an item, there's a child of the
 		  ;; item point belongs to above.  Make sure the less
 		  ;; indented line in this slice has the same column
@@ -1981,7 +1986,7 @@ Initial position of cursor is restored after the changes."
 						    down t)))))
 			(forward-line)))
 		    (- ind min-ind)))))
-	  (push (list down up delta) sliced-struct)))
+	  (push (list down up delta (when itemp (nth 2 (assq up itm-shift)))) sliced-struct)))
       ;; 3. Shift each slice in buffer, provided delta isn't 0, from
       ;;    end to beginning.  Take a special action when beginning is
       ;;    at item bullet.
@@ -2358,7 +2363,7 @@ is an integer, 0 means `-', 1 means `+' etc.  If WHICH is
 (define-minor-mode org-list-checkbox-radio-mode
   "When turned on, use list checkboxes as radio buttons."
   :lighter " CheckBoxRadio"
-  (unless (eq major-mode 'org-mode)
+  (unless (derived-mode-p 'org-mode)
     (user-error "Cannot turn this mode outside org-mode buffers")))
 
 (defun org-toggle-radio-button (&optional arg)
@@ -2541,10 +2546,6 @@ portion of the buffer."
       (let* ((cookie-re "\\(\\(\\[[0-9]*%\\]\\)\\|\\(\\[[0-9]*/[0-9]*\\]\\)\\)")
 	     (box-re "^[ \t]*\\([-+*]\\|\\([0-9]+\\|[A-Za-z]\\)[.)]\\)[ \t]+\
 \\(?:\\[@\\(?:start:\\)?\\([0-9]+\\|[A-Za-z]\\)\\][ \t]*\\)?\\(\\[[- X]\\]\\)")
-             (cookie-data (or (org-entry-get nil "COOKIE_DATA") ""))
-	     (recursivep
-	      (or (not org-checkbox-hierarchical-statistics)
-	          (string-match-p "\\<recursive\\>" cookie-data)))
 	     (within-inlinetask (and (not all)
 				     (featurep 'org-inlinetask)
 				     (org-inlinetask-in-task-p)))
@@ -2582,14 +2583,18 @@ portion of the buffer."
         ;; Move to start.
         (cond (all (goto-char (point-min)))
 	      (within-inlinetask (org-back-to-heading t))
-	      (t (org-with-limited-levels (outline-previous-heading))))
+	      (t (org-with-limited-levels (org-back-to-heading-or-point-min t))))
         ;; Build an alist for each cookie found.  The key is the position
         ;; at beginning of cookie and values ending position, format of
         ;; cookie, number of checked boxes to report and total number of
         ;; boxes.
         (while (re-search-forward cookie-re end t)
-          (let ((context (save-excursion (backward-char)
-				         (save-match-data (org-element-context)))))
+          (let* ((context (save-excursion (backward-char)
+				          (save-match-data (org-element-context))))
+                 (cookie-data (save-match-data (or (org-entry-get nil "COOKIE_DATA") "")))
+	         (recursivep
+	          (or (not org-checkbox-hierarchical-statistics)
+	              (string-match-p "\\<recursive\\>" cookie-data))))
 	    (when (and (org-element-type-p context 'statistics-cookie)
                        (not (string-match-p "\\<todo\\>" cookie-data)))
 	      (push
@@ -2725,8 +2730,7 @@ Return t if successful."
                        (no-subtree (1+ (line-beginning-position)))
                        (t (org-list-get-item-end (line-beginning-position) struct))))))
       (let* ((beg (marker-position org-last-indent-begin-marker))
-	     (end (marker-position org-last-indent-end-marker))
-             (deactivate-mark nil))
+	     (end (marker-position org-last-indent-end-marker)))
 	(cond
 	 ;; Special case: moving top-item with indent rule.
 	 (specialp
@@ -2773,6 +2777,7 @@ Return t if successful."
 		    (org-list-struct-indent beg end struct parents prevs))))
 	    (org-list-write-struct struct new-parents old-struct))
 	  (org-update-checkbox-count-maybe))))))
+  (setq deactivate-mark (org--deactivate-mark))
   t)
 
 (defun org-outdent-item ()
diff --git a/lisp/org/org-macro.el b/lisp/org/org-macro.el
index c68b937fa6a..1fb48ffcf08 100644
--- a/lisp/org/org-macro.el
+++ b/lisp/org/org-macro.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2013-2026 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou@gmail.com>
+;; Maintainer: Ihor Radchenko <yantar92 at posteo dot net>
 ;; Keywords: outlines, hypermedia, calendar, text
 
 ;; This file is part of GNU Emacs.
@@ -55,9 +56,8 @@
 (require 'org-compat)
 
 (declare-function org-collect-keywords "org" (keywords &optional unique directory))
-(declare-function org-element-at-point "org-element" (&optional pom cached-only))
 (declare-function org-element-context "org-element" (&optional element))
-(declare-function org-element-copy "org-element-ast" (datum))
+(declare-function org-element-copy "org-element-ast" (datum &optional keep-contents))
 (declare-function org-element-macro-parser "org-element" ())
 (declare-function org-element-keyword-parser "org-element" (limit affiliated))
 (declare-function org-element-put-property "org-element-ast" (node property value))
@@ -69,10 +69,8 @@
 (declare-function org-element-type "org-element-ast" (node &optional anonymous))
 (declare-function org-element-type-p "org-element-ast" (node types))
 (declare-function org-entry-get "org" (pom property &optional inherit literal-nil))
-(declare-function org-file-contents "org" (file &optional noerror nocache))
 (declare-function org-in-commented-heading-p "org" (&optional no-inheritance element))
-(declare-function org-link-search "ol" (s &optional avoid-pos stealth))
-(declare-function org-mode "org" ())
+(declare-function org-link-search "ol" (s &optional avoid-pos stealth new-heading-container))
 (declare-function vc-backend "vc-hooks" (f))
 (declare-function vc-call "vc-hooks" (fun file &rest args) t)
 (declare-function vc-exec-after "vc-dispatcher" (code &optional success))
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index eb4916dfe0b..44e73ca9875 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2004-2026 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
+;; Maintainer: Ihor Radchenko <yantar92 at posteo dot net>
 ;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
@@ -33,6 +34,7 @@
 
 (require 'cl-lib)
 (require 'format-spec)
+(eval-when-compile (require 'subr-x))  ; For `when-let*', Emacs < 29
 
 ;;; Org version verification.
 
@@ -80,7 +82,16 @@ Version mismatch is commonly encountered in the following situations:
    It is recommended to set `load-path' as early in the config as
    possible.
 
-3. New Org version is loaded using straight.el package manager and
+3. New Org version is loaded while an old Org version is partially
+   loaded during compilation or M-x package-upgrade.  This usually
+   should not happen (at least, a number of attemps have been made
+   to avoid this problem in package.el), but sometimes it does anyway.
+
+   You can manually delete Org installation from ~/.emacs.d/elpa/ and
+   try installing again, possibly from emacs -Q without any
+   configuration loaded.
+
+4. New Org version is loaded using straight.el package manager and
    other package depending on Org is loaded before straight triggers
    loading of the newer Org version.
 
@@ -93,7 +104,7 @@ Version mismatch is commonly encountered in the following situations:
    sufficient if the corresponding `use-package' statement is
    deferring the loading.
 
-4. A new Org version is synchronized with Emacs git repository and
+5. A new Org version is synchronized with Emacs git repository and
    stale .elc files are still left from the previous build.
 
    It is recommended to remove .elc files from lisp/org directory and
@@ -108,10 +119,8 @@ Version mismatch is commonly encountered in the following situations:
 (declare-function org-mode "org" ())
 (declare-function org-agenda-files "org" (&optional unrestricted archives))
 (declare-function org-time-string-to-seconds "org" (s))
-(declare-function org-fold-show-context "org-fold" (&optional key))
 (declare-function org-fold-save-outline-visibility "org-fold" (use-markers &rest body))
 (declare-function org-fold-next-visibility-change "org-fold" (&optional pos limit ignore-hidden-p previous-p))
-(declare-function org-fold-core-with-forced-fontification "org-fold" (&rest body))
 (declare-function org-fold-folded-p "org-fold" (&optional pos limit ignore-hidden-p previous-p))
 (declare-function org-time-convert-to-list "org-compat" (time))
 (declare-function org-buffer-text-pixel-width "org-compat" ())
@@ -246,26 +255,37 @@ This function is only useful when called from Agenda buffer."
 (defmacro org-preserve-local-variables (&rest body)
   "Execute BODY while preserving local variables."
   (declare (debug (body)))
-  `(let ((local-variables
-	  (org-with-wide-buffer
-	   (goto-char (point-max))
-	   (let ((case-fold-search t))
-	     (and (re-search-backward "^[ \t]*# +Local Variables:"
-				      (max (- (point) 3000) 1)
-				      t)
-               (let ((buffer-undo-list t))
-	         (delete-and-extract-region (point) (point-max)))))))
-         (tick-counter-before (buffer-modified-tick)))
-     (unwind-protect (progn ,@body)
-       (when local-variables
-	 (org-with-wide-buffer
-	  (goto-char (point-max))
-	  (unless (bolp) (insert "\n"))
-          (let ((modified (< tick-counter-before (buffer-modified-tick)))
-                (buffer-undo-list t))
-	    (insert local-variables)
-            (unless modified
-              (restore-buffer-modified-p nil))))))))
+  (org-with-gensyms (local-variables tick-counter-before)
+    `(org-with-undo-amalgamate
+       (let ((,local-variables
+              (org-with-wide-buffer
+               (goto-char (point-max))
+               (let ((case-fold-search t))
+                 (and (re-search-backward
+                       ,(rx-let ((prefix
+                                  (seq line-start (zero-or-more whitespace)
+                                       "#" (one-or-more whitespace))))
+                          (rx prefix "Local Variables:"
+                              (one-or-more anychar)
+                              prefix "End:"
+                              (zero-or-more whitespace) (optional "\n")))
+                       (max (- (point) 3000) 1)
+                       t)
+                      (cons (match-beginning 0)
+                            (delete-and-extract-region (match-beginning 0)
+                                                         (match-end 0)))))))
+             (,tick-counter-before (buffer-modified-tick)))
+         (unwind-protect (progn ,@body)
+           (when ,local-variables
+             (org-with-wide-buffer
+              (let ((modified (< ,tick-counter-before (buffer-modified-tick))))
+                (if (not modified)
+                    (goto-char (car ,local-variables))
+                  (goto-char (point-max))
+                  (unless (bolp) (insert "\n")))
+	        (insert (cdr ,local-variables))
+                (unless modified
+                  (restore-buffer-modified-p nil))))))))))
 
 ;;;###autoload
 (defmacro org-element-with-disabled-cache (&rest body)
@@ -274,6 +294,16 @@ This function is only useful when called from Agenda buffer."
   `(cl-letf (((symbol-function #'org-element--cache-active-p) (lambda (&rest _) nil)))
      ,@body))
 
+(defmacro org-with-syntax-table (table &rest body)
+  "Evaluate BODY with syntax table of current buffer set to TABLE.
+
+This is the same as `with-syntax-table' except that it also binds
+`parse-sexp-lookup-properties' to nil."
+  (declare (debug t) (indent 1))
+  `(with-syntax-table ,table
+     (let ((parse-sexp-lookup-properties nil))
+       ,@body)))
+
 
 ;;; Buffer and windows
 
@@ -672,7 +702,14 @@ ones and overrule settings in the other lists."
     org-element--cache-diagnostics-ring-size
     org-element--cache-sync-keys
     org-element--cache-sync-requests
-    org-element--cache-sync-timer)
+    org-element--cache-sync-timer
+    ;; FIXME: Avoid copying `buffer-file-name' - when closing a
+    ;; temporary buffer, org-persist badly interacts with multiple
+    ;; _different_ buffers with the same `buffer-file-name' and may
+    ;; modify (via `org-element--cache-persist-before-write' by side
+    ;; effect the cache in a _different_ buffer (whatever comes first
+    ;; in `get-file-buffer').
+    buffer-file-name)
   "List of local variables that cannot be transferred to another buffer.")
 
 (defun org-get-local-variables ()
@@ -1142,6 +1179,9 @@ delimiting S."
 	     ((= cursor end) 0)
 	     (t (string-width (substring s cursor end)))))))
 
+(defvar org-string-width--old-emacs (version< emacs-version "28")
+  "When non-nil, use fallback behavior, primarily for old Emacs versions.")
+
 (defun org--string-width-1 (string)
   "Return width of STRING when displayed in the current buffer.
 Unlike `string-width', this function takes into consideration
@@ -1151,17 +1191,47 @@ Results may be off sometimes if it cannot handle a given
 `display' value."
   (org--string-from-props string 'display 0 (length string)))
 
-(defun org-string-width (string &optional pixels default-face)
+(defun org-string-width-invisibility-spec ()
+  "Return the invisibility spec of this buffer without folds and ellipses."
+  ;; We need to remove the folds to make sure that folded table
+  ;; alignment is not messed up.
+  (or (and (not (listp buffer-invisibility-spec))
+           buffer-invisibility-spec)
+      (let (result)
+        (dolist (el buffer-invisibility-spec)
+          (unless (or (memq el
+                            '(org-fold-drawer
+                              org-fold-block
+                              org-fold-outline))
+                      (and (listp el)
+                           (memq (car el)
+                                 '(org-fold-drawer
+                                   org-fold-block
+                                   org-fold-outline))))
+            (push
+             ;; Consider ellipsis to have 0 width.
+             ;; It is what Emacs 28+ does, but we have
+             ;; to force it in earlier Emacs versions.
+             (if (and (consp el) (cdr el))
+                 (list (car el))
+               el)
+             result)))
+        result)))
+
+(defun org-string-width (string &optional pixels default-face invisibility-spec)
   "Return width of STRING when displayed in the current buffer.
 Return width in pixels when PIXELS is non-nil.
 When PIXELS is nil, DEFAULT-FACE is the face used to calculate relative
-STRING width.  When REFERENCE-FACE is nil, `default' face is used."
-  (if (and (version< emacs-version "28") (not pixels))
+STRING width.  When REFERENCE-FACE is nil, `default' face is used.
+Use INVISIBILITY-SPEC when non-nil, otherwise construct one without
+folds and ellipses."
+  (if (and org-string-width--old-emacs (not pixels))
       ;; FIXME: Fallback to old limited version, because
       ;; `window-pixel-width' is buggy in older Emacs.
       (org--string-width-1 string)
     ;; Wrap/line prefix will make `window-text-pixel-size' return too
     ;; large value including the prefix.
+    (setq string (copy-sequence string)) ; do not modify STRING object
     (remove-text-properties 0 (length string)
                             '(wrap-prefix t line-prefix t)
                             string)
@@ -1171,40 +1241,14 @@ STRING width.  When REFERENCE-FACE is nil, `default' face is used."
     ;; when PIXELS are requested though).
     (unless pixels
       (put-text-property 0 (length string) 'face (or default-face 'default) string))
-    (let (;; We need to remove the folds to make sure that folded table
-          ;; alignment is not messed up.
-          (current-invisibility-spec
-           (or (and (not (listp buffer-invisibility-spec))
-                    buffer-invisibility-spec)
-               (let (result)
-                 (dolist (el buffer-invisibility-spec)
-                   (unless (or (memq el
-                                     '(org-fold-drawer
-                                       org-fold-block
-                                       org-fold-outline))
-                               (and (listp el)
-                                    (memq (car el)
-                                          '(org-fold-drawer
-                                            org-fold-block
-                                            org-fold-outline))))
-                     (push el result)))
-                 result)))
+    (let ((current-invisibility-spec (or invisibility-spec (org-string-width-invisibility-spec)))
           (current-char-property-alias-alist char-property-alias-alist))
-      (with-current-buffer (get-buffer-create " *Org string width*")
+      (with-current-buffer (get-buffer-create " *Org string width*" t)
         (setq-local display-line-numbers nil)
         (setq-local line-prefix nil)
         (setq-local wrap-prefix nil)
         (setq-local buffer-invisibility-spec
-                    (if (listp current-invisibility-spec)
-                        (mapcar (lambda (el)
-                                  ;; Consider ellipsis to have 0 width.
-                                  ;; It is what Emacs 28+ does, but we have
-                                  ;; to force it in earlier Emacs versions.
-                                  (if (and (consp el) (cdr el))
-                                      (list (car el))
-                                    el))
-                                current-invisibility-spec)
-                      current-invisibility-spec))
+                    current-invisibility-spec)
         (setq-local char-property-alias-alist
                     current-char-property-alias-alist)
         (let (pixel-width symbol-width)
@@ -1218,7 +1262,7 @@ STRING width.  When REFERENCE-FACE is nil, `default' face is used."
               (setq symbol-width (org-buffer-text-pixel-width))))
           (if pixels
               pixel-width
-            (ceiling pixel-width symbol-width)))))))
+            (round pixel-width symbol-width)))))))
 
 (defmacro org-current-text-column ()
   "Like `current-column' but ignore display properties.
@@ -1228,7 +1272,9 @@ This function forces `tab-width' value because it is used as a part of
 the parser, to ensure parser consistency when calculating list
 indentation."
   `(progn
-     (unless (= 8 tab-width) (error "Tab width in Org files must be 8, not %d.  Please adjust your `tab-width' settings for Org mode" tab-width))
+     (unless (= 8 tab-width)
+       (org--set-tab-width)
+       (warn "Tab width in Org files must be 8, not %d.  Setting back to 8.  Please adjust your `tab-width' settings for Org mode" tab-width))
      (string-width (buffer-substring-no-properties
                     (line-beginning-position) (point)))))
 
@@ -1701,18 +1747,33 @@ it for output."
                         (file-relative-name source pwd))
                     source))
          (log-buf (and log-buf (get-buffer-create log-buf)))
-         (time (file-attribute-modification-time (file-attributes output))))
+         (time (file-attribute-modification-time (file-attributes output)))
+         exit-status (did-error nil))
     (save-window-excursion
       (dolist (command commands)
         (cond
          ((functionp command)
+          ;; We could treat return value of the function
+          ;; as return code in shell command, but that would be
+          ;; a breaking changed compared to historical behavior.
+          ;; Functions might still take care to remove the target file
+          ;; (if it already exists) to mark failure.
           (funcall command (shell-quote-argument relname)))
          ((stringp command)
           (let ((shell-command-dont-erase-buffer t))
-            (shell-command command log-buf))))))
+            (setq exit-status (shell-command command log-buf))
+            (when (and (numberp exit-status) (> exit-status 0))
+              (setq did-error t)))))))
     ;; Check for process failure.  Output file is expected to be
     ;; located in the same directory as SOURCE.
-    (unless (org-file-newer-than-p output time)
+    ;; Sometimes, the (LaTeX) process fails still producing output.
+    ;; Then, assume compilation success. It is way too common for
+    ;; LaTeX to throw non-0 exit code yet producing perfectly usable
+    ;; pdfs.
+    (when (or (not (file-exists-p output))
+              ;; non-0 exit code and output not updated.
+              (and did-error
+                   (not (org-file-newer-than-p output time))))
       (ignore (defvar org-batch-test))
       ;; Display logs when running tests.
       (when (bound-and-true-p org-batch-test)
@@ -1812,6 +1873,15 @@ indirectly called by the latter."
                    (eq (window-frame) (window-frame window))))
       (window--display-buffer buffer window 'reuse alist))))
 
+(defun org-base-buffer-file-name (&optional buffer)
+  "Resolve the base file name for the provided BUFFER.
+If BUFFER is not provided, default to the current buffer.  If
+BUFFER does not have a file name associated with it (e.g. a
+transient buffer) then return nil."
+  (if-let* ((base-buffer (buffer-base-buffer buffer)))
+      (buffer-file-name base-buffer)
+    (buffer-file-name buffer)))
+
 (provide 'org-macs)
 
 ;; Local variables:
diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el
index da3b42f4f5b..d76aef46081 100644
--- a/lisp/org/org-mobile.el
+++ b/lisp/org/org-mobile.el
@@ -1035,13 +1035,13 @@ be returned that indicates what went wrong."
      ((eq what 'priority)
       (let ((case-fold-search nil))
 	(when (looking-at org-complex-heading-regexp)
-	  (let ((current (and (match-end 3) (substring (match-string 3) 2 3))))
+	  (let ((current (and (match-end 3) (substring (match-string 3) 2 -1))))
 	    (cond
 	     ((equal current new) t)	;no action required
 	     ((or (equal current old)
 		  (eq org-mobile-force-mobile-change t)
 		  (memq 'tags org-mobile-force-mobile-change))
-	      (org-priority (and new (string-to-char new))))
+	      (org-priority (and new (org-priority-to-value new))))
 	     (t (error "Priority was expected to be %s, but is %s"
 		       old current)))))))
 
diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index 6e258879931..cf303ee9650 100644
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -427,13 +427,13 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
    (let ((tags (org-get-tags nil t)))
      (org-mouse-keyword-menu
       (sort (mapcar #'car (org-get-buffer-tags))
-            (or org-tags-sort-function #'org-string<))
+            #'org-tags-sort)
       (lambda (tag)
 	(org-mouse-set-tags
 	 (sort (if (member tag tags)
 		   (delete tag tags)
 		 (cons tag tags))
-	       (or org-tags-sort-function #'org-string<))))
+               #'org-tags-sort)))
       (lambda (tag) (member tag tags))
       ))
    '("--"
@@ -491,7 +491,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
    `("Main Menu"
      ["Show Overview" org-mouse-show-overview t]
      ["Show Headlines" org-mouse-show-headlines t]
-     ["Show All" org-show-all t]
+     ["Show All" org-fold-show-all t]
      ["Remove Highlights" org-remove-occur-highlights
       :visible org-occur-highlights]
      "--"
@@ -504,7 +504,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
      ("Check Tags"
       ,@(org-mouse-keyword-menu
 	 (sort (mapcar #'car (org-get-buffer-tags))
-               (or org-tags-sort-function #'org-string<))
+               #'org-tags-sort)
          (lambda (tag) (org-tags-sparse-tree nil tag)))
       "--"
       ["Custom Tag ..." org-tags-sparse-tree t])
@@ -515,7 +515,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
      ("Display Tags"
       ,@(org-mouse-keyword-menu
 	 (sort (mapcar #'car (org-get-buffer-tags))
-               (or org-tags-sort-function #'org-string<))
+               #'org-tags-sort)
          (lambda (tag) (org-tags-view nil tag)))
       "--"
       ["Custom Tag ..." org-tags-view t])
@@ -627,7 +627,7 @@ This means, between the beginning of line and the point."
 	   ["Sparse Tree" (org-occur ',region-string)]
 	   ["Find in Buffer" (occur ',region-string)]
 	   ["Grep in Current Dir"
-	    (grep (format "grep -rnH -e '%s' *" ',region-string))]
+	    (grep (format "grep -rnH -e '%s' ./*" ',region-string))]
 	   ["Grep in Parent Dir"
 	    (grep (format "grep -rnH -e '%s' ../*" ',region-string))]
 	   "--"
@@ -887,7 +887,7 @@ This means, between the beginning of line and the point."
             (when (memq 'activate-stars org-mouse-features)
               (font-lock-add-keywords
                nil
-               `((,org-outline-regexp
+               `((,org-outline-regexp-bol
                   0 `(face org-link mouse-face highlight keymap ,org-mouse-map)
                   'prepend))
                t))
diff --git a/lisp/org/org-num.el b/lisp/org/org-num.el
index 002d166fe7b..7e07300ff1c 100644
--- a/lisp/org/org-num.el
+++ b/lisp/org/org-num.el
@@ -76,10 +76,6 @@
 (defvar org-n-level-faces)
 (defvar org-odd-levels-only)
 
-(declare-function org-back-to-heading "org" (&optional invisible-ok))
-(declare-function org-entry-get "org" (pom property &optional inherit literal-nil))
-(declare-function org-reduced-level "org" (l))
-
 
 ;;; Customization
 
diff --git a/lisp/org/org-pcomplete.el b/lisp/org/org-pcomplete.el
index f2b9798f91b..ef51cbee960 100644
--- a/lisp/org/org-pcomplete.el
+++ b/lisp/org/org-pcomplete.el
@@ -37,7 +37,7 @@
 (require 'org-compat)
 (require 'pcomplete)
 
-(declare-function org-at-heading-p "org" (&optional ignored))
+(declare-function org-load-export-backends "org" ())
 (declare-function org-babel-combine-header-arg-lists "ob-core" (original &rest others))
 (declare-function org-babel-get-src-block-info "ob-core" (&optional no-eval datum))
 (declare-function org-before-first-heading-p "org" ())
@@ -51,15 +51,14 @@
 (declare-function org-export-backend-options "ox" (cl-x) t)
 (declare-function org-get-buffer-tags "org" ())
 (declare-function org-get-export-keywords "org" ())
-(declare-function org-get-heading "org" (&optional no-tags no-todo no-priority no-comment))
 (declare-function org-get-tags "org" (&optional pos local))
 (declare-function org-link-heading-search-string "ol" (&optional string))
 (declare-function org-tag-alist-to-string "org" (alist &optional skip-key))
 (declare-function org-time-stamp-format "org" (&optional with-time inactive custom))
+(declare-function org-priority-to-string "org" (priority))
 
 (defvar org-babel-common-header-args-w-values)
 (defvar org-current-tag-alist)
-(defvar org-priority-default)
 (defvar org-drawer-regexp)
 (defvar org-element-affiliated-keywords)
 (defvar org-entities)
@@ -68,9 +67,10 @@
 (defvar org-export-select-tags)
 (defvar org-file-tags)
 (defvar org-priority-highest)
+(defvar org-priority-default)
+(defvar org-priority-lowest)
 (defvar org-link-abbrev-alist)
 (defvar org-link-abbrev-alist-local)
-(defvar org-priority-lowest)
 (defvar org-options-keywords)
 (defvar org-outline-regexp)
 (defvar org-property-re)
@@ -157,6 +157,26 @@ The return value is a string naming the thing at point."
     (while (setq e (pop list))
       (setq res (cons (downcase e) (cons (upcase e) res))))
     (nreverse res)))
+
+;; Variables and constants
+
+(defconst org-block-keywords
+  (let (block-names)
+    (dolist (name
+	     '("CENTER" "COMMENT" "EXAMPLE" "EXPORT" "QUOTE" "SRC"
+	       "VERSE")
+	     block-names)
+      (push (format "END_%s" name) block-names)
+      (push (concat "BEGIN_"
+		    name
+		    ;; Since language is compulsory in
+		    ;; export blocks source blocks, add
+		    ;; a space.
+		    (and (member name '("EXPORT" "SRC")) " "))
+	    block-names)
+      (push (concat "ATTR_" name ": ") block-names))
+    block-names)
+  "Keywords related to blocks.")
 
 
 ;;; Completion API
@@ -219,20 +239,7 @@ When completing for #+STARTUP, for example, this function returns
 		    org-options-keywords)
 	    (mapcar (lambda (keyword) (concat keyword ": "))
 		    org-element-affiliated-keywords)
-	    (let (block-names)
-	      (dolist (name
-		       '("CENTER" "COMMENT" "EXAMPLE" "EXPORT" "QUOTE" "SRC"
-			 "VERSE")
-		       block-names)
-		(push (format "END_%s" name) block-names)
-		(push (concat "BEGIN_"
-			      name
-			      ;; Since language is compulsory in
-			      ;; export blocks source blocks, add
-			      ;; a space.
-			      (and (member name '("EXPORT" "SRC")) " "))
-		      block-names)
-		(push (format "ATTR_%s: " name) block-names)))
+            org-block-keywords
 	    (mapcar (lambda (keyword) (concat keyword ": "))
 		    (org-get-export-keywords))))
    (substring pcomplete-stub 2)))
@@ -269,10 +276,11 @@ When completing for #+STARTUP, for example, this function returns
 
 (defun pcomplete/org-mode/file-option/priorities ()
   "Complete arguments for the #+PRIORITIES file option."
-  (pcomplete-here (list (format "%c %c %c"
-				org-priority-highest
-				org-priority-lowest
-				org-priority-default))))
+  (pcomplete-here
+   (list (format "%s %s %s"
+                 (org-priority-to-string org-priority-highest)
+                 (org-priority-to-string org-priority-lowest)
+                 (org-priority-to-string org-priority-default)))))
 
 (defun pcomplete/org-mode/file-option/select_tags ()
   "Complete arguments for the #+SELECT_TAGS file option."
@@ -311,6 +319,7 @@ When completing for #+STARTUP, for example, this function returns
 
 (defun pcomplete/org-mode/file-option/options ()
   "Complete arguments for the #+OPTIONS file option."
+  (org-load-export-backends)
   (while (pcomplete-here
 	  (pcomplete-uniquify-list
 	   (append
diff --git a/lisp/org/org-persist.el b/lisp/org/org-persist.el
index e0e28032fb2..75f09b1e041 100644
--- a/lisp/org/org-persist.el
+++ b/lisp/org/org-persist.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2021-2026 Free Software Foundation, Inc.
 
 ;; Author: Ihor Radchenko <yantar92 at posteo dot net>
+;; Maintainer: Ihor Radchenko <yantar92 at posteo dot net>
 ;; Keywords: cache, storage
 
 ;; This file is part of GNU Emacs.
@@ -58,7 +59,8 @@
 ;;    has been removed.
 ;;
 ;; 3. Temporarily cache a file, including TRAMP path to disk:
-;;    (org-persist-write 'file "/path/to/file")
+;;    (org-persist-write `(file "/path/to/file"))
+;;    (org-persist-read `(file "/path/to/file")) ; => get path to the cached file copy
 ;;
 ;; 4. Cache file or URL while some other file exists.
 ;;    (org-persist-register '(url "https://static.fsf.org/common/img/logo-new.png") '(:file "/path to the other file") :expiry 'never :write-immediately t)
@@ -262,10 +264,6 @@
 (require 'org-id)
 (require 'xdg nil t)
 
-(declare-function org-back-to-heading "org" (&optional invisible-ok))
-(declare-function org-next-visible-heading "org" (arg))
-(declare-function org-at-heading-p "org" (&optional invisible-not-ok))
-
 ;; Silence byte-compiler (used in `org-persist--write-elisp-file').
 (defvar pp-use-max-width)
 
@@ -396,6 +394,9 @@ message is displayed.
 When the value is a non-nil non-number, always display the message.
 When the value is nil, never display the message.")
 
+(defvar org-persist--wrote-to-disk nil
+  "Whether we wrote to disk during current Emacs session.")
+
 ;;;; Common functions
 
 (defun org-persist--display-time (duration format &rest args)
@@ -448,7 +449,11 @@ FORMAT and ARGS are passed to `message'."
 ;; FIXME: `pp' is very slow when writing even moderately large datasets
 ;; We should probably drop it or find some fast formatter.
 (defun org-persist--write-elisp-file (file data &optional no-circular pp)
-  "Write elisp DATA to FILE."
+  "Write to index and then write elisp DATA to FILE.
+When optional argument NO-CIRCULAR is non-nil, do not bind
+`print-circle' to t.
+When optional argument PP is non-nil, pretty-print the data (slow on
+moderately large data)."
   ;; Fsync slightly reduces the chance of an incomplete filesystem
   ;; write, however on modern hardware its effectiveness is
   ;; questionable and it is insufficient to guarantee complete writes.
@@ -472,20 +477,22 @@ FORMAT and ARGS are passed to `message'."
         (print-escape-nonascii t)
         (print-continuous-numbering t)
         print-number-table
-        (start-time (float-time)))
+        (start-time (float-time))
+        (tmp-file (make-temp-file "org-persist-")))
     (unless (file-exists-p (file-name-directory file))
       (make-directory (file-name-directory file) t))
-    ;; Force writing even when the file happens to be opened by
-    ;; another Emacs process.
-    (cl-letf (((symbol-function #'ask-user-about-lock)
-               ;; FIXME: Emacs 27 does not yet have `always'.
-               (lambda (&rest _) t)))
-      (with-temp-file file
-        (insert ";;   -*- mode: lisp-data; -*-\n")
-        (if pp
-            (let ((pp-use-max-width nil)) ; Emacs bug#58687
-              (pp data (current-buffer)))
-          (prin1 data (current-buffer)))))
+    ;; Do not write to FILE directly.  Another Emacs instance may be
+    ;; doing the same at the same time.  Instead, write to new
+    ;; temporary file and then rename it (renaming is atomic
+    ;; operation that does not create data races).
+    ;; See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=75209#35
+    (with-temp-file tmp-file
+      (insert ";;   -*- mode: lisp-data; -*-\n")
+      (if pp
+          (let ((pp-use-max-width nil)) ; Emacs bug#58687
+            (pp data (current-buffer)))
+        (prin1 data (current-buffer))))
+    (rename-file tmp-file file 'overwrite)
     (org-persist--display-time
      (- (float-time) start-time)
      "Writing to %S" file)))
@@ -533,13 +540,26 @@ BODY is executed in a context with the following additional variables:
   (org-persist-collection-let collection
     (and org-persist--index-hash
          (catch :found
-           (dolist (cont (cons container container))
+           (dolist (cont
+                    (if (listp (car container)) ; container group
+                        (cons container container)
+                      (list container)))
              (let ((r (or (gethash (cons cont associated) org-persist--index-hash)
                           (and path (gethash (cons cont (list :file path)) org-persist--index-hash))
                           (and inode (gethash (cons cont (list :inode inode)) org-persist--index-hash))
                           (and hash (gethash (cons cont (list :hash hash)) org-persist--index-hash))
                           (and key (gethash (cons cont (list :key key)) org-persist--index-hash)))))
-               (when r (throw :found r))))))))
+               (when (and r
+                          ;; Every element in container group of
+                          ;; COLLECTION matches returned CONTAINER.
+                          (seq-every-p
+                           (lambda (cont)
+                             (org-persist-collection-let r
+                               (member cont container)))
+                           (if (listp (car container))
+                               container
+                             (list container))))
+                 (throw :found r))))))))
 
 (defun org-persist--add-to-index (collection &optional hash-only)
   "Add or update COLLECTION in `org-persist--index'.
@@ -557,7 +577,10 @@ Return PLIST."
             existing)
         (unless hash-only (push collection org-persist--index))
         (unless org-persist--index-hash (setq org-persist--index-hash (make-hash-table :test 'equal)))
-        (dolist (cont (cons container container))
+        (dolist (cont
+                 (if (listp (car container)) ; container group
+                     (cons container container)
+                   (list container)))
           (puthash (cons cont associated) collection org-persist--index-hash)
           (when path (puthash (cons cont (list :file path)) collection org-persist--index-hash))
           (when inode (puthash (cons cont (list :inode inode)) collection org-persist--index-hash))
@@ -579,7 +602,10 @@ Return PLIST."
   (let ((existing (org-persist--find-index collection)))
     (when existing
       (org-persist-collection-let collection
-        (dolist (cont (cons container container))
+        (dolist (cont
+                 (if (listp (car container)) ; container group
+                     (cons container container)
+                   (list container)))
           (unless (listp (car container))
             (org-persist-gc:generic cont collection)
             (dolist (afile (org-persist-associated-files:generic cont collection))
@@ -599,7 +625,6 @@ or file-path, (:inode inode), (:hash hash), or or (:key key).
 MISC, if non-nil will be appended to the collection.  It must be a plist."
   (unless (and (listp container) (listp (car container)))
     (setq container (list container)))
-  (setq associated (org-persist--normalize-associated associated))
   (when (and misc (or (not (listp misc)) (cl-oddp (length misc))))
     (error "org-persist: Not a plist: %S" misc))
   (or (org-persist--find-index
@@ -609,7 +634,8 @@ MISC, if non-nil will be appended to the collection.  It must be a plist."
        (nconc
         (list :container (org-persist--normalize-container container)
               :persist-file
-              (replace-regexp-in-string "^.." "\\&/" (org-id-uuid))
+              (let ((uuid (org-id-uuid)))
+                (concat (substring uuid 0 2) "/" (substring uuid 2)))
               :associated associated)
         misc))))
 
@@ -635,9 +661,10 @@ When INNER is non-nil, do not try to match as list of containers."
 (defvar org-persist--associated-buffer-cache (make-hash-table :weakness 'key)
   "Buffer hash cache.")
 
-(defun org-persist--normalize-associated (associated)
+(defsubst org-persist--normalize-associated (associated)
   "Normalize ASSOCIATED representation into (:type value)."
   (pcase associated
+    (`nil nil)
     ((or (pred stringp) `(:file ,_))
      (unless (stringp associated)
        (setq associated (cadr associated)))
@@ -729,7 +756,7 @@ COLLECTION is the plist holding data collection."
 
 (defun org-persist-read:index (cont index-file _)
   "Read index container CONT from INDEX-FILE."
-  (when (file-exists-p index-file)
+  (when (and (file-exists-p index-file) (file-readable-p index-file))
     (let ((index (org-persist--read-elisp-file index-file)))
       (when index
         (catch :found
@@ -785,9 +812,10 @@ COLLECTION is the plist holding data collection."
       (when (file-exists-p org-persist-directory)
         (dolist (file (directory-files org-persist-directory 'absolute
                                        "\\`[^.][^.]"))
-          (if (file-directory-p file)
-              (delete-directory file t)
-            (delete-file file))))
+          (when (file-writable-p file)
+            (if (file-directory-p file)
+                (delete-directory file t)
+              (delete-file file)))))
       (plist-put (org-persist--get-collection container) :expiry 'never))))
 
 (defun org-persist--load-index ()
@@ -827,6 +855,12 @@ COLLECTION is the plist holding data collection."
        (when (boundp (cadr container))
          (symbol-value (cadr container))))
       (`nil
+       ;; FIXME: Here and in other places, we use `get-file-buffer'
+       ;; assuming that all the buffers with the same
+       ;; `buffer-file-name' are same.  However, this may not
+       ;; necessarily be the case in general and we may initiate
+       ;; writing cache in one buffer, but `get-file-buffer' may then
+       ;; return _another_ buffer (with the same `buffer-file-name').
        (if-let* ((buf (and (plist-get (plist-get collection :associated) :file)
                            (get-file-buffer (plist-get (plist-get collection :associated) :file)))))
            ;; FIXME: There is `buffer-local-boundp' introduced in Emacs 28.
@@ -906,7 +940,7 @@ Otherwise, return t."
     (let ((index-file
            (org-file-name-concat org-persist-directory org-persist-index-file)))
       (org-persist--merge-index-with-disk)
-      (org-persist--write-elisp-file index-file org-persist--index t)
+      (org-persist--write-elisp-file index-file org-persist--index t nil)
       (setq org-persist--index-age
             (file-attribute-modification-time (file-attributes index-file)))
       index-file)))
@@ -918,6 +952,7 @@ Otherwise, return t."
 
 (defun org-persist--merge-index-with-disk ()
   "Merge `org-persist--index' with the current index file on disk."
+  (org-persist--load-index)
   (let* ((index-file
           (org-file-name-concat org-persist-directory org-persist-index-file))
          (disk-index
@@ -929,32 +964,37 @@ Otherwise, return t."
     (when disk-index
       (setq org-persist--index combined-index
             org-persist--index-age
-            (file-attribute-modification-time (file-attributes index-file))))))
+            (file-attribute-modification-time (file-attributes index-file)))
+      ;; Store newly added entries in the index hash.
+      (mapc (lambda (collection) (org-persist--add-to-index collection 'hash))
+            org-persist--index))))
 
 (defun org-persist--merge-index (base other)
   "Attempt to merge new index items in OTHER into BASE.
 Items with different details are considered too difficult, and skipped."
   (if other
-      (let ((new (cl-set-difference other base :test #'equal))
-            (base-files (mapcar (lambda (s) (plist-get s :persist-file)) base))
-            (combined (reverse base)))
-        (dolist (item (nreverse new))
-          (unless (or (memq 'index (mapcar #'car (plist-get item :container)))
-                      (not (file-exists-p
+      (if (not base) other
+        (let ((new (cl-set-difference other base :key #'org-persist--find-index))
+              (base-files (mapcar (lambda (s) (plist-get s :persist-file)) base))
+              (combined (reverse base)))
+          (dolist (item (nreverse new))
+            (unless (or (memq 'index (mapcar #'car (plist-get item :container)))
+                        (not (file-exists-p
                             (org-file-name-concat org-persist-directory
                                                   (plist-get item :persist-file))))
-                      (member (plist-get item :persist-file) base-files))
-            (push item combined)))
-        (nreverse combined))
+                        (member (plist-get item :persist-file) base-files))
+              (push item combined)))
+          (nreverse combined)))
     base))
 
 ;;;; Public API
 
-(cl-defun org-persist-register (container &optional associated &rest misc
-                               &key inherit
-                               &key (expiry org-persist-default-expiry)
-                               &key (write-immediately nil)
-                               &allow-other-keys)
+(cl-defun org-persist-register
+    ( container &optional associated &rest misc
+      &key inherit
+      &key (expiry org-persist-default-expiry)
+      &key (write-immediately nil)
+      &allow-other-keys)
   "Register CONTAINER in ASSOCIATED to be persistent across Emacs sessions.
 Optional key INHERIT makes CONTAINER dependent on another container.
 Such dependency means that data shared between variables will be
@@ -969,8 +1009,11 @@ MISC will be appended to the collection.  It must be alternating :KEY
 VALUE pairs.
 When WRITE-IMMEDIATELY is non-nil, the return value will be the same
 with `org-persist-write'."
-  (unless org-persist--index (org-persist--load-index))
+  ;; Sync cache with disk, dropping conflicting items between multiple
+  ;; Emacsen.
+  (org-persist--merge-index-with-disk)
   (setq container (org-persist--normalize-container container))
+  (setq associated (org-persist--normalize-associated associated))
   (when inherit
     (setq inherit (org-persist--normalize-container inherit))
     (let ((inherited-collection (org-persist--get-collection inherit associated))
@@ -996,7 +1039,9 @@ with `org-persist-write'."
 When ASSOCIATED is `all', unregister CONTAINER everywhere.
 When REMOVE-RELATED is non-nil, remove all the containers stored with
 the CONTAINER as well."
-  (unless org-persist--index (org-persist--load-index))
+  ;; Sync cache with disk, dropping conflicting items between multiple
+  ;; Emacsen.
+  (org-persist--merge-index-with-disk)
   (setq container (org-persist--normalize-container container))
   (if (eq associated 'all)
       (mapc (lambda (collection)
@@ -1012,10 +1057,6 @@ the CONTAINER as well."
                      (remove container (plist-get collection :container)))
           (org-persist--add-to-index collection))))))
 
-(defvar org-persist--write-cache (make-hash-table :test #'equal)
-  "Hash table storing as-written data objects.
-
-This data is used to avoid reading the data multiple times.")
 (cl-defun org-persist-read (container &optional associated hash-must-match load &key read-related)
   "Restore CONTAINER data for ASSOCIATED.
 When HASH-MUST-MATCH is non-nil, do not restore data if hash for
@@ -1037,7 +1078,9 @@ CONTAINER as well.  For example:
     (org-persist-read \"My data\") ; => \"My data\"
     (org-persist-read \"My data\" nil nil nil
                       :read-related t) ; => (\"My data\" \"test\")"
-  (unless org-persist--index (org-persist--load-index))
+  ;; Sync cache with disk, dropping conflicting items between multiple
+  ;; Emacsen.
+  (org-persist--merge-index-with-disk)
   (setq associated (org-persist--normalize-associated associated))
   (setq container (org-persist--normalize-container container))
   (let* ((collection (org-persist--find-index `(:container ,container :associated ,associated)))
@@ -1063,8 +1106,7 @@ CONTAINER as well.  For example:
       (unless (seq-find (lambda (v)
                           (run-hook-with-args-until-success 'org-persist-before-read-hook v associated))
                         (plist-get collection :container))
-        (setq data (or (gethash persist-file org-persist--write-cache)
-                       (org-persist--read-elisp-file persist-file)))
+        (setq data (org-persist--read-elisp-file persist-file))
         (when data
           (cl-loop for c in (plist-get collection :container)
                    with result = nil
@@ -1086,7 +1128,9 @@ have the same meaning as in `org-persist-read'."
 
 (defun org-persist-load-all (&optional associated)
   "Restore all the persistent data associated with ASSOCIATED."
-  (unless org-persist--index (org-persist--load-index))
+  ;; Sync cache with disk, dropping conflicting items between multiple
+  ;; Emacsen.
+  (org-persist--merge-index-with-disk)
   (setq associated (org-persist--normalize-associated associated))
   (let (all-containers)
     (dolist (collection org-persist--index)
@@ -1113,6 +1157,7 @@ The return value is nil when writing fails and the written value (as
 returned by `org-persist-read') on success.
 When IGNORE-RETURN is non-nil, just return t on success without calling
 `org-persist-read'."
+  (setq org-persist--wrote-to-disk t)
   (setq associated (org-persist--normalize-associated associated))
   ;; Update hash
   (when (and (plist-get associated :file)
@@ -1131,18 +1176,18 @@ When IGNORE-RETURN is non-nil, just return t on success without calling
              (seq-find (lambda (v)
                          (run-hook-with-args-until-success 'org-persist-before-write-hook v associated))
                        (plist-get collection :container)))
-      (when (or (file-exists-p org-persist-directory) (org-persist--save-index))
-        (let ((file (org-file-name-concat org-persist-directory (plist-get collection :persist-file)))
-              (data (mapcar (lambda (c) (cons c (org-persist-write:generic c collection)))
-                            (plist-get collection :container))))
-          (puthash file data org-persist--write-cache)
-          (org-persist--write-elisp-file file data)
-          (or ignore-return (org-persist-read container associated)))))))
+      (let ((file (org-file-name-concat org-persist-directory (plist-get collection :persist-file)))
+            (data (mapcar (lambda (c) (cons c (org-persist-write:generic c collection)))
+                          (plist-get collection :container))))
+        (org-persist--write-elisp-file file data)
+        (or ignore-return (org-persist-read container associated))))))
 
 (defun org-persist-write-all (&optional associated)
   "Save all the persistent data.
 When ASSOCIATED is non-nil, only save the matching data."
-  (unless org-persist--index (org-persist--load-index))
+  ;; Sync cache with disk, dropping conflicting items between multiple
+  ;; Emacsen.
+  (org-persist--merge-index-with-disk)
   (setq associated (org-persist--normalize-associated associated))
   (if
       (and (equal 1 (length org-persist--index))
@@ -1220,16 +1265,17 @@ Do nothing in an indirect buffer."
 (defun org-persist--refresh-gc-lock ()
   "Refresh session timestamp in `org-persist-gc-lock-file'.
 Remove expired sessions timestamps."
-  (let* ((file (org-file-name-concat org-persist-directory org-persist-gc-lock-file))
-         (alist (when (file-exists-p file) (org-persist--read-elisp-file file)))
-         new-alist)
-    (setf (alist-get before-init-time alist nil nil #'equal)
-          (current-time))
-    (dolist (record alist)
-      (when (< (- (float-time (cdr record)) (float-time (current-time)))
-               org-persist-gc-lock-expiry)
-        (push record new-alist)))
-    (org-persist--write-elisp-file file new-alist)))
+  (when org-persist--wrote-to-disk
+    (let* ((file (org-file-name-concat org-persist-directory org-persist-gc-lock-file))
+           (alist (when (file-exists-p file) (org-persist--read-elisp-file file)))
+           new-alist)
+      (setf (alist-get before-init-time alist nil nil #'equal)
+            (current-time))
+      (dolist (record alist)
+        (when (< (- (float-time (cdr record)) (float-time (current-time)))
+                 org-persist-gc-lock-expiry)
+          (push record new-alist)))
+      (ignore-errors (org-persist--write-elisp-file file new-alist)))))
 
 (defun org-persist--gc-orphan-p ()
   "Return non-nil, when orphan files should be garbage-collected.
@@ -1237,16 +1283,16 @@ Remove current sessions from `org-persist-gc-lock-file'."
   (let* ((file (org-file-name-concat org-persist-directory org-persist-gc-lock-file))
          (alist (when (file-exists-p file) (org-persist--read-elisp-file file))))
     (setq alist (org-assoc-delete-all before-init-time alist))
-    (org-persist--write-elisp-file file alist)
+    (ignore-errors (org-persist--write-elisp-file file alist))
     ;; Only GC orphan files when there are no active sessions.
     (not alist)))
 
 (defun org-persist-gc ()
   "Remove expired or unregistered containers and orphaned files.
 Also, remove containers associated with non-existing files."
-  (if org-persist--index
-      (org-persist--merge-index-with-disk)
-    (org-persist--load-index))
+  ;; Sync cache with disk, dropping conflicting items between multiple
+  ;; Emacsen.
+  (org-persist--merge-index-with-disk)
   (let (new-index
         (remote-files-num 0)
         (orphan-files
diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el
index 2e3ab00504a..5b53699a5c2 100644
--- a/lisp/org/org-plot.el
+++ b/lisp/org/org-plot.el
@@ -38,7 +38,6 @@
 (require 'org)
 (require 'org-table)
 
-(declare-function gnuplot-delchar-or-maybe-eof "ext:gnuplot" (arg))
 (declare-function gnuplot-mode "ext:gnuplot" ())
 (declare-function gnuplot-send-buffer-to-gnuplot "ext:gnuplot" ())
 
@@ -48,7 +47,9 @@
     (:ind . 0))
   "Default options to gnuplot used by `org-plot/gnuplot'.")
 
-(defvar org-plot-timestamp-fmt nil)
+(defvar org-plot-timestamp-fmt "%Y-%m-%d-%H:%M:%S"
+  "Default time format to be passed to Gnuplot.
+Can be changed via timefmt plot option.")
 
 (defun org-plot/add-options-to-plist (p options)
   "Parse an OPTIONS line and set values in the property list P.
@@ -130,14 +131,17 @@ will be added.  Returns the resulting property list."
 Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
   (with-temp-file
       data-file
-    (setq-local org-plot-timestamp-fmt (or
-					(plist-get params :timefmt)
-					"%Y-%m-%d-%H:%M:%S"))
-    (insert (orgtbl-to-generic
-	     table
-	     (org-combine-plists
-	      '(:sep "\t" :fmt org-plot-quote-tsv-field)
-	      params))))
+    (let ((org-plot-timestamp-fmt
+           (or
+	    (plist-get params :timefmt)
+            org-plot-timestamp-fmt
+	    "%Y-%m-%d-%H:%M:%S")))
+      (insert (orgtbl-to-generic
+	       table
+	       (org-combine-plists
+	        '( :sep "\t" :fmt org-plot-quote-tsv-field
+                   :with-special-rows nil)
+	        params)))))
   nil)
 
 (defun org-plot/gnuplot-to-grid-data (table data-file params)
@@ -215,9 +219,9 @@ of the NUMS."
 If HARD-MIN and HARD-MAX can be used to fix the ends of the axis."
   (let* ((row-data
 	  (mapcar (lambda (row) (org--plot/values-stats
-			         (mapcar #'string-to-number (cdr row))
-			         hard-min
-			         hard-max)) table))
+			    (mapcar #'string-to-number (cdr row))
+			    hard-min
+			    hard-max)) table))
 	 (row-normalized-ranges (mapcar (lambda (r-data)
 					  (let ((val (round (*
 							     (plist-get r-data :range-factor)
@@ -302,9 +306,10 @@ When NORMALIZE is non-nil, the count is divided by the number of values."
 (defcustom org-plot/gnuplot-script-preamble ""
   "String of function to be inserted before the gnuplot plot command is run.
 
-Note that this is in addition to, not instead of other content generated in
-`org-plot/gnuplot-script'.  If a function, it is called with the plot type as
-the argument, and must return a string to be used."
+Note that this is in addition to, not instead of other content generated
+in `org-plot/gnuplot-script'.  If a function, it is called with the
+parameters used by the current plot type (see
+`org-plot/preset-plot-types'), and must return a string to be used."
   :group 'org-plot
   :type '(choice string function))
 
@@ -349,7 +354,7 @@ the argument, and must return a string to be used."
     (grid :plot-cmd "splot"
 	  :plot-pre (lambda (_table _data-file _num-cols params _plot-str)
 		      (if (plist-get params :map) "set pm3d map" "set map"))
-	  :data-dump (lambda (table data-file params _num-cols)
+	  :data-dump (lambda (table data-file _num-cols params)
 		       (let ((y-labels (org-plot/gnuplot-to-grid-data
 					table data-file params)))
 			 (when y-labels (plist-put params :ylabels y-labels))))
@@ -391,8 +396,8 @@ be set.
 - :data-dump - Function to dump the table to a datafile for ease of
   use.
 
-  Accepts lambda function.  Default lambda body:
-  (org-plot/gnuplot-to-data table data-file params)
+  Accepts function with arguments:
+  (table data-file num-cols params)
 
 - :plot-pre - Gnuplot code to be inserted early into the script, just
   after term and output have been set.
@@ -400,7 +405,9 @@ be set.
    Accepts string, nil, or lambda function which returns string
    or nil.  Defaults to nil."
   :group 'org-plot
-  :type 'alist)
+  :package-version '(Org . "9.8")
+  :type 'alist
+  :risky t)
 
 (defvar org--plot/radar-template
   "### spider plot/chart with gnuplot
@@ -541,7 +548,8 @@ EOD
   "String or function which provides the extra term options.
 E.g. a value of \"size 1050,650\" would cause
 \"set term ... size 1050,650\" to be used.
-If a function, it is called with the plot type as the argument."
+If a function, it is called with the parameters used by the current plot
+type, see `org-plot/preset-plot-types'."
   :group 'org-plot
   :type '(choice string function))
 
@@ -627,7 +635,7 @@ manner suitable for prepending to a user-specified script."
 
 (defun org-plot/redisplay-img-in-buffer (img-file)
   "Find any overlays for IMG-FILE in the current Org buffer, and refresh them."
-  (dolist (img-overlay org-inline-image-overlays)
+  (dolist (img-overlay org-link-preview-overlays)
     (when (string= img-file (plist-get (cdr (overlay-get img-overlay 'display)) :file))
       (when (and (file-exists-p img-file)
                  (fboundp 'image-flush))
@@ -662,8 +670,7 @@ line directly before or after the table."
                   (looking-at "[[:space:]]*#\\+"))
         (setf params (org-plot/collect-options params))))
     ;; collect table and table information
-    (let* ((data-file (make-temp-file "org-plot"))
-           (table (let ((tbl (save-excursion
+    (let* ((table (let ((tbl (save-excursion
                                (org-plot/goto-nearest-table)
                                (org-table-to-lisp))))
 		    (when (pcase (plist-get params :transpose)
@@ -679,14 +686,13 @@ line directly before or after the table."
 		    tbl))
 	   (num-cols (length (if (eq (nth 0 table) 'hline) (nth 1 table)
 			       (nth 0 table))))
-	   (type (assoc (plist-get params :plot-type)
-			org-plot/preset-plot-types))
-           gnuplot-script)
+	   (type (cdr (assoc (plist-get params :plot-type)
+			     org-plot/preset-plot-types)))
+           gnuplot-script data-file)
 
       (unless type
 	(user-error "Org-plot type `%s' is undefined" (plist-get params :plot-type)))
 
-      (run-with-idle-timer 0.1 nil #'delete-file data-file)
       (when (eq (cadr table) 'hline)
 	(setf params
 	      (plist-put params :labels (car table))) ; headers to labels
@@ -695,8 +701,18 @@ line directly before or after the table."
       (save-excursion (while (and (equal 0 (forward-line -1))
 				  (looking-at "[[:space:]]*#\\+"))
 			(setf params (org-plot/collect-options params))))
+      ;; Ensure that the user can override any plot parameter, and
+      ;; that the parameters set by the plot type in
+      ;; `org-plot/preset-plot-types' is respected.
+      (setq params (org-combine-plists type params))
       ;; Dump table to datafile
       (let ((dump-func (plist-get type :data-dump)))
+        ;; Use a stable temporary file to ensure that 'replot' upon
+        ;; resizing a GUI gnuplot terminal window works.
+        (setq data-file (org-babel-temp-stable-file
+                         (list (or dump-func 'org-plot/gnuplot-to-data)
+                               table num-cols params)
+                         "org-plot"))
         (if dump-func
 	    (funcall dump-func table data-file num-cols params)
 	  (org-plot/gnuplot-to-data table data-file params)))
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index d02b981da09..21db13e318e 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -101,15 +101,15 @@
 ;;           new URLSearchParams({
 ;;                 url: location.href,
 ;;                 title: document.title,
-;;                 body: window.getSelection()})
+;;                 body: window.getSelection()});void(0)
 ;;
 ;; Alternatively use the following expression that encodes space as \"%20\"
 ;; instead of \"+\", so it is compatible with Org versions from 9.0 to 9.4:
 ;;
-;;     location.href='org-protocol://sub-protocol?url='+
+;;     javascript:location.href='org-protocol://sub-protocol?url='+
 ;;           encodeURIComponent(location.href)+'&title='+
 ;;           encodeURIComponent(document.title)+'&body='+
-;;           encodeURIComponent(window.getSelection())
+;;           encodeURIComponent(window.getSelection());void(0)
 ;;
 ;; The handler for the sub-protocol \"capture\" detects an optional template
 ;; char that, if present, triggers the use of a special template.
@@ -437,14 +437,14 @@ also recognized.
 The location for a browser's bookmark may look like this:
 
   javascript:location.href = \\='org-protocol://store-link?\\=' +
-       new URLSearchParams({url:location.href, title:document.title});
+       new URLSearchParams({url:location.href, title:document.title});void(0);
 
 or to keep compatibility with Org versions from 9.0 to 9.4 it may be:
 
   javascript:location.href = \\
       \\='org-protocol://store-link?url=\\=' + \\
       encodeURIComponent(location.href) + \\='&title=\\=' + \\
-      encodeURIComponent(document.title);
+      encodeURIComponent(document.title);void(0);
 
 Don't use `escape()'!  Use `encodeURIComponent()' instead.  The
 title of the page could contain slashes and the location
@@ -482,20 +482,21 @@ by `/'.  The location for a browser's bookmark looks like this:
         new URLSearchParams({
               url: location.href,
               title: document.title,
-              body: window.getSelection()})
+              body: window.getSelection()});void(0)
 
 or to keep compatibility with Org versions from 9.0 to 9.4:
 
   javascript:location.href = \\='org-protocol://capture?url=\\='+ \\
         encodeURIComponent(location.href) + \\='&title=\\=' + \\
         encodeURIComponent(document.title) + \\='&body=\\=' + \\
-        encodeURIComponent(window.getSelection())
+        encodeURIComponent(window.getSelection());void(0)
 
 By default, it uses the character `org-protocol-default-template-key',
 which should be associated with a template in `org-capture-templates'.
 You may specify the template with a template= query parameter, like this:
 
-  javascript:location.href = \\='org-protocol://capture?template=b\\='+ ...
+  javascript:location.href
+        = \\='org-protocol://capture?template=b\\='+ ...;void(0)
 
 Now template ?b will be used."
   (let* ((parts
@@ -556,13 +557,13 @@ in `org-protocol-project-alist'.
 The location for a browser's bookmark should look like this:
 
   javascript:location.href = \\='org-protocol://open-source?\\=' +
-        new URLSearchParams({url: location.href})
+        new URLSearchParams({url: location.href});void(0)
 
 or if you prefer to keep compatibility with older Org versions (9.0 to 9.4),
 consider the following expression:
 
   javascript:location.href = \\='org-protocol://open-source?url=\\=' + \\
-        encodeURIComponent(location.href)"
+        encodeURIComponent(location.href);void(0)"
   ;; As we enter this function for a match on our protocol, the return value
   ;; defaults to nil.
   (let (;; (result nil)
diff --git a/lisp/org/org-refile.el b/lisp/org/org-refile.el
index b4656b7a804..1d1d5175fa9 100644
--- a/lisp/org/org-refile.el
+++ b/lisp/org/org-refile.el
@@ -72,9 +72,10 @@ This is a list of cons cells.  Each cell contains:
   or a symbol whose function or variable value will be used to retrieve
   a file name or a list of file names.  If you use `org-agenda-files' for
   that, all agenda files will be scanned for targets.  Nil means consider
-  headings in the current buffer.
+  headlines in the current buffer.
 - A specification of how to find candidate refile targets.  This may be
   any of:
+  - t to indicate that all headlines should be considered.
   - a cons cell (:tag . \"TAG\") to identify refile targets by a tag.
     This tag has to be present in all target headlines, inheritance will
     not be considered.
@@ -104,13 +105,15 @@ are used, equivalent to the value `((nil . (:level . 1)))'."
 	   (choice :value org-agenda-files
 		   (const :tag "All agenda files" org-agenda-files)
 		   (const :tag "Current buffer" nil)
-		   (function) (variable) (file))
-	   (choice :tag "Identify target headline by"
-		   (cons :tag "Specific tag" (const :value :tag) (string))
-		   (cons :tag "TODO keyword" (const :value :todo) (string))
-		   (cons :tag "Regular expression" (const :value :regexp) (regexp))
-		   (cons :tag "Level number" (const :value :level) (integer))
-		   (cons :tag "Max Level number" (const :value :maxlevel) (integer))))))
+		   (function) (variable) (file) (repeat (file)))
+	   (choice :tag "Target headlines"
+		   (const :tag "All" t)
+		   (cons :tag "Tagged with" (const :value :tag) (string))
+		   (cons :tag "With the TODO keyword" (const :value :todo) (string))
+		   (cons :tag "Matching the regexp" (const :value :regexp) (regexp))
+		   (cons :tag "At level" (const :value :level) (integer))
+		   (cons :tag "Up through level" (const :value :maxlevel) (integer)))))
+  :package-version '(Org . "9.8"))
 
 (defcustom org-refile-target-verify-function nil
   "Function to verify if the headline at point should be a refile target.
@@ -289,10 +292,12 @@ When `org-refile-use-cache' is nil, just return POS."
 	  (setq files (symbol-value files))))
 	(when (stringp files) (setq files (list files)))
         ;; Allow commonly used (FILE :maxlevel N) and similar values.
-        (when (and (listp (cdr desc)) (null (cddr desc)))
+        (when (and (listp desc) (listp (cdr desc)) (null (cddr desc)))
           (setq desc (cons (car desc) (cadr desc))))
         (condition-case err
 	    (cond
+             ((eq desc t)
+	      (setq descre (concat "^\\*+[ \t]")))
 	     ((eq (car desc) :tag)
 	      (setq descre (concat "^\\*+[ \t]+.*?:" (regexp-quote (cdr desc)) ":")))
 	     ((eq (car desc) :todo)
@@ -341,50 +346,52 @@ When `org-refile-use-cache' is nil, just return POS."
 	       (org-with-wide-buffer
 		(goto-char (point-min))
 		(setq org-outline-path-cache nil)
-		(while (re-search-forward descre nil t)
-		  (forward-line 0)
-		  (let ((case-fold-search nil))
-		    (looking-at org-complex-heading-regexp))
-		  (let ((begin (point))
-			(heading (match-string-no-properties 4)))
-		    (unless (or (and
-				 org-refile-target-verify-function
-				 (not
-				  (funcall org-refile-target-verify-function)))
-				(not heading))
-		      (let ((re (format org-complex-heading-regexp-format
-					(regexp-quote heading)))
-			    (target
-			     (if (not org-refile-use-outline-path) heading
-			       (mapconcat
-				#'identity
-				(append
-				 (pcase org-refile-use-outline-path
-				   (`file (list
+		(let ((base (pcase org-refile-use-outline-path
+			      (`file (list
+                                      (and (buffer-file-name (buffer-base-buffer))
+                                           (file-name-nondirectory
+                                            (buffer-file-name (buffer-base-buffer))))))
+                              (`title (list
+                                       (or (org-get-title)
                                            (and (buffer-file-name (buffer-base-buffer))
                                                 (file-name-nondirectory
-                                                 (buffer-file-name (buffer-base-buffer))))))
-                                   (`title (list
-                                            (or (org-get-title)
-                                                (and (buffer-file-name (buffer-base-buffer))
-                                                     (file-name-nondirectory
-                                                      (buffer-file-name (buffer-base-buffer)))))))
-                                   (`full-file-path
-				    (list (buffer-file-name
-					   (buffer-base-buffer))))
-				   (`buffer-name
-				    (list (buffer-name
-					   (buffer-base-buffer))))
-				   (_ nil))
-				 (mapcar (lambda (s) (replace-regexp-in-string
-						 "/" "\\/" s nil t))
-					 (org-get-outline-path t t)))
-				"/"))))
-			(push (list target f re (org-refile-marker (point)))
-			      tgs)))
-		    (when (= (point) begin)
-		      ;; Verification function has not moved point.
-		      (end-of-line)))))))
+                                                 (buffer-file-name (buffer-base-buffer)))))))
+                              (`full-file-path
+			       (list (buffer-file-name
+				      (buffer-base-buffer))))
+			      (`buffer-name
+			       (list (buffer-name
+				      (buffer-base-buffer))))
+			      (_ nil))))
+		  (while (re-search-forward descre nil t)
+		    (forward-line 0)
+		    (let ((case-fold-search nil))
+		      (looking-at org-complex-heading-regexp))
+		    (let ((begin (point))
+			  (heading (match-string-no-properties 4)))
+		      (unless (or (and
+				   org-refile-target-verify-function
+				   (not
+				    (funcall org-refile-target-verify-function)))
+				  (not heading))
+		        (let ((re (format org-complex-heading-regexp-format
+					  (regexp-quote heading)))
+			      (target
+			       (if (not org-refile-use-outline-path)
+                                   (org-link-display-format heading)
+			         (mapconcat
+				  #'identity
+				  (append
+				   base
+				   (mapcar (lambda (s) (replace-regexp-in-string
+						        "/" "\\/" s nil t))
+					   (org-get-outline-path t t)))
+				  "/"))))
+			  (push (list target f re (org-refile-marker (point)))
+			        tgs)))
+		      (when (= (point) begin)
+		        ;; Verification function has not moved point.
+		        (end-of-line))))))))
 	    (when org-refile-use-cache
 	      (org-refile-cache-put tgs (buffer-file-name) descre))
 	    (setq targets (append tgs targets))))))
@@ -482,7 +489,7 @@ prefix argument (\\`C-u C-u C-u C-c C-w')."
 	   (region-start (and regionp (region-beginning)))
 	   (region-end (and regionp (region-end)))
 	   (org-refile-keep (if (equal arg 3) t org-refile-keep))
-	   pos it nbuf file level reversed)
+	   pos it nbuf file level reversed tree)
       (setq last-command nil)
       (when regionp
 	(goto-char region-start)
@@ -536,14 +543,15 @@ prefix argument (\\`C-u C-u C-u C-c C-w')."
 			 (and (>= pos region-start)
 			      (<= pos region-end))
 		       (and (>= pos (save-excursion
-                                     (org-back-to-heading t)
-                                     (point)))
+                                      (org-back-to-heading t)
+                                      (point)))
 			    (< pos (save-excursion
 				     (org-end-of-subtree t t))))))
 	    (error "Cannot refile to position inside the tree or region"))
 	  (setq nbuf (find-file-noselect file 'nowarn))
 	  (if (and arg (not (equal arg 3)))
 	      (progn
+                (org-mark-ring-push)
 		(pop-to-buffer-same-window nbuf)
 		(goto-char (cond (pos)
 				 ((org-notes-order-reversed-p) (point-min))
@@ -551,9 +559,10 @@ prefix argument (\\`C-u C-u C-u C-c C-w')."
 		(org-fold-show-context 'org-goto))
 	    (if regionp
 		(progn
-		  (org-kill-new (buffer-substring region-start region-end))
+                  (setq tree (buffer-substring region-start region-end))
+		  (org-kill-new tree)
 		  (org-save-markers-in-region region-start region-end))
-	      (org-copy-subtree 1 nil t))
+	      (setq tree (org-copy-subtree 1 nil t)))
             (let ((origin (point-marker)))
               ;; Handle special case when we refile to exactly same
               ;; location with tree promotion/demotion.  Point marker
@@ -580,7 +589,7 @@ prefix argument (\\`C-u C-u C-u C-c C-w')."
 		     (goto-char (point-min))
 		     (or (outline-next-heading) (goto-char (point-max)))))
 	         (unless (bolp) (newline))
-	         (org-paste-subtree level nil nil t)
+	         (org-paste-subtree level tree nil t)
 	         ;; Record information, according to `org-log-refile'.
 	         ;; Do not prompt for a note when refiling multiple
 	         ;; headlines, however.  Simply add a time stamp.
@@ -634,6 +643,7 @@ prefix argument (\\`C-u C-u C-u C-c C-w')."
 (defun org-refile-goto-last-stored ()
   "Go to the location where the last refile was stored."
   (interactive)
+  (org-mark-ring-push)
   (bookmark-jump (plist-get org-bookmark-names-plist :last-refile))
   (message "This is the location of the last refile"))
 
@@ -777,9 +787,7 @@ this function appends the default value from
 			 (all-completions string thetable predicate))))
               ((eq (car-safe flag) 'boundaries)
                ;; See `completion-file-name-table'.
-               (let ((start (or (and (string-match "/" string)
-                                     (match-beginning 0))
-                                (length string)))
+               (let ((start 0)
                      (end (and (string-match "/" (cdr flag))
                                (match-beginning 0))))
                  `(boundaries ,start . ,end)))
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 9318aad6a81..ed265d2d6a6 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -44,7 +44,6 @@
 (declare-function org--get-expected-indentation "org" (element contentsp))
 (declare-function org-mode "org" ())
 (declare-function org--get-expected-indentation "org" (element contentsp))
-(declare-function org-fold-region "org-fold" (from to flag &optional spec-or-alias))
 (declare-function org-element-at-point "org-element" (&optional pom cached-only))
 (declare-function org-element-class "org-element" (datum &optional parent))
 (declare-function org-element-context "org-element" (&optional element))
@@ -128,17 +127,21 @@ When this variable is nil, while indenting with `\\[org-indent-block]'
 or after editing with `\\[org-edit-src-code]', the minimum (across-lines)
 number of leading whitespace characters are removed from all lines,
 and the code block is uniformly indented according to the value of
-`org-edit-src-content-indentation'."
+`org-src-content-indentation'."
   :group 'org-edit-structure
   :type 'boolean)
 
-(defcustom org-edit-src-content-indentation 2
+(defcustom org-src-content-indentation 2
   "Indentation for the content of a source code block.
 
 This should be the number of spaces added to the indentation of the #+begin
 line in order to compute the indentation of the block content after
 editing it with `\\[org-edit-src-code]'.
 
+This customization also affects how the source code and example blocks
+are printed - when interpreting Org AST (during export), during
+detangling, and indentation.
+
 It has no effect if `org-src-preserve-indentation' is non-nil."
   :group 'org-edit-structure
   :type 'integer
@@ -220,7 +223,7 @@ The shells are associated with `sh-mode'."
     ("cpp" . c++)
     ("ditaa" . artist)
     ("desktop" . conf-desktop)
-    ("dot" . fundamental)
+    ("dot" . graphviz-dot)
     ("elisp" . emacs-lisp)
     ("ocaml" . tuareg)
     ("screen" . shell-script)
@@ -238,11 +241,12 @@ not the case, this variable provides a way to simplify things on
 the user side.  For example, there is no `ocaml-mode' in Emacs,
 but the mode to use is `tuareg-mode'."
   :group 'org-edit-structure
-  :package-version '(Org . "9.7")
+  :package-version '(Org . "9.8")
   :type '(repeat
 	  (cons
 	   (string :tag "Language name")
-	   (symbol :tag "Major mode"))))
+	   (symbol :tag "Major mode")))
+  :safe #'listp)
 
 (defcustom org-src-block-faces nil
   "Alist of faces to be used for source-block.
@@ -339,10 +343,14 @@ Return nil if there is no such buffer."
     (dolist (b (buffer-list))
       (with-current-buffer b
 	(and (org-src-edit-buffer-p)
-	     (= beg org-src--beg-marker)
 	     (eq (marker-buffer beg) (marker-buffer org-src--beg-marker))
-	     (= end org-src--end-marker)
 	     (eq (marker-buffer end) (marker-buffer org-src--end-marker))
+             ;; Do it after comparing buffers.  In some scenarios
+             ;; (namely, when Org buffer is generated as a copy and
+             ;; the source buffer gets killed), these markers may
+             ;; point nowhere making `=' throw an error.
+	     (= beg org-src--beg-marker)
+	     (= end org-src--end-marker)
 	     (throw 'exit b))))))
 
 (defun org-src--coordinates (pos beg end)
@@ -585,7 +593,7 @@ Leave point in edit buffer."
                             (org--get-expected-indentation
                              (org-element-parent datum) nil))
                            (t (org-current-text-indentation)))))
-	     (content-ind org-edit-src-content-indentation)
+	     (content-ind org-src-content-indentation)
 	     (preserve-ind (org-src-preserve-indentation-p datum))
 	     ;; Store relative positions of mark (if any) and point
 	     ;; within the edited area.
@@ -605,7 +613,10 @@ Leave point in edit buffer."
 	;; Insert contents.
 	(insert contents)
 	(remove-text-properties (point-min) (point-max)
-				'(display nil invisible nil intangible nil))
+				'( display nil
+                                   invisible nil
+                                   intangible nil
+                                   syntax-table nil ))
 	(let ((lf (eq type 'latex-fragment)))
           (unless preserve-ind (org-do-remove-indentation (and lf block-ind) lf)))
 	(set-buffer-modified-p nil)
@@ -665,96 +676,107 @@ Leave point in edit buffer."
   "Fontify code block between START and END using LANG's syntax.
 This function is called by Emacs's automatic fontification, as long
 as `org-src-fontify-natively' is non-nil."
-  (let ((modified (buffer-modified-p))
-        (native-tab-width tab-width))
+  (let ((modified (buffer-modified-p)) native-tab-width)
     (remove-text-properties start end '(face nil))
-    (let ((lang-mode (org-src-get-lang-mode lang)))
-      (when (fboundp lang-mode)
-        (let ((string (buffer-substring-no-properties start end))
-	      (org-buffer (current-buffer)))
-	  (with-current-buffer
-	      (get-buffer-create
-	       (format " *org-src-fontification:%s*" lang-mode))
-	    (let ((inhibit-modification-hooks nil))
-	      (erase-buffer)
-	      ;; Add string and a final space to ensure property change.
-	      (insert string " "))
-	    (unless (eq major-mode lang-mode) (funcall lang-mode))
-            (setq native-tab-width tab-width)
-            (font-lock-ensure)
-	    (let ((pos (point-min)) next
-	          ;; Difference between positions here and in org-buffer.
-	          (offset (- start (point-min))))
-	      (while (setq next (next-property-change pos))
-	        ;; Handle additional properties from font-lock, so as to
-	        ;; preserve, e.g., composition.
-                ;; FIXME: We copy 'font-lock-face property explicitly because
-                ;; `font-lock-mode' is not enabled in the buffers starting from
-                ;; space and the remapping between 'font-lock-face and 'face
-                ;; text properties may thus not be set.  See commit
-                ;; 453d634bc.
-	        (dolist (prop (append '(font-lock-face face) font-lock-extra-managed-props))
-		  (let ((new-prop (get-text-property pos prop)))
-                    (when new-prop
-                      (if (not (eq prop 'invisible))
-		          (put-text-property
-		           (+ offset pos) (+ offset next) prop new-prop
-		           org-buffer)
-                        ;; Special case.  `invisible' text property may
-                        ;; clash with Org folding.  Do not assign
-                        ;; `invisible' text property directly.  Use
-                        ;; property alias instead.
-                        (let ((invisibility-spec
-                               (or
-                                ;; ATOM spec.
-                                (and (memq new-prop buffer-invisibility-spec)
-                                     new-prop)
-                                ;; (ATOM . ELLIPSIS) spec.
-                                (assq new-prop buffer-invisibility-spec))))
-                          (with-current-buffer org-buffer
-                            ;; Add new property alias.
-                            (unless (memq 'org-src-invisible
-                                          (cdr (assq 'invisible char-property-alias-alist)))
-                              (setq-local
-                               char-property-alias-alist
-                               (cons (cons 'invisible
-			                   (nconc (cdr (assq 'invisible char-property-alias-alist))
-                                                  '(org-src-invisible)))
-		                     (remove (assq 'invisible char-property-alias-alist)
-			                     char-property-alias-alist))))
-                            ;; Carry over the invisibility spec, unless
-                            ;; already present.  Note that there might
-                            ;; be conflicting invisibility specs from
-                            ;; different major modes.  We cannot do much
-                            ;; about this then.
-                            (when invisibility-spec
-                              (add-to-invisibility-spec invisibility-spec))
-                            (put-text-property
-		             (+ offset pos) (+ offset next)
-                             'org-src-invisible new-prop
-		             org-buffer)))))))
-	        (setq pos next)))
-            (set-buffer-modified-p nil)))))
+    (when-let* ((lang-mode (org-src-get-lang-mode-if-bound lang)))
+      (condition-case nil
+          (let ((string (buffer-substring-no-properties start end))
+	        (org-buffer (current-buffer)))
+	    (with-current-buffer
+	        (get-buffer-create
+	         (format " *org-src-fontification:%s*" lang-mode))
+	      (let ((inhibit-modification-hooks nil))
+	        (erase-buffer)
+	        ;; Add string and a final space to ensure property change.
+	        (insert string " "))
+	      (unless (eq major-mode lang-mode) (funcall lang-mode))
+              (setq native-tab-width tab-width)
+              (font-lock-ensure)
+	      (let ((pos (point-min)) next
+	            ;; Difference between positions here and in org-buffer.
+	            (offset (- start (point-min))))
+	        (while (setq next (next-property-change pos))
+	          ;; Handle additional properties from font-lock, so as to
+	          ;; preserve, e.g., composition.
+                  ;; FIXME: We copy 'font-lock-face property explicitly because
+                  ;; `font-lock-mode' is not enabled in the buffers starting from
+                  ;; space and the remapping between 'font-lock-face and 'face
+                  ;; text properties may thus not be set.  See commit
+                  ;; 453d634bc.
+	          (dolist (prop (append '(font-lock-face face syntax-table) font-lock-extra-managed-props))
+		    (let ((new-prop (get-text-property pos prop)))
+                      (when new-prop
+                        (if (not (eq prop 'invisible))
+		            (put-text-property
+		             (+ offset pos) (+ offset next) prop new-prop
+		             org-buffer)
+                          ;; Special case.  `invisible' text property may
+                          ;; clash with Org folding.  Do not assign
+                          ;; `invisible' text property directly.  Use
+                          ;; property alias instead.
+                          (let ((invisibility-spec
+                                 (or
+                                  ;; ATOM spec.
+                                  (and (memq new-prop buffer-invisibility-spec)
+                                       new-prop)
+                                  ;; (ATOM . ELLIPSIS) spec.
+                                  (assq new-prop buffer-invisibility-spec))))
+                            (with-current-buffer org-buffer
+                              ;; Add new property alias.
+                              (unless (memq 'org-src-invisible
+                                            (cdr (assq 'invisible char-property-alias-alist)))
+                                (setq-local
+                                 char-property-alias-alist
+                                 (cons (cons 'invisible
+			                     (nconc (cdr (assq 'invisible char-property-alias-alist))
+                                                    '(org-src-invisible)))
+		                       (remove (assq 'invisible char-property-alias-alist)
+			                       char-property-alias-alist))))
+                              ;; Carry over the invisibility spec, unless
+                              ;; already present.  Note that there might
+                              ;; be conflicting invisibility specs from
+                              ;; different major modes.  We cannot do much
+                              ;; about this then.
+                              (when invisibility-spec
+                                (add-to-invisibility-spec invisibility-spec))
+                              (put-text-property
+		               (+ offset pos) (+ offset next)
+                               'org-src-invisible new-prop
+		               org-buffer)))))))
+	          (setq pos next)))
+              (let ((new-table (syntax-table)))
+                (alter-text-property
+                 start end 'syntax-table
+                 (lambda (old-table) (or old-table new-table))
+                 org-buffer))
+              (set-buffer-modified-p nil)))
+        (error
+         (message "Native code fontification error in %S at pos%d\n Error: %S"
+                  (current-buffer) start
+                  (when (and (fboundp 'backtrace-get-frames)
+                             (fboundp 'backtrace-to-string))
+                    (backtrace-to-string (backtrace-get-frames 'backtrace)))))))
     ;; Add Org faces.
     (let ((src-face (nth 1 (assoc-string lang org-src-block-faces t))))
       (when (or (facep src-face) (listp src-face))
         (font-lock-append-text-property start end 'face src-face))
       (font-lock-append-text-property start end 'face 'org-block))
     ;; Display native tab indentation characters as spaces
-    (save-excursion
-      (goto-char start)
-      (let ((indent-offset
-	     (if (org-src-preserve-indentation-p) 0
-	       (+ (progn (backward-char)
-                         (org-current-text-indentation))
-	          org-edit-src-content-indentation))))
-        (while (re-search-forward "^[ ]*\t" end t)
-          (let* ((b (and (eq indent-offset (move-to-column indent-offset))
-                         (point)))
-                 (e (progn (skip-chars-forward "\t") (point)))
-                 (s (and b (make-string (* (- e b) native-tab-width) ? ))))
-            (when (and b (< b e)) (add-text-properties b e `(display ,s)))
-            (forward-char)))))
+    (when native-tab-width
+      (save-excursion
+        (goto-char start)
+        (let ((indent-offset
+	       (if (org-src-preserve-indentation-p) 0
+	         (+ (progn (backward-char)
+                           (org-current-text-indentation))
+	            org-src-content-indentation))))
+          (while (re-search-forward "^[ ]*\t" end t)
+            (let* ((b (and (eq indent-offset (move-to-column indent-offset))
+                           (point)))
+                   (e (progn (skip-chars-forward "\t") (point)))
+                   (s (and b (make-string (* (- e b) native-tab-width) ? ))))
+              (when (and b (< b e)) (add-text-properties b e `(display ,s)))
+              (forward-char))))))
     (add-text-properties
      start end
      '(font-lock-fontified t fontified t font-lock-multiline t))
@@ -970,12 +992,31 @@ Org-babel commands."
 
 (defun org-src-get-lang-mode (lang)
   "Return major mode that should be used for LANG.
-LANG is a string, and the returned major mode is a symbol."
-  (intern
-   (concat
-    (let ((l (or (cdr (assoc lang org-src-lang-modes)) lang)))
-      (if (symbolp l) (symbol-name l) l))
-    "-mode")))
+LANG is a string, and the returned value is a symbol."
+  (let ((mode (intern
+               (concat
+                (let ((l (or (cdr (assoc lang org-src-lang-modes)) lang)))
+                  (if (symbolp l) (symbol-name l) l))
+                "-mode"))))
+    (cond
+     ((fboundp 'major-mode-remap) (major-mode-remap mode))
+     ((boundp 'major-mode-remap-alist)
+      (or (cdr (assq mode major-mode-remap-alist)) mode))
+     (t mode))))
+
+(defun org-src-get-lang-mode-if-bound (lang &optional fallback fallback-message-p)
+  "Return major mode for LANG, if bound, and FALLBACK otherwise.
+LANG is a string.  FALLBACK and the returned value are both symbols.  If
+FALLBACK-MESSAGE-P and FALLBACK are both non-nil, display a message when
+falling back to a major mode different from that for LANG."
+  (let ((mode (org-src-get-lang-mode lang)))
+    (if (functionp mode)
+        mode
+      (when (and fallback
+                 fallback-message-p
+                 (not (eq fallback mode)))
+        (message "%s not available, falling back to %s" mode fallback))
+      fallback)))
 
 (defun org-src-edit-buffer-p (&optional buffer)
   "Non-nil when current buffer is a source editing buffer.
@@ -1236,16 +1277,21 @@ Throw an error when not at an export block."
     (unless (and (org-element-type-p element 'export-block)
 		 (org-src--on-datum-p element))
       (user-error "Not in an export block"))
-    (let* ((type (downcase (or (org-element-property :type element)
-			       ;; Missing export-block type.  Fallback
-			       ;; to default mode.
-			       "fundamental")))
-	   (mode (org-src-get-lang-mode type)))
-      (unless (functionp mode) (error "No such language mode: %s" mode))
+    (let* ((lang-f-fallback #'fundamental-mode)
+           (lang (or (if-let* ((lang
+                                (org-element-property :type element)))
+                         (downcase lang))
+                     (replace-regexp-in-string
+                      "-mode$" ""
+                      (symbol-name lang-f-fallback))))
+	   (lang-f (org-src-get-lang-mode-if-bound
+                    lang
+                    lang-f-fallback
+                    t)))
       (org-src--edit-element
        element
-       (org-src--construct-edit-buffer-name (buffer-name) type)
-       mode
+       (org-src--construct-edit-buffer-name (buffer-name) lang)
+       lang-f
        (lambda () (org-escape-code-in-region (point-min) (point-max)))))
     t))
 
@@ -1282,8 +1328,9 @@ original code in the Org buffer, and replace it with the edited
 version.  See `org-src-window-setup' to configure the display of
 windows containing the Org buffer and the code buffer.
 
-When optional argument CODE is a string, edit it in a dedicated
-buffer instead.
+When optional argument CODE is a string, edit it in a read-only buffer
+instead.  The contents of that buffer will *not* be written back to
+the source of example block at point.
 
 When optional argument EDIT-BUFFER-NAME is non-nil, use it as the
 name of the sub-editing buffer."
@@ -1296,12 +1343,12 @@ name of the sub-editing buffer."
     (let* ((lang
 	    (if (eq type 'src-block) (org-element-property :language element)
 	      "example"))
-	   (lang-f (and (eq type 'src-block) (org-src-get-lang-mode lang)))
+	   (lang-f (and (eq type 'src-block)
+                        (org-src-get-lang-mode-if-bound
+                         lang #'fundamental-mode lang)))
 	   (babel-info (and (eq type 'src-block)
 			    (org-babel-get-src-block-info 'no-eval)))
 	   deactivate-mark)
-      (when (and (eq type 'src-block) (not (functionp lang-f)))
-	(error "No such language mode: %s" lang-f))
       (org-src--edit-element
        element
        (or edit-buffer-name
@@ -1331,10 +1378,9 @@ name of the sub-editing buffer."
 		 (org-src--on-datum-p context))
       (user-error "Not on inline source code"))
     (let* ((lang (org-element-property :language context))
-	   (lang-f (org-src-get-lang-mode lang))
+           (lang-f (org-src-get-lang-mode-if-bound lang #'fundamental-mode t))
 	   (babel-info (org-babel-get-src-block-info 'no-eval))
 	   deactivate-mark)
-      (unless (functionp lang-f) (error "No such language mode: %s" lang-f))
       (org-src--edit-element
        context
        (org-src--construct-edit-buffer-name (buffer-name) lang)
@@ -1409,15 +1455,22 @@ EVENT is passed to `mouse-set-point'."
 	(overlay org-src--overlay))
     (org-src--contents-for-write-back write-back-buf)
     (with-current-buffer (org-src-source-buffer)
+      ;; Note: be careful to not move point here to make sure that
+      ;; point motion does not get recorded into the undo list,
+      ;; leading to unexpected results.
+      ;; https://orgmode.org/list/XF_7mLNCUN8XKtnd7G-NUoAF5Vq0DDafaDdF0v53eFlhQ35N-H3bPA0VkYyDrbEWE-0PEQg8iiyB7NatUtvPEQe6SQyJaTE5vW0CwoUKzqs=@proton.me
       (undo-boundary)
-      (goto-char beg)
       ;; Temporarily disable read-only features of OVERLAY in order to
       ;; insert new contents.
       (delete-overlay overlay)
-      (let ((expecting-bol (bolp)))
-        (goto-char end)
-        (org-replace-region-contents beg end write-back-buf 0.1 nil)
-        (cl-assert (= (point) (+ beg (buffer-size write-back-buf))))
+      (let ((expecting-bol (save-excursion (goto-char beg) (bolp))))
+	(if (version< emacs-version "27.1")
+	    (progn (delete-region beg end)
+		   (insert (with-current-buffer write-back-buf (buffer-string))))
+	  (save-restriction
+	    (narrow-to-region beg end)
+	    (org-replace-buffer-contents write-back-buf 0.1 nil)
+	    (goto-char (point-max))))
 	(when (and expecting-bol (not (bolp))) (insert "\n")))
       (kill-buffer write-back-buf)
       (save-buffer)
@@ -1453,14 +1506,22 @@ EVENT is passed to `mouse-set-point'."
     (org-with-wide-buffer
      (when (and write-back
                 (not (equal (buffer-substring beg end)
-			    (with-current-buffer write-back-buf
-                              (buffer-string)))))
+			  (with-current-buffer write-back-buf
+                            (buffer-string)))))
+       ;; Note: be careful to not move point here to make sure that
+       ;; point motion does not get recorded into the undo list,
+       ;; leading to unexpected results.
+       ;; https://orgmode.org/list/XF_7mLNCUN8XKtnd7G-NUoAF5Vq0DDafaDdF0v53eFlhQ35N-H3bPA0VkYyDrbEWE-0PEQg8iiyB7NatUtvPEQe6SQyJaTE5vW0CwoUKzqs=@proton.me
        (undo-boundary)
-       (goto-char beg)
-       (let ((expecting-bol (bolp)))
-         (goto-char end)
-         (org-replace-region-contents beg end write-back-buf 0.1 nil)
-         (cl-assert (= (point) (+ beg (buffer-size write-back-buf))))
+       (let ((expecting-bol (save-excursion (goto-char beg) (bolp))))
+	 (if (version< emacs-version "27.1")
+	     (progn (delete-region beg end)
+		    (insert (with-current-buffer write-back-buf
+                              (buffer-string))))
+	   (save-restriction
+	     (narrow-to-region beg end)
+	     (org-replace-buffer-contents write-back-buf 0.1 nil)
+	     (goto-char (point-max))))
 	 (when (and expecting-bol (not (bolp))) (insert "\n")))))
     (when write-back-buf (kill-buffer write-back-buf))
     ;; If we are to return to source buffer, put point at an
@@ -1470,7 +1531,7 @@ EVENT is passed to `mouse-set-point'."
       (goto-char beg)
       (cond
        ;; Block is hidden; move at start of block.
-       ((org-fold-folded-p nil 'block) (forward-line -1))
+       ((org-invisible-p) (forward-line -1))
        (write-back (org-src--goto-coordinates coordinates beg end))))
     ;; Clean up left-over markers and restore window configuration.
     (set-marker beg nil)
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index f0d293be227..ba33f6724a0 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -44,42 +44,32 @@
 (require 'org-fold-core)
 
 (declare-function calc-eval "calc" (str &optional separator &rest args))
-(declare-function face-remap-remove-relative "face-remap" (cookie))
-(declare-function face-remap-add-relative "face-remap" (face &rest specs))
-(declare-function org-at-timestamp-p "org" (&optional extended))
 (declare-function org-delete-backward-char "org" (N))
 (declare-function org-mode "org" ())
-(declare-function org-duration-p "org-duration" (duration &optional canonical))
+(declare-function org-duration-p "org-duration" (duration))
 (declare-function org-duration-to-minutes "org-duration" (duration &optional canonical))
 (declare-function org-element-at-point "org-element" (&optional pom cached-only))
 (declare-function org-element-contents "org-element-ast" (node))
 (declare-function org-element-extract "org-element-ast" (node))
 (declare-function org-element-interpret-data "org-element" (data))
 (declare-function org-element-lineage "org-element-ast" (blob &optional types with-self))
-(declare-function org-element-map "org-element" (data types fun &optional info first-match no-recursion with-affiliated))
-(declare-function org-element-parse-buffer "org-element" (&optional granularity visible-only keep-deferred))
+(declare-function org-element-map "org-element" (data types fun &optional info first-match no-recursion with-affiliated no-undefer))
 (declare-function org-element-property "org-element-ast" (property node))
 (declare-function org-element-end "org-element" (node))
 (declare-function org-element-post-affiliated "org-element" (node))
 (declare-function org-element-type-p "org-element-ast" (node types))
-(declare-function org-element-cache-reset "org-element" (&optional all no-persistence))
 (declare-function org-entry-get "org" (pom property &optional inherit literal-nil))
 (declare-function org-export-create-backend "ox" (&rest rest) t)
 (declare-function org-export-data-with-backend "ox" (data backend info))
-(declare-function org-export-filter-apply-functions "ox" (filters value info))
-(declare-function org-export-first-sibling-p "ox" (blob info))
 (declare-function org-export-get-backend "ox" (name))
-(declare-function org-export-get-environment "ox" (&optional backend subtreep ext-plist))
-(declare-function org-export-install-filters "ox" (info))
 (declare-function org-export-table-has-special-column-p "ox" (table))
-(declare-function org-export-table-row-is-special-p "ox" (table-row info))
 (declare-function org-forward-paragraph "org" (&optional arg))
 (declare-function org-id-find "org-id" (id &optional markerp))
 (declare-function org-indent-line "org" ())
 (declare-function org-load-modules-maybe "org" (&optional force))
 (declare-function org-restart-font-lock "org" ())
 (declare-function org-sort-remove-invisible "org" (s))
-(declare-function org-time-stamp-format "org" (&optional long inactive))
+(declare-function org-time-stamp-format "org" (&optional long inactive custom))
 (declare-function org-time-string-to-absolute "org" (s &optional daynr prefer buffer pos))
 (declare-function org-time-string-to-time "org" (s))
 (declare-function org-timestamp-up-day "org" (&optional arg))
@@ -344,11 +334,11 @@ The `U' flag in a table formula will select this specific format for
 a single formula."
   :group 'org-table-calculation
   :version "24.1"
-  :type '(choice (symbol :tag "Seconds" 'seconds)
-		 (symbol :tag "Minutes" 'minutes)
-		 (symbol :tag "Hours  " 'hours)
-		 (symbol :tag "Days   " 'days)
-		 (symbol :tag "HH:MM  " 'hh:mm)))
+  :type '(choice (const :tag "Seconds" seconds)
+		 (const :tag "Minutes" minutes)
+		 (const :tag "Hours  " hours)
+		 (const :tag "Days   " days)
+		 (const :tag "HH:MM  " hh:mm)))
 
 (defcustom org-table-duration-hour-zero-padding t
   "Non-nil means hours in table duration computations should be zero-padded.
@@ -521,7 +511,7 @@ This may be useful when columns have been shrunk."
 (define-minor-mode org-table-header-line-mode
   "Display the first row of the table at point in the header line."
   :lighter " TblHeader"
-  (unless (eq major-mode 'org-mode)
+  (unless (derived-mode-p 'org-mode)
     (user-error "Cannot turn org table header mode outside org-mode buffers"))
   (if org-table-header-line-mode
       (add-hook 'post-command-hook #'org-table-header-set-header nil t)
@@ -586,7 +576,7 @@ This works for both table types.")
   "Match a reference that needs translation, for reference display.")
 
 (defconst org-table--separator-space-pre
-  (propertize " " 'display '(space :relative-width 1))
+  (propertize " " 'display '(space :relative-width 1) 'rear-nonsticky t)
   "Space used in front of fields when aligning the table.
 This space serves as a segment separator for the purposes of the
 bidirectional reordering.
@@ -929,8 +919,8 @@ nil      When nil, the command tries to be smart and figure out the
 	  (cond
 	   ((looking-at "^") (insert "| "))
 	   ((looking-at "[ \t]*$") (replace-match " |") (forward-line 1))
-	   ((looking-at "[ \t]*\"\\([^\"\n]*\\)\"")
-	    (replace-match "\\1")
+	   ((looking-at "[ \t]*\"\\([^\"]*\\)\"")
+	    (replace-match (replace-regexp-in-string "\n" " " (match-string 1)) t t)
 	    (if (looking-at "\"") (insert "\"")))
 	   ((looking-at "[^,\n]+") (goto-char (match-end 0)))
 	   ((looking-at "[ \t]*,") (replace-match " | "))
@@ -1118,7 +1108,7 @@ Before doing so, re-align the table if necessary."
   (when (looking-at "| ?")
     (goto-char (match-end 0))))
 
-(defun org-table-beginning-of-field (&optional n)
+(defun org-table-beginning-of-field (n)
   "Move to the beginning of the current table field.
 If already at or before the beginning, move to the beginning of the
 previous field.
@@ -1134,7 +1124,7 @@ With numeric argument N, move N-1 fields backward first."
       (and (looking-at " ") (forward-char 1)))
     (when (>= (point) pos) (org-table-beginning-of-field 2))))
 
-(defun org-table-end-of-field (&optional n)
+(defun org-table-end-of-field (n)
   "Move to the end of the current table field.
 If already at or after the end, move to the end of the next table field.
 With numeric argument N, move N-1 fields forward first."
@@ -2966,139 +2956,141 @@ known that the table will be realigned a little later anyway."
 	   beg end eqlcol eqlfield)
       ;; Insert constants in all formulas.
       (when eqlist
-	(org-table-with-shrunk-columns
-	 (org-table-save-field
-	  ;; Expand equations, then split the equation list between
-	  ;; column formulas and field formulas.
-	  (dolist (eq eqlist)
-	    (let* ((rhs (org-table-formula-substitute-names
-			 (org-table-formula-handle-first/last-rc (cdr eq))))
-		   (old-lhs (car eq))
-		   (lhs
-		    (org-table-formula-handle-first/last-rc
-		     (cond
-		      ((string-match "\\`@-?I+" old-lhs)
-		       (user-error "Can't assign to hline relative reference"))
-		      ((string-match "\\`\\$[<>]" old-lhs)
-		       (let ((new (org-table-formula-handle-first/last-rc
-				   old-lhs)))
-			 (when (assoc new eqlist)
-			   (user-error "\"%s=\" formula tries to overwrite \
+        (org-fold-core-ignore-modifications
+	  (org-table-with-shrunk-columns
+	   (org-table-save-field
+	    ;; Expand equations, then split the equation list between
+	    ;; column formulas and field formulas.
+	    (dolist (eq eqlist)
+	      (let* ((rhs (org-table-formula-substitute-names
+			   (org-table-formula-handle-first/last-rc (cdr eq))))
+		     (old-lhs (car eq))
+		     (lhs
+		      (org-table-formula-handle-first/last-rc
+		       (cond
+		        ((string-match "\\`@-?I+" old-lhs)
+		         (user-error "Can't assign to hline relative reference"))
+		        ((string-match "\\`\\$[<>]" old-lhs)
+		         (let ((new (org-table-formula-handle-first/last-rc
+				     old-lhs)))
+			   (when (assoc new eqlist)
+			     (user-error "\"%s=\" formula tries to overwrite \
 existing formula for column %s"
-				       old-lhs
-				       new))
-			 new))
-		      (t old-lhs)))))
-	      (if (string-match-p "\\`\\$[0-9]+\\'" lhs)
-		  (push (cons lhs rhs) eqlcol)
-		(push (cons lhs rhs) eqlfield))))
-	  (setq eqlcol (nreverse eqlcol))
-	  ;; Expand ranges in lhs of formulas
-	  (setq eqlfield (org-table-expand-lhs-ranges (nreverse eqlfield)))
-	  ;; Get the correct line range to process.
-	  (if all
-	      (progn
-		(setq end (copy-marker (org-table-end)))
-		(goto-char (setq beg org-table-current-begin-pos))
-		(cond
-		 ((re-search-forward org-table-calculate-mark-regexp end t)
-		  ;; This is a table with marked lines, compute selected
-		  ;; lines.
-		  (setq line-re org-table-recalculate-regexp))
-		 ;; Move forward to the first non-header line.
-		 ((and (re-search-forward org-table-dataline-regexp end t)
-		       (re-search-forward org-table-hline-regexp end t)
-		       (re-search-forward org-table-dataline-regexp end t))
-		  (setq beg (match-beginning 0)))
-		 ;; Just leave BEG at the start of the table.
-		 (t nil)))
-	    (setq beg (line-beginning-position)
-		  end (copy-marker (line-beginning-position 2))))
-	  (goto-char beg)
-	  ;; Mark named fields untouchable.  Also check if several
-	  ;; field/range formulas try to set the same field.
-	  (remove-text-properties beg end '(:org-untouchable t))
-	  (let ((current-line (count-lines org-table-current-begin-pos
-					   (line-beginning-position)))
-		seen-fields)
-	    (dolist (eq eqlfield)
-	      (let* ((name (car eq))
-		     (location (assoc name org-table-named-field-locations))
-		     (eq-line (or (nth 1 location)
-				  (and (string-match "\\`@\\([0-9]+\\)" name)
-				       (aref org-table-dlines
-					     (string-to-number
-					      (match-string 1 name))))))
-		     (reference
-		      (if location
-			  ;; Turn field coordinates associated to NAME
-			  ;; into an absolute reference.
-			  (format "@%d$%d"
-				  (org-table-line-to-dline eq-line)
-				  (nth 2 location))
-			name)))
-		(when (member reference seen-fields)
-		  (user-error "Several field/range formulas try to set %s"
-			      reference))
-		(push reference seen-fields)
-		(when (or all (eq eq-line current-line))
-		  (org-table-goto-field name)
-		  (org-table-put-field-property :org-untouchable t)))))
-	  ;; Evaluate the column formulas, but skip fields covered by
-	  ;; field formulas.
-	  (goto-char beg)
-	  (while (re-search-forward line-re end t)
-	    (unless (string-match "\\` *[_^!$/] *\\'" (org-table-get-field 1))
-	      ;; Unprotected line, recalculate.
-	      (cl-incf cnt)
-	      (when all
-		(setq log-last-time
-		      (org-table-message-once-per-second
-		       log-last-time
-		       "Re-applying formulas to full table...(line %d)" cnt)))
-	      (if (markerp org-last-recalc-line)
-		  (move-marker org-last-recalc-line (line-beginning-position))
-		(setq org-last-recalc-line
-		      (copy-marker (line-beginning-position))))
-	      (dolist (entry eqlcol)
-		(goto-char org-last-recalc-line)
-		(org-table-goto-column
-		 (string-to-number (substring (car entry) 1)) nil 'force)
-		(unless (get-text-property (point) :org-untouchable)
-		  (org-table-eval-formula
-		   nil (cdr entry) 'noalign 'nocst 'nostore 'noanalysis)))))
-	  ;; Evaluate the field formulas.
-	  (dolist (eq eqlfield)
-	    (let ((reference (car eq))
-		  (formula (cdr eq)))
-	      (setq log-last-time
-		    (org-table-message-once-per-second
-		     (and all log-last-time)
-		     "Re-applying formula to field: %s" (car eq)))
-	      (org-table-goto-field
-	       reference
-	       ;; Possibly create a new column, as long as
-	       ;; `org-table-formula-create-columns' allows it.
-	       (let ((column-count (progn (end-of-line)
-					  (1- (org-table-current-column)))))
-		 (lambda (column)
-		   (when (> column 1000)
-		     (user-error "Formula column target too large"))
-		   (and (> column column-count)
-			(or (eq org-table-formula-create-columns t)
-			    (and (eq org-table-formula-create-columns 'warn)
-				 (progn
-				   (org-display-warning
-				    "Out-of-bounds formula added columns")
-				   t))
-			    (and (eq org-table-formula-create-columns 'prompt)
-				 (yes-or-no-p
-				  "Out-of-bounds formula.  Add columns? "))
-			    (user-error
-			     "Missing columns in the table.  Aborting"))))))
-	      (org-table-eval-formula nil formula t t t t)))
-	  ;; Clean up marker.
-	  (set-marker end nil)))
+				         old-lhs
+				         new))
+			   new))
+		        (t old-lhs)))))
+	        (if (string-match-p "\\`\\$[0-9]+\\'" lhs)
+		    (push (cons lhs rhs) eqlcol)
+		  (push (cons lhs rhs) eqlfield))))
+	    (setq eqlcol (nreverse eqlcol))
+	    ;; Expand ranges in lhs of formulas
+	    (setq eqlfield (org-table-expand-lhs-ranges (nreverse eqlfield)))
+	    ;; Get the correct line range to process.
+	    (if all
+	        (progn
+		  (setq end (copy-marker (org-table-end)))
+		  (goto-char (setq beg org-table-current-begin-pos))
+		  (cond
+		   ((re-search-forward org-table-calculate-mark-regexp end t)
+		    ;; This is a table with marked lines, compute selected
+		    ;; lines.
+		    (setq line-re org-table-recalculate-regexp))
+		   ;; Move forward to the first non-header line.
+		   ((and (re-search-forward org-table-dataline-regexp end t)
+		         (re-search-forward org-table-hline-regexp end t)
+		         (re-search-forward org-table-dataline-regexp end t))
+		    (setq beg (match-beginning 0)))
+		   ;; Just leave BEG at the start of the table.
+		   (t nil)))
+	      (setq beg (line-beginning-position)
+		    end (copy-marker (line-beginning-position 2))))
+            (org-combine-change-calls beg end
+	      (goto-char beg)
+	      ;; Mark named fields untouchable.  Also check if several
+	      ;; field/range formulas try to set the same field.
+	      (remove-text-properties beg end '(:org-untouchable t))
+	      (let ((current-line (count-lines org-table-current-begin-pos
+					       (line-beginning-position)))
+		    seen-fields)
+	        (dolist (eq eqlfield)
+	          (let* ((name (car eq))
+		         (location (assoc name org-table-named-field-locations))
+		         (eq-line (or (nth 1 location)
+				      (and (string-match "\\`@\\([0-9]+\\)" name)
+				           (aref org-table-dlines
+					         (string-to-number
+					          (match-string 1 name))))))
+		         (reference
+		          (if location
+			      ;; Turn field coordinates associated to NAME
+			      ;; into an absolute reference.
+			      (format "@%d$%d"
+				      (org-table-line-to-dline eq-line)
+				      (nth 2 location))
+			    name)))
+		    (when (member reference seen-fields)
+		      (user-error "Several field/range formulas try to set %s"
+			          reference))
+		    (push reference seen-fields)
+		    (when (or all (eq eq-line current-line))
+		      (org-table-goto-field name)
+		      (org-table-put-field-property :org-untouchable t)))))
+	      ;; Evaluate the column formulas, but skip fields covered by
+	      ;; field formulas.
+	      (goto-char beg)
+	      (while (re-search-forward line-re end t)
+	        (unless (string-match "\\` *[_^!$/] *\\'" (org-table-get-field 1))
+	          ;; Unprotected line, recalculate.
+	          (cl-incf cnt)
+	          (when all
+		    (setq log-last-time
+		          (org-table-message-once-per-second
+		           log-last-time
+		           "Re-applying formulas to full table...(line %d)" cnt)))
+	          (if (markerp org-last-recalc-line)
+		      (move-marker org-last-recalc-line (line-beginning-position))
+		    (setq org-last-recalc-line
+		          (copy-marker (line-beginning-position))))
+	          (dolist (entry eqlcol)
+		    (goto-char org-last-recalc-line)
+		    (org-table-goto-column
+		     (string-to-number (substring (car entry) 1)) nil 'force)
+		    (unless (get-text-property (point) :org-untouchable)
+		      (org-table-eval-formula
+		       nil (cdr entry) 'noalign 'nocst 'nostore 'noanalysis)))))
+	      ;; Evaluate the field formulas.
+	      (dolist (eq eqlfield)
+	        (let ((reference (car eq))
+		      (formula (cdr eq)))
+	          (setq log-last-time
+		        (org-table-message-once-per-second
+		         (and all log-last-time)
+		         "Re-applying formula to field: %s" (car eq)))
+	          (org-table-goto-field
+	           reference
+	           ;; Possibly create a new column, as long as
+	           ;; `org-table-formula-create-columns' allows it.
+	           (let ((column-count (progn (end-of-line)
+					      (1- (org-table-current-column)))))
+		     (lambda (column)
+		       (when (> column 1000)
+		         (user-error "Formula column target too large"))
+		       (and (> column column-count)
+			    (or (eq org-table-formula-create-columns t)
+			        (and (eq org-table-formula-create-columns 'warn)
+				     (progn
+				       (org-display-warning
+				        "Out-of-bounds formula added columns")
+				       t))
+			        (and (eq org-table-formula-create-columns 'prompt)
+				     (yes-or-no-p
+				      "Out-of-bounds formula.  Add columns? "))
+			        (user-error
+			         "Missing columns in the table.  Aborting"))))))
+	          (org-table-eval-formula nil formula t t t t)))
+	      ;; Clean up marker.
+	      (set-marker end nil)))))
 	(unless noalign
 	  (when org-table-may-need-update (org-table-align))
 	  (when all
@@ -3142,7 +3134,7 @@ with the prefix ARG."
       ;; the way.
       (org-table-recalculate t t)
       (org-table-align))
-    t)))
+    t 'org)))
 
 ;;;###autoload
 (defun org-table-iterate-buffer-tables ()
@@ -3156,7 +3148,9 @@ with the prefix ARG."
      (catch 'exit
        (while (> i 0)
 	 (setq i (1- i))
-	 (org-table-map-tables (lambda () (org-table-recalculate t t)) t)
+	 (org-table-map-tables
+          (lambda () (org-table-recalculate t t))
+          t 'org)
 	 (if (equal checksum (setq c1 (md5 (buffer-string))))
 	     (progn
 	       (org-table-map-tables #'org-table-align t)
@@ -3323,8 +3317,8 @@ Parameters get priority."
     (org-defkey map [(shift right)] 'org-table-fedit-ref-right)
     (org-defkey map [(meta up)]     'org-table-fedit-scroll-down)
     (org-defkey map [(meta down)]   'org-table-fedit-scroll)
-    (org-defkey map [(meta tab)]    'lisp-complete-symbol)
-    (org-defkey map "\M-\C-i"       'lisp-complete-symbol)
+    (org-defkey map [(meta tab)]    'completion-at-point)
+    (org-defkey map "\M-\C-i"       'completion-at-point)
     (org-defkey map [(tab)]	    'org-table-fedit-lisp-indent)
     (org-defkey map "\C-i"	    'org-table-fedit-lisp-indent)
     (org-defkey map "\C-c\C-r" 'org-table-fedit-toggle-ref-type)
@@ -3338,7 +3332,7 @@ Parameters get priority."
     ["Abort" org-table-fedit-abort t]
     "--"
     ["Pretty-Print Lisp Formula" org-table-fedit-lisp-indent t]
-    ["Complete Lisp Symbol" lisp-complete-symbol t]
+    ["Complete Lisp Symbol" completion-at-point t]
     "--"
     "Shift Reference at Point"
     ["Up" org-table-fedit-ref-up t]
@@ -3397,6 +3391,9 @@ Parameters get priority."
       (setq-local org-table--fedit-source source)
       (setq-local org-window-configuration wc)
       (setq-local org-selected-window sel-win)
+      ;; Use completion from `emacs-lisp-mode'
+      (add-hook 'completion-at-point-functions
+                #'elisp-completion-at-point nil 'local)
       (use-local-map org-table-fedit-map)
       (add-hook 'post-command-hook #'org-table-fedit-post-command t t)
       (setq startline (org-current-line))
@@ -3427,7 +3424,7 @@ Edit formulas, finish with `\\[org-ctrl-c-ctrl-c]' or `\\[org-edit-special]'.  \
 See menu for more commands.")))))
 
 (defun org-table-fedit-post-command ()
-  (when (not (memq this-command '(lisp-complete-symbol)))
+  (when (not (memq this-command '(lisp-complete-symbol completion-at-point)))
     (let ((win (selected-window)))
       (save-excursion
 	(ignore-errors (org-table-show-reference))
@@ -4292,12 +4289,16 @@ beginning and end position of the current table."
 ;;; Generic Tools
 
 ;;;###autoload
-(defun org-table-map-tables (f &optional quietly)
-  "Apply function F to the start of all tables in the buffer."
+(defun org-table-map-tables (f &optional quietly type)
+  "Apply function F to the start of all tables in the buffer.
+When TYPE is non-nil, only consider Org tables of that type (symbol
+`org' or symbol `table.el'."
   (org-with-point-at 1
     (while (re-search-forward org-table-line-regexp nil t)
       (let ((table (org-element-lineage (org-element-at-point) 'table t)))
-	(when table
+	(when (and table
+                   (or (not type)
+                       (eq type (org-element-property :type table))))
 	  (unless quietly
 	    (message "Mapping tables: %d%%"
 		     (floor (* 100.0 (point)) (buffer-size))))
@@ -4375,11 +4376,12 @@ extension of the given file name, and finally on the variable
 	(user-error "TABLE_EXPORT_FORMAT invalid")))))
 
 ;;;###autoload
-(defun org-table--align-field (field width align)
+(defun org-table--align-field (field width align &optional field-width)
   "Format FIELD according to column WIDTH and alignment ALIGN.
 FIELD is a string.  WIDTH is a number.  ALIGN is either \"c\",
-\"l\" or\"r\"."
-  (let* ((spaces (- width (org-string-width field nil 'org-table)))
+\"l\" or\"r\".  If FIELD-WIDTH is non-nil, then it's used as
+FIELD's width.  Otherwise, it's calculated."
+  (let* ((spaces (- width (or field-width (org-string-width field nil 'org-table))))
 	 (prefix (pcase align
 		   ("l" "")
 		   ("r" (make-string spaces ?\s))
@@ -4408,7 +4410,16 @@ FIELD is a string.  WIDTH is a number.  ALIGN is either \"c\",
              (rows (remq 'hline table))
 	     (widths nil)
 	     (alignments nil)
-	     (columns-number 1))
+	     (columns-number 1)
+             (invisibility-spec (org-string-width-invisibility-spec))
+             (cell-width-cache (make-hash-table :test 'equal))
+             (get-or-compute-cell-width
+              (lambda (cell)
+                (or (gethash cell cell-width-cache)
+                    (puthash
+                     cell
+                     (org-string-width cell nil 'org-table invisibility-spec)
+                     cell-width-cache)))))
 	(if (null rows)
 	    ;; Table contains only horizontal rules.  Compute the
 	    ;; number of columns anyway, and choose an arbitrary width
@@ -4428,7 +4439,7 @@ FIELD is a string.  WIDTH is a number.  ALIGN is either \"c\",
 		  (non-empty 0))
 	      (dolist (row rows)
 		(let ((cell (or (nth i row) "")))
-		  (setq max-width (max max-width (org-string-width cell nil 'org-table)))
+		  (setq max-width (max max-width (funcall get-or-compute-cell-width cell)))
 		  (cond (fixed-align? nil)
 			((equal cell "") nil)
 			((string-match "\\`<\\([lrc]\\)[0-9]*>\\'" cell)
@@ -4451,32 +4462,40 @@ FIELD is a string.  WIDTH is a number.  ALIGN is either \"c\",
 	(setq org-table-last-column-widths widths)
 	;; Build new table rows.  Only replace rows that actually
 	;; changed.
-	(let ((rule (and (memq 'hline table)
-			 (mapconcat (lambda (w) (make-string (+ 2 w) ?-))
-				    widths
-				    "+")))
-              (indent (progn (looking-at "[ \t]*|") (match-string 0))))
-	  (dolist (row table)
-	    (let ((previous (buffer-substring (point) (line-end-position)))
-		  (new
-                   (concat indent
-		           (if (eq row 'hline) rule
-		             (let* ((offset (- columns-number (length row)))
-			            (fields (if (= 0 offset) row
-                                              ;; Add missing fields.
-				              (append row
-						      (make-list offset "")))))
-			       (mapconcat #'identity
-				          (cl-mapcar #'org-table--align-field
-					             fields
-					             widths
-					             alignments)
-				          "|")))
-		           "|")))
-	      (if (equal new previous)
-		  (forward-line)
-		(insert new "\n")
-		(delete-region (point) (line-beginning-position 2))))))
+        (org-fold-core-ignore-modifications
+          (org-combine-change-calls beg end
+	    (let ((rule (and (memq 'hline table)
+			     (mapconcat (lambda (w) (make-string (+ 2 w) ?-))
+				        widths
+				        "+")))
+                  (indent (progn (looking-at "[ \t]*|") (match-string 0))))
+	      (dolist (row table)
+	        (let ((previous (buffer-substring (point) (line-end-position)))
+		      (new
+                       (concat indent
+		               (if (eq row 'hline) rule
+		                 (let* ((offset (- columns-number (length row)))
+			                (fields (if (= 0 offset) row
+                                                  ;; Add missing fields.
+				                  (append row
+						          (make-list offset "")))))
+			           (mapconcat #'identity
+				              (cl-mapcar
+                                               (lambda (field width alignment)
+                                                 (org-table--align-field
+                                                  field
+                                                  width
+                                                  alignment
+                                                  (funcall get-or-compute-cell-width field)))
+					       fields
+					       widths
+					       alignments)
+				              "|")))
+		               "|")))
+	          (if (equal new previous)
+		      (forward-line)
+		    (insert new "\n")
+		    (delete-region (point) (line-beginning-position 2))))))))
 	(set-marker end nil)
 	(when org-table-overlay-coordinates (org-table-overlay-coordinates))
 	(setq org-table-may-need-update nil))))))
@@ -5653,6 +5672,42 @@ First element has index 0, or I0 if given."
     (insert txt)
     (goto-char pos)))
 
+(defun orgtbl--skip (ast _ info)
+  "Extract first X table rows from AST.
+X is taken from :skip property in INFO plist.
+Return the modified AST."
+  (when-let* ((skip (plist-get info :skip)))
+    (unless (wholenump skip) (user-error "Wrong :skip value"))
+    (let ((n 0))
+      (org-element-map ast 'table-row
+        (lambda (row)
+	  (if (>= n skip) t
+	    (org-element-extract row)
+	    (cl-incf n)
+	    nil))
+        nil t)))
+  ast)
+
+(defun orgtbl--skipcols (ast _ info)
+  "Extract first X table columns from AST.
+X is taken from :skipcols property in INFO plist.
+Special columns are always ignored.
+Return the modified AST."
+  (when-let* ((skipcols (plist-get info :skipcols)))
+    (unless (consp skipcols) (user-error "Wrong :skipcols value"))
+    (org-element-map ast 'table
+      (lambda (table)
+	(let ((specialp (org-export-table-has-special-column-p table)))
+	  (dolist (row (org-element-contents table))
+	    (when (eq (org-element-property :type row) 'standard)
+	      (let ((c 1))
+		(dolist (cell (nthcdr (if specialp 1 0)
+				      (org-element-contents row)))
+		  (when (memq c skipcols)
+		    (org-element-extract cell))
+		  (cl-incf c)))))))))
+  ast)
+
 ;;;###autoload
 (defun orgtbl-to-generic (table params)
   "Convert the `orgtbl-mode' TABLE to some other format.
@@ -5664,7 +5719,8 @@ a horizontal separator line, or a list of fields for that
 line.  PARAMS is a property list of parameters that can
 influence the conversion.
 
-Valid parameters are:
+Valid parameters are all the export options understood by the export
+backend and also:
 
 :backend, :raw
 
@@ -5773,84 +5829,55 @@ This may be either a string or a function of two arguments:
 	     ;; regular backend has a transcoder for them.  We
 	     ;; provide one so they are not ignored, but displayed
 	     ;; as-is instead.
-	     (macro . (lambda (m c i) (org-element-macro-interpreter m nil))))))
-	 data info)
+	     (macro . (lambda (m c i) (org-element-macro-interpreter m nil)))
+             ;; Only export the actual table.  Do nothing with the
+             ;; containing section regardless what backend think about
+             ;; it.  (It is somewhat like BODY-ONLY argument in
+             ;; `org-export-as', but skips not only transcoding the
+             ;; full document, but also section containing the table.
+             (section . (lambda (_ contents _) contents))))))
     ;; Store TABLE as Org syntax in DATA.  Tolerate non-string cells.
     ;; Initialize communication channel in INFO.
     (with-temp-buffer
+      (let ((standard-output (current-buffer)))
+	(dolist (e table)
+	  (cond ((eq e 'hline) (princ "|--\n"))
+		((consp e)
+		 (princ "| ") (dolist (c e) (princ c) (princ " |"))
+		 (princ "\n")))))
       (let ((org-inhibit-startup t)) (org-mode))
-      (org-fold-core-ignore-modifications
-        (let ((standard-output (current-buffer))
-	      (org-element-use-cache nil))
-	  (dolist (e table)
-	    (cond ((eq e 'hline) (princ "|--\n"))
-		  ((consp e)
-		   (princ "| ") (dolist (c e) (princ c) (princ " |"))
-		   (princ "\n")))))
-        (org-element-cache-reset)
-        ;; Add backend specific filters, but not user-defined ones.  In
-        ;; particular, make sure to call parse-tree filters on the
-        ;; table.
-        (setq info
-	      (let ((org-export-filters-alist nil))
-	        (org-export-install-filters
-	         (org-combine-plists
-		  (org-export-get-environment backend nil params)
-		  `(:back-end ,(org-export-get-backend backend))))))
-        (setq data
-	      (org-export-filter-apply-functions
-	       (plist-get info :filter-parse-tree)
-	       (org-element-map (org-element-parse-buffer) 'table
-	         #'identity nil t)
-	       info))
+      (defvar org-export-before-processing-functions) ; ox.el
+      (defvar org-export-process-citations) ; ox.el
+      (defvar org-export-expand-links) ; ox.el
+      (defvar org-export-filter-parse-tree-functions) ; ox.el
+      (defvar org-export-filters-alist) ; ox.el
+      (defvar org-export-replace-macros) ; ox.el
+      (declare-function
+       org-export-as "ox"
+       (backend &optional subtreep visible-only body-only ext-plist))
+      ;; We disable the usual pre-processing and post-processing,
+      ;; i.e., hooks, Babel code evaluation, and macro expansion.
+      ;; Only backend specific filters are retained.
+      ;; We _do not_ disable `org-export-filter-parse-tree-functions'
+      ;; (historically).
+      (let ((org-export-before-processing-functions nil)
+            (org-export-replace-macros nil)
+            (org-export-use-babel nil)
+            (org-export-before-parsing-functions nil)
+            (org-export-process-citations nil)
+            (org-export-expand-links nil)
+            (org-export-filter-parse-tree-functions
+             (append
+              '(orgtbl--skip orgtbl--skipcols)
+              org-export-filter-parse-tree-functions))
+            (org-export-filters-alist
+             '((:filter-parse-tree . org-export-filter-parse-tree-functions))))
+        (when (or (not backend) (plist-get params :raw)) (require 'ox-org))
         (when (and backend (symbolp backend) (not (org-export-get-backend backend)))
-          (user-error "Unknown :backend value"))))
-    (when (or (not backend) (plist-get info :raw)) (require 'ox-org))
-    ;; Handle :skip parameter.
-    (let ((skip (plist-get info :skip)))
-      (when skip
-	(unless (wholenump skip) (user-error "Wrong :skip value"))
-	(let ((n 0))
-	  (org-element-map data 'table-row
-	    (lambda (row)
-	      (if (>= n skip) t
-		(org-element-extract row)
-		(cl-incf n)
-		nil))
-	    nil t))))
-    ;; Handle :skipcols parameter.
-    (let ((skipcols (plist-get info :skipcols)))
-      (when skipcols
-	(unless (consp skipcols) (user-error "Wrong :skipcols value"))
-	(org-element-map data 'table
-	  (lambda (table)
-	    (let ((specialp (org-export-table-has-special-column-p table)))
-	      (dolist (row (org-element-contents table))
-		(when (eq (org-element-property :type row) 'standard)
-		  (let ((c 1))
-		    (dolist (cell (nthcdr (if specialp 1 0)
-					  (org-element-contents row)))
-		      (when (memq c skipcols)
-			(org-element-extract cell))
-		      (cl-incf c))))))))))
-    ;; Since we are going to export using a low-level mechanism,
-    ;; ignore special column and special rows manually.
-    (let ((special? (org-export-table-has-special-column-p data))
-	  ignore)
-      (org-element-map data (if special? '(table-cell table-row) 'table-row)
-	(lambda (datum)
-	  (when (if (org-element-type-p datum 'table-row)
-		    (org-export-table-row-is-special-p datum nil)
-		  (org-export-first-sibling-p datum nil))
-	    (push datum ignore))))
-      (setq info (plist-put info :ignore-list ignore)))
-    ;; We use a low-level mechanism to export DATA so as to skip all
-    ;; usual pre-processing and post-processing, i.e., hooks, Babel
-    ;; code evaluation, include keywords and macro expansion.  Only
-    ;; backend specific filters are retained.
-    (let ((output (org-export-data-with-backend data custom-backend info)))
-      ;; Remove final newline.
-      (if (org-string-nw-p output) (substring-no-properties output 0 -1) ""))))
+          (user-error "Unknown :backend value: %S" backend))
+        (let ((output (org-export-as custom-backend nil nil 'body-only params)))
+          ;; Remove final newline.
+          (if (org-string-nw-p output) (substring-no-properties output 0 -1) ""))))))
 
 (defun org-table--generic-apply (value name &optional with-cons &rest args)
   (cond ((null value) nil)
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el
index 52e6ced78fb..8c9df9d379f 100644
--- a/lisp/org/org-timer.el
+++ b/lisp/org/org-timer.el
@@ -41,8 +41,6 @@
 (require 'cl-lib)
 (require 'org-clock)
 
-(declare-function org-agenda-error "org-agenda" ())
-
 (defvar org-timer-start-time nil
   "Start time for the running timer.")
 
@@ -108,7 +106,8 @@ nil          current timer is not displayed"
   "Hook run after countdown timer is set.")
 
 (defvar org-timer-done-hook nil
-  "Hook run after countdown timer reaches zero.")
+  "Hook run after countdown timer reaches zero.
+The hook is run before the timer is actually stopped.")
 
 ;;;###autoload
 (defun org-timer-start (&optional offset)
@@ -426,7 +425,8 @@ using three \\[universal-argument] prefix arguments."
 	    org-timer-default-timer))
 	 (effort-minutes
           (cond ((derived-mode-p 'org-agenda-mode)
-                 (org-get-at-bol 'effort-minutes))
+                 (when-let* ((effort (org-get-at-bol 'effort-minutes)))
+                   (floor effort)))
                 ((derived-mode-p 'org-mode)
                  (let ((effort (org-entry-get nil org-effort-property)))
 	           (when (org-string-nw-p effort)
@@ -470,11 +470,11 @@ time is up."
         (sound org-clock-sound))
     (run-with-timer
      secs nil (lambda ()
-		(setq org-timer-countdown-timer nil
-		      org-timer-start-time nil)
-		(org-notify msg sound)
-		(org-timer-set-mode-line 'off)
-		(run-hooks 'org-timer-done-hook)))))
+	      (org-notify msg sound)
+	      (org-timer-set-mode-line 'off)
+	      (run-hooks 'org-timer-done-hook)
+              (setq org-timer-countdown-timer nil
+		    org-timer-start-time nil)))))
 
 (defun org-timer--get-timer-title ()
   "Construct timer title.
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 657d657d2ab..a62f9544fc2 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -5,13 +5,13 @@
 (defun org-release ()
   "The release version of Org.
 Inserted by installing Org mode or when a release is made."
-   (let ((org-release "9.7.11"))
+   (let ((org-release "9.8.1"))
      org-release))
 ;;;###autoload
 (defun org-git-version ()
   "The Git version of Org mode.
 Inserted by installing Org or when a release is made."
-   (let ((org-git-version "release_9.7.11"))
+   (let ((org-git-version "release_9.8.1"))
      org-git-version))
 
 (provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 433733537c5..d711687f4c9 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -4,12 +4,12 @@
 ;; Copyright (C) 2004-2026 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Maintainer: Bastien Guerry <bzg@gnu.org>
+;; Maintainer: Ihor Radchenko <yantar92@posteo.net>
 ;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
-;; Package-Requires: ((emacs "26.1"))
+;; Package-Requires: ((emacs "28.2"))
 
-;; Version: 9.7.11
+;; Version: 9.8.1
 
 ;; This file is part of GNU Emacs.
 ;;
@@ -71,10 +71,11 @@
 
 ;;;; Require other packages
 
-(require 'org-compat)
+(require 'org-macs)
 (org-assert-version)
 
 (require 'cl-lib)
+(require 'map)
 
 (eval-when-compile (require 'gnus-sum))
 
@@ -93,7 +94,7 @@
    (message "You need to run \"make\" or \"make autoloads\" from Org lisp directory")
    (sit-for 3)))
 
-(eval-and-compile (require 'org-macs))
+(require 'org-macs)
 (require 'org-compat)
 (require 'org-keys)
 (require 'ol)
@@ -122,6 +123,24 @@ sure that we are at the beginning of the line.")
   "Matches a headline, putting stars and text into groups.
 Stars are put in group 1 and the trimmed body in group 2.")
 
+(defvar org-priority-value-regexp "[A-Z]\\|[0-9]\\|[1-5][0-9]\\|6[0-4]"
+  "Regular expression matching valid priority values.
+The priority value must be a capital Latin
+alphabetic character, A through Z, or can be an integer value in the range 0
+through 64.")
+
+(defvar org-priority-regexp
+  (format ".*?\\(\\[#\\(%s\\)\\] ?\\)" org-priority-value-regexp)
+  "Regular expression matching the priority indicator.
+A priority indicator can be e.g. [#A] or [#1].
+The value of the priority cookie must be a capital Latin
+alphabetic character, A through Z, or can be an integer value in
+the range 0 through 64.
+This regular expression matches these groups:
+0 : the whole match, e.g. \"TODO [#A] Hack\"
+1 : the priority cookie, e.g. \"[#A]\"
+2 : the value of the priority cookie, e.g. \"A\".")
+
 (declare-function calendar-check-holidays "holidays" (date))
 (declare-function cdlatex-environment "ext:cdlatex" (environment item))
 (declare-function cdlatex-math-symbol "ext:cdlatex")
@@ -132,7 +151,6 @@ Stars are put in group 1 and the trimmed body in group 2.")
 (declare-function org-agenda-todo-yesterday "org-agenda" (&optional arg))
 (declare-function org-agenda-list "org-agenda" (&optional arg start-day span with-hour))
 (declare-function org-agenda-redo "org-agenda" (&optional all))
-(declare-function org-agenda-remove-restriction-lock "org-agenda" (&optional noupdate))
 (declare-function org-archive-subtree "org-archive" (&optional find-done))
 (declare-function org-archive-subtree-default "org-archive" ())
 (declare-function org-archive-to-archive-sibling "org-archive" ())
@@ -148,7 +166,6 @@ Stars are put in group 1 and the trimmed body in group 2.")
 (declare-function org-clock-get-last-clock-out-time "org-clock" ())
 (declare-function org-clock-goto "org-clock" (&optional select))
 (declare-function org-clock-in "org-clock" (&optional select start-time))
-(declare-function org-clock-in-last "org-clock" (&optional arg))
 (declare-function org-clock-out "org-clock" (&optional switch-to-state fail-quietly at-time))
 (declare-function org-clock-out-if-current "org-clock" ())
 (declare-function org-clock-remove-overlays "org-clock" (&optional beg end noremove))
@@ -165,24 +182,22 @@ Stars are put in group 1 and the trimmed body in group 2.")
 (declare-function org-duration-to-minutes "org-duration" (duration &optional canonical))
 (declare-function org-element-at-point "org-element" (&optional pom cached-only))
 (declare-function org-element-at-point-no-context "org-element" (&optional pom))
-(declare-function org-element-cache-refresh "org-element" (pos))
 (declare-function org-element-cache-reset "org-element" (&optional all no-persistence))
 (declare-function org-element-cache-map "org-element" (func &rest keys))
 (declare-function org-element-contents "org-element-ast" (node))
 (declare-function org-element-context "org-element" (&optional element))
-(declare-function org-element-copy "org-element-ast" (datum))
+(declare-function org-element-copy "org-element-ast" (datum &optional keep-contents))
 (declare-function org-element-create "org-element-ast" (type &optional props &rest children))
 (declare-function org-element-extract "org-element-ast" (node))
 (declare-function org-element-insert-before "org-element-ast" (node location))
 (declare-function org-element-interpret-data "org-element" (data))
-(declare-function org-element-keyword-parser "org-element" (limit affiliated))
 (declare-function org-element-lineage "org-element-ast" (blob &optional types with-self))
 (declare-function org-element-property-inherited "org-element-ast"
                   (property node &optional with-self accumulate literal-nil include-nil))
 (declare-function org-element-lineage-map "org-element-ast"
                   (datum fun &optional types with-self first-match))
 (declare-function org-element-link-parser "org-element" ())
-(declare-function org-element-map "org-element" (data types fun &optional info first-match no-recursion with-affiliated))
+(declare-function org-element-map "org-element" (data types fun &optional info first-match no-recursion with-affiliated no-undefer))
 (declare-function org-element-nested-p "org-element" (elem-a elem-b))
 (declare-function org-element-parse-buffer "org-element" (&optional granularity visible-only keep-deferred))
 (declare-function org-element-parse-secondary-string "org-element" (string restriction &optional parent))
@@ -206,11 +221,8 @@ Stars are put in group 1 and the trimmed body in group 2.")
 (declare-function org-feed-goto-inbox "org-feed" (feed))
 (declare-function org-feed-update-all "org-feed" ())
 (declare-function org-goto "org-goto" (&optional alternative-interface))
-(declare-function org-id-find-id-file "org-id" (id))
 (declare-function org-id-get-create "org-id" (&optional force))
-(declare-function org-inlinetask-at-task-p "org-inlinetask" ())
 (declare-function org-inlinetask-outline-regexp "org-inlinetask" ())
-(declare-function org-inlinetask-toggle-visibility "org-inlinetask" ())
 (declare-function org-latex-make-preamble "ox-latex" (info &optional template snippet?))
 (declare-function org-num-mode "org-num" (&optional arg))
 (declare-function org-plot/gnuplot "org-plot" (&optional params))
@@ -219,11 +231,8 @@ Stars are put in group 1 and the trimmed body in group 2.")
 (declare-function org-timer "org-timer" (&optional restart no-insert))
 (declare-function org-timer-item "org-timer" (&optional arg))
 (declare-function org-timer-pause-or-continue "org-timer" (&optional stop))
-(declare-function org-timer-set-timer "org-timer" (&optional opt))
 (declare-function org-timer-start "org-timer" (&optional offset))
-(declare-function org-timer-stop "org-timer" ())
 (declare-function org-toggle-archive-tag "org-archive" (&optional find-done))
-(declare-function org-update-radio-target-regexp "ol" ())
 
 (defvar org-agenda-buffer-name)
 (defvar org-element-paragraph-separate)
@@ -448,7 +457,16 @@ This one does not require the space after the date, so it can be used
 on a string that terminates immediately after the date.")
 
 (defconst org-ts-regexp1 "\\(\\([0-9]\\{4\\}\\)-\\([0-9]\\{2\\}\\)-\\([0-9]\\{2\\}\\)\\(?: *\\([^]+0-9>\r\n -]+\\)\\)?\\( \\([0-9]\\{1,2\\}\\):\\([0-9]\\{2\\}\\)\\)?\\)"
-  "Regular expression matching time strings for analysis.")
+  "Regular expression matching time strings for analysis.
+This regular expression provides the following groups:
+  1:   everything (required for embedding)
+   2:  year
+   3:  month
+   4:  day
+   5:  weekday name (optional)
+   6:  time part (optional)
+    7: hour
+    8: minute")
 
 (defconst org-ts-regexp2 (concat "<" org-ts-regexp1 "[^>\n]\\{0,16\\}>")
   "Regular expression matching time stamps, with groups.")
@@ -479,6 +497,13 @@ The time stamps may be either active or inactive.")
   "Regular expression for specifying repeated events.
 After a match, group 1 contains the repeat expression.")
 
+;; The weekday name "%a" is considered semi-optional in these formats,
+;; see https://list.orgmode.org/87fricxatw.fsf@localhost/.  It is
+;; "optional" because the `org-timestamp-*' functions work alright on
+;; weekday-less timestamps in paragraphs when one omits the "%a".  But
+;; it is only "semi"-optional since Org cannot process properly
+;; timestamps in CLOCK, DEADLINE, and SCHEDULED lines when one omits
+;; the "%a".
 (defvaralias 'org-time-stamp-formats 'org-timestamp-formats)
 (defconst org-timestamp-formats '("%Y-%m-%d %a" . "%Y-%m-%d %a %H:%M")
   "Formats for `format-time-string' which are used for time stamps.
@@ -632,14 +657,14 @@ Group 1 contains drawer's name or \"END\".")
 
 (defconst org-heading-keyword-regexp-format
   "^\\(\\*+\\)\\(?: +%s\\)\\(?: +\\(.*?\\)\\)?[ \t]*$"
-  "Printf format for a regexp matching a headline with some keyword.
+  "`format' string for a regexp matching a headline with some keyword.
 This regexp will match the headline of any node which has the
 exact keyword that is put into the format.  The keyword isn't in
 any group by default, but the stars and the body are.")
 
 (defconst org-heading-keyword-maybe-regexp-format
   "^\\(\\*+\\)\\(?: +%s\\)?\\(?: +\\(.*?\\)\\)?[ \t]*$"
-  "Printf format for a regexp matching a headline, possibly with some keyword.
+  "`format' string for a regexp matching a headline, possibly with some keyword.
 This regexp can match any headline with the specified keyword, or
 without a keyword.  The keyword isn't in any group by default,
 but the stars and the body are.")
@@ -649,16 +674,41 @@ but the stars and the body are.")
 An archived subtree does not open during visibility cycling, and does
 not contribute to the agenda listings.")
 
-(defconst org-tag-re "[[:alnum:]_@#%]+"
+(defconst org-tag--valid-char-set "[:alnum:]_@#%"
+  "Regex pattern representing the set of characters valid within a tag.
+This is the base pattern for tag matching regex.")
+
+(defconst org-tag--invalid-char-re
+  (format "[^%s]" org-tag--valid-char-set)
+  "Regexp matching a single character that's NOT a valid tag char.")
+
+(defconst org-tag-re (format "[%s]+" org-tag--valid-char-set)
   "Regexp matching a single tag.")
 
-(defconst org-tag-group-re "[ \t]+\\(:\\([[:alnum:]_@#%:]+\\):\\)[ \t]*$"
+(defconst org-tag--group-enclosed-re
+  (format "\\(:\\([%s:]+\\):\\)" org-tag--valid-char-set)
+  "Regex pattern for a colon-enclosed group of tags.
+The regexp does not match encosing spaces and tabs, e.g.,
+\":TAG1:TAG2:\".  Match group 1 stores the tags with the enclosing
+colons, and match group 2 stores the tags without the enclosing
+colons.  Built using `org-tag--valid-char-set' with the addition of the
+colon.")
+
+(defconst org-tag--group-optional-re
+  (concat "\\(?:[ \t]+" org-tag--group-enclosed-re "\\)?[ \t]*$")
+  "Regexp matching an optional tag group at the end of a line.
+Regexp includes leading and optional trailing spaces.  If a tag group
+is present, group 1 is the full tag group (with colons), group 2 is
+the tag content (without colons).")
+
+(defconst org-tag-group-re
+  (format "[ \t]+%s[ \t]*$" org-tag--group-enclosed-re)
   "Regexp matching the tag group at the end of a line, with leading spaces.
 Tags are stored in match group 1.  Match group 2 stores the tags
 without the enclosing colons.")
 
 (defconst org-tag-line-re
-  "^\\*+ \\(?:.*[ \t]\\)?\\(:\\([[:alnum:]_@#%:]+\\):\\)[ \t]*$"
+  (format "^\\*+ \\(?:.*[ \t]\\)?%s[ \t]*$" org-tag--group-enclosed-re)
   "Regexp matching tags in a headline.
 Tags are stored in match group 1.  Match group 2 stores the tags
 without the enclosing colons.")
@@ -674,7 +724,7 @@ An entry can be toggled between COMMENT and normal with
 ;;;; LaTeX Environments and Fragments
 
 (defconst org-latex-regexps
-  '(("begin" "^[ \t]*\\(\\\\begin{\\([a-zA-Z0-9\\*]+\\)\\(?:.\\|\n\\)+?\\\\end{\\2}\\)" 1 t)
+  '(("begin" "^[ \t]*\\(\\\\begin{\\([a-zA-Z0-9\\*]+\\)\\(?:.\\|\n\\)+?\\\\end{\\2}[ \t]*\n?\\)" 1 t)
     ;; ("$" "\\([ \t(]\\|^\\)\\(\\(\\([$]\\)\\([^ \t\n,.$].*?\\(\n.*?\\)\\{0,5\\}[^ \t\n,.$]\\)\\4\\)\\)\\([ \t.,?;:'\")]\\|$\\)" 2 nil)
     ("$1" "\\([^$]\\|^\\)\\(\\$[^ \t\r\n,;.$]\\$\\)\\(\\s.\\|\\s-\\|\\s(\\|\\s)\\|\\s\"\\|'\\|$\\)" 2 nil)
     ("$"  "\\([^$]\\|^\\)\\(\\(\\$\\([^ \t\n,;.$][^$\n\r]*?\\(\n[^$\n\r]*?\\)\\{0,2\\}[^ \t\n,.$]\\)\\$\\)\\)\\(\\s.\\|\\s-\\|\\s(\\|\\s)\\|\\s\"\\|'\\|$\\)" 2 nil)
@@ -915,11 +965,17 @@ depends on, if any."
 	      (const :tag "C  s5          Export buffer to s5 presentations" s5)
 	      (const :tag "C  taskjuggler Export buffer to TaskJuggler format" taskjuggler)))
 
-(eval-after-load 'ox
-  '(dolist (backend org-export-backends)
-     (condition-case-unless-debug nil (require (intern (format "ox-%s" backend)))
-       (error (message "Problems while trying to load export backend `%s'"
-		       backend)))))
+(defun org-load-export-backends (&optional force)
+  "Load all the export backends from `org-export-backends'.
+When FORCE, load backends even when ox is loaded."
+  (unless (and (featurep 'ox) (not force))
+    (require 'ox)
+    (dolist (backend org-export-backends)
+      (condition-case-unless-debug nil (require (intern (format "ox-%s" backend)))
+        (error (message "Problems while trying to load export backend `%s'"
+		        backend))))))
+
+(eval-after-load 'ox '(org-load-export-backends 'force))
 
 (defcustom org-support-shift-select nil
   "Non-nil means make shift-cursor commands select text when possible.
@@ -996,6 +1052,40 @@ equivalent option for agenda views."
   :group 'org-todo
   :group 'org-archive)
 
+(defcustom org-edit-keep-region
+  '((org-metaleft . t)
+    (org-metaright . t)
+    (org-metaup . t)
+    (org-metadown . t))
+  "Shall some Org editing commands keep region active?
+
+This variable can be nil, t, or an a list of entries like
+  (COMMAND-NAME . KEEP-REGION-P)"
+  :type '(choice
+          (const :tag "Keep region for all commands" t)
+          (const :tag "Never keep region" nil)
+          (alist
+           :key-type
+           (choice (const org-metaleft)
+                   (const org-metaright)
+                   (const org-metaup)
+                   (const org-metadown))
+           :value-type
+           (choice (const :tag "Keep region" t)
+                   (const :tag "Deactivate region" nil))))
+  :package-version '(Org . "9.8")
+  :group 'org-edit-structure
+  :safe #'always)
+
+(defun org--deactivate-mark ()
+  "Return non-nil when `this-command' should deactivate mark upon completion.
+Honor `org-edit-keep-region'.  Return nil by default, when
+`this-command' has no setting in `org-edit-keep-region'."
+  (pcase org-edit-keep-region
+    (`t nil)
+    (`nil t)
+    (_ (not (alist-get this-command org-edit-keep-region nil)))))
+
 (defgroup org-startup nil
   "Startup options Org uses when first visiting a file."
   :tag "Org Startup"
@@ -1160,14 +1250,22 @@ the following lines anywhere in the buffer:
   :package-version '(Org . "9.2")
   :safe #'booleanp)
 
-(defcustom org-startup-with-inline-images nil
+(defvaralias 'org-startup-with-inline-images
+  'org-startup-with-link-previews
   "Non-nil means show inline images when loading a new Org file.
 This can also be configured on a per-file basis by adding one of
 the following lines anywhere in the buffer:
    #+STARTUP: inlineimages
-   #+STARTUP: noinlineimages"
+   #+STARTUP: noinlineimages")
+
+(defcustom org-startup-with-link-previews nil
+  "Non-nil means show link previews when loading a new Org file.
+This can also be configured on a per-file basis by adding one of
+the following lines anywhere in the buffer:
+   #+STARTUP: linkpreviews
+   #+STARTUP: nolinkpreviews"
   :group 'org-startup
-  :version "24.1"
+  :version "29.4"
   :type 'boolean)
 
 (defcustom org-startup-with-latex-preview nil
@@ -1726,7 +1824,8 @@ make an intelligent decision whether to insert a blank line or not."
 (defcustom org-highlight-sparse-tree-matches t
   "Non-nil means highlight all matches that define a sparse tree.
 The highlights will automatically disappear the next time the buffer is
-changed by an edit command."
+changed by an edit command.
+Must be non-nil to traverse the sparse tree using `next-error'."
   :group 'org-sparse-trees
   :type 'boolean)
 
@@ -2379,7 +2478,6 @@ set a priority."
   :type 'boolean)
 
 (defvaralias 'org-highest-priority 'org-priority-highest)
-
 (defcustom org-priority-highest ?A
   "The highest priority of TODO items.
 
@@ -2397,9 +2495,10 @@ smaller than `org-priority-lowest': for example, if \"A\" is the
 highest priority, it is smaller than the lowest \"C\" priority:
 65 < 67."
   :group 'org-priorities
-  :type '(choice
-	  (character :tag "Character")
-	  (integer :tag "Integer (< 65)")))
+  :package-version '(Org . "9.8")
+  :type '( restricted-sexp :tag "Number 0-64 or uppercase character A-Z"
+           :match-alternatives ((lambda (val) (org-priority-valid-value-p val t))))
+  :safe #'integerp)
 
 (defvaralias 'org-lowest-priority 'org-priority-lowest)
 (defcustom org-priority-lowest ?C
@@ -2419,9 +2518,10 @@ than `org-priority-highest': for example, if \"C\" is the lowest
 priority, it is greater than the highest \"A\" priority: 67 >
 65."
   :group 'org-priorities
-  :type '(choice
-	  (character :tag "Character")
-	  (integer :tag "Integer (< 65)")))
+  :package-version '(Org . "9.8")
+  :type '( restricted-sexp :tag "Number 0-64 or uppercase character A-Z"
+           :match-alternatives ((lambda (val) (org-priority-valid-value-p val t))))
+  :safe #'integerp)
 
 (defvaralias 'org-default-priority 'org-priority-default)
 (defcustom org-priority-default ?B
@@ -2435,9 +2535,10 @@ in this range exclusive or inclusive to the range boundaries.  Else the
 first step refuses to set the default and the second will fall back on
 \(depending on the command used) the highest or lowest priority."
   :group 'org-priorities
-  :type '(choice
-	  (character :tag "Character")
-	  (integer :tag "Integer (< 65)")))
+  :package-version '(Org . "9.8")
+  :type '( restricted-sexp :tag "Number 0-64 or uppercase character A-Z"
+           :match-alternatives ((lambda (val) (org-priority-valid-value-p val t))))
+  :safe #'integerp)
 
 (defcustom org-priority-start-cycle-with-default t
   "Non-nil means start with default priority when starting to cycle.
@@ -2495,10 +2596,10 @@ of minutes to shift."
 	  (integer :tag "when modifying times")))
 
 ;; Normalize old customizations of this variable.
-(when (integerp org-timestamp-rounding-minutes)
-  (setq org-timestamp-rounding-minutes
-	(list org-timestamp-rounding-minutes
-	      org-timestamp-rounding-minutes)))
+(when (integerp org-time-stamp-rounding-minutes)
+  (setq org-time-stamp-rounding-minutes
+	(list org-time-stamp-rounding-minutes
+	      org-time-stamp-rounding-minutes)))
 
 (defcustom org-display-custom-times nil
   "Non-nil means overlay custom formats over all time stamps.
@@ -2521,13 +2622,16 @@ These are overlaid over the default ISO format if the variable
 end of the second format.  The custom formats are also honored by export
 commands, if custom time display is turned on at the time of export.
 
-This variable also affects how timestamps are exported.
+This variable also affects how timestamps are exported when
+`org-display-custom-times' is set.
 
-Leading \"<\" and trailing \">\" pair will be stripped from the format
-strings."
+Leading \"<\" or \"[\" and trailing \">\" or \"]\" pair will be
+stripped from the format strings in Emacs buffers.  The brackets
+will be preserved on export."
   :group 'org-time
-  :package-version '(Org . "9.6")
-  :type '(cons string string))
+  :package-version '(Org . "9.8")
+  :type '(cons string string)
+  :safe #'consp)
 
 (defun org-time-stamp-format (&optional with-time inactive custom)
   "Get timestamp format for a time string.
@@ -2540,20 +2644,23 @@ time.
 
 When optional argument INACTIVE is nil, format active timestamp.
 When `no-brackets', strip timestamp brackets.
+When `keep-format', keep as is.
 Otherwise, format inactive timestamp."
   (let ((format (funcall
                  (if with-time #'cdr #'car)
                  (if custom
                      org-timestamp-custom-formats
                    org-timestamp-formats))))
-    ;; Strip brackets, if any.
-    (when (or (and (string-prefix-p "<" format)
-                   (string-suffix-p ">" format))
-              (and (string-prefix-p "[" format)
-                   (string-suffix-p "]" format)))
-      (setq format (substring format 1 -1)))
+    (unless (eq inactive 'keep-format)
+      ;; Strip brackets, if any.
+      (when (or (and (string-prefix-p "<" format)
+                     (string-suffix-p ">" format))
+                (and (string-prefix-p "[" format)
+                     (string-suffix-p "]" format)))
+        (setq format (substring format 1 -1))))
     (pcase inactive
       (`no-brackets format)
+      (`keep-format format)
       (`nil (concat "<" format ">"))
       (_ (concat "[" format "]")))))
 
@@ -2949,13 +3056,33 @@ is better to limit inheritance to certain tags using the variables
 	  (const :tag "List them, indented with leading dots" indented)))
 
 (defcustom org-tags-sort-function nil
-  "When set, tags are sorted using this function as a comparator."
+  "When set, tags are sorted using this function as a comparator.
+When the value is nil, use default sorting order.  The default sorting
+is alphabetical, except in `org-set-tags' where no sorting is done by
+default.
+
+This can also be a list of functions.  To enable advanced sorting
+algorithms a special algorithm is used.  If a sorting function returns
+nil when comparing two tags, then it is tried again with the tags in the
+opposite order.  If the function once again returns nil, it is assumed
+that both tags are deemed equal and they will then be sorted by the next
+sort function in the list.
+
+A sort function can call `org-tag-sort' which will use the next sort
+function in the list.
+
+For an example of a function that uses this advanced sorting system, see
+`org-tags-sort-hierarchy'."
   :group 'org-tags
+  :package-version '(Org . "9.8")
   :type '(choice
-	  (const :tag "No sorting" nil)
+	  (const :tag "Default sorting" nil)
 	  (const :tag "Alphabetical" org-string<)
 	  (const :tag "Reverse alphabetical" org-string>)
-	  (function :tag "Custom function" nil)))
+          (const :tag "Sort by hierarchy" org-tags-sort-hierarchy)
+          (function :tag "Custom function" nil)
+          (repeat function))
+  :risky t)
 
 (defvar org-tags-history nil
   "History of minibuffer reads for tags.")
@@ -2995,7 +3122,7 @@ and the clock summary:
                    (let ((clocksum (org-clock-sum-current-item))
                          (effort (org-duration-to-minutes
                                    (org-entry-get (point) \"Effort\"))))
-                     (org-minutes-to-clocksum-string (- effort clocksum))))))"
+                     (org-duration-from-minutes (- effort clocksum))))))"
   :group 'org-properties
   :version "24.1"
   :type '(alist :key-type (string     :tag "Property")
@@ -3348,6 +3475,15 @@ All available processes and theirs documents can be found in
      :image-size-adjust (1.7 . 1.5)
      :latex-compiler ("latex -interaction nonstopmode -output-directory %o %f")
      :image-converter ("dvisvgm %f --no-fonts --exact-bbox --scale=%S --output=%O"))
+    (xelatex
+     :programs ("xelatex" "dvisvgm")
+     :description "xdv > svg"
+     :message "you need to install the programs: xelatex and dvisvgm."
+     :image-input-type "xdv"
+     :image-output-type "svg"
+     :image-size-adjust (1.7 . 1.5)
+     :latex-compiler ("xelatex -no-pdf -interaction nonstopmode -output-directory %o %f")
+     :image-converter ("dvisvgm %f --no-fonts --exact-bbox --scale=%S --output=%O"))
     (imagemagick
      :programs ("latex" "convert")
      :description "pdf > png"
@@ -3386,12 +3522,18 @@ PROPERTIES accepts the following attributes:
                       controlled by `org-format-latex-header',
                       `org-latex-default-packages-alist' and
                       `org-latex-packages-alist', which see.
-  :latex-compiler     list of LaTeX commands, as strings.  Each of them is given
-                      to the shell.  Place-holders \"%t\", \"%b\" and \"%o\" are
+  :latex-compiler list of LaTeX commands, as strings or a function.
+                      Each of them is given to the shell.
+                      Place-holders \"%t\", \"%b\" and \"%o\" are
                       replaced with values defined below.
-  :image-converter    list of image converter commands strings.  Each of them is
-                      given to the shell and supports any of the following
-                      place-holders defined below.
+                      When a function, that function should accept the
+                      file name as its single argument.
+  :image-converter list of image converter commands strings or a
+                      function.  Each of them is given to the shell
+                      and supports any of the following place-holders
+                      defined below.
+                      When a function, that function should accept the
+                      file name as its single argument.
 
 If set, :transparent-image-converter is used instead of :image-converter to
 convert an image when the background color is nil or \"Transparent\".
@@ -3409,9 +3551,10 @@ Place-holders only used by `:image-converter':
   %S    the image size scale ratio, which is used to adjust image size by some
         processing commands."
   :group 'org-latex
-  :package-version '(Org . "9.6")
+  :package-version '(Org . "9.8")
   :type '(alist :tag "LaTeX to image backends"
-		:value-type (plist)))
+		:value-type (plist))
+  :risky t)
 
 (defcustom org-preview-latex-image-directory "ltximg/"
   "Path to store latex preview images.
@@ -3423,6 +3566,16 @@ images at the same place."
   :package-version '(Org . "9.0")
   :type 'string)
 
+(defcustom org-latex-mathml-directory "ltxmathml/"
+  "Path to store MathML files converted from LaTeX fragments.
+A relative path here creates many directories relative to the
+processed Org files paths.  An absolute path puts all files
+in the same place."
+  :group 'org-latex
+  :package-version '(Org . "9.8")
+  :type 'string
+  :risky t)
+
 (defun org-format-latex-mathml-available-p ()
   "Return t if `org-latex-to-mathml-convert-command' is usable."
   (save-match-data
@@ -3481,9 +3634,9 @@ header, or they will be appended."
 
 (defcustom org-latex-default-packages-alist
   '(;; amsmath before fontspec for lualatex and xetex
-    (""     "amsmath"   t ("lualatex" "xetex"))
+    (""     "amsmath"   t ("lualatex" "xelatex"))
     ;; fontspec ASAP for lualatex and xetex
-    (""     "fontspec"  t ("lualatex" "xetex"))
+    (""     "fontspec"  t ("lualatex" "xelatex"))
     ;; inputenc and fontenc are for pdflatex only
     ("AUTO" "inputenc"  t ("pdflatex"))
     ("T1"   "fontenc"   t ("pdflatex"))
@@ -3770,7 +3923,11 @@ After a match, the match groups contain these elements:
 ;; https://orgmode.org/list/B72CDC2B-72F6-43A8-AC70-E6E6295766EC@gmail.com
 (defvar org-emphasis-regexp-components
   '("-[:space:]('\"{" "-[:space:].,:!?;'\")}\\[" "[:space:]" "." 1)
-  "Components used to build the regular expression for emphasis.
+  "Components used to build the regular expression for FONTIFYING emphasis.
+WARNING: This variable only affects visual fontification, but does not
+change Org markup.  For example, it does not affect how emphasis markup
+is interpreted on export.
+
 This is a list with five entries.  Terminology:  In an emphasis string
 like \" *strong word* \", we call the initial space PREMATCH, the final
 space POSTMATCH, the stars MARKERS, \"s\" and \"d\" are BORDER characters
@@ -3835,15 +3992,9 @@ This is needed for font-lock setup.")
 (declare-function calendar-iso-to-absolute "cal-iso" (date))
 (declare-function cdlatex-compute-tables "ext:cdlatex" ())
 (declare-function cdlatex-tab "ext:cdlatex" ())
-(declare-function dired-get-filename
-		  "dired"
-		  (&optional localp no-error-if-not-filep))
 (declare-function org-agenda-change-all-lines
 		  "org-agenda"
 		  (newhead hdmarker &optional fixface just-this))
-(declare-function org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item
-		  "org-agenda"
-		  (&optional end))
 (declare-function org-agenda-copy-local-variable "org-agenda" (var))
 (declare-function org-agenda-format-item
 		  "org-agenda"
@@ -3855,16 +4006,12 @@ This is needed for font-lock setup.")
 		  (beg end))
 (declare-function org-agenda-set-restriction-lock "org-agenda" (&optional type))
 (declare-function org-agenda-skip "org-agenda" (&optional element))
-(declare-function org-attach-expand "org-attach" (file))
 (declare-function org-attach-reveal "org-attach" ())
 (declare-function org-attach-reveal-in-emacs "org-attach" ())
-(declare-function org-gnus-follow-link "org-gnus" (&optional group article))
 (declare-function org-indent-mode "org-indent" (&optional arg))
-(declare-function org-inlinetask-goto-beginning "org-inlinetask" ())
 (declare-function org-inlinetask-goto-end "org-inlinetask" ())
 (declare-function org-inlinetask-in-task-p "org-inlinetask" ())
-(declare-function org-inlinetask-remove-END-maybe "org-inlinetask" ())
-(declare-function parse-time-string "parse-time" (string))
+(declare-function parse-time-string "parse-time" (string &optional form))
 
 (defvar align-mode-rules-list)
 (defvar calc-embedded-close-formula)
@@ -3876,8 +4023,6 @@ This is needed for font-lock setup.")
 
 (declare-function org-clock-save-markers-for-cut-and-paste "org-clock" (beg end))
 (declare-function org-clock-update-mode-line "org-clock" (&optional refresh))
-(declare-function org-resolve-clocks "org-clock"
-		  (&optional also-non-dangling-p prompt last-valid))
 
 (defvar org-clock-start-time)
 (defvar org-clock-marker (make-marker)
@@ -4039,7 +4184,6 @@ Otherwise, these types are allowed:
 
 ;; Declare ID code
 
-(declare-function org-id-store-link "org-id")
 (declare-function org-id-locations-load "org-id")
 (declare-function org-id-locations-save "org-id")
 (defvar org-id-track-globally)
@@ -4079,7 +4223,7 @@ Since TODO keywords are case-sensitive, `case-fold-search' is
 expected to be bound to nil when matching against this regexp.")
 
 (defvar-local org-complex-heading-regexp-format nil
-  "Printf format to make regexp to match an exact headline.
+  "`format' string to make regexp to match an exact headline.
 This regexp will match the headline of any node which has the
 exact headline text that is put into the format, but may have any
 TODO state, priority, tags, statistics cookies (at the beginning
@@ -4154,8 +4298,10 @@ After a match, the following groups carry important information:
     ("shrink" org-startup-shrink-all-tables t)
     ("descriptivelinks" org-link-descriptive t)
     ("literallinks" org-link-descriptive nil)
-    ("inlineimages" org-startup-with-inline-images t)
-    ("noinlineimages" org-startup-with-inline-images nil)
+    ("inlineimages" org-startup-with-link-previews t)
+    ("noinlineimages" org-startup-with-link-previews nil)
+    ("linkpreviews" org-startup-with-link-previews t)
+    ("nolinkpreviews" org-startup-with-link-previews nil)
     ("latexpreview" org-startup-with-latex-preview t)
     ("nolatexpreview" org-startup-with-latex-preview nil)
     ("customtime" org-display-custom-times t)
@@ -4263,6 +4409,62 @@ See `org-tag-alist' for their structure."
       ;; Preserve order of ALIST1.
       (append (nreverse to-add) alist2)))))
 
+(defun org-tags-sort (tag1 tag2)
+  "Sort tags TAG1 and TAG2 according to the value of `org-tags-sort-function'."
+  (let ((org-tags-sort-function
+         (cond ((functionp org-tags-sort-function) (list org-tags-sort-function))
+               ((consp     org-tags-sort-function) org-tags-sort-function)
+               ;; Default sorting as described in docstring of `org-tags-sort-function'.
+               ((null      org-tags-sort-function) (list #'org-string<)))))
+    (catch :org-tags-sort-return
+      (dolist (sort-fun org-tags-sort-function)
+        ;; So the function can call `org-tags-sort'
+        (let ((org-tags-sort-function (cdr org-tags-sort-function)))
+          (cond
+           ((funcall sort-fun tag1 tag2) ; tag1 < tag2
+            (throw :org-tags-sort-return t))
+           ((funcall sort-fun tag2 tag1) ; tag1 > tag2
+            (throw :org-tags-sort-return nil))
+           (t ; tag1 = tag2
+            'continue-loop)))))))
+
+(defun org-tags-sort-hierarchy (tag1 tag2)
+  "Sort tags TAG1 and TAG2 by the tag hierarchy.
+
+See Info node `(org) Tag Hierarchy' or `org-tag-alist' for how to set up
+a tag hierarchy.
+
+This function is intended to be a value of `org-tags-sort-function'."
+  (let ((group-alist (or org-tag-groups-alist-for-agenda
+                         org-tag-groups-alist)))
+    (if (not (and org-group-tags
+                  group-alist))
+        (org-tags-sort tag1 tag2)
+      (let* ((tag-path-function
+              ;; Returns a list of tags describing the tag path
+              ;; ex: '("top level tag" "second level" "tag")
+              (lambda (tag)
+                (let ((result (list tag)))
+                  (while (and
+                          ;; Prevent infinite loop
+                          (not (member tag (cdr result)))
+                          (setq tag
+                                (map-some
+                                 (lambda (key tags)
+                                   (when (member tag tags)
+                                     key))
+                                 group-alist)))
+                    (push tag result))
+                  result)))
+             (tag1-path (funcall tag-path-function tag1))
+             (tag2-path (funcall tag-path-function tag2)))
+        (catch :result
+          (dotimes (n (min (length tag1-path) (length tag2-path)))
+            ;; find the first difference and sort on that
+            (unless (string-equal (nth n tag1-path) (nth n tag2-path))
+              (throw :result (org-tags-sort (nth n tag1-path) (nth n tag2-path)))))
+          (< (length tag1-path) (length tag2-path)))))))
+
 (defun org-priority-to-value (s)
   "Convert priority string S to its numeric value."
   (or (save-match-data
@@ -4450,14 +4652,13 @@ related expressions."
 	      org-complex-heading-regexp
 	      (concat "^\\(\\*+\\)"
 		      "\\(?: +" org-todo-regexp "\\)?"
-		      "\\(?: +\\(\\[#.\\]\\)\\)?"
+		      (format "\\(?: +\\(\\[#\\(?:%s\\)\\]\\)\\)?" org-priority-value-regexp)
 		      "\\(?: +\\(.*?\\)\\)??"
-		      "\\(?:[ \t]+\\(:[[:alnum:]_@#%:]+:\\)\\)?"
-		      "[ \t]*$")
+                      org-tag--group-optional-re)
 	      org-complex-heading-regexp-format
 	      (concat "^\\(\\*+\\)"
 		      "\\(?: +" org-todo-regexp "\\)?"
-		      "\\(?: +\\(\\[#.\\]\\)\\)?"
+		      (format "\\(?: +\\(\\[#\\(?:%s\\)\\]\\)\\)?" org-priority-value-regexp)
 		      "\\(?: +"
                       ;; Headline might be commented
                       "\\(?:" org-comment-string " +\\)?"
@@ -4466,14 +4667,13 @@ related expressions."
 		      "\\(%s\\)"
 		      "\\(?: *\\[[0-9%%/]+\\]\\)*"
 		      "\\)"
-		      "\\(?:[ \t]+\\(:[[:alnum:]_@#%%:]+:\\)\\)?"
-		      "[ \t]*$")
+                      ;; Shield % inside as they will break `format'.
+		      (replace-regexp-in-string "%" "%%" org-tag--group-optional-re))
 	      org-todo-line-tags-regexp
 	      (concat "^\\(\\*+\\)"
 		      "\\(?: +" org-todo-regexp "\\)?"
 		      "\\(?: +\\(.*?\\)\\)??"
-		      "\\(?:[ \t]+\\(:[[:alnum:]:_@#%]+:\\)\\)?"
-		      "[ \t]*$"))
+                      org-tag--group-optional-re))
 	(org-compute-latex-and-related-regexp)))))
 
 (defun org-collect-keywords (keywords &optional unique directory)
@@ -4743,7 +4943,8 @@ returns non-nil if any of them match."
 
 (defun org--confirm-resource-safe (uri)
   "Ask the user if URI should be considered safe, returning non-nil if so."
-  (unless noninteractive
+  (if noninteractive
+      (error "Cannot prompt about %S interactively in batch mode.  Aborting" uri)
     (let ((current-file (and (buffer-file-name (buffer-base-buffer))
                              (file-truename (buffer-file-name (buffer-base-buffer)))))
           (domain (and (string-match
@@ -4924,6 +5125,10 @@ This is for getting out of special buffers like capture.")
     st)
   "Syntax table including \"@\" and \"_\" as word constituents.")
 
+(defun org--set-tab-width (&rest _)
+  "Set `tab-width' to be 8."
+  (setq-local tab-width 8))
+
 ;;;###autoload
 (define-derived-mode org-mode outline-mode "Org"
   "Outline-based notes management and organizer, alias
@@ -4946,7 +5151,16 @@ The following commands are available:
   (setq-local org-mode-loading t)
   ;; Force tab width - indentation is significant in lists, so we need
   ;; to make sure that it is consistent across configurations.
-  (setq-local tab-width 8)
+  (org--set-tab-width)
+  ;; Really force it, even if dir-locals or file-locals set it - we
+  ;; need tab-width = 8 as a part of Org syntax.
+  (add-hook 'hack-local-variables-hook
+            #'org--set-tab-width 90 'local)
+  ;; In Emacs <30, editorconfig-mode uses advices, so we cannot rely
+  ;; upon `hack-local-variables-hook' to run after editorconfig
+  ;; tab-width settings are applied.
+  (add-hook 'editorconfig-after-apply-functions
+            #'org--set-tab-width 90 'local)
   (org-load-modules-maybe)
   (when org-agenda-file-menu-enabled
     (org-install-agenda-files-menu))
@@ -5003,6 +5217,9 @@ The following commands are available:
   (org-setup-filling)
   ;; Comments.
   (org-setup-comments-handling)
+  ;; Obey the syntax-table text property when navigating text (used in
+  ;; source blocks).
+  (setq-local parse-sexp-lookup-properties t)
   ;; Beginning/end of defun
   (setq-local beginning-of-defun-function 'org-backward-element)
   (setq-local end-of-defun-function
@@ -5073,14 +5290,14 @@ The following commands are available:
 	      (lambda () (org-table-align) (org-table-shrink)))
 	     (org-startup-align-all-tables #'org-table-align)
 	     (t #'org-table-shrink))
-       t))
+       t 'org))
     ;; Suppress modification hooks to speed up the startup.
     ;; However, do it only when text properties/overlays, but not
     ;; buffer text are actually modified.  We still need to track text
     ;; modifications to make cache updates work reliably.
     (org-unmodified
      (when org-startup-with-beamer-mode (org-beamer-mode))
-     (when org-startup-with-inline-images (org-display-inline-images))
+     (when org-startup-with-inline-images (org-link-preview '(16)))
      (when org-startup-with-latex-preview (org-latex-preview '(16)))
      (unless org-inhibit-startup-visibility-stuff (org-cycle-set-startup-visibility))
      (when org-startup-truncated (setq truncate-lines t))
@@ -5129,7 +5346,8 @@ The following commands are available:
 		   ("9.4" . "27.2")
 		   ("9.5" . "28.1")
 		   ("9.6" . "29.1")
-                   ("9.7" . "30.1")))
+                   ("9.7" . "30.1")
+                   ("9.8" . "31.1")))
 
 (defvar org-mode-transpose-word-syntax-table
   (let ((st (make-syntax-table text-mode-syntax-table)))
@@ -5157,10 +5375,10 @@ The following commands are available:
 (defun org-current-time (&optional rounding-minutes past)
   "Current time, possibly rounded to ROUNDING-MINUTES.
 When ROUNDING-MINUTES is not an integer, fall back on the car of
-`org-timestamp-rounding-minutes'.  When PAST is non-nil, ensure
+`org-time-stamp-rounding-minutes'.  When PAST is non-nil, ensure
 the rounding returns a past time."
   (let ((r (or (and (integerp rounding-minutes) rounding-minutes)
-	       (car org-timestamp-rounding-minutes)))
+	       (car org-time-stamp-rounding-minutes)))
 	(now (current-time)))
     (if (< r 1)
 	now
@@ -5342,66 +5560,68 @@ This includes angle, plain, and bracket links."
 	     (style (cond ((eq ?< (char-after start)) 'angle)
 			  ((eq ?\[ (char-after (1+ start))) 'bracket)
 			  (t 'plain))))
-	(when (and (memq style org-highlight-links)
-		   ;; Do not span over paragraph boundaries.
-		   (not (string-match-p org-element-paragraph-separate
-				      (match-string 0)))
-		   ;; Do not confuse plain links with tags.
-		   (not (and (eq style 'plain)
-			   (let ((face (get-text-property
-					(max (1- start) (point-min)) 'face)))
-			     (if (consp face) (memq 'org-tag face)
-			       (eq 'org-tag face))))))
-	  (let* ((link-object (save-excursion
-				(goto-char start)
-				(save-match-data (org-element-link-parser))))
-		 (link (org-element-property :raw-link link-object))
-		 (type (org-element-property :type link-object))
-		 (path (org-element-property :path link-object))
-                 (face-property (pcase (org-link-get-parameter type :face)
-				  ((and (pred functionp) face) (funcall face path))
-				  ((and (pred facep) face) face)
-				  ((and (pred consp) face) face) ;anonymous
-				  (_ 'org-link)))
-		 (properties		;for link's visible part
-		  (list 'mouse-face (or (org-link-get-parameter type :mouse-face)
-					'highlight)
-			'keymap (or (org-link-get-parameter type :keymap)
-				    org-mouse-map)
-			'help-echo (pcase (org-link-get-parameter type :help-echo)
-				     ((and (pred stringp) echo) echo)
-				     ((and (pred functionp) echo) echo)
-				     (_ (concat "LINK: " link)))
-			'htmlize-link (pcase (org-link-get-parameter type
-								     :htmlize-link)
-					((and (pred functionp) f) (funcall f))
-					(_ `(:uri ,link)))
-			'font-lock-multiline t)))
-	    (org-remove-flyspell-overlays-in start end)
-	    (org-rear-nonsticky-at end)
-	    (if (not (eq 'bracket style))
-		(progn
+	(if (and (memq style org-highlight-links)
+		 ;; Do not span over paragraph boundaries.
+		 (not (string-match-p org-element-paragraph-separate
+				    (match-string 0)))
+		 ;; Do not confuse plain links with tags.
+		 (not (and (eq style 'plain)
+			 (let ((face (get-text-property
+				      (max (1- start) (point-min)) 'face)))
+			   (if (consp face) (memq 'org-tag face)
+			     (eq 'org-tag face))))))
+	    (let* ((link-object (save-excursion
+				  (goto-char start)
+				  (save-match-data (org-element-link-parser))))
+		   (link (org-element-property :raw-link link-object))
+		   (type (org-element-property :type link-object))
+		   (path (org-element-property :path link-object))
+                   (face-property (pcase (org-link-get-parameter type :face)
+				    ((and (pred functionp) face) (funcall face path))
+				    ((and (pred facep) face) face)
+				    ((and (pred consp) face) face) ;anonymous
+				    (_ 'org-link)))
+		   (properties		;for link's visible part
+		    (list 'mouse-face (or (org-link-get-parameter type :mouse-face)
+					  'highlight)
+			  'keymap (or (org-link-get-parameter type :keymap)
+				      org-mouse-map)
+			  'help-echo (pcase (org-link-get-parameter type :help-echo)
+				       ((and (pred stringp) echo) echo)
+				       ((and (pred functionp) echo) echo)
+				       (_ (concat "LINK: " link)))
+			  'htmlize-link (pcase (org-link-get-parameter type
+								       :htmlize-link)
+					  ((and (pred functionp) f) (funcall f))
+					  (_ `(:uri ,link)))
+			  'font-lock-multiline t)))
+	      (org-remove-flyspell-overlays-in start end)
+	      (org-rear-nonsticky-at end)
+	      (if (not (eq 'bracket style))
+		  (progn
+                    (add-face-text-property start end face-property)
+		    (add-text-properties start end properties))
+	        ;; Handle invisible parts in bracket links.
+	        (remove-text-properties start end '(invisible nil))
+	        (let ((hidden
+                       (if org-link-descriptive
+		           (append `(invisible
+			             ,(or (org-link-get-parameter type :display)
+				          'org-link))
+			           properties)
+                         properties)))
+		  (add-text-properties start visible-start hidden)
                   (add-face-text-property start end face-property)
-		  (add-text-properties start end properties))
-	      ;; Handle invisible parts in bracket links.
-	      (remove-text-properties start end '(invisible nil))
-	      (let ((hidden
-                     (if org-link-descriptive
-		         (append `(invisible
-			           ,(or (org-link-get-parameter type :display)
-				        'org-link))
-			         properties)
-                       properties)))
-		(add-text-properties start visible-start hidden)
-                (add-face-text-property start end face-property)
-		(add-text-properties visible-start visible-end properties)
-		(add-text-properties visible-end end hidden)
-		(org-rear-nonsticky-at visible-start)
-		(org-rear-nonsticky-at visible-end)))
-	    (let ((f (org-link-get-parameter type :activate-func)))
-	      (when (functionp f)
-		(funcall f start end path (eq style 'bracket))))
-	    (throw :exit t)))))		;signal success
+		  (add-text-properties visible-start visible-end properties)
+		  (add-text-properties visible-end end hidden)
+		  (org-rear-nonsticky-at visible-start)
+		  (org-rear-nonsticky-at visible-end)))
+	      (let ((f (org-link-get-parameter type :activate-func)))
+	        (when (functionp f)
+		  (funcall f start end path (eq style 'bracket))))
+	      (throw :exit t))		;signal success
+          ;; Not a real link, move forward one char and repeat the search.
+          (goto-char (1+ (match-beginning 0))))))
     nil))
 
 (defun org-activate-code (limit)
@@ -5429,7 +5649,7 @@ by a #."
   :group 'org-appearance)
 
 (defun org-fontify-meta-lines-and-blocks (limit)
-  (condition-case-unless-debug nil
+  (condition-case nil
       (org-fontify-meta-lines-and-blocks-1 limit)
     (error (message "Org mode fontification error in %S at %d"
 		    (current-buffer)
@@ -5451,10 +5671,6 @@ by a #."
 	   limit t)
       (let ((beg (match-beginning 0))
 	    (end-of-beginline (match-end 0))
-	    ;; Including \n at end of #+begin line will include \n
-	    ;; after the end of block content.
-	    (block-start (match-end 0))
-	    (block-end nil)
 	    (lang (match-string 7)) ; The language, if it is a source block.
 	    (bol-after-beginline (line-beginning-position 2))
 	    (dc1 (downcase (match-string 2)))
@@ -5480,7 +5696,6 @@ by a #."
 	    (setq beg-of-endline (match-beginning 0)
 		  end-of-endline (match-end 0)
 		  nl-before-endline (1- (match-beginning 0)))
-	    (setq block-end (match-beginning 0)) ; Include the final newline.
 	    (when quoting
 	      (org-remove-flyspell-overlays-in bol-after-beginline nl-before-endline)
 	      (remove-text-properties beg end-of-endline
@@ -5491,17 +5706,19 @@ by a #."
 	    (org-remove-flyspell-overlays-in nl-before-endline end-of-endline)
             (cond
 	     ((and org-src-fontify-natively
-                   ;; Technically, according to
+                   ;; Skip fontification of empty source-blocks
+                   (< bol-after-beginline beg-of-endline)
+                   ;; Technically, according to the
                    ;; `org-src-fontify-natively' docstring, we should
                    ;; only fontify src blocks.  However, it is common
-                   ;; to use undocumented fontification of example
-                   ;; blocks with undocumented language specifier.
-                   ;; Keep this undocumented feature for user
-                   ;; convenience.
-                   (member block-type '("src" "example")))
+                   ;; to use undocumented fontification of export and
+                   ;; example blocks. (The latter which do not support a
+                   ;; language specifier.) Keep this undocumented feature
+                   ;; for user convenience.
+                   (member block-type '("src" "export" "example")))
 	      (save-match-data
-                (org-src-font-lock-fontify-block (or lang "") block-start block-end))
-	      (add-text-properties bol-after-beginline block-end '(src-block t)))
+                (org-src-font-lock-fontify-block (or lang "") bol-after-beginline beg-of-endline))
+	      (add-text-properties bol-after-beginline beg-of-endline '(src-block t)))
 	     (quoting
 	      (add-text-properties
 	       bol-after-beginline beg-of-endline
@@ -5747,7 +5964,10 @@ highlighting was done, nil otherwise."
 			       1
 			     0))
 		   (start (+ offset (match-beginning 0)))
-		   (end (match-end 0)))
+		   (end (save-excursion
+                          (goto-char (match-end 0))
+                          ;; Do not fontify trailing whitespace.
+                          (skip-chars-backward " \t") (point))))
 	      (if (memq 'native org-highlight-latex-and-related)
 		  (org-src-font-lock-fontify-block "latex" start end)
 		(font-lock-prepend-text-property start end
@@ -5983,8 +6203,9 @@ needs to be inserted at a specific position in the font-lock sequence.")
           ;; Apply this last, after all the markup is highlighted, so
           ;; that even "bright" markup will become dim.
 	  (list (format
-		 "^\\*+\\(?: +%s\\)?\\(?: +\\[#[A-Z0-9]\\]\\)? +\\(?9:%s\\)\\(?: \\|$\\)"
+		 "^\\*+\\(?: +%s\\)?\\(?: +\\[#\\(?:%s\\)\\]\\)? +\\(?9:%s\\)\\(?: \\|$\\)"
 		 org-todo-regexp
+                 org-priority-value-regexp
 		 org-comment-string)
 		'(9 'org-special-keyword prepend))
           '(org-activate-folds))))
@@ -5996,7 +6217,6 @@ needs to be inserted at a specific position in the font-lock sequence.")
 		'(org-font-lock-keywords t nil nil backward-paragraph))
     (setq-local font-lock-extend-after-change-region-function
 		#'org-fontify-extend-region)
-    (kill-local-variable 'font-lock-keywords)
     nil))
 
 (defun org-toggle-pretty-entities ()
@@ -6113,7 +6333,7 @@ If KWD is a number, get the corresponding match group."
 
 (defun org-get-priority-face (priority)
   "Get the right face for PRIORITY.
-PRIORITY is a character."
+PRIORITY is a number from 0-64 or a character value from ?A to ?Z."
   (or (org-face-from-face-or-color
        'priority 'org-priority (cdr (assq priority org-priority-faces)))
       'org-priority))
@@ -6135,7 +6355,7 @@ If TAG is a number, get the corresponding match group."
 	  (end (1+ (match-end 2))))
       (add-face-text-property
        beg end
-       (org-get-priority-face (string-to-char (match-string 2))))
+       (org-get-priority-face (org-priority-to-value (match-string 2))))
       (add-text-properties
        beg end
        (list 'font-lock-fontified t)))))
@@ -6160,7 +6380,8 @@ If TAG is a number, get the corresponding match group."
     (remove-text-properties beg end
 			    '(mouse-face t keymap t org-linked-text t
 					 invisible t intangible t
-					 org-emphasis t))
+					 org-emphasis t
+                                         syntax-table t))
     (org-fold-core-update-optimization beg end)
     (org-remove-font-lock-display-properties beg end)))
 
@@ -6231,6 +6452,7 @@ and subscripts."
 ;; FIXME: This function is unused.
 (defun org-show-empty-lines-in-parent ()
   "Move to the parent and re-show empty lines before visible headlines."
+  (declare (obsolete "no longer used" "9.8"))
   (save-excursion
     (let ((context (if (org-up-heading-safe) 'children 'overview)))
       (org-cycle-show-empty-lines context))))
@@ -6458,45 +6680,45 @@ Assume that point is on the inserted heading."
 	       (invisible-p (max (1- (point)) (point-min)))))
       ;; Position point at the location of insertion.  Make sure we
       ;; end up on a visible headline if INVISIBLE-OK is nil.
-      (org-with-limited-levels
-       (if (not current-level) (outline-next-heading) ;before first headline
-	 (org-back-to-heading invisible-ok)
-	 (when (equal arg '(16)) (org-up-heading-safe))
-	 (org-end-of-subtree invisible-ok 'to-heading)))
-      ;; At `point-max', if the file does not have ending newline,
-      ;; create one, so that we are not appending stars at non-empty
-      ;; line.
-      (unless (bolp) (insert "\n"))
-      (when (and blank? (save-excursion
-                          (backward-char)
-                          (org-before-first-heading-p)))
-        (insert "\n")
-        (backward-char))
-      (when (and (not current-level) (not (eobp)) (not (bobp)))
-        (when (org-at-heading-p) (insert "\n"))
-        (backward-char))
-      (unless (and blank? (org-previous-line-empty-p))
-	(org-N-empty-lines-before-current (if blank? 1 0)))
-      (insert stars " " "\n")
-      ;; Move point after stars.
-      (backward-char)
-      ;; Retain blank lines before next heading.
-      (funcall maybe-add-blank-after blank?)
-      ;; When INVISIBLE-OK is non-nil, ensure newly created headline
-      ;; is visible.
-      (unless invisible-ok
-        (if (eq org-fold-core-style 'text-properties)
-	    (cond
-	     ((org-fold-folded-p
-               (max (point-min)
-                    (1- (line-beginning-position)))
-               'headline)
-	      (org-fold-region (line-end-position 0) (line-end-position) nil 'headline))
-	     (t nil))
-          (pcase (get-char-property-and-overlay (point) 'invisible)
-	    (`(outline . ,o)
-	     (move-overlay o (overlay-start o) (line-end-position 0)))
-	    (_ nil)))))
+      (org-preserve-local-variables
+       (org-with-limited-levels
+        (if (not current-level) (outline-next-heading) ;before first headline
+          (org-back-to-heading invisible-ok)
+          (when (equal arg '(16)) (org-up-heading-safe))
+          (org-end-of-subtree invisible-ok 'to-heading)))
+       ;; At `point-max', if the file does not have ending newline,
+       ;; create one, so that we are not appending stars at non-empty
+       ;; line.
+       (unless (bolp) (insert "\n"))
+       (when (and blank? (save-excursion
+                           (backward-char)
+                           (org-before-first-heading-p)))
+         (insert "\n")
+         (backward-char))
+       (when (and (not current-level) (not (eobp)) (not (bobp)))
+         (when (org-at-heading-p) (insert "\n"))
+         (backward-char))
+       (unless (and blank? (org-previous-line-empty-p))
+         (org-N-empty-lines-before-current (if blank? 1 0)))
+       (insert stars " " "\n")
+       ;; Move point after stars.
+       (backward-char)
+       ;; Retain blank lines before next heading.
+       (funcall maybe-add-blank-after blank?)
+       ;; When INVISIBLE-OK is non-nil, ensure newly created headline
+       ;; is visible.
+       (unless invisible-ok
+         (if (eq org-fold-core-style 'text-properties)
+             (cond
+              ((org-fold-folded-p
+                (max (point-min)
+                     (1- (line-beginning-position))))
+               (org-fold-region (line-end-position 0) (line-end-position) nil))
+              (t nil))
+           (pcase (get-char-property-and-overlay (point) 'invisible)
+             (`(outline . ,o)
+              (move-overlay o (overlay-start o) (line-end-position 0)))
+             (_ nil))))))
      ;; At a headline...
      ((org-at-heading-p)
       (cond ((bolp)
@@ -6595,7 +6817,7 @@ This is a list with the following elements:
 - the level as an integer
 - the reduced level, different if `org-odd-levels-only' is set.
 - the TODO keyword, or nil
-- the priority character, like ?A, or nil if no priority is given
+- the priority value, like ?A or 42, or nil if no priority is given
 - the headline text itself, or the tags string if no headline text
 - the tags string, or nil."
   (save-excursion
@@ -6606,7 +6828,7 @@ This is a list with the following elements:
           (list (length (match-string 1))
 	        (org-reduced-level (length (match-string 1)))
 	        (match-string-no-properties 2)
-	        (and (match-end 3) (aref (match-string 3) 2))
+	        (and (match-end 3) (org-priority-to-value (substring (match-string 3) 2 -1)))
 	        (match-string-no-properties 4)
 	        (match-string-no-properties 5))
         (org-fold-core-update-optimization (match-beginning 0) (match-end 0))))))
@@ -6755,8 +6977,9 @@ headings in the region."
   (interactive)
   (save-excursion
     (if (org-region-active-p)
-        (let ((deactivate-mark nil))
-          (org-map-region 'org-promote (region-beginning) (region-end)))
+        (progn
+          (org-map-region 'org-promote (region-beginning) (region-end))
+          (setq deactivate-mark (org--deactivate-mark)))
       (org-promote)))
   (org-fix-position-after-promote))
 
@@ -6767,8 +6990,9 @@ headings in the region."
   (interactive)
   (save-excursion
     (if (org-region-active-p)
-        (let ((deactivate-mark nil))
-          (org-map-region 'org-demote (region-beginning) (region-end)))
+        (progn
+          (org-map-region 'org-demote (region-beginning) (region-end))
+          (setq deactivate-mark (org--deactivate-mark)))
       (org-demote)))
   (org-fix-position-after-promote))
 
@@ -6913,13 +7137,16 @@ After top level, it switches back to sibling level."
 	(funcall fun)))))
 
 (defun org-map-region (fun beg end)
-  "Call FUN for every heading between BEG and END."
+  "Call FUN for every heading between BEG and END.
+The point is placed at the beginning of each heading
+(including any *) before FUN is called."
   (let ((org-ignore-region t))
     (save-excursion
       (setq end (copy-marker end))
       (goto-char beg)
       (when (and (re-search-forward org-outline-regexp-bol nil t)
 		 (< (point) end))
+        (goto-char (match-beginning 0))
 	(funcall fun))
       (while (and (progn
 		    (outline-next-heading)
@@ -7202,7 +7429,7 @@ of some markers in the region, even if CUT is non-nil.  This is
 useful if the caller implements cut-and-paste as copy-then-paste-then-cut."
   (interactive "p")
   (org-preserve-local-variables
-   (let (beg end folded (beg0 (point)))
+   (let (beg end folded subtree-text (beg0 (point)))
      (if (called-interactively-p 'any)
 	 (org-back-to-heading nil)    ; take what looks like a subtree
        (org-back-to-heading t))	      ; take what is really there
@@ -7229,11 +7456,13 @@ useful if the caller implements cut-and-paste as copy-then-paste-then-cut."
        (setq org-subtree-clip-folded folded)
        (when (or cut force-store-markers)
 	 (org-save-markers-in-region beg end))
+       (setq subtree-text (buffer-substring-no-properties beg end))
        (if cut (kill-region beg end) (copy-region-as-kill beg end))
-       (setq org-subtree-clip (current-kill 0))
+       (setq org-subtree-clip subtree-text)
        (message "%s: Subtree(s) with %d characters"
 		(if cut "Cut" "Copied")
-		(length org-subtree-clip))))))
+		(length org-subtree-clip))
+       subtree-text))))
 
 (defun org-paste-subtree (&optional level tree for-yank remove)
   "Paste the clipboard as a subtree, with modification of headline level.
@@ -7989,7 +8218,7 @@ function is being called interactively."
 		  (float-time now))))
 	     ((= dcst ?p)
               (if (re-search-forward org-priority-regexp (line-end-position) t)
-		  (string-to-char (match-string 2))
+                  (org-priority-to-value (match-string 2))
 		org-priority-default))
 	     ((= dcst ?r)
 	      (or (org-entry-get nil property) ""))
@@ -8248,7 +8477,8 @@ the whole buffer."
 		 (stats (cond ((not denominator) numerator) ;percent
 			      ((= denominator 0) 0)
 			      (t (/ (* numerator 100) denominator)))))
-	    (put-text-property (point) (progn (org-end-of-subtree t t) (point))
+	    (put-text-property (line-beginning-position)
+                               (progn (org-end-of-subtree t t) (point))
 			       'org-stats stats)))))))
 
 (defun org-refresh-effort-properties ()
@@ -8271,7 +8501,23 @@ See the docstring of `org-open-file' for details."
   (mouse-set-point ev)
   (when (eq major-mode 'org-agenda-mode)
     (org-agenda-copy-local-variable 'org-link-abbrev-alist-local))
-  (org-open-at-point))
+  ;; FIXME: This feature is actually unreliable - if we are in non-Org
+  ;; buffer and the link happens to be inside what Org parser
+  ;; recognizes as verbarim (for exampe, src block),
+  ;; `org-open-at-point' will do nothing.
+  ;; We might have used `org-open-at-point-global' instead, but it is
+  ;; not exactly the same. For example, it will have no way to open
+  ;; link abbreviations. So, suppressing parser complains about
+  ;; non-Org buffer to keep the feature working at least to the extent
+  ;; it did before.
+  (require 'warnings) ; Emacs <30
+  (defvar warning-suppress-types) ; warnings.el
+  (let ((warning-suppress-types
+         (cons '(org-element org-element-parser)
+               warning-suppress-types)))
+    ;; FIXME: Suppress warning in Emacs <30
+    ;; (ignore warning-suppress-types)
+    (org-open-at-point)))
 
 (defvar org-window-config-before-follow-link nil
   "The window configuration before following a link.
@@ -8504,7 +8750,7 @@ If the file does not exist, throw an error."
 	(and (boundp 'org-wait) (numberp org-wait) (sit-for org-wait))))
      ((or (stringp cmd)
 	  (eq cmd 'emacs))
-      (funcall (cdr (assq 'file org-link-frame-setup)) file)
+      (funcall (org-link-frame-setup-function 'file) file)
       (widen)
       (cond (line (org-goto-line line)
 		  (when (derived-mode-p 'org-mode) (org-fold-reveal)))
@@ -8532,18 +8778,19 @@ If the file does not exist, throw an error."
       ;; `org-file-apps' with sexp instead of a function for `cmd'.
       (user-error "Please see Org News for version 9.0 about \
 `org-file-apps'--Error: Deprecated usage of %S" cmd))
-     (t (funcall (cdr (assq 'file org-link-frame-setup)) file)))
+     (t (funcall (org-link-frame-setup-function 'file) file)))
     (funcall save-position-maybe)))
 
 ;;;###autoload
-(defun org-open-at-point-global ()
+(defun org-open-at-point-global (&optional arg)
   "Follow a link or a timestamp like Org mode does.
+Pass ARG to `org-link-open-to-string'.
 Also follow links and emails as seen by `thing-at-point'.
 This command can be called in any mode to follow an external
 link or a timestamp that has Org mode syntax.  Its behavior
 is undefined when called on internal links like fuzzy links.
 Raise a user error when there is nothing to follow."
-  (interactive)
+  (interactive "P")
   (let ((tap-url (thing-at-point 'url))
 	(tap-email (thing-at-point 'email)))
     (cond ((org-in-regexp
@@ -8556,13 +8803,14 @@ Raise a user error when there is nothing to follow."
                (save-excursion
                  (forward-paragraph)
                  (count-lines origin (point))))))
-	   (org-link-open-from-string (match-string-no-properties 0)))
+	   (org-link-open-from-string (match-string-no-properties 0) arg))
 	  ((or (org-in-regexp org-ts-regexp-both nil t)
 	       (org-in-regexp org-tsr-regexp-both nil t))
 	   (org-follow-timestamp-link))
-	  (tap-url (org-link-open-from-string tap-url))
+	  (tap-url (org-link-open-from-string tap-url arg))
 	  (tap-email (org-link-open-from-string
-		      (concat "mailto:" tap-email)))
+		      (concat "mailto:" tap-email)
+                      arg))
 	  (t (user-error "No link found")))))
 
 (defvar org-open-at-point-functions nil
@@ -8590,7 +8838,7 @@ When point is a footnote definition, move to the first reference
 found.  If it is on a reference, move to the associated
 definition.
 
-When point is on a src-block of inline src-block, open its result.
+When point is on a src-block or inline src-block, open its result.
 
 When point is on a citation, follow it.
 
@@ -9104,6 +9352,8 @@ keywords relative to each registered export backend."
 	     (delq nil keywords))
       ;; Backend name (for keywords, like #+LATEX:)
       (push (upcase (symbol-name (org-export-backend-name backend))) keywords)
+      ;; Backend attributes, like #+ATTR_LATEX:
+      (push (format "ATTR_%s" (upcase (symbol-name (org-export-backend-name backend)))) keywords)
       (dolist (option-entry (org-export-backend-options backend))
 	;; Backend options.
 	(push (nth 1 option-entry) keywords)))))
@@ -9259,6 +9509,7 @@ If an element cannot be made unique, an error is raised."
 	    (cl-sort menu-keys #'<
 		     :key (lambda (elm) (cl-position (cdr elm) keys))))))
 
+(defalias 'org-insert-block-template #'org-insert-structure-template)
 (defun org-insert-structure-template (type)
   "Insert a block structure of the type #+begin_foo/#+end_foo.
 Select a block from `org-structure-template-alist' then type
@@ -9375,21 +9626,23 @@ nil or a string to be used for the todo mark." )
 (defvar org-block-entry-blocking ""
   "First entry preventing the TODO state change.")
 
-(defun org-cancel-repeater ()
-  "Cancel a repeater by setting its numeric value to zero."
+(defalias 'org-cancel-repeater #'org-cancel-repeaters)
+(defun org-cancel-repeaters ()
+  "Cancel all the repeaters in entry by setting their numeric value to zero."
   (interactive)
   (save-excursion
     (org-back-to-heading t)
     (let ((bound1 (point))
 	  (bound0 (save-excursion (outline-next-heading) (point))))
-      (when (and (re-search-forward
-		  (concat "\\(" org-scheduled-time-regexp "\\)\\|\\("
-			  org-deadline-time-regexp "\\)\\|\\("
-			  org-ts-regexp "\\)")
-		  bound0 t)
-		 (re-search-backward "[ \t]+\\(?:[.+]\\)?\\+\\([0-9]+\\)[hdwmy]"
-				     bound1 t))
-	(replace-match "0" t nil nil 1)))))
+      (while (re-search-forward
+	      (concat "\\(" org-scheduled-time-regexp "\\)\\|\\("
+		      org-deadline-time-regexp "\\)\\|\\("
+		      org-ts-regexp "\\)")
+	      bound0 t)
+        (when (save-excursion
+	        (re-search-backward "[ \t]+\\(?:[.+]\\)?\\+\\([0-9]+\\)[hdwmy]"
+			            bound1 t))
+	  (replace-match "0" t nil nil 1))))))
 
 (defvar org-state)
 ;; FIXME: We should refactor this and similar dynamically scoped blocker flags.
@@ -9442,7 +9695,7 @@ When called through Elisp, arg is also interpreted in the following way:
 	 nil cl
 	 (when (org-invisible-p) (org-end-of-subtree nil t))))
     (when (equal arg '(16)) (setq arg 'nextset))
-    (when (equal (prefix-numeric-value arg) -1) (org-cancel-repeater) (setq arg nil))
+    (when (equal (prefix-numeric-value arg) -1) (org-cancel-repeaters) (setq arg nil))
     (when (< (prefix-numeric-value arg) -1) (user-error "Prefix argument %d not supported" arg))
     (let ((org-blocker-hook org-blocker-hook)
 	  commentp
@@ -9806,12 +10059,14 @@ changes because there are unchecked boxes in this entry."
 (defun org-update-statistics-cookies (all)
   "Update the statistics cookie, either from TODO or from checkboxes.
 This should be called with the cursor in a line with a statistics
-cookie.  When called with a \\[universal-argument] prefix, update
-all statistics cookies in the buffer."
+cookie.  When called with a \\[universal-argument] prefix, update all
+statistics cookies in the accessible portion of the buffer, i.e.,
+respect narrowing."
   (interactive "P")
   (if all
       (progn
-	(org-update-checkbox-count 'all)
+	(org-update-checkbox-count
+	 (if (buffer-narrowed-p) 'narrow 'all))
 	(org-map-region 'org-update-parent-todo-statistics
                         (point-min) (point-max)))
     (if (not (org-at-heading-p))
@@ -11056,6 +11311,8 @@ The function must neither move point nor alter narrowing."
 		nil 'local))
     (unless org-sparse-tree-open-archived-trees
       (org-fold-hide-archived-subtrees (point-min) (point-max)))
+    (when org-highlight-sparse-tree-matches
+      (setq next-error-last-buffer (current-buffer)))
     (run-hooks 'org-occur-hook)
     (when (called-interactively-p 'interactive)
       (message "%d match(es) for regexp %s" cnt regexp))
@@ -11109,13 +11366,44 @@ from the `before-change-functions' in the current buffer."
 
 ;;;; Priorities
 
-(defvar org-priority-regexp ".*?\\(\\[#\\([A-Z0-9]+\\)\\] ?\\)"
-  "Regular expression matching the priority indicator.
-A priority indicator can be e.g. [#A] or [#1].
-This regular expression matches these groups:
-0 : the whole match, e.g. \"TODO [#A] Hack\"
-1 : the priority cookie, e.g. \"[#A]\"
-2 : the value of the priority cookie, e.g. \"A\".")
+(defun org-priority-valid-cookie-string-p (priority)
+  "Return t if the PRIORITY is a valid priority cookie, nil otherwise."
+  (cond
+   ((stringp priority)
+    (let ((case-fold-search nil)) ;; Force case-sensitive match
+      ;; (and ... t) to force explicit t/nil
+      (and (string-match-p org-priority-regexp priority) t)))))
+
+(defun org-priority-valid-value-p (priority &optional ignore-user-bounds)
+  "Return t if the PRIORITY is a valid priority value (0-64, A-Z), nil otherwise.
+Also validate that the priority value is within the current bounds of
+ `org-priority-lowest' and `org-priority-highest' unless IGNORE-USER-BOUNDS is
+non-nil."
+  ;; Although we can have either numeric or alphabetic priorities,
+  ;; we simplify here by treating everything as integers because the ASCII
+  ;; alphabetic range also fits in an integer range.
+  (and (integerp priority)
+       ;; validate that the value is within valid ranges
+       (or (<= 0 priority 64)
+           (<= ?A priority ?Z))
+       ;; more specifically, validate within the current high/low ranges
+       ;; unless the caller is ignoring the range
+       (or ignore-user-bounds
+           (>= org-priority-lowest priority org-priority-highest))))
+
+(defun org-priority-number-p (priority)
+  "Return t if the PRIORITY is an integer 0 through 64, inclusive, nil otherwise."
+  (and (integerp priority)
+       (<= 0 priority 64)))
+
+(defun org-priority-to-string (priority)
+  "Return a string form of PRIORITY based on whether it's numeric or alphabetic."
+  ;; we check whether this is even a valid value, ignoring the current high/low bounds
+  (if (org-priority-valid-value-p priority t)
+      (if (org-priority-number-p priority)
+          (number-to-string priority)
+        (format "%c" priority))
+    (error "Invalid priority value `%s'" priority)))
 
 (defun org-priority-up ()
   "Increase the priority of the current item."
@@ -11127,67 +11415,80 @@ This regular expression matches these groups:
   (interactive)
   (org-priority 'down))
 
-(defun org-priority (&optional action show)
+(defun org-priority (&optional action)
   "Change the priority of an item.
 
 When called interactively with a `\\[universal-argument]' prefix,
 show the priority in the minibuffer instead of changing it.
 
-When called programmatically, ACTION can be `set', `up', `down',
-or a character."
+When called programmatically, ACTION can be `set', `up', `down', `remove', an
+uppercase alphabetic character A through Z, or an integer 0 through 64,
+inclusive.  If a lower-case character is passed as ACTION or entered via
+interactive prompt, it will automatically be converted to uppercase."
   (interactive "P")
-  (when show
-    ;; Deprecation warning inserted for Org 9.2; once enough time has
-    ;; passed the SHOW argument should be removed.
-    (warn "`org-priority' called with deprecated SHOW argument"))
   (if (equal action '(4))
       (org-priority-show)
     (unless org-priority-enable-commands
       (user-error "Priority commands are disabled"))
+    ;; If action was not provided, default to "set", which will prompt the user
     (setq action (or action 'set))
-    (let ((nump (< org-priority-lowest 65))
-	  current new news have remove)
+    (let ((is-numeric-priority (org-priority-number-p org-priority-lowest))
+	  current-value new-value new-value-string has-existing-cookie remove)
       (save-excursion
 	(org-back-to-heading t)
 	(when (looking-at org-priority-regexp)
 	  (let ((ms (match-string 2)))
-	    (setq current (org-priority-to-value ms)
-		  have t)))
+	    (setq current-value (org-priority-to-value ms)
+		  has-existing-cookie t)))
 	(cond
 	 ((eq action 'remove)
-	  (setq remove t new ?\ ))
+	  (setq remove t new-value ?\s))
+         ;; set and a value are treated similarly, but only if the
+         ;; value is a valid priority
 	 ((or (eq action 'set)
-	      (integerp action))
+	      (org-priority-valid-value-p action))
 	  (if (not (eq action 'set))
-	      (setq new action)
+	      (setq new-value action)
 	    (setq
-	     new
-	     (if nump
-                 (let* ((msg (format "Priority %s-%s, SPC to remove: "
-                                     (number-to-string org-priority-highest)
-                                     (number-to-string org-priority-lowest)))
-                        (s (if (< 9 org-priority-lowest)
-                               (read-string msg)
-                             (message msg)
-                             (char-to-string (read-char-exclusive)))))
-                   (if (equal s " ") ?\s (string-to-number s)))
-	       (progn (message "Priority %c-%c, SPC to remove: "
-			       org-priority-highest org-priority-lowest)
-		      (save-match-data
-			(setq new (read-char-exclusive)))))))
-	  (when (and (= (upcase org-priority-highest) org-priority-highest)
-		     (= (upcase org-priority-lowest) org-priority-lowest))
-	    (setq new (upcase new)))
-	  (cond ((equal new ?\s) (setq remove t))
-		((or (< (upcase new) org-priority-highest) (> (upcase new) org-priority-lowest))
-		 (user-error
-		  (if nump
-		      "Priority must be between `%s' and `%s'"
-		    "Priority must be between `%c' and `%c'")
-		  org-priority-highest org-priority-lowest))))
+	     new-value
+             (let* ((msg (format "Priority %s-%s, SPC to remove: "
+                                 (org-priority-to-string org-priority-highest)
+                                 (org-priority-to-string org-priority-lowest)))
+                    ;; Read input as a string if the current high/low range could
+                    ;; be two digits. Otherwise, we can just read a single
+                    ;; character and save the user from pressing <enter>
+                    (s (if (and is-numeric-priority
+                                (>= org-priority-lowest 10))
+                           (read-string msg)
+                         (char-to-string (read-char-exclusive msg)))))
+               ;; Space is a special value indicating removal. For numeric
+               ;; priorities, parse the numeric value or ensure an upper case
+               ;; character (and convert back to a character for validation)
+               (if (string-equal s " ")
+                   ?\s
+                 (if is-numeric-priority
+                     (progn
+                       ;; Validate the input string to ensure it's a valid value because
+                       ;; string-to-number returns zero for a non-numeric string, which could
+                       ;; be a valid priority
+                       (unless (string-match-p org-priority-value-regexp s)
+                         (user-error "Priority must be a number between `%s' and `%s'"
+		                     (org-priority-to-string org-priority-highest)
+                                     (org-priority-to-string org-priority-lowest)))
+                       (string-to-number s))
+                   ;; Validation of non-numerics is handled next
+                   (string-to-char (upcase s)))))))
+          ;; After reading interactive input, set removal flag if needed and
+          ;; perform validation on the new value
+	  (cond
+           ((equal new-value ?\s) (setq remove t))
+	   ((not (org-priority-valid-value-p new-value))
+	    (user-error "Priority must be between `%s' and `%s'"
+		        (org-priority-to-string org-priority-highest)
+                        (org-priority-to-string org-priority-lowest)))))
 	 ((eq action 'up)
-	  (setq new (if have
-			(1- current)  ; normal cycling
+	  (setq new-value (if has-existing-cookie
+			(1- current-value)  ; normal cycling
 		      ;; last priority was empty
 		      (if (eq last-command this-command)
 			  org-priority-lowest  ; wrap around empty to lowest
@@ -11196,8 +11497,8 @@ or a character."
 			    org-priority-default
 			  (1- org-priority-default))))))
 	 ((eq action 'down)
-	  (setq new (if have
-			(1+ current)  ; normal cycling
+	  (setq new-value (if has-existing-cookie
+			(1+ current-value)  ; normal cycling
 		      ;; last priority was empty
 		      (if (eq last-command this-command)
 			  org-priority-highest  ; wrap around empty to highest
@@ -11205,37 +11506,43 @@ or a character."
 			(if org-priority-start-cycle-with-default
 			    org-priority-default
 			  (1+ org-priority-default))))))
-	 (t (user-error "Invalid action")))
-	(when (or (< (upcase new) org-priority-highest)
-		  (> (upcase new) org-priority-lowest))
+	 (t (user-error (concat "Invalid action: `%s'.  Action must be one of "
+                                "`up', `down', `set', `remove' or a value "
+                                "between `%s' and `%s'")
+                        action
+                        (org-priority-to-string org-priority-highest)
+                        (org-priority-to-string org-priority-lowest))))
+        ;; Check against the current high/low range if we need to wrap
+	(when (not (org-priority-valid-value-p new-value))
 	  (if (and (memq action '(up down))
-		   (not have) (not (eq last-command this-command)))
-	      ;; `new' is from default priority
+		   (not has-existing-cookie) (not (eq last-command this-command)))
+	      ;; `new-value' is from default priority
 	      (error
 	       "The default can not be set, see `org-priority-default' why")
-	    ;; normal cycling: `new' is beyond highest/lowest priority
+	    ;; normal cycling: `new-value' is beyond highest/lowest priority
 	    ;; and is wrapped around to the empty priority
 	    (setq remove t)))
-	;; Numerical priorities are limited to 64, beyond that number,
-	;; assume the priority cookie is a character.
-	(setq news (if (> new 64) (format "%c" new) (format "%s" new)))
-	(if have
+        (setq new-value-string
+              (if remove
+                  "removed"
+                (org-priority-to-string new-value)))
+	(if has-existing-cookie
 	    (if remove
 		(replace-match "" t t nil 1)
-	      (replace-match news t t nil 2))
+	      (replace-match new-value-string t t nil 2))
 	  (if remove
 	      (user-error "No priority cookie found in line")
 	    (let ((case-fold-search nil)) (looking-at org-todo-line-regexp))
 	    (if (match-end 2)
 		(progn
 		  (goto-char (match-end 2))
-		  (insert " [#" news "]"))
+		  (insert " [#" new-value-string "]"))
 	      (goto-char (match-beginning 3))
-	      (insert "[#" news "] "))))
+	      (insert "[#" new-value-string "] "))))
 	(when org-auto-align-tags (org-align-tags)))
       (if remove
 	  (message "Priority removed")
-	(message "Priority of current item set to %s" news)))))
+	(message "Priority of current item set to %s" new-value-string)))))
 
 (defalias 'org-show-priority 'org-priority-show)
 (defun org-priority-show ()
@@ -11411,6 +11718,7 @@ headlines matching this string."
 		 'todo-state todo
                  'ts-date ts-date
 		 'priority priority
+                 'urgency priority
                  'type (concat "tagsmatch" ts-date-type))
 	       (push txt rtn))
 	      ((functionp action)
@@ -11432,9 +11740,11 @@ headlines matching this string."
        :next-re heading-re
        :fail-re heading-re
        :narrow t))
-    (when (and (eq action 'sparse-tree)
-	       (not org-sparse-tree-open-archived-trees))
-      (org-fold-hide-archived-subtrees (point-min) (point-max)))
+    (when (eq action 'sparse-tree)
+      (unless org-sparse-tree-open-archived-trees
+        (org-fold-hide-archived-subtrees (point-min) (point-max)))
+      (when org-highlight-sparse-tree-matches
+        (setq next-error-last-buffer (current-buffer))))
     (nreverse rtn)))
 
 (defun org-remove-uninherited-tags (tags)
@@ -11629,7 +11939,7 @@ See also `org-scan-tags'."
 		   (mm
 		    (cond
 		     (regexp			; [2]
-                      `(with-syntax-table org-mode-tags-syntax-table
+                      `(org-with-syntax-table org-mode-tags-syntax-table
                          (org-match-any-p ,(substring tag 1 -1) tags-list)))
 		     (propp
 		      (let* (;; Determine property name.
@@ -11783,7 +12093,7 @@ the list of tags in this group."
 	    (add-text-properties
 	     (match-beginning 0) (match-end 0) '(regexp t) return-match)))
 	;; For each tag token found in MATCH, compute a regexp and  it
-	(with-syntax-table org-mode-tags-syntax-table
+	(org-with-syntax-table org-mode-tags-syntax-table
 	  (replace-regexp-in-string
 	   key-regexp
 	   (lambda (m)
@@ -11940,7 +12250,7 @@ in Lisp code use `org-set-tags' instead."
 	       (tags
 		(replace-regexp-in-string
 		 ;; Ignore all forbidden characters in tags.
-		 "[^[:alnum:]_@#%]+" ":"
+                 org-tag--invalid-char-re ":"
 		 (if (or (eq t org-use-fast-tag-selection)
 			 (and org-use-fast-tag-selection
 			      (delq nil (mapcar #'cdr table))))
@@ -12007,8 +12317,8 @@ This function assumes point is on a headline."
 		   (_ (error "Invalid tag specification: %S" tags))))
 	   (old-tags (org-get-tags nil t))
 	   (tags-change? nil))
-       (when (functionp org-tags-sort-function)
-         (setq tags (sort tags org-tags-sort-function)))
+       (when org-tags-sort-function
+         (setq tags (sort tags #'org-tags-sort)))
        (setq tags-change? (not (equal tags old-tags)))
        (when tags-change?
          ;; Delete previous tags and any trailing white space.
@@ -12073,9 +12383,15 @@ This works in the agenda, and also in an Org buffer."
 
 (defun org-tags-completion-function (string _predicate &optional flag)
   "Complete tag STRING.
+
+The format for tag string is described in the
+Info node `(org) Matching tags and properties'.
+
 FLAG specifies the type of completion operation to perform.  This
 function is passed as a collection function to `completing-read',
 which see."
+  ;; FIXME: This function is used to complete a tag string which can
+  ;; include properties but does not know anything about properties
   (let ((completion-ignore-case nil)	;tags are case-sensitive
 	(confirm (lambda (x) (stringp (car x))))
 	(prefix "")
@@ -12089,7 +12405,7 @@ which see."
       (`lambda (assoc string org-last-tags-completion-table)) ;exact match?
       (`(boundaries . ,suffix)
        (let ((end (if (string-match "[-+:&,|]" suffix)
-                      (match-string 0 suffix)
+                      (match-beginning 0)
                     (length suffix))))
          `(boundaries ,(or begin 0) . ,end)))
       (`nil
@@ -12886,7 +13202,7 @@ strings."
 	      (push (cons "PRIORITY"
 			  (if (looking-at org-priority-regexp)
 			      (match-string-no-properties 2)
-			    (char-to-string org-priority-default)))
+			    (org-priority-to-string org-priority-default)))
 		    props)
 	      (when specific (throw 'exit props)))
 	    (when (or (not specific) (string= specific "FILE"))
@@ -13269,7 +13585,7 @@ decreases scheduled or deadline date by one day."
 	 (org-todo value)
 	 (when org-auto-align-tags (org-align-tags)))
         ((equal property "PRIORITY")
-	 (org-priority (if (org-string-nw-p value) (string-to-char value) ?\s))
+	 (org-priority (if (org-string-nw-p value) (org-priority-to-value value) 'remove))
 	 (when org-auto-align-tags (org-align-tags)))
         ((equal property "SCHEDULED")
 	 (forward-line)
@@ -13698,7 +14014,7 @@ completion."
      ((equal property "PRIORITY")
       (let ((n org-priority-lowest))
 	(while (>= n org-priority-highest)
-	  (push (char-to-string n) vals)
+	  (push (org-priority-to-string n) vals)
 	  (setq n (1- n)))))
      ((equal property "CATEGORY"))
      ((member property org-special-properties))
@@ -14033,10 +14349,10 @@ the time/date that is used for everything that is not specified by the
 user."
   (require 'parse-time)
   (let* ((org-with-time with-time)
-	 (org-timestamp-rounding-minutes
+	 (org-time-stamp-rounding-minutes
 	  (if (equal org-with-time '(16))
 	      '(0 0)
-	    org-timestamp-rounding-minutes))
+	    org-time-stamp-rounding-minutes))
 	 (ct (org-current-time))
 	 (org-def (or org-overriding-default-time default-time ct))
 	 (org-defdecode (decode-time org-def))
@@ -14073,13 +14389,15 @@ user."
 	      (setq cal-frame
 		    (window-frame (get-buffer-window calendar-buffer 'visible)))
 	      (select-frame cal-frame))
-	    (org-eval-in-calendar '(setq cursor-type nil) t)
+	    ;; FIXME: Not sure we need `with-current-buffer' but I couldn't
+            ;; convince myself that we're always in `calendar-buffer' after
+            ;; the call to `calendar'.
+	    (with-current-buffer calendar-buffer (setq cursor-type nil))
 	    (unwind-protect
-		(progn
-		  (calendar-forward-day (- (time-to-days org-def)
-					   (calendar-absolute-from-gregorian
-					    (calendar-current-date))))
-		  (org-eval-in-calendar nil t)
+		(let ((days (- (time-to-days org-def)
+			       (calendar-absolute-from-gregorian
+				(calendar-current-date)))))
+		  (org-funcall-in-calendar #'calendar-forward-day t days)
 		  (let* ((old-map (current-local-map))
 			 (map (copy-keymap calendar-mode-map))
 			 (minibuffer-local-map
@@ -14463,20 +14781,20 @@ user function argument order change dependent on argument order."
     (`european (list arg2 arg1 arg3))
     (`iso (list arg2 arg3 arg1))))
 
-(defun org-eval-in-calendar (form &optional keepdate)
-  "Eval FORM in the calendar window and return to current window.
+(defun org-funcall-in-calendar (func &optional keepdate &rest args)
+  "Call FUNC in the calendar window and return to current window.
 Unless KEEPDATE is non-nil, update `org-ans2' to the cursor date."
-  (let ((sf (selected-frame))
-	(sw (selected-window)))
-    (select-window (get-buffer-window calendar-buffer t))
-    (eval form t)
+  (with-selected-window (get-buffer-window calendar-buffer t)
+    (apply func args)
     (when (and (not keepdate) (calendar-cursor-to-date))
       (let* ((date (calendar-cursor-to-date))
 	     (time (org-encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date))))
 	(setq org-ans2 (format-time-string "%Y-%m-%d" time))))
-    (move-overlay org-date-ovl (1- (point)) (1+ (point)) (current-buffer))
-    (select-window sw)
-    (select-frame-set-input-focus sf)))
+    (move-overlay org-date-ovl (1- (point)) (1+ (point)) (current-buffer))))
+
+(defun org-eval-in-calendar (form &optional keepdate)
+  (declare (obsolete org-funcall-in-calendar "2024"))
+  (org-funcall-in-calendar (lambda () (eval form t)) keepdate))
 
 (defun org-calendar-goto-today-or-insert-dot ()
   "Go to the current date, or insert a dot.
@@ -14488,81 +14806,92 @@ insert \".\"."
   (if (looking-back "^[^:]+: "
 		    (let ((inhibit-field-text-motion t))
 		      (line-beginning-position)))
-      (org-eval-in-calendar '(calendar-goto-today))
+      (org-funcall-in-calendar #'calendar-goto-today)
     (insert ".")))
 
 (defun org-calendar-goto-today ()
   "Reposition the calendar window so the current date is visible."
   (interactive)
-  (org-eval-in-calendar '(calendar-goto-today)))
+  (org-funcall-in-calendar #'calendar-goto-today))
 
 (defun org-calendar-backward-month ()
   "Move the cursor backward by one month."
   (interactive)
-  (org-eval-in-calendar '(calendar-backward-month 1)))
+  (org-funcall-in-calendar #'calendar-backward-month nil 1))
 
 (defun org-calendar-forward-month ()
   "Move the cursor forward by one month."
   (interactive)
-  (org-eval-in-calendar '(calendar-forward-month 1)))
+  (org-funcall-in-calendar #'calendar-forward-month nil 1))
 
 (defun org-calendar-backward-year ()
   "Move the cursor backward by one year."
   (interactive)
-  (org-eval-in-calendar '(calendar-backward-year 1)))
+  (org-funcall-in-calendar #'calendar-backward-year nil 1))
 
 (defun org-calendar-forward-year ()
   "Move the cursor forward by one year."
   (interactive)
-  (org-eval-in-calendar '(calendar-forward-year 1)))
+  (org-funcall-in-calendar #'calendar-forward-year nil 1))
 
 (defun org-calendar-backward-week ()
   "Move the cursor backward by one week."
   (interactive)
-  (org-eval-in-calendar '(calendar-backward-week 1)))
+  (org-funcall-in-calendar #'calendar-backward-week nil 1))
 
 (defun org-calendar-forward-week ()
   "Move the cursor forward by one week."
   (interactive)
-  (org-eval-in-calendar '(calendar-forward-week 1)))
+  (org-funcall-in-calendar #'calendar-forward-week nil 1))
 
 (defun org-calendar-backward-day ()
   "Move the cursor backward by one day."
   (interactive)
-  (org-eval-in-calendar '(calendar-backward-day 1)))
+  (org-funcall-in-calendar #'calendar-backward-day nil 1))
 
 (defun org-calendar-forward-day ()
   "Move the cursor forward by one day."
   (interactive)
-  (org-eval-in-calendar '(calendar-forward-day 1)))
+  (org-funcall-in-calendar #'calendar-forward-day nil 1))
 
 (defun org-calendar-view-entries ()
   "Prepare and display a buffer with diary entries."
   (interactive)
-  (org-eval-in-calendar '(diary-view-entries))
+  (org-funcall-in-calendar #'diary-view-entries)
   (message ""))
 
 (defun org-calendar-scroll-month-left ()
   "Scroll the displayed calendar left by one month."
   (interactive)
-  (org-eval-in-calendar '(calendar-scroll-left 1)))
+  (org-funcall-in-calendar #'calendar-scroll-left nil 1))
 
 (defun org-calendar-scroll-month-right ()
   "Scroll the displayed calendar right by one month."
   (interactive)
-  (org-eval-in-calendar '(calendar-scroll-right 1)))
+  (org-funcall-in-calendar #'calendar-scroll-right nil 1))
 
+;; FIXME: Since Emacs 31, calendar.el has `calendar-total-months'.
+;; So, we are not neccesarily scrolling "three" months.
+;; Maybe rename.
 (defun org-calendar-scroll-three-months-left ()
   "Scroll the displayed calendar left by three months."
   (interactive)
-  (org-eval-in-calendar
-   '(calendar-scroll-left-three-months 1)))
+  (org-funcall-in-calendar
+   (if (fboundp 'calendar-scroll-calendar-left)
+       #'calendar-scroll-calendar-left
+     (with-suppressed-warnings ((obsolete calendar-scroll-left-three-months))
+       #'calendar-scroll-left-three-months))
+   nil 1))
 
 (defun org-calendar-scroll-three-months-right ()
   "Scroll the displayed calendar right by three months."
   (interactive)
-  (org-eval-in-calendar
-   '(calendar-scroll-right-three-months 1)))
+  (org-funcall-in-calendar
+   (if (fboundp 'calendar-scroll-calendar-right)
+       #'calendar-scroll-calendar-right
+     (with-suppressed-warnings ((obsolete calendar-scroll-right-three-months))
+       #'calendar-scroll-right-three-months))
+   nil 1))
 
 (defun org-calendar-select ()
   "Return to `org-read-date' with the date currently selected.
@@ -14609,12 +14938,11 @@ The command returns the inserted time stamp."
   (setq org-display-custom-times (not org-display-custom-times))
   (unless org-display-custom-times
     (let ((p (point-min)) (bmp (buffer-modified-p)))
-      (while (setq p (next-single-property-change p 'display))
-	(when (and (get-text-property p 'display)
-		   (eq (get-text-property p 'face) 'org-date))
+      (while (setq p (next-single-property-change p 'org-custom-date))
+	(when (get-text-property p 'org-custom-date)
 	  (remove-text-properties
-	   p (setq p (next-single-property-change p 'display))
-	   '(display t))))
+	   p (setq p (next-single-property-change p 'org-custom-date))
+	   '(display t org-custom-date t))))
       (set-buffer-modified-p bmp)))
   (org-restart-font-lock)
   (setq org-table-may-need-update t)
@@ -14637,7 +14965,8 @@ The command returns the inserted time stamp."
 	  str (org-add-props
 		  (format-time-string tf (org-encode-time time))
 		  nil 'mouse-face 'highlight))
-    (put-text-property beg end 'display str)))
+    (put-text-property beg end 'display str)
+    (put-text-property beg end 'org-custom-date t)))
 
 (defun org-fix-decoded-time (time)
   "Set 0 instead of nil for the first 6 elements of time.
@@ -15010,7 +15339,11 @@ This uses the icalendar.el library."
 	 buf rtn b e)
     (unwind-protect
         (with-current-buffer frombuf
-          (icalendar-export-region (point-min) (point-max) tmpfile)
+          (if (fboundp 'diary-icalendar-export-region)
+              (diary-icalendar-export-region (point-min) (point-max) tmpfile)
+            ;; Emacs < 31
+            (with-suppressed-warnings ((obsolete icalendar-export-region))
+              (icalendar-export-region (point-min) (point-max) tmpfile)))
           (setq buf (find-buffer-visiting tmpfile))
           (set-buffer buf)
           (goto-char (point-min))
@@ -15277,7 +15610,7 @@ The date is changed by N times WHAT.  WHAT can be `day', `month',
 position in the timestamp determines what is changed.
 
 When optional argument UPDOWN is non-nil, minutes are rounded
-according to `org-timestamp-rounding-minutes'.
+according to `org-time-stamp-rounding-minutes'.
 
 When SUPPRESS-TMP-DELAY is non-nil, suppress delays like
 \"--2d\"."
@@ -15285,7 +15618,7 @@ When SUPPRESS-TMP-DELAY is non-nil, suppress delays like
 	(timestamp? (org-at-timestamp-p 'lax))
 	origin-cat
 	with-hm inactive
-	(dm (max (nth 1 org-timestamp-rounding-minutes) 1))
+	(dm (max (nth 1 org-time-stamp-rounding-minutes) 1))
 	extra rem
 	ts time time0 fixnext clrgx)
     (unless timestamp? (user-error "Not at a timestamp"))
@@ -15379,9 +15712,13 @@ When SUPPRESS-TMP-DELAY is non-nil, suppress delays like
 	(looking-at org-ts-regexp3)
 	(goto-char
 	 (pcase origin-cat
-	   ;; `day' category ends before `hour' if any, or at the end
-	   ;; of the day name.
-	   (`day (min (or (match-beginning 7) (1- (match-end 5))) origin))
+	   ;; `day' category ends at the end of the weekday name if
+	   ;; any (group 5), or before `hour' if any (group 7), or at
+	   ;; the end of the timestamp (group 1).
+	   (`day (min (cond ((match-end 5) (1- (match-end 5)))
+                            ((match-beginning 7))
+                            (t (1- (match-end 1))))
+                      origin))
 	   (`hour (min (match-end 7) origin))
 	   (`minute (min (1- (match-end 8)) origin))
 	   ((pred integerp) (min (1- (match-end 0)) origin))
@@ -15580,26 +15917,6 @@ This requires Emacs >= 24.1, built with imagemagick support."
 	  (list :tag "Use #+ATTR* or a number of pixels" (integer))
 	  (const :tag "Use #+ATTR* or don't resize" nil)))
 
-(defcustom org-image-max-width 'fill-column
-  "When non-nil, limit the displayed image width.
-This setting only takes effect when `org-image-actual-width' is set to
-t or when #+ATTR* is set to t.
-
-Possible values:
-- `fill-column' :: limit width to `fill-column'
-- `window'      :: limit width to window width
-- integer       :: limit width to number in pixels
-- float         :: limit width to that fraction of window width
-- nil             :: do not limit image width"
-  :group 'org-appearance
-  :package-version '(Org . "9.7")
-  :type '(choice
-          (const :tag "Do not limit image width" nil)
-          (const :tag "Limit to `fill-column'" fill-column)
-          (const :tag "Limit to window width" window)
-          (integer :tag "Limit to a number of pixels")
-          (float :tag "Limit to a fraction of window width")))
-
 (defcustom org-agenda-inhibit-startup nil
   "Inhibit startup when preparing agenda buffers.
 When this variable is t, the initialization of the Org agenda
@@ -16462,8 +16779,15 @@ This uses  `org-latex-to-html-convert-command', which see."
 The function assumes that the display has the same pixel width in
 the horizontal and vertical directions."
   (if (display-graphic-p)
-      (round (/ (display-pixel-height)
-		(/ (display-mm-height) 25.4)))
+      (seq-max
+       (mapcar
+        (lambda (attr-list)
+          ;; Compute the DPI for a given display ATTR-LIST
+          (let* ((height-mm   (nth 1 (alist-get 'mm-size attr-list)))
+                 (height-px   (nth 3 (alist-get 'geometry attr-list)))
+                 (scale       (alist-get 'scale-factor attr-list 1.0)))
+            (round (/ (/ height-px scale) (/ height-mm 25.4)))))
+        (display-monitor-attributes-list)))
     (error "Attempt to calculate the dpi of a non-graphic display")))
 
 (defun org-create-formula-image
@@ -16646,427 +16970,6 @@ SNIPPETS-P indicates if this is run to create snippet images for HTML."
   (format "%g" (/ value 65535.0)))
 
 
-;; Image display
-
-(defvar-local org-inline-image-overlays nil)
-;; Preserve when switching modes or when restarting Org.
-;; If we clear the overlay list and later enable Or mode, the existing
-;; image overlays will never be cleared by `org-toggle-inline-images'.
-(put 'org-inline-image-overlays 'permanent-local t)
-
-(defun org--inline-image-overlays (&optional beg end)
-  "Return image overlays between BEG and END."
-  (let* ((beg (or beg (point-min)))
-         (end (or end (point-max)))
-         (overlays (overlays-in beg end))
-         result)
-    (dolist (ov overlays result)
-      (when (memq ov org-inline-image-overlays)
-        (push ov result)))))
-
-(defun org-toggle-inline-images (&optional include-linked beg end)
-  "Toggle the display of inline images.
-INCLUDE-LINKED is passed to `org-display-inline-images'."
-  (interactive "P")
-  (if (org--inline-image-overlays beg end)
-      (progn
-        (org-remove-inline-images beg end)
-        (when (called-interactively-p 'interactive)
-	  (message "Inline image display turned off")))
-    (org-display-inline-images include-linked nil beg end)
-    (when (called-interactively-p 'interactive)
-      (let ((new (org--inline-image-overlays beg end)))
-        (message (if new
-		     (format "%d images displayed inline"
-			     (length new))
-		   "No images to display inline"))))))
-
-(defun org-redisplay-inline-images ()
-  "Assure display of inline images and refresh them."
-  (interactive)
-  (org-toggle-inline-images)
-  (unless org-inline-image-overlays
-    (org-toggle-inline-images)))
-
-;; For without-x builds.
-(declare-function image-flush "image" (spec &optional frame))
-
-(defcustom org-display-remote-inline-images 'skip
-  "How to display remote inline images.
-Possible values of this option are:
-
-skip        Don't display remote images.
-download    Always download and display remote images.
-t
-cache       Display remote images, and open them in separate buffers
-            for caching.  Silently update the image buffer when a file
-            change is detected."
-  :group 'org-appearance
-  :package-version '(Org . "9.7")
-  :type '(choice
-	  (const :tag "Ignore remote images" skip)
-	  (const :tag "Always display remote images" download)
-	  (const :tag "Display and silently update remote images" cache))
-  :safe #'symbolp)
-
-(defcustom org-image-align 'left
-  "How to align images previewed using `org-display-inline-images'.
-
-Only stand-alone image links are affected by this setting.  These
-are links without surrounding text.
-
-Possible values of this option are:
-
-left     Insert image at specified position.
-center   Center image previews.
-right    Right-align image previews."
-  :group 'org-appearance
-  :package-version '(Org . "9.7")
-  :type '(choice
-          (const :tag "Left align (or don\\='t align) image previews" left)
-	  (const :tag "Center image previews" center)
-	  (const :tag "Right align image previews" right))
-  :safe #'symbolp)
-
-(defun org--create-inline-image (file width)
-  "Create image located at FILE, or return nil.
-WIDTH is the width of the image.  The image may not be created
-according to the value of `org-display-remote-inline-images'."
-  (let* ((remote? (file-remote-p file))
-	 (file-or-data
-	  (pcase org-display-remote-inline-images
-	    ((guard (not remote?)) file)
-	    (`download (with-temp-buffer
-			 (set-buffer-multibyte nil)
-			 (insert-file-contents-literally file)
-			 (buffer-string)))
-	    ((or `cache `t)
-             (let ((revert-without-query '(".")))
-	       (with-current-buffer (find-file-noselect file)
-		 (buffer-string))))
-	    (`skip nil)
-	    (other
-	     (message "Invalid value of `org-display-remote-inline-images': %S"
-		      other)
-	     nil))))
-    (when file-or-data
-      (create-image file-or-data
-		    (and (image-type-available-p 'imagemagick)
-			 width
-			 'imagemagick)
-		    remote?
-		    :width width
-                    :max-width
-                    (pcase org-image-max-width
-                      (`fill-column (* fill-column (frame-char-width (selected-frame))))
-                      (`window (window-width nil t))
-                      ((pred integerp) org-image-max-width)
-                      ((pred floatp) (floor (* org-image-max-width (window-width nil t))))
-                      (`nil nil)
-                      (_ (error "Unsupported value of `org-image-max-width': %S"
-                                org-image-max-width)))
-                    :scale 1))))
-
-(defun org-display-inline-images (&optional include-linked refresh beg end)
-  "Display inline images.
-
-An inline image is a link which follows either of these
-conventions:
-
-  1. Its path is a file with an extension matching return value
-     from `image-file-name-regexp' and it has no contents.
-
-  2. Its description consists in a single link of the previous
-     type.  In this case, that link must be a well-formed plain
-     or angle link, i.e., it must have an explicit \"file\" or
-     \"attachment\" type.
-
-Equip each image with the key-map `image-map'.
-
-When optional argument INCLUDE-LINKED is non-nil, also links with
-a text description part will be inlined.  This can be nice for
-a quick look at those images, but it does not reflect what
-exported files will look like.
-
-When optional argument REFRESH is non-nil, refresh existing
-images between BEG and END.  This will create new image displays
-only if necessary.
-
-BEG and END define the considered part.  They default to the
-buffer boundaries with possible narrowing."
-  (interactive "P")
-  (when (display-graphic-p)
-    (when refresh
-      (org-remove-inline-images beg end)
-      (when (fboundp 'clear-image-cache) (clear-image-cache)))
-    (let ((end (or end (point-max))))
-      (org-with-point-at (or beg (point-min))
-	(let* ((case-fold-search t)
-	       (file-extension-re (image-file-name-regexp))
-	       (link-abbrevs (mapcar #'car
-				     (append org-link-abbrev-alist-local
-					     org-link-abbrev-alist)))
-	       ;; Check absolute, relative file names and explicit
-	       ;; "file:" links.  Also check link abbreviations since
-	       ;; some might expand to "file" links.
-	       (file-types-re
-		(format "\\[\\[\\(?:file%s:\\|attachment:\\|[./~]\\)\\|\\]\\[\\(<?\\(?:file\\|attachment\\):\\)"
-			(if (not link-abbrevs) ""
-			  (concat "\\|" (regexp-opt link-abbrevs))))))
-	  (while (re-search-forward file-types-re end t)
-	    (let* ((link (org-element-lineage
-			  (save-match-data (org-element-context))
-			  'link t))
-                   (linktype (org-element-property :type link))
-		   (inner-start (match-beginning 1))
-		   (path
-		    (cond
-		     ;; No link at point; no inline image.
-		     ((not link) nil)
-		     ;; File link without a description.  Also handle
-		     ;; INCLUDE-LINKED here since it should have
-		     ;; precedence over the next case.  I.e., if link
-		     ;; contains filenames in both the path and the
-		     ;; description, prioritize the path only when
-		     ;; INCLUDE-LINKED is non-nil.
-		     ((or (not (org-element-contents-begin link))
-			  include-linked)
-		      (and (or (equal "file" linktype)
-                               (equal "attachment" linktype))
-			   (org-element-property :path link)))
-		     ;; Link with a description.  Check if description
-		     ;; is a filename.  Even if Org doesn't have syntax
-		     ;; for those -- clickable image -- constructs, fake
-		     ;; them, as in `org-export-insert-image-links'.
-		     ((not inner-start) nil)
-		     (t
-		      (org-with-point-at inner-start
-			(and (looking-at
-			      (if (char-equal ?< (char-after inner-start))
-				  org-link-angle-re
-				org-link-plain-re))
-			     ;; File name must fill the whole
-			     ;; description.
-			     (= (org-element-contents-end link)
-				(match-end 0))
-			     (progn
-                               (setq linktype (match-string 1))
-                               (match-string 2))))))))
-	      (when (and path (string-match-p file-extension-re path))
-		(let ((file (if (equal "attachment" linktype)
-				(progn
-                                  (require 'org-attach)
-				  (ignore-errors (org-attach-expand path)))
-                              (expand-file-name path))))
-                  ;; Expand environment variables.
-                  (when file (setq file (substitute-in-file-name file)))
-		  (when (and file (file-exists-p file))
-		    (let ((width (org-display-inline-image--width link))
-			  (align (org-image--align link))
-                          (old (get-char-property-and-overlay
-				(org-element-begin link)
-				'org-image-overlay)))
-		      (if (and (car-safe old) refresh)
-                          (image-flush (overlay-get (cdr old) 'display))
-			(let ((image (org--create-inline-image file width)))
-			  (when image
-			    (let ((ov (make-overlay
-				       (org-element-begin link)
-				       (progn
-					 (goto-char
-					  (org-element-end link))
-					 (unless (eolp) (skip-chars-backward " \t"))
-					 (point)))))
-                              ;; See bug#59902.  We cannot rely
-                              ;; on Emacs to update image if the file
-                              ;; has changed.
-                              (image-flush image)
-			      (overlay-put ov 'display image)
-			      (overlay-put ov 'face 'default)
-			      (overlay-put ov 'org-image-overlay t)
-			      (overlay-put
-			       ov 'modification-hooks
-			       (list 'org-display-inline-remove-overlay))
-			      (when (boundp 'image-map)
-				(overlay-put ov 'keymap image-map))
-                              (when align
-                                (overlay-put
-                                 ov 'before-string
-                                 (propertize
-                                  " " 'face 'default
-                                  'display
-                                  (pcase align
-                                    ("center" `(space :align-to (- center (0.5 . ,image))))
-                                    ("right"  `(space :align-to (- right ,image)))))))
-			      (push ov org-inline-image-overlays))))))))))))))))
-
-(declare-function org-export-read-attribute "ox"
-                  (attribute element &optional property))
-(defvar visual-fill-column-width) ; Silence compiler warning
-(defun org-display-inline-image--width (link)
-  "Determine the display width of the image LINK, in pixels.
-- When `org-image-actual-width' is t, the image's pixel width is used.
-- When `org-image-actual-width' is a number, that value will is used.
-- When `org-image-actual-width' is nil or a list, :width attribute of
-  #+attr_org or the first #+attr_...  (if it exists) is used to set the
-  image width.  A width of X% is divided by 100.  If the value is a
-  float between 0 and 2, it interpreted as that proportion of the text
-  width in the buffer.
-
-  If no :width attribute is given and `org-image-actual-width' is a
-  list with a number as the car, then that number is used as the
-  default value."
-  ;; Apply `org-image-actual-width' specifications.
-  ;; Support subtree-level property "ORG-IMAGE-ACTUAL-WIDTH" specified
-  ;; width.
-  (let ((org-image-actual-width (org-property-or-variable-value 'org-image-actual-width)))
-    (cond
-     ((eq org-image-actual-width t) nil)
-     ((listp org-image-actual-width)
-      (require 'ox)
-      (let* ((par (org-element-lineage link 'paragraph))
-             ;; Try to find an attribute providing a :width.
-             ;; #+ATTR_ORG: :width ...
-             (attr-width (org-export-read-attribute :attr_org par :width))
-             (width-unreadable?
-              (lambda (value)
-                (or (not (stringp value))
-                    (unless (string= value "t")
-                      (or (not (string-match-p
-                              (rx bos (opt "+") (opt ".") (in "0-9"))
-                              value))
-                          (let ((number (string-to-number value)))
-                            (and (floatp number) (not (<= 0.0 number 2.0)))))))))
-             ;; #+ATTR_BACKEND: :width ...
-             (attr-other
-              (catch :found
-                (org-element-properties-map
-                 (lambda (prop _)
-                   (when (and
-                          (not (eq prop :attr_org))
-                          (string-match-p "^:attr_" (symbol-name prop))
-                          (not (funcall width-unreadable? (org-export-read-attribute prop par :width))))
-                     (throw :found prop)))
-                 par)))
-             (attr-width
-              (if (not (funcall width-unreadable? attr-width))
-                  attr-width
-                ;; When #+attr_org: does not have readable :width
-                (and attr-other
-                     (org-export-read-attribute attr-other par :width))))
-             (width
-              (cond
-               ;; Treat :width t as if `org-image-actual-width' were t.
-               ((string= attr-width "t") nil)
-               ;; Fallback to `org-image-actual-width' if no interprable width is given.
-               ((funcall width-unreadable? attr-width)
-                (car org-image-actual-width))
-               ;; Convert numeric widths to numbers, converting percentages.
-               ((string-match-p "\\`[[+]?[0-9.]+%" attr-width)
-                (/ (string-to-number attr-width) 100.0))
-               (t (string-to-number attr-width)))))
-        (if (and (floatp width) (<= 0.0 width 2.0))
-            ;; A float in [0,2] should be interpereted as this portion of
-            ;; the text width in the window.  This works well with cases like
-            ;; #+attr_latex: :width 0.X\{line,page,column,etc.}width,
-            ;; as the "0.X" is pulled out as a float.  We use 2 as the upper
-            ;; bound as cases such as 1.2\linewidth are feasible.
-            (round (* width
-                      (window-pixel-width)
-                      (/ (or (and (bound-and-true-p visual-fill-column-mode)
-                                  (or visual-fill-column-width auto-fill-function))
-                             (when auto-fill-function fill-column)
-                             (- (window-text-width) (line-number-display-width)))
-                         (float (window-total-width)))))
-          width)))
-     ((numberp org-image-actual-width)
-      org-image-actual-width)
-     (t nil))))
-
-(defun org-image--align (link)
-  "Determine the alignment of the image LINK.
-LINK is a link object.
-
-In decreasing order of priority, this is controlled:
-- Per image by the value of `:center' or `:align' in the
-affiliated keyword `#+attr_org'.
-- By the `#+attr_html' or `#+attr_latex` keywords with valid
-  `:center' or `:align' values.
-- Globally by the user option `org-image-align'.
-
-The result is either nil or one of the strings \"left\",
-\"center\" or \"right\".
-
-\"center\" will cause the image preview to be centered, \"right\"
-will cause it to be right-aligned.  A value of \"left\" or nil
-implies no special alignment."
-  (let ((par (org-element-lineage link 'paragraph)))
-    ;; Only align when image is not surrounded by paragraph text:
-    (when (and par ; when image is not in paragraph, but in table/headline/etc, do not align
-               (= (org-element-begin link)
-                  (save-excursion
-                    (goto-char (org-element-contents-begin par))
-                    (skip-chars-forward "\t ")
-                    (point)))           ;account for leading space
-                                        ;before link
-               (<= (- (org-element-contents-end par)
-                     (org-element-end link))
-                  1))                  ;account for trailing newline
-                                        ;at end of paragraph
-      (save-match-data
-        ;; Look for a valid ":center t" or ":align left|center|right"
-        ;; attribute.
-        ;;
-        ;; An attr_org keyword has the highest priority, with
-        ;; any attr.* next.  Choosing between these is
-        ;; unspecified.
-        (let ((center-re ":\\(center\\)[[:space:]]+t\\b")
-              (align-re ":align[[:space:]]+\\(left\\|center\\|right\\)\\b")
-              attr-align)
-          (catch 'exit
-            (org-element-properties-mapc
-             (lambda (propname propval)
-               (when (and propval
-                          (string-match-p ":attr.*" (symbol-name propname)))
-                 (setq propval (car-safe propval))
-                 (when (or (string-match center-re propval)
-                           (string-match align-re propval))
-                   (setq attr-align (match-string 1 propval))
-                   (when (eq propname :attr_org)
-                     (throw 'exit t)))))
-             par))
-          (if attr-align
-              (when (member attr-align '("center" "right")) attr-align)
-            ;; No image-specific keyword, check global alignment property
-            (when (memq org-image-align '(center right))
-              (symbol-name org-image-align))))))))
-
-
-(defun org-display-inline-remove-overlay (ov after _beg _end &optional _len)
-  "Remove inline-display overlay if a corresponding region is modified."
-  (when (and ov after)
-    (setq org-inline-image-overlays (delete ov org-inline-image-overlays))
-    ;; Clear image from cache to avoid image not updating upon
-    ;; changing on disk.  See Emacs bug#59902.
-    (when (overlay-get ov 'org-image-overlay)
-      (image-flush (overlay-get ov 'display)))
-    (delete-overlay ov)))
-
-(defun org-remove-inline-images (&optional beg end)
-  "Remove inline display of images."
-  (interactive)
-  (let* ((beg (or beg (point-min)))
-         (end (or end (point-max)))
-         (overlays (overlays-in beg end)))
-    (dolist (ov overlays)
-      (when (memq ov org-inline-image-overlays)
-        (setq org-inline-image-overlays (delq ov org-inline-image-overlays))
-        (delete-overlay ov)))
-    ;; Clear removed overlays.
-    (dolist (ov org-inline-image-overlays)
-      (unless (overlay-buffer ov)
-        (setq org-inline-image-overlays (delq ov org-inline-image-overlays))))))
-
 (defvar org-self-insert-command-undo-counter 0)
 (defvar org-speed-command nil)
 
@@ -17234,7 +17137,7 @@ This uses the `org-mode-transpose-word-syntax-table' syntax
 table, which interprets characters in `org-emphasis-alist' as
 word constituents."
   (interactive)
-  (with-syntax-table org-mode-transpose-word-syntax-table
+  (org-with-syntax-table org-mode-transpose-word-syntax-table
     (call-interactively 'transpose-words)))
 
 (defvar org-ctrl-c-ctrl-c-hook nil
@@ -17634,7 +17537,8 @@ function runs `org-metaup-final-hook' using the same logic."
             (org-at-heading-p))))
     (when (org-check-for-hidden 'headlines) (org-hidden-tree-error))
     (let ((beg (region-beginning))
-          (end (region-end)))
+          (end (region-end))
+          (region-extended nil))
       (save-excursion
         ;; Go a little earlier because `org-move-subtree-down' will
         ;; insert before markers and we may overshoot in some cases.
@@ -17651,8 +17555,17 @@ function runs `org-metaup-final-hook' using the same logic."
             (user-error "Cannot move past superior level or buffer limit"))
           ;; Drag first subtree above below the selected.
           (while (< (point) end)
-            (let ((deactivate-mark nil))
-              (call-interactively 'org-move-subtree-down)))))))
+            (call-interactively 'org-move-subtree-down)
+            (setq deactivate-mark (org--deactivate-mark)))
+          ;; When `org-move-subtree-down' inserts before markers, the
+          ;; region boundaries will extend to the moved
+          ;; heading. Prevent this.
+          (when (<= (point) (region-end))
+            (setq region-extended t))))
+      (when region-extended
+        (if (= (region-beginning) (point))
+            (set-mark (1+ end))
+          (goto-char (1+ end))))))
    ((org-region-active-p)
     (let* ((a (save-excursion
                 (goto-char (region-beginning))
@@ -17717,8 +17630,8 @@ function runs `org-metadown-final-hook' using the same logic."
             (user-error "Cannot move past superior level or buffer limit"))
           ;; Drag first subtree below above the selected.
           (while (> (point) beg)
-            (let ((deactivate-mark nil))
-              (call-interactively 'org-move-subtree-up)))))))
+            (call-interactively 'org-move-subtree-up)
+            (setq deactivate-mark (org--deactivate-mark)))))))
    ((org-region-active-p)
     (let* ((a (save-excursion
                 (goto-char (region-beginning))
@@ -18035,7 +17948,7 @@ context.  See the individual commands for more information."
    (if (org-at-table-p) #'org-table-cut-region #'org-cut-subtree)))
 
 (defun org-paste-special (arg)
-  "Paste rectangular region into table, or past subtree relative to level.
+  "Paste rectangular region into table, or paste subtree relative to level.
 Calls `org-table-paste-rectangle' or `org-paste-subtree', depending on context.
 See the individual commands for more information."
   (interactive "P")
@@ -18255,6 +18168,8 @@ This command does many different things, depending on context:
 	     (org-toggle-radio-button arg)
 	   (let* ((box (org-element-property :checkbox context))
 		  (struct (org-element-property :structure context))
+                  ;; Avoid modifying cached structure by side effect.
+                  (struct (copy-tree struct))
 		  (old-struct (copy-tree struct))
 		  (parents (org-list-parents-alist struct))
 		  (prevs (org-list-prevs-alist struct))
@@ -18298,6 +18213,8 @@ This command does many different things, depending on context:
 	     (org-toggle-radio-button arg)
 	   (let* ((begin (org-element-contents-begin context))
 		  (struct (org-element-property :structure context))
+                  ;; Avoid modifying cached structure by side effect.
+                  (struct (copy-tree struct))
 		  (old-struct (copy-tree struct))
 		  (first-box (save-excursion
 			       (goto-char begin)
@@ -18358,8 +18275,7 @@ Use `\\[org-edit-special]' to edit table.el tables")))
                     (= (point) (org-element-end context))))
            (save-excursion
              (if (org-at-TBLFM-p)
-                 (progn (require 'org-table)
-                        (org-table-calc-current-TBLFM))
+                 (org-table-calc-current-TBLFM)
                (goto-char (org-element-contents-begin context))
                (org-call-with-arg 'org-table-recalculate (or arg t))
                (orgtbl-send-table 'maybe))))
@@ -18529,17 +18445,22 @@ object (e.g., within a comment).  In these case, you need to use
      ;; if `org-return-follows-link' allows it.  Tolerate fuzzy
      ;; locations, e.g., in a comment, as `org-open-at-point'.
      ((and org-return-follows-link
-	   (or (and (eq 'link element-type)
-		    ;; Ensure point is not on the white spaces after
-		    ;; the link.
-		    (let ((origin (point)))
-		      (org-with-point-at (org-element-end context)
-			(skip-chars-backward " \t")
-			(> (point) origin))))
-	       (org-in-regexp org-ts-regexp-both nil t)
-	       (org-in-regexp org-tsr-regexp-both nil  t)
-               (org-element-lineage context '(citation citation-reference) 'include-self)
-	       (org-in-regexp org-link-any-re nil t)))
+	   (or
+            (let ((context
+                   (org-element-lineage
+                    context
+                    '(citation citation-reference link)
+                    'include-self)))
+              (and context
+                   ;; Ensure point is not on the white spaces after
+                   ;; the link.
+                   (let ((origin (point)))
+                     (org-with-point-at (org-element-end context)
+                       (skip-chars-backward " \t")
+                       (> (point) origin)))))
+            (org-in-regexp org-ts-regexp-both nil t)
+            (org-in-regexp org-tsr-regexp-both nil  t)
+            (org-in-regexp org-link-any-re nil t)))
       (call-interactively #'org-open-at-point))
      ;; Insert newline in heading, but preserve tags.
      ((and (not (bolp))
@@ -18770,7 +18691,7 @@ an argument, unconditionally call `org-insert-heading'."
      ["Reveal Context" org-fold-reveal t]
      ["Show All" org-fold-show-all t]
      "--"
-     ["Subtree to indirect buffer" org-tree-to-indirect-buffer t])
+     ["Subtree to Indirect Buffer" org-tree-to-indirect-buffer t])
     "--"
     ["New Heading" org-insert-heading t]
     ("Navigate Headings"
@@ -18785,94 +18706,95 @@ an argument, unconditionally call `org-insert-heading'."
      ["Move Subtree Up" org-metaup (org-at-heading-p)]
      ["Move Subtree Down" org-metadown (org-at-heading-p)]
      "--"
-     ["Copy Subtree"  org-copy-special (org-in-subtree-not-table-p)]
-     ["Cut Subtree"  org-cut-special (org-in-subtree-not-table-p)]
+     ["Copy Subtree" org-copy-special (org-in-subtree-not-table-p)]
+     ["Cut Subtree" org-cut-special (org-in-subtree-not-table-p)]
      ["Paste Subtree"  org-paste-special (not (org-at-table-p))]
      "--"
-     ["Clone subtree, shift time" org-clone-subtree-with-time-shift t]
+     ["Clone Subtree, Shift Time" org-clone-subtree-with-time-shift t]
      "--"
-     ["Copy visible text"  org-copy-visible t]
+     ["Copy Visible Text" org-copy-visible t]
      "--"
      ["Promote Heading" org-metaleft (org-in-subtree-not-table-p)]
      ["Promote Subtree" org-shiftmetaleft (org-in-subtree-not-table-p)]
-     ["Demote Heading"  org-metaright (org-in-subtree-not-table-p)]
-     ["Demote Subtree"  org-shiftmetaright (org-in-subtree-not-table-p)]
+     ["Demote Heading" org-metaright (org-in-subtree-not-table-p)]
+     ["Demote Subtree" org-shiftmetaright (org-in-subtree-not-table-p)]
      "--"
      ["Sort Region/Children" org-sort t]
      "--"
-     ["Convert to odd levels" org-convert-to-odd-levels t]
-     ["Convert to odd/even levels" org-convert-to-oddeven-levels t])
+     ["Convert to Odd Levels" org-convert-to-odd-levels t]
+     ["Convert to Odd/Even Levels" org-convert-to-oddeven-levels t])
     ("Editing"
      ["Emphasis..." org-emphasize t]
-     ["Add block structure" org-insert-structure-template t]
+     ["Add Block Structure" org-insert-structure-template t]
      ["Edit Source Example" org-edit-special t]
      "--"
-     ["Footnote new/jump" org-footnote-action t]
-     ["Footnote extra" (org-footnote-action t) :active t :keys "C-u C-c C-x f"])
+     ["Footnote New/Jump" org-footnote-action t]
+     ["Footnote Extra" (org-footnote-action t) :active t :keys "C-u C-c C-x f"])
     ("Archive"
-     ["Archive (default method)" org-archive-subtree-default (org-in-subtree-not-table-p)]
+     ["Archive (Default Method)" org-archive-subtree-default (org-in-subtree-not-table-p)]
      "--"
-     ["Move Subtree to Archive file" org-archive-subtree (org-in-subtree-not-table-p)]
-     ["Toggle ARCHIVE tag" org-toggle-archive-tag (org-in-subtree-not-table-p)]
-     ["Move subtree to Archive sibling" org-archive-to-archive-sibling (org-in-subtree-not-table-p)])
+     ["Move Subtree to Archive File" org-archive-subtree (org-in-subtree-not-table-p)]
+     ["Toggle ARCHIVE Tag" org-toggle-archive-tag (org-in-subtree-not-table-p)]
+     ["Move Subtree to Archive Sibling" org-archive-to-archive-sibling (org-in-subtree-not-table-p)])
     "--"
     ("Hyperlinks"
      ["Store Link (Global)" org-store-link t]
-     ["Find existing link to here" org-occur-link-in-agenda-files t]
+     ["Find Existing Link to Here" org-occur-link-in-agenda-files t]
      ["Insert Link" org-insert-link t]
      ["Follow Link" org-open-at-point t]
      "--"
-     ["Next link" org-next-link t]
-     ["Previous link" org-previous-link t]
+     ["Next Link" org-next-link t]
+     ["Previous Link" org-previous-link t]
      "--"
      ["Descriptive Links"
       org-toggle-link-display
       :style radio
-      :selected org-descriptive-links
+      :selected org-link-descriptive
       ]
      ["Literal Links"
       org-toggle-link-display
       :style radio
-      :selected (not org-descriptive-links)])
+      :selected (not org-link-descriptive)])
     "--"
     ("TODO Lists"
      ["TODO/DONE/-" org-todo t]
-     ("Select keyword"
-      ["Next keyword" org-shiftright (org-at-heading-p)]
-      ["Previous keyword" org-shiftleft (org-at-heading-p)]
+     ("Select Keyword"
+      ["Next Keyword" org-shiftright (org-at-heading-p)]
+      ["Previous Keyword" org-shiftleft (org-at-heading-p)]
       ["Complete Keyword" pcomplete (assq :todo-keyword (org-context))]
-      ["Next keyword set" org-shiftcontrolright (and (> (length org-todo-sets) 1) (org-at-heading-p))]
-      ["Previous keyword set" org-shiftcontrolright (and (> (length org-todo-sets) 1) (org-at-heading-p))])
+      ["Next Keyword Set" org-shiftcontrolright (and (> (length org-todo-sets) 1) (org-at-heading-p))]
+      ["Previous Keyword Set" org-shiftcontrolright (and (> (length org-todo-sets) 1) (org-at-heading-p))])
      ["Show TODO Tree" org-show-todo-tree :active t :keys "C-c / t"]
-     ["Global TODO list" org-todo-list :active t :keys "\\[org-agenda] t"]
+     ["Global TODO List" org-todo-list :active t :keys "\\[org-agenda] t"]
      "--"
-     ["Enforce dependencies" (customize-variable 'org-enforce-todo-dependencies)
+     ["Enforce Dependencies" (customize-variable 'org-enforce-todo-dependencies)
       :selected org-enforce-todo-dependencies :style toggle :active t]
-     "Settings for tree at point"
-     ["Do Children sequentially" org-toggle-ordered-property :style radio
+     "Settings for Tree at Point"
+     "--"
+     ["Enforce TODO Completion Order"
+      org-toggle-ordered-property
+      :style toggle
       :selected (org-entry-get nil "ORDERED")
-      :active org-enforce-todo-dependencies :keys "C-c C-x o"]
-     ["Do Children parallel" org-toggle-ordered-property :style radio
-      :selected (not (org-entry-get nil "ORDERED"))
-      :active org-enforce-todo-dependencies :keys "C-c C-x o"]
+      :active org-enforce-todo-dependencies
+      :keys "C-c C-x o"]
      "--"
      ["Set Priority" org-priority t]
      ["Priority Up" org-shiftup t]
      ["Priority Down" org-shiftdown t]
      "--"
-     ["Get news from all feeds" org-feed-update-all t]
-     ["Go to the inbox of a feed..." org-feed-goto-inbox t]
-     ["Customize feeds" (customize-variable 'org-feed-alist) t])
-    ("TAGS and Properties"
+     ["Get News From All Feeds" org-feed-update-all t]
+     ["Go to Inbox of Feed..." org-feed-goto-inbox t]
+     ["Customize Feeds" (customize-variable 'org-feed-alist) t])
+    ("Tags and Properties"
      ["Set Tags" org-set-tags-command (not (org-before-first-heading-p))]
-     ["Change tag in region" org-change-tag-in-region (org-region-active-p)]
+     ["Change Tag in Region" org-change-tag-in-region (org-region-active-p)]
      "--"
-     ["Set property" org-set-property (not (org-before-first-heading-p))]
-     ["Column view of properties" org-columns t]
+     ["Set Property" org-set-property (not (org-before-first-heading-p))]
+     ["Column View of Properties" org-columns t]
      ["Insert Column View DBlock" org-columns-insert-dblock t])
     ("Dates and Scheduling"
      ["Timestamp" org-timestamp (not (org-before-first-heading-p))]
-     ["Timestamp (inactive)" org-timestamp-inactive (not (org-before-first-heading-p))]
+     ["Timestamp (Inactive)" org-timestamp-inactive (not (org-before-first-heading-p))]
      ("Change Date"
       ["1 Day Later" org-shiftright (org-at-timestamp-p 'lax)]
       ["1 Day Earlier" org-shiftleft (org-at-timestamp-p 'lax)]
@@ -18882,10 +18804,10 @@ an argument, unconditionally call `org-insert-heading'."
      ["Schedule Item" org-schedule (not (org-before-first-heading-p))]
      ["Deadline" org-deadline (not (org-before-first-heading-p))]
      "--"
-     ["Custom time format" org-toggle-timestamp-overlays
+     ["Custom Time Format" org-toggle-timestamp-overlays
       :style radio :selected org-display-custom-times]
      "--"
-     ["Goto Calendar" org-goto-calendar t]
+     ["Go to Calendar" org-goto-calendar t]
      ["Date from Calendar" org-date-from-calendar t]
      "--"
      ["Start/Restart Timer" org-timer-start t]
@@ -18894,19 +18816,19 @@ an argument, unconditionally call `org-insert-heading'."
      ["Insert Timer String" org-timer t]
      ["Insert Timer Item" org-timer-item t])
     ("Logging work"
-     ["Clock in" org-clock-in :active t :keys "C-c C-x C-i"]
-     ["Switch task" (lambda () (interactive) (org-clock-in '(4))) :active t :keys "C-u C-c C-x C-i"]
-     ["Clock out" org-clock-out t]
-     ["Clock cancel" org-clock-cancel t]
+     ["Clock In" org-clock-in :active t :keys "C-c C-x C-i"]
+     ["Switch Task" (lambda () (interactive) (org-clock-in '(4))) :active t :keys "C-u C-c C-x C-i"]
+     ["Clock Out" org-clock-out t]
+     ["Clock Cancel" org-clock-cancel t]
      "--"
-     ["Mark as default task" org-clock-mark-default-task t]
-     ["Clock in, mark as default" (lambda () (interactive) (org-clock-in '(16))) :active t :keys "C-u C-u C-c C-x C-i"]
-     ["Goto running clock" org-clock-goto t]
+     ["Mark as Default Task" org-clock-mark-default-task t]
+     ["Clock In, Mark as Default" (lambda () (interactive) (org-clock-in '(16))) :active t :keys "C-u C-u C-c C-x C-i"]
+     ["Go to Running Clock" org-clock-goto t]
      "--"
-     ["Display times" org-clock-display t]
-     ["Create clock table" org-clock-report t]
+     ["Display Times" org-clock-display t]
+     ["Create Clock Table" org-clock-report t]
      "--"
-     ["Record DONE time"
+     ["Record DONE Time"
       (progn (setq org-log-done (not org-log-done))
 	     (message "Switching to %s will %s record a timestamp"
 		      (car org-done-keywords)
@@ -18916,35 +18838,36 @@ an argument, unconditionally call `org-insert-heading'."
     ["Agenda Command..." org-agenda t]
     ["Set Restriction Lock" org-agenda-set-restriction-lock t]
     ("File List for Agenda")
-    ("Special views current file"
+    ("Special Views Current File"
      ["TODO Tree"  org-show-todo-tree t]
      ["Check Deadlines" org-check-deadlines t]
-     ["Tags/Property tree" org-match-sparse-tree t])
+     ["Tags/Property Tree" org-match-sparse-tree t])
     "--"
     ["Export/Publish..." org-export-dispatch t]
     ("LaTeX"
      ["Org CDLaTeX mode" org-cdlatex-mode :active (require 'cdlatex nil t)
       :style toggle :selected org-cdlatex-mode]
      ["Insert Environment" cdlatex-environment (fboundp 'cdlatex-environment)]
-     ["Insert math symbol" cdlatex-math-symbol (fboundp 'cdlatex-math-symbol)]
-     ["Modify math symbol" org-cdlatex-math-modify
+     ["Insert Math Symbol" cdlatex-math-symbol (fboundp 'cdlatex-math-symbol)]
+     ["Modify Math Symbol" org-cdlatex-math-modify
       (org-inside-LaTeX-fragment-p)]
-     ["Insert citation" org-reftex-citation t])
+     ["Insert Citation" org-reftex-citation t])
     "--"
     ("Documentation"
      ["Show Version" org-version t]
-     ["Info Documentation" org-info t]
+     ["Show Org Manual" org-info t]
      ["Browse Org News" org-browse-news t])
     ("Customize"
      ["Browse Org Group" org-customize t]
      "--"
      ["Expand This Menu" org-create-customize-menu t])
-    ["Send bug report" org-submit-bug-report t]
+    ["Send Bug Report" org-submit-bug-report t]
     "--"
-    ("Refresh/Reload"
-     ["Refresh setup current buffer" org-mode-restart t]
-     ["Reload Org (after update)" org-reload t]
-     ["Reload Org uncompiled" (org-reload t) :active t :keys "C-u C-c C-x !"])))
+    ("Restart/Reload"
+     ["Restart Org in Current Buffer" org-mode-restart t]
+     "--"
+     ["Reload Org" org-reload t]
+     ["Reload Org Uncompiled" (org-reload t) :active t :keys "C-u C-c C-x !"])))
 
 (easy-menu-define org-tbl-menu org-mode-map "Org Table menu."
   '("Table"
@@ -18968,9 +18891,9 @@ an argument, unconditionally call `org-insert-heading'."
      ["Move Row Down" org-metadown (org-at-table-p)]
      ["Delete Row" org-shiftmetaup (org-at-table-p)]
      ["Insert Row" org-shiftmetadown (org-at-table-p)]
-     ["Sort lines in region" org-table-sort-lines (org-at-table-p)]
+     ["Sort Lines in Region" org-table-sort-lines (org-at-table-p)]
      "--"
-     ["Insert Hline" org-ctrl-c-minus (org-at-table-p)])
+     ["Insert Horizontal Line" org-ctrl-c-minus (org-at-table-p)])
     ("Rectangle"
      ["Copy Rectangle" org-copy-special (org-at-table-p)]
      ["Cut Rectangle" org-cut-special (org-at-table-p)]
@@ -18982,9 +18905,9 @@ an argument, unconditionally call `org-insert-heading'."
      ["Set Field Formula" (org-table-eval-formula '(4)) :active (org-at-table-p) :keys "C-u C-c ="]
      ["Edit Formulas" org-edit-special (org-at-table-p)]
      "--"
-     ["Recalculate line" org-table-recalculate (org-at-table-p)]
-     ["Recalculate all" (lambda () (interactive) (org-table-recalculate '(4))) :active (org-at-table-p) :keys "C-u C-c *"]
-     ["Iterate all" (lambda () (interactive) (org-table-recalculate '(16))) :active (org-at-table-p) :keys "C-u C-u C-c *"]
+     ["Recalculate Line" org-table-recalculate (org-at-table-p)]
+     ["Recalculate All" (lambda () (interactive) (org-table-recalculate '(4))) :active (org-at-table-p) :keys "C-u C-c *"]
+     ["Iterate All" (lambda () (interactive) (org-table-recalculate '(16))) :active (org-at-table-p) :keys "C-u C-u C-c *"]
      "--"
      ["Toggle Recalculate Mark" org-table-rotate-recalc-marks (org-at-table-p)]
      "--"
@@ -18994,7 +18917,7 @@ an argument, unconditionally call `org-insert-heading'."
     ["Debug Formulas"
      org-table-toggle-formula-debugger
      :style toggle :selected (bound-and-true-p org-table-formula-debug)]
-    ["Show Col/Row Numbers"
+    ["Show Column/Row Numbers"
      org-table-toggle-coordinate-overlays
      :style toggle
      :selected (bound-and-true-p org-table-overlay-coordinates)]
@@ -19004,11 +18927,11 @@ an argument, unconditionally call `org-insert-heading'."
     ["Import from File" org-table-import (not (org-at-table-p))]
     ["Export to File" org-table-export (org-at-table-p)]
     "--"
-    ["Create/Convert from/to table.el" org-table-create-with-table.el t]
+    ["Create/Convert 'table.el' Table" org-table-create-with-table.el t]
     "--"
     ("Plot"
-     ["Ascii plot" orgtbl-ascii-plot :active (org-at-table-p) :keys "C-c \" a"]
-     ["Gnuplot" org-plot/gnuplot :active (org-at-table-p) :keys "C-c \" g"])))
+     ["ASCII Plot" orgtbl-ascii-plot :active (org-at-table-p) :keys "C-c \" a"]
+     ["Gnuplot Plot" org-plot/gnuplot :active (org-at-table-p) :keys "C-c \" g"])))
 
 (defun org-info (&optional node)
   "Read documentation for Org in the info system.
@@ -19107,10 +19030,10 @@ Your bug report will be posted to the Org mailing list.
 	 (append
 	  (list
 	   ["Edit File List" (org-edit-agenda-file-list) t]
-	   ["Add/Move Current File to Front of List" org-agenda-file-to-front t]
-	   ["Remove Current File from List" org-remove-file t]
-	   ["Cycle through agenda files" org-cycle-agenda-files t]
-	   ["Occur in all agenda files" org-occur-in-agenda-files t]
+	   ["Add/Move Current File to Front" org-agenda-file-to-front t]
+	   ["Remove Current File" org-remove-file t]
+	   ["Cycle Through Files" org-cycle-agenda-files t]
+	   ["Occur in Files" org-occur-in-agenda-files t]
 	   "--")
 	  (mapcar 'org-file-menu-entry
 		  ;; Prevent initialization from failing.
@@ -19229,7 +19152,8 @@ With prefix arg UNCOMPILED, load the uncompiled versions."
 	(when (or (> marker (point-max)) (< marker (point-min)))
 	  (widen))
 	(goto-char marker)
-	(org-fold-show-context 'org-goto))
+        (when (derived-mode-p 'org-mode)
+	  (org-fold-show-context 'org-goto)))
     (if bookmark
 	(bookmark-jump bookmark)
       (error "Cannot find location"))))
@@ -19696,10 +19620,16 @@ ELEMENT."
 	  ;; and contents.
 	  ((and post-affiliated (= (line-beginning-position) post-affiliated))
 	   (org--get-expected-indentation element t))
-	  ;; POS is after contents in a greater element.  Indent like
-	  ;; the beginning of the element.
-	  ((and (memq type org-element-greater-elements)
-		(let ((cend (org-element-contents-end element)))
+	  ;; POS is after contents in a greater element or other block.
+	  ;; Indent like the beginning of the element.
+	  ((and (or (memq type org-element-greater-elements)
+                    (memq type '(comment-block example-block export-block
+                                               src-block verse-block)))
+		(let ((cend (or (org-element-contents-end element)
+                                (org-with-wide-buffer
+			         (goto-char (org-element-end element))
+			         (skip-chars-backward " \r\t\n")
+			         (line-beginning-position)))))
 		  (and cend (<= cend pos))))
 	   ;; As a special case, if point is at the end of a footnote
 	   ;; definition or an item, indent like the very last element
@@ -19764,7 +19694,7 @@ Indentation is done according to the following rules:
 
   - In the code part of a source block, use language major mode
     to indent current line if `org-src-tab-acts-natively' is
-    non-nil.  If it is nil, do nothing.
+    non-nil.
 
   - Otherwise, indent like the first non-blank line above.
 
@@ -19810,15 +19740,20 @@ Also align node properties according to `org-property-format'."
                     (when (not (org-src-preserve-indentation-p element))
                       (org-with-point-at (org-element-property :begin element)
                         (+ (org-current-text-indentation)
-                           org-edit-src-content-indentation)))))
-               (ignore-errors ; do not err when there is no proper major mode
-                 ;; It is important to call `indent-according-to-mode'
-                 ;; rather than `indent-line-function' here or we may
-                 ;; sometimes break `electric-indent-mode'
-                 ;; https://orgmode.org/list/5O9VMGb6WRaqeHR5_NXTb832Z2Lek_5L40YPDA52-S3kPwGYJspI8kLWaGtuq3DXyhtHpj1J7jTIXb39RX9BtCa2ecrWHjijZqI8QAD742U=@proton.me
-                 (org-babel-do-in-edit-buffer (indent-according-to-mode)))
-               (when (and block-content-ind (looking-at-p "^$"))
-                 (indent-line-to block-content-ind))))
+                           org-src-content-indentation)))))
+               ;; Avoid over-indenting when beginning of a new line is not empty.
+               ;; https://list.orgmode.org/OMCpuwZ--J-9@phdk.org/
+               (org-with-undo-amalgamate
+                (when block-content-ind
+                  (save-excursion (indent-line-to block-content-ind)))
+                (ignore-errors ; do not err when there is no proper major mode
+                  ;; It is important to call `indent-according-to-mode'
+                  ;; rather than `indent-line-function' here or we may
+                  ;; sometimes break `electric-indent-mode'
+                  ;; https://orgmode.org/list/5O9VMGb6WRaqeHR5_NXTb832Z2Lek_5L40YPDA52-S3kPwGYJspI8kLWaGtuq3DXyhtHpj1J7jTIXb39RX9BtCa2ecrWHjijZqI8QAD742U=@proton.me
+                  (org-babel-do-in-edit-buffer (indent-according-to-mode)))
+                (when (and block-content-ind (looking-at-p "^$"))
+                  (indent-line-to block-content-ind)))))
 	    (t
 	     (let ((column (org--get-expected-indentation element nil)))
 	       ;; Preserve current column.
@@ -20039,6 +19974,24 @@ Signal an error when not at a block."
   ;; parenthesis can end up being parsed as a new list item.
   (looking-at-p "[ \t]*{{{n\\(?:([^\n)]*)\\)?}}}[.)]\\(?:$\\| \\)"))
 
+(defun org-adaptive-fill-paragraph-function ()
+  "Compute a fill prefix for the current line in paragraph.
+Return fill prefix, as a string, or nil if current line isn't meant to
+be filled.  Use `adaptive-fill-regexp', but ignore Org markup at the
+beginning of the line."
+  (let ((context (org-element-context)))
+    ;; Skip over markup symbols, if any.
+    (defvar org-element-all-objects) ; org-element.el
+    (when (and (org-element-type-p context org-element-all-objects)
+               (org-element-contents-begin context)
+               (> (org-element-contents-begin context)
+                  (org-element-begin context)))
+      (goto-char (org-element-contents-begin context)))
+    ;; Delegate to `fill-match-adaptive-prefix' to handle
+    ;; `adaptive-fill-regexp'.  *Assume* that
+    ;; `fill-match-adaptive-prefix' matches at point.
+    (let (adaptive-fill-function) (fill-match-adaptive-prefix))))
+
 (defun org-adaptive-fill-function ()
   "Compute a fill prefix for the current line.
 Return fill prefix, as a string, or nil if current line isn't
@@ -20052,7 +20005,7 @@ matches in paragraphs or comments, use it."
 		       (org-element-at-point)))
 	    (type (org-element-type element))
 	    (post-affiliated (org-element-post-affiliated element)))
-       (unless (< p post-affiliated)
+       (unless (or (not element) (< p post-affiliated))
 	 (cl-case type
 	   (comment
 	    (save-excursion
@@ -20073,11 +20026,12 @@ matches in paragraphs or comments, use it."
 				     (org-element-begin parent))
 				    ?\s))
 		      ((and adaptive-fill-regexp
-			    ;; Locally disable
+			    ;; Locally override
 			    ;; `adaptive-fill-function' to let
 			    ;; `fill-context-prefix' handle
-			    ;; `adaptive-fill-regexp' variable.
-			    (let (adaptive-fill-function)
+			    ;; `adaptive-fill-regexp' variable, but
+                            ;; ignore Org markup, like "*" at bol.
+			    (let ((adaptive-fill-function #'org-adaptive-fill-paragraph-function))
 			      (fill-context-prefix
 			       post-affiliated
 			       (org-element-end element)))))
@@ -20112,7 +20066,7 @@ width for filling.
 
 For convenience, when point is at a plain list, an item or
 a footnote definition, try to fill the first paragraph within."
-  (with-syntax-table org-mode-transpose-word-syntax-table
+  (org-with-syntax-table org-mode-transpose-word-syntax-table
     ;; Move to end of line in order to get the first paragraph within
     ;; a plain list or a footnote definition.
     (let ((element (save-excursion (end-of-line) (org-element-at-point))))
@@ -20559,11 +20513,15 @@ strictly within a source block, use appropriate comment syntax."
 		end)))
       ;; Translate region boundaries for the Org buffer to the source
       ;; buffer.
-      (let ((offset (- end beg)))
+      (let (src-end)
+        (save-excursion
+          (goto-char end)
+          (org-babel-do-in-edit-buffer
+           (setq src-end (point))))
 	(save-excursion
 	  (goto-char beg)
 	  (org-babel-do-in-edit-buffer
-	   (comment-or-uncomment-region (point) (+ offset (point))))))
+	   (comment-or-uncomment-region (point) src-end))))
     (save-restriction
       ;; Restrict region
       (narrow-to-region (save-excursion (goto-char beg)
@@ -20736,7 +20694,7 @@ it has a `diary' type."
     (if (or (not org-display-custom-times) (eq type 'diary))
 	(org-element-interpret-data timestamp)
       (let ((fmt (org-time-stamp-format
-                  (org-timestamp-has-time-p timestamp) nil 'custom)))
+                  (org-timestamp-has-time-p timestamp) 'keep-format 'custom)))
 	(if (and (not boundary) (memq type '(active-range inactive-range)))
 	    (concat (org-format-timestamp timestamp fmt)
 		    "--"
@@ -20760,18 +20718,23 @@ it has a `diary' type."
     ;; Looks like different DEs go for different handler names,
     ;; https://larsee.com/blog/2019/05/clipboard-files/.
     (yank-media-handler "x/special-\\(?:gnome\\|KDE\\|mate\\)-files"
-                        #'org--copied-files-yank-media-handler))
+                        #'org--copied-files-yank-media-handler)
+    (yank-media-handler "application/x-libreoffice-tsvc"
+                        #'org--libreoffice-table-handler))
   (when (boundp 'x-dnd-direct-save-function)
     (setq-local x-dnd-direct-save-function #'org--dnd-xds-function)))
 
 (defcustom org-yank-image-save-method 'attach
   "Method to save images yanked from clipboard and dropped to Emacs.
 It can be the symbol `attach' to add it as an attachment, or a
-directory name to copy/cut the image to that directory."
+directory name to copy/cut the image to that directory, or a
+function that will be called without arguments and should return the
+directory name, as a string."
   :group 'org
-  :package-version '(Org . "9.7")
+  :package-version '(Org . "9.8")
   :type '(choice (const :tag "Add it as attachment" attach)
-                 (directory :tag "Save it in directory"))
+                 (directory :tag "Save it in directory")
+                 (function :tag "Save it in a directory returned from the function call"))
   :safe (lambda (x) (eq x 'attach)))
 
 (defcustom org-yank-image-file-name-function #'org-yank-image-autogen-filename
@@ -20811,26 +20774,36 @@ end."
          (iname (funcall org-yank-image-file-name-function))
          (filename (with-no-warnings ; Suppress warning in Emacs <28
                      (file-name-with-extension iname ext)))
+         (dirname (cond ((eq org-yank-image-save-method 'attach) temporary-file-directory)
+                        ((stringp org-yank-image-save-method) org-yank-image-save-method)
+                        ((functionp org-yank-image-save-method)
+                         (let ((retval (funcall org-yank-image-save-method)))
+                           (when (not (stringp retval))
+                             (user-error
+                              "`org-yank-image-save-method' did not return a string: %S"
+                              retval))
+                           retval))
+                        (t (user-error
+                            "Unknown value of `org-yank-image-save-method': %S"
+                            org-yank-image-save-method))))
          (absname (expand-file-name
                    filename
-                   (if (eq org-yank-image-save-method 'attach)
-                       temporary-file-directory
-                     org-yank-image-save-method)))
-         link)
+                   dirname)))
     (when (and (not (eq org-yank-image-save-method 'attach))
-               (not (file-directory-p org-yank-image-save-method)))
-      (make-directory org-yank-image-save-method t))
+               (not (file-directory-p dirname)))
+      (make-directory dirname t))
     ;; DATA is a raw image.  Tell Emacs to write it raw, without
     ;; trying to auto-detect the coding system.
     (let ((coding-system-for-write 'emacs-internal))
       (with-temp-file absname
         (insert data)))
-    (if (null (eq org-yank-image-save-method 'attach))
-        (setq link (org-link-make-string (concat "file:" (file-relative-name absname))))
-      (require 'org-attach)
-      (org-attach-attach absname nil 'mv)
-      (setq link (org-link-make-string (concat "attachment:" filename))))
-    (insert link)))
+    (insert
+     (if (not (eq org-yank-image-save-method 'attach))
+         (org-link-make-string-for-buffer (concat "file:" absname))
+       (progn
+         (require 'org-attach)
+         (apply #'org-link-make-string-for-buffer
+                (org-attach-attach absname nil 'mv)))))))
 
 ;; I cannot find a spec for this but
 ;; https://indigo.re/posts/2021-12-21-clipboard-data.html and pcmanfm
@@ -20853,6 +20826,29 @@ concerned files."
           (org--dnd-local-file-handler f action sep)
         (message "File `%s' is not readable, skipping" f)))))
 
+(defun org--libreoffice-table-handler (_mimetype data)
+  "Insert LibreOffice Calc table DATA as an Org table.
+DATA is in the TSV format."
+  ;; Some LibreOffice versions have the null byte in the selection.
+  ;; It should be safe to remove it.
+  (when (string-search "\0" data)
+    (setq data (string-replace "\0" "" data)))
+  (let ((orig-buf (current-buffer)))
+    (with-temp-buffer
+      (decode-coding-string data 'undecided nil (current-buffer))
+      (let ((tmp (current-buffer))
+            (nlines (count-lines (point-min) (point-max))))
+        (when (> nlines org-table-convert-region-max-lines)
+          (unless (yes-or-no-p
+                   (format "Inserting large table with %d lines, more than `org-table-convert-region-max-lines'.  Continue? "
+                           nlines))
+            (user-error "Table is larger than limit `org-table-convert-region-max-lines'")))
+        ;; User has chosen to ignore the limit.
+        (let ((org-table-convert-region-max-lines most-positive-fixnum))
+          (org-table-convert-region (point-min) (point-max)))
+        (with-current-buffer orig-buf
+          (insert-buffer-substring tmp))))))
+
 (defcustom org-yank-dnd-method 'ask
   "Action to perform on the dropped and the pasted files.
 When the value is the symbol,
@@ -20939,7 +20935,9 @@ in which case, space is inserted."
       (`open (dnd-open-local-file url action))
       (`file-link
        (let ((filename (dnd-get-local-file-name url)))
-         (insert (org-link-make-string (concat "file:" filename)) separator))))))
+         (insert
+          (org-link-make-string-for-buffer filename)
+          separator))))))
 
 (defun org--dnd-attach-file (url action separator)
   "Attach filename given by URL using method pertaining to ACTION.
@@ -20966,30 +20964,29 @@ SEPARATOR is the string to insert after each link."
                             (?l "hard link" ln)
                             (?s "symbolic link" lns))))
                    ('private (or org-yank-dnd-default-attach-method
-                                 org-attach-method)))))
+                                 org-attach-method))))
+         link description)
     (if separatep
         (progn
           (unless (file-directory-p org-yank-image-save-method)
             (make-directory org-yank-image-save-method t))
-          (funcall
-           (pcase method
-             ('cp #'copy-file)
-             ('mv #'rename-file)
-             ('ln #'add-name-to-file)
-             ('lns #'make-symbolic-link))
-           filename
-           (expand-file-name (file-name-nondirectory filename)
-                             org-yank-image-save-method)))
-      (org-attach-attach filename nil method))
+          (let ((stored-filename
+                 (expand-file-name
+                  (file-name-nondirectory filename)
+                  org-yank-image-save-method)))
+            (funcall
+             (pcase method
+               ('cp #'copy-file)
+               ('mv #'rename-file)
+               ('ln #'add-name-to-file)
+               ('lns #'make-symbolic-link))
+             filename stored-filename)
+            (setq link (concat "file:" stored-filename))))
+      (let ((link-pair (org-attach-attach filename nil method)))
+        (setq link (car link-pair)
+              description (cdr link-pair))))
     (insert
-     (org-link-make-string
-      (concat (if separatep
-                  "file:"
-                "attachment:")
-              (if separatep
-                  (expand-file-name (file-name-nondirectory filename)
-                                    org-yank-image-save-method)
-                (file-name-nondirectory filename))))
+     (org-link-make-string-for-buffer link description)
      separator)
     'private))
 
@@ -21014,9 +21011,10 @@ When NEED-NAME is nil, the drop is complete."
           (`open (expand-file-name (make-temp-name "emacs.") temporary-file-directory))
           (`file-link (read-file-name "Write file to: " nil nil nil filename))))
     (pcase org--dnd-xds-method
-      (`attach (insert (org-link-make-string
+      (`attach (insert (org-link-make-string-for-buffer
                         (concat "attachment:" (file-name-nondirectory filename)))))
-      (`file-link (insert (org-link-make-string (concat "file:" filename))))
+      (`file-link (insert (org-link-make-string-for-buffer
+                           (concat "file:" filename))))
       (`open (find-file filename)))
     (setq-local org--dnd-xds-method nil)))
 
@@ -21377,7 +21375,7 @@ interactive command with similar behavior."
               (org-element-at-point)
               (lambda (el)
                 (goto-char (org-element-begin el))
-                (or invisible-ok (not (org-fold-folded-p))))
+                (or invisible-ok (not (org-invisible-p))))
             '(headline inlinetask)
             'with-self 'first-match)
         (user-error "Before first headline at position %d in buffer %s"
@@ -21410,7 +21408,7 @@ Respect narrowing."
 If INVISIBLE-NOT-OK is non-nil, an invisible heading line is not ok."
   (save-excursion
     (forward-line 0)
-    (and (or (not invisible-not-ok) (not (org-fold-folded-p)))
+    (and (or (not invisible-not-ok) (not (org-invisible-p)))
 	 (looking-at outline-regexp))))
 
 (defun org-in-commented-heading-p (&optional no-inheritance element)
@@ -21455,19 +21453,19 @@ Optional argument ELEMENT contains element at point."
 (defun org-at-keyword-p nil
   "Return t if cursor is at a keyword-line."
   (save-excursion
-    (move-beginning-of-line 1)
+    (forward-line 0)
     (looking-at org-keyword-regexp)))
 
 (defun org-at-drawer-p nil
   "Return t if cursor is at a drawer keyword."
   (save-excursion
-    (move-beginning-of-line 1)
+    (forward-line 0)
     (looking-at org-drawer-regexp)))
 
 (defun org-at-block-p nil
   "Return t if cursor is at a block keyword."
   (save-excursion
-    (move-beginning-of-line 1)
+    (forward-line 0)
     (looking-at org-block-regexp)))
 
 (defun org-point-at-end-of-empty-headline ()
@@ -21655,10 +21653,10 @@ When TO-HEADING is non-nil, go to the next heading or `point-max'."
   "Skip planning line and properties drawer in current entry.
 
 When optional argument FULL is t, also skip planning information,
-clocking lines and any kind of drawer.
+clocking lines, any kind of drawer, and blank lines
 
 When FULL is non-nil but not t, skip planning information,
-properties, clocking lines and logbook drawers."
+properties, clocking lines, logbook drawers, and blank lines."
   (org-back-to-heading t)
   (forward-line)
   ;; Skip planning information.
@@ -21673,7 +21671,7 @@ properties, clocking lines and logbook drawers."
       (let ((end (save-excursion (outline-next-heading) (point)))
 	    (re (concat "[ \t]*$" "\\|" org-clock-line-re)))
 	(while (not (eobp))
-	  (cond ;; Skip clock lines.
+	  (cond ;; Skip clock lines and blank lines.
 	   ((looking-at-p re) (forward-line))
 	   ;; Skip logbook drawer.
 	   ((looking-at-p org-logbook-drawer-re)
@@ -22286,7 +22284,7 @@ Point is moved after both elements."
 Relative indentation (between items, inside blocks, etc.) isn't
 modified."
   (interactive)
-  (unless (eq major-mode 'org-mode)
+  (unless (derived-mode-p 'org-mode)
     (user-error "Cannot un-indent a buffer not in Org mode"))
   (letrec ((parse-tree (org-element-parse-buffer 'greater-element nil 'defer))
 	   (unindent-tree
diff --git a/lisp/org/ox-ascii.el b/lisp/org/ox-ascii.el
index 229a06cc99e..cdc3f1c64f8 100644
--- a/lisp/org/ox-ascii.el
+++ b/lisp/org/ox-ascii.el
@@ -37,9 +37,6 @@
 ;;; Function Declarations
 
 (declare-function aa2u "ext:ascii-art-to-unicode" ())
-(declare-function org-at-heading-p "org" (&optional _))
-(declare-function org-back-to-heading "org" (&optional invisible-ok))
-(declare-function org-next-visible-heading "org" (arg))
 
 ;;; Define Backend
 ;;
@@ -688,8 +685,8 @@ possible.  It doesn't apply to `inlinetask' elements."
 			   (org-make-tag-string tag-list)))))
 	 (priority
 	  (and (plist-get info :with-priority)
-	       (let ((char (org-element-property :priority element)))
-		 (and char (format "(#%c) " char)))))
+	       (let ((priority-value (org-element-property :priority element)))
+		 (and priority-value (format "(#%s) " (org-priority-to-string priority-value))))))
 	 (first-part (concat numbers todo priority text)))
     (concat
      first-part
diff --git a/lisp/org/ox-beamer.el b/lisp/org/ox-beamer.el
index 0c4c79baeb9..72fe18acdb8 100644
--- a/lisp/org/ox-beamer.el
+++ b/lisp/org/ox-beamer.el
@@ -198,6 +198,7 @@ through `org-beamer-environments-extra' variable.")
     ("example"        "e" "\\begin{example}%a[%h]%l"        "\\end{example}")
     ("exampleblock"   "E" "\\begin{exampleblock}%a{%h}%l"   "\\end{exampleblock}")
     ("proof"          "p" "\\begin{proof}%a[%h]"          "\\end{proof}")
+    ("onlyenv"        "O" "\\begin{onlyenv}%a"            "\\end{onlyenv}")
     ("beamercolorbox" "o" "\\begin{beamercolorbox}%o{%h}" "\\end{beamercolorbox}"))
   "Environments triggered by properties in Beamer export.
 These are the defaults - for user definitions, see
@@ -500,6 +501,15 @@ used as a communication channel."
 		      (if (and env (equal (downcase env) "fullframe")) ""
 			(org-export-data
 			 (org-element-property :title headline) info))))
+            ;; Subtitle
+            (when-let* ((subtitle
+                         (org-element-property :BEAMER_SUBTITLE headline)))
+              (format "{%s}"
+                      (org-export-data
+                       (org-element-parse-secondary-string
+                        subtitle
+                        (org-element-restriction 'keyword))
+                       info)))
 	    "\n"
 	    ;; The following workaround is required in fragile frames
 	    ;; as Beamer will append "\par" to the beginning of the
diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el
index 54f60b543a0..6916cc21609 100644
--- a/lisp/org/ox-html.el
+++ b/lisp/org/ox-html.el
@@ -43,12 +43,7 @@
 
 ;;; Function Declarations
 
-(declare-function org-id-find-id-file "org-id" (id))
 (declare-function htmlize-region "ext:htmlize" (beg end))
-(declare-function mm-url-decode-entities "mm-url" ())
-(declare-function org-at-heading-p "org" (&optional _))
-(declare-function org-back-to-heading "org" (&optional invisible-ok))
-(declare-function org-next-visible-heading "org" (arg))
 
 (defvar htmlize-css-name-prefix)
 (defvar htmlize-output-type)
@@ -161,7 +156,7 @@
     (:html-postamble-format nil nil org-html-postamble-format)
     (:html-preamble-format nil nil org-html-preamble-format)
     (:html-prefer-user-labels nil nil org-html-prefer-user-labels)
-    (:html-self-link-headlines nil nil org-html-self-link-headlines)
+    (:html-self-link-headlines nil "html-self-link-headlines" org-html-self-link-headlines)
     (:html-table-align-individual-fields
      nil nil org-html-table-align-individual-fields)
     (:html-table-caption-above nil nil org-html-table-caption-above)
@@ -233,10 +228,10 @@ For blocks that should contain headlines, use the HTML_CONTAINER
 property on the headline itself.")
 
 (defconst org-html-special-string-regexps
-  '(("\\\\-" . "&#x00ad;")		; shy
-    ("---\\([^-]\\)" . "&#x2014;\\1")	; mdash
-    ("--\\([^-]\\)" . "&#x2013;\\1")	; ndash
-    ("\\.\\.\\." . "&#x2026;"))		; hellip
+  '(("\\\\-" . "&shy;")
+    ("---\\([^-]\\)" . "&mdash;\\1")
+    ("--\\([^-]\\)" . "&ndash;\\1")
+    ("\\.\\.\\." . "&hellip;"))
   "Regular expressions for special string conversion.")
 
 (defvar org-html--id-attr-prefix "ID-"
@@ -318,6 +313,7 @@ This affects IDs that are determined from the ID property.")
   pre.src-asymptote:before { content: 'Asymptote'; }
   pre.src-awk:before { content: 'Awk'; }
   pre.src-authinfo::before { content: 'Authinfo'; }
+  pre.src-c:before { content: 'C'; }
   pre.src-C:before { content: 'C'; }
   /* pre.src-C++ doesn't work in CSS */
   pre.src-clojure:before { content: 'Clojure'; }
@@ -332,7 +328,7 @@ This affects IDs that are determined from the ID property.")
   pre.src-haskell:before { content: 'Haskell'; }
   pre.src-hledger:before { content: 'hledger'; }
   pre.src-java:before { content: 'Java'; }
-  pre.src-js:before { content: 'Javascript'; }
+  pre.src-js:before { content: 'JavaScript'; }
   pre.src-latex:before { content: 'LaTeX'; }
   pre.src-ledger:before { content: 'Ledger'; }
   pre.src-lisp:before { content: 'Lisp'; }
@@ -459,8 +455,9 @@ You can use `org-html-head' and `org-html-head-extra' to add to
 this style.  If you don't want to include this default style,
 customize `org-html-head-include-default-style'."
   :group 'org-export-html
-  :package-version '(Org . "9.5")
-  :type 'string)
+  :package-version '(Org . "9.8")
+  :type 'string
+  :safe #'stringp)
 
 
 ;;; User Configuration Variables
@@ -1130,7 +1127,7 @@ org-info.js for your website."
              ((on . "&#x2611;") (off . "&#x2610;") (trans . "&#x2610;")))
     (ascii .
            ((on . "<code>[X]</code>")
-            (off . "<code>[&#xa0;]</code>")
+            (off . "<code>[&nbsp;]</code>")
             (trans . "<code>[-]</code>")))
     (html .
 	  ((on . "<input type='checkbox' checked='checked' />")
@@ -1168,6 +1165,20 @@ See `format-time-string' for more information on its components."
   :package-version '(Org . "8.0")
   :type 'string)
 
+(defcustom org-html-datetime-formats '("%F" . "%FT%T")
+  "Formats used for the timestamp added as metadata to the time HTML element.
+This only has an effect when `org-html-html5-fancy' is enabled, but
+does not affect how the timestamp is displayed.  The format in CAR
+represents the timestamp used for timestamps without a time component,
+CDR the one for the full date and time.  Note that the HTML standard
+restricts what timestamp formats are considered valid for the datetime
+attribute.  See `format-time-string' for more information on its
+components."
+  :type '(cons string string)
+  :group 'org-export-html
+  :package-version '(Org . "9.8")
+  :safe #'consp)
+
 ;;;; Template :: Mathjax
 
 (defcustom org-html-mathjax-options
@@ -1531,7 +1542,8 @@ style information."
 This variable can contain the full HTML structure to provide a
 style, including the surrounding HTML tags.  You can consider
 including definitions for the following classes: title, todo,
-done, timestamp, timestamp-kwd, tag, target.
+done, timestamp, timestamp-kwd, tag, target.  Can be a string, or
+a function that accepts the INFO plist and returns a string.
 
 For example, a valid value would be:
 
@@ -1554,21 +1566,25 @@ header.
 You can set this on a per-file basis using #+HTML_HEAD:,
 or for publication projects using the :html-head property."
   :group 'org-export-html
-  :version "24.4"
-  :package-version '(Org . "8.0")
-  :type 'string)
+  :package-version '(Org . "9.8")
+  :type '(choice (string :tag "Literal text to insert")
+                 (function :tag "Function evaluating to a string"))
+  :safe #'stringp)
 ;;;###autoload
 (put 'org-html-head 'safe-local-variable 'stringp)
 
 (defcustom org-html-head-extra ""
   "More head information to add in the HTML output.
 
-You can set this on a per-file basis using #+HTML_HEAD_EXTRA:,
-or for publication projects using the :html-head-extra property."
+You can set this on a per-file basis using #+HTML_HEAD_EXTRA:, or
+for publication projects using the :html-head-extra property.
+Can be a string, or a function that accepts the INFO plist and returns
+a string."
   :group 'org-export-html
-  :version "24.4"
-  :package-version '(Org . "8.0")
-  :type 'string)
+  :package-version '(Org . "9.8")
+  :type '(choice (string :tag "Literal text to insert")
+                 (function :tag "Function evaluating to a string"))
+  :safe #'stringp)
 ;;;###autoload
 (put 'org-html-head-extra 'safe-local-variable 'stringp)
 
@@ -1648,7 +1664,7 @@ https://developer.mozilla.org/en-US/docs/Mozilla/Mobile/Viewport_meta_tag"
                              selector_eval_scheme: '.src-scheme',
                              selector: '.src-clojure',
                              selector_eval_ruby: '.src-ruby'};"
-  "Javascript snippet to activate klipse."
+  "JavaScript snippet to activate klipse."
   :group 'org-export-html
   :package-version '(Org . "9.1")
   :type 'string)
@@ -1804,6 +1820,29 @@ is meant to be used as a predicate for `org-export-get-ordinal' or
 a value to `org-html-standalone-image-predicate'."
   (org-element-property :caption element))
 
+(defun org-html--format-timestamp (timestamp info)
+  "Format given TIMESTAMP for inclusion in an HTML document.
+INFO is a plist used as a communication channel.  Formatted timestamp
+will be wrapped in an element with class timestamp."
+  (let ((html-tag (if (org-html--html5-fancy-p info) "time" "span"))
+        (html-attrs (concat "class=\"timestamp\""
+                            (when (org-html--html5-fancy-p info)
+                              (format " datetime=\"%s\""
+                                      (org-format-timestamp
+                                       timestamp
+                                       (if (org-timestamp-has-time-p timestamp)
+                                           (cdr org-html-datetime-formats)
+                                           (car org-html-datetime-formats))))))))
+    (replace-regexp-in-string
+     "--"
+     "&ndash;"
+     (format "<%s %s>%s</%s>"
+             html-tag
+             html-attrs
+             (org-html-plain-text (org-timestamp-translate timestamp)
+                                  info)
+             html-tag))))
+
 ;;;; Table
 
 (defun org-html-htmlize-region-for-paste (beg end)
@@ -2001,6 +2040,15 @@ INFO is a plist used as a communication channel."
 		  org-html-meta-tags))
       ""))))
 
+(defun org-html-normalize-string-or-function (input &rest args)
+  "Normalize INPUT function or string.
+If INPUT is a string, it is passed to
+`org-element-normalize-string'.  If INPUT is a function, it is
+applied to arguments ARGS, and the result is passed to
+`org-element-normalize-string'."
+  (let ((s (if (functionp input) (format "%s" (apply input args)) input)))
+    (org-element-normalize-string s)))
+
 (defun org-html--build-head (info)
   "Return information for the <head>..</head> of the HTML output.
 INFO is a plist used as a communication channel."
@@ -2008,8 +2056,9 @@ INFO is a plist used as a communication channel."
    (concat
     (when (plist-get info :html-head-include-default-style)
       (org-element-normalize-string org-html-style-default))
-    (org-element-normalize-string (plist-get info :html-head))
-    (org-element-normalize-string (plist-get info :html-head-extra))
+    (org-html-normalize-string-or-function (plist-get info :html-head) info)
+    (org-html-normalize-string-or-function (plist-get info :html-head-extra)
+                                           info)
     (when (and (plist-get info :html-htmlized-css-url)
 	       (eq org-html-htmlize-output-type 'css))
       (org-html-close-tag "link"
@@ -2318,7 +2367,8 @@ INFO is the info plist."
   "Format a priority into HTML.
 PRIORITY is the character code of the priority or nil.  INFO is
 a plist containing export options."
-  (and priority (format "<span class=\"priority\">[%c]</span>" priority)))
+  (and priority (format "<span class=\"priority\">[%s]</span>"
+                        (org-priority-to-string priority))))
 
 ;;;; Tags
 
@@ -2333,7 +2383,7 @@ INFO is a plist containing export options."
 		       (concat (plist-get info :html-tag-class-prefix)
 			       (org-html-fix-class-name tag))
 		       tag))
-	     tags "&#xa0;"))))
+	     tags "&nbsp;"))))
 
 ;;;; Src Code
 
@@ -2355,8 +2405,7 @@ is the language used for CODE, as a string, or nil."
       (org-html-encode-plain-text code))
      (t
       ;; Map language
-      (setq lang (or (assoc-default lang org-src-lang-modes) lang))
-      (let* ((lang-mode (and lang (intern (format "%s-mode" lang)))))
+      (let* ((lang-mode (and lang (org-src-get-lang-mode lang))))
 	(cond
 	 ;; Case 1: Language is not associated with any Emacs mode
 	 ((not (functionp lang-mode))
@@ -2471,7 +2520,7 @@ of contents as a string, or nil if it is empty."
       (let* ((toc-id-counter (plist-get info :org-html--toc-counter))
              (toc (concat (format "<div id=\"text-table-of-contents%s\" role=\"doc-toc\">"
                                   (if toc-id-counter (format "-%d" toc-id-counter) ""))
-			  (org-html--toc-text toc-entries)
+			  (org-html--toc-text toc-entries scope)
 			  "</div>\n")))
         (plist-put info :org-html--toc-counter (1+ (or toc-id-counter 0)))
 	(if scope toc
@@ -2489,11 +2538,14 @@ of contents as a string, or nil if it is empty."
 		    toc
 		    (format "</%s>\n" outer-tag))))))))
 
-(defun org-html--toc-text (toc-entries)
+(defun org-html--toc-text (toc-entries &optional scope)
   "Return innards of a table of contents, as a string.
+
 TOC-ENTRIES is an alist where key is an entry title, as a string,
-and value is its relative level, as an integer."
-  (let* ((prev-level (1- (cdar toc-entries)))
+and value is its relative level, as an integer. Optional SCOPE,
+when non-nil, indicates a TOC for a subtree, which affects the
+initial nesting level."
+  (let* ((prev-level (if scope (1- (cdar toc-entries)) 0))
 	 (start-level prev-level))
     (concat
      (mapconcat
@@ -2639,17 +2691,17 @@ holding contextual information."
 
 ;;;; Clock
 
-(defun org-html-clock (clock _contents _info)
+(defun org-html-clock (clock _contents info)
   "Transcode a CLOCK element from Org to HTML.
 CONTENTS is nil.  INFO is a plist used as a communication
 channel."
   (format "<p>
 <span class=\"timestamp-wrapper\">
-<span class=\"timestamp-kwd\">%s</span> <span class=\"timestamp\">%s</span>%s
+<span class=\"timestamp-kwd\">%s</span> %s%s
 </span>
 </p>"
 	  org-clock-string
-	  (org-timestamp-translate (org-element-property :value clock))
+	  (org-html--format-timestamp (org-element-property :value clock) info)
 	  (let ((time (org-element-property :duration clock)))
 	    (and time (format " <span class=\"timestamp\">(%s)</span>" time)))))
 
@@ -2860,7 +2912,7 @@ description of TODO, PRIORITY, TEXT, TAGS, and INFO arguments."
     (concat todo (and todo " ")
 	    priority (and priority " ")
 	    text
-	    (and tags "&#xa0;&#xa0;&#xa0;") tags)))
+	    (and tags "&nbsp;&nbsp;&nbsp") tags)))
 
 (defun org-html--container (headline info)
   "Return HTML container name for HEADLINE as a string.
@@ -3051,7 +3103,7 @@ INFO is a plist containing export properties."
 	      (concat (file-name-as-directory org-preview-latex-image-directory)
 		      (file-name-sans-extension
 		       (file-name-nondirectory bfn)))
-	      cache-dir (file-name-directory bfn))
+	      cache-dir (file-name-directory (plist-get info :output-file)))
 	;; Re-create LaTeX environment from original buffer in
 	;; temporary buffer so that dvipng/imagemagick can properly
 	;; turn the fragment into an image.
@@ -3085,6 +3137,8 @@ Math environments match the regular expression defined in
 `org-latex-math-environments-re'.  This function is meant to be
 used as a predicate for `org-export-get-ordinal' or a value to
 `org-html-standalone-image-predicate'."
+  (require 'ox-latex)
+  (defvar org-latex-math-environments-re) ; defined in ox-latex.el
   (string-match-p org-latex-math-environments-re
                   (org-element-property :value element)))
 
@@ -3328,7 +3382,7 @@ INFO is a plist holding contextual information.  See
       (let ((destination (org-export-resolve-radio-link link info)))
 	(if (not destination) desc
 	  (format "<a href=\"#%s\"%s>%s</a>"
-		  (org-export-get-reference destination info)
+		  (org-html--reference destination info)
 		  attributes
 		  desc))))
      ;; Links pointing to a headline: Find destination and build
@@ -3373,6 +3427,8 @@ INFO is a plist holding contextual information.  See
 	     (format "<a href=\"#%s\"%s>%s</a>" href attributes desc)))
 	  ;; Fuzzy link points to a target or an element.
 	  (_
+           (require 'ox-latex)
+           (declare-function org-latex--environment-type "ox-latex" (latex-environment))
            (if (and destination
                     (memq (plist-get info :with-latex) '(mathjax t))
                     (org-element-type-p destination 'latex-environment)
@@ -3565,10 +3621,9 @@ channel."
 	 (when timestamp
 	   (let ((string (car pair)))
 	     (format "<span class=\"timestamp-kwd\">%s</span> \
-<span class=\"timestamp\">%s</span> "
+%s "
 		     string
-		     (org-html-plain-text (org-timestamp-translate timestamp)
-					  info))))))
+		     (org-html--format-timestamp timestamp info))))))
      `((,org-closed-string . ,(org-element-property :closed planning))
        (,org-deadline-string . ,(org-element-property :deadline planning))
        (,org-scheduled-string . ,(org-element-property :scheduled planning)))
@@ -3697,7 +3752,7 @@ contextual information."
 			      " data-editor-type=\"html\""
 			    "")
 			  code)
-		(format "<pre class=\"src src-%s\"%s>%s</pre>"
+		(format "<pre class=\"src src-%s\"%s><code>%s</code></pre>"
                         ;; Lang being nil is OK.
                         lang label code))))))
 
@@ -3751,7 +3806,7 @@ channel."
 			" align=\"%s\"" " class=\"org-%s\"")
 		    (org-export-table-cell-alignment table-cell info)))))
     (when (or (not contents) (string= "" (org-trim contents)))
-      (setq contents "&#xa0;"))
+      (setq contents "&nbsp;"))
     (cond
      ((and (org-export-table-has-header-p table info)
 	   (= 1 (org-export-table-row-group table-row info)))
@@ -3837,7 +3892,6 @@ INFO is a plist used as a communication channel."
   "Format table.el TABLE into HTML.
 INFO is a plist used as a communication channel."
   (when (eq (org-element-property :type table) 'table.el)
-    (require 'table)
     (let ((outbuf (with-current-buffer
 		      (get-buffer-create "*org-export-table*")
 		    (erase-buffer) (current-buffer))))
@@ -3920,9 +3974,16 @@ information."
   "Transcode a TIMESTAMP object from Org to HTML.
 CONTENTS is nil.  INFO is a plist holding contextual
 information."
-  (let ((value (org-html-plain-text (org-timestamp-translate timestamp) info)))
-    (format "<span class=\"timestamp-wrapper\"><span class=\"timestamp\">%s</span></span>"
-	    (replace-regexp-in-string "--" "&#x2013;" value))))
+  (let (
+        ;; Strip :post-blank
+        ;; It will be handled as a part of generic transcoder code
+        ;; so we should avoid double-counting post-blank.
+        (timestamp-no-blank
+         (org-element-put-property
+          (org-element-copy timestamp t)
+          :post-blank 0)))
+    (format "<span class=\"timestamp-wrapper\">%s</span>"
+	    (org-html--format-timestamp timestamp-no-blank info))))
 
 ;;;; Underline
 
@@ -3952,7 +4013,7 @@ contextual information."
   (format "<p class=\"verse\">\n%s</p>"
 	  ;; Replace leading white spaces with non-breaking spaces.
 	  (replace-regexp-in-string
-	   "^[ \t]+" (lambda (m) (org-html--make-string (length m) "&#xa0;"))
+	   "^[ \t]+" (lambda (m) (org-html--make-string (length m) "&nbsp;"))
 	   ;; Replace each newline character with line break.  Also
 	   ;; remove any trailing "br" close-tag so as to avoid
 	   ;; duplicates.
diff --git a/lisp/org/ox-icalendar.el b/lisp/org/ox-icalendar.el
index 3b7dd45f873..9fc1e54cb32 100644
--- a/lisp/org/ox-icalendar.el
+++ b/lisp/org/ox-icalendar.el
@@ -39,9 +39,6 @@
 (require 'org-agenda)
 (require 'ox-ascii)
 (declare-function org-bbdb-anniv-export-ical "ol-bbdb" nil)
-(declare-function org-at-heading-p "org" (&optional _))
-(declare-function org-back-to-heading "org" (&optional invisible-ok))
-(declare-function org-next-visible-heading "org" (arg))
 
 
 
@@ -202,18 +199,28 @@ This is a list of symbols, the following are valid:
 (defcustom org-icalendar-with-timestamps 'active
   "Non-nil means make an event from plain time stamps.
 
-It can be set to `active', `inactive', t or nil, in order to make
-an event from, respectively, only active timestamps, only
-inactive ones, all of them or none.
+It can be set to `active', `active-exclude-diary', `inactive', t
+or nil, in order to make an event from, respectively, only active
+timestamps (with/without diary timestamps), only inactive ones,
+all of them or none.
+
+This variable has the same options as
+`org-export-with-timestamps', and takes precedence over it.
+However, note that this variable applies to all timestamps within
+an entry, whereas `org-export-with-timestamps' only applies to
+timestamps isolated in a paragraph containing only timestamps.
 
-This variable has precedence over `org-export-with-timestamps'.
 It can also be set with the #+OPTIONS line, e.g. \"<:t\"."
   :group 'org-export-icalendar
+  :package-version '(Org . "9.8")
   :type '(choice
 	  (const :tag "All timestamps" t)
-	  (const :tag "Only active timestamps" active)
+	  (const :tag "Active timestamps, including diary timestamps" active)
+	  (const :tag "Active timestamps, excluding diary timestamps"
+                 active-exclude-diary)
 	  (const :tag "Only inactive timestamps" inactive)
-	  (const :tag "No timestamp" nil)))
+	  (const :tag "No timestamp" nil))
+  :safe (lambda (x) (memq x '(t nil active active-exclude-diary inactive))))
 
 (defcustom org-icalendar-include-todo nil
   "Non-nil means create VTODO components from TODO items.
@@ -744,11 +751,9 @@ inlinetask within the section."
 				    (org-element-contents inside))
 		 'timestamp
 	       (lambda (ts)
-		 (when (let ((type (org-element-property :type ts)))
-			 (cl-case (plist-get info :with-timestamps)
-			   (active (memq type '(active active-range)))
-			   (inactive (memq type '(inactive inactive-range)))
-			   ((t) t)))
+		 (unless (org-export--skip-timestamp-p
+                          (plist-get info :with-timestamps)
+                          (org-element-property :type ts))
 		   (let ((uid (format "TS%d-%s" (cl-incf counter) uid)))
 		     (org-icalendar--vevent
 		      entry ts uid summary loc desc cat tz class))))
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index 6598f3fed65..b4d1ada8d5e 100644
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -124,6 +124,7 @@
     (:latex-class-options "LATEX_CLASS_OPTIONS" nil nil t)
     (:latex-header "LATEX_HEADER" nil nil newline)
     (:latex-header-extra "LATEX_HEADER_EXTRA" nil nil newline)
+    (:latex-class-pre "LATEX_CLASS_PRE" nil nil newline)
     (:description "DESCRIPTION" nil nil parse)
     (:keywords "KEYWORDS" nil nil parse)
     (:subtitle "SUBTITLE" nil nil parse)
@@ -170,6 +171,7 @@
     (:latex-title-command nil nil org-latex-title-command)
     (:latex-toc-command nil nil org-latex-toc-command)
     (:latex-compiler "LATEX_COMPILER" nil org-latex-compiler)
+    (:latex-use-sans nil "latex-use-sans" org-latex-use-sans)
     ;; Redefine regular options.
     (:date "DATE" nil "\\today" parse)))
 
@@ -588,6 +590,7 @@ like that: \"%%\".
 Setting :latex-title-command in publishing projects will take
 precedence over this variable."
   :group 'org-export-latex
+  :safe #'stringp
   :type '(string :tag "Format string"))
 
 (defcustom org-latex-subtitle-format "\\\\\\medskip\n\\large %s"
@@ -597,6 +600,7 @@ which is replaced with the subtitle."
   :group 'org-export-latex
   :version "26.1"
   :package-version '(Org . "8.3")
+  :safe #'stringp
   :type '(string :tag "Format string"))
 
 (defcustom org-latex-subtitle-separate nil
@@ -604,6 +608,7 @@ which is replaced with the subtitle."
   :group 'org-export-latex
   :version "26.1"
   :package-version '(Org . "8.3")
+  :safe #'booleanp
   :type 'boolean)
 
 (defcustom org-latex-toc-command "\\tableofcontents\n\n"
@@ -616,7 +621,7 @@ the #+TOC keyword."
 
 (defcustom org-latex-hyperref-template
   "\\hypersetup{\n pdfauthor={%a},\n pdftitle={%t},\n pdfkeywords={%k},
- pdfsubject={%d},\n pdfcreator={%c}, \n pdflang={%L}}\n"
+ pdfsubject={%d},\n pdfcreator={%c},\n pdflang={%L}}\n"
   "Template for hyperref package options.
 
 This format string may contain these elements:
@@ -643,7 +648,8 @@ precedence over this variable."
   :version "26.1"
   :package-version '(Org . "8.3")
   :type '(choice (const :tag "No template" nil)
-		 (string :tag "Format string")))
+		 (string :tag "Format string"))
+  :safe #'string-or-null-p)
 
 ;;;; Headline
 
@@ -675,6 +681,7 @@ command like \"\\sidenote{%s%s}\" that you want to use.
 The value will be passed as an argument to `format' as the following
   (format org-latex-default-footnote-command
      footnote-description footnote-label)"
+
   :group 'org-export-latex
   :package-version '(Org . "9.7")
   :type 'string)
@@ -698,17 +705,17 @@ The value will be passed as an argument to `format' as the following
 ;;;; Timestamps
 
 (defcustom org-latex-active-timestamp-format "\\textit{%s}"
-  "A printf format string to be applied to active timestamps."
+  "A `format' string to be applied to active timestamps."
   :group 'org-export-latex
   :type 'string)
 
 (defcustom org-latex-inactive-timestamp-format "\\textit{%s}"
-  "A printf format string to be applied to inactive timestamps."
+  "A `format' string to be applied to inactive timestamps."
   :group 'org-export-latex
   :type 'string)
 
 (defcustom org-latex-diary-timestamp-format "\\textit{%s}"
-  "A printf format string to be applied to diary timestamps."
+  "A `format' string to be applied to diary timestamps."
   :group 'org-export-latex
   :type 'string)
 
@@ -956,13 +963,13 @@ The first two options provide basic syntax
 highlighting (listings), or none at all (verbatim).
 
 When using listings, you also need to make use of LaTeX package
-\"listings\".  The \"color\" LaTeX package is also needed if you
-would like color too.  These can simply be added to
+\"listings\".  The \"xcolor\" LaTeX package is also needed for
+color management.  These can simply be added to
 `org-latex-packages-alist', using customize or something like:
 
   (require \\='ox-latex)
   (add-to-list \\='org-latex-packages-alist \\='(\"\" \"listings\"))
-  (add-to-list \\='org-latex-packages-alist \\='(\"\" \"color\"))
+  (add-to-list \\='org-latex-packages-alist \\='(\"\" \"xcolor\"))
 
 There are two further options for more comprehensive
 fontification.  The first can be set with,
@@ -983,7 +990,7 @@ In addition, it is necessary to install pygments
 passed to pdflatex.
 
 The minted choice has possible repercussions on the preview of
-latex fragments (see `org-preview-latex-fragment').  If you run
+latex fragments (see `org-latex-preview').  If you run
 into previewing problems, please consult
 URL `https://orgmode.org/worg/org-tutorials/org-latex-preview.html'.
 
@@ -1409,6 +1416,10 @@ See also `org-latex-compiler'."
   :version "26.1"
   :package-version '(Org . "9.0"))
 
+(defconst org-latex-compilers '("pdflatex" "xelatex" "lualatex")
+  "Known LaTeX compilers.
+See also `org-latex-compiler'.")
+
 (defcustom org-latex-compiler "pdflatex"
   "LaTeX compiler to use.
 
@@ -1422,11 +1433,12 @@ Can also be set in buffers via #+LATEX_COMPILER.  See also
 	  (const :tag "LuaLaTeX" "lualatex")
 	  (const :tag "Unset" ""))
   :version "26.1"
-  :package-version '(Org . "9.0"))
-
-(defconst org-latex-compilers '("pdflatex" "xelatex" "lualatex")
-  "Known LaTeX compilers.
-See also `org-latex-compiler'.")
+  :package-version '(Org . "9.0")
+  :safe (lambda (s)
+          (and (stringp s)              ; must be a string
+               ;; either an empty string or one of the supported compilers
+               (or (length= s 0)
+                   (member s org-latex-compilers)))))
 
 (defcustom org-latex-bib-compiler "bibtex"
   "Command to process a LaTeX file's bibliography.
@@ -1443,7 +1455,7 @@ A better approach is to use a compiler suit such as `latexmk'."
   :package-version '(Org . "9.0"))
 
 (defcustom org-latex-pdf-process
-  (if (executable-find "latexmk")
+  (if (and (executable-find "latexmk") (executable-find "perl"))
       '("latexmk -f -pdf -%latex -interaction=nonstopmode -output-directory=%o %f")
     '("%latex -interaction nonstopmode -output-directory %o %f"
       "%latex -interaction nonstopmode -output-directory %o %f"
@@ -1522,7 +1534,7 @@ logfiles to remove, set `org-latex-logfiles-extensions'."
     ("Underfull \\hbox" . "[underfull hbox]")
     ("Overfull \\hbox" . "[overfull hbox]")
     ("Citation.*?undefined" . "[undefined citation]")
-    ("^!.+Unicode character" . "[unicode character(s) not set up for use with pdflatex. You can run lualatex or xelatex instead]")
+    ("^!.+Unicode character" . "[unicode character(s) not supported by pdflatex. Set org-latex-compiler to lualatex or xelatex instead]")
     ("Missing character: There is no" . "[Missing character(s): please load an appropriate font with the fontspec package]")
     ("Undefined control sequence" . "[undefined control sequence]"))
   "Alist of regular expressions and associated messages for the user.
@@ -1537,6 +1549,18 @@ calling `org-latex-compile'."
 	   (string :tag "Message"))))
 
 
+(defcustom org-latex-toc-include-unnumbered nil
+  "Whether to include unnumbered headings in the table of contents.
+
+The default behaviour is to include numbered headings only, as it is
+usually the case in LaTeX (but different from other Org exporters).
+To include an unnumbered heading, set the `:UNNUMBERED:'
+property to `toc'"
+  :group 'org-export-latex
+  :package-version '(Org . "9.8")
+  :type 'boolean
+  :safe #'booleanp)
+
 
 ;;; Internal Functions
 
@@ -1926,16 +1950,24 @@ INFO is a plist used as a communication channel."
                     ;; Here the actual name of the LANGUAGE or LANG is used.
 		    (or (plist-get plist :lang-name)
 		        lang))))
-    `((?a . ,(org-export-data (plist-get info :author) info))
-      (?t . ,(org-export-data (plist-get info :title) info))
-      (?s . ,(org-export-data (plist-get info :subtitle) info))
+    `((?a . ,(if (plist-get info :with-author)
+                 (org-export-data (plist-get info :author) info)
+               ""))
+      (?t . ,(if (plist-get info :with-title)
+                 (org-export-data (plist-get info :title) info)
+               ""))
+      (?s . ,(if (plist-get info :with-title)
+                 (org-export-data (plist-get info :subtitle) info)
+               ""))
       (?k . ,(org-export-data (org-latex--wrap-latex-math-block
 			       (plist-get info :keywords) info)
 			      info))
       (?d . ,(org-export-data (org-latex--wrap-latex-math-block
 			       (plist-get info :description) info)
 			      info))
-      (?c . ,(plist-get info :creator))
+      (?c . ,(if (plist-get info :with-creator)
+                 (plist-get info :creator)
+               ""))
       (?l . ,language)
       (?L . ,(capitalize language))
       (?D . ,(org-export-data (org-export-get-date info) info)))))
@@ -1948,6 +1980,15 @@ INFO is a plist used as a communication channel."
 	 (member (or compiler "") org-latex-compilers)
 	 (format org-latex-compiler-file-string compiler))))
 
+(defcustom org-latex-use-sans nil
+  "Whether to typeset the document with the Sans font family.
+
+The default behaviour is to typeset with the Roman font family."
+  :group 'org-export-latex
+  :package-version '(Org . "9.8")
+  :type 'boolean
+  :safe #'booleanp)
+
 
 ;;; Filters
 
@@ -1985,10 +2026,15 @@ specified in `org-latex-default-packages-alist' or
 	      (let* ((class-options (plist-get info :latex-class-options))
 		     (header (nth 1 (assoc class (plist-get info :latex-classes)))))
 		(and (stringp header)
-		     (if (not class-options) header
-		       (replace-regexp-in-string
-			"^[ \t]*\\\\documentclass\\(\\(\\[[^]]*\\]\\)?\\)"
-			class-options header t nil 1))))
+	             (mapconcat #'org-element-normalize-string
+		                (list
+                                 (and (not snippet?)
+                                      (plist-get info :latex-class-pre))
+		                 (if (not class-options) header
+		                   (replace-regexp-in-string
+			            "^[ \t]*\\\\documentclass\\(\\(\\[[^]]*\\]\\)?\\)"
+			            class-options header t nil 1)))
+                                nil)))
 	      (user-error "Unknown LaTeX class `%s'" class))))
     (org-latex-guess-polyglossia-language
      (org-latex-guess-babel-language
@@ -2002,7 +2048,11 @@ specified in `org-latex-default-packages-alist' or
 	 (mapconcat #'org-element-normalize-string
 		    (list (plist-get info :latex-header)
 			  (and (not snippet?)
-			       (plist-get info :latex-header-extra)))
+			       (plist-get info :latex-header-extra))
+                          (and (not snippet?)
+                               (plist-get info :latex-use-sans)
+                               "\\renewcommand*\\familydefault{\\sfdefault}"))
+
 		    ""))))
       info)
      info)))
@@ -2237,11 +2287,10 @@ CONTENTS is nil.  INFO is a plist holding contextual information."
 		(org-export-get-footnote-definition footnote-reference info)
 		info t)))
       ;; Use \footnotemark if reference is within another footnote
-      ;; reference, footnote definition, table cell, verse block, or
-      ;; item's tag.
+      ;; reference, footnote definition, table cell, or item's tag.
       ((or (org-element-lineage footnote-reference
-				'(footnote-reference footnote-definition
-						     table-cell verse-block))
+				'( footnote-reference footnote-definition
+				   table-cell))
 	   (org-element-type-p
 	    (org-element-parent-element footnote-reference) 'item))
        "\\footnotemark")
@@ -2269,66 +2318,82 @@ CONTENTS is nil.  INFO is a plist holding contextual information."
 
 ;;;; Headline
 
+(defun org-latex--get-section-format (headline info)
+  "Get section format for HEADLINE.
+INFO is the communication plist."
+  (let* ((class (plist-get info :latex-class))
+	 (level (org-export-get-relative-level headline info))
+         (numberedp (org-export-numbered-headline-p headline info))
+         (class-sectioning (assoc class (plist-get info :latex-classes))))
+    (let ((sec (if (functionp (nth 2 class-sectioning))
+		   (funcall (nth 2 class-sectioning) level numberedp)
+		 (nth (1+ level) class-sectioning))))
+      (cond
+       ;; No section available for that LEVEL.
+       ((not sec) nil)
+       ;; Section format directly returned by a function.  Add
+       ;; placeholder for contents.
+       ((stringp sec) (concat sec "\n%s"))
+       ;; (numbered-section . unnumbered-section)
+       ((not (consp (cdr sec)))
+	(concat (funcall (if numberedp #'car #'cdr) sec) "\n%s"))
+       ;; (numbered-open numbered-close)
+       ((= (length sec) 2)
+	(when numberedp (concat (car sec) "\n%s" (nth 1 sec))))
+       ;; (num-in num-out no-num-in no-num-out)
+       ((= (length sec) 4)
+	(if numberedp (concat (car sec) "\n%s" (nth 1 sec))
+	  (concat (nth 2 sec) "\n%s" (nth 3 sec))))))))
+
+(defconst org-latex--section-backend
+  (org-export-create-backend
+   :parent 'latex
+   :transcoders
+   '((underline . (lambda (o c i) (format "\\underline{%s}" c)))
+     ;; LaTeX isn't happy when you try to use \verb inside the argument of other
+     ;; commands (like \section, etc.), and this causes compilation to fail.
+     ;; So, within headings it's a good idea to replace any instances of \verb
+     ;; with \texttt.
+     (code . (lambda (o _ _) (org-latex--protect-texttt (org-element-property :value o))))
+     (verbatim . (lambda (o _ _) (org-latex--protect-texttt (org-element-property :value o))))))
+  "Export backend that hard-codes \\underline within \\section and alike.")
+
+(defconst org-latex--section-no-footnote-backend
+  (org-export-create-backend
+   :parent org-latex--section-backend
+   :transcoders
+   `((footnote-reference . ignore)))
+  "Export backend that strips footnotes from title.
+
+Footnotes are not allowed in \\section and similar commands that
+contribute to TOC and footers.
+See https://orgmode.org/list/691643eb-49d0-45c3-ab7f-a1edbd093bef@gmail.com
+https://texfaq.org/FAQ-ftnsect")
+
 (defun org-latex-headline (headline contents info)
   "Transcode a HEADLINE element from Org to LaTeX.
 CONTENTS holds the contents of the headline.  INFO is a plist
 holding contextual information."
   (unless (org-element-property :footnote-section-p headline)
-    (let* ((class (plist-get info :latex-class))
-	   (level (org-export-get-relative-level headline info))
+    (let* ((level (org-export-get-relative-level headline info))
+           ;; "LaTeX TOC handling"
+           ;; :unnumbered: toc will add the heading to the ToC
+           ;; "Org TOC handling"
+           ;; :unnumbered: notoc to suppress heading from the ToC
+           ;; else include all headings (including unnumbered) like other modes
+           (unnumbered-type (org-export-get-node-property :UNNUMBERED headline t))
 	   (numberedp (org-export-numbered-headline-p headline info))
-	   (class-sectioning (assoc class (plist-get info :latex-classes)))
 	   ;; Section formatting will set two placeholders: one for
 	   ;; the title and the other for the contents.
-	   (section-fmt
-	    (let ((sec (if (functionp (nth 2 class-sectioning))
-			   (funcall (nth 2 class-sectioning) level numberedp)
-			 (nth (1+ level) class-sectioning))))
-	      (cond
-	       ;; No section available for that LEVEL.
-	       ((not sec) nil)
-	       ;; Section format directly returned by a function.  Add
-	       ;; placeholder for contents.
-	       ((stringp sec) (concat sec "\n%s"))
-	       ;; (numbered-section . unnumbered-section)
-	       ((not (consp (cdr sec)))
-		(concat (funcall (if numberedp #'car #'cdr) sec) "\n%s"))
-	       ;; (numbered-open numbered-close)
-	       ((= (length sec) 2)
-		(when numberedp (concat (car sec) "\n%s" (nth 1 sec))))
-	       ;; (num-in num-out no-num-in no-num-out)
-	       ((= (length sec) 4)
-		(if numberedp (concat (car sec) "\n%s" (nth 1 sec))
-		  (concat (nth 2 sec) "\n%s" (nth 3 sec)))))))
-	   ;; Create a temporary export backend that hard-codes
-	   ;; "\underline" within "\section" and alike.
-	   (section-backend
-            (org-export-create-backend
-             :parent 'latex
-             :transcoders
-             '((underline . (lambda (o c i) (format "\\underline{%s}" c)))
-               ;; LaTeX isn't happy when you try to use \verb inside the argument of other
-               ;; commands (like \section, etc.), and this causes compilation to fail.
-               ;; So, within headings it's a good idea to replace any instances of \verb
-               ;; with \texttt.
-               (code . (lambda (o _ _) (org-latex--protect-texttt (org-element-property :value o))))
-               (verbatim . (lambda (o _ _) (org-latex--protect-texttt (org-element-property :value o)))))))
-           ;; Create a temporary export backend that strips footnotes from title.
-           ;; Footnotes are not allowed in \section and similar
-           ;; commands that contribute to TOC and footers.
-           ;; See https://orgmode.org/list/691643eb-49d0-45c3-ab7f-a1edbd093bef@gmail.com
-           ;; https://texfaq.org/FAQ-ftnsect
-           (section-no-footnote-backend
-            (org-export-create-backend
-             :parent section-backend
-             :transcoders
-             `((footnote-reference . ignore))))
+	   (section-fmt (org-latex--get-section-format headline info))
 	   (text
 	    (org-export-data-with-backend
-	     (org-element-property :title headline) section-backend info))
+	     (org-element-property :title headline)
+             org-latex--section-backend info))
            (text-no-footnote
             (org-export-data-with-backend
-	     (org-element-property :title headline) section-no-footnote-backend info))
+	     (org-element-property :title headline)
+             org-latex--section-no-footnote-backend info))
 	   (todo
 	    (and (plist-get info :with-todo-keywords)
 		 (let ((todo (org-element-property :todo-keyword headline)))
@@ -2382,8 +2447,10 @@ holding contextual information."
 	       (funcall (plist-get info :latex-format-headline-function)
 			todo todo-type priority
 			(org-export-data-with-backend
+                         ;; Returns alternative title when provided or
+                         ;; title itself.
 			 (org-export-get-alt-title headline info)
-			 section-backend info)
+			 org-latex--section-backend info)
 			(and (eq (plist-get info :with-tags) t) tags)
 			info))
 	      ;; Maybe end local TOC (see `org-latex-keyword').
@@ -2402,25 +2469,80 @@ holding contextual information."
 				  (string-match-p "\\<local\\>" v)
 				  (format "\\stopcontents[level-%d]" level)))))
 		    info t)))))
-	  (if (and (or (and opt-title (not (equal opt-title full-text)))
-                       ;; Heading contains footnotes.  Add optional title
-                       ;; version without footnotes to avoid footnotes in
-                       ;; TOC/footers.
-                       (and (not (equal full-text-no-footnote full-text))
-                            (setq opt-title full-text-no-footnote)))
-		   (string-match "\\`\\\\\\(.+?\\){" section-fmt))
-              (format (replace-match "\\1[%s]" nil nil section-fmt 1)
-		      ;; Replace square brackets with parenthesis
-		      ;; since square brackets are not supported in
-		      ;; optional arguments.
-		      (replace-regexp-in-string
-		       "\\[" "(" (replace-regexp-in-string "\\]" ")" opt-title))
-		      full-text
-		      (concat headline-label pre-blanks contents))
-	    ;; Impossible to add an alternative heading.  Fallback to
-	    ;; regular sectioning format string.
-	    (format section-fmt full-text
-		    (concat headline-label pre-blanks contents))))))))
+          ;; When do we need to explicitly specify a heading for TOC?
+          ;; 1. On numbered section with footnotes in title or alt_title
+          ;; 2. On an unnumbered section if :UNNUMBERED: allows it regardless of footnotes
+          ;; This applies to anything that may go into the ToC.
+          ;; Specifically for paragraphs, see first answer of
+          ;; https://tex.stackexchange.com/questions/288072/footnotes-within-paragraph
+          (let ((section-kw
+                 (and (string-match "\\`\\\\\\(.+?\\){" section-fmt)
+                      (match-string 1 section-fmt)))
+                need-alternative-toc-title)
+            (if (not section-kw)
+                ;; We only know how to add \SECTION-KW{...} to TOC.
+                (setq need-alternative-toc-title nil)
+              (if (string-suffix-p "*" section-kw)
+                  ;; FIXME: In theory, user may customize section-fmt
+                  ;; to use, e.g. \section{...} for unnumbered headings
+                  ;; We do not handle such scenario.
+                  (progn ;; unnumbered sections (ending with *)
+                    ;; Then we need to obey what the :UNNUMBERED: property says
+                    (if org-latex-toc-include-unnumbered
+                        ;; Treat the ToC closer to what other exporters do
+                        ;; Include unnumbered section into TOC unless
+                        ;; explicitly requested not to.
+                        (if (string= unnumbered-type "notoc")
+                            (setq need-alternative-toc-title nil)
+                          (setq need-alternative-toc-title t))
+                      ;; Ignore unnumbered headings in ToC - as in LaTeX
+                      ;; unless explicitly requested to include.
+                      (if (string= unnumbered-type "toc")
+                          (setq need-alternative-toc-title t)
+                        (setq need-alternative-toc-title nil))))
+                ;; Numbered sections
+                ;; Specify special TOC title only when there is
+                ;; opt-title or when title contains footnotes.
+                (if (and (string= full-text full-text-no-footnote)  ;; no footnotes
+                         ;; opt-title is either ALT_TITLE or title itself
+                         ;; as returned by `org-export-get-alt-title'
+                         (string= full-text opt-title)) ;; same alternative title
+                    (setq need-alternative-toc-title nil)
+                  (setq need-alternative-toc-title t))))
+            ;; In all cases
+            ;; Get rid of the footnotes in opt-title
+            (when (and (not (string= full-text-no-footnote full-text)) ;; when we have footnotess
+                       (string= full-text opt-title))      ;; And we do not impose an alternative title
+              (setq opt-title full-text-no-footnote))
+	    (if need-alternative-toc-title
+                (let ((new-format section-fmt)
+                      (new-extra  "")) ;; put the addcontentsline here
+                  (if (string-suffix-p "*" section-kw)
+                      ;; Subsection that needs alternative title:
+                      ;; Keep section format, use \\addcontentsline
+                      (setq new-extra
+                            (format "\\addcontentsline{toc}{%s}{%s}\n"
+                                    (string-remove-suffix "*" section-kw)
+                                    opt-title))
+                    ;; section... we need the brackets
+                    (let*
+		        ;; Replace square brackets with parenthesis
+		        ;; since square brackets are not supported in
+		        ;; optional arguments.
+                        ((un-bracketed-alt (replace-regexp-in-string
+                                            "\\[" "(" (replace-regexp-in-string "\\]" ")" opt-title)))
+                         (replacement-re (concat
+                                          "\\1["
+                                          (replace-regexp-in-string (rx "\\") "\\\\" un-bracketed-alt nil t)
+                                          "]")))
+                      (setq new-format (replace-match replacement-re nil nil section-fmt 1))))
+                  (format new-format
+                          full-text
+		          (concat headline-label new-extra pre-blanks contents)))
+	      ;; Don't need or cannot have alternative heading.
+	      ;; Use regular sectioning format string.
+	      (format section-fmt full-text
+		      (concat headline-label pre-blanks contents)))))))))
 
 (defun org-latex-format-headline-default-function
     (todo _todo-type priority text tags _info)
@@ -2428,7 +2550,7 @@ holding contextual information."
 See `org-latex-format-headline-function' for details."
   (concat
    (and todo (format "{\\bfseries\\sffamily %s} " todo))
-   (and priority (format "\\framebox{\\#%c} " priority))
+   (and priority (format "\\framebox{\\#%s} " (org-priority-to-string priority)))
    text
    (and tags
 	(format "\\hfill{}\\textsc{%s}"
@@ -2534,7 +2656,7 @@ holding contextual information."
 See `org-latex-format-inlinetask-function' for details."
   (let ((full-title
 	 (concat (when todo (format "\\textbf{\\textsf{\\textsc{%s}}} " todo))
-		 (when priority (format "\\framebox{\\#%c} " priority))
+		 (when priority (format "\\framebox{\\#%s} " (org-priority-to-string priority)))
 		 title
 		 (when tags
 		   (format "\\hfill{}\\textsc{%s}"
@@ -3119,6 +3241,8 @@ contextual information."
                   "{[}"
                   output
                   nil nil 1))
+    ;; When inside verse block, use special rules.
+    (setq output (org-latex--plain-text-verse-block output text))
     ;; Return value.
     output))
 
@@ -4188,6 +4312,48 @@ channel."
 
 ;;;; Verse Block
 
+(defun org-latex--plain-text-verse-block (contents plain-text)
+  "Format CONTENTS if PLAIN-TEXT is inside verse environment.
+INFO is the communication plist.
+Return CONTENTS unchanged when TEXT is not inside verse environment or
+when TEXT is a part of footnote reference.
+
+In a verse environment, add a line break to each newline character and
+change each white space at beginning of a line into a normal space,
+calculated with `\\fontdimen2\\font'.  One or more blank lines between
+lines are exported as a single blank line.  If the `:lines' attribute
+is used, the last verse of each stanza ends with the string `\\!',
+according to the syntax of the `verse' package.  The separation between
+stanzas can be controlled with the length `\\stanzaskip', of the
+aforementioned package.  If the `:literal' attribute is used, all
+blank lines are preserved and exported as `\\vspace*{\\baselineskip}',
+including the blank lines before or after CONTENTS."
+  (if-let* ((verse-block (org-element-lineage plain-text 'verse-block))
+            ;; VALUEFORM
+            ((not (org-element-lineage plain-text 'footnote-reference))))
+      (let* ((lin (org-export-read-attribute :attr_latex verse-block :lines))
+             (lit (org-export-read-attribute :attr_latex verse-block :literal)))
+	(replace-regexp-in-string
+	 "^[ \t]+" (lambda (m) (format "\\hspace*{%d\\fontdimen2\\font}" (length m)))
+	 (replace-regexp-in-string
+          (if (not lit)
+	      (rx-to-string
+               `(seq (group "\\\\\n")
+		     (1+ (group line-start (0+ space) "\\\\\n"))))
+	    "^[ \t]*\\\\$")
+	  (if (not lit)
+	      (if lin "\\\\!\n\n" "\n\n")
+	    "\\vspace*{\\baselineskip}")
+	  (replace-regexp-in-string
+	   "\\([ \t]*\\\\\\\\\\)?[ \t]*\n"
+           "\\\\\n"
+	   contents
+           nil t)
+          nil t)
+         nil t))
+    ;; Not in verse block, return CONTENTS unchanged.
+    contents))
+
 (defun org-latex-verse-block (verse-block contents info)
   "Transcode a VERSE-BLOCK element from Org to LaTeX.
 CONTENTS is verse block contents.  INFO is a plist holding
@@ -4195,57 +4361,27 @@ contextual information."
   (let* ((lin (org-export-read-attribute :attr_latex verse-block :lines))
          (latcode (org-export-read-attribute :attr_latex verse-block :latexcode))
          (cent (org-export-read-attribute :attr_latex verse-block :center))
-         (lit (org-export-read-attribute :attr_latex verse-block :literal))
          (attr (concat
-		(if cent "[\\versewidth]" "")
-		(if lin (format "\n\\poemlines{%s}" lin) "")
-		(if latcode (format "\n%s" latcode) "")))
+	        (if cent "[\\versewidth]" "")
+	        (if lin (format "\n\\poemlines{%s}" lin) "")
+	        (if latcode (format "\n%s" latcode) "")))
+         (lit (org-export-read-attribute :attr_latex verse-block :literal))
          (versewidth (org-export-read-attribute :attr_latex verse-block :versewidth))
          (vwidth (if versewidth (format "\\settowidth{\\versewidth}{%s}\n" versewidth) ""))
          (linreset (if lin "\n\\poemlines{0}" "")))
-    (concat
-     (org-latex--wrap-label
-      verse-block
-      ;; In a verse environment, add a line break to each newline
-      ;; character and change each white space at beginning of a line
-      ;; into a normal space, calculated with `\fontdimen2\font'.  One
-      ;; or more blank lines between lines are exported as a single
-      ;; blank line.  If the `:lines' attribute is used, the last
-      ;; verse of each stanza ends with the string `\\!', according to
-      ;; the syntax of the `verse' package. The separation between
-      ;; stanzas can be controlled with the length `\stanzaskip', of
-      ;; the aforementioned package.  If the `:literal' attribute is
-      ;; used, all blank lines are preserved and exported as
-      ;; `\vspace*{\baselineskip}', including the blank lines before
-      ;; or after CONTENTS.
-      (format "%s\\begin{verse}%s\n%s\\end{verse}%s"
-	      vwidth
-	      attr
-	      (replace-regexp-in-string
-	       "^[ \t]+" (lambda (m) (format "\\hspace*{%d\\fontdimen2\\font}" (length m)))
-	       (replace-regexp-in-string
-                (if (not lit)
-		    (rx-to-string
-                     `(seq (group "\\\\\n")
-		           (1+ (group line-start (0+ space) "\\\\\n"))))
-		  "^[ \t]*\\\\$")
-	        (if (not lit)
-		    (if lin "\\\\!\n\n" "\n\n")
-		  "\\vspace*{\\baselineskip}")
-	        (replace-regexp-in-string
-	         "\\([ \t]*\\\\\\\\\\)?[ \t]*\n"
-                 "\\\\\n"
-	         (if (not lit)
-		     (concat (org-trim contents t) "\n")
-		   contents)
-                 nil t)
-                nil t)
-               nil t)
-              linreset)
-      info)
-     ;; Insert footnote definitions, if any, after the environment, so
-     ;; the special formatting above is not applied to them.
-     (org-latex--delayed-footnotes-definitions verse-block info))))
+    (org-latex--wrap-label
+     verse-block
+     (format "%s\\begin{verse}%s\n%s\\end{verse}%s"
+             vwidth attr
+             ;; If the `:literal' attribute is used, all blank lines
+             ;; are preserved and exported as
+             ;; `\\vspace*{\\baselineskip}', including the blank lines
+             ;; before or after CONTENTS.
+             (if (not lit)
+	         (concat (org-trim contents t) "\n")
+	       contents)
+             linreset)
+     info)))
 
 
 ;;; End-user functions
@@ -4282,11 +4418,16 @@ Export is done in a buffer named \"*Org LATEX Export*\", which
 will be displayed when `org-export-show-temporary-export-buffer'
 is non-nil."
   (interactive)
-  (org-export-to-buffer 'latex "*Org LATEX Export*"
-    async subtreep visible-only body-only ext-plist
-    (if (fboundp 'major-mode-remap)
-        (major-mode-remap 'latex-mode)
-      #'LaTeX-mode)))
+  (defvar TeX-parse-self) ;; defined in tex.el
+  (let (;; FIXME: Working around LaTeX-mode being broken in non-file buffers.
+        ;; To be removed once we drop Emacs 30 and earlier, where the problem
+        ;; is not yet fixed.
+        (TeX-parse-self nil))
+    (org-export-to-buffer 'latex "*Org LATEX Export*"
+      async subtreep visible-only body-only ext-plist
+      (if (fboundp 'major-mode-remap)
+          (major-mode-remap 'latex-mode)
+        #'LaTeX-mode))))
 
 ;;;###autoload
 (defun org-latex-convert-region-to-latex ()
diff --git a/lisp/org/ox-man.el b/lisp/org/ox-man.el
index b573b1e59e5..2f296cab03d 100644
--- a/lisp/org/ox-man.el
+++ b/lisp/org/ox-man.el
@@ -33,7 +33,11 @@
 ;; See ox.el for more details on how this exporter works.
 ;;
 ;; It introduces one new buffer keywords:
-;; "MAN_CLASS_OPTIONS".
+;; "MAN_CLASS_OPTIONS" that accepts the following options:
+;;   - `:section-id', the section, a string (eg. ':section-id "2"');
+;;   - `:release', the footer middle, a string (eg. ':release "Emacs 13"');
+;;   - `:header', the header middle, a string (eg. ':header "GNU"').
+
 
 ;;; Code:
 
@@ -101,6 +105,7 @@
     (underline . org-man-underline)
     (verbatim . org-man-verbatim)
     (verse-block . org-man-verse-block))
+  :filters-alist '((:filter-parse-tree . org-man--remove-blank))
   :menu-entry
   '(?M "Export to MAN"
        ((?m "As MAN file" org-man-export-to-man)
@@ -300,6 +305,17 @@ This function shouldn't be used for floats.  See
   ;; backslash) cannot be used as per the same man page.
   (replace-regexp-in-string "\\\\" "\\e" text nil t))
 
+
+;;; Filters
+
+(defun org-man--remove-blank (tree _backend info)
+  "Remove :post-blank from TREE elements.
+INFO is the communication plist.
+Avoiding blank lines is adviced by groff_man_style(7) man page."
+  (org-element-map tree org-element-all-elements
+    (lambda (el) (setf (org-element-post-blank el) 0))
+    info)
+  tree)
 
 
 ;;; Template
@@ -315,19 +331,25 @@ holding export options."
                               #'identity
                               (list (plist-get info :man-class-options))
                               " "))))
-         (section-item (plist-get attr :section-id)))
-
+         (section-item (plist-get attr :section-id))
+         (release (plist-get attr :release))
+         (header (plist-get attr :header))
+         ;; Note: groff linter suggests date to be the third argument
+         ;; of .TH
+         (date (and (plist-get info :with-date)
+		    (org-export-data (org-export-get-date info) info))))
     (concat
-
-     (cond
-      ((and title (stringp section-item))
-       (format ".TH \"%s\" \"%s\" \n" title section-item))
-      ((and (string= "" title) (stringp section-item))
-       (format ".TH \"%s\" \"%s\" \n" " " section-item))
-      (title
-       (format ".TH \"%s\" \"1\" \n" title))
-      (t
-       ".TH \" \" \"1\" "))
+     (format ".TH \"%s\" \"%s\"" ;; only two required by groff_man(7).
+             (if title title " ")
+             (if (stringp section-item) section-item "1"))
+     (if date (format " \"%s\""  date)
+       " \"\"") ;; in case later options are present.
+     (if release (format " \"%s\"" release)
+       " \"\"") ;; in case later options are present.
+     ;; Do not write an empty footer-outside, otherwise man(1) will
+     ;; no longer generate its content, see groff_man(7).
+     (if header (format " \"%s\"" header))
+     " \n"
      contents)))
 
 
@@ -535,7 +557,7 @@ contextual information."
               (delete-file in-file)
               (delete-file out-file)
               code-block)
-          (format ".RS\n.nf\n\\fC\\m[black]%s\\m[]\\fP\n.fi\n.RE\n"
+          (format ".RS\n.nf\n\\fC%s\\m[]\\fP\n.fi\n.RE\n"
                   (org-man--protect-example code)))))
 
      ;; Do not use a special package: transcode it verbatim.
@@ -755,7 +777,7 @@ holding contextual information."
 CONTENTS holds the contents of the item.  INFO is a plist holding
 contextual information."
   (if (not (plist-get info :man-source-highlight))
-      (format ".RS\n.nf\n\\fC%s\\fP\n.fi\n.RE\n\n"
+      (format ".RS\n.nf\n\\fC%s\\fP\n.fi\n.RE\n"
 	      (org-man--protect-example (org-export-format-code-default src-block info)))
     (let* ((tmpdir temporary-file-directory)
 	   (in-file  (make-temp-name (expand-file-name "srchilite" tmpdir)))
@@ -779,7 +801,7 @@ contextual information."
 	    (delete-file in-file)
 	    (delete-file out-file)
 	    code-block)
-	(format ".RS\n.nf\n\\fC\\m[black]%s\\m[]\\fP\n.fi\n.RE" (org-man--protect-example code))))))
+	(format ".RS\n.nf\n\\fC%s\\m[]\\fP\n.fi\n.RE" (org-man--protect-example code))))))
 
 
 ;;; Statistics Cookie
@@ -1125,6 +1147,8 @@ file-local settings.
 Return PDF file's name."
   (interactive)
   (let ((outfile (org-export-output-file-name ".man" subtreep)))
+    (require 'ox-latex)
+    (declare-function org-latex-compile "ox-latex" (texfile &optional snippet))
     (org-export-to-file 'man outfile
       async subtreep visible-only body-only ext-plist
       #'org-latex-compile)))
diff --git a/lisp/org/ox-md.el b/lisp/org/ox-md.el
index 20d41dc858a..f15f3f5686c 100644
--- a/lisp/org/ox-md.el
+++ b/lisp/org/ox-md.el
@@ -93,6 +93,22 @@ headings for its own use."
   ;; Avoid `natnum' because that's not available until Emacs 28.1.
   :type 'integer)
 
+(defcustom org-md-link-org-files-as-md t
+  "Non-nil means make file links to \"file.org\" point to \"file.md\".
+
+When Org mode is exporting an Org file to markdown, links to
+non-markdown files are directly put into a \"href\" tag in
+markdown.  However, links to other Org files \(recognized by the
+extension \".org\") should become links to the corresponding
+markdown file, assuming that the linked Org file will also be
+converted to markdown.
+
+When nil, the links still point to the plain \".org\" file."
+  :group 'org-export-md
+  :package-version '(Org . "9.8")
+  :type 'boolean
+  :safe #'booleanp)
+
 
 
 ;;; Define Backend
@@ -144,7 +160,8 @@ headings for its own use."
   '((:md-footnote-format nil nil org-md-footnote-format)
     (:md-footnotes-section nil nil org-md-footnotes-section)
     (:md-headline-style nil nil org-md-headline-style)
-    (:md-toplevel-hlevel nil nil org-md-toplevel-hlevel)))
+    (:md-toplevel-hlevel nil nil org-md-toplevel-hlevel)
+    (:md-link-org-files-as-md nil nil org-md-link-org-files-as-md)))
 
 
 ;;; Filters
@@ -393,8 +410,8 @@ a communication channel."
 			     (concat "     " (org-make-tag-string tag-list))))))
 	   (priority
 	    (and (plist-get info :with-priority)
-		 (let ((char (org-element-property :priority headline)))
-		   (and char (format "[#%c] " char)))))
+		 (let ((priority-value (org-element-property :priority headline)))
+		   (and priority-value (format "[#%s] " (org-priority-to-string priority-value))))))
 	   ;; Headline text without tags.
 	   (heading (concat todo priority title))
 	   (style (plist-get info :md-headline-style)))
@@ -540,17 +557,19 @@ channel."
 DESC is the description part of the link, or the empty string.
 INFO is a plist holding contextual information.  See
 `org-export-data'."
-  (let* ((link-org-files-as-md
+  (let* ((link-org-files-as-md-maybe
 	  (lambda (raw-path)
 	    ;; Treat links to `file.org' as links to `file.md'.
-	    (if (string= ".org" (downcase (file-name-extension raw-path ".")))
+	    (if (and
+		 (plist-get info :md-link-org-files-as-md)
+		 (string= ".org" (downcase (file-name-extension raw-path "."))))
 		(concat (file-name-sans-extension raw-path) ".md")
 	      raw-path)))
 	 (type (org-element-property :type link))
 	 (raw-path (org-element-property :path link))
 	 (path (cond
 		((string-equal  type "file")
-		 (org-export-file-uri (funcall link-org-files-as-md raw-path)))
+		 (org-export-file-uri (funcall link-org-files-as-md-maybe raw-path)))
 		(t (concat type ":" raw-path)))))
     (cond
      ;; Link type is handled by a special function.
@@ -561,7 +580,7 @@ INFO is a plist holding contextual information.  See
 			   (org-export-resolve-id-link link info))))
 	(pcase (org-element-type destination)
 	  (`plain-text			; External file.
-	   (let ((path (funcall link-org-files-as-md destination)))
+	   (let ((path (funcall link-org-files-as-md-maybe destination)))
 	     (if (not desc) (format "<%s>" path)
 	       (format "[%s](%s)" desc path))))
 	  (`headline
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index be58b152670..232a643738f 100644
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -35,10 +35,6 @@
 (require 'ox)
 (require 'table nil 'noerror)
 
-(declare-function org-at-heading-p "org" (&optional _))
-(declare-function org-back-to-heading "org" (&optional invisible-ok))
-(declare-function org-next-visible-heading "org" (arg))
-
 ;;; Define Backend
 
 (org-export-define-backend 'odt
@@ -91,10 +87,12 @@
     (verbatim . org-odt-verbatim)
     (verse-block . org-odt-verse-block))
   :filters-alist '((:filter-parse-tree
-		    . (org-odt--translate-latex-fragments
+		    . (org-odt--strip-trailing-newlines
+                       org-odt--translate-latex-fragments
 		       org-odt--translate-description-lists
 		       org-odt--translate-list-tables
-		       org-odt--translate-image-links)))
+		       org-odt--translate-image-links))
+                   (:filter-final-output . org-odt--remove-forbidden))
   :menu-entry
   '(?o "Export to ODT"
        ((?o "As ODT file" org-odt-export-to-odt)
@@ -108,6 +106,7 @@
     (:keywords "KEYWORDS" nil nil space)
     (:subtitle "SUBTITLE" nil nil parse)
     ;; Other variables.
+    (:odt-with-forbidden-chars nil nil org-odt-with-forbidden-chars)
     (:odt-content-template-file nil nil org-odt-content-template-file)
     (:odt-display-outline-level nil nil org-odt-display-outline-level)
     (:odt-fontify-srcblocks nil nil org-odt-fontify-srcblocks)
@@ -170,6 +169,14 @@ Use this to infer values of `org-odt-styles-dir' and
     ("\\.\\.\\." . "&#x2026;"))		; hellip
   "Regular expressions for special string conversion.")
 
+(defconst org-odt-forbidden-char-re
+  (rx (not (in ?\N{U+9} ?\N{U+A} ?\N{U+D}
+               (?\N{U+20} . ?\N{U+D7FF})
+               (?\N{U+E000} . ?\N{U+FFFD})
+               (?\N{U+10000} . ?\N{U+10FFFF}))))
+  "Regexp matching forbidden XML1.0 characters.
+https://www.w3.org/TR/REC-xml/#charsets")
+
 (defconst org-odt-schema-dir-list
   (list (expand-file-name "./schema/" org-odt-data-dir))
   "List of directories to search for OpenDocument schema files.
@@ -364,6 +371,20 @@ the entity.  See `org-odt--enumerate'.")
   :tag "Org Export ODT"
   :group 'org-export)
 
+(defcustom org-odt-with-forbidden-chars ""
+  "String to replace forbidden XML characters.
+When set to t, forbidden characters are left as-is.
+When set to nil, an error is thrown.
+See `org-odt-forbidden-char-re' for the list of forbidden characters
+that cannot occur inside ODT documents.
+
+You may also consider export filters to perform more fine-grained
+replacements.  See info node `(org)Advanced Export Configuration'."
+  :package-version '(Org . "9.8")
+  :type '(choice (const :tag "Leave forbidden characters as-is" t)
+                 (const :tag "Err when forbidden characters encountered" nil)
+                 (string :tag "Replacement string"))
+  :safe #'always)
 
 ;;;; Debugging
 
@@ -699,26 +720,31 @@ When set, the exporter will process LaTeX environments and
 fragments.
 
 This option can also be set with the +OPTIONS line,
-e.g. \"tex:mathjax\".  Allowed values are:
+e.g. \"tex:dvipng\".  Allowed values are:
 
 nil            Ignore math snippets.
-`verbatim'     Keep everything in verbatim
-`dvipng'       Process the LaTeX fragments to images.  This will also
-               include processing of non-math environments.
-`imagemagick'  Convert the LaTeX fragments to pdf files and use
-               imagemagick to convert pdf files to png files.
-`mathjax'      Do MathJax preprocessing and arrange for MathJax.js to
-               be loaded.
+t, `mathml'    Convert the LaTeX fragments to MathML if the
+               `org-latex-to-mathml-convert-command' is usable.
+SYMBOL         Convert the LaTeX fragments to images using any symbol
+               defined in `org-preview-latex-process-alist', e.g.,
+               `dvipng'.
+`verbatim'     Keep everything in verbatim.
 
-Any other symbol is a synonym for `mathjax'."
-  :version "24.4"
-  :package-version '(Org . "8.0")
-  :type '(choice
-	  (const :tag "Do not process math in any way" nil)
-	  (const :tag "Leave math verbatim" verbatim)
-	  (const :tag "Use dvipng to make images" dvipng)
-	  (const :tag "Use imagemagick to make images" imagemagick)
-	  (other :tag "Use MathJax to display math" mathjax)))
+If the desired converter is not available or any other symbol is
+provided, process as `verbatim'."
+  :package-version '(Org . "9.8")
+  :type `(choice
+          (const :tag "Do not process math in any way" nil)
+          (choice :tag "Convert fragments to MathML" :value t
+                  (const t)
+                  (const mathml))
+          (restricted-sexp :tag "Convert fragments to images"
+                           :value ,(caar org-preview-latex-process-alist)
+                           :match-alternatives
+                           (,(lambda (v)
+                               (assq v org-preview-latex-process-alist))))
+          (const :tag "Leave math verbatim" verbatim))
+  :safe #'always)
 
 
 ;;;; Links
@@ -1097,8 +1123,9 @@ specifying the depth of the table."
 	       (format "<text:span text:style-name=\"%s\">%s</text:span> "
 		       style todo)))
 	   (when priority
-	     (let* ((style (format "OrgPriority-%s" priority))
-		    (priority (format "[#%c]" priority)))
+	     (let* ((priority-string (org-priority-to-string priority))
+                    (style (format "OrgPriority-%s" priority-string))
+		    (priority (format "[#%s]" priority-string)))
 	       (format "<text:span text:style-name=\"%s\">%s</text:span> "
 		       style priority)))
 	   ;; Title.
@@ -1369,7 +1396,11 @@ original parsed data.  INFO is a plist holding export options."
     ;; Ensure we have write permissions to this file.
     (set-file-modes (concat org-odt-zip-dir "styles.xml") #o600)
 
-    (let ((styles-xml (concat org-odt-zip-dir "styles.xml")))
+    (let ((styles-xml (concat org-odt-zip-dir "styles.xml"))
+          ;; Capture the current (possibly buffer-local) values for priorities
+          ;; because these get reset to global values when we use `with-temp-buffer'
+          (priority-high org-priority-highest)
+          (priority-low org-priority-lowest))
       (with-temp-buffer
         (when (file-exists-p styles-xml)
           (insert-file-contents styles-xml))
@@ -1401,6 +1432,16 @@ original parsed data.  INFO is a plist holding export options."
 		      (if (wholenump sec-num) (<= level sec-num) sec-num))
 	      (replace-match replacement t nil))))
 
+        ;; Update styles.xml with priority styles for the current valid priority range
+        (when (plist-get info :with-priority)
+          (goto-char (point-min))
+          (when (re-search-forward "<style:style style:name=\"OrgPriority\" style:family=\"text\"/>" nil t)
+            (goto-char (match-end 0))
+            (insert "\n  <!-- Org Priority Styles -->\n")
+            (dolist (priority (number-sequence priority-high priority-low))
+              (insert (format "  <style:style style:name=\"OrgPriority-%s\" style:family=\"text\" style:parent-style-name=\"OrgPriority\"/>\n"
+                              (org-priority-to-string priority))))))
+
         ;; Write back the new contents.
         (write-region nil nil styles-xml))))
   ;; Update content.xml.
@@ -1838,8 +1879,9 @@ See `org-odt-format-headline-function' for details."
      (let ((style (if (eq todo-type 'done) "OrgDone" "OrgTodo")))
        (format "<text:span text:style-name=\"%s\">%s</text:span> " style todo)))
    (when priority
-     (let* ((style (format "OrgPriority-%c" priority))
-	    (priority (format "[#%c]" priority)))
+     (let* ((priority-string (org-priority-to-string priority))
+            (style (format "OrgPriority-%s" priority-string))
+	    (priority (format "[#%s]" priority-string)))
        (format "<text:span text:style-name=\"%s\">%s</text:span> "
 	       style priority)))
    ;; Title.
@@ -2209,9 +2251,10 @@ SHORT-CAPTION are strings."
 	    ;; Use Imagemagick.
 	    (and (executable-find "identify")
 		 (let ((size-in-pixels
-			(let ((dim (shell-command-to-string
-				    (format "identify -format \"%%w:%%h\" \"%s\""
-					    file))))
+			(let ((dim (with-temp-buffer
+                                     (call-process "identify" nil `(,(current-buffer) nil) nil
+                                                   "-format" "%w:%h" (format "%s" file))
+                                     (buffer-string))))
 			  (when (string-match "\\([0-9]+\\):\\([0-9]+\\)" dim)
 			    (cons (string-to-number (match-string 1 dim))
 				  (string-to-number (match-string 2 dim)))))))
@@ -2892,6 +2935,32 @@ contextual information."
        (format " <text:s text:c=\"%d\"/>" (1- (length s)))))
    line))
 
+(defun org-odt--remove-forbidden (text _backend info)
+  "Remove forbidden and discouraged characters from TEXT.
+INFO is the communication plist"
+  (pcase-exhaustive (plist-get info :odt-with-forbidden-chars)
+    ((and (pred stringp) rep)
+     (let ((replacements (make-hash-table :test 'equal)))
+       (with-temp-buffer
+         (insert text)
+         (goto-char (point-min))
+         (while (re-search-forward org-odt-forbidden-char-re nil t)
+           (cl-incf (gethash (match-string 0) replacements 0))
+           (replace-match rep))
+         (cl-loop for forbidden being the hash-keys of replacements
+                  using (hash-values count)
+                  do (display-warning
+                      '(ox-odt ox-odt-with-forbidden-chars)
+                      (format "Replaced forbidden character '%s' with '%s' %d times"
+                              forbidden rep count)))
+         (buffer-string))))
+    (`nil
+     (if (string-match org-odt-forbidden-char-re text)
+         (error "Forbidden character '%s' found.  See `org-odt-with-forbidden-chars'"
+                (match-string 0 text))
+       text))
+    ('t text)))
+
 (defun org-odt--encode-plain-text (text &optional no-whitespace-filling)
   (dolist (pair '(("&" . "&amp;") ("<" . "&lt;") (">" . "&gt;")))
     (setq text (replace-regexp-in-string (car pair) (cdr pair) text t t)))
@@ -2925,7 +2994,11 @@ contextual information."
       ;; FIXME: The unnecessary spacing may still remain when a newline
       ;; is at a boundary between Org objects (e.g. italics markup
       ;; followed by newline).
-      (when (org-string-nw-p output) ; blank string needs not to be re-filled
+      (when (and (org-string-nw-p output) ; blank string needs not to be re-filled
+                 ;; Plain text inside verse blocks gotta preserve newlines
+                 ;; and spaces.
+                 (not (org-element-lineage text '(verse-block)))
+                 )
         (setq output
               (with-temp-buffer
                 (save-match-data
@@ -3116,8 +3189,7 @@ and prefix with \"OrgSrc\".  For example,
 
 (defun org-odt-do-format-code
     (code info &optional lang refs retain-labels num-start)
-  (let* ((lang (or (assoc-default lang org-src-lang-modes) lang))
-	 (lang-mode (if lang (intern (format "%s-mode" lang)) #'ignore))
+  (let* ((lang-mode (if lang (org-src-get-lang-mode lang) #'ignore))
 	 (code-lines (org-split-string code "\n"))
 	 (code-length (length code-lines))
 	 (use-htmlfontify-p (and (functionp lang-mode)
@@ -3711,14 +3783,38 @@ contextual information."
 	  (replace-regexp-in-string
 	   ;; Replace leading tabs and spaces.
 	   "^[ \t]+" #'org-odt--encode-tabs-and-spaces
-	   ;; Add line breaks to each line of verse.
-	   (replace-regexp-in-string
-	    "\\(<text:line-break/>\\)?[ \t]*$" "<text:line-break/>" contents))))
+           (replace-regexp-in-string
+            ;; Remove newlines after line breaks.
+            "<text:line-break/>[\n]" "<text:line-break/>"
+	    (replace-regexp-in-string
+             ;; Add line breaks to each line of verse.
+	     "\\(<text:line-break/>\\)?[ \t]*$" "<text:line-break/>" contents)))))
 
 
 
 ;;; Filters
 
+;;; Plain text
+
+;; Trailing newlines appear as spaces in ODT.
+;; We do not want that in, for example, in paragraphs where
+;; end of paragraph is already signaled by ODT tag.
+(defun org-odt--strip-trailing-newlines (data _backend info)
+  "Strip trailing newlines in DATA at the end of contents.
+INFO is the communication channel."
+  (org-element-map data org-element-all-elements
+    (lambda (el)
+      (when-let* ((last-child (car (last (org-element-contents el)))))
+        (when (and (org-element-type-p last-child 'plain-text)
+                   (string-suffix-p "\n" last-child))
+          (when (length> last-child 1)
+            (org-element-insert-before
+             (substring last-child 0 (1- (length last-child)))
+             last-child))
+          (org-element-extract last-child))))
+    info nil nil t)
+  data)
+
 ;;; Images
 
 (defun org-odt--translate-image-links (data _backend info)
@@ -3728,26 +3824,35 @@ contextual information."
 
 (defun org-odt--translate-latex-fragments (tree _backend info)
   (let ((processing-type (plist-get info :with-latex))
+	(preview-symbols (mapcar #'car org-preview-latex-process-alist))
 	(count 0)
         (warning nil))
-    ;; Normalize processing-type to one of dvipng, mathml or verbatim.
-    ;; If the desired converter is not available, force verbatim
-    ;; processing.
-    (cl-case processing-type
-      ((t mathml)
+    ;; Normalize processing-type to one of mathml, verbatim, or a
+    ;; symbol in org-preview-latex-process-alist.  If the desired
+    ;; converter is not available, force verbatim processing.
+    (pcase processing-type
+      ((or 't 'mathml)
        (if (and (fboundp 'org-format-latex-mathml-available-p)
 		(org-format-latex-mathml-available-p))
 	   (setq processing-type 'mathml)
          (setq warning "`org-odt-with-latex': LaTeX to MathML converter not available.  Falling back to verbatim.")
 	 (setq processing-type 'verbatim)))
-      ((dvipng imagemagick)
-       (unless (and (org-check-external-command "latex" "" t)
-		    (org-check-external-command
-		     (if (eq processing-type 'dvipng) "dvipng" "convert") "" t))
-	 (setq warning "`org-odt-with-latex': LaTeX to PNG converter not available.  Falling back to verbatim.")
-	 (setq processing-type 'verbatim)))
-      (verbatim) ;; nothing to do
-      (otherwise
+      ((and s (guard (memq s preview-symbols)))
+       (let* ((ext-commands (plist-get
+                             (cdr (assq s org-preview-latex-process-alist))
+                             :programs))
+              (ext-commands-available
+               (seq-reduce (lambda (result cmd)
+                             (and result
+                                  (not
+                                   (null
+                                    (org-check-external-command cmd "" t)))))
+                           ext-commands t)))
+         (unless ext-commands-available
+           (setq warning "`org-odt-with-latex': LaTeX to image converter not available.  Falling back to verbatim.")
+           (setq processing-type 'verbatim))))
+      ('verbatim) ;; nothing to do
+      (_
        (setq warning "`org-odt-with-latex': Unknown LaTeX option.  Forcing verbatim.")
        (setq processing-type 'verbatim)))
 
@@ -3764,34 +3869,32 @@ contextual information."
     (message "Formatting LaTeX using %s" processing-type)
 
     ;; Convert `latex-fragment's and `latex-environment's.
-    (when (memq processing-type '(mathml dvipng imagemagick))
+    (when (memq processing-type (append '(mathml) preview-symbols))
       (org-element-map tree '(latex-fragment latex-environment)
 	(lambda (latex-*)
 	  (cl-incf count)
 	  (let* ((latex-frag (org-element-property :value latex-*))
 		 (input-file (plist-get info :input-file))
+                 (is-image (memq processing-type preview-symbols))
 		 (cache-dir (file-name-directory input-file))
 		 (cache-subdir (concat
-				(cl-case processing-type
-				  ((dvipng imagemagick)
-				   org-preview-latex-image-directory)
-				  (mathml "ltxmathml/"))
+				(if is-image
+				    org-preview-latex-image-directory
+				  org-latex-mathml-directory)
 				(file-name-sans-extension
 				 (file-name-nondirectory input-file))))
 		 (display-msg
-		  (cl-case processing-type
-		    ((dvipng imagemagick)
-		     (format "Creating LaTeX Image %d..." count))
-		    (mathml (format "Creating MathML snippet %d..." count))))
-		 ;; Get an Org-style link to PNG image or the MathML
-		 ;; file.
+		  (if is-image
+		      (format "Creating LaTeX image %d..." count)
+		    (format "Creating MathML snippet %d..." count)))
+		 ;; Get an Org-style link to image or the MathML file.
 		 (link
 		  (with-temp-buffer
 		    (insert latex-frag)
                     (delay-mode-hooks (let ((org-inhibit-startup t)) (org-mode)))
-		    ;; When converting to a PNG image, make sure to
-		    ;; copy all LaTeX header specifications from the
-		    ;; Org source.
+		    ;; When converting to an image, make sure to copy
+		    ;; all LaTeX header specifications from the Org
+		    ;; source.
 		    (unless (eq processing-type 'mathml)
 		      (let ((h (plist-get info :latex-header)))
 			(when h
@@ -4033,7 +4136,11 @@ contextual information."
 		     (kill-buffer buf)))))
 	     ;; Delete temporary directory and also other embedded
 	     ;; files that get copied there.
-	     (delete-directory org-odt-zip-dir t))))
+	     (delete-directory org-odt-zip-dir t)))
+          ;; We specify UTF-8 in `org-odt-template'.  Enforce it even
+          ;; when the buffer text has different encoding.
+          (coding-system-for-write 'utf-8)
+	  (save-buffer-coding-system 'utf-8))
      (condition-case-unless-debug err
 	 (progn
 	   (unless (executable-find "zip")
diff --git a/lisp/org/ox-org.el b/lisp/org/ox-org.el
index 61fd813841f..e2c434fd6ce 100644
--- a/lisp/org/ox-org.el
+++ b/lisp/org/ox-org.el
@@ -245,7 +245,7 @@ a communication channel."
    ;; them are included in the result.
    (let ((footnotes
 	  (org-element-map
-	      (list (org-element-lineage section 'headline) section)
+	      (list (or (org-element-lineage section 'headline) "") section)
 	      'footnote-reference
 	    (lambda (fn)
 	      (and (eq (org-element-property :type fn) 'standard)
@@ -337,10 +337,13 @@ is the property list for the given project.  PUB-DIR is the
 publishing directory.
 
 Return output file name."
+  (require 'ox-publish)
+  (declare-function org-publish-org-to "ox-publish" (backend filename extension plist &optional pub-dir))
   (org-publish-org-to 'org filename ".org" plist pub-dir)
   (when (plist-get plist :htmlized-source)
     (org-require-package 'htmlize)
     (require 'ox-html)
+    (defvar org-html-extension) ; defined in ox-html.el
     (let* ((org-inhibit-startup t)
 	   (htmlize-output-type 'css)
 	   (html-ext (concat "." (or (plist-get plist :html-extension)
diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el
index 88d0940e664..5116ff9985d 100644
--- a/lisp/org/ox-publish.el
+++ b/lisp/org/ox-publish.el
@@ -45,8 +45,6 @@
 (require 'ox)
 
 (declare-function org-at-heading-p "org" (&optional _))
-(declare-function org-back-to-heading "org" (&optional invisible-ok))
-(declare-function org-next-visible-heading "org" (arg))
 
 
 ;;; Variables
@@ -56,9 +54,6 @@
   "This will cache timestamps and titles for files in publishing projects.
 Blocks could hash sha1 values here.")
 
-(defvar org-publish-transient-cache nil
-  "This will cache information during publishing process.")
-
 (defvar org-publish-after-publishing-hook nil
   "Hook run each time a file is published.
 Every function in this hook will be called with two arguments:
@@ -389,7 +384,7 @@ still decide about that independently."
   "Update publishing timestamp for file FILENAME.
 If there is no timestamp, create one."
   (let ((key (org-publish-timestamp-filename filename pub-dir pub-func))
-	(stamp (org-publish-cache-mtime-of-src filename)))
+	(stamp (current-time)))
     (org-publish-cache-set key stamp)))
 
 (defun org-publish-remove-all-timestamps ()
@@ -650,6 +645,7 @@ files, when entire projects are published (see
       (when (org-publish-needed-p filename pub-base-dir f pub-dir base-dir)
 	(let ((output (funcall f project-plist filename pub-dir)))
 	  (org-publish-update-timestamp filename pub-base-dir f base-dir)
+          (org-publish-update-timestamp filename)
 	  (run-hook-with-args 'org-publish-after-publishing-hook
 			      filename
 			      output))))
@@ -826,7 +822,7 @@ Default for SITEMAP-FILENAME is `sitemap.org'."
 				      (mapcar #'file-name-directory files)))
 			files)))
 	 ;; Eventually sort all entries.
-	 (when (or sort-files (not (memq sort-folders 'ignore)))
+	 (when (or sort-files (not (eq sort-folders 'ignore)))
 	   (setq files (sort files sort-predicate)))
 	 (funcall sitemap-builder
 		  title
@@ -858,7 +854,7 @@ PROPERTY, i.e. \"behavior\" parameter from `org-export-options-alist'."
 (defun org-publish-find-title (file project)
   "Find the title of FILE in PROJECT."
   (let ((file (org-publish--expand-file-name file project)))
-    (or (org-publish-cache-get-file-property file :title nil t)
+    (or (org-publish-cache-get-file-property file :title nil t (car project))
 	(let* ((parsed-title (org-publish-find-property file :title project))
 	       (title
 		(if parsed-title
@@ -867,7 +863,7 @@ PROPERTY, i.e. \"behavior\" parameter from `org-export-options-alist'."
 		    (org-no-properties
 		     (org-element-interpret-data parsed-title))
 		  (file-name-nondirectory (file-name-sans-extension file)))))
-	  (org-publish-cache-set-file-property file :title title nil 'transient)))))
+	  (org-publish-cache-set-file-property file :title title (car project))))))
 
 (defun org-publish-find-date (file project)
   "Find the date of FILE in PROJECT.
@@ -876,7 +872,7 @@ If FILE is an Org file and provides a DATE keyword use it.  In
 any other case use the file system's modification time.  Return
 time in `current-time' format."
   (let ((file (org-publish--expand-file-name file project)))
-    (or (org-publish-cache-get-file-property file :date nil t)
+    (or (org-publish-cache-get-file-property file :date nil t (car project))
 	(org-publish-cache-set-file-property
 	 file :date
 	 (if (file-directory-p file)
@@ -893,7 +889,7 @@ time in `current-time' format."
 		   ((file-exists-p file)
 		    (file-attribute-modification-time (file-attributes file)))
 		   (t (error "No such file: \"%s\"" file)))))
-         nil 'transient))))
+         (car project)))))
 
 (defun org-publish-sitemap-default-entry (entry style project)
   "Default format for site map ENTRY, as a string.
@@ -1049,8 +1045,7 @@ its CDR is a string."
 			      (replace-regexp-in-string
 			       "\\[[0-9]+%\\]\\|\\[[0-9]+/[0-9]+\\]" ""
 			       (org-element-property :raw-value parent)))))))))
-	info))
-     nil 'transient))
+	info))))
   ;; Return output unchanged.
   output)
 
@@ -1065,8 +1060,9 @@ publishing directory."
 		  (setq full-index
 			(sort (nreverse full-index)
 			      (lambda (a b) (string< (downcase (car a))
-						     (downcase (car b)))))))
-      (let ((index (org-publish-cache-get-file-property file :index)))
+						(downcase (car b)))))))
+      (let ((index (org-publish-cache-get-file-property
+                    file :index nil nil (car project))))
 	(dolist (term index)
 	  (unless (member term full-index) (push term full-index)))))
     ;; Write "theindex.inc" in DIRECTORY.
@@ -1231,6 +1227,7 @@ If FREE-CACHE, empty the cache."
       (error "Cannot find cache-file name in `org-publish-write-cache-file'"))
     (with-temp-file cache-file
       (let (print-level print-length)
+        (insert ";; -*- lexical-binding: nil; -*-\n")
 	(insert "(setq org-publish-cache \
 \(make-hash-table :test 'equal :weakness nil :size 100))\n")
 	(maphash (lambda (k v)
@@ -1253,9 +1250,6 @@ If FREE-CACHE, empty the cache."
     (error "Org publish timestamp: %s is not a directory"
 	   org-publish-timestamp-directory))
 
-  (unless org-publish-transient-cache
-    (setq org-publish-transient-cache (make-hash-table :test #'equal)))
-
   (unless (and org-publish-cache
 	       (string= (org-publish-cache-get ":project:") project-name))
     (let* ((cache-file
@@ -1279,16 +1273,15 @@ If FREE-CACHE, empty the cache."
   (message "%s" "Resetting org-publish-cache")
   (when (hash-table-p org-publish-cache)
     (clrhash org-publish-cache))
-  (when (hash-table-p org-publish-transient-cache)
-    (clrhash org-publish-transient-cache))
   (setq org-publish-cache nil))
 
 (defun org-publish-cache-file-needs-publishing
     (filename &optional pub-dir pub-func _base-dir)
   "Check the timestamp of the last publishing of FILENAME.
-Return non-nil if the file needs publishing.  Also check if
-any included files have been more recently published, so that
-the file including them will be republished as well."
+Return non-nil if the file needs publishing.  This is the case
+if either FILENAME does not occur in the publication cache or
+if FILENAME, or any file included by it, was modified after the
+most recent publication."
   (unless org-publish-cache
     (error
      "`org-publish-cache-file-needs-publishing' called, but no cache present"))
@@ -1322,26 +1315,20 @@ the file including them will be republished as well."
     (or (null pstamp)
 	(let ((mtime (org-publish-cache-mtime-of-src filename)))
 	  (or (time-less-p pstamp mtime)
-	      (cl-some (lambda (ct) (time-less-p mtime ct))
+	      (cl-some (lambda (ct) (time-less-p pstamp ct))
 		       included-files-mtime))))))
 
 (defun org-publish-cache-set-file-property
-    (filename property value &optional project-name transient)
+    (filename property value &optional project-name)
   "Set the VALUE for a PROPERTY of file FILENAME in publishing cache to VALUE.
 Use cache file of PROJECT-NAME.  If the entry does not exist, it
-will be created.  Return VALUE.
-
-When TRANSIENT is non-nil, store value in transient cache that is only
-maintained during the current publish process."
+will be created.  Return VALUE."
   ;; Evtl. load the requested cache file:
   (when project-name (org-publish-initialize-cache project-name))
-  (if transient
-      (puthash (cons filename property) value
-               org-publish-transient-cache)
-    (let ((pl (org-publish-cache-get filename)))
-      (if pl (progn (plist-put pl property value) value)
-        (org-publish-cache-get-file-property
-         filename property value nil project-name)))))
+  (let ((pl (org-publish-cache-get filename)))
+    (if pl (progn (plist-put pl property value) value)
+      (org-publish-cache-get-file-property
+       filename property value nil project-name))))
 
 (defun org-publish-cache-get-file-property
     (filename property &optional default no-create project-name)
@@ -1350,14 +1337,19 @@ Use cache file of PROJECT-NAME.  Return the value of that PROPERTY,
 or DEFAULT, if the value does not yet exist.  Create the entry,
 if necessary, unless NO-CREATE is non-nil."
   (when project-name (org-publish-initialize-cache project-name))
-  (or (gethash (cons filename property) org-publish-transient-cache)
-      (let ((properties (org-publish-cache-get filename)))
-        (cond ((null properties)
-	       (unless no-create
-	         (org-publish-cache-set filename (list property default)))
-	       default)
-	      ((plist-member properties property) (plist-get properties property))
-	      (t default)))))
+  (let ((properties (org-publish-cache-get filename)))
+    (cond ((null properties)
+	   (unless no-create
+	     (org-publish-cache-set filename (list property default)))
+	   default)
+          ((org-publish-cache-file-needs-publishing filename)
+           ;; Cache is not up to date - file or #+include'd files changed.
+           (org-publish-cache-set filename nil)
+           ;; Mark that we refreshed the cache.
+           (org-publish-update-timestamp filename)
+           default)
+	  ((plist-member properties property) (plist-get properties property))
+	  (t default))))
 
 (defun org-publish-cache-get (key)
   "Return the value stored in `org-publish-cache' for key KEY.
diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el
index 37a845b5e45..a5417773854 100644
--- a/lisp/org/ox-texinfo.el
+++ b/lisp/org/ox-texinfo.el
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 2012-2026 Free Software Foundation, Inc.
 ;; Author: Jonathan Leech-Pepin <jonathan.leechpepin at gmail dot com>
+;; Maintainer: Rudolf Adamkovič <rudolf@adamkovic.org>
 ;; Keywords: outlines, hypermedia, calendar, text
 
 ;; This file is part of GNU Emacs.
@@ -246,15 +247,15 @@ be placed after the end of the title."
 ;;;; Timestamps
 
 (defcustom org-texinfo-active-timestamp-format "@emph{%s}"
-  "A printf format string to be applied to active timestamps."
+  "A `format' string to be applied to active timestamps."
   :type 'string)
 
 (defcustom org-texinfo-inactive-timestamp-format "@emph{%s}"
-  "A printf format string to be applied to inactive timestamps."
+  "A `format' string to be applied to inactive timestamps."
   :type 'string)
 
 (defcustom org-texinfo-diary-timestamp-format "@emph{%s}"
-  "A printf format string to be applied to diary timestamps."
+  "A `format' string to be applied to diary timestamps."
   :type 'string)
 
 ;;;; Links
@@ -377,7 +378,7 @@ transcoded to `@itemx'.  See info node `(org)Plain lists in
 Texinfo export' for how to enable this for individual lists."
   :package-version '(Org . "9.6")
   :type 'boolean
-  :safe t)
+  :safe #'booleanp)
 
 ;;;; Compilation
 
@@ -389,11 +390,16 @@ shell as a command.  %f in the command will be replaced by the
 relative file name, %F by the absolute file name, %b by the file
 base name (i.e. without directory and extension parts), %o by the
 base directory of the file and %O by the absolute file name of
-the output file."
+the output file.
+
+Alternatively, this may be a Lisp function that does the processing,
+This function should accept the file name as its single argument."
   :version "26.1"
   :package-version '(Org . "9.1")
-  :type '(repeat :tag "Shell command sequence"
-		 (string :tag "Shell command")))
+  :type '(choice
+          (repeat :tag "Shell command sequence"
+		  (string :tag "Shell command"))
+          (function)))
 
 (defcustom org-texinfo-logfiles-extensions
   '("aux" "toc" "cp" "fn" "ky" "pg" "tp" "vr")
@@ -524,7 +530,7 @@ node or anchor name is unique."
 		(org-texinfo--sanitize-node
 		 (pcase (org-element-type datum)
 		   (`headline
-		    (org-texinfo--sanitize-title
+		    (org-texinfo--sanitize-title-reference
 		     (org-export-get-alt-title datum info) info))
 		   (`radio-target
 		    (org-export-data (org-element-contents datum) info))
@@ -553,6 +559,14 @@ node or anchor name is unique."
 	  (plist-put info :texinfo-node-cache (cons (cons datum name) cache))
 	  name))))
 
+(defun org-texinfo--prepend-anchor-maybe (contents node)
+  "Maybe prepend NODE anchor before CONTENTS.
+When NODE has :name property, prepend anchor named as :name value to
+CONTENTS.  Otherwise, return CONTENTS."
+  (if-let* ((label (org-element-property :name node)))
+      (concat "@anchor{" label "}\n" contents)
+    contents))
+
 (defun org-texinfo--sanitize-node (title)
   "Bend string TITLE to node line requirements.
 Trim string and collapse multiple whitespace characters as they
@@ -569,14 +583,30 @@ periods, commas and colons."
 (defun org-texinfo--sanitize-title (title info)
   "Make TITLE suitable as a section name.
 TITLE is a string or a secondary string.  INFO is the current
+export state, as a plist."
+  (org-export-data-with-backend
+   title
+   (org-export-create-backend
+    :parent 'texinfo
+    :transcoders `((footnote-reference . ,#'ignore)
+                   (radio-target . ,(lambda (_r c _) c))
+                   (target . ,#'ignore)))
+   info))
+
+(defun org-texinfo--sanitize-title-reference (title info)
+  "Make TITLE suitable as a section reference.
+TITLE is a string or a secondary string.  INFO is the current
 export state, as a plist."
   (org-export-data-with-backend
    title (org-export-toc-entry-backend 'texinfo) info))
 
 (defun org-texinfo--sanitize-content (text)
   "Escape special characters in string TEXT.
-Special characters are: @ { }"
-  (replace-regexp-in-string "[@{}]" "@\\&" text))
+Special characters are: @ { } ,"
+  (thread-last
+    text
+    (replace-regexp-in-string "[@{}]" "@\\&")
+    (replace-regexp-in-string "," "@comma{}")))
 
 (defun org-texinfo--wrap-float (value info &optional type label caption short)
   "Wrap string VALUE within a @float command.
@@ -627,7 +657,7 @@ Return new tree."
 	(let ((contents (org-element-contents plain-list))
 	      (items nil))
 	  (dolist (item contents)
-	    (pcase-let ((`(,cmd . ,args) (org-texinfo--match-definition item)))
+	    (pcase-let ((`(,cmd . ,args) (org-texinfo--match-definition item info)))
 	      (cond
 	       (cmd
 		(when items
@@ -643,16 +673,17 @@ Return new tree."
     info)
   tree)
 
-(defun org-texinfo--match-definition (item)
+(defun org-texinfo--match-definition (item &optional info)
   "Return a cons-cell if ITEM specifies a Texinfo definition command.
-The car is the command and the cdr is its arguments."
-  (let ((tag (car-safe (org-element-property :tag item))))
+The car is the command and the cdr is its arguments.
+INFO is the export INFO plist."
+  (let ((tag (org-export-data (org-element-property :tag item) info)))
     (and tag
 	 (stringp tag)
 	 (string-match org-texinfo--definition-command-regexp tag)
 	 (pcase-let*
 	     ((cmd (car (rassoc (match-string-no-properties 1 tag)
-				 org-texinfo--definition-command-alist)))
+				org-texinfo--definition-command-alist)))
 	      (`(,cmd ,category)
 	       (and cmd (save-match-data (split-string cmd " "))))
 	      (args (match-string-no-properties 2 tag)))
@@ -667,7 +698,11 @@ specified by CMD and ARGS."
     (org-element-insert-before
      (apply #'org-element-create 'special-block
 	    (list :type cmd
-		  :attr_texinfo (list (format ":options %s" args))
+                  :ox-texinfo--options args
+                  ;; Option can be nil that cannot be recorgnized
+                  ;; literally by `org-export-read-attribute', so we
+                  ;; use dedicated property instead
+		  ;; :attr_texinfo (list (format ":options %s" args))
 		  :post-blank (if contents 1 0))
 	    (mapc #'org-element-extract contents))
      plain-list))
@@ -909,11 +944,13 @@ contextual information."
 
 ;;;; Center Block
 
-(defun org-texinfo-center-block (_center-block contents _info)
+(defun org-texinfo-center-block (center-block contents _info)
   "Transcode a CENTER-BLOCK element from Org to Texinfo.
 CONTENTS holds the contents of the block.  INFO is a plist used
 as a communication channel."
-  (replace-regexp-in-string "\\(^\\).*?\\S-" "@center " contents nil nil 1))
+  (org-texinfo--prepend-anchor-maybe
+   (replace-regexp-in-string "\\(^\\).*?\\S-" "@center " contents nil nil 1)
+   center-block))
 
 ;;;; Clock
 
@@ -947,15 +984,15 @@ holding contextual information."
   (let* ((name (org-element-property :drawer-name drawer))
 	 (output (funcall (plist-get info :texinfo-format-drawer-function)
 			  name contents)))
-    output))
+    (org-texinfo--prepend-anchor-maybe output drawer)))
 
 ;;;; Dynamic Block
 
-(defun org-texinfo-dynamic-block (_dynamic-block contents _info)
+(defun org-texinfo-dynamic-block (dynamic-block contents _info)
   "Transcode a DYNAMIC-BLOCK element from Org to Texinfo.
 CONTENTS holds the contents of the block.  INFO is a plist
 holding contextual information."
-  contents)
+  (org-texinfo--prepend-anchor-maybe contents dynamic-block))
 
 ;;;; Entity
 
@@ -1007,9 +1044,11 @@ holding contextual information."
   "Transcode an EXAMPLE-BLOCK element from Org to Texinfo.
 CONTENTS is nil.  INFO is a plist holding contextual
 information."
-  (format "@example\n%s@end example"
-	  (org-texinfo--sanitize-content
-	   (org-export-format-code-default example-block info))))
+  (org-texinfo--prepend-anchor-maybe
+   (format "@example\n%s@end example"
+	   (org-texinfo--sanitize-content
+	    (org-export-format-code-default example-block info)))
+   example-block))
 
 ;;; Export Block
 
@@ -1032,10 +1071,12 @@ CONTENTS is nil.  INFO is a plist holding contextual information."
 (defun org-texinfo-fixed-width (fixed-width _contents _info)
   "Transcode a FIXED-WIDTH element from Org to Texinfo.
 CONTENTS is nil.  INFO is a plist holding contextual information."
-  (format "@example\n%s\n@end example"
-	  (org-remove-indentation
-	   (org-texinfo--sanitize-content
-	    (org-element-property :value fixed-width)))))
+  (org-texinfo--prepend-anchor-maybe
+   (format "@example\n%s\n@end example"
+	   (org-remove-indentation
+	    (org-texinfo--sanitize-content
+	     (org-element-property :value fixed-width))))
+   fixed-width))
 
 ;;;; Footnote Reference
 
@@ -1097,8 +1138,11 @@ holding contextual information."
 		      (org-export-get-tags headline info)))
 	   (priority (and (plist-get info :with-priority)
 			  (org-element-property :priority headline)))
-	   (text (org-texinfo--sanitize-title
-		  (org-element-property :title headline) info))
+	   (text (funcall (if command
+                              #'org-texinfo--sanitize-title-reference
+                            #'org-texinfo--sanitize-title)
+                          (org-element-property :title headline)
+                          info))
 	   (full-text
 	    (funcall (plist-get info :texinfo-format-headline-function)
 		     todo todo-type priority text tags))
@@ -1127,7 +1171,7 @@ holding contextual information."
   "Default format function for a headline.
 See `org-texinfo-format-headline-function' for details."
   (concat (and todo (format "@strong{%s} " todo))
-	  (and priority (format "@emph{#%s} " priority))
+	  (and priority (format "@emph{#%s} " (org-priority-to-string priority)))
 	  text
 	  (and tags (concat " " (org-make-tag-string tags)))))
 
@@ -1165,7 +1209,7 @@ holding contextual information."
 See `org-texinfo-format-inlinetask-function' for details."
   (let ((full-title
 	 (concat (when todo (format "@strong{%s} " todo))
-		 (when priority (format "#%c " priority))
+		 (when priority (format "#%s " (org-priority-to-string priority)))
 		 title
 		 (when tags (org-make-tag-string tags)))))
     (format "@center %s\n\n%s\n" full-title contents)))
@@ -1253,11 +1297,13 @@ CONTENTS is ignored.  INFO is a plist holding contextual information."
     (when (or (eq with-latex t)
               (and (eq with-latex 'detect)
                    (org-texinfo-supports-math-p)))
-      (let ((value (org-element-property :value environment)))
-        (string-join (list "@displaymath"
-                           (string-trim (org-remove-indentation value))
-                           "@end displaymath")
-                     "\n")))))
+      (org-texinfo--prepend-anchor-maybe
+       (let ((value (org-element-property :value environment)))
+         (string-join (list "@displaymath"
+                            (string-trim (org-remove-indentation value))
+                            "@end displaymath")
+                      "\n"))
+       environment))))
 
 ;;;; LaTeX Fragment
 
@@ -1311,7 +1357,7 @@ nil."
 		    (replace-regexp-in-string
 		     "[ \t]*:+" ""
 		     (replace-regexp-in-string "," "@comma{}" description)))))
-    (if (or (not title) (equal title node-name))
+    (if (not title)
 	(format "@ref{%s}" node-name)
       (format "@ref{%s, , %s}" node-name title))))
 
@@ -1445,14 +1491,17 @@ is an integer, build the menu recursively, down to this depth."
    ((zerop level) "\n")
    (t
     (mapconcat
-     (lambda (h)
-       (let ((entries (org-texinfo--menu-entries h info)))
+     (lambda (headline)
+       (let ((entries (org-texinfo--menu-entries headline info)))
 	 (when entries
 	   (concat
 	    (format "%s\n\n%s\n"
-		    (org-export-data (org-export-get-alt-title h info) info)
+		    (org-export-data-with-backend
+                     (org-export-get-alt-title headline info)
+                     (org-export-toc-entry-backend 'texinfo)
+                     info)
 		    (org-texinfo--format-entries entries info))
-	    (org-texinfo--build-menu h info (1- level))))))
+	    (org-texinfo--build-menu headline info (1- level))))))
      (org-texinfo--menu-entries scope info)
      ""))))
 
@@ -1468,7 +1517,7 @@ a plist containing contextual information."
 	      ;; name.  Remove them.
 	      (replace-regexp-in-string
 	       "[ \t]*:+" ""
-	       (org-texinfo--sanitize-title
+	       (org-texinfo--sanitize-title-reference
 		(org-export-get-alt-title h info) info)))
 	     (node (org-texinfo--get-node h info))
 	     (entry (concat "* " title ":"
@@ -1513,7 +1562,7 @@ information."
 
 ;;;; Paragraph
 
-(defun org-texinfo-paragraph (_paragraph contents _info)
+(defun org-texinfo-paragraph (paragraph contents _info)
   "Transcode a PARAGRAPH element from Org to Texinfo.
 CONTENTS is the contents of the paragraph, as a string.  INFO is
 the plist used as a communication channel."
@@ -1522,7 +1571,9 @@ the plist used as a communication channel."
   ;; Multiple newlines may appear in CONTENTS, for example, when
   ;; certain objects are stripped from export, leaving single newlines
   ;; before and after.
-  (org-remove-blank-lines contents))
+  (org-texinfo--prepend-anchor-maybe
+   (org-remove-blank-lines contents)
+   paragraph))
 
 ;;;; Plain List
 
@@ -1550,12 +1601,14 @@ contextual information."
 		     ((eq type 'unordered) "itemize")
 		     ((member table-type '("ftable" "vtable")) table-type)
 		     (t "table"))))
-    (format "@%s\n%s@end %s"
-	    (cond ((eq type 'descriptive) (concat list-type " " indic))
-		  (enum (format "%s %s" list-type enum))
-		  (t list-type))
-	    contents
-	    list-type)))
+    (org-texinfo--prepend-anchor-maybe
+     (format "@%s\n%s@end %s"
+	     (cond ((eq type 'descriptive) (concat list-type " " indic))
+		   (enum (format "%s %s" list-type enum))
+		   (t list-type))
+	     contents
+	     list-type)
+     plain-list)))
 
 ;;;; Plain Text
 
@@ -1563,7 +1616,7 @@ contextual information."
   "Transcode a TEXT string from Org to Texinfo.
 TEXT is the string to transcode.  INFO is a plist holding
 contextual information."
-  ;; First protect @, { and }.
+  ;; First protect @, {, }, and commas (,).
   (let ((output (org-texinfo--sanitize-content text)))
     ;; Activate smart quotes.  Be sure to provide original TEXT string
     ;; since OUTPUT may have been modified.
@@ -1641,10 +1694,12 @@ CONTENTS holds the contents of the block.  INFO is a plist
 holding contextual information."
   (let ((tag (org-export-read-attribute :attr_texinfo quote-block :tag))
 	(author (org-export-read-attribute :attr_texinfo quote-block :author)))
-    (format "@quotation%s\n%s%s\n@end quotation"
-	    (if tag (concat " " tag) "")
-	    contents
-	    (if author (concat "\n@author " author) ""))))
+    (org-texinfo--prepend-anchor-maybe
+     (format "@quotation%s\n%s%s\n@end quotation"
+	     (if tag (concat " " tag) "")
+	     contents
+	     (if author (concat "\n@author " author) ""))
+     quote-block)))
 
 ;;;; Radio Target
 
@@ -1676,13 +1731,18 @@ holding contextual information."
   "Transcode a SPECIAL-BLOCK element from Org to Texinfo.
 CONTENTS holds the contents of the block.  INFO is a plist used
 as a communication channel."
-  (let ((opt (org-export-read-attribute :attr_texinfo special-block :options))
+  (let ((opt (or
+              ;; See `org-texinfo--split-definition'
+              (org-element-property :ox-texinfo--options special-block)
+              (org-export-read-attribute :attr_texinfo special-block :options)))
 	(type (org-element-property :type special-block)))
-    (format "@%s%s\n%s@end %s"
-	    type
-	    (if opt (concat " " opt) "")
-	    (or contents "")
-	    type)))
+    (org-texinfo--prepend-anchor-maybe
+     (format "@%s%s\n%s@end %s"
+	     type
+	     (if opt (concat " " opt) "")
+	     (or contents "")
+	     type)
+     special-block)))
 
 ;;;; Src Block
 
@@ -1700,13 +1760,15 @@ contextual information."
 		 code))
 	 (caption (org-export-get-caption src-block))
 	 (shortcaption (org-export-get-caption src-block t)))
-    (if (not (or caption shortcaption)) value
+    (cond
+     ((or caption shortcaption)
       (org-texinfo--wrap-float value
 			       info
 			       (org-export-translate "Listing" :utf-8 info)
-			       (org-texinfo--get-node src-block info)
+                               (org-element-property :name src-block)
 			       caption
-			       shortcaption))))
+			       shortcaption))
+     (t (org-texinfo--prepend-anchor-maybe value src-block)))))
 
 ;;;; Statistics Cookie
 
@@ -1747,9 +1809,11 @@ contextual information."
 CONTENTS is the contents of the table.  INFO is a plist holding
 contextual information."
   (if (eq (org-element-property :type table) 'table.el)
-      (format "@verbatim\n%s@end verbatim"
-	      (org-element-normalize-string
-	       (org-element-property :value table)))
+      (org-texinfo--prepend-anchor-maybe
+       (format "@verbatim\n%s@end verbatim"
+	       (org-element-normalize-string
+	        (org-element-property :value table)))
+       table)
     (let* ((col-width (org-export-read-attribute :attr_texinfo table :columns))
 	   (columns
 	    (if col-width (format "@columnfractions %s" col-width)
@@ -1759,13 +1823,15 @@ contextual information."
 	   (table-str (format "@multitable %s\n%s@end multitable"
 			      columns
 			      contents)))
-      (if (not (or caption shortcaption)) table-str
-	(org-texinfo--wrap-float table-str
+      (cond
+       ((or caption shortcaption)
+        (org-texinfo--wrap-float table-str
 				 info
 				 (org-export-translate "Table" :utf-8 info)
-				 (org-texinfo--get-node table info)
+                                 (org-element-property :name table)
 				 caption
-				 shortcaption)))))
+				 shortcaption))
+       (t (org-texinfo--prepend-anchor-maybe table-str table))))))
 
 (defun org-texinfo-table-column-widths (table info)
   "Determine the largest table cell in each column to process alignment.
@@ -1867,11 +1933,13 @@ channel."
 
 ;;;; Verse Block
 
-(defun org-texinfo-verse-block (_verse-block contents _info)
+(defun org-texinfo-verse-block (verse-block contents _info)
   "Transcode a VERSE-BLOCK element from Org to Texinfo.
 CONTENTS is verse block contents.  INFO is a plist holding
 contextual information."
-  (format "@display\n%s@end display" contents))
+  (org-texinfo--prepend-anchor-maybe
+   (format "@display\n%s@end display" contents)
+   verse-block))
 
 
 ;;; Public Functions
@@ -1993,6 +2061,8 @@ is the property list for the given project.  PUB-DIR is the
 publishing directory.
 
 Return output file name."
+  (require 'ox-publish)
+  (declare-function org-publish-org-to "ox-publish" (backend filename extension plist &optional pub-dir))
   (org-publish-org-to 'texinfo filename ".texi" plist pub-dir))
 
 ;;;###autoload
@@ -2037,9 +2107,11 @@ Once computed, the results remain cached."
   (unless (boundp 'org-texinfo-supports-math--cache)
     (setq org-texinfo-supports-math--cache
           (let ((math-example "1 + 1 = 2"))
-            (let* ((input-file (make-temp-file "test" nil ".info"))
+            (let* ((input-file (make-temp-file "test" nil ".texi"))
+                   (output-file
+                    (concat (file-name-sans-extension input-file) ".info"))
                    (input-content (string-join
-                                   (list (format "@setfilename %s" input-file)
+                                   (list (format "@setfilename %s" output-file)
                                          "@node Top"
                                          "@displaymath"
                                          math-example
@@ -2050,7 +2122,8 @@ Once computed, the results remain cached."
               (when-let* ((output-file
                            ;; If compilation fails, consider math to
                            ;; be not supported.
-                           (ignore-errors (org-texinfo-compile input-file)))
+                           (ignore-errors (let ((inhibit-message t))
+                                            (org-texinfo-compile input-file))))
                           (output-content (with-temp-buffer
                                             (insert-file-contents output-file)
                                             (buffer-string))))
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 8527af3f1ae..686ffee8de2 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -90,9 +90,7 @@
 (declare-function org-publish-all "ox-publish" (&optional force async))
 (declare-function org-publish-current-file "ox-publish" (&optional force async))
 (declare-function org-publish-current-project "ox-publish" (&optional force async))
-(declare-function org-at-heading-p "org" (&optional _))
 (declare-function org-back-to-heading "org" (&optional invisible-ok))
-(declare-function org-next-visible-heading "org" (arg))
 
 (defvar org-publish-project-alist)
 (defvar org-table-number-fraction)
@@ -185,6 +183,20 @@ BEHAVIOR determines how Org should handle multiple keywords for
 Values set through KEYWORD and OPTION have precedence over
 DEFAULT.
 
+When adding new export options to the alist, it is recommended to
+provide OPTION and/or KEYWORD depending on the allowed values for a
+given export option.  For example,
+ (:with-tags nil \"tags\" org-export-with-tags)
+takes short boolean values t/nil and can be succintly set as
+ #+OPTIONS: tags:t
+So, using OPTION makes more sense than forcing something like
+ #+WITH_TAGS: t
+
+On the other hand,
+ (:title \"TITLE\" nil nil parse)
+may have very long string value and may better be set on a separate line
+ #+TITLE: Some very long title that would not fit well into #+OPTIONS
+
 All these properties should be backend agnostic.  Backend
 specific properties are set through `org-export-define-backend'.
 Properties redefined there have precedence over these.")
@@ -520,10 +532,10 @@ t           Allow export of math snippets."
   :safe (lambda (x) (memq x '(t nil verbatim))))
 
 (defcustom org-export-headline-levels 3
-  "The last level which is still exported as a headline.
+  "This level and its ancestors will be exported as a headline.
 
-Inferior levels will usually produce itemize or enumerate lists
-when exported, but backend behavior may differ.
+Descendants of this level will usually produce itemized or
+enumerated lists when exported, but backend behavior may differ.
 
 This option can also be set with the OPTIONS keyword,
 e.g. \"H:2\"."
@@ -802,10 +814,11 @@ also be set with the OPTIONS keyword, e.g. \"timestamp:nil\"."
   "Non-nil means allow timestamps in export.
 
 It can be set to any of the following values:
-  t          export all timestamps.
-  `active'   export active timestamps only.
-  `inactive' export inactive timestamps only.
-  nil        do not export timestamps
+  t                        export all timestamps.
+  `active'                 export active timestamps, including diary timestamps.
+  `active-exclude-diary'   export active timestamps, excluding diary timestamps.
+  `inactive'               export inactive timestamps only.
+  nil                      do not export timestamps
 
 This only applies to timestamps isolated in a paragraph
 containing only timestamps.  Other timestamps are always
@@ -814,12 +827,15 @@ exported.
 This option can also be set with the OPTIONS keyword, e.g.
 \"<:nil\"."
   :group 'org-export-general
+  :package-version '(Org . "9.8")
   :type '(choice
 	  (const :tag "All timestamps" t)
-	  (const :tag "Only active timestamps" active)
+	  (const :tag "Active timestamps, including diary timestamps" active)
+	  (const :tag "Active timestamps, excluding diary timestamps"
+                 active-exclude-diary)
 	  (const :tag "Only inactive timestamps" inactive)
 	  (const :tag "No timestamp" nil))
-  :safe (lambda (x) (memq x '(t nil active inactive))))
+  :safe (lambda (x) (memq x '(t nil active active-exclude-diary inactive))))
 
 (defcustom org-export-with-todo-keywords t
   "Non-nil means include TODO keywords in export.
@@ -864,6 +880,15 @@ This option can also be set with the OPTIONS keyword, e.g.,
   :package-version '(Org . "9.7")
   :type 'boolean)
 
+(defcustom org-export-replace-macros t
+  "When non-nil, replace macros before export.
+This variable does not affect {{{results}}} macros when processing
+code block results."
+  :group 'org-export-general
+  :package-version '(Org . "9.8")
+  :type 'boolean
+  :safe (lambda (obj) (null obj)))
+
 (defcustom org-export-snippet-translation-alist nil
   "Alist between export snippets backends and exporter backends.
 
@@ -1131,7 +1156,7 @@ Return nil if BACKEND is unknown."
     (let ((options (org-export-backend-options backend))
 	  parent)
       (while (setq parent (org-export-backend-parent backend))
-	(setq backend (org-export-get-backend parent))
+	(setq backend (if (symbolp parent) (org-export-get-backend parent) parent))
 	(setq options (append options (org-export-backend-options backend))))
       options)))
 
@@ -1149,7 +1174,7 @@ returns filters inherited from parent backends, if any."
     (let ((filters (org-export-backend-filters backend))
 	  parent)
       (while (setq parent (org-export-backend-parent backend))
-	(setq backend (org-export-get-backend parent))
+	(setq backend (if (symbolp parent) (org-export-get-backend parent) parent))
 	(setq filters (append filters (org-export-backend-filters backend))))
       filters)))
 
@@ -1433,11 +1458,15 @@ specific items to read, if any."
 	;; Priority is given to backend specific options.
 	(all (append (org-export-get-all-options backend)
 		     org-export-options-alist))
-	(plist))
+	(plist)
+        seen-options)
     (when line
       (dolist (entry all plist)
 	(let ((item (nth 2 entry)))
-	  (when item
+	  (when (and item
+                     ;; Only use the first option set by derived backend.
+                     (not (memq (car entry) seen-options)))
+            (push (car entry) seen-options)
 	    (let ((v (assoc-string item line t)))
 	      (when v (setq plist (plist-put plist (car entry) (cdr v)))))))))))
 
@@ -1469,12 +1498,17 @@ for export.  Return options as a plist."
 	 ;; Look for both general keywords and backend specific
 	 ;; options, with priority given to the latter.
 	 (options (append (org-export-get-all-options backend)
-			  org-export-options-alist)))
+			  org-export-options-alist))
+         seen-properties)
      ;; Handle other keywords.  Then return PLIST.
      (dolist (option options plist)
        (let ((property (car option))
 	     (keyword (nth 1 option)))
-	 (when keyword
+	 (when (and keyword
+                    ;; Only consider the first instance of property
+                    ;; In other words, derived backend settings take precendence.
+                    (not (memq property seen-properties)))
+           (push property seen-properties)
 	   (let ((value
 		  (or (cdr (assoc keyword cache))
 		      (let ((v (org-entry-get (point)
@@ -1510,10 +1544,18 @@ Assume buffer is in Org mode.  Narrowing, if any, is ignored."
     (let ((find-properties
 	   (lambda (keyword)
 	     ;; Return all properties associated to KEYWORD.
-	     (let (properties)
+	     (let (properties seen-properties)
 	       (dolist (option options properties)
-		 (when (equal (nth 1 option) keyword)
-		   (cl-pushnew (car option) properties)))))))
+                 ;; Ignore all but first :export-property
+                 ;; This is to avoid situations like
+                 ;; (:parent-backend-property "PARENT_KEYWORD" ...)
+                 ;; (:child-backend-property "CHILD_KEYWORD" ...)
+                 ;; where we should ignore #+PARENT_KEYWORD when child
+                 ;; backend is used.
+                 (unless (memq (car option) seen-properties)
+                   (push (car option) seen-properties)
+		   (when (equal (nth 1 option) keyword)
+		     (cl-pushnew (car option) properties))))))))
       ;; Read options in the current buffer and return value.
       (dolist (entry (org-collect-keywords
 		      (nconc (delq nil (mapcar #'cadr options))
@@ -1849,13 +1891,23 @@ not exported."
 		         (lambda (obj)
 			   (or (not (stringp obj)) (org-string-nw-p obj)))
 		         options t))))
-       (cl-case (plist-get options :with-timestamps)
-	 ((nil) t)
-	 (active
-	  (not (memq (org-element-property :type datum) '(active active-range))))
-	 (inactive
-	  (not (memq (org-element-property :type datum)
-		     '(inactive inactive-range)))))))))
+       (org-export--skip-timestamp-p
+        (plist-get options :with-timestamps)
+        (org-element-property :type datum))))))
+
+(defun org-export--skip-timestamp-p (with-timestamps timestamp-type)
+  "Decides whether to skip a timestamp during export.
+WITH-TIMESTAMPS should be a valid option for
+`org-export-with-timestamps'.  TIMESTAMP-TYPE should be the
+`:type' property of a timestamp element."
+  (cl-case with-timestamps
+    ((nil) t)
+    (active
+     (not (memq timestamp-type '(active active-range diary))))
+    (active-exclude-diary
+     (not (memq timestamp-type '(active active-range))))
+    (inactive
+     (not (memq timestamp-type '(inactive inactive-range))))))
 
 
 ;;; The Transcoder
@@ -2123,8 +2175,8 @@ keywords before output."
 ;; Filters properties are installed in communication channel with
 ;; `org-export-install-filters' function.
 ;;
-;; Eventually, two hooks (`org-export-before-processing-hook' and
-;; `org-export-before-parsing-hook') are run at the beginning of the
+;; Eventually, two hooks (`org-export-before-processing-functions' and
+;; `org-export-before-parsing-functions') are run at the beginning of the
 ;; export process and just before parsing to allow for heavy structure
 ;; modifications.
 
@@ -3048,12 +3100,13 @@ still inferior to file-local settings."
                                org-export-options-alist))))
         tree modified-tick)
     ;; Run first hook with current backend's name as argument.
-    (run-hook-with-args 'org-export-before-processing-hook
+    (run-hook-with-args 'org-export-before-processing-functions
                         (org-export-backend-name backend))
     (org-export-expand-include-keyword nil nil nil nil (plist-get info :expand-links))
     (org-export--delete-comment-trees)
-    (org-macro-initialize-templates org-export-global-macros)
-    (org-macro-replace-all org-macro-templates parsed-keywords)
+    (when org-export-replace-macros
+      (org-macro-initialize-templates org-export-global-macros)
+      (org-macro-replace-all org-macro-templates parsed-keywords))
     ;; Refresh buffer properties and radio targets after previous
     ;; potentially invasive changes.
     (org-set-regexps-and-options)
@@ -3075,7 +3128,7 @@ still inferior to file-local settings."
     ;; before parsing.
     (goto-char (point-min))
     (save-excursion
-      (run-hook-with-args 'org-export-before-parsing-hook
+      (run-hook-with-args 'org-export-before-parsing-functions
                           (org-export-backend-name backend)))
     (unless (eq modified-tick (buffer-chars-modified-tick))
       (org-set-regexps-and-options)
@@ -3111,6 +3164,17 @@ still inferior to file-local settings."
           (when result (setq info result)))))
     ;; Parse buffer.
     (setq tree (org-element-parse-buffer nil visible-only 'defer))
+    ;; Force parsing ALT_TITLE property of headlines.
+    (org-element-map tree '(headline inlinetask)
+      (lambda (h)
+        (when-let* ((alt-title (org-element-property :ALT_TITLE h)))
+          (org-element-put-property
+           h :ALT_TITLE
+           (org-element-parse-secondary-string
+	    alt-title (org-element-restriction 'headline) h))
+          (org-element-put-property
+           h :secondary
+           (cons :ALT_TITLE (org-element-property :secondary h))))))
     ;; Prune tree from non-exported elements and transform
     ;; uninterpreted elements or objects in both parse tree and
     ;; communication channel.
@@ -3293,7 +3357,8 @@ variables in include file names."
           (when (org-element-type-p element 'keyword)
             (forward-line 0)
             ;; Extract arguments from keyword's value.
-            (let* ((value (org-element-property :value element))
+            (let* ((indentation (org-current-text-indentation))
+                   (value (org-element-property :value element))
                    (parameters (org-export-parse-include-value value dir))
                    (file (if expand-env
                              (substitute-env-in-file-name
@@ -3318,7 +3383,8 @@ variables in include file names."
                  :file-prefix file-prefix
                  :footnotes footnotes
                  :already-included included
-                 :expand-env expand-env)
+                 :expand-env expand-env
+                 :indentation indentation)
                 ;; Expand footnotes after all files have been
                 ;; included.  Footnotes are stored at end of buffer.
                 (unless included
@@ -3413,7 +3479,8 @@ provided as the :unmatched parameter."
 
 (cl-defun org-export--blindly-expand-include
     (parameters
-     &key includer-file file-prefix footnotes already-included expand-env)
+     &key includer-file file-prefix footnotes
+     already-included expand-env indentation)
   "Unconditionally include reference defined by PARAMETERS in the buffer.
 PARAMETERS is a plist of the form returned by `org-export-parse-include-value'.
 
@@ -3425,7 +3492,7 @@ which when provided allows footnotes to be handled appropriately.
 ALREADY-INCLUDED is a list of included names along with their
 line restriction which prevents recursion.  EXPAND-ENV is a flag to
 expand environment variables for #+INCLUDE keywords in the included
-file."
+file.  INDENTATION is the common indentation to be added."
   (let* ((coding-system-for-read
           (or (plist-get parameters :coding-system)
               coding-system-for-read))
@@ -3433,7 +3500,7 @@ file."
          (lines (plist-get parameters :lines))
          (args (plist-get parameters :args))
          (block (plist-get parameters :block))
-         (ind (org-current-text-indentation)))
+         (ind indentation))
     (cond
      ((eq (plist-get parameters :env) 'literal)
       (insert
@@ -4198,10 +4265,8 @@ fail, the fall-back value is \"???\"."
 (defun org-export-get-alt-title (headline _)
   "Return alternative title for HEADLINE, as a secondary string.
 If no optional title is defined, fall-back to the regular title."
-  (let ((alt (org-element-property :ALT_TITLE headline)))
-    (if alt (org-element-parse-secondary-string
-	     alt (org-element-restriction 'headline) headline)
-      (org-element-property :title headline))))
+  (or (org-element-property :ALT_TITLE headline)
+      (org-element-property :title headline)))
 
 (defun org-export-first-sibling-p (blob info)
   "Non-nil when BLOB is the first sibling in its parent.
@@ -4658,7 +4723,6 @@ Return value can be an object or an element:
         (org-persist-register location-type path
                               :write-immediately t))))
 
-(require 'subr-x) ;; FIXME: For `thread-first' in Emacs 26.
 (defun org-export-link-localise (link)
   "Convert remote LINK to local link.
 If LINK refers to a remote resource, modify it to point to a local
@@ -5549,12 +5613,10 @@ Footnote sections are ignored."
 		     (+ (org-export-get-relative-level scope info) n))
 		   limit))))
     (org-element-map (org-element-contents scope) 'headline
-      (lambda (h)
-	(and (not (org-element-property :footnote-section-p h))
-	     (not (equal "notoc"
-		       (org-export-get-node-property :UNNUMBERED h t)))
-	     (>= n (org-export-get-relative-level h info))
-	     h))
+      (lambda (headline)
+        (and (not (org-export-excluded-from-toc-p headline info))
+             (>= n (org-export-get-relative-level headline info))
+             headline))
       info)))
 
 (defun org-export-collect-elements (type info &optional predicate)
@@ -5619,7 +5681,11 @@ contents.  However, it is useful if some additional processing is
 required on headlines excluded from table of contents."
   (or (org-element-property :footnote-section-p headline)
       (org-export-low-level-p headline info)
-      (equal "notoc" (org-export-get-node-property :UNNUMBERED headline t))))
+      (equal "notoc" (org-export-get-node-property :UNNUMBERED headline t))
+      (let ((toc-depth (plist-get info :with-toc)))
+        (and (wholenump toc-depth)
+             (> (org-export-get-relative-level headline info)
+                toc-depth)))))
 
 (defun org-export-toc-entry-backend (parent &rest transcoders)
   "Return an export backend appropriate for table of contents entries.
@@ -6179,6 +6245,7 @@ them."
      ("tr" :default "Devamı sonraki sayfada"))
     ("Created"
      ("cs" :default "Vytvořeno")
+     ("de" :default "Erstellt am")
      ("et" :default "Loodud")
      ("fa" :default "ساخته شده")
      ("nl" :default "Gemaakt op")  ;; must be followed by a date or date+time
@@ -6267,25 +6334,25 @@ them."
     ("Figure %d:"
      ("ar" :default "شكل %d:")
      ("cs" :default "Obrázek %d:")
-     ("da" :default "Figur %d")
+     ("da" :default "Figur %d:")
      ("de" :default "Abbildung %d:")
      ("es" :default "Figura %d:")
      ("et" :default "Joonis %d:")
      ("fa" :default "شکل %d:")
-     ("fr" :default "Figure %d :" :html "Figure&nbsp;%d&nbsp;:")
-     ("is" :default "Mynd %d")
+     ("fr" :default "Figure %d:" :html "Figure&nbsp;%d&nbsp;:")
+     ("is" :default "Mynd %d:")
      ("it" :default "Figura %d:")
-     ("ja" :default "図%d: " :html "&#22259;%d: ")
+     ("ja" :default "図%d:" :html "&#22259;%d:")
      ("nl" :default "Figuur %d:" :html "Figuur&nbsp;%d:")
-     ("no" :default "Illustrasjon %d")
-     ("nb" :default "Illustrasjon %d")
-     ("nn" :default "Illustrasjon %d")
-     ("pl" :default "Obrazek %d") ; alternatively "Rysunek %d"
+     ("no" :default "Illustrasjon %d:")
+     ("nb" :default "Illustrasjon %d:")
+     ("nn" :default "Illustrasjon %d:")
+     ("pl" :default "Obrazek %d:") ; alternatively "Rysunek %d"
      ("pt_BR" :default "Figura %d:")
      ("ro" :default "Imaginea %d:")
      ("ru" :html "&#1056;&#1080;&#1089;. %d.:" :utf-8 "Рис. %d.:")
-     ("sl" :default "Slika %d")
-     ("sv" :default "Illustration %d")
+     ("sl" :default "Slika %d:")
+     ("sv" :default "Illustration %d:")
      ("tr" :default "Şekil %d:")
      ("zh-CN" :html "&#22270;%d&nbsp;" :utf-8 "图%d "))
     ("Footnotes"
@@ -6393,24 +6460,24 @@ them."
     ("Listing %d:"
      ("ar" :default "برنامج %d:")
      ("cs" :default "Program %d:")
-     ("da" :default "Program %d")
-     ("de" :default "Programmlisting %d")
-     ("es" :default "Listado de programa %d")
-     ("et" :default "Loend %d")
+     ("da" :default "Program %d:")
+     ("de" :default "Programmlisting %d:")
+     ("es" :default "Listado de programa %d:")
+     ("et" :default "Loend %d:")
      ("fa" :default "برنامه‌ریزی %d:")
-     ("fr" :default "Programme %d :" :html "Programme&nbsp;%d&nbsp;:")
-     ("it" :default "Listato %d :")
+     ("fr" :default "Programme %d:" :html "Programme&nbsp;%d&nbsp;:")
+     ("it" :default "Listato %d:")
      ("ja" :default "ソースコード%d:")
      ("nl" :default "Programma %d:" :html "Programma&nbsp;%d:")
      ("nn" :default "Program %d:")
-     ("no" :default "Dataprogram %d")
-     ("nb" :default "Dataprogram %d")
-     ("ro" :default "Lista %d")
+     ("no" :default "Dataprogram %d:")
+     ("nb" :default "Dataprogram %d:")
+     ("ro" :default "Lista %d:")
      ("pl" :default "Indeks %d:")
      ("pt_BR" :default "Listagem %d:")
      ("ru" :html "&#1056;&#1072;&#1089;&#1087;&#1077;&#1095;&#1072;&#1090;&#1082;&#1072; %d.:"
       :utf-8 "Распечатка %d.:")
-     ("sl" :default "Izpis programa %d")
+     ("sl" :default "Izpis programa %d:")
      ("sv" :default "Programlistning %d:")
      ("tr" :default "Program %d:")
      ("zh-CN" :html "&#20195;&#30721;%d&nbsp;" :utf-8 "代码%d "))
@@ -6434,6 +6501,7 @@ them."
     ("See figure %s"
      ("cs" :default "Viz obrázek %s")
      ("et" :default "Vaata joonist %s")
+     ("de" :default "Siehe Abbildung %s")
      ("fa" :default "نمایش شکل %s")
      ("fr" :default "cf. figure %s"
       :html "cf.&nbsp;figure&nbsp;%s" :latex "cf.~figure~%s")
@@ -6450,6 +6518,7 @@ them."
     ("See listing %s"
      ("cs" :default "Viz program %s")
      ("et" :default "Vaata loendit %s")
+     ("de" :default "Siehe Programmlisting %s")
      ("fa" :default "نمایش برنامه‌ریزی %s")
      ("fr" :default "cf. programme %s"
       :html "cf.&nbsp;programme&nbsp;%s" :latex "cf.~programme~%s")
@@ -6466,7 +6535,7 @@ them."
      ("ar" :default "انظر قسم %s")
      ("cs" :default "Viz sekce %s")
      ("da" :default "jævnfør afsnit %s")
-     ("de" :default "siehe Abschnitt %s")
+     ("de" :default "Siehe Abschnitt %s")
      ("es" :ascii "Vea seccion %s" :html "Vea secci&oacute;n %s" :default "Vea sección %s")
      ("et" :default "Vaata peatükki %s" :html "Vaata peat&#252;kki %s" :utf-8 "Vaata peatükki %s")
      ("fa" :default "نمایش بخش %s")
@@ -6489,6 +6558,7 @@ them."
     ("See table %s"
      ("cs" :default "Viz tabulka %s")
      ("et" :default "Vaata tabelit %s")
+     ("de" :default "Siehe Tabelle %s")
      ("fa" :default "نمایش جدول %s")
      ("fr" :default "cf. tableau %s"
       :html "cf.&nbsp;tableau&nbsp;%s" :latex "cf.~tableau~%s")
@@ -6526,27 +6596,27 @@ them."
     ("Table %d:"
      ("ar" :default "جدول %d:")
      ("cs" :default "Tabulka %d:")
-     ("da" :default "Tabel %d")
-     ("de" :default "Tabelle %d")
-     ("es" :default "Tabla %d")
-     ("et" :default "Tabel %d")
-     ("fa" :default "جدول %d")
-     ("fr" :default "Tableau %d :")
-     ("is" :default "Tafla %d")
+     ("da" :default "Tabel %d:")
+     ("de" :default "Tabelle %d:")
+     ("es" :default "Tabla %d:")
+     ("et" :default "Tabel %d:")
+     ("fa" :default "جدول %d:")
+     ("fr" :default "Tableau %d:")
+     ("is" :default "Tafla %d:")
      ("it" :default "Tabella %d:")
      ("ja" :default "表%d:" :html "&#34920;%d:")
      ("nl" :default "Tabel %d:" :html "Tabel&nbsp;%d:")
-     ("no" :default "Tabell %d")
-     ("nb" :default "Tabell %d")
-     ("nn" :default "Tabell %d")
-     ("pl" :default "Tabela %d")
+     ("no" :default "Tabell %d:")
+     ("nb" :default "Tabell %d:")
+     ("nn" :default "Tabell %d:")
+     ("pl" :default "Tabela %d:")
      ("pt_BR" :default "Tabela %d:")
-     ("ro" :default "Tabel %d")
+     ("ro" :default "Tabel %d:")
      ("ru" :html "&#1058;&#1072;&#1073;&#1083;&#1080;&#1094;&#1072; %d.:"
       :utf-8 "Таблица %d.:")
-     ("sl" :default "Tabela %d")
+     ("sl" :default "Tabela %d:")
      ("sv" :default "Tabell %d:")
-     ("tr" :default "Tablo %d")
+     ("tr" :default "Tablo %d:")
      ("zh-CN" :html "&#34920;%d&nbsp;" :utf-8 "表%d "))
     ("Table of Contents"
      ("ar" :default "قائمة المحتويات")
@@ -6673,7 +6743,10 @@ and `org-export-to-file' for more specialized functions."
   ;; buffer to a temporary file, as it may be too long for program
   ;; args in `start-process'.
   (with-temp-message "Initializing asynchronous export process"
-    (let ((copy-fun (org-element--generate-copy-script (current-buffer)))
+    (let ((copy-fun (org-element--generate-copy-script
+                     ;; Text properties may contain unreadable Elisp
+                     ;; objects. Avoid them.
+                     (current-buffer) :drop-text-properties t))
           (temp-file (make-temp-file "org-export-process")))
       (let ((coding-system-for-write 'emacs-internal))
         (write-region
@@ -7382,9 +7455,22 @@ Toggle export options when required.  Otherwise, return value is
 a list with action as CAR and a list of interactive export
 options as CDR."
   (let (key)
-    ;; Scrolling: when in non-expert mode, act on motion keys (C-n,
-    ;; C-p, SPC, DEL).
-    (while (and (setq key (read-char-exclusive prompt))
+    ;; Scrolling: When in non-expert mode, act on motion keys (C-n,
+    ;; C-p, SPC, DEL), and translate down/up arrow keys and scroll
+    ;; wheel to C-n/C-p, respectively.
+    (while (and (setq key
+                      (pcase (read-event prompt)
+                        ((or 'up
+                             `(wheel-up . ,_)
+                             `(double-wheel-up . ,_)
+                             `(triple-wheel-up . ,_))
+                         ?\C-p)
+                        ((or 'down
+                             `(wheel-down . ,_)
+                             `(double-wheel-down . ,_)
+                             `(triple-wheel-down . ,_))
+                         ?\C-n)
+                        (event event)))
 		(not expertp)
 		;; FIXME: Don't use C-v (22) here, as it is used as a
 		;; modifier key in the export dispatch.

From ae1ac739b799608cca0ec9f0e78f2b852078bd57 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sat, 4 Apr 2026 23:53:54 -0400
Subject: [PATCH 006/463] * etc/NEWS: Announce Org update.

---
 etc/NEWS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/etc/NEWS b/etc/NEWS
index 27dc86727e3..0ac0ee9f843 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -767,6 +767,9 @@ mode in most cases in which Emacs would by default enter that mode.
 This can make things work better for some cases of X forwarding; see the
 docstring for the new option.
 
+** Emacs now comes with Org v9.8.
+See the file "etc/ORG-NEWS" for user-visible changes in Org.
+
 
 * Editing Changes in Emacs 31.1
 

From 45d7678ca3717ebcb422145e5705de49df881010 Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Sat, 4 Apr 2026 22:33:19 -0700
Subject: [PATCH 007/463] Fix treesit-query-capture's NODE-ONLY param

Before the fix, if user uses the NODE-ONLY option, we don't keep
the capture names in the results, then predicates won't work
because they can't reference capture names.

* src/treesit.c (query_capture_remove_capture_name): New
function.
(Ftreesit_query_capture): Use the new function to remove capture
names AFTER running the predicate.
* test/src/treesit-tests.el:
(treesit-query-node-only-and-grouped): New test.
---
 src/treesit.c             | 56 +++++++++++++++++++++++++++------------
 test/src/treesit-tests.el | 32 ++++++++++++++++++++++
 2 files changed, 71 insertions(+), 17 deletions(-)

diff --git a/src/treesit.c b/src/treesit.c
index bec37067b50..c08691af3d8 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -3977,6 +3977,22 @@ treesit_initialize_query (Lisp_Object query, const TSLanguage *lang,
     }
 }
 
+/* Go over a list from START to END (until the element eq to END),
+   replace (capture-name . node) with just node.  */
+static void query_capture_remove_capture_name (Lisp_Object start,
+					       Lisp_Object end)
+{
+  Lisp_Object tail = start;
+  FOR_EACH_TAIL (tail)
+    {
+      Lisp_Object cell = CAR (tail);
+      CHECK_CONS (cell);
+      XSETCAR (tail, CDR (cell));
+
+      if (EQ (CDR (tail), end)) return;
+    }
+}
+
 DEFUN ("treesit-query-capture",
        Ftreesit_query_capture,
        Streesit_query_capture, 2, 6, 0,
@@ -4122,18 +4138,12 @@ the query.  */)
 	  TSQueryCapture capture = captures[idx];
 	  Lisp_Object captured_node = make_treesit_node (lisp_parser,
 							 capture.node);
-
-	  Lisp_Object cap;
-	  if (NILP (node_only))
-	    {
-	      const char *capture_name
-		= ts_query_capture_name_for_id (treesit_query, capture.index,
-						&capture_name_len);
-	      cap = Fcons (intern_c_string_1 (capture_name, capture_name_len),
-			   captured_node);
-	    }
-	  else
-	    cap = captured_node;
+	  const char *capture_name
+	    = ts_query_capture_name_for_id (treesit_query, capture.index,
+					    &capture_name_len);
+	  Lisp_Object cap
+	    = Fcons (intern_c_string_1 (capture_name, capture_name_len),
+		     captured_node);
 
 	  if (NILP (grouped))
 	    result = Fcons (cap, result); /* Mode 1. */
@@ -4166,12 +4176,24 @@ the query.  */)
       if (!NILP (predicate_signal_data))
 	break;
 
-      /* Mode 1: Predicates didn't pass, roll back.  */
-      if (!match && NILP (grouped))
-	result = prev_result;
-      /* Mode 2: Predicates pass, add this match group.  */
+      /* Mode 1: Roll back if predicate didn't pass, don't roll back if
+         predicate passed.  */
+      if (NILP (grouped))
+	{
+	  if (!match)
+	    result = prev_result;
+	  else if (!NILP (node_only))
+	    query_capture_remove_capture_name (result, prev_result);
+	}
+      /* Mode 2: Add this match group if predicate pass, don't add this
+         group if predicate didn't pass.  */
       if (match && !NILP (grouped))
-	result = Fcons (Fnreverse (match_group), result);
+	{
+	  match_group = Fnreverse (match_group);
+	  if (!NILP (node_only))
+	    query_capture_remove_capture_name (match_group, Qnil);
+	  result = Fcons (match_group, result);
+	}
     }
 
   /* Final clean up.  */
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 5492a45b1de..58579e82f7d 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -590,6 +590,38 @@ BODY is the test body."
                (treesit-pattern-expand "a\nb\rc\td\0e\"f\1g\\h\fi")
                "\"a\\nb\\rc\\td\\0e\\\"f\1g\\\\h\fi\"")))))
 
+(ert-deftest treesit-query-node-only-and-grouped ()
+  "Tests for query API."
+  (skip-unless (treesit-language-available-p 'json))
+  (with-temp-buffer
+    (let (parser root-node)
+      (progn
+        (insert "[1,2,{\"name\": \"Bob\"},3]")
+        (setq parser (treesit-parser-create 'json)))
+
+      ;; Test NODE-ONLY.
+      (let ((res (treesit-query-capture 'json '((number) @num) nil nil t)))
+        (should (equal (length res) 3))
+        ;; First element should be a node rather than 'num.
+        (should (treesit-node-p (nth 0 res))))
+
+      ;; Test GROUPED.
+      (let ((res (treesit-query-capture 'json '((number) @num) nil nil nil t)))
+        (should (equal (length res) 3))
+        ;; First element should be a match group.
+        (should (consp (nth 0 res)))
+        ;; First element of the match group should be a cons (num . <node>).
+        (should (consp (nth 0 (nth 0 res))))
+        (should (eq (car (nth 0 (nth 0 res))) 'num)))
+
+      ;; Test NODE-ONLY + GROUPED.
+      (let ((res (treesit-query-capture 'json '((number) @num) nil nil t t)))
+        (should (equal (length res) 3))
+        ;; First element should be a match group.
+        (should (consp (nth 0 res)))
+        ;; First element of the match group should be a node.
+        (should (treesit-node-p (nth 0 (nth 0 res))))))))
+
 ;;; Narrow
 
 (ert-deftest treesit-narrow ()

From d4002877d3b4d7dcc3c7d5e6ecdef10aad06b8a6 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 5 Apr 2026 09:09:21 +0300
Subject: [PATCH 008/463] ; Fix node names in modus-themes.org

---
 doc/misc/modus-themes.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org
index 6e6cf68c7d2..7bd86896ecc 100644
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@ -2587,7 +2587,7 @@ We thus have the following:
 
 Reload the theme for changes to take effect.
 
-*** DIY Make the region preserve text colors, plus other styles
+*** DIY Make the region preserve text colors plus other styles
 :PROPERTIES:
 :CUSTOM_ID: h:c8605d37-66e1-42aa-986e-d7514c3af6fe
 :END:
@@ -6276,7 +6276,7 @@ piece of text to the next.  Whereas multiple shades of, say, blue and
 magenta can suffice to tell things apart and avoid excess coloration: a
 harmonious rhythm.
 
-** Why are colors mostly variants of blue, magenta, cyan?
+** Why are colors mostly variants of blue magenta cyan?
 :properties:
 :custom_id: h:0b26cb47-9733-4cb1-87d9-50850cb0386e
 :end:

From 670bb34d91179eef087b6964edb445244180e8f6 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 5 Apr 2026 09:13:40 +0300
Subject: [PATCH 009/463] ; Fix last change.

---
 doc/misc/modus-themes.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org
index 7bd86896ecc..40343f468c9 100644
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@ -2975,7 +2975,7 @@ this to the Emacs configuration file will suffice:
  '(region ((t :extend nil))))
 #+end_src
 
-[[#h:c8605d37-66e1-42aa-986e-d7514c3af6fe][Make the region preserve text colors, plus other styles]].
+[[#h:c8605d37-66e1-42aa-986e-d7514c3af6fe][Make the region preserve text colors plus other styles]].
 
 ** DIY Add padding to the mode line
 :PROPERTIES:

From 93f40d1bb7ab12d971e87ac2786135487d2ee4ed Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 5 Apr 2026 09:52:56 +0300
Subject: [PATCH 010/463] ; Fix recently-added treesit test

* test/src/treesit-tests.el (treesit-query-node-only-and-grouped):
Remove unused variables.
---
 test/src/treesit-tests.el | 46 +++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 58579e82f7d..dfbb4124a5f 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -594,33 +594,31 @@ BODY is the test body."
   "Tests for query API."
   (skip-unless (treesit-language-available-p 'json))
   (with-temp-buffer
-    (let (parser root-node)
-      (progn
-        (insert "[1,2,{\"name\": \"Bob\"},3]")
-        (setq parser (treesit-parser-create 'json)))
+    (insert "[1,2,{\"name\": \"Bob\"},3]")
+    (treesit-parser-create 'json)
 
-      ;; Test NODE-ONLY.
-      (let ((res (treesit-query-capture 'json '((number) @num) nil nil t)))
-        (should (equal (length res) 3))
-        ;; First element should be a node rather than 'num.
-        (should (treesit-node-p (nth 0 res))))
+    ;; Test NODE-ONLY.
+    (let ((res (treesit-query-capture 'json '((number) @num) nil nil t)))
+      (should (equal (length res) 3))
+      ;; First element should be a node rather than 'num.
+      (should (treesit-node-p (nth 0 res))))
 
-      ;; Test GROUPED.
-      (let ((res (treesit-query-capture 'json '((number) @num) nil nil nil t)))
-        (should (equal (length res) 3))
-        ;; First element should be a match group.
-        (should (consp (nth 0 res)))
-        ;; First element of the match group should be a cons (num . <node>).
-        (should (consp (nth 0 (nth 0 res))))
-        (should (eq (car (nth 0 (nth 0 res))) 'num)))
+    ;; Test GROUPED.
+    (let ((res (treesit-query-capture 'json '((number) @num) nil nil nil t)))
+      (should (equal (length res) 3))
+      ;; First element should be a match group.
+      (should (consp (nth 0 res)))
+      ;; First element of the match group should be a cons (num . <node>).
+      (should (consp (nth 0 (nth 0 res))))
+      (should (eq (car (nth 0 (nth 0 res))) 'num)))
 
-      ;; Test NODE-ONLY + GROUPED.
-      (let ((res (treesit-query-capture 'json '((number) @num) nil nil t t)))
-        (should (equal (length res) 3))
-        ;; First element should be a match group.
-        (should (consp (nth 0 res)))
-        ;; First element of the match group should be a node.
-        (should (treesit-node-p (nth 0 (nth 0 res))))))))
+    ;; Test NODE-ONLY + GROUPED.
+    (let ((res (treesit-query-capture 'json '((number) @num) nil nil t t)))
+      (should (equal (length res) 3))
+      ;; First element should be a match group.
+      (should (consp (nth 0 res)))
+      ;; First element of the match group should be a node.
+      (should (treesit-node-p (nth 0 (nth 0 res)))))))
 
 ;;; Narrow
 

From 91b08717d4d2d95a9f0126beede3f10e37502faf Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 5 Apr 2026 09:54:56 +0300
Subject: [PATCH 011/463] ; * src/sound.c (Fw32_sound_volume): Shut up GCC
 warning.

---
 src/sound.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sound.c b/src/sound.c
index b3988524df0..5c2dfa08e21 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1367,7 +1367,7 @@ current volume setting.
 The return value is the integer volume setting before the change, if any.  */)
   (Lisp_Object volume)
 {
-  DWORD ui_volume, ui_volume_orig;
+  DWORD ui_volume = 0, ui_volume_orig;
   MMRESULT mm_result = MMSYSERR_NOERROR;
 
   if (FIXNUMP (volume))

From c3fda2e34b9725c4931f10ce48df5b1917c916df Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 5 Apr 2026 12:34:12 +0300
Subject: [PATCH 012/463] Fix display in window margins when text-area text is
 reordered

* src/xdisp.c (handle_stop_backwards): Don't overwrite
'stop_charpos' if we end up on a different stack level of the
iterator.  (Bug#80693)
---
 src/xdisp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index bd07f9983ff..6f06206b43e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9752,6 +9752,7 @@ handle_stop_backwards (struct it *it, ptrdiff_t charpos)
   struct display_pos save_current = it->current;
   struct text_pos save_position = it->position;
   struct composition_it save_cmp_it = it->cmp_it;
+  int save_sp = it->sp;
   struct text_pos pos1;
   ptrdiff_t next_stop;
 
@@ -9783,7 +9784,8 @@ handle_stop_backwards (struct it *it, ptrdiff_t charpos)
   next_stop = it->stop_charpos;
   it->stop_charpos = it->prev_stop;
   handle_stop (it);
-  it->stop_charpos = next_stop;
+  if (it->sp == save_sp)
+    it->stop_charpos = next_stop;
 }
 
 /* Load IT with the next display element from current_buffer.  Value

From 859e0622ae5e8303d288a345d9ef9181fa0aa6ae Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sun, 5 Apr 2026 13:50:35 +0100
Subject: [PATCH 013/463] * lisp/vc/diff-mode.el (diff-mode-read-only-map):
 Bind 'v'.

---
 etc/NEWS             | 3 +++
 lisp/vc/diff-mode.el | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 0ac0ee9f843..571253f33fc 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2418,6 +2418,9 @@ you are in buffers generated by 'C-x v =' and 'C-x v D'.
 When the region is active, the command reverse-applies and kills hunks
 that the region overlaps.
 
+---
+*** 'v' is now bound to 'vc-next-action' in read-only Diff mode buffers.
+
 ---
 *** 'diff-file-prev' and 'diff-hunk-prev' always move to start of header.
 Previously, 'diff-file-prev' and 'diff-hunk-prev' would move when point
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 8a432a7f618..5d6f478d3e8 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -241,10 +241,11 @@ buffers."
 
   ;; The foregoing commands in `diff-mode-shared-map' and
   ;; `diff-mode-read-only-map' don't affect buffers beyond this one.
-  ;; The following command is the only one that has a single-character
-  ;; binding and which affects buffers beyond this one.  However, the
-  ;; following command asks for confirmation by default, so that seems
-  ;; okay.  --spwhitton
+  ;; The following commands are the only ones that have a
+  ;; single-character binding and which affect something beyond the
+  ;; current buffer.  However, the following commands ask for
+  ;; confirmation by default, so that seems okay.  --spwhitton
+  "v" #'vc-next-action
   "u" #'diff-revert-and-kill-hunk
   ;; `diff-revert-and-kill-hunk' is the `diff-mode' analogue of what '@'
   ;; does in VC-Dir, so give it the same short binding.

From af69eb2f27d6ac7becea62f1c73630d758d61c03 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sun, 5 Apr 2026 14:58:55 +0100
Subject: [PATCH 014/463] VC-Dir next action: Offer to hide up-to-date items

* lisp/vc/vc-dir.el (vc-dir--up-to-date-states): New constant.
(vc-dir-hide-state): Use it.
(vc-dir--only-files-state-and-model): New function.
(vc-dir-root-next-action, vc-dir-deduce-fileset): Use it.
* lisp/vc/vc.el (vc-only-files-state-and-model): Improve error
message readability.
---
 lisp/vc/vc-dir.el | 54 +++++++++++++++++++++++++++++++++++------------
 lisp/vc/vc.el     |  6 ++++--
 2 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 87f4a55850c..35e760fc7cd 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -1028,8 +1028,7 @@ is), this command is useful to check in all local changes at once."
          (vc-buffer-overriding-fileset
           `(,vc-dir-backend
             (,default-directory)
-            . ,(vc-only-files-state-and-model only-files-list
-                                              vc-dir-backend))))
+            . ,(vc-dir--only-files-state-and-model only-files-list))))
     (vc-next-action nil)))
 
 (defun vc-dir-clean-files ()
@@ -1531,6 +1530,8 @@ outside of VC) and one wants to do some operation on it."
   (interactive "fShow file: ")
   (vc-dir-update (list (list (file-relative-name file) (vc-state file))) (current-buffer)))
 
+(defconst vc-dir--up-to-date-states '(up-to-date ignored))
+
 (defun vc-dir-hide-state (&optional state)
   "Hide items that are in STATE from display.
 See `vc-state' for valid values of STATE.
@@ -1568,9 +1569,10 @@ state of item at point, if any."
 		     (vc-dir-fileinfo->directory (ewoc-data next))))
 	       ;; Remove files in specified STATE.  STATE can be a
 	       ;; symbol, a user-name, or nil.
-               (if state
-                   (equal (vc-dir-fileinfo->state data) state)
-                 (memq (vc-dir-fileinfo->state data) '(up-to-date ignored))))
+               (let ((data-state (vc-dir-fileinfo->state data)))
+                 (if state
+                     (equal data-state state)
+                   (memq data-state vc-dir--up-to-date-states))))
 	  (ewoc-delete vc-ewoc crt))
 	(setq crt prev)))))
 
@@ -1588,22 +1590,46 @@ state of item at point, if any."
 
 (declare-function vc-only-files-state-and-model "vc")
 
+(defun vc-dir--only-files-state-and-model (only-files-list)
+  "Call `vc-only-files-state-and-model' as appropriate for VC-Dir buffers.
+Offer to call `vc-dir-hide-up-to-date' if that might be useful.
+If we did, remove up-to-date items from ONLY-FILES-LIST before passing
+to `vc-only-files-state-and-model'.
+
+There's usually no action to be taken on `up-to-date' or `ignored'
+files, but a new user may include these in their VC-Dir fileset without
+realizing it.  To avoid the user having to know in advance that what
+they must do is invoke \\<vc-dir-mode-map>\\[vc-dir-hide-up-to-date] \
+before \\[vc-next-action], offer to invoke `vc-dir-hide-up-to-date'
+for them, and also filter ONLY-FILES-LIST so as not to include entries
+in those states.  Only do this if there are both up-to-date and
+non-up-to-date files in ONLY-FILES-LIST (in case we add a VC next action
+for `up-to-date' and/or `ignored' files at some point)."
+  (let (up-to-date other)
+    (dolist (entry only-files-list)
+      (push entry (if (memq (cdr entry) vc-dir--up-to-date-states)
+                      up-to-date other)))
+    (vc-only-files-state-and-model
+     (if (or (null up-to-date) (null other)
+             (not (y-or-n-p "Clear up-to-date items before proceeding?")))
+         only-files-list
+       (vc-dir-hide-up-to-date)
+       other)
+     vc-dir-backend)))
+
 (defun vc-dir-deduce-fileset (&optional state-model-only-files)
-  (let ((marked (vc-dir-marked-files))
-	files only-files-list)
-    (if marked
+  (let (files only-files-list)
+    (if-let* ((marked (vc-dir-marked-files)))
 	(progn
 	  (setq files marked)
 	  (when state-model-only-files
 	    (setq only-files-list (vc-dir-marked-only-files-and-states))))
-      (let ((crt (vc-dir-current-file)))
-	(setq files (list crt))
-	(when state-model-only-files
-	  (setq only-files-list (vc-dir-child-files-and-states)))))
+      (setq files (list (vc-dir-current-file)))
+      (when state-model-only-files
+	(setq only-files-list (vc-dir-child-files-and-states))))
     (if state-model-only-files
         (cl-list* vc-dir-backend files
-                  (vc-only-files-state-and-model only-files-list
-                                                 vc-dir-backend))
+                  (vc-dir--only-files-state-and-model only-files-list))
       (list vc-dir-backend files))))
 
 ;;;###autoload
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 37d2bc3612f..539c7b4628b 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1596,8 +1596,10 @@ Some files are unregistered; register them before checking in?"))
                             (cadr other-alist))))
              (error "\
 To apply VC operations to multiple files, the files must be in similar VC states.
-%s in state %s clashes with %s in state %s"
-                    (cadr first) (car first) (cadr second) (car second)))))
+%s in state `%s' clashes with
+%s in state `%s'"
+                    (abbreviate-file-name (cadr first)) (car first)
+                    (abbreviate-file-name (cadr second)) (car second)))))
     (list files* state
           (and state (not (eq state 'unregistered))
                (vc-checkout-model backend files*)))))

From d604445954d0c390e7c6c1280bf48b6858881bef Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sun, 5 Apr 2026 15:50:46 +0100
Subject: [PATCH 015/463] New option vc-dir-auto-hide-up-to-date

* lisp/vc/vc-dir.el (vc-dir-hide-up-to-date-on-revert): Delete.
(vc-dir-auto-hide-up-to-date): New option.
(vc-dir-update, vc-dir-revert-buffer-function): Use it.
* etc/NEWS: Document it.
---
 etc/NEWS          |  7 ++++--
 lisp/vc/vc-dir.el | 55 ++++++++++++++++++++++++++++-------------------
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 571253f33fc..dc21ac8399b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2918,11 +2918,14 @@ There is still some further work to do to rationalize VC's handling of
 file removal.
 
 ---
-*** New user option 'vc-dir-hide-up-to-date-on-revert'.
-If you customize this option to non-nil, the 'g' command to refresh
+*** New user option 'vc-dir-auto-hide-up-to-date'.
+If you customize this option to 'revert', the 'g' command to refresh
 the VC Directory buffer also has the effect of the 'x' command.
 That is, typing 'g' refreshes the buffer and also hides items in the
 'up-to-date' and 'ignored' states.
+If you customize this option to any other non-nil value, then in
+addition, hide items whenever their state would change to 'up-to-date'
+or 'ignored'.
 
 ---
 *** New user option 'vc-dir-save-some-buffers-on-revert'.
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 35e760fc7cd..dc764fcc94b 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -160,10 +160,20 @@ proceed to mark and unmark other entries, without asking."
   :group 'vc
   :version "31.1")
 
-(defcustom vc-dir-hide-up-to-date-on-revert nil
-  "If non-nil, \\<vc-dir-mode-map>\\[revert-buffer] in VC-Dir buffers also does \\[vc-dir-hide-up-to-date].
-That is, refreshing the VC-Dir buffer also hides `up-to-date' and
-`ignored' items."
+(defcustom vc-dir-auto-hide-up-to-date nil
+  "If non-nil, VC-Dir automatically hides \\+`up-to-date' and \\+`ignored' items.
+
+If the value of this variable is the symbol `revert', \
+\\<vc-dir-mode-map>\\[revert-buffer] in VC-Dir
+buffers also does \\[vc-dir-hide-up-to-date].  \
+That is, refreshing the VC-Dir buffer also hides
+\\+`up-to-date' and \\+`ignored' items.
+
+If the value of this variable is any other non-nil value, then in
+addition, hide items whenever their state would change to
+\\+`up-to-date' or \\+`ignored'.
+You can still use `vc-dir-show-fileentry' to manually add an entry for
+an \\+`up-to-date' or \\+`ignored' file."
   :type 'boolean
   :group 'vc
   :version "31.1")
@@ -495,6 +505,8 @@ If BODY uses EVENT, it should be a variable,
 	  (expand-file-name
 	   (vc-dir-fileinfo->name data)))))))
 
+(defconst vc-dir--up-to-date-states '(up-to-date ignored))
+
 (defun vc-dir-update (entries buffer &optional noinsert)
   "Update BUFFER's VC-Dir ewoc from ENTRIES.
 This has the effect of adding ENTRIES to the VC-Dir buffer BUFFER.
@@ -552,21 +564,22 @@ Also update some VC file properties from ENTRIES."
 	       ((string-lessp nodefile entryfile)
 		(setq node (ewoc-next vc-ewoc node)))
 	       ((string-equal nodefile entryfile)
-		(if (nth 1 entry)
-		    (progn
-		      (setf (vc-dir-fileinfo->state (ewoc-data node)) (nth 1 entry))
-		      (setf (vc-dir-fileinfo->display-state (ewoc-data node))
-			    (vc--file-getinheprop nodefile 'display-state))
-		      (setf (vc-dir-fileinfo->extra (ewoc-data node)) (nth 2 entry))
-		      (setf (vc-dir-fileinfo->needs-update (ewoc-data node)) nil)
-		      (ewoc-invalidate vc-ewoc node))
-		  ;; If the state is nil, the file does not exist
-		  ;; anymore, so remember the entry so we can remove
-		  ;; it after we are done inserting all ENTRIES.
-		  (push node to-remove))
-		(setq entries (cdr entries))
-		(setq entry (car entries))
-		(setq node (ewoc-next vc-ewoc node)))
+                (let ((state (nth 1 entry)))
+		  (if (or (null state)
+                          (and vc-dir-auto-hide-up-to-date
+                               (not (eq vc-dir-auto-hide-up-to-date 'revert))
+                               (memq state vc-dir--up-to-date-states)))
+                      (push node to-remove)
+		    (setf (vc-dir-fileinfo->state (ewoc-data node)) state)
+		    (setf (vc-dir-fileinfo->display-state (ewoc-data node))
+			  (vc--file-getinheprop nodefile 'display-state))
+		    (setf (vc-dir-fileinfo->extra (ewoc-data node))
+                          (nth 2 entry))
+		    (setf (vc-dir-fileinfo->needs-update (ewoc-data node)) nil)
+		    (ewoc-invalidate vc-ewoc node))
+		  (setq entries (cdr entries))
+		  (setq entry (car entries))
+		  (setq node (ewoc-next vc-ewoc node))))
 	       (t
 		(unless noinsert
 		  (ewoc-enter-before vc-ewoc node
@@ -1465,7 +1478,7 @@ specific headers."
 
 (defun vc-dir-revert-buffer-function (&optional _ignore-auto _noconfirm)
   (vc-dir-refresh)
-  (when vc-dir-hide-up-to-date-on-revert
+  (when vc-dir-auto-hide-up-to-date
     (vc-dir-hide-state)))
 
 (defun vc-dir-refresh ()
@@ -1530,8 +1543,6 @@ outside of VC) and one wants to do some operation on it."
   (interactive "fShow file: ")
   (vc-dir-update (list (list (file-relative-name file) (vc-state file))) (current-buffer)))
 
-(defconst vc-dir--up-to-date-states '(up-to-date ignored))
-
 (defun vc-dir-hide-state (&optional state)
   "Hide items that are in STATE from display.
 See `vc-state' for valid values of STATE.

From 3289886f84cc25a5cc8fc9c6cfd3d711a2db476e Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sun, 5 Apr 2026 15:51:31 +0100
Subject: [PATCH 016/463] * lisp/vc/vc-dir.el (vc-dir-update): Remove empty
 directory entries.

---
 lisp/vc/vc-dir.el | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index dc764fcc94b..77329cd6c26 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -606,7 +606,8 @@ Also update some VC file properties from ENTRIES."
 	(let ((lastdir (vc-dir-node-directory (ewoc-nth vc-ewoc -1))))
 	  (dolist (entry entries)
 	    (let ((entrydir (file-name-directory
-			     (directory-file-name (expand-file-name (car entry))))))
+			     (directory-file-name
+                              (expand-file-name (car entry))))))
 	      ;; Insert a directory node if needed.
 	      (unless (string-equal lastdir entrydir)
 		(setq lastdir entrydir)
@@ -617,8 +618,22 @@ Also update some VC file properties from ENTRIES."
 	      (ewoc-enter-last vc-ewoc
 			       (apply #'vc-dir-create-fileinfo entry))))))
       (when to-remove
-	(let ((inhibit-read-only t))
-	  (apply #'ewoc-delete vc-ewoc (nreverse to-remove)))))
+	(let ((inhibit-read-only t)
+              (crt (ewoc-nth vc-ewoc -1))
+              (first (ewoc-nth vc-ewoc 0)))
+          (while (not (eq crt first))
+            (let ((prev (ewoc-prev vc-ewoc crt)))
+              (cond
+               ;; Remove the entries we queued up for removal.
+               ((eq crt (car to-remove))
+                (ewoc-delete vc-ewoc (pop to-remove)))
+               ;; Remove directories which (now) have no child files.
+               ((and (vc-dir-fileinfo->directory (ewoc-data crt))
+                     (let ((next (ewoc-next vc-ewoc crt)))
+                       (or (null next)
+                           (vc-dir-fileinfo->directory (ewoc-data next)))))
+                (ewoc-delete vc-ewoc crt)))
+              (setq crt prev))))))
     ;; Update VC file properties.
     (pcase-dolist (`(,file ,state ,_extra) entries)
       (vc-file-setprop file 'vc-backend

From bd4b876e9b3106f892ed1cdc0fded226c97cb399 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sun, 5 Apr 2026 16:24:52 +0100
Subject: [PATCH 017/463] Fix vc-default-checkin-patch for vc-async-checkin
 non-nil

* lisp/vc/vc.el (vc-default-checkin-patch): Fix for
vc-async-checkin non-nil (bug#80746).
---
 lisp/vc/vc.el | 70 ++++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 539c7b4628b..3e4382ded7d 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2612,40 +2612,42 @@ proceed anyway?")))
       (make-directory (file-name-directory (expand-file-name f tmpdir)) t)
       (copy-file (expand-file-name f)
                  (expand-file-name f tmpdir)))
-    (unwind-protect
-        (progn
-          (vc-revert-files backend
-                           (mapcar (lambda (f)
-                                     (with-current-buffer (find-file-noselect f)
-                                       buffer-file-name))
-                                   files))
-          (with-temp-buffer
-            ;; Trying to support CVS too.  Assuming that vc-diff
-            ;; there will usually have diff root in default-directory.
-            (when (vc-find-backend-function backend 'root)
-              (setq-local default-directory
-                          (vc-call-backend backend 'root (car files))))
-            (unless (eq 0
-                        (call-process-region patch-string
-                                             nil
-                                             "patch"
-                                             nil
-                                             t
-                                             nil
-                                             "-p1"
-                                             "-r" null-device
-                                             "--posix"
-                                             "--remove-empty-files"
-                                             "-i" "-"))
-              (user-error "Patch failed: %s" (buffer-string))))
-          (vc-call-backend backend 'checkin files comment))
-      (dolist (f files)
-        (copy-file (expand-file-name f tmpdir)
-                   (expand-file-name f)
-                   t)
-        (with-current-buffer (get-file-buffer f)
-          (revert-buffer t t t)))
-      (delete-directory tmpdir t))))
+    (cl-flet ((do-it ()
+                (vc-revert-files backend
+                                 (mapcar (lambda (f)
+                                           (with-current-buffer
+                                               (find-file-noselect f)
+                                             buffer-file-name))
+                                         files))
+                (with-temp-buffer
+                  ;; Try to support CVS too.  Assume that vc-diff there
+                  ;; will usually have diff root in `default-directory'.
+                  (when (vc-find-backend-function backend 'root)
+                    (setq-local default-directory
+                                (vc-call-backend backend 'root (car files))))
+                  (unless (zerop (call-process-region patch-string nil "patch"
+                                                      nil t nil
+                                                      "-p1"
+                                                      "-r" null-device
+                                                      "--posix"
+                                                      "--remove-empty-files"
+                                                      "-i" "-"))
+                    (user-error "Patch failed: %s" (buffer-string))))
+                (vc-call-backend backend 'checkin files comment))
+              (cleanup ()
+                (dolist (f files)
+                  (copy-file (expand-file-name f tmpdir)
+                             (expand-file-name f)
+                             t)
+                  (with-current-buffer (get-file-buffer f)
+                    (revert-buffer t t t)))
+                (delete-directory tmpdir t)))
+      (if (and vc-async-checkin
+               (vc-call-backend backend 'async-checkins))
+          (let ((ret (do-it)))
+            (when (eq (car-safe ret) 'async)
+              (vc-exec-after #'cleanup nil (cadr ret))))
+        (unwind-protect (do-it) (cleanup))))))
 
 ;;; Additional entry points for examining version histories
 

From 418319c15551da03c7b1e986492722fa3306d324 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 5 Apr 2026 10:58:06 +0200
Subject: [PATCH 018/463] ; Use lookup table for package menu faces

* lisp/emacs-lisp/package.el (package-menu-status-faces): Add
new constant.
(package-menu--print-info-simple): Replace 'pcase' form with
'alist-get', which is my measurements is slightly faster.
---
 lisp/emacs-lisp/package.el | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 6a4848c6544..cfa4417240f 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -3665,25 +3665,30 @@ Return (PKG-DESC [NAME VERSION STATUS DOC])."
 
 ;;; Package menu printing
 
+(defconst package-menu-status-faces
+  '(("built-in"   . package-status-built-in)
+    ("external"   . package-status-external)
+    ("available"  . package-status-available)
+    ("avail-obso" . package-status-avail-obso)
+    ("new"        . package-status-new)
+    ("held"       . package-status-held)
+    ("disabled"   . package-status-disabled)
+    ("installed"  . package-status-installed)
+    ("source"     . package-status-from-source)
+    ("dependency" . package-status-dependency)
+    ("unsigned"   . package-status-unsigned)
+    ("incompat"   . package-status-incompat)
+    ("obsolete"   . font-lock-warning-face))
+  "Alist mapping status strings for packages to faces.
+These faces are used in the package menu.")
+
 (defun package-menu--print-info-simple (pkg)
   "Return a package entry suitable for `tabulated-list-entries'.
 PKG is a `package-desc' object.
 Return (PKG-DESC [NAME VERSION STATUS DOC])."
   (let* ((status  (package-desc-status pkg))
-         (face (pcase status
-                 ("built-in"  'package-status-built-in)
-                 ("external"  'package-status-external)
-                 ("available" 'package-status-available)
-                 ("avail-obso" 'package-status-avail-obso)
-                 ("new"       'package-status-new)
-                 ("held"      'package-status-held)
-                 ("disabled"  'package-status-disabled)
-                 ("installed" 'package-status-installed)
-                 ("source"    'package-status-from-source)
-                 ("dependency" 'package-status-dependency)
-                 ("unsigned"  'package-status-unsigned)
-                 ("incompat"  'package-status-incompat)
-                 (_            'font-lock-warning-face)))) ; obsolete.
+         (face (alist-get status package-menu-status-faces
+                          nil nil #'string=)))
     (list pkg
           `[(,(symbol-name (package-desc-name pkg))
              face package-name

From 4473f76261b036e4d970427f42f47563cf93f600 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 5 Apr 2026 11:53:29 +0200
Subject: [PATCH 019/463] Mention package version in 'package-autoremove'
 prompt

* lisp/emacs-lisp/package.el (package--removable-packages):
Return package descriptors instead of names.
(package-autoremove): Adapt code to handle package descriptors
instead of names.
---
 lisp/emacs-lisp/package.el | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index cfa4417240f..e07c3caf8ec 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1827,15 +1827,15 @@ control over."
     (file-in-directory-p dir package-user-dir)))
 
 (defun package--removable-packages ()
-  "Return a list of names of packages no longer needed.
+  "Return a list of `package-desc' objects that are longer needed.
 These are packages which are neither contained in
 `package-selected-packages' nor a dependency of one that is."
   (let ((needed (package--get-deps package-selected-packages)))
-    (cl-loop for p in (mapcar #'car package-alist)
-             unless (or (memq p needed)
+    (cl-loop for (name . descs) in (package--alist)
+             unless (or (memq name needed)
                         ;; Do not auto-remove external packages.
-                        (not (package--user-installed-p p)))
-             collect p)))
+                        (not (package--user-installed-p name)))
+             append descs)))
 
 (defun package--used-elsewhere-p (pkg-desc &optional pkg-list all)
   "Non-nil if PKG-DESC is a dependency of a package in PKG-LIST.
@@ -2511,10 +2511,9 @@ argument, don't ask for confirmation to install packages."
                     (y-or-n-p
                      (format "Packages to delete: %d (%s), proceed? "
                              (length removable)
-                             (mapconcat #'symbol-name removable " "))))
-            (mapc (lambda (p)
-                    (package-delete (cadr (assq p package-alist)) t))
-                  removable))
+                             (mapconcat #'package-desc-full-name
+                              removable ", "))))
+            (mapc #'package-delete removable))
         (message "Nothing to autoremove")))))
 
 (defun package-isolate (packages &optional temp-init)

From 5589d44ce6bd303ba69cc97ad9b041f39539b06e Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 5 Apr 2026 14:27:48 +0200
Subject: [PATCH 020/463] ; Use 'ensure-proper-list' to get uniform maintainer
 lists

* lisp/emacs-lisp/package.el (describe-package-1)
(package-maintainers): Remove manual checks that :maintainer is
not just a cons-cell.
---
 lisp/emacs-lisp/package.el | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index e07c3caf8ec..ea8cccd413a 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2712,8 +2712,8 @@ Helper function for `describe-package'."
          (status (if desc (package-desc-status desc) "orphan"))
          (incompatible-reason (package--incompatible-p desc))
          (signed (if desc (package-desc-signed desc)))
-         (maintainers (or (cdr (assoc :maintainer extras))
-                          (cdr (assoc :maintainers extras))))
+         (maintainers (ensure-proper-list (or (cdr (assoc :maintainer extras))
+                                              (cdr (assoc :maintainers extras)))))
          (authors (cdr (assoc :authors extras)))
          (news (and desc (package-find-news-file desc))))
     (when (string= status "avail-obso")
@@ -2847,8 +2847,6 @@ Helper function for `describe-package'."
         (insert " "))
       (insert "\n"))
     (when maintainers
-      (unless (and (listp (car maintainers)) (listp (cdr maintainers)))
-        (setq maintainers (list maintainers)))
       (package--print-help-section
           (if (cdr maintainers) "Maintainers" "Maintainer"))
       (dolist (maintainer maintainers)
@@ -4869,9 +4867,8 @@ will be signaled in that case."
     (error "Invalid package description: %S" pkg-desc))
   (let* ((name (package-desc-name pkg-desc))
          (extras (package-desc-extras pkg-desc))
-         (maint (ensure-list
-                 (or (and-let* ((list (cdr (assoc :maintainer extras))))
-                       (if (consp (car-safe list)) list (list list)))
+         (maint (ensure-proper-list
+                 (or (cdr (assoc :maintainer extras))
                      (cdr (assoc :maintainers extras))
                      ;; If no maintainers are listed, contact authors
                      ;; instead (bug#80478)

From 9425610ac3270589975e66aced7a25a87228d674 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 5 Apr 2026 14:29:10 +0200
Subject: [PATCH 021/463] Disable 'package-review-policy' during package-tests

* test/lisp/emacs-lisp/package-tests.el (with-package-test):
Disable package reviewing during testing to not require manual
user input during tests.
---
 test/lisp/emacs-lisp/package-tests.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el
index a8c34e8e45b..a6d9f13a289 100644
--- a/test/lisp/emacs-lisp/package-tests.el
+++ b/test/lisp/emacs-lisp/package-tests.el
@@ -141,6 +141,7 @@ This macro interprets the following keywords:
             (package-user-dir package-test-user-dir)
             (package-gnupghome-dir (expand-file-name "gnupg" package-user-dir))
             (package-archives `(("gnu" . ,(or ,location package-test-data-dir))))
+            (package-review-policy nil)
             (default-directory package-test-file-dir)
             abbreviated-home-dir
             package--initialized

From 5bd8f3a44a2052af4455e093e51f142c432dfe59 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 6 Apr 2026 09:05:19 +0300
Subject: [PATCH 022/463] ; Improve documentation of 'window-prev-buffers'

* doc/lispref/windows.texi (Window History): Document that
'window-prev-buffers' returns positions as markers.  (Bug#80754)
---
 doc/lispref/windows.texi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 007aee73cdf..b7fabca89a9 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -4922,10 +4922,10 @@ window and defaults to the selected one.
 
 Each list element has the form @code{(@var{buffer} @var{window-start}
 @var{window-pos})}, where @var{buffer} is a buffer previously shown in
-the window, @var{window-start} is the window start position
-(@pxref{Window Start and End}) when that buffer was last shown, and
-@var{window-pos} is the window point position (@pxref{Window Point})
-when that buffer was last shown in @var{window}.
+the window, @var{window-start} is a marker that gives the window start
+position (@pxref{Window Start and End}) when that buffer was last shown,
+and @var{window-pos} is a marker that gives the window point position
+(@pxref{Window Point}) when that buffer was last shown in @var{window}.
 
 The list is ordered so that earlier elements correspond to more
 recently-shown buffers, and the first element usually corresponds to the

From 358a7ba0f6f601ea49fb22dc05e36f4a258c7db4 Mon Sep 17 00:00:00 2001
From: Joseph Mingrone <jrm@ftfl.ca>
Date: Sat, 4 Apr 2026 19:26:56 -0300
Subject: [PATCH 023/463] lisp/net/tramp.el: Fix performance regression with
 completions

* lisp/net/tramp.el (tramp-skeleton-file-name-all-completions):
Use `file-directory-p' directly instead of calling `file-symlink-p'
and file-truename first.  Since `file-directory-p' already follows
symlinks, symlinked directories are handled correctly without the
extra indirection.
---
 lisp/net/tramp.el | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 03089dffb55..b38d502e8b1 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3027,16 +3027,14 @@ BODY is the backend specific code."
 			     (format
 			      "file-name-all-completions-%s"
 			      tramp-fnac-add-trailing-slash)
-			   ;; Mark symlinked directories.  Other
-			   ;; directories are already marked.
+			   ;; Mark directories, including symlinks to
+			   ;; directories.
 			   (mapcar
 			    (lambda (x)
 			      (let ((f (file-name-concat ,directory x)))
 				(if (and tramp-fnac-add-trailing-slash
 					 (not (string-suffix-p "/" x))
-					 (file-directory-p
-					  (if (file-symlink-p f)
-					      (file-truename f) f)))
+					 (file-directory-p f))
 				    (concat x "/") x)))
 			    ;; Some storage systems do not return "." and "..".
 			    (seq-union

From 4a297f43980cc16731d820345dbc702241adb0aa Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 6 Apr 2026 10:19:16 +0200
Subject: [PATCH 024/463] Keep cache in
 tramp-skeleton-file-name-all-completions

* lisp/net/tramp.el (tramp-skeleton-file-name-all-completions):
Don't expire cache for large directories.
---
 lisp/net/tramp.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index b38d502e8b1..cc0ad613992 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3016,6 +3016,7 @@ BODY is the backend specific code."
       (when (file-directory-p ,directory)
 	(seq-uniq (delq nil
          (let* ((case-fold-search read-file-name-completion-ignore-case)
+                remote-file-name-inhibit-cache
 		(result
 		 (if (tramp-tramp-file-p ,directory)
 		     (with-parsed-tramp-file-name

From 5003f5e6e48bc4a2050b74f85ed19b366237b427 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 6 Apr 2026 10:57:35 +0200
Subject: [PATCH 025/463] * test/lisp/net/tramp-tests.el
 (tramp-test21-file-links): Extend test.

---
 test/lisp/net/tramp-tests.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 3972e5faa45..90dc17a0753 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -4473,6 +4473,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 	    ;; Check, that files in symlinked directories still work.
 	    (make-symbolic-link tmp-name4 tmp-name6)
 	    (should (file-symlink-p tmp-name6))
+	    (should (file-directory-p tmp-name6))
 	    (should-not (file-regular-p tmp-name6))
 	    (write-region "foo" nil (expand-file-name "foo" tmp-name6))
 	    (delete-file (expand-file-name "foo" tmp-name6))

From 02ad0183f2e078b5fda8a67c209ba280db9b2123 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Mon, 6 Apr 2026 12:16:56 +0100
Subject: [PATCH 026/463] ; * lisp/vc/vc.el (dir-status-files): Clarifications
 (bug#80722).

---
 lisp/vc/vc.el | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 3e4382ded7d..2ab6635e943 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -157,12 +157,15 @@
 ;; - dir-status-files (dir files update-function)
 ;;
 ;;   Produce RESULT: a list of lists of the form (FILE VC-STATE EXTRA)
-;;   for FILES in DIR.  If FILES is nil, report on all files in DIR.
-;;   (It is OK, though possibly inefficient, to ignore the FILES argument
-;;   and always report on all files in DIR.)
+;;   for FILES in DIR (which need not be the repository root).
+;;   If FILES is nil, report on all files in DIR.
+;;   (It is permitted, though possibly inefficient, to ignore the FILES
+;;   argument and always report on all files in DIR.)
 ;;
 ;;   If FILES is non-nil, this function should report on all requested
 ;;   files, including up-to-date or ignored files.
+;;   If FILES is nil, up-to-date and ignored files may be excluded, but
+;;   need not be.
 ;;
 ;;   EXTRA can be used for backend specific information about FILE.
 ;;

From 7679855281b0a91fd6acce81555be2807d7fa5aa Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Mon, 6 Apr 2026 12:26:08 +0100
Subject: [PATCH 027/463] ; * lisp/vc/vc.el (checkin): Specify the async case
 (bug#80723).

---
 lisp/vc/vc.el | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 2ab6635e943..c1e373d496b 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -287,6 +287,11 @@
 ;;   revision argument is only supported with some older VCSes, like
 ;;   RCS and CVS, and is otherwise silently ignored.
 ;;
+;;   If the backend supports async checkins and `vc-async-checkin' is
+;;   non-nil, the implementation should start an asychronous process to
+;;   commit the changes, and return a cons whose car is `async' and
+;;   whose cdr is that process object.
+;;
 ;; - checkin-patch (patch-string comment)
 ;;
 ;;   Commit a single patch PATCH-STRING to this backend, bypassing any

From 8205f39b6caca3f7ed528aaa34fad572f3bb4b4c Mon Sep 17 00:00:00 2001
From: Diep Pham <diep@calif.io>
Date: Mon, 6 Apr 2026 12:54:25 +0100
Subject: [PATCH 028/463] Eglot: improve safety spec of
 eglot-workspace-configuration

* lisp/progmodes/eglot.el (eglot-workspace-configuration): Improve
safety spec.

Copyright-paperwork-exempt: Yes
---
 lisp/progmodes/eglot.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 0e1ed519b43..bf6fbc69ba2 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -3087,7 +3087,8 @@ root of the current project.  It should return an object of the
 format described above.")
 
 ;;;###autoload
-(put 'eglot-workspace-configuration 'safe-local-variable #'listp)
+(put 'eglot-workspace-configuration 'safe-local-variable
+     (lambda (v) (and (listp v) (not (functionp v)))))
 
 (defun eglot-show-workspace-configuration (&optional server)
   "Dump `eglot-workspace-configuration' as JSON for debugging."

From 7ce60be53e7ffbc1972dd8e98744adf6103eee9e Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Mon, 6 Apr 2026 13:02:06 +0100
Subject: [PATCH 029/463] vc-hg-working-revision: Return changeset hashes

* lisp/vc/vc-hg.el (vc-hg-working-revision): Return changeset
hashes instead of revision numbers.  Respect
vc-use-short-revision.
* etc/NEWS: Document the change.
---
 etc/NEWS         | 5 +++++
 lisp/vc/vc-hg.el | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/etc/NEWS b/etc/NEWS
index dc21ac8399b..b3a497c351a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3088,6 +3088,11 @@ You can use 'C-u C-x v +' to preview or change the arguments.
 *** 'C-u C-x v +' and 'C-u C-x v P' for Git have an input history.
 This was already in place for Mercurial.
 
+---
+*** 'vc-hg-working-revision' now returns changeset hashes.
+Previously it returned local revision numbers, but hashes are more
+robust for how this function is typically used.
+
 ** Package
 
 +++
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index d671caa23db..398645e5a1e 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -282,7 +282,8 @@ A value of `default' means to use the value of `vc-resolve-conflicts'."
   (ignore-errors
     (with-output-to-string
       (vc-hg-command standard-output 0 nil
-                     "log" "-r" "." "--template" "{rev}"))))
+                     "log" "-r" "." "--template"
+                     (if vc-use-short-revision "{node|short}" "{node}")))))
 
 (defcustom vc-hg-symbolic-revision-styles
   '(builtin-active-bookmark

From 8e1399dbdac9dbf26d8fa00a5453bce6f2639740 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 7 Apr 2026 09:59:53 +0300
Subject: [PATCH 030/463] ; * doc/lispref/os.texi (Timers): Mention primitives
 that wait (bug#80755).

---
 doc/lispref/os.texi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 38d7ad44c4a..72a1fdc7878 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -2382,6 +2382,7 @@ calling a timer function in a row, when many previously scheduled
 calls were unavoidably delayed.
 @end defopt
 
+@cindex running code with timeout
 @defmac with-timeout (seconds timeout-forms@dots{}) body@dots{}
 Execute @var{body}, but give up after @var{seconds} seconds.  If
 @var{body} finishes before the time is up, @code{with-timeout} returns
@@ -2400,6 +2401,8 @@ primitive that can wait, @code{with-timeout} cannot stop executing
 @var{body} while it is in the midst of a computation---only when it
 calls one of those primitives.  So use @code{with-timeout} only with a
 @var{body} that waits for input, not one that does a long computation.
+Primitives that wait for input include @code{sit-for}, @code{sleep-for},
+@code{accept-process-output}, and some others.
 @end defmac
 
   The function @code{y-or-n-p-with-timeout} provides a simple way to use

From bc59d16cd8f81b0c6891133de2ae495e3b6dab26 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 7 Apr 2026 10:50:05 +0300
Subject: [PATCH 031/463] ; Update description of 'defcustom' in Emacs Lisp
 Intro manual

* doc/lispintro/emacs-lisp-intro.texi (defcustom): Update text
(bug#80751).
---
 doc/lispintro/emacs-lisp-intro.texi | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index a712b3a1b46..0211a4b3686 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -16570,18 +16570,16 @@ M-x customize
 @end smallexample
 
 @noindent
-and find that the group for editing files of text is called ``Text''.
-Enter that group.  Text Mode Hook is the first member.  You can click
-on its various options, such as @code{turn-on-auto-fill}, to set the
-values.  After you click on the button to
-
-@smallexample
-Save for Future Sessions
-@end smallexample
-
-@noindent
-Emacs will write an expression into your @file{.emacs} file.
-It will look like this:
+and find that the group for editing files of text is called @samp{Text}.
+Enter that group by clicking or typing @key{RET} on it.  Text Mode Hook
+is one of the group's members; click on the triangular button (or on the
+@samp{Show Value} button which replaces that on text-only terminals) to
+its left to show its various options.  Then you can click (or type
+@key{RET} if you are on a text-only terminal) on its options, such as
+@code{turn-on-auto-fill}, to set or reset the values.  After you click
+(or type @key{RET}) on the @samp{State} button and select @samp{Save for
+Future Sessions}, Emacs will write an expression into your @file{.emacs}
+file.  It will look like this:
 
 @smallexample
 @group

From f5a2357a89f8bc59db44bb27b3e9378db4087834 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 7 Apr 2026 13:19:04 +0200
Subject: [PATCH 032/463] Tweak remote-file-name-inhibit-cache in Tramp

* lisp/net/tramp-cache.el
(tramp-suppress-remote-file-name-inhibit-cache): New defsubst.

* lisp/net/tramp.el (tramp-skeleton-file-name-all-completions):
* lisp/net/tramp-sh.el (tramp-get-remote-path): Use it.
---
 lisp/net/tramp-cache.el | 14 ++++++++++++++
 lisp/net/tramp-sh.el    | 10 ++++------
 lisp/net/tramp.el       |  3 ++-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index 1fc3fb3aeae..b47a2aa9f6c 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -161,6 +161,20 @@ If KEY is `tramp-cache-undefined', don't create anything, and return nil."
 ;; would fail.
 (function-put #'tramp-get-hash-table 'tramp-suppress-trace t)
 
+(defsubst tramp-suppress-remote-file-name-inhibit-cache ()
+  "Weaken `remote-file-name-inhibit-cache'.
+This is meant to be let-bound for code over many cache operations, like
+in large directories."
+  ;; If `remote-file-name-inhibit-cache' is already `nil', keep it.
+  (cond
+   (;; A timestamp.  Keep it.
+    (consp remote-file-name-inhibit-cache) remote-file-name-inhibit-cache)
+   (;; A number of seconds.  Set a timestamp with the difference.
+    (numberp remote-file-name-inhibit-cache)
+    (time-subtract nil remote-file-name-inhibit-cache))
+   (;; Cache is disabled.  Set a timestamp from now on.
+    t (current-time))))
+
 ;;;###tramp-autoload
 (defun tramp-get-file-property (key file property &optional default)
   "Get the PROPERTY of FILE from the cache context of KEY.
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 9aec9e38f65..668eae3198b 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -5036,8 +5036,7 @@ Goes through the list `tramp-inline-compress-commands'."
 
    ;; Use plink options.
    ((string-match-p
-     (rx "plink" (? ".exe") eol)
-     (tramp-expand-args vec 'tramp-login-program))
+     (rx "plink" (? ".exe") eol) (tramp-expand-args vec 'tramp-login-program))
     (concat
      (if (eq tramp-use-connection-share 'suppress)
 	 "-noshare" "-share")
@@ -5397,9 +5396,7 @@ connection if a previous connection has died for some reason."
 			  (tramp-get-method-parameter
 			   hop 'tramp-connection-timeout
 			   tramp-connection-timeout))
-			 (command
-			  (tramp-expand-args
-			   hop 'tramp-login-program))
+			 (command (tramp-expand-args hop 'tramp-login-program))
 			 ;; We don't create the temporary file.  In
 			 ;; fact, it is just a prefix for the
 			 ;; ControlPath option of ssh; the real
@@ -5805,7 +5802,8 @@ Nonexistent directories are removed from spec."
 	       remote-path :test #'string-equal :from-end t))
 
 	;; Remove non-existing directories.
-	(let (remote-file-name-inhibit-cache)
+	(let ((remote-file-name-inhibit-cache
+	       (tramp-suppress-remote-file-name-inhibit-cache)))
 	  (tramp-bundle-read-file-names vec remote-path)
 	  (cl-remove-if
 	   (lambda (x) (not (tramp-get-file-property vec x "file-directory-p")))
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index cc0ad613992..1e1fa2fe9a7 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3016,7 +3016,8 @@ BODY is the backend specific code."
       (when (file-directory-p ,directory)
 	(seq-uniq (delq nil
          (let* ((case-fold-search read-file-name-completion-ignore-case)
-                remote-file-name-inhibit-cache
+                (remote-file-name-inhibit-cache
+		 (tramp-suppress-remote-file-name-inhibit-cache))
 		(result
 		 (if (tramp-tramp-file-p ,directory)
 		     (with-parsed-tramp-file-name

From 5d9b6c8262beb2b5f4ad9c48c0c8a780db902fd6 Mon Sep 17 00:00:00 2001
From: Stephen Gildea <stepheng+emacs@gildea.com>
Date: Tue, 7 Apr 2026 09:27:06 -0700
Subject: [PATCH 033/463] ; time-stamp: rename some internal functions to
 include "--"

* lisp/time-stamp.el (time-stamp--zformat-from-parsed-options)
(time-stamp--string-internal) (time-stamp--do-letter-case)
(time-stamp--do-number) (time-stamp--filtered-buffer-file-name)
(time-stamp--conv-warn) (time-stamp--once-internal): New names.
* test/lisp/time-stamp-tests.el (define-formatz-tests)
(formatz-find-test-def-function):
Give generated test names "time-stamp-" prefix.
---
 lisp/time-stamp.el            | 107 +++++++++++++++++-----------------
 test/lisp/time-stamp-tests.el |  56 +++++++++---------
 2 files changed, 81 insertions(+), 82 deletions(-)

diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index 671cf5a1547..df5acfa629a 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -399,7 +399,7 @@ template, and where in the file it can occur."
 	   (setq ts-count 1)
            (time-stamp--message "time-stamp-count is not an integer"))
 	  ((< ts-count 1)
-	   ;; We need to call time-stamp-once at least once
+           ;; We need to call time-stamp--once-internal at least once
 	   ;; to output any warnings about time-stamp not being active.
 	   (setq ts-count 1)))
     ;; Figure out what lines the end should be on.
@@ -429,14 +429,14 @@ template, and where in the file it can occur."
       (while (and start
                   (< start search-limit)
                   (> ts-count 0))
-        (setq start (time-stamp-once start search-limit ts-start ts-end
-                                     ts-format format-lines end-lines))
+        (setq start (time-stamp--once-internal start search-limit ts-start ts-end
+                                               ts-format format-lines end-lines))
         (setq ts-count (1- ts-count)))
       (set-marker search-limit nil))))
   nil)
 
-(defun time-stamp-once (start search-limit ts-start ts-end
-			ts-format format-lines end-lines)
+(defun time-stamp--once-internal (start search-limit ts-start ts-end
+                                  ts-format format-lines end-lines)
   "Update one time stamp.  Internal routine called by `time-stamp'.
 Returns the end point, which is where `time-stamp' begins the next search."
   (let ((case-fold-search nil)
@@ -515,7 +515,7 @@ ARG is positive, otherwise nil."
 
 (defun time-stamp--format (format time)
   "FORMAT a TIME in zone `time-stamp-time-zone'.
-Internal helper used by `time-stamp-string-preprocess'."
+Helper used by `time-stamp--string-internal'."
   (format-time-string format time time-stamp-time-zone))
 
 (defun time-stamp-string (&optional ts-format time)
@@ -529,7 +529,7 @@ documentation of `time-stamp-format' for details.
 Optional second argument TIME is only for testing; normally the current
 time is used.  The time zone is determined by `time-stamp-time-zone'."
   (if (stringp (or ts-format (setq ts-format time-stamp-format)))
-      (time-stamp-string-preprocess ts-format time)))
+      (time-stamp--string-internal ts-format time)))
 
 
 (defconst time-stamp-no-file "(no file)"
@@ -544,7 +544,7 @@ time is used.  The time zone is determined by `time-stamp-time-zone'."
 ;;;      The : modifier is a temporary conversion feature used to resolve
 ;;; ambiguous formats--formats that are changing (over time) incompatibly.
 
-(defun time-stamp-string-preprocess (format &optional time)
+(defun time-stamp--string-internal (format &optional time)
   "Use FORMAT to format date, time, and user information.
 Optional second argument TIME is only for testing.
 This is an internal routine implementing extensions to `format-time-string'
@@ -626,7 +626,7 @@ and all `time-stamp-format' compatibility."
 	           ((eq cur-char ?%)
 	            "%")
 	           ((eq cur-char ?a)    ;day of week
-                    (time-stamp-do-letter-case
+                    (time-stamp--do-letter-case
                      nil upcase title-case change-case
                      (if (> colon-cnt 0)
                          (if (string-equal field-width "")
@@ -639,21 +639,22 @@ and all `time-stamp-format' compatibility."
                            (<= (string-to-number field-width) 3)
                            (not flag-minimize)
                            (not flag-pad-with-spaces))
-                      (time-stamp-conv-warn "%3A" "%#a")
+                      (time-stamp--conv-warn "%3A" "%#a")
                       (time-stamp--format "%#a" time))
                      ((or (> colon-cnt 0)
                           change-case upcase title-case
                           flag-minimize flag-pad-with-spaces
                           (string-equal field-width ""))
-                      (time-stamp-do-letter-case
+                      (time-stamp--do-letter-case
                        nil upcase title-case change-case
                        (time-stamp--format "%A" time)))
-                     (t (time-stamp-conv-warn (format "%%%sA" field-width)
-                                              (format "%%#%sA" field-width)
-                                              (format "%%:%sA" field-width))
+                     (t (time-stamp--conv-warn (format "%%%sA" field-width)
+                                               (format "%%#%sA" field-width)
+                                               (format "%%:%sA" field-width))
+
                         (time-stamp--format "%#A" time))))
 	           ((eq cur-char ?b)    ;month name
-                    (time-stamp-do-letter-case
+                    (time-stamp--do-letter-case
                      nil upcase title-case change-case
                      (if (> colon-cnt 0)
                          (if (string-equal field-width "")
@@ -666,41 +667,41 @@ and all `time-stamp-format' compatibility."
                            (<= (string-to-number field-width) 3)
                            (not flag-minimize)
                            (not flag-pad-with-spaces))
-                      (time-stamp-conv-warn "%3B" "%#b")
+                      (time-stamp--conv-warn "%3B" "%#b")
                       (time-stamp--format "%#b" time))
                      ((or (> colon-cnt 0)
                           change-case upcase title-case
                           flag-minimize flag-pad-with-spaces
                           (string-equal field-width ""))
-                      (time-stamp-do-letter-case
+                      (time-stamp--do-letter-case
                        nil upcase title-case change-case
                        (time-stamp--format "%B" time)))
-                     (t (time-stamp-conv-warn (format "%%%sB" field-width)
-                                              (format "%%#%sB" field-width)
-                                              (format "%%:%sB" field-width))
+                     (t (time-stamp--conv-warn (format "%%%sB" field-width)
+                                               (format "%%#%sB" field-width)
+                                               (format "%%:%sB" field-width))
                         (time-stamp--format "%#B" time))))
 	           ((eq cur-char ?d)    ;day of month, 1-31
-                    (time-stamp-do-number cur-char colon-cnt field-width time))
+                    (time-stamp--do-number cur-char colon-cnt field-width time))
 	           ((eq cur-char ?H)    ;hour, 0-23
-                    (time-stamp-do-number cur-char colon-cnt field-width time))
+                    (time-stamp--do-number cur-char colon-cnt field-width time))
 	           ((eq cur-char ?I)    ;hour, 1-12
-                    (time-stamp-do-number cur-char colon-cnt field-width time))
+                    (time-stamp--do-number cur-char colon-cnt field-width time))
 	           ((eq cur-char ?m)    ;month number, 1-12
-                    (time-stamp-do-number cur-char colon-cnt field-width time))
+                    (time-stamp--do-number cur-char colon-cnt field-width time))
 	           ((eq cur-char ?M)    ;minute, 0-59
-                    (time-stamp-do-number cur-char colon-cnt field-width time))
+                    (time-stamp--do-number cur-char colon-cnt field-width time))
 	           ((eq cur-char ?p)    ;AM or PM
-                    (time-stamp-do-letter-case
+                    (time-stamp--do-letter-case
                      t upcase title-case change-case
                      (time-stamp--format "%p" time)))
 	           ((eq cur-char ?P)    ;AM or PM
                     (if (and upcase (not change-case))
                         ""              ;discourage inconsistent "%^P"
-                      (time-stamp-do-letter-case
+                      (time-stamp--do-letter-case
                        t upcase title-case change-case
                        (time-stamp--format "%p" time))))
 	           ((eq cur-char ?S)    ;seconds, 00-60
-                    (time-stamp-do-number cur-char colon-cnt field-width time))
+                    (time-stamp--do-number cur-char colon-cnt field-width time))
 	           ((eq cur-char ?w)    ;weekday number, Sunday is 0
 	            (time-stamp--format "%w" time))
 	           ((eq cur-char ?y)    ;year
@@ -708,10 +709,10 @@ and all `time-stamp-format' compatibility."
                         (if (or (string-equal field-width "")
                                 (<= (string-to-number field-width) 2))
                             (string-to-number (time-stamp--format "%y" time))
-                          (time-stamp-conv-warn
+                          (time-stamp--conv-warn
                            (format "%%%sy" field-width) "%Y")
                           (string-to-number (time-stamp--format "%Y" time)))
-                      (time-stamp-conv-warn "%:y" "%Y")
+                      (time-stamp--conv-warn "%:y" "%Y")
                       (string-to-number (time-stamp--format "%Y" time))))
 	           ((eq cur-char ?Y)    ;4-digit year
 	            (string-to-number (time-stamp--format "%Y" time)))
@@ -738,9 +739,9 @@ and all `time-stamp-format' compatibility."
 			          (not flag-pad-with-spaces)
 			          (not flag-pad-with-zeros)
 			          (= field-width-num 0))
-                             (time-stamp-conv-warn "%z" "%#Z" "%5z")
+                             (time-stamp--conv-warn "%z" "%#Z" "%5z")
 		             (time-stamp--format "%#Z" time))
-			    (t (time-stamp-formatz-from-parsed-options
+                            (t (time-stamp--zformat-from-parsed-options
 				flag-minimize
 				flag-pad-with-spaces
 				flag-pad-with-zeros
@@ -748,25 +749,25 @@ and all `time-stamp-format' compatibility."
 				field-width-num
 				offset-secs)))))
 	           ((eq cur-char ?Z)    ;time zone name
-                    (time-stamp-do-letter-case
+                    (time-stamp--do-letter-case
                      t upcase title-case change-case
                      (time-stamp--format "%Z" time)))
 	           ((eq cur-char ?f)    ;buffer-file-name, base name only
 	            (if buffer-file-name
-                        (time-stamp-filtered-buffer-file-name :nondirectory)
+                        (time-stamp--filtered-buffer-file-name :nondirectory)
 	              time-stamp-no-file))
 	           ((eq cur-char ?F)    ;buffer-file-name, absolute name
                     (if buffer-file-name
-                        (time-stamp-filtered-buffer-file-name :absolute)
+                        (time-stamp--filtered-buffer-file-name :absolute)
                       time-stamp-no-file))
 	           ((eq cur-char ?s)    ;system name, legacy
-		    (time-stamp-conv-warn "%s" "%Q")
+                    (time-stamp--conv-warn "%s" "%Q")
                     (time-stamp--system-name :full))
 	           ((eq cur-char ?u)    ;user name, legacy
-		    (time-stamp-conv-warn "%u" "%l")
+                    (time-stamp--conv-warn "%u" "%l")
 	            (user-login-name))
 	           ((eq cur-char ?U)    ;user full name, legacy
-		    (time-stamp-conv-warn "%U" "%L")
+                    (time-stamp--conv-warn "%U" "%L")
 	            (user-full-name))
 	           ((eq cur-char ?l)    ;login name
 	            (user-login-name))
@@ -808,15 +809,15 @@ and all `time-stamp-format' compatibility."
       (setq ind (1+ ind)))
     (apply #'concat (nreverse result))))
 
-(defun time-stamp-do-letter-case (change-is-downcase
-                                  upcase title-case change-case text)
+(defun time-stamp--do-letter-case (change-is-downcase
+                                   upcase title-case change-case text)
   "Apply upper- and lower-case conversions to TEXT per the flags.
 CHANGE-IS-DOWNCASE non-nil indicates that modifier CHANGE-CASE
 requests lowercase, otherwise the modifier requests uppercase.
 UPCASE is non-nil if the \"^\" modifier is active.
 TITLE-CASE is non-nil if the \"*\" modifier is active.
 CHANGE-CASE is non-nil if the \"#\" modifier is active.
-This is an internal helper for `time-stamp-string-preprocess'."
+This is a helper for `time-stamp--string-internal'."
   (cond ((and upcase change-case)
          (downcase text))
         ((and title-case change-case)
@@ -830,18 +831,18 @@ This is an internal helper for `time-stamp-string-preprocess'."
         (t
          text)))
 
-(defun time-stamp-do-number (format-char colon-count field-width time)
+(defun time-stamp--do-number (format-char colon-count field-width time)
   "Handle a FORMAT-CHAR mostly compatible with `format-time-string'.
 The default width/padding may be different from `format-time-string'.
 COLON-COUNT is non-0 if \":\" was specified.  FIELD-WIDTH is the string
 width specification or \"\".  TIME is the time to convert.
-This is an internal helper for `time-stamp-string-preprocess'."
+This is a helper for `time-stamp--string-internal'."
   (let ((format-string (concat "%" (char-to-string format-char))))
     (if (and (> colon-count 0) (not (string-equal field-width "")))
 	""				;discourage "%:2d" and the like
       (string-to-number (time-stamp--format format-string time)))))
 
-(defun time-stamp-filtered-buffer-file-name (type)
+(defun time-stamp--filtered-buffer-file-name (type)
   "Return a printable string representing the buffer file name.
 Non-graphic characters are replaced by ?.  TYPE is :absolute
 for the full name or :nondirectory for base name only."
@@ -864,7 +865,6 @@ for the full name or :nondirectory for base name only."
 
 (defun time-stamp--count-newlines (str)
   "Return the number of newlines in STR."
-  (declare (pure t))
   (let ((nl-count 0)
         (nl-start 0))
     (while (setq nl-start (string-match-p "\n" str nl-start))
@@ -884,7 +884,6 @@ TYPE is :short for the unqualified name, :full for the full name."
 
 (defun time-stamp--system-name-1 (sysname type)
   "Return SYSNAME, shortened if TYPE is :short."
-  (declare (pure t))
   (let (first-dot)
     (if (and (eq type :short)
              (setq first-dot (string-match-p "\\." sysname)))
@@ -909,7 +908,7 @@ to change in the future to be compatible with `format-time-string'.
 The new formats being recommended now will continue to work then.")
 
 
-(defun time-stamp-conv-warn (old-format new-format &optional standard-format)
+(defun time-stamp--conv-warn (old-format new-format &optional standard-format)
   "Display a warning about a soon-to-be-obsolete format.
 Suggests replacing OLD-FORMAT with NEW-FORMAT (same effect, but stable)
 or (if provided) STANDARD-FORMAT (the effect the user may have expected
@@ -1031,12 +1030,12 @@ This is an internal function called by `time-stamp'."
 ;; bighours = 1*digit digitpair
 ;; padding = *" "
 
-(defun time-stamp-formatz-from-parsed-options (flag-minimize
-                                               flag-pad-spaces-only
-                                               flag-pad-zeros-first
-                                               colon-count
-                                               field-width
-                                               offset-secs)
+(defun time-stamp--zformat-from-parsed-options (flag-minimize
+                                                flag-pad-spaces-only
+                                                flag-pad-zeros-first
+                                                colon-count
+                                                field-width
+                                                offset-secs)
   "Format a time offset according to a %z variation.
 
 Format parts FLAG-MINIMIZE, FLAG-PAD-SPACES-ONLY,
@@ -1047,7 +1046,7 @@ This is an internal function used by `time-stamp'."
 
   ;; Callers of this function need to have already parsed the %z
   ;; format string; this function accepts just the parts of the format.
-  ;; `time-stamp-string-preprocess' is the full-fledged parser normally
+  ;; `time-stamp--string-internal' is the full-fledged parser normally
   ;; used.  The unit test (in time-stamp-tests.el) defines the simpler
   ;; parser `format-time-offset'.
 
diff --git a/test/lisp/time-stamp-tests.el b/test/lisp/time-stamp-tests.el
index 76126c77602..4482ed293f6 100644
--- a/test/lisp/time-stamp-tests.el
+++ b/test/lisp/time-stamp-tests.el
@@ -37,7 +37,7 @@
          (time-stamp-active t)         ;default, but user may have changed it
          (time-stamp-warn-inactive t)  ;default, but user may have changed it
          (time-stamp-time-zone t))     ;use UTC
-     (cl-letf (((symbol-function 'time-stamp-conv-warn)
+     (cl-letf (((symbol-function 'time-stamp--conv-warn)
                 (lambda (old-format _new &optional _newer)
                   (ert-fail
                    (format "Unexpected format warning for '%s'" old-format))))
@@ -85,7 +85,7 @@
   "Similar to `should' and also verify that FORM generates a format warning."
   (declare (debug t))
   `(time-stamp-test--count-function-calls
-       time-stamp-conv-warn (format "format: %S" ',form)
+       time-stamp--conv-warn (format "format: %S" ',form)
      (should ,form)))
 
 (defmacro time-stamp-should-message (variable &rest body)
@@ -112,20 +112,19 @@
 (iter-defun time-stamp-test-pattern-sequential ()
   "Iterate through each possibility for a part of `time-stamp-pattern'."
   (let ((pattern-value-parts
-         '(("4/" "10/" "-9/" "0/" "")                      ;0: line limit
+         '(("3/" "10/" "-9/" "0/" "")                      ;0: line limit
            ("stamp:" "")                                   ;1: start
            ("%-d" "%_H" "%^a" "%#Z" "%:A" "%019z" "%%" "") ;2: format part 1
            (" " "x" ":" "\n" "")                           ;3: format part 2
            ("%-d" "%_H" "%^a" "%#Z" "%:A" "%019z" "%%")    ;4: format part 3
-           ("end" ""))))                                   ;5: end
+           ("fin" ""))))                                   ;5: end
     (dotimes (cur (length pattern-value-parts))
       (dotimes (cur-index (length (nth cur pattern-value-parts)))
-        (cl-flet ((extract-part
-                   (lambda (desired-part)
-                     (let ((part-list (nth desired-part pattern-value-parts)))
-                       (if (= desired-part cur)
-                           (nth cur-index part-list)
-                         (nth 0 part-list))))))
+        (cl-flet ((extract-part (desired-part)
+                    (let ((part-list (nth desired-part pattern-value-parts)))
+                      (if (= desired-part cur)
+                          (nth cur-index part-list)
+                        (nth 0 part-list)))))
           ;; Don't repeat the default pattern.
           (when (or (= cur 0) (> cur-index 0))
             ;; The whole format must start with %, so not all
@@ -213,7 +212,7 @@
           (cl-destructuring-bind
               (line-limit1 start1 whole-format end1) pattern-parts
             (cl-letf
-                (((symbol-function 'time-stamp-once)
+                (((symbol-function 'time-stamp--once-internal)
                   (lambda (start search-limit ts-start ts-end
                                  ts-format _format-lines _end-lines)
                     (incf actual-calls)
@@ -245,7 +244,7 @@
               (setq time-stamp-pattern
                     (concat line-limit1 start1 whole-format end1))
               (incf expected-calls)
-              ;; Call time-stamp, which should call time-stamp-once,
+              ;; Call time-stamp, which should call time-stamp--once-internal,
               ;; triggering the tests above.
               (time-stamp)
               )))
@@ -875,10 +874,10 @@ This function is called by 99% of the `time-stamp' \"%z\" unit tests."
 (defun format-time-offset (format offset-secs)
   "Use FORMAT to format the time zone represented by OFFSET-SECS.
 FORMAT must be time format \"%z\" or some variation thereof.
-This function is a wrapper around `time-stamp-formatz-from-parsed-options'
+This function is a wrapper around `time-stamp--zformat-from-parsed-options'
 and is called by some low-level `time-stamp' \"%z\" unit tests."
   ;; This wrapper adds a simple regexp-based parser that handles only
-  ;; %z and variants.  In normal use, time-stamp-formatz-from-parsed-options
+  ;; %z and variants.  In normal use, time-stamp--zformat-from-parsed-options
   ;; is called from a parser that handles all time string formats.
   (string-match
    "\\`\\([^%]*\\)%\\([-_]?\\)\\(0?\\)\\([1-9][0-9]*\\)?\\([EO]?\\)\\(:*\\)\\([^a-zA-Z]+\\)?z\\(.*\\)"
@@ -896,12 +895,12 @@ and is called by some low-level `time-stamp' \"%z\" unit tests."
     (concat leading-string
             (if garbage
                 ""
-              (time-stamp-formatz-from-parsed-options flag-minimize
-                                                      flag-pad-with-spaces
-                                                      flag-pad-with-zeros
-                                                      colon-count
-                                                      field-width
-                                                      offset-secs))
+              (time-stamp--zformat-from-parsed-options flag-minimize
+                                                       flag-pad-with-spaces
+                                                       flag-pad-with-zeros
+                                                       colon-count
+                                                       field-width
+                                                       offset-secs))
             trailing-string)))
 
 (defun fz-make+zone (h &optional m s)
@@ -1067,11 +1066,11 @@ the other expected results for hours greater than 99 with non-zero seconds."
                  " the macro `define-formatz-tests'.")))
     (dolist (form-string form-strings ert-test-list)
       (let ((test-name-hhmm
-             (intern (concat "formatz-" form-string "-hhmm")))
+             (intern (concat "time-stamp-zformat-" form-string "-hhmm")))
             (test-name-seconds
-             (intern (concat "formatz-" form-string "-seconds")))
+             (intern (concat "time-stamp-zformat-" form-string "-seconds")))
             (test-name-threedigit
-             (intern (concat "formatz-" form-string "-threedigit"))))
+             (intern (concat "time-stamp-zformat-" form-string "-threedigit"))))
         (nconc
          ert-test-list
          (list
@@ -1113,9 +1112,10 @@ the other expected results for hours greater than 99 with non-zero seconds."
 (defun formatz-find-test-def-function (test-name)
   "Search for the `define-formatz-tests' call defining test TEST-NAME.
 Return non-nil if the definition is found."
-  (let* ((z-format (replace-regexp-in-string "\\`formatz-\\([^z]+z\\)-.*\\'"
-                                             "\\1"
-                                             (symbol-name test-name)))
+  (let* ((z-format (replace-regexp-in-string
+                    "\\`time-stamp-zformat-\\([^z]+z\\)-.*\\'"
+                    "\\1"
+                    (symbol-name test-name)))
          (regexp (concat "^(define-formatz-tests ("
                          "\\(?:[^)]\\|;.*\n\\)*"
                          "\"" (regexp-quote z-format) "\"")))
@@ -1153,7 +1153,7 @@ Return non-nil if the definition is found."
 ;; it here, to verify the implementation we will eventually use.
 ;; The legacy exception for %z in time-stamp will need to remain
 ;; through at least 2024 and Emacs 28.
-(ert-deftest formatz-%z-spotcheck ()
+(ert-deftest time-stamp-zformat-%z-spotcheck ()
   "Spot-check internal implementation of `time-stamp' format %z."
   (should (equal (format-time-offset "%z" (fz-make+zone 0)) "+0000"))
   (should (equal (format-time-offset "%z" (fz-make+zone 0 30)) "+0030"))
@@ -1277,7 +1277,7 @@ Return non-nil if the definition is found."
 
 ;;; Test illegal %z formats.
 
-(ert-deftest formatz-illegal-options ()
+(ert-deftest time-stamp-zformat-illegal-options ()
   "Test that illegal/nonsensical/ambiguous %z formats don't produce output."
   ;; multiple options
   (should (equal "" (formatz "%_-z" 0)))

From 0b30f7aa9d999cde5b106df8545a848a5139992b Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 7 Apr 2026 14:34:59 -0400
Subject: [PATCH 034/463] lisp/progmodes/project.el (generator): Don't require
 at run-time

---
 lisp/progmodes/project.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 516a53b61bf..e7078d8e972 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -183,7 +183,7 @@
 (require 'cl-generic)
 (require 'cl-lib)
 (require 'seq)
-(require 'generator)
+(eval-when-compile (require 'generator))
 (eval-when-compile (require 'subr-x))
 
 (defgroup project nil

From 36354c8ab4556c64082a87c3ad8e1705abbb04cf Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 7 Apr 2026 15:37:35 -0400
Subject: [PATCH 035/463] Don't load `package` just for
 `lm-package-needs-footer-line`

* lisp/emacs-lisp/lisp-mnt.el (lm-package-requires):
Don't require `package`.
---
 lisp/emacs-lisp/lisp-mnt.el | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index 471b29258e6..96936a4411d 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -462,11 +462,10 @@ is wrapped around any parts requiring it."
 The return value is a list of elements of the form (PACKAGE VERSION)
 where PACKAGE is the package name (a symbol) and VERSION is the
 package version (a string)."
-  (require 'package)
   (lm-with-file file
-    (and-let* ((require-lines (lm-header-multiline "package-requires")))
+    (when-let* ((require-lines (lm-header-multiline "package-requires")))
       (lm--prepare-package-dependencies
-       (package-read-from-string (mapconcat #'identity require-lines " "))))))
+       (car (read-from-string (mapconcat #'identity require-lines " ")))))))
 
 (defun lm-package-version (&optional file)
   "Return \"Package-Version\" or \"Version\" header.

From 9b8361d9abddb32a343ba325421bad13be2837b8 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 8 Apr 2026 11:02:47 +0300
Subject: [PATCH 036/463] Improve documentation of 'url-retrieve' and GnuTLS
 peer status

* doc/misc/url.texi (Retrieving URLs): Describe the ':peer' entry
of the STATUS argument passed to CALLBACK of 'url-retrieve'.

* lisp/url/url.el (url-retrieve):
* src/gnutls.c (Fgnutls_peer_status): Doc fixes.
(Bug#80762)
---
 doc/misc/url.texi | 23 +++++++++++++++++++++++
 lisp/url/url.el   |  5 +++++
 src/gnutls.c      | 39 ++++++++++++++++++++++++++++++++-------
 3 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 0613294024e..a07aa805fa9 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -332,6 +332,29 @@ This means that the request was redirected to the URL
 @item (:error (@var{error-symbol} . @var{data}))
 This means that an error occurred.  If so desired, the error can be
 signaled with @code{(signal @var{error-symbol} @var{data})}.
+
+@cindex status of GnuTLS connection, as provided by @code{url-retrieve}
+@findex gnutls-peer-status-warning-describe
+@findex gnutls-peer-status
+@item  (:peer @var{gnutls-information})
+This means that GnuTLS was used for a TLS connection to the peer.  The
+@var{gnutls-information} has the following form:
+
+@lisp
+ ((:warnings @var{warning}@dots{})
+  (:certificates @var{certificate}@dots{} @var{peer-data}))
+@end lisp
+
+@noindent
+where the @var{warning}s are warnings, if any, emitted by GnuTLS for the
+connection, and @var{certificate}s is the list of certificates used for
+the TLS connection followed by the properties of the connection in
+@var{peer-data}.  Both @var{warning}s and @var{peer-data} are in the
+form of a key-value pairs (i.e., they are plists).  The value of each
+key in the @code{:warnings} list is a symbol whose description can be
+obtained by using @code{gnutls-peer-status-warning-describe}, and the
+various keys of the @var{peer-data} list and their values are documented
+in the doc string of @code{gnutls-peer-status}.
 @end table
 
 When the callback function is called, the current buffer is the one
diff --git a/lisp/url/url.el b/lisp/url/url.el
index c8ee686a410..002ce7bef7d 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -142,6 +142,11 @@ occurred.  Each pair is one of:
 symbol that says something about where the error occurred, and
 DATA is a list (possibly nil) that describes the error further.
 
+\(:peer GNUTLS-INFO) - GnuTLS information for the retrieval request.
+This will be present only if GnuTLS was used to make an HTTPS request,
+in which case GNUTLS-INFO is the list returned by `gnutls-peer-status'
+describing the state of TLS connection with the peer.
+
 Return the buffer URL will load into, or nil if the process has
 already completed (i.e. URL was a mailto URL or similar; in this case
 the callback is not called).
diff --git a/src/gnutls.c b/src/gnutls.c
index 44d2f7f4db2..4a4567a5174 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1383,18 +1383,43 @@ DEFUN ("gnutls-peer-status-warning-describe", Fgnutls_peer_status_warning_descri
 }
 
 DEFUN ("gnutls-peer-status", Fgnutls_peer_status, Sgnutls_peer_status, 1, 1, 0,
-       doc: /* Describe a GnuTLS PROC peer certificate and any warnings about it.
+       doc: /* Describe GnuTLS peer certificate of PROC and any warnings about it.
 
 The return value is a property list with top-level keys :warnings and
 :certificates.
 
-The :warnings entry is a list of symbols you can get a description of
-with `gnutls-peer-status-warning-describe', and :certificates is the
-certificate chain for the connection, with the host certificate
-first, and intermediary certificates (if any) following it.
+The :warnings entry is a list of symbols whose descriptions can be
+obtained with `gnutls-peer-status-warning-describe'.
 
-In addition, for backwards compatibility, the host certificate is also
-returned as the :certificate entry.  */)
+The :certificates entry is the certificate chain for the connection,
+with the host certificate first and intermediary certificates (if any)
+following it.  In addition, for backwards compatibility, the host
+certificate is also returned as the :certificate entry.
+
+The list in :certificates entry can also include one or more of the
+properties of the TLS connection, when applicable, using the following
+keys:
+
+  :cipher              a string naming the cipher algorithm, or "NULL"
+
+  :compression         a string naming the compression algorithm, or "NULL"
+
+  :diffie-hellman-prime-bits
+		       the number if bits used in Diffie-Hellman key exchange,
+			 an integer
+
+  :encrypt-then-mac    t if encrypt-then-mac negotiation was successful,
+                         nil otherwise
+
+  :key-exchange        key exchange algorithm, a string
+
+  :mac                 a string naming the MAC algorithm, or "NULL"
+
+  :protocol            TLS protocol version as a string
+
+  :safe-renegotiation  t if safe renegotiation is used, otherwise nil
+
+*/)
   (Lisp_Object proc)
 {
   Lisp_Object warnings = Qnil, result = Qnil;

From 2bca4ac0ed7f9911c5d1443615ec3e1ac3364a8d Mon Sep 17 00:00:00 2001
From: ewantown <ewan@etown.dev>
Date: Sun, 12 Oct 2025 07:23:53 -0700
Subject: [PATCH 037/463] Support 24-bit TrueColor on MS-Windows console

* src/w32console.c (DEFAULTP, SSPRINTF, w32con_write_vt_seq)
(w32con_get_cursor_coords): New functions and macros.
(w32con_write_glyphs): Hide cursor before writing to the console.
Add code for writing in virtual-terminal mode when
'w32_use_virtual_terminal' is non-zero.
(w32con_write_glyphs_with_face): Add code for writing in
virtual-terminal mode when 'w32_use_virtual_terminal' is non-zero.
(w32con_setup_virtual_terminal): New function.
(w32con_set_terminal_modes): Call it.
(turn_on_face, turn_off_face): New functions.
(initialize_w32_display): Save background and foreground, and the
current TTY.
(Fset_screen_color): Accept an additional optional argument VTP;
if non-nil, arrange for 24-bit display to use the specified
colors.
(Fget_screen_color): Accept an additional optional argument VTP;
if non-nil, return colors used by 24-bit display.
(Fw32_use_virtual_terminal, Fw32_use_virtual_terminal_p): New
functions.
* src/term.c (tty_setup_colors) [WINDOWSNT]: Set up
virtual-terminal sequences for colors.
(init_tty) [WINDOWSNT]: Set up terminfo capabilities for Windows
virtual-terminal.
* src/xdisp.c (redisplay_internal): Don't call set_tty_color_mode
for WINDOWSNT.

* lisp/term/w32console.el (w32-tty-set-base-colors)
(w32-tty-define-base-colors, w32-tty-define-8bit-colors)
(w32-tty-define-24bit-colors, w32-tty-get-pixel): New functions.
(terminal-init-w32console): Remove color setup.
(w32-tty-setup-colors): New function.
* lisp/term/tty-colors.el (tty-color-mode-alist): Add --color
modes for 256 and 24-bit color modes.
* lisp/startup.el (tty-handle-args): Fix --color handling.
* lisp/faces.el (tty-set-up-initial-frame-faces): Set up colors
for MS-Windows consoles.

* etc/NEWS:
* doc/emacs/msdos.texi (Windows Misc):
* doc/emacs/cmdargs.texi (Colors X): Document 24-bit color support
on MS-Windows.
(Bug#79298)
---
 doc/emacs/cmdargs.texi  |  17 +-
 doc/emacs/msdos.texi    |  27 ++++
 etc/NEWS                |  12 ++
 lisp/faces.el           |  12 +-
 lisp/startup.el         |   2 +-
 lisp/term/tty-colors.el |   4 +-
 lisp/term/w32console.el | 148 +++++++++++++----
 src/term.c              |  51 +++++-
 src/termchar.h          |   2 +
 src/w32console.c        | 348 +++++++++++++++++++++++++++++++++-------
 src/xdisp.c             |   2 +-
 11 files changed, 515 insertions(+), 110 deletions(-)

diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 3bcf4949581..5a3c1c14ab1 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -1024,19 +1024,26 @@ colored display.
 @itemx ansi8
 Turn on the color support unconditionally, and use color commands
 specified by the ANSI escape sequences for the 8 standard colors.
+@item 8bit
+Turn on support for 8-bit (256 color) display if available.
+Currently this option is effective on MS-Windows (10+) only.
+On other systems, maximal color support is enabled automatically.
+@item 24bit
+Turn on support for 24-bit (true color) display if available.
+Currently this option is effective on MS-Windows (10+) only.
+On other systems, 24-bit color is enabled automatically if supported.
 @item @var{num}
 Use color mode for @var{num} colors.  If @var{num} is @minus{}1, turn off
 color support (equivalent to @samp{never}); if it is 0, use the
 default color support for this terminal (equivalent to @samp{auto});
 otherwise use an appropriate standard mode for @var{num} colors.
 Depending on your terminal's capabilities, Emacs might be able to turn
-on a color mode for 8, 16, 88, or 256 as the value of @var{num}.  If
-there is no mode that supports @var{num} colors, Emacs acts as if
-@var{num} were 0, i.e., it uses the terminal's default color support
-mode.
+on a color mode for 8, 16, 88, 256, or 16777216 as the value of @var{num}.
+If there is no mode that supports @var{num} colors, Emacs acts as if
+@var{num} were 0, i.e., it uses the terminal's default color support mode.
 @end table
 
-This option has no effect on MS-Windows and MS-DOS.
+This option has no effect on MS-DOS, nor MS-Windows prior to Windows 10.
 
 @cindex colors on character terminal, changing during session
 @cindex character terminal, change color mode
diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi
index 26b6ccbce09..203df57c7c1 100644
--- a/doc/emacs/msdos.texi
+++ b/doc/emacs/msdos.texi
@@ -1200,6 +1200,33 @@ you should set its value in your init file (@pxref{Init File}), either
 directly or via @kbd{M-x customize-variable}, which lets you save the
 customized value, see @ref{Saving Customizations}.
 
+@findex w32-use-virtual-terminal
+@cindex Windows Terminal, Windows Console, MS-Windows
+  The implementation of display functionality for Windows Console
+differs from the implementation for other terminal emulators,
+because historically, Windows required use of an idiosyncractic API.
+That API limited Windows Console display of Emacs to 16 basic colors.
+With the introduction of Windows Terminal, Microsoft implemented
+support for ANSI control sequences, modelled on the VT100 and Xterm,
+as well as 24-bit RBG color display.
+
+  The functions @code{w32-use-virtual-terminal} and
+@code{w32-use-virtual-terminal-p} can be used to set and inspect
+(respectively) an internal variable which determines whether this newer
+mechanism is used for display, or the older one.  The internal variable is
+automatically set based on your terminal's capabilities on startup.
+By default, 24-bit RGB color will be used, but other (8, 16, 256) color
+spaces may be used, by passing the @code{--color} command line argument,
+or setting the value of the @code{tty-color-mode} frame parameter.
+
+   @code{'(w32-use-virtual-terminal-p)} evaluates to @code{t} if and only if
+the internal variable has a non-zero numerical value, and otherwise to
+@code{nil}.  If it evaluates to @code{t}, ANSI escape sequences are used
+for color, otherwise, the older mechanism is used.  The internal variable
+can be set by evaluating @code{(w32-use-virtual-terminal x)}, where @code{x} is
+@code{t} or @code{nil}: if @code{x} is @code{t} and the feature is supported by
+your terminal, it will be enabled.  Otherwise, the feature will be disabled.
+
 @ifnottex
 @include msdos-xtra.texi
 @end ifnottex
diff --git a/etc/NEWS b/etc/NEWS
index b3a497c351a..90dbca7501b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -4630,6 +4630,18 @@ Accordingly, we have revised our recommendations for a suitable DJGPP
 toolchain to GCC 14.2.0 and Binutils 2.35.1 in lieu of GCC 3.4.x and
 Binutils 2.26.
 
++++
+** Windows Terminal can now display 256 and 24-bit RGB color.
+Previously, terminal sessions on Windows supported display of 16 colors.
+There is now support for 8-bit (256 color) and 24-bit RGB (true color).
+The new mechanism will be enabled automatically when supported.
+It defaults to 24-bit RGB color, but can be set to 8, 16, '8bit, or '24bit
+by passing the '--color' flag or setting the 'tty-color-mode' frame parameter.
+Use of the new mechanism is controlled by an internal variable that can be
+set and inspected via the functions 'w32-use-virtual-terminal' and
+'w32-use-virtual-terminal-p' (respectively).  See the manual entry specific
+to MS-Windows for more details.
+
 
 ----------------------------------------------------------------------
 This file is part of GNU Emacs.
diff --git a/lisp/faces.el b/lisp/faces.el
index fbc81af1b51..6fe94927290 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2405,11 +2405,15 @@ If you set `term-file-prefix' to nil, this function does nothing."
 
 ;; Called from C function init_display to initialize faces of the
 ;; dumped terminal frame on startup.
-
+(declare-function w32-tty-setup-colors "term/w32console" ())
 (defun tty-set-up-initial-frame-faces ()
-  (let ((frame (selected-frame)))
-    (frame-set-background-mode frame t)
-    (face-set-after-frame-default frame)))
+  (progn
+    (when (and (eq system-type 'windows-nt)
+               (featurep 'term/w32console))
+      (w32-tty-setup-colors))
+    (let ((frame (selected-frame)))
+      (frame-set-background-mode frame t)
+      (face-set-after-frame-default frame))))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/lisp/startup.el b/lisp/startup.el
index adaea013604..decd25a6232 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -958,7 +958,7 @@ to prepare for opening the first frame (e.g. open a connection to an X server)."
 	       (push (cons 'tty-color-mode
                            (cond
                             ((numberp argval) argval)
-                            ((string-match "-?[0-9]+" argval)
+                            ((string-match "-?[0-9]+$" argval)
                              (string-to-number argval))
                             (t (intern argval))))
                      default-frame-alist))
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
index 183464befa5..a0450bc46bb 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -764,7 +764,9 @@
     (auto . 0)
     (ansi8 . 8)
     (always . 8)
-    (yes . 8))
+    (yes . 8)
+    (8bit . 256)
+    (24bit . 16777216))
   "An alist of supported standard tty color modes and their aliases.")
 
 (defun tty-color-alist (&optional _frame)
diff --git a/lisp/term/w32console.el b/lisp/term/w32console.el
index 79b84a9f752..2985cf7e39b 100644
--- a/lisp/term/w32console.el
+++ b/lisp/term/w32console.el
@@ -46,9 +46,77 @@
 "A list of VGA console colors, their indices and 16-bit RGB values.")
 
 (declare-function x-setup-function-keys "term/common-win" (frame))
-(declare-function get-screen-color "w32console.c" ())
+(declare-function get-screen-color "w32console.c" (&optional vtp))
+(declare-function set-screen-color "w32console.c" (&optional vtp))
 (declare-function w32-get-console-codepage "w32proc.c" ())
 (declare-function w32-get-console-output-codepage "w32proc.c" ())
+(declare-function w32-use-virtual-terminal "w32console.c" (enable))
+(declare-function w32-use-virtual-terminal-p "w32console.c" ())
+
+(defun w32-tty-set-base-colors (vtp)
+  "Re-order `w32-tty-standard-colors' based on the value of VTP."
+  (let ((seq
+         (if vtp
+             '("black"     "red"          "green"      "brown"
+               "blue"      "magenta"      "cyan"       "lightgray"
+               "darkgray"  "lightred"     "lightgreen" "yellow"
+               "lightblue" "lightmagenta" "lightcyan"  "white")
+           '("black"     "blue"         "green"      "cyan"
+             "red"       "magenta"      "brown"      "lightgray"
+             "darkgray"  "lightblue"    "lightgreen" "lightcyan"
+             "lightred"  "lightmagenta" "yellow"     "white"))))
+    (setq w32-tty-standard-colors
+          (mapcar
+           (lambda (n) (let ((c (assoc n w32-tty-standard-colors)))
+                    (cons n (cons (seq-position seq n) (cddr c)))))
+           seq))))
+
+(defun w32-tty-define-base-colors ()
+  "Defines base 16-color space for w32 tty display."
+  (let* ((colors w32-tty-standard-colors)
+         (nbase (length colors))
+         (color (car colors)))
+    (progn (while colors
+             (tty-color-define (car color) (cadr color) (cddr color))
+             (setq colors (cdr colors)
+                   color  (car colors)))
+           nbase)))
+
+(defun w32-tty-define-8bit-colors ()
+  "Defines 8-bit color space for w32 tty display."
+  (let ((r 0) (b 0) (g 0)
+        (n (- 256 (w32-tty-define-base-colors)))
+        (convert-to-16bit (lambda (prim) (logior prim (ash prim 8)))))
+    (while (> n 24) ; non-grey
+      (let ((i (- 256 n))
+            (c (mapcar convert-to-16bit
+                       (mapcar (lambda (x) (if (zerop x) 0 (+ (* x 40) 55)))
+                               (list r g b)))))
+        (tty-color-define (format "color-%d" i) i c))
+      (setq b (1+ b))
+      (when (> b 5) (setq g (1+ g) b 0))
+      (when (> g 5) (setq r (1+ r) g 0))
+      (setq n (1- n)))
+    (while (> n 0) ; all-grey
+      (let* ((i (- 256 n))
+             (v (funcall convert-to-16bit (+ 8 (* (- 24 n) 10))))
+             (c (list v v v)))
+        (tty-color-define (format "color-%d" i) i c))
+      (setq n (1- n)))))
+
+(defun w32-tty-define-24bit-colors ()
+  "Defines 24-bit color space for w32 tty display."
+  (let ((i (w32-tty-define-base-colors)))
+    (mapc (lambda (c) (unless (assoc (car c) w32-tty-standard-colors)
+                   (tty-color-define (car c) i (cdr c))
+                   (setq i (1+ i))))
+          color-name-rgb-alist)))
+
+;; tty-color-define swaps indices for pixel values on 24bit display
+(defun w32-tty-get-pixel (index)
+  "Convert a legacy color INDEX (0..15) into a pixel value."
+  (let ((color (nth index w32-tty-standard-colors)))
+    (or (tty-color-24bit (cddr color)) index)))
 
 (defun terminal-init-w32console ()
   "Terminal initialization function for w32 console."
@@ -56,43 +124,53 @@
   (x-setup-function-keys (selected-frame))
   ;; Set terminal and keyboard encodings to the current OEM codepage.
   (let ((oem-code-page-coding
-	 (intern (format "cp%d" (w32-get-console-codepage))))
-	(oem-code-page-output-coding
-	 (intern (format "cp%d" (w32-get-console-output-codepage))))
-	oem-cs-p oem-o-cs-p)
-	(setq oem-cs-p (coding-system-p oem-code-page-coding))
-	(setq oem-o-cs-p (coding-system-p oem-code-page-output-coding))
-	(when oem-cs-p
-	  (set-keyboard-coding-system oem-code-page-coding)
-	  (set-terminal-coding-system
-	   (if oem-o-cs-p oem-code-page-output-coding oem-code-page-coding))
-          ;; Since we changed the terminal encoding, we need to repeat
-          ;; the test for Unicode quotes being displayable.
-          (startup--setup-quote-display)))
-  (let* ((colors w32-tty-standard-colors)
-         (color (car colors)))
-    (tty-color-clear)
-    (while colors
-      (tty-color-define (car color) (cadr color) (cddr color))
-      (setq colors (cdr colors)
-            color (car colors))))
-  (clear-face-cache)
-  ;; Figure out what are the colors of the console window, and set up
-  ;; the background-mode correspondingly.
-  (let* ((screen-color (get-screen-color))
-	 (bg (cadr screen-color))
-	 (descr (tty-color-by-index bg))
-	 r g b bg-mode)
-    (setq r (nth 2 descr)
-	  g (nth 3 descr)
-	  b (nth 4 descr))
-    (if (< (+ r g b) (* .6 (+ 65535 65535 65535)))
-	(setq bg-mode 'dark)
-      (setq bg-mode 'light))
-    (set-terminal-parameter nil 'background-mode bg-mode))
+         (intern (format "cp%d" (w32-get-console-codepage))))
+        (oem-code-page-output-coding
+         (intern (format "cp%d" (w32-get-console-output-codepage))))
+        oem-cs-p oem-o-cs-p)
+    (setq oem-cs-p (coding-system-p oem-code-page-coding))
+    (setq oem-o-cs-p (coding-system-p oem-code-page-output-coding))
+    (when oem-cs-p
+      (set-keyboard-coding-system oem-code-page-coding)
+      (set-terminal-coding-system
+       (if oem-o-cs-p oem-code-page-output-coding oem-code-page-coding))
+      ;; Since we changed the terminal encoding, we need to repeat
+      ;; the test for Unicode quotes being displayable.
+      (startup--setup-quote-display)))
   (tty-set-up-initial-frame-faces)
   (run-hooks 'terminal-init-w32-hook))
 
+;; Called from tty-set-up-initial-frame-faces in faces.el
+(defun w32-tty-setup-colors ()
+  "Set up color definitions and frame parameters for w32 tty display."
+  (tty-color-clear)
+  (let ((ncolors (display-color-cells))
+        (vtp (w32-use-virtual-terminal-p)))
+    (w32-tty-set-base-colors vtp)
+    (if vtp
+        (cond ((= ncolors 16777216) (w32-tty-define-24bit-colors))
+              ((= ncolors 256)      (w32-tty-define-8bit-colors))
+              (t                    (w32-tty-define-base-colors)))
+      (w32-tty-define-base-colors))
+    (clear-face-cache)
+    (let* ((screen-color (get-screen-color vtp))
+           (fg (car  screen-color))
+           (bg (cadr screen-color))
+           (bootstrap (and vtp (= ncolors 16777216)
+                           (< fg 16) (< bg 16) (not (= 0 fg bg))))
+           (fallback  (and vtp (< ncolors 16777216)
+                           (or (< ncolors fg) (< ncolors bg))))
+           (screen-color (if fallback (get-screen-color t) screen-color))
+           (fg (if bootstrap (w32-tty-get-pixel fg) (car  screen-color)))
+           (bg (if bootstrap (w32-tty-get-pixel bg) (cadr screen-color)))
+           (bg-col (tty-color-by-index bg))
+           (bg-dark (< (+ (nth 2 bg-col) (nth 3 bg-col) (nth 4 bg-col))
+                       (* .6 (+ 65535 65535 65535))))
+           (bg-mode (if bg-dark 'dark 'light)))
+      (set-terminal-parameter nil 'background-mode bg-mode)
+      (when (or bootstrap fallback)
+        (set-screen-color fg bg t)))))
+
 (provide 'term/w32console)
 
 ;;; w32console.el ends here
diff --git a/src/term.c b/src/term.c
index b5cf418450f..766eeebe5e8 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2207,7 +2207,7 @@ TERMINAL does not refer to a text terminal.  */)
   return make_fixnum (t ? t->display_info.tty->TN_max_colors : 0);
 }
 
-#if !defined DOS_NT && !defined HAVE_ANDROID
+#if !defined MSDOS && !defined HAVE_ANDROID
 
 /* Declare here rather than in the function, as in the rest of Emacs,
    to work around an HPUX compiler bug (?). See
@@ -2246,7 +2246,7 @@ tty_default_color_capabilities (struct tty_display_info *tty, bool save)
    MODE's value is generally the number of colors which we want to
    support; zero means set up for the default capabilities, the ones
    we saw at init_tty time; -1 means turn off color support.  */
-static void
+void
 tty_setup_colors (struct tty_display_info *tty, int mode)
 {
   /* Canonicalize all negative values of MODE.  */
@@ -2269,6 +2269,10 @@ tty_setup_colors (struct tty_display_info *tty, int mode)
 #ifdef TERMINFO
 	tty->TS_set_foreground = "\033[3%p1%dm";
 	tty->TS_set_background = "\033[4%p1%dm";
+#elif WINDOWSNT
+	tty->TS_orig_pair = "\x1b[39m\x1b[49m";
+	tty->TS_set_foreground = "\x1b[%lum";
+	tty->TS_set_background = "\x1b[%lum";
 #else
 	tty->TS_set_foreground = "\033[3%dm";
 	tty->TS_set_background = "\033[4%dm";
@@ -2276,6 +2280,26 @@ tty_setup_colors (struct tty_display_info *tty, int mode)
 	tty->TN_max_colors = 8;
 	tty->TN_no_color_video = 0;
 	break;
+#ifdef WINDOWSNT
+      case 16:
+	tty->TN_max_colors = 16;
+	tty->TS_set_foreground = "\x1b[%lum";
+	tty->TS_set_background = "\x1b[%lum";
+	tty->TN_no_color_video = 0;
+	break;
+      case 256:
+	tty->TN_max_colors = 256;
+	tty->TS_set_foreground = "\x1b[38;5;%lum";
+	tty->TS_set_background = "\x1b[48;5;%lum";
+	tty->TN_no_color_video = 0;
+	break;
+      case 16777216:
+	tty->TN_max_colors = 16777216;
+	tty->TS_set_foreground = "\x1b[38;2;%lu;%lu;%lum";
+	tty->TS_set_background = "\x1b[48;2;%lu;%lu;%lum";
+	tty->TN_no_color_video = 0;
+	break;
+#endif
     }
 }
 
@@ -2312,7 +2336,7 @@ set_tty_color_mode (struct tty_display_info *tty, struct frame *f)
     }
 }
 
-#endif /* !DOS_NT && !HAVE_ANDROID */
+#endif /* !MSDOS && !HAVE_ANDROID */
 
 char *
 tty_type_name (Lisp_Object terminal)
@@ -4644,6 +4668,22 @@ use the Bourne shell command 'TERM=...; export TERM' (C-shell:\n\
 
     initialize_w32_display (terminal, &width, &height);
 
+    tty->TN_no_color_video = 0;
+    tty->TN_max_colors = 16777216;
+    tty->TS_orig_pair = "\x1b[39m\x1b[49m";
+    tty->TS_set_foreground = "\x1b[38;2;%lu;%lu;%lum";
+    tty->TS_set_background = "\x1b[48;2;%lu;%lu;%lum";
+
+    /* Save default color capabilities */
+    tty_default_color_capabilities (tty, 1);
+
+    tty->TS_enter_bold_mode = "\x1b[1m";
+    tty->TS_enter_italic_mode = "\x1b[3m";
+    tty->TS_enter_strike_through_mode = "\x1b[9m";
+    tty->TS_enter_underline_mode = "\x1b[4m";
+    tty->TS_enter_reverse_mode = "\x1b[7m";
+    tty->TS_exit_attribute_mode = "\x1b[0m";
+
     FrameRows (tty) = height;
     FrameCols (tty) = width;
     tty->specified_window = height;
@@ -4689,7 +4729,6 @@ use the Bourne shell command 'TERM=...; export TERM' (C-shell:\n\
      don't think we're losing anything by turning it off.  */
   tty->line_ins_del_ok = 0;
 
-  tty->TN_max_colors = 16;  /* Must be non-zero for tty-display-color-p.  */
 #endif	/* DOS_NT */
 
 #ifdef HAVE_GPM
@@ -5205,11 +5244,11 @@ non-nil to enable this optimization.  */);
   defsubr (&Stty_display_pixel_width);
   defsubr (&Stty_display_pixel_height);
 
-#if !defined DOS_NT && !defined HAVE_ANDROID
+#if !defined MSDOS && !defined HAVE_ANDROID
   default_orig_pair = NULL;
   default_set_foreground = NULL;
   default_set_background = NULL;
-#endif /* !DOS_NT && !HAVE_ANDROID */
+#endif /* !MSDOS && !HAVE_ANDROID */
 
 #ifndef HAVE_ANDROID
   encode_terminal_src = NULL;
diff --git a/src/termchar.h b/src/termchar.h
index 9d7c3a2a555..9a9001d5cef 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -249,4 +249,6 @@ struct input_event;
 extern Lisp_Object tty_handle_tab_bar_click (struct frame *, int, int, bool,
 					     struct input_event *);
 
+extern void tty_setup_colors (struct tty_display_info *tty, int mode);
+
 #endif /* EMACS_TERMCHAR_H */
diff --git a/src/w32console.c b/src/w32console.c
index be5e0b92072..b0a2f0c1c0e 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -19,6 +19,9 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 /*
    Tim Fleehart (apollo@online.com)		1-17-92
    Geoff Voelker (voelker@cs.washington.edu)	9-12-93
+   Ewan Townshend (ewan@etown.dev)              2025-08
+   * c. ~ 2025: 24bit RGB support in Windows (10+) Terminal
+   * https://learn.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
 */
 
 
@@ -53,11 +56,17 @@ static void w32con_set_terminal_modes (struct terminal *t);
 static void w32con_update_begin (struct frame * f);
 static void w32con_update_end (struct frame * f);
 static WORD w32_face_attributes (struct frame *f, int face_id);
+static int  w32con_write_vt_seq (const char *);
+static void turn_on_face (struct frame *, int face_id);
+static void turn_off_face (struct frame *, int face_id);
+static COORD w32con_get_cursor_coords ();
 
 static COORD	cursor_coords;
 static HANDLE	prev_screen, cur_screen;
 static WORD	char_attr_normal;
 static DWORD	prev_console_mode;
+static int      bg_normal;
+static int      fg_normal;
 
 static CONSOLE_CURSOR_INFO console_cursor_info;
 #ifndef USE_SEPARATE_SCREEN
@@ -67,7 +76,10 @@ static CONSOLE_CURSOR_INFO prev_console_cursor;
 extern HANDLE  keyboard_handle;
 HANDLE  keyboard_handle;
 int w32_console_unicode_input;
-
+extern int w32_use_virtual_terminal;
+int w32_use_virtual_terminal = 1;
+extern struct tty_display_info *current_tty;
+struct tty_display_info *current_tty = NULL;
 
 /* Setting this as the ctrl handler prevents emacs from being killed when
    someone hits ^C in a 'suspended' session (child shell).
@@ -83,6 +95,38 @@ ctrl_c_handler (unsigned long type)
 	  && (type == CTRL_C_EVENT || type == CTRL_BREAK_EVENT));
 }
 
+#define DEFAULTP(p)							\
+  (p == FACE_TTY_DEFAULT_COLOR						\
+   || p == FACE_TTY_DEFAULT_FG_COLOR					\
+   || p == FACE_TTY_DEFAULT_BG_COLOR)
+
+#define SEQMAX 256 /* Arbitrary upper limit on VT sequence size */
+
+#define SSPRINTF(buf, i, sz, fmt, ...)					\
+  do {									\
+    eassert (*i < sz && sz <= SEQMAX);					\
+    if (fmt && *i < sz && sz <= SEQMAX)				\
+      *i += snprintf (buf + *i, sz - *i, fmt, __VA_ARGS__);		\
+  } while (0)
+
+/* Writes virtual terminal sequence to screen */
+static int
+w32con_write_vt_seq (const char *seq)
+{
+  char buf[SEQMAX];
+  DWORD n = 0, k = 0;
+  SSPRINTF (buf, &n, SEQMAX, seq, NULL);
+  if (n) WriteConsole (cur_screen, (LPCSTR) buf, n, &k, NULL);
+  return k;
+}
+
+static COORD
+w32con_get_cursor_coords ()
+{
+  CONSOLE_SCREEN_BUFFER_INFO info;
+  GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &info);
+  return info.dwCursorPosition;
+}
 
 /* Move the cursor to (ROW, COL) on FRAME.  */
 static void
@@ -309,10 +353,11 @@ w32con_write_glyphs (struct frame *f, register struct glyph *string,
                      register int len)
 {
   DWORD r;
-  WORD char_attr;
   LPCSTR conversion_buffer;
   struct coding_system *coding;
 
+  w32con_hide_cursor();
+
   if (len <= 0)
     return;
 
@@ -342,8 +387,6 @@ w32con_write_glyphs (struct frame *f, register struct glyph *string,
 
       /* w32con_clear_end_of_line sets frame of glyphs to NULL.  */
       struct frame *attr_frame = face_id_frame ? face_id_frame : f;
-      /* Turn appearance modes of the face of the run on.  */
-      char_attr = w32_face_attributes (attr_frame, face_id);
 
       if (n == len)
 	/* This is the last run.  */
@@ -351,31 +394,45 @@ w32con_write_glyphs (struct frame *f, register struct glyph *string,
       conversion_buffer = (LPCSTR) encode_terminal_code (string, n, coding);
       if (coding->produced > 0)
 	{
-	  /* Compute the string's width on display by accounting for
-	     character's width.  FIXME: this doesn't handle character
-	     compositions.  */
-	  ptrdiff_t ncols = strwidth (coding->source, coding->src_bytes);
-	  /* Set the attribute for these characters.  */
-	  if (!FillConsoleOutputAttribute (cur_screen, char_attr, ncols,
-					   cursor_coords, &r))
+	  if (w32_use_virtual_terminal)
 	    {
-	      printf ("Failed writing console attributes: %lu\n",
-		      GetLastError ());
-	      fflush (stdout);
+	      turn_on_face (f, face_id);
+	      WriteConsole (cur_screen, conversion_buffer,
+			    coding->produced, &r, NULL);
+	      turn_off_face (f, face_id);
+	      cursor_coords = w32con_get_cursor_coords ();
 	    }
-
-	  /* Write the characters.  */
-	  if (!WriteConsoleOutputCharacter (cur_screen, conversion_buffer,
-					    coding->produced, cursor_coords,
-					    &r))
+	  else
 	    {
-	      printf ("Failed writing console characters: %lu\n",
-		      GetLastError ());
-	      fflush (stdout);
-	    }
+	      /* Account for character width.
+		 FIXME: this doesn't handle character compositions.  */
+	      ptrdiff_t ncols = strwidth (coding->source, coding->src_bytes);
 
-	  cursor_coords.X += ncols;
-	  w32con_move_cursor (f, cursor_coords.Y, cursor_coords.X);
+	      /* Turn appearance modes of the face of the run on.  */
+	      WORD char_attr = w32_face_attributes (attr_frame, face_id);
+
+	      /* Set the attribute for these characters.  */
+	      if (!FillConsoleOutputAttribute (cur_screen, char_attr, ncols,
+					       cursor_coords, &r))
+		{
+		  printf ("Failed writing console attributes: %lu\n",
+			  GetLastError ());
+		  fflush (stdout);
+		}
+
+	      /* Write the characters.  */
+	      if (!WriteConsoleOutputCharacter (cur_screen, conversion_buffer,
+						coding->produced, cursor_coords,
+						&r))
+		{
+		  printf ("Failed writing console characters: %lu\n",
+			  GetLastError ());
+		  fflush (stdout);
+		}
+
+	      cursor_coords.X += ncols;
+	      w32con_move_cursor (f, cursor_coords.Y, cursor_coords.X);
+	    }
 	}
       len -= n;
       string += n;
@@ -391,6 +448,8 @@ w32con_write_glyphs_with_face (struct frame *f, register int x, register int y,
   LPCSTR conversion_buffer;
   struct coding_system *coding;
 
+  w32con_hide_cursor();
+
   if (len <= 0)
     return;
 
@@ -407,28 +466,42 @@ w32con_write_glyphs_with_face (struct frame *f, register int x, register int y,
   if (coding->produced > 0)
     {
       DWORD filled, written;
-      /* Compute the character attributes corresponding to the face.  */
-      DWORD char_attr = w32_face_attributes (f, face_id);
-      COORD start_coords;
-      /* Compute the string's width on display by accounting for
-	 character's width.  FIXME: this doesn't handle character
-	 compositions.  */
-      ptrdiff_t ncols = strwidth (coding->source, coding->src_bytes);
-
-      start_coords.X = x;
-      start_coords.Y = y;
-      /* Set the attribute for these characters.  */
-      if (!FillConsoleOutputAttribute (cur_screen, char_attr, ncols,
-				       start_coords, &filled))
-	DebPrint (("Failed writing console attributes: %d\n", GetLastError ()));
+      if (w32_use_virtual_terminal)
+	{
+	  COORD saved_coords = cursor_coords;
+	  w32con_move_cursor(f, y, x);
+	  turn_on_face (f, face_id);
+	  WriteConsole (cur_screen, conversion_buffer,
+			coding->produced, &written, NULL);
+	  turn_off_face (f, face_id);
+	  w32con_move_cursor(f, saved_coords.Y, saved_coords.X);
+	}
       else
 	{
-	  /* Write the characters.  */
-	  if (!WriteConsoleOutputCharacter (cur_screen, conversion_buffer,
-					    coding->produced, start_coords,
-					    &written))
-	    DebPrint (("Failed writing console characters: %d\n",
-		       GetLastError ()));
+	  /* Compute the character attributes corresponding to the face.  */
+	  DWORD char_attr = w32_face_attributes (f, face_id);
+	  COORD start_coords;
+
+	  start_coords.X = x;
+	  start_coords.Y = y;
+
+	  /* Account for character width.
+	     FIXME: this doesn't handle character compositions.  */
+	  ptrdiff_t ncols = strwidth (coding->source, coding->src_bytes);
+
+	  /* Set the attribute for these characters.  */
+	  if (!FillConsoleOutputAttribute (cur_screen, char_attr, ncols,
+					   start_coords, &filled))
+	    DebPrint (("Failed writing console attributes: %d\n", GetLastError ()));
+	  else
+	    {
+	      /* Write the characters.  */
+	      if (!WriteConsoleOutputCharacter (cur_screen, conversion_buffer,
+						coding->produced, start_coords,
+						&written))
+		DebPrint (("Failed writing console characters: %d\n",
+			   GetLastError ()));
+	    }
 	}
     }
 }
@@ -529,6 +602,33 @@ w32con_delete_glyphs (struct frame *f, int n)
   scroll_line (f, n, LEFT);
 }
 
+static void
+w32con_setup_virtual_terminal (void)
+{
+  /* Disable unless 24bit color is supported (v. > 10.0.15063).  */
+  w32_use_virtual_terminal = w32_use_virtual_terminal
+    && (w32_major_version > 10
+	|| (w32_major_version == 10
+	    && (w32_minor_version > 0 || w32_build_number > 15063)));
+
+  DWORD out_mode;
+  GetConsoleMode (cur_screen, &out_mode);
+  out_mode |= ENABLE_PROCESSED_OUTPUT;
+  out_mode |= DISABLE_NEWLINE_AUTO_RETURN;
+
+  if (w32_use_virtual_terminal)
+    out_mode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
+  else
+    out_mode &= ~ENABLE_VIRTUAL_TERMINAL_PROCESSING;
+
+  int out_mode_set = SetConsoleMode (cur_screen, out_mode);
+  w32_use_virtual_terminal = w32_use_virtual_terminal && out_mode_set;
+
+  int max_colors = w32_use_virtual_terminal ? 16777216 : 16;
+  tty_setup_colors (current_tty, max_colors);
+
+  safe_calln (Qtty_set_up_initial_frame_faces);
+}
 
 static void
 w32con_reset_terminal_modes (struct terminal *t)
@@ -585,6 +685,7 @@ w32con_set_terminal_modes (struct terminal *t)
   /* Initialize input mode: interrupt_input off, no flow control, allow
      8 bit character input, standard quit char.  */
   Fset_input_mode (Qnil, Qnil, make_fixnum (2), Qnil);
+  w32con_setup_virtual_terminal ();
 }
 
 /* hmmm... perhaps these let us bracket screen changes so that we can flush
@@ -631,8 +732,6 @@ sys_tgetstr (char *cap, char **area)
 			stubs from cm.c
  ***********************************************************************/
 
-extern struct tty_display_info *current_tty;
-struct tty_display_info *current_tty = NULL;
 extern int cost;
 int cost = 0;
 
@@ -736,6 +835,87 @@ w32_face_attributes (struct frame *f, int face_id)
   return char_attr;
 }
 
+static void
+turn_on_face (struct frame *f, int face_id)
+{
+  struct face *face = FACE_FROM_ID (f, face_id);
+  struct tty_display_info *tty = FRAME_TTY (f);
+  unsigned long fg = face->foreground;
+  unsigned long bg = face->background;
+
+  /* construct combined VT sequence for face attributes */
+  DWORD n = 0;
+  size_t sz = SEQMAX;
+  char seq[sz];
+  sz--;
+
+  if (face->tty_bold_p)
+    SSPRINTF (seq, &n, sz, tty->TS_enter_bold_mode, NULL);
+  if (face->tty_italic_p)
+    SSPRINTF (seq, &n, sz, tty->TS_enter_italic_mode, NULL);
+  if (face->tty_strike_through_p)
+    SSPRINTF (seq, &n, sz, tty->TS_enter_strike_through_mode, NULL);
+  if (face->underline != 0)
+    SSPRINTF (seq, &n, sz, tty->TS_enter_underline_mode, NULL);
+  /* Note: when face->tty_reverse_p != 0 and fg and bg are specified,
+     their values are already swapped and reversing them here would swap
+     them back, but we need to handle the reversal when unspecified.  */
+  if (face->tty_reverse_p && DEFAULTP (fg) && DEFAULTP (bg))
+    SSPRINTF (seq, &n, sz, tty->TS_enter_reverse_mode, NULL);
+
+  if (DEFAULTP (fg)) fg = fg_normal;
+  if (DEFAULTP (bg)) bg = bg_normal;
+
+  const char *set_fg = tty->TS_set_foreground;
+  const char *set_bg = tty->TS_set_background;
+  if (tty->TN_max_colors == 8  || tty->TN_max_colors == 16)
+    {
+      /* fg and bg are indices into 16 base colors (see link at top).  */
+      unsigned long fgi = 0, bgi = 0;
+
+      fgi = (fg >= 0  && fg < 8)
+	    ? fg + 30
+	    : (fg >= 8  && fg < 16)
+	      ? fg - 8 + 90
+	      : 0;
+      if (fgi)
+	SSPRINTF (seq, &n, sz, set_fg, fgi);
+
+      bgi = (bg >= 0  && bg < 8)
+	    ? bg + 40
+	    : (bg >= 8  && bg < 16)
+	      ? bg - 8 + 100
+	      : 0;
+      if (bgi)
+	SSPRINTF (seq, &n, sz, set_bg, bgi);
+    }
+  else if (tty->TN_max_colors == 256)
+    {
+      /* fg and bg are xterm indices.  */
+      if (fg >= 0 && fg < 256)
+	SSPRINTF (seq, &n, sz, set_fg, fg);
+
+      if (bg >= 0 && bg < 256)
+	SSPRINTF (seq, &n, sz, set_bg, bg);
+    }
+  else if (tty->TN_max_colors == 16777216)
+    {
+      /* fg and bg are pixel values -- decompose to rgb triples.  */
+      unsigned long rf = fg/65536, gf = (fg/256)&255, bf = fg&255;
+      unsigned long rb = bg/65536, gb = (bg/256)&255, bb = bg&255;
+      SSPRINTF (seq, &n, sz, set_fg, rf, gf, bf);
+      SSPRINTF (seq, &n, sz, set_bg, rb, gb, bb);
+    }
+  w32con_write_vt_seq ((const char *) seq);
+}
+
+static void
+turn_off_face (struct frame *f, int face_id)
+{
+  struct tty_display_info *tty = FRAME_TTY (f);
+  w32con_write_vt_seq (tty->TS_exit_attribute_mode);
+}
+
 /* The IME window is needed to receive the session notifications
    required to reset the low level keyboard hook state.  */
 
@@ -868,6 +1048,8 @@ initialize_w32_display (struct terminal *term, int *width, int *height)
     }
 
   char_attr_normal = info.wAttributes;
+  fg_normal = char_attr_normal & 0x000f;
+  bg_normal = (char_attr_normal >> 4) & 0x000f;
 
   /* Determine if the info returned by GetConsoleScreenBufferInfo
      is realistic.  Old MS Telnet servers used to only fill out
@@ -921,31 +1103,81 @@ initialize_w32_display (struct terminal *term, int *width, int *height)
 
   /* Set up the keyboard hook.  */
   setup_w32_kbdhook (hwnd);
+
+  /* Set current_tty to the tty of this terminal */
+  current_tty = term->display_info.tty;
 }
 
 
-DEFUN ("set-screen-color", Fset_screen_color, Sset_screen_color, 2, 2, 0,
+DEFUN ("set-screen-color", Fset_screen_color, Sset_screen_color, 2, 3, 0,
        doc: /* Set screen foreground and background colors.
 
-Arguments should be indices between 0 and 15, see w32console.el.  */)
-  (Lisp_Object foreground, Lisp_Object background)
+Arguments should be indices for colors in the list returned by `tty-color-alist'.
+If VTP is non-nil, settings affect virtual terminal processing only.
+Otherwise, arguments should be between 0 and 15, and settings will
+be effective only when virtual terminal processing is disabled.
+
+See w32console.el and the documentation for `w32-use-virtual-terminal'.  */)
+  (Lisp_Object foreground, Lisp_Object background, Lisp_Object vtp)
 {
-  char_attr_normal = XFIXNAT (foreground) + (XFIXNAT (background) << 4);
+  int fg = XFIXNAT (foreground);
+  int bg = XFIXNAT (background);
+
+  if (NILP (vtp))
+    {
+      char_attr_normal = fg + (bg << 4);
+    }
+  else
+    {
+      fg_normal = fg;
+      bg_normal = bg;
+    }
 
   Frecenter (Qnil, Qt);
   return Qt;
 }
 
-DEFUN ("get-screen-color", Fget_screen_color, Sget_screen_color, 0, 0, 0,
+DEFUN ("get-screen-color", Fget_screen_color, Sget_screen_color, 0, 1, 0,
        doc: /* Get color indices of the current screen foreground and background.
 
-The colors are returned as a list of 2 indices (FOREGROUND BACKGROUND).
-See w32console.el and `tty-defined-color-alist' for mapping of indices
-to colors.  */)
+The colors are returned as a list of 2 indices (FOREGROUND BACKGROUND) for
+colors in the list returned by `tty-color-alist`.
+
+If VTP is non-nil, returns settings effective when virtual terminal
+processing is enabled.  Otherwise, returns settings effective when
+virtual terminal processing is disabled.
+
+See w32console.el and the documentation for `w32-use-virtual-terminal'.  */)
+  (Lisp_Object vtp)
+{
+  int fg = NILP (vtp) ? char_attr_normal & 0x000f : fg_normal;
+  int bg = NILP (vtp) ? (char_attr_normal >> 4) & 0x000f : bg_normal;
+
+  return Fcons (make_fixnum (fg), Fcons (make_fixnum (bg), Qnil));
+}
+
+DEFUN ("w32-use-virtual-terminal", Fw32_use_virtual_terminal, Sw32_use_virtual_terminal, 1, 1, 0,
+       doc: /* Enables (disables) virtual terminal sequence processing if argument is t (nil).  */)
+  (Lisp_Object arg)
+{
+  if (EQ (arg, Qt))
+    w32_use_virtual_terminal = 1;
+  else if (EQ (arg, Qnil))
+    w32_use_virtual_terminal = 0;
+  else {
+    error ("Invalid argument: expects t or nil.");
+    return Qnil;
+  }
+
+  w32con_setup_virtual_terminal ();
+  return Qt;
+}
+
+DEFUN ("w32-use-virtual-terminal-p", Fw32_use_virtual_terminal_p, Sw32_use_virtual_terminal_p, 0, 0, 0,
+       doc: /* Returns t (nil) if virtual terminal sequence processing is enabled (disabled).  */)
   (void)
 {
-  return Fcons (make_fixnum (char_attr_normal & 0x000f),
-		Fcons (make_fixnum ((char_attr_normal >> 4) & 0x000f), Qnil));
+  return w32_use_virtual_terminal ? Qt : Qnil;
 }
 
 DEFUN ("set-cursor-size", Fset_cursor_size, Sset_cursor_size, 1, 1, 0,
@@ -974,5 +1206,7 @@ scroll-back buffer.  */);
 
   defsubr (&Sset_screen_color);
   defsubr (&Sget_screen_color);
+  defsubr (&Sw32_use_virtual_terminal);
+  defsubr (&Sw32_use_virtual_terminal_p);
   defsubr (&Sset_cursor_size);
 }
diff --git a/src/xdisp.c b/src/xdisp.c
index 6f06206b43e..99474d7abdc 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17387,7 +17387,7 @@ redisplay_internal (void)
 	     area, displaying a different frame means redisplay the
 	     whole thing.  */
 	  SET_FRAME_GARBAGED (sf);
-#if !defined DOS_NT && !defined HAVE_ANDROID
+#if !defined MSDOS && !defined HAVE_ANDROID
 	  set_tty_color_mode (FRAME_TTY (sf), sf);
 #endif
 	}

From 00207670e55e1c3792329d51a7bcc1b0185ea394 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 8 Apr 2026 16:33:57 +0300
Subject: [PATCH 038/463] ; * lisp/term/w32console.el (set-screen-color): Fix
 signature.

---
 lisp/term/w32console.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/term/w32console.el b/lisp/term/w32console.el
index 2985cf7e39b..2b66f98247f 100644
--- a/lisp/term/w32console.el
+++ b/lisp/term/w32console.el
@@ -47,7 +47,7 @@
 
 (declare-function x-setup-function-keys "term/common-win" (frame))
 (declare-function get-screen-color "w32console.c" (&optional vtp))
-(declare-function set-screen-color "w32console.c" (&optional vtp))
+(declare-function set-screen-color "w32console.c" (foreground background &optional vtp))
 (declare-function w32-get-console-codepage "w32proc.c" ())
 (declare-function w32-get-console-output-codepage "w32proc.c" ())
 (declare-function w32-use-virtual-terminal "w32console.c" (enable))

From 65b984c21a5237dfe544e37375e101fa5aa7a233 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 8 Apr 2026 16:40:15 +0200
Subject: [PATCH 039/463] * doc/misc/tramp.texi (New operations): Extend
 example.

---
 doc/misc/tramp.texi | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 23b6dce2ec6..41455a47546 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -6920,6 +6920,7 @@ Then we have the different use cases:
 @end group
 @end lisp
 
+@findex with-parsed-tramp-file-name
 @var{function} is implemented like an ordinary @value{tramp} backend
 handler, see the examples in @code{tramp-<backend>-handle-*} and
 @code{tramp-handle-*}.  It can expect, that the first argument (or
@@ -6927,6 +6928,27 @@ handler, see the examples in @code{tramp-<backend>-handle-*} and
 syntax.  It shall use @value{tramp} internal macros and functions like
 @code{with-parsed-tramp-file-name} and the different cache functions.
 
+@findex tramp-run-real-handler
+If @var{function} must call the original function, this can be done
+via @code{tramp-run-real-handler}.  The implementation of the example
+could look like:
+
+@lisp
+@group
+(defun handle-test-operation (file)
+  (message "Entry handler implementation for %s" file)
+  (tramp-run-real-handler #'test-operation (list file))
+  (message "Exit handler implementation for %s" file))
+@end group
+
+@group
+(test-operation "/ssh::/a/b")
+@result{} "Entry handler implementation for /ssh::/a/b
+   Original implementation for /ssh::/a/b
+   Exit handler implementation for /ssh::/a/b"
+@end group
+@end lisp
+
 If the same @var{function} shall be used for different @value{tramp}
 backends, @code{tramp-add-external-operation} must be called for every
 backend, respectively.

From 948aecee651a04d4e15fd7373ed09f1531d1afb8 Mon Sep 17 00:00:00 2001
From: Pip Cet <pipcet@protonmail.com>
Date: Tue, 7 Apr 2026 18:44:16 +0000
Subject: [PATCH 040/463] Avoid infinite recursion in bind-keys-form
 (bug#80759)

* lisp/bind-key.el (bind-keys-form): Always continue loop after
matching a keyword argument.
---
 lisp/bind-key.el | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/lisp/bind-key.el b/lisp/bind-key.el
index 860d488dba3..d33ee9b1222 100644
--- a/lisp/bind-key.el
+++ b/lisp/bind-key.el
@@ -314,31 +314,41 @@ function symbol (unquoted)."
       (while (and cont args)
         (if (cond ((and (eq :map (car args))
                         (not prefix-map))
-                   (setq map (cadr args)))
+                   (setq map (cadr args))
+                   t)
                   ((eq :prefix-docstring (car args))
-                   (setq prefix-doc (cadr args)))
+                   (setq prefix-doc (cadr args))
+                   t)
                   ((and (eq :prefix-map (car args))
                         (not (memq map '(global-map
                                          override-global-map))))
-                   (setq prefix-map (cadr args)))
+                   (setq prefix-map (cadr args))
+                   t)
                   ((eq :repeat-docstring (car args))
-                   (setq repeat-doc (cadr args)))
+                   (setq repeat-doc (cadr args))
+                   t)
                   ((and (eq :repeat-map (car args))
                         (not (memq map '(global-map
                                          override-global-map))))
                    (setq repeat-map (cadr args))
-                   (setq map repeat-map))
+                   (setq map repeat-map)
+                   t)
                   ((memq (car args) '(:continue :continue-only :exit))
                    (setq repeat-type (car args)
-                         arg-change-func 'cdr))
+                         arg-change-func 'cdr)
+                   t)
                   ((eq :prefix (car args))
-                   (setq prefix (cadr args)))
+                   (setq prefix (cadr args))
+                   t)
                   ((eq :filter (car args))
-                   (setq filter (cadr args)) t)
+                   (setq filter (cadr args))
+                   t)
                   ((eq :menu-name (car args))
-                   (setq menu-name (cadr args)))
+                   (setq menu-name (cadr args))
+                   t)
                   ((eq :package (car args))
-                   (setq pkg (cadr args))))
+                   (setq pkg (cadr args))
+                   t))
             (setq args (funcall arg-change-func args))
           (setq cont nil))))
 

From 7c5ab95f037643257a94e071202d9abf7d3fba08 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 8 Apr 2026 15:01:46 -0400
Subject: [PATCH 041/463] (natnum, keyword, command): Fix bootstrap warnings
 (bug#80732)

To break the interdependence between `cl-macs` and `cl-preloaded`,
we refrain from defining some types in `cl-macs` in some corner case
situations which affect only the early bootstrap.
`transient.el` is used during early bootstrap (while loading
`emoji.el` to produce `emoji-labels.el`) and it uses the
`keyword` and `command` types, so make sure they're not among
those types that are sometimes not defined.

Include `natnum` while we're at it, so the only types still
affected by this corner case are "Common Lisp" types, which are
less likely to be used during early bootstrap.

* lisp/emacs-lisp/cl-macs.el (natnum, keyword, command): Move type
declaration from here to...

* lisp/emacs-lisp/cl-preloaded.el (natnum, keyword, command): ...here.
---
 lisp/emacs-lisp/cl-macs.el      | 17 +++++------------
 lisp/emacs-lisp/cl-preloaded.el | 10 +++++++++-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index caa02fb24b2..a85f669fca9 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -3626,11 +3626,11 @@ Of course, we really can't know that for sure, so it's just a heuristic."
         (let* ((name (symbol-name type))
                (namep (intern (concat name "p"))))
           (cond
-           ((cl--macroexp-fboundp namep) (inline-quote (funcall #',namep ,val)))
-           ((cl--macroexp-fboundp
-             (setq namep (intern (concat name "-p"))))
-            (inline-quote (funcall #',namep ,val)))
-           ((cl--macroexp-fboundp type) (inline-quote (funcall #',type ,val)))
+           ;; ((cl--macroexp-fboundp namep) (inline-quote (funcall #',namep ,val)))
+           ;; ((cl--macroexp-fboundp
+           ;;   (setq namep (intern (concat name "-p"))))
+           ;;  (inline-quote (funcall #',namep ,val)))
+           ;; ((cl--macroexp-fboundp type) (inline-quote (funcall #',type ,val)))
            (t (error "Unknown type %S" type))))
         nil nil type))
       (type (error "Bad type spec: %S" type)))))
@@ -3868,19 +3868,12 @@ If PARENTS is non-nil, ARGLIST must be nil."
 ;; both at compile-time and at runtime, so we need to double-check.
 (static-if (not (fboundp 'cl--define-derived-type)) nil
   (when (fboundp 'cl--define-derived-type)
-    (cl-deftype natnum () (declare (parents integer)) '(satisfies natnump))
     (cl-deftype character () (declare (parents fixnum natnum))
                 '(and fixnum natnum))
     (cl-deftype base-char () (declare (parents character))
                 '(satisfies characterp))
     (cl-deftype extended-char () (declare (parents character))
                 '(and character (not base-char)))
-    (cl-deftype keyword () (declare (parents symbol)) '(satisfies keywordp))
-    (cl-deftype command ()
-      ;; FIXME: Can't use `function' as parent because of arrays as
-      ;; keyboard macros, which are redundant since `kmacro.el'!!
-      ;;(declare (parents function))
-      '(satisfies commandp))
 
     (eval-when-compile
       (defmacro cl--defnumtype (type base)
diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el
index f6376fbd192..e9f2126f33c 100644
--- a/lisp/emacs-lisp/cl-preloaded.el
+++ b/lisp/emacs-lisp/cl-preloaded.el
@@ -37,7 +37,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl-lib))
-(eval-when-compile (require 'cl-macs))  ;For cl--struct-class.
+(eval-when-compile (require 'cl-macs))  ;For cl--find-class.
 
 ;; The `assert' macro from the cl package signals
 ;; `cl-assertion-failed' at runtime so always define it.
@@ -528,6 +528,14 @@ PARENTS is a list of types NAME is a subtype of, or nil."
     (when predicate
       (define-symbol-prop name 'cl-deftype-satisfies predicate))))
 
+(cl-deftype natnum  () (declare (parents integer)) '(satisfies natnump))
+(cl-deftype keyword () (declare (parents symbol)) '(satisfies keywordp))
+(cl-deftype command ()
+  ;; FIXME: Can't use `function' as parent because of arrays as
+  ;; keyboard macros, which are redundant since `kmacro.el'!!
+  ;;(declare (parents function))
+  '(satisfies commandp))
+
 ;; Make sure functions defined with cl-defsubst can be inlined even in
 ;; packages which do not require CL.  We don't put an autoload cookie
 ;; directly on that function, since those cookies only go to cl-loaddefs.

From 666955dfa0e8420a0e6d47d4482d08c7840cd9f8 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 8 Apr 2026 15:19:06 -0400
Subject: [PATCH 042/463] (dired-at-point-prompter): Fix bug#80545

* lisp/ffap.el (ffap-read-file-or-url): Add `read-dir` argument to
indicate we expect a directory as return value.
Avoid `read-file-name` when we want a directory and the dialog UI
might prevent us from doing so.
(dired-at-point-prompter): Use the new arg.
---
 lisp/dired.el |  5 +++--
 lisp/ffap.el  | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lisp/dired.el b/lisp/dired.el
index 4aded86e40d..353190347db 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1237,8 +1237,9 @@ If DIRNAME is already in a Dired buffer, that buffer is used without refresh."
   (prog1 (pop-to-buffer-same-window (dired-noselect dirname switches))
     (dired--display-ls-error)))
 
-;; This is needed to let clicks on the menu bar invoke Dired even if
-;; some feature remaps the Dired command to another command.
+;; This lets clicks on the menu bar invoke Dired even if some feature
+;; remaps the Dired command to another command that does not handle this
+;; situation correctly (e.g. earlier versions of `dired-at-point-prompter').
 ;;;###autoload
 (defun dired-from-menubar (dirname &optional switches)
   "Edit an existing directory."
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 800437d69c9..2e88adfaf4a 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1607,7 +1607,7 @@ which may actually result in an URL rather than a filename."
       (otherwise
        (apply operation args)))))
 
-(defun ffap-read-file-or-url (prompt guess)
+(defun ffap-read-file-or-url (prompt guess &optional read-dir)
   "Read file or URL from minibuffer, with PROMPT and initial GUESS."
   (let ((elem (cons ffap-url-regexp #'ffap--url-file-handler)))
     (unwind-protect
@@ -1623,9 +1623,14 @@ which may actually result in an URL rather than a filename."
               (setq guess default-directory))
             (unless (ffap-file-remote-p guess)
               (setq guess (abbreviate-file-name (expand-file-name guess))))
-            (read-file-name prompt
-                            (file-name-directory guess) nil nil
-                            (file-name-nondirectory guess))))
+            (funcall
+             ;; Copied from `dired-read-dir-and-switches'.
+	     (if (and read-dir (next-read-file-uses-dialog-p))
+	         #'read-directory-name
+	       #'read-file-name)
+	     prompt
+             (file-name-directory guess) nil nil
+             (file-name-nondirectory guess))))
       ;; Remove the special handler manually.  We used to just let-bind
       ;; file-name-handler-alist to preserve its value, but that caused
       ;; other modifications to be lost (e.g. when Tramp gets loaded
@@ -2158,7 +2163,8 @@ If `dired-at-point-require-prefix' is set, the prefix meaning is reversed."
 		    ((file-regular-p guess)
 		     (file-name-directory guess))
 		    (guess))))
-	 (and guess (ffap-highlight))))
+	 (and guess (ffap-highlight)))
+       'read-dir)
     (ffap-highlight t)))
 
 ;;; ffap-dired-other-*, ffap-list-directory commands:

From d8c9a860635dbf52bfac75146f0a2d0f38048482 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 8 Apr 2026 15:29:13 -0400
Subject: [PATCH 043/463] (take-while, drop-while, all, member-if)

* lisp/subr.el (take-while, drop-while, all, member-if): Don't inline
if `pred` is not a "constant" since it wouldn't bring any
significant benefit.  Also, don't explicitly `macroexpand-all` since
the compiler macro will be called (again) after macro-expansion,
if needed.
(internal--effect-free-fun-arg-p): Return nil for variable references.
---
 lisp/subr.el | 72 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 31 deletions(-)

diff --git a/lisp/subr.el b/lisp/subr.el
index b0e04bc5f99..682e156de12 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1168,24 +1168,27 @@ side-effects, and the argument LIST is not modified."
     list))
 
 (defun internal--effect-free-fun-arg-p (x)
-  (or (symbolp x) (closurep x) (memq (car-safe x) '(function quote))))
+  ;; FIXME: Rename it to `macroexp-FOO-p' and give it a proper docstring
+  ;; which explains the finer difference with `macroexp-copyable-p'
+  ;; (and maybe adjust the docstring of `macroexp-copyable-p' accordingly).
+  (or (closurep x) (memq (car-safe x) '(function quote))))
 
 (defun take-while (pred list)
   "Return the longest prefix of LIST whose elements satisfy PRED."
   (declare (compiler-macro
-            (lambda (_form)
+            (lambda (form)
               (let* ((tail (make-symbol "tail"))
-                     (pred (macroexpand-all pred macroexpand-all-environment))
-                     (f (and (not (internal--effect-free-fun-arg-p pred))
-                             (make-symbol "f")))
                      (r (make-symbol "r")))
-                `(let (,@(and f `((,f ,pred)))
-                       (,r nil)
-                       (,tail ,list))
-                   (while (and ,tail (funcall ,(or f pred) (car ,tail)))
-                     (push (car ,tail) ,r)
-                     (setq ,tail (cdr ,tail)))
-                   (nreverse ,r))))))
+                (if (not (internal--effect-free-fun-arg-p pred))
+                    ;; Don't inline since it would just duplicate the code
+                    ;; without allowing any more optimizations.
+                    form
+                  `(let ((,r nil)
+                         (,tail ,list))
+                     (while (and ,tail (funcall ,pred (car ,tail)))
+                       (push (car ,tail) ,r)
+                       (setq ,tail (cdr ,tail)))
+                     (nreverse ,r)))))))
   (let ((r nil))
     (while (and list (funcall pred (car list)))
       (push (car list) r)
@@ -1195,23 +1198,29 @@ side-effects, and the argument LIST is not modified."
 (defun drop-while (pred list)
   "Skip initial elements of LIST satisfying PRED and return the rest."
   (declare (compiler-macro
-            (lambda (_form)
-              (let* ((tail (make-symbol "tail"))
-                     (pred (macroexpand-all pred macroexpand-all-environment))
-                     (f (and (not (internal--effect-free-fun-arg-p pred))
-                             (make-symbol "f"))))
-                `(let (,@(and f `((,f ,pred)))
-                       (,tail ,list))
-                   (while (and ,tail (funcall ,(or f pred) (car ,tail)))
-                     (setq ,tail (cdr ,tail)))
-                   ,tail)))))
+            (lambda (form)
+              (let* ((tail (make-symbol "tail")))
+                (if (not (internal--effect-free-fun-arg-p pred))
+                    ;; Don't inline since it would just duplicate the code
+                    ;; without allowing any more optimizations.
+                    form
+                  `(let ((,tail ,list))
+                     (while (and ,tail (funcall ,pred (car ,tail)))
+                       (setq ,tail (cdr ,tail)))
+                     ,tail))))))
   (while (and list (funcall pred (car list)))
     (setq list (cdr list)))
   list)
 
 (defun all (pred list)
   "Non-nil if PRED is true for all elements in LIST."
-  (declare (compiler-macro (lambda (_) `(not (drop-while ,pred ,list)))))
+  (declare (compiler-macro
+            (lambda (form)
+              (if (not (internal--effect-free-fun-arg-p pred))
+                  ;; Don't inline since it would just duplicate the code
+                  ;; without allowing any more optimizations.
+                  form
+                `(not (drop-while ,pred ,list))))))
   (not (drop-while pred list)))
 
 (defun member-if (pred list)
@@ -1229,14 +1238,15 @@ with
 
     (member-if (lambda (x) (foo (bar x))) items)"
   (declare (compiler-macro
-            (lambda (_)
-              (let* ((x (make-symbol "x"))
-                     (f (and (not (internal--effect-free-fun-arg-p pred))
-                             (make-symbol "f")))
-                     (form `(drop-while (lambda (,x)
-                                          (not (funcall ,(or f pred) ,x)))
-                                        ,list)))
-                (if f `(let ((,f ,pred)) ,form) form)))))
+            (lambda (form)
+              (if (not (internal--effect-free-fun-arg-p pred))
+                  ;; Don't inline since it would just duplicate the code
+                  ;; without allowing any more optimizations.
+                  form
+                (let* ((x (make-symbol "x")))
+                  `(drop-while (lambda (,x)
+                                 (not (funcall ,pred ,x)))
+                               ,list))))))
   (drop-while (lambda (x) (not (funcall pred x))) list))
 
 ;; This is good to have for improved readability in certain uses, but

From 24ff3398c8f2d137d1b91541d2dd1b84948ac429 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 8 Apr 2026 15:43:56 -0400
Subject: [PATCH 044/463] src/data.c (set_internal): Mention var which can't be
 unbound in error msg

---
 src/data.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/data.c b/src/data.c
index 8b9490d9466..b269ec6d501 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1724,7 +1724,8 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where,
 
 	if (unbinding_p && blv->fwd)
 	  /* Forbid unbinding built-in variables.  */
-	  error ("Built-in variables may not be unbound");
+	  error ("Built-in variable may not be unbound : %s",
+		 SDATA (SYMBOL_NAME (symbol)));
 
 	if (NILP (where))
 	  XSETBUFFER (where, current_buffer);
@@ -1803,7 +1804,8 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where,
 
 	if (unbinding_p)
 	  /* Forbid unbinding built-in variables.  */
-	  error ("Built-in variables may not be unbound");
+	  error ("Built-in variable may not be unbound : %s",
+		 SDATA (SYMBOL_NAME (symbol)));
 
 	if (BUFFER_OBJFWDP (innercontents))
 	  {

From 1df537e8eb22ef3aa6165428c8387f2bba9ba907 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 8 Apr 2026 16:38:19 -0400
Subject: [PATCH 045/463] lisp/emacs-lisp/cl-macs.el (cl-typep): Undo
 accidental change

---
 lisp/emacs-lisp/cl-macs.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index a85f669fca9..19b8bc68d6f 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -3626,11 +3626,11 @@ Of course, we really can't know that for sure, so it's just a heuristic."
         (let* ((name (symbol-name type))
                (namep (intern (concat name "p"))))
           (cond
-           ;; ((cl--macroexp-fboundp namep) (inline-quote (funcall #',namep ,val)))
-           ;; ((cl--macroexp-fboundp
-           ;;   (setq namep (intern (concat name "-p"))))
-           ;;  (inline-quote (funcall #',namep ,val)))
-           ;; ((cl--macroexp-fboundp type) (inline-quote (funcall #',type ,val)))
+           ((cl--macroexp-fboundp namep) (inline-quote (funcall #',namep ,val)))
+           ((cl--macroexp-fboundp
+             (setq namep (intern (concat name "-p"))))
+            (inline-quote (funcall #',namep ,val)))
+           ((cl--macroexp-fboundp type) (inline-quote (funcall #',type ,val)))
            (t (error "Unknown type %S" type))))
         nil nil type))
       (type (error "Bad type spec: %S" type)))))

From 9d6d4cabbfabcaf6056a6774516e4eb9d4c2fdde Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dmitry@gutov.dev>
Date: Thu, 9 Apr 2026 05:53:27 +0300
Subject: [PATCH 046/463] Fix "Narrowing src/ file breaks xref"

* lisp/emacs-lisp/find-func.el (find-function-C-source):
Look outside of the current narrowing as well (bug#80749).
---
 lisp/emacs-lisp/find-func.el | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 2d89b0f46ec..76b8798ca25 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -302,18 +302,19 @@ TYPE should be nil to find a function, or `defvar' to find a variable."
 		      (indirect-function
 		       (find-function-advised-original fun-or-var)))))
   (with-current-buffer (find-file-noselect file)
-    (goto-char (point-min))
-    (unless (re-search-forward
-	     (if type
-		 (concat "DEFVAR[A-Z_]*[ \t\n]*([ \t\n]*\""
-			 (regexp-quote (symbol-name fun-or-var))
-			 "\"")
-	       (concat "DEFUN[ \t\n]*([ \t\n]*\""
-		       (regexp-quote (subr-name (advice--cd*r fun-or-var)))
-		       "\""))
-	     nil t)
-      (error "Can't find source for %s" fun-or-var))
-    (cons (current-buffer) (match-beginning 0))))
+    (without-restriction
+      (goto-char (point-min))
+      (unless (re-search-forward
+	       (if type
+		   (concat "DEFVAR[A-Z_]*[ \t\n]*([ \t\n]*\""
+			   (regexp-quote (symbol-name fun-or-var))
+			   "\"")
+	         (concat "DEFUN[ \t\n]*([ \t\n]*\""
+		         (regexp-quote (subr-name (advice--cd*r fun-or-var)))
+		         "\""))
+	       nil t)
+        (error "Can't find source for %s" fun-or-var))
+      (cons (current-buffer) (match-beginning 0)))))
 
 ;;;###autoload
 (defun find-library (library)

From d43aa7c6e27ebfffde00644fe7be5e3e4cca14b9 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 9 Apr 2026 07:56:56 +0300
Subject: [PATCH 047/463] ; Update admin/authors.el

* admin/authors.el (authors-aliases, authors-fixed-entries): Add
Ewan Townshend and his contribution.
---
 admin/authors.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/admin/authors.el b/admin/authors.el
index 7a1a350beaa..a389e8161d7 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -103,6 +103,7 @@ files.")
     ("Eric M. Ludlam" "Eric Ludlam")
     ("Eric S. Raymond" "Eric Raymond")
     ("Etienne Prud’Homme" "Etienne Prud'Homme")
+    ("Ewan Townshend" "ewan@etown\\.dev")
     ("Fabián Ezequiel Gallina" "Fabian Ezequiel Gallina" "Fabi.n E\\. Gallina")
     (nil "felix.*EmacsWiki")
     (nil "felix\\.dick@web\\.de")
@@ -924,7 +925,8 @@ Changes to files in this list are not listed.")
     ("Dale R. Worley" :changed "mail-extr.el")
     ("Jamie Zawinski" :changed "bytecode.c" :wrote "tar-mode.el"
      :cowrote "disass.el")
-    ("Andrea Corallo" :wrote "comp.c"))
+    ("Andrea Corallo" :wrote "comp.c" "[native compilation of Emacs Lisp]")
+    ("Ewan Townshend" :wrote "[24-bit color support for MS-Windows console]"))
   "Manual fixes to the list of actions taken.
 These are mostly taken from the original, manually (un)maintained
 AUTHORS file.  There are also some more recent manual additions.")

From 04dbd88c34341bc4fb1712f370eefd0d3387aa9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=B8=E0=A4=AE=E0=A5=80=E0=A4=B0=20=E0=A4=B8=E0=A4=BF?=
 =?UTF-8?q?=E0=A4=82=E0=A4=B9=20Sameer=20Singh?= <lumarzeli30@gmail.com>
Date: Wed, 8 Apr 2026 10:25:40 +0530
Subject: [PATCH 048/463] Fix emoji--insert-buffer being wiped by
 emoji-list-mode

* lisp/international/emoji.el (emoji-list): Set insert-buffer after the
emoji buffer is set up.  (bug#80773)
---
 lisp/international/emoji.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/international/emoji.el b/lisp/international/emoji.el
index 56a8134be81..237062cc328 100644
--- a/lisp/international/emoji.el
+++ b/lisp/international/emoji.el
@@ -167,14 +167,14 @@ when the command was invoked."
   (let ((buf (current-buffer)))
     (emoji--init)
     (switch-to-buffer (get-buffer-create "*Emoji*"))
-    (setq-local emoji--insert-buffer buf)
     ;; Don't regenerate the buffer if it already exists -- this will
     ;; leave point where it was the last time it was used.
     (when (zerop (buffer-size))
       (let ((inhibit-read-only t))
         (emoji-list-mode)
         (emoji--list-generate nil (cons nil emoji--labels))
-        (goto-char (point-min))))))
+        (goto-char (point-min))))
+    (setq-local emoji--insert-buffer buf)))
 
 ;;;###autoload
 (defun emoji-describe (glyph &optional interactive)

From bad60b50ed242f7ccef6ed2f2776f716091bf1ed Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 9 Apr 2026 12:00:20 +0200
Subject: [PATCH 049/463] ; * doc/emacs/msdos.texi (Windows Misc): Fix typo.

---
 doc/emacs/msdos.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi
index 203df57c7c1..75fc34d76d3 100644
--- a/doc/emacs/msdos.texi
+++ b/doc/emacs/msdos.texi
@@ -1219,7 +1219,7 @@ By default, 24-bit RGB color will be used, but other (8, 16, 256) color
 spaces may be used, by passing the @code{--color} command line argument,
 or setting the value of the @code{tty-color-mode} frame parameter.
 
-   @code{'(w32-use-virtual-terminal-p)} evaluates to @code{t} if and only if
+   @code{(w32-use-virtual-terminal-p)} evaluates to @code{t} if and only if
 the internal variable has a non-zero numerical value, and otherwise to
 @code{nil}.  If it evaluates to @code{t}, ANSI escape sequences are used
 for color, otherwise, the older mechanism is used.  The internal variable

From 49420f7033150c94d4828c7f363e043f610e8416 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 9 Apr 2026 16:22:20 +0100
Subject: [PATCH 050/463] with-vc-properties: Don't substitute in a global
 value

* lisp/vc/vc.el (with-vc-properties): Don't substitute in the
value vc-touched-properties happens to have at macro expansion
time.  This was left over from when vc-touched-properties was
bound to a local gensym.
---
 lisp/vc/vc.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index c1e373d496b..5c1d0354f7d 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1276,7 +1276,7 @@ Return the result of evaluating FORM."
          (dolist (file ,flist)
            (dolist (setting ,settings)
              (let ((property (car setting)))
-               (unless (memq property ,vc-touched-properties)
+               (unless (memq property vc-touched-properties)
                  (put (intern file vc-file-prop-obarray)
                       property (cdr setting))))))))))
 

From 1d2c3cb5bbce3273f8b9a4ea7807da83462ade94 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 9 Apr 2026 16:22:39 +0100
Subject: [PATCH 051/463] * lisp/vc/vc.el (vc-checkin): Don't assume vc-dir is
 loaded.

---
 lisp/vc/vc.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 5c1d0354f7d..fe1b9108636 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2230,7 +2230,8 @@ have changed; continue with old fileset?" (current-buffer))))
                   (dolist (file files)
                     (let ((file (expand-file-name file)))
                       (vc-file-setprop file 'display-state "committing")
-                      (vc-dir-resynch-file file)
+                      (when (featurep 'vc-dir)
+                        (vc-dir-resynch-file file))
                       (push file to-remove-props)))
                   (vc-exec-after #'remove-props-done-msg nil proc))
                 ret)

From 72ba149cfaae030bf2b17351681c89d0a04c35bc Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 9 Apr 2026 12:23:26 -0400
Subject: [PATCH 052/463] (listify-key-sequence): Fix breakage with unibyte
 chars

* lisp/subr.el (listify-key-sequence): The funny
"7th bit is Meta" applies only to unibyte strings.

* test/lisp/subr-tests.el (subr-listify-key-sequence): New test.
---
 lisp/subr.el            | 2 +-
 test/lisp/subr-tests.el | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/subr.el b/lisp/subr.el
index 682e156de12..036f414262a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1806,7 +1806,7 @@ See also `current-global-map'.")
 (defun listify-key-sequence (key)
   "Convert a key sequence to a list of events."
   (declare (side-effect-free t))
-  (if (vectorp key)
+  (if (or (vectorp key) (multibyte-string-p key))
       (append key nil)
     (mapcar (lambda (c)
               (if (> c 127)
diff --git a/test/lisp/subr-tests.el b/test/lisp/subr-tests.el
index 791b06f9edf..b99328459d6 100644
--- a/test/lisp/subr-tests.el
+++ b/test/lisp/subr-tests.el
@@ -433,6 +433,9 @@
   (should (eq (global-key-binding "x") 'self-insert-command))
   (should-not (global-key-binding [f12])))
 
+(ert-deftest subr-listify-key-sequence ()
+  (should (equal (listify-key-sequence "ŕ°") '(?ŕ ?°))))
+
 
 ;;;; Mode hooks.
 

From dcae1062144d7e0e0ea64f31fb3b9793f918ef76 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 9 Apr 2026 12:57:44 -0400
Subject: [PATCH 053/463] lisp/vc/vc.el (vc-checkin): Use `vc-dir-buffers` like
 we do everywhere else

---
 lisp/vc/vc.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index fe1b9108636..3773973eb60 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2230,7 +2230,7 @@ have changed; continue with old fileset?" (current-buffer))))
                   (dolist (file files)
                     (let ((file (expand-file-name file)))
                       (vc-file-setprop file 'display-state "committing")
-                      (when (featurep 'vc-dir)
+                      (when vc-dir-buffers
                         (vc-dir-resynch-file file))
                       (push file to-remove-props)))
                   (vc-exec-after #'remove-props-done-msg nil proc))

From fc128826b537fd0b95cedbc03b70e3466dd68ee2 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 9 Apr 2026 14:32:15 -0400
Subject: [PATCH 054/463] (elisp--local-variables): Restore point earlier

* lisp/progmodes/elisp-mode.el (elisp--local-variables): Restore
point before calling `elisp--safe-macroexpand-all` in case this
triggers a temporary redisplay.
---
 lisp/progmodes/elisp-mode.el | 47 ++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 3c3aafcde15..82b80cc16da 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -868,29 +868,30 @@ use of `macroexpand-all' as a way to find the \"underlying raw code\".")
 
 (defun elisp--local-variables ()
   "Return a list of locally let-bound variables at point."
-  (save-excursion
-    (skip-syntax-backward "w_")
-    (let* ((ppss (syntax-ppss))
-           (txt (buffer-substring-no-properties (or (car (nth 9 ppss)) (point))
-                                                (or (nth 8 ppss) (point))))
-           (closer ()))
-      (dolist (p (nth 9 ppss))
-        (push (cdr (syntax-after p)) closer))
-      (setq closer (apply #'string closer))
-      (let* ((sexp (condition-case nil
-                       (car (read-from-string
-                             (concat txt "elisp--witness--lisp" closer)))
-                     ((invalid-read-syntax end-of-file) nil)))
-             (vars (elisp--local-variables-1
-                    nil (elisp--safe-macroexpand-all sexp))))
-        (delq nil
-              (mapcar (lambda (var)
-                        (and (symbolp var)
-                             (not (string-match (symbol-name var) "\\`[&_]"))
-                             ;; Eliminate uninterned vars.
-                             (intern-soft var)
-                             var))
-                      vars))))))
+  (let* ((sexp
+          (save-excursion
+            (skip-syntax-backward "w_")
+            (let* ((ppss (syntax-ppss))
+                   (txt (buffer-substring-no-properties
+                         (or (car (nth 9 ppss)) (point))
+                         (or (nth 8 ppss) (point))))
+                   (closer
+                    (nreverse (mapcar (lambda (p) (cdr (syntax-after p)))
+                                      (nth 9 ppss)))))
+              (condition-case nil
+                  (car (read-from-string
+                        (concat txt "elisp--witness--lisp" closer)))
+                ((invalid-read-syntax end-of-file) nil)))))
+         (vars (elisp--local-variables-1
+                nil (elisp--safe-macroexpand-all sexp))))
+    (delq nil
+          (mapcar (lambda (var)
+                    (and (symbolp var)
+                         (not (string-match (symbol-name var) "\\`[&_]"))
+                         ;; Eliminate uninterned vars.
+                         (intern-soft var)
+                         var))
+                  vars))))
 
 (defconst elisp--local-variables-completion-table
   (let ((lastpos nil) (lastvars nil))

From b4da8610cd3091a05f458bcda52ce133e2e9494c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Marks?= <shipmints@gmail.com>
Date: Thu, 9 Apr 2026 13:09:51 -0400
Subject: [PATCH 055/463] ; New function 'ns-process-is-accessibility-trusted',
 no message (bug#80624)

* src/nsfns.m (Fns_process_is_accessibility_trusted): New
function.
(syms_of_nsfns): New defsubr.
* src/nsterm.m: ([EmacsApp applicationDidFinishLaunching:]):
Remove the AXIsProcessTrusted message.
* etc/NEWS: Updated.
---
 etc/NEWS     | 14 +++++++++++---
 src/nsfns.m  | 22 ++++++++++++++++++++++
 src/nsterm.m |  8 --------
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 90dbca7501b..3639d1b47e8 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -4520,9 +4520,17 @@ singleton list.
 ---
 ** Support macOS Accessibility Zoom focus tracking.
 This is an important change for visually-impaired users.  If macOS
-Accessibility Zoom is enabled (System Settings, Accessibility, Zoom)
-with keyboard focus tracking (Advanced...), Zoom is informed of updated
-cursor positions during each redisplay cycle.
+Accessibility Zoom is enabled via (System Settings, Accessibility,
+Zoom...)  with keyboard focus tracking (Advanced...), Zoom is informed
+of updated cursor positions during each redisplay cycle.
+
+---
+** New macOS function 'ns-process-is-accessibility-trusted'.
+This function returns t if the macOS Accessibility Framework trusts the
+Emacs.  This is a necessary condition for Accessibility Zoom and other
+accessibility features.  Enable Emacs via (System Settings, Privacy &
+Security, Accessibility...) and add the Emacs.app installed directory to
+the enabled application list.
 
 ---
 ** Process execution has been optimized on Android.
diff --git a/src/nsfns.m b/src/nsfns.m
index ae8e6e30e66..efe622782f7 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -3755,6 +3755,27 @@ The position is returned as a cons cell (X . Y) of the
   return Qnil;
 }
 
+
+DEFUN ("ns-process-is-accessibility-trusted",
+       Fns_process_is_accessibility_trusted,
+       Sns_process_is_accessibility_trusted,
+       0, 0, 0,
+       doc: /* Return non-nil if Emacs is trusted by macOS Accessibility.
+Return nil otherwise or if the OS is not macOS.
+This is necessary for Emacs to support Zoom and related accessibility
+features.  Authorize Emacs for accessibility via System
+Settings... Privacy & Security... Accessibility... and add the Emacs.app
+installed directory to the enabled application list.  */)
+  (void)
+{
+#ifdef NS_IMPL_COCOA
+  if (AXIsProcessTrusted())
+    return Qt;
+#endif
+  return Qnil;
+}
+
+
 DEFUN ("ns-badge", Fns_badge, Sns_badge, 1, 1, 0,
        doc: /* Set the app icon badge to BADGE.
 BADGE should be a string short enough to display nicely in the short
@@ -4248,6 +4269,7 @@ - (Lisp_Object)lispString
   defsubr (&Sns_set_mouse_absolute_pixel_position);
   defsubr (&Sns_mouse_absolute_pixel_position);
   defsubr (&Sns_show_character_palette);
+  defsubr (&Sns_process_is_accessibility_trusted);
   defsubr (&Sns_badge);
   defsubr (&Sns_request_user_attention);
   defsubr (&Sns_progress_indicator);
diff --git a/src/nsterm.m b/src/nsterm.m
index b16d020ebad..0dbb59344a3 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6517,14 +6517,6 @@ - (void)applicationDidFinishLaunching: (NSNotification *)notification
   }
 #endif
 
-#ifdef NS_IMPL_COCOA
-  /* Is accessibility enabled for this process/bundle?  */
-  if (AXIsProcessTrusted())
-    NSLog (@"Emacs is macOS AXIsProcessTrusted");
-  else
-    NSLog (@"Emacs is not macOS AXIsProcessTrusted");
-#endif
-
   ns_send_appdefined (-2);
 }
 

From 7d00565fee1b222e114473b4b4303c0598c2b1e9 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 9 Apr 2026 17:55:16 -0400
Subject: [PATCH 056/463] (elisp--font-lock-flush-elisp-buffers): Avoid eager
 font-locking

When jit-lock is not in use, `font-lock-flush` is too costly to
justify using it just to maybe update the highlighting of a few macro calls.

* lisp/progmodes/elisp-mode.el (elisp--font-lock-flush-elisp-buffers):
Skip buffers that use jit-lock, like the `*ielm*-comint-indirect` buffer.
---
 lisp/progmodes/elisp-mode.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 82b80cc16da..cf380ada975 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -774,7 +774,9 @@ be used instead.
     ;; be any need to font-lock-flush all the Elisp buffers.
     (dolist (buf (buffer-list))
       (with-current-buffer buf
-	(when (derived-mode-p 'emacs-lisp-mode)
+        (when (and (derived-mode-p 'emacs-lisp-mode)
+                   ;; Don't flush if it refontifies the whole buffer eagerly.
+                   font-lock-support-mode)
           ;; So as to take into account new macros that may have been defined
           ;; by the just-loaded file.
 	  (font-lock-flush))))))

From 34b582301f6849374caf2058d8cd45400735ae0e Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 10 Apr 2026 09:54:42 +0300
Subject: [PATCH 057/463] ; Update "Key Binding" node in Emacs Lisp Intro

* doc/lispintro/emacs-lisp-intro.texi (Key Bindings): Remove
obsolete text about \C in key bindings.  (Bug#80787)
---
 doc/lispintro/emacs-lisp-intro.texi | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 0211a4b3686..41ccfc11cba 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -16979,11 +16979,10 @@ The command invoked by the keys is @code{compare-windows}.  Note that
 @code{compare-windows} is preceded by a single-quote; otherwise, Emacs
 would first try to evaluate the symbol to determine its value.
 
-These three things, the double quotation marks, the backslash before
-the @samp{C}, and the single-quote are necessary parts of
-key binding that I tend to forget.  Fortunately, I have come to
-remember that I should look at my existing @file{.emacs} file, and
-adapt what is there.
+These two things, the double quotation marks and the single-quote, are
+necessary parts of key binding that I tend to forget.  Fortunately, I
+have come to remember that I should look at my existing @file{.emacs}
+file, and adapt what is there.
 
 As for the key binding itself: @kbd{C-c w}.  This combines the prefix
 key, @kbd{C-c}, with a single character, in this case, @kbd{w}.  This

From 5cb7446245ccf09c4186985f37cc4ad7a91488cd Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 10 Apr 2026 14:28:54 +0200
Subject: [PATCH 058/463] * test/infra/gitlab-ci.yml (default): User docker
 28.5.2.

---
 test/infra/gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 1f0f33bbe86..9a90727699a 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -62,7 +62,7 @@ variables:
   # CI_DEBUG_TRACE: "true"
 
 default:
-  image: docker:19.03.12
+  image: docker:28.5.2
   timeout: 3 hours
   before_script:
     - docker info

From fe90f2d87ecd65a671ac884dcf7be3692d5ae184 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 10 Apr 2026 14:59:17 +0200
Subject: [PATCH 059/463] * test/infra/gitlab-ci.yml (default): User docker
 28.5.2.

---
 test/infra/gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 0d7d31c3fdd..12890b50f9f 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2025 Free Software Foundation, Inc.
+# Copyright (C) 2017-2026 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
@@ -62,7 +62,7 @@ variables:
   # CI_DEBUG_TRACE: "true"
 
 default:
-  image: docker:19.03.12
+  image: docker:28.5.2
   timeout: 3 hours
   before_script:
     - docker info

From 923eb9afef02f2d788d67660725e9687bd783ccf Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 10 Apr 2026 12:04:59 -0400
Subject: [PATCH 060/463] src/eval.c (Fdefault_toplevel_value): Improve
 docstring (bug#80775)

---
 src/eval.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/eval.c b/src/eval.c
index 0b451b2c891..ff2ce1b01a5 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -810,7 +810,10 @@ lexbound_p (Lisp_Object symbol)
 
 DEFUN ("default-toplevel-value", Fdefault_toplevel_value, Sdefault_toplevel_value, 1, 1, 0,
        doc: /* Return SYMBOL's toplevel default value.
-"Toplevel" means outside of any let binding.  */)
+"Toplevel" means outside of any let binding.
+Signals `void-variable' if there is no such value, which can
+happen even if `default-boundp' is non-nil.
+Note: In most cases, you'll want to use `default-value' instead.  */)
   (Lisp_Object symbol)
 {
   union specbinding *binding = default_toplevel_binding (symbol);
@@ -824,7 +827,8 @@ DEFUN ("default-toplevel-value", Fdefault_toplevel_value, Sdefault_toplevel_valu
 DEFUN ("set-default-toplevel-value", Fset_default_toplevel_value,
        Sset_default_toplevel_value, 2, 2, 0,
        doc: /* Set SYMBOL's toplevel default value to VALUE.
-"Toplevel" means outside of any let binding.  */)
+"Toplevel" means outside of any let binding.
+Note: In most cases, you'll want to use `set-default' instead.  */)
      (Lisp_Object symbol, Lisp_Object value)
 {
   union specbinding *binding = default_toplevel_binding (symbol);

From b07a3970aecee69b0bff88a28b344a4020a3701f Mon Sep 17 00:00:00 2001
From: Henrique Martins <mh-e-users-2009@martins.cc>
Date: Fri, 10 Apr 2026 11:04:09 -0700
Subject: [PATCH 061/463] MH-E: remember destination when refiling a thread
 (SF#473)

* lisp/mh-e/mh-thread.el (mh-thread-refile): Add an optional argument
'dont-update-last-destination-flag'.  If it is nil, update
'mh-last-destination' and 'mh-last-destination-folder'.

Copyright-paperwork-exempt: yes
---
 lisp/mh-e/mh-thread.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/mh-e/mh-thread.el b/lisp/mh-e/mh-thread.el
index 3f2f9b5958d..00351b730c3 100644
--- a/lisp/mh-e/mh-thread.el
+++ b/lisp/mh-e/mh-thread.el
@@ -193,7 +193,7 @@ sibling."
   (mh-thread-next-sibling t))
 
 ;;;###mh-autoload
-(defun mh-thread-refile (folder)
+(defun mh-thread-refile (folder  &optional dont-update-last-destination-flag)
   "Refile (output) thread into FOLDER."
   (interactive (list (intern (mh-prompt-for-refile-folder))))
   (cond ((not (memq 'unthread mh-view-ops))
@@ -201,6 +201,9 @@ sibling."
         ((eobp)
          (error "No message at point"))
         (t (let ((region (mh-thread-find-children)))
+             (unless dont-update-last-destination-flag
+               (setq mh-last-destination (cons 'refile folder)
+                     mh-last-destination-folder mh-last-destination))
              (mh-iterate-on-messages-in-region () (car region) (cadr region)
                (mh-refile-a-msg nil folder))
              (mh-next-msg)))))

From 80c0529e94357cfe46e52089b3c113e944efa0e4 Mon Sep 17 00:00:00 2001
From: Mike Kupfer <kupfer@rawbw.com>
Date: Fri, 10 Apr 2026 11:04:29 -0700
Subject: [PATCH 062/463] Improve previous change.

* lisp/mh-e/mh-thread.el: Require 'mh-folder.
(mh-thread-refile): Update the docstring.
---
 lisp/mh-e/mh-thread.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/mh-e/mh-thread.el b/lisp/mh-e/mh-thread.el
index 00351b730c3..b21b23483c7 100644
--- a/lisp/mh-e/mh-thread.el
+++ b/lisp/mh-e/mh-thread.el
@@ -73,6 +73,7 @@
 
 (require 'mh-e)
 (require 'mh-scan)
+(require 'mh-folder)
 
 (cl-defstruct (mh-thread-message (:conc-name mh-message-)
                                  (:constructor mh-thread-make-message))
@@ -193,8 +194,11 @@ sibling."
   (mh-thread-next-sibling t))
 
 ;;;###mh-autoload
-(defun mh-thread-refile (folder  &optional dont-update-last-destination-flag)
-  "Refile (output) thread into FOLDER."
+(defun mh-thread-refile (folder &optional dont-update-last-destination-flag)
+  "Refile (output) thread into FOLDER.
+In a program, update the variables `mh-last-destination' and
+`mh-last-destination-folder' unless DONT-UPDATE-LAST-DESTINATION-FLAG is
+non-nil."
   (interactive (list (intern (mh-prompt-for-refile-folder))))
   (cond ((not (memq 'unthread mh-view-ops))
          (error "Folder isn't threaded"))

From bc0eacca9707296cbe1088c127a7fa7716e86202 Mon Sep 17 00:00:00 2001
From: Mike Kupfer <kupfer@rawbw.com>
Date: Fri, 10 Apr 2026 11:04:34 -0700
Subject: [PATCH 063/463] ; * etc/MH-E-NEWS: Document the fix for SF#473.

---
 etc/MH-E-NEWS | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 19677670860..9ec4135d2d6 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -3,6 +3,19 @@
 Copyright (C) 2001-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
+* Changes in Emacs 31.1
+
+** Bug Fixes in Emacs 31.1
+
+*** 'mh-thread-refile' now remembers the destination folder.
+
+For consistency with 'mh-refile-msg', 'mh-thread-refile' now updates
+'mh-last-destination' and 'mh-last-destination-folder' unless the
+optional argument 'dont-update-last-destination-flag' is non-nil (closes
+SF #473).
+
+
+
 * Changes in MH-E 8.6
 
 Version 8.6 fixes composition errors in nmh 1.6.

From 708759324e2314eb912ddb9758cabecd16469ffe Mon Sep 17 00:00:00 2001
From: Pip Cet <pipcet@protonmail.com>
Date: Fri, 10 Apr 2026 10:10:59 +0000
Subject: [PATCH 064/463] Don't accept dead selected_frame in
 x_connection_closed (bug#80789)

* src/xterm.c (x_connection_closed): Try to restore frame if the
selected frame is dead. If that fails, abort.
---
 src/xterm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index d7451b538e3..48fb78a6f63 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -26961,7 +26961,7 @@ For details, see etc/PROBLEMS.\n",
 
   /* The initial "daemon" frame is sometimes not selected by
      `delete_frame' when Emacs is a background daemon.  */
-  if (NILP (selected_frame))
+  if (NILP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame)))
     x_try_restore_frame ();
 
   unblock_input ();
@@ -26970,7 +26970,8 @@ For details, see etc/PROBLEMS.\n",
      terminal caused all frames to vanish.  In that case, simply kill
      Emacs, since the next redisplay will abort as there is no more
      selected frame.  (bug#56528) */
-  if (terminal_list == 0 || NILP (selected_frame))
+  if (terminal_list == 0 || NILP (selected_frame)
+      || !FRAME_LIVE_P (XFRAME (selected_frame)))
     Fkill_emacs (make_fixnum (70), Qnil);
 
   totally_unblock_input ();

From 2edcc6d4223a2837e594ff83c13832533b5e3ef8 Mon Sep 17 00:00:00 2001
From: Pip Cet <pipcet@protonmail.com>
Date: Fri, 10 Apr 2026 11:35:22 +0000
Subject: [PATCH 065/463] Ensure selected_frame isn't the deleted frame
 (bug#80789)

The previous code would sometimes exit the loop with frame1 set to the
last considered frame, even if that wasn't a suitable frame to switch
to.

* src/frame.c (delete_frame): Reset 'frame1' in the loops if we don't
match the break condition, so we don't think we've found a suitable
replacement frame if we haven't. Error if, for some reason, that
fails.
---
 src/frame.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/frame.c b/src/frame.c
index d0d02eaeb1f..2c0a27cf47c 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2733,8 +2733,6 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
 	error ("Attempt to delete the only frame");
     }
 
-  /* At this point, we are committed to deleting the frame.
-     There is no more chance for errors to prevent it.  */
   sf = SELECTED_FRAME ();
   /* Don't let the frame remain selected.  */
   if (f == sf)
@@ -2754,7 +2752,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
 		 frames on the same terminal as FRAME, excluding FRAME
 		 which we are about to delete.  */
 	      frame1 = safe_calln (Qget_mru_frame, Qvisible, Qnil, frame);
-	      if (!NILP (frame1))
+	      if (FRAMEP (frame1))
 		{
 		  struct frame *f1 = XFRAME (frame1);
 
@@ -2764,6 +2762,8 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
 		      || EQ (frame1, frame))
 		    frame1 = Qnil;
 		}
+	      else
+		frame1 = Qnil;
 	    }
 
 	  if (NILP (frame1))
@@ -2783,6 +2783,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
 		      && FRAME_TERMINAL (f) == FRAME_TERMINAL (f1)
 		      && FRAME_VISIBLE_P (f1))
 		    break;
+		  frame1 = Qnil;
 		}
 
 	      /* If there is none, find *some* other frame.  */
@@ -2805,6 +2806,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
 			    }
 			  break;
 			}
+		      frame1 = Qnil;
 		    }
 		}
 #ifdef NS_IMPL_COCOA
@@ -2821,8 +2823,18 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
 #endif
 	    }
 
-	  do_switch_frame (frame1, 0, 1, Qnil);
+	  if (FRAMEP (frame1) && XFRAME (frame1) != f)
+	    do_switch_frame (frame1, 0, 1, Qnil);
+	  else if (EQ (force, Qnoelisp))
+	    {
+	      /* This is the last frame, and it's being forcibly
+		 deleted.  There's no way to recover from this.  */
+	      Fkill_emacs (make_fixnum (70), Qnil);
+	    }
+	  else
+	    emacs_abort ();
 	  sf = SELECTED_FRAME ();
+	  eassert (sf != f);
 	}
     }
   else
@@ -2830,6 +2842,8 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
        frame.  */
     move_minibuffers_onto_frame (f, selected_frame, true);
 
+  /* At this point, we are committed to deleting the frame.
+     There is no more chance for errors to prevent it.  */
   /* Don't let echo_area_window to remain on a deleted frame.  */
   if (EQ (f->minibuffer_window, echo_area_window))
     echo_area_window = sf->minibuffer_window;

From c05037ba1cddb20fee7446c4b2c73deb310b194c Mon Sep 17 00:00:00 2001
From: Pip Cet <pipcet@protonmail.com>
Date: Fri, 10 Apr 2026 11:59:23 +0000
Subject: [PATCH 066/463] Don't continue FOR_EACH_FRAME loops after
 delete_frame (bug#80789)

* src/xterm.c (x_connection_closed, x_delete_terminal): Restart
FOR_EACH_FRAME loops after deleting one (or potentially more) frames.
---
 src/xterm.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index 48fb78a6f63..b02380a7171 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -26861,6 +26861,7 @@ x_connection_closed (Display *dpy, const char *error_message, bool ioerror)
 
   /* First delete frames whose mini-buffers are on frames
      that are on the dead display.  */
+ delete_more_minibuffer_frames:
   FOR_EACH_FRAME (tail, frame)
     {
       /* Tooltip frames don't have these, so avoid crashing.  */
@@ -26875,12 +26876,16 @@ x_connection_closed (Display *dpy, const char *error_message, bool ioerror)
 	  && FRAME_X_P (XFRAME (minibuf_frame))
 	  && ! EQ (frame, minibuf_frame)
 	  && FRAME_DISPLAY_INFO (XFRAME (minibuf_frame)) == dpyinfo)
-	delete_frame (frame, Qnoelisp);
+	{
+	  delete_frame (frame, Qnoelisp);
+	  goto delete_more_minibuffer_frames;
+	}
     }
 
   /* Now delete all remaining frames on the dead display.
      We are now sure none of these is used as the mini-buffer
      for another frame that we need to delete.  */
+ delete_more_frames:
   FOR_EACH_FRAME (tail, frame)
     if (FRAME_X_P (XFRAME (frame))
 	&& FRAME_DISPLAY_INFO (XFRAME (frame)) == dpyinfo)
@@ -26889,6 +26894,7 @@ x_connection_closed (Display *dpy, const char *error_message, bool ioerror)
 	   trying to find a replacement.  */
 	kset_default_minibuffer_frame (FRAME_KBOARD (XFRAME (frame)), Qt);
 	delete_frame (frame, Qnoelisp);
+	goto delete_more_frames;
       }
 
   /* If DPYINFO is null, this means we didn't open the display in the
@@ -32029,13 +32035,17 @@ x_delete_terminal (struct terminal *terminal)
   /* Delete all remaining frames on the display that is going away.
      Otherwise, font backends assume the display is still up, and
      xftfont_end_for_frame crashes.  */
+ delete_more_frames:
   FOR_EACH_FRAME (tail, frame)
     {
       f = XFRAME (frame);
 
       if (FRAME_LIVE_P (f) && f->terminal == terminal)
-	/* Pass Qnoelisp rather than Qt.  */
-	delete_frame (frame, Qnoelisp);
+	{
+	  /* Pass Qnoelisp rather than Qt.  */
+	  delete_frame (frame, Qnoelisp);
+	  goto delete_more_frames;
+	}
     }
 
 #ifdef HAVE_X_I18N

From 52e484742d9d95dd488f15dbe35962d342712137 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 10 Apr 2026 14:38:06 -0400
Subject: [PATCH 067/463] uni-script.el: Fix failure when loading the file
 directly

* lisp/international/textsec.el (textsec--create-script-table): Autoload
and don't define while compiling.
(uni-script): Require only when loading, not when compiling.
---
 lisp/international/textsec.el | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lisp/international/textsec.el b/lisp/international/textsec.el
index 5157a1fef93..55080169f62 100644
--- a/lisp/international/textsec.el
+++ b/lisp/international/textsec.el
@@ -33,15 +33,16 @@
 
 (defvar textsec--char-scripts nil)
 
-(eval-and-compile
-  (defun textsec--create-script-table (data)
-    "Create the textsec--char-scripts char table."
-    (setq textsec--char-scripts (make-char-table nil))
-    (dolist (scripts data)
-      (dolist (range (cadr scripts))
-        (set-char-table-range textsec--char-scripts
-                              range (car scripts)))))
-  (require 'uni-scripts))
+;;;###autoload
+(defun textsec--create-script-table (data)
+  "Create the textsec--char-scripts char table."
+  (setq textsec--char-scripts (make-char-table nil))
+  (dolist (scripts data)
+    (dolist (range (cadr scripts))
+      (set-char-table-range textsec--char-scripts
+                            range (car scripts)))))
+
+(if t (require 'uni-scripts))
 
 (defun textsec-scripts (string)
   "Return a list of Unicode scripts used by characters in STRING.

From 6a90e0ee324f6fd0efe8b0de2a82c8a8a09dd19d Mon Sep 17 00:00:00 2001
From: Stephen Berman <stephen.berman@gmx.net>
Date: Sat, 11 Apr 2026 11:01:05 +0200
Subject: [PATCH 068/463] Handle 'dired' called with -Al switches (bug#80711)

* lisp/dired.el (dired-internal-noselect): After reading in
directory, check whether there was an 'ls' error instead of
checking for file entries, since there may be none is the -Al
switches (or just -l) were used.
(dired--display-ls-error): Ensure the 'ls' error buffer is a live buffer.

* lisp/files.el (insert-directory-clean): Ensure deletion of
"//DIRED-OPTIONS//" line when using -Al switches (or just -l).
---
 lisp/dired.el | 18 +++++++-----------
 lisp/files.el |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lisp/dired.el b/lisp/dired.el
index 353190347db..2f66753f230 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1456,16 +1456,12 @@ The return value is the target column for the file names."
       (let ((failed t))
 	(unwind-protect
 	    (progn (dired-readin)
-                   ;; Check for file entries (they are listed below the
-                   ;; directory name and (if present) wildcard lines).
-                   (while (and (skip-syntax-forward "\s")
-                               (looking-at "\\(.+:$\\|wildcard\\)"))
-                     (forward-line))
-                   (unless (eobp)
+                   (unless (and dired--ls-error-buffer
+                                (get-buffer "*ls error*"))
 		     (setq failed nil)))
-	  ;; No file entries indicates an `ls' error, and `dired-readin'
-	  ;; can fail if parent directories are inaccessible.  In either
-	  ;; case don't leave the Dired buffer around.
+	  ;; If either `dired-readin' failed (e.g. if parent directories
+	  ;; are inaccessible) or `ls' errored, don't leave the Dired
+	  ;; buffer around.
 	  (when failed
             (kill-buffer buffer)
             (setq buffer nil))))
@@ -4112,8 +4108,8 @@ See `%s' for other alternatives and more information."))
                         (search-backward "Warning (dired)")))))
 
 (defun dired--display-ls-error ()
-  "Pop up a buffer displaying the current `ls' error, if any."
-  (when dired--ls-error-buffer
+  "Pop up the buffer displaying the current `ls' error, if any."
+  (when (buffer-live-p dired--ls-error-buffer)
     (let* ((errwin (display-buffer dired--ls-error-buffer)))
       (fit-window-to-buffer errwin))
     (setq dired--ls-error-buffer nil)))
diff --git a/lisp/files.el b/lisp/files.el
index e05a4b99497..15bcf3568a2 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -8340,7 +8340,7 @@ Valid wildcards are `*', `?', `[abc]' and `[a-z]'."
       ;; Take care of the case where the ls output contains a
       ;; "//DIRED-OPTIONS//"-line, but no "//DIRED//"-line
       ;; and we went one line too far back (see above).
-      (unless (bobp) (forward-line 1)))
+      (forward-line 1))
     (if (let ((case-fold-search nil)) (looking-at "//DIRED-OPTIONS//"))
 	(delete-region (point) (progn (forward-line 1) (point))))))
 

From 69d6f58557e43cb91455e203332d54c1f9aed704 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 11 Apr 2026 12:27:08 +0300
Subject: [PATCH 069/463] Fix face extension in 'visual-line-mode'

* src/xdisp.c (display_line): Under WORD_WRAP, save and restore
the iterator _before_ the wrap point.  This fixes face extension
under 'visual-line-mode', because otherwise 'extend_face_to_end_of_line'
is called with the value of 'it' that corresponds to the first display
element on the next screen line.  (Bug#80673)
---
 src/xdisp.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 99474d7abdc..370c3ec30c1 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -25691,8 +25691,8 @@ display_line (struct it *it, int cursor_vpos)
 {
   struct glyph_row *row = it->glyph_row;
   Lisp_Object overlay_arrow_string;
-  struct it wrap_it;
-  void *wrap_data = NULL;
+  struct it wrap_it, prev_it;
+  void *wrap_data = NULL, *prev_data = NULL;
   bool may_wrap = false;
   int wrap_x UNINIT;
   int wrap_row_used = -1;
@@ -25701,6 +25701,7 @@ display_line (struct it *it, int cursor_vpos)
   int wrap_row_extra_line_spacing UNINIT;
   ptrdiff_t wrap_row_min_pos UNINIT, wrap_row_min_bpos UNINIT;
   ptrdiff_t wrap_row_max_pos UNINIT, wrap_row_max_bpos UNINIT;
+  int wrap_face_id UNINIT, prev_face_id;
   int cvpos;
   ptrdiff_t min_pos = ZV + 1, max_pos = 0;
   ptrdiff_t min_bpos UNINIT, max_bpos UNINIT;
@@ -25871,6 +25872,7 @@ display_line (struct it *it, int cursor_vpos)
 
   /* Loop generating characters.  The loop is left with IT on the next
      character to display.  */
+  wrap_face_id = -1;
   while (true)
     {
       int n_glyphs_before, hpos_before, x_before;
@@ -25964,9 +25966,17 @@ display_line (struct it *it, int cursor_vpos)
 		  wrap_row_min_bpos = min_bpos;
 		  wrap_row_max_pos = max_pos;
 		  wrap_row_max_bpos = max_bpos;
+		  wrap_face_id = prev_face_id;
 		}
 	      /* Update may_wrap for the next iteration.  */
               may_wrap = next_may_wrap;
+	      if (may_wrap)
+		{
+		  prev_face_id = it->face_id;
+		  SAVE_IT (prev_it, *it, prev_data);
+		}
+	      else
+		prev_face_id = -1;
 	    }
 	}
 
@@ -26224,8 +26234,10 @@ display_line (struct it *it, int cursor_vpos)
 		      if (row->reversed_p)
 			unproduce_glyphs (it,
 					  row->used[TEXT_AREA] - wrap_row_used);
-		      RESTORE_IT (it, &wrap_it, wrap_data);
-		      it->continuation_lines_width += wrap_x;
+		      /* We need to extend the face of the display
+                         element _before_ the wrap point.  */
+		      eassert (wrap_face_id >= 0);
+		      RESTORE_IT (it, &prev_it, prev_data);
 		      row->used[TEXT_AREA] = wrap_row_used;
 		      row->ascent = wrap_row_ascent;
 		      row->height = wrap_row_height;
@@ -26239,10 +26251,11 @@ display_line (struct it *it, int cursor_vpos)
 		      row->continued_p = true;
 		      row->ends_at_zv_p = false;
 		      row->exact_window_width_line_p = false;
-
 		      /* Make sure that a non-default face is extended
 			 up to the right margin of the window.  */
 		      extend_face_to_end_of_line (it);
+		      RESTORE_IT (it, &wrap_it, wrap_data);
+		      it->continuation_lines_width += wrap_x;
 		    }
 		  else if ((it->what == IT_CHARACTER
 			    || it->what == IT_STRETCH
@@ -26541,6 +26554,8 @@ display_line (struct it *it, int cursor_vpos)
 
   if (wrap_data)
     bidi_unshelve_cache (wrap_data, true);
+  if (prev_data)
+    bidi_unshelve_cache (prev_data, true);
 
   /* If line is not empty and hscrolled, maybe insert truncation glyphs
      at the left window margin.  */

From 3e5697864ca5866345763f8baff132bb539a7833 Mon Sep 17 00:00:00 2001
From: Stephen Berman <stephen.berman@gmx.net>
Date: Sat, 11 Apr 2026 11:46:52 +0200
Subject: [PATCH 070/463] Ensure Dired does not list deleted 'ls' error file

* lisp/dired.el (dired--ls-error-file): New variable.
(dired-readin-insert): Use it to find and remove entry in Dired
buffer of already deleted temporary 'ls' error file (bug#80499).

* lisp/files.el (insert-directory): Set it to temporary 'ls' error file.
---
 lisp/dired.el | 20 +++++++++++++++++++-
 lisp/files.el |  2 ++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/lisp/dired.el b/lisp/dired.el
index 2f66753f230..62b1cce0247 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -649,6 +649,9 @@ The match starts at the beginning of the line and ends after the end
 of the line.
 Subexpression 2 must end right before the \\n.")
 
+(defvar dired--ls-error-file nil
+  "When non-nil, name of temporary file an `ls' error is written to.")
+
 (defvar dired--ls-error-buffer nil
   "Non-nil if the current dired invocation yields an `ls' error.
 The non-nil value is the buffer containing the error message.")
@@ -1615,7 +1618,22 @@ wildcards, erases the buffer, and builds the subdir-alist anew
       ;; Else treat it as a wildcard spec
       ;; unless we have an explicit list of files.
       (dired-insert-directory dir dired-actual-switches
-       file-list (not file-list) t)))))
+                              file-list (not file-list) t)))
+    ;; Every time `temporary-file-directory' is (re)displayed in Dired a
+    ;; new `ls' error file is created and the Dired buffer has an entry
+    ;; for it.  The file itself is deleted in `insert-directory' but its
+    ;; Dired entry remains, so we remove it here.
+    (let ((tmpbuf (dired-find-buffer-nocreate temporary-file-directory)))
+      (when tmpbuf
+        (with-current-buffer tmpbuf
+          (widen)
+          (goto-char (point-min))
+          (when (search-forward (file-name-base dired--ls-error-file) nil t)
+            ;; The call chain of `dired-remove-entry' requires non-nil
+            ;; `dired-subdir-alist', but here it is nil, so we set it.
+            (let ((dired-subdir-alist `((,temporary-file-directory
+                                         . ,(point-min-marker)))))
+              (dired-remove-entry dired--ls-error-file))))))))
 
 (defun dired-align-file (beg end)
   "Align the fields of a file to the ones of surrounding lines.
diff --git a/lisp/files.el b/lisp/files.el
index 15bcf3568a2..d555fab7323 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -8489,6 +8489,8 @@ normally equivalent short `-D' option is just passed on to
               (erase-buffer)
               (insert-file-contents errfile))
             (setq dired--ls-error-buffer errbuf)))
+        (defvar dired--ls-error-file) ; Pacify byte-compiler.
+        (setq dired--ls-error-file errfile)
         (delete-file errfile)
 
         (insert-directory-clean beg switches)

From adfa1e969f869381b0a59cb1124bc38e3dd93d03 Mon Sep 17 00:00:00 2001
From: Stephen Berman <stephen.berman@gmx.net>
Date: Sat, 11 Apr 2026 12:09:42 +0200
Subject: [PATCH 071/463] Improve tests involving 'ls' error message

* test/lisp/dired-tests.el (dired-test-ls-error-message):
* test/lisp/files-tests.el
(files-tests-file-name-non-special-insert-directory): Make test
comparing the expected 'ls' error message with the string in the
'ls' error buffer more robust (bug#80499).
---
 test/lisp/dired-tests.el | 23 +++++++++++++++--------
 test/lisp/files-tests.el | 23 +++++++++++++++--------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el
index 77ed07fcc42..35795825365 100644
--- a/test/lisp/dired-tests.el
+++ b/test/lisp/dired-tests.el
@@ -751,17 +751,24 @@ hence another buffer should be returned."
     (unless (and (featurep 'ls-lisp)
                  (boundp 'ls-lisp-use-insert-directory-program)
                  (null ls-lisp-use-insert-directory-program))
-      (let ((errbuf (get-buffer "*ls error*")))
+      (let ((errbuf (get-buffer "*ls error*"))
+            ;; Since different `ls' programs can produce different
+            ;; messages for the nonexisting file error, we make a sample
+            ;; message to use for comparing the expected message with
+            ;; the string in the error buffer.
+            (ls-err (lambda (fn)
+		      (let* ((tmpname (make-temp-name "/bug80499-tests-"))
+                             (errlist (string-split
+                                       (shell-command-to-string
+                                        (concat insert-directory-program
+                                                " -al " tmpname))
+                                       tmpname)))
+                        (concat (car errlist) fn (cadr errlist))))))
         (should (get-buffer-window errbuf))
         (should-not (equal (buffer-name buf) (file-name-nondirectory name)))
         (with-current-buffer errbuf
-          (should (string-match-p
-                   (format
-                    ;; Use .* around file name to account for different
-                    ;; file-name quoting styles, or no quoting at all.
-                    "%s: cannot access .*%s.*: No such file or directory\n"
-                    insert-directory-program (file-name-nondirectory name))
-                   (buffer-string))))
+          (should (equal (funcall ls-err (file-name-nondirectory name))
+                         (buffer-string))))
         (kill-buffer errbuf))
       (delete-directory dir t))))
 
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index 6781c4a3d8b..7b049af7070 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -1033,16 +1033,23 @@ unquoted file names."
       (let ((errbuf (get-buffer "*ls error*"))
             ;; By the time `ls' is called in `insert-directory', the
             ;; handler prefix has been removed.
-            (nospecial-dir (string-remove-prefix "/:" nospecial-dir)))
+            (nospecial-dir (string-remove-prefix "/:" nospecial-dir))
+            ;; Since different `ls' programs can produce different
+            ;; messages for the nonexisting file error, we make a sample
+            ;; message to use for comparing the expected message with
+            ;; the string in the error buffer.
+            (ls-err (lambda (fn)
+		      (let* ((tmpname (make-temp-name "/bug80499-tests-"))
+                             (errlist (string-split
+                                       (shell-command-to-string
+                                        (concat insert-directory-program
+                                                " -al " tmpname))
+                                       tmpname)))
+                        (concat (car errlist) fn (cadr errlist))))))
         (should errbuf)
         (with-current-buffer errbuf
-          (should (string-match-p
-                   (format
-                    ;; Use .* around file name to account for different
-                    ;; file-name quoting styles, or no quoting at all.
-                    "%s: cannot access .*%s.*: No such file or directory\n"
-                    insert-directory-program nospecial-dir)
-                   (buffer-string))))
+          (should (equal (funcall ls-err nospecial-dir)
+                         (buffer-string))))
         (kill-buffer errbuf)))))
 
 (ert-deftest files-tests-file-name-non-special-insert-file-contents ()

From 1eb7218f90159459e857734c3e5f4b7cdf2f2bda Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 11 Apr 2026 14:49:47 +0300
Subject: [PATCH 072/463] Fix display of ambiguous-width characters on
 MS-Windows terminal

* src/w32console.c (syms_of_ntterm) <w32--terminal-is-conhost>:
New variable.
(initialize_w32_display): Set 'w32--terminal-is-conhost' non-nil
when running on ConHost.

* lisp/international/characters.el (use-cjk-char-width-table):
When Emacs runs on MS-Windows Terminal, behave as if
'cjk-ambiguous-chars-are-wide' were nil even in CJK locales.
(Bug#79298)
---
 lisp/international/characters.el | 13 ++++++++++---
 src/w32console.c                 | 18 ++++++++++++++++--
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index d19802c46fd..b29b0f8d094 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1711,11 +1711,18 @@ the value of the variable with `setq'."
 				 (car code-range) (cdr code-range)))))
 	(optimize-char-table table)
 	(set-char-table-parent table char-width-table)
-        (let ((tbl (make-char-table nil)))
+        (let ((tbl (make-char-table nil))
+              (ambiguous-is-wide
+               (and cjk-ambiguous-chars-are-wide
+                    ;; MS-Windows Terminal forces all ambiguous
+                    ;; characters to be narrow, even in CJK locales.
+                    (not (and (boundp 'w32--terminal-is-conhost)
+                              (null w32--terminal-is-conhost))))))
           (map-char-table
            (lambda (range _val)
-             (set-char-table-range tbl range
-                                   (if cjk-ambiguous-chars-are-wide 2 1)))
+             (set-char-table-range
+              tbl range
+              (if ambiguous-is-wide 2 1)))
            ambiguous-width-chars)
           (optimize-char-table tbl)
           (set-char-table-parent tbl table)
diff --git a/src/w32console.c b/src/w32console.c
index b0a2f0c1c0e..8737b9cca70 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -59,12 +59,13 @@ static WORD w32_face_attributes (struct frame *f, int face_id);
 static int  w32con_write_vt_seq (const char *);
 static void turn_on_face (struct frame *, int face_id);
 static void turn_off_face (struct frame *, int face_id);
-static COORD w32con_get_cursor_coords ();
+static COORD w32con_get_cursor_coords (void);
 
 static COORD	cursor_coords;
 static HANDLE	prev_screen, cur_screen;
 static WORD	char_attr_normal;
 static DWORD	prev_console_mode;
+static DWORD	prev_output_mode;
 static int      bg_normal;
 static int      fg_normal;
 
@@ -121,7 +122,7 @@ w32con_write_vt_seq (const char *seq)
 }
 
 static COORD
-w32con_get_cursor_coords ()
+w32con_get_cursor_coords (void)
 {
   CONSOLE_SCREEN_BUFFER_INFO info;
   GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &info);
@@ -1005,6 +1006,13 @@ initialize_w32_display (struct terminal *term, int *width, int *height)
   GetConsoleCursorInfo (prev_screen, &prev_console_cursor);
 #endif
 
+  /* Record whether we are on ConHost or Windows Terminal.  */
+  const DWORD virt_mode_flags
+    = (ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
+  GetConsoleMode (cur_screen, &prev_output_mode);
+  w32__terminal_is_conhost =
+    (prev_output_mode & virt_mode_flags) != virt_mode_flags;
+
   /* Respect setting of LINES and COLUMNS environment variables.  */
   {
     char * lines = getenv ("LINES");
@@ -1204,6 +1212,12 @@ may be preferable when working directly at the console with a large
 scroll-back buffer.  */);
   w32_use_full_screen_buffer = 0;
 
+  DEFVAR_BOOL ("w32--terminal-is-conhost",
+	       w32__terminal_is_conhost,
+	       doc: /* Non-nil means Emacs text-mode terminal is MS-Windows ConHost.
+If nil, Emacs is displaying text-mode frames on the Windows Terminal.  */);
+  w32__terminal_is_conhost = 0;
+
   defsubr (&Sset_screen_color);
   defsubr (&Sget_screen_color);
   defsubr (&Sw32_use_virtual_terminal);

From e8203e314241112ce581e167083e38700cb3ce96 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 11 Apr 2026 15:29:25 +0300
Subject: [PATCH 073/463] Fix setting and restoring cursor shape on Windows
 Terminal

* src/w32console.c (w32con_set_cursor_size): New function.
(w32con_reset_terminal_modes, w32con_set_terminal_modes)
(Fset_cursor_size): Use it to change cursor shape on Windows
Terminal.
---
 src/w32console.c | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/w32console.c b/src/w32console.c
index 8737b9cca70..ea62d59a787 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -157,6 +157,32 @@ w32con_show_cursor (void)
   SetConsoleCursorInfo (cur_screen, &console_cursor_info);
 }
 
+static void
+w32con_set_cursor_size (EMACS_INT esize)
+{
+
+  if (w32_use_virtual_terminal && !w32__terminal_is_conhost)
+    {
+      /* The Virtual Terminal Sequences don't support arbitrary sizes of
+         the block and underline cursor, so we can only provide 2
+         extreme shapes.  */
+      if (esize < 50)
+	w32con_write_vt_seq ("\x1b[3 q");
+      else
+	w32con_write_vt_seq ("\x1b[1 q");
+    }
+  else
+    {
+      /* Use legacy APIs, which on Windows Terminal don't change the
+         cursor shape.  */
+      CONSOLE_CURSOR_INFO cci;
+      cci.dwSize = esize;
+      cci.bVisible = TRUE;
+      (void) SetConsoleCursorInfo (cur_screen, &cci);
+    }
+}
+
+
 /* Clear from cursor to end of screen.  */
 static void
 w32con_clear_to_end (struct frame *f)
@@ -657,6 +683,8 @@ w32con_reset_terminal_modes (struct terminal *t)
   SetConsoleActiveScreenBuffer (prev_screen);
 #else
   SetConsoleCursorInfo (prev_screen, &prev_console_cursor);
+  if (w32_use_virtual_terminal)
+    w32con_set_cursor_size (prev_console_cursor.dwSize);
 #endif
 
   SetConsoleMode (keyboard_handle, prev_console_mode);
@@ -665,12 +693,8 @@ w32con_reset_terminal_modes (struct terminal *t)
 static void
 w32con_set_terminal_modes (struct terminal *t)
 {
-  CONSOLE_CURSOR_INFO cci;
-
-  /* make cursor big and visible (100 on Windows 95 makes it disappear)  */
-  cci.dwSize = 99;
-  cci.bVisible = TRUE;
-  (void) SetConsoleCursorInfo (cur_screen, &cci);
+  /* Make cursor big and visible (100 on Windows 95 makes it disappear).  */
+  w32con_set_cursor_size (99);
 
   SetConsoleActiveScreenBuffer (cur_screen);
 
@@ -1192,10 +1216,7 @@ DEFUN ("set-cursor-size", Fset_cursor_size, Sset_cursor_size, 1, 1, 0,
        doc: /* Set cursor size.  */)
   (Lisp_Object size)
 {
-  CONSOLE_CURSOR_INFO cci;
-  cci.dwSize = XFIXNAT (size);
-  cci.bVisible = TRUE;
-  (void) SetConsoleCursorInfo (cur_screen, &cci);
+  w32con_set_cursor_size (XFIXNAT (size));
 
   return Qt;
 }

From 15f1b565a2e7a7cb68e662dfc852e840db6a954b Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 11 Apr 2026 15:39:47 +0300
Subject: [PATCH 074/463] ; * lisp/dired.el (dired-readin-insert): Fix a recent
 change (bug#80499).

---
 lisp/dired.el | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lisp/dired.el b/lisp/dired.el
index 62b1cce0247..3a5a9a3a525 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1622,18 +1622,20 @@ wildcards, erases the buffer, and builds the subdir-alist anew
     ;; Every time `temporary-file-directory' is (re)displayed in Dired a
     ;; new `ls' error file is created and the Dired buffer has an entry
     ;; for it.  The file itself is deleted in `insert-directory' but its
-    ;; Dired entry remains, so we remove it here.
-    (let ((tmpbuf (dired-find-buffer-nocreate temporary-file-directory)))
-      (when tmpbuf
-        (with-current-buffer tmpbuf
-          (widen)
-          (goto-char (point-min))
-          (when (search-forward (file-name-base dired--ls-error-file) nil t)
-            ;; The call chain of `dired-remove-entry' requires non-nil
-            ;; `dired-subdir-alist', but here it is nil, so we set it.
-            (let ((dired-subdir-alist `((,temporary-file-directory
-                                         . ,(point-min-marker)))))
-              (dired-remove-entry dired--ls-error-file))))))))
+    ;; Dired entry remains, so we remove it here.  This is not relevant
+    ;; if ls-lisp emulation is used.
+    (when (files--use-insert-directory-program-p)
+      (let ((tmpbuf (dired-find-buffer-nocreate temporary-file-directory)))
+        (when tmpbuf
+          (with-current-buffer tmpbuf
+            (widen)
+            (goto-char (point-min))
+            (when (search-forward (file-name-base dired--ls-error-file) nil t)
+              ;; The call chain of `dired-remove-entry' requires non-nil
+              ;; `dired-subdir-alist', but here it is nil, so we set it.
+              (let ((dired-subdir-alist `((,temporary-file-directory
+                                           . ,(point-min-marker)))))
+                (dired-remove-entry dired--ls-error-file)))))))))
 
 (defun dired-align-file (beg end)
   "Align the fields of a file to the ones of surrounding lines.

From ee9b2db1cf036d6f511d7e6eea0189073076e7c0 Mon Sep 17 00:00:00 2001
From: Stephen Berman <stephen.berman@gmx.net>
Date: Sat, 11 Apr 2026 15:40:40 +0200
Subject: [PATCH 075/463] ; Fix last change to 'ls' error message tests

* test/lisp/dired-tests.el (dired-test-ls-error-message):
* test/lisp/files-tests.el
(files-tests-file-name-non-special-insert-directory): Use
`string-match-p' instead of `equal' because the error message may
report e.g. "/bin/ls" even though the value of
`insert-directory-program' is "ls".
---
 test/lisp/dired-tests.el | 7 +++++--
 test/lisp/files-tests.el | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el
index 35795825365..f5f92fd6485 100644
--- a/test/lisp/dired-tests.el
+++ b/test/lisp/dired-tests.el
@@ -767,8 +767,11 @@ hence another buffer should be returned."
         (should (get-buffer-window errbuf))
         (should-not (equal (buffer-name buf) (file-name-nondirectory name)))
         (with-current-buffer errbuf
-          (should (equal (funcall ls-err (file-name-nondirectory name))
-                         (buffer-string))))
+          ;; The error message may report e.g. "/bin/ls" even though the
+          ;; value of `insert-directory-program' is "ls", so we can't
+          ;; test with `equal'.
+          (should (string-match-p (funcall ls-err (file-name-nondirectory name))
+                                  (buffer-string))))
         (kill-buffer errbuf))
       (delete-directory dir t))))
 
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index 7b049af7070..037e354d841 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -1048,8 +1048,11 @@ unquoted file names."
                         (concat (car errlist) fn (cadr errlist))))))
         (should errbuf)
         (with-current-buffer errbuf
-          (should (equal (funcall ls-err nospecial-dir)
-                         (buffer-string))))
+          ;; The error message may report e.g. "/bin/ls" even though the
+          ;; value of `insert-directory-program' is "ls", so we can't
+          ;; test with `equal'.
+          (should (string-match-p (funcall ls-err nospecial-dir)
+                                  (buffer-string))))
         (kill-buffer errbuf)))))
 
 (ert-deftest files-tests-file-name-non-special-insert-file-contents ()

From 386e9598b638f07ca9fb9179e4e1e31b47fcd484 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 12 Apr 2026 11:54:08 +0300
Subject: [PATCH 076/463] ; * doc/lispintro/emacs-lisp-intro.texi (Files List):
 Fix typo (bug#80694).

---
 doc/lispintro/emacs-lisp-intro.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 41ccfc11cba..85aa8107232 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -15348,7 +15348,7 @@ Here is the function:
 @c (files-in-below-directory "/usr/local/src/emacs/lisp/")
 @c (files-in-below-directory "/usr/local/share/emacs/22.1.1/lisp/")
 
-The @code{files-in-below-directory} @code{directory-files} function
+The @code{files-in-below-directory} function
 takes one argument, the name of a directory.
 
 @need 1250

From 6eea01533770d2bfcd15b9e81c40bf77ab1ae39d Mon Sep 17 00:00:00 2001
From: Richard Lawrence <rwl@recursewithless.net>
Date: Sat, 7 Mar 2026 12:20:00 +0100
Subject: [PATCH 077/463] Improve performance of icalendar-recur.el and its
 tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As discussed in Bug#80520.

* test/lisp/calendar/icalendar-recur-tests.el
(icalendar-test-rrule-test-rfc5545-sec3.8.5.3/3)
(icalendar-test-rrule-test-rfc5545-sec3.8.5.3/29)
(icalendar-test-rrule-test-rfc5545-sec3.8.5.3/30)
(icalendar-test-rrule-test-rfc5545-sec3.8.5.3/31)
(icalendar-test-rrule-test-rfc5545-sec3.8.5.3/33)
(icalendar-test-rrule-test-rfc5545-sec3.8.5.3/34)
(icalendar-test-rrule-test-rfc5545-sec3.8.5.3/38): Mark tests expensive.

Abstract the implementation of intervals in icalendar-recur.el.  Don't
store interval NEXT-LOW when it's the same as HIGH.  This reduces
allocations, and shaves about ~20% off the full test suite.

* lisp/calendar/icalendar-recur.el
(icalendar-recur-make-interval)
(icalendar-recur-interval-low)
(icalendar-recur-interval-high)
(icalendar-recur-interval-next): Implement intervals and subintervals as
vectors.  Only store NEXT-LOW when it's non-nil.
(icalendar-recur-find-absolute-interval)
(icalendar-recur-find-daily-interval)
(icalendar-recur-find-weekly-interval)
(icalendar-recur-find-monthly-interval)
(icalendar-recur-find-yearly-interval)
(icalendar-recur-next-interval)
(icalendar-recur-previous-interval)
(icalendar-recur-refine-byyearday)
(icalendar-recur-refine-byweekno)
(icalendar-recur-refine-bymonth)
(icalendar-recur-refine-bymonthday)
(icalendar-recur-refine-byday)
(icalendar-recur-refine-byhour)
(icalendar-recur-refine-byminute)
(icalendar-recur-refine-bysecond)
(icalendar-recur-subintervals-to-date-times)
(icalendar-recur-subintervals-to-dates)
(icalendar-recur-recurrences-in-interval)
(icalendar-recur-recurrences-in-window)
(icalendar-recur--key-from-interval): Use new interval constructor and
accessors.  Don't generate NEXT-LOW when it's the same as HIGH.
* lisp/calendar/icalendar-utils.el (icalendar-dates-until): Use new
interval constructor and accessors.
* test/lisp/calendar/icalendar-recur-tests.el
(icalendar-test-recur-find-secondly-interval)
(icalendar-test-recur-find-minutely-interval)
(icalendar-test-recur-find-hourly-interval)
(icalendar-test-recur-find-daily-interval-w/date)
(icalendar-test-recur-find-daily-interval-w/date-time)
(icalendar-test-recur-find-weekly-interval-w/date)
(icalendar-test-recur-find-weekly-interval-w/date-time)
(icalendar-test-recur-find-monthly-interval)
(icalendar-test-recur-find-yearly-interval)
(icalendar-test-recur-refine-byyearday)
(icalendar-test-recur-refine-bymonth)
(icalendar-test-recur-refine-bymonthday)
(icalendar-test-recur-refine-byday)
(icalendar-test-recur-refine-byhour)
(icalendar-test-recur-refine-byminute)
(icalendar-test-recur-refine-bysecond)
(icalendar-test-recur-subintervals-to-dates)
(icalendar-test-recur-subintervals-to-date-times)
(icalendar-test-rrule-test): Use new interval constructor and accessors.

Rearrange loops when refining subintervals, so that the loop always runs
once but doesn't run a second no-op iteration.  Astonishingly this cuts
the running time of the full test suite by almost 50%.

* lisp/calendar/icalendar-recur.el (icalendar-recur-refine-byyearday)
(icalendar-recur-refine-byweekno)
(icalendar-recur-refine-bymonth)
(icalendar-recur-refine-bymonthday)
(icalendar-recur-refine-byday)
(icalendar-recur-refine-byhour)
(icalendar-recur-refine-byminute)
(icalendar-recur-refine-bysecond): Tighten up loop bounds when refining
subintervals.

Improve performance of `icalendar-recur-tz-observance-on'.  This also
brings about a ~20% performance gain.

* lisp/calendar/icalendar-recur.el
(icalendar-recur-tz-observance-on): Eliminate calculation of previous
interval recurrences when it's unnecessary.  Add a cheap upper bound check to
prevent fully computing recurrences for irrelevant observances.
(icalendar-recur--w/in-locally-p):
(icalendar-recur--w/in-abs-p): New helper functions for the upper bound check.

Other more minor changes:

Improve performance in `icalendar-recur-refine-byday'

* lisp/calendar/icalendar-recur.el (icalendar-recur-refine-byday): Avoid
calculating Gregorian from absolute date unless it's necessary.

Improve performance of BYSETPOS filtering in icalendar-recur.el:
η-reduce `icalendar-recur-make-bysetpos-filter'.
Thanks to Mattias Engdegård for the suggestion and implementation.

* lisp/calendar/icalendar-recur.el
(icalendar-recur-make-bysetpos-filter): Rename to
`icalendar-recur-bysetpos-filter' and avoid `seq-map-indexed'.
(icalendar-recur-recurrences-in-interval): Use new function.
* test/lisp/calendar/icalendar-recur-tests.el
(icalendar-test-recur-bysetpos-filter): Use new function.

Improve sorting performance:
Thanks to Mattias Engdegård for the suggestion and implementation.

* lisp/calendar/icalendar-recur.el (icalendar-recur-refine-byyearday):
(icalendar-recur-refine-byweekno):
(icalendar-recur-refine-bymonthday):
(icalendar-recur-refine-byday): Use :key instead of :lessp in `sort'
calls.

Eliminate `apply-partially' and `seq-take':
Thanks to Mattias Engdegård for the suggestion and implementation.

* lisp/calendar/icalendar-recur.el
(icalendar-recur-recurrences-in-window): Eliminate `apply-partially'.
(icalendar-recur-recurrences-in-interval): Eliminate
`apply-partially' and replace `seq-take' with `take'.

Reduce consing:

* lisp/calendar/icalendar-recur.el
(icalendar-recur-subintervals-to-dates):
(icalendar-recur-recurrences-in-window):
(icalendar-recur-recurrences-in-window-w/end-times):
(icalendar-recur-recurrences-to-count): Replace `append' with `nconc'.

Avoid a few uses of `seq-filter' in common functions in icalendar-ast.el:

* lisp/calendar/icalendar-ast.el (icalendar-ast-node-children-of):
Reimplement filter imperatively.
---
 lisp/calendar/icalendar-ast.el              |   7 +-
 lisp/calendar/icalendar-recur.el            | 507 ++++++++++++--------
 lisp/calendar/icalendar-utils.el            |  16 +-
 test/lisp/calendar/icalendar-recur-tests.el | 249 +++++-----
 4 files changed, 451 insertions(+), 328 deletions(-)

diff --git a/lisp/calendar/icalendar-ast.el b/lisp/calendar/icalendar-ast.el
index e9c289f16db..cfbc6c7cac8 100644
--- a/lisp/calendar/icalendar-ast.el
+++ b/lisp/calendar/icalendar-ast.el
@@ -293,8 +293,11 @@ PROPS should be a plist with any of the following keywords:
 
 (defun ical:ast-node-children-of (type node)
   "Return a list of all the children of NODE of type TYPE."
-  (seq-filter (lambda (c) (eq type (ical:ast-node-type c)))
-              (ical:ast-node-children node)))
+  (let (tchildren)
+    (dolist (c (ical:ast-node-children node))
+      (when (eq type (ical:ast-node-type c))
+        (push c tchildren)))
+    (nreverse tchildren)))
 
 
 ;; A high-level API for constructing iCalendar syntax nodes in Lisp code:
diff --git a/lisp/calendar/icalendar-recur.el b/lisp/calendar/icalendar-recur.el
index 2eaa48a76d0..c01116fc5a7 100644
--- a/lisp/calendar/icalendar-recur.el
+++ b/lisp/calendar/icalendar-recur.el
@@ -131,24 +131,38 @@
 ;; also in this case, recurrences are generated for one interval at a
 ;; time, because a BYSETPOS clause might apply.
 ;;
-;; An interval is represented as a list (LOW HIGH NEXT-LOW) of decoded
-;; times.  The length of time between LOW and HIGH corresponds to the
-;; FREQ rule part: they are one year apart for a 'YEARLY rule, a month
-;; apart for a 'MONTHLY rule, etc.  NEXT-LOW is the upper bound of the
-;; interval: it is equal to LOW in the subsequent interval.  When the
-;; INTERVAL rule part is equal to 1 (the default), HIGH and NEXT-LOW are
-;; the same, but if it is > 1, NEXT-LOW is equal to LOW + INTERVAL *
-;; FREQ.  For example, in a 'MONTHLY rule where INTERVAL=3, which means
-;; "every three months", LOW and HIGH bound the first month, while HIGH
-;; and NEXT-LOW bound the following two months.
+;; An interval is represented as a vector like [LOW HIGH NEXT-LOW] of
+;; decoded times.  The length of time between LOW and HIGH corresponds
+;; to the FREQ rule part: they are one year apart for a 'YEARLY rule, a
+;; month apart for a 'MONTHLY rule, etc.  NEXT-LOW is the upper bound of
+;; the interval: it is equal to LOW in the subsequent interval.  When
+;; the INTERVAL rule part is equal to 1 (the default), HIGH and NEXT-LOW
+;; are the same, but if it is > 1, NEXT-LOW is equal to LOW + INTERVAL *
+;; FREQ.  (For performance reasons, NEXT-LOW is therefore left out of
+;; the vector when it is redundant.)  For example, in a 'MONTHLY rule
+;; where INTERVAL=3, which means "every three months", LOW and HIGH
+;; bound the first month, while HIGH and NEXT-LOW bound the following
+;; two months.
 ;;
 ;; The times between LOW and HIGH are candidates for recurrences.  LOW
 ;; is an inclusive lower bound, and HIGH is an exclusive upper bound:
 ;; LOW <= R < HIGH for each recurrence R in the interval.  The times
 ;; between HIGH and NEXT-LOW are not candidates for recurrences.
-;;
+
+(defun icr:make-interval (low high &optional next-low)
+  (if next-low
+      (vector low high next-low)
+    (vector low high)))
+
+(defsubst icr:interval-low (interval)
+  (aref interval 0))
+(defsubst icr:interval-high (interval)
+  (aref interval 1))
+(defsubst icr:interval-next (interval)
+  (aref interval (1- (length interval)))) ; = NEXT-LOW if present, HIGH otherwise
+
 ;; The following functions deal with constructing intervals, given a
-;; target, a start date/time, and intervalsize, and optionally a time
+;; target, a start date/time, an intervalsize, and optionally a time
 ;; zone.  The main entry point is `icalendar-recur-find-interval'.
 
 ;; Look, dragons already:
@@ -252,7 +266,8 @@ returned interval looks like (LOW LOW+FREQS LOW+INTERVALSIZE).  See
       (let ((offset (decoded-time-zone target-w/zone)))
         (setq low (icr:tz-decode-time low-abs offset)
               high (icr:tz-decode-time (+ low-abs freqs) offset)
-              next-low (icr:tz-decode-time (+ low-abs intervalsize) offset))))
+              next-low (when (< 1 intervalsize)
+                         (icr:tz-decode-time (+ low-abs intervalsize) offset)))))
 
     (unless (and given-start-zone given-target-zone)
       ;; but if we started with floating times, we should return floating times:
@@ -260,10 +275,11 @@ returned interval looks like (LOW LOW+FREQS LOW+INTERVALSIZE).  See
       (setf (decoded-time-dst low) -1)
       (setf (decoded-time-zone high) nil)
       (setf (decoded-time-dst high) -1)
-      (setf (decoded-time-zone next-low) nil)
-      (setf (decoded-time-dst next-low) -1))
+      (when next-low
+        (setf (decoded-time-zone next-low) nil)
+        (setf (decoded-time-dst next-low) -1)))
 
-    (list low high next-low)))
+    (icr:make-interval low high next-low)))
 
 (defun icr:find-secondly-interval (target dtstart intervalsize &optional vtimezone)
   "Find a SECONDLY recurrence interval.
@@ -317,16 +333,18 @@ See `icalendar-recur-find-interval' for arguments' meanings."
                      (calendar-gregorian-from-absolute low-absdate)))
            (high-dt (ical:date-to-date-time
                       (calendar-gregorian-from-absolute high-absdate)))
-           (next-low-dt (ical:date-to-date-time
-                          (calendar-gregorian-from-absolute next-low-absdate))))
+           (next-low-dt (unless (= high-absdate next-low-absdate)
+                          (ical:date-to-date-time
+                           (calendar-gregorian-from-absolute next-low-absdate)))))
 
       (when vtimezone
         (icr:tz-set-zone low-dt vtimezone)
         (icr:tz-set-zone high-dt vtimezone)
-        (icr:tz-set-zone next-low-dt vtimezone))
+        (when next-low-dt
+          (icr:tz-set-zone next-low-dt vtimezone)))
 
       ;; Return the bounds:
-      (list low-dt high-dt next-low-dt))))
+      (icr:make-interval low-dt high-dt next-low-dt))))
 
 (defun icr:find-weekly-interval (target dtstart intervalsize
                                  &optional weekstart vtimezone)
@@ -358,16 +376,19 @@ See `icalendar-recur-find-interval' for arguments' meanings."
                (calendar-gregorian-from-absolute low-abs)))
          (high (ical:date-to-date-time
                (calendar-gregorian-from-absolute (+ 7 low-abs))))
-         (next-low (ical:date-to-date-time
-                    (calendar-gregorian-from-absolute (+ intsize-days low-abs)))))
+         (next-low
+          (when (< 1 intervalsize)
+            (ical:date-to-date-time
+             (calendar-gregorian-from-absolute (+ intsize-days low-abs))))))
 
     (when vtimezone
       (icr:tz-set-zone low vtimezone)
       (icr:tz-set-zone high vtimezone)
-      (icr:tz-set-zone next-low vtimezone))
+      (when next-low
+        (icr:tz-set-zone next-low vtimezone)))
 
     ;; Return the bounds:
-    (list low high next-low)))
+    (icr:make-interval low high next-low)))
 
 (defun icr:find-monthly-interval (target dtstart intervalsize &optional vtimezone)
   "Find a MONTHLY recurrence interval.
@@ -399,10 +420,12 @@ See `icalendar-recur-find-interval' for arguments' meanings."
          (low (ical:make-date-time :year low-year :month low-month :day 1
                                    :hour 0 :minute 0 :second 0 :tz vtimezone))
          (high (ical:date/time-add low :month 1 vtimezone))
-         (next-low (ical:date/time-add low :month intervalsize vtimezone)))
+         (next-low
+          (when (< 1 intervalsize)
+            (ical:date/time-add low :month intervalsize vtimezone))))
 
     ;; Return the bounds:
-    (list low high next-low)))
+    (icr:make-interval low high next-low)))
 
 (defun icr:find-yearly-interval (target dtstart intervalsize &optional vtimezone)
   "Find a YEARLY recurrence interval.
@@ -417,12 +440,14 @@ See `icalendar-recur-find-interval' for arguments' meanings."
                                    :hour 0 :minute 0 :second 0 :tz vtimezone))
          (high (ical:make-date-time :year (1+ low-year) :month 1 :day 1
                                     :hour 0 :minute 0 :second 0 :tz vtimezone))
-         (next-low (ical:make-date-time :year (+ low-year intervalsize)
-                                        :month 1 :day 1 :hour 0 :minute 0 :second 0
-                                        :tz vtimezone)))
+         (next-low
+          (when (< 1 intervalsize)
+            (ical:make-date-time :year (+ low-year intervalsize)
+                                 :month 1 :day 1 :hour 0 :minute 0 :second 0
+                                 :tz vtimezone))))
 
     ;; Return the bounds:
-    (list low high next-low)))
+    (icr:make-interval low high next-low)))
 
 (defun icr:find-interval (target dtstart recur-value &optional vtimezone)
   "Return the recurrence interval around TARGET.
@@ -430,7 +455,7 @@ See `icalendar-recur-find-interval' for arguments' meanings."
 TARGET and DTSTART should be `icalendar-date' or `icalendar-date-time'
 values.  RECUR-VALUE should be an `icalendar-recur'.
 
-The returned value is a list (LOW HIGH NEXT-LOW) which
+The returned value is an interval [LOW HIGH NEXT-LOW] which
 represents the lower and upper bounds of a recurrence interval around
 TARGET.  For some N, LOW is equal to START + N*INTERVALSIZE units, HIGH
 is equal to START + (N+1)*INTERVALSIZE units, and LOW <= TARGET < HIGH.
@@ -460,7 +485,7 @@ information and represent floating local times."
 (defun icr:nth-interval (n dtstart recur-value &optional vtimezone)
   "Return the Nth recurrence interval after DTSTART.
 
-The returned value is a list (LOW HIGH NEXT-LOW) which represent the Nth
+The returned value is an interval [LOW HIGH NEXT-LOW] which is the Nth
 recurrence interval after DTSTART.  LOW is equal to START +
 N*INTERVALSIZE units, HIGH is equal to START + (N+1)*INTERVALSIZE units,
 and LOW <= TARGET < HIGH.  START here is a time derived from DTSTART
@@ -498,10 +523,10 @@ information and represent floating local times."
 (defun icr:next-interval (interval recur-value &optional vtimezone)
   "Return the next recurrence interval after INTERVAL.
 
-Given a recurrence interval (LOW HIGH NEXT), returns the next interval
-\(NEXT HIGHER HIGHER-NEXT), where HIGHER and HIGHER-NEXT are determined
+Given a recurrence interval [LOW HIGH NEXT], returns the next interval
+[NEXT HIGHER HIGHER-NEXT], where HIGHER and HIGHER-NEXT are determined
 by the frequency and interval sizes of RECUR-VALUE."
-  (let* ((new-low (caddr interval))
+  (let* ((new-low (icr:interval-next interval))
          (freq (ical:recur-freq recur-value))
          (unit (cl-case freq
                  (YEARLY :year)
@@ -513,7 +538,9 @@ by the frequency and interval sizes of RECUR-VALUE."
                  (SECONDLY :second)))
          (intervalsize (ical:recur-interval-size recur-value))
          (new-high (ical:date/time-add new-low unit 1 vtimezone))
-         (new-next (ical:date/time-add new-low unit intervalsize vtimezone)))
+         (new-next
+          (when (< 1 intervalsize)
+            (ical:date/time-add new-low unit intervalsize vtimezone))))
 
     (when vtimezone
       (icr:tz-set-zone new-low vtimezone)
@@ -521,18 +548,18 @@ by the frequency and interval sizes of RECUR-VALUE."
       ;; (icr:tz-set-zone new-next vtimezone)
       )
 
-    (list new-low new-high new-next)))
+    (icr:make-interval new-low new-high new-next)))
 
 (defun icr:previous-interval (interval recur-value dtstart &optional vtimezone)
   "Given a recurrence INTERVAL, return the previous interval.
 
-For an interval (LOW HIGH NEXT-LOW), the previous interval is
-\(PREV-LOW PREV-HIGH LOW), where PREV-LOW and PREV-HIGH are determined by
+For an interval [LOW HIGH NEXT-LOW], the previous interval is
+[PREV-LOW PREV-HIGH LOW], where PREV-LOW and PREV-HIGH are determined by
 the frequency and interval sizes of RECUR-VALUE (see
 `icalendar-recur-find-interval').  If the resulting period of time
 between PREV-LOW and PREV-HIGH occurs entirely before DTSTART, then the
 interval does not exist; in this case nil is returned."
-  (let* ((upper (car interval))
+  (let* ((upper (icr:interval-low interval))
          (freq (ical:recur-freq recur-value))
          (unit (cl-case freq
                  (YEARLY :year)
@@ -544,7 +571,13 @@ interval does not exist; in this case nil is returned."
                  (SECONDLY :second)))
          (intervalsize (ical:recur-interval-size recur-value))
          (new-low (ical:date/time-add upper unit (* -1 intervalsize) vtimezone))
-         (new-high (ical:date/time-add new-low unit 1 vtimezone)))
+         (new-high
+          (if (< 1 intervalsize)
+              (ical:date/time-add new-low unit 1 vtimezone)
+            upper))
+         (new-upper
+          (when (< 1 intervalsize)
+            upper)))
 
     (when vtimezone
       ;; (icr:tz-set-zone new-low vtimezone)
@@ -552,7 +585,7 @@ interval does not exist; in this case nil is returned."
       (icr:tz-set-zone upper vtimezone))
 
     (unless (ical:date-time< new-high dtstart)
-      (list new-low new-high upper))))
+      (icr:make-interval new-low new-high new-upper))))
 
 
 
@@ -617,21 +650,18 @@ interval does not exist; in this case nil is returned."
 YEARDAYS should be a list of values from a recurrence rule's
 BYYEARDAY=... clause; see `icalendar-recur' for the possible values."
   (let* ((sorted-ydays (sort yeardays
-                             :lessp (lambda (a b)
-                                      (let ((pos-a (if (< 0 a) a (+ 366 a)))
-                                            (pos-b (if (< 0 b) b (+ 366 b))))
-                                        (< pos-a pos-b)))))
-         (interval-start (car interval))
-         (start-year (decoded-time-year interval-start))
-         (interval-end (cadr interval))
+                             :key (lambda (a) (if (< 0 a) a (+ 366 a)))))
+         (interval-start (icr:interval-low interval))
+         (curr-year (decoded-time-year interval-start))
+         (interval-end (icr:interval-high interval))
          (end-year (decoded-time-year interval-end))
          (subintervals nil))
-    (while (<= start-year end-year)
+    (while curr-year
       ;; For each year in the interval...
       (dolist (n sorted-ydays)
         ;; ...the subinterval is one day long on the nth yearday
-        (let* ((nthday (calendar-date-from-day-of-year start-year n))
-               (low (ical:make-date-time :year start-year
+        (let* ((nthday (calendar-date-from-day-of-year curr-year n))
+               (low (ical:make-date-time :year curr-year
                                          :month (calendar-extract-month nthday)
                                          :day (calendar-extract-day nthday)
                                          :hour 0 :minute 0 :second 0
@@ -648,9 +678,11 @@ BYYEARDAY=... clause; see `icalendar-recur' for the possible values."
           (when (and (ical:date-time<= interval-start low)
                      (ical:date-time< low high)
                      (ical:date-time<= high interval-end))
-            (push (list low high) subintervals))))
-
-      (setq start-year (1+ start-year)))
+            (push (icr:make-interval low high) subintervals))))
+      (setq curr-year (1+ curr-year))
+      (when (<= end-year curr-year)
+        ;; we're done:
+        (setq curr-year nil)))
     (nreverse subintervals)))
 
 (defun icr:refine-byweekno (interval weeknos &optional weekstart vtimezone)
@@ -660,20 +692,17 @@ WEEKNOS should be a list of values from a recurrence rule's
 BYWEEKNO=... clause, and WEEKSTART should be the value of its
 WKST=... clause (if any).  See `icalendar-recur' for the possible values."
   (let* ((sorted-weeknos (sort weeknos
-                               :lessp (lambda (a b)
-                                        (let ((pos-a (if (< 0 a) a (+ 53 a)))
-                                              (pos-b (if (< 0 b) b (+ 53 b))))
-                                          (< pos-a pos-b)))))
-         (interval-start (car interval))
-         (start-year (decoded-time-year interval-start))
-         (interval-end (cadr interval))
+                               :key (lambda (a) (if (< 0 a) a (+ 53 a)))))
+         (interval-start (icr:interval-low interval))
+         (curr-year (decoded-time-year interval-start))
+         (interval-end (icr:interval-high interval))
          (end-year (decoded-time-year interval-end))
          (subintervals nil))
-    (while (<= start-year end-year)
+    (while curr-year
       ;; For each year in the interval...
       (dolist (wn sorted-weeknos)
         ;; ...the subinterval is one week long in the wn-th week
-        (let* ((nth-wstart (ical:start-of-weekno wn start-year weekstart))
+        (let* ((nth-wstart (ical:start-of-weekno wn curr-year weekstart))
                (low (ical:make-date-time :year (calendar-extract-year nth-wstart)
                                          :month (calendar-extract-month nth-wstart)
                                          :day (calendar-extract-day nth-wstart)
@@ -690,8 +719,11 @@ WKST=... clause (if any).  See `icalendar-recur' for the possible values."
           (when (and (ical:date-time<= interval-start low)
                      (ical:date-time< low high)
                      (ical:date-time<= high interval-end))
-              (push (list low high) subintervals))))
-      (setq start-year (1+ start-year)))
+              (push (icr:make-interval low high) subintervals))))
+      (setq curr-year (1+ curr-year))
+      (when (<= end-year curr-year)
+        ;; we're done:
+        (setq curr-year nil)))
     (nreverse subintervals)))
 
 (defun icr:refine-bymonth (interval months &optional vtimezone)
@@ -700,17 +732,17 @@ WKST=... clause (if any).  See `icalendar-recur' for the possible values."
 MONTHS should be a list of values from a recurrence rule's
 BYMONTH=... clause; see `icalendar-recur' for the possible values."
   (let* ((sorted-months (sort months))
-         (interval-start (car interval))
-         (start-year (decoded-time-year interval-start))
-         (interval-end (cadr interval))
+         (interval-start (icr:interval-low interval))
+         (curr-year (decoded-time-year interval-start))
+         (interval-end (icr:interval-high interval))
          (end-year (decoded-time-year interval-end))
          (subintervals nil))
-    (while (<= start-year end-year)
+    (while curr-year
       ;; For each year in the interval...
       (dolist (m sorted-months)
         ;; ...the subinterval is from the first day of the given month
         ;; to the first day of the next
-        (let* ((low (ical:make-date-time :year start-year :month m :day 1
+        (let* ((low (ical:make-date-time :year curr-year :month m :day 1
                                          :hour 0 :minute 0 :second 0
                                          :tz vtimezone))
                (high (ical:date/time-add low :month 1 vtimezone)))
@@ -723,9 +755,11 @@ BYMONTH=... clause; see `icalendar-recur' for the possible values."
           (when (and (ical:date/time<= interval-start low)
                      (ical:date/time< low high)
                      (ical:date/time<= high interval-end))
-            (push (list low high) subintervals))))
-      (setq start-year (1+ start-year)))
-
+            (push (icr:make-interval low high) subintervals))))
+      (setq curr-year (1+ curr-year))
+      (when (<= end-year curr-year)
+        ; we're done:
+        (setq curr-year nil)))
     (nreverse subintervals)))
 
 (defun icr:refine-bymonthday (interval monthdays &optional vtimezone)
@@ -734,22 +768,20 @@ BYMONTH=... clause; see `icalendar-recur' for the possible values."
 MONTHDAYS should be a list of values from a recurrence rule's
 BYMONTHDAY=... clause; see `icalendar-recur' for the possible values."
   (let* ((sorted-mdays (sort monthdays
-                             :lessp (lambda (a b)
-                                      (let ((pos-a (if (< 0 a) a (+ 31 a)))
-                                            (pos-b (if (< 0 b) b (+ 31 b))))
-                                        (< pos-a pos-b)))))
-         (interval-start (car interval))
-         (interval-end (cadr interval))
+                             :key (lambda (a) (if (< 0 a) a (+ 31 a)))))
+         (interval-start (icr:interval-low interval))
+         (curr-dt interval-start)
+         (interval-end (icr:interval-high interval))
          (subintervals nil))
-    (while (ical:date-time<= interval-start interval-end)
+    (while curr-dt
       ;; For each month in the interval...
       (dolist (m sorted-mdays)
         ;; ...the subinterval is one day long on the given monthday
-        (let* ((month (ical:date/time-month interval-start))
-               (year (ical:date/time-year interval-start))
+        (let* ((month (ical:date/time-month curr-dt))
+               (year (ical:date/time-year curr-dt))
                (monthday (if (< 0 m) m
                            (+ m 1 (calendar-last-day-of-month month year))))
-               (low (ical:date-time-variant interval-start :day monthday
+               (low (ical:date-time-variant curr-dt :day monthday
                                             :hour 0 :minute 0 :second 0
                                             :tz vtimezone))
                (high (ical:date/time-add low :day 1 vtimezone)))
@@ -763,9 +795,11 @@ BYMONTHDAY=... clause; see `icalendar-recur' for the possible values."
             (when (and (ical:date/time<= interval-start low)
                        (ical:date/time< low high)
                        (ical:date/time<= high interval-end))
-              (push (list low high) subintervals)))))
-      (setq interval-start
-            (ical:date/time-add interval-start :month 1 vtimezone)))
+              (push (icr:make-interval low high) subintervals)))))
+      (setq curr-dt (ical:date/time-add curr-dt :month 1 vtimezone))
+      (when (ical:date-time<= interval-end curr-dt)
+        ;; we're done:
+        (setq curr-dt nil)))
     (nreverse subintervals)))
 
 (defun icr:refine-byday (interval weekdays &optional in-month vtimezone)
@@ -779,11 +813,11 @@ whether OFFSET is relative to the month of the start of the interval.  If
 it is nil, OFFSET will be relative to the year, rather than the month."
   (let* ((sorted-weekdays (sort (seq-filter #'natnump weekdays)))
          (with-offsets (sort (seq-filter #'consp weekdays)
-                             :lessp (lambda (w1 w2) (and (< (car w1) (car w2))))))
-         (interval-start (car interval))
-         (start-abs (calendar-absolute-from-gregorian
-                     (ical:date-time-to-date interval-start)))
-         (interval-end (cadr interval))
+                             :key #'car))
+         (interval-start (icr:interval-low interval))
+         (curr-abs (calendar-absolute-from-gregorian
+                    (ical:date-time-to-date interval-start)))
+         (interval-end (icr:interval-high interval))
          (end-abs (calendar-absolute-from-gregorian
                    (ical:date-time-to-date interval-end)))
          (subintervals nil))
@@ -810,15 +844,15 @@ it is nil, OFFSET will be relative to the year, rather than the month."
         (when (and (ical:date/time<= interval-start low)
                    (ical:date/time<= high interval-end)
                    (ical:date/time< low high))
-          (push (list low high) subintervals))))
+          (push (icr:make-interval low high) subintervals))))
 
     ;; When no offset was given, for each day in the interval...
-    (while (and (<= start-abs end-abs)
-                sorted-weekdays)
+    (while (and curr-abs sorted-weekdays)
       ;; ...the subinterval is one day long on matching weekdays.
-      (let* ((gdate (calendar-gregorian-from-absolute start-abs)))
-        (when (memq (calendar-day-of-week gdate) sorted-weekdays)
-          (let* ((low (ical:date-to-date-time gdate))
+      (when (memq (mod curr-abs 7) ; = weekday of absolute date;
+                  sorted-weekdays) ;   see `calendar-day-of-week'
+          (let* ((gdate (calendar-gregorian-from-absolute curr-abs))
+                 (low (ical:date-to-date-time gdate))
                  (high (ical:date/time-add low :day 1 vtimezone)))
             (when (ical:date/time< low interval-start)
               (setq low interval-start))
@@ -830,13 +864,16 @@ it is nil, OFFSET will be relative to the year, rather than the month."
             (when (and (ical:date/time<= interval-start low)
                        (ical:date/time<= high interval-end)
                        (ical:date/time< low high))
-              (push (list low high) subintervals)))))
-      (setq start-abs (1+ start-abs)))
+              (push (icr:make-interval low high) subintervals))))
+      (setq curr-abs (1+ curr-abs))
+      (when (<= end-abs curr-abs)
+        ;; we're done:
+        (setq curr-abs nil)))
 
     ;; Finally, sort and return all subintervals:
     (sort subintervals
-          :lessp (lambda (int1 int2)
-                   (ical:date-time< (car int1) (car int2)))
+          :key #'icr:interval-low
+          :lessp #'ical:date-time<
           :in-place t)))
 
 (defun icr:refine-byhour (interval hours &optional vtimezone)
@@ -845,27 +882,31 @@ it is nil, OFFSET will be relative to the year, rather than the month."
 HOURS should be a list of values from a recurrence rule's
 BYHOUR=... clause; see `icalendar-recur' for the possible values."
   (let* ((sorted-hours (sort hours))
-         (interval-start (car interval))
-         (interval-end (cadr interval))
+         (interval-start (icr:interval-low interval))
+         (interval-end (icr:interval-high interval))
+         (curr-dt interval-start)
          (subintervals nil))
-    (while (ical:date-time<= interval-start interval-end)
+    (while curr-dt
       ;; For each day in the interval...
       (dolist (h sorted-hours)
         ;; ...the subinterval is one hour long in the given hour
-        (let* ((low (ical:date-time-variant interval-start
+        (let* ((low (ical:date-time-variant curr-dt
                                             :hour h :minute 0 :second 0
                                             :tz vtimezone))
                (high (ical:date/time-add low :hour 1 vtimezone)))
           (ignore-errors ; do not generate subintervals for nonexisting times
-            (when (ical:date/time< low interval-start)
-              (setq low interval-start))
+            (when (ical:date/time< low curr-dt)
+              (setq low curr-dt))
             (when (ical:date/time< interval-end high)
               (setq high interval-end))
             (when (and (ical:date/time<= interval-start low)
                        (ical:date/time< low high)
                        (ical:date/time<= high interval-end))
-              (push (list low high) subintervals)))))
-      (setq interval-start (ical:date/time-add interval-start :day 1 vtimezone)))
+              (push (icr:make-interval low high) subintervals)))))
+      (setq curr-dt (ical:date/time-add curr-dt :day 1 vtimezone))
+      (when (ical:date-time<= interval-end curr-dt)
+        ;; we're done:
+        (setq curr-dt nil)))
     (nreverse subintervals)))
 
 (defun icr:refine-byminute (interval minutes &optional vtimezone)
@@ -874,33 +915,37 @@ BYHOUR=... clause; see `icalendar-recur' for the possible values."
 MINUTES should be a list of values from a recurrence rule's
 BYMINUTE=... clause; see `icalendar-recur' for the possible values."
   (let* ((sorted-minutes (sort minutes))
-         (interval-start (car interval))
-         (interval-end (cadr interval))
+         (interval-start (icr:interval-low interval))
+         (interval-end (icr:interval-high interval))
          ;; we use absolute times (in seconds) for the loop variables in
          ;; case the interval crosses the boundary between two observances:
-         (low-ts (time-convert (encode-time interval-start) 'integer))
+         (curr-dt interval-start)
+         (curr-ts (time-convert (encode-time curr-dt) 'integer))
          (end-ts (time-convert (encode-time interval-end) 'integer))
          (subintervals nil))
-    (while (<= low-ts end-ts)
+    (while curr-ts
       ;; For each hour in the interval...
       (dolist (m sorted-minutes)
         ;; ...the subinterval is one minute long in the given minute
-        (let* ((low (ical:date-time-variant interval-start :minute m :second 0
+        (let* ((low (ical:date-time-variant curr-dt :minute m :second 0
                                             :tz vtimezone))
                (high (ical:date/time-add low :minute 1 vtimezone)))
           (ignore-errors ; do not generate subintervals for nonexisting times
             ;; Clip the subinterval, as above
             (when (ical:date/time< low interval-start)
-              (setq low interval-start))
+              (setq low curr-dt))
             (when (ical:date/time< interval-end high)
               (setq high interval-end))
             (when (and (ical:date/time<= interval-start low)
                        (ical:date/time< low high)
                        (ical:date/time<= high interval-end))
-              (push (list low high) subintervals)))))
-      (setq low-ts (+ low-ts (* 60 60))
-            interval-start (if vtimezone (icr:tz-decode-time low-ts vtimezone)
-                             (ical:date/time-add interval-start :hour 1))))
+              (push (icr:make-interval low high) subintervals)))))
+      (setq curr-ts (+ curr-ts (* 60 60))
+            curr-dt (if vtimezone (icr:tz-decode-time curr-ts vtimezone)
+                             (ical:date/time-add curr-dt :hour 1)))
+      (when (<= end-ts curr-ts)
+        ;; we're done:
+        (setq curr-ts nil)))
     (nreverse subintervals)))
 
 (defun icr:refine-bysecond (interval seconds &optional vtimezone)
@@ -909,32 +954,36 @@ BYMINUTE=... clause; see `icalendar-recur' for the possible values."
 SECONDS should be a list of values from a recurrence rule's
 BYSECOND=... clause; see `icalendar-recur' for the possible values."
   (let* ((sorted-seconds (sort seconds))
-         (interval-start (car interval))
-         (interval-end (cadr interval))
+         (interval-start (icr:interval-low interval))
+         (interval-end (icr:interval-high interval))
          ;; we use absolute times (in seconds) for the loop variables in
          ;; case the interval crosses the boundary between two observances:
-         (low-ts (time-convert (encode-time interval-start) 'integer))
+         (curr-dt interval-start)
+         (curr-ts (time-convert (encode-time curr-dt) 'integer))
          (end-ts (time-convert (encode-time interval-end) 'integer))
          (subintervals nil))
-    (while (<= low-ts end-ts)
+    (while curr-ts
       ;; For each minute in the interval...
       (dolist (s sorted-seconds)
         ;; ...the subinterval is one second long: the given second
-        (let* ((low (ical:date-time-variant interval-start :second s
+        (let* ((low (ical:date-time-variant curr-dt :second s
                                             :tz vtimezone))
                (high (ical:date/time-add low :second 1 vtimezone)))
           (when (ical:date/time< low interval-start)
-            (setq low interval-start))
+            (setq low curr-dt))
           (when (ical:date/time< interval-end high)
             (setq high interval-end))
           (when (and (ical:date/time<= interval-start low)
                      (ical:date/time< low high)
                      (ical:date/time<= high interval-end))
-            (push (list low high) subintervals))))
-      (setq low-ts (+ low-ts 60)
-            interval-start (if vtimezone
-                               (icr:tz-decode-time low-ts vtimezone)
-                             (ical:date/time-add interval-start :minute 1))))
+            (push (icr:make-interval low high) subintervals))))
+      (setq curr-ts (+ curr-ts 60)
+            curr-dt (if vtimezone
+                               (icr:tz-decode-time curr-ts vtimezone)
+                             (ical:date/time-add curr-dt :minute 1)))
+      (when (<= end-ts curr-ts)
+        ;; we're done:
+        (setq curr-ts nil)))
     (nreverse subintervals)))
 
 ;; TODO: should this just become a generic function, with the above
@@ -952,8 +1001,8 @@ BYSECOND=... clause; see `icalendar-recur' for the possible values."
     (BYMINUTE (icr:refine-byminute interval values vtimezone))
     (BYSECOND (icr:refine-bysecond interval values vtimezone))))
 
-(defun icr:make-bysetpos-filter (setpos)
-  "Return a filter on values for the indices in SETPOS.
+(defun icr:bysetpos-filter (setpos recurrences)
+  "Filter RECURRENCES on values for the indices in SETPOS.
 
 SETPOS should be a list of positive or negative integers between -366
 and 366, indicating a fixed index in a set of recurrences for *one
@@ -962,23 +1011,24 @@ an `icalendar-recur'.  For example, in a YEARLY recurrence rule with an
 INTERVAL of 1, the SETPOS represent indices in the recurrence instances
 generated for a single year.
 
-The returned value is a closure which can be called on the list of
-recurrences for one interval to filter it by index."
-  (lambda (dts)
-    (let* ((len (length dts))
-           (keep-indices (mapcar
-                          (lambda (pos)
-                            ;; sequence indices are 0-based, POS's are 1-based:
-                            (if (< pos 0)
-                                (+ pos len)
-                              (1- pos)))
-                          setpos)))
-      (delq nil
-        (seq-map-indexed
-         (lambda (dt index)
-           (when (memq index keep-indices)
-                 dt))
-         dts)))))
+The returned value is RECURRENCES filtered by index."
+  (let* ((len (length recurrences))
+         (keep-indices (mapcar
+                        (lambda (pos)
+                          ;; sequence indices are 0-based, POS's are 1-based:
+                          (if (< pos 0)
+                              (+ pos len)
+                            (1- pos)))
+                        setpos))
+         (r nil)
+         (i 0)
+         (dts recurrences))
+    (while dts
+      (when (memq i keep-indices)
+        (push (car dts) r))
+      (incf i)
+      (pop dts))
+    (nreverse r)))
 
 (defun icr:refine-from-clauses (interval recur-value dtstart
                                 &optional vtimezone)
@@ -1099,13 +1149,13 @@ The returned list of recurrences contains one date-time value for each
 second of each subinterval."
   (let (recurrences)
     (dolist (int subintervals)
-      (let* ((start (car int))
+      (let* ((start (icr:interval-low int))
              (dt start)
              ;; Use absolute times for the loop in case the subinterval
              ;; crosses the boundary between two observances.
              ;; N.B. floating times will be correctly treated as local
              ;; times by encode-time.
-             (end (time-convert (encode-time (cadr int)) 'integer))
+             (end (time-convert (encode-time (icr:interval-high int)) 'integer))
              (tick (time-convert (encode-time start) 'integer)))
         (while (time-less-p tick end)
           (push dt recurrences)
@@ -1121,10 +1171,10 @@ The returned list of recurrences contains one date value for each
 day of each subinterval."
   (let (recurrences)
     (dolist (int subintervals)
-      (let* ((start (car int))
+      (let* ((start (icr:interval-low int))
              (start-abs (calendar-absolute-from-gregorian
                          (ical:date-time-to-date start)))
-             (end (cadr int))
+             (end (icr:interval-high int))
              (end-abs (calendar-absolute-from-gregorian
                        (ical:date-time-to-date end)))
              ;; end is an exclusive upper bound, but number-sequence
@@ -1136,9 +1186,9 @@ day of each subinterval."
                         (1- end-abs)
                       end-abs)))
         (setq recurrences
-              (append recurrences
-                      (mapcar #'calendar-gregorian-from-absolute
-                              (number-sequence start-abs bound))))))
+              (nconc recurrences
+                     (mapcar #'calendar-gregorian-from-absolute
+                             (number-sequence start-abs bound))))))
     recurrences))
 
 (defun icr:subintervals-to-recurrences (subintervals dtstart &optional vtimezone)
@@ -1162,7 +1212,7 @@ subinterval of the same type as DTSTART."
 (defun icr:recurrences-in-interval (interval component &optional vtimezone nmax)
   "Return a list of the recurrences of COMPONENT in INTERVAL.
 
-INTERVAL should be a list (LOW HIGH NEXT) of date-times which bound a
+INTERVAL should be an interval [LOW HIGH NEXT] of date-times which bound a
 single recurrence interval, as returned e.g. by
 `icalendar-recur-find-interval'.  (To find the recurrences in an
 arbitrary window of time, rather than between interval boundaries, see
@@ -1209,11 +1259,7 @@ retrieved on subsequent calls with the same arguments."
                                       :zone offset-from
                                       :dst (not (ical:daylight-component-p
                                                  component)))))
-      (cl-labels ((get-interval
-                    (apply-partially #'icr:-set-get-interval component))
-                  (put-interval
-                    (apply-partially #'icr:-set-put-interval component)))
-        (let ((cached (get-interval interval)))
+        (let ((cached (icr:-set-get-interval component interval)))
           (cond ((eq cached :none) nil)
                 (cached cached)
                 (t
@@ -1227,8 +1273,7 @@ retrieved on subsequent calls with the same arguments."
                         (keep-indices (ical:recur-by* 'BYSETPOS recur-value))
                         (pos-recs
                          (if keep-indices
-                             (funcall (icr:make-bysetpos-filter keep-indices)
-                                      sub-recs)
+                             (icr:bysetpos-filter keep-indices sub-recs)
                            sub-recs))
                         ;; Remove any recurrences before DTSTART or after UNTIL
                         ;; (both of which are inclusive bounds):
@@ -1241,8 +1286,8 @@ retrieved on subsequent calls with the same arguments."
                           pos-recs))
                         ;; Include any values in the interval from the
                         ;; RDATE property:
-                        (low (car interval))
-                        (high (cadr interval))
+                        (low (icr:interval-low interval))
+                        (high (icr:interval-high interval))
                         (rdates
                          (mapcar #'ical:ast-node-value
                                  (apply #'append
@@ -1276,11 +1321,12 @@ retrieved on subsequent calls with the same arguments."
                         ;; store more recurrences in the final interval than the
                         ;; COUNT clause allows:
                         (nmax-recs
-                         (if nmax (seq-take all-recs nmax)
+                         (if nmax (take nmax all-recs)
                            all-recs)))
                    ;; Store and return the computed recurrences:
-                   (put-interval interval (or nmax-recs :none))
-                   nmax-recs))))))))
+                   (icr:-set-put-interval component interval
+                                          (or nmax-recs :none))
+                   nmax-recs)))))))
 
 (defun icr:recurrences-in-window (lower upper component &optional vtimezone)
   "Return the recurrences of COMPONENT in the window between LOWER and UPPER.
@@ -1320,12 +1366,12 @@ UTC offsets local to that time zone."
                                                vtimezone))
              (high-interval (icr:find-interval high-end dtstart recur-value
                                                vtimezone))
-             (high-intbound (cadr high-interval))
+             (high-intbound (icr:interval-high high-interval))
              (recurrences nil))
 
-        (while (ical:date-time< (car curr-interval) high-intbound)
+        (while (ical:date-time< (icr:interval-low curr-interval) high-intbound)
           (setq recurrences
-                (append
+                (nconc
                  (icr:recurrences-in-interval curr-interval component vtimezone)
                  recurrences))
           (setq curr-interval (icr:next-interval curr-interval recur-value
@@ -1370,18 +1416,18 @@ the period."
                      (mapcar #'ical:ast-node-value rdate-nodes)))))
       (when (or starts periods)
         (seq-uniq
-         (append (mapcar
-                  (lambda (dt) (list dt (ical:date/time-add-duration
-                                         dt duration vtimezone)))
-                  starts)
-                 (mapcar
-                  (lambda (p)
-                    (let ((start (ical:period-start p)))
-                      (list start
-                            (or (ical:period-end p)
-                                (ical:date/time-add-duration
-                                 start (ical:period-dur-value p) vtimezone)))))
-                  periods)))))))
+         (nconc (mapcar
+                 (lambda (dt) (list dt (ical:date/time-add-duration
+                                        dt duration vtimezone)))
+                 starts)
+                (mapcar
+                 (lambda (p)
+                   (let ((start (ical:period-start p)))
+                     (list start
+                           (or (ical:period-end p)
+                               (ical:date/time-add-duration
+                                start (ical:period-dur-value p) vtimezone)))))
+                 periods)))))))
 
 (defun icr:recurrences-to-count (component &optional vtimezone)
   "Return all the recurrences in COMPONENT up to COUNT in its recurrence rule.
@@ -1418,8 +1464,8 @@ UTC offsets local to that time zone."
           recs)
       (while (length< recs count)
         (setq recs
-              (append recs (icr:recurrences-in-interval int component vtimezone
-                                                        (- count (length recs)))))
+              (nconc recs (icr:recurrences-in-interval int component vtimezone
+                                                       (- count (length recs)))))
         (setq int (icr:next-interval int recur-value vtimezone)))
       recs)))
 
@@ -1455,7 +1501,7 @@ UTC offsets local to that time zone."
   (make-hash-table :test #'equal))
 
 (defsubst icr:-key-from-interval (interval)
-  (take 6 (car interval))) ; (secs mins hours day month year)
+  (take 6 (icr:interval-low interval))) ; (secs mins hours day month year)
 
 (defun icr:-set-get-interval (component interval)
   (let ((set (ical:ast-node-meta-get :recurrence-set component))
@@ -1636,6 +1682,24 @@ should be a time zone identifier, as found e.g. in an
         (when (equal tzidval tzid)
           (throw 'found tz))))))
 
+(defun icr:-w/in-locally-p (dt start &optional end)
+  "Check whether DT falls after START (and before END, if any).
+All three values must be `icalendar-date-time's. The check is performed with
+`icalendar-date-time-locally<='."
+  (and
+   (ical:date-time-locally<= start dt)
+   (or (not end)
+       (ical:date-time-locally<= dt end))))
+
+(defun icr:-w/in-abs-p (dt start &optional end)
+  "Check whether DT falls after START (and before END, if any).
+DT must be a Lisp time stamp and START and END must be `icalendar-date-time's.
+The check is performed with `icalendar-time<='."
+  (and
+   (ical:time<= (encode-time start) dt)
+   (or (not end)
+       (ical:time<= dt (encode-time end)))))
+
 ;; DRAGONS DRAGONS DRAGONS
 (defun icr:tz-observance-on (dt vtimezone &optional update nonexisting)
   "Return the time zone observance in effect on DT in VTIMEZONE.
@@ -1715,10 +1779,27 @@ ignored."
                  (effective-start
                   (ical:date-time-variant start :zone offset-from
                                           :dst (not is-daylight)))
+                 (until (ical:recur-until recur-value))
+                 (bound
+                  ;; Optimization: compute a rough upper bound for when
+                  ;; an observance might apply, thus allowing us to skip
+                  ;; computing recurrences for irrelevant observances.
+                  ;; The UNTIL date, if any, is the last *recurrence* of
+                  ;; the observance.  The observance is therefore in
+                  ;; effect for some time after this recurrence, so we
+                  ;; can't just use UNTIL as an upper bound, but it's
+                  ;; guaranteed to end within N years after UNTIL, where
+                  ;; N is the interval size.  This is not the tightest
+                  ;; possible bound but it is the cheapest to compute here.
+                  (when until
+                    (ical:date-time-variant until
+                                            :year (+ (decoded-time-year until)
+                                                     (ical:recur-interval-size
+                                                      recur-value)))))
                  (observance-might-apply
                   (if given-clock-time
-                      (ical:date-time-locally<= effective-start given-clock-time)
-                    (ical:time<= (encode-time effective-start) given-abs-time))))
+                      (icr:-w/in-locally-p given-clock-time effective-start bound)
+                    (icr:-w/in-abs-p given-abs-time effective-start bound))))
 
             (when observance-might-apply
               ;; Initialize our return values on the first iteration
@@ -1781,31 +1862,37 @@ ignored."
                                    (decode-time given-abs-time offset-from)))
                        (int (icr:find-interval
                              target effective-start recur-value offset-from))
-                       (int-recs (icr:recurrences-in-interval
-                                  int obs offset-from))
-                       ;; The closest observance onset before `dt' might
-                       ;; actually be in the previous interval, e.g.
-                       ;; if `dt' is in January after an annual change to
-                       ;; Standard Time in November.  So check that as well.
-                       (prev-int (icr:previous-interval int recur-value
-                                                        effective-start
-                                                        offset-from))
-                       (prev-recs (when prev-int
-                                    (icr:recurrences-in-interval
-                                     prev-int obs offset-from)))
-                       (recs (append prev-recs int-recs))
-                       (keep-recs<=given
+                       (<=given
                         (if given-clock-time
                             (lambda (rec)
                               (ical:date-time-locally<= rec given-clock-time))
                           (lambda (rec)
                             (ical:time<= (encode-time rec) given-abs-time))))
-                       (srecs (sort (seq-filter ; (1)
-                                     keep-recs<=given
-                                     recs)
+                       (int-recs (sort
+                                  (seq-filter <=given ; (1)
+                                              (icr:recurrences-in-interval
+                                               int obs offset-from))
                                     :lessp #'ical:date-time<
                                     :in-place t :reverse t))
-                       (latest-rec (car srecs)))
+                       latest-rec)
+
+                       (unless int-recs
+                         ;; The closest observance onset before `dt' might
+                         ;; actually be in the previous interval, e.g.
+                         ;; if `dt' is in January after an annual change to
+                         ;; Standard Time in November.  So check that as well.
+                         (setq int (icr:previous-interval int recur-value
+                                                          effective-start
+                                                          offset-from))
+                         (setq int-recs
+                               (when int
+                                 (sort
+                                  (seq-filter <=given ; (1)
+                                              (icr:recurrences-in-interval
+                                               int obs offset-from))
+                                  :lessp #'ical:date-time<
+                                  :in-place t :reverse t))))
+                       (setq latest-rec (car int-recs))
 
                   (when (and latest-rec
                              (ical:date-time< nearest-onset latest-rec)) ; (2)
@@ -1974,8 +2061,8 @@ called recursively on NODE's children."
                         :duration (ical:period-dur-value value)))))
           (ical:ast-node-set-value value-node updated)))))
    ((ical:component-node-p node) ; includes VCALENDAR nodes
-    (mapc (apply-partially #'icr:tz-set-zones-in vtimezones)
-          (ical:ast-node-children node)))
+    (dolist (nd (ical:ast-node-children node))
+      (icr:tz-set-zones-in vtimezones nd)))
    (t nil)))
 
 (defun icr:tzname-on (dt vtimezone)
diff --git a/lisp/calendar/icalendar-utils.el b/lisp/calendar/icalendar-utils.el
index 3f8e9d085c2..e877cb85637 100644
--- a/lisp/calendar/icalendar-utils.el
+++ b/lisp/calendar/icalendar-utils.el
@@ -561,6 +561,7 @@ interpreted into Emacs local time, so that the dates returned are valid
 for the local time zone."
   (require 'icalendar-recur) ; avoid circular requires
   (declare-function icalendar-recur-subintervals-to-dates "icalendar-recur")
+  (declare-function icalendar-recur-make-interval "icalendar-recur")
 
   (when locally
     (when (cl-typep start 'ical:date-time)
@@ -572,18 +573,23 @@ for the local time zone."
      (cl-typecase end
        (ical:date
         (icalendar-recur-subintervals-to-dates
-         (list (list (ical:date-to-date-time start)
-                     (ical:date-to-date-time end)))))
+         (list
+          (icalendar-recur-make-interval
+           (ical:date-to-date-time start)
+           (ical:date-to-date-time end)))))
        (ical:date-time
         (icalendar-recur-subintervals-to-dates
-         (list (list (ical:date-to-date-time start) end))))))
+         (list
+          (icalendar-recur-make-interval (ical:date-to-date-time start) end))))))
     (ical:date-time
      (cl-typecase end
        (ical:date
         (icalendar-recur-subintervals-to-dates
-         (list (list start (ical:date-to-date-time end)))))
+         (list
+          (icalendar-recur-make-interval start (ical:date-to-date-time end)))))
        (ical:date-time
-        (icalendar-recur-subintervals-to-dates (list (list start end))))))))
+        (icalendar-recur-subintervals-to-dates
+         (list (icalendar-recur-make-interval start end))))))))
 
 
 (cl-defun ical:make-date-time (&key second minute hour day month year
diff --git a/test/lisp/calendar/icalendar-recur-tests.el b/test/lisp/calendar/icalendar-recur-tests.el
index 1df2c5b17e5..c1f7bb90974 100644
--- a/test/lisp/calendar/icalendar-recur-tests.el
+++ b/test/lisp/calendar/icalendar-recur-tests.el
@@ -117,13 +117,12 @@ END:VTIMEZONE
 ;; Tests for basic functions:
 
 (ert-deftest ict:recur-bysetpos-filter ()
-  "Test that `icr:make-bysetpos-filter' filters correctly by position"
+  "Test that `icr:bysetpos-filter' filters correctly by position"
   (let* ((t1 (list 1 1 2024))
          (t2 (list 2 1 2024))
          (t3 (list 12 30 2024))
          (dts (list t1 t2 t3))
-         (filter (icr:make-bysetpos-filter (list 1 -1)))
-         (filtered (funcall filter dts)))
+         (filtered (icr:bysetpos-filter (list 1 -1) dts)))
     (should (member t1 filtered))
     (should (member t3 filtered))
     (should-not (member t2 filtered))))
@@ -282,7 +281,7 @@ END:VTIMEZONE
     ;; an interval boundary:
     (let* ((target (ical:date-time-variant dtstart :year 2026 :second 5 :zone 0))
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :second 0 :tz 'preserve)
              (ical:date-time-variant target :second 1 :tz 'preserve)
              (ical:date-time-variant target :second 10 :tz 'preserve))))
@@ -294,7 +293,7 @@ END:VTIMEZONE
     ;; an interval boundary:
     (let* ((target (ical:date-time-variant dtstart :year 2027 :second 10 :zone 0))
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :second 10 :tz 'preserve)
              (ical:date-time-variant target :second 11 :tz 'preserve)
              (ical:date-time-variant target :second 20 :tz 'preserve))))
@@ -308,7 +307,7 @@ END:VTIMEZONE
                                            :year 2028 :month 2 :second 20
                                            :zone ict:est :dst nil))
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :second 20 :tz 'preserve)
              (ical:date-time-variant target :second 21 :tz 'preserve)
              (ical:date-time-variant target :second 30 :tz 'preserve))))
@@ -323,7 +322,7 @@ END:VTIMEZONE
                                            :year 2029 :month 5 :second 30
                                            :zone ict:edt :dst t))
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :second 30 :tz 'preserve)
              (ical:date-time-variant target :second 31 :tz 'preserve)
              (ical:date-time-variant target :second 40 :tz 'preserve))))
@@ -342,7 +341,7 @@ END:VTIMEZONE
                                            :hour 2 :minute 30 :second 0
                                            :zone ict:est :dst nil))
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :hour 3 :second 0
                                      :zone ict:edt :dst t)
              (ical:date-time-variant target :hour 3 :second 1
@@ -364,7 +363,7 @@ END:VTIMEZONE
                                            :zone ict:edt :dst t))
            (intsize 59)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :hour 11 :minute 59 :second 16
                                      :tz 'preserve)
              (ical:date-time-variant target :hour 11 :minute 59 :second 17
@@ -393,7 +392,7 @@ END:VTIMEZONE
     (let* ((target (ical:date-time-variant dtstart :year 2026 :minute 5))
            (intsize 10)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :minute 0 :second 0)
              (ical:date-time-variant target :minute 1 :second 0)
              (ical:date-time-variant target :minute 10 :second 0))))
@@ -406,7 +405,7 @@ END:VTIMEZONE
     (let* ((target (ical:date-time-variant dtstart :year 2027 :minute 10))
            (intsize 10)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :minute 10 :second 0)
              (ical:date-time-variant target :minute 11 :second 0)
              (ical:date-time-variant target :minute 20 :second 0))))
@@ -421,7 +420,7 @@ END:VTIMEZONE
                                            :zone ict:est :dst nil))
            (intsize 10)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :minute 20 :second 0
                                      :zone ict:est :dst nil)
              (ical:date-time-variant target :minute 21 :second 0
@@ -440,7 +439,7 @@ END:VTIMEZONE
                                            :zone ict:edt :dst t))
            (intsize 10)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :minute 30 :second 0
                                      :zone ict:edt :dst t)
              (ical:date-time-variant target :minute 31 :second 0
@@ -464,7 +463,7 @@ END:VTIMEZONE
                                            :zone ict:est :dst nil))
            (intsize 10)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :hour 3 :minute 30 :second 0
                                      :zone ict:edt :dst t)
              (ical:date-time-variant target :hour 3 :minute 31 :second 0
@@ -493,7 +492,7 @@ END:VTIMEZONE
     (let* ((target (ical:date-time-variant dtstart :year 2026 :hour 5))
            (intsize 10)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :hour 0 :minute 0 :second 0)
              (ical:date-time-variant target :hour 1 :minute 0 :second 0)
              (ical:date-time-variant target :hour 10 :minute 0 :second 0))))
@@ -506,7 +505,7 @@ END:VTIMEZONE
     (let* ((target (ical:date-time-variant dtstart :year 2027 :hour 10))
            (intsize 10)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :hour 10 :minute 0 :second 0)
              (ical:date-time-variant target :hour 11 :minute 0 :second 0)
              (ical:date-time-variant target :hour 20 :minute 0 :second 0))))
@@ -521,7 +520,7 @@ END:VTIMEZONE
                                            :zone ict:est :dst nil))
            (intsize 2)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :hour 10 :minute 0 :second 0
                                      :zone ict:est :dst nil)
              (ical:date-time-variant target :hour 11 :minute 0 :second 0
@@ -543,7 +542,7 @@ END:VTIMEZONE
                                            :zone ict:edt :dst t))
            (intsize 2)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :hour 11 :minute 0 :second 0
                                      :zone ict:edt :dst t)
              (ical:date-time-variant target :hour 12 :minute 0 :second 0
@@ -566,7 +565,7 @@ END:VTIMEZONE
                                         :zone ict:est :dst nil))
            (intsize 2)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :hour 3 :minute 0 :second 0
                                      :zone ict:edt :dst t)
              (ical:date-time-variant target :hour 4 :minute 0 :second 0
@@ -590,7 +589,7 @@ END:VTIMEZONE
     (let* ((target (list 1 9 2026))
            (intsize 7)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:make-date-time :year 2026 :month 1 :day 7
                                   :hour 0 :minute 0 :second 0)
              (ical:make-date-time :year 2026 :month 1 :day 8
@@ -617,7 +616,7 @@ END:VTIMEZONE
                                               :year 2026 :month 1 :day 9))
            (intsize 7)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :day 7 :hour 0 :minute 0 :second 0)
              (ical:date-time-variant target :day 8 :hour 0 :minute 0 :second 0)
              (ical:date-time-variant target :day 14
@@ -631,7 +630,7 @@ END:VTIMEZONE
     (let* ((target (ical:date-time-variant dtstart :year 2027 :month 1 :day 6))
            (intsize 7)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :day 6 :hour 0 :minute 0 :second 0)
              (ical:date-time-variant target :day 7 :hour 0 :minute 0 :second 0)
              (ical:date-time-variant target :day 13 :hour 0 :minute 0 :second 0))))
@@ -645,7 +644,7 @@ END:VTIMEZONE
                                            :zone ict:est :dst nil))
            (intsize 7)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :day 2 :hour 0 :minute 0 :second 0
                                      :tz 'preserve)
              (ical:date-time-variant target :day 3 :hour 0 :minute 0 :second 0
@@ -663,7 +662,7 @@ END:VTIMEZONE
                                            :zone ict:edt :dst t))
            (intsize 7)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :day 23 :hour 0 :minute 0 :second 0
                                      :tz 'preserve)
              (ical:date-time-variant target :day 24 :hour 0 :minute 0 :second 0
@@ -687,7 +686,7 @@ END:VTIMEZONE
     (let* ((target '(1 9 2026))
            (intsize 2)
            (expected-int-mon
-            (list
+            (icr:make-interval
              (ical:make-date-time :year 2026 :month 1 :day 5
                                   :hour 0 :minute 0 :second 0)
              (ical:make-date-time :year 2026 :month 1 :day 12
@@ -714,13 +713,13 @@ END:VTIMEZONE
            (weds 3)
            ;; expected interval for Monday (default) week start:
            (expected-int-mon
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :day 5 :hour 0 :minute 0 :second 0)
              (ical:date-time-variant target :day 12 :hour 0 :minute 0 :second 0)
              (ical:date-time-variant target :day 19 :hour 0 :minute 0 :second 0)))
            ;; expected interval for Wednesday week start:
            (expected-int-wed
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :day 7 :hour 0 :minute 0 :second 0)
              (ical:date-time-variant target :day 14 :hour 0 :minute 0 :second 0)
              (ical:date-time-variant target :day 21 :hour 0 :minute 0 :second 0))))
@@ -736,7 +735,7 @@ END:VTIMEZONE
            (intsize 3)
            ;; expected interval for Monday (default) week start:
            (expected-int-mon
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :year 2026 :month 12 :day 21
                                      :hour 0 :minute 0 :second 0)
              (ical:date-time-variant target :year 2026 :month 12 :day 28
@@ -753,7 +752,7 @@ END:VTIMEZONE
            (sun 0)
            ;; expected interval for Sunday week start:
            (expected-int-sun
-            (list
+            (icr:make-interval
              (ical:date-time-variant target :day 2 :hour 0 :minute 0 :second 0)
              (ical:date-time-variant target :day 9 :hour 0 :minute 0 :second 0)
              (ical:date-time-variant target :day 23 :hour 0 :minute 0 :second 0))))
@@ -771,7 +770,7 @@ END:VTIMEZONE
          (target '(10 9 2025))
            (intsize 5)
            (expected-int
-            (list
+            (icr:make-interval
              (ical:make-date-time :year 2025 :month 6 :day 1
                                   :hour 0 :minute 0 :second 0)
              (ical:make-date-time :year 2025 :month 7 :day 1
@@ -789,7 +788,7 @@ END:VTIMEZONE
          (target (ical:date-time-variant dtstart :year 2026 :month 3 :day 9))
          (intsize 2)
          (expected-int
-          (list
+          (icr:make-interval
            (ical:date-time-variant target :day 1 :hour 0 :minute 0 :second 0)
            (ical:date-time-variant target :month 4 :day 1
                                    :hour 0 :minute 0 :second 0)
@@ -807,7 +806,7 @@ END:VTIMEZONE
          (target (ical:date-time-variant dtstart :year 2027 :month 5 :day 1))
          (intsize 7)
          (expected-int
-          (list
+          (icr:make-interval
            (ical:date-time-variant target :year 2027 :month 5 :day 1
                                    :hour 0 :minute 0 :second 0)
            (ical:date-time-variant target :year 2027 :month 6 :day 1
@@ -826,7 +825,7 @@ END:VTIMEZONE
                                          :year 2029 :month 4 :day 15))
          (intsize 2)
          (expected-int
-          (list
+          (icr:make-interval
            (ical:date-time-variant target :year 2029 :month 3 :day 1
                                    :hour 0 :minute 0 :second 0)
            (ical:date-time-variant target :year 2029 :month 4 :day 1
@@ -845,7 +844,7 @@ END:VTIMEZONE
                                          :year 2030 :month 5 :day 1))
          (intsize 2)
          (expected-int
-          (list
+          (icr:make-interval
            (ical:date-time-variant target :year 2030 :month 5 :day 1
                                    :hour 0 :minute 0 :second 0)
            (ical:date-time-variant target :year 2030 :month 6 :day 1
@@ -863,7 +862,7 @@ END:VTIMEZONE
          (target (ical:date-time-variant dtstart :year 2032 :month 11 :day 11))
          (intsize 2)
          (expected-int
-          (list
+          (icr:make-interval
            (ical:date-time-variant target :year 2032 :month 11 :day 1
                                    :hour 0 :minute 0 :second 0)
            (ical:date-time-variant target :year 2032 :month 12 :day 1
@@ -884,7 +883,7 @@ END:VTIMEZONE
          (target '(10 9 2025))
          (intsize 2)
          (expected-int
-          (list
+          (icr:make-interval
            (ical:make-date-time :year 2025 :month 1 :day 1
                                 :hour 0 :minute 0 :second 0)
            (ical:make-date-time :year 2026 :month 1 :day 1
@@ -901,7 +900,7 @@ END:VTIMEZONE
                                       :hour 11 :minute 58 :second 0))
          (intsize 3)
          (expected-int
-          (list
+          (icr:make-interval
            (ical:make-date-time :year 2026 :month 1 :day 1
                                 :hour 0 :minute 0 :second 0)
            (ical:make-date-time :year 2027 :month 1 :day 1
@@ -918,7 +917,7 @@ END:VTIMEZONE
                                       :hour 0 :minute 0 :second 0))
          (intsize 4)
          (expected-int
-          (list
+          (icr:make-interval
            (ical:make-date-time :year 2027 :month 1 :day 1
                                 :hour 0 :minute 0 :second 0)
            (ical:make-date-time :year 2028 :month 1 :day 1
@@ -937,13 +936,12 @@ END:VTIMEZONE
                                       :hour 11 :minute 58 :second 0))
          (intsize 1)
          (expected-int
-          (list
+          (icr:make-interval
            (ical:make-date-time :year 2029 :month 1 :day 1
                                 :hour 0 :minute 0 :second 0)
            (ical:make-date-time :year 2030 :month 1 :day 1
                                 :hour 0 :minute 0 :second 0)
-           (ical:make-date-time :year 2030 :month 1 :day 1
-                                :hour 0 :minute 0 :second 0))))
+           nil)))
     (should (equal expected-int
                    (icr:find-yearly-interval target dtstart intsize)))))
 
@@ -954,12 +952,14 @@ END:VTIMEZONE
   (let* ((low (ical:make-date-time :year 2025 :month 1 :day 1
                                    :hour 0 :minute 0 :second 0))
          (high (ical:date/time-add low :year 1))
-         (interval (list low high high))
+         (interval (icr:make-interval low high high))
          (yeardays (list 2 -7))
-         (sub1 (list (ical:date-time-variant low :day 2)
-                     (ical:date-time-variant low :day 3)))
-         (sub2 (list (ical:date-time-variant low :month 12 :day 25)
-                     (ical:date-time-variant low :month 12 :day 26)))
+         (sub1 (icr:make-interval
+                (ical:date-time-variant low :day 2)
+                (ical:date-time-variant low :day 3)))
+         (sub2 (icr:make-interval
+                (ical:date-time-variant low :month 12 :day 25)
+                (ical:date-time-variant low :month 12 :day 26)))
          (expected-subintervals (list sub1 sub2)))
     (should (equal expected-subintervals
                    (icr:refine-byyearday interval yeardays)))))
@@ -969,12 +969,14 @@ END:VTIMEZONE
   (let* ((low (ical:make-date-time :year 2025 :month 1 :day 1
                                    :hour 0 :minute 0 :second 0))
          (high (ical:date/time-add low :year 1))
-         (interval (list low high high))
+         (interval (icr:make-interval low high high))
          (months (list 9 2))
-         (sub1 (list (ical:date-time-variant low :month 2 :day 1)
-                     (ical:date-time-variant low :month 3 :day 1)))
-         (sub2 (list (ical:date-time-variant low :month 9 :day 1)
-                     (ical:date-time-variant low :month 10 :day 1)))
+         (sub1 (icr:make-interval
+                (ical:date-time-variant low :month 2 :day 1)
+                (ical:date-time-variant low :month 3 :day 1)))
+         (sub2 (icr:make-interval
+                (ical:date-time-variant low :month 9 :day 1)
+                (ical:date-time-variant low :month 10 :day 1)))
          (expected-subintervals (list sub1 sub2)))
     (should (equal expected-subintervals
                    (icr:refine-bymonth interval months)))))
@@ -984,13 +986,15 @@ END:VTIMEZONE
   (let* ((low (ical:make-date-time :year 2025 :month 2 :day 1
                                    :hour 0 :minute 0 :second 0))
          (high (ical:date/time-add low :month 1))
-         (interval (list low high high))
+         (interval (icr:make-interval low high high))
          (monthdays (list -1 2 29))
          ;; N.B. we should get no subinterval for Feb. 29, 2025
-         (sub1 (list (ical:date-time-variant low :day 2)
-                     (ical:date-time-variant low :day 3)))
-         (sub2 (list (ical:date-time-variant low :day 28)
-                     (ical:date-time-variant low :month 3 :day 1)))
+         (sub1 (icr:make-interval
+                (ical:date-time-variant low :day 2)
+                (ical:date-time-variant low :day 3)))
+         (sub2 (icr:make-interval
+                (ical:date-time-variant low :day 28)
+                (ical:date-time-variant low :month 3 :day 1)))
          (expected-subintervals (list sub1 sub2)))
     (should (equal expected-subintervals
                    (icr:refine-bymonthday interval monthdays)))))
@@ -1001,12 +1005,14 @@ END:VTIMEZONE
   (let* ((low (ical:make-date-time :year 2025 :month 3 :day 3 ; a Monday
                                    :hour 0 :minute 0 :second 0))
          (high (ical:date/time-add low :day 7))
-         (interval (list low high high))
+         (interval (icr:make-interval low high high))
          (days (list 0 6)) ; just the weekend, please!
-         (sub1 (list (ical:date-time-variant low :day 8)
-                     (ical:date-time-variant low :day 9)))
-         (sub2 (list (ical:date-time-variant low :day 9)
-                     (ical:date-time-variant low :day 10)))
+         (sub1 (icr:make-interval
+                (ical:date-time-variant low :day 8)
+                (ical:date-time-variant low :day 9)))
+         (sub2 (icr:make-interval
+                (ical:date-time-variant low :day 9)
+                (ical:date-time-variant low :day 10)))
          (expected-subintervals (list sub1 sub2)))
     (should (equal expected-subintervals
                    (icr:refine-byday interval days))))
@@ -1015,12 +1021,14 @@ END:VTIMEZONE
   (let* ((low (ical:make-date-time :year 2025 :month 3 :day 1 ; a Saturday
                                    :hour 0 :minute 0 :second 0))
          (high (ical:date/time-add low :month 1))
-         (interval (list low high high))
+         (interval (icr:make-interval low high high))
          (days (list '(1 . 2) '(1 . -1)))  ; second and last Monday
-         (sub1 (list (ical:date-time-variant low :day 10)
-                     (ical:date-time-variant low :day 11)))
-         (sub2 (list (ical:date-time-variant low :day 31)
-                     (ical:date-time-variant low :month 4 :day 1)))
+         (sub1 (icr:make-interval
+                (ical:date-time-variant low :day 10)
+                (ical:date-time-variant low :day 11)))
+         (sub2 (icr:make-interval
+                (ical:date-time-variant low :day 31)
+                (ical:date-time-variant low :month 4 :day 1)))
          (expected-subintervals (list sub1 sub2)))
     (should (equal expected-subintervals
                    (icr:refine-byday interval days t))))
@@ -1029,12 +1037,14 @@ END:VTIMEZONE
   (let* ((low (ical:make-date-time :year 2025 :month 1 :day 1
                                    :hour 0 :minute 0 :second 0))
          (high (ical:date/time-add low :year 1))
-         (interval (list low high high))
+         (interval (icr:make-interval low high high))
          (days (list '(5 . 1) '(5 . -1)))  ; first and last Friday
-         (sub1 (list (ical:date-time-variant low :day 3)
-                     (ical:date-time-variant low :day 4)))
-         (sub2 (list (ical:date-time-variant low :month 12 :day 26)
-                     (ical:date-time-variant low :month 12 :day 27)))
+         (sub1 (icr:make-interval
+                (ical:date-time-variant low :day 3)
+                (ical:date-time-variant low :day 4)))
+         (sub2 (icr:make-interval
+                (ical:date-time-variant low :month 12 :day 26)
+                (ical:date-time-variant low :month 12 :day 27)))
          (expected-subintervals (list sub1 sub2)))
     (should (equal expected-subintervals
                    (icr:refine-byday interval days nil)))))
@@ -1045,12 +1055,14 @@ END:VTIMEZONE
   (let* ((low (ical:make-date-time :year 2025 :month 1 :day 1
                                    :hour 0 :minute 0 :second 0))
          (high (ical:date/time-add low :day 1))
-         (interval (list low high high))
+         (interval (icr:make-interval low high high))
          (hours (list 2 19))
-         (sub1 (list (ical:date-time-variant low :hour 2)
-                     (ical:date-time-variant low :hour 3)))
-         (sub2 (list (ical:date-time-variant low :hour 19)
-                     (ical:date-time-variant low :hour 20)))
+         (sub1 (icr:make-interval
+                (ical:date-time-variant low :hour 2)
+                (ical:date-time-variant low :hour 3)))
+         (sub2 (icr:make-interval
+                (ical:date-time-variant low :hour 19)
+                (ical:date-time-variant low :hour 20)))
          (expected-subintervals (list sub1 sub2)))
     (should (equal expected-subintervals
                    (icr:refine-byhour interval hours))))
@@ -1060,12 +1072,14 @@ END:VTIMEZONE
                                    :hour 0 :minute 0 :second 0
                                    :zone ict:est :dst nil))
          (high (ical:date/time-add low :day 1 ict:tz-eastern))
-         (interval (list low high high))
+         (interval (icr:make-interval low high high))
          (hours (list 2 19))
-         (sub1 (list (ical:date-time-variant low :hour 2 :tz 'preserve)
-                     (ical:date-time-variant low :hour 3 :tz 'preserve)))
-         (sub2 (list (ical:date-time-variant low :hour 19 :tz 'preserve)
-                     (ical:date-time-variant low :hour 20 :tz 'preserve)))
+         (sub1 (icr:make-interval
+                (ical:date-time-variant low :hour 2 :tz 'preserve)
+                (ical:date-time-variant low :hour 3 :tz 'preserve)))
+         (sub2 (icr:make-interval
+                (ical:date-time-variant low :hour 19 :tz 'preserve)
+                (ical:date-time-variant low :hour 20 :tz 'preserve)))
          (expected-subintervals (list sub1 sub2)))
     (should (equal expected-subintervals
                    (icr:refine-byhour interval hours ict:tz-eastern)))))
@@ -1076,12 +1090,14 @@ END:VTIMEZONE
   (let* ((low (ical:make-date-time :year 2025 :month 5 :day 1
                                    :hour 13 :minute 0 :second 0))
          (high (ical:date/time-add low :hour 1))
-         (interval (list low high high))
+         (interval (icr:make-interval low high high))
          (minutes (list 7 59))
-         (sub1 (list (ical:date-time-variant low :minute 7)
-                     (ical:date-time-variant low :minute 8)))
-         (sub2 (list (ical:date-time-variant low :minute 59)
-                     (ical:date-time-variant low :hour 14 :minute 0)))
+         (sub1 (icr:make-interval
+                (ical:date-time-variant low :minute 7)
+                (ical:date-time-variant low :minute 8)))
+         (sub2 (icr:make-interval
+                (ical:date-time-variant low :minute 59)
+                (ical:date-time-variant low :hour 14 :minute 0)))
          (expected-subintervals (list sub1 sub2)))
     (should (equal expected-subintervals
                    (icr:refine-byminute interval minutes))))
@@ -1091,13 +1107,14 @@ END:VTIMEZONE
                                    :hour 13 :minute 0 :second 0
                                    :zone ict:est :dst nil))
          (high (ical:date/time-add low :hour 1 ict:tz-eastern))
-         (interval (list low high high))
+         (interval (icr:make-interval low high high))
          (minutes (list 7 59))
-         (sub1 (list (ical:date-time-variant low :minute 7 :tz 'preserve)
-                     (ical:date-time-variant low :minute 8 :tz 'preserve)))
-         (sub2 (list (ical:date-time-variant low :minute 59 :tz 'preserve)
-                     (ical:date-time-variant low :hour 14 :minute 0
-                                             :tz 'preserve)))
+         (sub1 (icr:make-interval
+                (ical:date-time-variant low :minute 7 :tz 'preserve)
+                (ical:date-time-variant low :minute 8 :tz 'preserve)))
+         (sub2 (icr:make-interval
+                (ical:date-time-variant low :minute 59 :tz 'preserve)
+                (ical:date-time-variant low :hour 14 :minute 0 :tz 'preserve)))
          (expected-subintervals (list sub1 sub2)))
     (should (equal expected-subintervals
                    (icr:refine-byminute interval minutes ict:tz-eastern)))))
@@ -1108,12 +1125,14 @@ END:VTIMEZONE
   (let* ((low (ical:make-date-time :year 2025 :month 5 :day 1
                                    :hour 13 :minute 59 :second 0))
          (high (ical:date/time-add low :minute 1))
-         (interval (list low high high))
+         (interval (icr:make-interval low high high))
          (seconds (list 24 59))
-         (sub1 (list (ical:date-time-variant low :second 24)
-                     (ical:date-time-variant low :second 25)))
-         (sub2 (list (ical:date-time-variant low :second 59)
-                     (ical:date-time-variant low :hour 14 :minute 0 :second 0)))
+         (sub1 (icr:make-interval
+                (ical:date-time-variant low :second 24)
+                (ical:date-time-variant low :second 25)))
+         (sub2 (icr:make-interval
+                (ical:date-time-variant low :second 59)
+                (ical:date-time-variant low :hour 14 :minute 0 :second 0)))
          (expected-subintervals (list sub1 sub2)))
     (should (equal expected-subintervals
                    (icr:refine-bysecond interval seconds))))
@@ -1123,13 +1142,14 @@ END:VTIMEZONE
                                    :hour 13 :minute 19 :second 0
                                    :zone ict:est :dst nil))
          (high (ical:date/time-add low :minute 1 ict:tz-eastern))
-         (interval (list low high high))
+         (interval (icr:make-interval low high high))
          (seconds (list 24 59))
-         (sub1 (list (ical:date-time-variant low :second 24 :tz 'preserve)
-                     (ical:date-time-variant low :second 25 :tz 'preserve)))
-         (sub2 (list (ical:date-time-variant low :second 59 :tz 'preserve)
-                     (ical:date-time-variant low :minute 20 :second 0
-                                             :tz 'preserve)))
+         (sub1 (icr:make-interval
+                (ical:date-time-variant low :second 24 :tz 'preserve)
+                (ical:date-time-variant low :second 25 :tz 'preserve)))
+         (sub2 (icr:make-interval
+                (ical:date-time-variant low :second 59 :tz 'preserve)
+                (ical:date-time-variant low :minute 20 :second 0 :tz 'preserve)))
          (expected-subintervals (list sub1 sub2)))
     (should (equal expected-subintervals
                    (icr:refine-bysecond interval seconds ict:tz-eastern)))))
@@ -1140,11 +1160,11 @@ END:VTIMEZONE
   (let* ((low1 (ical:make-date-time :year 2025 :month 5 :day 1
                                     :hour 13 :minute 59 :second 0))
          (high1 (ical:date/time-add low1 :day 3))
-         (sub1 (list low1 high1))
+         (sub1 (icr:make-interval low1 high1))
          (low2 (ical:make-date-time :year 2025 :month 5 :day 31
                                     :hour 14 :minute 0 :second 0))
          (high2 (ical:date/time-add low2 :hour 3)) ; later but on the same day
-         (sub2 (list low2 high2))
+         (sub2 (icr:make-interval low2 high2))
          (low-date1 (ical:date-time-to-date low1))
          (low-date2 (ical:date-time-to-date low2))
          (expected-recs (list low-date1
@@ -1161,11 +1181,11 @@ END:VTIMEZONE
   (let* ((low1 (ical:make-date-time :year 2025 :month 5 :day 1
                                     :hour 13 :minute 59 :second 0))
          (high1 (ical:date/time-add low1 :second 1))
-         (sub1 (list low1 high1))
+         (sub1 (icr:make-interval low1 high1))
          (low2 (ical:make-date-time :year 2025 :month 5 :day 2
                                     :hour 14 :minute 0 :second 0))
          (high2 (ical:date/time-add low2 :second 1))
-         (sub2 (list low2 high2))
+         (sub2 (icr:make-interval low2 high2))
          (expected-recs (list low1 low2)))
     (should (equal expected-recs
                    (icr:subintervals-to-date-times (list sub1 sub2)))))
@@ -1175,7 +1195,7 @@ END:VTIMEZONE
                                     :hour 13 :minute 59 :second 0
                                     :zone ict:edt :dst t))
          (high1 (ical:date/time-add low1 :second 5 ict:tz-eastern))
-         (sub1 (list low1 high1))
+         (sub1 (icr:make-interval low1 high1))
          (expected-recs
           (list low1
                 (ical:date/time-add low1 :second 1 ict:tz-eastern)
@@ -1194,7 +1214,7 @@ END:VTIMEZONE
          (high1 (ical:make-date-time :year 2025 :month 3 :day 9
                                      :hour 3 :minute 0 :second 3
                                      :zone ict:edt :dst t))
-         (sub1 (list low1 high1))
+         (sub1 (icr:make-interval low1 high1))
          (expected-recs
           (list low1
                 (ical:date-time-variant low1 :second 59 :tz 'preserve)
@@ -1214,7 +1234,7 @@ END:VTIMEZONE
          (high1 (ical:make-date-time :year 2024 :month 11 :day 3
                                      :hour 1 :minute 0 :second 2
                                      :zone ict:est :dst nil))
-         (sub1 (list low1 high1))
+         (sub1 (icr:make-interval low1 high1))
          (expected-recs
           (list low1
                 (ical:date-time-variant low1 :second 59 :tz 'preserve)
@@ -1534,7 +1554,7 @@ SOURCE should be a symbol; it is used to name the test."
             (win-high
              (or ,high
                  until
-                 (cadr
+                 (icr:interval-high
                   (icr:nth-interval 2 ,dtstart recvalue))))
             (recs
              (if count
@@ -1741,6 +1761,7 @@ SOURCE should be a symbol; it is used to name the test."
 (ict:rrule-test
  "RRULE:FREQ=DAILY;INTERVAL=2\n"
  "Every other day - forever"
+ :tags '(:expensive-test)
  :tz ict:tz-eastern
  :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
                                :hour 9 :minute 0 :second 0
@@ -2523,6 +2544,7 @@ SOURCE should be a symbol; it is used to name the test."
 (ict:rrule-test
 "RRULE:FREQ=YEARLY;BYDAY=TH;BYMONTH=6,7,8\n"
 "Every Thursday, but only during June, July, and August, forever"
+ :tags '(:expensive-test)
  :tz ict:tz-eastern
  :dtstart (ical:make-date-time :year 1997 :month 6 :day 5
                                :hour 9 :minute 0 :second 0
@@ -2576,6 +2598,7 @@ SOURCE should be a symbol; it is used to name the test."
 (ict:rrule-test
  "RRULE:FREQ=MONTHLY;BYDAY=FR;BYMONTHDAY=13\n"
  "Every Friday the 13th, forever, *excluding* DTSTART "
+ :tags '(:expensive-test)
  :tz ict:tz-eastern
  :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
                                :hour 9 :minute 0 :second 0
@@ -2603,6 +2626,7 @@ SOURCE should be a symbol; it is used to name the test."
 (ict:rrule-test
  "RRULE:FREQ=MONTHLY;BYDAY=SA;BYMONTHDAY=7,8,9,10,11,12,13\n"
  "The first Saturday that follows the first Sunday of the month, forever"
+ :tags '(:expensive-test)
  :tz ict:tz-eastern
  :dtstart (ical:make-date-time :year 1997 :month 9 :day 13
                                :hour 9 :minute 0 :second 0
@@ -2654,6 +2678,7 @@ SOURCE should be a symbol; it is used to name the test."
  "RRULE:FREQ=MONTHLY;COUNT=3;BYDAY=TU,WE,TH;BYSETPOS=3\n"
  "The third instance into the month of one of Tuesday, Wednesday, or
 Thursday, for the next 3 months"
+ :tags '(:expensive-test)
  ;; TODO: Yikes, why is this so slow??
  :tz ict:tz-eastern
  :dtstart (ical:make-date-time :year 1997 :month 9 :day 4
@@ -2672,6 +2697,7 @@ Thursday, for the next 3 months"
 (ict:rrule-test
  "RRULE:FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-2\n"
  "The second-to-last weekday of the month"
+ :tags '(:expensive-test)
  :tz ict:tz-eastern
  :dtstart (ical:make-date-time :year 1997 :month 9 :day 29
                                :hour 9 :minute 0 :second 0
@@ -2751,6 +2777,7 @@ Thursday, for the next 3 months"
 (ict:rrule-test
  "RRULE:FREQ=DAILY;BYHOUR=9,10,11,12,13,14,15,16;BYMINUTE=0,20,40\n"
  "Every 20 minutes from 9:00 AM to 4:40 PM every day"
+ :tags '(:expensive-test)
  :tz ict:tz-eastern
  :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
                                :hour 9 :minute 0 :second 0

From 0326130e1beb3152a8803c3cc04aca6088e11e49 Mon Sep 17 00:00:00 2001
From: Richard Lawrence <rwl@recursewithless.net>
Date: Tue, 31 Mar 2026 18:35:19 +0200
Subject: [PATCH 078/463] Add short documentation group for iCalendar lib

Define a short documentation group and document the major functions:

* lisp/calendar/icalendar-shortdoc.el: New file.
* lisp/calendar/diary-icalendar.el:
* lisp/calendar/icalendar-ast.el:
* lisp/calendar/icalendar-parser.el:
* lisp/calendar/icalendar-recur.el:
* lisp/calendar/icalendar-utils.el: Refer to icalendar-shortdoc.el in
file commentary.
* lisp/calendar/icalendar-macs.el: Ditto, and also mention the macros
for binding values.
* lisp/calendar/icalendar.el: Ditto, and also remove some obsolete
commentary.

Also make some improvements to documentation strings that the above
changes revealed would be helpful:

* lisp/calendar/icalendar-recur.el
(icalendar-recur-recurrences-in-window-w/end-times): Fix broken ref.
(icalendar-recur-current-tz-to-vtimezone): Clarify docstring.
* lisp/calendar/icalendar-parser.el (icalendar-parse): Clarify
docstring.

(Bug#80727)
---
 lisp/calendar/diary-icalendar.el    |   8 +-
 lisp/calendar/icalendar-ast.el      |   2 +
 lisp/calendar/icalendar-macs.el     |  17 +-
 lisp/calendar/icalendar-parser.el   |  10 +-
 lisp/calendar/icalendar-recur.el    |   6 +-
 lisp/calendar/icalendar-shortdoc.el | 273 ++++++++++++++++++++++++++++
 lisp/calendar/icalendar-utils.el    |   2 +
 lisp/calendar/icalendar.el          |  12 +-
 8 files changed, 308 insertions(+), 22 deletions(-)
 create mode 100644 lisp/calendar/icalendar-shortdoc.el

diff --git a/lisp/calendar/diary-icalendar.el b/lisp/calendar/diary-icalendar.el
index 42102291298..994258dedd4 100644
--- a/lisp/calendar/diary-icalendar.el
+++ b/lisp/calendar/diary-icalendar.el
@@ -24,8 +24,12 @@
 
 ;;; Commentary:
 
-;; This file is a replacement for icalendar.el that uses a new parser
-;; and offers more features.
+;; For an overview of the iCalendar library, see icalendar-shortdoc.el.
+
+;; This file is a replacement for the diary import/export features
+;; previously provided by icalendar.el.  It uses a new parser and offers
+;; more flexibility and features than the old implementation.  It is
+;; documented in the Emacs manual.
 
 ;;; Code:
 
diff --git a/lisp/calendar/icalendar-ast.el b/lisp/calendar/icalendar-ast.el
index cfbc6c7cac8..fc8f23a3a27 100644
--- a/lisp/calendar/icalendar-ast.el
+++ b/lisp/calendar/icalendar-ast.el
@@ -24,6 +24,8 @@
 
 ;;; Commentary:
 
+;; For an overview of the iCalendar library, see icalendar-shortdoc.el.
+
 ;; This file defines the abstract syntax tree representation for
 ;; iCalendar data.  The AST is based on `org-element-ast' (which see;
 ;; that feature will eventually be renamed and moved out of the Org tree
diff --git a/lisp/calendar/icalendar-macs.el b/lisp/calendar/icalendar-macs.el
index 033fea94527..b216d8dc141 100644
--- a/lisp/calendar/icalendar-macs.el
+++ b/lisp/calendar/icalendar-macs.el
@@ -24,10 +24,19 @@
 
 ;;; Commentary:
 
-;; This file defines the macros `ical:define-type', `ical:define-param',
-;; `ical:define-property' and `ical:define-component', used in
-;; icalendar-parser.el to define the particular value types, parameters,
-;; properties and components in the standard as type symbols.
+;; For an overview of the iCalendar library, see icalendar-shortdoc.el.
+
+;; This file defines the macros `icalendar-define-type',
+;; `icalendar-define-param', `icalendar-define-property' and
+;; `icalendar-define-component', used in icalendar-parser.el to define
+;; the particular value types, parameters, properties and components in
+;; the standard as type symbols.  It also defines the following macros
+;; for binding values in iCalendar syntax nodes:
+;; `icalendar-with-component'
+;; `icalendar-with-property'
+;; `icalendar-with-property-of'
+;; `icalendar-with-param'
+;; `icalendar-with-param-of'
 
 ;; TODOs:
 ;;   - in the define* macros, :default needs rethinking.
diff --git a/lisp/calendar/icalendar-parser.el b/lisp/calendar/icalendar-parser.el
index a2ce4b2362f..86dbcff1ce3 100644
--- a/lisp/calendar/icalendar-parser.el
+++ b/lisp/calendar/icalendar-parser.el
@@ -24,6 +24,8 @@
 
 ;;; Commentary:
 
+;; For an overview of the iCalendar library, see icalendar-shortdoc.el.
+
 ;; This file defines regular expressions, constants and functions that
 ;; implement the iCalendar grammar according to RFC5545.
 ;;
@@ -4350,7 +4352,7 @@ during printing will be logged in the buffer returned by
 
 ;;; High-level parsing and printing functions.
 (defun ical:parse (&optional buffer)
-  "Parse an `icalendar-vcalendar' object in BUFFER (default: current buffer).
+  "Parse an iCalendar VCALENDAR object in BUFFER (default: current buffer).
 
 An unfolded copy of BUFFER (see `icalendar-unfolded-buffer-from-buffer')
 will first be obtained if necessary.  Parsing will begin at the first
@@ -4359,9 +4361,9 @@ occurrence of \"BEGIN:VCALENDAR\" in the unfolded buffer.
 The buffer may be tidied up by user functions before parsing begins; see
 `icalendar-pre-unfolding-hook' and `icalendar-pre-parsing-hook'.
 
-If parsing is successful, the VCALENDAR object is returned.  Otherwise,
-nil is returned, a warning is issued, and errors are logged in the
-buffer returned by `icalendar-error-buffer'."
+If parsing is successful, an `icalendar-vcalendar' object is returned.
+Otherwise, nil is returned, a warning is issued, and errors are logged
+in the buffer returned by `icalendar-error-buffer'."
   (let* ((buf (or buffer (current-buffer)))
          (unfolded (cond ((ical:unfolded-p buf) buf)
                          ((buffer-file-name buf)
diff --git a/lisp/calendar/icalendar-recur.el b/lisp/calendar/icalendar-recur.el
index c01116fc5a7..cf751c83184 100644
--- a/lisp/calendar/icalendar-recur.el
+++ b/lisp/calendar/icalendar-recur.el
@@ -23,6 +23,8 @@
 
 ;;; Commentary:
 
+;; For an overview of the iCalendar library, see icalendar-shortdoc.el.
+
 ;; This is a sub-library for working with recurrence rules and time
 ;; zones, as defined by RFC5545 (see especially Secs. 3.3.10 and
 ;; 3.8.5.3, which are required reading before you make any changes to
@@ -1387,7 +1389,7 @@ UTC offsets local to that time zone."
 
 (defun icr:recurrences-in-window-w/end-times
     (lower upper component &optional vtimezone)
-  "Like `icalendar-recurrences-in-window', but returns end times.
+  "Like `icalendar-recur-recurrences-in-window', but returns end times.
 
 The return value is a list of (START END) pairs representing the start
 and end time of each recurrence of COMPONENT in the window defined by
@@ -2111,7 +2113,7 @@ observance."
               (null dst-ends-time))))))
 
 (defun icr:current-tz-to-vtimezone (&optional tz tzid start-year)
-  "Convert TZ to an `icalendar-vtimezone'.
+  "Convert TZ (default: current time zone) to an `icalendar-vtimezone'.
 
 TZ defaults to the output of `calendar-current-time-zone'; if specified,
 it should be a list of the same form as that function returns.
diff --git a/lisp/calendar/icalendar-shortdoc.el b/lisp/calendar/icalendar-shortdoc.el
new file mode 100644
index 00000000000..ef6f23cdfb9
--- /dev/null
+++ b/lisp/calendar/icalendar-shortdoc.el
@@ -0,0 +1,273 @@
+;;; icalendar-shortdoc.el --- Short documentation for iCalendar  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2026 Free Software Foundation, Inc.
+
+;; Author: Richard Lawrence <rwl@recursewithless.net>
+;; Created: April 2026
+;; Keywords: calendar, help
+;; Human-Keywords: calendar, iCalendar
+
+;; This file is part of GNU Emacs.
+
+;; This file is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this file.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This file defines a short documentation group for the main functions
+;; of the iCalendar API.  It does not aim to cover every function in the
+;; library; it is a guide to the high-level functions for Lisp
+;; programmers who want to interpret or produce iCalendar data.
+
+;; To read this documentation, do:
+;; M-x load-libraray RET icalendar-shortdoc RET
+;; M-x shortdoc RET icalendar RET
+
+
+;;; Code:
+(require 'shortdoc)
+(require 'icalendar-macs)
+(require 'icalendar-parser)
+(require 'icalendar-utils)
+(require 'icalendar-ast)
+(require 'icalendar-recur)
+
+(define-short-documentation-group icalendar
+  "Parsing and printing VCALENDAR objects"
+  (icalendar-parse
+   :no-manual t
+   :no-eval* (icalendar-parse)
+   :result-string "(icalendar-vcalendar ...)")
+  (icalendar-parse-and-index
+   :no-manual t
+   :no-eval* (icalendar-parse-and-index)
+   :result (vcalendar index))
+  (icalendar-index-get
+   :args (index &rest kwargs)
+   :no-manual t
+   :no-eval (icalendar-index-get index :uid "some-event-UID")
+   :eg-result-string "(icalendar-vevent ...)"
+   :no-eval (icalendar-index-get index :date '(5 28 2026))
+   :eg-result-string "((icalendar-vevent ...) ...)"
+   :no-eval (icalendar-index-get index :tzid "Europe/Vienna")
+   :eg-result-string "(icalendar-vtimezone ...)")
+  (icalendar-parse-from-string
+   :no-eval
+   (icalendar-parse-from-string 'icalendar-rrule "RRULE:FREQ=WEEKLY\n")
+   :result-string "(icalendar-rrule ...)")
+  (icalendar-print-calendar-node
+   :no-manual t
+   :no-eval (icalendar-print-calendar-node vcalendar)
+   :result "BEGIN:VCALENDAR...")
+  "Constructing syntax nodes"
+  (icalendar-make-vcalendar
+   :no-manual t
+   :no-eval
+   "(icalendar-make-vcalendar
+   some-vtimezone
+   (@ list-of-vevents)
+   ...)"
+   :result-string "(icalendar-vcalendar ...)")
+  (icalendar-make-vevent
+   :no-manual t
+   :no-eval
+   "(icalendar-make-vevent
+   (icalendar-summary \"Party\")
+   (icalendar-location \"Robot House\")
+   (icalendar-organizer \"mailto:bender@mars.edu\"
+      (icalendar-cnparam \"Bender B. Rodriguez\"))
+   (icalendar-attendee  \"mailto:philip.j.fry@mars.edu\"
+      (icalendar-partstatparam \"ACCEPTED\"))
+   (icalendar-dtstart '(3 13 3003))
+   (icalendar-rrule '((FREQ MONTHLY))))"
+   :result-string "(icalendar-vevent ...)")
+  (icalendar-make-vtodo
+   :no-manual t
+   :no-eval
+   "(icalendar-make-vtodo
+   (icalendar-summary \"Sell another doomsday device\")
+   (icalendar-description \"Need funds for electronium hat experiment.\")
+   (icalendar-due '(6 6 3002)))"
+   :result-string "(icalendar-vtodo ...)")
+  (icalendar-make-vjournal
+   :no-manual t
+   :no-eval
+   "(icalendar-make-vjournal
+   (icalendar-summary \"Results: Electronium Hat Experiment\")
+   (icalendar-description \"How do you like them bananas?\")
+   (icalendar-dtstart '(8 6 3002)))"
+   :result-string "(icalendar-vjournal ...)")
+  "Binding values in syntax nodes"
+  (icalendar-with-component
+      :args (node bindings &rest body)
+    :no-manual t
+    :no-eval
+    "(icalendar-with-component vevent
+     ((icalendar-summary :value summary)
+      (icalendar-location :value location))
+    (format \"%s @ %s\" summary location))"
+    :eg-result "Party @ Robot House")
+  (icalendar-with-property
+      :args (node bindings &rest body)
+    :no-manual t
+    :no-eval "(icalendar-with-property location-node nil
+    (downcase value))"
+    :eg-result "robot house")
+  (icalendar-with-property-of
+      :args (component property-type bindings &rest body)
+      :no-manual t
+      :no-eval
+      "(icalendar-with-property-of vevent 'icalendar-location nil
+    (downcase value))"
+      :eg-result "robot house")
+  (icalendar-with-param
+      :args (parameter &rest body)
+      :no-manual t
+      :no-eval "(icalendar-with-param cnparam-node
+    (upcase value))"
+      :eg-result "BENDER B. RODRIGUEZ")
+  (icalendar-with-param-of
+      :args (property param-type &rest body)
+    :no-manual t
+    :no-eval "(icalendar-with-param-of organizer-node 'icalendar-cnparam
+    (upcase value))"
+    :eg-result "BENDER B. RODRIGUEZ")
+  "Time zones"
+  (icalendar-recur-current-tz-to-vtimezone
+   :no-manual t
+   :no-eval (icalendar-recur-current-tz-to-vtimezone)
+   :result-string "(icalendar-vtimezone ...)")
+  (icalendar-recur-tz-decode-time
+   :no-manual t
+   :no-eval (icalendar-recur-tz-decode-time timestamp vtimezone)
+   :eg-result (0 0 11 11 11 2024 1 nil 3600))
+  (icalendar-recur-tz-set-zone
+   :no-eval (icalendar-recur-tz-set-zone '(0 0 11 11 11 2024 1 -1 nil) vtimezone)
+   :eg-result (0 0 11 11 11 2024 1 nil 3600))
+  "Dates and date-times"
+  (icalendar-make-date-time
+   :no-manual t
+   :args (&rest kwargs)
+   :no-eval
+   "(icalendar-make-date-time :year 2024 :month 12 :day 11
+                            :hour 10 :minute 0 :second 0
+                            :tz vtimezone)"
+   :eg-result (0 0 10 11 12 2024 3 -1 3600))
+  (icalendar-date/time<=
+   :eval (icalendar-date/time<= '(12 15 2024) '(12 11 2024))
+   :eval "(icalendar-date/time<= '(0 0 8 11 11 2024 1 nil 3600)
+                         '(0 0 10 11 11 2024 3 nil 3600))"
+   :no-manual t)
+  (icalendar-date/time<
+   :no-manual t
+   :eval (icalendar-date/time< '(12 15 2024) '(12 15 2024)))
+  (icalendar-date/time-min
+   :no-manual t
+   :eval (icalendar-date/time-min '(12 15 2024) '(11 15 2024) '(12 1 2024))
+   :eval
+   "(icalendar-date/time-min '(0 0 8 11 12 2024 3 nil 3600)
+                           '(0 0 9 11 12 2024 3 nil 3600)
+                           '(0 0 10 11 12 2024 3 nil 3600))")
+  (icalendar-date/time-max
+   :no-manual t
+   :eval (icalendar-date/time-max '(12 15 2024) '(11 15 2024) '(12 1 2024))
+   :eval
+   "(icalendar-date/time-max '(0 0 8 11 12 2024 3 nil 3600)
+                           '(0 0 9 11 12 2024 3 nil 3600)
+                           '(0 0 10 11 12 2024 3 nil 3600))")
+  (icalendar-date/time-add
+   :no-manual t
+   :eval (icalendar-date/time-add '(11 11 2024) :month 2)
+   :eval (icalendar-date/time-add '(0 0 10 11 11 2024 1 -1 nil) :hour -3))
+  (icalendar-date/time-add-duration
+   :no-manual t
+   :eval "(icalendar-date/time-add-duration '(12 11 2024)
+    (make-decoded-time :day 4))"
+   :eval "(icalendar-date/time-add-duration '(0 0 10 11 12 2024 3 -1 nil)
+    (make-decoded-time :hour 2 :minute 30))")
+  (icalendar-date/time-year
+   :no-manual t
+   :eval (icalendar-date/time-year '(12 11 2024))
+   :eval (icalendar-date/time-year '(0 0 10 11 12 2024 3 nil 3600)))
+  (icalendar-date/time-month
+   :no-manual t
+   :eval (icalendar-date/time-month '(12 11 2024))
+   :eval (icalendar-date/time-month '(0 0 10 11 12 2024 3 nil 3600)))
+  (icalendar-date/time-monthday
+   :no-manual t
+   :eval (icalendar-date/time-monthday '(12 11 2024))
+   :eval (icalendar-date/time-monthday '(0 0 10 11 12 2024 3 nil 3600)))
+  (icalendar-date/time-weekday
+   :no-manual t
+   :eval (icalendar-date/time-weekday '(12 11 2024))
+   :eval (icalendar-date/time-weekday '(0 0 10 11 12 2024 3 nil 3600)))
+  (icalendar-date/time-weekno
+   :no-manual t
+   :eval (icalendar-date/time-weekno '(12 11 2024))
+   :eval (icalendar-date/time-weekno '(0 0 10 11 12 2024 3 nil 3600)))
+  (icalendar-date/time-hour
+   :no-manual t
+   :eval (icalendar-date/time-hour '(12 11 2024))
+   :eval (icalendar-date/time-hour '(0 0 10 11 12 2024 3 nil 3600)))
+  (icalendar-date/time-minute
+   :no-manual t
+   :eval (icalendar-date/time-minute '(12 11 2024))
+   :eval (icalendar-date/time-minute '(0 0 10 11 12 2024 3 nil 3600)))
+  (icalendar-date/time-second
+   :no-manual t
+   :eval (icalendar-date/time-second '(12 11 2024))
+   :eval (icalendar-date/time-second '(0 0 10 11 12 2024 3 nil 3600)))
+  (icalendar-date/time-zone
+   :no-manual t
+   :eval (icalendar-date/time-zone '(12 11 2024))
+   :eval (icalendar-date/time-zone '(0 0 10 11 12 2024 3 nil 3600)))
+  "Recurrence rules and recurrences"
+  (icalendar-recur-recurrences-in-window
+   :no-manual t
+   :no-eval
+   "(icalendar-recur-recurrences-in-window '(1 1 2026) '(12 31 2026)
+                                          vevent)"
+   :eg-result-string "((1 10 2026) (2 10 2026) ...)")
+  (icalendar-recur-recurrences-in-window-w/end-times
+   :no-manual t
+   :no-eval
+   "(icalendar-recur-recurrences-in-window-w/end-times
+     '(0 0 0 1 1 2026 4 -1 nil) '(0 0 0 1 2 2026 1 -1 nil)
+     vevent)"
+   :eg-result-string
+   "(((0 0 10 10 1 2026 4 -1 nil) (0 0 11 10 1 2026 4 -1 nil)) ...)")
+  (icalendar-recur-recurrences-to-count
+   :no-manual t
+   :no-eval
+   "(icalendar-recur-recurrences-to-count '(1 1 2026) '(12 31 2026)
+                                          vevent)"
+   :eg-result-string "((1 10 2026) (2 10 2026) (3 10 2026))")
+  (icalendar-recur-freq
+   :eval
+   (icalendar-recur-freq '((FREQ MONTHLY) (INTERVAL 3) (BYDAY ((5 . -1))))))
+  (icalendar-recur-interval-size
+   :eval (icalendar-recur-interval-size '((FREQ MONTHLY) (BYDAY ((5 . -1)))))
+   :eval (icalendar-recur-interval-size '((FREQ MONTHLY) (INTERVAL 3))))
+  (icalendar-recur-count
+   :eval (icalendar-recur-count '((FREQ MONTHLY) (INTERVAL 2) (COUNT 6))))
+  (icalendar-recur-until
+   :eval (icalendar-recur-until '((FREQ WEEKLY) (UNTIL (12 31 2026)))))
+  (icalendar-recur-by*
+   :eval (icalendar-recur-by* 'BYDAY '((FREQ MONTHLY) (BYDAY ((5 . -1))))))
+  (icalendar-recur-weekstart
+   :eval
+   (icalendar-recur-weekstart '((FREQ WEEKLY) (UNTIL (12 31 2026)) (WKST 0)))
+   :eval
+   (icalendar-recur-weekstart '((FREQ WEEKLY) (UNTIL (12 31 2026))))))
+
+(provide 'icalendar-shortdoc)
diff --git a/lisp/calendar/icalendar-utils.el b/lisp/calendar/icalendar-utils.el
index e877cb85637..565901940f0 100644
--- a/lisp/calendar/icalendar-utils.el
+++ b/lisp/calendar/icalendar-utils.el
@@ -23,6 +23,8 @@
 
 ;;; Commentary:
 
+;; For an overview of the iCalendar library, see icalendar-shortdoc.el.
+
 ;; This file contains a variety of utility functions to work with
 ;; iCalendar data which are used throughout the rest of the iCalendar
 ;; library.  Most of the functions here deal with calendar and clock
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 4956dc82f09..d439d4ed2e3 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -27,21 +27,13 @@
 ;;; Commentary:
 
 ;; Most of the code in this file is now obsolete and has been marked as such.
+;; For an overview of the new iCalendar library, see icalendar-shortdoc.el.
 ;; For the new implementation of diary import/export, see diary-icalendar.el.
 ;; Error handling code, global variables, and user options relevant for the
 ;; entire iCalendar library remain in this file.
 
-;; This package is documented in the Emacs Manual.
+;; The diary-icalendar feature is documented in the Emacs Manual.
 
-;;   Please note:
-;; - Diary entries which have a start time but no end time are assumed to
-;;   last for one hour when they are exported.
-;; - Weekly diary entries are assumed to occur the first time in the first
-;;   week of the year 2000 when they are exported.
-;; - Yearly diary entries are assumed to occur the first time in the year
-;;   1900 when they are exported.
-;; - Float diary entries are assumed to occur the first time on the
-;;   day when they are exported.
 
 ;;; History:
 

From b6e7c7d43b431e846655d310c4c66413c8bf41a7 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Mon, 6 Apr 2026 12:16:56 +0200
Subject: [PATCH 079/463] Add face for obsolete packages in package menu

* lisp/emacs-lisp/package.el (package-status-obsolete): New face.
(package-menu-status-faces): Use new face instead of hard-coding
a font-lock face.
---
 lisp/emacs-lisp/package.el | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index ea8cccd413a..0d21c520609 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -3625,6 +3625,11 @@ Return (PKG-DESC [NAME VERSION STATUS DOC])."
   "Face used on the status and version of avail-obso packages."
   :version "25.1")
 
+(defface package-status-obsolete
+  '((t :inherit font-lock-warning-face))
+  "Face used on the status and version of obsolete packages."
+  :version "31.1")
+
 (defface package-mark-install-line
   '((((class color) (background light))
      :background "darkolivegreen1" :extend t)
@@ -3675,7 +3680,7 @@ Return (PKG-DESC [NAME VERSION STATUS DOC])."
     ("dependency" . package-status-dependency)
     ("unsigned"   . package-status-unsigned)
     ("incompat"   . package-status-incompat)
-    ("obsolete"   . font-lock-warning-face))
+    ("obsolete"   . package-status-obsolete))
   "Alist mapping status strings for packages to faces.
 These faces are used in the package menu.")
 

From dedd652fc58c2157e0c27df1ca2e5836a94ce641 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 12 Apr 2026 12:37:01 +0200
Subject: [PATCH 080/463] Fix computation of package description file

* lisp/subr.el (package--description-file): Do not expect
non-numeric version components to be followed directly by a
number.  (Bug#80744)
---
 lisp/subr.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/subr.el b/lisp/subr.el
index 036f414262a..d97598ab61f 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -7625,7 +7625,7 @@ as a list.")
                          (directory-file-name dir))))
             ;; This needs to match only the version strings that can be
             ;; generated by `package-version-join'.
-            (if (string-match "\\([^.].*?\\)-\\([0-9]+\\(?:[.][0-9]+\\|\\(?:pre\\|beta\\|alpha\\|snapshot\\)[0-9]+\\)*\\)\\'" subdir)
+            (if (string-match "\\([^.].*?\\)-\\([0-9]+\\(?:[.][0-9]+\\|\\(?:pre\\|beta\\|alpha\\|snapshot\\)[0-9]*\\)*\\)\\'" subdir)
                 (match-string 1 subdir) subdir))
           "-pkg.el"))
 

From be2b4a983192efc0f5f7ce99a95e3bb648f3984a Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 12 Apr 2026 13:09:09 +0200
Subject: [PATCH 081/463] Clean up 'Info-directory-list' after deleting package

* lisp/emacs-lisp/package.el (package--delete-directory): Remove
manual before physically deleting the package.  (Bug#80776)
---
 lisp/emacs-lisp/package.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 0d21c520609..7d934222b16 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2348,6 +2348,9 @@ installed), maybe you need to \\[package-refresh-contents]")
   "Delete PKG-DESC directory DIR recursively.
 Clean-up the corresponding .eln files if Emacs is native
 compiled, and remove the DIR from `load-path'."
+  (when (and (file-exists-p (expand-file-name "dir" dir))
+             (boundp 'Info-directory-list))
+    (cl-callf2 delete dir Info-directory-list))
   (setq load-path (cl-remove-if (lambda (s) (file-in-directory-p s dir))
                                 load-path))
   (when (featurep 'native-compile)

From 4e855f90d1b1c3996b408d3f5d9e02d0ca7fd792 Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Fri, 3 Apr 2026 09:41:13 +0300
Subject: [PATCH 082/463] xwidgets: re-enable with newer webkit2gtk

By disabling hw-acceleration we can re-enable xwidgets with newer
webkit2gtk versions (Bug#80728).
Newer versions were disallowed (Bug#66068) since they abort when a
webkit view is created; however, they work fine as long as we disable
hw-acceleration, since the off-screen windows that xwidgets uses do not
support that.
* configure.ac: Remove upper-bound for webkit2gtk version check.
* src/xwidget.c (Fmake_xwidget): Turn off hardware-acceleration.

Copyright-paperwork-exempt: yes
---
 configure.ac  | 5 ++---
 src/xwidget.c | 9 +++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3567849c81d..9f3677bea34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4456,11 +4456,10 @@ XWIDGETS_OBJ=
 if test "$with_xwidgets" != "no"; then
   if test "$USE_GTK_TOOLKIT" = "GTK3" && test "$window_system" != "none"; then
     WEBKIT_REQUIRED=2.12
-    WEBKIT_BROKEN=2.41.92
-    WEBKIT_MODULES="webkit2gtk-4.1 >= $WEBKIT_REQUIRED webkit2gtk-4.1 < $WEBKIT_BROKEN"
+    WEBKIT_MODULES="webkit2gtk-4.1 >= $WEBKIT_REQUIRED"
     EMACS_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES])
     if test "$HAVE_WEBKIT" = "no"; then
-      WEBKIT_MODULES="webkit2gtk-4.0 >= $WEBKIT_REQUIRED webkit2gtk-4.0 < $WEBKIT_BROKEN"
+      WEBKIT_MODULES="webkit2gtk-4.0 >= $WEBKIT_REQUIRED"
       EMACS_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES])
     fi
     HAVE_XWIDGETS=$HAVE_WEBKIT
diff --git a/src/xwidget.c b/src/xwidget.c
index 0efb3466c34..503b554696d 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -380,6 +380,15 @@ fails.  */)
 	  g_object_set (G_OBJECT (settings), "enable-developer-extras", TRUE, NULL);
 	  g_object_set (G_OBJECT (settings), "enable-javascript",
 		        (gboolean) (!xwidget_webkit_disable_javascript), NULL);
+#if WEBKIT_CHECK_VERSION (2, 16, 0)
+	  /* the webkit view is created on an *offscreen* window, on
+	     which hardware acceleration is not supported; we need to
+	     tell webkitgtk _not_ to try that, since it will fail & abort()
+	     with recent versions. */
+
+	  webkit_settings_set_hardware_acceleration_policy
+	    (settings, WEBKIT_HARDWARE_ACCELERATION_POLICY_NEVER);
+#endif
 	}
 
       gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width,

From 1f946a4497d70a7be87bef9d76587a686635e388 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 12 Apr 2026 14:24:51 +0300
Subject: [PATCH 083/463] ; * src/xwidget.c (Fmake_xwidget): Fix commentary.

---
 src/xwidget.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/xwidget.c b/src/xwidget.c
index 503b554696d..0b890375c30 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -381,11 +381,10 @@ fails.  */)
 	  g_object_set (G_OBJECT (settings), "enable-javascript",
 		        (gboolean) (!xwidget_webkit_disable_javascript), NULL);
 #if WEBKIT_CHECK_VERSION (2, 16, 0)
-	  /* the webkit view is created on an *offscreen* window, on
+	  /* The webkit view is created on an *offscreen* window, on
 	     which hardware acceleration is not supported; we need to
-	     tell webkitgtk _not_ to try that, since it will fail & abort()
-	     with recent versions. */
-
+	     tell webkitgtk _not_ to try that, since it will fail & abort
+	     with recent versions.  */
 	  webkit_settings_set_hardware_acceleration_policy
 	    (settings, WEBKIT_HARDWARE_ACCELERATION_POLICY_NEVER);
 #endif

From 032d4e97e62e885336bfd0b436f45d336b558558 Mon Sep 17 00:00:00 2001
From: Juri Linkov <juri@linkov.net>
Date: Sun, 12 Apr 2026 20:32:05 +0300
Subject: [PATCH 084/463] * lisp/tab-bar.el (tab-bar-show): Support the 0 value
 (bug#80713).

Add explicit choice for the 0 value to always show the tab bar.
Also add a choice for other non-negative numbers.
In the setter enable 'tab-bar-mode' only for numbers,
but not for the t value that should not enable the tab bar
after customization, only after creating a new tab.
---
 lisp/tab-bar.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index 3399e5ef93e..5dd61cdee29 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -638,6 +638,7 @@ on different frames: the tab bar can be shown on some frames and
 hidden on others, depending on how many tab-bar tabs are on that
 frame, and whether that number is greater than the numerical value
 of this variable.
+If 0, always keep the tab bar shown.
 If nil, always keep the tab bar hidden.  In this case it's still
 possible to use persistent named window configurations by relying on
 keyboard commands `tab-new', `tab-close', `tab-next', `tab-switcher', etc.
@@ -648,13 +649,15 @@ update the tab bar on all frames according to the new value.
 
 To enable or disable the tab bar individually on each frame,
 you can use the command `toggle-frame-tab-bar'."
-  :type '(choice (const :tag "Always" t)
+  :type '(choice (const :tag "On creating a new tab" t)
+                 (const :tag "Always" 0)
                  (const :tag "When more than one tab" 1)
+                 (natnum :tag "When more than this number")
                  (const :tag "Never" nil))
   :initialize #'custom-initialize-default
   :set (lambda (sym val)
          (set-default sym val)
-         (if val
+         (if (natnump val)
              (tab-bar-mode 1)
            (tab-bar--update-tab-bar-lines t)))
   :group 'tab-bar

From d835775d9bccc169ce660a184d3ae48e8d1dba53 Mon Sep 17 00:00:00 2001
From: Elias Gabriel Perez <eg642616@gmail.com>
Date: Wed, 11 Mar 2026 20:34:39 -0600
Subject: [PATCH 085/463] hideshow: New function 'hs-add-cycle-binding'
 (Bug#80657)

https://lists.gnu.org/archive/html/emacs-devel/2026-02/msg00153.html

* lisp/progmodes/hideshow.el (hs-cycle-filter)
(hs-minor-mode-map): Update.
(hs--filter-function, hs-add-cycle-binding): New functions.
(hs-cycle): Minor rework.
---
 lisp/progmodes/hideshow.el | 52 +++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index 993ff1cd6f5..34a3fe97da3 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -436,17 +436,16 @@ info node `(elisp)Overlays'."
 (defcustom hs-cycle-filter nil
   "Control where typing a \\`TAB' cycles the visibility.
 This option determines on which parts of a line where a block
-begins \\`TAB' will be bound to visibility-cycling commands such
-as `hs-toggle-hiding'.  The value t means you can type \\`TAB'
-anywhere on a headline.  The value nil means \\`TAB' always has its
-usual binding.  The value can also be a function of no arguments,
-then \\`TAB' will invoke the visibility-cycling commands where that
-function returns non-nil.  For example, if the value is `bolp',
-those commands will be invoked at the headline's beginning.
+begins \\`TAB' will be bound to visibility-cycling commands.
+The value t means you can type \\`TAB' anywhere on a headline.  The
+value nil means \\`TAB' always has its usual binding.  The value can
+also be a function of no arguments, then \\`TAB' will invoke the
+visibility-cycling commands where that function returns non-nil.  For
+example, if the value is `bolp', those commands will be invoked at the
+headline's beginning.
 This allows to preserve the usual bindings, as determined by the
 major mode, elsewhere on the headlines.
-Currently it affects only the command `hs-toggle-hiding' by default,
-but it can be easily replaced with the command `hs-cycle'."
+See also `hs-add-cycle-binding' to change the function to use."
   :type `(choice (const :tag "Nowhere" nil)
                  (const :tag "Everywhere on the headline" t)
                  (const :tag "At block beginning" hs-hideable-block-p)
@@ -537,18 +536,6 @@ This is only used if `hs-indicator-type' is set to `margin' or nil."
   :doc "Keymap for hideshow minor mode."
   "S-<mouse-2>" #'hs-toggle-hiding
   "C-c @" hs-prefix-map
-  "TAB" `(menu-item
-          "" hs-toggle-hiding
-          :filter
-          ,(lambda (cmd)
-             (when (and hs-cycle-filter
-                        ;; On the headline with hideable blocks
-                        (save-excursion
-                          (forward-line 0)
-                          (hs-get-first-block-on-line))
-                        (or (not (functionp hs-cycle-filter))
-                            (funcall hs-cycle-filter)))
-               cmd)))
   "<left-fringe> <mouse-1>" #'hs-indicator-mouse-toggle-hiding)
 
 (defvar-keymap hs-indicators-map
@@ -556,6 +543,17 @@ This is only used if `hs-indicator-type' is set to `margin' or nil."
   "<left-margin> <mouse-1>" #'hs-indicator-mouse-toggle-hiding
   "<mouse-1>" #'hs-toggle-hiding)
 
+(defun hs-add-cycle-binding (keymap key definition)
+  "Define KEY for `hs-cycle-filter'.
+KEYMAP, KEY and DEFINITION are the same arguments as the ones of
+`keymap-set'."
+  (keymap-set (or keymap hs-minor-mode-map) key
+              `(menu-item
+                "" ,definition
+                :filter hs--filter-function)))
+
+(hs-add-cycle-binding nil "TAB" #'hs-toggle-hiding)
+
 (easy-menu-define hs-minor-mode-menu hs-minor-mode-map
   "Menu used when hideshow minor mode is active."
   '("Hide/Show"
@@ -976,6 +974,17 @@ commands."
 
 ;;;; Internal functions
 
+(defun hs--filter-function (cmd)
+  "Function used for `hs-cycle-filter' and `hs-add-cycle-binding'."
+  (when (and hs-cycle-filter
+             ;; On the headline with hideable blocks
+             (save-excursion
+               (forward-line 0)
+               (hs-get-first-block-on-line))
+             (or (not (functionp hs-cycle-filter))
+                 (funcall hs-cycle-filter)))
+    cmd))
+
 (defun hs--discard-overlay-before-changes (o &rest _r)
   "Remove overlay O before changes.
 Intended to be used in `modification-hooks', `insert-in-front-hooks' and
@@ -1441,6 +1450,7 @@ blocks.
 If LEVEL is specified (interactively, the prefix numeric argument), hide
 only blocks which are that many levels below the level of point."
   (interactive "p")
+  (setq level (or level 1)) ; For non-interactive calls
   (hs-life-goes-on
    (when-let* ((ret (hs-get-near-block :include-comments)))
      (cond ((eq ret 'comment)

From ca33663e5065fb9730924650ea9e86f486910fb3 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sun, 12 Apr 2026 16:44:03 -0400
Subject: [PATCH 086/463] Update to Org 9.8.2

---
 etc/refcards/orgcard.tex |  2 +-
 lisp/org/org-element.el  |  4 ++--
 lisp/org/org-version.el  |  4 ++--
 lisp/org/org.el          |  2 +-
 lisp/org/ox-texinfo.el   | 14 ++++++++------
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 73d7543e853..88444fef54e 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{9.8.1}
+\def\orgversionnumber{9.8.2}
 \def\versionyear{2026}          % latest update
 \input emacsver.tex
 
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index 5f64cc1c1d0..32edc154132 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -183,7 +183,7 @@ Drawer's name is located in match group 1.")
 (defconst org-element-dynamic-block-open-re
   (rx line-start (0+ (any ?\s ?\t))
       "#+BEGIN:" (0+ (any ?\s ?\t))
-      (group (1+ word))
+      (group (1+ (not space)))
       (opt
        (1+ (any ?\s ?\t))
        (group (1+ nonl))))
@@ -193,7 +193,7 @@ Parameters are in match group 2.")
 
 (defconst org-element-dynamic-block-open-re-nogroup
   (rx line-start (0+ (any ?\s ?\t))
-      "#+BEGIN:" (0+ (any ?\s ?\t)) word)
+      "#+BEGIN:" (0+ (any ?\s ?\t)) (not space))
   "Regexp matching the opening line of a dynamic block.")
 
 (defconst org-element-headline-re
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index a62f9544fc2..75d036844d8 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -5,13 +5,13 @@
 (defun org-release ()
   "The release version of Org.
 Inserted by installing Org mode or when a release is made."
-   (let ((org-release "9.8.1"))
+   (let ((org-release "9.8.2"))
      org-release))
 ;;;###autoload
 (defun org-git-version ()
   "The Git version of Org mode.
 Inserted by installing Org or when a release is made."
-   (let ((org-git-version "release_9.8.1"))
+   (let ((org-git-version "release_9.8.2"))
      org-git-version))
 
 (provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index d711687f4c9..bf3bfbc6244 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -9,7 +9,7 @@
 ;; URL: https://orgmode.org
 ;; Package-Requires: ((emacs "28.2"))
 
-;; Version: 9.8.1
+;; Version: 9.8.2
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el
index a5417773854..0aaa4902bd7 100644
--- a/lisp/org/ox-texinfo.el
+++ b/lisp/org/ox-texinfo.el
@@ -573,12 +573,14 @@ Trim string and collapse multiple whitespace characters as they
 are not significant.  Replace leading left parenthesis, when
 followed by a right parenthesis, with a square bracket.  Remove
 periods, commas and colons."
-  (org-trim
-   (replace-regexp-in-string
-    "[ \t]+" " "
-    (replace-regexp-in-string
-     "[:,.]" ""
-     (replace-regexp-in-string "\\`(\\(.*?)\\)" "[\\1" title)))))
+  (thread-last
+    title
+    (replace-regexp-in-string "\\`(\\(.*?)\\)" "[\\1")
+    ;; See https://lists.gnu.org/archive/html/bug-texinfo/2026-03/msg00000.html
+    (replace-regexp-in-string (rx "@comma" (optional "{}")) "")
+    (replace-regexp-in-string "[:,.]" "")
+    (replace-regexp-in-string "[ \t]+" " ")
+    org-trim))
 
 (defun org-texinfo--sanitize-title (title info)
   "Make TITLE suitable as a section name.

From 180953c8f656edfc4333091d59d0d5cacbe277e9 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 12 Apr 2026 15:35:40 -0700
Subject: [PATCH 087/463] emacsclient config+sending long-line fixes

Do not mishandle long lines, or lines containing NUL,
when getting configuration or sending data.
* lib-src/emacsclient.c (send_to_emacs_len, quote_argument_len):
New functions, generalizing the old send_to_emacs and quote_argument.
Rewrite the old functions to use the new ones.
(get_server_config): Do not mishandle long lines in the config file.
(set_tcp_socket): No longer a need to null-terminate auth string.
(main): Do not mishandle long lines from stdin, or lines with NUL.
---
 lib-src/emacsclient.c | 74 +++++++++++++++++++++++++++----------------
 1 file changed, 46 insertions(+), 28 deletions(-)

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 4f3215ea6b1..fe5f405efb4 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -811,12 +811,12 @@ sock_err_message (const char *function_name)
 }
 
 
-/* Send to S the data in *DATA when either
+/* Send to S the DATA, of size DLEN, when either
    - the data's last byte is '\n', or
-   - the buffer is full (but this shouldn't happen)
+   - the buffer is full.
    Otherwise, just accumulate the data.  */
 static void
-send_to_emacs (HSOCKET s, const char *data)
+send_to_emacs_len (HSOCKET s, const char *data, ptrdiff_t dlen)
 {
   enum { SEND_BUFFER_SIZE = 4096 };
 
@@ -826,7 +826,7 @@ send_to_emacs (HSOCKET s, const char *data)
   /* Fill pointer for the send buffer.  */
   static int sblen;
 
-  for (ptrdiff_t dlen = strlen (data); dlen != 0; )
+  while (dlen != 0)
     {
       int part = min (dlen, SEND_BUFFER_SIZE - sblen);
       memcpy (&send_buffer[sblen], data, part);
@@ -858,20 +858,27 @@ send_to_emacs (HSOCKET s, const char *data)
     }
 }
 
-
-/* In STR, insert a & before each &, each space, each newline, and
-   any initial -.  Change spaces to underscores, too, so that the
-   return value never contains a space.
-
-   Does not change the string.  Outputs the result to S.  */
+/* Send to S the data in the string DATA.  */
 static void
-quote_argument (HSOCKET s, const char *str)
+send_to_emacs (HSOCKET s, const char *data)
 {
-  char *copy = xmalloc (strlen (str) * 2 + 1);
+  send_to_emacs_len (s, data, strlen (data));
+}
+
+
+/* Output to S a quoted copy of the array of bytes STR with length LEN.
+   Insert a & before each &, each space, each newline, and
+   any initial -.  Change spaces to underscores, too, so that the
+   output never contains a space.  */
+static void
+quote_argument_len (HSOCKET s, const char *str, ptrdiff_t len)
+{
+  char const *lim = str + len;
+  char *copy = xmalloc (len * 2);
   char *q = copy;
-  if (*str == '-')
-    *q++ = '&', *q++ = *str++;
-  for (; *str; str++)
+  if (str < lim && *str == '-')
+    *q++ = '&';
+  for (; str < lim; str++)
     {
       char c = *str;
       if (c == ' ')
@@ -882,13 +889,21 @@ quote_argument (HSOCKET s, const char *str)
 	*q++ = '&';
       *q++ = c;
     }
-  *q = 0;
 
-  send_to_emacs (s, copy);
+  send_to_emacs_len (s, copy, q - copy);
 
   free (copy);
 }
 
+/* Output to S a quoted copy of the string STR.
+   Insert a & before each &, each space, each newline, and
+   any initial -.  Change spaces to underscores, too, so that the
+   output never contains a space.  */
+static void
+quote_argument (HSOCKET s, const char *str)
+{
+  return quote_argument_len (s, str, strlen (str));
+}
 
 /* The inverse of quote_argument.  Remove quoting in string STR by
    modifying the addressed string in place.  Return STR.  */
@@ -990,8 +1005,6 @@ static bool
 get_server_config (const char *config_file, struct sockaddr_in *server,
 		   char *authentication)
 {
-  char dotted[32];
-  char *port;
   FILE *config;
 
   if (IS_ABSOLUTE_FILE_NAME (config_file))
@@ -1009,8 +1022,11 @@ get_server_config (const char *config_file, struct sockaddr_in *server,
   if (! config)
     return false;
 
-  if (fgets (dotted, sizeof dotted, config)
-      && (port = strchr (dotted, ':')))
+  char *dotted = NULL;
+  size_t dottedsize;
+  ssize_t dottedlen = getline (&dotted, &dottedsize, config);
+  char *port = dottedlen < 0 ? NULL : strchr (dotted, ':');
+  if (port)
     *port++ = '\0';
   else
     {
@@ -1022,6 +1038,7 @@ get_server_config (const char *config_file, struct sockaddr_in *server,
   server->sin_family = AF_INET;
   server->sin_addr.s_addr = inet_addr (dotted);
   server->sin_port = htons (atoi (port));
+  free (dotted);
 
   if (! fread (authentication, AUTH_KEY_LENGTH, 1, config))
     {
@@ -1060,9 +1077,9 @@ set_tcp_socket (const char *local_server_file)
     struct sockaddr sa;
   } server;
   struct linger l_arg = { .l_onoff = 1, .l_linger = 1 };
-  char auth_string[AUTH_KEY_LENGTH + 1];
+  char auth_buf[AUTH_KEY_LENGTH];
 
-  if (! get_server_config (local_server_file, &server.in, auth_string))
+  if (! get_server_config (local_server_file, &server.in, auth_buf))
     return INVALID_SOCKET;
 
   if (server.in.sin_addr.s_addr != inet_addr ("127.0.0.1") && !quiet)
@@ -1096,10 +1113,8 @@ set_tcp_socket (const char *local_server_file)
     sock_err_message ("setsockopt");
 
   /* Send the authentication.  */
-  auth_string[AUTH_KEY_LENGTH] = '\0';
-
   send_to_emacs (s, "-auth ");
-  send_to_emacs (s, auth_string);
+  send_to_emacs_len (s, auth_buf, sizeof auth_buf);
   send_to_emacs (s, " ");
 
   return s;
@@ -2170,11 +2185,14 @@ main (int argc, char **argv)
   else if (eval)
     {
       /* Read expressions interactively.  */
-      while (fgets (string, BUFSIZ, stdin))
+      char *line = NULL;
+      size_t linesize;
+      for (ssize_t len; 0 <= (len = getline (&line, &linesize, stdin)); )
 	{
 	  send_to_emacs (emacs_socket, "-eval ");
-	  quote_argument (emacs_socket, string);
+	  quote_argument_len (emacs_socket, line, len);
 	}
+      free (line);
       send_to_emacs (emacs_socket, " ");
     }
 

From 46c08d85743e30cd024264703e4e1b6f8927fb58 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 12 Apr 2026 17:05:44 -0700
Subject: [PATCH 088/463] emacsclient send_buffer size--

* lib-src/emacsclient.c (send_to_emacs_len):
No need to add 1 to SEND_BUFFER_SIZE.
---
 lib-src/emacsclient.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index fe5f405efb4..3ee4e3f92d5 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -821,7 +821,7 @@ send_to_emacs_len (HSOCKET s, const char *data, ptrdiff_t dlen)
   enum { SEND_BUFFER_SIZE = 4096 };
 
   /* Buffer to accumulate data to send in TCP connections.  */
-  static char send_buffer[SEND_BUFFER_SIZE + 1];
+  static char send_buffer[SEND_BUFFER_SIZE];
 
   /* Fill pointer for the send buffer.  */
   static int sblen;

From 7d07690e5dade398da8a26805744f8bf1daafe8c Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 12 Apr 2026 22:56:16 -0700
Subject: [PATCH 089/463] emacsclient receiving long-line fixes

Do not mishandle long lines, or lines containing NUL,
when receiving data.
* lib-src/emacsclient.c (check_socket_timeout, main):
Use ssize_t for return values from recv,
since in theory the value could exceed INT_MAX now.
(main): Do not use a fixed-size buffer for receiving data;
instead, grow the buffer as needed (admittedly unlikely).
When a partial line is received via recv, do not discard its data;
instead, keep reading, possibly with a grown buffer.
Do not ignore received data after a null byte is received.
Add a comment about when received data is ignored due to a goto.
---
 lib-src/emacsclient.c | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 3ee4e3f92d5..134c2217650 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1975,7 +1975,7 @@ set_socket_timeout (HSOCKET socket, int seconds)
 }
 
 static bool
-check_socket_timeout (int rl)
+check_socket_timeout (ssize_t rl)
 {
 #ifndef WINDOWSNT
   return (rl == -1)
@@ -1994,9 +1994,11 @@ main (int argc, char **argv)
   main_argv = argv;
   progname = argv[0] ? argv[0] : "emacsclient";
 
-  int rl = 0;
+  ssize_t rl = 0;
   bool skiplf = true;
-  char string[BUFSIZ + 1];
+  char *recv_buf = NULL;
+  ptrdiff_t recv_bufsize = 0;
+
   int exit_status = EXIT_SUCCESS;
 
 #ifdef HAVE_NTGUI
@@ -2208,6 +2210,8 @@ main (int argc, char **argv)
 
   set_socket_timeout (emacs_socket, timeout > 0 ? timeout : DEFAULT_TIMEOUT);
   bool saw_response = false;
+  ptrdiff_t nrecv = 0;
+
   /* Now, wait for an answer and print any messages.  */
   while (exit_status == EXIT_SUCCESS)
     {
@@ -2216,7 +2220,14 @@ main (int argc, char **argv)
       do
 	{
 	  act_on_signals (emacs_socket);
-	  rl = recv (emacs_socket, string, BUFSIZ, 0);
+	  if (nrecv == recv_bufsize)
+	    {
+	      enum { DEFAULT_RECV_BUFSIZE = 4096 };
+	      recv_bufsize = (recv_bufsize + (recv_bufsize >> 1)
+			      + DEFAULT_RECV_BUFSIZE);
+	      recv_buf = xrealloc (recv_buf, recv_bufsize);
+	    }
+	  rl = recv (emacs_socket, recv_buf + nrecv, recv_bufsize - nrecv, 0);
 	  retry = check_socket_timeout (rl);
 	  if (retry && !saw_response)
 	    {
@@ -2239,16 +2250,17 @@ main (int argc, char **argv)
       if (rl <= 0)
         break;
 
+      nrecv += rl;
       saw_response = true;
-      string[rl] = '\0';
 
       /* Loop over all NL-terminated messages.  */
-      char *p = string;
-      for (char *end_p = p; end_p && *end_p != '\0'; p = end_p)
+      char *p = recv_buf;
+      for (char *end_p = p; end_p < recv_buf + nrecv; p = end_p)
 	{
-	  end_p = strchr (p, '\n');
-	  if (end_p != NULL)
-	    *end_p++ = '\0';
+	  end_p = memchr (p, '\n', recv_buf + nrecv - p);
+	  if (!end_p)
+	    break;
+	  *end_p++ = '\0';
 
           if (strprefix ("-emacs-pid ", p))
             {
@@ -2271,6 +2283,7 @@ main (int argc, char **argv)
                   tty = true;
                 }
 
+	      /* This discards any remaining data in recv_buf.  */
               goto retry;
             }
           else if (strprefix ("-print ", p))
@@ -2324,6 +2337,9 @@ main (int argc, char **argv)
 	      skiplf = true;
 	    }
 	}
+
+      nrecv -= p - recv_buf;
+      memmove (recv_buf, p, nrecv);
     }
 
   if (!skiplf && 0 <= process_grouping ())

From 873da49988007d7cf4bc793c89355261f5ad2818 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 13 Apr 2026 13:47:24 +0300
Subject: [PATCH 090/463] Revert "; Fix last change."

This reverts commit 670bb34d91179eef087b6964edb445244180e8f6.
It is no longer needed with the latest Org 9.8.2.
---
 doc/misc/modus-themes.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org
index 40343f468c9..7bd86896ecc 100644
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@ -2975,7 +2975,7 @@ this to the Emacs configuration file will suffice:
  '(region ((t :extend nil))))
 #+end_src
 
-[[#h:c8605d37-66e1-42aa-986e-d7514c3af6fe][Make the region preserve text colors plus other styles]].
+[[#h:c8605d37-66e1-42aa-986e-d7514c3af6fe][Make the region preserve text colors, plus other styles]].
 
 ** DIY Add padding to the mode line
 :PROPERTIES:

From 71fce9fe2b8ff12af878c8692e61ca7467f42830 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 13 Apr 2026 13:48:22 +0300
Subject: [PATCH 091/463] Revert "; Fix node names in modus-themes.org"

This reverts commit d4002877d3b4d7dcc3c7d5e6ecdef10aad06b8a6.
It is no longer needed with the latest Org v9.8.2.
---
 doc/misc/modus-themes.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org
index 7bd86896ecc..6e6cf68c7d2 100644
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@ -2587,7 +2587,7 @@ We thus have the following:
 
 Reload the theme for changes to take effect.
 
-*** DIY Make the region preserve text colors plus other styles
+*** DIY Make the region preserve text colors, plus other styles
 :PROPERTIES:
 :CUSTOM_ID: h:c8605d37-66e1-42aa-986e-d7514c3af6fe
 :END:
@@ -6276,7 +6276,7 @@ piece of text to the next.  Whereas multiple shades of, say, blue and
 magenta can suffice to tell things apart and avoid excess coloration: a
 harmonious rhythm.
 
-** Why are colors mostly variants of blue magenta cyan?
+** Why are colors mostly variants of blue, magenta, cyan?
 :properties:
 :custom_id: h:0b26cb47-9733-4cb1-87d9-50850cb0386e
 :end:

From 5a5801fc24d5a644a58d26d2dc01f73bad57f5db Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Mon, 13 Apr 2026 09:24:44 -0400
Subject: [PATCH 092/463] ; * lisp/vc/vc.el: Note about different file name
 kinds (bug#80722).

---
 lisp/vc/vc.el | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 3773973eb60..bc6c38e3704 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -104,6 +104,12 @@
 ;; In the list of functions below, each identifier needs to be prepended
 ;; with `vc-sys-'.  Some of the functions are mandatory (marked with a
 ;; `*'), others are optional (`-').
+;;
+;; NOTES
+;;
+;; - Unless otherwise specified, code should be prepared to handle
+;;   absolute, relative, abbreviated and unabbreviated file names:
+;;   the generic code isn't always consistent about what it passes.
 
 ;; BACKEND PROPERTIES
 ;;

From cde6878f9defdac1e4e9aedcc79e2a07c6e4c5f8 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 13 Apr 2026 16:31:16 +0300
Subject: [PATCH 093/463] Fix MinGW64 build broken by changes in emacsclient.c

* nt/gnulib-cfg.mk (getdelim, getline): Do not omit.  It is now
needed for 'emacsclient', but MinGW64 doesn't have it in its runtime
libraries (mingw.org's MinGW does have it).  (Bug#80770)
---
 nt/gnulib-cfg.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nt/gnulib-cfg.mk b/nt/gnulib-cfg.mk
index 4a6d3d0719f..288c9b11209 100644
--- a/nt/gnulib-cfg.mk
+++ b/nt/gnulib-cfg.mk
@@ -56,8 +56,6 @@ OMIT_GNULIB_MODULE_file-has-acl = true
 OMIT_GNULIB_MODULE_free-posix = true
 OMIT_GNULIB_MODULE_fsusage = true
 OMIT_GNULIB_MODULE_futimens = true
-OMIT_GNULIB_MODULE_getdelim = true
-OMIT_GNULIB_MODULE_getline = true
 OMIT_GNULIB_MODULE_inttypes-h-incomplete = true
 OMIT_GNULIB_MODULE_issymlink = true
 OMIT_GNULIB_MODULE_issymlinkat = true

From 5d0efe0a5adc025154248350028a718c6906d047 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 13 Apr 2026 17:06:46 +0300
Subject: [PATCH 094/463] Fix hangs on MS-Windows when deleting a pipe process

* src/w32.c (sys_close): Don't close a descriptor from which the
reader thread is reading, to avoid hanging Emacs.  (Bug#80770)
---
 src/w32.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/w32.c b/src/w32.c
index 0b8c21e6c66..f43c96902e8 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -8706,6 +8706,7 @@ sys_close (int fd)
 {
   int rc = -1;
   bool reader_thread_exited = false;
+  bool reader_thread_reading = false;
 
   if (fd < 0)
     {
@@ -8724,6 +8725,9 @@ sys_close (int fd)
 	  && thrd_status != STILL_ACTIVE)
 	reader_thread_exited = true;
 
+      if (cp->thrd != NULL && cp->status == STATUS_READ_IN_PROGRESS)
+	reader_thread_reading = true;
+
       fd_info[fd].cp = NULL;
 
       if (CHILD_ACTIVE (cp))
@@ -8773,7 +8777,13 @@ sys_close (int fd)
      because socket handles are fully fledged kernel handles. */
   if (fd < MAXDESC)
     {
-      if ((fd_info[fd].flags & FILE_DONT_CLOSE) == 0
+      if (((fd_info[fd].flags & FILE_DONT_CLOSE) == 0
+	   /* Don't attempt to close a descriptor while reader thread is
+              stuck in _sys_read_ahead attempting to read from it, as
+              that will hang Emacs.  */
+	   && !(((fd_info[fd].flags & (FILE_PIPE | FILE_READ))
+		 == (FILE_PIPE | FILE_READ))
+		&& reader_thread_reading))
 	  /* If the reader thread already exited, close the descriptor,
 	     since otherwise no one will close it, and we will be
 	     leaking descriptors.  */

From 5caab891b4541e2ad41d86472a8b256760092f16 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 13 Apr 2026 10:40:11 -0400
Subject: [PATCH 095/463] lisp/international/mule.el (auto-coding-alist): Fix
 name (bug#80818)

---
 lisp/international/mule.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 465322070b6..7ee37f14571 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1772,7 +1772,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\|SQUASHFS\\)\\'"
     ;; https://spec.editorconfig.org/ says:
     ;;     EditorConfig files must be UTF-8 encoded,
     ;;     with LF or CRLF line separators.
-    ("/\\.editorconfig\\'" . utf-8-undecided)
+    ("/\\.editorconfig\\'" . utf-8)
     ("/#[^/]+#\\'" . utf-8-emacs-unix))
   "Alist of filename patterns vs corresponding coding systems.
 Each element looks like (REGEXP . CODING-SYSTEM).

From 6b479f201cf681c3a04f5f6105b6b09a4ec8d479 Mon Sep 17 00:00:00 2001
From: Stephen Berman <stephen.berman@gmx.net>
Date: Mon, 13 Apr 2026 20:21:13 +0200
Subject: [PATCH 096/463] ; Another fix for recent 'dired-readin-insert' change

* lisp/dired.el (dired-readin-insert): Restore point after
searching for Dired buffer entry of 'ls' error file (bug#80499).
---
 lisp/dired.el | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lisp/dired.el b/lisp/dired.el
index 3a5a9a3a525..9b7b1271e66 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1628,14 +1628,17 @@ wildcards, erases the buffer, and builds the subdir-alist anew
       (let ((tmpbuf (dired-find-buffer-nocreate temporary-file-directory)))
         (when tmpbuf
           (with-current-buffer tmpbuf
-            (widen)
-            (goto-char (point-min))
-            (when (search-forward (file-name-base dired--ls-error-file) nil t)
-              ;; The call chain of `dired-remove-entry' requires non-nil
-              ;; `dired-subdir-alist', but here it is nil, so we set it.
-              (let ((dired-subdir-alist `((,temporary-file-directory
-                                           . ,(point-min-marker)))))
-                (dired-remove-entry dired--ls-error-file)))))))))
+            (save-excursion
+              (without-restriction
+                (goto-char (point-min))
+                (when (search-forward
+                       (file-name-base dired--ls-error-file) nil t)
+                  ;; The call chain of `dired-remove-entry' requires
+                  ;; non-nil `dired-subdir-alist', but here it is nil,
+                  ;; so we set it.
+                  (let ((dired-subdir-alist `((,temporary-file-directory
+                                               . ,(point-min-marker)))))
+                    (dired-remove-entry dired--ls-error-file)))))))))))
 
 (defun dired-align-file (beg end)
   "Align the fields of a file to the ones of surrounding lines.

From 6942d508f0c0aea17b72e1ce4a612425082316e5 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 13 Apr 2026 16:45:27 -0400
Subject: [PATCH 097/463] SETUP_SYNTAX_TABLE: syntax-propertize more lazily
 (bug#80600)

Many regexps do not pay attention to syntax tables at all
because they don't use things like \s, \b, \<, or \_<.
So delay the actual initialization of the machinery for
`syntax-table` properties (especially the call to `syntax-propertize`)
until the first time we actually need to consult the syntax of
a character.

* src/syntax.c (uninitialized_interval): New constant.
(RE_SETUP_SYNTAX_TABLE_FOR_OBJECT, SETUP_SYNTAX_TABLE):
Set `forw/backward_i` to that new constant to indicate they haven't
actually be initialized yet.
Set `start` and `stop` fields right away, instead of delegating it to
`update_syntax_table`, so that `e_property` and `b_property`
can be set independently.
(update_syntax_table): Remove the `init` argument.  Instead, discover
the need for initialization based on the fact that `forw/backward_i`
are uninitialized.  Presume `start` and `stop` fields have been
set already.
(parse_sexp_propertize): Update call accordingly.
(update_syntax_table_forward): Remove the `init` argument.

* src/syntax.h (update_syntax_table, update_syntax_table_forward):
Remove the `init` argument.
(UPDATE_SYNTAX_TABLE_FORWARD, UPDATE_SYNTAX_TABLE_BACKWARD):
Update calls accordingly.
---
 src/syntax.c | 44 ++++++++++++++++++++++++++++++--------------
 src/syntax.h |  8 ++++----
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/syntax.c b/src/syntax.c
index 64d938b57c1..04b48e91529 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -235,6 +235,9 @@ SYNTAX_MATCH (int c)
   return CONSP (ent) ? XCDR (ent) : Qnil;
 }
 
+/* A "dummy" value we never dereference, distinct from NULL.  */
+#define uninitialized_interval ((INTERVAL) (intptr_t) 1)
+
 /* This should be called with FROM at the start of forward
    search, or after the last position of the backward search.  It
    makes sure that the first char is picked up with correct table, so
@@ -252,11 +255,14 @@ SETUP_SYNTAX_TABLE (ptrdiff_t from, ptrdiff_t count)
   gl_state.object = Qnil;
   if (parse_sexp_lookup_properties)
     {
+      gl_state.start = gl_state.b_property;
+      gl_state.stop = gl_state.e_property;
+      gl_state.backward_i = gl_state.forward_i = uninitialized_interval;
       if (count > 0)
-	update_syntax_table_forward (from, true, Qnil);
+	update_syntax_table_forward (from, Qnil);
       else if (from > BEGV)
 	{
-	  update_syntax_table (from - 1, count, true, Qnil);
+	  update_syntax_table (from - 1, count, Qnil);
 	  parse_sexp_propertize (from - 1);
 	}
     }
@@ -295,8 +301,14 @@ RE_SETUP_SYNTAX_TABLE_FOR_OBJECT (Lisp_Object object,
       gl_state.e_property = 1 + SCHARS (gl_state.object);
     }
   if (parse_sexp_lookup_properties)
-    update_syntax_table (RE_SYNTAX_TABLE_BYTE_TO_CHAR (frombyte),
-			 1, 1, gl_state.object);
+    {
+      gl_state.start = gl_state.b_property;
+      gl_state.stop = gl_state.e_property;
+      /* Don't cover any char, to make sure we'll call `update_syntax_table`
+       * the very next time we need the syntax of a character.  */
+      gl_state.e_property = gl_state.b_property;
+      gl_state.backward_i = gl_state.forward_i = uninitialized_interval;
+    }
 }
 
 /* Update gl_state to an appropriate interval which contains CHARPOS.  The
@@ -313,7 +325,7 @@ RE_SETUP_SYNTAX_TABLE_FOR_OBJECT (Lisp_Object object,
    start/end of OBJECT.  */
 
 void
-update_syntax_table (ptrdiff_t charpos, EMACS_INT count, bool init,
+update_syntax_table (ptrdiff_t charpos, EMACS_INT count,
 		     Lisp_Object object)
 {
   Lisp_Object tmp_table;
@@ -321,22 +333,27 @@ update_syntax_table (ptrdiff_t charpos, EMACS_INT count, bool init,
   bool invalidate = true;
   INTERVAL i;
 
-  if (init)
+  if (gl_state.backward_i == uninitialized_interval)
     {
+      eassert (gl_state.forward_i == uninitialized_interval);
       gl_state.old_prop = Qnil;
-      gl_state.start = gl_state.b_property;
-      gl_state.stop = gl_state.e_property;
       i = interval_of (charpos, object);
       gl_state.backward_i = gl_state.forward_i = i;
       invalidate = false;
       if (!i)
-	return;
+	{
+	  gl_state.b_property = gl_state.start;
+	  gl_state.e_property = gl_state.stop;
+	  return;
+	}
       i = gl_state.forward_i;
       gl_state.b_property = i->position;
       gl_state.e_property = INTERVAL_LAST_POS (i);
     }
   else
     {
+      eassert (gl_state.backward_i != uninitialized_interval);
+      eassert (gl_state.forward_i  != uninitialized_interval);
       i = count > 0 ? gl_state.forward_i : gl_state.backward_i;
 
       /* We are guaranteed to be called with CHARPOS either in i,
@@ -489,13 +506,12 @@ parse_sexp_propertize (ptrdiff_t charpos)
 	 e_property_truncated, so the e_property_truncated flag may
 	 occasionally be left raised spuriously.  This should be rare.  */
       gl_state.e_property_truncated = false;
-      update_syntax_table_forward (charpos, false, Qnil);
+      update_syntax_table_forward (charpos, Qnil);
     }
 }
 
 void
-update_syntax_table_forward (ptrdiff_t charpos, bool init,
-			     Lisp_Object object)
+update_syntax_table_forward (ptrdiff_t charpos, Lisp_Object object)
 {
   if (gl_state.e_property_truncated)
     {
@@ -505,7 +521,7 @@ update_syntax_table_forward (ptrdiff_t charpos, bool init,
     }
   else
     {
-      update_syntax_table (charpos, 1, init, object);
+      update_syntax_table (charpos, 1, object);
       if (NILP (object) && gl_state.e_property > syntax_propertize__done)
 	parse_sexp_propertize (charpos);
     }
@@ -2187,7 +2203,7 @@ skip_syntaxes (bool forwardp, Lisp_Object string, Lisp_Object lim)
 	    while (!parse_sexp_lookup_properties
 		   || pos < gl_state.e_property);
 
-	    update_syntax_table_forward (pos, false, gl_state.object);
+	    update_syntax_table_forward (pos, gl_state.object);
 	  }
       }
     else
diff --git a/src/syntax.h b/src/syntax.h
index 9ed917b1a93..1e32a485eb1 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -26,8 +26,8 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 INLINE_HEADER_BEGIN
 
-extern void update_syntax_table (ptrdiff_t, EMACS_INT, bool, Lisp_Object);
-extern void update_syntax_table_forward (ptrdiff_t, bool, Lisp_Object);
+extern void update_syntax_table (ptrdiff_t, EMACS_INT, Lisp_Object);
+extern void update_syntax_table_forward (ptrdiff_t, Lisp_Object);
 
 /* The standard syntax table is stored where it will automatically
    be used in all new buffers.  */
@@ -175,7 +175,7 @@ INLINE void
 UPDATE_SYNTAX_TABLE_FORWARD (ptrdiff_t charpos)
 { /* Performs just-in-time syntax-propertization.  */
   if (parse_sexp_lookup_properties && charpos >= gl_state.e_property)
-    update_syntax_table_forward (charpos, false, gl_state.object);
+    update_syntax_table_forward (charpos, gl_state.object);
 }
 
 /* Make syntax table state (gl_state) good for CHARPOS, assuming it is
@@ -185,7 +185,7 @@ INLINE void
 UPDATE_SYNTAX_TABLE_BACKWARD (ptrdiff_t charpos)
 {
   if (parse_sexp_lookup_properties && charpos < gl_state.b_property)
-    update_syntax_table (charpos, -1, false, gl_state.object);
+    update_syntax_table (charpos, -1, gl_state.object);
 }
 
 /* Make syntax table good for CHARPOS.  */

From a2b78854b02565b609bf7efc3a6ba8c65e9af2cc Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 13 Apr 2026 17:02:27 -0400
Subject: [PATCH 098/463] (loaddefs-generate--make-autoload): Avoid `%s` on
 compound values

* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload):
Avoid `%s` on compound values.
---
 lisp/emacs-lisp/loaddefs-gen.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el
index 0dc0d873bcd..9659b6535a5 100644
--- a/lisp/emacs-lisp/loaddefs-gen.el
+++ b/lisp/emacs-lisp/loaddefs-gen.el
@@ -238,7 +238,7 @@ expand)' among their `declare' forms."
                   (load file))
               (error
                (push file loaddefs--load-error-files) ; do not attempt again
-               (warn "loaddefs-gen: load error\n\t%s" e)))))
+               (warn "loaddefs-gen: load error\n\t%S" e)))))
         (and (macrop car)
 	     (eq 'expand (function-get car 'autoload-macro 'macro))
 	     (setq expand (let ((load-true-file-name file)

From 601c099d1d3650a0153cd8bfb6a608dd0044dc97 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 14 Apr 2026 14:18:49 +0300
Subject: [PATCH 099/463] ; Fix MinGW64 build due to missing 'getdelim'
 prototype

* src/conf_post.h [WINDOWSNT]: Add prototype for 'getdelim'.
Reported by Angelo Graziosi <angelo.g0@libero.it>.
---
 src/conf_post.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/conf_post.h b/src/conf_post.h
index f2cd8d6b04e..78b542d69d3 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -425,3 +425,11 @@ extern int gl_consolesafe_vprintf (const char *restrict format, va_list args)
 #  define vprintf gl_consolesafe_vprintf
 # endif	/* !_UCRT */
 #endif	/* WINDOWSNT */
+
+#if defined WINDOWSNT && !defined HAVE_DECL_GETDELIM
+/* MinGW64 doesn't have getdelim, called by Gnulib's getline, but the
+   MS-Windows build omits stdio.h module, where getdelim is declared.  */
+# include <stdio.h>
+# include <stddef.h>
+extern ssize_t getdelim (char **, size_t *, int, FILE *);
+#endif

From 6bda6e21234dd07504362755c8c22e5f15ee92f7 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 14 Apr 2026 15:32:11 +0300
Subject: [PATCH 100/463] ; Another attempt to fix the MinGW64 build

* src/conf_post.h [WINDOWSNT]: Add prototype for 'getline'.
---
 src/conf_post.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/conf_post.h b/src/conf_post.h
index 78b542d69d3..e2addf37103 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -426,10 +426,17 @@ extern int gl_consolesafe_vprintf (const char *restrict format, va_list args)
 # endif	/* !_UCRT */
 #endif	/* WINDOWSNT */
 
-#if defined WINDOWSNT && !defined HAVE_DECL_GETDELIM
+#if defined WINDOWSNT
 /* MinGW64 doesn't have getdelim, called by Gnulib's getline, but the
    MS-Windows build omits stdio.h module, where getdelim is declared.  */
-# include <stdio.h>
-# include <stddef.h>
+# if !(defined HAVE_DECL_GETDELIM && defined HAVE_DECL_GETLINE)
+#  include <stdio.h>
+#  include <stddef.h>
+#  if !defined HAVE_DECL_GETDELIM
 extern ssize_t getdelim (char **, size_t *, int, FILE *);
+#  endif
+#  if !defined HAVE_DECL_GETLINE
+extern ssize_t getline (char **, size_t *, FILE *);
+#  endif
+# endif
 #endif

From 5e34dba5b8913b6dbe6d4a2dd2dbe087f81b15dc Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 14 Apr 2026 16:02:42 +0300
Subject: [PATCH 101/463] ; And one more attempt to fix MinGW64 build

* src/conf_post.h [WINDOWSNT]: Use "#if !FOO" because HAVE_DECL_*
are defined to zero.
---
 src/conf_post.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/conf_post.h b/src/conf_post.h
index e2addf37103..a3fcb1f82c5 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -426,16 +426,16 @@ extern int gl_consolesafe_vprintf (const char *restrict format, va_list args)
 # endif	/* !_UCRT */
 #endif	/* WINDOWSNT */
 
-#if defined WINDOWSNT
+#ifdef WINDOWSNT
 /* MinGW64 doesn't have getdelim, called by Gnulib's getline, but the
    MS-Windows build omits stdio.h module, where getdelim is declared.  */
-# if !(defined HAVE_DECL_GETDELIM && defined HAVE_DECL_GETLINE)
+# if !(HAVE_DECL_GETDELIM && HAVE_DECL_GETLINE)
 #  include <stdio.h>
 #  include <stddef.h>
-#  if !defined HAVE_DECL_GETDELIM
+#  if !HAVE_DECL_GETDELIM
 extern ssize_t getdelim (char **, size_t *, int, FILE *);
 #  endif
-#  if !defined HAVE_DECL_GETLINE
+#  if !HAVE_DECL_GETLINE
 extern ssize_t getline (char **, size_t *, FILE *);
 #  endif
 # endif

From be18635ef09dfef50e1ae6811d1b8c5e71008165 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 14 Apr 2026 17:34:24 +0300
Subject: [PATCH 102/463] ; * doc/emacs/fixit.texi (Transpose): Improve text
 and indexing.

---
 doc/emacs/fixit.texi | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi
index 36a27a78dda..37dcfbb9c7c 100644
--- a/doc/emacs/fixit.texi
+++ b/doc/emacs/fixit.texi
@@ -142,6 +142,7 @@ undo data, then it is probably a bug and you should report it.
 
 @node Transpose
 @section Transposing Text
+@cindex transposing text
 
 @table @kbd
 @item C-t
@@ -160,6 +161,14 @@ Transpose two paragraphs (@code{transpose-paragraphs}).
 Transpose two regions.
 @end table
 
+  One of the common editing mistakes is to type characters or words or
+sentences in the wrong order.  To fix that, you could delete the
+incorrectly-typed text and re-type it anew, or you could kill
+(@pxref{Erasing}) the text that's in the wrong place and then yank it
+(@pxref{Yanking}) in its correct place.  But that is inefficient.  Emacs
+has convenient commands, described in this section, to transpose
+characters, words, sentences, etc.
+
 @kindex C-t
 @findex transpose-chars
   The common error of transposing two characters can be fixed, when they
@@ -215,7 +224,10 @@ across four words.  @kbd{C-u - C-M-t} would cancel the effect of plain
   A numeric argument of zero is assigned a special meaning (because
 otherwise a command with a repeat count of zero would do nothing): to
 transpose the character (or word or expression or line) ending after
-point with the one ending after the mark.
+point with the one ending after the mark.  So to convert, say, @samp{Bob
+and Mary} into @samp{Mary and Bob}, set the mark on @samp{Bob}
+(@pxref{Setting Mark}), then move point to @samp{Mary}, and then type
+@kbd{C-u 0 M-t}.
 
 @findex transpose-regions
   @kbd{M-x transpose-regions} transposes the text between point and

From dcbfa53e4ba155c4c50cc045466d7eeeff738281 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 14 Apr 2026 17:48:59 +0300
Subject: [PATCH 103/463] ; * src/conf_post.h: Another tweak of conditionals
 for MinGW64.

---
 src/conf_post.h | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/conf_post.h b/src/conf_post.h
index a3fcb1f82c5..5b7548f20fa 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -389,10 +389,11 @@ extern int emacs_setenv_TZ (char const *);
 #endif /* MSDOS */
 
 #if defined WINDOWSNT && !(defined OMIT_CONSOLESAFE && OMIT_CONSOLESAFE == 1)
-# if !defined _UCRT
-#  include <stdarg.h>
+# if !defined _UCRT || !(HAVE_DECL_GETDELIM && HAVE_DECL_GETLINE)
 #  include <stdio.h>
 #  include <stddef.h>
+#  if !defined _UCRT
+#   include <stdarg.h>
 
 /* Workarounds for MSVCRT bugs.
 
@@ -418,20 +419,13 @@ extern int gl_consolesafe_vfprintf (FILE *restrict fp,
 extern int gl_consolesafe_vprintf (const char *restrict format, va_list args)
   ATTRIBUTE_FORMAT_PRINTF (1, 0)
   ARG_NONNULL ((1));
-#  define fwrite gl_consolesafe_fwrite
-#  define fprintf gl_consolesafe_fprintf
-#  define printf gl_consolesafe_printf
-#  define vfprintf gl_consolesafe_vfprintf
-#  define vprintf gl_consolesafe_vprintf
-# endif	/* !_UCRT */
-#endif	/* WINDOWSNT */
+#   define fwrite gl_consolesafe_fwrite
+#   define fprintf gl_consolesafe_fprintf
+#   define printf gl_consolesafe_printf
+#   define vfprintf gl_consolesafe_vfprintf
+#   define vprintf gl_consolesafe_vprintf
+#  endif /* !_UCRT */
 
-#ifdef WINDOWSNT
-/* MinGW64 doesn't have getdelim, called by Gnulib's getline, but the
-   MS-Windows build omits stdio.h module, where getdelim is declared.  */
-# if !(HAVE_DECL_GETDELIM && HAVE_DECL_GETLINE)
-#  include <stdio.h>
-#  include <stddef.h>
 #  if !HAVE_DECL_GETDELIM
 extern ssize_t getdelim (char **, size_t *, int, FILE *);
 #  endif
@@ -439,4 +433,4 @@ extern ssize_t getdelim (char **, size_t *, int, FILE *);
 extern ssize_t getline (char **, size_t *, FILE *);
 #  endif
 # endif
-#endif
+#endif	/* WINDOWSNT */

From a1899d8cb17e82e9729d39ce12ca0a8575690353 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 14 Apr 2026 19:41:23 +0300
Subject: [PATCH 104/463] ; Improve documentation of map.el methods

* lisp/emacs-lisp/map.el (map-elt, map-delete, map-values)
(map-length, map-copy, map-do, map-values-apply, map-empty-p)
(map-contains-key, map-into, map-insert, map-apply): Doc fixes.
(Bug#80804)
---
 lisp/emacs-lisp/map.el | 143 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 128 insertions(+), 15 deletions(-)

diff --git a/lisp/emacs-lisp/map.el b/lisp/emacs-lisp/map.el
index 43174df0160..b5c5623332c 100644
--- a/lisp/emacs-lisp/map.el
+++ b/lisp/emacs-lisp/map.el
@@ -175,15 +175,26 @@ or array."
                            ,v)))))))))))
 
 (cl-defmethod map-elt ((map list) key &optional default testfn)
+  "Implementation of `map-elt' for maps that are alists or plists.
+In a map that is a plist, property names are the keys, and the
+corresponding property values are the values of those keys.
+In a map that is an alist, the `car' of each cons cell is the key
+and the `cdr' is the value."
   (if (map--plist-p map)
       (let ((res (map--plist-member map key testfn)))
         (if res (cadr res) default))
     (alist-get key map default nil (or testfn #'equal))))
 
 (cl-defmethod map-elt ((map hash-table) key &optional default _testfn)
+  "Implementation of `map-elt' for maps that are hash-tables.
+In a map that is a hash-table, the keys in the table serve as the map
+keys and the associated values are the key values."
   (gethash key map default))
 
 (cl-defmethod map-elt ((map array) key &optional default _testfn)
+  "Implementation of `map-elt' for maps that are arrays.
+In a map that is an array, the keys are the slot indices,
+and slot contents are the values."
   (if (map-contains-key map key)
       (aref map key)
     default))
@@ -234,6 +245,13 @@ say
 for this to work reliably.")
 
 (cl-defmethod map-delete ((map list) key)
+  "Implementation of `map-delete' for maps that are plists or alists.
+In a map that is a plist, property names are the keys, and the
+corresponding property values are the values of those keys; this
+function removes the pair whose property-name matches KEY.
+In a map that is an alist, the `car' of each cons cell is the key
+and the `cdr' is the value; this function removes the cons cell
+whose `car' equals KEY."
   ;; FIXME: Signal map-not-inplace i.s.o returning a different list?
   (if (map--plist-p map)
       (map--plist-delete map key)
@@ -241,11 +259,18 @@ for this to work reliably.")
     map))
 
 (cl-defmethod map-delete ((map hash-table) key)
+  "Implementation of `map-delete' for maps that are hash-tables.
+In a map that is a hash-table, the keys in the table serve as the map
+keys and the associated values are the key values.
+Calls `remhash' to remove KEY."
   (remhash key map)
   map)
 
 (cl-defmethod map-delete ((map array) key)
-  "Store nil at index KEY."
+  "Implementation of `map-delete' for maps that are arrays.
+In a map that is an array, the keys are the slot indices,
+and slot contents are the values.
+Since array slots cannot be removed, this stores nil at index KEY."
   (when (map-contains-key map key)
     (aset map key nil))
   map)
@@ -273,7 +298,10 @@ The default implementation delegates to `map-apply'."
   (map-apply (lambda (_ value) value) map))
 
 (cl-defmethod map-values ((map array))
-  "Convert MAP into a list."
+  "Implementation of `map-values' for maps that are arrays.
+In a map that is an array, the keys are the slot indices,
+and slot contents are the values.
+This creates a list from MAP's slot values."
   (append map ()))
 
 (cl-defgeneric map-pairs (map)
@@ -291,29 +319,45 @@ The default implementation delegates to `map-do'."
     size))
 
 (cl-defmethod map-length ((map hash-table))
+  "Implementation of `map-length' for maps that are hash-tables.
+Value is the number of elements in MAP."
   (hash-table-count map))
 
 (cl-defmethod map-length ((map list))
+  "Implementation of `map-length' for maps that are plists or alists.
+Value is the number of property-value pairs for plists and the number
+of association cons cells in an alist."
   (if (map--plist-p map)
       (/ (length map) 2)
     (length map)))
 
 (cl-defmethod map-length ((map array))
+  "Implementation of `map-length' for maps that are arrays.
+In a map that is an array, the keys are the slot indices,
+and slot contents are the values.
+Value is the number of slots in MAP."
   (length map))
 
 (cl-defgeneric map-copy (map)
   "Return a copy of MAP.")
 
 (cl-defmethod map-copy ((map list))
-  "Use `copy-alist' on alists and `copy-sequence' on plists."
+  "Implementation of `map-copy' for maps that are plists or alists.
+Uses `copy-alist' on alists and `copy-sequence' on plists."
   (if (map--plist-p map)
       (copy-sequence map)
     (copy-alist map)))
 
 (cl-defmethod map-copy ((map hash-table))
+  "Implementation of `map-copy' for maps that are hash-tables.
+Returns a copy of MAP produced by `copy-hash-table'."
   (copy-hash-table map))
 
 (cl-defmethod map-copy ((map array))
+  "Implementation of `map-copy' for maps that are arrays.
+In a map that is an array, the keys are the slot indices,
+and slot contents are the values.
+Uses `copy-sequence'."
   (copy-sequence map))
 
 (cl-defgeneric map-apply (function map)
@@ -326,10 +370,15 @@ The default implementation delegates to `map-do'."
 
 (cl-defgeneric map-do (function map)
   "Apply FUNCTION to each element of MAP and return nil.
-FUNCTION is called with two arguments, the key and the value.")
+FUNCTION is called with two arguments, the key and the value
+of each MAP's element.")
 
 ;; FIXME: I wish there was a way to avoid this η-redex!
-(cl-defmethod map-do (function (map hash-table)) (maphash function map))
+(cl-defmethod map-do (function (map hash-table))
+  "Implementation of `map-do' for maps that are hash-tables.
+Calls `maphash', which will call FUNCTION with key and value
+of each element of MAP."
+  (maphash function map))
 
 (cl-defgeneric map-keys-apply (function map)
   "Return the result of applying FUNCTION to each key in MAP.
@@ -346,6 +395,10 @@ The default implementation delegates to `map-apply'."
              map))
 
 (cl-defmethod map-values-apply (function (map array))
+  "Implementation of `map-values-apply' for maps that are arrays.
+In a map that is an array, the keys are the slot indices,
+and slot contents are the values.
+Calls `mapcar', which will call FUNCTION with each element of MAP."
   (mapcar function map))
 
 (cl-defgeneric map-filter (pred map)
@@ -376,6 +429,8 @@ The default implementation delegates to `map-length'."
   (zerop (map-length map)))
 
 (cl-defmethod map-empty-p ((map list))
+  "Implementation of `map-empty-p' for maps that are plists or alists.
+MAP is empty if `null' returns non-nil for it."
   (null map))
 
 (cl-defgeneric map-contains-key (map key &optional testfn)
@@ -391,20 +446,30 @@ The default implementation delegates to `map-some'."
   (map-some (lambda (k _v) (funcall testfn key k)) map))
 
 (cl-defmethod map-contains-key ((map list) key &optional testfn)
-  "Return non-nil if MAP contains KEY.
+  "Implementation of `map-contains-key' for maps that are plists or alists.
 If MAP is an alist, TESTFN defaults to `equal'.
-If MAP is a plist, TESTFN defaults to `eq'."
+If MAP is a plist, TESTFN defaults to `eq'.
+In a map that is a plist, property names are the keys, and the
+corresponding property values are the values of those keys.
+In a map that is an alist, the `car' of each cons cell is the key
+and the `cdr' is the value."
   (if (map--plist-p map)
       (map--plist-member map key testfn)
     (let ((v '(nil)))
       (not (eq v (alist-get key map v nil (or testfn #'equal)))))))
 
 (cl-defmethod map-contains-key ((map array) key &optional _testfn)
-  "Return non-nil if KEY is an index of MAP, ignoring TESTFN."
+  "Implementation of `map-contains-key' for maps that are arrays.
+In a map that is an array, the keys are the slot indices,
+and slot contents are the values.
+Returns non-nil if KEY is a valid index in MAP, ignoring TESTFN."
   (and (natnump key) (< key (length map))))
 
 (cl-defmethod map-contains-key ((map hash-table) key &optional _testfn)
-  "Return non-nil if MAP contains KEY, ignoring TESTFN."
+  "Implementation of `map-contains-key' for maps that are hash-tables.
+Returns non-nil if MAP contains KEY, ignoring TESTFN.
+In a map that is a hash-table, the keys in the table serve as the map
+keys and the associated values are the key values."
   ;; FIXME: use `hash-table-contains-p' from Compat when available.
   (if (fboundp 'hash-table-contains-p)
       (hash-table-contains-p key map)
@@ -494,15 +559,20 @@ This does not modify any of the MAPS."
 
 ;; FIXME: I wish there was a way to avoid this η-redex!
 (cl-defmethod map-into (map (_type (eql list)))
-  "Convert MAP into an alist."
+  "Implementation of `map-into' for TYPE that is list.
+Convert MAP into an alist."
   (map-pairs map))
 
 (cl-defmethod map-into (map (_type (eql alist)))
-  "Convert MAP into an alist."
+  "Implementation of `map-into' for TYPE that is alist.
+Convert MAP into an alist, with keys the `car' of each
+association cons cell and value the `cdr'.."
   (map-pairs map))
 
 (cl-defmethod map-into (map (_type (eql plist)))
-  "Convert MAP into a plist."
+  "Implementation of `map-into' for TYPE that is plist.
+Convert MAP into a plist, with property names serving as keys
+and property values as values."
   (let (plist)
     (map-do (lambda (k v) (setq plist `(,v ,k ,@plist))) map)
     (nreverse plist)))
@@ -518,6 +588,11 @@ To insert an element without modifying MAP, use `map-insert'."
   (declare (advertised-calling-convention (map key value) "27.1")))
 
 (cl-defmethod map-put! ((map list) key value &optional testfn)
+  "Implementation of `map-put!' for maps that are plists or alists.
+In a map that is a plist, property names are the keys, and the
+corresponding property values are the values of those keys.
+In a map that is an alist, the `car' of each cons cell is the key
+and the `cdr' is the value."
   (if (map--plist-p map)
       (map--plist-put map key value testfn)
     (let ((oldmap map))
@@ -528,9 +603,16 @@ To insert an element without modifying MAP, use `map-insert'."
   value)
 
 (cl-defmethod map-put! ((map hash-table) key value &optional _testfn)
+  "Implementation of `map-put!' for maps that are hash-tables.
+In a map that is a hash-table, the keys in the table serve as the map
+keys and the associated values are the key values."
   (puthash key value map))
 
 (cl-defmethod map-put! ((map array) key value &optional _testfn)
+  "Implementation of `map-put!' for maps that are arrays.
+In a map that is an array, the keys are the slot indices,
+and slot contents are the values.
+Calls `aset'."
   ;; FIXME: If `key' is too large, should we signal `map-not-inplace'
   ;; and let `map-insert' grow the array?
   (aset map key value))
@@ -550,12 +632,22 @@ The default implementation defaults to `map-copy' and `map-put!'."
     copy))
 
 (cl-defmethod map-insert ((map list) key value)
-  "Cons KEY and VALUE to the front of MAP."
+  "Implementation of `map-insert' for maps that are plists or alists.
+Cons KEY and VALUE to the front of MAP.  If MAP is a plist, KEY and VALUE
+will be the property name and its value,  If MAP is an alist, KEY and
+VALUE will be the `car' and `cdr' of the association cons cell."
   (if (map--plist-p map)
       (cons key (cons value map))
     (cons (cons key value) map)))
 
 (cl-defmethod map-apply (function (map list))
+  "Implementation of `map-apply' for maps that are plists or alists.
+In a map that is a plist, property names are the keys, and the
+corresponding property values are the values of those keys.
+In a map that is an alist, the `car' of each cons cell is the key
+and the `cdr' is the value.
+Calls `mapcar', which will call FUNCTION for each element in MAP,
+passing the element's key and its value as arguments of FUNCTION."
   (if (map--plist-p map)
       (cl-call-next-method)
     (mapcar (lambda (pair)
@@ -563,6 +655,9 @@ The default implementation defaults to `map-copy' and `map-put!'."
             map)))
 
 (cl-defmethod map-apply (function (map hash-table))
+  "Implementation of `map-apply' for maps that are hash-tables.
+Calls `maphash', which will call FUNCTION for each element in MAP,
+passing the element's key and its value as arguments of FUNCTION."
   (let (result)
     (maphash (lambda (key value)
                (push (funcall function key value) result))
@@ -570,11 +665,23 @@ The default implementation defaults to `map-copy' and `map-put!'."
     (nreverse result)))
 
 (cl-defmethod map-apply (function (map array))
+  "Implementation of `map-apply' for maps that are arrays.
+In a map that is an array, the keys are the slot indices,
+and slot contents are the values.
+FUNCTION will be called with each element of the map and its
+array index."
   (seq-map-indexed (lambda (elt index)
                      (funcall function index elt))
                    map))
 
 (cl-defmethod map-do (function (map list))
+  "Implementation of `map-do' for maps that are plists or alists.
+In a map that is a plist, property names are the keys, and the
+corresponding property values are the values of those keys.
+In a map that is an alist, the `car' of each cons cell is the key
+and the `cdr' is the value.
+FUNCTION's arguments are property name and property value for plist
+elements, `car' and `cdr' of association cons cell for alists."
   (if (map--plist-p map)
       (while map
         (funcall function (pop map) (pop map)))
@@ -584,6 +691,10 @@ The default implementation defaults to `map-copy' and `map-put!'."
     nil))
 
 (cl-defmethod map-do (function (map array))
+  "Implementation of `map-do' for maps that are arrays.
+In a map that is an array, the keys are the slot indices,
+and slot contents are the values.
+FUNCTION's arguments are the index of the element and the element itself."
   (seq-do-indexed (lambda (elt index)
                     (funcall function index elt))
                   map))
@@ -598,11 +709,13 @@ KEYWORD-ARGS are forwarded to `make-hash-table'."
     ht))
 
 (cl-defmethod map-into (map (_type (eql hash-table)))
-  "Convert MAP into a hash-table with keys compared with `equal'."
+  "Implementation of `map-into' for TYPE that is hash-table.
+Convert MAP into a hash-table with keys compared with `equal'."
   (map--into-hash map (list :size (map-length map) :test #'equal)))
 
 (cl-defmethod map-into (map (type (head hash-table)))
-  "Convert MAP into a hash-table.
+  "Implementation of `map-into' for TYPE that is hash-table with keywords.
+Convert MAP into a hash-table.
 TYPE is a list whose car is `hash-table' and cdr a list of
 keyword-args forwarded to `make-hash-table'.
 

From 0384600a21fb363e623afa658d1e66a54f79d2fb Mon Sep 17 00:00:00 2001
From: Juri Linkov <juri@linkov.net>
Date: Tue, 14 Apr 2026 20:14:15 +0300
Subject: [PATCH 105/463] New faces 'tab-line-active' and 'tab-line-inactive'
 (bug#80742)

This is intended to parallel the 'mode-line-active/inactive'
and 'header-line-active/inactive' distinction.

* doc/emacs/display.texi (Standard Faces): Document the new faces.

* lisp/faces.el (tab-line-active, tab-line-inactive): Add new faces.

* lisp/tab-line.el (tab-line-faces): Add new faces
to MEMBERS arg of 'defgroup'.
(tab-line-auto-hscroll): Use one of the faces
depending on 'mode-line-window-selected-p'.

* src/dispextern.h (CURRENT_TAB_LINE_ACTIVE_FACE_ID_3)
(CURRENT_TAB_LINE_ACTIVE_FACE_ID): New macros
based on header-line equivalents.
(CURRENT_TAB_LINE_HEIGHT): Use CURRENT_TAB_LINE_ACTIVE_FACE_ID.
(face_id): Use TAB_LINE_ACTIVE_FACE_ID and
TAB_LINE_INACTIVE_FACE_ID instead of TAB_LINE_FACE_ID.

* src/xdisp.c (window_box_height, pos_visible_p, init_iterator)
(window_text_pixel_size, display_mode_lines, display_mode_line)
(format-mode-line): Replace all uses of TAB_LINE_FACE_ID with
either a new macro or the new face IDs.

* src/xfaces.c (lookup_basic_face, realize_basic_faces):
Map new face IDs to their lisp symbols.
(syms_of_xfaces): New lisp symbols.
---
 doc/emacs/display.texi | 16 ++++++++++++++++
 etc/NEWS               |  6 ++++++
 lisp/faces.el          | 17 ++++++++++++++++-
 lisp/tab-line.el       | 17 ++++++++++++-----
 src/dispextern.h       | 26 ++++++++++++++++++++++++--
 src/xdisp.c            | 28 ++++++++++++++++------------
 src/xfaces.c           |  8 ++++++--
 7 files changed, 96 insertions(+), 22 deletions(-)

diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index dde6cc4f1b6..a64c009f2d9 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -811,6 +811,22 @@ Similar to @code{mode-line} for a window's tab line, which appears
 at the top of a window with tabs representing window buffers.
 @xref{Tab Line}.
 
+The @code{tab-line-active} and @code{tab-line-inactive} faces (which
+are the ones actually used on the tab lines) inherit from this face.
+
+@cindex faces for tab lines
+@item tab-line-active
+Like @code{tab-line}, but used for the tab line of the currently
+selected window.  This face inherits from @code{tab-line}, so changes
+in that face affect tab lines in all windows.
+
+@cindex @code{tab-line-inactive} face
+@item tab-line-inactive
+Like @code{tab-line}, but used for tab lines of the windows other
+than the selected one (if those windows have a tab line).  This face
+inherits from @code{tab-line}, so changes in that face affect tab
+lines in all windows.
+
 @cindex @code{vertical-border} face
 @item vertical-border
 This face is used for the vertical divider between windows on text
diff --git a/etc/NEWS b/etc/NEWS
index 3639d1b47e8..3c02002d0ff 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -658,6 +658,12 @@ will change its appearance if the tab buffer has been modified.
 This user option controls which buffers should appear in the tab line.
 By default, this is set to not filter the buffers.
 
++++
+*** New faces 'tab-line-active' and 'tab-line-inactive'.
+These inherit from the 'tab-line' face, but the faces actually used
+on the tab lines are now these two: the selected window uses
+'tab-line-active', non-selected windows use 'tab-line-inactive'.
+
 ** Help
 
 +++
diff --git a/lisp/faces.el b/lisp/faces.el
index 6fe94927290..97620822b88 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -3005,7 +3005,22 @@ Note: Other faces cannot inherit from the cursor face."
      :background "grey")
     (t
      :inverse-video t))
-  "Tab line face."
+  "Basic tab line face.
+See `tab-line-active' and `tab-line-inactive' for the faces
+used on tab lines."
+  :version "31.1"
+  :group 'basic-faces)
+
+(defface tab-line-active
+  '((t :inherit tab-line))
+  "Face for the selected tab line.
+This inherits from the `tab-line' face."
+  :version "31.1"
+  :group 'basic-faces)
+
+(defface tab-line-inactive
+  '((t :inherit tab-line))
+  "Basic tab line face for non-selected windows."
   :version "31.1"
   :group 'basic-faces)
 
diff --git a/lisp/tab-line.el b/lisp/tab-line.el
index 832b2b74437..524799e445d 100644
--- a/lisp/tab-line.el
+++ b/lisp/tab-line.el
@@ -54,7 +54,11 @@ is selected."
   :group 'tab-line
   :version "28.1")
 
-(defgroup tab-line-faces '((tab-line custom-face)) ; tab-line is defined in faces.el
+(defgroup tab-line-faces
+  ;; These faces are defined in faces.el
+  '((tab-line custom-face)
+    (tab-line-active custom-face)
+    (tab-line-inactive custom-face))
   "Faces used in the tab line."
   :group 'tab-line
   :group 'faces
@@ -860,13 +864,16 @@ the selected tab visible."
   (with-current-buffer tab-line-auto-hscroll-buffer
     (let ((truncate-partial-width-windows nil)
           (inhibit-modification-hooks t)
+          (face (if (mode-line-window-selected-p)
+                    'tab-line-active
+                  'tab-line-inactive))
           show-arrows)
       (setq truncate-lines nil
             word-wrap nil)
       (erase-buffer)
       (apply 'insert strings)
       (goto-char (point-min))
-      (add-face-text-property (point-min) (point-max) 'tab-line t)
+      (add-face-text-property (point-min) (point-max) face t)
       ;; Continuation means tab-line doesn't fit completely,
       ;; thus scroll arrows are needed for scrolling.
       (setq show-arrows (> (vertical-motion 1) 0))
@@ -888,7 +895,7 @@ the selected tab visible."
             (erase-buffer)
             (apply 'insert (reverse (seq-subseq strings 0 (1+ selected))))
             (goto-char (point-min))
-            (add-face-text-property (point-min) (point-max) 'tab-line)
+            (add-face-text-property (point-min) (point-max) face)
             (if (> (vertical-motion 1) 0)
                 (let* ((point (previous-single-property-change (point) 'tab))
                        (tab-prop (when point
@@ -909,13 +916,13 @@ the selected tab visible."
             (erase-buffer)
             (apply 'insert (seq-subseq strings (truncate hscroll) (1+ selected)))
             (goto-char (point-min))
-            (add-face-text-property (point-min) (point-max) 'tab-line)
+            (add-face-text-property (point-min) (point-max) face)
             (when (> (vertical-motion 1) 0)
               ;; Not visible already
               (erase-buffer)
               (apply 'insert (reverse (seq-subseq strings 0 (1+ selected))))
               (goto-char (point-min))
-              (add-face-text-property (point-min) (point-max) 'tab-line)
+              (add-face-text-property (point-min) (point-max) face)
               (when (> (vertical-motion 1) 0)
                 (let* ((point (previous-single-property-change (point) 'tab))
                        (tab-prop (when point
diff --git a/src/dispextern.h b/src/dispextern.h
index 55f4118d676..16565b8ad18 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1610,6 +1610,27 @@ struct glyph_string
 	 : estimate_mode_line_height				\
 	 (XFRAME ((W)->frame), CURRENT_HEADER_LINE_ACTIVE_FACE_ID (W)))))
 
+/* Return the desired face id for the tab line of a window, depending
+   on whether the window is selected or not, or if the window is the
+   scrolling window for the currently active minibuffer window.  */
+
+#define CURRENT_TAB_LINE_ACTIVE_FACE_ID_3(SELW, MBW, SCRW)    	\
+     ((!mode_line_in_non_selected_windows			\
+       || (SELW) == XWINDOW (selected_window)			\
+       || (minibuf_level > 0					\
+           && !NILP (minibuf_selected_window)			\
+           && (MBW) == XWINDOW (minibuf_window)			\
+           && (SCRW) == XWINDOW (minibuf_selected_window)))	\
+      ? TAB_LINE_ACTIVE_FACE_ID					\
+      : TAB_LINE_INACTIVE_FACE_ID)
+
+/* Return the desired face id for the tab line of window W.  */
+
+#define CURRENT_TAB_LINE_ACTIVE_FACE_ID(W)		\
+	 CURRENT_TAB_LINE_ACTIVE_FACE_ID_3(W, 		\
+					   XWINDOW (selected_window), \
+					   W)
+
 /* Return the current height of the tab line of window W.  If not known
    from W->tab_line_height, look at W's current glyph matrix, or return
    an estimation based on the height of the font of the face `tab-line'.  */
@@ -1621,7 +1642,7 @@ struct glyph_string
       = (MATRIX_TAB_LINE_HEIGHT ((W)->current_matrix)		\
 	 ? MATRIX_TAB_LINE_HEIGHT ((W)->current_matrix)		\
 	 : estimate_mode_line_height				\
-	     (XFRAME ((W)->frame), TAB_LINE_FACE_ID))))
+	 (XFRAME ((W)->frame), CURRENT_TAB_LINE_ACTIVE_FACE_ID (W)))))
 
 /* Return the height of the desired mode line of window W.  */
 
@@ -1943,7 +1964,8 @@ enum face_id
   INTERNAL_BORDER_FACE_ID,
   CHILD_FRAME_BORDER_FACE_ID,
   TAB_BAR_FACE_ID,
-  TAB_LINE_FACE_ID,
+  TAB_LINE_ACTIVE_FACE_ID,
+  TAB_LINE_INACTIVE_FACE_ID,
   BASIC_FACE_ID_SENTINEL
 };
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 370c3ec30c1..281f04e4132 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1343,7 +1343,7 @@ window_box_height (struct window *w)
 	  if (tl_row && tl_row->mode_line_p)
 	    height -= tl_row->height;
 	  else
-	    height -= estimate_mode_line_height (f, TAB_LINE_FACE_ID);
+	    height -= estimate_mode_line_height (f, CURRENT_TAB_LINE_ACTIVE_FACE_ID (w));
 	}
     }
 
@@ -1743,7 +1743,7 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y,
 	= window_parameter (w, Qtab_line_format);
 
       w->tab_line_height
-	= display_mode_line (w, TAB_LINE_FACE_ID,
+	= display_mode_line (w, CURRENT_TAB_LINE_ACTIVE_FACE_ID (w),
 			     NILP (window_tab_line_format)
 			     ? BVAR (current_buffer, tab_line_format)
 			     : window_tab_line_format);
@@ -3285,7 +3285,8 @@ init_iterator (struct it *it, struct window *w,
       if (base_face_id == MODE_LINE_ACTIVE_FACE_ID
 	  || base_face_id == MODE_LINE_INACTIVE_FACE_ID)
 	row = MATRIX_MODE_LINE_ROW (w->desired_matrix);
-      else if (base_face_id == TAB_LINE_FACE_ID)
+      else if (base_face_id == TAB_LINE_ACTIVE_FACE_ID
+	       || base_face_id == TAB_LINE_INACTIVE_FACE_ID)
 	row = MATRIX_TAB_LINE_ROW (w->desired_matrix);
       else if (base_face_id == HEADER_LINE_ACTIVE_FACE_ID
 	       || base_face_id == HEADER_LINE_INACTIVE_FACE_ID)
@@ -11975,7 +11976,7 @@ window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to,
       Lisp_Object window_tab_line_format
 	= window_parameter (w, Qtab_line_format);
 
-      y = y + display_mode_line (w, TAB_LINE_FACE_ID,
+      y = y + display_mode_line (w, CURRENT_TAB_LINE_ACTIVE_FACE_ID (w),
 				 NILP (window_tab_line_format)
 				 ? BVAR (current_buffer, tab_line_format)
 				 : window_tab_line_format);
@@ -27946,7 +27947,7 @@ display_mode_lines (struct window *w)
       Lisp_Object window_tab_line_format
 	= window_parameter (w, Qtab_line_format);
 
-      display_mode_line (w, TAB_LINE_FACE_ID,
+      display_mode_line (w, CURRENT_TAB_LINE_ACTIVE_FACE_ID_3 (sel_w, sel_w, w),
 			 NILP (window_tab_line_format)
 			 ? BVAR (current_buffer, tab_line_format)
 			 : window_tab_line_format);
@@ -27975,10 +27976,10 @@ display_mode_lines (struct window *w)
 
 /* Display mode or header/tab line of window W.  FACE_ID specifies which
    line to display; it is either MODE_LINE_ACTIVE_FACE_ID,
-   HEADER_LINE_ACTIVE_FACE_ID, HEADER_LINE_INACTIVE_FACE_ID, or
-   TAB_LINE_FACE_ID.  FORMAT is the mode/header/tab line format to
-   display.  Value is the pixel height of the mode/header/tab line
-   displayed.  */
+   HEADER_LINE_ACTIVE_FACE_ID, HEADER_LINE_INACTIVE_FACE_ID,
+   TAB_LINE_ACTIVE_FACE_ID or TAB_LINE_INACTIVE_FACE_ID.
+   FORMAT is the mode/header/tab line format to display.
+   Value is the pixel height of the mode/header/tab line displayed.  */
 
 static int
 display_mode_line (struct window *w, enum face_id face_id, Lisp_Object format)
@@ -27994,7 +27995,8 @@ display_mode_line (struct window *w, enum face_id face_id, Lisp_Object format)
   prepare_desired_row (w, it.glyph_row, true);
 
   it.glyph_row->mode_line_p = true;
-  if (face_id == TAB_LINE_FACE_ID)
+  if (face_id == TAB_LINE_ACTIVE_FACE_ID
+      || face_id == TAB_LINE_INACTIVE_FACE_ID)
     {
       it.glyph_row->tab_line_p = true;
       w->desired_matrix->tab_line_p = true;
@@ -28021,7 +28023,8 @@ display_mode_line (struct window *w, enum face_id face_id, Lisp_Object format)
   if (NILP (Vmode_line_compact)
       || face_id == HEADER_LINE_ACTIVE_FACE_ID
       || face_id == HEADER_LINE_INACTIVE_FACE_ID
-      || face_id == TAB_LINE_FACE_ID)
+      || face_id == TAB_LINE_ACTIVE_FACE_ID
+      || face_id == TAB_LINE_INACTIVE_FACE_ID)
     {
       mode_line_target = MODE_LINE_DISPLAY;
       display_mode_element (&it, 0, 0, 0, format, Qnil, false);
@@ -28879,7 +28882,8 @@ are the selected window and the WINDOW's buffer).  */)
     : EQ (face, Qmode_line_inactive) ? MODE_LINE_INACTIVE_FACE_ID
     : EQ (face, Qheader_line_active) ? HEADER_LINE_ACTIVE_FACE_ID
     : EQ (face, Qheader_line_inactive) ? HEADER_LINE_INACTIVE_FACE_ID
-    : EQ (face, Qtab_line) ? TAB_LINE_FACE_ID
+    : EQ (face, Qtab_line_active) ? TAB_LINE_ACTIVE_FACE_ID
+    : EQ (face, Qtab_line_inactive) ? TAB_LINE_INACTIVE_FACE_ID
     : EQ (face, Qtab_bar) ? TAB_BAR_FACE_ID
     : EQ (face, Qtool_bar) ? TOOL_BAR_FACE_ID
     : DEFAULT_FACE_ID;
diff --git a/src/xfaces.c b/src/xfaces.c
index ab0934abde2..6c4267b8afa 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5195,7 +5195,8 @@ lookup_basic_face (struct window *w, struct frame *f, int face_id)
     case MODE_LINE_INACTIVE_FACE_ID:	name = Qmode_line_inactive;	break;
     case HEADER_LINE_ACTIVE_FACE_ID:	name = Qheader_line_active;	break;
     case HEADER_LINE_INACTIVE_FACE_ID:	name = Qheader_line_inactive;	break;
-    case TAB_LINE_FACE_ID:		name = Qtab_line;		break;
+    case TAB_LINE_ACTIVE_FACE_ID:	name = Qtab_line_active;	break;
+    case TAB_LINE_INACTIVE_FACE_ID:	name = Qtab_line_inactive;	break;
     case TAB_BAR_FACE_ID:		name = Qtab_bar;		break;
     case TOOL_BAR_FACE_ID:		name = Qtool_bar;		break;
     case FRINGE_FACE_ID:		name = Qfringe;			break;
@@ -5975,7 +5976,8 @@ realize_basic_faces (struct frame *f)
       realize_named_face (f, Qinternal_border, INTERNAL_BORDER_FACE_ID);
       realize_named_face (f, Qchild_frame_border, CHILD_FRAME_BORDER_FACE_ID);
       realize_named_face (f, Qtab_bar, TAB_BAR_FACE_ID);
-      realize_named_face (f, Qtab_line, TAB_LINE_FACE_ID);
+      realize_named_face (f, Qtab_line_active, TAB_LINE_ACTIVE_FACE_ID);
+      realize_named_face (f, Qtab_line_inactive, TAB_LINE_INACTIVE_FACE_ID);
       unbind_to (count, Qnil);
 
       /* Reflect changes in the `menu' face in menu bars.  */
@@ -7534,6 +7536,8 @@ syms_of_xfaces (void)
   DEFSYM (Qtab_bar, "tab-bar");
   DEFSYM (Qfringe, "fringe");
   DEFSYM (Qtab_line, "tab-line");
+  DEFSYM (Qtab_line_inactive, "tab-line-inactive");
+  DEFSYM (Qtab_line_active, "tab-line-active");
   DEFSYM (Qheader_line, "header-line");
   DEFSYM (Qheader_line_inactive, "header-line-inactive");
   DEFSYM (Qheader_line_active, "header-line-active");

From 8b823737ff8fc950685c3f00475e12c660daea91 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 15 Apr 2026 10:02:16 -0400
Subject: [PATCH 106/463] ; vc-test--working-revision: Update for vc-hg change

* test/lisp/vc/vc-tests/vc-tests.el (vc-test--working-revision):
Recognize '0000000000000000000000000000000000000000' now that
vc-hg-working-revision returns changeset hashes.
---
 test/lisp/vc/vc-tests/vc-tests.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/lisp/vc/vc-tests/vc-tests.el b/test/lisp/vc/vc-tests/vc-tests.el
index a64bee00de2..a9b4653ac9b 100644
--- a/test/lisp/vc/vc-tests/vc-tests.el
+++ b/test/lisp/vc/vc-tests/vc-tests.el
@@ -436,9 +436,12 @@ This checks also `vc-backend' and `vc-responsible-backend'."
               ;; nil: Git Mtn
               ;; "0": Bzr CVS Hg SRC SVN
               ;; "1.1": RCS SCCS
+              ;; "0000000000000000000000000000000000000000": Hg
               ;; "-1": Hg versions before 5 (probably)
               (message "vc-working-revision4 %s" (vc-working-revision tmp-name))
-              (should (member (vc-working-revision tmp-name) '(nil "0" "1.1" "-1")))
+              (should (member (vc-working-revision tmp-name)
+                              '(nil "0" "1.1" "-1"
+                                    "0000000000000000000000000000000000000000")))
 
               ;; TODO: Call `vc-checkin', and check the resulting
               ;; working revision.  None of the return values should be

From 5347b221da3c2c47df85b9519e367366f2bf1047 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 15 Apr 2026 10:04:58 -0400
Subject: [PATCH 107/463] vc-rename-file: New OK-IF-ALREADY-EXISTS parameter

* lisp/vc/vc.el (vc-delete-file): New NOCONFIRM parameter.
(vc-rename-file): New OK-IF-ALREADY-EXISTS parameter.
* lisp/dired-aux.el (dired-rename-file): Pass it.
* test/lisp/vc/vc-tests/vc-tests.el (vc-test--rename-file): Test
it.  Also test moving files into an existing directory.
---
 lisp/dired-aux.el                 |  2 +-
 lisp/vc/vc.el                     | 33 +++++++++++++++++++++----------
 test/lisp/vc/vc-tests/vc-tests.el | 31 ++++++++++++++++++++++++++++-
 3 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index d82e617d145..a870f610094 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -2362,7 +2362,7 @@ unless OK-IF-ALREADY-EXISTS is non-nil."
                  (ignore-errors (vc-responsible-backend file))
                (vc-backend file))
              (ignore-errors (vc-responsible-backend newname)))
-        (vc-rename-file file newname)
+        (vc-rename-file file newname ok-if-already-exists)
       ;; error is caught in -create-files
       (rename-file file newname ok-if-already-exists))
     ;; Silently rename the visited file of any buffer visiting this file.
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index bc6c38e3704..40544a7c578 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -4958,12 +4958,14 @@ backend to NEW-BACKEND, and unregister FILE from the current backend.
       (vc-checkin file new-backend comment (stringp comment)))))
 
 ;;;###autoload
-(defun vc-delete-file (file-or-files)
+(defun vc-delete-file (file-or-files &optional noconfirm)
   "Delete file and mark it as such in the version control system.
 If called interactively, read FILE-OR-FILES, defaulting to the current
 buffer's file name if it's under version control.
 When called from Lisp, FILE-OR-FILES can be a file name or a list of
-file names."
+file names.
+When called from Lisp, optional argument NOCONFIRM non-nil means don't
+prompt to confirm deletion."
   (interactive (list (read-file-name "VC delete file: " nil
                                      (when (vc-backend buffer-file-name)
                                        buffer-file-name)
@@ -4982,11 +4984,12 @@ file names."
           (error "Please commit or undo your changes before deleting %s" file))
         (when (eq state 'conflict)
           (error "Please resolve the conflicts before deleting %s" file)))))
-  (unless (y-or-n-p (if (cdr file-or-files)
-                        (format "Really want to delete these %d files? "
-                                (length file-or-files))
-                      (format "Really want to delete %s? "
-			      (file-name-nondirectory (car file-or-files)))))
+  (unless (or noconfirm
+              (y-or-n-p (if (cdr file-or-files)
+                            (format "Really want to delete these %d files? "
+                                    (length file-or-files))
+                          (format "Really want to delete %s? "
+			          (file-name-nondirectory (car file-or-files))))))
     (error "Abort!"))
   (let ((post-backend-deletion
          ;; Things to do after calling the backend's `delete-file' or
@@ -5032,10 +5035,14 @@ file names."
             (funcall post-backend-deletion file)))))))
 
 ;;;###autoload
-(defun vc-rename-file (old new)
+(defun vc-rename-file (old new &optional ok-if-already-exists)
   "Rename file OLD to NEW in both working tree and repository.
 When called interactively, read OLD and NEW, defaulting OLD to the
-current buffer's file name if it's under version control."
+current buffer's file name if it's under version control.
+If NEW is a directory name, rename FILE to a like-named file under NEW.
+For NEW to be recognized as a directory name, it should end in a slash.
+Signal a `file-already-exists' error if a file NEW already exists unless
+called from Lisp with optional argument OK-IF-ALREADY-EXISTS non-nil."
   ;; FIXME: Support renaming whole directories.
   ;; The use of `vc-call' will need to change to something like
   ;;
@@ -5064,8 +5071,14 @@ current buffer's file name if it's under version control."
       (error "Please save files before moving them"))
     (when (get-file-buffer new)
       (error "Already editing new file name"))
+    ;; Handle OK-IF-ALREADY-EXISTS here because it's not part of the VC
+    ;; backend `delete-file' API.
+    ;; If NEW is a directory we'll fail to delete it, consistent with
+    ;; `rename-file' whose OK-IF-ALREADY-EXISTS argument similarly can't
+    ;; delete existing directories.
     (when (file-exists-p new)
-      (error "New file already exists"))
+      (if ok-if-already-exists (vc-delete-file new 'noconfirm)
+        (signal 'file-already-exists `("File exists" ,new))))
     (unless dirp
       (let ((state (vc-state old)))
         (unless (memq state '(up-to-date edited added))
diff --git a/test/lisp/vc/vc-tests/vc-tests.el b/test/lisp/vc/vc-tests/vc-tests.el
index a9b4653ac9b..788db646db3 100644
--- a/test/lisp/vc/vc-tests/vc-tests.el
+++ b/test/lisp/vc/vc-tests/vc-tests.el
@@ -589,7 +589,36 @@ This checks also `vc-backend' and `vc-responsible-backend'."
               (should (equal (vc-state new-name)
                              (if (memq backend '(RCS SCCS))
                                  'up-to-date
-                               'added)))))
+                               'added))))
+
+            ;; Test OK-IF-ALREADY-EXISTS.
+            (let ((tmp-name (expand-file-name "qux" default-directory))
+                  (new-name (expand-file-name "quuux" default-directory)))
+              (write-region "qux" nil tmp-name nil 'nomessage)
+              (write-region "quuux" nil new-name nil 'nomessage)
+              (vc-register
+               (list backend (list (file-name-nondirectory tmp-name)
+                                   (file-name-nondirectory new-name))))
+
+              (should-error (vc-rename-file tmp-name new-name)
+                            :type 'file-already-exists)
+              (vc-rename-file tmp-name new-name 'ok-if-already-exists)
+              (should-not (file-exists-p tmp-name))
+              (should (file-exists-p new-name)))
+
+            ;; Test moving into an existing directory.
+            (let ((tmp-name (expand-file-name "quux" default-directory))
+                  (new-dir (expand-file-name "dir1/" default-directory))
+                  (new-name (expand-file-name "dir1/quux" default-directory)))
+              (make-directory new-dir)
+              (write-region "quux" nil tmp-name nil 'nomessage)
+              (vc-register
+               `(,backend (,(file-relative-name new-dir default-directory)
+                           ,(file-name-nondirectory tmp-name))))
+
+              (vc-rename-file tmp-name new-dir)
+              (should-not (file-exists-p tmp-name))
+              (should (file-exists-p new-name))))
 
         ;; Save exit.
         (ignore-errors

From 0ea1c0d831d230a8494431d168f95a72534ea2e6 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 15 Apr 2026 10:05:29 -0400
Subject: [PATCH 108/463] ; * lisp/vc/vc.el (vc-rename-file): Delete old FIXME.

---
 lisp/vc/vc.el | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 40544a7c578..3a7bb5b2170 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -5043,15 +5043,6 @@ If NEW is a directory name, rename FILE to a like-named file under NEW.
 For NEW to be recognized as a directory name, it should end in a slash.
 Signal a `file-already-exists' error if a file NEW already exists unless
 called from Lisp with optional argument OK-IF-ALREADY-EXISTS non-nil."
-  ;; FIXME: Support renaming whole directories.
-  ;; The use of `vc-call' will need to change to something like
-  ;;
-  ;;     (vc-call-backend (if dir
-  ;;                          (vc-responsible-backend file)
-  ;;                        (vc-backend file))
-  ;;                      'rename-file old new)
-  ;;
-  ;; as was done in `vc-revert-file'; see bug#43464.  --spwhitton
   (interactive (list (read-file-name "VC rename file: " nil
                                      (and (vc-backend buffer-file-name)
                                           buffer-file-name)

From 43f0da207e2e87a1c1bcf3efbf29aae82b5f0cc6 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 15 Apr 2026 10:06:48 -0400
Subject: [PATCH 109/463] Fix renaming whole directories with Mercurial

* lisp/vc/vc-hg.el (vc-hg-rename-file): Use 'hg mv --after'.
* test/lisp/vc/vc-tests/vc-tests.el (vc-test--rename-directory):
New test.
---
 lisp/vc/vc-hg.el                  |  7 +++-
 test/lisp/vc/vc-tests/vc-tests.el | 66 ++++++++++++++++++++++++++++++-
 2 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 398645e5a1e..1535e767ea5 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -1189,10 +1189,13 @@ Should be called with DEFAULT-DIRECTORY equal to the repository root."
       (file-error nil)))
   (vc-hg-command nil 0 files "remove" "--after" "--force"))
 
-;; Modeled after the similar function in vc-bzr.el
 (defun vc-hg-rename-file (old new)
   "Rename file from OLD to NEW using `hg mv'."
-  (vc-hg-command nil 0 (expand-file-name new) "mv"
+  ;; Do the rename ourselves then update hg.  Otherwise only registered
+  ;; files are moved.  ('git mv' moves both registered and unregistered
+  ;; files which seems more useful.)
+  (rename-file old new)
+  (vc-hg-command nil 0 (expand-file-name new) "mv" "--after"
                  (expand-file-name old)))
 
 (defun vc-hg-register (files &optional _comment)
diff --git a/test/lisp/vc/vc-tests/vc-tests.el b/test/lisp/vc/vc-tests/vc-tests.el
index 788db646db3..ed0f2597bd0 100644
--- a/test/lisp/vc/vc-tests/vc-tests.el
+++ b/test/lisp/vc/vc-tests/vc-tests.el
@@ -624,6 +624,54 @@ This checks also `vc-backend' and `vc-responsible-backend'."
         (ignore-errors
           (run-hooks 'vc-test--cleanup-hook))))))
 
+(defun vc-test--rename-directory (backend)
+  "Check the rename-file action for directories."
+  (ert-with-temp-directory tempdir
+    (let ((vc-handled-backends `(,backend))
+          (default-directory
+           (file-name-as-directory
+            (expand-file-name
+             (make-temp-name "vc-test") temporary-file-directory)))
+          (process-environment process-environment)
+          vc-test--cleanup-hook)
+      (vc--fix-home-for-bzr tempdir)
+      (unwind-protect
+          (progn
+            ;; Cleanup.
+            (add-hook
+             'vc-test--cleanup-hook
+             (let ((dir default-directory))
+               (lambda () (delete-directory dir 'recursive))))
+
+            ;; Create empty repository.
+            (make-directory default-directory)
+            (vc-test--create-repo-function backend)
+
+            (let* ((tmp-dir (expand-file-name "dir1/" default-directory))
+                   (tmp-name1 (expand-file-name "foo" tmp-dir))
+                   (tmp-name2 (expand-file-name "bar" tmp-dir))
+                   (new-dir (expand-file-name "dir2/" default-directory))
+                   (new-name1 (expand-file-name "foo" new-dir))
+                   (new-name2 (expand-file-name "bar" new-dir)))
+              (make-directory tmp-dir)
+              (write-region "foo" nil tmp-name1 nil 'nomessage)
+              (write-region "bar" nil tmp-name2 nil 'nomessage)
+              ;; Register TMP-NAME1 but *not* TMP-NAME2.
+              (vc-register `(,backend
+                             (,(file-relative-name tmp-name1
+                                                   default-directory))))
+
+              (vc-rename-file (directory-file-name tmp-dir)
+                              (directory-file-name new-dir))
+              (should-not (file-exists-p tmp-name1))
+              (should-not (file-exists-p tmp-name2))
+              (should (file-exists-p new-name1))
+              (should (file-exists-p new-name2))))
+
+        ;; Save exit.
+        (ignore-errors
+          (run-hooks 'vc-test--cleanup-hook))))))
+
 (defvar vc-hg-global-switches)
 
 (defmacro vc-test--with-author-identity (backend &rest body)
@@ -1222,7 +1270,23 @@ This checks also `vc-backend' and `vc-responsible-backend'."
 	      ',(intern
 	         (format "vc-test-%s01-register" backend-string))))))
           (skip-unless (memq ',backend '(Git Hg)))
-          (vc-test--checkin-patch ',backend))))))
+          (vc-test--checkin-patch ',backend))
+
+        (ert-deftest
+            ,(intern (format "vc-test-%s10-rename-directory" backend-string)) ()
+          ,(format "Check `vc-rename-file' with directories for the %s backend."
+                   backend-string)
+          (skip-unless
+           (ert-test-passed-p
+            (ert-test-most-recent-result
+             (ert-get-test
+              ',(intern
+                 (format "vc-test-%s01-register" backend-string))))))
+          ;; See vc-test-*-rename-file regarding CVS and Mtn.
+          ;; SVN requires all files to rename are registered but we want
+          ;; to test a mix of registered and unregistered files in this test.
+          (skip-when (memq ',backend '(CVS SVN Mtn)))
+          (vc-test--rename-directory ',backend))))))
 
 (provide 'vc-tests)
 ;;; vc-tests.el ends here

From 4ad8bd9b483f5229888e448a895740c0a96035fa Mon Sep 17 00:00:00 2001
From: Juri Linkov <juri@linkov.net>
Date: Wed, 15 Apr 2026 20:40:23 +0300
Subject: [PATCH 110/463] Handle the symbol property 'isearch-exit' in
 'isearch-occur' (bug#80785)

* lisp/isearch.el (isearch-occur): When the command has
a non-nil symbol property 'isearch-exit', exit the search
before running the command.
---
 lisp/isearch.el | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lisp/isearch.el b/lisp/isearch.el
index b677e89c7cd..745b0745fd6 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2468,7 +2468,10 @@ the search words, ignoring punctuation.  If the last search
 command was a regular expression search, REGEXP is the regular
 expression used in that search.  If the last search command searched
 for a literal string, REGEXP is constructed by quoting all the special
-characters in that string."
+characters in that string.
+
+When the symbol property `isearch-exit' of this command is non-nil,
+the search exits before it runs `occur'."
   (interactive
    (let* ((perform-collect (consp current-prefix-arg))
 	  (regexp (cond
@@ -2495,6 +2498,11 @@ characters in that string."
 	     ;; Otherwise normal occur takes numerical prefix argument.
 	     (when current-prefix-arg
 	       (prefix-numeric-value current-prefix-arg))))))
+  (when (and (symbolp this-command)
+             (get this-command 'isearch-exit))
+    (let ((isearch-recursive-edit nil))
+      (isearch-done nil t)
+      (isearch-clean-overlays)))
   (let ((case-fold-search isearch-case-fold-search)
 	;; Set `search-upper-case' to nil to not call
 	;; `isearch-no-upper-case-p' in `occur-1'.

From 324e5b4177832ac8e7f41a95c4adfa6198feca1d Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 15 Apr 2026 13:53:58 -0400
Subject: [PATCH 111/463] ; * test/lisp/vc/vc-tests/vc-tests.el: Disable new
 tests on RCS.

---
 test/lisp/vc/vc-tests/vc-tests.el | 55 +++++++++++++++++--------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/test/lisp/vc/vc-tests/vc-tests.el b/test/lisp/vc/vc-tests/vc-tests.el
index ed0f2597bd0..77e77ededfb 100644
--- a/test/lisp/vc/vc-tests/vc-tests.el
+++ b/test/lisp/vc/vc-tests/vc-tests.el
@@ -592,33 +592,37 @@ This checks also `vc-backend' and `vc-responsible-backend'."
                                'added))))
 
             ;; Test OK-IF-ALREADY-EXISTS.
-            (let ((tmp-name (expand-file-name "qux" default-directory))
-                  (new-name (expand-file-name "quuux" default-directory)))
-              (write-region "qux" nil tmp-name nil 'nomessage)
-              (write-region "quuux" nil new-name nil 'nomessage)
-              (vc-register
-               (list backend (list (file-name-nondirectory tmp-name)
-                                   (file-name-nondirectory new-name))))
+            ;; RCS doesn't support `vc-delete-file'.
+            (unless (eq backend 'RCS)
+              (let ((tmp-name (expand-file-name "qux" default-directory))
+                    (new-name (expand-file-name "quuux" default-directory)))
+                (write-region "qux" nil tmp-name nil 'nomessage)
+                (write-region "quuux" nil new-name nil 'nomessage)
+                (vc-register
+                 (list backend (list (file-name-nondirectory tmp-name)
+                                     (file-name-nondirectory new-name))))
 
-              (should-error (vc-rename-file tmp-name new-name)
-                            :type 'file-already-exists)
-              (vc-rename-file tmp-name new-name 'ok-if-already-exists)
-              (should-not (file-exists-p tmp-name))
-              (should (file-exists-p new-name)))
+                (should-error (vc-rename-file tmp-name new-name)
+                              :type 'file-already-exists)
+                (vc-rename-file tmp-name new-name 'ok-if-already-exists)
+                (should-not (file-exists-p tmp-name))
+                (should (file-exists-p new-name))))
 
             ;; Test moving into an existing directory.
-            (let ((tmp-name (expand-file-name "quux" default-directory))
-                  (new-dir (expand-file-name "dir1/" default-directory))
-                  (new-name (expand-file-name "dir1/quux" default-directory)))
-              (make-directory new-dir)
-              (write-region "quux" nil tmp-name nil 'nomessage)
-              (vc-register
-               `(,backend (,(file-relative-name new-dir default-directory)
-                           ,(file-name-nondirectory tmp-name))))
+            ;; FIXME: This is broken for RCS and I don't know why.  --spwhitton
+            (unless (eq backend 'RCS)
+              (let ((tmp-name (expand-file-name "quux" default-directory))
+                    (new-dir (expand-file-name "dir1/" default-directory))
+                    (new-name (expand-file-name "dir1/quux" default-directory)))
+                (make-directory new-dir)
+                (write-region "quux" nil tmp-name nil 'nomessage)
+                (vc-register
+                 `(,backend (,(file-relative-name new-dir default-directory)
+                             ,(file-name-nondirectory tmp-name))))
 
-              (vc-rename-file tmp-name new-dir)
-              (should-not (file-exists-p tmp-name))
-              (should (file-exists-p new-name))))
+                (vc-rename-file tmp-name new-dir)
+                (should-not (file-exists-p tmp-name))
+                (should (file-exists-p new-name)))))
 
         ;; Save exit.
         (ignore-errors
@@ -1285,7 +1289,10 @@ This checks also `vc-backend' and `vc-responsible-backend'."
           ;; See vc-test-*-rename-file regarding CVS and Mtn.
           ;; SVN requires all files to rename are registered but we want
           ;; to test a mix of registered and unregistered files in this test.
-          (skip-when (memq ',backend '(CVS SVN Mtn)))
+          ;; RCS does not seem to support renaming directories; possibly
+          ;; `vc-rcs-rename-file' could be improved or it might be a
+          ;; fundamental limitation.
+          (skip-when (memq ',backend '(CVS SVN Mtn RCS)))
           (vc-test--rename-directory ',backend))))))
 
 (provide 'vc-tests)

From 5045394694d72323a6746130e43cdcda2a293740 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 15 Apr 2026 17:59:10 -0400
Subject: [PATCH 112/463] vc-rename-file: Fix case of directory with only
 untracked files

* lisp/vc/vc.el (vc-rename-file): Don't call into the backend if
moving a directory containing only untracked files.
* test/lisp/vc/vc-tests/vc-tests.el (vc-test--rename-directory):
New test for this case.
---
 lisp/vc/vc.el                     | 15 +++++++++++----
 test/lisp/vc/vc-tests/vc-tests.el | 18 +++++++++++++++++-
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 3a7bb5b2170..3cae49c0b60 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -5075,10 +5075,17 @@ called from Lisp with optional argument OK-IF-ALREADY-EXISTS non-nil."
         (unless (memq state '(up-to-date edited added))
           (error "Please %s files before moving them"
 	         (if (stringp state) "check in" "update")))))
-    (vc-call-backend (if dirp
-                         (vc-responsible-backend old)
-                       (vc-backend old))
-                     'rename-file old new)
+    (let ((backend (if dirp
+                       (vc-responsible-backend old)
+                     (vc-backend old))))
+      ;; The rename commands for several VCS (at least Bzr, Git and
+      ;; Mercurial) will fail if asked to move a directory containing
+      ;; only untracked files.
+      (unless (and dirp
+                   (all (lambda (x)
+                          (memq (cadr x) '(ignored unregistered)))
+                        (vc-dir-status-files old (list old) backend)))
+        (vc-call-backend backend 'rename-file old new)))
     (vc-file-clearprops old)
     (vc-file-clearprops new)
     ;; Move the actual file (unless the backend did it already)
diff --git a/test/lisp/vc/vc-tests/vc-tests.el b/test/lisp/vc/vc-tests/vc-tests.el
index 77e77ededfb..ca3b62ee9e8 100644
--- a/test/lisp/vc/vc-tests/vc-tests.el
+++ b/test/lisp/vc/vc-tests/vc-tests.el
@@ -651,6 +651,7 @@ This checks also `vc-backend' and `vc-responsible-backend'."
             (make-directory default-directory)
             (vc-test--create-repo-function backend)
 
+            ;; Test mix of registered and unregistered files.
             (let* ((tmp-dir (expand-file-name "dir1/" default-directory))
                    (tmp-name1 (expand-file-name "foo" tmp-dir))
                    (tmp-name2 (expand-file-name "bar" tmp-dir))
@@ -670,7 +671,22 @@ This checks also `vc-backend' and `vc-responsible-backend'."
               (should-not (file-exists-p tmp-name1))
               (should-not (file-exists-p tmp-name2))
               (should (file-exists-p new-name1))
-              (should (file-exists-p new-name2))))
+              (should (file-exists-p new-name2)))
+
+            ;; Test only unregistered files.
+            (let* ((tmp-dir (expand-file-name "dir3/" default-directory))
+                   (tmp-name (expand-file-name "foo" tmp-dir))
+                   (new-dir (expand-file-name "dir4/" default-directory))
+                   (new-name (expand-file-name "foo" new-dir)))
+              (make-directory tmp-dir)
+              (write-region "foo" nil tmp-name nil 'nomessage)
+
+              (vc-rename-file (directory-file-name tmp-dir)
+                              (directory-file-name new-dir))
+              (should-not (file-exists-p tmp-name))
+              (should-not (file-exists-p tmp-name))
+              (should (file-exists-p new-name))
+              (should (file-exists-p new-name))))
 
         ;; Save exit.
         (ignore-errors

From eb4835e5215fdc1af78ac660abf7afcee7a79434 Mon Sep 17 00:00:00 2001
From: Toby Dylan Hocking <toby.hocking@r-project.org>
Date: Thu, 26 Mar 2026 08:51:27 -0400
Subject: [PATCH 113/463] Make | optional for 'gnu' regexp in compilation-mode
 (bug#80681)

* lisp/progmodes/compile.el
(compilation-error-regexp-alist-alist): Make leading '|'
optional when there are leading spaces (bug#80681).
* etc/compilation.txt (GNU style): New error with two leading
spaces.
* test/lisp/progmodes/compile-tests.el
(compile-test-error-regexps): Increment expected
compilation-num-errors-found.
(compile-tests--test-regexps-data): New error test case for
'gnu' with two leading spaces.  Change expected match for
'cucumber' to match again 'gnu'.

Copyright-paperwork-exempt: yes
---
 etc/compilation.txt                  | 1 +
 lisp/progmodes/compile.el            | 5 +++--
 test/lisp/progmodes/compile-tests.el | 7 +++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/etc/compilation.txt b/etc/compilation.txt
index 801d262f5aa..b97ba12fb9a 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -331,6 +331,7 @@ boost/container/detail/flat_tree.hpp:589:25:   [ skipping 5 instantiation contex
    |
    |board.h:60:21:
    |   60 | #define I(b, C) ((C).y * (b)->width + (C).x)
+  src/add.cpp:8:31: error: invalid operands of types ‘const double’ and ‘const double*’ to binary ‘operator+’
 
 
 * Guile backtrace, 2.0.11
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 07974906a90..53aca7b0266 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -460,8 +460,9 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
        ;; non-interactive programs other than compilers (e.g. the
        ;; "jade:" entry in compilation.txt).
        (? (| (: alpha (+ (in ?. ?- alnum)) ":" (? " "))
-             ;; Skip indentation generated by GCC's -fanalyzer.
-             (: (+ " ") "|")))
+             ;; Skip indentation generated by GCC's -fanalyzer (with |),
+             ;; or two spaces from pip install (without |).
+             (: (+ " ") (? "|"))))
 
        ;; File name group.
        (group-n 1
diff --git a/test/lisp/progmodes/compile-tests.el b/test/lisp/progmodes/compile-tests.el
index 67a713857e3..caf386b4950 100644
--- a/test/lisp/progmodes/compile-tests.el
+++ b/test/lisp/progmodes/compile-tests.el
@@ -121,7 +121,8 @@
     ;; cucumber
     (cucumber "Scenario: undefined step  # features/cucumber.feature:3"
      29 nil 3 "features/cucumber.feature" error)
-    (cucumber "      /home/gusev/.rvm/foo/bar.rb:500:in `_wrap_assertion'"
+    ;; Below is from cucumber but gnu regexp is consistent and matches first.
+    (gnu "      /home/gusev/.rvm/foo/bar.rb:500:in `_wrap_assertion'"
      1 nil 500 "/home/gusev/.rvm/foo/bar.rb" error)
     ;; edg-1 edg-2
     (edg-1 "build/intel/debug/../../../struct.cpp(42): error: identifier \"foo\" is undefined"
@@ -271,6 +272,8 @@
      1 nil 27041 "{standard input}" warning)
     (gnu "boost/container/detail/flat_tree.hpp:589:25:   [ skipping 5 instantiation contexts, use -ftemplate-backtrace-limit=0 to disable ]"
      1 25 589 "boost/container/detail/flat_tree.hpp" info)
+    ;; Below from pip install, running g++ to compile python extension module.
+    (gnu "  src/add.cpp:8:31: error: invalid operands of types ‘const double’ and ‘const double*’ to binary ‘operator+’" 1 31 8 "src/add.cpp" error)
     ;; Gradle/Kotlin
     (gradle-kotlin
      "e: file:///src/Test.kt:267:5 foo: bar" 4 5 267 "/src/Test.kt" error)
@@ -556,7 +559,7 @@ The test data is in `compile-tests--test-regexps-data'."
                    1 15 5 "alpha.c")))
         (compile--test-error-line test))
 
-      (should (eq compilation-num-errors-found 110))
+      (should (eq compilation-num-errors-found 111))
       (should (eq compilation-num-warnings-found 37))
       (should (eq compilation-num-infos-found 36)))))
 

From abcd0d3c8da637f3b0e828afcbc92ca90954744f Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 16 Apr 2026 08:26:33 +0300
Subject: [PATCH 114/463] ; * lisp/isearch.el (isearch-occur): Doc fix. 
 (Bug#80785)

---
 lisp/isearch.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 745b0745fd6..785d324cac3 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2470,8 +2470,9 @@ expression used in that search.  If the last search command searched
 for a literal string, REGEXP is constructed by quoting all the special
 characters in that string.
 
-When the symbol property `isearch-exit' of this command is non-nil,
-the search exits before it runs `occur'."
+If the symbol property `isearch-exit' of this command is non-nil,
+and the command is invoked while in the middle of incremental
+search, it will exit the on-going search before it runs `occur'."
   (interactive
    (let* ((perform-collect (consp current-prefix-arg))
 	  (regexp (cond

From 213b8e0b978a28305a1a3c9735114449962cfbef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Thu, 16 Apr 2026 08:03:33 +0100
Subject: [PATCH 115/463] Eglot: un-canonicalize server URIs to project's root

Some LSP servers prefer to canonicalize all document URIs to
their "true name", chasing all fs symbolic links.  If the user
is visiting a project under a symlink, say ~/myprojects/foo
which points to /data/true/projects/foo.  When visiting a
~/myprojects/foo/f.c and trying to jump to a nearby file f.h via
LSP 'xref-find-definitions', the path should probably be
~/myproject/foo/f.h, not /data/true/projects/foo/f.h.

Even though Emacs can recognize that the two files are the same,
'buffer-file-name' is not.  This confuses tools like C-x C-f,
ibuffer, and ultimately the users themselves who probably
oblivious to the true place of the project.  After all they
started Eglot under a syminked file.

* lisp/progmodes/eglot.el (eglot-lsp-server): Add trueroot slot.
(eglot-uri-to-path): Rework to consider trueroot and project root.
---
 lisp/progmodes/eglot.el | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index bf6fbc69ba2..6e7d0dcf7a1 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -1225,7 +1225,11 @@ object."
     :accessor eglot--saved-initargs)
    (semtok-cache
     :initform (make-hash-table :test #'equal)
-    :documentation "Map LSP token conses to face names."))
+    :documentation "Map LSP token conses to face names.")
+   (trueroot
+    :initform nil
+    :documentation "Cached truename of the associated project root."
+    :accessor eglot--trueroot))
   :documentation
   "Represents a server. Wraps a process for LSP communication.")
 
@@ -1235,19 +1239,27 @@ object."
   (when (keywordp uri) (setq uri (substring (symbol-name uri) 1)))
   (let* ((server (eglot-current-server))
          (remote-prefix (and server (eglot--trampish-p server)))
+         (root (and server (project-root (eglot--project server))))
+         (trueroot (and root (eglot--trueroot server)))
          (url (url-generic-parse-url uri)))
     ;; Only parse file:// URIs, leave other URI untouched as
     ;; `file-name-handler-alist' should know how to handle them
     ;; (bug#58790).
     (if (string= "file" (url-type url))
-        (let* ((retval (url-unhex-string (url-filename url)))
+        (let* ((unhexed (url-unhex-string (url-filename url)))
                ;; Remove the leading "/" for local MS Windows-style paths.
                (normalized (if (and (not remote-prefix)
                                     (eq system-type 'windows-nt)
-                                    (cl-plusp (length retval))
-                                    (eq (aref retval 0) ?/))
-                               (w32-long-file-name (substring retval 1))
-                             retval)))
+                                    (cl-plusp (length unhexed))
+                                    (eq (aref unhexed 0) ?/))
+                               (w32-long-file-name (substring unhexed 1))
+                             unhexed))
+               ;; Make sure the final path is relative to project's root
+               ;; (found when the user `M-x eglot''ed), not trueroot.
+               (normalized (if trueroot
+                               (replace-regexp-in-string (concat "^" trueroot) root
+                                                         normalized)
+                             normalized)))
           (concat remote-prefix normalized))
       uri)))
 
@@ -1833,6 +1845,7 @@ This docstring appeases checkdoc, that's all."
     (setf (eglot--saved-initargs server) initargs)
     (setf (eglot--project server) project)
     (setf (eglot--project-nickname server) nickname)
+    (setf (eglot--trueroot server) (file-truename (project-root project)))
     (setf (eglot--languages server)
           (cl-loop for m in managed-modes for l in language-ids
                    collect (cons m l)))

From d7c9676ec8ecf295021d1e8d0f327d614a3d84ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Thu, 16 Apr 2026 08:28:21 +0100
Subject: [PATCH 116/463] Jsonrpc: don't suddenly jump point in events buffer

* lisp/jsonrpc.el (jsonrpc--save-excursion-maybe): New macro.

* lisp/jsonrpc.el (jsonrpc--log-event, jsonrpc--forwarding-buffer):
Use it.
---
 lisp/jsonrpc.el | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el
index e8930fd2d4e..4e4f914c998 100644
--- a/lisp/jsonrpc.el
+++ b/lisp/jsonrpc.el
@@ -1053,6 +1053,15 @@ TIMEOUT is nil)."
                                              fn oops)
                            (remove-hook 'jsonrpc-event-hook fn)))))))
 
+(defmacro jsonrpc--save-excursion-maybe (&rest body)
+  "Run BODY, preserving point unless it was at `point-max'.
+If point is already at end of buffer, allow it to follow any
+text inserted there.  Otherwise, restore it afterwards."
+  (declare (indent 0))
+  `(if (= (point) (point-max))
+       (progn ,@body)
+     (save-excursion ,@body)))
+
 (defun jsonrpc--limit-buffer-size (max-size)
   "Limit the current buffer to MAX-SIZE by eating lines at the beginning.
 Do nothing if MAX-SIZE is nil."
@@ -1137,12 +1146,13 @@ of the API instead.")
                                       (concat "\n" (pp-to-string
                                                     foreign-message))))
                                (concat log-text "\n")))))))
-          (goto-char (point-max))
           ;; XXX: could use `run-at-time' to delay server logs
           ;; slightly to play nice with verbose servers' stderr.
           (when error
             (setq msg (propertize msg 'face 'error)))
-          (insert-before-markers msg)
+          (jsonrpc--save-excursion-maybe
+            (goto-char (point-max))
+            (insert-before-markers msg))
           (jsonrpc--limit-buffer-size max))))))
 
 (defun jsonrpc--forwarding-buffer (name prefix conn)
@@ -1167,11 +1177,12 @@ PREFIX to CONN's events buffer."
                                   (line-beginning-position 0)
                                   (line-end-position 0))
                       do (with-current-buffer (jsonrpc-events-buffer conn)
-                           (goto-char (point-max))
                            (let ((inhibit-read-only t))
-                             (insert
-                              (propertize (format "%s %s\n" prefix line)
-                                          'face 'shadow))
+                             (jsonrpc--save-excursion-maybe
+                               (goto-char (point-max))
+                               (insert-before-markers
+                                (propertize (format "%s %s\n" prefix line)
+                                            'face 'shadow)))
                              (jsonrpc--limit-buffer-size max)))
                       until (eobp)))))
        nil t))

From 1c4c9d759a2e32856db3fd03e906057c8d81fa0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Thu, 16 Apr 2026 09:28:16 +0100
Subject: [PATCH 117/463] Eglot: add shutdown/reconnect bindings to
 eglot-list-connections buffer

* lisp/progmodes/eglot.el (eglot-list-connections-mode-map): New
defvar.

* lisp/progmodes/eglot.el (eglot--list-connections-entries): New
function, extracted from eglot-list-connections.

* lisp/progmodes/eglot.el (eglot--list-connections-cmd): New macro.

* lisp/progmodes/eglot.el (eglot-shutdown-listed-connection)
(eglot-reconnect-listed-connection): New commands.

* lisp/progmodes/eglot.el (eglot-list-connections): Use
eglot--list-connections-entries.

* doc/misc/eglot.texi: Document eglot-list-connections and new keys.

* etc/EGLOT-NEWS: Announce.
---
 doc/misc/eglot.texi     |  7 +++++
 etc/EGLOT-NEWS          |  7 +++++
 lisp/progmodes/eglot.el | 62 ++++++++++++++++++++++++++++++-----------
 3 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/doc/misc/eglot.texi b/doc/misc/eglot.texi
index 68829a733c5..e6ca177c726 100644
--- a/doc/misc/eglot.texi
+++ b/doc/misc/eglot.texi
@@ -713,6 +713,13 @@ Emacs session.  As with @code{eglot-shutdown}, invoking this command
 with a prefix argument avoids killing the buffers used for
 communications with the language servers.
 
+@item M-x eglot-list-connections
+This command pops up a buffer listing all active Eglot connections,
+showing aspects such as the server name, project, number of managed
+buffers, major modes, and the server invocation.  In this buffer,
+@kbd{k} shuts down the server on the current line and @kbd{r}
+reconnects to it.
+
 @item M-x eglot-rename
 This command renames the program symbol (a.k.a.@: @dfn{identifier}) at
 point to another name.  It prompts for the new name of the symbol, and
diff --git a/etc/EGLOT-NEWS b/etc/EGLOT-NEWS
index 81becb41eba..cdbe4cc2c22 100644
--- a/etc/EGLOT-NEWS
+++ b/etc/EGLOT-NEWS
@@ -17,6 +17,13 @@ This refers to https://github.com/joaotavora/eglot/issues/.  That is,
 to look up issue github#1234, go to
 https://github.com/joaotavora/eglot/issues/1234.
 
+
+* Changes to upcoming Eglot
+
+** New commands for the 'M-x eglot-list-connections' major mode
+
+'k' shuts down and 'r' reconnects the server on the current line.
+
 
 * Changes in Eglot 1.23 (2/4/2026)
 
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 6e7d0dcf7a1..c357e23ad12 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -4938,6 +4938,13 @@ If NOERROR, return predicate, else erroring function."
 
 ;;; List connections mode
 
+(defvar eglot-list-connections-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "k" #'eglot-shutdown-listed-connection)
+    (define-key map "r" #'eglot-reconnect-listed-connection)
+    map)
+  "Keymap for `eglot-list-connections-mode'.")
+
 (define-derived-mode eglot-list-connections-mode  tabulated-list-mode
   "" "Eglot mode for listing server connections.
 \\{eglot-list-connections-mode-map}"
@@ -4947,6 +4954,25 @@ If NOERROR, return predicate, else erroring function."
                 ("Modes" 20) ("Invocation" 32)])
   (tabulated-list-init-header))
 
+(defun eglot--list-connections-entries ()
+  "Compute `tabulated-list-entries' for the connections list buffer."
+  (mapcar
+   (lambda (server)
+     (list server
+           `[,(or (plist-get (eglot--server-info server) :name)
+                  (jsonrpc-name server))
+             ,(eglot-project-nickname server)
+             ,(format "%s" (length (eglot--managed-buffers server)))
+             ,(mapconcat #'symbol-name
+                         (eglot--major-modes server)
+                         ", ")
+             ,(let ((c (process-command
+                        (jsonrpc--process server))))
+                (if (consp c) (mapconcat #'identity c " ")
+                  "network"))]))
+   (cl-reduce #'append
+              (hash-table-values eglot--servers-by-project))))
+
 (defun eglot-list-connections ()
   "List currently active Eglot connections."
   (interactive)
@@ -4955,26 +4981,24 @@ If NOERROR, return predicate, else erroring function."
     (let ((inhibit-read-only t))
       (erase-buffer)
       (eglot-list-connections-mode)
-      (setq-local tabulated-list-entries
-                  (mapcar
-                   (lambda (server)
-                     (list server
-                           `[,(or (plist-get (eglot--server-info server) :name)
-                                  (jsonrpc-name server))
-                             ,(eglot-project-nickname server)
-                             ,(format "%s" (length (eglot--managed-buffers server)))
-                             ,(mapconcat #'symbol-name
-                                         (eglot--major-modes server)
-                                         ", ")
-                             ,(let ((c (process-command
-                                        (jsonrpc--process server))))
-                                (if (consp c) (mapconcat #'identity c " ")
-                                  "network"))]))
-                   (cl-reduce #'append
-                              (hash-table-values eglot--servers-by-project))))
+      (setq-local tabulated-list-entries #'eglot--list-connections-entries)
       (revert-buffer)
       (pop-to-buffer (current-buffer)))))
 
+(cl-defmacro eglot--list-connections-cmd (name s doc &body body)
+  (declare (indent 2) (debug (sexp sexp sexp &rest form)))
+  `(defun ,name ()
+     ,doc (interactive)
+     (if-let* ((,s (tabulated-list-get-id)))
+         (progn ,@body (tabulated-list-revert))
+       (user-error "No server on this line"))))
+
+(eglot--list-connections-cmd eglot-shutdown-listed-connection s
+  "Shutdown Eglot server on current line" (eglot-shutdown s))
+
+(eglot--list-connections-cmd eglot-reconnect-listed-connection s
+  "Reconnect Eglot server on current line" (eglot-reconnect s))
+
 
 ;;; Inlay hints
 (defface eglot-inlay-hint-face '((t (:height 0.8 :inherit shadow)))
@@ -5634,6 +5658,10 @@ lock machinery calls us again."
                eglot-stderr-buffer))
   (function-put sym 'command-modes '(eglot--managed-mode)))
 
+(dolist (sym '(eglot-shutdown-listed-connection
+               eglot-reconnect-listed-connection))
+  (function-put sym 'command-modes '(eglot-list-connections-mode)))
+
 (provide 'eglot)
 
 

From 5b6fc8ebfcd6bce6a0e5fb7160ec7a2aeb561baf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20Bela=C3=AFche?= <vincentb1@users.sourceforge.net>
Date: Sun, 29 Mar 2026 06:17:55 +0200
Subject: [PATCH 118/463] ert-play-keys function

* lisp/emacs-lisp/ert-x.el (ert-play-keys): new defun.

* test/lisp/simple-tests.el (undo-test-kill-c-a-then-undo)
(undo-test-point-after-forward-kill): Use new function
`ert-play-keys' and `(ert-with-test-buffer (:selected t) ...)'
rather (with-temp-buffer (switch-to-buffer (current-buffer) ...)'.

* test/lisp/erc/erc-scenarios-spelling.el
(erc-scenarios-spelling--auto-correct): Use new function
`ert-play-keys' and `(ert-with-buffer-selected ...)' rather than
`execute-kbd-macro' and `(with-current-buffer
... (set-window-buffer nil (current-buffer) ...)'.

* doc/misc/ert.texi (Helper Functions): Document ert-play-keys,
and differences between ert-simulate-command, ert-simulate-keys
& ert-play-keys.

* test/lisp/emacs-lisp/ert-x-tests.el
(ert-x-tests-play-keys)
(ert-x-tests-simulate-command, ert-x-tests-simulate-keys): New
tests.
---
 doc/misc/ert.texi                       | 90 ++++++++++++++++++++++++-
 lisp/emacs-lisp/ert-x.el                | 13 ++++
 lisp/emacs-lisp/ert.el                  | 15 ++---
 test/lisp/emacs-lisp/ert-x-tests.el     | 71 +++++++++++++++++++
 test/lisp/erc/erc-scenarios-spelling.el |  7 +-
 test/lisp/simple-tests.el               | 46 ++++++-------
 6 files changed, 205 insertions(+), 37 deletions(-)

diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index f3bd60db8e4..8a2128fe851 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -1132,6 +1132,12 @@ This has the same effect as combining @code{ert-with-test-buffer} with
   (ert-with-test-buffer (:name "global" :selected t)
     @dots{}))
 @end lisp
+
+@findex ert-play-keys
+The @var{select-form} shall be set non-nil when @var{body} contains some
+call to @code{ert-play-keys} to generate programmatically user input
+events inserting text into the test buffer, or starting commands acting
+on the test buffer.
 @end defmac
 
 @defmac ert-with-buffer-selected (buffer &body body)
@@ -1154,6 +1160,13 @@ value is the last form in @var{body}.  Example:
 @end lisp
 
 This displays a temporary buffer like @file{ *temp*-739785*}.
+
+@findex ert-play-keys
+One of the use of @code{ert-with-buffer-selected} is to set the buffer
+to which user input events generated programmatically by one or more
+calls to @code{ert-play-keys} are targetted, which is needed when those
+events are supposed to insert text into this buffer, or start commands
+acting on it.
 @end defmac
 
 @subsection Protecting buffers
@@ -1348,7 +1361,14 @@ symbol and the rest are arguments to the command.  Example:
 
 @strong{Note}: Since the command is not called by
 @code{call-interactively}, a test for @code{(called-interactively-p
-'interactive)} in the command will fail.
+@var{kind})} in the command will fail for whatever @var{kind}.@*
+Function @code{ert-play-keys} may be used instead to start a command if
+you need the predicate @code{(called-interactively-p @var{kind})} tested
+within the command body to return @code{t} for @var{kind} @code{any},
+note however that it will still be @code{nil} too for @var{kind}
+@code{interactive} since @code{ert-play-keys} uses keyboard macros under
+the hood, and that @code{ert-play-keys} needs selecting the buffer of
+interest.
 @end defun
 
 @defmac ert-simulate-keys (keys &rest body)
@@ -1362,8 +1382,76 @@ vector.  Examples:
 (ert-simulate-keys (kbd "#fake C-m C-a C-k C-m") @dots{})
 (ert-simulate-keys [?b ?2 return] @dots{})
 @end lisp
+
+@c @findex ert-play-keys
+To generate input event for inserting some text into a buffer, or
+calling some interactive command, see rather function
+@code{ert-play-keys}.
 @end defmac
 
+@defun ert-play-keys (keys)
+Generate programmatically user input events.
+
+@c @findex ert-simulate-keys
+Contrary to @code{ert-simulate-keys}, these events are not intended to be
+consumed by functions reading input, like @code{read-from-minibuffer},
+but are consumed by the command loop which typically will process them
+to start interactive commands or insert text into the selected buffer.
+
+So, before calling @code{ert-play-keys} you generally need to select the
+buffer to which input events are intended to insert text or call a
+command. Do this by passing a non-nil @code{:selected} flag to
+@code{ert-with-test-buffer} if the buffer was created this way, or use
+the @code{ert-with-buffer-selected} macro.
+
+@c @findex ert-simulate-command
+Contrary to @code{ert-simulate-command}, when @code{ert-play-keys}
+generates events starting a command you cannot get the command return
+value. On the other hand, @code{(called-interactively-p 'any)} tested in
+the command body will be @code{t}, but not @code{(called-interactively-p
+'interactive)} as @code{ert-play-keys} does not a true interactive call,
+but uses a keyboard macro under the hood. Another difference is that,
+contrary to @code{ert-simulate-command}, @code{ert-play-keys} needs to
+select the buffer on which the command acts for the input events to
+reach it.
+
+In this example a test buffer is created and selected, then
+@code{ert-play-keys} sets the mark, inserts text @samp{n'importe quoi}
+and kills it, then the test checks that the killed text is in the kill
+ring and the test buffer is empty, then a second @code{ert-play-keys}
+call yanks again the killed text, and finally the test checks the test
+buffer contains @samp{n'importe quoi}:
+
+@lisp
+(ert-deftest ert-example-kill&yank ()
+  "Test kill and yank."
+  (ert-with-test-buffer (:selected t)
+    (ert-play-keys "C-SPC n'importe SPC quoi C-w")
+    (should (string= "n'importe quoi" (car kill-ring)))
+    (should (string= "" (buffer-substring (point-min) (point-max))))
+    (ert-play-keys "C-y")
+    (should (string= "n'importe quoi"
+                     (buffer-substring (point-min) (point-max))))))
+@end lisp
+
+@noindent
+Write input events as above with a string in the input format used by
+@code{key-parse}, or directly in the internal Emacs representation like
+here which is otherwise the same test as above:
+
+@lisp
+(ert-deftest ert-example-kill&yank ()
+  "Test kill and yank."
+  (ert-with-test-buffer (:selected t)
+    (ert-play-keys (vconcat [ ?\C- ] "n'importe quoi" [ ?\C-w]))
+    (should (string= "n'importe quoi" (car kill-ring)))
+    (should (string= "" (buffer-substring (point-min) (point-max))))
+    (ert-play-keys [ ?\C-y ])
+    (should (string= "n'importe quoi"
+                     (buffer-substring (point-min) (point-max))))))
+@end lisp
+@end defun
+
 @defun ert-filter-string (s &rest regexps)
 This function returns a copy of string @var{s} with all matches of
 @var{regexps} removed.  Elements of @var{regexps} may also be
diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el
index be4023c350a..0952033a6cc 100644
--- a/lisp/emacs-lisp/ert-x.el
+++ b/lisp/emacs-lisp/ert-x.el
@@ -416,6 +416,19 @@ The same keyword arguments are supported as in
         (format "/mock::%s" temporary-file-directory))))
   "Temporary directory for remote file tests.")
 
+(defun ert-play-keys (keys)
+  "Play the key sequence KEYS as if it was user input.
+
+KEYS shall have the same format as in a call to function `kmacro'.
+
+This macro should be expanded within the body of
+`ert-with-buffer-selected' to select a buffer when keys KEYS start
+commands acting on this buffer, or within the body of
+`ert-with-test-buffer' used with `:selected' flag set."
+  (funcall
+    (kmacro keys)))
+
+
 
 ;;;; Obsolete
 
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 1c2df07f137..2f3f517701b 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -3125,14 +3125,13 @@ The return value is the last form in BODY."
 
 If BUFFER-OR-NAME is nil, the current buffer is used.
 
-The buffer is made the current buffer, and the temporary window
-becomes the `selected-window', before BODY is evaluated.  The
-modification hooks `before-change-functions' and
-`after-change-functions' are not inhibited during the evaluation
-of BODY, which makes it easier to use `execute-kbd-macro' to
-simulate user interaction.  The window configuration is restored
-before returning, even if BODY exits nonlocally.  The return
-value is the last form in BODY."
+The buffer is made the current buffer, and the temporary window becomes
+the `selected-window', before BODY is evaluated.  The modification hooks
+`before-change-functions' and `after-change-functions' are not inhibited
+during the evaluation of BODY, which makes it easier to use
+`ert-play-keys' to simulate user sending input events.  The window
+configuration is restored before returning, even if BODY exits
+nonlocally.  The return value is the last form in BODY."
   (declare (debug (form body)) (indent 1))
   `(save-window-excursion
      (with-current-buffer (or ,buffer-or-name (current-buffer))
diff --git a/test/lisp/emacs-lisp/ert-x-tests.el b/test/lisp/emacs-lisp/ert-x-tests.el
index c72ab97c557..2823fdba3d7 100644
--- a/test/lisp/emacs-lisp/ert-x-tests.el
+++ b/test/lisp/emacs-lisp/ert-x-tests.el
@@ -293,6 +293,77 @@ desired effect."
   (should-error
    (ert-with-temp-directory dir :text "foo" nil)))
 
+(ert-deftest ert-x-tests-play-keys ()
+  "Test `ert-play-keys'.
+Send one symbolic event, some inserted text, and some key event to the
+test buffer, and check all of them are processed."
+  (ert-with-test-buffer (:selected t)
+    (let (verdict-event verdict-key verdict-pre-command-hook verdict-post-command-hook)
+      (let ((pre-command-hook (lambda () (setq verdict-pre-command-hook t)))
+            (post-command-hook (lambda () (setq verdict-post-command-hook t)))
+            (map (let ((map (make-sparse-keymap)))
+                    (define-key map [event]
+                                (lambda ()
+                                  (interactive)
+                                  (setq verdict-event
+                                        (list t
+                                              (called-interactively-p 'any)
+                                              (called-interactively-p 'interactive)))))
+                    (define-key map [?$]
+                                (lambda ()
+                                  (interactive)
+                                  (setq verdict-key
+                                        (list t
+                                              (called-interactively-p 'any)
+                                              (called-interactively-p 'interactive)))))
+                    map)))
+        (let ((minor-mode-map-alist (cons (cons t map) minor-mode-map-alist)))
+	  (ert-play-keys (vconcat [event] "n'importe $quoi"))))
+      (should (equal verdict-event '(t  t nil)))
+      (should (equal verdict-key '(t  t nil)))
+      (should (eq verdict-pre-command-hook t))
+      (should (eq verdict-post-command-hook t)))
+    (should (string= "n'importe quoi"
+		     (buffer-substring (point-min) (point-max))))))
+
+(ert-deftest ert-x-tests-simulate-command ()
+  "Test `ert-simulate-command'."
+  (ert-with-test-buffer ()
+    (let (verdict-interactive verdict-pre-command-hook verdict-post-command-hook)
+      (let ((pre-command-hook (lambda () (setq verdict-pre-command-hook t)))
+            (post-command-hook (lambda () (setq verdict-post-command-hook t))))
+        (should (eq (ert-simulate-command
+                     (list
+                      (lambda (x)
+                        (interactive (list "un rien"))
+                        (insert x)
+                        (setq verdict-interactive (list t
+                                                        (called-interactively-p 'any)
+                                                        (called-interactively-p 'interactive)))
+                        :ok)
+                      "n'importe quoi"))
+                    :ok)))
+      (should (equal verdict-interactive '(t nil nil)))
+      (should (eq verdict-pre-command-hook t))
+      (should (eq verdict-post-command-hook t)))
+    (should (string= "n'importe quoi"
+		     (buffer-substring (point-min) (point-max))))))
+
+(ert-deftest ert-x-tests-simulate-keys ()
+  "Test `ert-simulate-keys'."
+  (ert-with-test-buffer ()
+    (let* ((map (let ((map (make-sparse-keymap)))
+                  (define-key map [?b]
+                              (lambda ()
+                                (interactive)
+                                (insert "r"))) map))
+           (minor-mode-map-alist (cons (cons t map) minor-mode-map-alist)))
+      (ert-simulate-keys
+       (listify-key-sequence "un bien\nn'importe quoi")
+       (should (string= (read-from-minibuffer "Please enter something: ") "un rien")))
+      (should (string= "" (buffer-substring (point-min) (point-max)))))))
+
+
 (provide 'ert-x-tests)
 
 ;;; ert-x-tests.el ends here
diff --git a/test/lisp/erc/erc-scenarios-spelling.el b/test/lisp/erc/erc-scenarios-spelling.el
index 0495a2a1390..74e6dbb9715 100644
--- a/test/lisp/erc/erc-scenarios-spelling.el
+++ b/test/lisp/erc/erc-scenarios-spelling.el
@@ -61,14 +61,13 @@
           (should erc-spelling-mode)
           (should flyspell-mode)))
 
-      (with-current-buffer (erc-d-t-wait-for 10 (get-buffer "#chan"))
+      (ert-with-buffer-selected (erc-d-t-wait-for 10 (get-buffer "#chan"))
         (should erc-spelling-mode)
         (should flyspell-mode)
         (funcall expect 10 "<alice> tester, welcome!")
 
         ;; Insert a command with one misspelled word.
-        (set-window-buffer nil (current-buffer))
-        (execute-kbd-macro "\M->/AMSG an/dor /gmsg one fsbot two frob my shoe")
+        (ert-play-keys (vconcat [?\M->] "/AMSG an/dor /gmsg one fsbot two frob my shoe"))
         (funcall expect 10 "shoe")
 
         (let* ((ovs (overlays-in erc-input-marker (point)))
@@ -90,7 +89,7 @@
 
           ;; Depending on the machine, this should become something
           ;; like: "/AMSG an/dor /gmsg one fsbot two Rob my shoe".
-          (execute-kbd-macro (key-parse "M-TAB"))
+          (ert-play-keys "M-TAB")
           (should (equal (overlays-in erc-input-marker (point-max))
                          (list ov1)))))
 
diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el
index 12697b2d68e..464cc51c152 100644
--- a/test/lisp/simple-tests.el
+++ b/test/lisp/simple-tests.el
@@ -21,7 +21,7 @@
 
 ;;; Code:
 
-(require 'ert)
+(require 'ert-x)
 (eval-when-compile (require 'cl-lib))
 
 (defun simple-test--buffer-substrings ()
@@ -730,36 +730,34 @@ See bug#35036."
 ;; Test for a regression introduced by undo-auto--boundaries changes.
 ;; https://lists.gnu.org/r/emacs-devel/2015-11/msg01652.html
 (defun undo-test-kill-c-a-then-undo ()
-  (with-temp-buffer
-    (switch-to-buffer (current-buffer))
-    (setq buffer-undo-list nil)
-    (insert "a\nb\nc\n")
-    (goto-char (point-max))
-    ;; We use a keyboard macro because it adds undo events in the same
-    ;; way as if a user were involved.
-    (funcall (kmacro [left
-                      ;; Delete "c"
-                      backspace
-                      left left left
-                      ;; Delete "a"
-                      backspace
-                      ;; C-/ or undo
-                      ?\C-/
-                      ]))
+  (ert-with-test-buffer (:selected t)
+     (setq buffer-undo-list nil)
+     (insert "a\nb\nc\n")
+     (goto-char (point-max))
+     ;; We use a keyboard macro because it adds undo events in the same
+     ;; way as if a user were involved.
+     (ert-play-keys [left
+                     ;; Delete "c"
+                     backspace
+                     left left left
+                     ;; Delete "a"
+                     backspace
+                     ;; C-/ or undo
+                     ?\C-/
+                     ])
     (point)))
 
 (defun undo-test-point-after-forward-kill ()
-  (with-temp-buffer
-    (switch-to-buffer (current-buffer))
+  (ert-with-test-buffer (:selected t)
     (setq buffer-undo-list nil)
     (insert "kill word forward")
     ;; Move to word "word".
     (goto-char 6)
-    (funcall (kmacro [;; kill-word
-                      C-delete
-                      ;; undo
-                      ?\C-/
-                      ]))
+    (ert-play-keys [;; kill-word
+                    C-delete
+                    ;; undo
+                    ?\C-/
+                    ])
     (point)))
 
 (ert-deftest undo-point-in-wrong-place ()

From ed98d9f81fa0b7e4a77654bb76951e348da8319f Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 16 Apr 2026 14:50:28 +0200
Subject: [PATCH 119/463] ; * doc/misc/ert.texi: Fix typos.

---
 doc/misc/ert.texi | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index 8a2128fe851..8329c202d3f 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -1123,7 +1123,7 @@ result of @var{NAME-FORM}.  Example:
 This uses the test buffer @file{*Test buffer
 (backtrace-tests--variables): variables*}.
 
-If @var{select-form} is non-nil, select the buffer after creating it.
+If @var{select-form} is non-@code{nil}, select the buffer after creating it.
 This has the same effect as combining @code{ert-with-test-buffer} with
 @code{ert-with-buffer-selected}.  Example:
 
@@ -1134,7 +1134,7 @@ This has the same effect as combining @code{ert-with-test-buffer} with
 @end lisp
 
 @findex ert-play-keys
-The @var{select-form} shall be set non-nil when @var{body} contains some
+The @var{select-form} shall be set non-@code{nil} when @var{body} contains some
 call to @code{ert-play-keys} to generate programmatically user input
 events inserting text into the test buffer, or starting commands acting
 on the test buffer.
@@ -1161,7 +1161,7 @@ value is the last form in @var{body}.  Example:
 
 This displays a temporary buffer like @file{ *temp*-739785*}.
 
-@findex ert-play-keys
+@c @findex ert-play-keys
 One of the use of @code{ert-with-buffer-selected} is to set the buffer
 to which user input events generated programmatically by one or more
 calls to @code{ert-play-keys} are targetted, which is needed when those
@@ -1270,21 +1270,21 @@ The following keyword arguments are supported:
 @table @code
 @vindex ert-temp-file-prefix
 @item :prefix @var{string}
-If non-nil, pass @var{string} to @code{make-temp-file} as
+If non-@code{nil}, pass @var{string} to @code{make-temp-file} as
 the @var{prefix} argument.  Otherwise, use the value of
 @code{ert-temp-file-prefix}.
 
 @vindex ert-temp-file-suffix
 @item :suffix @var{string}
-If non-nil, pass @var{string} to @code{make-temp-file} as the
+If non-@code{nil}, pass @var{string} to @code{make-temp-file} as the
 @var{suffix} argument.  Otherwise, use the value of
 @code{ert-temp-file-suffix}; if the value of that variable is nil,
 generate a suffix based on the name of the file that
 @code{ert-with-temp-file} is called from.
 
 @item :text @var{string}
-If non-nil, pass @var{string} to @code{make-temp-file} as the @var{text}
-argument.
+If non-@code{nil}, pass @var{string} to @code{make-temp-file} as the
+@var{text} argument.
 
 @item :buffer @var{symbol}
 Open the temporary file using @code{find-file-noselect} and bind
@@ -1292,7 +1292,7 @@ Open the temporary file using @code{find-file-noselect} and bind
 normally or non-locally.
 
 @item :coding @var{coding}
-If non-nil, bind @code{coding-system-for-write} to @var{coding} when
+If non-@code{nil}, bind @code{coding-system-for-write} to @var{coding} when
 executing @var{body}.  This is handy when @var{string} includes
 non-ASCII characters or the temporary file must have a specific encoding
 or end-of-line format.
@@ -1400,7 +1400,7 @@ to start interactive commands or insert text into the selected buffer.
 
 So, before calling @code{ert-play-keys} you generally need to select the
 buffer to which input events are intended to insert text or call a
-command. Do this by passing a non-nil @code{:selected} flag to
+command. Do this by passing a non-@code{nil} @code{:selected} flag to
 @code{ert-with-test-buffer} if the buffer was created this way, or use
 the @code{ert-with-buffer-selected} macro.
 

From ae822de38d2e02c32b1be844fa8be2a5f8d1b21f Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 16 Apr 2026 09:22:00 -0400
Subject: [PATCH 120/463] ; newcomers-presets: FIXME.

---
 etc/themes/newcomers-presets-theme.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/etc/themes/newcomers-presets-theme.el b/etc/themes/newcomers-presets-theme.el
index 12205a4ee8e..2c69f26da4c 100644
--- a/etc/themes/newcomers-presets-theme.el
+++ b/etc/themes/newcomers-presets-theme.el
@@ -163,6 +163,8 @@ This minor mode will enable and disable the theme on startup."
 ;;;; Frame- and window-related options
  '(frame-inhibit-implied-resize t)
  '(tab-bar-history-mode t)
+ ;; FIXME: If you toggle off the theme, without having run any
+ ;; tab-related commands, the tab bar remains visible.
  '(tab-bar-show 0)
 
 ;;;; Programming-related options

From 3d822669eee7f6e685368b8a298b6f0924f382da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20Bela=C3=AFche?= <vincentb1@users.sourceforge.net>
Date: Thu, 16 Apr 2026 17:09:04 +0200
Subject: [PATCH 121/463] Announce ert-play-keys in etc/NEWS.

---
 etc/NEWS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/etc/NEWS b/etc/NEWS
index 3c02002d0ff..48800c9974f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -82,6 +82,12 @@ Info node "(emacs) User Lisp Directory" for more details.
 
 * Changes in Emacs 31.1
 
++++
+** ERT has a new 'ert-play-keys' function
+Previously, ert-simulate-keys could be use for sending keys to input
+functions such as read-from-minibuffer, but not for other interactive
+input such as starting key-mapped commands.
+
 +++
 ** 'line-spacing' now supports specifying spacing above the line.
 Previously, only spacing below the line could be specified.  The user

From 1811ce52c29b6119d71942f4186c2330f60247a0 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 16 Apr 2026 17:31:07 +0200
Subject: [PATCH 122/463] ; * etc/NEWS: Presentational fixes and improvements.

---
 etc/NEWS | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 48800c9974f..a6abd23b4ac 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -82,12 +82,6 @@ Info node "(emacs) User Lisp Directory" for more details.
 
 * Changes in Emacs 31.1
 
-+++
-** ERT has a new 'ert-play-keys' function
-Previously, ert-simulate-keys could be use for sending keys to input
-functions such as read-from-minibuffer, but not for other interactive
-input such as starting key-mapped commands.
-
 +++
 ** 'line-spacing' now supports specifying spacing above the line.
 Previously, only spacing below the line could be specified.  The user
@@ -1371,7 +1365,7 @@ set to 'margin' or nil.
 hide the innermost block to which the current line belongs instead of
 the block after cursor position.
 
-To restore the old behavior set the new user option
+To restore the old behavior, set the new user option
 'hs-hide-block-behavior' to 'after-cursor'.
 
 +++
@@ -1778,7 +1772,7 @@ used to customize the appearance.
 ---
 *** New user option 'whitespace-global-mode-buffers'.
 Normally, 'global-whitespace-mode' skips special buffers whose name
-starts with an asterisk '*'.  This user option provides an override: it
+starts with an asterisk "*".  This user option provides an override: it
 contains a list of regular expressions used to match the names of
 special buffers in which 'global-whitespace-mode' should turn on.  The
 default value preserves the existing exception for the "*scratch*"
@@ -3236,7 +3230,7 @@ minor mode 'global-xref-mouse-mode' will enable this in all buffers.
 
 +++
 *** New command 'xref-change-to-xref-edit-mode'.
-It's bound to "e" and it switches an Xref buffer into an "editable" mode
+It is bound to 'e' and it switches an Xref buffer into an "editable" mode
 like similar features in Occur and Grep buffers.
 
 ** Revert
@@ -3910,7 +3904,7 @@ all versions, sleep events require Windows 8 or later).
 
 +++
 ** 'makunbound' on a variable alias undoes the alias.
-Previously it had the effect of applying the 'makunbound' on the
+Previously, it had the effect of applying the 'makunbound' on the
 target of the alias (which can fail on some builtin variables).
 
 ---
@@ -4186,14 +4180,14 @@ change it globally with:
 
 ---
 ** New function 'set-local'.
-This is the buffer local equivalent of the function 'set'.
+This is the buffer-local equivalent of the function 'set'.
 
 +++
 ** New macro 'setopt-local'.
-This is the buffer local version of 'setopt' for user options rather
+This is the buffer-local version of 'setopt' for user options rather
 than plain variables and uses 'custom-set'/'set-local' to set variable
 values.  A new argument, BUFFER-LOCAL, is passed to 'custom-set'
-functions to indicate the buffer local context.
+functions to indicate the buffer-local context.
 
 +++
 ** New macros 'incf' and 'decf'.
@@ -4247,6 +4241,12 @@ The following macros, previously only available in the experimental
 
 See "(ert) Helper Functions" node in the ERT manual for more information.
 
++++
+*** New function 'ert-play-keys'.
+Previously, 'ert-simulate-keys' could be used for sending keys to input
+functions such as 'read-from-minibuffer', but not for other interactive
+input such as starting key-mapped commands.
+
 ** Time & Date
 
 +++
@@ -4533,12 +4533,12 @@ singleton list.
 ** Support macOS Accessibility Zoom focus tracking.
 This is an important change for visually-impaired users.  If macOS
 Accessibility Zoom is enabled via (System Settings, Accessibility,
-Zoom...)  with keyboard focus tracking (Advanced...), Zoom is informed
+Zoom...) with keyboard focus tracking (Advanced...), Zoom is informed
 of updated cursor positions during each redisplay cycle.
 
 ---
 ** New macOS function 'ns-process-is-accessibility-trusted'.
-This function returns t if the macOS Accessibility Framework trusts the
+This function returns t if the macOS Accessibility Framework trusts
 Emacs.  This is a necessary condition for Accessibility Zoom and other
 accessibility features.  Enable Emacs via (System Settings, Privacy &
 Security, Accessibility...) and add the Emacs.app installed directory to
@@ -4655,12 +4655,13 @@ Binutils 2.26.
 Previously, terminal sessions on Windows supported display of 16 colors.
 There is now support for 8-bit (256 color) and 24-bit RGB (true color).
 The new mechanism will be enabled automatically when supported.
-It defaults to 24-bit RGB color, but can be set to 8, 16, '8bit, or '24bit
-by passing the '--color' flag or setting the 'tty-color-mode' frame parameter.
-Use of the new mechanism is controlled by an internal variable that can be
-set and inspected via the functions 'w32-use-virtual-terminal' and
-'w32-use-virtual-terminal-p' (respectively).  See the manual entry specific
-to MS-Windows for more details.
+It defaults to 24-bit RGB color, but can be set to 8, 16, '8bit', or
+'24bit' by passing the '--color' flag or setting the 'tty-color-mode'
+frame parameter.  Use of the new mechanism is controlled by an internal
+variable that can be set and inspected via the functions
+'w32-use-virtual-terminal' and 'w32-use-virtual-terminal-p'
+(respectively).  See the manual entry "(emacs) Windows Misc" for more
+details.
 
 
 ----------------------------------------------------------------------

From 126eab79b08bcb88c27fc9fef32012584d54541b Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 16 Apr 2026 11:34:56 -0400
Subject: [PATCH 123/463] src/syntax.c (update_syntax_table): Remove redundant
 assignment

---
 src/syntax.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/syntax.c b/src/syntax.c
index 04b48e91529..7649abb1aa0 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -346,7 +346,6 @@ update_syntax_table (ptrdiff_t charpos, EMACS_INT count,
 	  gl_state.e_property = gl_state.stop;
 	  return;
 	}
-      i = gl_state.forward_i;
       gl_state.b_property = i->position;
       gl_state.e_property = INTERVAL_LAST_POS (i);
     }

From d88e73d047367bc76e4ecec7fdd00c70d7d4ea13 Mon Sep 17 00:00:00 2001
From: Juri Linkov <juri@linkov.net>
Date: Thu, 16 Apr 2026 20:12:03 +0300
Subject: [PATCH 124/463] Update 'crm-complete-and-exit' from
 'minibuffer-complete-and-exit'

* lisp/emacs-lisp/crm.el (crm-complete-and-exit):
Add new arg 'no-exit'.  Call 'minibuffer-choose-completion'
when 'completion--selected-candidate' returns non-nil (bug#80821).
---
 lisp/emacs-lisp/crm.el | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el
index a1c7175fc66..39a01490365 100644
--- a/lisp/emacs-lisp/crm.el
+++ b/lisp/emacs-lisp/crm.el
@@ -192,14 +192,21 @@ Like `minibuffer-complete-word' but for `completing-read-multiple'."
   (crm--completion-command beg end
     (completion-in-region--single-word beg end)))
 
-(defun crm-complete-and-exit ()
+(defun crm-complete-and-exit (&optional no-exit)
   "If all of the minibuffer elements are valid completions then exit.
 All elements in the minibuffer must match.  If there is a mismatch, move point
 to the location of mismatch and do not exit.
 
+If a completion candidate is selected in the *Completions* buffer, it
+will be inserted in the minibuffer first.  If NO-EXIT is non-nil, don't
+actually exit the minibuffer, just insert the selected completion if
+any.
+
 This function is modeled after `minibuffer-complete-and-exit'."
-  (interactive)
-  (let ((doexit t))
+  (interactive "P")
+  (when (completion--selected-candidate)
+    (minibuffer-choose-completion t t))
+  (let ((doexit (not no-exit)))
     (goto-char (minibuffer-prompt-end))
     (while
         (and doexit

From ce06e8cdef410e008636819125b1d1d3181db996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Thu, 16 Apr 2026 18:17:38 +0100
Subject: [PATCH 125/463] Eglot: adjust previous change to eglot-uri-to-path

* lisp/progmodes/eglot.el (eglot-uri-to-path): Tweak.
---
 lisp/progmodes/eglot.el | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index c357e23ad12..554e02167f0 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -1240,7 +1240,7 @@ object."
   (let* ((server (eglot-current-server))
          (remote-prefix (and server (eglot--trampish-p server)))
          (root (and server (project-root (eglot--project server))))
-         (trueroot (and root (eglot--trueroot server)))
+         (trueroot (and server (eglot--trueroot server)))
          (url (url-generic-parse-url uri)))
     ;; Only parse file:// URIs, leave other URI untouched as
     ;; `file-name-handler-alist' should know how to handle them
@@ -1248,19 +1248,22 @@ object."
     (if (string= "file" (url-type url))
         (let* ((unhexed (url-unhex-string (url-filename url)))
                ;; Remove the leading "/" for local MS Windows-style paths.
-               (normalized (if (and (not remote-prefix)
+               (norm (if (and (not remote-prefix)
                                     (eq system-type 'windows-nt)
                                     (cl-plusp (length unhexed))
                                     (eq (aref unhexed 0) ?/))
                                (w32-long-file-name (substring unhexed 1))
                              unhexed))
-               ;; Make sure the final path is relative to project's root
-               ;; (found when the user `M-x eglot''ed), not trueroot.
-               (normalized (if trueroot
-                               (replace-regexp-in-string (concat "^" trueroot) root
-                                                         normalized)
-                             normalized)))
-          (concat remote-prefix normalized))
+               ;; Even though we exchange truename URIs with the server,
+               ;; ensure paths exchanged with Emacs facilities such as
+               ;; Xref contains the familiar root as found by
+               ;; 'project-current', not a potentially obscure
+               ;; canonicalized truename.
+               (norm
+                (if (and trueroot (string-prefix-p trueroot norm))
+                    (expand-file-name (substring norm (length trueroot)) root)
+                  norm)))
+          (concat remote-prefix norm))
       uri)))
 
 (cl-defun eglot-path-to-uri (path &key truenamep)

From f146bfe3e716de0b98a41016926b281f1513d0d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Thu, 16 Apr 2026 18:46:39 +0100
Subject: [PATCH 126/463] Jsonrpc: simplify previous change

* lisp/jsonrpc.el (jsonrpc--save-excursion-maybe): Delete.
(jsonrpc--forwarding-buffer, jsonrpc--log-event): Use simple
save-excursion.
---
 lisp/jsonrpc.el | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el
index 4e4f914c998..77010b76ab5 100644
--- a/lisp/jsonrpc.el
+++ b/lisp/jsonrpc.el
@@ -1053,15 +1053,6 @@ TIMEOUT is nil)."
                                              fn oops)
                            (remove-hook 'jsonrpc-event-hook fn)))))))
 
-(defmacro jsonrpc--save-excursion-maybe (&rest body)
-  "Run BODY, preserving point unless it was at `point-max'.
-If point is already at end of buffer, allow it to follow any
-text inserted there.  Otherwise, restore it afterwards."
-  (declare (indent 0))
-  `(if (= (point) (point-max))
-       (progn ,@body)
-     (save-excursion ,@body)))
-
 (defun jsonrpc--limit-buffer-size (max-size)
   "Limit the current buffer to MAX-SIZE by eating lines at the beginning.
 Do nothing if MAX-SIZE is nil."
@@ -1150,7 +1141,7 @@ of the API instead.")
           ;; slightly to play nice with verbose servers' stderr.
           (when error
             (setq msg (propertize msg 'face 'error)))
-          (jsonrpc--save-excursion-maybe
+          (save-excursion
             (goto-char (point-max))
             (insert-before-markers msg))
           (jsonrpc--limit-buffer-size max))))))
@@ -1178,7 +1169,7 @@ PREFIX to CONN's events buffer."
                                   (line-end-position 0))
                       do (with-current-buffer (jsonrpc-events-buffer conn)
                            (let ((inhibit-read-only t))
-                             (jsonrpc--save-excursion-maybe
+                             (save-excursion
                                (goto-char (point-max))
                                (insert-before-markers
                                 (propertize (format "%s %s\n" prefix line)

From 792fef0583e225cde390c4a63984dbabd6cc2011 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 16 Apr 2026 14:36:45 -0400
Subject: [PATCH 127/463] vc-rename-file: Fix skipping calling into the backend

* lisp/vc/vc.el (vc-rename-file): Replace broken attempted use
of vc-dir-status-files with walking OLD using vc-file-tree-walk.
* test/lisp/vc/vc-tests/vc-tests.el (vc-test--rename-directory):
Assert that the files are registered or not as appropriate.  New
test case in which there are only registered files.
---
 lisp/vc/vc.el                     | 10 ++++++----
 test/lisp/vc/vc-tests/vc-tests.el | 23 +++++++++++++++++++++--
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 3cae49c0b60..344e1c012ac 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -5080,11 +5080,13 @@ called from Lisp with optional argument OK-IF-ALREADY-EXISTS non-nil."
                      (vc-backend old))))
       ;; The rename commands for several VCS (at least Bzr, Git and
       ;; Mercurial) will fail if asked to move a directory containing
-      ;; only untracked files.
+      ;; only untracked files.  So skip calling into the backend if OLD
+      ;; is a directory and we walk through the entirety of it without
+      ;; finding any VC-managed files.
       (unless (and dirp
-                   (all (lambda (x)
-                          (memq (cadr x) '(ignored unregistered)))
-                        (vc-dir-status-files old (list old) backend)))
+                   (catch 'done
+                     (vc-file-tree-walk old (lambda (_) (throw 'done nil)))
+                     t))
         (vc-call-backend backend 'rename-file old new)))
     (vc-file-clearprops old)
     (vc-file-clearprops new)
diff --git a/test/lisp/vc/vc-tests/vc-tests.el b/test/lisp/vc/vc-tests/vc-tests.el
index ca3b62ee9e8..732ef12fbdc 100644
--- a/test/lisp/vc/vc-tests/vc-tests.el
+++ b/test/lisp/vc/vc-tests/vc-tests.el
@@ -671,7 +671,9 @@ This checks also `vc-backend' and `vc-responsible-backend'."
               (should-not (file-exists-p tmp-name1))
               (should-not (file-exists-p tmp-name2))
               (should (file-exists-p new-name1))
-              (should (file-exists-p new-name2)))
+              (should (vc-registered new-name1))
+              (should (file-exists-p new-name2))
+              (should-not (vc-registered new-name2)))
 
             ;; Test only unregistered files.
             (let* ((tmp-dir (expand-file-name "dir3/" default-directory))
@@ -684,9 +686,26 @@ This checks also `vc-backend' and `vc-responsible-backend'."
               (vc-rename-file (directory-file-name tmp-dir)
                               (directory-file-name new-dir))
               (should-not (file-exists-p tmp-name))
+              (should (file-exists-p new-name))
+              (should-not (vc-registered new-name)))
+
+            ;; Test only registered files.
+
+            (let* ((tmp-dir (expand-file-name "dir5/" default-directory))
+                   (tmp-name (expand-file-name "foo" tmp-dir))
+                   (new-dir (expand-file-name "dir6/" default-directory))
+                   (new-name (expand-file-name "foo" new-dir)))
+              (make-directory tmp-dir)
+              (write-region "foo" nil tmp-name nil 'nomessage)
+              (vc-register `(,backend
+                             (,(file-relative-name tmp-name
+                                                   default-directory))))
+
+              (vc-rename-file (directory-file-name tmp-dir)
+                              (directory-file-name new-dir))
               (should-not (file-exists-p tmp-name))
               (should (file-exists-p new-name))
-              (should (file-exists-p new-name))))
+              (should (vc-registered new-name))))
 
         ;; Save exit.
         (ignore-errors

From 75fd5269809c5092781531379e7ca47673811080 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 16 Apr 2026 16:08:36 -0400
Subject: [PATCH 128/463] ; Fix last change.

---
 lisp/vc/vc.el | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 344e1c012ac..f25067f3660 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -5075,19 +5075,19 @@ called from Lisp with optional argument OK-IF-ALREADY-EXISTS non-nil."
         (unless (memq state '(up-to-date edited added))
           (error "Please %s files before moving them"
 	         (if (stringp state) "check in" "update")))))
-    (let ((backend (if dirp
-                       (vc-responsible-backend old)
-                     (vc-backend old))))
-      ;; The rename commands for several VCS (at least Bzr, Git and
-      ;; Mercurial) will fail if asked to move a directory containing
-      ;; only untracked files.  So skip calling into the backend if OLD
-      ;; is a directory and we walk through the entirety of it without
-      ;; finding any VC-managed files.
-      (unless (and dirp
-                   (catch 'done
-                     (vc-file-tree-walk old (lambda (_) (throw 'done nil)))
-                     t))
-        (vc-call-backend backend 'rename-file old new)))
+    ;; The rename commands for several VCS (at least Bzr, Git and
+    ;; Mercurial) will fail if asked to move a directory containing
+    ;; only untracked files.  So skip calling into the backend if OLD
+    ;; is a directory and we walk through the entirety of it without
+    ;; finding any VC-managed files.
+    (unless (and dirp
+                 (catch 'done
+                   (vc-file-tree-walk old (lambda (_) (throw 'done nil)))
+                   t))
+      (vc-call-backend  (if dirp
+                            (vc-responsible-backend old)
+                          (vc-backend old))
+                        'rename-file old new))
     (vc-file-clearprops old)
     (vc-file-clearprops new)
     ;; Move the actual file (unless the backend did it already)

From c93a6bd5d8256cb70f9b4bcf92c7c1634c1ca67a Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 16 Apr 2026 16:10:02 -0400
Subject: [PATCH 129/463] ; Fix formatting.

---
 lisp/vc/vc.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index f25067f3660..c41b06a1dcd 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -5084,10 +5084,10 @@ called from Lisp with optional argument OK-IF-ALREADY-EXISTS non-nil."
                  (catch 'done
                    (vc-file-tree-walk old (lambda (_) (throw 'done nil)))
                    t))
-      (vc-call-backend  (if dirp
-                            (vc-responsible-backend old)
-                          (vc-backend old))
-                        'rename-file old new))
+      (vc-call-backend (if dirp
+                           (vc-responsible-backend old)
+                         (vc-backend old))
+                       'rename-file old new))
     (vc-file-clearprops old)
     (vc-file-clearprops new)
     ;; Move the actual file (unless the backend did it already)

From 2259c116aed040f1f7d506d72a407f258d71263d Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 16 Apr 2026 16:49:56 -0400
Subject: [PATCH 130/463] vc-file-tree-walk-internal: Use vc-registered

* lisp/vc/vc.el (vc-file-tree-walk-internal): Use vc-registered
not vc-backend, for robustness.
---
 lisp/vc/vc.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index c41b06a1dcd..176620b1aba 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -6062,7 +6062,7 @@ Invoke FUNC f ARGS on each VC-managed file f underneath it."
 
 (defun vc-file-tree-walk-internal (file func args)
   (if (not (file-directory-p file))
-      (when (vc-backend file) (apply func file args))
+      (when (vc-registered file) (apply func file args))
     (message "Traversing directory %s..." (abbreviate-file-name file))
     (let ((dir (file-name-as-directory file)))
       (mapcar

From f6bb77270f01b10931782152a02253f55626bf62 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 16 Apr 2026 16:50:32 -0400
Subject: [PATCH 131/463] vc-file-tree-walk: Stop emitting messages

* lisp/vc/vc.el (vc-file-tree-walk, vc-file-tree-walk-internal):
Stop emitting messages about traversing directories.
---
 lisp/vc/vc.el | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 176620b1aba..54ab49a9032 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -6057,13 +6057,11 @@ except that this command works only in file-visiting buffers."
 (defun vc-file-tree-walk (dirname func &rest args)
   "Walk recursively through DIRNAME.
 Invoke FUNC f ARGS on each VC-managed file f underneath it."
-  (vc-file-tree-walk-internal (expand-file-name dirname) func args)
-  (message "Traversing directory %s...done" dirname))
+  (vc-file-tree-walk-internal (expand-file-name dirname) func args))
 
 (defun vc-file-tree-walk-internal (file func args)
   (if (not (file-directory-p file))
       (when (vc-registered file) (apply func file args))
-    (message "Traversing directory %s..." (abbreviate-file-name file))
     (let ((dir (file-name-as-directory file)))
       (mapcar
        (lambda (f) (or

From cbbe2b5f55e26a86a94cd47f1881320ef01d5b39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Fri, 17 Apr 2026 00:18:31 +0100
Subject: [PATCH 132/463] Eglot: add M-x eglot-describe-connection

Also add more bindings to M-x eglot-list-connections

* lisp/progmodes/eglot.el (eglot-list-connections-mode-map): Add
bindings for e, w, RET.
(eglot-events-buffer-of-listed-connection)
(eglot-show-workspace-configuration-of-listed-connection)
(eglot-describe-listed-connection): New commands.
(eglot-describe-connection): New command.

* doc/misc/eglot.texi: Document new keys and eglot-describe-connection.

* etc/EGLOT-NEWS: Announce.
---
 doc/misc/eglot.texi     |  11 +++-
 etc/EGLOT-NEWS          |  12 +++-
 lisp/progmodes/eglot.el | 129 ++++++++++++++++++++++++++++++++++++++--
 3 files changed, 144 insertions(+), 8 deletions(-)

diff --git a/doc/misc/eglot.texi b/doc/misc/eglot.texi
index e6ca177c726..0b6be34c41f 100644
--- a/doc/misc/eglot.texi
+++ b/doc/misc/eglot.texi
@@ -713,12 +713,19 @@ Emacs session.  As with @code{eglot-shutdown}, invoking this command
 with a prefix argument avoids killing the buffers used for
 communications with the language servers.
 
+@item M-x eglot-describe-connection
+This command pops up a detailed description buffer for the current
+connection, outlining aspects such as the LSP server name and version,
+the project name and root path, among others.
+
 @item M-x eglot-list-connections
 This command pops up a buffer listing all active Eglot connections,
 showing aspects such as the server name, project, number of managed
 buffers, major modes, and the server invocation.  In this buffer,
-@kbd{k} shuts down the server on the current line and @kbd{r}
-reconnects to it.
+@kbd{k} shuts down the server on the current line, @kbd{r} reconnects
+to it, @kbd{e} visits its events buffer, @kbd{w} shows its workspace
+configuration, and @kbd{RET} describes the connection with
+@code{eglot-describe-connection}.
 
 @item M-x eglot-rename
 This command renames the program symbol (a.k.a.@: @dfn{identifier}) at
diff --git a/etc/EGLOT-NEWS b/etc/EGLOT-NEWS
index cdbe4cc2c22..4e01f32cecd 100644
--- a/etc/EGLOT-NEWS
+++ b/etc/EGLOT-NEWS
@@ -20,9 +20,17 @@ https://github.com/joaotavora/eglot/issues/1234.
 
 * Changes to upcoming Eglot
 
-** New commands for the 'M-x eglot-list-connections' major mode
+** New command 'M-x eglot-describe-connection'
 
-'k' shuts down and 'r' reconnects the server on the current line.
+Pops up a detailed description buffer for the current connection,
+outlining aspects such as the LSP server name and version, the project
+name and root path, among others.
+
+** Improvements to 'M-x eglot-list-connections'
+
+New key bindings: 'k' shuts down, 'r' reconnects, 'e' visits the events
+buffer, 'w' shows workspace configuration, and 'RET' invokes
+'eglot-describe-connection'.
 
 
 * Changes in Eglot 1.23 (2/4/2026)
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 554e02167f0..ba5c7089c77 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -4943,8 +4943,11 @@ If NOERROR, return predicate, else erroring function."
 
 (defvar eglot-list-connections-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key map "k" #'eglot-shutdown-listed-connection)
-    (define-key map "r" #'eglot-reconnect-listed-connection)
+    (define-key map "k"           #'eglot-shutdown-listed-connection)
+    (define-key map "r"           #'eglot-reconnect-listed-connection)
+    (define-key map "e"           #'eglot-events-buffer-of-listed-connection)
+    (define-key map "w"           #'eglot-show-workspace-configuration-of-listed-connection)
+    (define-key map (kbd "RET")   #'eglot-describe-listed-connection)
     map)
   "Keymap for `eglot-list-connections-mode'.")
 
@@ -5002,6 +5005,120 @@ If NOERROR, return predicate, else erroring function."
 (eglot--list-connections-cmd eglot-reconnect-listed-connection s
   "Reconnect Eglot server on current line" (eglot-reconnect s))
 
+(eglot--list-connections-cmd eglot-events-buffer-of-listed-connection s
+  "Show events buffer for Eglot server on current line"
+  (eglot-events-buffer s))
+
+(eglot--list-connections-cmd eglot-show-workspace-configuration-of-listed-connection s
+  "Show workspace configuration for Eglot server on current line"
+  (save-current-buffer (eglot-show-workspace-configuration s)))
+
+(eglot--list-connections-cmd eglot-describe-listed-connection server
+  "Describe Eglot server on current line in detail"
+  (eglot-describe-connection server))
+
+(cl-defun eglot-describe-connection
+    (server &aux
+            (info    (eglot--server-info server))
+            (project (eglot--project server))
+            (root    (project-root project))
+            (managed (eglot--managed-buffers server))
+            (caps    (eglot--capabilities server))
+            (watches (eglot--file-watches server))
+            (wsconf  (eglot--workspace-configuration-plist server))
+            (sname (or (plist-get info :name) (jsonrpc-name server))))
+  "Describe SERVER in a dedicated buffer."
+  (interactive (list (eglot--current-server-or-lose)))
+  (with-current-buffer
+      (get-buffer-create (format "*EGLOT connection (%s/%s)*"
+                                 (eglot-project-nickname server) sname))
+    (let ((inhibit-read-only t))
+      (erase-buffer)
+      (special-mode)
+      (setq-local revert-buffer-function
+                  (lambda (&rest _)
+                    (eglot-describe-connection server)))
+      (cl-flet ((heading (str &optional first)
+                  (unless first (insert "\n"))
+                  (insert (propertize str 'face 'bold) "\n")))
+        (heading "Server" t)
+        (insert (format "  Name:    %s\n" sname))
+        (insert (format "  Version: %s\n" (plist-get info :version)))
+
+        (heading "Project")
+        (insert (format "  Nickname:  %s\n" (eglot-project-nickname server)))
+        (insert (format "  Root:      %s\n" root))
+        (let ((expanded (expand-file-name root))
+              (trueroot (eglot--trueroot server)))
+          (unless (string= root expanded)
+            (insert (format "  Expanded:  %s\n" expanded)))
+          (unless (string= expanded trueroot)
+            (insert (format "  Canonical: %s\n" trueroot))))
+        (insert (format "  As lisp:   %s\n" project))
+
+        (heading "Major modes")
+        (insert "  "
+                (mapconcat #'symbol-name (eglot--major-modes server) ", ")
+                "\n")
+
+        (heading (format "Managed buffers (%d)" (length managed)))
+        (dolist (buf managed)
+          (if (buffer-live-p buf)
+              (let ((name (or (buffer-file-name buf) (buffer-name buf))))
+                (insert "  ")
+                (insert-text-button name
+                                    'action (lambda (_) (pop-to-buffer buf))
+                                    'follow-link t)
+                (insert "\n"))
+            (insert "  (dead buffer)\n")))
+
+        (heading "Capabilities")
+        (cl-loop
+         with enabled = (cl-loop for (k v) on caps by #'cddr
+                                 unless (eq v :json-false) collect k)
+         with col-width = (+ 1 (cl-reduce
+                                #'max enabled :initial-value 0
+                                :key (lambda (k) (length (symbol-name k)))))
+         for tail on enabled by #'cdddr
+         do (insert "  ")
+         (cl-loop for k in (seq-take tail 3)
+                  for name = (symbol-name k)
+                  do (insert-text-button
+                      name
+                      'action (let ((v (plist-get caps k)))
+                                (lambda (_)
+                                  (pp-eval-expression (list 'quote v))))
+                      'follow-link t)
+                  (insert (make-string (- col-width (length name)) ?\s)))
+         (insert "\n"))
+
+        (heading "Workspace configuration")
+        (if wsconf
+            (insert (with-temp-buffer
+                      (insert (jsonrpc--json-encode wsconf))
+                      (ignore-errors (require 'json) (json-pretty-print-buffer))
+                      (replace-regexp-in-string "^" "  " (buffer-string)))
+                    "\n")
+          (insert "  (none)\n"))
+
+        (heading "File watchers")
+        (if (zerop (hash-table-count watches))
+            (insert "  (none)\n")
+          (maphash (lambda (id descs)
+                     (insert (format "  %s -> %d watcher%s\n" id
+                                     (length descs)
+                                     (if (= 1 (length descs)) "" "s"))))
+                   watches))
+
+        (heading "Events buffer")
+        (insert "  ")
+        (insert-text-button "Show events buffer"
+                            'action (lambda (_) (eglot-events-buffer server))
+                            'follow-link t)
+        (insert "\n")))
+    (goto-char (point-min))
+    (display-buffer (current-buffer))))
+
 
 ;;; Inlay hints
 (defface eglot-inlay-hint-face '((t (:height 0.8 :inherit shadow)))
@@ -5658,11 +5775,15 @@ lock machinery calls us again."
                eglot-reconnect
                eglot-rename
                eglot-signal-didChangeConfiguration
-               eglot-stderr-buffer))
+               eglot-stderr-buffer
+               eglot-describe-connection))
   (function-put sym 'command-modes '(eglot--managed-mode)))
 
 (dolist (sym '(eglot-shutdown-listed-connection
-               eglot-reconnect-listed-connection))
+               eglot-reconnect-listed-connection
+               eglot-events-buffer-of-listed-connection
+               eglot-show-workspace-configuration-of-listed-connection
+               eglot-describe-listed-connection))
   (function-put sym 'command-modes '(eglot-list-connections-mode)))
 
 (provide 'eglot)

From 5ea181a75eed97853e6dc587127849992b4c29b7 Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Thu, 16 Apr 2026 23:05:59 -0700
Subject: [PATCH 133/463] Accept marker as position in treesit.c functions
 (bug#80830)

* src/treesit.c (treesit_check_positive_integer): Remove.
(treesit_check_position):
(Ftreesit_node_first_child_for_pos):
(Ftreesit_node_descendant_for_range):
(Ftreesit_query_capture):
(Ftreesit__linecol_at): Use fix_position.

* test/src/treesit-tests.el:
(treesit-query-marker-position): Test.
---
 src/treesit.c             | 29 +++++++++--------------------
 test/src/treesit-tests.el | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/treesit.c b/src/treesit.c
index c08691af3d8..ad874b35b7b 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2891,16 +2891,6 @@ or no affected ranges, return nil.  */)
 
 /*** Node API  */
 
-/* Check that OBJ is a positive integer and signal an error if
-   otherwise.  */
-static void
-treesit_check_positive_integer (Lisp_Object obj)
-{
-  CHECK_INTEGER (obj);
-  if (XFIXNUM (obj) < 0)
-    xsignal1 (Qargs_out_of_range, obj);
-}
-
 static void
 treesit_check_node (Lisp_Object obj)
 {
@@ -2916,13 +2906,12 @@ treesit_check_node (Lisp_Object obj)
     xsignal1 (Qtreesit_node_buffer_killed, obj);
 }
 
-/* Check that OBJ is a positive integer and it is within the visible
-   portion of BUF.  */
+/* Check that OBJ is a positive integer/marker and it is within the
+   visible portion of BUF.  */
 static void
 treesit_check_position (Lisp_Object obj, struct buffer *buf)
 {
-  treesit_check_positive_integer (obj);
-  ptrdiff_t pos = XFIXNUM (obj);
+  ptrdiff_t pos = fix_position (obj);
   if (pos < BUF_BEGV (buf) || pos > BUF_ZV (buf))
     xsignal1 (Qargs_out_of_range, obj);
 }
@@ -3350,7 +3339,7 @@ Note that this function returns an immediate child, not the smallest
   treesit_check_position (pos, buf);
   treesit_initialize ();
 
-  ptrdiff_t byte_pos = buf_charpos_to_bytepos (buf, XFIXNUM (pos));
+  ptrdiff_t byte_pos = buf_charpos_to_bytepos (buf, fix_position (pos));
   TSNode treesit_node = XTS_NODE (node)->node;
 
   TSTreeCursor cursor = ts_tree_cursor_new (treesit_node);
@@ -3388,8 +3377,8 @@ If NODE is nil, return nil.  */)
 
   treesit_initialize ();
 
-  ptrdiff_t byte_beg = buf_charpos_to_bytepos (buf, XFIXNUM (beg));
-  ptrdiff_t byte_end = buf_charpos_to_bytepos (buf, XFIXNUM (end));
+  ptrdiff_t byte_beg = buf_charpos_to_bytepos (buf, fix_position (beg));
+  ptrdiff_t byte_end = buf_charpos_to_bytepos (buf, fix_position (end));
   TSNode treesit_node = XTS_NODE (node)->node;
   TSNode child;
   if (NILP (named))
@@ -4079,8 +4068,8 @@ the query.  */)
     {
       ptrdiff_t visible_beg
 	= XTS_PARSER (XTS_NODE (lisp_node)->parser)->visible_beg;
-      ptrdiff_t beg_byte = CHAR_TO_BYTE (XFIXNUM (beg));
-      ptrdiff_t end_byte = CHAR_TO_BYTE (XFIXNUM (end));
+      ptrdiff_t beg_byte = CHAR_TO_BYTE (fix_position (beg));
+      ptrdiff_t end_byte = CHAR_TO_BYTE (fix_position (end));
       /* We never let tree-sitter run on buffers too large, so these
 	 assertion should never hit.  */
       eassert (beg_byte - visible_beg <= UINT32_MAX);
@@ -5169,7 +5158,7 @@ This is used for internal testing and debugging ONLY.  */)
 {
   CHECK_NUMBER (pos);
   struct ts_linecol pos_linecol
-    = treesit_linecol_of_pos (CHAR_TO_BYTE (XFIXNUM (pos)),
+    = treesit_linecol_of_pos (CHAR_TO_BYTE (fix_position (pos)),
 			      BUF_TS_LINECOL_POINT (current_buffer));
   return Fcons (make_fixnum (pos_linecol.line), make_fixnum (pos_linecol.col));
 }
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index dfbb4124a5f..af21ec6592a 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -620,6 +620,22 @@ BODY is the test body."
       ;; First element of the match group should be a node.
       (should (treesit-node-p (nth 0 (nth 0 res)))))))
 
+(ert-deftest treesit-query-marker-position ()
+  "Tests for query API."
+  (skip-unless (treesit-language-available-p 'json))
+  (with-temp-buffer
+    (insert "[1,2,{\"name\": \"Bob\"},3]")
+    (treesit-parser-create 'json)
+
+    ;; Test marker.
+    (let* ((beg (point-min-marker))
+           (end (point-max-marker))
+           (res (treesit-query-capture 'json '((number) @num) beg end)))
+      (should (equal (length res) 3)))
+
+    ;; Test out-of-range.
+    (should-error (treesit-query-capture 'json '((number) @num) -1 1))))
+
 ;;; Narrow
 
 (ert-deftest treesit-narrow ()

From 35a8e7e0680e6ec14048099c650796ae1404ff05 Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Thu, 16 Apr 2026 23:16:49 -0700
Subject: [PATCH 134/463] Make sure range (1, 1) doesn't capture anything
 (bug#80798)

* src/treesit.c (Ftreesit_query_capture): Return Qnil if
querying (1, 1).
---
 src/treesit.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/treesit.c b/src/treesit.c
index ad874b35b7b..6f0b0cd720e 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -4070,6 +4070,11 @@ the query.  */)
 	= XTS_PARSER (XTS_NODE (lisp_node)->parser)->visible_beg;
       ptrdiff_t beg_byte = CHAR_TO_BYTE (fix_position (beg));
       ptrdiff_t end_byte = CHAR_TO_BYTE (fix_position (end));
+      /* In ts_query_cursor_set_byte_range, if end_byte = 0, it's set to
+         UINT32_MAX for some reason.  But range (1, 1) shouldn't capture
+         anything.  So in this case just return Qnil.  (bug#80798)  */
+      if (beg_byte == visible_beg && end_byte == visible_beg) return Qnil;
+
       /* We never let tree-sitter run on buffers too large, so these
 	 assertion should never hit.  */
       eassert (beg_byte - visible_beg <= UINT32_MAX);

From eda9a819ce5cae976062e744ad2f7ee3e08fd3f6 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 16 Apr 2026 23:31:19 -0700
Subject: [PATCH 135/463] Append newline to server -error commands
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem reported by Zhengyi Fu (bug#80844).
* lisp/server.el (server--process-filter-1, server-return-error)
(server-edit-abort): Append newline to -error commands, too.
Otherwise emacsclient has no reliable way to find the end of the
error command’s argument, except to wait for EOF which is
undesirable since the Emacs server keeps the socket open
for a while, waiting for emacsclient to exit.
---
 lisp/server.el | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lisp/server.el b/lisp/server.el
index f5dea9c590f..b0f11cf2dd6 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1220,7 +1220,7 @@ The following commands are accepted by the client:
       ;; visible for some reason.
       (server--message-sit-for 2 "Authentication failed")
       (server-send-string
-       proc (concat "-error " (server-quote-arg "Authentication failed")))
+       proc (concat "-error " (server-quote-arg "Authentication failed") "\n"))
       (unless (eq system-type 'windows-nt)
         (let ((terminal (process-get proc 'terminal)))
           ;; Only delete the terminal if it is non-nil.
@@ -1576,7 +1576,8 @@ invocations of \"emacs\".")
     (server--message-sit-for 2 (error-message-string err))
     (server-send-string
      proc (concat "-error " (server-quote-arg
-                             (error-message-string err))))
+			     (error-message-string err))
+		  "\n"))
     (server-log (error-message-string err) proc)
     (unless (eq system-type 'windows-nt)
       (let ((terminal (process-get proc 'terminal)))
@@ -1813,7 +1814,7 @@ To abort an edit instead of saying \"Done\", use \\[server-edit-abort]."
       (mapc (lambda (proc)
               (server-send-string
                proc (concat "-error "
-                            (server-quote-arg "Aborted by the user"))))
+                            (server-quote-arg "Aborted by the user") "\n")))
             server-clients)
     (message "This buffer has no clients")))
 

From 00b767089e711bdbd5d2e470d66fa17390da73f0 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 17 Apr 2026 16:48:16 +0200
Subject: [PATCH 136/463] Extend integration of external operations in Tramp

* doc/misc/tramp.texi (Extension packages): Use another format
char in example.
(New operations): Document different argument types.  Extend example.

* lisp/net/tramp.el: Use consequently `eq', `assq', `memq'.
(tramp-file-name-for-operation-external): Extend docstring.
(tramp-file-name-for-operation): Make more use of
`tramp-file-name-for-operation-external'.
(tramp-add-external-operation): New optional argument `arg-type'.

* test/lisp/net/tramp-tests.el (tramp--handle-test-operation):
Rename from `tramp--handler-for-test-operation'.
(tramp--handle-process-id)
(tramp--test-operation-file-name-for-operation): New defuns.
(tramp-test49-external-backend-function): Extend test.
---
 doc/misc/tramp.texi          |  78 ++++++++++++----
 lisp/net/tramp.el            | 168 +++++++++++++++++++++--------------
 test/lisp/net/tramp-tests.el | 144 +++++++++++++++++++++++++-----
 3 files changed, 285 insertions(+), 105 deletions(-)

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 41455a47546..3aaa2e84982 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -5556,6 +5556,8 @@ operations.  For example, the GNU ELPA package @file{tramp-hlo}
 implements specialized versions of @code{dir-locals--all-files},
 @code{locate-dominating-file} and @code{dir-locals-find-file} for
 @value{tramp}'s @code{tramp-sh} backend (@pxref{New operations}).
+@c The NonGNU ELPA package @file{tramp-rpc} implements an own
+@c @value{tramp} backend (@pxref{New operations}).
 @end itemize
 
 
@@ -6743,7 +6745,7 @@ The following parameters expand format specifiers for the
 The example above could use
 
 @lisp
-(tramp-login-program "%1")
+(tramp-login-program "%b")
 @end lisp
 
 And you could set @code{tramp-extra-expand-args} as connection-local value:
@@ -6759,7 +6761,7 @@ And you could set @code{tramp-extra-expand-args} as connection-local value:
 (connection-local-set-profile-variables
  'foo-tramp-connection-local-default-profile
  '((tramp-extra-expand-args
-    ?1 (foo-tramp-get-login-program (car tramp-current-connection)))))
+    ?b (foo-tramp-get-login-program (car tramp-current-connection)))))
 
 (connection-local-set-profiles
  '(:application tramp :protocol "foo")
@@ -6867,15 +6869,12 @@ For example, it could implement this by using an own shell script
 which collects the information on the remote host for this very
 special purpose with one round-trip per-call.
 
-@defun tramp-add-external-operation operation function backend
+@defun tramp-add-external-operation operation function backend &optional arg-type
 This adds an implementation of @var{operation} to @value{tramp}'s
 backend @var{backend}.  @var{function} is the new implementation.
 
 Both @var{operation} and @var{function} shall be function symbols.
-They must have the same argument list.  The first argument is used to
-determine, whether @value{tramp} is invoked (check for remote file
-name syntax).  It must be a string or nil, in the latter case
-@code{default-directory} is used for the check.
+They must have the same argument list.
 
 @var{backend}, also a symbol, is the feature name of a @value{tramp}
 backend (except @code{tramp-ftp}).  The new implementation will be
@@ -6883,18 +6882,18 @@ applied only for this backend.  Example:
 
 @lisp
 @group
-(defun test-operation (file)
+(defun my-test-operation (file)
   (message "Original implementation for %s" file))
 @end group
 
 @group
-(defun handle-test-operation (file)
+(defun my-handle-test-operation (file)
   (message "Handler implementation for %s" file))
 @end group
 
 @group
 (tramp-add-external-operation
- #'test-operation #'handle-test-operation 'tramp-sh)
+ #'my-test-operation #'my-handle-test-operation 'tramp-sh)
 @end group
 @end lisp
 
@@ -6903,19 +6902,19 @@ Then we have the different use cases:
 @lisp
 @group
 ;; Local file name.
-(test-operation "/a/b")
+(my-test-operation "/a/b")
 @result{} "Original implementation for /a/b"
 @end group
 
 @group
 ;; Remote file name, handled by `tramp-sh'.
-(test-operation "/ssh::/a/b")
+(my-test-operation "/ssh::/a/b")
 @result{} "Handler implementation for /ssh::/a/b"
 @end group
 
 @group
 ;; Remote file name, handled by `tramp-gvfs'.
-(test-operation "/sftp::/a/b")
+(my-test-operation "/sftp::/a/b")
 @result{} "Original implementation for /sftp::/a/b"
 @end group
 @end lisp
@@ -6935,14 +6934,14 @@ could look like:
 
 @lisp
 @group
-(defun handle-test-operation (file)
+(defun my-handle-test-operation (file)
   (message "Entry handler implementation for %s" file)
-  (tramp-run-real-handler #'test-operation (list file))
+  (tramp-run-real-handler #'my-test-operation (list file))
   (message "Exit handler implementation for %s" file))
 @end group
 
 @group
-(test-operation "/ssh::/a/b")
+(my-test-operation "/ssh::/a/b")
 @result{} "Entry handler implementation for /ssh::/a/b
    Original implementation for /ssh::/a/b
    Exit handler implementation for /ssh::/a/b"
@@ -6952,6 +6951,47 @@ could look like:
 If the same @var{function} shall be used for different @value{tramp}
 backends, @code{tramp-add-external-operation} must be called for every
 backend, respectively.
+
+The optional argument @var{arg-type} specisfies, which argument of
+@var{operation} shall be used in order to determine, whether the
+handler @var{function} should be called.  It can be
+
+@itemize @minus
+@item @code{file}@*
+The first argument of @var{operation} is the remote file name to be
+checked.  This is the default, if @var{arg-type} is @code{nil}.
+
+@item @code{default-directory}@*
+@code{default-directory} is the remote file name to be checked.
+
+@item @code{process}@*
+@code{default-directory} of the process buffer of the first argument
+of @var{operation}, a process, is the remote file name to be checked.
+@end itemize
+
+If the first argument of @var{operation} is nil,
+@code{default-directory} is the remote file name to be checked in case
+of @var{arg-type} being @code{file} or @code{process}.
+
+@findex tramp-file-name-for-operation
+If @var{arg-type} is a function symbol, it will be called with the
+same arguments as @code{tramp-file-name-for-operation}.  It must
+return a string, which is the remote file name to be checked.
+
+The example above could be changed like this:
+
+@lisp
+@group
+(defun my-file-name-for-test-operation (operation &rest args)
+  (if (stringp (car args)) (car args) default-directory))
+@end group
+
+@group
+(tramp-add-external-operation
+ #'my-test-operation #'my-handle-test-operation 'tramp-sh
+ #'my-file-name-for-test-operation)
+@end group
+@end lisp
 @end defun
 
 @defun tramp-remove-external-operation operation backend
@@ -6963,7 +7003,7 @@ they are kept.  Example:
 @lisp
 @group
 (tramp-remove-external-operation
- #'test-operation 'tramp-sh)
+ #'my-test-operation 'tramp-sh)
 @end group
 @end lisp
 @end defun
@@ -6979,6 +7019,10 @@ An example implementing this mechanism is the GNU ELPA package
 @code{dir-locals-find-file} for @value{tramp}'s @code{tramp-sh}
 backend.
 
+@c Another example is the NonGNU ELPA package @file{tramp-rpc}.  It
+@c provides an own @value{tramp} backend, using a server process on the
+@c remote host.
+
 
 @node Traces and Profiles
 @chapter How to Customize Traces
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 1e1fa2fe9a7..0685de12494 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2424,7 +2424,22 @@ arguments to pass to the OPERATION."
     (apply operation args)))
 
 (defvar tramp-file-name-for-operation-external nil
-  "List of operations added by external packages.")
+  "Alist of operations added by external packages.
+An entry has the form `(OPERATION . ARG-TYPE)'.  ARG-TYPE can be the
+symbol
+
+- `file': the first argument of OERATION is the remote file name to be
+  checked.
+- `default-directory': `default-directory' is the remote file name to be
+  checked.
+- `process': `default-directory' of the process buffer of the first
+  argument of OPERATION is the remote file name to be checked.
+
+If the first argument of OPERATION is nil, `default-directory' is the
+remote file name to be checked in case of `file' and `process'.
+
+If ARG-TYPE is a function symbol, it will be called with the same
+arguments as `tramp-file-name-for-operation'.  It must return a string.")
 
 ;; We handle here all file primitives.  Most of them have the file
 ;; name as first parameter; nevertheless we check for them explicitly
@@ -2434,9 +2449,7 @@ arguments to pass to the OPERATION."
 ;; ease the life if `file-name-handler-alist' would support a decision
 ;; function as well but regexp only.
 ;; Operations added by external packages are kept in
-;; `tramp-file-name-for-operation-external'.  They expect the file
-;; name to be checked as first argument or, if there isn't any
-;; argument, `default-directory'.
+;; `tramp-file-name-for-operation-external'.
 (defun tramp-file-name-for-operation (operation &rest args)
   "Return file name related to OPERATION file primitive.
 ARGS are the arguments OPERATION has been called with.
@@ -2446,30 +2459,32 @@ first argument of `expand-file-name' is absolute and not remote.
 Must be handled by the callers."
   (cond
    ;; FILE resp DIRECTORY.
-   ((memq operation
-	  '(access-file byte-compiler-base-file-name delete-directory
-	    delete-file diff-latest-backup-file directory-file-name
-	    directory-files directory-files-and-attributes dired-compress-file
-	    dired-uncache file-acl file-accessible-directory-p file-attributes
-	    file-directory-p file-executable-p file-exists-p file-local-copy
-	    file-locked-p file-modes file-name-as-directory
-	    file-name-case-insensitive-p file-name-directory
-	    file-name-nondirectory file-name-sans-versions
-	    file-notify-add-watch file-ownership-preserved-p file-readable-p
-	    file-regular-p file-remote-p file-selinux-context file-symlink-p
-	    file-system-info file-truename file-writable-p
-	    find-backup-file-name get-file-buffer
-	    insert-directory insert-file-contents load lock-file make-directory
-	    make-lock-file-name set-file-acl set-file-modes
-	    set-file-selinux-context set-file-times substitute-in-file-name
-	    unhandled-file-name-directory unlock-file vc-registered
-	    ;; Emacs 28- only.
-	    make-directory-internal
-	    ;; Emacs 29+ only.
-	    abbreviate-file-name
-	    ;; Tramp internal magic file name function.
-	    tramp-set-file-uid-gid))
-    (if (file-name-absolute-p (nth 0 args))
+   ((or
+     (memq operation
+	   '(access-file byte-compiler-base-file-name delete-directory
+	     delete-file diff-latest-backup-file directory-file-name
+	     directory-files directory-files-and-attributes dired-compress-file
+	     dired-uncache file-acl file-accessible-directory-p file-attributes
+	     file-directory-p file-executable-p file-exists-p file-local-copy
+	     file-locked-p file-modes file-name-as-directory
+	     file-name-case-insensitive-p file-name-directory
+	     file-name-nondirectory file-name-sans-versions
+	     file-notify-add-watch file-ownership-preserved-p file-readable-p
+	     file-regular-p file-remote-p file-selinux-context file-symlink-p
+	     file-system-info file-truename file-writable-p
+	     find-backup-file-name get-file-buffer
+	     insert-directory insert-file-contents load lock-file make-directory
+	     make-lock-file-name set-file-acl set-file-modes
+	     set-file-selinux-context set-file-times substitute-in-file-name
+	     unhandled-file-name-directory unlock-file vc-registered
+	     ;; Emacs 28- only.
+	     make-directory-internal
+	     ;; Emacs 29+ only.
+	     abbreviate-file-name
+	     ;; Tramp internal magic file name function.
+	     tramp-set-file-uid-gid))
+     (eq (alist-get operation tramp-file-name-for-operation-external) 'file))
+    (if (and (stringp (nth 0 args)) (file-name-absolute-p (nth 0 args)))
 	(nth 0 args)
       default-directory))
    ;; STRING FILE.
@@ -2502,31 +2517,45 @@ Must be handled by the callers."
     (buffer-file-name
      (if (bufferp (nth 0 args)) (nth 0 args) (current-buffer))))
    ;; COMMAND.
-   ((memq operation
-	  '(exec-path make-nearby-temp-file make-process process-file
-	    shell-command start-file-process temporary-file-directory
-	    ;; Emacs 29+ only.
-            list-system-processes memory-info process-attributes
-            ;; Emacs 30+ only.
-	    file-group-gid file-user-uid))
+   ((or
+     (memq operation
+	   '(exec-path make-nearby-temp-file make-process process-file
+	     shell-command start-file-process temporary-file-directory
+	     ;; Emacs 29+ only.
+             list-system-processes memory-info process-attributes
+             ;; Emacs 30+ only.
+	     file-group-gid file-user-uid))
+     (eq (alist-get operation tramp-file-name-for-operation-external)
+	 'default-directory))
     default-directory)
-   ;; PROC.
-   ((memq operation '(file-notify-rm-watch file-notify-valid-p))
-    (when (processp (nth 0 args))
-      (tramp-get-default-directory (process-buffer (nth 0 args)))))
+   ;; PROC or BUFFER.
+   ((or
+     (memq operation '(file-notify-rm-watch file-notify-valid-p))
+     (eq (alist-get operation tramp-file-name-for-operation-external) 'process))
+    (or (when-let* (((processp (nth 0 args)))
+		    (vec (process-get (nth 0 args) 'tramp-vector)))
+	  (tramp-make-tramp-file-name vec))
+	(when-let*
+	    ((buf (cond
+		   ((processp (nth 0 args)) (process-buffer (nth 0 args)))
+		   ((bufferp (nth 0 args)) (get-buffer (nth 0 args)))
+		   ((stringp (nth 0 args))
+		    ;; Process or buffer name.
+		    (or (get-process (nth 0 args)) (get-buffer (nth 0 args)))))))
+	  (tramp-get-default-directory buf))
+	""))
    ;; VEC.
    ((memq operation
 	  '(tramp-get-home-directory tramp-get-remote-gid
 	    tramp-get-remote-groups tramp-get-remote-uid))
     (tramp-make-tramp-file-name (nth 0 args)))
-   ;; FILE resp DIRECTORY.
-   ((and (memq operation tramp-file-name-for-operation-external)
-	 (or (stringp (nth 0 args)) (null (nth 0 args))))
-    (if (and (stringp (nth 0 args)) (file-name-absolute-p (nth 0 args)))
-	(nth 0 args)
-      default-directory))
+   ;; A function.
+   ((functionp (alist-get operation tramp-file-name-for-operation-external))
+    (apply
+     (alist-get operation tramp-file-name-for-operation-external)
+     operation args))
    ;; Unknown file primitive.
-   (t (unless (member 'remote-file-error debug-ignored-errors)
+   (t (unless (memq 'remote-file-error debug-ignored-errors)
 	(tramp-error
 	 nil 'remote-file-error "Unknown file I/O primitive: %s" operation)))))
 
@@ -2544,7 +2573,7 @@ Must be handled by the callers."
 		  (funcall (setq func (car elt)) vec)
 		(error
 		 (setcar elt #'ignore)
-		 (unless (member 'remote-file-error debug-ignored-errors)
+		 (unless (memq 'remote-file-error debug-ignored-errors)
 		   (tramp-error
 		    vec 'remote-file-error
 		    "Not a valid Tramp file name function `%s'" func))))
@@ -2552,22 +2581,32 @@ Must be handled by the callers."
 		res (cdr elt))))
       res)))
 
-(defun tramp-add-external-operation (operation function backend)
+(defun tramp-add-external-operation
+    (operation function backend &optional arg-type)
   "Add FUNCTION to Tramp BACKEND as handler for OPERATION.
 OPERATION must not be one of the magic operations listed in Info
 node `(elisp) Magic File Names'.  FUNCTION must have the same argument
 list as OPERATION.  BACKEND, a symbol, must be one of the Tramp backend
-packages like `tramp-sh' (except `tramp-ftp')."
+packages like `tramp-sh' (except `tramp-ftp').  ARG-TYPE is either
+`file' (the default), `default-directory', `process' or a function
+symbol.  It describes the type of the OPERATION argument to be checked.
+See the docstring of `tramp-file-name-for-operation-external' for its
+meaning."
   (require backend)
   (when-let* ((fnha
 	       (intern-soft
 		(concat (symbol-name backend) "-file-name-handler-alist")))
-	      ((boundp fnha)))
+	      ((boundp fnha))
+	      (arg-type (or arg-type 'file)))
+    (unless (or (memq arg-type '(file default-directory process))
+		(functionp arg-type))
+      (tramp-error nil 'remote-file-error "Unknown arg type: %s" arg-type))
     ;; Make BACKEND aware of the new operation.
     (add-to-list fnha (cons operation function))
-    (unless (memq operation tramp-file-name-for-operation-external)
+    (unless (assq operation tramp-file-name-for-operation-external)
       ;; Make Tramp aware of the new operation.
-      (add-to-list 'tramp-file-name-for-operation-external operation)
+      (add-to-list
+       'tramp-file-name-for-operation-external (cons operation arg-type))
       (put #'tramp-file-name-handler
 	   'operations
            (cons operation (get 'tramp-file-name-handler 'operations)))
@@ -2577,8 +2616,7 @@ packages like `tramp-sh' (except `tramp-ftp')."
        `(lambda (orig-fun &rest args)
 	  (if-let* ((handler
 		     (find-file-name-handler
-		      (if (and (car args) (file-name-absolute-p (car args)))
-			  (car args) default-directory)
+		      (apply #'tramp-file-name-for-operation #',operation args)
 		      #',operation)))
 	      (apply handler #',operation args)
 	    (apply orig-fun args)))
@@ -2605,7 +2643,7 @@ Tramp backend packages like `tramp-sh'."
 	   tramp-foreign-file-name-handler-alist)
     ;; Make Tramp unaware of OPERATION.
     (setq tramp-file-name-for-operation-external
-	  (delq operation tramp-file-name-for-operation-external))
+	  (assq-delete-all operation tramp-file-name-for-operation-external))
     (put #'tramp-file-name-handler
 	 'operations (delq operation (get 'tramp-file-name-handler 'operations)))
     ;; Remove the advice for OPERATION.
@@ -6335,7 +6373,7 @@ Mostly useful to protect BODY from being interrupted by timers."
   (declare (indent 1) (debug t))
   `(if (tramp-get-connection-property ,proc "locked")
        ;; Be kind for old versions of Emacs.
-       (if (member 'remote-file-error debug-ignored-errors)
+       (if (memq 'remote-file-error debug-ignored-errors)
 	   (throw 'non-essential 'non-essential)
 	 ;(tramp-backtrace ,proc 'force)
 	 (tramp-error
@@ -6701,7 +6739,7 @@ If FILENAME is remote, a file name handler is called."
 ID-FORMAT valid values are `string' and `integer'."
   ;; We use key nil for local connection properties.
   (with-tramp-connection-property nil (format "uid-%s" id-format)
-    (if (equal id-format 'integer) (user-uid) (user-login-name))))
+    (if (eq id-format 'integer) (user-uid) (user-login-name))))
 
 (defun tramp-get-local-gid (id-format)
   "The gid of the local user, in ID-FORMAT.
@@ -6709,8 +6747,8 @@ ID-FORMAT valid values are `string' and `integer'."
   ;; We use key nil for local connection properties.
   (with-tramp-connection-property nil (format "gid-%s" id-format)
     (cond
-     ((equal id-format 'integer) (group-gid))
-     ((equal id-format 'string) (group-name (group-gid)))
+     ((eq id-format 'integer) (group-gid))
+     ((eq id-format 'string) (group-name (group-gid)))
      ((file-attribute-group-id (file-attributes "~/" id-format))))))
 
 (defun tramp-get-local-locale (&optional vec)
@@ -6906,8 +6944,8 @@ ID-FORMAT valid values are `string' and `integer'."
 	   (with-tramp-connection-property vec (format "uid-%s" id-format)
 	     (tramp-file-name-handler #'tramp-get-remote-uid vec id-format)))
       ;; Ensure there is a valid result.
-      (and (equal id-format 'integer) tramp-unknown-id-integer)
-      (and (equal id-format 'string) tramp-unknown-id-string)))
+      (and (eq id-format 'integer) tramp-unknown-id-integer)
+      (and (eq id-format 'string) tramp-unknown-id-string)))
 
 (defun tramp-get-remote-gid (vec id-format)
   "The gid of the remote connection VEC, in ID-FORMAT.
@@ -6916,8 +6954,8 @@ ID-FORMAT valid values are `string' and `integer'."
 	   (with-tramp-connection-property vec (format "gid-%s" id-format)
 	     (tramp-file-name-handler #'tramp-get-remote-gid vec id-format)))
       ;; Ensure there is a valid result.
-      (and (equal id-format 'integer) tramp-unknown-id-integer)
-      (and (equal id-format 'string) tramp-unknown-id-string)))
+      (and (eq id-format 'integer) tramp-unknown-id-integer)
+      (and (eq id-format 'string) tramp-unknown-id-string)))
 
 (defun tramp-get-remote-groups (vec id-format)
   "The list of groups of the remote connection VEC, in ID-FORMAT.
@@ -7231,9 +7269,9 @@ verbosity of 6."
       (let ((default-directory temporary-file-directory))
 	(dolist (pid (list-system-processes))
 	  (and-let* ((attributes (process-attributes pid))
-		     (comm (cdr (assoc 'comm attributes)))
+		     (comm (cdr (assq 'comm attributes)))
 		     ((string-equal
-		       (cdr (assoc 'user attributes)) (user-login-name)))
+		       (cdr (assq 'user attributes)) (user-login-name)))
 		     ;; The returned command name could be truncated
 		     ;; to 15 characters.  Therefore, we cannot check
 		     ;; for `string-equal'.
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 90dc17a0753..25e7870b5ce 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -8859,10 +8859,19 @@ process sentinels.  They shall not disturb each other."
   "Test operation."
   "Test operation")
 
-(defun tramp--handler-for-test-operation (&optional _file)
+(defun tramp--handle-test-operation (&optional _file)
   "Test operation handler."
   "Test operation handler")
 
+(defun tramp--handle-process-id (process)
+  "Handler for `process-id'."
+  ;; Return something else.
+  (1+ (tramp-run-real-handler #'process-id (list process))))
+
+(defun tramp--test-operation-file-name-for-operation (_operation &optional _file)
+  "Helper function for `tramp--test-operation' handler."
+  default-directory)
+
 (ert-deftest tramp-test49-external-backend-function ()
   "Check that Tramp handles external functions for a given backend."
   :tags '(:expensive-test)
@@ -8879,78 +8888,167 @@ process sentinels.  They shall not disturb each other."
     ;; There is no backend specific code.
     (should-not
      (string-equal (tramp--test-operation ert-remote-temporary-file-directory)
-		   (tramp--handler-for-test-operation
+		   (tramp--handle-test-operation
 		    ert-remote-temporary-file-directory)))
     (should-not
      (string-equal (tramp--test-operation temporary-file-directory)
-		   (tramp--handler-for-test-operation
+		   (tramp--handle-test-operation
 		    temporary-file-directory)))
     (let ((default-directory ert-remote-temporary-file-directory))
       (should-not
        (string-equal (tramp--test-operation)
-		     (tramp--handler-for-test-operation))))
+		     (tramp--handle-test-operation))))
     (let ((default-directory temporary-file-directory))
       (should-not
        (string-equal (tramp--test-operation)
-		     (tramp--handler-for-test-operation))))
+		     (tramp--handle-test-operation))))
 
     (should-error
      (tramp-add-external-operation
-      #'tramp--test-operation
-      #'tramp--handler-for-test-operation 'foo)
+      #'tramp--test-operation #'tramp--handle-test-operation 'foo)
      :type 'file-missing)
+    (should-error
+     (tramp-add-external-operation
+      #'tramp--test-operation #'tramp--handle-test-operation backend 'foo)
+     :type 'remote-file-error)
+    ;; This doesn't hurt.
     (tramp-add-external-operation
-     #'tramp--test-operation
-     #'tramp--handler-for-test-operation backend)
+     #'tramp--test-operation #'tramp--handle-test-operation backend 'file)
+
     ;; The backend specific function is called.
     (should
      (string-equal (tramp--test-operation ert-remote-temporary-file-directory)
-		   (tramp--handler-for-test-operation
+		   (tramp--handle-test-operation
 		    ert-remote-temporary-file-directory)))
     (should-not
      (string-equal (tramp--test-operation temporary-file-directory)
-		   (tramp--handler-for-test-operation
+		   (tramp--handle-test-operation
 		    temporary-file-directory)))
     (let ((default-directory ert-remote-temporary-file-directory))
       (should
        (string-equal (tramp--test-operation)
-		     (tramp--handler-for-test-operation)))
+		     (tramp--handle-test-operation)))
       (should
        (string-equal (tramp--test-operation "foo")
-		     (tramp--handler-for-test-operation "foo"))))
+		     (tramp--handle-test-operation "foo"))))
     (let ((default-directory temporary-file-directory))
       (should-not
        (string-equal (tramp--test-operation)
-		     (tramp--handler-for-test-operation)))
+		     (tramp--handle-test-operation)))
       (should-not
        (string-equal (tramp--test-operation "foo")
-		     (tramp--handler-for-test-operation "foo"))))
+		     (tramp--handle-test-operation "foo"))))
 
-    (tramp-remove-external-operation
-     #'tramp--test-operation backend)
+    (tramp-remove-external-operation #'tramp--test-operation backend)
     ;; There is no backend specific code.
     (should-not
      (string-equal (tramp--test-operation ert-remote-temporary-file-directory)
-		   (tramp--handler-for-test-operation
+		   (tramp--handle-test-operation
 		    ert-remote-temporary-file-directory)))
     (should-not
      (string-equal (tramp--test-operation temporary-file-directory)
-		   (tramp--handler-for-test-operation
+		   (tramp--handle-test-operation
 		    temporary-file-directory)))
     (let ((default-directory ert-remote-temporary-file-directory))
       (should-not
        (string-equal (tramp--test-operation)
-		     (tramp--handler-for-test-operation)))
+		     (tramp--handle-test-operation)))
       (should-not
        (string-equal (tramp--test-operation "foo")
-		     (tramp--handler-for-test-operation "foo"))))
+		     (tramp--handle-test-operation "foo"))))
     (let ((default-directory temporary-file-directory))
       (should-not
        (string-equal (tramp--test-operation)
-		     (tramp--handler-for-test-operation)))
+		     (tramp--handle-test-operation)))
       (should-not
        (string-equal (tramp--test-operation "foo")
-		     (tramp--handler-for-test-operation "foo"))))))
+		     (tramp--handle-test-operation "foo"))))
+
+    ;; Test `default-directory' arg type.
+    (tramp-add-external-operation
+     #'tramp--test-operation #'tramp--handle-test-operation
+     backend 'default-directory)
+
+    ;; The backend specific function is called.
+    (let ((default-directory ert-remote-temporary-file-directory))
+      (should
+       (string-equal (tramp--test-operation "foo")
+		     (tramp--handle-test-operation "foo"))))
+    (let ((default-directory temporary-file-directory))
+      (should-not
+       (string-equal (tramp--test-operation "foo")
+		     (tramp--handle-test-operation "foo"))))
+
+    (tramp-remove-external-operation #'tramp--test-operation backend)
+    ;; There is no backend specific code.
+    (let ((default-directory ert-remote-temporary-file-directory))
+      (should-not
+       (string-equal (tramp--test-operation)
+		     (tramp--handle-test-operation)))
+      (should-not
+       (string-equal (tramp--test-operation "foo")
+		     (tramp--handle-test-operation "foo"))))
+    (let ((default-directory temporary-file-directory))
+      (should-not
+       (string-equal (tramp--test-operation)
+		     (tramp--handle-test-operation)))
+      (should-not
+       (string-equal (tramp--test-operation "foo")
+		     (tramp--handle-test-operation "foo"))))
+
+    ;; Test `process' arg type.
+    (when (and (tramp--test-supports-processes-p) (not (tramp--test-smb-p)))
+      (let ((default-directory ert-remote-temporary-file-directory)
+	    proc command id)
+	(unwind-protect
+	    (with-temp-buffer
+	      (setq command '("cat")
+		    proc
+		    (make-process
+		     :name "test" :buffer (current-buffer) :command command
+		     :file-handler t))
+	      (should (processp proc))
+	      (should (eq (process-status proc) 'run))
+	      (should (natnump (setq id (process-id proc))))
+	      (tramp-add-external-operation
+	       #'process-id #'tramp--handle-process-id backend 'process)
+	      (should (= (process-id proc) (1+ id))))
+
+	  ;; Cleanup.
+	  (tramp-remove-external-operation #'process-id backend)
+	  (ignore-errors (delete-process proc)))))
+
+    ;; Test function arg type.
+    (tramp-add-external-operation
+     #'tramp--test-operation #'tramp--handle-test-operation
+     backend #'tramp--test-operation-file-name-for-operation)
+
+    ;; The backend specific function is called.
+    (let ((default-directory ert-remote-temporary-file-directory))
+      (should
+       (string-equal (tramp--test-operation "foo")
+		     (tramp--handle-test-operation "foo"))))
+    (let ((default-directory temporary-file-directory))
+      (should-not
+       (string-equal (tramp--test-operation "foo")
+		     (tramp--handle-test-operation "foo"))))
+
+    (tramp-remove-external-operation #'tramp--test-operation backend)
+    ;; There is no backend specific code.
+    (let ((default-directory ert-remote-temporary-file-directory))
+      (should-not
+       (string-equal (tramp--test-operation)
+		     (tramp--handle-test-operation)))
+      (should-not
+       (string-equal (tramp--test-operation "foo")
+		     (tramp--handle-test-operation "foo"))))
+    (let ((default-directory temporary-file-directory))
+      (should-not
+       (string-equal (tramp--test-operation)
+		     (tramp--handle-test-operation)))
+      (should-not
+       (string-equal (tramp--test-operation "foo")
+		     (tramp--handle-test-operation "foo"))))))
 
 ;; This test is inspired by Bug#29163.
 (ert-deftest tramp-test50-auto-load ()

From c92354d19023537fe77b7b16773e613e3d4d31c4 Mon Sep 17 00:00:00 2001
From: "Aaron L. Zeng" <azeng@janestreet.com>
Date: Fri, 17 Apr 2026 12:06:38 -0400
Subject: [PATCH 137/463] vc-hg--checkin: When committing a patch, advance
 active hg bookmark

* lisp/vc/vc-hg.el (vc-hg--checkin): When committing a patch,
advance any active hg bookmark (bug#80848).

Copyright-paperwork-exempt: yes
---
 lisp/vc/vc-hg.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 1535e767ea5..08a58425104 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -1305,8 +1305,11 @@ It is an error to supply both or neither."
              ;; need to make both of them part of the async command,
              ;; possibly by writing out a tiny shell script (bug#79235).
              (when patch-file
-               (vc-hg-command nil 0 nil "update" "--merge"
-                              "--tool" "internal:local" "tip")))))
+               (let ((bmark (alist-get 'bookmark (vc-hg--working-branch))))
+                 (when bmark
+                   (vc-hg-command nil 0 nil "bookmark" "-f" "-r" "tip" bmark))
+                 (vc-hg-command nil 0 nil "update" "--merge"
+                                "--tool" "internal:local" (or bmark "tip")))))))
       (if vc-async-checkin
           (let* ((buffer (vc-hg--async-buffer))
                  (proc (apply #'vc-hg--async-command buffer

From abde2d1ed3bbd5cf89fede83664ec3424527819c Mon Sep 17 00:00:00 2001
From: Stephen Berman <stephen.berman@gmx.net>
Date: Fri, 17 Apr 2026 19:26:37 +0200
Subject: [PATCH 138/463] Restrict Dired handling of newlines in file names

* lisp/dired.el (dired--ls-accept-b-switch-p): New function.
(dired-internal-noselect): Use it in the condition on displaying
warning about filenames with newlines.
(dired--set-auto-toggle-b-switch): Use it to conditionalize
calling 'dired--toggle-b-switch'.
(dired-auto-toggle-b-switch, dired--toggle-b-switch): Improve doc
string.

* test/lisp/dired-tests.el (dired-test-filename-with-newline-1)
(dired-test-filename-with-newline-2): Skip unless Dired uses an
'ls' that supports the '-b' switch.

* etc/NEWS: Adjust accordingly the announcements of the Dired
warning and the new user option for file names with newlines.
---
 etc/NEWS                 |  6 ++++--
 lisp/dired.el            | 38 +++++++++++++++++++++++---------------
 test/lisp/dired-tests.el |  2 ++
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index a6abd23b4ac..25cddfa58e1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2536,7 +2536,8 @@ names relative to the root directory of the current project.
 
 +++
 *** Warning when Dired displays a file name with a literal newline.
-On visiting a directory that contains a file whose name has a newline,
+If Dired uses an 'ls' implementation that supports the '-b' switch, then
+on visiting a directory that contains a file whose name has a newline,
 and Dired displays that character as a literal newline, Emacs now
 automatically pops up a buffer warning that such a display can be
 problematic for Dired and showing a way to change the display to use the
@@ -2544,7 +2545,8 @@ unproblematic character '\n'.
 
 +++
 *** New user option 'dired-auto-toggle-b-switch'.
-When this user option is non-nil and 'dired-listing-switches' does not
+When this user option is non-nil and Dired uses an 'ls' implementation
+that supports the '-b' switch and 'dired-listing-switches' does not
 include the '-b' switch, then on visiting a directory containing a file
 whose name has a newline, Emacs automatically adds the '-b' switch and
 redisplays the directory in Dired to show '\n' in the file name instead
diff --git a/lisp/dired.el b/lisp/dired.el
index 9b7b1271e66..9ce3f042f6b 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -553,7 +553,8 @@ displayed instead."
 (defcustom dired-auto-toggle-b-switch nil
   "Whether to automatically add or remove the `b' switch.
 If non-nil, the function `dired--toggle-b-switch' (which see) is added
-to `post-command-hook' in Dired mode."
+to `post-command-hook' in Dired mode, unless the `ls' used by Dired does
+not accept the `b' switch."
   :type 'boolean
   :group 'dired
   :initialize #'custom-initialize-default
@@ -1472,15 +1473,16 @@ The return value is the target column for the file names."
       (dired-initial-position dirname))
     (when (consp dired-directory)
       (dired--align-all-files))
-    ;; Pop up a warning if the Dired listing displays a literal newline.
-    ;; We do this here in order to get the warning not only when
-    ;; interactively invoking `dired' on a directory, but also e.g. when
-    ;; passing the directory name as a command line argument when
-    ;; starting Emacs from the shell.
+    ;; Pop up a warning if the Dired listing displays a literal newline
+    ;; and `ls' can take the `b' switch.  We do this here in order to
+    ;; get the warning not only when interactively invoking `dired' on a
+    ;; directory, but also e.g. when passing the directory name as a
+    ;; command line argument when starting Emacs from the shell.
     (unless (or dired-auto-toggle-b-switch
                 (dired-switches-escape-p dired-listing-switches)
                 (dired-switches-escape-p dired-actual-switches))
-      (when (dired--filename-with-newline-p)
+      (when (and (dired--filename-with-newline-p)
+                 (dired--ls-accept-b-switch-p))
         (dired--display-filename-with-newline-warning buffer)))
     (set-buffer old-buf)
     buffer))
@@ -4054,6 +4056,10 @@ newline character (regardless of whether Dired displays the character as
 a literal newline or as \"\\n\")."
   (directory-files default-directory nil "\n"))
 
+(defun dired--ls-accept-b-switch-p ()
+  "Return non-nil if the `ls' used by Dired accepts the `b' switch."
+  (eq 0 (call-process insert-directory-program nil nil nil "-b")))
+
 (defun dired--remove-b-switch ()
   "Remove all variants of the `b' switch from `dired-actual-switches'.
 This removes not only all occurrences of the short form `-b' but also
@@ -4071,8 +4077,9 @@ the long forms `--escape' and `--quoting-style=escape'."
   "Add or remove `b' switch and redisplay Dired buffer.
 When the current Dired buffer has a file name containing a newline, add
 the `b' switch to the actual switches if it isn't already among them;
-otherwise remove the `b' switch unless it is in `dired-listing-switches'.
-Then redisplay the Dired buffer.  This function is called from
+otherwise remove the `b' switch unless it is in
+`dired-listing-switches'.  Then redisplay the Dired buffer.  When
+`dired-auto-toggle-b-switch' is non-nil, this function is called from
 `post-command-hook' in Dired mode buffers."
   (when (eq major-mode 'dired-mode)
     (if (and (dired--filename-with-newline-p) dired-auto-toggle-b-switch)
@@ -4087,12 +4094,13 @@ Then redisplay the Dired buffer.  This function is called from
 (defun dired--set-auto-toggle-b-switch (symbol value)
   "The :set function for user option `dired-auto-toggle-b-switch'."
   (custom-set-default symbol value)
-  (if value
-      (add-hook 'post-command-hook #'dired--toggle-b-switch nil t)
-    (remove-hook 'post-command-hook #'dired--toggle-b-switch t))
-  (dolist (b (buffer-list))
-    (with-current-buffer b
-      (dired--toggle-b-switch))))
+  (when (dired--ls-accept-b-switch-p)
+    (if value
+        (add-hook 'post-command-hook #'dired--toggle-b-switch nil t)
+      (remove-hook 'post-command-hook #'dired--toggle-b-switch t))
+    (dolist (b (buffer-list))
+      (with-current-buffer b
+        (dired--toggle-b-switch)))))
 
 (defun dired--display-filename-with-newline-warning (dir)
   "Display a warning if buffer DIR has a file name with a newline."
diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el
index f5f92fd6485..b2e0f257a15 100644
--- a/test/lisp/dired-tests.el
+++ b/test/lisp/dired-tests.el
@@ -663,6 +663,7 @@ The current directory at call time should not affect the result (Bug#50630)."
   ;; File names with embedded newlines are not allowed on MS-Windows and
   ;; MS-DOS.
   (skip-when (memq system-type '(windows-nt ms-dos)))
+  (skip-unless (dired--ls-accept-b-switch-p))
   (with-current-buffer "*Messages*"
     (let ((inhibit-read-only t))
       (erase-buffer)))
@@ -698,6 +699,7 @@ The current directory at call time should not affect the result (Bug#50630)."
   ;; File names with embedded newlines are not allowed on MS-Windows and
   ;; MS-DOS.
   (skip-when (memq system-type '(windows-nt ms-dos)))
+  (skip-unless (dired--ls-accept-b-switch-p))
   (with-current-buffer "*Messages*"
     (let ((inhibit-read-only t))
       (erase-buffer)))

From a236442581b52a8d83df52e42a848e7482d62f49 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Fri, 17 Apr 2026 14:39:03 -0400
Subject: [PATCH 139/463] vc-hg--checkin: Use vc-hg--active-bookmark-internal

* lisp/vc/vc-hg.el (vc-hg--active-bookmark-internal): Make it
work when default-directory is not the repository root.
(vc-hg--checkin): Use vc-hg--active-bookmark-internal instead of
vc-hg--working-branch.
---
 lisp/vc/vc-hg.el | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 08a58425104..1c12271e0cb 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -325,13 +325,14 @@ large repositories."
 
 (defun vc-hg--active-bookmark-internal (rev)
   (when (equal rev ".")
-    (let* ((current-bookmarks-file ".hg/bookmarks.current"))
-      (when (file-exists-p current-bookmarks-file)
-        (ignore-errors
-          (with-temp-buffer
-            (insert-file-contents current-bookmarks-file)
-            (buffer-substring-no-properties
-             (point-min) (point-max))))))))
+    (let* ((current-bookmarks-file
+            (expand-file-name ".hg/bookmarks.current"
+                              (vc-hg-root default-directory))))
+      (and (file-exists-p current-bookmarks-file)
+           (ignore-errors
+             (with-temp-buffer
+               (insert-file-contents current-bookmarks-file)
+               (buffer-substring-no-properties (point-min) (point-max))))))))
 
 (defun vc-hg--run-log (template rev path)
   (ignore-errors
@@ -1305,7 +1306,7 @@ It is an error to supply both or neither."
              ;; need to make both of them part of the async command,
              ;; possibly by writing out a tiny shell script (bug#79235).
              (when patch-file
-               (let ((bmark (alist-get 'bookmark (vc-hg--working-branch))))
+               (let ((bmark (vc-hg--active-bookmark-internal ".")))
                  (when bmark
                    (vc-hg-command nil 0 nil "bookmark" "-f" "-r" "tip" bmark))
                  (vc-hg-command nil 0 nil "update" "--merge"

From cffc12c8cd3361ccfbe89515a473711cecb9eb1b Mon Sep 17 00:00:00 2001
From: Rahguzar <rahguzar@mailbox.org>
Date: Fri, 17 Apr 2026 18:03:58 -0500
Subject: [PATCH 140/463] proced-format: Use process-alist for standard
 attributes (bug#77775).

* lisp/proced.el (proced-format): Use process-alist for standard
attributes.
---
 lisp/proced.el | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lisp/proced.el b/lisp/proced.el
index 75c657bc86d..4b05a8d65b8 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -1742,13 +1742,12 @@ Replace newline characters by \"^J\" (two characters)."
   (if (symbolp format)
       (setq format (cdr (assq format proced-format-alist))))
 
-  ;; Not all systems give us all attributes.  We take `emacs-pid' as a
-  ;; representative process PID.  If FORMAT contains a list of alternative
-  ;; attributes, we take the first attribute that is non-nil for `emacs-pid'.
+  ;; Not all systems give us all attributes.  We take the first process as a
+  ;; representative process.  If FORMAT contains a list of alternative
+  ;; attributes, we take the first attribute that is non-nil for this process.
   ;; If none of the alternatives is non-nil, the attribute is ignored
   ;; in the listing.
-  (let ((standard-attributes
-         (car (proced-process-attributes (list-system-processes))))
+  (let ((standard-attributes (car process-alist))
         new-format fmi)
     (if (and proced-tree-flag
              (assq 'ppid standard-attributes))

From af95583f7dad43712c7aafd79d861ea06dd9673a Mon Sep 17 00:00:00 2001
From: Rahguzar <rahguzar@mailbox.org>
Date: Fri, 17 Apr 2026 18:06:17 -0500
Subject: [PATCH 141/463] proced-format: Use internal var for speed-up
 (bug#77775).

* lisp/proced.el (proced-format-current-process): New variable.
* lisp/proced.el (proced-format-pid, proced-format): Use it.
---
 lisp/proced.el | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/lisp/proced.el b/lisp/proced.el
index 4b05a8d65b8..5053b5fb4d3 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -180,9 +180,11 @@ Symbol KEY is the car of a process attribute.
 
 String NAME appears in the header line.
 
-FORMAT specifies the format for displaying the attribute values.  It can
-be a string passed to `format'.  It can be a function called with one
-argument, the value of the attribute.  The value nil means take as is.
+FORMAT specifies the format for displaying the attribute values.
+It can be a string passed to `format'.  It can be a function called with one
+argument, the value of the attribute.  This function can access the full list
+of attributes of the respective process via `proced-format-current-process'.
+If FORMAT is nil take the attribute value as is.
 
 If JUSTIFY is an integer, its modulus gives the width of the attribute
 values formatted with FORMAT.  If JUSTIFY is positive, NAME appears
@@ -428,6 +430,10 @@ cons pairs, see `proced-process-attributes'.")
   "Sort scheme for listing (internal format).
 It is a list of lists (KEY PREDICATE REVERSE).")
 
+(defvar proced-format-current-process nil
+  "Attributes of current process worked on by function `proced-format'.
+See `proced-grammar-alist'.")
+
 (defvar proced-marker-char ?*		; the answer is 42
   "In Proced, the current mark character.")
 
@@ -1682,13 +1688,13 @@ Replace newline characters by \"^J\" (two characters)."
 
 (defun proced-format-pid (pid)
   "Format PID."
-  (let ((proc-info (process-attributes pid))
-        (pid-s (number-to-string pid)))
+  (let ((pid-s (number-to-string pid)))
     (cond ((and proced-enable-color-flag
                 (not (file-remote-p default-directory))
                 (equal pid (emacs-pid)))
            (propertize pid-s 'font-lock-face 'proced-emacs-pid))
-          ((and proced-enable-color-flag (equal pid (alist-get 'sess proc-info)))
+          ((and proced-enable-color-flag
+                (equal pid (alist-get 'sess proced-format-current-process)))
            (propertize pid-s 'font-lock-face 'proced-session-leader-pid))
           (proced-enable-color-flag
            (propertize pid-s 'font-lock-face 'proced-pid))
@@ -1813,7 +1819,8 @@ Replace newline characters by \"^J\" (two characters)."
                  (end-of-line)
                  (setq value (cdr (assq key (cdr process))))
                  (insert (if value
-                             (apply #'propertize (funcall fun value) fprops)
+                             (let ((proced-format-current-process process))
+                               (apply #'propertize (funcall fun value) fprops))
                            (format (concat "%" (number-to-string (nth 3 grammar)) "s")
                                    unknown))
                          whitespace)
@@ -1827,7 +1834,9 @@ Replace newline characters by \"^J\" (two characters)."
                (dolist (process process-alist)
                  (end-of-line)
                  (setq value (cdr (assq key (cdr process))))
-                 (insert (if value (apply #'propertize (funcall fun value) fprops)
+                 (insert (if value
+                             (let ((proced-format-current-process process))
+                               (apply #'propertize (funcall fun value) fprops))
                            unknown))
                  (forward-line))
                (push (apply #'propertize (nth 1 grammar) hprops) header-list))
@@ -1838,7 +1847,8 @@ Replace newline characters by \"^J\" (two characters)."
                  (dolist (process process-alist)
                    (setq value (cdr (assq key (cdr process))))
                    (if value
-                       (setq value (apply #'propertize (funcall fun value) fprops)
+                       (setq value (let ((proced-format-current-process process))
+                                     (apply #'propertize (funcall fun value) fprops))
                              width (max width (length value))
                              field-list (cons value field-list))
                      (push unknown field-list)

From 1b8512d676b0209c3cd31ce9fcaf0a311387683e Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Fri, 17 Apr 2026 18:24:25 -0700
Subject: [PATCH 142/463] Fix c-ts-mode-set-style when STYLE is a function
 (bug#80777)

* lisp/progmodes/c-ts-mode.el (c-ts-mode-set-style): Prepend the
language symbol in front of the styles.
---
 lisp/progmodes/c-ts-mode.el | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index be67e8db78f..591000cb440 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -200,11 +200,10 @@ To set the default indent style globally, use
       (user-error "The current buffer is not in `c-ts-mode' nor `c++-ts-mode'")
     (setq-local c-ts-mode-indent-style style)
     (setq treesit-simple-indent-rules
-          (if (functionp style)
-              (funcall style)
-            (c-ts-mode--simple-indent-rules
-             (if (derived-mode-p 'c-ts-mode) 'c 'cpp)
-             style)))))
+          (let ((lang (if (derived-mode-p 'c-ts-mode) 'c 'cpp)))
+            (if (functionp style)
+                (list (cons lang (funcall style)))
+              (c-ts-mode--simple-indent-rules lang style))))))
 
 (defcustom c-ts-mode-emacs-sources-support t
   "Whether to enable Emacs source-specific C features.

From 5e7518b8387681d0b4c923d261d4183da0b7929b Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Fri, 17 Apr 2026 20:18:34 -0700
Subject: [PATCH 143/463] ; * src/treesit.c (compute_new_linecol_by_change):
 Fix comment.

---
 src/treesit.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/treesit.c b/src/treesit.c
index 6f0b0cd720e..2b96fe47ce2 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1295,11 +1295,13 @@ compute_new_linecol_by_change (struct ts_linecol pos_linecol,
   /* 2. When old_end (oe) is before pos, the difference between pos and
      pos' is the difference between old_end and new_end (ne).
 
-     |     |   |           |     |   |
-     s     oe  pos         s     oe  pos
-		      OR
-     |  |   |              |         |
-     s  ne  pos'           s         ne  pos'
+     Delete:                   Insert:
+
+     |     |   |               |     |   |
+     s     oe  pos             s     oe  pos
+
+     |  |   |                  |         |   |
+     s  ne  pos'               s         ne  pos'
 
    */
   else if (old_end_linecol.bytepos <= pos_linecol.bytepos)

From 8f535370b9efbc91673b20c6987a5cae4f6dc562 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 18 Apr 2026 10:35:05 +0300
Subject: [PATCH 144/463] * src/image.c (svg_load_image): Fix off-by-one
 mistake (bug#80851).

---
 src/image.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/image.c b/src/image.c
index b5b7de3351f..d98c63f06c6 100644
--- a/src/image.c
+++ b/src/image.c
@@ -12052,7 +12052,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents,
     {
       css = xmalloc (SBYTES (lcss) + 1);
       strncpy (css, SSDATA (lcss), SBYTES (lcss));
-      *(css + SBYTES (lcss) + 1) = 0;
+      *(css + SBYTES (lcss)) = 0;
     }
 #endif
 

From c4902924b6f793029229809f563a32a71e7b3c6d Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Mon, 13 Apr 2026 19:59:25 +0200
Subject: [PATCH 145/463] ; Add missing docstring for
 'package-matches-selector-p'

* lisp/emacs-lisp/package.el (package-matches-selector-p): New
docstring based on 'package-review-policy'.
---
 lisp/emacs-lisp/package.el | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 7d934222b16..4385b1a1722 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -741,6 +741,14 @@ if the user selects a diff-related option during review."
   :version "31.1")
 
 (defun package-matches-selector-p (selector pkg-desc)
+  "Return non-nil if SELECTOR matches PKG-DESC.
+If SELECTOR is t the match always passes.  If SELECTOR is a list to a
+list you can specify a list of conditions.  An entry of the
+form (archive STRING) will match any packages from the archive
+STRING (see `package-archives'), and an entry of the form (package
+SYMBOL) will match any packages whose names match SYMBOL.  If any
+singular condition matches, then the entire selector matches PKG-DESC.
+If you prefix the list with a symbol `not', the rules are inverted."
   (let ((archive (package-desc-archive pkg-desc))
         (name (package-desc-name pkg-desc)))
     (pcase-exhaustive selector

From 27434c0f9d7ca262ff7cf7e00e2cb2a51c30708f Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Mon, 13 Apr 2026 21:01:17 +0200
Subject: [PATCH 146/463] Use git-diff(1) in 'package-review-diff-command' if
 available

* lisp/emacs-lisp/package.el (package--review-git-diff-command):
Add new constant to avoid duplicating the exact command as the
default value and in the type of the user option.
(package-review-diff-command): Use git-diff(1) if Git is
installed, and fall back to regular diff(1) otherwise.  The
previous default value has been moved to the user option, as a
suggested alternative.
(package-review): Support the ability to use symbols, that get
replaced and expanded into the list of switches.

(Bug#80684)

Co-Authored-By: Daniel Mendler <mail@daniel-mendler.de>
---
 lisp/emacs-lisp/package.el | 59 +++++++++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 17 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 4385b1a1722..1d654b87ed8 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -721,23 +721,44 @@ case you are concerned about moving files between file systems."
   :type 'directory
   :version "31.1")
 
+(defconst package--review-git-diff-command
+  ;; Git's diff command can be used as a regular diff implementation
+  ;; with the --no-index flag.  The advantage is that the
+  ;; --diff-filter=d ignores files which are not present in the
+  ;; newly extracted archive.  This way, already compiled elc files
+  ;; are not shown as part of the diff for example.
+  '("git" "diff" "--no-index" "--no-color" "--diff-filter=d" "--minimal"
+    vc-git-diff-switches))
+
 (defcustom package-review-diff-command
-  (cons diff-command
-        (mapcar #'shell-quote-argument
-                '("-u"                  ;unified patch formatting
-                  "-N"                  ;treat absent files as empty
-                  "-x" "*.elc"          ;ignore byte compiled files
-                  "-x" "*-autoloads.el" ;ignore the autoloads file
-                  "-x" "*-pkg.el"       ;ignore the package description
-                  "-x" "*.info"         ;ignore compiled Info files
-                  )))
+  (if (executable-find "git")
+      package--review-git-diff-command
+    (list diff-command "-u" "-N"))
   "Configuration of how `package-review' should generate a Diff.
 The structure of the value must be (COMMAND . OPTIONS), where
 `diff-command' is rebound to be COMMAND and OPTIONS are command-line
-switches and arguments passed to `diff-no-select' as the SWITCHES argument
-if the user selects a diff-related option during review."
-  :type '(cons (string :tag "Diff command name")
-               (repeat :tag "Diff command-line arguments" string))
+switches and arguments passed to `diff-no-select' as the SWITCHES
+argument if the user selects a diff-related option during review.
+SWITCHES may additionally also include a symbol, which is replaced by
+the symbol value."
+  :type `(choice
+          (const :tag "Use git diff, excluding deleted files"
+                 ,package--review-git-diff-command)
+          (const :tag "Use diff, without exclusion" ("diff" "-u" "-N"))
+          (const :tag "Use diff, with exclusion of safe files"
+                 ,(cons diff-command
+                        (mapcar #'shell-quote-argument
+                                '("-u"                  ;unified patch formatting
+                                  "-N"                  ;treat absent files as empty
+                                  "-x" "*.elc"          ;ignore byte compiled files
+                                  "-x" "*-autoloads.el" ;ignore the autoloads file
+                                  "-x" "*-pkg.el"       ;ignore the package description
+                                  "-x" "*.info"         ;ignore compiled Info files
+                                  ))))
+          (cons :tag "Custom diff command"
+                (string :tag "Diff command name")
+                (repeat :tag "Diff command-line arguments"
+                        (or symbol string))))
   :version "31.1")
 
 (defun package-matches-selector-p (selector pkg-desc)
@@ -781,7 +802,12 @@ review fails, the function throws a symbol `review-failed' with PKG-DESC
 attached."
   (let ((news (package-find-news-file pkg-desc))
         (enable-recursive-minibuffers t)
-        (diff-command (car package-review-diff-command)))
+        (diff-command (car package-review-diff-command))
+        (switches (cl-loop for switch in (cdr package-review-diff-command)
+                           when (stringp switch) collect switch into result
+                           when (and (symbolp switch) (boundp switch))
+                           append (ensure-list (symbol-value switch)) into result
+                           finally (delq t result))))
     (while (pcase-exhaustive
                (car (read-multiple-choice
                      (format "Install \"%s\"?" (package-desc-name pkg-desc))
@@ -798,7 +824,7 @@ attached."
              (?d
               (display-buffer
                (diff-no-select
-                (package-desc-dir old-desc) pkg-dir (cdr package-review-diff-command) t
+                (package-desc-dir old-desc) pkg-dir switches t
                 (get-buffer-create (format "*Package Review Diff: %s*"
                                            (package-desc-full-name pkg-desc)))))
               t)
@@ -806,8 +832,7 @@ attached."
               (with-temp-buffer
                 (diff-no-select
                  (package-desc-dir old-desc) pkg-dir
-                 (cdr package-review-diff-command)
-                 t (current-buffer))
+                 switches t (current-buffer))
                 ;; delete sentinel message
                 (goto-char (point-max))
                 (forward-line -2)

From 0051e2b707b68281ab9adfba78d7f54a2b38d6e8 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sat, 18 Apr 2026 14:05:36 +0200
Subject: [PATCH 147/463] Suppress queries when installing package from file

* lisp/emacs-lisp/package.el (package-install-file): Assume it
is OK to set the visited file name, since we are not actually
touching anything on disk, and prevent the modified flag from
preventing us to kill the temporary buffer.  The flag is set by
tar-mode.
---
 lisp/emacs-lisp/package.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 1d654b87ed8..4d0414f736a 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2327,11 +2327,12 @@ directory."
           (setq default-directory file)
           (dired-mode))
       (insert-file-contents-literally file)
-      (set-visited-file-name file)
+      (set-visited-file-name file t)
       (set-buffer-modified-p nil)
       (when (string-match "\\.tar\\'" file) (tar-mode)))
     (unwind-protect
-        (package-install-from-buffer)
+        (with-silent-modifications
+          (package-install-from-buffer))
       (fundamental-mode))))             ; free auxiliary data
 
 ;;;###autoload

From 0ed0ff69e56952d621340c3d9797e91030c95429 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sat, 18 Apr 2026 14:46:04 +0200
Subject: [PATCH 148/463] ; Fix cl-loop related typo from 27434c0f

---
 lisp/emacs-lisp/package.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 4d0414f736a..984d3566f08 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -807,7 +807,7 @@ attached."
                            when (stringp switch) collect switch into result
                            when (and (symbolp switch) (boundp switch))
                            append (ensure-list (symbol-value switch)) into result
-                           finally (delq t result))))
+                           finally return (delq t result))))
     (while (pcase-exhaustive
                (car (read-multiple-choice
                      (format "Install \"%s\"?" (package-desc-name pkg-desc))

From e6873462ce19a1c3926f7e5c33d3624ed239c685 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 19 Apr 2026 00:01:22 -0400
Subject: [PATCH 149/463] (js-jsx--detect-after-change): Fix test regression

Commit 6942d508f0c made js-mode-regexp-syntax-bug-25529 fail,
because it changes the moment and place in which
`syntax-propertize` gets called, uncovering a bug where
`js-jsx--detect-after-change` narrows the buffer, then calls
`re-search-forward` which calls `syntax-propertize`, so we end
up doing `syntax-propertize` while narrowed which can fail in
all kinds of ways.

* lisp/progmodes/js.el (js-jsx--detect-and-enable): Change optional arg
to BEG and END.
(js-jsx--detect-after-change): Use them to avoid narrowing.

* lisp/emacs-lisp/syntax.el (syntax-propertize): Emit a message
when called narrowed and the narrowing starts later than the
nearest already propertized position.
---
 lisp/emacs-lisp/syntax.el |  3 +++
 lisp/progmodes/js.el      | 25 +++++++++++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index 7b4d0f0bf1f..ae1caca0cd5 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -401,6 +401,9 @@ It's also used so that `syntax-ppss-flush-cache' can be used from within
       ;;          syntax-propertize--done pos)
       (setq-local parse-sexp-lookup-properties t)
       (when (< syntax-propertize--done (point-min))
+        (when (> syntax-propertize--done 0)
+          (message "Cannot syntax-propertize %d..%d because of narrowing!"
+                   syntax-propertize--done (point-min)))
         ;; *Usually* syntax-propertize is called via syntax-ppss which
         ;; takes care of adding syntax-ppss-flush-cache to b-c-f, but this
         ;; is not *always* the case, so since we share a single "flush" function
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index a5e1d8ac023..e7e5bd901e1 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3361,25 +3361,25 @@ their `mode-name' updates to show enabled syntax extensions."
   "Case-sensitive regexps for detecting JSX in JavaScript buffers.
 When `js-jsx-detect-syntax' is non-nil and any of these regexps
 match text near the beginning of a JavaScript buffer,
-`js-jsx-syntax' (which see) will be made buffer-local and set to
-t.")
+`js-jsx-syntax' (which see) will be made buffer-local and set to t.")
 
-(defun js-jsx--detect-and-enable (&optional arbitrarily)
+(defun js-jsx--detect-and-enable (&optional beg end)
   "Detect if JSX is likely to be used, and enable it if so.
 Might make `js-jsx-syntax' buffer-local and set it to t.  Matches
-from the beginning of the buffer, unless optional arg ARBITRARILY
-is non-nil.  Return t after enabling, nil otherwise."
+between BEG..END (defaults to the first 4KB of the buffer).
+Return non-nil after enabling, nil otherwise."
   (when (or (and (buffer-file-name)
                  (string-match-p "\\.jsx\\'" (buffer-file-name)))
             (and js-jsx-detect-syntax
                  (save-excursion
-                   (unless arbitrarily
-                     (goto-char (point-min)))
+                   (unless (integerp beg)
+                     (setq beg (point-min) end (min (+ beg 4000) (point-max))))
+                   (goto-char beg)
                    (catch 'match
                      (mapc
                       (lambda (regexp)
                         (when (let (case-fold-search)
-                                (re-search-forward regexp 4000 t))
+                                (re-search-forward regexp end t))
                           (throw 'match t)))
                       js-jsx-regexps)
                      nil))))
@@ -3393,10 +3393,11 @@ This function is intended for use in `after-change-functions'."
     (save-excursion
       (goto-char beg)
       (beginning-of-line)
-      (save-restriction
-        (narrow-to-region (point) end)
-        (when (js-jsx--detect-and-enable 'arbitrarily)
-          (remove-hook 'after-change-functions #'js-jsx--detect-after-change t))))))
+      ;; `after-change-functions' shouldn't affect the match-data.
+      ;; FIXME: It would be better to move this work to a timer or
+      ;; a `post-command-hook'.
+      (when (save-match-data (js-jsx--detect-and-enable beg end))
+        (remove-hook 'after-change-functions #'js-jsx--detect-after-change t)))))
 
 ;; Ensure all CC Mode "lang variables" are set to valid values.
 ;; js-mode, however, currently uses only those needed for filling.

From 1ae3a0903245e5e2f72274f04688c41959843968 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 18 Apr 2026 22:07:35 -0700
Subject: [PATCH 150/463] Pacify clang 21.1.8 + gdk-pixbuf 2.44

* src/pgtkfns.c (xg_set_icon_from_xpm_data):
* src/xfns.c (xg_set_icon_from_xpm_data):
Also pacify clang when --enable-gcc-warnings is used.
---
 src/pgtkfns.c | 4 ++--
 src/xfns.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index 630175b2283..53fe5fbc9d0 100644
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -775,7 +775,7 @@ xg_set_icon_from_xpm_data (struct frame *f, const char **data)
      Pacify GCC for now.  */
 #if (defined GDK_PIXBUF_VERSION_2_44 \
      && GDK_PIXBUF_VERSION_2_44 <= GDK_PIXBUF_VERSION_MIN_REQUIRED \
-     && GNUC_PREREQ (4, 6, 0))
+     && (GNUC_PREREQ (4, 6, 0) || defined __clang__))
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
@@ -784,7 +784,7 @@ xg_set_icon_from_xpm_data (struct frame *f, const char **data)
 
 #if (defined GDK_PIXBUF_VERSION_2_44 \
      && GDK_PIXBUF_VERSION_2_44 <= GDK_PIXBUF_VERSION_MIN_REQUIRED \
-     && GNUC_PREREQ (4, 6, 0))
+     && (GNUC_PREREQ (4, 6, 0) || defined __clang__))
 # pragma GCC diagnostic pop
 #endif
 
diff --git a/src/xfns.c b/src/xfns.c
index 33ec8312cb5..0c9215b9d6b 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1152,7 +1152,7 @@ xg_set_icon_from_xpm_data (struct frame *f, const char **data)
      Pacify GCC for now.  */
 #if (defined GDK_PIXBUF_VERSION_2_44 \
      && GDK_PIXBUF_VERSION_2_44 <= GDK_PIXBUF_VERSION_MIN_REQUIRED \
-     && GNUC_PREREQ (4, 6, 0))
+     && (GNUC_PREREQ (4, 6, 0) || defined __clang__))
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
@@ -1161,7 +1161,7 @@ xg_set_icon_from_xpm_data (struct frame *f, const char **data)
 
 #if (defined GDK_PIXBUF_VERSION_2_44 \
      && GDK_PIXBUF_VERSION_2_44 <= GDK_PIXBUF_VERSION_MIN_REQUIRED \
-     && GNUC_PREREQ (4, 6, 0))
+     && (GNUC_PREREQ (4, 6, 0) || defined __clang__))
 # pragma GCC diagnostic pop
 #endif
 

From 38e704c1dcf0c7038043c302c5c63003e57c0716 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 14 Apr 2026 12:35:22 -0700
Subject: [PATCH 151/463] emacs server sending long-line simplification
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now that emacsclient can receive long lines without problems,
don’t bother splitting long lines when sending to it.
* lisp/server.el (server-msg-size): Now obsolete.
(server-reply-print): Send qtext without trying to break it
into pieces (Bug#80807#49).
---
 lisp/server.el | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/lisp/server.el b/lisp/server.el
index b0f11cf2dd6..c2aa854a4bb 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -900,25 +900,12 @@ Server mode runs a process that accepts commands from the
 
 (defconst server-msg-size 1024
   "Maximum size of a message sent to a client.")
+(make-obsolete-variable 'server-msg-size nil "31.1")
 
 (defun server-reply-print (qtext proc)
   "Send a `-print QTEXT' command to client PROC.
-QTEXT must be already quoted.
-This handles splitting the command if it would be bigger than
-`server-msg-size'."
-  (let ((prefix "-print ")
-	part)
-    (while (> (+ (length qtext) (length prefix) 1) server-msg-size)
-      ;; We have to split the string
-      (setq part (substring qtext 0 (- server-msg-size (length prefix) 1)))
-      ;; Don't split in the middle of a quote sequence
-      (if (string-match "\\(^\\|[^&]\\)&\\(&&\\)*$" part)
-	  ;; There is an uneven number of & at the end
-	  (setq part (substring part 0 -1)))
-      (setq qtext (substring qtext (length part)))
-      (server-send-string proc (concat prefix part "\n"))
-      (setq prefix "-print-nonl "))
-    (server-send-string proc (concat prefix qtext "\n"))))
+QTEXT must be already quoted."
+  (server-send-string proc (concat "-print " qtext "\n")))
 
 (defun server-create-tty-frame (tty type proc &optional parameters)
   (unless tty

From b0034dffcc198d45556cbdc0a28121213a027698 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 19 Apr 2026 15:19:20 +0200
Subject: [PATCH 152/463] Some minor Tramp changes

* lisp/net/tramp-sh.el (tramp-get-remote-arg-max): New defun.
(tramp-open-connection-setup-interactive-shell): Use it.

* lisp/net/tramp.el (tramp-multi-hop-p-hook): New defvar.
(tramp-multi-hop-p): Use it.
(tramp-handle-make-process): Set TERM environment.
---
 lisp/net/tramp-sh.el | 16 ++++++++++++++--
 lisp/net/tramp.el    | 14 ++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 668eae3198b..079f82f556a 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4693,13 +4693,14 @@ process to set up.  VEC specifies the connection."
     ;; `connection-local-profile-name-for-criteria' exists since Emacs 29.1.
     ;; We simulate it with `make-symbol'.
     (when (boundp 'command-line-max-length)
-      (let* ((criteria (tramp-get-connection-local-criteria vec))
+      (let* ((arg-max (tramp-get-remote-arg-max vec))
+	     (criteria (tramp-get-connection-local-criteria vec))
 	     (profile (if (fboundp 'connection-local-profile-name-for-criteria)
 			  (connection-local-profile-name-for-criteria criteria)
 			(make-symbol "generated-profile-name"))))
 	(connection-local-set-profile-variables
 	 profile
-	 `((command-line-max-length . ,(tramp-get-remote-pipe-buf vec))))
+	 `((command-line-max-length . ,(if arg-max (floor arg-max 4) 4094))))
 	(connection-local-set-profiles criteria profile)))))
 
 ;; Old text from documentation of tramp-methods:
@@ -5809,6 +5810,17 @@ Nonexistent directories are removed from spec."
 	   (lambda (x) (not (tramp-get-file-property vec x "file-directory-p")))
 	   remote-path))))))
 
+(defun tramp-get-remote-arg-max (vec)
+  "Return ARG_MAX config from the remote side."
+  (with-tramp-connection-property vec "arg-max"
+    (when-let* ((result
+		 (tramp-send-command-and-read
+		  vec (format "getconf ARG_MAX 2>%s"
+			      (tramp-get-remote-null-device vec))
+		  'noerror))
+		((natnump result)))
+      result)))
+
 ;; The PIPE_BUF in POSIX [1] can be as low as 512 [2].  Here are the values
 ;; on various platforms:
 ;;   - 512 on macOS, FreeBSD, NetBSD, OpenBSD, MirBSD, native Windows.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 0685de12494..553b76bd044 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -5227,11 +5227,17 @@ Do not set it manually, it is used buffer-local in `tramp-get-lock-pid'.")
 	      (delete-file local-copy)))))
       t)))
 
+(defvar tramp-multi-hop-p-hook nil
+  "Abnormal hook for `tramp-multi-hop-p'.
+This can be used by external Tramp backends to inform, that they are
+multi-hop capable.")
+
 (defun tramp-multi-hop-p (vec)
   "Whether the method of VEC is capable of multi-hops."
   (let ((tramp-verbose 0))
-    (and (tramp-sh-file-name-handler-p vec)
-	 (tramp-get-method-parameter vec 'tramp-login-args))))
+    (or (and (tramp-sh-file-name-handler-p vec)
+	     (tramp-get-method-parameter vec 'tramp-login-args))
+	(run-hook-with-args-until-success 'tramp-multi-hop-p-hook vec))))
 
 (defun tramp-add-hops (vec)
   "Add ad-hoc proxy definitions to `tramp-default-proxies-alist'."
@@ -5499,6 +5505,10 @@ processes."
 		      (setenv-internal env "HISTFILESIZE" "0" 'keep))
 		     (t env))
 		  env))
+	   ;; Add TERM.
+	   (env (if sh-file-name-handler-p
+		    (setenv-internal env "TERM" tramp-terminal-type 'keep)
+		  env))
 	   ;; Add INSIDE_EMACS.
 	   (env (setenv-internal env "INSIDE_EMACS" (tramp-inside-emacs) 'keep))
 	   (env (mapcar #'tramp-shell-quote-argument (delq nil env)))

From 6894b65440fa1632762ff78372ddeb3be552182b Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Sat, 18 Apr 2026 22:31:58 -0700
Subject: [PATCH 153/463] Fix tree-sitter variable name

* lisp/treesit.el:
(treesit-languages-require-line-column-tracking): This is what
treesit.c uses.
* src/treesit.c: Fix comment typo.
---
 lisp/treesit.el | 2 +-
 src/treesit.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 14c05b0dd16..82bdb97602d 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1264,7 +1264,7 @@ omitted, default END to BEG."
 ;;; Language
 
 ;; Defined in treesit.c.  This is just to add some default values.
-(defvar treesit-languages-need-line-column-tracking
+(defvar treesit-languages-require-line-column-tracking
   '(haskell))
 
 ;; The entries are sorted by `sort-lines'.
diff --git a/src/treesit.c b/src/treesit.c
index 2b96fe47ce2..4713378315d 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1527,7 +1527,7 @@ treesit_linecol_maybe (ptrdiff_t pos, ptrdiff_t pos_byte,
    does not parse the buffer and only updates the tree, so it should be
    very fast.
 
-   This is a wrapper over treesit_record_change that does a bit more
+   This is a wrapper over treesit_record_change_1 that does a bit more
    boilerplate work: it (optionally) calculates linecol for new_end,
    pass all the positions into treesit_record_change_1 which does the
    real work, and finally (optionally) sets buffer's linecol cache to

From 3d0597e9b2e10a0c6d58c5bba514e77751b6d819 Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Sun, 19 Apr 2026 19:49:48 -0700
Subject: [PATCH 154/463] * src/treesit.c (Ftreesit__linecol_at): Add
 treesit_check_position.

---
 src/treesit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/treesit.c b/src/treesit.c
index 4713378315d..2c6ab6aaa2b 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -5163,7 +5163,7 @@ return the line and column in the form of
 This is used for internal testing and debugging ONLY.  */)
   (Lisp_Object pos)
 {
-  CHECK_NUMBER (pos);
+  treesit_check_position (pos, current_buffer);
   struct ts_linecol pos_linecol
     = treesit_linecol_of_pos (CHAR_TO_BYTE (fix_position (pos)),
 			      BUF_TS_LINECOL_POINT (current_buffer));

From 29751e472430555034ef6ae23f467266e398495a Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Sun, 19 Apr 2026 20:01:25 -0700
Subject: [PATCH 155/463] Make sure treesit-fill-reindent-defun handles nil
 defun (bug#80860)

* lisp/treesit.el (treesit-fill-reindent-defun): Display error
when there's no defun at point.
---
 lisp/treesit.el | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 82bdb97602d..b4f148e8972 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -4038,9 +4038,11 @@ JUSTIFY is the same as in `fill-paragraph'."
         (fill-paragraph justify (region-active-p))
       (let* ((treesit-defun-tactic 'parent-first)
              (node (treesit-defun-at-point)))
-        (indent-region (treesit-node-start node)
-                       (treesit-node-end node)
-                       nil)))))
+        (if node
+            (indent-region (treesit-node-start node)
+                           (treesit-node-end node)
+                           nil)
+          (user-error "No defun detected at point"))))))
 
 ;;; Imenu
 

From 0d8ccbfe595f4b3ce5a9c5c53bcabe7e4a8b6849 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sun, 19 Apr 2026 23:10:39 -0400
Subject: [PATCH 156/463] Update to Org 9.8.3

---
 etc/refcards/orgcard.tex | 2 +-
 lisp/org/ob-tangle.el    | 9 +++++++--
 lisp/org/org-version.el  | 4 ++--
 lisp/org/org.el          | 2 +-
 lisp/org/ox-html.el      | 3 ++-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 88444fef54e..dcd3208d132 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{9.8.2}
+\def\orgversionnumber{9.8.3}
 \def\versionyear{2026}          % latest update
 \input emacsver.tex
 
diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el
index 9d4c914c27f..a21ab3f18aa 100644
--- a/lisp/org/ob-tangle.el
+++ b/lisp/org/ob-tangle.el
@@ -42,6 +42,7 @@
 (declare-function org-before-first-heading-p "org" ())
 (declare-function org-element-lineage "org-element-ast" (datum &optional types with-self))
 (declare-function org-element-begin "org-element" (node))
+(declare-function org-element-end "org-element" (node))
 (declare-function org-element-at-point "org-element" (&optional pom cached-only))
 (declare-function org-element-type-p "org-element-ast" (node types))
 (declare-function org-heading-components "org" ())
@@ -720,8 +721,12 @@ of the current buffer."
       (forward-line 1)
       ;; Try to preserve location of point within the source code in
       ;; tangled code file.
-      (let ((offset (- mid body-start)))
-	(when (> end (+ offset (point)))
+      (let ((offset (- mid body-start))
+            (block-ends-here (org-with-point-at (org-element-end (org-element-at-point))
+                               (skip-chars-backward " \t\n\r")
+                               (forward-line 0)
+                               (point))))
+        (when (> block-ends-here (+ offset (point)))
 	  (forward-char offset)))
       (setq target-char (point)))
     (org-src-switch-to-buffer target-buffer t)
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 75d036844d8..b6a6d1d4eec 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -5,13 +5,13 @@
 (defun org-release ()
   "The release version of Org.
 Inserted by installing Org mode or when a release is made."
-   (let ((org-release "9.8.2"))
+   (let ((org-release "9.8.3"))
      org-release))
 ;;;###autoload
 (defun org-git-version ()
   "The Git version of Org mode.
 Inserted by installing Org or when a release is made."
-   (let ((org-git-version "release_9.8.2"))
+   (let ((org-git-version "release_9.8.3"))
      org-git-version))
 
 (provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index bf3bfbc6244..84b4f245f8e 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -9,7 +9,7 @@
 ;; URL: https://orgmode.org
 ;; Package-Requires: ((emacs "28.2"))
 
-;; Version: 9.8.2
+;; Version: 9.8.3
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el
index 6916cc21609..8e6f341565b 100644
--- a/lisp/org/ox-html.el
+++ b/lisp/org/ox-html.el
@@ -3103,7 +3103,8 @@ INFO is a plist containing export properties."
 	      (concat (file-name-as-directory org-preview-latex-image-directory)
 		      (file-name-sans-extension
 		       (file-name-nondirectory bfn)))
-	      cache-dir (file-name-directory (plist-get info :output-file)))
+	      cache-dir (file-name-directory
+                         (or (plist-get info :output-file) bfn)))
 	;; Re-create LaTeX environment from original buffer in
 	;; temporary buffer so that dvipng/imagemagick can properly
 	;; turn the fragment into an image.

From 6de3bc0bf2acff7f41fc7472e6067e552909d0aa Mon Sep 17 00:00:00 2001
From: Roland Winkler <winkler@gnu.org>
Date: Sun, 19 Apr 2026 23:28:18 -0500
Subject: [PATCH 157/463] proced-format: Simplify last change

* lisp/proced.el (proced-current-process): Rename from
proced-format-current-process.
(proced-format): Use it.  Simplify.
---
 lisp/proced.el | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/lisp/proced.el b/lisp/proced.el
index 5053b5fb4d3..ebdf61e683c 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -183,7 +183,7 @@ String NAME appears in the header line.
 FORMAT specifies the format for displaying the attribute values.
 It can be a string passed to `format'.  It can be a function called with one
 argument, the value of the attribute.  This function can access the full list
-of attributes of the respective process via `proced-format-current-process'.
+of attributes of the respective process via `proced-current-process'.
 If FORMAT is nil take the attribute value as is.
 
 If JUSTIFY is an integer, its modulus gives the width of the attribute
@@ -430,7 +430,7 @@ cons pairs, see `proced-process-attributes'.")
   "Sort scheme for listing (internal format).
 It is a list of lists (KEY PREDICATE REVERSE).")
 
-(defvar proced-format-current-process nil
+(defvar proced-current-process nil
   "Attributes of current process worked on by function `proced-format'.
 See `proced-grammar-alist'.")
 
@@ -1694,7 +1694,7 @@ Replace newline characters by \"^J\" (two characters)."
                 (equal pid (emacs-pid)))
            (propertize pid-s 'font-lock-face 'proced-emacs-pid))
           ((and proced-enable-color-flag
-                (equal pid (alist-get 'sess proced-format-current-process)))
+                (equal pid (alist-get 'sess proced-current-process)))
            (propertize pid-s 'font-lock-face 'proced-session-leader-pid))
           (proced-enable-color-flag
            (propertize pid-s 'font-lock-face 'proced-pid))
@@ -1815,12 +1815,11 @@ Replace newline characters by \"^J\" (two characters)."
         (goto-char (point-min))
         (cond ( ;; fixed width of output field
                (numberp (nth 3 grammar))
-               (dolist (process process-alist)
+               (dolist (proced-current-process process-alist)
                  (end-of-line)
-                 (setq value (cdr (assq key (cdr process))))
+                 (setq value (cdr (assq key (cdr proced-current-process))))
                  (insert (if value
-                             (let ((proced-format-current-process process))
-                               (apply #'propertize (funcall fun value) fprops))
+                             (apply #'propertize (funcall fun value) fprops)
                            (format (concat "%" (number-to-string (nth 3 grammar)) "s")
                                    unknown))
                          whitespace)
@@ -1831,12 +1830,11 @@ Replace newline characters by \"^J\" (two characters)."
 
               ( ;; last field left-justified
                (and (not format) (eq 'left (nth 3 grammar)))
-               (dolist (process process-alist)
+               (dolist (proced-current-process process-alist)
                  (end-of-line)
-                 (setq value (cdr (assq key (cdr process))))
+                 (setq value (cdr (assq key (cdr proced-current-process))))
                  (insert (if value
-                             (let ((proced-format-current-process process))
-                               (apply #'propertize (funcall fun value) fprops))
+                             (apply #'propertize (funcall fun value) fprops)
                            unknown))
                  (forward-line))
                (push (apply #'propertize (nth 1 grammar) hprops) header-list))
@@ -1844,11 +1842,10 @@ Replace newline characters by \"^J\" (two characters)."
               (t ;; calculated field width
                (let ((width (length (nth 1 grammar)))
                      field-list value)
-                 (dolist (process process-alist)
-                   (setq value (cdr (assq key (cdr process))))
+                 (dolist (proced-current-process process-alist)
+                   (setq value (cdr (assq key (cdr proced-current-process))))
                    (if value
-                       (setq value (let ((proced-format-current-process process))
-                                     (apply #'propertize (funcall fun value) fprops))
+                       (setq value (apply #'propertize (funcall fun value) fprops)
                              width (max width (length value))
                              field-list (cons value field-list))
                      (push unknown field-list)

From b7eb715a134f2c98b9a358cebcc2c47832d212ae Mon Sep 17 00:00:00 2001
From: Martin Rudalics <rudalics@gmx.at>
Date: Mon, 20 Apr 2026 10:33:55 +0200
Subject: [PATCH 158/463] Fix control window setup in
 'ediff-setup-windows-plain-compare' (Bug#80809)

* lisp/vc/ediff-wind.el (ediff-setup-windows-plain-compare): Do
not call 'display-buffer-in-direction' directly (Bug#80809).
---
 lisp/vc/ediff-wind.el | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index 2174c5f4e29..c7a9b1b349d 100644
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -453,9 +453,15 @@ BODY, instead returning nil."
       (set-window-start wind-A wind-A-start)
       (set-window-start wind-B wind-B-start))
 
-    (select-window (display-buffer-in-direction
-                    control-buffer
-                    '((direction . bottom))))
+    ;; Do not call 'display-buffer-in-direction' directly (Bug#80809).
+    ;; If making a new window fails, reuse an existing one.
+    (pop-to-buffer
+     control-buffer
+     '(display-buffer-in-direction
+       ;; Don't let 'display-buffer' put the control buffer into a new
+       ;; frame - ‘ediff-cleanup-mess’ can't handle it (if you insist,
+       ;; run 'quit-restore-window' instead of 'delete-window' there).
+       . ((direction . bottom) (pop-up-frames . nil))))
     (ediff-setup-control-buffer control-buffer)))
 
 ;; dispatch an appropriate window setup function

From ddef61cd4bc9ff15722f0e85aa07f0343cb082e4 Mon Sep 17 00:00:00 2001
From: Michael Heerdegen <michael_heerdegen@web.de>
Date: Thu, 16 Apr 2026 12:34:33 +0200
Subject: [PATCH 159/463] ; Additional small tweaks of map.el methods

* lisp/emacs-lisp/map.el (map-into, map-do): Doc tweaks.
(Bug#80804)
---
 lisp/emacs-lisp/map.el | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lisp/emacs-lisp/map.el b/lisp/emacs-lisp/map.el
index b5c5623332c..99ea533b97f 100644
--- a/lisp/emacs-lisp/map.el
+++ b/lisp/emacs-lisp/map.el
@@ -565,8 +565,9 @@ Convert MAP into an alist."
 
 (cl-defmethod map-into (map (_type (eql alist)))
   "Implementation of `map-into' for TYPE that is alist.
-Convert MAP into an alist, with keys the `car' of each
-association cons cell and value the `cdr'.."
+Convert MAP into an alist, with the `car' of each
+association cons cell serving as keys and the `cdr' as
+values."
   (map-pairs map))
 
 (cl-defmethod map-into (map (_type (eql plist)))
@@ -668,8 +669,8 @@ passing the element's key and its value as arguments of FUNCTION."
   "Implementation of `map-apply' for maps that are arrays.
 In a map that is an array, the keys are the slot indices,
 and slot contents are the values.
-FUNCTION will be called with each element of the map and its
-array index."
+FUNCTION will be called for each element of MAP with the
+index of the element and the element itself as arguments."
   (seq-map-indexed (lambda (elt index)
                      (funcall function index elt))
                    map))
@@ -694,7 +695,8 @@ elements, `car' and `cdr' of association cons cell for alists."
   "Implementation of `map-do' for maps that are arrays.
 In a map that is an array, the keys are the slot indices,
 and slot contents are the values.
-FUNCTION's arguments are the index of the element and the element itself."
+FUNCTION's arguments are the index of the element and the
+element itself."
   (seq-do-indexed (lambda (elt index)
                     (funcall function index elt))
                   map))

From 1b2a8de314ae7d6cc530884f272e95f64b93e81b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Mon, 20 Apr 2026 16:13:06 +0100
Subject: [PATCH 160/463] Eglot: unbreak diagnostics in symlinked projects

Now that 'eglot-uri-to-path' tries to return
"project-root-familiar" paths, unresolving the absolute path
name, it's important to update 'eglot--find-buffer-visiting' to
consider the two alternative ways to refer to a file.  IOW, this
was already a bug, but the latest changes to 'eglot-uri-to-path'
made it more evident.

* lisp/progmodes/eglot.el (eglot--find-buffer-visiting): Also
consider buffer-file-name.
---
 lisp/progmodes/eglot.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index ba5c7089c77..f6e7a3b47f8 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -3249,8 +3249,10 @@ When called interactively, use the currently active server"
   ;; potentially slow `file-truename' (bug#70036).
   (cl-loop for b in (eglot--managed-buffers server)
            when (with-current-buffer b
-                  (equal (car eglot--TextDocumentIdentifier-cache)
-                         abspath))
+                  (or
+                   (equal abspath buffer-file-name)
+                   (equal (car eglot--TextDocumentIdentifier-cache)
+                         abspath)))
            return b))
 
 

From 789e98e54fe768577ba367fbdae7a2e20109e4d3 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Tue, 14 Apr 2026 22:32:01 +0200
Subject: [PATCH 161/463] Extend utility of 'package-get-descriptor'

The general idea here is to make it easier to handle situations
where you might have a symbol designating a package name or a
'package-desc' object, but you really want the latter.

* lisp/emacs-lisp/package.el (package--get-deps): Remove
function superseded by 'package--dependencies'.
(package--builtin-alist, package--archive-contents): Add new
functions.
(package--removable-packages): Use 'package--dependencies'.
(package--dependencies): Check for circular dependencies.
(package-upgrade, package--upgradeable-packages)
(package--user-installed-p, package-reinstall, package-recompile)
(describe-package-1, package-desc-status, package--mapc)
(package-menu--find-upgrades): Use 'package-get-descriptor'.
(package-get-descriptor): Add optional arguments to allow for
different kinds of queries.

* lisp/emacs-lisp/package-vc.el
(package-vc-install-selected-packages)
(package-vc--generate-description-file)
(package-vc-install-dependencies, package-vc--read-package-desc)
(package-vc-install, package-vc-checkout): Use
'package-get-descriptor'.
---
 lisp/emacs-lisp/package-vc.el |  64 +++++------
 lisp/emacs-lisp/package.el    | 205 ++++++++++++++++------------------
 2 files changed, 129 insertions(+), 140 deletions(-)

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index f3ea440fb30..ff39786e8bd 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -90,19 +90,18 @@ the `clone' VC function."
   (pcase-dolist (`(,name . ,spec) package-vc-selected-packages)
     (when (stringp name)
       (setq name (intern name)))
-    (let ((pkg-descs (assoc name package-alist #'string=)))
-      (unless (seq-some #'package-vc-p (cdr pkg-descs))
-        (cond
-         ((null spec)
-          (package-vc-install name))
-         ((stringp spec)
-          (package-vc-install name spec))
-         ((listp spec)
-          (package-vc--archives-initialize)
-          (package-vc--unpack
-           (or (cadr (assoc name package-archive-contents))
-               (package-desc-create :name name :kind 'vc))
-           spec)))))))
+    (unless (package-get-descriptor name 'installed #'package-vc-p)
+      (cond
+       ((null spec)
+        (package-vc-install name))
+       ((stringp spec)
+        (package-vc-install name spec))
+       ((listp spec)
+        (package-vc--archives-initialize)
+        (package-vc--unpack
+         (or (package-get-descriptor name 'archive)
+             (package-desc-create :name name :kind 'vc))
+         spec))))))
 
 
 (defcustom package-vc-selected-packages nil
@@ -314,7 +313,7 @@ asynchronously."
     (unless (package-desc-summary pkg-desc)
       (setf (package-desc-summary pkg-desc)
             (or (package-desc-summary pkg-desc)
-                (and-let* ((pkg (cadr (assq name package-archive-contents))))
+                (and-let* ((pkg (package-get-descriptor name 'archive)))
                   (package-desc-summary pkg))
                 (and main-file
                      (lm-summary main-file))
@@ -476,13 +475,11 @@ this function successfully installs all given dependencies)."
                   (cond
                    ((assq (car pkg) to-install)) ;inhibit cycles
                    ((package-installed-p (car pkg) (cadr pkg)))
-                   ((let* ((pac package-archive-contents)
-                           (desc (cadr (assoc (car pkg) pac))))
-                      (if desc
-                          (let ((reqs (package-desc-reqs desc)))
-                            (push desc to-install)
-                            (mapc #'search reqs))
-                        (push pkg missing))))))
+                   ((if-let* ((desc (package-get-descriptor (car pkg) 'archive)))
+                        (let ((reqs (package-desc-reqs desc)))
+                          (push desc to-install)
+                          (mapc #'search reqs))
+                      (push pkg missing)))))
                 (version-order (a b)
                   "Predicate to sort packages in order."
                   (version-list-<
@@ -494,11 +491,10 @@ this function successfully installs all given dependencies)."
                 (depends-on-p (target package)
                   "Does PACKAGE depend on TARGET?"
                   (or (eq target package)
-                      (let* ((pac package-archive-contents)
-                             (desc (cadr (assoc package pac))))
-                        (and desc (seq-some
-                                   (apply-partially #'depends-on-p target)
-                                   (mapcar #'car (package-desc-reqs desc)))))))
+                      (and-let* ((desc (package-get-descriptor package 'archive)))
+                        (seq-some
+                         (apply-partially #'depends-on-p target)
+                         (mapcar #'car (package-desc-reqs desc))))))
                 (dependent-order (a b)
                   (let ((desc-a (package-desc-name a))
                         (desc-b (package-desc-name b)))
@@ -808,9 +804,9 @@ If the optional argument INSTALLED is non-nil, the selection will
 be filtered down to VC packages that have already been
 installed, and the package description will be that of an
 installed package."
-  (cadr (assoc (package-vc--read-package-name prompt nil installed)
-               (if installed package-alist package-archive-contents)
-               #'string=)))
+  (package-get-descriptor
+   (package-vc--read-package-name prompt nil installed)
+   (if installed 'installed 'archive)))
 
 ;;;###autoload
 (defun package-vc-upgrade-all ()
@@ -971,11 +967,11 @@ installs takes precedence."
         :kind 'vc)
        (list :vc-backend backend :url package)
        rev)))
-   ((and-let* ((desc (assoc package package-archive-contents #'string=)))
+   ((and-let* ((desc (package-get-descriptor package 'archive)))
       (package-vc--unpack
-       (cadr desc)
-       (or (package-vc--desc->spec (cadr desc))
-           (and-let* ((extras (package-desc-extras (cadr desc)))
+       desc
+       (or (package-vc--desc->spec desc)
+           (and-let* ((extras (package-desc-extras desc))
                       (url (alist-get :url extras))
                       (backend (vc-guess-url-backend url)))
              (list :vc-backend backend :url url))
@@ -994,7 +990,7 @@ package's repository.  If REV has the special value
 the last released version of the package."
   (interactive
    (let* ((name (package-vc--read-package-name "Fetch package source: ")))
-     (list (cadr (assoc name package-archive-contents #'string=))
+     (list (package-get-descriptor name 'archive)
            (read-directory-name "Clone into new or empty directory: " nil nil
                                 (lambda (dir) (or (not (file-exists-p dir))
                                              (directory-empty-p dir))))
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 984d3566f08..5585b64215d 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -468,6 +468,12 @@ BI-DESC should be a `package--bi-desc' object."
                        :summary (package--bi-desc-summary bi-desc)
                        :dir 'builtin))
 
+(defun package--builtin-alist ()
+  "Return a `package-alist'-like alist for all builtin packages."
+  (cl-loop for bi-desc in package--builtins
+           unless (assq (car bi-desc) package-alist)
+           collect (list (car bi-desc) (package--from-builtin bi-desc))))
+
 (defun package-desc-suffix (pkg-desc)
   "Return file-name extension of package-desc object PKG-DESC.
 Depending on the `package-desc-kind' of PKG-DESC, this is one of:
@@ -1532,6 +1538,13 @@ If successful, set or update `package-archive-contents'."
   (dolist (archive package-archives)
     (run-hook-with-args 'package-read-archive-hook (car archive))))
 
+(defun package--archive-contents ()
+  "Return the package archive contents.
+Load them if they haven't already been loaded."
+  (unless package-archive-contents
+    (package-read-all-archive-contents))
+  package-archive-contents)
+
 
 ;;;; Package Initialize
 ;; A bit of a milestone.  This brings together some of the above
@@ -1837,25 +1850,12 @@ if it is still empty."
     (package--save-selected-packages (package--find-non-dependencies)))
   (memq pkg package-selected-packages))
 
-(defun package--get-deps (pkgs)
-  (let ((seen '()))
-    (while pkgs
-      (let ((pkg (pop pkgs)))
-        (if (memq pkg seen)
-            nil ;; Done already!
-          (let ((pkg-desc (cadr (assq pkg package-alist))))
-            (when pkg-desc
-              (push pkg seen)
-              (setq pkgs (append (mapcar #'car (package-desc-reqs pkg-desc))
-                                 pkgs)))))))
-    seen))
-
 (defun package--user-installed-p (package)
   "Return non-nil if PACKAGE is a user-installed package.
 PACKAGE is the package name, a symbol.  Check whether the package
 was installed into `package-user-dir' where we assume to have
 control over."
-  (let* ((pkg-desc (cadr (assq package package-alist)))
+  (let* ((pkg-desc (package-get-descriptor package 'installed))
          (dir (package-desc-dir pkg-desc)))
     (file-in-directory-p dir package-user-dir)))
 
@@ -1863,7 +1863,7 @@ control over."
   "Return a list of `package-desc' objects that are longer needed.
 These are packages which are neither contained in
 `package-selected-packages' nor a dependency of one that is."
-  (let ((needed (package--get-deps package-selected-packages)))
+  (let ((needed (package--dependencies package-selected-packages)))
     (cl-loop for (name . descs) in (package--alist)
              unless (or (memq name needed)
                         ;; Do not auto-remove external packages.
@@ -2129,12 +2129,12 @@ NAME should be a symbol."
                   "Upgrade package: "
                   (package--upgradeable-packages t) nil t))))
   (cl-check-type name symbol)
-  (let* ((pkg-desc (cadr (assq name package-alist)))
+  (let* ((pkg-desc (package-get-descriptor name 'installed))
          (package-install-upgrade-built-in (not pkg-desc)))
     ;; `pkg-desc' will be nil when the package is an "active built-in".
     (if (and pkg-desc (package-vc-p pkg-desc))
         (error "Use `package-vc-upgrade' for VC packages")
-      (let ((new-desc (cadr (assq name package-archive-contents))))
+      (let ((new-desc (package-get-descriptor name 'archive)))
         (when (or (null new-desc)
                   (and pkg-desc
                        (version-list-= (package-desc-version pkg-desc)
@@ -2157,24 +2157,17 @@ NAME should be a symbol."
    #'car
    (seq-filter
     (lambda (elt)
-      (let ((available
-             (assq (car elt) package-archive-contents)))
+      (let ((available (package-get-descriptor (car elt) 'archive)))
         (and available
              (or (and
                   include-builtins
                   (not (package-desc-version (cadr elt))))
                  (version-list-<
                   (package-desc-version (cadr elt))
-                  (package-desc-version (cadr available))))
+                  (package-desc-version available)))
              (not (package-vc-p (cadr elt))))))
-    (if include-builtins
-        (append package-alist
-                (mapcan
-                 (lambda (elt)
-                   (when (not (assq (car elt) package-alist))
-                     (list (list (car elt) (package--from-builtin elt)))))
-                 package--builtins))
-      package-alist))))
+    (nconc (and include-builtins (package--builtin-alist))
+           (package--alist)))))
 
 ;;;###autoload
 (defun package-upgrade-all (&optional query)
@@ -2210,30 +2203,30 @@ where NAME is a symbol designating the package name and VERSION-LIST
 designates the least version number that any dependency of PKG requires.
 This format is intentionally meant to mirror that of
 `package-desc-reqs', which see.  PKG is either a symbol designating a
-package name known in the archives or a `package-desc' object."
-  (when-let* ((desc (if (package-desc-p pkg) pkg
-                      (cadr (assq pkg package-archive-contents)))))
-    ;; Can we have circular dependencies?  Assume "nope".
-    (let ((all (named-let rec ((pkg-desc desc) (min-version nil))
-                 (cl-loop for (name vlist) in (package-desc-reqs pkg-desc)
-                          if (eq name 'emacs)
-                          collect (list name vlist) into deps
-                          else append
-                          (cl-loop for p in (alist-get name package-archive-contents)
-                                   when (version-list-<= vlist (package-desc-version p))
-                                   return (rec p vlist)
-                                   ;; if we couldn't find a package in
-                                   ;; the archives, we fall back to
-                                   ;; returning the dependency as-is:
-                                   finally return (list (list name vlist)))
-                          into deps
-                          finally (return `((,(package-desc-name pkg-desc) ,min-version) . ,deps))))))
-      (mapcar
-       (lambda (ent)
-         (list (car ent) (seq-reduce (lambda (acc vlist)
-                                       (if (version-list-< acc vlist) vlist acc))
-                                     (mapcar #'cadr (cdr ent)) '())))
-       (seq-group-by #'car (delete-dups (cdr all)))))))
+package name known in the archives or a `package-desc' object, or a list
+of package names."
+  (cl-loop for desc in (mapcar (lambda (d) (package-get-descriptor d t))
+                               (ensure-list pkg))
+           when desc
+           append (named-let rec ((pkg-desc desc) (min-version nil) (seen '()))
+                    (let ((deps '()))
+                      (pcase-dolist (`(,name ,vlist) (package-desc-reqs pkg-desc))
+                        (cond*
+                         ((bind* (pred (lambda (d) (version-list-<= vlist (package-desc-version d))))))
+                         ((memq name seen))
+                         ((eq name 'emacs) (push (list name vlist) deps))
+                         ((bind-and* (desc (package-get-descriptor name t pred)))
+                          (setq deps (nconc (rec desc vlist (cons name seen)) deps)))
+                         (t (push (list name vlist) deps))))
+                      (cons (list (package-desc-name pkg-desc) min-version) deps)))
+           into all
+           finally return
+           (mapcar
+            (lambda (ent)
+              (list (car ent) (seq-reduce (lambda (acc vlist)
+                                            (if (version-list-< acc vlist) vlist acc))
+                                          (mapcar #'cadr (cdr ent)) '())))
+            (seq-group-by #'car (delete-dups (cdr all))))))
 
 (defun package-strip-rcs-id (str)
   "Strip RCS version ID from the version string STR.
@@ -2489,7 +2482,7 @@ object."
                             (mapcar #'car package-alist)))))))
   (package--archives-initialize)
   (package-delete
-   (if (package-desc-p pkg) pkg (cadr (assq pkg package-alist)))
+   (package-get-descriptor pkg 'installed)
    'force 'nosave)
   (package-install pkg 'dont-select))
 
@@ -2502,9 +2495,7 @@ object."
                               "Recompile package: "
                               (mapcar #'symbol-name
                                       (mapcar #'car package-alist))))))
-  (let ((pkg-desc (if (package-desc-p pkg)
-                      pkg
-                    (cadr (assq pkg package-alist)))))
+  (let ((pkg-desc (package-get-descriptor pkg 'installed)))
     ;; Delete the old .elc files to ensure that we don't inadvertently
     ;; load them (in case they contain byte code/macros that are now
     ;; invalid).
@@ -2727,13 +2718,7 @@ If no such file exists, the function returns nil."
   "Insert the package description for PKG.
 Helper function for `describe-package'."
   (require 'lisp-mnt)
-  (let* ((desc (or
-                (if (package-desc-p pkg) pkg)
-                (cadr (assq pkg package-alist))
-                (let ((built-in (assq pkg package--builtins)))
-                  (if built-in
-                      (package--from-builtin built-in)
-                    (cadr (assq pkg package-archive-contents))))))
+  (let* ((desc (package-get-descriptor pkg t))
          (name (if desc (package-desc-name desc) pkg))
          (pkg-dir (if desc (package-desc-dir desc)))
          (reqs (if desc (package--dependencies desc)))
@@ -2898,8 +2883,8 @@ Helper function for `describe-package'."
         (package--print-email-button author)))
     (let* ((all-pkgs (append (cdr (assq name package-alist))
                              (cdr (assq name package-archive-contents))
-                             (let ((bi (assq name package--builtins)))
-                               (if bi (list (package--from-builtin bi))))))
+                             (and-let* ((bi (assq name package--builtins)))
+                               (list (package--from-builtin bi)))))
            (other-pkgs (delete desc all-pkgs)))
       (when other-pkgs
         (package--print-help-section "Other versions"
@@ -3346,14 +3331,14 @@ of these dependencies, similar to the list returned by
        ((not (file-exists-p dir)) "deleted")
        ;; Not inside `package-user-dir'.
        ((not (file-in-directory-p dir package-user-dir)) "external")
-       ((eq pkg-desc (cadr (assq name package-alist)))
+       ((eq pkg-desc (package-get-descriptor name 'installed))
         (if (not signed) "unsigned"
           (if (package--user-selected-p name)
               "installed" "dependency")))
        (t "obsolete")))
      ((package--incompatible-p pkg-desc) "incompat")
      (t
-      (let* ((ins (cadr (assq name package-alist)))
+      (let* ((ins (package-get-descriptor name 'installed))
              (ins-v (if ins (package-desc-version ins))))
         (cond
          ;; Installed obsolete packages are handled in the `dir'
@@ -3511,32 +3496,16 @@ PACKAGES can be nil or t, which means to display all known
 packages, or a list of packages.
 
 Built-in packages are converted with `package--from-builtin'."
-  (unless packages (setq packages t))
-  (let (name)
-    ;; Installed packages:
-    (dolist (elt package-alist)
-      (setq name (car elt))
-      (when (or (eq packages t) (memq name packages))
-        (mapc function (cdr elt))))
-
-    ;; Built-in packages:
-    (dolist (elt package--builtins)
-      (setq name (car elt))
-      (when (and (not (eq name 'emacs)) ; Hide the `emacs' package.
-                 (or package-list-unversioned
-                     (package--bi-desc-version (cdr elt)))
-                 (or (eq packages t) (memq name packages)))
-        (funcall function (package--from-builtin elt))))
-
-    ;; Available and disabled packages:
-    (dolist (elt package-archive-contents)
-      (setq name (car elt))
-      (when (or (eq packages t) (memq name packages))
-        (dolist (pkg (cdr elt))
-          ;; Hide obsolete packages.
-          (unless (package-installed-p (package-desc-name pkg)
-                                       (package-desc-version pkg))
-        (funcall function pkg)))))))
+  (dolist (pkg (if (memq packages '(t nil))
+                   (flatten-tree
+                    (list (mapcar #'cdr (package--builtin-alist))
+                          (mapcar #'cdr (package--archive-contents))
+                          (mapcar #'cdr (package--alist))))
+                 (mapcar #'package-get-descriptor packages)))
+    (unless (or (package-disabled-p (package-desc-name pkg)
+                                    (package-desc-version pkg))
+                (eq (package-desc-name pkg) 'emacs)) ;hide pseudo package
+      (funcall function pkg))))
 
 (defun package--has-keyword-p (desc &optional keywords)
   "Test if package DESC has any of the given KEYWORDS.
@@ -3939,13 +3908,11 @@ of elements of the form (PKG . DESCS), but where DESCS is the `package-desc'
 object corresponding to the newer version."
   (mapcar
    (lambda (pkg-name)
-     (cons pkg-name
-           (seq-find
-            (let ((curr (package-desc-version
-                         (cadr (assq pkg-name package-alist)))))
-              (lambda (pkg-desc)
-                (version-list-< curr (package-desc-version pkg-desc))))
-            (cdr (assq pkg-name package-archive-contents)))))
+     (let* ((desc (package-get-descriptor pkg-name 'installed))
+            (pred (lambda (other)
+                    (version-list-< (package-desc-version desc)
+                                    (package-desc-version other)))))
+       (cons pkg-name (package-get-descriptor pkg-name 'archive pred))))
    (package--upgradeable-packages)))
 
 (defvar package-menu--mark-upgrades-pending nil
@@ -4982,12 +4949,38 @@ DESC must be a `package-desc' object."
 
 ;;;; Introspection
 
-(defun package-get-descriptor (pkg-name)
-  "Return the `package-desc' of PKG-NAME."
-  (unless package--initialized (package-initialize 'no-activate))
-  (or (package--get-activatable-pkg pkg-name)
-      (cadr (assq pkg-name package-alist))
-      (cadr (assq pkg-name package-archive-contents))))
+(defun package-get-descriptor (pkg sources &optional pred)
+  "Return a `package-desc' object for PKG, or nil if none can be found.
+If PKG is a `package-desc' object it will be returned directly.  If PKG
+is a symbol or string it designates a package name.  The argument
+SOURCES can be a list consisting of the symbols `installed', `builtin'
+or `archive', each when present indicating that the function should find
+a `package-desc' object for PKG in the list of installed packages,
+built-in packages or packages available in the archives respectively.
+If SOURCES is t, then the function will interpret this as a shorthand
+for a list consisting of the symbols mentioned in the order given above.
+Any other symbol will be converted to a singleton list.  The order is
+significant, in that the first hit will be returned.  If specified, PRED
+is a function that takes a single `package-desc' argument and prevents
+the object from being returned if the predicate returns nil."
+  (cond
+   ((package-desc-p pkg)
+    (and (or (not pred) (funcall pred pkg)) pkg))
+   ((or (and (stringp pkg) (setq pkg (intern pkg)))
+        (symbolp pkg))
+    (catch 'found
+      (dolist (source (if (eq sources t)
+                          '(installed builtin archive)
+                        (delete-dups (ensure-list sources))))
+        (dolist (ent (pcase-exhaustive source
+                       ('installed (package--alist))
+                       ('builtin (package--builtin-alist))
+                       ('archive (package--archive-contents))))
+          (when (eq (car ent) pkg)
+            (dolist (desc (cdr ent))
+              (when (or (null pred) (funcall pred desc))
+                (throw 'found desc))))))))
+   ((error "Failed to recognize package %S" pkg))))
 
 (provide 'package)
 

From 6a1c43fe62a512f167242ce6284b1805697e6255 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Mon, 20 Apr 2026 21:08:23 +0200
Subject: [PATCH 162/463] ; Add a comment to elaborate changes in 0051e2b7

---
 lisp/emacs-lisp/package.el | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 5585b64215d..cdbbda0ba03 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2325,6 +2325,12 @@ directory."
       (when (string-match "\\.tar\\'" file) (tar-mode)))
     (unwind-protect
         (with-silent-modifications
+          ;; When installing .tar files, `package-tar-file-info' touches
+          ;; the modified bit which causes Emacs to query the user if
+          ;; they are certain about killing this temporary buffer, since
+          ;; it is marked as visiting FILE.  This of course is OK, since
+          ;; this is not the actual visiting file, so we want to prevent
+          ;; the modified bit from triggering this query.
           (package-install-from-buffer))
       (fundamental-mode))))             ; free auxiliary data
 

From baf7e6a44fd4711356036740f66c542cc0abafc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Mon, 20 Apr 2026 17:50:21 +0100
Subject: [PATCH 163/463] Eglot: use Unicode box-drawing chars in hierarchy
 buffers

Use box-drawing characters for the tree guides in hierarchy
buffers when the display supports them.

* lisp/progmodes/eglot.el (eglot--hierarchy-2): Rework.
---
 lisp/progmodes/eglot.el | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index f6e7a3b47f8..0ff95165af0 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -5683,10 +5683,16 @@ lock machinery calls us again."
                      (convert child (plist-get node :uri)))
                    (eglot--hierarchy-children node))))
               (convert (node parent-uri)
-                (let ((w (widget-convert
+                (let ((w (apply
+                          #'widget-convert
                           'tree-widget
                           :tag (eglot--hierarchy-label node parent-uri)
-                          :expander (expander-for node))))
+                          :expander (expander-for node)
+                          (when (char-displayable-p ?│)
+                            '(:guide          (item :tag " ├" :format "%t")
+                              :nohandle-guide (item :tag " │" :format "%t")
+                              :end-guide      (item :tag " └" :format "%t")
+                              :handle         (item :tag "─"  :format "%t"))))))
                   (widget-put w :empty-icon
                               (widget-get w :leaf-icon))
                   w)))

From 28ead7477227aaeae0f5250336627f16696c6352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Tue, 21 Apr 2026 10:59:12 +0100
Subject: [PATCH 164/463] Eglot: handle visited file name changes (typically
 C-x C-w)

When the user renames a buffer's file via set-visited-file-name,
notify the server with didClose (old URI) and didOpen (new URI).
The TextDocumentIdentifier cache still holds the old URI when
after-set-visited-file-name-hook fires, so didClose uses it
correctly; didOpen then clears and rebuilds it from the new name.

* lisp/progmodes/eglot.el (eglot--managed-mode): Hook and unhook
eglot--after-set-visited-file-name-hook.
(eglot--after-set-visited-file-name-hook): New function.
---
 lisp/progmodes/eglot.el | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 0ff95165af0..a49153568c7 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -2385,6 +2385,8 @@ the previous reports for TOKEN.")
     (add-hook 'kill-buffer-hook #'eglot--signal-textDocument/didClose nil t)
     (add-hook 'before-revert-hook #'eglot--signal-textDocument/didClose nil t)
     (add-hook 'after-revert-hook #'eglot--after-revert-hook nil t)
+    (add-hook 'after-set-visited-file-name-hook
+              #'eglot--after-set-visited-file-name-hook nil t)
     (add-hook 'before-save-hook #'eglot--signal-textDocument/willSave nil t)
     (add-hook 'after-save-hook #'eglot--signal-textDocument/didSave nil t)
     (unless (eglot--stay-out-of-p 'xref)
@@ -2425,6 +2427,8 @@ the previous reports for TOKEN.")
     (remove-hook 'kill-buffer-hook #'eglot--signal-textDocument/didClose t)
     (remove-hook 'before-revert-hook #'eglot--signal-textDocument/didClose t)
     (remove-hook 'after-revert-hook #'eglot--after-revert-hook t)
+    (remove-hook 'after-set-visited-file-name-hook
+                 #'eglot--after-set-visited-file-name-hook t)
     (remove-hook 'before-save-hook #'eglot--signal-textDocument/willSave t)
     (remove-hook 'after-save-hook #'eglot--signal-textDocument/didSave t)
     (remove-hook 'xref-backend-functions #'eglot-xref-backend t)
@@ -3220,6 +3224,15 @@ When called interactively, use the currently active server"
      (eglot--current-server-or-lose)
      :textDocument/didClose `(:textDocument ,(eglot--TextDocumentIdentifier)))))
 
+(defun eglot--after-set-visited-file-name-hook ()
+  "Handle visited file name change: send didClose then didOpen.
+The cache still holds the old URI when this runs, so didClose
+uses it; didOpen then clears it and recomputes from the new
+`buffer-file-name'."
+  (when (and eglot--managed-mode buffer-file-name)
+    (eglot--signal-textDocument/didClose)
+    (eglot--signal-textDocument/didOpen)))
+
 (defun eglot--signal-textDocument/willSave ()
   "Maybe send textDocument/willSave to server."
   (let ((server (eglot--current-server-or-lose))

From 62e3549f780adb8f27e0c01f18593a002866e2bf Mon Sep 17 00:00:00 2001
From: Roi Martin <jroi.martin@gmail.com>
Date: Sat, 11 Apr 2026 16:18:56 +0200
Subject: [PATCH 165/463] Show executed tests from erts files via the ERT
 results buffer

* lisp/emacs-lisp/ert.el: Add key binding.
(ert--erts-file-test-execution-observer): New variable.
(ert--signal-erts-file-test-execution): New function.
(ert-test-result): Add field.
(ert-run-test): Collect tests from erts files.
(ert-results-mode-menu): Add entry.
(ert--erts-file-test-name-button): New button type.
(ert--erts-file-test-name-button-action): New function.
(ert-results-pop-to-erts-file-tests-for-test-at-point): New function.
(ert-test--erts-test): Record execution of test from erts file.
* doc/misc/ert.texi (Running Tests Interactively): Update manual.
* etc/NEWS: Update NEWS.  (Bug#80806)
---
 doc/misc/ert.texi      | 17 ++++++++
 etc/NEWS               |  7 ++++
 lisp/emacs-lisp/ert.el | 95 +++++++++++++++++++++++++++++++++++++++---
 3 files changed, 113 insertions(+), 6 deletions(-)

diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index 8329c202d3f..458cccf3063 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -323,6 +323,23 @@ for more information about backtraces.
 Show the list of @code{should} forms executed in the test
 (@code{ert-results-pop-to-should-forms-for-test-at-point}).
 
+@kindex e@r{, in ert results buffer}
+@findex ert-results-pop-to-erts-file-tests-for-test-at-point
+@item e
+Display a buffer with the list of tests from erts files executed by the
+test at point
+(@code{ert-results-pop-to-erts-file-tests-for-test-at-point}).  For
+tests that call @code{ert-test-erts-file}, the list contains the tests
+defined in the referenced erts files that have been executed.  Tests
+that were skipped are omitted.  If a test fails, the list ends with the
+failing test.
+
+Each entry consists of the name of the test followed by the code that
+performs the transform being tested.  The buffer also contains buttons
+that allow jumping to the test definitions.
+
+@xref{erts files} for more information.
+
 @item m
 @kindex m@r{, in ert results buffer}
 @findex ert-results-pop-to-messages-for-test-at-point
diff --git a/etc/NEWS b/etc/NEWS
index 25cddfa58e1..e03e635b11f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -4249,6 +4249,13 @@ Previously, 'ert-simulate-keys' could be used for sending keys to input
 functions such as 'read-from-minibuffer', but not for other interactive
 input such as starting key-mapped commands.
 
++++
+*** Show executed tests from erts files via the ERT results buffer.
+For tests that call 'ert-test-erts-file', the ERT results buffer now
+allows you to list the tests defined in the referenced erts files that
+have been executed by the test at point.  See "(ert) Running Tests
+Interactively" for more information.
+
 ** Time & Date
 
 +++
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 2f3f517701b..9c7cef199e3 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -681,6 +681,15 @@ A and B are the time values to compare."
       ,(format-time-string "%s.%N" (time-subtract a b) t))))
 (function-put #'time-equal-p 'ert-explainer #'ert--explain-time-equal-p)
 
+;;; Facilities for recording the execution of tests from erts files.
+
+(defvar ert--erts-file-test-execution-observer nil)
+
+(defun ert--signal-erts-file-test-execution (test-description)
+  "Tell the current erts-file test observer (if any) about TEST-DESCRIPTION."
+  (when ert--erts-file-test-execution-observer
+    (funcall ert--erts-file-test-execution-observer test-description)))
+
 ;;; Implementation of `ert-info'.
 
 ;; TODO(ohler): The name `info' clashes with
@@ -716,8 +725,8 @@ in front of the value of MESSAGE-FORM."
 (cl-defstruct ert-test-result
   (messages nil)
   (should-forms nil)
-  (duration 0)
-  )
+  (erts-file-tests nil)
+  (duration 0))
 (cl-defstruct (ert-test-passed (:include ert-test-result)))
 (cl-defstruct (ert-test-result-with-condition (:include ert-test-result))
   (condition (cl-assert nil))
@@ -867,11 +876,15 @@ Returns the result and stores it in ERT-TEST's `most-recent-result' slot."
                        (make-ert-test-aborted-with-non-local-exit)
                        :exit-continuation (lambda ()
                                             (cl-return-from error nil))))
-                (should-form-accu (list)))
+                (should-form-accu (list))
+                (erts-file-test-accu (list)))
             (unwind-protect
                 (let ((ert--should-execution-observer
                        (lambda (form-description)
                          (push form-description should-form-accu)))
+                      (ert--erts-file-test-execution-observer
+                       (lambda (test-description)
+                         (push test-description erts-file-test-accu)))
                       (message-log-max t)
                       (ert--running-tests (cons ert-test ert--running-tests)))
                   (ert--run-test-internal info))
@@ -882,9 +895,10 @@ Returns the result and stores it in ERT-TEST's `most-recent-result' slot."
                          (or (marker-position begin-marker) (point-min))
                          (point-max))))
                 (ert--force-message-log-buffer-truncation)
-                (setq should-form-accu (nreverse should-form-accu))
-                (setf (ert-test-result-should-forms result)
-                      should-form-accu)
+                (setq should-form-accu (nreverse should-form-accu)
+                      erts-file-test-accu (nreverse erts-file-test-accu))
+                (setf (ert-test-result-should-forms result) should-form-accu
+                      (ert-test-result-erts-file-tests result) erts-file-test-accu)
                 (setf (ert-test-most-recent-result ert-test) result))))
         (set-marker begin-marker nil))))
   (ert-test-most-recent-result ert-test))
@@ -2363,6 +2377,7 @@ SELECTOR; the default t means run all the defined tests."
            ("b" ert-results-pop-to-backtrace-for-test-at-point)
            ("m" ert-results-pop-to-messages-for-test-at-point)
            ("l" ert-results-pop-to-should-forms-for-test-at-point)
+           ("e" ert-results-pop-to-erts-file-tests-for-test-at-point)
            ("h" ert-results-describe-test-at-point)
            ("D" ert-delete-test)
            ("T" ert-results-pop-to-timings)
@@ -2390,6 +2405,8 @@ SELECTOR; the default t means run all the defined tests."
      :active (ert--results-test-at-point-no-redefinition)]
     ["Show `should' forms" ert-results-pop-to-should-forms-for-test-at-point
      :active (ert--results-test-at-point-no-redefinition)]
+    ["Show tests from erts files" ert-results-pop-to-erts-file-tests-for-test-at-point
+     :active (ert--results-test-at-point-no-redefinition)]
     ["Describe test" ert-results-describe-test-at-point
      :active (ert--results-test-at-point-no-redefinition)]
     "--"
@@ -2410,6 +2427,10 @@ SELECTOR; the default t means run all the defined tests."
   'action #'ert--results-expand-collapse-button-action
   'help-echo "mouse-2, RET: Expand/collapse test result")
 
+(define-button-type 'ert--erts-file-test-name-button
+  'action #'ert--erts-file-test-name-button-action
+  'help-echo "mouse-2, RET: Find test definition in erts file")
+
 (defun ert--results-test-node-or-null-at-point ()
   "If point is on a valid ewoc node, return it; return nil otherwise.
 
@@ -2493,6 +2514,14 @@ To be used in the ERT results buffer."
                   (car (button-get button 'help-args)))))
     (ert-find-test-other-window name)))
 
+(defun ert--erts-file-test-name-button-action (button)
+  "Find the definition in an erts file of the test BUTTON belongs to.
+It creates a new window or reuses an existing one."
+  (let ((file (button-get button 'file))
+        (position (button-get button 'position)))
+    (find-file-other-window file)
+    (goto-char position)))
+
 (defun ert--ewoc-position (ewoc node)
   ;; checkdoc-order: nil
   "Return the position of NODE in EWOC, or nil if NODE is not in EWOC."
@@ -2774,6 +2803,55 @@ To be used in the ERT results buffer."
                         "have been modified destructively.)\n"))
         (forward-line 1)))))
 
+(defun ert-results-pop-to-erts-file-tests-for-test-at-point ()
+  "Display a buffer with the tests from erts files executed by the test at point.
+For tests that call `ert-test-erts-file', the list contains the tests
+defined in the referenced erts files that have been executed.  Tests
+that were skipped are omitted.  If a test fails, the list ends with the
+failing test.
+
+Each entry consists of the name of the test followed by the code that
+performs the transform being tested.  The buffer also contains buttons
+that allow jumping to the test definitions.
+
+To be used in the ERT results buffer.  See Info node `(ert) Running
+Tests Interactively' for more information about how to use this feature."
+  (interactive nil ert-results-mode)
+  (let* ((test (ert--results-test-at-point-no-redefinition t))
+         (stats ert--results-stats)
+         (pos (ert--stats-test-pos stats test))
+         (result (aref (ert--stats-test-results stats) pos)))
+    (let ((buffer (get-buffer-create "*ERT list of tests from erts files*")))
+      (pop-to-buffer buffer)
+      (let ((inhibit-read-only t))
+        (buffer-disable-undo)
+        (erase-buffer)
+        (ert-simple-view-mode)
+        (if (null (ert-test-result-erts-file-tests result))
+            (insert "\n(No tests from erts files executed during this test.)\n")
+          (cl-loop for test-description
+                   in (ert-test-result-erts-file-tests result)
+                   for i from 1 do
+                   (insert (format "\n%d: " i))
+                   (insert-text-button (cdr (assq 'name test-description))
+                                       :type 'ert--erts-file-test-name-button
+                                       'file (cdr (assq 'file test-description))
+                                       'position (cdr (assq 'position test-description)))
+                   (insert "\n\t")
+                   (let* ((begin (point))
+                          (desc-code (cdr (assq 'code test-description)))
+                          (code (if (interpreted-function-p desc-code)
+                                    (macroexp-progn (aref desc-code 1))
+                                  desc-code)))
+                     (ert--pp-with-indentation-and-newline code)
+                     (ert--make-xrefs-region begin (point)))))
+        (goto-char (point-min))
+        (insert (substitute-command-keys
+                 "tests from erts files executed during test `"))
+        (ert-insert-test-name-button (ert-test-name test))
+        (insert (substitute-command-keys "':\n"))
+        (forward-line 1)))))
+
 (defun ert-results-toggle-printer-limits-for-test-at-point ()
   "Toggle how much of the condition to print for the test at point.
 
@@ -2980,6 +3058,11 @@ write erts files."
         (let ((code (cdr (assq 'code gen-specs))))
           (unless code
             (error "No code to run the transform"))
+          ;; Record execution of test from erts file.
+          (ert--signal-erts-file-test-execution `((name . ,name)
+                                                  (code . ,code)
+                                                  (file . ,file)
+                                                  (position . ,start-before)))
           (funcall code))
         (unless (equal (buffer-string) after)
           (ert-fail (list (format "Mismatch in test \"%s\", file %s"

From c1fbe7c4081dc54bdb8ac3a9bdaa7ff60b2bf861 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 21 Apr 2026 15:23:15 +0300
Subject: [PATCH 166/463] ; Avoid warnings from 'makeinfo' in Calc manual

* doc/misc/calc.texi (Top, Interactive Tutorial): Fix warnings
emitted by 'makeinfo' due to node inconsistencies with menus.
(Bug#80735)
---
 doc/misc/calc.texi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index cb091023660..b1e4221bd5b 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -170,8 +170,9 @@ longer Info tutorial.)
 @ifinfo
 * Interactive Tutorial::
 @end ifinfo
+@ifnotinfo
 * Tutorial::              A step-by-step introduction for beginners.
-
+@end ifnotinfo
 * Introduction::          Introduction to the Calc reference manual.
 * Data Types::            Types of objects manipulated by Calc.
 * Stack and Trail::       Manipulating the stack and trail buffers.
@@ -1244,7 +1245,7 @@ finished in two weeks.
 
 @ifinfo
 @c This node is accessed by the 'C-x * t' command.
-@node Interactive Tutorial, Tutorial, Getting Started, Top
+@node Interactive Tutorial, Introduction, Getting Started, Top
 @chapter Tutorial
 
 @noindent

From ccb454f28cc09a5f9f9eddb5bb9e4b8b641c6233 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 21 Apr 2026 15:49:07 +0300
Subject: [PATCH 167/463] Fix unsafe use of SDATA in
 'display_tty_menu_separator'

* src/xdisp.c (display_tty_menu_separator): Pass Lisp string to
display_string, not a pointer to its SDATA.  This is safer
GC-wise.
---
 src/xdisp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 281f04e4132..a05e5bda48a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -27765,7 +27765,7 @@ display_tty_menu_separator (struct it *it, const char *label, int width)
   else
     c = display_tty_menu_separator_char ('-', BOX_HORIZONTAL);
   Lisp_Object sep = Fmake_string (make_fixnum (width - 1), make_fixnum (c), Qt);
-  display_string ((char *) SDATA (sep), Qnil, Qnil, 0, 0, it, width, -1, -1, 1);
+  display_string ((char *) SDATA (sep), sep, Qnil, 0, 0, it, width, -1, -1, 1);
 }
 
 /* Display one menu item on a TTY, by overwriting the glyphs in the

From de09a022a4152b2008e2634aff58f4f24e2f571b Mon Sep 17 00:00:00 2001
From: "Leo C. Stein" <leo.stein@gmail.com>
Date: Thu, 9 Apr 2026 16:48:23 -0500
Subject: [PATCH 168/463] Add missing Greek subscripts to TeX input method

* lisp/leim/quail/latin-ltx.el: Add a regex to match Greek
subscripts. Currently there are only five in unicode: beta, gamma,
rho, phi, and chi. They can now be input with the TeX input method
as, e.g., _\beta .  (Bug#80791)
---
 lisp/leim/quail/latin-ltx.el | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lisp/leim/quail/latin-ltx.el b/lisp/leim/quail/latin-ltx.el
index 8b2e0999f77..af1349b7078 100644
--- a/lisp/leim/quail/latin-ltx.el
+++ b/lisp/leim/quail/latin-ltx.el
@@ -228,6 +228,12 @@ system, including many technical ones.  Examples:
         (string (if (match-end 2) ?^ ?_) basechar))))
   "\\(.*\\)SU\\(?:B\\|\\(PER\\)\\)SCRIPT \\(.*\\)")
 
+ ;; There are just a small number of these, and only SMALL, no CAPITAL
+ ((lambda (name _char)
+    (let* ((basename (match-string 1 name)))
+      (concat "_\\" (downcase basename))))
+  "\\`GREEK SUBSCRIPT SMALL LETTER \\([[:ascii:]]+\\)\\'")
+
  ((lambda (name _char)
     (let* ((basename (match-string 2 name))
            (name (if (match-end 1) (capitalize basename) (downcase basename))))

From 612960d4b3a99c169e28604503e8f70c67fa230d Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 21 Apr 2026 16:25:29 +0300
Subject: [PATCH 169/463] Fix 'toggle-truncate-lines' when 'visual-line-mode'
 is ON

* lisp/simple.el (toggle-truncate-lines): Force 'truncate-lines'
non-nil, even if visual-line-mode needs to be turned off.
(Bug#80741)
---
 lisp/simple.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/simple.el b/lisp/simple.el
index ff7ffafa3a1..441f7ff3440 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -9310,6 +9310,7 @@ non-nil."
            (if (and truncate-lines visual-line-mode)
                (progn
                  (visual-line-mode -1)
+                 (setq truncate-lines t)
                  (format-message " and `visual-line-mode' disabled"))
              "")))
 

From c6ec2c6ce1eb743d42a582dd8bfde68e98df4339 Mon Sep 17 00:00:00 2001
From: john muhl <jm@pub.pink>
Date: Thu, 16 Apr 2026 09:57:55 -0500
Subject: [PATCH 170/463] ; Cleanup defcustoms in 'lua-mode'

* lisp/progmodes/lua-mode.el (lua-always-show)
(lua-documentation-url): Add :version, remove :group.  (Bug#80840)
---
 lisp/progmodes/lua-mode.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/lua-mode.el b/lisp/progmodes/lua-mode.el
index bc042599759..ec13bec54b2 100644
--- a/lisp/progmodes/lua-mode.el
+++ b/lisp/progmodes/lua-mode.el
@@ -185,7 +185,7 @@ Should be a list of strings."
 (defcustom lua-always-show t
   "Non-nil means display `lua-process-buffer' after sending a command."
   :type 'boolean
-  :group 'lua)
+  :version "31.1")
 
 (defcustom lua-documentation-function 'browse-url
   "Function used to fetch the Lua reference manual."
@@ -202,7 +202,7 @@ Should be a list of strings."
       "http://www.lua.org/manual/5.1/manual.html")
   "URL pointing to the Lua reference manual."
   :type 'string
-  :group 'lua)
+  :version "31.1")
 
 (defvar lua-process nil
   "The active Lua process.")

From 330ccd33681b3a9e973114e5fd964cc5a319ce98 Mon Sep 17 00:00:00 2001
From: Juri Linkov <juri@linkov.net>
Date: Tue, 21 Apr 2026 19:30:03 +0300
Subject: [PATCH 171/463] Rebind 'tab-bar-mouse-close-tab' from <down-mouse-2>
 to <mouse-2>

* lisp/tab-bar.el (tab-bar-map): Unbind <mouse-2> from 'ignore'.
Bind 'tab-bar-mouse-close-tab' to <mouse-2> instead of <down-mouse-2>
(bug#80858).
---
 etc/NEWS        | 4 ++++
 lisp/tab-bar.el | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index e03e635b11f..ccad04ae371 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -603,6 +603,10 @@ This hook allows you to operate on a reopened tab.
 This is useful when you define custom tab parameters that may need
 adjustment when a tab is restored, and avoids advice.
 
+---
+*** Tabs are closed now on releasing the middle mouse button.
+Previously, closing the tab-bar's tabs was on pressing the button.
+
 ---
 *** New user option 'tab-bar-define-keys'.
 This controls which key bindings tab-bar creates.  Values are t, the
diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index 5dd61cdee29..15ef7967344 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -565,8 +565,7 @@ appropriate."
   "<down-mouse-1>"  #'tab-bar-mouse-down-1
   "<drag-mouse-1>"  #'tab-bar-mouse-move-tab
   "<mouse-1>"       #'tab-bar-mouse-1
-  "<down-mouse-2>"  #'tab-bar-mouse-close-tab
-  "<mouse-2>"       #'ignore
+  "<mouse-2>"       #'tab-bar-mouse-close-tab
   "<down-mouse-3>"  #'tab-bar-mouse-context-menu
 
   "<mouse-4>"       #'tab-previous

From 901d4fe32a8909e8b564502970528ffe9871e60a Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 21 Apr 2026 19:23:21 +0200
Subject: [PATCH 172/463] Improve files-tests.el for quoted file names

* test/lisp/files-tests.el
(files-tests-file-name-non-special--temp-file-prefixes): New defconst.
(files-tests-file-name-non-special--subprocess)
(files-tests-file-name-non-special--buffers): Loop over it.
(files-tests--with-temp-non-special)
(files-tests--with-temp-non-special-and-file-name-handler): Simplify.
(files-tests-file-name-non-special-make-symbolic-link):
Pacify compiler warning.
---
 test/lisp/files-tests.el | 150 +++++++++++++++++++--------------------
 1 file changed, 73 insertions(+), 77 deletions(-)

diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index 037e354d841..3fd252a8dbc 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -397,18 +397,27 @@ be $HOME."
                    (file-name-unquote
                     (file-name-unquote temporary-file-directory))))))
 
+(defconst  files-tests-file-name-non-special--temp-file-prefixes
+  '("foo" "$foo" "~foo" "foo*bar")
+  "Prefixes to be tested for `file-name-non-special' tests.")
+
 (ert-deftest files-tests-file-name-non-special--subprocess ()
   "Check that Bug#25949 and Bug#48177 are fixed."
   (skip-unless (and (executable-find "true") (file-exists-p null-device)
                     ;; These systems cannot set date of the null device.
                     (not (memq system-type '(windows-nt ms-dos)))))
-  (let ((default-directory (file-name-quote temporary-file-directory))
-        (true (file-name-quote (executable-find "true")))
-        (null (file-name-quote null-device)))
-    (should (zerop (process-file true null `((:file ,null) ,null))))
-    (should (processp (start-file-process "foo" nil true)))
-    (should (zerop (shell-command true)))
-    (should (processp (make-process :name "foo" :command `(,true))))))
+  (dolist (prefix files-tests-file-name-non-special--temp-file-prefixes)
+    (ert-with-temp-directory default-directory
+      :prefix prefix :suffix ""
+      (let ((default-directory (file-name-quote temporary-file-directory))
+            (true (file-name-quote (executable-find "true")))
+            (null (file-name-quote null-device)))
+        (should (zerop (process-file true null `((:file ,null) ,null))))
+        (should (processp (start-file-process "foo" nil true)))
+        (with-temp-buffer
+          (should (zerop (shell-command true)))
+          (should (windowp (async-shell-command true (current-buffer)))))
+        (should (processp (make-process :name "foo" :command `(,true))))))))
 
 (defmacro files-tests--with-advice (symbol where function &rest body)
   (declare (indent 3))
@@ -430,40 +439,42 @@ the buffer current and a nil argument, second passing the buffer
 object explicitly.  In both cases no error should be raised and
 the `file-name-non-special' handler for quoted file names should
 be invoked with the right arguments."
-  (ert-with-temp-file temp-file-name
-    (with-temp-buffer
-     (let* ((buffer-visiting-file (current-buffer))
-            (actual-args ())
-            (log (lambda (&rest args) (push args actual-args))))
-       (insert-file-contents (file-name-quote temp-file-name) :visit)
-       (should (stringp buffer-file-name))
-       (should (file-name-quoted-p buffer-file-name))
-       ;; The following is not true for remote files.
-       (should (string-prefix-p "/:" buffer-file-name))
-       (should (consp (visited-file-modtime)))
-       (should (equal (find-file-name-handler buffer-file-name
-                                              #'verify-visited-file-modtime)
-                      #'file-name-non-special))
-       (files-tests--with-advice file-name-non-special :before log
-         ;; This should call the file name handler with the right
-         ;; buffer and not signal an error.  The file hasn't been
-         ;; modified, so `verify-visited-file-modtime' should return
-         ;; t.
-         (should (equal (verify-visited-file-modtime) t))
-         (with-temp-buffer
-           (should (stringp (buffer-file-name buffer-visiting-file)))
-           ;; This should call the file name handler with the right
-           ;; buffer and not signal an error.  The file hasn't been
-           ;; modified, so `verify-visited-file-modtime' should return
-           ;; t.
-           (should (equal (verify-visited-file-modtime buffer-visiting-file)
-                          t))))
-       ;; Verify that the handler was actually called.  We called
-       ;; `verify-visited-file-modtime' twice, so both calls should be
-       ;; recorded in reverse order.
-       (should (equal actual-args
-                      `((verify-visited-file-modtime ,buffer-visiting-file)
-                        (verify-visited-file-modtime nil))))))))
+  (dolist (prefix files-tests-file-name-non-special--temp-file-prefixes)
+    (ert-with-temp-file temp-file-name
+      :prefix prefix :suffix ""
+      (with-temp-buffer
+        (let* ((buffer-visiting-file (current-buffer))
+               (actual-args ())
+               (log (lambda (&rest args) (push args actual-args))))
+          (insert-file-contents (file-name-quote temp-file-name) :visit)
+          (should (stringp buffer-file-name))
+          (should (file-name-quoted-p buffer-file-name))
+          ;; The following is not true for remote files.
+          (should (string-prefix-p "/:" buffer-file-name))
+          (should (consp (visited-file-modtime)))
+          (should (equal (find-file-name-handler buffer-file-name
+                                                 #'verify-visited-file-modtime)
+                         #'file-name-non-special))
+          (files-tests--with-advice file-name-non-special :before log
+            ;; This should call the file name handler with the right
+            ;; buffer and not signal an error.  The file hasn't been
+            ;; modified, so `verify-visited-file-modtime' should return
+            ;; t.
+            (should (equal (verify-visited-file-modtime) t))
+            (with-temp-buffer
+              (should (stringp (buffer-file-name buffer-visiting-file)))
+              ;; This should call the file name handler with the right
+              ;; buffer and not signal an error.  The file hasn't been
+              ;; modified, so `verify-visited-file-modtime' should return
+              ;; t.
+              (should (equal (verify-visited-file-modtime buffer-visiting-file)
+                             t))))
+          ;; Verify that the handler was actually called.  We called
+          ;; `verify-visited-file-modtime' twice, so both calls should be
+          ;; recorded in reverse order.
+          (should (equal actual-args
+                         `((verify-visited-file-modtime ,buffer-visiting-file)
+                           (verify-visited-file-modtime nil)))))))))
 
 (cl-defmacro files-tests--with-temp-non-special
     ((name non-special-name &optional dir-flag) &rest body)
@@ -476,21 +487,14 @@ After evaluating BODY, the temporary file or directory is deleted."
   (declare (indent 1) (debug ((symbolp symbolp &optional form) body)))
   (cl-check-type name symbol)
   (cl-check-type non-special-name symbol)
-  `(let* ((temporary-file-directory (file-truename temporary-file-directory))
-          (temporary-file-directory
-           (file-name-as-directory (make-temp-file "files-tests" t)))
-          (,name (make-temp-file "files-tests" ,dir-flag))
-          (,non-special-name (file-name-quote ,name)))
-     (unwind-protect
-         (progn ,@body)
-       (when (file-exists-p ,name)
-         (if ,dir-flag (delete-directory ,name t)
-           (delete-file ,name)))
-       (when (file-exists-p ,non-special-name)
-         (if ,dir-flag (delete-directory ,non-special-name t)
-           (delete-file ,non-special-name)))
-       (when (file-exists-p temporary-file-directory)
-         (delete-directory temporary-file-directory t)))))
+  `(ert-with-temp-directory temporary-file-directory
+     :prefix "files-tests-" :suffix ""
+     (setq temporary-file-directory (file-truename temporary-file-directory))
+     (dolist (prefix files-tests-file-name-non-special--temp-file-prefixes)
+       (ert-with-temp-file ,name
+         :prefix prefix :suffix "" :directory ,dir-flag
+         (let ((,non-special-name (file-name-quote ,name)))
+           ,@body)))))
 
 (defconst files-tests--special-file-name-extension ".special"
   "Trailing string for test file name handler.")
@@ -531,27 +535,17 @@ unquoted file names."
   (declare (indent 1) (debug ((symbolp symbolp &optional form) body)))
   (cl-check-type name symbol)
   (cl-check-type non-special-name symbol)
-  `(let* ((temporary-file-directory (file-truename temporary-file-directory))
-          (temporary-file-directory
-           (file-name-as-directory (make-temp-file "files-tests" t)))
-          (file-name-handler-alist
-           `((,files-tests--special-file-name-regexp
-              . files-tests--special-file-name-handler)
-             . ,file-name-handler-alist))
-          (,name (concat
-                  (make-temp-file "files-tests" ,dir-flag)
-                  files-tests--special-file-name-extension))
-          (,non-special-name (file-name-quote ,name)))
-     (unwind-protect
-         (progn ,@body)
-       (when (file-exists-p ,name)
-         (if ,dir-flag (delete-directory ,name t)
-           (delete-file ,name)))
-       (when (file-exists-p ,non-special-name)
-         (if ,dir-flag (delete-directory ,non-special-name t)
-           (delete-file ,non-special-name)))
-       (when (file-exists-p temporary-file-directory)
-         (delete-directory temporary-file-directory t)))))
+  `(let ((file-name-handler-alist
+          (cons (cons files-tests--special-file-name-regexp
+                      #'files-tests--special-file-name-handler)
+                file-name-handler-alist)))
+     (files-tests--with-temp-non-special
+         (,name ,non-special-name ,dir-flag)
+       (setq ,name (concat
+                    (make-temp-file "files-tests-" ,dir-flag)
+                    files-tests--special-file-name-extension)
+             ,non-special-name (file-name-quote ,name))
+       ,@body)))
 
 (defun files-tests--new-name (name part)
   (let (file-name-handler-alist)
@@ -1156,6 +1150,7 @@ unquoted file names."
 (ert-deftest files-tests-file-name-non-special-make-symbolic-link ()
   (files-tests--with-temp-non-special (tmpdir nospecial-dir t)
     (files-tests--with-temp-non-special (tmpfile nospecial)
+      (ignore nospecial) ; Pacify compiler warning.
       (let* ((linkname (expand-file-name "link" tmpdir))
              (may-symlink (ignore-errors (make-symbolic-link tmpfile linkname)
                                          t)))
@@ -1170,6 +1165,7 @@ unquoted file names."
       (tmpdir nospecial-dir t)
     (files-tests--with-temp-non-special-and-file-name-handler
         (tmpfile nospecial)
+      (ignore nospecial) ; Pacify compiler warning.
       (let* ((linkname (expand-file-name "link" tmpdir))
              (may-symlink (ignore-errors (make-symbolic-link tmpfile linkname)
                                          t)))

From 6f15481be5f9705e2ec32731cda0588c7e2bb15d Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 22 Apr 2026 08:48:49 +0300
Subject: [PATCH 173/463] ; Fix files-tests on MS-Windows

* test/lisp/files-tests.el
(files-tests-file-name-non-special--temp-file-prefixes): Don't use
a file name with '*' on MS-Windows.
---
 test/lisp/files-tests.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index 3fd252a8dbc..f3a2bd2df10 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -398,7 +398,10 @@ be $HOME."
                     (file-name-unquote temporary-file-directory))))))
 
 (defconst  files-tests-file-name-non-special--temp-file-prefixes
-  '("foo" "$foo" "~foo" "foo*bar")
+  (append '("foo" "$foo" "~foo")
+          ;; No amount of quoting will allow creation of a file name
+          ;; with an embedded '*' on MS-Windows and MS-DOS.
+          (if (not (memq system-type '(windows-nt ms-dos))) '("foo*bar")))
   "Prefixes to be tested for `file-name-non-special' tests.")
 
 (ert-deftest files-tests-file-name-non-special--subprocess ()

From 2afa232816db01b7d960b554dfd7991948779fbb Mon Sep 17 00:00:00 2001
From: Eshel Yaron <me@eshelyaron.com>
Date: Tue, 21 Apr 2026 18:22:14 +0200
Subject: [PATCH 174/463] ; (string-edit-minor-mode): Fix mode line lighter.

---
 lisp/textmodes/string-edit.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/textmodes/string-edit.el b/lisp/textmodes/string-edit.el
index a234a325643..d5fc270179c 100644
--- a/lisp/textmodes/string-edit.el
+++ b/lisp/textmodes/string-edit.el
@@ -117,8 +117,8 @@ Also see `string-edit'."
   "C-c C-k" #'string-edit-abort)
 
 (define-minor-mode string-edit-minor-mode
-  "Minor mode for editing strings"
-  :lighter "String"
+  "Minor mode for editing strings."
+  :lighter " String"
   :interactive nil)
 
 (define-derived-mode string-edit-mode text-mode "Text"

From ca816386e70d8484e7f1b634444f2b8087b91611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Tue, 21 Apr 2026 23:11:07 +0100
Subject: [PATCH 175/463] Eglot: add eglot--server-name helper

* lisp/progmodes/eglot.el (eglot--server-name): New function.
(eglot--list-connections-entries, eglot-describe-connection): Use it.
---
 lisp/progmodes/eglot.el | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index a49153568c7..a0ed5a81c0e 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -1392,6 +1392,10 @@ when processing many ranges."
 (defun eglot--language-ids (s) "LSP Language ID strings for server S's modes."
   (mapcar #'cdr (eglot--languages s)))
 
+(defun eglot--server-name (s)
+  "Name server S, consulting LSP `serverInfo' if available."
+  (or (plist-get (eglot--server-info s) :name) (jsonrpc-name s)))
+
 (cl-defmethod initialize-instance :before ((_server eglot-lsp-server) &optional args)
   (cl-remf args :initializationOptions))
 
@@ -4980,8 +4984,7 @@ If NOERROR, return predicate, else erroring function."
   (mapcar
    (lambda (server)
      (list server
-           `[,(or (plist-get (eglot--server-info server) :name)
-                  (jsonrpc-name server))
+           `[,(eglot--server-name server)
              ,(eglot-project-nickname server)
              ,(format "%s" (length (eglot--managed-buffers server)))
              ,(mapconcat #'symbol-name
@@ -5041,7 +5044,7 @@ If NOERROR, return predicate, else erroring function."
             (caps    (eglot--capabilities server))
             (watches (eglot--file-watches server))
             (wsconf  (eglot--workspace-configuration-plist server))
-            (sname (or (plist-get info :name) (jsonrpc-name server))))
+            (sname (eglot--server-name server)))
   "Describe SERVER in a dedicated buffer."
   (interactive (list (eglot--current-server-or-lose)))
   (with-current-buffer

From cd1a372ccf28903cc05dc30c11c8fe89d4493513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Tue, 21 Apr 2026 23:24:50 +0100
Subject: [PATCH 176/463] Eglot: add eglot--server-buffer-name and use it
 consistently

* lisp/progmodes/eglot.el (eglot--server-buffer-name): New function.

(eglot--connect): Rename events and stderr buffers after serverInfo
arrives to include the server's self-reported name.

(eglot-show-workspace-configuration, eglot-describe-connection)
(eglot--define-hierarchy-command): Use eglot--server-buffer-name.

(eglot--propose-changes-as-diff): Add SERVER argument; use
eglot--server-buffer-name.

(eglot--apply-workspace-edit): Add SERVER argument; pass server to
eglot--propose-changes-as-diff.

(eglot-handle-request workspace/applyEdit, eglot-execute)
(eglot-rename): Pass server to eglot--apply-workspace-edit.
---
 lisp/progmodes/eglot.el | 53 ++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index a0ed5a81c0e..13d578d550a 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -1037,7 +1037,7 @@ object."
       (if (and (null edit) (null command) data
                (eglot-server-capable :codeActionProvider :resolveProvider))
           (eglot-execute server (eglot--request server :codeAction/resolve action))
-        (when edit (eglot--apply-workspace-edit edit this-command))
+        (when edit (eglot--apply-workspace-edit server edit this-command))
         (when command
           ;; Recursive call with what must be a Command object (bug#71642)
           (eglot-execute server command)))))))
@@ -1396,6 +1396,13 @@ when processing many ranges."
   "Name server S, consulting LSP `serverInfo' if available."
   (or (plist-get (eglot--server-info s) :name) (jsonrpc-name s)))
 
+(defun eglot--server-buffer-name (server &optional suffix)
+  "Standard buffer name for SERVER with optional SUFFIX."
+  (format "*EGLOT (%s/%s)%s*"
+          (eglot-project-nickname server)
+          (eglot--server-name server)
+          (if suffix (concat " " suffix) "")))
+
 (cl-defmethod initialize-instance :before ((_server eglot-lsp-server) &optional args)
   (cl-remf args :initializationOptions))
 
@@ -1895,6 +1902,13 @@ This docstring appeases checkdoc, that's all."
                                 (gethash project eglot--servers-by-project))
                           (setf (eglot--capabilities server) capabilities)
                           (setf (eglot--server-info server) serverInfo)
+                          (with-current-buffer (jsonrpc-events-buffer server)
+                            (rename-buffer (eglot--server-buffer-name server "events") t))
+                          (when-let* ((buf (jsonrpc-stderr-buffer server)))
+                            (with-current-buffer buf
+                              (rename-buffer (concat " " (eglot--server-buffer-name
+                                                          server "stderr"))
+                                             t)))
                           (jsonrpc-notify server :initialized eglot--{})
                           (dolist (buffer (buffer-list))
                             (with-current-buffer buffer
@@ -2885,10 +2899,10 @@ THINGS are either registrations or unregisterations (sic)."
   (eglot--register-unregister server unregisterations 'unregister))
 
 (cl-defmethod eglot-handle-request
-  (_server (_method (eql workspace/applyEdit)) &key _label edit)
+  (server (_method (eql workspace/applyEdit)) &key _label edit)
   "Handle server request workspace/applyEdit."
   (condition-case-unless-debug oops
-      (pcase-let ((`(,retval ,reason) (eglot--apply-workspace-edit edit last-command)))
+      (pcase-let ((`(,retval ,reason) (eglot--apply-workspace-edit server edit last-command)))
         `(:applied ,retval ,@(and reason `(:failureReason ,reason))))
     (quit
      (jsonrpc-error
@@ -3118,7 +3132,8 @@ format described above.")
   "Dump `eglot-workspace-configuration' as JSON for debugging."
   (interactive (list (eglot--read-server "Show workspace configuration for" t)))
   (let ((conf (eglot--workspace-configuration-plist server)))
-    (with-current-buffer (get-buffer-create "*EGLOT workspace configuration*")
+    (with-current-buffer (get-buffer-create (eglot--server-buffer-name
+                                             server "workspace configuration"))
       (erase-buffer)
       (insert (jsonrpc--json-encode conf))
       (with-no-warnings
@@ -4361,12 +4376,13 @@ option and returns a symbol like `diff', `summary' or nil."
           ;; Default entry
           ((setq v (assoc t eglot-confirm-server-edits)) (cdr v)))))
 
-(defun eglot--propose-changes-as-diff (prepared)
+(defun eglot--propose-changes-as-diff (server prepared)
   "Helper for `eglot--apply-workspace-edit'.
 Goal is to popup a `diff-mode' buffer containing all the changes
 of PREPARED, ready to apply with C-c C-a.  PREPARED is a
 list ((FILENAME EDITS VERSION)...)."
-  (with-current-buffer (get-buffer-create "*EGLOT proposed server changes*")
+  (with-current-buffer (get-buffer-create (eglot--server-buffer-name
+                                           server "proposed changes"))
     (buffer-disable-undo (current-buffer))
     (let ((inhibit-read-only t)
           (target (current-buffer)))
@@ -4401,7 +4417,7 @@ list ((FILENAME EDITS VERSION)...)."
     (font-lock-ensure)
     (current-buffer)))
 
-(cl-defun eglot--apply-workspace-edit (wedit origin &aux prepared)
+(cl-defun eglot--apply-workspace-edit (server wedit origin &aux prepared)
   "Apply (or offer to apply) the workspace edit WEDIT.
 ORIGIN is a symbol designating the command that originated this edit
 proposed by the server.  Returns a list (APPLIED REASON) indicating if
@@ -4512,7 +4528,7 @@ the edit was attempted and optionally why not."
          ((memq decision '(diff maybe-diff))
           (cond (all-text-edits
                  (pop-to-buffer
-                  (eglot--propose-changes-as-diff prepared))
+                  (eglot--propose-changes-as-diff server prepared))
                  `(nil "decision to apply manually"))
                 (t
                  ;; `map-y-or-n-p' heroics.  Iterate over prepared
@@ -4527,7 +4543,7 @@ the edit was attempted and optionally why not."
                           (lambda (op)
                             (when (eq (car op) 'text-edit)
                               (display-buffer
-                               (eglot--propose-changes-as-diff (list op))))
+                               (eglot--propose-changes-as-diff server (list op))))
                             (format "[eglot] %s? " (cadr op)))
                           (lambda (op)
                             (set-window-configuration wconf)
@@ -4577,11 +4593,12 @@ the edit was attempted and optionally why not."
 (defun eglot-rename (newname)
   "Rename the current symbol to NEWNAME."
   (interactive (eglot--rename-interactive))
-  (eglot--apply-workspace-edit
-   (eglot--request (eglot--current-server-or-lose)
-                   :textDocument/rename `(,@(eglot--TextDocumentPositionParams)
-                                          :newName ,newname))
-   this-command))
+  (let ((server (eglot--current-server-or-lose)))
+    (eglot--apply-workspace-edit
+     server
+     (eglot--request server :textDocument/rename `(,@(eglot--TextDocumentPositionParams)
+                                                   :newName ,newname))
+     this-command)))
 
 (defun eglot--code-action-bounds ()
   "Calculate appropriate bounds depending on region and point."
@@ -5048,8 +5065,7 @@ If NOERROR, return predicate, else erroring function."
   "Describe SERVER in a dedicated buffer."
   (interactive (list (eglot--current-server-or-lose)))
   (with-current-buffer
-      (get-buffer-create (format "*EGLOT connection (%s/%s)*"
-                                 (eglot-project-nickname server) sname))
+      (get-buffer-create (eglot--server-buffer-name server "connection"))
     (let ((inhibit-read-only t))
       (erase-buffer)
       (special-mode)
@@ -5561,9 +5577,8 @@ lock machinery calls us again."
                      (list
                       (cl-find direction specs :key #'cl-third)))))
        (eglot--hierarchy-1
-        (format "*EGLOT %s hierarchy for %s*"
-                ,kind
-                (eglot-project-nickname (eglot--current-server-or-lose)))
+        (eglot--server-buffer-name (eglot--current-server-or-lose)
+                                   (format "%s hierarchy" ,kind))
         ,feature ,preparer specs))))
 
 (eglot--define-hierarchy-command

From 402a0b70752fd4a8e6be1580297a3316af3a11c7 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 22 Apr 2026 08:39:48 -0400
Subject: [PATCH 177/463] (mail-citation-prefix-regexp): Fix excessive
 backtracking (bug#80808)

* lisp/mail/sendmail.el (mail-citation-prefix-regexp): Simplify regexp
and fix docstring to reflect reality since commit 0b8ee42164cc4569.
---
 lisp/mail/sendmail.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 51690013de1..cd2115cb660 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -259,13 +259,14 @@ regardless of what part of it (if any) is included in the cited text.")
 
 ;;;###autoload
 (defcustom mail-citation-prefix-regexp
-  ;; Use [[:word:]] rather than \w so we don't get tripped up if one
+  ;; Use [:word:] rather than \w so we don't get tripped up if one
   ;; of those chars has a weird `syntax-table' text property.
-  "\\([ \t]*\\([[:word:]]\\|[_.]\\)+>+\\|[ \t]*[>|]\\)+"
+  ;; FIXME: Merge with `message-cite-prefix-regexp'.
+  "\\(?:[ \t]*\\(?:[[:word:]_.]+>\\|[>|]\\)\\)+"
   "Regular expression to match a citation prefix plus whitespace.
 It should match whatever sort of citation prefixes you want to handle,
-with whitespace before and after; it should also match just whitespace.
-The default value matches citations like `foo-bar>' plus whitespace."
+including leading whitespace.  The default value matches citations
+like `foo_bar>' plus any leading whitespace."
   :type 'regexp
   :version "24.1")
 

From 7f1e54c61ac4bc06bbb5ba334a91c73e49a9f0ec Mon Sep 17 00:00:00 2001
From: Roi Martin <jroi.martin@gmail.com>
Date: Wed, 22 Apr 2026 16:48:16 +0200
Subject: [PATCH 178/463] Test that ERT creates a list of executed tests from
 erts files

* test/lisp/emacs-lisp/ert-resources/erts-file-test-list-fail.erts:
* test/lisp/emacs-lisp/ert-resources/erts-file-test-list.erts: New erts
files.
* test/lisp/emacs-lisp/ert-tests.el (ert-test-list-of-erts-file-tests):
New test.
---
 .../erts-file-test-list-fail.erts             | 23 +++++++++++++
 .../ert-resources/erts-file-test-list.erts    | 32 +++++++++++++++++++
 test/lisp/emacs-lisp/ert-tests.el             | 19 +++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 test/lisp/emacs-lisp/ert-resources/erts-file-test-list-fail.erts
 create mode 100644 test/lisp/emacs-lisp/ert-resources/erts-file-test-list.erts

diff --git a/test/lisp/emacs-lisp/ert-resources/erts-file-test-list-fail.erts b/test/lisp/emacs-lisp/ert-resources/erts-file-test-list-fail.erts
new file mode 100644
index 00000000000..6683ae37987
--- /dev/null
+++ b/test/lisp/emacs-lisp/ert-resources/erts-file-test-list-fail.erts
@@ -0,0 +1,23 @@
+Name: foo
+
+=-=
+FOO
+=-=
+FOO
+=-=-=
+
+Name: bar
+
+=-=
+BAR
+=-=
+BAZ
+=-=-=
+
+Name: quux
+
+=-=
+QUUX
+=-=
+QUUX
+=-=-=
diff --git a/test/lisp/emacs-lisp/ert-resources/erts-file-test-list.erts b/test/lisp/emacs-lisp/ert-resources/erts-file-test-list.erts
new file mode 100644
index 00000000000..737bcd000a7
--- /dev/null
+++ b/test/lisp/emacs-lisp/ert-resources/erts-file-test-list.erts
@@ -0,0 +1,32 @@
+Name: foo
+
+=-=
+FOO
+=-=
+FOO
+=-=-=
+
+Name: bar
+
+=-=
+BAR
+=-=
+BAR
+=-=-=
+
+Name: baz
+Skip: t
+
+=-=
+BAZ
+=-=
+BAZ
+=-=-=
+
+Name: quux
+
+=-=
+QUUX
+=-=
+QUUX
+=-=-=
diff --git a/test/lisp/emacs-lisp/ert-tests.el b/test/lisp/emacs-lisp/ert-tests.el
index 00020e8bef6..2831a93ec07 100644
--- a/test/lisp/emacs-lisp/ert-tests.el
+++ b/test/lisp/emacs-lisp/ert-tests.el
@@ -1052,6 +1052,25 @@ F failing-test
   (ert-test-erts-file (ert-resource-file "erts-skip-last.erts")
                       (lambda () ())))
 
+(ert-deftest ert-test-list-of-erts-file-tests ()
+  "Test that the list of tests from erts files is created correctly."
+  (let ((run-erts-file-tests
+         (lambda (erts-file)
+           (let* ((ert-test (make-ert-test
+                             :body (lambda ()
+                                     (ert-test-erts-file
+                                      (ert-resource-file erts-file)
+                                      (lambda () ())))))
+                  (result (ert-run-test ert-test))
+                  (erts-file-tests (ert-test-result-erts-file-tests result)))
+             (mapcar (lambda (desc)
+                       (cdr (assq 'name desc)))
+                     erts-file-tests)))))
+    (should (equal (funcall run-erts-file-tests "erts-file-test-list.erts")
+                   '("foo" "bar" "quux")))
+    (should (equal (funcall run-erts-file-tests "erts-file-test-list-fail.erts")
+                   '("foo" "bar")))))
+
 (provide 'ert-tests)
 
 ;;; ert-tests.el ends here

From 45304541ec906855e2412e15848bb8c8e7aa9d58 Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Wed, 22 Apr 2026 18:53:35 +0200
Subject: [PATCH 179/463] Update to Transient v0.13.0-10-g5b2ff26f

---
 doc/misc/transient.texi |  378 ++++++++++----
 lisp/transient.el       | 1054 +++++++++++++++++++++++++--------------
 2 files changed, 946 insertions(+), 486 deletions(-)

diff --git a/doc/misc/transient.texi b/doc/misc/transient.texi
index 25d0e11fac7..b0eebec3071 100644
--- a/doc/misc/transient.texi
+++ b/doc/misc/transient.texi
@@ -25,13 +25,13 @@ General Public License for more details.
 
 @dircategory Emacs misc features
 @direntry
-* Transient: (transient).       Transient Commands.
+* Transient: (transient). Transient Commands.
 @end direntry
 
 @finalout
 @titlepage
 @title Transient User and Developer Manual
-@subtitle for version 0.12.0
+@subtitle for version 0.13.0
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
@@ -53,7 +53,7 @@ resource to get over that hurdle is Psionic K's interactive tutorial,
 available at @uref{https://github.com/positron-solutions/transient-showcase}.
 
 @noindent
-This manual is for Transient version 0.12.0.
+This manual is for Transient version 0.13.0.
 
 @insertcopying
 @end ifnottex
@@ -385,7 +385,7 @@ than outlined above and even customizable.}
 If the user does not save the value and just exits using a regular
 suffix command, then the value is merely saved to the transient's
 history.  That value won't be used when the transient is next invoked,
-but it is easily accessible (@pxref{Using History}).
+but it is easily accessible (see @ref{Using History}).
 
 Option @code{transient-common-command-prefix} controls the prefix key used
 in the following bindings.  For simplicity's sake the default, @kbd{C-x},
@@ -454,8 +454,8 @@ previously used values.  Usually the same keys as those mentioned
 above are bound to those commands.
 
 Authors of transients should arrange for different infix commands that
-read the same kind of value to also use the same history key
-(@pxref{Suffix Slots}).
+read the same kind of value to also use the same history key (see
+@ref{Suffix Slots}).
 
 Both kinds of history are saved to a file when Emacs is exited.
 
@@ -680,7 +680,7 @@ More options are described in @ref{Common Suffix Commands}, in @ref{Saving Value
 
 Two more essential options are documented in @ref{Common Suffix Commands}.
 
-@defopt transient-show-popup
+@defopt transient-show-menu
 This option controls whether and when transient's menu buffer is
 shown.
 
@@ -747,16 +747,23 @@ from the user.  If @code{nil}, there is no initial input and the first
 element has to be accessed the same way as the older elements.
 @end defopt
 
-@defopt transient-enable-popup-navigation
+@defopt transient-enable-menu-navigation
 This option controls whether navigation commands are enabled in
-transient's menu buffer.  If the value is @code{verbose} (the default),
-brief documentation about the command under point is additionally
-show in the echo area.
+transient menu buffer, and whether additional documentation is shown
+in the echo area while doing so.
 
-While a transient is active the menu buffer is not the current
-buffer, making it necessary to use dedicated commands to act on that
-buffer itself.  If this option is non-@code{nil}, then the following
-features are available:
+If the value is @code{verbose} (the default), additional documentation
+about the command at point is shown in the echo area.  If this would
+result in the same documentation, which is being displayed inside
+the menu buffer, to be duplicated in the echo area, then @code{verbose}
+forgoes doing so.  Use @code{force-verbose} to echo even such documentation.
+Use @code{t} to enable menu navigation without showing documentation in the
+echo area.
+
+While a transient is active, the menu buffer is (by default) not the
+current buffer, making it necessary to use dedicated commands to act
+on that buffer itself.  If this option is non-nil, then the
+following bindings are available:
 
 @itemize
 @item
@@ -766,15 +773,18 @@ features are available:
 @item
 @kbd{M-@key{RET}} invokes the suffix the cursor is on.
 @item
-@kbd{mouse-1} invokes the clicked on suffix.
+@kbd{mouse-1} and @kbd{mouse-2} invokes the clicked on suffix.
 @item
 @kbd{C-s} and @kbd{C-r} start isearch in the menu buffer.
 @end itemize
 
-By default @kbd{M-@key{RET}} is bound to @code{transient-push-button}, instead of
-@kbd{@key{RET}}, because if a transient allows the invocation of non-suffixes,
-then it is likely, that you would want @kbd{@key{RET}} to do what it would do
-if no transient were active."
+@kbd{mouse-1} and @kbd{mouse-2} are bound in @code{transient-button-map}.
+All other bindings are in @code{transient-popup-navigation-map}.
+
+Instead of @kbd{@key{RET}}, @kbd{M-@key{RET}} is used to invoke the suffix command at point by
+default, because if a transient allows the invocation of non-suffixes,
+then it is likely that the user would want the former do what it would
+do if no transient were active.
 @end defopt
 
 @defopt transient-display-buffer-action
@@ -785,7 +795,7 @@ menu buffer.  The menu buffer is displayed in a window using
 The value of this option has the form @code{(@var{FUNCTION} . @var{ALIST})},
 where @var{FUNCTION} is a function or a list of functions.  Each such
 function should accept two arguments: a buffer to display and an
-alist of the same form as @var{ALIST}.  @xref{Choosing Window,,,elisp,},
+alist of the same form as @var{ALIST}.  See @ref{Choosing Window,,,elisp,},
 for details.
 
 The default is:
@@ -798,8 +808,8 @@ The default is:
 @end lisp
 
 This displays the window at the bottom of the selected frame.
-For alternatives @xref{Buffer Display Action Functions,,,elisp,},
-and @xref{Buffer Display Action Alists,,,elisp,}.
+For alternatives see @ref{Buffer Display Action Functions,,,elisp,},
+and @ref{Buffer Display Action Alists,,,elisp,}.
 
 When you switch to a different ACTION, you should keep the ALIST
 entries for @code{dedicated} and @code{inhibit-same-window} in most cases.
@@ -828,11 +838,147 @@ when creating a new prefix with @code{transient-define-prefix}.
 @anchor{Accessibility Options}
 @subheading Accessibility Options
 
+For visually impaired users I recommend the following configuration.
+If you need more guidance or would like to share your experience,
+please don't hesitate to contact me.
+
+@lisp
+(setopt transient-enable-menu-navigation 'force-verbose)
+(setopt transient-navigate-to-group-descriptions t)
+(setopt transient-describe-menu t)
+(setopt transient-select-menu-window t)
+(setopt transient-force-single-column t)
+(setopt transient-prefer-reading-value t)
+(setopt transient-use-accessible-values t)
+(setopt transient-use-accessible-formats t)
+@end lisp
+
+Additionally you have allow the command, which you use to read the
+text at point, to be run when a transient menu is active, for example:
+
+@lisp
+(define-key transient-predicate-map
+  [my-read-text-at-point] #'transient--do-stay)
+@end lisp
+
+@defopt transient-enable-menu-navigation
+This option is documented in the previous node (@ref{Essential Options}).  You might want to change the value from @code{verbose} to
+@code{force-verbose}, which causes information to be shown in the echo
+area, even if it is identical to information already displayed in
+the menu buffer.  Whether that is useful to you depends on whether
+your setup makes it easy to read the last message displayed in the
+echo area.
+@end defopt
+
+@defopt transient-navigate-to-group-descriptions
+This option controls whether menu navigation commands stop at group
+descriptions.  If your output method works by reading the text at
+point, you most likely want to enable this.
+
+If @code{transient-enable-menu-navigation} is non-@code{nil}, which it is by
+default, @kbd{@key{UP}} and @kbd{@key{DOWN}} move from suffix to suffix.  When this option
+is non-@code{nil} as well, then they additionally stop at group descriptions.
+This is useful because it allows braille and audio devices to output
+the group title at point.
+@end defopt
+
+@defopt transient-describe-menu
+This option controls whether a short description about the menu
+itself is inserted at the beginning of the menu buffer.
+
+When this is non-@code{nil}, then the menu buffer begins with a short
+description.  Ideally this is a string written exactly for that
+purpose, but because this is a new feature, most menu commands do
+not provide that yet.  In that case the first line of the prefix
+command's docstring is used as fallback.  If the value is @code{docstring},
+then the docstring is used even if a description is available.
+@end defopt
+
+@defopt transient-select-menu-window
+This option controls whether the window displaying the transient menu
+is automatically selected as soon as it is displayed.
+
+Enabling this is discouraged, except for users of braille and audio
+output devises.  Note that enabling this, or alternatively selecting
+the menu window on demand, are both unnecessary, to be able to move
+the cursor in the menu.  See @code{transient-enable-menu-navigation}.
+@end defopt
+
 @defopt transient-force-single-column
 This option controls whether the use of a single column to display
 suffixes is enforced.  This might be useful for users with low
 vision who use large text and might otherwise have to scroll in two
-dimensions.
+dimensions.  This is also useful for blind users, because it causes
+suffixes to be navigated in a more natural order, because often
+related commands are displayed in the same column but navigation
+first moves horizontally to the next item on the same row.
+@end defopt
+
+@defopt transient-prefer-reading-value
+This option controls whether reading a new value is preferred over
+other value selection methods.
+
+If this is @code{nil} (the default), then certain arguments are directly
+disabled when they are invoked, while they have a non-@code{nil} value.  I.e.,
+to switch from one non-@code{nil} value to another non-@code{nil} value, such commands
+have to be invoked twice.  For other arguments, which happen to have a
+small set of possible values, all values are displayed at all times,
+using solely coloring to indicate which of the values is active.  When
+such an infix command is invoked it cycles to the next value.
+
+This default does not work for visually impaired user.  If this option
+is non-@code{nil}, then more arguments immediately read the new value, instead
+of being toggled off on first invocation, or instead of cycling through
+values.
+@end defopt
+
+@defopt transient-use-accessible-values
+This option controls whether values are shown in a way that does not
+rely on coloring.
+
+If this is @code{nil} (the default), then colors are used to communicate the
+state of arguments.  For certain argument types the state is solely
+communicated that way.  For example, an enabled command-line switch is
+shown using some bright color, and disabling that argument, changes the
+color to gray, without otherwise changing the displayed text.
+
+This default does not work for visually impaired user.  If this option
+is non-@code{nil}, then the state is additionally communicated through other
+means.  A switch, for example, is either followed by "is enabled" or
+"is disabled".  How exactly the state is communicated depends on the
+type of the infix command.
+
+Note that packages, which use Transient, can define their own infix
+command types, which may or may not involve overriding Transient's
+code, which honors this new option.  I.e., it will take some time until
+everything respects this setting.
+@end defopt
+
+@defopt transient-use-accessible-formats
+This option controls whether more accessible format strings are used
+for menu elements.
+
+If this is non-@code{nil}, then menu elements are displayed in a way, that I
+hope, is more suitable for visually impaired users than the default.
+Please provide feedback, so that we can together work on improving this.
+
+By default the format specified by an element's @code{format} slot is used.
+When this is non-@code{nil}, then the @code{accessible-format} slot is used instead.
+One change implemented in the latter is that for an element representing
+a command-line argument, the argument and its value are moved before the
+description, giving quicker access to the current state, while still
+allowing users to read the description, in case they don't know yet what
+the argument in question does.
+
+Enabling this also causes the string "inapt" to be added at the very
+beginning of the text describing a command that currently cannot be
+used.  When using the default format, the only visual clue that a
+command is inapt, is that the complete text representing it is grayed
+out.  (As an example of such an inapt command, consider the case of a
+commands that can only act on the file at point, when there currently
+isn't a file at point.)  Placing the string "inapt" at the very
+beginning gives users the opportunity to immediately skip over unusable
+commands, while still giving them the opportunity to read on.
 @end defopt
 
 @anchor{Auxiliary Options}
@@ -861,7 +1007,7 @@ used to draw the line.
 This user option may be overridden if @code{:mode-line-format} is passed
 when creating a new prefix with @code{transient-define-prefix}.
 
-Otherwise this can be any mode-line format.  @xref{Mode Line Format,,,elisp,}, for details.
+Otherwise this can be any mode-line format.  See @ref{Mode Line Format,,,elisp,}, for details.
 @end defopt
 
 @defopt transient-semantic-coloring
@@ -1002,8 +1148,8 @@ That buffer is current and empty when this hook is runs.
 
 @cindex modifying existing transients
 
-To an extent, transients can be customized interactively,
-@xref{Enabling and Disabling Suffixes}.  This section explains how existing
+To an extent, transients can be customized interactively, see
+@ref{Enabling and Disabling Suffixes}.  This section explains how existing
 transients can be further modified non-interactively.  Let's begin
 with an example:
 
@@ -1029,10 +1175,10 @@ which can be included in multiple prefixes.  See TODO@.
 as expected by @code{transient-define-prefix}.  Note that an infix is a
 special kind of suffix.  Depending on context ``suffixes'' means
 ``suffixes (including infixes)'' or ``non-infix suffixes''.  Here it
-means the former.  @xref{Suffix Specifications}.
+means the former.  See @ref{Suffix Specifications}.
 
 @var{SUFFIX} may also be a group in the same form as expected by
-@code{transient-define-prefix}.  @xref{Group Specifications}.
+@code{transient-define-prefix}.  See @ref{Group Specifications}.
 
 @item
 @var{LOC} is a key description (a string as returned by @code{key-description}
@@ -1072,7 +1218,7 @@ or after @var{LOC}.
 Conceptually adding a binding to a transient prefix is similar to
 adding a binding to a keymap, but this is complicated by the fact
 that multiple suffix commands can be bound to the same key, provided
-they are never active at the same time, @xref{Predicate Slots}.
+they are never active at the same time, see @ref{Predicate Slots}.
 
 Unfortunately both false-positives and false-negatives are possible.
 To deal with the former, use non-@code{nil} @var{KEEP-OTHER@.}  The symbol @code{always}
@@ -1205,14 +1351,14 @@ enabled.  One benefit of the Transient interface is that it remembers
 history not only on a global level (``this command was invoked using
 these arguments, and previously it was invoked using those other
 arguments''), but also remembers the values of individual arguments
-independently.  @xref{Using History}.
+independently.  See @ref{Using History}.
 
 After a transient prefix command is invoked, @kbd{C-h @var{KEY}} can be used to
 show the documentation for the infix or suffix command that @kbd{@var{KEY}} is
-bound to (@pxref{Getting Help for Suffix Commands}), and infixes and
+bound to (see @ref{Getting Help for Suffix Commands}), and infixes and
 suffixes can be removed from the transient using @kbd{C-x l @var{KEY}}.  Infixes
 and suffixes that are disabled by default can be enabled the same way.
-@xref{Enabling and Disabling Suffixes}.
+See @ref{Enabling and Disabling Suffixes}.
 
 Transient ships with support for a few different types of specialized
 infix commands.  A command that sets a command line option, for example,
@@ -1263,7 +1409,7 @@ explicitly.
 
 @var{GROUP}s add key bindings for infix and suffix commands and specify
 how these bindings are presented in the menu buffer.  At least one
-@var{GROUP} has to be specified.  @xref{Binding Suffix and Infix Commands}.
+@var{GROUP} has to be specified.  See @ref{Binding Suffix and Infix Commands}.
 
 The @var{BODY} is optional.  If it is omitted, then @var{ARGLIST} is ignored and
 the function definition becomes:
@@ -1314,13 +1460,11 @@ GROUPs have the same form as for @code{transient-define-prefix}.
 @section Binding Suffix and Infix Commands
 
 The macro @code{transient-define-prefix} is used to define a transient.
-This defines the actual transient prefix command (@pxref{Defining
-Transients}) and adds the transient's infix and suffix bindings, as
+This defines the actual transient prefix command (see @ref{Defining Transients}) and adds the transient's infix and suffix bindings, as
 described below.
 
 Users and third-party packages can add additional bindings using
-functions such as @code{transient-insert-suffix} (@pxref{Modifying Existing Transients}).
-These functions take a ``suffix specification'' as one of
+functions such as @code{transient-insert-suffix} (see @ref{Modifying Existing Transients}).  These functions take a ``suffix specification'' as one of
 their arguments, which has the same form as the specifications used in
 @code{transient-define-prefix}.
 
@@ -1336,7 +1480,7 @@ for a set of suffixes.
 
 Several group classes exist, some of which organize suffixes in
 subgroups.  In most cases the class does not have to be specified
-explicitly, but @xref{Group Classes}.
+explicitly, but see @ref{Group Classes}.
 
 Groups are specified in the call to @code{transient-define-prefix}, using
 vectors.  Because groups are represented using vectors, we cannot use
@@ -1346,13 +1490,10 @@ brackets to do the latter.
 Group specifications then have this form:
 
 @lisp
-[@{@var{LEVEL}@} @{@var{DESCRIPTION}@}
- @{@var{KEYWORD} @var{VALUE}@}...
- @var{ELEMENT}...]
+[@{LEVEL@} @{DESCRIPTION@} @{KEYWORD VALUE@}... ELEMENT...]
 @end lisp
 
-The @var{LEVEL} is optional and defaults to 4.  @xref{Enabling and
-Disabling Suffixes}.
+The @var{LEVEL} is optional and defaults to 4.  See @ref{Enabling and Disabling Suffixes}.
 
 The @var{DESCRIPTION} is optional.  If present, it is used as the heading of
 the group.
@@ -1383,7 +1524,7 @@ useful while rebase is already in progress; and another that uses
 initiate a rebase.
 
 These predicates can also be used on individual suffixes and are
-only documented once, @xref{Predicate Slots}.
+only documented once, see @ref{Predicate Slots}.
 
 @item
 The value of @code{:hide}, if non-@code{nil}, is a predicate that controls
@@ -1488,13 +1629,13 @@ The form of suffix specifications is documented in the next node.
 @cindex suffix specifications
 
 A transient's suffix and infix commands are bound when the transient
-prefix command is defined using @code{transient-define-prefix},
-@xref{Defining Transients}.  The commands are organized into groups,
-@xref{Group Specifications}.  Here we describe the form used to bind an
+prefix command is defined using @code{transient-define-prefix}, see
+@ref{Defining Transients}.  The commands are organized into groups, see
+@ref{Group Specifications}.  Here we describe the form used to bind an
 individual suffix command.
 
 The same form is also used when later binding additional commands
-using functions such as @code{transient-insert-suffix}, @xref{Modifying Existing Transients}.
+using functions such as @code{transient-insert-suffix}, see @ref{Modifying Existing Transients}.
 
 Note that an infix is a special kind of suffix.  Depending on context
 ``suffixes'' means ``suffixes (including infixes)'' or ``non-infix
@@ -1503,9 +1644,7 @@ suffixes''.  Here it means the former.
 Suffix specifications have this form:
 
 @lisp
-([@var{LEVEL}]
- [@var{KEY} [@var{DESCRIPTION}]]
- @var{COMMAND}|@var{ARGUMENT} [@var{KEYWORD} @var{VALUE}]...)
+([LEVEL] [KEY [DESCRIPTION]] COMMAND|ARGUMENT [KEYWORD VALUE]...)
 @end lisp
 
 @var{LEVEL}, @var{KEY} and @var{DESCRIPTION} can also be specified using the @var{KEYWORD}s
@@ -1516,8 +1655,8 @@ the object's values just for the binding inside this transient.
 
 @itemize
 @item
-@var{LEVEL} is the suffix level, an integer between 1 and 7.
-@xref{Enabling and Disabling Suffixes}.
+@var{LEVEL} is the suffix level, an integer between 1 and 7.  See
+@ref{Enabling and Disabling Suffixes}.
 
 @item
 KEY is the key binding, a string in the format returned by
@@ -1591,7 +1730,7 @@ guessed based on the long argument.  If the argument ends with @samp{=}
 
 Finally, details can be specified using optional @var{KEYWORD}-@var{VALUE} pairs.
 Each keyword has to be a keyword symbol, either @code{:class} or a keyword
-argument supported by the constructor of that class.  @xref{Suffix Slots}.
+argument supported by the constructor of that class.  See @ref{Suffix Slots}.
 
 If a keyword argument accepts a function as value, you an use a @code{lambda}
 expression.  As a special case, the @code{##} macro (which returns a @code{lambda}
@@ -1941,8 +2080,8 @@ means that all outer prefixes are exited at once.
 @item
 The behavior for non-suffixes can be set for a particular prefix,
 by the prefix's @code{transient-non-suffix} slot to a boolean, a suitable
-pre-command function, or a shorthand for such a function.
-@xref{Pre-commands for Non-Suffixes}.
+pre-command function, or a shorthand for such a function.  See
+@ref{Pre-commands for Non-Suffixes}.
 
 @item
 The common behavior for the suffixes of a particular prefix can be
@@ -2267,7 +2406,7 @@ Transient itself provides a single class for prefix commands,
 @code{transient-prefix}, but package authors may wish to define specialized
 classes.  Doing so makes it possible to change the behavior of the set
 of prefix commands that use that class, by implementing specialized
-methods for certain generic functions (@pxref{Prefix Methods}).
+methods for certain generic functions (see @ref{Prefix Methods}).
 
 A transient prefix command's object is stored in the @code{transient--prefix}
 property of the command symbol.  While a transient is active, a clone
@@ -2282,7 +2421,7 @@ object should not affect later invocations.
 @item
 All suffix and infix classes derive from @code{transient-suffix}, which in
 turn derives from @code{transient-child}, from which @code{transient-group} also
-derives (@pxref{Group Classes}).
+derives (see @ref{Group Classes}).
 
 @item
 All infix classes derive from the abstract @code{transient-infix} class,
@@ -2290,13 +2429,13 @@ which in turn derives from the @code{transient-suffix} class.
 
 Infixes are a special type of suffixes.  The primary difference is
 that infixes always use the @code{transient--do-stay} pre-command, while
-non-infix suffixes use a variety of pre-commands (@pxref{Transient State}).  Doing that is most easily achieved by using this class,
+non-infix suffixes use a variety of pre-commands (see @ref{Transient State}).  Doing that is most easily achieved by using this class,
 though theoretically it would be possible to define an infix class
 that does not do so.  If you do that then you get to implement many
 methods.
 
 Also, infixes and non-infix suffixes are usually defined using
-different macros (@pxref{Defining Suffix and Infix Commands}).
+different macros (see @ref{Defining Suffix and Infix Commands}).
 
 @item
 Classes used for infix commands that represent arguments should
@@ -2607,7 +2746,7 @@ returns a brief summary about the command at point or hovered with
 the mouse.
 
 This function is called when the mouse is moved over a command and
-(if the value of @code{transient-enable-popup-navigation} is @code{verbose}) when
+(if the value of @code{transient-enable-menu-navigation} is @code{verbose}) when
 the user navigates to a command using the keyboard.
 
 If OBJ's @code{summary} slot is a string, that is used.  If @code{summary} is a
@@ -2706,7 +2845,7 @@ secondary value, called a ``scope''.  See @code{transient-define-prefix}.
 @code{transient-suffix}, @code{transient-non-suffix} and @code{transient-switch-frame}
 play a part when determining whether the currently active transient
 prefix command remains active/transient when a suffix or arbitrary
-non-suffix command is invoked.  @xref{Transient State}.
+non-suffix command is invoked.  See @ref{Transient State}.
 
 @item
 @code{refresh-suffixes} Normally suffix objects and keymaps are only setup
@@ -2766,6 +2905,12 @@ fallback descriptions for suffixes that lack a description.  This
 is intended to be temporarily used when implementing of a new prefix
 command, at which time @code{transient-command-summary-or-name} is a useful
 value.
+
+@item
+@code{description} a short string describing the prefix, which users can
+opt-in to be displayed at the top of the menu buffer.  This should
+be more concise than the first line of the docstring, which is used
+as a fallback if no description is provided.
 @end itemize
 
 @anchor{Internal}
@@ -2788,7 +2933,7 @@ of the same symbol.
 
 @item
 @code{level} The level of the prefix commands.  The suffix commands whose
-layer is equal or lower are displayed.  @pxref{Enabling and Disabling Suffixes}.
+layer is equal or lower are displayed.  See @ref{Enabling and Disabling Suffixes}.
 
 @item
 @code{value} The likely outdated value of the prefix.  Instead of accessing
@@ -2812,19 +2957,46 @@ Here we document most of the slots that are only available for suffix
 objects.  Some slots are shared by suffix and group objects, they are
 documented in @ref{Predicate Slots}.
 
-Also @xref{Suffix Classes}.
+Also see @ref{Suffix Classes}.
 
 @anchor{Slots of @code{transient-child}}
 @subheading Slots of @code{transient-child}
 
-This is the abstract superclass of @code{transient-suffix} and @code{transient-group}.
-This is where the shared @code{if*} and @code{inapt-if*} slots (@pxref{Predicate Slots}),
-the @code{level} slot (@pxref{Enabling and Disabling Suffixes}), and the @code{advice}
-and @code{advice*} slots (@pxref{Slots of @code{transient-suffix}}) are defined.
+This is the abstract superclass of @code{transient-suffix} and
+@code{transient-group}.  In addition to the slots listed below, this class
+is also where the @code{if*} and @code{inapt-if*} slots (see @ref{Predicate Slots}) and
+the @code{level} slot (see @ref{Enabling and Disabling Suffixes}) are defined.
 
 @itemize
 @item
-@code{parent} The object for the parent group.
+@code{parent} The object for the parent group, if any.
+
+@item
+@code{inactive} If an @code{:if*} predicate of a suffix or group returns @code{nil},
+then it is not displayed in the menu, but it has to remain in the
+internal object tree, in case that predicate later returns @code{t}, and
+the @code{object} therefore has to appear in the menu again.  Likewise a
+group or suffix may be (potentially only temporarily) inactive due
+to its @code{level}.  The @code{inactive} slot is set accordingly.  Never set it
+yourself.
+@end itemize
+
+The following two slots are experimental.  If they are set for a
+group, then they apply to all suffixes in that group, except for
+suffixes that themselves set the same slot to a non-@code{nil} value.
+
+@itemize
+@item
+@code{advice} A function used to advise the command.  The advise is called
+using @code{(apply advice command args)}, i.e., it behaves like an "around"
+advice.
+
+@item
+@code{advice*} A function used to advise the command.  Unlike @code{advice}, this
+advises not only the command body but also its @code{interactive} spec.  If
+both slots are non-@code{nil}, @code{advice} is used for the body and @code{advice*} is
+used for the @code{interactive} form.  When advising the @code{interactive} spec,
+called using @code{(funcall advice #'advice-eval-interactive-spec spec)}.
 @end itemize
 
 @anchor{Slots of @code{transient-suffix}}
@@ -2846,7 +3018,7 @@ which is useful for alignment purposes.
 @code{command} The command, a symbol.
 
 @item
-@code{transient} Whether to stay transient.  @xref{Transient State}.
+@code{transient} Whether to stay transient.  See @ref{Transient State}.
 
 @item
 @code{format} The format used to display the suffix in the menu buffer.
@@ -2877,34 +3049,23 @@ unspecified, the prefix controls how help is displayed for its
 suffixes.  See also function @code{transient-show-help}.
 
 @item
-@code{summary} The summary displayed in the echo area, or as a tooltip.
-If this is @code{nil}, which it usually should be, the first line of the
-documentation string is used instead.  See @code{transient-show-summary}
-for details.
+@code{summary} A short description to be displayed in addition to the text
+displayed in the menu itself.  If this is @code{nil}, the first line of the
+documentation string is used instead.  If non-@code{nil}, this must be a
+string or a function that returns a string or @code{nil}.
+
+This description is displayed as a tooltip, when hovering an element
+in the menu.  If @code{transient-enable-menu-navigation} is @code{verbose}, it is
+also shown in the echo area, when navigating the menu.
+
+The generic function @code{transient-get-summary} is used to determine and
+format this description.
 
 @item
 @code{definition} A command, which is used if the body is omitted when
 defining a command using @code{transient-define-suffix}.
 @end itemize
 
-The following two slots are experimental.  They can also be set for a
-group, in which case they apply to all suffixes in that group, except
-for suffixes that set the same slot to a non-@code{nil} value.
-
-@itemize
-@item
-@code{advice} A function used to advise the command.  The advise is called
-using @code{(apply advice command args)}, i.e., it behaves like an "around"
-advice.
-
-@item
-@code{advice*} A function used to advise the command.  Unlike @code{advice}, this
-advises not only the command body but also its @code{interactive} spec.  If
-both slots are non-@code{nil}, @code{advice} is used for the body and @code{advice*} is
-used for the @code{interactive} form.  When advising the @code{interactive} spec,
-called using @code{(funcall advice #'advice-eval-interactive-spec spec)}.
-@end itemize
-
 @anchor{Slots of @code{transient-infix}}
 @subheading Slots of @code{transient-infix}
 
@@ -3070,14 +3231,14 @@ currently cannot be invoked.
 
 By default these predicates run when the prefix command is invoked,
 but this can be changes, using the @code{refresh-suffixes} prefix slot.
-@xref{Prefix Slots}.
+See @ref{Prefix Slots}.
 
 One more slot is shared between group and suffix classes, @code{level}.  Like
 the slots documented above, it is a predicate, but it is used for a
 different purpose.  The value has to be an integer between 1
 and 7.  @code{level} controls whether a suffix or a group should be
 available depending on user preference.
-@xref{Enabling and Disabling Suffixes}.
+See @ref{Enabling and Disabling Suffixes}.
 
 @node FAQ
 @appendix FAQ
@@ -3092,20 +3253,17 @@ by passing @code{:display-action} to @code{transient-define-prefix}.
 @anchor{How can I copy text from the menu buffer?}
 @appendixsec How can I copy text from the menu buffer?
 
-To be able to mark text in Transient's menu buffer using the mouse,
-you have to add the below binding.  Note that for technical reasons,
-the region won't be visualized, while doing so.  After you have quit
-the transient menu, you will be able to yank it in another buffer.
+You can select text in the menu buffer using the mouse, like in most
+other buffers, by clicking @code{mouse-1} and keeping it pressed while
+dragging.
 
-@lisp
-(keymap-set transient-predicate-map
-            "<mouse-set-region>"
-            #'transient--do-stay)
-@end lisp
+(Before v0.13.0, the above required additional configuration and the
+region was not visualized while dragging.  This isn't the case anymore,
+but explains why the following was once deemed necessary.)
 
-Copying the region while not seeing the region is a bit fiddly, so a
-dedicated command, @code{transient-copy-menu-text}, was added.  You have to
-add a binding for this command in @code{transient-map}.
+Alternatively the command @code{transient-copy-menu-text} can be used to copy
+the complete content of the menu buffer.  You have to add a binding
+for this command in @code{transient-map}.
 
 @lisp
 (keymap-set transient-map "C-c C-w" #'transient-copy-menu-text)
@@ -3115,9 +3273,9 @@ add a binding for this command in @code{transient-map}.
 @appendixsec How can I autoload prefix and suffix commands?
 
 If your package only supports Emacs 30, just prefix the definition
-with @code{;;;###autoload}.  If your package supports released versions of
-Emacs, you unfortunately have to use a long form autoload comment
-as described in @ref{Autoload,,,elisp,}.
+with @code{;;;###autoload}.  If your package supports older Emacs releases,
+you unfortunately have to use a long-form autoload comment as
+described in @ref{Autoload,,,elisp,}.
 
 @lisp
 ;;;###autoload (autoload 'magit-dispatch "magit" nil t)
diff --git a/lisp/transient.el b/lisp/transient.el
index e77fef1f98a..202cd10a552 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -5,7 +5,7 @@
 ;; Author: Jonas Bernoulli <jonas@bernoul.li>
 ;; URL: https://github.com/magit/transient
 ;; Keywords: extensions
-;; Version: 0.12.0
+;; Version: 0.13.0
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -30,10 +30,16 @@
 ;; in Magit.  It is distributed as a separate package, so that it can be
 ;; used to implement similar menus in other packages.
 
+;; You can contact the maintainer of this package by sending an email to
+;; <emacs.transient@jonas.bernoulli.dev>, or you can use the public issue
+;; tracker at <https://github.com/magit/transient>.  The latter can also
+;; be accessed using the `forge' package, which lets you avoid the sadly
+;; non-free javascript on that website.
+
 ;;; Code:
 ;;;; Frontmatter
 
-(defconst transient-version "v0.12.0-15-gfe5214e6-builtin")
+(defconst transient-version "v0.13.0-10-g5b2ff26f-builtin")
 
 (require 'cl-lib)
 (require 'eieio)
@@ -52,6 +58,16 @@
 
 (defvar Man-notify-method)
 
+(define-obsolete-variable-alias
+  'transient-show-popup
+  'transient-show-menu
+  "transient 0.13.0")
+
+(define-obsolete-variable-alias
+  'transient-enable-popup-navigation
+  'transient-enable-menu-navigation
+  "transient 0.13.0")
+
 (defvar transient-common-command-prefix)
 
 (defmacro transient--with-emergency-exit (id &rest body)
@@ -76,7 +92,7 @@
   "Transient commands."
   :group 'extensions)
 
-(defcustom transient-show-popup t
+(defcustom transient-show-menu t
   "Whether and when to show transient's menu in a buffer.
 
 \\<transient-map>\
@@ -100,39 +116,84 @@
                  (const  :tag "On demand (no summary)" 0)
                  (number :tag "After delay" 1)))
 
-(defcustom transient-enable-popup-navigation 'verbose
+(defcustom transient-enable-menu-navigation 'verbose
   "Whether navigation commands are enabled in the menu buffer.
 
-If the value is `verbose' (the default), additionally show brief
-documentation about the command under point in the echo area.
+If the value is `verbose' (the default), show additional documentation
+about the command at point in the echo area.  If this would result in
+the same documentation, which is being displayed inside the menu buffer,
+to be duplicated in the echo area, then `verbose' forgoes doing so.
+Use `force-verbose' to echo even such documentation.  If `t', enable
+navigation, but without echoing any documentation.
 
-While a transient is active transient's menu buffer is not the
-current buffer, making it necessary to use dedicated commands to
-act on that buffer itself.  If this is non-nil, then the following
+While a transient is active, the menu buffer is (by default) not the
+current buffer, making it necessary to use dedicated commands to act
+on that buffer itself.  If this option is non-nil, then the following
 bindings are available:
 
 \\<transient-popup-navigation-map>\
 - \\[transient-backward-button] moves the cursor to the previous suffix.
 - \\[transient-forward-button] moves the cursor to the next suffix.
 - \\[transient-push-button] invokes the suffix the cursor is on.
-\\<transient-button-map>\
 - \\`<mouse-1>' and \\`<mouse-2>' invoke the clicked on suffix.
-\\<transient-popup-navigation-map>\
 - \\[transient-isearch-backward]\
  and \\[transient-isearch-forward] start isearch in the menu buffer.
 
-\\`<mouse-1>' and \\`<mouse-2>' are bound in `transient-push-button'.
+\\`<mouse-1>' and \\`<mouse-2>' are bound in `transient-button-map'.
 All other bindings are in `transient-popup-navigation-map'.
 
-By default \\`M-RET' is bound to `transient-push-button', instead of
-\\`RET', because if a transient allows the invocation of non-suffixes,
-then it is likely, that you would want \\`RET' to do what it would do
-if no transient were active."
+Instead of \\`RET', \\`M-RET' is used to invoke the suffix command at point by
+default, because if a transient allows the invocation of non-suffixes,
+then it is likely that the user would want the former do what it would
+do if no transient were active."
   :package-version '(transient . "0.7.8")
   :group 'transient
-  :type '(choice (const :tag "Enable navigation and echo summary" verbose)
-                 (const :tag "Enable navigation commands" t)
-                 (const :tag "Disable navigation commands" nil)))
+  :type
+  '(choice
+    (const :tag "Enable navigation and force showing summary" force-verbose)
+    (const :tag "Enable navigation and enable showing summary" verbose)
+    (const :tag "Enable navigation commands" t)
+    (const :tag "Disable navigation commands" nil)))
+
+(defcustom transient-navigate-to-group-descriptions nil
+  "Whether menu navigation commands stop at group descriptions.
+
+If `transient-enable-menu-navigation' is non-nil, which it is by default,
+\\<transient-popup-navigation-map>\
+then \\[transient-backward-button] and \\[transient-forward-button] move \
+from suffix to suffix.  When this option is
+non-nil as well, then they additionally stop at group descriptions.  This
+is useful for visually impaired users, who use a braille or audio output
+device."
+  :package-version '(transient . "0.13.0")
+  :group 'transient
+  :type 'boolean)
+
+(defcustom transient-describe-menu nil
+  "Whether to begin the menu buffer with a very short description.
+
+When this is non-nil, then the menu buffer begins with a short
+description.  Ideally this is a string written exactly for that
+purpose, but because this is a new feature, most menu commands
+do not provide that yet.  In that case the first line of the prefix
+command's docstring is used as fallback.  If the value is `docstring',
+then the docstring is used even if a description is available."
+  :package-version '(transient . "0.13.0")
+  :group 'transient
+  :type '(choice (const :tag "Insert description" t)
+                 (const :tag "Insert docstring summary" docstring)
+                 (const :tag "Do not insert description" nil)))
+
+(defcustom transient-select-menu-window nil
+  "Whether to select the window displaying the transient menu.
+
+Enabling this is discouraged, except for users of braille output
+devises.  Note that enabling this, or alternatively selecting the
+menu window on demand, are both unnecessary, to be able to move
+the cursor in the menu.  See `transient-enable-menu-navigation'."
+  :package-version '(transient . "0.13.0")
+  :group 'transient
+  :type 'boolean)
 
 (defcustom transient-display-buffer-action
   '(display-buffer-in-side-window
@@ -312,6 +373,28 @@ This command is not bound by default, see its docstring for instructions."
   :group 'transient
   :type 'boolean)
 
+(defcustom transient-prefer-reading-value nil
+  "Whether to prefer reading new value over other value selection methods.
+
+If this is nil (the default), then certain arguments are directly
+disabled when they are invoked, while they have a non-nil value.  I.e.,
+to switch from one non-nil value to another non-nil value, such commands
+have to be invoked twice.  For other arguments, which happen to have a
+small set of possible values, all values are displayed at all times,
+using solely coloring to indicate which of the values is active.  When
+such an infix command is invoked it cycles to the next value.
+
+This default does not work for visually impaired user.  If this option
+is non-nil, then more arguments immediately read the new value, instead
+of being toggled off on first invocation, or instead of cycling through
+values.
+
+If you enable this, then `transient-use-accessible-values' should also
+be enabled."
+  :package-version '(transient . "0.13.0")
+  :group 'transient
+  :type 'boolean)
+
 (defcustom transient-highlight-mismatched-keys nil
   "Whether to highlight keys that do not match their argument.
 
@@ -434,12 +517,70 @@ See also `transient-align-variable-pitch'."
 (defcustom transient-force-single-column nil
   "Whether to force use of a single column to display suffixes.
 
-This might be useful for users with low vision who use large
-text and might otherwise have to scroll in two dimensions."
+This might be useful for users with low vision who use large text
+and might otherwise have to scroll in two dimensions. This is also
+useful for blind users, because it causes suffixes to be navigated
+in a more natural order."
   :package-version '(transient . "0.3.6")
   :group 'transient
   :type 'boolean)
 
+(defcustom transient-use-accessible-values nil
+  "Whether to show values in a way that does not rely on coloring.
+
+If this is nil (the default), then colors are used to communicate the
+state of arguments.  For certain argument types the state is solely
+communicated that way.  For example, an enabled command-line switch is
+shown using some bright color, and disabling that argument, changes the
+color to gray, without otherwise changing the displayed text.
+
+This default does not work for visually impaired user.  If this option
+is non-nil, then the state is additionally communicated through other
+means.  A switch, for example, is either followed by \"is enabled\" or
+\"is disabled\".  How exactly the state is communicated depends on the
+type of the infix command.
+
+Note that packages, which use Transient, can define their own infix
+command types, which may or may not involve overriding Transient's
+code, which honors this new option.  I.e., it will take some time until
+everything respects this setting.
+
+If you enable this, then `transient-prefer-reading-value' should also
+be enabled.  Also consider enabling `transient-use-accessible-formats'."
+  :package-version '(transient . "0.13.0")
+  :group 'transient
+  :type 'boolean)
+
+(defcustom transient-use-accessible-formats nil
+  "Whether to use a more accessible format strings for menu elements.
+
+If this is non-nil, then menu elements are displayed in a way, that I
+hope, is more suitable for visually impaired users than the default.
+Please provide feedback, so that we can together work on improving this.
+
+By default the format specified by an element's `format' slot is used.
+When this is non-nil, then the `accessible-format' slot is used instead.
+One change implemented in the latter is that for an element representing
+a command-line argument, the argument and its value are moved before the
+description, giving quicker access to the current state, while still
+allowing users to read the description, in case they don't know yet what
+the argument in question does.
+
+Enabling this also causes the string \"inapt\" to be added at the very
+beginning of the text describing a command that currently cannot be
+used.  When using the default format, the only visual clue that a
+command is inapt, is that the complete text representing it is grayed
+out.  (As an example of such an inapt command, consider the case of a
+commands that can only act on the file at point, when there currently
+isn't a file at point.)  Placing the string \"inapt\" at the very
+beginning gives users the opportunity to immediately skip over unusable
+commands, while still giving them the opportunity to read on.
+
+Also consider enabling `transient-use-accessible-values'."
+  :package-version '(transient . "0.13.0")
+  :group 'transient
+  :type 'boolean)
+
 (defconst transient--max-level 7)
 (defconst transient--default-child-level 1)
 (defconst transient--default-prefix-level 4)
@@ -725,9 +866,13 @@ If `transient-save-history' is nil, then do nothing."
   (add-hook 'kill-emacs-hook #'transient-maybe-save-history))
 
 ;;;; Classes
-;;;; Prefix
+;;;;; Base
 
-(defclass transient-prefix ()
+(defclass transient-object () () :abstract t)
+
+;;;;; Prefix
+
+(defclass transient-prefix (transient-object)
   ((prototype   :initarg :prototype)
    (command     :initarg :command)
    (level       :initarg :level)
@@ -738,9 +883,11 @@ If `transient-save-history' is nil, then do nothing."
    (history     :initarg :history     :initform nil)
    (history-pos :initarg :history-pos :initform 0)
    (history-key :initarg :history-key :initform nil)
+   (description :initarg :description :initform nil)
    (show-help   :initarg :show-help   :initform nil)
    (info-manual :initarg :info-manual :initform nil)
    (man-page    :initarg :man-page    :initform nil)
+   (summary     :initarg :summary     :initform nil)
    (transient-suffix     :initarg :transient-suffix     :initform nil)
    (transient-non-suffix :initarg :transient-non-suffix :initform nil)
    (transient-switch-frame :initarg :transient-switch-frame)
@@ -764,9 +911,9 @@ When a transient prefix command is invoked, then a clone of that
 object is stored in the global variable `transient--prefix' and
 the prototype is stored in the clone's `prototype' slot.")
 
-;;;; Suffix
+;;;;; Suffix
 
-(defclass transient-child ()
+(defclass transient-child (transient-object)
   ((parent
     :initarg :parent
     :initform nil
@@ -853,7 +1000,10 @@ the prototype is stored in the clone's `prototype' slot.")
    (advice*
     :initarg :advice*
     :initform nil
-    :documentation "Advise applied to the command body and interactive spec."))
+    :documentation "Advise applied to the command body and interactive spec.")
+   (summary
+    :initarg :summary
+    :initform nil))
   "Abstract superclass for group and suffix classes.
 
 It is undefined which predicates are used if more than one `if*'
@@ -866,15 +1016,15 @@ predicate slots or more than one `inapt-if*' slots are non-nil."
    (command     :initarg :command)
    (transient   :initarg :transient)
    (format      :initarg :format      :initform " %k %d")
+   (accessible-format
+    :initarg :accessible-format       :initform "%i%k %d")
    (description :initarg :description :initform nil)
    (face        :initarg :face        :initform nil)
-   (show-help   :initarg :show-help   :initform nil)
-   (summary     :initarg :summary     :initform nil))
+   (show-help   :initarg :show-help   :initform nil))
   "Superclass for suffix command.")
 
 (defclass transient-information (transient-suffix)
-  ((format :initform " %k %d")
-   (key    :initform " "))
+  ((key :initform " "))
   "Display-only information, aligned with suffix keys.
 Technically a suffix object with no associated command.")
 
@@ -897,7 +1047,8 @@ Technically a suffix object with no associated command.")
    (reader      :initarg :reader      :initform nil)
    (prompt      :initarg :prompt      :initform nil)
    (choices     :initarg :choices     :initform nil)
-   (format                            :initform " %k %d (%v)"))
+   (format                            :initform " %k %d (%v)")
+   (accessible-format                 :initform "%i%k %v (%d)"))
   "Transient infix command."
   :abstract t)
 
@@ -913,7 +1064,8 @@ Technically a suffix object with no associated command.")
 
 (defclass transient-variable (transient-infix)
   ((variable    :initarg :variable)
-   (format                            :initform " %k %d %v"))
+   (format                            :initform " %k %d %v")
+   (accessible-format                 :initform "%i%k %v (%d)"))
   "Abstract superclass for infix commands that set a variable."
   :abstract t)
 
@@ -942,7 +1094,7 @@ They become the value of this argument.")
    (target :initarg := :initform nil))
   "Class used by the `transient-describe' suffix command.")
 
-;;;; Group
+;;;;; Group
 
 (defclass transient-group (transient-child)
   ((suffixes       :initarg :suffixes       :initform nil)
@@ -1033,6 +1185,7 @@ to the setup function:
             `(lambda ()
                (interactive)
                (transient-setup ',name))))
+       :autoload-end
        (put ',name 'interactive-only ,interactive-only)
        (put ',name 'function-documentation ,docstr)
        (put ',name 'transient--prefix
@@ -1040,6 +1193,7 @@ to the setup function:
        (transient--set-layout
         ',name
         (list ,@(mapcan (lambda (s) (transient--parse-child name s)) groups))))))
+(put 'transient-define-prefix 'autoload-macro 'expand)
 
 (defmacro transient-define-group (name &rest groups)
   "Define one or more groups and store them in symbol NAME.
@@ -1085,10 +1239,12 @@ ARGLIST.  The infix arguments are usually accessed by using
          ,(if (and (not body) class (oref-default class definition))
               `(oref-default ',class definition)
             `(lambda ,arglist ,@body)))
+       :autoload-end
        (put ',name 'interactive-only ,interactive-only)
        (put ',name 'function-documentation ,docstr)
        (put ',name 'transient--suffix
             (,(or class 'transient-suffix) :command ',name ,@slots)))))
+(put 'transient-define-suffix 'autoload-macro 'expand)
 
 (defmacro transient-augment-suffix (name &rest args)
   "Augment existing command NAME with a new transient suffix object.
@@ -1099,8 +1255,10 @@ Similar to `transient-define-suffix' but define a suffix object only.
   (pcase-let
       ((`(,class ,slots)
         (transient--expand-define-args args nil 'transient-augment-suffix t)))
+    :autoload-end
     `(put ',name 'transient--suffix
           (,(or class 'transient-suffix) :command ',name ,@slots))))
+(put 'transient-define-infix 'autoload-macro 'expand)
 
 (defmacro transient-define-infix (name arglist &rest args)
   "Define NAME as a transient infix command.
@@ -1425,21 +1583,21 @@ symbol property.")
 (defun transient--get-layout (prefix)
   (cond*
     ((bind*
-      (layout
-       (or (get prefix 'transient--layout)
-           ;; Migrate unparsed legacy group definition.
-           (condition-case-unless-debug err
-               (and-let* ((value (symbol-value prefix)))
-                 (transient--set-layout
-                  prefix
-                  (if (and (listp value)
-                           (or (listp (car value))
-                               (vectorp (car value))))
-                      (transient-parse-suffixes prefix value)
-                    (list (transient-parse-suffix prefix value)))))
-             (error
-              (message "Not a legacy group definition: %s: %S" prefix err)
-              nil))))))
+       (layout
+        (or (get prefix 'transient--layout)
+            ;; Migrate unparsed legacy group definition.
+            (condition-case-unless-debug err
+                (and-let* ((value (symbol-value prefix)))
+                  (transient--set-layout
+                   prefix
+                   (if (and (listp value)
+                            (or (listp (car value))
+                                (vectorp (car value))))
+                       (transient-parse-suffixes prefix value)
+                     (list (transient-parse-suffix prefix value)))))
+              (error
+               (message "Not a legacy group definition: %s: %S" prefix err)
+               nil))))))
     ((not layout)
      (error "Not a transient prefix command or group definition: %s" prefix))
     ((vectorp layout)
@@ -1452,7 +1610,12 @@ symbol property.")
      (transient--set-layout
       prefix
       (named-let upgrade ((spec layout))
-        (cond ((vectorp spec)
+        (cond ((and (vectorp spec)
+                    (length= spec 3))
+               ;; This format is used by emoji.el from Emacs <= 29.4.
+               (pcase-let ((`[,class ,args ,children] spec))
+                 (vector class args (mapcar #'upgrade children))))
+              ((vectorp spec)
                (pcase-let ((`[,level ,class ,args ,children] spec))
                  (when level
                    (setq args (plist-put args :level level)))
@@ -1761,6 +1924,9 @@ That buffer is current and empty when this hook runs.")
 (defvar transient--refreshp nil
   "Whether to refresh the transient completely.")
 
+(defvar transient--pre-command nil
+  "The pre-command selected for `this-command'.")
+
 (defvar transient--all-levels-p nil
   "Whether temporary display of suffixes on all levels is active.")
 
@@ -1813,15 +1979,10 @@ This is bound while the suffixes are drawn in the transient buffer.")
 
 (defvar transient--history nil)
 
-(defvar transient--scroll-commands
-  '(transient-scroll-up
-    transient-scroll-down
-    mwheel-scroll
-    scroll-bar-toolkit-scroll))
-
 (defvar transient--quit-commands
   '(transient-quit-one
-    transient-quit-all))
+    transient-quit-all
+    top-level))
 
 ;;;; Identities
 
@@ -1917,6 +2078,7 @@ probably use this instead:
   (cond*
     (transient--pending-suffix)
     (transient--current-suffix)
+    ((bind* (this-command (advice--cd*r this-command))))
     ((or transient--prefix
          transient-current-prefix)
      (let ((suffixes
@@ -2084,8 +2246,7 @@ Common Suffix Commands'."
 
 (defvar-keymap transient-popup-navigation-map
   :doc "One of the keymaps used when menu navigation is enabled.
-See `transient-enable-popup-navigation'."
-  "<down-mouse-1>" #'transient-noop
+See `transient-enable-menu-navigation'."
   "<up>"   #'transient-backward-button
   "<down>" #'transient-forward-button
   "C-r"    #'transient-isearch-backward
@@ -2094,7 +2255,7 @@ See `transient-enable-popup-navigation'."
 
 (defvar-keymap transient-button-map
   :doc "One of the keymaps used when menu navigation is enabled.
-See `transient-enable-popup-navigation'."
+See `transient-enable-menu-navigation'."
   "<mouse-1>" #'transient-push-button
   "<mouse-2>" #'transient-push-button)
 
@@ -2150,10 +2311,10 @@ of the corresponding object."
   "<transient-reset>"             #'transient--do-call
   "<describe-key-briefly>"        #'transient--do-stay
   "<describe-key>"                #'transient--do-stay
-  "<transient-scroll-up>"         #'transient--do-stay
-  "<transient-scroll-down>"       #'transient--do-stay
-  "<mwheel-scroll>"               #'transient--do-stay
-  "<scroll-bar-toolkit-scroll>"   #'transient--do-stay
+  "<transient-scroll-up>"         #'transient--do-scroll
+  "<transient-scroll-down>"       #'transient--do-scroll
+  "<mwheel-scroll>"               #'transient--do-scroll
+  "<scroll-bar-toolkit-scroll>"   #'transient--do-scroll
   "<transient-noop>"              #'transient--do-noop
   "<transient-mouse-push-button>" #'transient--do-move
   "<transient-push-button>"       #'transient--do-push-button
@@ -2161,6 +2322,9 @@ of the corresponding object."
   "<transient-forward-button>"    #'transient--do-move
   "<transient-isearch-backward>"  #'transient--do-move
   "<transient-isearch-forward>"   #'transient--do-move
+  "<mouse-set-point>"             #'transient--do-mouse
+  "<mouse-set-region>"            #'transient--do-mouse
+  "<mouse-drag-region>"           #'transient--do-mouse
   "<transient-copy-menu-text>"    #'transient--do-stay
   "<transient-toggle-docstrings>" #'transient--do-stay
   ;; If a valid but incomplete prefix sequence is followed by
@@ -2226,7 +2390,7 @@ of the corresponding object."
     (when-let* ((b (keymap-lookup map "-"))) (keymap-set map "<kp-subtract>" b))
     (when-let* ((b (keymap-lookup map "="))) (keymap-set map "<kp-equal>" b))
     (when-let* ((b (keymap-lookup map "+"))) (keymap-set map "<kp-add>" b))
-    (when transient-enable-popup-navigation
+    (when transient-enable-menu-navigation
       ;; `transient--make-redisplay-map' maps only over bindings that are
       ;; directly in the base keymap, so that cannot be a composed keymap.
       (set-keymap-parent
@@ -2406,13 +2570,10 @@ value.  Otherwise return CHILDREN as is.")
       (setq transient--prefix (transient--init-prefix name params))
     (setq name (oref transient--prefix command)))
   (setq transient--refreshp (oref transient--prefix refresh-suffixes))
-  (cond ((and (not transient--refreshp) layout)
-         (setq transient--layout layout)
-         (setq transient--suffixes (transient--flatten-suffixes layout)))
-        (t
-         (setq transient--suffixes nil)
-         (setq transient--layout (transient--init-suffixes name))
-         (setq transient--suffixes (nreverse transient--suffixes))))
+  (setq transient--layout
+        (or (and (not transient--refreshp) layout)
+            (transient--init-suffixes name)))
+  (setq transient--suffixes (transient--flatten-suffixes transient--layout))
   (slot-makeunbound transient--prefix 'value))
 
 (defun transient--init-prefix (name &optional params)
@@ -2432,17 +2593,19 @@ value.  Otherwise return CHILDREN as is.")
     (mapcan (lambda (c) (transient--init-child levels c nil))
             (append (transient--get-children name)
                     (and (not transient--editp)
-                         (transient--get-children 'transient-common-commands))))))
+                         (transient--get-children
+                          'transient-common-commands))))))
 
 (defun transient--flatten-suffixes (layout)
-  (named-let flatten ((def layout))
-    (cond ((stringp def) nil)
-          ((cl-typep def 'transient-information) nil)
-          ((listp def) (mapcan #'flatten def))
-          ((cl-typep def 'transient-group)
-           (mapcan #'flatten (oref def suffixes)))
-          ((cl-typep def 'transient-suffix)
-           (list def)))))
+  (nreverse
+   (named-let flatten ((def layout))
+     (cond ((stringp def) nil)
+           ((cl-typep def 'transient-information) nil)
+           ((listp def) (mapcan #'flatten def))
+           ((cl-typep def 'transient-group)
+            (mapcan #'flatten (oref def suffixes)))
+           ((cl-typep def 'transient-suffix)
+            (list def))))))
 
 (defun transient--init-child (levels spec parent)
   (cl-etypecase spec
@@ -2510,8 +2673,7 @@ value.  Otherwise return CHILDREN as is.")
     (cond ((not (cl-typep obj 'transient-information))
            (transient--init-suffix-key obj)
            (transient-init-scope obj)
-           (transient-init-value obj)
-           (push obj transient--suffixes)))
+           (transient-init-value obj)))
     (list obj)))
 
 (cl-defmethod transient--init-suffix-key ((obj transient-suffix))
@@ -2673,7 +2835,10 @@ value.  Otherwise return CHILDREN as is.")
          (transient--wrap-command)
          (when exitp
            (transient--maybe-set-value 'exit)
-           (transient--pre-exit)))))))
+           (transient--pre-exit)))))
+    (when (and (eq (selected-window) transient--window)
+               (not (eq transient--pre-command 'transient--do-mouse)))
+      (select-window transient--original-window))))
 
 (defun transient--pre-exit ()
   (transient--debug 'pre-exit)
@@ -2692,6 +2857,7 @@ value.  Otherwise return CHILDREN as is.")
   (unless (eq transient--docsp 'permanent)
     (setq transient--docsp nil))
   (setq transient--editp nil)
+  (setq transient--pre-command nil)
   (setq transient--prefix nil)
   (setq transient--layout nil)
   (setq transient--suffixes nil)
@@ -2744,13 +2910,23 @@ value.  Otherwise return CHILDREN as is.")
   (if (not transient--prefix)
       (funcall fn)
     (transient--suspend-override (bound-and-true-p edebug-active))
-    (funcall fn) ; Already unwind protected.
-    (cond ((memq this-command '(top-level abort-recursive-edit))
-           (setq transient--exitp t)
-           (transient--post-exit this-command)
-           (transient--delete-window))
-          (transient--prefix
-           (transient--resume-override)))))
+    (condition-case err
+        (unwind-protect
+            (funcall fn)
+          (cond
+            ((memq this-command '(top-level abort-recursive-edit))
+             (setq transient--exitp t)
+             (transient--post-exit this-command)
+             (transient--delete-window)
+             (transient--debug "     abort recursive-edit and menu "))
+            (transient--prefix
+             (transient--resume-override)
+             (transient--debug "     exit recursive-edit and resumed menu"))))
+      (error (if (and (eq (car err) 'error)
+                      (stringp (cadr err))
+                      (string-prefix-p "Abort" (cadr err)))
+                 (message "%s" (cadr err))
+               (message "transient--recursive-edit: %S" err))))))
 
 (defmacro transient--with-suspended-override (&rest body)
   (let ((depth (make-symbol "depth"))
@@ -2781,52 +2957,61 @@ value.  Otherwise return CHILDREN as is.")
 
 (defun transient--wrap-command ()
   (transient--load-command-if-autoload this-command)
-  (letrec
-      ((command this-command)
-       (suffix (transient-suffix-object this-command))
-       (prefix transient--prefix)
-       (advice
-        (lambda (fn &rest args)
-          (interactive
-            (lambda (spec)
-              (let ((abort t))
-                (unwind-protect
-                    (prog1 (let ((debugger #'transient--exit-and-debug))
-                             (if-let* ((obj suffix)
-                                       (grp (oref obj parent))
-                                       (adv (or (oref obj advice*)
-                                                (oref grp advice*))))
-                                 (funcall
-                                  adv #'advice-eval-interactive-spec spec)
-                               (advice-eval-interactive-spec spec)))
-                      (setq abort nil))
-                  (when abort
-                    (when-let* ((unwind (oref prefix unwind-suffix)))
-                      (transient--debug 'unwind-interactive)
-                      (funcall unwind command))
-                    (when (symbolp command)
-                      (remove-function (symbol-function command) advice))
-                    (oset prefix unwind-suffix nil))))))
-          (unwind-protect
-              (let ((debugger #'transient--exit-and-debug))
-                (if-let* ((obj suffix)
-                          (grp (oref obj parent))
-                          (adv (or (oref obj advice)
-                                   (oref obj advice*)
-                                   (oref grp advice)
-                                   (oref grp advice*))))
-                    (apply adv fn args)
-                  (apply fn args)))
-            (when-let* ((unwind (oref prefix unwind-suffix)))
-              (transient--debug 'unwind-command)
-              (funcall unwind command))
-            (when (symbolp command)
-              (remove-function (symbol-function command) advice))
-            (oset prefix unwind-suffix nil)))))
-    (add-function :around (if (symbolp this-command)
-                              (symbol-function this-command)
-                            this-command)
-                  advice '((depth . -99)))))
+  (letrec ((command this-command)
+           (suffix (transient-suffix-object this-command))
+           (prefix transient--prefix)
+           (advice
+            (lambda (fn &rest args)
+              (interactive
+                (lambda (spec)
+                  (let ((abort t))
+                    (unwind-protect
+                        (prog1 (let ((debugger #'transient--exit-and-debug))
+                                 (if-let* ((obj suffix)
+                                           (grp (oref obj parent))
+                                           (adv (or (oref obj advice*)
+                                                    (oref grp advice*))))
+                                     (funcall
+                                      adv #'advice-eval-interactive-spec spec)
+                                   (advice-eval-interactive-spec spec)))
+                          (setq abort nil))
+                      (when abort
+                        (when-let* ((unwind (oref prefix unwind-suffix)))
+                          (transient--debug 'unwind-interactive)
+                          (funcall unwind command))
+                        (when (symbolp command)
+                          (remove-function (symbol-function command) advice))
+                        (oset prefix unwind-suffix nil))))))
+              (unwind-protect
+                  (let ((debugger #'transient--exit-and-debug))
+                    (if-let* ((obj suffix)
+                              (grp (oref obj parent))
+                              (adv (or (oref obj advice)
+                                       (oref obj advice*)
+                                       (oref grp advice)
+                                       (oref grp advice*))))
+                        (apply adv fn args)
+                      (apply fn args)))
+                (when-let* ((unwind (oref prefix unwind-suffix)))
+                  (transient--debug 'unwind-command)
+                  (funcall unwind command))
+                (when (symbolp command)
+                  (remove-function (symbol-function command) advice))
+                (oset prefix unwind-suffix nil)))))
+    (transient--advise-this-command advice)))
+
+(defun transient--advise-this-command (advice)
+  "Add ADVICE around `this-command'.
+If possible add the advice to the value of `this-command' instead of
+the symbol directly, so the command's identity does not get obfuscated.
+For primitive and anonymous functions that isn't possible, so fall back
+to advising via the symbol in those cases."
+  (add-function
+   :around (if (and (symbolp this-command)
+                    (not (subr-primitive-p (symbol-function this-command))))
+               (symbol-function this-command)
+             this-command)
+   advice '((depth . -99))))
 
 (defun transient--premature-post-command ()
   (and (equal (this-command-keys-vector) [])
@@ -2936,25 +3121,30 @@ value.  Otherwise return CHILDREN as is.")
   (setq transient--stack nil))
 
 (defun transient--redisplay ()
-  (if (or (eq transient-show-popup t)
-          transient--showp)
-      (unless
-          (or (memq this-command transient--scroll-commands)
-              (and (or (memq this-command '(mouse-drag-region
-                                            mouse-set-region))
-                       (equal (key-description (this-command-keys-vector))
-                              "<mouse-movement>"))
-                   (and (eq (current-buffer) transient--buffer))))
-        (transient--show))
-    (when (and (numberp transient-show-popup)
-               (not (zerop transient-show-popup))
-               (not transient--timer))
-      (transient--timer-start))
-    (transient--show-hint)))
+  (cond
+    ((or (eq transient-show-menu t)
+         transient--showp)
+     (unless (or (eq transient--pre-command 'transient--do-move)
+                 (eq transient--pre-command 'transient--do-scroll)
+                 (and (or (eq transient--pre-command 'transient--do-mouse)
+                          (eq (event-basic-type last-command-event)
+                              'mouse-movement))
+                      (eq (current-buffer) transient--buffer)))
+       (transient--show))
+     (when (and transient-select-menu-window
+                (not (eq (selected-window) transient--window))
+                (not (eq transient--pre-command 'transient--do-mouse)))
+       (select-window transient--window)))
+    (t
+     (when (and (numberp transient-show-menu)
+                (not (zerop transient-show-menu))
+                (not transient--timer))
+       (transient--timer-start))
+     (transient--show-hint))))
 
 (defun transient--timer-start ()
   (setq transient--timer
-        (run-at-time (abs transient-show-popup) nil
+        (run-at-time (abs transient-show-menu) nil
                      (lambda ()
                        (transient--timer-cancel)
                        (transient--show)
@@ -3004,7 +3194,11 @@ identifying the exit."
     (transient--post-exit this-command)))
 
 (defun transient--quit-kludge (action)
-  (static-if (boundp 'redisplay-can-quit) ;Emacs 31
+  ;; Fixing the bug that makes this kludge necessary was proposed in
+  ;; https://yhetil.org/emacs-bugs/m1ikl4iqtg.fsf@dancol.org/, but it
+  ;; does not look like that's gonna be merged any time soon.  See also
+  ;; https://github.com/magit/transient/commit/45fbefdc5b112f0a15cd9365.
+  (static-if (boundp 'redisplay-can-quit)
       action
     (pcase-exhaustive action
       ('enable
@@ -3028,18 +3222,20 @@ identifying the exit."
 ;;;; Pre-Commands
 
 (defun transient--call-pre-command ()
-  (if-let* ((fn (transient--get-pre-command this-command
-                                            (this-command-keys-vector))))
-      (let ((action (funcall fn)))
-        (when (eq action transient--exit)
-          (setq transient--exitp (or transient--exitp t)))
-        action)
-    (if (let ((keys (this-command-keys-vector)))
-          (eq (aref keys (1- (length keys))) ?\C-g))
-        (setq this-command 'transient-noop)
-      (unless (transient--edebug-command-p)
-        (setq this-command 'transient-undefined)))
-    transient--stay))
+  (cond*
+    ((bind-and* (fn (transient--get-pre-command
+                     this-command (this-command-keys-vector))))
+     (setq transient--pre-command fn)
+     (let ((action (funcall fn)))
+       (when (eq action transient--exit)
+         (setq transient--exitp (or transient--exitp t)))
+       action))
+    ((let ((keys (this-command-keys-vector)))
+       (eq (aref keys (1- (length keys))) ?\C-g))
+     (transient--do-noop))
+    ((transient--edebug-command-p)
+     (transient--do-stay))
+    ((transient--do-warn))))
 
 (defun transient--get-pre-command (&optional cmd key enforce-type)
   (or (and (not (eq enforce-type 'non-suffix))
@@ -3050,9 +3246,13 @@ identifying the exit."
                       (and (symbolp def) def)))
                (lookup-key transient--predicate-map (vector cmd))))
       (and (not (eq enforce-type 'suffix))
-           (transient--resolve-pre-command
-            (oref transient--prefix transient-non-suffix)
-            t))))
+           (if (equal (event-basic-type last-command-event) 'mouse-movement)
+               ;; `this-command' is most likely the anonymous
+               ;; drag command defined inside `mouse-drag-track'.
+               'transient--do-mouse
+             (transient--resolve-pre-command
+              (oref transient--prefix transient-non-suffix)
+              t)))))
 
 (defun transient--resolve-pre-command (pre &optional resolve-boolean correct)
   (setq pre (cond ((booleanp pre)
@@ -3070,15 +3270,18 @@ identifying the exit."
 
 (defun transient--do-stay ()
   "Call the command without exporting variables and stay transient."
+  (setq transient--pre-command 'transient--do-stay)
   transient--stay)
 
 (defun transient--do-noop ()
   "Call `transient-noop' and stay transient."
+  (setq transient--pre-command 'transient--do-noop)
   (setq this-command 'transient-noop)
   transient--stay)
 
 (defun transient--do-warn ()
   "Call `transient-undefined' and stay transient."
+  (setq transient--pre-command 'transient--do-warn)
   (setq this-command 'transient-undefined)
   transient--stay)
 
@@ -3114,17 +3317,18 @@ If there is no parent prefix, then behave like `transient--do-exit'."
 (defun transient--do-push-button ()
   "Call the command represented by the activated button.
 Use that command's pre-command to determine transient behavior."
-  (if (and (mouse-event-p last-command-event)
-           (not (eq (posn-window (event-start last-command-event))
-                    transient--window)))
-      transient--stay
-    (with-selected-window transient--window
-      (let ((pos (if (mouse-event-p last-command-event)
-                     (posn-point (event-start last-command-event))
-                   (point))))
-        (setq this-command (get-text-property pos 'command))
-        (setq transient--current-suffix (get-text-property pos 'suffix))))
-    (transient--call-pre-command)))
+  (with-selected-window transient--window
+    (cond*
+      ((bind-and*
+         (pos (if (mouse-event-p last-command-event)
+                  (posn-point (event-start last-command-event))
+                (point)))
+         (obj (get-text-property pos 'button-data))
+         (_(cl-typep obj '(and transient-suffix (not transient-information)))))
+       (setq this-command (oref obj command))
+       (setq transient--current-suffix obj)
+       (transient--call-pre-command))
+      (transient--stay))))
 
 (defun transient--do-recurse ()
   "Call the transient prefix command, preparing for return to outer transient.
@@ -3174,13 +3378,21 @@ Do not push the active transient to the transient stack."
   transient--exit)
 
 (defun transient--do-move ()
-  "Call the command if `transient-enable-popup-navigation' is non-nil.
+  "Call the command if `transient-enable-menu-navigation' is non-nil.
 In that case behave like `transient--do-stay', otherwise similar
 to `transient--do-warn'."
-  (unless transient-enable-popup-navigation
+  (unless transient-enable-menu-navigation
     (setq this-command 'transient-inhibit-move))
   transient--stay)
 
+(defun transient--do-scroll ()
+  "Call the scroll command without exporting variables and stay transient."
+  transient--stay)
+
+(defun transient--do-mouse ()
+  "Call the mouse command without exporting variables and stay transient."
+  transient--stay)
+
 (defun transient--do-minus ()
   "Call `negative-argument' or pivot to `transient-update'.
 If `negative-argument' is invoked using \"-\" then preserve the
@@ -3209,7 +3421,7 @@ prefix argument and pivot to `transient-update'."
 (put 'transient--do-minus      'transient-face 'transient-key-stay)
 
 ;;;; Commands
-;;;; Noop
+;;;;; Noop
 
 (defun transient-noop ()
   "Do nothing at all."
@@ -3255,9 +3467,9 @@ Please open an issue and post the shown command log." :error)))
   (interactive)
   (message "To enable use of `%s', please customize `%s'"
            this-original-command
-           'transient-enable-popup-navigation))
+           'transient-enable-menu-navigation))
 
-;;;; Core
+;;;;; Core
 
 (defun transient-quit-all ()
   "Exit all transients without saving the transient stack."
@@ -3285,7 +3497,7 @@ Please open an issue and post the shown command log." :error)))
   "Invoke the suffix command represented by this button."
   (interactive))
 
-;;;; Suspend
+;;;;; Suspend
 
 (defun transient-suspend ()
   "Suspend the current transient.
@@ -3315,7 +3527,7 @@ transient is active."
         (t
          (message "No suspended transient command"))))
 
-;;;; Help
+;;;;; Help
 
 (defun transient-help (&optional interactivep)
   "Show help for the active transient or one of its suffixes.
@@ -3338,7 +3550,7 @@ transient is active."
   "From a transient menu, describe something in another buffer.
 
 This command can be bound multiple times to describe different targets.
-Each binding must specify the thing it describes, be setting the value
+Each binding must specify the thing it describes, by setting the value
 of its `target' slot, using the keyword argument `:='.
 
 The `helper' slot specifies the low-level function used to describe the
@@ -3355,7 +3567,7 @@ For example:
   (with-slots (helper target) (transient-suffix-object)
     (transient--display-help helper target)))
 
-;;;; Level
+;;;;; Level
 
 (defun transient-set-level (&optional command level)
   "Set the level of the transient or one of its suffix commands."
@@ -3414,7 +3626,7 @@ For example:
   (setq transient--all-levels-p (not transient--all-levels-p))
   (setq transient--refreshp t))
 
-;;;; Value
+;;;;; Value
 
 (defun transient-set ()
   "Set active transient's value for this Emacs session."
@@ -3468,7 +3680,7 @@ For example:
   (interactive)
   (transient-prefix-set (oref (transient-suffix-object) set)))
 
-;;;; Auxiliary
+;;;;; Auxiliary
 
 (transient-define-suffix transient-toggle-common ()
   "Toggle whether common commands are permanently shown."
@@ -3530,7 +3742,7 @@ such as when suggesting a new feature or reporting an issue."
     (message "%s: %S" (key-description (this-command-keys)) arguments)))
 
 ;;;; Value
-;;;; Init
+;;;;; Init
 
 (cl-defgeneric transient-init-value (obj)
   "Set the initial value of the prefix or suffix object OBJ.
@@ -3588,7 +3800,7 @@ Call `transient-default-value' but because that is a noop for
               (case-fold-search nil)
               (regexp (if (slot-exists-p obj 'argument-regexp)
                           (oref obj argument-regexp)
-                        (format "\\`%s\\(.*\\)" (oref obj argument)))))
+                        (format "\\`%s\\([^z-a]*\\)\\'" (oref obj argument)))))
           (if (memq multi-value '(t rest))
               (cdr (assoc argument value))
             (let ((match (lambda (v)
@@ -3605,7 +3817,7 @@ Call `transient-default-value' but because that is a noop for
         (car (member (oref obj argument)
                      (oref transient--prefix value)))))
 
-;;;; Default
+;;;;; Default
 
 (cl-defgeneric transient-default-value (obj)
   "Return the default value.")
@@ -3627,7 +3839,7 @@ that.  If the slot is unbound, return nil."
 Doing so causes `transient-init-value' to skip setting the `value' slot."
   eieio--unbound)
 
-;;;; Read
+;;;;; Read
 
 (cl-defgeneric transient-infix-read (obj)
   "Determine the new value of the infix object OBJ.
@@ -3675,6 +3887,7 @@ it\", in which case it is pointless to preserve history.)"
   (with-slots (value multi-value always-read allow-empty choices) obj
     (if (and value
              (not multi-value)
+             (not transient-prefer-reading-value)
              (not always-read)
              transient--prefix)
         (oset obj value nil)
@@ -3682,7 +3895,9 @@ it\", in which case it is pointless to preserve history.)"
              (reader (oref obj reader))
              (choices (if (functionp choices) (funcall choices) choices))
              (prompt (transient-prompt obj))
-             (value (if multi-value (string-join value ",") value))
+             (value (if (and multi-value value)
+                        (string-join value ",")
+                      value))
              (history-key (or (oref obj history-key)
                               (oref obj command)))
              (transient--history (alist-get history-key transient-history))
@@ -3690,8 +3905,9 @@ it\", in which case it is pointless to preserve history.)"
                                          (eq value (car transient--history)))
                                      transient--history
                                    (cons value transient--history)))
-             (initial-input (and transient-read-with-initial-input
-                                 (car transient--history)))
+             (initial-input (or value
+                                (and transient-read-with-initial-input
+                                     (car transient--history))))
              (history (if initial-input
                           (cons 'transient--history 1)
                         'transient--history))
@@ -3719,16 +3935,24 @@ it\", in which case it is pointless to preserve history.)"
 
 (cl-defmethod transient-infix-read ((obj transient-switch))
   "Toggle the switch on or off."
-  (if (oref obj value) nil (oref obj argument)))
+  (prog1 (if (oref obj value) nil (oref obj argument))
+    (when transient-prefer-reading-value
+      (message "%s is now %s"
+               (oref obj argument)
+               (if (oref obj value) "enabled" "disabled")))))
 
 (cl-defmethod transient-infix-read ((obj transient-switches))
   "Cycle through the mutually exclusive switches.
 The last value is \"don't use any of these switches\"."
   (let ((choices (mapcar (apply-partially #'format (oref obj argument-format))
                          (oref obj choices))))
-    (if-let* ((value (oref obj value)))
-        (cadr (member value choices))
-      (car choices))))
+    (cond*
+      (transient-prefer-reading-value
+       (let ((choice (completing-read (transient-prompt obj) choices nil t)))
+         (if (equal choice "") nil choice)))
+      ((bind-and* (value (oref obj value)))
+       (cadr (member value choices)))
+      ((car choices)))))
 
 (cl-defmethod transient-infix-read ((command symbol))
   "Elsewhere use the reader of the infix command COMMAND.
@@ -3739,7 +3963,7 @@ stand-alone command."
         (transient-infix-read obj))
     (error "Not a suffix command: `%s'" command)))
 
-;;;; Readers
+;;;;; Readers
 
 (defun transient-read-file (prompt _initial-input _history)
   "Read a file."
@@ -3786,7 +4010,20 @@ stand-alone command."
   (when (fboundp 'org-read-date)
     (org-read-date 'with-time nil nil prompt default-time)))
 
-;;;; Prompt
+(defun transient-read-string-from-buffer (prompt value _)
+  "Switch to a new buffer to edit STRING in a recursive edit.
+Like `read-string-from-buffer' but accept an additional argument as
+provided by `transient-infix-read' (but ignore it).  Only available
+when using Emacs 29.1 or greater."
+  (string-edit prompt (or value "")
+               (lambda (edited)
+                 (setq value edited)
+                 (exit-recursive-edit))
+               :abort-callback #'exit-recursive-edit)
+  (recursive-edit)
+  value)
+
+;;;;; Prompt
 
 (cl-defgeneric transient-prompt (obj)
   "Return the prompt to be used to read infix object OBJ's value.")
@@ -3818,16 +4055,17 @@ prompt."
        (if (stringp prompt)
            prompt
          "[BUG: invalid prompt]: ")))
-    ((bind-and*
-      (name (or (and (slot-boundp obj 'argument) (oref obj argument))
-                (and (slot-boundp obj 'variable) (oref obj variable)))))
+    ((bind-and* (name (or (ignore-error (invalid-slot-name unbound-slot)
+                            (oref obj argument))
+                          (ignore-error (invalid-slot-name unbound-slot)
+                            (oref obj variable)))))
      (if (and (stringp name)
               (string-suffix-p "=" name))
          name
        (format "%s: " name)))
     ("[BUG: no prompt]: ")))
 
-;;;; Set
+;;;;; Set
 
 (cl-defgeneric transient-infix-set (obj value)
   "Set the value of infix object OBJ to VALUE.")
@@ -3897,7 +4135,7 @@ See also `transient-prefix-set'.")
                (transient-save-value transient--prefix)
              (transient-set-value transient--prefix))))))
 
-;;;; Save
+;;;;; Save
 
 (cl-defgeneric transient-save-value (obj)
   "Save the value of the transient prefix OBJ.")
@@ -3909,7 +4147,7 @@ See also `transient-prefix-set'.")
     (transient-save-values)
     (transient--history-push obj value)))
 
-;;;; Reset
+;;;;; Reset
 
 (cl-defgeneric transient-reset-value (obj)
   "Clear the set and saved values of the transient prefix OBJ.")
@@ -3923,7 +4161,7 @@ See also `transient-prefix-set'.")
     (transient--history-push obj value))
   (mapc #'transient-init-value transient--suffixes))
 
-;;;; Get
+;;;;; Get
 
 (defun transient-args (prefix)
   "Return the value of the transient prefix command PREFIX.
@@ -4089,7 +4327,7 @@ value of the variable.  I.e., this is a side-effect and does
 not contribute to the value of the transient."
   nil)
 
-;;;; Utilities
+;;;;; Utilities
 
 (defun transient-arg-value (arg args)
   "Return the value of ARG as it appears in ARGS.
@@ -4103,14 +4341,14 @@ Append \"=\ to ARG to indicate that it is an option."
     (cond*
       ((member arg args) t)
       ((bind-and*
-        (_(string-suffix-p "=" arg))
-        (match (let ((case-fold-search nil)
-                     (re (format "\\`%s\\(?:=\\(.+\\)\\)?\\'"
-                                 (substring arg 0 -1))))
-                 (cl-find-if (lambda (a)
-                               (and (stringp a)
-                                    (string-match re a)))
-                             args))))
+         (_(string-suffix-p "=" arg))
+         (match (let ((case-fold-search nil)
+                      (re (format "\\`%s\\(?:=\\(.+\\)\\)?\\'"
+                                  (substring arg 0 -1))))
+                  (cl-find-if (lambda (a)
+                                (and (stringp a)
+                                     (string-match re a)))
+                              args))))
        (match-string 1 match)))))
 
 ;;;; Return
@@ -4126,7 +4364,7 @@ Append \"=\ to ARG to indicate that it is an option."
     (oset obj return t)))
 
 ;;;; Scope
-;;;; Init
+;;;;; Init
 
 (cl-defgeneric transient-init-scope (obj)
   "Set the scope of the prefix or suffix object OBJ.
@@ -4147,7 +4385,7 @@ a default implementation, which is a noop.")
 (cl-defmethod transient-init-scope ((_   transient-suffix))
   "Noop." nil)
 
-;;;; Get
+;;;;; Get
 
 (defun transient-scope (&optional prefixes classes)
   "Return the scope of the active or current transient prefix command.
@@ -4246,11 +4484,10 @@ have a history of their own.")
         (focus nil))
     (setq transient--buffer (get-buffer-create transient--buffer-name))
     (with-current-buffer transient--buffer
-      (when transient-enable-popup-navigation
-        (setq focus (or (button-get (point) 'command)
+      (when transient-enable-menu-navigation
+        (setq focus (or (get-text-property (point) 'button-data)
                         (and (not (bobp))
-                             (button-get (1- (point)) 'command))
-                        (transient--heading-at-point))))
+                             (get-text-property (1- (point)) 'button-data)))))
       (erase-buffer)
       (transient--insert-menu setup))
     (unless (window-live-p transient--window)
@@ -4262,9 +4499,11 @@ have a history of their own.")
                               (window-parameter nil 'no-other-window))))
     (when (window-live-p transient--window)
       (with-selected-window transient--window
-        (set-window-parameter nil 'no-other-window t)
+        (unless (eq (lookup-key transient-predicate-map [other-window])
+                    'transient--do-move)
+          (set-window-parameter nil 'no-other-window t))
         (goto-char (point-min))
-        (when transient-enable-popup-navigation
+        (when (and focus transient-enable-menu-navigation)
           (transient--goto-button focus))
         (transient--fit-window-to-buffer transient--window)))))
 
@@ -4278,7 +4517,7 @@ have a history of their own.")
                             'transient-display-buffer-action))
                (transient-display-buffer-action))))
     (when (and (assq 'pop-up-frame-parameters (cdr action))
-               (fboundp 'buffer-line-statistics)) ; Emacs >= 28.1
+               (fboundp 'buffer-line-statistics)) ; since Emacs 28.1
       (setq action (copy-tree action))
       (pcase-let ((`(,height ,width)
                    (buffer-line-statistics transient--buffer))
@@ -4324,10 +4563,12 @@ have a history of their own.")
            (if (window-parent win)
                (delete-window win)
              (delete-frame (window-frame win) t)))))
-      (when remain-in-minibuffer-window
-        (select-window remain-in-minibuffer-window))))
-  (when (buffer-live-p transient--buffer)
-    (kill-buffer transient--buffer))
+      (with-demoted-errors "Error while exiting transient [1]: %S"
+        (when remain-in-minibuffer-window
+          (select-window remain-in-minibuffer-window)))))
+  (with-demoted-errors "Error while exiting transient [2]: %S"
+    (when (buffer-live-p transient--buffer)
+      (kill-buffer transient--buffer)))
   (setq transient--buffer nil))
 
 (defun transient--preserve-window-p (&optional nohide)
@@ -4343,7 +4584,7 @@ have a history of their own.")
 ;;;; Format
 
 (defun transient--format-hint ()
-  (if (and transient-show-popup (<= transient-show-popup 0))
+  (if (and transient-show-menu (<= transient-show-menu 0))
       (format "%s-" (key-description (this-command-keys)))
     (format
      "%s- [%s] %s"
@@ -4384,12 +4625,27 @@ have a history of their own.")
             (if (or (natnump format) (eq format 'line)) nil format)))
     (setq mode-line-buffer-identification
           (symbol-name (oref transient--prefix command)))
-    (if transient-enable-popup-navigation
+    (if transient-enable-menu-navigation
         (setq-local cursor-in-non-selected-windows 'box)
       (setq cursor-type nil))
     (setq display-line-numbers nil)
     (setq show-trailing-whitespace nil)
     (run-hooks 'transient-setup-buffer-hook))
+  (when transient-describe-menu
+    (let* ((command (oref transient--prefix command))
+           (desc (propertize
+                  (or (and (not (eq transient-describe-menu 'docstring))
+                           (oref transient--prefix description))
+                      (and-let* ((doc (documentation command)))
+                        (car (split-string doc "\n")))
+                      (symbol-name command))
+                  'face 'transient-heading)))
+      (when (string-suffix-p "." desc)
+        (setq desc (substring desc 0 -1)))
+      (if transient-navigate-to-group-descriptions
+          (insert (transient-buttonize desc transient--prefix))
+        (insert desc))
+      (insert "\n\n")))
   (transient--insert-groups)
   (when (or transient--helpp transient--editp)
     (transient--insert-help))
@@ -4529,7 +4785,7 @@ making `transient--original-buffer' current.")
   "Add additional formatting if appropriate.
 When reading user input for this infix, then highlight it.
 When edit-mode is enabled, then prepend the level information.
-When `transient-enable-popup-navigation' is non-nil then format
+When `transient-enable-menu-navigation' is non-nil then format
 as a button."
   (let ((str (cl-call-next-method obj)))
     (when (and (cl-typep obj 'transient-infix)
@@ -4543,31 +4799,30 @@ as a button."
                                                 'transient-enabled-suffix
                                               'transient-disabled-suffix)))
                         str)))
-    (when (and transient-enable-popup-navigation
-               (slot-boundp obj 'command))
-      (setq str (make-text-button str nil
-                                  'type 'transient
-                                  'suffix obj
-                                  'command (oref obj command))))
-    str))
+    (transient-buttonize str obj)))
 
 (cl-defmethod transient-format ((obj transient-infix))
   "Return a string generated using OBJ's `format'.
 %k is formatted using `transient-format-key'.
 %d is formatted using `transient-format-description'.
-%v is formatted using `transient-format-value'."
-  (format-spec (oref obj format)
+%v is formatted using `transient-format-value'.
+%i is formatted using `transient-format-inapt'."
+  (format-spec (transient--get-format obj)
                `((?k . ,(transient-format-key obj))
                  (?d . ,(transient-format-description obj))
-                 (?v . ,(transient-format-value obj)))))
+                 (?v . ,(transient-format-value obj))
+                 (?i . ,(transient-format-inapt obj)))))
+
 
 (cl-defmethod transient-format ((obj transient-suffix))
   "Return a string generated using OBJ's `format'.
 %k is formatted using `transient-format-key'.
-%d is formatted using `transient-format-description'."
-  (format-spec (oref obj format)
+%d is formatted using `transient-format-description'.
+%i is formatted using `transient-format-inapt'."
+  (format-spec (transient--get-format obj)
                `((?k . ,(transient-format-key obj))
-                 (?d . ,(transient-format-description obj)))))
+                 (?d . ,(transient-format-description obj))
+                 (?i . ,(transient-format-inapt obj)))))
 
 (cl-defgeneric transient-format-key (obj)
   "Format OBJ's `key' for display and return the result.")
@@ -4657,12 +4912,15 @@ and its value is returned to the caller."
   "Format the description by calling the next method.
 If the result doesn't use the `face' property at all, then apply the
 face `transient-heading' to the complete string."
-  (and-let* ((desc (transient--get-description obj)))
-    (cond ((oref obj inapt)
-           (propertize desc 'face 'transient-inapt-suffix))
-          ((text-property-not-all 0 (length desc) 'face nil desc)
-           desc)
-          ((propertize desc 'face 'transient-heading)))))
+  (and-let* ((desc (transient--get-description obj))
+             (desc (cond ((oref obj inapt)
+                          (propertize desc 'face 'transient-inapt-suffix))
+                         ((text-property-not-all 0 (length desc) 'face nil desc)
+                          desc)
+                         ((propertize desc 'face 'transient-heading)))))
+    (if transient-navigate-to-group-descriptions
+        (transient-buttonize desc obj)
+      desc)))
 
 (cl-defmethod transient-format-description :around ((obj transient-suffix))
   "Format the description by calling the next method.
@@ -4707,55 +4965,84 @@ apply the face `transient-unreachable' to the complete string."
   "Format OBJ's value for display and return the result.")
 
 (cl-defmethod transient-format-value ((obj transient-suffix))
-  (propertize (oref obj argument)
-              'face (if (oref obj value)
-                        (if (oref obj inapt)
-                            'transient-inapt-argument
-                          'transient-argument)
-                      'transient-inactive-argument)))
+  (with-slots (argument value inapt) obj
+    (concat (propertize argument 'face (transient-argument-face obj))
+            (cond ((not transient-use-accessible-values) nil)
+                  (inapt " is inapt")
+                  (value " is enabled")
+                  (t     " is disabled")))))
 
 (cl-defmethod transient-format-value ((obj transient-option))
-  (let ((argument (prin1-to-string (oref obj argument) t)))
+  (let ((argument (prin1-to-string (oref obj argument) t))
+        (aface (transient-argument-face obj))
+        (vface (transient-value-face obj)))
     (if-let* ((value (oref obj value)))
-        (let* ((inapt (oref obj inapt))
-               (aface (if inapt 'transient-inapt-argument 'transient-argument))
-               (vface (if inapt 'transient-inapt-argument 'transient-value)))
-          (pcase-exhaustive (oref obj multi-value)
-            ('nil
-             (concat (propertize argument 'face aface)
-                     (propertize value    'face vface)))
-            ((or 't 'rest)
-             (concat (propertize (if (string-suffix-p " " argument)
-                                     argument
-                                   (concat argument " "))
-                                 'face aface)
-                     (propertize (mapconcat #'prin1-to-string value " ")
-                                 'face vface)))
-            ('repeat
-             (mapconcat (lambda (value)
-                          (concat (propertize argument 'face aface)
-                                  (propertize value    'face vface)))
-                        value " "))))
-      (propertize argument 'face 'transient-inactive-argument))))
+        (pcase-exhaustive (oref obj multi-value)
+          ('nil
+           (concat (propertize argument 'face aface)
+                   (propertize value    'face vface)))
+          ((or 't 'rest)
+           (concat (propertize (if (string-suffix-p " " argument)
+                                   argument
+                                 (concat argument " "))
+                               'face aface)
+                   (propertize (mapconcat #'prin1-to-string value " ")
+                               'face vface)))
+          ('repeat
+           (mapconcat (lambda (value)
+                        (concat (propertize argument 'face aface)
+                                (propertize value    'face vface)))
+                      value " ")))
+      (concat (propertize (if (string-suffix-p "=" argument)
+                              (substring argument 0 -1)
+                            argument)
+                          'face aface)
+              (and transient-use-accessible-values " is disabled")))))
 
 (cl-defmethod transient-format-value ((obj transient-switches))
-  (with-slots (value argument-format choices) obj
-    (format (propertize argument-format
-                        'face (if value
-                                  'transient-argument
-                                'transient-inactive-argument))
-            (format
-             (propertize "[%s]" 'face 'transient-delimiter)
-             (mapconcat
-              (lambda (choice)
-                (propertize choice 'face
-                            (if (equal (format argument-format choice) value)
-                                (if (oref obj inapt)
-                                    'transient-inapt-argument
-                                  'transient-value)
-                              'transient-inactive-value)))
-              choices
-              (propertize "|" 'face 'transient-delimiter))))))
+  (pcase-let (((eieio value argument-format choices) obj)
+              (face (transient-argument-face obj)))
+    (cond
+      ((not transient-use-accessible-values)
+       (format (propertize argument-format 'face face)
+               (format
+                (propertize "[%s]" 'face 'transient-delimiter)
+                (mapconcat
+                 (lambda (choice)
+                   (propertize choice 'face
+                               (transient-value-face
+                                obj
+                                (equal (format argument-format choice) value))))
+                 choices
+                 (propertize "|" 'face 'transient-delimiter)))))
+      (value (propertize value 'face face))
+      ((format "No %s argument is enabled"
+               (propertize (string-replace "%s" "*" argument-format)
+                           'face face))))))
+
+(cl-defmethod transient-format-inapt ((obj transient-suffix))
+  "If OBJ is currently inapt, return \"inapt \", else the empty string."
+  (if (oref obj inapt) "inapt " ""))
+
+(defun transient-argument-face (obj)
+  (if (oref obj value)
+      (if (oref obj inapt)
+          'transient-inapt-argument
+        'transient-argument)
+    'transient-inactive-argument))
+
+(cl-defun transient-value-face (obj &optional (active nil sactive))
+  (if (if sactive active (oref obj value))
+      (if (oref obj inapt)
+          ;; transient-inapt-value does not exist
+          'transient-inapt-argument
+        'transient-value)
+    'transient-inactive-value))
+
+(cl-defmethod transient--get-format ((obj transient-suffix))
+  (if transient-use-accessible-formats
+      (oref obj accessible-format)
+    (oref obj format)))
 
 (cl-defmethod transient--get-description ((obj transient-child))
   (cond*
@@ -4814,26 +5101,17 @@ apply the face `transient-unreachable' to the complete string."
                                   (length (oref suffix key))))
                            (oref group suffixes))))))
 
-(defun transient--pixel-width (string)
-  (save-window-excursion
-    (with-temp-buffer
-      (insert string)
-      (set-window-dedicated-p nil nil)
-      (set-window-buffer nil (current-buffer))
-      (car (window-text-pixel-size
-            nil (line-beginning-position) (point))))))
-
 (defun transient--column-stops (columns)
   (let* ((var-pitch (or transient-align-variable-pitch
                         (oref transient--prefix variable-pitch)))
-         (char-width (and var-pitch (transient--pixel-width " "))))
+         (char-width (and var-pitch (string-pixel-width " "))))
     (transient--seq-reductions-from
      (apply-partially #'+ (* 2 (if var-pitch char-width 1)))
      (transient--mapn
       (lambda (cells min)
         (apply #'max
                (if min (if var-pitch (* min char-width) min) 0)
-               (mapcar (if var-pitch #'transient--pixel-width #'length) cells)))
+               (mapcar (if var-pitch #'string-pixel-width #'length) cells)))
       columns
       (oref transient--prefix column-widths))
      0)))
@@ -4939,7 +5217,8 @@ Select the help window, and make the help buffer current and return it."
           (cons (lambda () (setq buffer (current-buffer)))
                 temp-buffer-window-setup-hook)))
     (describe-function fn)
-    (set-buffer buffer)))
+    (when buffer
+      (set-buffer buffer))))
 
 (defun transient--show-manual (manual)
   (info manual))
@@ -5044,8 +5323,8 @@ The current level of this menu is %s, so
                     'face 'transient-disabled-suffix)
         (propertize " 0 " 'face 'transient-disabled-suffix))))))
 
-(cl-defgeneric transient-show-summary (obj &optional return)
-  "Show brief summary about the command at point in the echo area.
+(cl-defgeneric transient-get-summary (obj)
+  "Return brief summary about the menu element at point.
 
 If OBJ's `summary' slot is a string, use that.  If it is a function,
 call that with OBJ as the only argument and use the returned string.
@@ -5056,25 +5335,29 @@ of the documentation string, if any.
 If RETURN is non-nil, return the summary instead of showing it.
 This is used when a tooltip is needed.")
 
-(cl-defmethod transient-show-summary ((obj transient-suffix) &optional return)
-  (with-slots (command summary) obj
-    (when-let*
-        ((doc (cond ((functionp summary)
-                     (funcall summary obj))
-                    (summary)
-                    ((documentation command)
-                     (car (split-string (documentation command) "\n")))))
-         (_(stringp doc))
-         (_(not (equal doc
-                       (car (split-string (documentation
-                                           'transient--default-infix-command)
-                                          "\n"))))))
-      (when (string-suffix-p "." doc)
-        (setq doc (substring doc 0 -1)))
-      (if return
-          doc
-        (let ((message-log-max nil))
-          (message "%s" doc))))))
+(cl-defmethod transient-get-summary ((obj transient-object))
+  (cond*
+    ((bind-and*
+       (summary (cond*
+                  ((bind* (summary (oref obj summary))))
+                  ((functionp summary)
+                   (funcall summary obj))
+                  (summary)
+                  ((bind-and*
+                     (command (ignore-error (invalid-slot-name unbound-slot)
+                                (oref obj command)))
+                     (_(documentation command)))
+                   (car (split-string (documentation command) "\n")))))
+       (_(stringp summary))
+       (_(not (equal summary
+                     (car (split-string (documentation
+                                         'transient--default-infix-command)
+                                        "\n"))))))
+     (if (string-suffix-p "." summary)
+         (substring summary 0 -1)
+       summary))
+    ((eq transient-enable-menu-navigation 'force-verbose)
+     (transient--get-description obj))))
 
 ;;;; Menu Navigation
 
@@ -5100,8 +5383,7 @@ See `backward-button' for information about N."
   (interactive "p")
   (with-selected-window transient--window
     (backward-button n t)
-    (when (eq transient-enable-popup-navigation 'verbose)
-      (transient-show-summary (get-text-property (point) 'suffix)))))
+    (transient--button-move-echo)))
 
 (defun transient-forward-button (n)
   "Move to the next button in transient's menu buffer.
@@ -5109,44 +5391,60 @@ See `forward-button' for information about N."
   (interactive "p")
   (with-selected-window transient--window
     (forward-button n t)
-    (when (eq transient-enable-popup-navigation 'verbose)
-      (transient-show-summary (get-text-property (point) 'suffix)))))
+    (transient--button-move-echo)))
+
+(defun transient--button-move-echo ()
+  (when-let* ((_(memq transient-enable-menu-navigation '(verbose force-verbose)))
+              (obj (get-text-property (point) 'button-data)))
+    (let ((message-log-max nil))
+      (message "%s" (or (transient-get-summary obj) "")))))
+
+(defun transient--button-help-echo (win buf pos)
+  (with-selected-window win
+    (with-current-buffer buf
+      (transient-get-summary (get-text-property pos 'button-data)))))
 
 (define-button-type 'transient
   'face nil
   'keymap transient-button-map
-  'help-echo (lambda (win buf pos)
-               (with-selected-window win
-                 (with-current-buffer buf
-                   (transient-show-summary
-                    (get-text-property pos 'suffix) t)))))
+  'help-echo #'transient--button-help-echo)
 
-(defun transient--goto-button (command)
-  (cond
-    ((stringp command)
-     (when (re-search-forward (concat "^" (regexp-quote command)) nil t)
-       (goto-char (match-beginning 0))))
-    (command
-     (cl-flet ((found ()
-                 (and-let* ((button (button-at (point))))
-                   (eq (button-get button 'command) command))))
-       (while (and (ignore-errors (forward-button 1))
-                   (not (found))))
-       (unless (found)
+(defun transient-buttonize (string object)
+  (if transient-enable-menu-navigation
+      (make-text-button string nil 'type 'transient 'button-data object)
+    string))
+
+(defun transient--goto-button (object)
+  (cl-etypecase object
+    (transient-prefix (goto-char (point-min)))
+    ((or transient-group transient-suffix)
+     (let ((found (transient--match-button object)))
+       (while (and (not (funcall found))
+                   (ignore-errors (forward-button 1))))
+       (unless (funcall found)
          (goto-char (point-min))
          (ignore-errors (forward-button 1))
-         (unless (found)
+         (unless (funcall found)
            (goto-char (point-min))))))))
 
-(defun transient--heading-at-point ()
-  (and (eq (get-text-property (point) 'face) 'transient-heading)
-       (let ((beg (line-beginning-position)))
-         (buffer-substring-no-properties
-          beg (next-single-property-change
-               beg 'face nil (line-end-position))))))
+(defun transient--match-button (object)
+  (cl-etypecase object
+    ((or transient-group transient-information)
+     (let ((description (transient-format-description object)))
+       (lambda ()
+         (let ((obj (get-text-property (point) 'button-data)))
+           (and (cl-typep obj '(or transient-group transient-information))
+                (equal (string-trim-left (button-label (button-at (point))))
+                       description))))))
+    (transient-suffix
+     (let ((key (oref object key)))
+       (lambda ()
+         (let ((obj (get-text-property (point) 'button-data)))
+           (and (cl-typep obj 'transient-suffix)
+                (eq (oref obj key) key))))))))
 
 ;;;; Compatibility
-;;;; Menu Isearch
+;;;;; Menu Isearch
 
 (defvar-keymap transient--isearch-mode-map
   :parent isearch-mode-map
@@ -5204,14 +5502,14 @@ search instead."
   (select-window transient--original-window)
   (transient--resume-override))
 
-;;;; Edebug
+;;;;; Edebug
 
 (defun transient--edebug-command-p ()
   (and (bound-and-true-p edebug-active)
        (or (memq this-command '(top-level abort-recursive-edit))
            (string-prefix-p "edebug" (symbol-name this-command)))))
 
-;;;; Miscellaneous
+;;;;; Miscellaneous
 
 (cl-pushnew (list nil (concat "^\\s-*("
                               (eval-when-compile
@@ -5226,14 +5524,13 @@ search instead."
             lisp-imenu-generic-expression :test #'equal)
 
 (defun transient--suspend-text-conversion-style ()
-  (static-if (boundp 'overriding-text-conversion-style) ; since Emacs 30.1
-      (when text-conversion-style
-        (letrec ((suspended overriding-text-conversion-style)
-                 (fn (lambda ()
-                       (setq overriding-text-conversion-style nil)
-                       (remove-hook 'transient-exit-hook fn))))
-          (setq overriding-text-conversion-style suspended)
-          (add-hook 'transient-exit-hook fn)))))
+  (when text-conversion-style
+    (letrec ((suspended overriding-text-conversion-style)
+             (fn (lambda ()
+                   (setq overriding-text-conversion-style nil)
+                   (remove-hook 'transient-exit-hook fn))))
+      (setq overriding-text-conversion-style suspended)
+      (add-hook 'transient-exit-hook fn))))
 
 (declare-function which-key-mode "ext:which-key" (&optional arg))
 
@@ -5318,7 +5615,7 @@ as stand-in for elements of exhausted lists."
 (font-lock-add-keywords 'emacs-lisp-mode transient-font-lock-keywords)
 
 ;;;; Auxiliary Classes
-;;;; `transient-lisp-variable'
+;;;;; `transient-lisp-variable'
 
 (defclass transient-lisp-variable (transient-variable)
   ((reader :initform #'transient-lisp-variable--reader)
@@ -5351,10 +5648,11 @@ as stand-in for elements of exhausted lists."
 (defun transient-lisp-variable--reader (prompt initial-input _history)
   (read--expression prompt initial-input))
 
-;;;; `transient-cons-option'
+;;;;; `transient-cons-option'
 
 (defclass transient-cons-option (transient-option)
-  ((format :initform " %k %d: %v"))
+  ((format            :initform " %k %d: %v")
+   (accessible-format :initform "%i%k %d is %v"))
   "[Experimental] Class used for unencoded key-value pairs.")
 
 (cl-defmethod transient-infix-value ((obj transient-cons-option))
@@ -5370,9 +5668,11 @@ as stand-in for elements of exhausted lists."
           description))))
 
 (cl-defmethod transient-format-value ((obj transient-cons-option))
-  (let ((value (oref obj value)))
-    (propertize (prin1-to-string value t) 'face
-                (if value 'transient-value 'transient-inactive-value))))
+  (with-slots (value) obj
+    (if (or value (not transient-use-accessible-values))
+        (propertize (prin1-to-string value t)
+                    'face (transient-argument-face obj))
+      "unset")))
 
 ;;;; _
 (provide 'transient)
@@ -5380,6 +5680,8 @@ as stand-in for elements of exhausted lists."
 ;; checkdoc-symbol-words: ("command-line" "edit-mode" "help-mode")
 ;; indent-tabs-mode: nil
 ;; lisp-indent-local-overrides: (
+;;   (bind* . 0)
+;;   (bind-and* . 0)
 ;;   (cond . 0)
 ;;   (cond* . 0)
 ;;   (interactive . 0))

From 986892fe305047e27097ae8e4a371dc2610a5a02 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Wed, 22 Apr 2026 20:46:22 +0200
Subject: [PATCH 180/463] ; Adjust package tests for 789e98e54fe

* test/lisp/emacs-lisp/package-tests.el (package-test-get-deps):
Replace test with an analogous test for 'package--dependencies'.
---
 test/lisp/emacs-lisp/package-tests.el | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el
index a6d9f13a289..a2e4adb7b8e 100644
--- a/test/lisp/emacs-lisp/package-tests.el
+++ b/test/lisp/emacs-lisp/package-tests.el
@@ -982,8 +982,8 @@ but with a different end of line convention (bug#48137)."
                             (member sample-elem (aref pac 4)))
                           (aref pac-sample 4)))))))
 
-(ert-deftest package-test-get-deps ()
-  "Test `package--get-deps' with complex structures."
+(ert-deftest package-test-get-dependencies ()
+  "Test `package--dependencies' with complex structures."
   (let ((package-alist
          (mapcar (lambda (p) (list (package-desc-name p) p))
            (list simple-single-desc
@@ -991,16 +991,15 @@ but with a different end of line convention (bug#48137)."
                  multi-file-desc
                  new-pkg-desc
                  simple-depend-desc-1
-                 simple-depend-desc-2)))
-        (pkg-cmp #'string-lessp))
+                 simple-depend-desc-2))))
     (should
-     (equal (sort (package--get-deps '(simple-depend)) pkg-cmp)
-            (sort (list 'simple-depend 'simple-single) pkg-cmp)))
+     (seq-set-equal-p
+      (mapcar #'car (package--dependencies 'simple-depend))
+      '(simple-single)))
     (should
-     (equal (sort (package--get-deps '(simple-depend-2)) pkg-cmp)
-            (sort (list 'simple-depend-2 'simple-depend-1 'multi-file
-                        'simple-depend 'simple-single)
-                  pkg-cmp)))))
+     (seq-set-equal-p
+      (mapcar #'car (package--dependencies 'simple-depend-2))
+      '(simple-depend-1 multi-file simple-depend simple-single)))))
 
 (ert-deftest package-test-sort-by-dependence ()
   "Test `package--sort-by-dependence' with complex structures."

From 4e165cc2d0cfb889ea2206a5e7a4ccf8c77aa2b5 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 22 Apr 2026 23:02:59 -0400
Subject: [PATCH 181/463] (loaddefs--defining-macros): Delete var

Now that Transient-0.13.0 has been merged, we don't need to
treat its macros specially any more because they come with the
appropriate `autoload-macro` property.

* lisp/emacs-lisp/loaddefs-gen.el (loaddefs--defining-macros): Delete var.
(loaddefs-generate--make-autoload): Delete corresponding code.
---
 lisp/emacs-lisp/loaddefs-gen.el | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el
index 9659b6535a5..7d1ca74ea94 100644
--- a/lisp/emacs-lisp/loaddefs-gen.el
+++ b/lisp/emacs-lisp/loaddefs-gen.el
@@ -143,23 +143,6 @@ scanning for autoloads and will be in the `load-path'."
              3)
         form))
 
-;; The following macros are known to define functions, and are treated
-;; specially when encountered during autoload generation, translating
-;; calls to them directly into appropriate (autoload function ...)
-;; forms.
-;;
-;; An alternative to appearing on this list is for a macro to declare
-;; (autoload-macro expand), so calls to it get expanded into more basic
-;; forms during generation.  Macros may be removed from this list once
-;; they request such expansion and produce suitable output (e.g. by
-;; employing :autoload-end to omit unneeded forms).
-(defconst loaddefs--defining-macros
-  '( transient-define-prefix transient-define-suffix transient-define-infix
-     transient-define-argument
-     ;; FIXME: How can this one make sense?  It doesn't put anything
-     ;; into `symbol-function'!
-     transient-define-group))
-
 (defvar loaddefs--load-error-files nil)
 (defun loaddefs-generate--make-autoload (form file &optional expansion)
   "Turn FORM into an autoload or defvar for source file FILE.
@@ -225,7 +208,6 @@ expand)' among their `declare' forms."
         ;; give packages a chance to define their macros.
         (unless (or (not (symbolp car)) (fboundp car)
                     ;; Special cases handled below
-                    (memq car loaddefs--defining-macros)
                     (memq car '(defclass defcustom deftheme defgroup nil))
                     (assoc file load-history)
                     (member file loaddefs--load-error-files))
@@ -248,21 +230,6 @@ expand)' among their `declare' forms."
       ;; Recurse on the expansion.
       (loaddefs-generate--make-autoload expand file 'expansion))
 
-     ;; For known special macros which define functions, use `autoload'
-     ;; directly.
-     ((memq car loaddefs--defining-macros)
-      (let* ((name (nth 1 form))
-	     (args (nth 2 form))
-	     (body (nthcdr (or (function-get car 'doc-string-elt) 3) form))
-	     (doc (if (stringp (car body)) (pop body))))
-        ;; Add the usage form at the end where describe-function-1
-        ;; can recover it.
-	(when (listp args) (setq doc (help-add-fundoc-usage doc args)))
-        ;; `define-generic-mode' quotes the name, so take care of that
-        (loaddefs-generate--shorten-autoload
-         `(autoload ,(if (listp name) name (list 'quote name))
-            ,file ,doc t))))
-
      ;; For defclass forms, use `eieio-defclass-autoload'.
      ((eq car 'defclass)
       (let ((name (nth 1 form))

From 84ae97f865cfc08351972de33b457840f011c067 Mon Sep 17 00:00:00 2001
From: Peter Oliver <git@mavit.org.uk>
Date: Sun, 5 Apr 2026 00:24:33 +0100
Subject: [PATCH 182/463] Use expected escape sequence for terminfo Tc and
 COLORTERM=truecolor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the non-standard terminfo capability Tc is present, or the
environment variable COLORTERM is set to truecolor, use a
hard-coded escape sequence that addresses all colors directly by
their RGB values.

Previously we used escape sequences cribbed from terminfo's
setaf/setab for direct color, that expect that we will only try to
use colors 000000 to 000007 for the first eight indexed colors.
This isn't something we currently handle.

* doc/misc/efaq.texi (Colors on a TTY): Fix off-by-one error in list
of indexed colors for terminfo RGB terminals.
* src/term.c (init_tty): Don’t use any indexed colors with terminfo
Tc capability or COLORTERM=truecolor environment variable (bug#70941).
---
 doc/misc/efaq.texi |  2 +-
 src/term.c         | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 7502d8d551c..13dc2b70431 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -1973,7 +1973,7 @@ If Terminfo database is not available, but 24-bit direct color mode is
 supported, it can still be enabled by defining the environment
 variable @env{COLORTERM} to @samp{truecolor}.
 
-Terminals with @samp{RGB} capability treat pixels #000001 - #000007 as
+Terminals with @samp{RGB} capability treat pixels #000000 - #000007 as
 indexed colors to maintain backward compatibility with applications
 that are unaware of direct color mode.  Therefore the seven darkest
 blue shades may not be available.  If this is a problem, you can
diff --git a/src/term.c b/src/term.c
index 766eeebe5e8..091b900db93 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4605,16 +4605,22 @@ use the Bourne shell command 'TERM=...; export TERM' (C-shell:\n\
 	       signed values, tgetnum("Co") and tigetnum("colors")
 	       could return 32767.  */
 	    tty->TN_max_colors = 16777216;
+
+	    /* FIXME: When the RGB terminfo capability is given, we
+	       should avoid trying to use colors 000000 to 000007 as if
+	       they were RGB values.  The escape sequences given by
+	       setaf and setab treat them as the first eight indexed
+	       ANSI colors. */
 	  }
-	/* Fall back to xterm+direct (semicolon version) if Tc is set
-	   (de-facto standard introduced by tmux) or if	requested by
-	   the COLORTERM environment variable.  */
+	/* Fall back to direct colour by RGB value (semicolon version)
+	   if Tc is set (de-facto standard introduced by tmux) or if
+	   requested by the COLORTERM environment variable.  */
 	else if ((tigetflag ("Tc") > 0)
 		 || ((bg = getenv ("COLORTERM")) != NULL
 		     && strcasecmp (bg, "truecolor") == 0))
 	  {
-	    tty->TS_set_foreground = "\033[%?%p1%{8}%<%t3%p1%d%e38;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%d%;m";
-	    tty->TS_set_background = "\033[%?%p1%{8}%<%t4%p1%d%e48;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%d%;m";
+	    tty->TS_set_foreground = "\033[38;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%d%;m";
+	    tty->TS_set_background = "\033[48;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%d%;m";
 	    tty->TN_max_colors = 16777216;
 	  }
       }

From 8aa7f6a50135a26ed8cabd9bdd47e46c774167b6 Mon Sep 17 00:00:00 2001
From: Tim Ruffing <crypto@timruffing.de>
Date: Fri, 12 Nov 2021 20:37:39 +0100
Subject: [PATCH 183/463] Support setrgbb/setrgbf for setting 24-bit color

* src/term.c (turn_on_face): Account for TF_rgb_separate.
(init_tty): Support setrgbf/setrrgbb and set TF_rgb_separate
accordingly.
* src/termchar.h: Update commentary.
(Bug#70941)
---
 src/term.c     | 28 ++++++++++++++++++++++------
 src/termchar.h | 10 ++++++----
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/term.c b/src/term.c
index 091b900db93..cd0f0f0f154 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2074,7 +2074,10 @@ turn_on_face (struct frame *f, struct face *face)
       ts = tty->standout_mode ? tty->TS_set_background : tty->TS_set_foreground;
       if (face_tty_specified_color (fg) && ts)
 	{
-          p = tparam (ts, NULL, 0, fg, 0, 0, 0);
+	  if (tty->TF_rgb_separate)
+	    p = tparam (ts, NULL, 0, fg >> 16, (fg >> 8) & 0xFF, fg & 0xFF, 0);
+	  else
+	    p = tparam (ts, NULL, 0, fg, 0, 0, 0);
 	  OUTPUT (tty, p);
 	  xfree (p);
 	}
@@ -2082,7 +2085,10 @@ turn_on_face (struct frame *f, struct face *face)
       ts = tty->standout_mode ? tty->TS_set_foreground : tty->TS_set_background;
       if (face_tty_specified_color (bg) && ts)
 	{
-          p = tparam (ts, NULL, 0, bg, 0, 0, 0);
+	  if (tty->TF_rgb_separate)
+	    p = tparam (ts, NULL, 0, bg >> 16, (bg >> 8) & 0xFF, bg & 0xFF, 0);
+	  else
+	    p = tparam (ts, NULL, 0, bg, 0, 0, 0);
 	  OUTPUT (tty, p);
 	  xfree (p);
 	}
@@ -4587,10 +4593,10 @@ use the Bourne shell command 'TERM=...; export TERM' (C-shell:\n\
 
 #ifdef TERMINFO
       {
-	const char *fg = tigetstr ("setf24");
-	const char *bg = tigetstr ("setb24");
-	/* Non-standard support for 24-bit colors. */
-	if (fg && bg
+	const char *fg;
+	const char *bg;
+	/* Our own non-standard support for 24-bit colors. */
+	if ((fg = tigetstr ("setf24")) && (bg = tigetstr ("setb24"))
 	    && fg != (char *) (intptr_t) -1
 	    && bg != (char *) (intptr_t) -1)
 	  {
@@ -4598,6 +4604,16 @@ use the Bourne shell command 'TERM=...; export TERM' (C-shell:\n\
 	    tty->TS_set_background = bg;
 	    tty->TN_max_colors = 16777216;
 	  }
+	/* Other non-standard support for 24-bit colors. */
+	else if ((fg = tigetstr ("setrgbf")) && (bg = tigetstr ("setrgbb"))
+	    && fg != (char *) (intptr_t) -1
+	    && bg != (char *) (intptr_t) -1)
+	  {
+	    tty->TS_set_foreground = fg;
+	    tty->TS_set_background = bg;
+	    tty->TN_max_colors = 16777216;
+	    tty->TF_rgb_separate = 1;
+	  }
 	/* Standard support for 24-bit colors.  */
 	else if (tigetflag ("RGB") > 0)
 	  {
diff --git a/src/termchar.h b/src/termchar.h
index 9a9001d5cef..d9390db17b2 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -159,10 +159,12 @@ struct tty_display_info
   /* "op" -- SVr4 set default pair to its original value.  */
   const char *TS_orig_pair;
 
-  /* "AF"/"AB" or "Sf"/"Sb"-- set ANSI or SVr4 foreground/background color.
-     1 param, the color index.  */
-  const char *TS_set_foreground;
-  const char *TS_set_background;
+  const char *TS_set_foreground; /* "AF"/"Sf"/"setrgbf" -- set foreground color. */
+  const char *TS_set_background; /* "AB"/"Sb"/"setrgbb" -- set background color. */
+  /* If set, TS_set_foreground and TS_set_background take 3 separate
+     params for R, G, and B values ("setrgbf"/"setrgbb" -- non-standard).
+     If unset, they take 1 param ("AF"/"AB" or "Sf"/"Sb" -- ANSI or SVr4r). */
+  int TF_rgb_separate;
 
   int TF_hazeltine;             /* termcap hz flag. */
   int TF_insmode_motion;        /* termcap mi flag: can move while in insert mode. */

From 74d411d600502b6af8d7a8c6b24d88a0fc964619 Mon Sep 17 00:00:00 2001
From: Peter Oliver <git@mavit.org.uk>
Date: Wed, 22 Apr 2026 13:04:44 +0100
Subject: [PATCH 184/463] Simplify Tc/COLORTERM=truecolor escape sequence

This should be more readable to most people, since C is
more widely familiar than the terminfo language.
* src/term.c (init_tty): Do the conversion from a single integer
24-bit color value to three 8-bit RGB values up-front.
(Bug#70941)
---
 src/term.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/term.c b/src/term.c
index cd0f0f0f154..131832d3ee1 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4635,9 +4635,10 @@ use the Bourne shell command 'TERM=...; export TERM' (C-shell:\n\
 		 || ((bg = getenv ("COLORTERM")) != NULL
 		     && strcasecmp (bg, "truecolor") == 0))
 	  {
-	    tty->TS_set_foreground = "\033[38;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%d%;m";
-	    tty->TS_set_background = "\033[48;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%d%;m";
+	    tty->TS_set_foreground = "\033[38;2;%p1%d;%p2%d;%p3%d%;m";
+	    tty->TS_set_background = "\033[48;2;%p1%d;%p2%d;%p3%d%;m";
 	    tty->TN_max_colors = 16777216;
+	    tty->TF_rgb_separate = 1;
 	  }
       }
 #endif

From fe1d9562f1dabf2b70309cac708c47faf51a7f67 Mon Sep 17 00:00:00 2001
From: Peter Oliver <git@mavit.org.uk>
Date: Wed, 22 Apr 2026 12:32:06 +0100
Subject: [PATCH 185/463] Document setrgbb, setrgbf, and Tc terminal
 capabilities

* doc/misc/efaq.texi (Colors on a TTY): Mention the unofficial
setrgbb, setrgbf, and Tc terminal capabilities, and give an
example custom terminfo defintion using them.  (Bug#70941)
---
 doc/misc/efaq.texi | 45 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 13dc2b70431..c65b5ee5593 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -1914,14 +1914,40 @@ exhibits all the colors Emacs knows about on the current display.
 Syntax highlighting is also on by default on text-only terminals.
 
 @cindex direct color in terminals
-Emacs 26.1 and later support direct color mode in terminals.  If Emacs
-finds Terminfo capabilities @samp{setb24} and @samp{setf24}, 24-bit
-direct color mode is used.  The capability strings are expected to
-take one 24-bit pixel value as argument and transform the pixel to a
-string that can be used to send 24-bit colors to the terminal.
+Emacs 26.1 and later support direct color mode in terminals.
 
-Standard terminal definitions don't support these capabilities and
-therefore custom definition is needed.
+If Emacs finds Terminfo capabilities @samp{setrgbb} and @samp{setrgbf},
+@samp{setb24} and @samp{setf24}, or @samp{Tc}, 24-bit direct color mode
+is used.  Standard terminal definitions don't support any of these
+capabilities, and therefore custom definition is needed.
+
+The capability strings @samp{setrgbb} and @samp{setrgbf} are expected to
+take three 8-bit values as arguments.  They are supported by Emacs 31.1
+and newer (and some other applications).
+
+@example
+$ cat terminfo-custom.src
+
+xterm-truecolor|xterm with 24-bit true color,
+  use=xterm-256color,
+  Tc,
+  setrgbb=\E[48\:2\:\:%p1%d\:%p2%d\:%p3%dm,
+  setrgbf=\E[38\:2\:\:%p1%d\:%p2%d\:%p3%dm,
+
+$ tic -x -o ~/.terminfo terminfo-custom.src
+
+$ TERM=xterm-truecolor emacs -nw
+@end example
+
+Some terminal emulators bundle their own custom definition that include
+the @samp{setrgbb}, @samp{setrgbf} and @samp{Tc} capabilities.
+
+The capability strings @samp{setb24} and @samp{setf24} are expected to
+take one 24-bit pixel value as argument and transform the pixel to a
+string that can be used to send 24-bit colors to the terminal.  They are
+only know to be supported by Emacs.  They are made obsolete by
+@samp{setrgbb} and @samp{setrgbf}, and may be removed in a future
+version of Emacs.
 
 @example
 $ cat terminfo-custom.src
@@ -1977,8 +2003,9 @@ Terminals with @samp{RGB} capability treat pixels #000000 - #000007 as
 indexed colors to maintain backward compatibility with applications
 that are unaware of direct color mode.  Therefore the seven darkest
 blue shades may not be available.  If this is a problem, you can
-always use custom terminal definition with @samp{setb24} and
-@samp{setf24}.
+always use custom terminal definition with @samp{setrgbb} and
+@samp{setrgbf}, @samp{setb24} and @samp{setf24}, @samp{Tc} without
+@samp{RGB}, or @env{COLORTERM}=@samp{truecolor} without @samp{RGB}.
 
 @node Debugging a customization file
 @section How do I debug an init file?

From 39202daeddc64ca407ebcb2072a9b59351457828 Mon Sep 17 00:00:00 2001
From: Lee Thompson <lee.p.thomp@gmail.com>
Date: Tue, 20 Jan 2026 21:58:54 +0000
Subject: [PATCH 186/463] Add language-environment and input methods for Syriac

* lisp/leim/quail/syriac.el: New file
* lisp/language/misc-lang.el: ("Syriac"): New language environment.
("Arabic"): Add comment explaining usage of `arabic-shape-gstring'
for Syriac as well as Arabic.
* etc/NEWS: Announce the new language environment and input methods.
* etc/HELLO: Add a Syriac greeting.
(Bug#80451)
---
 etc/HELLO                  |   3 +-
 etc/NEWS                   |   5 +
 lisp/language/misc-lang.el |  17 +++
 lisp/leim/quail/syriac.el  | 236 +++++++++++++++++++++++++++++++++++++
 4 files changed, 260 insertions(+), 1 deletion(-)
 create mode 100644 lisp/leim/quail/syriac.el

diff --git a/etc/HELLO b/etc/HELLO
index 8a7c7dbe706..fdbca768b44 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -12,7 +12,7 @@ Non-ASCII examples:
   Europe: <x-charset><param>latin-iso8859-1</param>¡Hola!, Grüß Gott, Hyvää päivää,</x-charset> Tere õhtust,<x-charset><param>latin-iso8859-3</param> Bonġu
           Cześć!,</x-charset><x-charset><param>latin-iso8859-2</param> Dobrý den,</x-charset><x-charset><param>cyrillic-iso8859-5</param> Здравствуйте!,</x-charset><x-charset><param>greek-iso8859-7</param> Γειά σας,</x-charset> გამარჯობა
   Africa: <x-charset><param>ethiopic</param>ሠላም</x-charset>
-  Middle/Near East:<x-charset><param>hebrew-iso8859-8</param> שָׁלוֹם,</x-charset> السّلام عليكم
+  Middle/Near East:<x-charset><param>hebrew-iso8859-8</param> שָׁלוֹם,</x-charset> السّلام عليكم, ܣܠܡܐ
   South Asia: નમસ્તે, नमस्ते, ನಮಸ್ಕಾರ, നമസ്കാരം, ନମସ୍କାର,
               ආයුබෝවන්, வணக்கம், నమస్కారం,<x-charset><param>tibetan</param> བཀྲ་ཤིས་བདེ་ལེགས༎</x-charset>
   South East Asia: ជំរាបសួរ,<x-charset><param>lao</param> ສະບາຍດີ,</x-charset> မင်္ဂလာပါ,<x-charset><param>thai-tis620</param> สวัสดีครับ,</x-charset><x-charset><param>vietnamese-viscii-lower</param> </x-charset><x-charset><param>vietnamese-viscii-upper</param>C</x-charset><x-charset><param>vietnamese-viscii-lower</param>hào bạn</x-charset>
@@ -107,6 +107,7 @@ Spanish (español)	¡Hola!
 Sundanese (ᮃᮊ᮪ᮟᮛᮞᮥᮔ᮪ᮓ)	ᮞᮙ᮪ᮕᮥᮛᮞᮥᮔ᮪
 Swedish (svenska)	Hej / Goddag / Hallå
 Syloti Nagri (ꠍꠤꠟꠐꠤ ꠘꠣꠉꠞꠤ)	ꠀꠌ꠆ꠍꠣꠟꠣꠝꠥ ꠀꠟꠣꠁꠇꠥꠝ / ꠘꠝꠡ꠆ꠇꠣꠞ
+Syriac (ܣܘܪܝܝܐ)	ܫܠܡܐ
 Tamil (தமிழ்)	வணக்கம்
 Telugu (తెలుగు)	నమస్కారం
 Tagalog (ᜊᜌ᜔ᜊᜌᜒᜈ᜔)	ᜃᜓᜋᜓᜐ᜔ᜆ
diff --git a/etc/NEWS b/etc/NEWS
index ccad04ae371..f3a5675284f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -819,6 +819,11 @@ writing in the orthographies of the six languages simultaneously.
 *** New input methods for languages based on Burmese.
 These include: Burmese, Burmese (visual order), Shan, and Mon.
 
+---
+*** New input methods for Syriac languages.
+Language environment and input methods are implemented now for languages
+using the Syriac script: Syriac and Syriac (phonetic)
+
 ---
 ** 'visual-wrap-prefix-mode' now supports variable-pitch fonts.
 When using 'visual-wrap-prefix-mode' in buffers with variable-pitch
diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index 1f5d4ee4c02..8942c86ea1b 100644
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.el
@@ -135,6 +135,9 @@ thin (i.e. 1-dot width) space."
     (error (push err arabic-shape-log)))
   gstring)
 
+;;; `arabic-shape-gstring' is used for shaping of Arabic (range
+;;; #x600–#x6ff) and Syriac (range #x700–#x74f) on account of their
+;;; identical shaping requirements.
 (set-char-table-range
  composition-function-table
  '(#x600 . #x74F)
@@ -146,6 +149,20 @@ thin (i.e. 1-dot width) space."
   (list (vector "[\u200C\u200D][\u0600-\u074F\u200C\u200D]+"
                 0 #'arabic-shape-gstring)))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Syriac
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(set-language-info-alist
+ "Syriac" '((charset unicode)
+            (coding-system utf-8)
+            (coding-priority utf-8)
+            (input-method . "syriac")
+            (sample-text . "Syriac	ܫܠܡܐ")
+            (documentation . "\
+Language environment for Classical Syriac, Aramaic, and other languages
+using the Syriac script.")))
+
 ;; The Egyptian Hieroglyph Format Controls were introduced in Unicode
 ;; Standard v12.0.  Apparently, they are not yet well supported in
 ;; existing fonts, as of late 2020.  But there's no reason for us not
diff --git a/lisp/leim/quail/syriac.el b/lisp/leim/quail/syriac.el
new file mode 100644
index 00000000000..72eef0f1c8c
--- /dev/null
+++ b/lisp/leim/quail/syriac.el
@@ -0,0 +1,236 @@
+;;; syriac.el --- Quail package for inputting Syriac	-*- coding: utf-8; lexical-binding:t -*-
+
+;; Copyright (C) 2026 Free Software Foundation, Inc.
+
+;; Author: Lee Thompson <lee.p.thomp@gmail.com>
+;; Keywords: multilingual, input method, Syriac
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'quail)
+
+(quail-define-package
+ "syriac" "Syriac" "ܣ" nil "Syriac input method.
+
+Based on Syriac table in X Keyboard Configuration DB
+" nil t t t t nil nil nil nil nil t)
+
+;;  ܏̮ 1! 2̊ 3̥ 4݉ 5♰ 6♱ 7܊ 8» 9) 0( -« =+
+;;      ܔܰ ܨܳ ܖܶ ܩܺ ܦܽ ܜ݀ ܥ݁ ܗ̈ ܞ̄ ܚ̇ ܓ̃ ܕ݊ <>
+;;       ܫܱ ܣܴ ܝܷ ܒܻ ܠܾ ܐܑ ܬـ ܢ̤ ܡ̱ ܟ̣ ܛ̰ ܆:
+;;        ]ܲ [ܵ ܤܸ ܪܼ ܧܿ ܀ܹ .݂ ܘ، ܙ؛ ܇؟
+;;
+
+(quail-define-rules
+ ("`" ?܏)
+ ("~" ?̮)
+
+ ("!" ?!)
+ ("@" ?̊)
+ ("#" ?̥)
+ ("$" ?݉)
+ ("%" ?♰)
+ ("^" ?♱)
+ ("&" ?܊)
+ ("*" ?»)
+ ("(" ?\))
+ (")" ?\()
+ ("_" ?«)
+ ("+" ?+)
+
+ ("Q" ?ܰ)
+ ("W" ?ܳ)
+ ("E" ?ܶ)
+ ("R" ?ܺ)
+ ("T" ?ܽ)
+ ("Y" ?݀)
+ ("U" ?݁)
+ ("I" ?̈)
+ ("O" ?̄)
+ ("P" ?̇)
+ ("{" ?̃)
+ ("}" ?݊)
+
+ ("A" ?ܱ)
+ ("S" ?ܴ)
+ ("D" ?ܷ)
+ ("F" ?ܻ )
+ ("G" ?ܾ)
+ ("H" ?ܑ)
+ ("J" ?ـ)
+ ("K" ?̤)
+ ("L" ?̱)
+ (":" ?̣)
+ ("\"" ?̰)
+ ("|" ?:)
+
+
+ ("Z" ?ܲ)
+ ("X" ?ܵ)
+ ("C" ?ܸ)
+ ("V" ?ܼ)
+ ("B" ?ܿ)
+ ("N" ?ܹ)
+ ("M" ?݂)
+ ("<" ?،)
+ (">" ?؛)
+ ("?" ?؟)
+
+ ("q" ?ܔ)
+ ("w" ?ܨ)
+ ("e" ?ܖ)
+ ("r" ?ܩ)
+ ("t" ?ܦ)
+ ("y" ?ܜ)
+ ("u" ?ܥ)
+ ("i" ?ܗ)
+ ("o" ?ܞ)
+ ("p" ?ܚ)
+ ("[" ?ܓ)
+ ("]" ?ܕ)
+
+ ("a" ?ܫ)
+ ("s" ?ܣ)
+ ("d" ?ܝ)
+ ("f" ?ܒ)
+ ("g" ?ܠ)
+ ("h" ?ܐ)
+ ("j" ?ܬ)
+ ("k" ?ܢ)
+ ("l" ?ܡ)
+ (";" ?ܟ)
+ ("'" ?ܛ)
+ ("\\" ?܆)
+
+ ("z" ?\])
+ ("x" ?\[)
+ ("c" ?ܤ)
+ ("v" ?ܪ)
+ ("b" ?ܧ)
+ ("n" ?܀)
+ ("m" ?.)
+ ("," ?ܘ)
+ ("." ?ܙ)
+ ("/" ?܇))
+
+(quail-define-package
+ "syriac-phonetic" "Syriac" "ܦ" nil "Phonetic input method for Syriac.
+
+Based on Syriac (phonetic) table in X Keyboard Configuration DB
+" nil t t t t nil nil nil nil nil t)
+
+;;  ܏̮ 1! 2̊ 3̥ 4݉ 5♰ 6♱ 7܊ 8» 9) 0( -« =+
+;;     ܩܰ ܘܳ ܖܶ ܪܺ ܬܽ ܝ݀ ܜ݁ ܥ̈ ܧ̄ ܦ̇ ]̃ [݊
+;;      ܐܱ ܣܴ ܕܷ ܔܻ ܓܾ ܗܑ ܛـ ܟ̤ ܠ̱ ܚ̣ ܞ̰ ܆:
+;;       ܙܲ ܨܵ ܤܸ ܫܼ ܒܿ ܢܹ ܡ݂ ܀، .؛ ܇؟
+
+(quail-define-rules
+ ("`" ?܏)
+ ("~" ?̮)
+
+ ("!" ?!)
+ ("@" ?̊)
+ ("#" ?̥)
+ ("$" ?݉)
+ ("%" ?♰)
+ ("^" ?♱)
+ ("&" ?܊)
+ ("*" ?»)
+ ("(" ?\))
+ (")" ?\()
+ ("_" ?«)
+ ("+" ?+)
+
+ ("Q" ?ܰ)
+ ("W" ?ܳ)
+ ("E" ?ܶ)
+ ("R" ?ܺ)
+ ("T" ?ܽ)
+ ("Y" ?݀)
+ ("U" ?݁)
+ ("I" ?̈)
+ ("O" ?̄)
+ ("P" ?̇)
+ ("{" ?̃)
+ ("}" ?݊)
+
+ ("A" ?ܱ)
+ ("S" ?ܴ)
+ ("D" ?ܷ)
+ ("F" ?ܻ)
+ ("G" ?ܾ)
+ ("H" ?ܑ)
+ ("J" ?ـ)
+ ("K" ?̤)
+ ("L" ?̱)
+ (":" ?̣)
+ ("\"" ?̰)
+ ("|" ?:)
+
+ ("Z" ?ܲ)
+ ("X" ?ܵ)
+ ("C" ?ܸ)
+ ("V" ?ܼ)
+ ("B" ?ܿ)
+ ("N" ?ܹ)
+ ("M" ?݂)
+ ("<" ?،)
+ (">" ?؛)
+ ("?" ?؟)
+
+ ("q" ?ܩ)
+ ("w" ?ܘ)
+ ("e" ?ܖ)
+ ("r" ?ܪ)
+ ("t" ?ܬ)
+ ("y" ?ܝ)
+ ("u" ?ܜ)
+ ("i" ?ܥ)
+ ("o" ?ܧ)
+ ("p" ?ܦ)
+ ("[" ?\])
+ ("]" ?\[)
+
+ ("a" ?ܐ)
+ ("s" ?ܣ)
+ ("d" ?ܕ)
+ ("f" ?ܔ)
+ ("g" ?ܓ)
+ ("h" ?ܗ)
+ ("j" ?ܛ)
+ ("k" ?ܟ)
+ ("l" ?ܠ)
+ (";" ?ܚ)
+ ("\\" ?܆)
+ ("'" ?ܞ)
+
+ ("z" ?ܙ)
+ ("x" ?ܨ)
+ ("c" ?ܤ)
+ ("v" ?ܫ)
+ ("b" ?ܒ)
+ ("n" ?ܢ)
+ ("m" ?ܡ)
+ ("," ?܀)
+ ("." ?.)
+ ("/" ?܇)
+ )
+
+;;; syriac.el ends here

From 71749c47d9053a73b20015dbb53efac94cc7a815 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 23 Apr 2026 11:36:09 +0300
Subject: [PATCH 187/463] ; * etc/NEWS: Fix last added entry.  (Bug#80451)

---
 etc/NEWS | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index f3a5675284f..f1cae28d398 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -820,9 +820,10 @@ writing in the orthographies of the six languages simultaneously.
 These include: Burmese, Burmese (visual order), Shan, and Mon.
 
 ---
-*** New input methods for Syriac languages.
-Language environment and input methods are implemented now for languages
-using the Syriac script: Syriac and Syriac (phonetic)
+*** New language environment and input methods for Syriac languages.
+A new language environment for languages that use the Syriac script:
+Classical Syriac, Aramaic, and others.  Two new input methods for these
+languages: Syriac and Syriac (phonetic).
 
 ---
 ** 'visual-wrap-prefix-mode' now supports variable-pitch fonts.

From 5913101e402a9b9475ac82402664cf71c9c6c910 Mon Sep 17 00:00:00 2001
From: Peter Oliver <git@mavit.org.uk>
Date: Thu, 23 Apr 2026 12:30:01 +0100
Subject: [PATCH 188/463] ; * etc/NEWS: Announce "setrgbf" and "setrgbb"
 terminfo capabilities

---
 etc/NEWS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/etc/NEWS b/etc/NEWS
index f1cae28d398..c8006cdd40e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -756,6 +756,12 @@ Emacs previously discarded arguments to emacsclient of zero length, such
 as in 'emacsclient --eval "(length (pop server-eval-args-left))" ""'.
 These are no longer discarded.
 
++++
+** Emacs will now use 24-bit colors on terminals that support the "setrgbf" and "setrgbb" user-defined terminfo capabilities.
+These have broader support in the wider terminal and application
+ecosystem than the old capabilities, "setf24" and "setb24", which are
+now obsolete.
+
 +++
 ** New user option 'xterm-update-cursor' to update cursor display on TTYs.
 When enabled, Emacs sends Xterm escape sequences on Xterm-compatible

From baa52744457222ebe621b11eb997a5fc4bd67293 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 23 Apr 2026 14:57:51 +0300
Subject: [PATCH 189/463] ; * etc/NEWS: Fix last change (bug#70941).

---
 etc/NEWS | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index c8006cdd40e..40151ef4425 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -757,10 +757,11 @@ as in 'emacsclient --eval "(length (pop server-eval-args-left))" ""'.
 These are no longer discarded.
 
 +++
-** Emacs will now use 24-bit colors on terminals that support the "setrgbf" and "setrgbb" user-defined terminfo capabilities.
-These have broader support in the wider terminal and application
-ecosystem than the old capabilities, "setf24" and "setb24", which are
-now obsolete.
+** Emacs now uses the 'setrgbf' and 'setrgbb' terminfo capabilities.
+Emacs now uses 24-bit colors on terminals that support the 'setrgbf' and
+'setrgbb' user-defined terminfo capabilities.  These are supported by
+more terminals and applications than the old capabilities, 'setf24' and
+'setb24', which are now obsolete.
 
 +++
 ** New user option 'xterm-update-cursor' to update cursor display on TTYs.

From 0a04a4bc7a852d12ecaa2edaeafa5221588d120a Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 23 Apr 2026 15:27:20 +0100
Subject: [PATCH 190/463] vc-hg-after-dir-status: Rewrite to handle current 'hg
 status' output

* lisp/vc/vc-hg.el (vc-hg-after-dir-status): Rewrite to handle
renames where the "R" line comes arbitrarily later in the
output.
* test/lisp/vc/vc-hg-tests.el
(vc-hg-test--after-dir-status-expect): New function.
(vc-hg-after-dir-status): New test.
---
 lisp/vc/vc-hg.el            | 75 +++++++++++++++++--------------------
 test/lisp/vc/vc-hg-tests.el | 31 +++++++++++++++
 2 files changed, 65 insertions(+), 41 deletions(-)

diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 1c12271e0cb..d65252bbbd2 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -1469,8 +1469,7 @@ REV is the revision to check out into WORKFILE."
                'face 'font-lock-comment-face)))))
 
 (defun vc-hg-after-dir-status (update-function)
-  (let ((file nil)
-        (translation '((?= . up-to-date)
+  (let ((translation '((?= . up-to-date)
                        (?C . up-to-date)
                        (?A . added)
                        (?R . removed)
@@ -1479,45 +1478,39 @@ REV is the revision to check out into WORKFILE."
                        (?! . missing)
                        (?  . copy-rename-line)
                        (?? . unregistered)))
-        (translated nil)
-        (result nil)
-        (last-added nil)
-        (last-line-copy nil))
-      (goto-char (point-min))
-      (while (not (eobp))
-        (setq translated (cdr (assoc (char-after) translation)))
-        (setq file
-              (buffer-substring-no-properties (+ (point) 2)
-                                              (line-end-position)))
-        (cond ((not translated)
-               (setq last-line-copy nil))
-              ((eq translated 'up-to-date)
-               (setq last-line-copy nil))
-              ((eq translated 'copy-rename-line)
-               ;; For copied files the output looks like this:
-               ;; A COPIED_FILE_NAME
-               ;;   ORIGINAL_FILE_NAME
-               (setf (nth 2 last-added)
-                     (vc-hg-create-extra-fileinfo 'copied file))
-               (setq last-line-copy t))
-              ((and last-line-copy (eq translated 'removed))
-               ;; For renamed files the output looks like this:
-               ;; A NEW_FILE_NAME
-               ;;   ORIGINAL_FILE_NAME
-               ;; R ORIGINAL_FILE_NAME
-               ;; We need to adjust the previous entry to not think it is a copy.
-               (setf (vc-hg-extra-fileinfo->rename-state (nth 2 last-added))
-                     'renamed-from)
-               (push (list file translated
-                           (vc-hg-create-extra-fileinfo
-                            'renamed-to (nth 0 last-added))) result)
-               (setq last-line-copy nil))
-              (t
-               (setq last-added (list file translated nil))
-               (push last-added result)
-               (setq last-line-copy nil)))
-        (forward-line))
-      (funcall update-function result)))
+        (copies (make-hash-table :test #'equal))
+        result)
+    (goto-char (point-min))
+    (while (not (eobp))
+      (let ((translated (cdr (assq (char-after) translation)))
+            (file (buffer-substring-no-properties (+ (point) 2)
+                                                  (line-end-position))))
+        (pcase translated
+          ;; For copied files the output looks like this:
+          ;;     A COPIED_FILE_NAME
+          ;;       ORIGINAL_FILE_NAME
+          ;; For renamed files the output looks like this:
+          ;;     A NEW_FILE_NAME
+          ;;       ORIGINAL_FILE_NAME
+          ;;     R ORIGINAL_FILE_NAME
+          ;; but the last line can come arbitrarily later in the output.
+          ;; So we have to remember the entry for the copy in RESULT to
+          ;; potentially modify later.
+          ('copy-rename-line
+           (let ((last (car result)))
+             (setf (caddr last)
+                   (vc-hg-create-extra-fileinfo 'copied file))
+             (puthash file last copies)))
+          ((and 'removed
+                (let (and last (guard last)) (gethash file copies)))
+           (setf (vc-hg-extra-fileinfo->rename-state (caddr last))
+                 'renamed-from)
+           (push (list file translated
+                       (vc-hg-create-extra-fileinfo 'renamed-to (car last)))
+                 result))
+          (_ (push (list file translated nil) result))))
+      (forward-line))
+    (funcall update-function result)))
 
 ;; Follows vc-hg-command (or vc-do-async-command), which uses vc-do-command
 ;; from vc-dispatcher.
diff --git a/test/lisp/vc/vc-hg-tests.el b/test/lisp/vc/vc-hg-tests.el
index 76df75cb8d1..0216c23eebe 100644
--- a/test/lisp/vc/vc-hg-tests.el
+++ b/test/lisp/vc/vc-hg-tests.el
@@ -57,4 +57,35 @@
                    (vc-annotate-convert-time
                     (encode-time 0 0 0 28 11 2014))))))
 
+(defun vc-hg-test--after-dir-status-expect (in out)
+  "Call `vc-hg-after-dir-status' on IN and assert that it returns OUT."
+  (with-temp-buffer
+    (insert in)
+    (vc-hg-after-dir-status (lambda (res) (should (equal res out))))))
+
+(ert-deftest vc-hg-after-dir-status ()
+  "Test `vc-hg-after-dir-status'."
+  (vc-hg-test--after-dir-status-expect
+   "\
+A bar2
+  bar
+A foo2
+  foo
+R bar"
+   '(("bar" removed #s(vc-hg-extra-fileinfo renamed-to "bar2"))
+     ("foo2" added #s(vc-hg-extra-fileinfo copied "foo"))
+     ("bar2" added #s(vc-hg-extra-fileinfo renamed-from "bar"))))
+  (vc-hg-test--after-dir-status-expect
+   "\
+A bar2
+  bar
+A foo2
+  foo
+R bar
+R foo"
+   '(("foo" removed #s(vc-hg-extra-fileinfo renamed-to "foo2"))
+     ("bar" removed #s(vc-hg-extra-fileinfo renamed-to "bar2"))
+     ("foo2" added #s(vc-hg-extra-fileinfo renamed-from "foo"))
+     ("bar2" added #s(vc-hg-extra-fileinfo renamed-from "bar")))))
+
 ;;; vc-hg-tests.el ends here

From 65bd3fe0473d8cd57fd7aab3790b41cd0dee84ba Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Thu, 23 Apr 2026 16:31:25 +0200
Subject: [PATCH 191/463] ; * lisp/transient.el: Fix compiler warning.

`overriding-text-conversion-style' isn't defined on all platforms, in
which case this is a no-op; there's nothing that has to be suspended.

Re <id:86zf2uc2ve.fsf@gnu.org>.
---
 lisp/transient.el | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lisp/transient.el b/lisp/transient.el
index 202cd10a552..f0c17fdfc2c 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -5524,13 +5524,15 @@ search instead."
             lisp-imenu-generic-expression :test #'equal)
 
 (defun transient--suspend-text-conversion-style ()
-  (when text-conversion-style
-    (letrec ((suspended overriding-text-conversion-style)
-             (fn (lambda ()
-                   (setq overriding-text-conversion-style nil)
-                   (remove-hook 'transient-exit-hook fn))))
-      (setq overriding-text-conversion-style suspended)
-      (add-hook 'transient-exit-hook fn))))
+  ;; Added in Emacs 30.1, but not defined on all platforms.
+  (static-when (boundp 'overriding-text-conversion-style)
+    (when text-conversion-style
+      (letrec ((suspended overriding-text-conversion-style)
+               (fn (lambda ()
+                     (setq overriding-text-conversion-style nil)
+                     (remove-hook 'transient-exit-hook fn))))
+        (setq overriding-text-conversion-style suspended)
+        (add-hook 'transient-exit-hook fn)))))
 
 (declare-function which-key-mode "ext:which-key" (&optional arg))
 

From e8535ba110251ce61489acb4e6ec555fe76c6176 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 23 Apr 2026 11:16:05 -0400
Subject: [PATCH 192/463] (comint--fontify-input-fontify-region): Silence
 messages (bug#80870)

`syntax-propertize` currently doesn't support propertizing only
parts of a buffer.  Maybe we should improve it, maybe via
something like `font-lock-dont-widen` or the `syntax-ppss` support for
narrowing, but in the mean time, teach comint to avoid holes in
the propertization.

* lisp/comint.el (comint--dummy-fontify-syntax): New function.
(comint--fontify-input-fontify-region): Use it to silence the
new "Cannot syntax-propertize" message in `syntax.el`.
Also, refine args to reflect the fact that it's an advice.
---
 lisp/comint.el | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/lisp/comint.el b/lisp/comint.el
index 8d2692e50e6..95e117d999a 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -4157,14 +4157,21 @@ setting."
       (when (memq #'syntax-ppss-flush-cache before-change-functions)
         (apply #'syntax-ppss-flush-cache beg rest)))))
 
-(defun comint--fontify-input-fontify-region (fun beg end verbose)
-  "Fontify process output and user input in the current comint buffer.
-First, fontify the region between BEG and END using FUN.  Then
-fontify only the input text in the region with the help of an
-indirect buffer.  VERBOSE is passed to the fontify-region
-functions.  Skip fontification of input regions with non-nil
-`comint--fontify-input-inhibit-fontification' text property."
-  (pcase (funcall fun beg end verbose)
+(defun comint--dummy-fontify-syntax (end)
+  ;; Tell `syntax-propertize' that there's nothing
+  ;; to propertize here.
+  ;; BEWARE: don't use `ignore' because `syntax-propertize'
+  ;; treats it specially.
+  (let ((syntax-propertize-function (lambda (&rest _) nil)))
+    (syntax-propertize end)))
+
+(defun comint--fontify-input-fontify-region (orig-fun beg end &rest args)
+  "Fontify user input in the current comint buffer.
+Fontify the input text in the region with the help of an indirect buffer.
+Skip fontification of input regions with non-nil
+`comint--fontify-input-inhibit-fontification' text property.
+Designed as an advice for use in `font-lock-fontify-region-function'."
+  (pcase (apply orig-fun beg end args)
     (`(jit-lock-bounds ,beg1 . ,end1)
      (setq beg beg1 end end1)))
   (pcase
@@ -4173,10 +4180,12 @@ functions.  Skip fontification of input regions with non-nil
         (with-current-buffer (comint-indirect-buffer)
           (narrow-to-region min max)
           (comint--intersect-regions
-           nil (lambda (beg end)
-                 (unless (get-text-property
-                          beg 'comint--fontify-input-inhibit-fontification)
-                   (font-lock-fontify-region beg end verbose)))
+           (lambda (_beg end) (comint--dummy-fontify-syntax end))
+           (lambda (beg end)
+             (if (get-text-property
+                  beg 'comint--fontify-input-inhibit-fontification)
+                 (comint--dummy-fontify-syntax end)
+               (apply #'font-lock-fontify-region beg end args)))
            beg end)))
     (`((jit-lock-bounds ,beg1 . ,_) . (jit-lock-bounds ,_ . ,end1))
      (setq beg (min beg beg1))

From 7ac1d0742e36f8aa0f3c4bbea6c7a49897c620bb Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 23 Apr 2026 15:58:40 -0400
Subject: [PATCH 193/463] (work-buffer--release): Fix bug#80813

* lisp/emacs-lisp/subr-x.el (work-buffer--release): Make sure the
buffer is not left read-only.  Clarify potential limitations to
the cleanup performed, especially w.r.t indirect buffers.
Don't bother binding `deactivate-mark` since that variable is buffer-local
nowadays anyway.
---
 lisp/emacs-lisp/subr-x.el | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index b36b14b9b50..be86051ff2f 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -329,12 +329,13 @@ automatically killed, which means that in a such case
         ;; Flush BUFFER before making it available again, i.e. clear
         ;; its contents, remove all overlays and buffer-local
         ;; variables.  Is it enough to safely reuse the buffer?
-        (let ((inhibit-read-only t)
-              ;; Avoid deactivating the region as side effect.
-              deactivate-mark)
-          (erase-buffer))
-        (delete-all-overlays)
+        (let ((inhibit-read-only t))
+          (erase-buffer)
+          (delete-all-overlays))
         (let (change-major-mode-hook)
+          ;; `kill-all-local-variables' does not kill permanent locals
+          ;; like `buffer-read-only'.
+          (setq buffer-read-only nil)
           (kill-all-local-variables t))
         ;; Make the buffer available again.
         (push buffer work-buffer--list)))
@@ -349,7 +350,9 @@ automatically killed, which means that in a such case
 (defmacro with-work-buffer (&rest body)
   "Create a work buffer, and evaluate BODY there like `progn'.
 Like `with-temp-buffer', but reuse an already created temporary
-buffer when possible, instead of creating a new one on each call."
+buffer when possible, instead of creating a new one on each call.
+Avoid retaining state referring to a work buffer, and kill
+any indirect buffers you create that use a work buffer as a base."
   (declare (indent 0) (debug t))
   (let ((work-buffer (make-symbol "work-buffer")))
     `(let ((,work-buffer (work-buffer--get)))

From f9f6f1210c90e39b719c7e371d883a61c1c4286e Mon Sep 17 00:00:00 2001
From: Martin Rudalics <rudalics@gmx.at>
Date: Fri, 24 Apr 2026 09:42:58 +0200
Subject: [PATCH 194/463] ;; Clarify doc on 'dedicated' 'display-buffer' action
 alist entry

* doc/lispref/windows.texi (Buffer Display Action Alists):
Clarify that only new windows can be marked as dedicated via the
action alist entry.
---
 doc/lispref/windows.texi | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index b7fabca89a9..fbd578b08f0 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -3892,12 +3892,16 @@ specified right below this list.
 
 @vindex dedicated@r{, a buffer display action alist entry}
 @item dedicated
-If non-@code{nil}, such an entry tells @code{display-buffer} to mark
-any window it creates as dedicated to its buffer (@pxref{Dedicated
+If non-@code{nil}, such an entry tells @code{display-buffer} to mark any
+window it creates as dedicated to its buffer (@pxref{Dedicated
 Windows}).  It does that by calling @code{set-window-dedicated-p} with
 the chosen window as first argument and the entry's value as second.
 Side windows are by default dedicated with the value @code{side}
-(@pxref{Side Window Options and Functions}).
+(@pxref{Side Window Options and Functions}).  Windows that are reused
+are not marked as dedicated regardless of whether they already showed
+the buffer before or not.  If a window dedicated to its buffer gets
+reused for showing the same buffer again, its dedicated flag is left
+alone.
 
 @vindex preserve-size@r{, a buffer display action alist entry}
 @item preserve-size

From 44a6a8b75448e4a6c943a4c163cf60a507f442d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20Bela=C3=AFche?= <vincentb1@users.sourceforge.net>
Date: Fri, 24 Apr 2026 12:39:49 +0200
Subject: [PATCH 195/463] ; doc/translations/fr/misc/ses-fr.texi: Typo.

---
 doc/translations/fr/misc/ses-fr.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/translations/fr/misc/ses-fr.texi b/doc/translations/fr/misc/ses-fr.texi
index 3740c1f508b..c05d9c5a109 100644
--- a/doc/translations/fr/misc/ses-fr.texi
+++ b/doc/translations/fr/misc/ses-fr.texi
@@ -335,7 +335,7 @@ Mettre en vedette toutes les cellules (@code{mark-whole-buffer}).
 @node Formulas
 @section Formules de cellule
 @cindex formules
-@cindex formules, saisire
+@cindex formules, saisir
 @cindex valeurs
 @cindex valeurs de cellule
 @cindex éditer des cellules

From 19d1834ce08e7576e616b973c11f77ac892da9ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20Bela=C3=AFche?= <vincentb1@users.sourceforge.net>
Date: Fri, 24 Apr 2026 12:59:29 +0200
Subject: [PATCH 196/463] ; doc/translations/fr/misc/ses-fr.texi: Typo.

---
 doc/translations/fr/misc/ses-fr.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/translations/fr/misc/ses-fr.texi b/doc/translations/fr/misc/ses-fr.texi
index c05d9c5a109..ead9ed33609 100644
--- a/doc/translations/fr/misc/ses-fr.texi
+++ b/doc/translations/fr/misc/ses-fr.texi
@@ -340,7 +340,7 @@ Mettre en vedette toutes les cellules (@code{mark-whole-buffer}).
 @cindex valeurs de cellule
 @cindex éditer des cellules
 @findex ses-read-cell
-@findex ses-read-symbole
+@findex ses-read-symbol
 @findex ses-edit-cell
 @findex ses-recalculate-cell
 @findex ses-recalculate-all

From 6a19ab9cceea774b0dc74eab8932167307d1e925 Mon Sep 17 00:00:00 2001
From: Pip Cet <pipcet@protonmail.com>
Date: Tue, 21 Apr 2026 13:08:36 +0000
Subject: [PATCH 197/463] Don't modify kbd_fetch_ptr in
 x_delete_selection_requests (bug#80863)

This code may be called from within the loop in process_special_events
which assumed kbd_fetch_ptr remains unchanged.  This caused a buffer
underflow which resulted in the entire kbd buffer being replayed.

* src/xterm.c (x_delete_selection_requests): Simply clear deleted
events rather than rotating the kbd buffer.
---
 src/xterm.c | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index b02380a7171..4de0b24081f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -31784,7 +31784,6 @@ static void
 x_delete_selection_requests (struct x_display_info *dpyinfo)
 {
   union buffered_input_event *event;
-  int moved_events;
 
   for (event = kbd_fetch_ptr; event != kbd_store_ptr;
        event = X_NEXT_KBD_EVENT (event))
@@ -31795,25 +31794,8 @@ x_delete_selection_requests (struct x_display_info *dpyinfo)
 	  if (SELECTION_EVENT_DPYINFO (&event->sie) != dpyinfo)
 	    continue;
 
-	  /* Remove the event from the fifo buffer before processing;
-	     otherwise swallow_events called recursively could see it
-	     and process it again.  To do this, we move the events
-	     between kbd_fetch_ptr and EVENT one slot to the right,
-	     cyclically.  */
-
-	  if (event < kbd_fetch_ptr)
-	    {
-	      memmove (kbd_buffer + 1, kbd_buffer,
-		       (event - kbd_buffer) * sizeof *kbd_buffer);
-	      kbd_buffer[0] = kbd_buffer[KBD_BUFFER_SIZE - 1];
-	      moved_events = kbd_buffer + KBD_BUFFER_SIZE - 1 - kbd_fetch_ptr;
-	    }
-	  else
-	    moved_events = event - kbd_fetch_ptr;
-
-	  memmove (kbd_fetch_ptr + 1, kbd_fetch_ptr,
-		   moved_events * sizeof *kbd_fetch_ptr);
-	  kbd_fetch_ptr = X_NEXT_KBD_EVENT (kbd_fetch_ptr);
+	  EVENT_INIT (event->ie);
+	  event->ie.kind = NO_EVENT;
 
 	  /* `detect_input_pending' will then recompute whether or not
 	     pending input events exist.  */

From 52c4ef11099115952ca1f5f64d481673a3d5ae4c Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 25 Apr 2026 08:48:51 +0300
Subject: [PATCH 198/463] ; * src/process.c (Fprocess_attributes): Doc fix.

---
 src/process.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/process.c b/src/process.c
index d40500cc050..d46be48821f 100644
--- a/src/process.c
+++ b/src/process.c
@@ -8558,11 +8558,14 @@ integer or floating point values.
  majflt  -- number of major page faults (number)
  cminflt -- cumulative number of minor page faults (number)
  cmajflt -- cumulative number of major page faults (number)
- utime   -- user time used by the process, in `current-time' format
- stime   -- system time used by the process (current-time)
+ utime   -- total user time used by the process since its start,
+              in `current-time' format
+ stime   -- total system time used by the process since its start
+              (current-time)
  time    -- sum of utime and stime (current-time)
- cutime  -- user time used by the process and its children (current-time)
- cstime  -- system time used by the process and its children (current-time)
+ cutime  -- total user time used by the process and its children (current-time)
+ cstime  -- total system time used by the process and its children
+              (current-time)
  ctime   -- sum of cutime and cstime (current-time)
  pri     -- priority of the process (number)
  nice    -- nice value of the process (number)
@@ -8571,7 +8574,8 @@ integer or floating point values.
  vsize   -- virtual memory size of the process in KB's (number)
  rss     -- resident set size of the process in KB's (number)
  etime   -- elapsed time the process is running (current-time)
- pcpu    -- percents of CPU time used by the process (floating-point number)
+ pcpu    -- percents of total CPU time used by the process since its start
+              (floating-point number)
  pmem    -- percents of total physical memory used by process's resident set
               (floating-point number)
  args    -- command line which invoked the process (string).  */)

From e077bd21adb2d4828765b861e10bab81c61319da Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 25 Apr 2026 09:01:48 +0300
Subject: [PATCH 199/463] ; Improve documentation of Proced

* lisp/proced.el (proced-grammar-alist)
(proced-process-attributes, proced, proced-mode)
(proced-format-alist, proced-format): Doc fixes.
---
 lisp/proced.el | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lisp/proced.el b/lisp/proced.el
index ebdf61e683c..34566b942b9 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -176,7 +176,8 @@ Each element has the form
 
   (KEY NAME FORMAT JUSTIFY PREDICATE REVERSE SORT-SCHEME REFINER).
 
-Symbol KEY is the car of a process attribute.
+Symbol KEY is the symbol of a process attribute, see `process-attributes'
+and `proced-process-attributes'.
 
 String NAME appears in the header line.
 
@@ -279,7 +280,7 @@ The car of each element is a symbol, the name of the format.
 The cdr is a list of attribute keys appearing in `proced-grammar-alist'.
 An element of this list may also be a list of attribute keys that specifies
 alternatives.  If the first attribute is absent for a process, use the second
-one, etc."
+one, etc.  See `process-attributes' for the meaning of each attribute."
   :type '(alist :key-type (symbol :tag "Format Name")
                 :value-type (repeat :tag "Keys"
                                     (choice (symbol :tag "")
@@ -289,7 +290,8 @@ one, etc."
 (defcustom proced-format 'short
   "Current format of Proced listing.
 It can be the car of an element of `proced-format-alist'.
-It can also be a list of keys appearing in `proced-grammar-alist'."
+It can also be a list of keys appearing in `proced-grammar-alist'.
+See `process-attributes' for the meaning of each attribute key."
   :type '(choice (symbol :tag "Format Name")
                  (repeat :tag "Keys" (symbol :tag "")))
   :local t)
@@ -863,7 +865,8 @@ The variable `proced-filter' specifies which system processes are
 displayed.
 
 The variable `proced-format' specifies which attributes are
-displayed for each process.
+displayed for each process.  See `process-attributes' for the
+meaning of each displayed attribute.
 
 Type \\[proced-filter-interactive] and \\[proced-format-interactive] to \
 change the values of `proced-filter' and
@@ -912,7 +915,7 @@ normal hook `proced-post-display-hook'.
 
 ;;;###autoload
 (defun proced (&optional arg)
-  "Generate a listing of UNIX system processes.
+  "Generate a listing of system processes and their attributes.
 \\<proced-mode-map>
 If invoked with optional non-negative ARG, do not select the
 window displaying the process information.
@@ -1898,6 +1901,9 @@ With prefix REVERT non-nil revert listing."
 (defun proced-process-attributes (&optional pid-list)
   "Return alist of attributes for each system process.
 This alist can be customized via `proced-custom-attributes'.
+The function filters the list of attributes returned
+by `process-attributes' by passing each attribute to the
+functions in `proced-custom-attributes'.
 Optional arg PID-LIST is a list of PIDs of system process that are analyzed.
 If no attributes are known for a process (possibly because it already died)
 the process is ignored."

From 6425df6a802e3f6c7b1baf32da9af2c9ef79bea2 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 25 Apr 2026 10:04:47 +0300
Subject: [PATCH 200/463] ; * doc/lispref/text.texi (Undo): Advice about
 restoring point.

---
 doc/lispref/text.texi | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index b89f34f33cb..c3436570498 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1383,7 +1383,11 @@ Here are the kinds of elements an undo list can have:
 This kind of element records a previous value of point; undoing this
 element moves point to @var{position}.  Ordinary cursor motion does not
 make any sort of undo record, but deletion operations use these entries
-to record where point was before the command.
+to record where point was before the command if re-inserting the deleted
+text by undoing the deletion will not already place point at the right
+position.  Lisp programs that need to ensure correct restoration of
+point by undoing a command can explicitly push @code{(point)} to
+@code{buffer-undo-list} to record the position to restore.
 
 @item (@var{beg} . @var{end})
 This kind of element indicates how to delete text that was inserted.

From faa7fa050164d7060c1fbcee03d1b02f8cba5e77 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 25 Apr 2026 10:36:29 +0300
Subject: [PATCH 201/463] ; * lisp/simple.el (Info-documentlanguage): Add a
 local safe variable.

---
 lisp/simple.el | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lisp/simple.el b/lisp/simple.el
index 441f7ff3440..2b2380165f6 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -11700,6 +11700,14 @@ seconds."
           (setq undo-auto-current-boundary-timer
                 (run-at-time 5 nil #'undo-auto--boundary-timer)))))))
 
+
+(defvar-local Info-documentlanguage nil
+  "Document language as set by the Texinfo source.
+Currently, this is not used.")
+;; This is to avoid annoying prompts when visiting Info files as normal
+;; files.  Texinfo 7.3 puts this variable into Info files it produces.
+(put 'Info-documentlanguage 'safe-local-variable 'symbolp)
+
 (provide 'simple)
 
 ;;; simple.el ends here

From aa067441d65686e52c89733c65229e37fd609a9a Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 25 Apr 2026 10:01:37 +0200
Subject: [PATCH 202/463] Some minor Tramp fixes

* doc/misc/tramp.texi (Customizing Methods): Add comment.

* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
Comment out setting `command-line-max-length', it doesn't work reliably.

* test/lisp/net/tramp-tests.el (tramp-test03-file-error)
(tramp-test26-file-name-completion-boundaries): Adapt tests.
---
 doc/misc/tramp.texi          |  6 ++++++
 lisp/net/tramp-sh.el         | 22 ++++++++++++----------
 test/lisp/net/tramp-tests.el |  4 +++-
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 3aaa2e84982..8428109fde7 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2042,6 +2042,12 @@ Access of a hadoop/hdfs file system.  A file is accessed via
 the user that you want to use, and @samp{node} is the name of the
 hadoop server.
 
+@c @cindex method @option{rpc}
+@c @cindex @option{rpc} method
+@c @item tramp-rpc
+@c This is a @value{tramp} backend of its own.  It uses a remote server
+@c process to serve the requests, which gains better performance.
+
 @cindex method @option{vagrant}
 @cindex @option{vagrant} method
 @item vagrant-tramp
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 079f82f556a..8cade9ce095 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4688,20 +4688,22 @@ process to set up.  VEC specifies the connection."
 	(tramp-send-command
 	 vec (format "unset %s" (string-join unset " ")) t)))
 
+    ;; FIXME: This doesn't work with `tramp-test42-utf8' and "/ssh::tmp".
     ;; Set connection-local variable `command-line-max-length'.
     ;; `command-line-max-length' exists since Emacs 31.
     ;; `connection-local-profile-name-for-criteria' exists since Emacs 29.1.
     ;; We simulate it with `make-symbol'.
-    (when (boundp 'command-line-max-length)
-      (let* ((arg-max (tramp-get-remote-arg-max vec))
-	     (criteria (tramp-get-connection-local-criteria vec))
-	     (profile (if (fboundp 'connection-local-profile-name-for-criteria)
-			  (connection-local-profile-name-for-criteria criteria)
-			(make-symbol "generated-profile-name"))))
-	(connection-local-set-profile-variables
-	 profile
-	 `((command-line-max-length . ,(if arg-max (floor arg-max 4) 4094))))
-	(connection-local-set-profiles criteria profile)))))
+    ;; (when (boundp 'command-line-max-length)
+    ;;   (let* ((arg-max (tramp-get-remote-arg-max vec))
+    ;; 	     (criteria (tramp-get-connection-local-criteria vec))
+    ;; 	     (profile (if (fboundp 'connection-local-profile-name-for-criteria)
+    ;; 			  (connection-local-profile-name-for-criteria criteria)
+    ;; 			(make-symbol "generated-profile-name"))))
+    ;; 	(connection-local-set-profile-variables
+    ;; 	 profile
+    ;; 	 `((command-line-max-length . ,(if arg-max (floor arg-max 4) 4094))))
+    ;; 	(connection-local-set-profiles criteria profile)))))
+    ))
 
 ;; Old text from documentation of tramp-methods:
 ;; Using a uuencode/uudecode inline method is discouraged, please use one
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 25e7870b5ce..a19a17dcecf 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2287,6 +2287,8 @@ being the result.")
 
 (ert-deftest tramp-test03-file-error ()
   "Check that Tramp signals an error in case of connection problems."
+  (skip-unless (tramp-file-name-p tramp-test-vec))
+
   ;; Connect to a non-existing host.
   (let ((vec (copy-tramp-file-name tramp-test-vec))
 	;; Don't poison it.
@@ -5394,7 +5396,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
   ;; boundaries are always incorrect before that.
   (skip-unless (tramp--test-emacs31-p))
 
-  (let ((remote (file-remote-p ert-remote-temporary-file-directory)))
+  (when-let* ((remote (file-remote-p ert-remote-temporary-file-directory)))
     (dolist
 	(file `(,remote ,(concat remote "/~/")
 		,(concat remote "/usr//usr/") ,(concat remote remote "//usr/")))

From 700768cd1d192bbd5e1f7c21e977ffb1e9488445 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 25 Apr 2026 14:39:53 +0300
Subject: [PATCH 203/463] Fix line-truncation on horizontally-split TTY frames

* src/term.c (append_glyph, append_composite_glyph)
(append_glyphless_glyph): Account for the right-border glyph
when computing the end glyph of TEXT_AREA.  (Bug#80900)
---
 src/term.c | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/term.c b/src/term.c
index 131832d3ee1..354375085e2 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1548,7 +1548,15 @@ append_glyph (struct it *it)
   eassert (it->glyph_row);
   glyph = (it->glyph_row->glyphs[it->area]
 	   + it->glyph_row->used[it->area]);
-  end = it->glyph_row->glyphs[1 + it->area];
+  /* The last glyph of TEXT_AREA in all windows but the rightmost one is
+     the border glyph, except when the window has the right margin.  */
+  int reserve_last =
+    it->area == TEXT_AREA
+    /* Exclude mode/header/tab lines and menu/tool bars.  */
+    && !it->glyph_row->full_width_p
+    && !WINDOW_RIGHTMOST_P (it->w)
+    && WINDOW_RIGHT_MARGIN_WIDTH (it->w) == 0;
+  end = it->glyph_row->glyphs[1 + it->area] - reserve_last;
 
   /* If the glyph row is reversed, we need to prepend the glyph rather
      than append it.  */
@@ -1773,7 +1781,15 @@ append_composite_glyph (struct it *it)
 
   eassert (it->glyph_row);
   glyph = it->glyph_row->glyphs[it->area] + it->glyph_row->used[it->area];
-  if (glyph < it->glyph_row->glyphs[1 + it->area])
+  /* The last glyph of TEXT_AREA in all windows but the rightmost one is
+     the border glyph, except when the window has the right margin.  */
+  int reserve_last =
+    it->area == TEXT_AREA
+    /* Exclude mode/header/tab lines and menu/tool bars.  */
+    && !it->glyph_row->full_width_p
+    && !WINDOW_RIGHTMOST_P (it->w)
+    && WINDOW_RIGHT_MARGIN_WIDTH (it->w) == 0;
+  if (glyph < it->glyph_row->glyphs[1 + it->area] - reserve_last)
     {
       /* If the glyph row is reversed, we need to prepend the glyph
 	 rather than append it.  */
@@ -1868,7 +1884,15 @@ append_glyphless_glyph (struct it *it, int face_id, const char *str)
 
   eassert (it->glyph_row);
   glyph = it->glyph_row->glyphs[it->area] + it->glyph_row->used[it->area];
-  end = it->glyph_row->glyphs[1 + it->area];
+  /* The last glyph of TEXT_AREA in all windows but the rightmost one is
+     the border glyph, except when the window has the right margin.  */
+  int reserve_last =
+    it->area == TEXT_AREA
+    /* Exclude mode/header/tab lines and menu/tool bars.  */
+    && !it->glyph_row->full_width_p
+    && !WINDOW_RIGHTMOST_P (it->w)
+    && WINDOW_RIGHT_MARGIN_WIDTH (it->w) == 0;
+  end = it->glyph_row->glyphs[1 + it->area] - reserve_last;
 
   /* If the glyph row is reversed, we need to prepend the glyph rather
      than append it.  */

From 5a9cfbd7fd9f9df968201509fb432bd5369dd9b8 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 25 Apr 2026 09:56:25 -0400
Subject: [PATCH 204/463] (Info-documentlanguage): Keep Info-related code in
 `info.el`

* lisp/simple.el (Info-documentlanguage): Move from here...
* lisp/info.el (Info-documentlanguage): ...to here.
---
 lisp/info.el   | 8 ++++++++
 lisp/simple.el | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lisp/info.el b/lisp/info.el
index 320ac7de65c..960e0d51eb4 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -74,6 +74,14 @@ to the user."
 The Lisp code is executed when the node is selected.")
 (put 'Info-enable-active-nodes 'risky-local-variable t)
 
+(defvar-local Info-documentlanguage nil
+  "Document language as set by the Texinfo source.
+Currently, this is not used.")
+;; Autoload to avoid annoying prompts when visiting Info files as normal
+;; files.  Texinfo 7.3 puts this variable into Info files it produces.
+;;;###autoload
+(put 'Info-documentlanguage 'safe-local-variable #'symbolp)
+
 (defface info-node
   '((((class color) (background light)) :foreground "brown" :weight bold :slant italic)
     (((class color) (background dark)) :foreground "white" :weight bold :slant italic)
diff --git a/lisp/simple.el b/lisp/simple.el
index 2b2380165f6..441f7ff3440 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -11700,14 +11700,6 @@ seconds."
           (setq undo-auto-current-boundary-timer
                 (run-at-time 5 nil #'undo-auto--boundary-timer)))))))
 
-
-(defvar-local Info-documentlanguage nil
-  "Document language as set by the Texinfo source.
-Currently, this is not used.")
-;; This is to avoid annoying prompts when visiting Info files as normal
-;; files.  Texinfo 7.3 puts this variable into Info files it produces.
-(put 'Info-documentlanguage 'safe-local-variable 'symbolp)
-
 (provide 'simple)
 
 ;;; simple.el ends here

From 28f828e8a65d27d6d51e0ca778b0f3a201bc4fa7 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 25 Apr 2026 10:41:16 -0400
Subject: [PATCH 205/463] register.el: Allow jumping to kmacros again
 (bug#80894)

* lisp/register.el (register--get-method-type): Fix handling for
OClosure args.
* test/lisp/register-tests.el (register--jumpable-p): New test.
---
 lisp/register.el            | 24 +++++++++++++++++++++++-
 test/lisp/register-tests.el |  5 +++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/lisp/register.el b/lisp/register.el
index 51f6aa5bf4e..d1b5684ecb0 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -577,7 +577,21 @@ With a prefix argument, prompt for BUFFER as well."
   (set-register register (cons 'buffer buffer)))
 
 (defun register--get-method-type (val genfun &optional other-args-type)
-  (let* ((type (cl-type-of val))
+  ;; Try and return the specializer used in the most specific method
+  ;; applicable to argument VAL in generic function GENFUN.
+  ;; VAL is assumed to be the first argument and OTHER-ARGS-TYPE
+  ;; is a list of types for the other arguments.
+  ;; Go through all the types of VAL (from most specific to least specific)
+  ;; and return the first for which we can find a method with that
+  ;; type as specializer.
+  ;; FIXME: This is ad-hoc and does not handle all possible cases.
+  ;; We should instead do what `cl-generic' does during dispatch,
+  ;; i.e. get the set of generalizers used for the first arg of this generic
+  ;; function, use them to compute the TAGs corresponding to VAL (which
+  ;; we approximate here in TYPE) and then use those TAGs to compute the
+  ;; corresponding set of specializers (which we approximate here in TYPES),
+  ;; then look for the best matching method.
+  (let* ((type (or (oclosure-type val) (cl-type-of val)))
 	 (types (cl--class-allparents (cl--find-class type))))
     (while (and types (not (cl-find-method genfun nil
                                            (cons (car types) other-args-type))))
@@ -587,12 +601,20 @@ With a prefix argument, prompt for BUFFER as well."
 (defun register--jumpable-p (regval)
   "Return non-nil if `register-val-insert' is implemented for REGVAL."
   (pcase (register--get-method-type regval 'register-val-jump-to '(t))
+    ;; The only applicable method is one with the `t' specializer,
+    ;; i.e. the default method which signals an error.
     ('t nil)
+    ;; The best applicable method is that for `registerv' objects
+    ;; which works only if there's a function in `registerv-jump-func'.
     ('registerv (registerv-jump-func regval))
+    ;; The best applicable method is the one below for register values of
+    ;; type `cons' so return non-nil for those values supported by that method.
     ('cons
      (or (frame-configuration-p (car regval))
 	 (window-configuration-p (car regval))
 	 (memq (car regval) '(file buffer file-query))))
+    ;; There's another method that handles VAL.
+    ;; Presumably its presence implies that we can "jump" to that value.
     (type type)))
 
 (cl-defgeneric register-val-jump-to (_val _arg)
diff --git a/test/lisp/register-tests.el b/test/lisp/register-tests.el
index d97b4a0bee9..5b7fef6c9a6 100644
--- a/test/lisp/register-tests.el
+++ b/test/lisp/register-tests.el
@@ -39,5 +39,10 @@
                        (quit (car err)))))
       (should-not register-alist))))
 
+(ert-deftest register--jumpable-p ()
+  (should (register--jumpable-p (kmacro "test")))
+  (should (register--jumpable-p (make-marker)))
+  (should-not (register--jumpable-p "test")))
+
 (provide 'register-tests)
 ;;; register-tests.el ends here

From d3debef28dddee94673e091c95dbf6c0cecce312 Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Thu, 23 Apr 2026 01:13:05 -0700
Subject: [PATCH 206/463] Make :range-fn in treesit-range-rules actually work

* lisp/treesit.el (treesit--range-start):
(treesit--range-end):
(treesit--flatten-ranges): New helpers.
(treesit-query-range):
(treesit-query-range-by-language): Don't flatten the ranges
returned by each range-fn.
(treesit--update-ranges-non-local):
(treesit--update-ranges-local): Handle the case where the range
is a complicated ((START . END)...).
* test/src/treesit-tests.el (treesit-range-helper): New test.
---
 lisp/treesit.el           | 100 ++++++++++++++++++++++++++++++--------
 test/src/treesit-tests.el |  59 ++++++++++++++++++++++
 2 files changed, 139 insertions(+), 20 deletions(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index b4f148e8972..c6db9ede968 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -545,6 +545,44 @@ See `treesit-query-capture' for QUERY."
        (treesit-parser-root-node parser)
        query))))
 
+(defsubst treesit--range-start (range)
+  "Return the start of RANGE.
+RANGE can be either a simple range (START . END), or a list of ranges
+\((START . END)...).  If RANGE is empty, return nil."
+  (if (consp (car range))
+      (caar range)
+    (car range)))
+
+(defsubst treesit--range-end (range)
+  "Return the end of RANGE.
+RANGE can be either a simple range (START . END), or a list of ranges
+\((START . END)...).  If RANGE is empty, return nil."
+  (let ((last-link (last range)))
+    (if (consp (car last-link))
+        (cdr (car last-link))
+      (cdr last-link))))
+
+(defun treesit--flatten-ranges (ranges)
+  "Flatten RANGES to be a list of (START . END) in-place and return it.
+Each element in RANGES can be either (STRT . END) or ((START . END)...)."
+  (let (head prev elm)
+    (while (setq elm (car ranges))
+      (if (consp (car elm))
+          ;; ELM is ((START . END)...).
+          (progn
+            (if (null head)
+                (setq head elm)
+              (setcdr prev elm))
+            (setq prev (last elm)))
+        ;; ELM is (START . END).
+        (if (null head)
+            (setq head ranges)
+          (setcdr prev ranges))
+        (setq prev ranges))
+
+      (setq ranges (cdr ranges)))
+    head))
+
 (defun treesit-query-range (node query &optional beg end offset range-fn)
   "Query the current buffer and return ranges of captured nodes.
 
@@ -557,7 +595,12 @@ being returned.  Capture names generally don't matter, but names
 that starts with an underscore are ignored.
 
 RANGE-FN, if non-nil, is a function that takes a NODE and OFFSET, and
-returns the ranges to use for that NODE."
+returns the ranges to use for that NODE, it can return either a simple
+range (START . END) or a list ((START . END)...).
+
+Note that each range in the returned list can be either a simple (START
+. END), or a list itself ((START . END)...).  The latter case means the
+embedded parser should have ranges set to that."
   (let ((offset-left (or (car offset) 0))
         (offset-right (or (cdr offset) 0)))
     (cl-loop for capture
@@ -565,11 +608,11 @@ returns the ranges to use for that NODE."
              for name = (car capture)
              for node = (cdr capture)
              if (not (string-prefix-p "_" (symbol-name name)))
-             append
+             collect
              (if range-fn
                  (funcall range-fn node offset)
-               (list (cons (+ (treesit-node-start node) offset-left)
-                           (+ (treesit-node-end node) offset-right)))))))
+               (cons (+ (treesit-node-start node) offset-left)
+                     (+ (treesit-node-end node) offset-right))))))
 
 (defun treesit-query-range-by-language
     (node query language-fn &optional beg end offset range-fn)
@@ -584,9 +627,14 @@ symbols with LANGUAGE-FN.  LANGUAGE-FN can return nil, meaning no
 valid language is detected, in which case the range is skipped.
 
 RANGE-FN, if non-nil, is a function that takes a NODE and OFFSET, and
-returns the ranges to use for that NODE.
+returns the ranges to use for that NODE, it can return either a simple
+range (START . END) or a list ((START . END)...).
 
-BEG, END, OFFSET are the same as in `treesit-query-range'."
+BEG, END, OFFSET are the same as in `treesit-query-range'.
+
+Note that each range in the returned list can be either (START . END)
+or ((START . END)...).  The latter case means the embedded parser should
+have ranges set to that."
   (let ((offset-left (or (car offset) 0))
         (offset-right (or (cdr offset) 0))
         (ranges-by-language nil))
@@ -601,12 +649,11 @@ BEG, END, OFFSET are the same as in `treesit-query-range'."
                          (not (string-prefix-p "_" (symbol-name name))))
                 (push (if range-fn
                           (funcall range-fn node offset)
-                        (list (cons (+ (treesit-node-start node) offset-left)
-                                    (+ (treesit-node-end node) offset-right))))
+                        (cons (+ (treesit-node-start node) offset-left)
+                              (+ (treesit-node-end node) offset-right)))
                       (alist-get lang ranges-by-language))))))))
     (mapcar (lambda (entry)
-              (cons (car entry)
-                    (apply #'append (nreverse (cdr entry)))))
+              (cons (car entry) (nreverse (cdr entry))))
             ranges-by-language)))
 
 (defun treesit-query-valid-p (language query)
@@ -1053,27 +1100,32 @@ Return updated parsers as a list."
           ;; Lay an overlay over each range to mark the start & end of
           ;; it for other functions to access (e.g., outline wants to
           ;; know this).  Refer to (ref:local-parser-overlay) for more
-          ;; explanation of local parser overlays.
+          ;; explanation of local parser overlays.  Each RANGE can be
+          ;; either a simple (START . END) or a ((START . END)...).
           (dolist (range new-ranges)
-            (let ((has-existing-ov nil))
+            (let ((has-existing-ov nil)
+                  (r-start (treesit--range-start range))
+                  (r-end (treesit--range-end range)))
               (setq has-existing-ov
                     (catch 'done
-                      (dolist (ov (overlays-in (car range) (cdr range)))
+                      (dolist (ov (overlays-in r-start r-end))
                         (when (eq (overlay-get ov 'treesit-parser)
                                   embed-parser)
-                          (move-overlay ov (car range) (cdr range))
+                          (move-overlay ov r-start r-end)
                           (overlay-put ov 'treesit-parser-ov-timestamp
                                        modified-tick)
                           (throw 'done t)))))
               (unless has-existing-ov
-                (let ((ov (make-overlay (car range) (cdr range))))
+                (let ((ov (make-overlay r-start r-end)))
                   (overlay-put ov 'treesit-parser embed-parser)
                   (overlay-put ov 'treesit-parser-local-p nil)
                   (overlay-put ov 'treesit-host-parser host-parser)
                   (overlay-put ov 'treesit-parser-ov-timestamp
                                modified-tick)))))
           ;; Set ranges for the embed parser.
-          (let* ((old-ranges (treesit-parser-included-ranges
+          (let* ((new-ranges
+                  (treesit--flatten-ranges new-ranges))
+                 (old-ranges (treesit-parser-included-ranges
                               embed-parser))
                  (set-ranges (treesit--clip-ranges
                               (treesit--merge-ranges
@@ -1133,8 +1185,12 @@ Return the created local parsers as a list."
     (dolist (lang-and-range ranges-by-lang)
       (let ((embedded-lang (car lang-and-range))
             (ranges (cdr lang-and-range)))
-        (pcase-dolist (`(,beg . ,end) ranges)
-          (let ((existing-local-parser
+        ;; Each element of RANGES can be either (START . END) or ((START
+        ;; . END)...).
+        (dolist (range ranges)
+          (let ((beg (treesit--range-start range))
+                (end (treesit--range-end range))
+                (existing-local-parser
                  (catch 'done
                    (dolist (ov (overlays-in beg end) nil)
                      ;; Update range of local parser.
@@ -1148,7 +1204,9 @@ Return the created local parsers as a list."
                                   (eq parser-lang embedded-lang)
                                   (eq embed-level parser-level))
                          (treesit-parser-set-included-ranges
-                          embedded-parser `((,beg . ,end)))
+                          embedded-parser (if (consp (car range))
+                                              range
+                                            (list range)))
                          (move-overlay ov beg end)
                          (overlay-put ov 'treesit-parser-ov-timestamp
                                       modified-tick)
@@ -1168,7 +1226,9 @@ Return the created local parsers as a list."
                 (overlay-put ov 'treesit-parser-ov-timestamp
                              modified-tick)
                 (treesit-parser-set-included-ranges
-                 embedded-parser `((,beg . ,end)))
+                 embedded-parser (if (consp (car range))
+                                     range
+                                   (list range)))
                 (push embedded-parser touched-parsers)))))))
     touched-parsers))
 
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index af21ec6592a..572a8817e26 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -524,6 +524,65 @@ BODY is the test body."
 
 ;;; Query
 
+(ert-deftest treesit-range-helper ()
+  "Test range helpers."
+  ;; Simple.
+  (should (equal (treesit--range-start '(1 . 2)) 1))
+  (should (equal (treesit--range-end '(1 . 2)) 2))
+  ;; Empty.
+  (should (equal (treesit--range-start '()) nil))
+  (should (equal (treesit--range-end '()) nil))
+  ;; List.
+  (should (equal (treesit--range-start '((1 . 2) (3 . 4))) 1))
+  (should (equal (treesit--range-end '((1 . 2) (3 . 4))) 4))
+  ;; The complicated range is...
+  ;; ...in the middle.
+  (should (equal (treesit--flatten-ranges (list (cons 1 2)
+                                                (cons 3 4)
+                                                (list (cons 5 6)
+                                                      (cons 7 8))
+                                                (cons 9 10)))
+
+                 '((1 . 2) (3 . 4) (5 . 6) (7 . 8) (9 . 10))))
+  ;; ... the second.
+  (should (equal (treesit--flatten-ranges (list (cons 1 2)
+                                                (list (cons 5 6)
+                                                      (cons 7 8))
+                                                (cons 3 4)
+                                                (cons 9 10)))
+
+                 '((1 . 2) (5 . 6) (7 . 8) (3 . 4) (9 . 10))))
+  ;; ...last.
+  (should (equal (treesit--flatten-ranges (list (cons 1 2)
+                                                (cons 3 4)
+                                                (cons 9 10)
+                                                (list (cons 5 6)
+                                                      (cons 7 8))))
+                 '((1 . 2) (3 . 4) (9 . 10) (5 . 6) (7 . 8))))
+  ;; ...first.
+  (should (equal (treesit--flatten-ranges (list (list (cons 5 6)
+                                                      (cons 7 8))
+                                                (cons 1 2)
+                                                (cons 3 4)
+                                                (cons 9 10)))
+
+                 '((5 . 6) (7 . 8) (1 . 2) (3 . 4) (9 . 10))))
+  ;; ...doubled.
+  (should (equal (treesit--flatten-ranges (list (list (cons 5 6)
+                                                      (cons 7 8))
+                                                (list (cons 5 6)
+                                                      (cons 7 8))
+                                                (cons 1 2)
+                                                (cons 3 4)
+                                                (cons 9 10)))
+                 '((5 . 6) (7 . 8) (5 . 6) (7 . 8) (1 . 2) (3 . 4) (9 . 10))))
+  ;; ...has one element.
+  (should (equal (treesit--flatten-ranges (list (cons 1 2)
+                                                (cons 3 4)
+                                                (cons 9 10)
+                                                (list (cons 5 6))))
+                 '((1 . 2) (3 . 4) (9 . 10) (5 . 6)))))
+
 (defun treesit--ert-pred-last-sibling (node)
   (null (treesit-node-next-sibling node t)))
 

From ddbd311d37db64a1cf52d0cc3f00a461f170624b Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Thu, 23 Apr 2026 20:09:46 -0700
Subject: [PATCH 207/463] ; Move treesit-languages-require-line-column-tracking
 to treesit.c.

* lisp/treesit.el: Remove it.
* src/treesit.c (syms_of_treesit): Add it.
---
 lisp/treesit.el | 4 ----
 src/treesit.c   | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index c6db9ede968..737f5545a16 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1323,10 +1323,6 @@ omitted, default END to BEG."
 
 ;;; Language
 
-;; Defined in treesit.c.  This is just to add some default values.
-(defvar treesit-languages-require-line-column-tracking
-  '(haskell))
-
 ;; The entries are sorted by `sort-lines'.
 (defvar treesit-language-display-name-alist
   '(
diff --git a/src/treesit.c b/src/treesit.c
index 2c6ab6aaa2b..5315c348634 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -5289,6 +5289,8 @@ syms_of_treesit (void)
   DEFSYM (Qor, "or");
   DEFSYM (Qand, "and");
 
+  DEFSYM (Qhaskell, "haskell");
+
 #ifdef WINDOWSNT
   DEFSYM (Qtree_sitter, "tree-sitter");
 #endif
@@ -5410,7 +5412,7 @@ Most tree-sitter language grammars don't require line and column
 tracking to work, but some languages do.  When creating a parser, if the
 language is in this list, Emacs enables line-column tracking for the
 buffer.  */);
-  Vtreesit_languages_require_line_column_tracking = Qnil;
+  Vtreesit_languages_require_line_column_tracking = list1 (Qhaskell);
 
   DEFVAR_LISP ("treesit-major-mode-remap-alist",
 	       Vtreesit_major_mode_remap_alist,

From ba4561c79de72e5c754d020ca9ddd7e40f67d7dc Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Thu, 23 Apr 2026 20:58:02 +0200
Subject: [PATCH 208/463] Clarify how to customize
 'user-lisp-ignored-directories'

* lisp/startup.el (user-lisp-ignored-directories): Update docstring.

(Bug#80853)
---
 lisp/startup.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/startup.el b/lisp/startup.el
index decd25a6232..4f8c890f9ec 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1229,7 +1229,11 @@ Each entry of the list is a string that denotes the file name without a
 directory component.  If during recursion any single entry matches the
 file name of any directory, `prepare-user-lisp' will ignore the contents
 of the directory.  This option is most useful to exclude administrative
-directories that do not contain Lisp files."
+directories that do not contain Lisp files.
+
+Note that if `prepare-user-lisp' is called at startup, this variable
+must be set in your early-init file, see Info node `(emacs) User Lisp
+Directory' for details."
   :type '(choice (repeat (string :tag "Directory name")))
   :version "31.1")
 

From 4b0631716314200fde98d91b32e3be362284787b Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Thu, 23 Apr 2026 21:53:40 +0200
Subject: [PATCH 209/463] Adjust default value of
 'user-lisp-ignored-directories'

* lisp/startup.el (user-lisp-ignored-directories): Ignore all
directories that VC would also exclude.  (Bug#80853)
---
 lisp/startup.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/startup.el b/lisp/startup.el
index 4f8c890f9ec..e4c20d4b592 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1222,8 +1222,7 @@ customized setting into your `early-init-file'."
   :type 'directory
   :version "31.1")
 
-(defcustom user-lisp-ignored-directories
-  '(".git" ".hg" "RCS" "CVS" ".svn" "_svn" ".bzr")
+(defcustom user-lisp-ignored-directories vc-directory-exclusion-list
   "List of directory names for `prepare-user-lisp' to not descend into.
 Each entry of the list is a string that denotes the file name without a
 directory component.  If during recursion any single entry matches the
@@ -1234,6 +1233,7 @@ directories that do not contain Lisp files.
 Note that if `prepare-user-lisp' is called at startup, this variable
 must be set in your early-init file, see Info node `(emacs) User Lisp
 Directory' for details."
+  :initialize #'custom-initialize-delay
   :type '(choice (repeat (string :tag "Directory name")))
   :version "31.1")
 

From 4acb0f775df4eba21b4cfc379306980bf05afb80 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Fri, 24 Apr 2026 21:02:18 +0200
Subject: [PATCH 210/463] Restore previous 'package-get-descriptor' signature

* lisp/emacs-lisp/package.el (package-get-descriptor): Allow
SOURCES to not be specified for the sake of backwards
compatibility.
---
 lisp/emacs-lisp/package.el | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index cdbbda0ba03..f729a1fa174 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -4955,20 +4955,23 @@ DESC must be a `package-desc' object."
 
 ;;;; Introspection
 
-(defun package-get-descriptor (pkg sources &optional pred)
+(defun package-get-descriptor (pkg &optional sources pred)
   "Return a `package-desc' object for PKG, or nil if none can be found.
 If PKG is a `package-desc' object it will be returned directly.  If PKG
-is a symbol or string it designates a package name.  The argument
+is a symbol or string it designates a package name.  The optional argument
 SOURCES can be a list consisting of the symbols `installed', `builtin'
 or `archive', each when present indicating that the function should find
 a `package-desc' object for PKG in the list of installed packages,
 built-in packages or packages available in the archives respectively.
 If SOURCES is t, then the function will interpret this as a shorthand
 for a list consisting of the symbols mentioned in the order given above.
-Any other symbol will be converted to a singleton list.  The order is
-significant, in that the first hit will be returned.  If specified, PRED
-is a function that takes a single `package-desc' argument and prevents
-the object from being returned if the predicate returns nil."
+If omitted, the argument falls back to a list consisting of `installed'
+and `archive'.  Any other symbol will be converted to a singleton list.
+The order is significant, in that the first hit will be returned.  If
+specified, PRED is a function that takes a single `package-desc' argument
+and prevents the object from being returned if the predicate returns nil."
+  (unless sources
+    (setq sources '(installed archive)))
   (cond
    ((package-desc-p pkg)
     (and (or (not pred) (funcall pred pkg)) pkg))

From 931e04a34ba0c4878921416d2c327e2201beed19 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sat, 25 Apr 2026 12:23:06 +0200
Subject: [PATCH 211/463] Replace 'package--builtin-alist' function with
 constant

* lisp/emacs-lisp/package.el (package--builtin-alist):
(package--upgradeable-packages, package--mapc)
(package-get-descriptor):
* lisp/emacs-lisp/package.el (package--builtin-alist): Replace
function with constant, as the result of the function is always
the same within an Emacs session, since the set of built-in
packages don't change during execution.
(package--upgradeable-packages, package--mapc)
(package-get-descriptor): Use variable instead of function.
(package-menu--refresh, describe-package-1): Lookup desc in
alist instead of calling 'package--from-builtin'.

(Bug#80902)
---
 lisp/emacs-lisp/package.el | 42 ++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index f729a1fa174..be416e6be1a 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -468,11 +468,12 @@ BI-DESC should be a `package--bi-desc' object."
                        :summary (package--bi-desc-summary bi-desc)
                        :dir 'builtin))
 
-(defun package--builtin-alist ()
-  "Return a `package-alist'-like alist for all builtin packages."
+(defconst package--builtin-alist
   (cl-loop for bi-desc in package--builtins
-           unless (assq (car bi-desc) package-alist)
-           collect (list (car bi-desc) (package--from-builtin bi-desc))))
+           unless (eq (car bi-desc) 'emacs)
+           collect (list (car bi-desc) (package--from-builtin bi-desc)))
+  "Alist of built-in packages in the form of `package-alist'.
+The alist doesn't include the pseudo-package for Emacs.")
 
 (defun package-desc-suffix (pkg-desc)
   "Return file-name extension of package-desc object PKG-DESC.
@@ -2166,7 +2167,7 @@ NAME should be a symbol."
                   (package-desc-version (cadr elt))
                   (package-desc-version available)))
              (not (package-vc-p (cadr elt))))))
-    (nconc (and include-builtins (package--builtin-alist))
+    (nconc (and include-builtins package--builtin-alist)
            (package--alist)))))
 
 ;;;###autoload
@@ -2889,8 +2890,7 @@ Helper function for `describe-package'."
         (package--print-email-button author)))
     (let* ((all-pkgs (append (cdr (assq name package-alist))
                              (cdr (assq name package-archive-contents))
-                             (and-let* ((bi (assq name package--builtins)))
-                               (list (package--from-builtin bi)))))
+                             (cdr (assq name package--builtin-alist))))
            (other-pkgs (delete desc all-pkgs)))
       (when other-pkgs
         (package--print-help-section "Other versions"
@@ -3456,15 +3456,13 @@ KEYWORDS should be nil or a list of keywords."
               (push pkg info-list))))))
 
     ;; Built-in packages:
-    (dolist (elt package--builtins)
-      (let ((pkg  (package--from-builtin elt))
-            (name (car elt)))
-        (when (not (eq name 'emacs)) ; Hide the `emacs' package.
-          (when (and (package--has-keyword-p pkg keywords)
-                     (or package-list-unversioned
-                         (package--bi-desc-version (cdr elt)))
-                     (or (eq packages t) (memq name packages)))
-            (push pkg info-list)))))
+    (dolist (elt package--builtin-alist)
+      (let ((name (car elt)) (pkg (cadr elt)))
+        (when (and (package--has-keyword-p pkg keywords)
+                   (or package-list-unversioned
+                       (package-desc-version pkg))
+                   (or (eq packages t) (memq name packages)))
+          (push pkg info-list))))
 
     ;; Available and disabled packages:
     (unless (equal package--old-archive-priorities package-archive-priorities)
@@ -3499,18 +3497,14 @@ KEYWORDS should be nil or a list of keywords."
 (defun package--mapc (function &optional packages)
   "Call FUNCTION for all known PACKAGES.
 PACKAGES can be nil or t, which means to display all known
-packages, or a list of packages.
-
-Built-in packages are converted with `package--from-builtin'."
+packages, or a list of packages."
   (dolist (pkg (if (memq packages '(t nil))
                    (flatten-tree
-                    (list (mapcar #'cdr (package--builtin-alist))
+                    (list (mapcar #'cdr package--builtin-alist)
                           (mapcar #'cdr (package--archive-contents))
                           (mapcar #'cdr (package--alist))))
                  (mapcar #'package-get-descriptor packages)))
-    (unless (or (package-disabled-p (package-desc-name pkg)
-                                    (package-desc-version pkg))
-                (eq (package-desc-name pkg) 'emacs)) ;hide pseudo package
+    (unless (package-disabled-p (package-desc-name pkg) (package-desc-version pkg))
       (funcall function pkg))))
 
 (defun package--has-keyword-p (desc &optional keywords)
@@ -4983,7 +4977,7 @@ and prevents the object from being returned if the predicate returns nil."
                         (delete-dups (ensure-list sources))))
         (dolist (ent (pcase-exhaustive source
                        ('installed (package--alist))
-                       ('builtin (package--builtin-alist))
+                       ('builtin package--builtin-alist)
                        ('archive (package--archive-contents))))
           (when (eq (car ent) pkg)
             (dolist (desc (cdr ent))

From d378e4355f269961eae905e323830f5fabeafa75 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sat, 25 Apr 2026 12:25:06 +0200
Subject: [PATCH 212/463] Prevent force reloading of package archive contents

* lisp/emacs-lisp/package.el (package--compatible-packages):
Drop 'package-read-all-archive-contents' call, as
'package--build-compatibility-table' will load the archive
contents on demand via 'package--mapc' anyway.  (Bug#80902)
---
 lisp/emacs-lisp/package.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index be416e6be1a..fd623aa1533 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2054,7 +2054,6 @@ package archive."
 This excludes packages that are listed in the archives, but have
 incompatible dependencies (either too old or not available at all
 in any archive mentioned in `package-archives')."
-  (package-read-all-archive-contents)
   (package--build-compatibility-table)
   (cl-loop for (name . desc) in package-archive-contents
            unless (any #'package--incompatible-p desc)

From ca2c477d01a45032268f1af995230e1624bb556e Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sat, 25 Apr 2026 12:29:00 +0200
Subject: [PATCH 213/463] Improve 'package-get-descriptor' performance

* lisp/emacs-lisp/package.el (package-get-descriptor): Use
'assq' to look up element in package alists instead of iterative
over them manually.  This was initially not possible, since we
merged all alists into one, which would require using a consing
function like 'map-merge-with' to look up all package descriptor
objects we want to consider in a single 'assq' call.  As we
ended up not merging lists, we can assume that there are no
duplicate keys in the alists, making the efficient 'assq'
viable.
---
 lisp/emacs-lisp/package.el | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index fd623aa1533..6fb1e1562a0 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -4963,25 +4963,22 @@ and `archive'.  Any other symbol will be converted to a singleton list.
 The order is significant, in that the first hit will be returned.  If
 specified, PRED is a function that takes a single `package-desc' argument
 and prevents the object from being returned if the predicate returns nil."
-  (unless sources
-    (setq sources '(installed archive)))
   (cond
    ((package-desc-p pkg)
     (and (or (not pred) (funcall pred pkg)) pkg))
    ((or (and (stringp pkg) (setq pkg (intern pkg)))
         (symbolp pkg))
     (catch 'found
-      (dolist (source (if (eq sources t)
-                          '(installed builtin archive)
-                        (delete-dups (ensure-list sources))))
-        (dolist (ent (pcase-exhaustive source
-                       ('installed (package--alist))
-                       ('builtin package--builtin-alist)
-                       ('archive (package--archive-contents))))
-          (when (eq (car ent) pkg)
-            (dolist (desc (cdr ent))
-              (when (or (null pred) (funcall pred desc))
-                (throw 'found desc))))))))
+      (dolist (source (cond
+                       ((eq sources nil) '(installed archive))
+                       ((eq sources t) '(installed builtin archive))
+                       ((delete-dups (ensure-list sources)))))
+        (dolist (desc (alist-get pkg (pcase-exhaustive source
+                                       ('installed (package--alist))
+                                       ('builtin package--builtin-alist)
+                                       ('archive (package--archive-contents)))))
+          (when (or (null pred) (funcall pred desc))
+            (throw 'found desc))))))
    ((error "Failed to recognize package %S" pkg))))
 
 (provide 'package)

From ec70112ac5d759692cf4315b1ddc72203382fede Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sat, 25 Apr 2026 12:46:29 +0200
Subject: [PATCH 214/463] Use 'package-get-descriptor' in 'package--query-desc'

* lisp/emacs-lisp/package.el (package--query-desc): Replace
manual 'assoc' call.
---
 lisp/emacs-lisp/package.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 6fb1e1562a0..3b4e7c17489 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -4839,8 +4839,7 @@ form (PKG-NAME PKG-DESC).  If not specified, it will default to
 `package-alist'."
   (or (tabulated-list-get-id)
       (let ((alist (or alist (package--alist))))
-        (cadr (assoc (completing-read "Package: " alist nil t)
-                     alist #'string=)))))
+        (package-get-descriptor (completing-read "Package: " alist nil t)))))
 
 ;;;###autoload
 (defun package-browse-url (desc &optional secondary)

From f749b4b97869f9855fc0a998d5a6381a61f92d27 Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@gnu.org>
Date: Sun, 26 Apr 2026 10:07:37 +0200
Subject: [PATCH 215/463] ; * etc/tutorials/TUTORIAL.fr: fix missing word,
 rephrase paragraph
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reported-by: Sébastien Hinderer <sebastien.hinderer@ens-lyon.org>
---
 etc/tutorials/TUTORIAL.fr | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/tutorials/TUTORIAL.fr b/etc/tutorials/TUTORIAL.fr
index 1d94f3b9911..cec23a52001 100644
--- a/etc/tutorials/TUTORIAL.fr
+++ b/etc/tutorials/TUTORIAL.fr
@@ -868,7 +868,7 @@ désactive : on dit que la commande « fait basculer le mode ».
    Vous devez mettre des espaces entre eux car le mode Auto Fill ne
    coupe les lignes que sur les espaces.
 
-La marge est habituellement fixée à 70 caractères, mais pouvez
+La marge est habituellement fixée à 70 caractères, mais vous pouvez
 modifier cette valeur avec la commande C-x f. Vous devez fournir la
 nouvelle valeur de la marge sous la forme d'un paramètre numérique.
 
@@ -1133,9 +1133,9 @@ Voici d'autres options utiles de C-h :
 >> Faites C-h a file<Entrée>.
 
 Cela affiche dans une autre fenêtre une liste de toutes les commandes
-M-x ayant « file » dans leurs noms. Vous verrez listée des commandes
-caractères à côté des noms de commandes qui leur correspondent (comme
-C-x C-f à côté de find-file).
+M-x ayant « file » dans leurs noms. À côté des noms de commandes, vous
+verrez les séquences de caractères qui correspondent (comme C-x C-f à
+côté de find-file).
 
 >> Faites C-M-v pour faire défiler la fenêtre d'aide. Faites-le
    plusieurs fois.

From fa3a81adcb98e5c7ac4b1cc08dd4ee90b1ca5a5a Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sun, 26 Apr 2026 09:22:48 +0100
Subject: [PATCH 216/463] ; Document getting a persistent *scratch* buffer in
 the manual.

---
 doc/emacs/building.texi | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 2fd3ccc6d87..9628c087e32 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -1875,6 +1875,16 @@ Emacs Lisp expressions.  Type @kbd{M-x ielm} to create an
 @file{*ielm*} buffer which uses this mode.  For more information, see
 that command's documentation.
 
+@cindex persistent *scratch* buffer
+  By default, the @file{*scratch*} buffer is not associated with any
+file.  Therefore, any text in the buffer is lost when you quit Emacs.
+If you prefer, you can use Remember mode's notes buffer feature to make
+Emacs save and reload the contents of @file{*scratch*}.  Customize the
+variable @code{initial-buffer-choice} to the symbol
+@code{remember-notes} and the variable @code{remember-notes-buffer-name}
+to the string @code{"*scratch*"} to achieve this.  See also @xref{Quick
+Start,,, remember, the Remember mode manual}.
+
 @node External Lisp
 @section Running an External Lisp
 @cindex Lisp mode

From 6a39de6ee50b2fc38b177c22550a83536d35d963 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 26 Apr 2026 11:34:39 +0300
Subject: [PATCH 217/463] ; Add more register tests

* test/lisp/register-tests.el (register--jumpable-p): Add tests
for more register types.  (Bug#80894)
---
 test/lisp/register-tests.el | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/test/lisp/register-tests.el b/test/lisp/register-tests.el
index 5b7fef6c9a6..2f26492eb9f 100644
--- a/test/lisp/register-tests.el
+++ b/test/lisp/register-tests.el
@@ -39,9 +39,42 @@
                        (quit (car err)))))
       (should-not register-alist))))
 
+(require 'frameset)
+(require 'semantic/senator)
+(require 'doc-view)
 (ert-deftest register--jumpable-p ()
+  ;; Keyboard macro
   (should (register--jumpable-p (kmacro "test")))
+  ;; Marker
   (should (register--jumpable-p (make-marker)))
+  ;; Frameset
+  (should (register--jumpable-p
+           (frameset-make-register
+            (frameset-save nil
+			   :app 'register
+			   :filters frameset-session-filter-alist)
+	    (frameset-frame-id nil)
+	    (point-marker))))
+  ;; Frame configuration
+  (should (register--jumpable-p
+           (list (current-frame-configuration) (point-marker))))
+  ;; Window configuration
+  (should (register--jumpable-p
+           (list (current-window-configuration) (point-marker))))
+  ;; File
+  (should (register--jumpable-p '(file . "foo")))
+  ;; Buffer
+  (should (register--jumpable-p '(buffer . "foo")))
+  ;; File to revisit
+  (should (register--jumpable-p '(file-query "quux" 1)))
+  ;; Senator's semantic tag
+  (should (register--jumpable-p
+           (senator-make-register
+            (list "foo" 'type nil nil (make-overlay 1 1)))))
+  ;; DocView: FIXME -- this should pass!
+  (should-not (register--jumpable-p
+           (cons 'doc-view (list (cons 'buffer (current-buffer))
+                                 '(file . "foo") '(page . 1)))))
   (should-not (register--jumpable-p "test")))
 
 (provide 'register-tests)

From 3f06d73a4962c3c1cffa354aa4b42601bf278753 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sun, 26 Apr 2026 10:53:46 +0100
Subject: [PATCH 218/463] VC: Support deleting directories

* lisp/vc/vc.el (delete-files): Specify that implementations of
this should handle deleting directories.
* lisp/vc/vc-git.el (vc-git-delete-files):
* lisp/vc/vc-hg.el (vc-hg-delete-files):
* lisp/vc/vc.el (vc-delete-file): Handle deleting directories.
---
 lisp/vc/vc-git.el |  2 +-
 lisp/vc/vc-hg.el  |  4 +++-
 lisp/vc/vc.el     | 31 +++++++++++++++++++++----------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index b238afcd127..db7ff66468a 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -2357,7 +2357,7 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"."
   (vc-git-command nil 0 file "rm" "-f" "--"))
 
 (defun vc-git-delete-files (files)
-  (vc-git-command nil 0 files "rm" "-f" "--"))
+  (vc-git-command nil 0 files "rm" "-rf" "--"))
 
 (defun vc-git-rename-file (old new)
   (vc-git-command nil 0 (list old new) "mv" "-f" "--"))
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index d65252bbbd2..8d0239604a7 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -1186,7 +1186,9 @@ hg binary."
   "Delete each of FILES and delete them in the Mercurial repository.
 Should be called with DEFAULT-DIRECTORY equal to the repository root."
   (dolist (file files)
-    (condition-case _ (delete-file file)
+    (condition-case _ (if (eq t (car (file-attributes file)))
+                          (delete-directory file 'recursive)
+                        (delete-file file))
       (file-error nil)))
   (vc-hg-command nil 0 files "remove" "--after" "--force"))
 
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 54ab49a9032..bd43f8abfc2 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -737,10 +737,12 @@
 ;;
 ;; - delete-files (files)
 ;;
-;;   As delete-file, except that the first argument is a list of files,
-;;   all of which require deletion.  May assume that it is called from
-;;   the repository root.  Backends can implement this for faster mass
-;;   deletions.
+;;   As delete-file, except that (i) the first argument is a list of
+;;   files, all of which require deletion; and (ii) elements of FILES
+;;   may be directories, which should be recursively removed.
+;;   May assume that it is called from the repository root.
+;;   Backends can implement this for faster mass deletions and to enable
+;;   deleting directories.
 ;;
 ;; - rename-file (old new)
 ;;
@@ -4965,15 +4967,19 @@ buffer's file name if it's under version control.
 When called from Lisp, FILE-OR-FILES can be a file name or a list of
 file names.
 When called from Lisp, optional argument NOCONFIRM non-nil means don't
-prompt to confirm deletion."
+prompt to confirm deletion.
+For some VCS, FILE-OR-FILES can include directories.
+These are recursively deleted."
   (interactive (list (read-file-name "VC delete file: " nil
-                                     (when (vc-backend buffer-file-name)
-                                       buffer-file-name)
+                                     (and (vc-backend buffer-file-name)
+                                          buffer-file-name)
                                      t)))
   (setq file-or-files (mapcar #'expand-file-name (ensure-list file-or-files)))
   (dolist (file file-or-files)
     (let ((buf (get-file-buffer file))
-          (backend (vc-backend file)))
+          (backend (if (file-directory-p file)
+                       (vc-responsible-backend file)
+                     (vc-backend file))))
       (unless (or (not backend)
                   (vc-find-backend-function backend 'delete-file))
         (error "Deleting files under %s is not supported in VC" backend))
@@ -4998,7 +5004,10 @@ prompt to confirm deletion."
          (lambda (file)
            ;; For the case of unregistered files, or if the backend
            ;; didn't actually delete the file.
-           (when (file-exists-p file) (delete-file file))
+           (when-let* ((attrs (file-attributes file)))
+             (if (eq t (car attrs))
+                 (delete-directory file 'recursive)
+               (delete-file file)))
            ;; Forget what VC knew about the file.
            (vc-file-clearprops file)
            ;; Make sure the buffer is killed and *vc-dir* buffers are
@@ -5008,7 +5017,9 @@ prompt to confirm deletion."
         deletions-by-backend)
     (dolist (file file-or-files)
       (let ((buf (get-file-buffer file))
-            (backend (vc-backend file)))
+            (backend (if (file-directory-p file)
+                         (vc-responsible-backend file)
+                       (vc-backend file))))
         (unless (or (file-directory-p file) (null make-backup-files)
                     (not (file-exists-p file)))
           (with-current-buffer (or buf (find-file-noselect file))

From cdaf550bb3c20ef9cbc11db18a5443d418f771f3 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sun, 26 Apr 2026 11:13:11 +0100
Subject: [PATCH 219/463] vc-delete-file: Narrow binding of default-directory

* lisp/vc/vc.el (vc-delete-file): In the delete-file branch,
narrow the binding of default-directory to cover only the call
into the backend.
Suggested by Aaron L. Zeng <azeng@janestreet.com> in bug#80875.
---
 lisp/vc/vc.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index bd43f8abfc2..a01a65d9c6c 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -5042,8 +5042,8 @@ These are recursively deleted."
           ;; before calling BACKEND's `delete-file' function, so keep it
           ;; for compatibility.  --spwhitton
           (let ((default-directory (file-name-directory file)))
-            (vc-call-backend backend 'delete-file file)
-            (funcall post-backend-deletion file)))))))
+            (vc-call-backend backend 'delete-file file))
+          (funcall post-backend-deletion file))))))
 
 ;;;###autoload
 (defun vc-rename-file (old new &optional ok-if-already-exists)

From 5147a78dd13eb4a4fcccbc3857e73ec778856832 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sun, 26 Apr 2026 11:19:30 +0100
Subject: [PATCH 220/463] ; * admin/authors.el (authors-aliases): Add Aaron L.
 Zeng.

---
 admin/authors.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/authors.el b/admin/authors.el
index a389e8161d7..697f697f1f9 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -43,6 +43,7 @@ files.")
     (nil "A\\. N\\. Other")  ; unknown author 2014-12-03, later removed
     (nil "Anticrisis")
     (nil "akater")
+    ("Aaron L. Zeng" "Aaron Zeng")
     ("Aaron S. Hawley" "Aaron Hawley")
     ("Alan Third" "Alan J Third")
     ("Alexander Gramiak" "Alex Gramiak")

From bbdab523b4801e0573644798e5e3ae8a6d9acff0 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 26 Apr 2026 14:20:56 +0300
Subject: [PATCH 221/463] Fix renaming files and directories under RCS

* lisp/vc/vc-rcs.el (vc-rcs-register): Filter out directories from
FILES.
(vc-rcs-rename-file): Support OLD being a directory.

* test/lisp/vc/vc-tests/vc-tests.el (vc-test--rename-file)
(vc-test--rename-directory): Re-enable these tests for RCS.
(vc-test--rename-directory): Disable 'yes-or-no-p' questions that
RCS asks when it needs to create the RCS/ subdirectory: this lets
the test run without user interaction.
---
 lisp/vc/vc-rcs.el                 | 10 ++++--
 test/lisp/vc/vc-tests/vc-tests.el | 52 +++++++++++++++++--------------
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 7b9af355c6a..72e71a41d4f 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -249,6 +249,9 @@ COMMENT can be used to provide an initial description for each FILES.
 Passes either `vc-rcs-register-switches' or `vc-register-switches'
 to the RCS command."
   (let (subdir name)
+    ;; RCS doesn't track directories, and 'ci' will fail if passed a
+    ;; directory name.
+    (setq files (seq-remove #'file-directory-p files))
     (dolist (file files)
       (and (not (file-exists-p
 		 (setq subdir (expand-file-name "RCS"
@@ -945,8 +948,11 @@ Uses `rcs2log' which only works for RCS and CVS."
 (autoload 'vc-rename-master "vc-filewise")
 
 (defun vc-rcs-rename-file (old new)
-  ;; Just move the master file (using vc-rcs-master-templates).
-  (vc-rename-master (vc-master-name old) new vc-rcs-master-templates))
+  (if (file-directory-p old)
+      ;; RCS doesn't track directories, so just rename the directory.
+      (rename-file old new)
+    ;; Just move the master file (using vc-rcs-master-templates).
+    (vc-rename-master (vc-master-name old) new vc-rcs-master-templates)))
 
 (defun vc-rcs-find-file-hook ()
   ;; If the file is locked by some other user, make
diff --git a/test/lisp/vc/vc-tests/vc-tests.el b/test/lisp/vc/vc-tests/vc-tests.el
index 732ef12fbdc..1199d94cd03 100644
--- a/test/lisp/vc/vc-tests/vc-tests.el
+++ b/test/lisp/vc/vc-tests/vc-tests.el
@@ -609,20 +609,18 @@ This checks also `vc-backend' and `vc-responsible-backend'."
                 (should (file-exists-p new-name))))
 
             ;; Test moving into an existing directory.
-            ;; FIXME: This is broken for RCS and I don't know why.  --spwhitton
-            (unless (eq backend 'RCS)
-              (let ((tmp-name (expand-file-name "quux" default-directory))
-                    (new-dir (expand-file-name "dir1/" default-directory))
-                    (new-name (expand-file-name "dir1/quux" default-directory)))
-                (make-directory new-dir)
-                (write-region "quux" nil tmp-name nil 'nomessage)
-                (vc-register
-                 `(,backend (,(file-relative-name new-dir default-directory)
-                             ,(file-name-nondirectory tmp-name))))
+            (let ((tmp-name (expand-file-name "quux" default-directory))
+                  (new-dir (expand-file-name "dir1/" default-directory))
+                  (new-name (expand-file-name "dir1/quux" default-directory)))
+              (make-directory new-dir)
+              (write-region "quux" nil tmp-name nil 'nomessage)
+              (vc-register
+               `(,backend (,(file-relative-name new-dir default-directory)
+                           ,(file-name-nondirectory tmp-name))))
 
-                (vc-rename-file tmp-name new-dir)
-                (should-not (file-exists-p tmp-name))
-                (should (file-exists-p new-name)))))
+              (vc-rename-file tmp-name new-dir)
+              (should-not (file-exists-p tmp-name))
+              (should (file-exists-p new-name))))
 
         ;; Save exit.
         (ignore-errors
@@ -662,10 +660,14 @@ This checks also `vc-backend' and `vc-responsible-backend'."
               (write-region "foo" nil tmp-name1 nil 'nomessage)
               (write-region "bar" nil tmp-name2 nil 'nomessage)
               ;; Register TMP-NAME1 but *not* TMP-NAME2.
-              (vc-register `(,backend
-                             (,(file-relative-name tmp-name1
-                                                   default-directory))))
-
+              ;; (We disable yes-or-no-p for RCS, which asks whether to
+              ;; create the RCS/ subdirectory of a directory where we
+              ;; register the first file.)
+              (cl-letf (((symbol-function #'yes-or-no-p)
+                         #'always))
+                (vc-register `(,backend
+                               (,(file-relative-name tmp-name1
+                                                     default-directory)))))
               (vc-rename-file (directory-file-name tmp-dir)
                               (directory-file-name new-dir))
               (should-not (file-exists-p tmp-name1))
@@ -697,9 +699,14 @@ This checks also `vc-backend' and `vc-responsible-backend'."
                    (new-name (expand-file-name "foo" new-dir)))
               (make-directory tmp-dir)
               (write-region "foo" nil tmp-name nil 'nomessage)
-              (vc-register `(,backend
-                             (,(file-relative-name tmp-name
-                                                   default-directory))))
+              ;; (We disable yes-or-no-p for RCS, which asks whether to
+              ;; create the RCS/ subdirectory of a directory where we
+              ;; register the first file.)
+              (cl-letf (((symbol-function #'yes-or-no-p)
+                         #'always))
+                (vc-register `(,backend
+                               (,(file-relative-name tmp-name
+                                                     default-directory)))))
 
               (vc-rename-file (directory-file-name tmp-dir)
                               (directory-file-name new-dir))
@@ -1324,10 +1331,7 @@ This checks also `vc-backend' and `vc-responsible-backend'."
           ;; See vc-test-*-rename-file regarding CVS and Mtn.
           ;; SVN requires all files to rename are registered but we want
           ;; to test a mix of registered and unregistered files in this test.
-          ;; RCS does not seem to support renaming directories; possibly
-          ;; `vc-rcs-rename-file' could be improved or it might be a
-          ;; fundamental limitation.
-          (skip-when (memq ',backend '(CVS SVN Mtn RCS)))
+          (skip-when (memq ',backend '(CVS SVN Mtn)))
           (vc-test--rename-directory ',backend))))))
 
 (provide 'vc-tests)

From 9a7bc6b93085a12dbeb2513154c20db8dae2c6a6 Mon Sep 17 00:00:00 2001
From: Kai Ma <justksqsf@gmail.com>
Date: Sat, 14 Feb 2026 14:02:36 +0100
Subject: [PATCH 222/463] New user option compilation-search-extra-path

* lisp/progmodes/compile.el (compilation-search-extra-path): New
option (bug#80279).
(compilation-start): Use it.
(compilation-search-path):
* doc/emacs/building.texi:
* etc/NEWS: Document it, and also compilation-search-path.
---
 doc/emacs/building.texi   | 15 +++++++++++++++
 etc/NEWS                  |  8 ++++++++
 lisp/progmodes/compile.el | 17 ++++++++++++++++-
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 9628c087e32..94b41dd9845 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -188,6 +188,21 @@ appears in the @file{*compilation*} buffer.  (This variable can also
 have the values @code{if-location-known} and @code{first-known}, which
 modify the conditions for automatically visiting the error locus.)
 
+@vindex compilation-search-path
+@vindex compilation-search-extra-path
+  The actual locus of an error message is determined by
+@code{compilation-search-path}, a list of directory names.  By default,
+Emacs visits the file indicated in the error message under the directory
+where the compilation happens, which is the special directory name
+@code{nil} in the default value for @code{compilation-search-path}
+(i.e. @code{(nil)}).  If you would like Emacs to try to find the file
+under a different directory (e.g. when you compile a nested project),
+customize @code{compilation-search-path} to include that directory.  For
+directory-local customization (@pxref{Directory Variables}), prefer
+using @code{compilation-search-extra-path} instead, which will be
+considered in addition to @code{compilation-search-path}, and takes
+precedence over it.
+
   Compilation mode provides the following additional commands.  These
 commands can also be used in @file{*grep*} buffers, where the
 hyperlinks are search matches rather than error messages (@pxref{Grep
diff --git a/etc/NEWS b/etc/NEWS
index 40151ef4425..03dfe3b0fc3 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -787,6 +787,14 @@ docstring for the new option.
 ** Emacs now comes with Org v9.8.
 See the file "etc/ORG-NEWS" for user-visible changes in Org.
 
++++
+** New user option 'compilation-search-extra-path'
+compile.el will now use paths specified in both
+'compilation-search-extra-path' and 'compilation-search-path', when
+doing search.  'compilation-search-extra-path' is consulted first.
+One possible use case of this option is to customize add new search
+paths on a per-project basis with directory-local customization.
+
 
 * Editing Changes in Emacs 31.1
 
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 53aca7b0266..e35acbec042 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -966,10 +966,22 @@ of `my-compilation-root' here."
 (defcustom compilation-search-path '(nil)
   "List of directories to search for source files named in error messages.
 Elements should be directory names, not file names of directories.
-The value nil as an element means to try the default directory."
+The value nil as an element means to try the default directory.
+
+For directory-local customizations, prefer
+`compilation-search-extra-path' instead."
   :type '(repeat (choice (const :tag "Default" nil)
 			 (string :tag "Directory"))))
 
+;;;###autoload
+(defcustom compilation-search-extra-path nil
+  "List of extra directories to search for source files named in error messages.
+Elements in this list will be searched before those in
+`compilation-search-path'.
+
+The buffer-local value of this variable will be inherited by the
+compilation buffer.")
+
 ;;;###autoload
 (defcustom compile-command
   ;; Divide by less than 2 and round up to avoid using all processors on
@@ -2009,6 +2021,8 @@ Returns the compilation buffer created."
 	    (replace-regexp-in-string "-mode\\'" "" (symbol-name mode))))
 	 (thisdir default-directory)
 	 (thisenv compilation-environment)
+         (thissearchpath (append compilation-search-extra-path
+                                 compilation-search-path))
          (buffer-path (and (local-variable-p 'exec-path) exec-path))
          (buffer-env (and (local-variable-p 'process-environment)
                           process-environment))
@@ -2084,6 +2098,7 @@ Returns the compilation buffer created."
         ;; NB: must be done after (funcall mode) as that resets local variables
         (setq-local compilation-directory thisdir)
         (setq-local compilation-environment thisenv)
+        (setq-local compilation-search-path thissearchpath)
         (if buffer-path
             (setq-local exec-path buffer-path)
           (kill-local-variable 'exec-path))

From df6fb6fafbefcedd868fac9dab573126f8e4d954 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sun, 26 Apr 2026 12:21:05 +0100
Subject: [PATCH 223/463] ; Fix & improve last change.

---
 doc/emacs/building.texi   | 15 ++++++++-------
 etc/NEWS                  |  2 +-
 lisp/progmodes/compile.el |  3 ++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 94b41dd9845..2af98997480 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -193,15 +193,16 @@ modify the conditions for automatically visiting the error locus.)
   The actual locus of an error message is determined by
 @code{compilation-search-path}, a list of directory names.  By default,
 Emacs visits the file indicated in the error message under the directory
-where the compilation happens, which is the special directory name
+where the compilation happens, represented by the special directory name
 @code{nil} in the default value for @code{compilation-search-path}
-(i.e. @code{(nil)}).  If you would like Emacs to try to find the file
-under a different directory (e.g. when you compile a nested project),
-customize @code{compilation-search-path} to include that directory.  For
+(i.e. @code{(nil)}).  To make Emacs try to find the file under a
+different directory (e.g. when compiling a nested project), customize
+@code{compilation-search-path} to include that directory.  For
 directory-local customization (@pxref{Directory Variables}), prefer
-using @code{compilation-search-extra-path} instead, which will be
-considered in addition to @code{compilation-search-path}, and takes
-precedence over it.
+setting @code{compilation-search-extra-path} instead, which Emacs
+considers in addition to @code{compilation-search-path}.  Entries in
+@code{compilation-search-extra-path} take precedence over entries in
+@code{compilation-search-path}.
 
   Compilation mode provides the following additional commands.  These
 commands can also be used in @file{*grep*} buffers, where the
diff --git a/etc/NEWS b/etc/NEWS
index 03dfe3b0fc3..43e858352ef 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -793,7 +793,7 @@ compile.el will now use paths specified in both
 'compilation-search-extra-path' and 'compilation-search-path', when
 doing search.  'compilation-search-extra-path' is consulted first.
 One possible use case of this option is to customize add new search
-paths on a per-project basis with directory-local customization.
+paths on a per-project basis with directory-local variables.
 
 
 * Editing Changes in Emacs 31.1
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index e35acbec042..5222579592e 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -980,7 +980,8 @@ Elements in this list will be searched before those in
 `compilation-search-path'.
 
 The buffer-local value of this variable will be inherited by the
-compilation buffer.")
+compilation buffer."
+  :type '(repeat (string :tag "Directory")))
 
 ;;;###autoload
 (defcustom compile-command

From e4633e657a338a39e381da397f02ee33c367d437 Mon Sep 17 00:00:00 2001
From: "Aaron L. Zeng" <azeng@janestreet.com>
Date: Thu, 26 Mar 2026 16:45:14 -0400
Subject: [PATCH 224/463] Support Elisp debugging and backtraces in code called
 by modules

* src/lisp.h (handlertype) <CATCHER_ALL_DEBUGGABLE>: New enumeration
value.
* src/emacs-module.c (MODULE_HANDLE_NONLOCAL_EXIT):
* src/eval.c (Fthrow, signal_or_quit): Use it.

* test/src/emacs-module-tests.el
(mod-test-non-local-exit-funcall-debug-on-error): New test.

Bug#80714

Copyright-paperwork-exempt: yes.
---
 src/emacs-module.c             |  4 +---
 src/eval.c                     |  6 +++++-
 src/lisp.h                     |  2 ++
 test/src/emacs-module-tests.el | 10 ++++++++++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/emacs-module.c b/src/emacs-module.c
index 887c078f7d9..142ca675734 100644
--- a/src/emacs-module.c
+++ b/src/emacs-module.c
@@ -263,13 +263,11 @@ module_memory_buffer_too_small (ptrdiff_t actual, ptrdiff_t required)
    code after the macro may longjmp back into the macro, which means
    its local variable INTERNAL_CLEANUP must stay live in later code.  */
 
-/* TODO: Make backtraces work if this macro is used.  */
-
 #define MODULE_HANDLE_NONLOCAL_EXIT(retval)                             \
   if (module_non_local_exit_check (env) != emacs_funcall_exit_return)	\
     return retval;							\
   struct handler *internal_handler =                                    \
-    push_handler_nosignal (Qt, CATCHER_ALL);                            \
+    push_handler_nosignal (Qt, CATCHER_ALL_DEBUGGABLE);                 \
   if (!internal_handler)                                                \
     {									\
       module_out_of_memory (env);					\
diff --git a/src/eval.c b/src/eval.c
index ff2ce1b01a5..b61bda4a024 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1453,7 +1453,7 @@ Both TAG and VALUE are evalled.  */
   if (!NILP (tag))
     for (c = handlerlist; c; c = c->next)
       {
-	if (c->type == CATCHER_ALL)
+	if (c->type == CATCHER_ALL || c->type == CATCHER_ALL_DEBUGGABLE)
           unwind_to_catch (c, NONLOCAL_EXIT_THROW, Fcons (tag, value));
         if (c->type == CATCHER && EQ (c->tag_or_ch, tag))
 	  unwind_to_catch (c, NONLOCAL_EXIT_THROW, value);
@@ -1981,6 +1981,9 @@ signal_or_quit (Lisp_Object error_symbol, Lisp_Object data, bool continuable)
         case CATCHER_ALL:
           clause = Qt;
           break;
+        case CATCHER_ALL_DEBUGGABLE:
+          clause = Qdebug;
+          break;
 	case CATCHER:
 	  continue;
         case CONDITION_CASE:
@@ -2024,6 +2027,7 @@ signal_or_quit (Lisp_Object error_symbol, Lisp_Object data, bool continuable)
 	  || NILP (clause)
 	  /* A `debug' symbol in the handler list disables the normal
 	     suppression of the debugger.  */
+	  || EQ (clause, Qdebug)
 	  || (CONSP (clause) && !NILP (Fmemq (Qdebug, clause)))
 	  /* Special handler that means "print a message and run debugger
 	     if requested".  */
diff --git a/src/lisp.h b/src/lisp.h
index 223eb4df564..ee50cc777c6 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3810,6 +3810,8 @@ enum handlertype {
   CATCHER_ALL,                  /* Wildcard that catches all throws and signals.
                                    'tag_or_ch' is unused.
                                    'val' holds the retval during longjmp.  */
+  CATCHER_ALL_DEBUGGABLE,       /* Like CATCHER_ALL, but does not suppress the
+                                   debugger. */
   HANDLER_BIND,                 /* Entry for 'handler-bind'.
                                    'tag_or_ch' holds the list of conditions.
                                    'val' holds the handler function.
diff --git a/test/src/emacs-module-tests.el b/test/src/emacs-module-tests.el
index d2ec127f878..5d3abb0d76b 100644
--- a/test/src/emacs-module-tests.el
+++ b/test/src/emacs-module-tests.el
@@ -146,6 +146,16 @@ changes."
   (should (equal (mod-test-non-local-exit-funcall (lambda () (throw 'tag 32)))
                  '(throw tag 32))))
 
+(ert-deftest mod-test-non-local-exit-funcall-debug-on-error ()
+  (let* ((debugger-entered nil)
+         (debugger (lambda (&rest _) (setq debugger-entered t))))
+    (should (equal
+             (let ((debug-on-error t))
+               (mod-test-non-local-exit-funcall
+                (lambda () (error "test error"))))
+             '(signal error ("test error"))))
+    (should debugger-entered)))
+
 ;;; String tests
 
 (defun multiply-string (s n)

From c6608ea05053c81e1498376a0334ed64a46e53fd Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 26 Apr 2026 15:20:57 +0300
Subject: [PATCH 225/463] ; Avoid warnings when generating info.info

* doc/misc/info.texi (Help-], Help-FOO): Make these @subheading's
instead of @section/@subsection, to avoid warnings from 'makeinfo'.
Suggested by Gavin Smith <gavinsmith0123@gmail.com> in
https://lists.gnu.org/archive/html/bug-texinfo/2026-04/msg00103.html
(Bug#80736)
---
 doc/misc/info.texi | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index b642f69278b..7479d677e7b 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -464,7 +464,10 @@ Now type @kbd{]}, to learn about the @kbd{]} and @kbd{[} commands.
 @end menu
 
 @node Help-], , , Help-Inv
-@subsection The @kbd{]} and @kbd{[} commands
+@c @subheading and not @section to avoid warnings from makeinfo due to
+@c the fact that all the 3 items in the above menu point to the same
+@c node.  The downside is that the section name has no number.
+@subheading The @kbd{]} and @kbd{[} commands
 
 If you type @kbd{n} now, you get an error message saying that this
 node has no next node.  Similarly, if you type @kbd{p}, the error
@@ -709,7 +712,10 @@ there's no next node.
 @end format
 
 @node Help-FOO,  ,  , Help-M
-@subsection The @kbd{u} command
+@c @subheading and not @subsection to avoid warnings from makeinfo due to
+@c the fact that all the 3 items in the above menu point to the same
+@c node.  The downside is that the subsection name has no number.
+@subheading The @kbd{u} command
 
   Congratulations!  This is the node @samp{Help-FOO}.  It has an @samp{Up}
 pointer @samp{Help-M}, the node you just came from via the @kbd{m}

From 4bd5608513cc801fe36c90a1c8a6249564250b2e Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 26 Apr 2026 12:18:04 -0400
Subject: [PATCH 226/463] (register--get-method-type): Fix one more case
 (bug#80894)

* lisp/register.el (register--get-method-type): Refine the cl-generic hack
yet a but further.
* test/lisp/register-tests.el (register--jumpable-p): Fix the test.
---
 lisp/register.el            | 2 ++
 test/lisp/register-tests.el | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/register.el b/lisp/register.el
index d1b5684ecb0..179e0822c33 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -593,6 +593,8 @@ With a prefix argument, prompt for BUFFER as well."
   ;; then look for the best matching method.
   (let* ((type (or (oclosure-type val) (cl-type-of val)))
 	 (types (cl--class-allparents (cl--find-class type))))
+    (if (eq type 'cons) (push `(head ,(car val)) types))
+    (push `(eql ',val) types)
     (while (and types (not (cl-find-method genfun nil
                                            (cons (car types) other-args-type))))
       (setq types (cdr types)))
diff --git a/test/lisp/register-tests.el b/test/lisp/register-tests.el
index 2f26492eb9f..fbf67a96d3d 100644
--- a/test/lisp/register-tests.el
+++ b/test/lisp/register-tests.el
@@ -72,7 +72,7 @@
            (senator-make-register
             (list "foo" 'type nil nil (make-overlay 1 1)))))
   ;; DocView: FIXME -- this should pass!
-  (should-not (register--jumpable-p
+  (should (register--jumpable-p
            (cons 'doc-view (list (cons 'buffer (current-buffer))
                                  '(file . "foo") '(page . 1)))))
   (should-not (register--jumpable-p "test")))

From 1a1f83c73079fca4a78a35ba6bcb9f4380365886 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 26 Apr 2026 21:01:45 +0300
Subject: [PATCH 227/463] ; * lisp/treesit.el (treesit-ready-p): Doc fix
 (bug#80909).

---
 lisp/treesit.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 737f5545a16..6ede1a1da13 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -4548,7 +4548,7 @@ as belonging to the node that ends before POS (by subtracting 1 from POS)."
 ;;; Activating tree-sitter
 
 (defun treesit-ready-p (language &optional quiet)
-  "Check whether tree-sitter is ready to be used for MODE and LANGUAGE.
+  "Check whether tree-sitter is ready to be used for LANGUAGE.
 
 LANGUAGE is the language symbol to check for availability.
 It can also be a list of language symbols.

From 20b6edf1677f22fb0a2adf960ba17b26ac256430 Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@gnu.org>
Date: Sun, 26 Apr 2026 20:50:45 +0200
Subject: [PATCH 228/463] ; * etc/tutorials/TUTORIAL.fr: fix translation

---
 etc/tutorials/TUTORIAL.fr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/tutorials/TUTORIAL.fr b/etc/tutorials/TUTORIAL.fr
index cec23a52001..1209088d5f8 100644
--- a/etc/tutorials/TUTORIAL.fr
+++ b/etc/tutorials/TUTORIAL.fr
@@ -1134,7 +1134,7 @@ Voici d'autres options utiles de C-h :
 
 Cela affiche dans une autre fenêtre une liste de toutes les commandes
 M-x ayant « file » dans leurs noms. À côté des noms de commandes, vous
-verrez les séquences de caractères qui correspondent (comme C-x C-f à
+verrez les combinaisons de touches qui correspondent (comme C-x C-f à
 côté de find-file).
 
 >> Faites C-M-v pour faire défiler la fenêtre d'aide. Faites-le

From ee021b0ec195971096a1020def7584cefdbe707e Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Sun, 26 Apr 2026 19:40:32 -0700
Subject: [PATCH 229/463] Fix treesit-range-fn-exclude-children

* lisp/treesit.el (treesit-range-fn-exclude-children): Exclude
0-length ranges.
---
 lisp/treesit.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 6ede1a1da13..387d2716f5b 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -845,9 +845,12 @@ This can be used as a `:range-fn' in `treesit-range-rules'."
     (dolist (child (treesit-node-children node))
       (let ((child-start (treesit-node-start child))
             (child-end (treesit-node-end child)))
-        (push (cons prev-end child-start) ranges)
+        ;; Filter out the case when PREV-END = CHILD-START.
+        (when (< prev-end child-start)
+          (push (cons prev-end child-start) ranges))
         (setq prev-end child-end)))
-    (push (cons prev-end end) ranges)
+    (when (< prev-end end)
+      (push (cons prev-end end) ranges))
     (nreverse ranges)))
 
 (defun treesit--merge-ranges (old-ranges new-ranges start end)

From d19c5114250aa474d686bd76e06347372898e28b Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Sun, 26 Apr 2026 22:07:33 -0700
Subject: [PATCH 230/463] ; Add heuristic for treesit--update-ranges-non-local

* lisp/treesit.el (treesit--update-ranges-non-local): Treat
language symbols that happens to be a command as just language
symbol, not function.
---
 lisp/treesit.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 387d2716f5b..2b2740e2fb4 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1079,7 +1079,8 @@ returns the ranges to use for that node.
 
 Return updated parsers as a list."
   (let ((ranges-by-lang
-         (if (functionp embed-lang)
+         ;; Filter out functions like `markdown' using `commandp'.
+         (if (and (functionp embed-lang) (not (commandp embed-lang)))
              (treesit-query-range-by-language
               host-parser query embed-lang beg end offset range-fn)
            (list (cons embed-lang

From 241481cf1e034a990200fe8d3df98a128cb13105 Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Mon, 27 Apr 2026 01:16:10 -0700
Subject: [PATCH 231/463] Add treesit-query-with-fallback

* lisp/treesit.el (treesit-font-lock-rules): Handle
treesit-query-with-fallback.
(treesit-query-with-fallback): New function.
* doc/lispref/modes.texi (Parser-based Font Lock): Mention
treesit-query-with-fallback.
---
 doc/lispref/modes.texi |  8 ++++++++
 etc/NEWS               | 11 +++++++++++
 lisp/treesit.el        | 27 ++++++++++++++++++++++-----
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 13a8ec46a8a..5f0e9a0fade 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -4447,6 +4447,14 @@ arguments as optional arguments for future extensibility.
 If a capture name is both a face and a function, the face takes
 priority.  If a capture name is neither a face nor a function, it is
 ignored.
+
+@findex treesit-query-with-optional
+@findex treesit-query-with-fallback
+Sometimes, to support different versions of the same grammar, it's
+useful to conditionally include some optional @var{query}, or choose the
+first valid query from a list of queries.  Functions like
+@code{treesit-query-with-optional} and
+@code{treesit-query-with-fallback} can come in handy.
 @end defun
 
 @c FIXME: Cross-ref treesit-font-lock-level to user manual.
diff --git a/etc/NEWS b/etc/NEWS
index 43e858352ef..abe49005af8 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1295,6 +1295,17 @@ information.
 Multi-language major modes can rely on the default return value from
 'treesit-language-at' that uses the new function 'treesit-parsers-at'.
 
++++
+*** New function 'treesit-query-with-optional'.
+When used in 'treesit-font-lock-rules', 'treesit-query-with-optional'
+returns a default query plus the valid queries from a list of optional
+queries.
+
++++
+*** New function 'treesit-query-with-fallback'.
+When used in 'treesit-font-lock-rules', 'treesit-query-with-fallback'
+selects the first valid query from a list.
+
 +++
 *** Tree-sitter thing functions now work better with multiple parsers.
 The following functions now handle better the case when there are
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 2b2740e2fb4..b0fd9d404e2 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1660,7 +1660,12 @@ name, it is ignored."
           ;; The list this function returns.
           (result nil))
       (while query-specs
-        (let ((token (pop query-specs)))
+        (let ((token (pop query-specs))
+              (reset (lambda ()
+                       (setq current-language nil
+                             current-override nil
+                             current-feature nil
+                             current-reversed nil))))
           (pcase token
             ;; (1) Process keywords.
             (:default-language
@@ -1719,10 +1724,10 @@ name, it is ignored."
                            lang)
                      result)
                ;; Clears any configurations set for this query.
-               (setq current-language nil
-                     current-override nil
-                     current-feature nil
-                     current-reversed nil)))
+               (funcall reset)))
+            ;; (3) Skip this query, for whatever reason.  Currently only
+            ;; utilized by `treesit-query-with-fallback' and undocumented.
+            ('nil (funcall reset))
             (_ (signal 'treesit-font-lock-error
                        `("Unexpected value" ,token))))))
       (nreverse result))))
@@ -1743,6 +1748,18 @@ Use LANGUAGE for validating queries."
           (push query optional))))
     (append mandatory optional)))
 
+(defun treesit-query-with-fallback (language &rest queries)
+  "Return the first valid query in QUERIES.
+
+Return nil if no query is valid.  Use LANGUAGE for validating queries."
+  (declare (indent 1))
+  (catch 'return
+    (dolist (query queries)
+      (ignore-errors
+        (when (treesit--compile-query-with-cache language query)
+          (throw 'return query))))
+    nil))
+
 ;; `font-lock-fontify-region-function' has the LOUDLY argument, but
 ;; `jit-lock-functions' doesn't pass that argument.  So even if we set
 ;; `font-lock-verbose' to t, if jit-lock is enabled (and it's almost

From 9e70acea67bc72bc21ff179f4ddb674922b4d3f4 Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Mon, 27 Apr 2026 01:33:27 -0700
Subject: [PATCH 232/463] Fix tree-sitter embedded parser range

If a host parser has some ranges, and an embedded parser also
has some ranges, the final range used by the embedded parser
should be an intersection of the two.  This patch adds this
logic.

* lisp/treesit.el (treesit--range-verbose): New variable.
(treesit--intersect-ranges):
(treesit--set-embed-ranges): New function.
(treesit--update-ranges-non-local):
(treesit--update-ranges-local): Use the new functions.
* test/src/treesit-tests.el:
(treesit-intersect-ranges): New test.
---
 lisp/treesit.el           | 75 ++++++++++++++++++++++++++++-----------
 test/src/treesit-tests.el | 24 +++++++++++++
 2 files changed, 79 insertions(+), 20 deletions(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index b0fd9d404e2..fe1d0e6e725 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -675,6 +675,10 @@ If none are valid, return nil."
 
 ;;; Range API supplement
 
+(defvar treesit--range-verbose nil
+  "If non-nil, print verbose debugging info for setting ranges.
+Useful when your multi-parser setup doesn't seem to work.")
+
 ;; (ref:local-parser-overlay) Regarding local parser overlays, we store
 ;; the local parser in an overlay spanning across the code block for
 ;; which the parser is responsible. The `treesit-parser' property stores
@@ -918,6 +922,21 @@ those inside are kept."
            if (<= start (car range) (cdr range) end)
            collect range))
 
+(defun treesit--intersect-ranges (ranges-1 ranges-2)
+  "Return the intersection of RANGES-1 and RANGES-2."
+  (let ((r1 (pop ranges-1))
+        (r2 (pop ranges-2))
+        result)
+    (while (and r1 r2)
+      (let ((start (max (car r1) (car r2)))
+            (end (min (cdr r1) (cdr r2))))
+        (when (< start end)
+          (push (cons start end) result))
+        (if (< (cdr r1) (cdr r2))
+            (setq r1 (pop ranges-1))
+          (setq r2 (pop ranges-2)))))
+    (nreverse result)))
+
 (defvar treesit--parser-overlay-offset 0
   "Defines at which position to get the parser overlay.
 The commands that move backward need to set it to -1 to be
@@ -1050,6 +1069,32 @@ is nil."
                          (null (treesit-parser-embed-level parser)))))
               parsers))
 
+(defun treesit--set-embed-ranges (ranges embed-parser host-parser)
+  "A helper for setting RANGES to EMBED-PARSER.
+
+Take HOST-PARSER's ranges and intersect with RANGES, then set to
+EMBED-PARSER.  If the intersection is empty, give EMBED-PARSER a
+0-length ranges.
+
+RANGES is a list of (START . END) or just (START . END)."
+  (let* ((new-ranges-1 (cond
+                        ((null ranges) nil)
+                        ((consp (car ranges)) ranges)
+                        (t (list ranges))))
+         (host-ranges (treesit-parser-included-ranges host-parser))
+         (new-ranges (if (and host-ranges new-ranges-1)
+                         (treesit--intersect-ranges
+                          new-ranges-1 host-ranges)
+                       new-ranges-1)))
+    (when (and (null new-ranges) treesit--range-verbose)
+      (message "Setting empty ranges to %s\nRanges for embedded parser :%s\nRanges for host parser: %s\nIntersection is empty"
+               new-ranges-1 embed-parser host-parser))
+    ;; When there's no range for the embedded language, set it's range
+    ;; to a dummy (1 . 1), otherwise it would be set to the whole
+    ;; buffer, which is not what we want.
+    (treesit-parser-set-included-ranges
+     embed-parser (or new-ranges `((,(point-min) . ,(point-min)))))))
+
 (defun treesit--update-ranges-non-local
     ( host-parser query embed-lang modified-tick embed-level
       &optional beg end offset range-fn)
@@ -1100,7 +1145,9 @@ Return updated parsers as a list."
                   (car (treesit--parser-at-level
                         (treesit-parser-list nil resolved-embed-lang)
                         embed-level 'include-null)))))
-        (when embed-parser
+        (if (null embed-parser)
+            (when treesit--range-verbose
+              (message "Couldn't find an embed parser for an embedded code block, language=%s, embed level=%s" resolved-embed-lang embed-level))
           ;; Lay an overlay over each range to mark the start & end of
           ;; it for other functions to access (e.g., outline wants to
           ;; know this).  Refer to (ref:local-parser-overlay) for more
@@ -1135,17 +1182,9 @@ Return updated parsers as a list."
                               (treesit--merge-ranges
                                old-ranges new-ranges beg end)
                               (point-min) (point-max))))
-            (treesit-parser-set-embed-level
-             embed-parser embed-level)
-            (treesit-parser-set-included-ranges
-             embed-parser (or set-ranges
-                              ;; When there's no range for the
-                              ;; embedded language, set it's
-                              ;; range to a dummy (1 . 1),
-                              ;; otherwise it would be set to
-                              ;; the whole buffer, which is
-                              ;; not what we want.
-                              `((,(point-min) . ,(point-min)))))
+            (treesit-parser-set-embed-level embed-parser embed-level)
+            (treesit--set-embed-ranges
+             set-ranges embed-parser host-parser)
             (push embed-parser touched-parsers)))))
     touched-parsers))
 
@@ -1207,10 +1246,8 @@ Return the created local parsers as a list."
                        (when (and (overlay-get ov 'treesit-parser-local-p)
                                   (eq parser-lang embedded-lang)
                                   (eq embed-level parser-level))
-                         (treesit-parser-set-included-ranges
-                          embedded-parser (if (consp (car range))
-                                              range
-                                            (list range)))
+                         (treesit--set-embed-ranges
+                          range embedded-parser host-parser)
                          (move-overlay ov beg end)
                          (overlay-put ov 'treesit-parser-ov-timestamp
                                       modified-tick)
@@ -1229,10 +1266,8 @@ Return the created local parsers as a list."
                 (overlay-put ov 'treesit-host-parser host-parser)
                 (overlay-put ov 'treesit-parser-ov-timestamp
                              modified-tick)
-                (treesit-parser-set-included-ranges
-                 embedded-parser (if (consp (car range))
-                                     range
-                                   (list range)))
+                (treesit--set-embed-ranges
+                 range embedded-parser host-parser)
                 (push embedded-parser touched-parsers)))))))
     touched-parsers))
 
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 572a8817e26..db00496cda8 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -583,6 +583,30 @@ BODY is the test body."
                                                 (list (cons 5 6))))
                  '((1 . 2) (3 . 4) (9 . 10) (5 . 6)))))
 
+(ert-deftest treesit-intersect-ranges ()
+  "Test `treesit--intersect-ranges'."
+  ;; Empty.
+  (should (equal (treesit--intersect-ranges '() '()) '()))
+  (should (equal (treesit--intersect-ranges '((1 . 5)) '()) '()))
+  ;; No overlap.
+  (should (equal (treesit--intersect-ranges '((1 . 3)) '((5 . 7))) '()))
+  ;; Adjacent (touching at boundary, no overlap).
+  (should (equal (treesit--intersect-ranges '((1 . 5)) '((5 . 10))) '()))
+  ;; Partial overlap.
+  (should (equal (treesit--intersect-ranges '((1 . 5)) '((3 . 7)))
+                 '((3 . 5))))
+  ;; One inside another.
+  (should (equal (treesit--intersect-ranges '((1 . 10)) '((3 . 5)))
+                 '((3 . 5))))
+  ;; Multiple ranges, multiple intersections.
+  (should (equal (treesit--intersect-ranges '((1 . 5) (10 . 15))
+                                            '((3 . 12)))
+                 '((3 . 5) (10 . 12))))
+  ;; One range spanning multiple.
+  (should (equal (treesit--intersect-ranges '((2 . 5) (7 . 10) (15 . 18))
+                                            '((1 . 20)))
+                 '((2 . 5) (7 . 10) (15 . 18)))))
+
 (defun treesit--ert-pred-last-sibling (node)
   (null (treesit-node-next-sibling node t)))
 

From eda3e9eb07674f043da57ba9cc5a8e9cb7e78881 Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Mon, 27 Apr 2026 02:08:31 -0700
Subject: [PATCH 233/463] ; * lisp/treesit.el (treesit-font-lock-rules): Fix
 typo.

---
 lisp/treesit.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index fe1d0e6e725..5fe17d5d382 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1635,7 +1635,7 @@ to QUERY.  For example,
     (treesit-font-lock-rules
      :language \\='javascript
      :override t
-     :feature\\='constant
+     :feature \\='constant
      \\='((true) @font-lock-constant-face
        (false) @font-lock-constant-face)
      :language \\='html

From 99b0199253f13def674924dca69451121e95e907 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 27 Apr 2026 10:25:48 +0100
Subject: [PATCH 234/463] diff-kill-creations-deletions: Look for /dev/null on
 all platforms

* lisp/vc/diff-mode.el (diff-kill-creations-deletions): Look for
/dev/null on platforms when null-device is something else.
---
 lisp/vc/diff-mode.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 5d6f478d3e8..32f34ebaa10 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1252,8 +1252,10 @@ Optional argument DELETE is passed on to `diff-file-kill'."
              (goto-char (point-min))
              (ignore-errors (diff-file-next))
              for (name1 name2) = (diff-hunk-file-names)
-             if (or (equal name1 null-device)
-                    (equal name2 null-device))
+             ;; Allow for "/dev/null" on all platforms, as some versions
+             ;; of Diff produce that for "portability".
+             if (or (member name1 (list null-device "/dev/null"))
+                    (member name2 (list null-device "/dev/null")))
              do (diff-file-kill delete)
              else if (eq (prog1 (point)
                            (ignore-errors (diff-file-next)))

From 705152bb7b6f7e212bb7e7d531e2d975bd5495c2 Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Mon, 27 Apr 2026 11:38:56 +0200
Subject: [PATCH 235/463] (transient--suspend-text-conversion-style): Avoid
 static-if

; * lisp/transient.el (transient--suspend-text-conversion-style): Use
safer version/platform conditional.
---
 lisp/transient.el | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lisp/transient.el b/lisp/transient.el
index f0c17fdfc2c..4068966dafd 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -5524,15 +5524,14 @@ search instead."
             lisp-imenu-generic-expression :test #'equal)
 
 (defun transient--suspend-text-conversion-style ()
-  ;; Added in Emacs 30.1, but not defined on all platforms.
-  (static-when (boundp 'overriding-text-conversion-style)
-    (when text-conversion-style
-      (letrec ((suspended overriding-text-conversion-style)
-               (fn (lambda ()
-                     (setq overriding-text-conversion-style nil)
-                     (remove-hook 'transient-exit-hook fn))))
-        (setq overriding-text-conversion-style suspended)
-        (add-hook 'transient-exit-hook fn)))))
+  (when (and text-conversion-style
+             (bound-and-true-p overriding-text-conversion-style))
+    (letrec ((suspended overriding-text-conversion-style)
+             (fn (lambda ()
+                   (setq overriding-text-conversion-style nil)
+                   (remove-hook 'transient-exit-hook fn))))
+      (setq overriding-text-conversion-style suspended)
+      (add-hook 'transient-exit-hook fn))))
 
 (declare-function which-key-mode "ext:which-key" (&optional arg))
 

From 89c6b632c402874bc5d7d764fddf3b597d58e888 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 26 Apr 2026 23:08:45 +0200
Subject: [PATCH 236/463] Ensure that 'package--builtin-alist' can be populated

This is a partial reversion of 931e04a34ba.

* lisp/emacs-lisp/package.el (package--builtin-alist): Add a
function that loads 'finder-inf', which in turn will populate
'package--builtins', if necessary, caching the result.
(package--upgradeable-packages, describe-package-1)
(package-menu--refresh, package--mapc, package-get-descriptor):
Use the function instead of the variable.
---
 lisp/emacs-lisp/package.el | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 3b4e7c17489..2453e181858 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -468,12 +468,15 @@ BI-DESC should be a `package--bi-desc' object."
                        :summary (package--bi-desc-summary bi-desc)
                        :dir 'builtin))
 
-(defconst package--builtin-alist
-  (cl-loop for bi-desc in package--builtins
-           unless (eq (car bi-desc) 'emacs)
-           collect (list (car bi-desc) (package--from-builtin bi-desc)))
-  "Alist of built-in packages in the form of `package-alist'.
-The alist doesn't include the pseudo-package for Emacs.")
+(defconst package--builtin-alist nil)
+(defun package--builtin-alist ()
+  "Return a alist of built-in packages in the form of `package-alist'.
+The alist doesn't include the pseudo-package for Emacs."
+  (with-memoization package--builtin-alist
+    (require 'finder-inf nil t)         ;for `package--builtins'
+    (cl-loop for bi-desc in package--builtins
+             unless (eq (car bi-desc) 'emacs)
+             collect (list (car bi-desc) (package--from-builtin bi-desc)))))
 
 (defun package-desc-suffix (pkg-desc)
   "Return file-name extension of package-desc object PKG-DESC.
@@ -2166,7 +2169,7 @@ NAME should be a symbol."
                   (package-desc-version (cadr elt))
                   (package-desc-version available)))
              (not (package-vc-p (cadr elt))))))
-    (nconc (and include-builtins package--builtin-alist)
+    (nconc (and include-builtins (package--builtin-alist))
            (package--alist)))))
 
 ;;;###autoload
@@ -2887,9 +2890,9 @@ Helper function for `describe-package'."
         (when (bolp)
           (insert (make-string 13 ?\s)))
         (package--print-email-button author)))
-    (let* ((all-pkgs (append (cdr (assq name package-alist))
-                             (cdr (assq name package-archive-contents))
-                             (cdr (assq name package--builtin-alist))))
+    (let* ((all-pkgs (append (cdr (assq name (package--alist)))
+                             (cdr (assq name (package--archive-contents)))
+                             (cdr (assq name (package--builtin-alist)))))
            (other-pkgs (delete desc all-pkgs)))
       (when other-pkgs
         (package--print-help-section "Other versions"
@@ -3455,7 +3458,7 @@ KEYWORDS should be nil or a list of keywords."
               (push pkg info-list))))))
 
     ;; Built-in packages:
-    (dolist (elt package--builtin-alist)
+    (dolist (elt (package--builtin-alist))
       (let ((name (car elt)) (pkg (cadr elt)))
         (when (and (package--has-keyword-p pkg keywords)
                    (or package-list-unversioned
@@ -3499,7 +3502,7 @@ PACKAGES can be nil or t, which means to display all known
 packages, or a list of packages."
   (dolist (pkg (if (memq packages '(t nil))
                    (flatten-tree
-                    (list (mapcar #'cdr package--builtin-alist)
+                    (list (mapcar #'cdr (package--builtin-alist))
                           (mapcar #'cdr (package--archive-contents))
                           (mapcar #'cdr (package--alist))))
                  (mapcar #'package-get-descriptor packages)))
@@ -4974,7 +4977,7 @@ and prevents the object from being returned if the predicate returns nil."
                        ((delete-dups (ensure-list sources)))))
         (dolist (desc (alist-get pkg (pcase-exhaustive source
                                        ('installed (package--alist))
-                                       ('builtin package--builtin-alist)
+                                       ('builtin (package--builtin-alist))
                                        ('archive (package--archive-contents)))))
           (when (or (null pred) (funcall pred desc))
             (throw 'found desc))))))

From 475bb02345c0ef296ceaac70c951ae8e0eeace1f Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 26 Apr 2026 23:13:41 +0200
Subject: [PATCH 237/463] Do not regard selected packages as removable

* lisp/emacs-lisp/package.el (package--removable-packages):
Handle the fact that 'package--dependencies' doesn't return the
package itself as a dependency, so we have to check
'package-selected-packages' separately.  Also fix the way we
check the return value of 'package--dependencies', keeping in
mind that the value is an alist.  (Bug#80907)
---
 lisp/emacs-lisp/package.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 2453e181858..93fdc81164f 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1869,7 +1869,8 @@ These are packages which are neither contained in
 `package-selected-packages' nor a dependency of one that is."
   (let ((needed (package--dependencies package-selected-packages)))
     (cl-loop for (name . descs) in (package--alist)
-             unless (or (memq name needed)
+             unless (or (assq name needed)
+                        (memq name package-selected-packages)
                         ;; Do not auto-remove external packages.
                         (not (package--user-installed-p name)))
              append descs)))

From 52769368d7ec23421cde757a0b3dc7dcb4e35933 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 26 Apr 2026 23:18:51 +0200
Subject: [PATCH 238/463] Do not warn about 'lexical-binding' if buffer is not
 compiled

* lisp/emacs-lisp/bytecomp.el (byte-compile-file): Check
'no-byte-compile' before issuing a warning.  This prevents
false-positives when running into .dir-locals.el or -pkg.el
files.  (Bug#80352)
---
 lisp/emacs-lisp/bytecomp.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index aadfc4c335a..b1875dc2bcf 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2270,6 +2270,7 @@ See also `emacs-lisp-byte-compile-and-load'."
               filename buffer-file-name))
       ;; Don't inherit lexical-binding from caller (bug#12938).
       (unless (or (local-variable-p 'lexical-binding)
+                  no-byte-compile
                   bytecomp--inhibit-lexical-cookie-warning)
         (let ((byte-compile-current-buffer (current-buffer)))
           (displaying-byte-compile-warnings

From e83052c09598ee57dffc552f71ddd8853711800c Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 26 Apr 2026 23:43:31 +0200
Subject: [PATCH 239/463] Add lexical-binding cookies to multi-file-0.2.3.tar

* test/lisp/emacs-lisp/package-resources/multi-file-0.2.3.tar:
Update multi-file.el and multi-file-sub.el files.
---
 .../package-resources/multi-file-0.2.3.tar    | Bin 20480 -> 20480 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/test/lisp/emacs-lisp/package-resources/multi-file-0.2.3.tar b/test/lisp/emacs-lisp/package-resources/multi-file-0.2.3.tar
index 2f1c5e93df1d956aaaa5ebcb6191fa98c20beb2c..b98211dedfd2c189210f87a64ab8c385a11e5e4f 100644
GIT binary patch
delta 273
zcmZozz}T>WaYGH0q5=dMn;4lX7#bOx85x?Gm>8HdC>WX=8k;dF7)&-~OxeuHY{4j}
zpsS^;kds=GnVguTo0OTCl9`uoRRR*_;<C1$EGQw&rlVkFU}UyAfMo*vB%T_W;YP;B
z2Iz*H8zKznwI<DQXXee*1ihFxiL?kw8W|d)8*OH0jBqz2qb%6ndHK3Yl_jaV$@#ej
TnK`Le3Q&h{(s;<YNJ|X>n3zB~

delta 182
zcmZozz}T>WaYGH0q5%XL8=ILi7#bOx85x?Gm>8Hd7#NxwnHe%D7)&-~OxeuHY{AIF
z#bs?hSx`b`b0JGV`$PqWNjx=^YeYCCjm!<uw3->1AhhyYqiA(v-n>oFiwUTIlSqq@
jq@k&?0<ygdhNfm_=1_YlGcx|)EU)p9aiW6!A}uullj|wQ


From 09a90f0e902078208e1b1e7c488d10c0d5a9d858 Mon Sep 17 00:00:00 2001
From: Chris Roberts <git@chobert.org>
Date: Sun, 26 Apr 2026 15:28:29 +0200
Subject: [PATCH 240/463] sqlite-close: no-op for already closed connections

This behavior is more expected than throwing an error,
as passing NULL (closed db connection) to 'sqlite3_close'
is a "harmless no-op" according to the documentation.
* src/sqlite.c (sqlite-close): Ignore already closed connections.
(Bug#80908)

Copyright-paperwork-exempt: yes
---
 src/sqlite.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/sqlite.c b/src/sqlite.c
index 244bb7bb027..97399339817 100644
--- a/src/sqlite.c
+++ b/src/sqlite.c
@@ -330,6 +330,11 @@ DEFUN ("sqlite-close", Fsqlite_close, Ssqlite_close, 1, 1, 0,
        doc: /* Close the sqlite database DB.  */)
   (Lisp_Object db)
 {
+  /* Do nothing when the connection is already closed.
+     This aligns with the behavior of sqlite3_close. */
+  if (SQLITE (db) && !XSQLITE (db)->db)
+    return Qt;
+
   check_sqlite (db, false);
   sqlite3_close (XSQLITE (db)->db);
   XSQLITE (db)->db = NULL;

From 5cee4fa0ff4bc5dd5da2fb4063cf04fa4b39bcc0 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 27 Apr 2026 13:47:17 +0300
Subject: [PATCH 241/463] ; Fix last change

* etc/NEWS: Announce the change in 'sqlite-close'.
* src/sqlite.c (Fsqlite_close): Fix commentary.
(Bug#80908).
---
 etc/NEWS     | 2 ++
 src/sqlite.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/etc/NEWS b/etc/NEWS
index abe49005af8..bfc475c5704 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3605,6 +3605,8 @@ normal file name starts with "file:", you can disable the URI
 recognition by invoking 'sqlite-open' with the new optional argument
 DISABLE-URI non-nil.
 
+*** 'sqlite-close' now does nothing if the connection is already closed.
+
 ** GUD
 
 +++
diff --git a/src/sqlite.c b/src/sqlite.c
index 97399339817..425a39d76dd 100644
--- a/src/sqlite.c
+++ b/src/sqlite.c
@@ -331,7 +331,7 @@ DEFUN ("sqlite-close", Fsqlite_close, Ssqlite_close, 1, 1, 0,
   (Lisp_Object db)
 {
   /* Do nothing when the connection is already closed.
-     This aligns with the behavior of sqlite3_close. */
+     This aligns with the behavior of 'sqlite3_close' itself.  */
   if (SQLITE (db) && !XSQLITE (db)->db)
     return Qt;
 

From f293becdd66b8620f22f6f4c1bcfec4575452650 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 27 Apr 2026 13:57:06 +0300
Subject: [PATCH 242/463] ; Fix minor issues in SQLite docs

* doc/lispref/text.texi (Database): Update description of
'sqlite-close'.  (Bug#80908)
* etc/NEWS: Fix SQLite entries.
---
 doc/lispref/text.texi | 4 +++-
 etc/NEWS              | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index c3436570498..22bce370197 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -5438,7 +5438,9 @@ database object.  The database object returned by the
 @defun sqlite-close db
 Close the database @var{db}.  It's usually not necessary to call this
 function explicitly---the database will automatically be closed if
-Emacs shuts down or the database object is garbage collected.
+Emacs shuts down or the database object is garbage collected.  If the
+connection identified by @var{db} is already closed, this function does
+nothing.
 @end defun
 
 @defun sqlite-execute db statement &optional values
diff --git a/etc/NEWS b/etc/NEWS
index bfc475c5704..c6f7ffe2a1e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3599,12 +3599,14 @@ provide more accurate warnings from byte compilation.
 The new optional argument READONLY to 'sqlite-open' function allows to
 open an existing database only for reading.
 
++++
 *** 'sqlite-open' now recognizes 'file://' URIs as well as file names.
 The 'file://' URIs are supported by default.  In the unusual case that a
 normal file name starts with "file:", you can disable the URI
 recognition by invoking 'sqlite-open' with the new optional argument
 DISABLE-URI non-nil.
 
++++
 *** 'sqlite-close' now does nothing if the connection is already closed.
 
 ** GUD

From 91db34868ab374195c5639e4cb3a88fa1cbee16d Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Mon, 27 Apr 2026 13:23:30 +0100
Subject: [PATCH 243/463] VC Annotate for Mercurial repositories shows
 changeset hashes

* lisp/vc/vc-hg.el (vc-hg-annotate-show-revision-numbers): New
option.
(vc-hg-annotate-command): If it's nil, show changeset hashes not
revision numbers by passing "-c" not "-n" to 'hg annotate'.
(vc-hg-annotate-re): Update.
* etc/NEWS: Document the change.
---
 etc/NEWS         |  6 ++++++
 lisp/vc/vc-hg.el | 15 +++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index c6f7ffe2a1e..4f6dec10e99 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2802,6 +2802,12 @@ To undo this change you can use
 This command prints the log of VC changes to the current fileset on
 another branch.
 
+---
+*** VC Annotate for Mercurial repositories shows changeset hashes.
+To restore showing revision numbers instead of changeset hashes,
+customize the new option vc-hg-annotate-show-revision-numbers to
+non-nil.
+
 +++
 *** New commands to handle repositories with multiple working trees.
 Some VCS support more than one working tree with the same backing
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 8d0239604a7..588d24e36d6 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -601,10 +601,17 @@ This requires hg 4.4 or later, for the \"-L\" option of \"hg log\"."
                    table (lambda () (vc-hg-revision-table files)))))
     table))
 
+(defcustom vc-hg-annotate-show-revision-numbers nil
+  "If non-nil, \\[vc-annotate] shows revision numbers for Hg repositories.
+The default when this is nil is to show changeset hashes."
+  :type 'boolean
+  :version "31.1")
+
 (defun vc-hg-annotate-command (file buffer &optional revision)
   "Execute \"hg annotate\" on FILE, inserting the contents in BUFFER.
 Optional arg REVISION is a revision to annotate from."
-  (apply #'vc-hg-command buffer 'async file "annotate" "-dq" "-n"
+  (apply #'vc-hg-command buffer 'async file "annotate" "-dq"
+         (if vc-hg-annotate-show-revision-numbers "-n" "-c")
 	 (append (vc-switches 'hg 'annotate)
                  (if revision (list (concat "-r" revision))))))
 
@@ -619,9 +626,9 @@ Optional arg REVISION is a revision to annotate from."
 ;;   b56girard 114590 2012-03-13:
 (defconst vc-hg-annotate-re
   (concat
-   "^\\(?: *[^ ]+ +\\)?\\([0-9]+\\) "   ;User and revision.
-   "\\([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]\\)" ;Date.
-   "\\(?: +\\([^:]+\\)\\)?:"))                        ;Filename.
+   "^\\(?: *[^ ]+ +\\)?\\([[:xdigit:]]+\\) "          ; User and revision.
+   "\\([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]\\)" ; Date.
+   "\\(?: +\\([^:]+\\)\\)?:"))                        ; Filename.
 
 (defun vc-hg-annotate-time ()
   (when (looking-at vc-hg-annotate-re)

From 525b7b14243cd15d26dfe4606e4540643579c543 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Mon, 27 Apr 2026 13:35:31 +0100
Subject: [PATCH 244/463] Rename outstanding changes commands to "unintegrated
 changes"

* doc/emacs/vc1-xtra.texi (Outstanding Changes): Rename node
from this ...
(Unintegrated Changes): ... to this (bug#80434).  References
changed.
* etc/NEWS: Document the change.
* lisp/vc/vc-git.el (vc-git-topic-outgoing-base)
(vc-git-log-view-mode):
* lisp/vc/vc-hg.el (vc-hg-print-log, vc-hg-log-view-mode):
* lisp/vc/vc.el (vc-root-diff-outstanding, vc-diff-outstanding)
(vc-log-outstanding, vc-root-log-outstanding):
Rename from these ...
(vc-root-diff-unintegrated, vc-diff-unintegrated)
(vc-log-unintegrated, vc-root-log-unintegrated):
... to these (bug#80434).  All uses changed.
(vc-log-view-type): Rename 'log-outstanding' type to
'log-unintegrated'.  All uses changed.
---
 doc/emacs/emacs.texi       |  2 +-
 doc/emacs/maintaining.texi |  2 +-
 doc/emacs/vc1-xtra.texi    | 58 +++++++++++++++++++-------------------
 etc/NEWS                   | 10 +++----
 lisp/vc/vc-dir.el          |  8 +++---
 lisp/vc/vc-git.el          |  4 +--
 lisp/vc/vc-hg.el           |  4 +--
 lisp/vc/vc-hooks.el        |  8 +++---
 lisp/vc/vc.el              | 42 +++++++++++++--------------
 9 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 166256362ab..2071aaf3878 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -872,7 +872,7 @@ Miscellaneous Commands and Features of VC
 * VC Delete/Rename::      Deleting and renaming version-controlled files.
 * Revision Tags::         Symbolic names for revisions.
 * Merge Bases::           The most recent revision existing on both branches.
-* Outstanding Changes::   Diffs including all outstanding changes on a branch.
+* Unintegrated Changes::  Diffs including all unintegrated changes on a branch.
 * Other Working Trees::   Multiple sets of workfiles.
 * Version Headers::       Inserting version control headers into working files.
 * Editing VC Commands::   Editing the VC shell commands that Emacs will run.
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 697a13dbe7b..b482f5658c3 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1719,7 +1719,7 @@ Do an incremental regular expression search on the fileset
 Apart from acting on multiple files, these commands behave much like
 their single-buffer counterparts (@pxref{Search}).
 
-@c Outstanding changes commands under 'T' are not mentioned because
+@c Unintegrated changes commands under 'T' are not mentioned because
 @c these are an advanced feature documented only in vc1-xtra.texi.
 
   The VC Directory buffer additionally defines some branch-related
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 07dd61b32a0..1fc098c0693 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -11,17 +11,17 @@
   This section explains the less-frequently-used features of VC.
 
 @menu
-* Change Logs and VC::  Generating a change log file from log entries.
-* VC Delete/Rename::    Deleting and renaming version-controlled files.
-* Revision Tags::       Symbolic names for revisions.
-* Merge Bases::         The most recent revision existing on both branches.
-* Outstanding Changes:: Diffs including all outstanding changes on a branch.
-* Other Working Trees:: Multiple sets of workfiles.
-* Version Headers::     Inserting version control headers into working files.
-* Editing VC Commands:: Editing the VC shell commands that Emacs will run.
-* Preparing Patches::   Preparing and composing patches from within VC.
-* VC Auto-Reverting::   Updating buffer contents after VCS operations.
-* Rewinding Branches::  Commands to delete revisions from ends of branches.
+* Change Logs and VC::   Generating a change log file from log entries.
+* VC Delete/Rename::     Deleting and renaming version-controlled files.
+* Revision Tags::        Symbolic names for revisions.
+* Merge Bases::          The most recent revision existing on both branches.
+* Unintegrated Changes:: Diffs including all unintegrated changes on a branch.
+* Other Working Trees::  Multiple sets of workfiles.
+* Version Headers::      Inserting version control headers into working files.
+* Editing VC Commands::  Editing the VC shell commands that Emacs will run.
+* Preparing Patches::    Preparing and composing patches from within VC.
+* VC Auto-Reverting::    Updating buffer contents after VCS operations.
+* Rewinding Branches::   Commands to delete revisions from ends of branches.
 @end menu
 
 @node Change Logs and VC
@@ -293,27 +293,27 @@ on the target branch if you were to merge the source branch into it, and
 @kbd{C-x v M L} shows you a log of the changes on the source branch not
 yet merged into the target branch.
 
-@node Outstanding Changes
-@subsubsection Commands to see all outstanding changes
-@cindex outstanding changes
+@node Unintegrated Changes
+@subsubsection Commands to see all unintegrated changes
+@cindex unintegrated changes
 
 @table @kbd
 @item C-x v T =
 Display diffs of changes to the VC fileset since the merge base of this
-branch and its upstream counterpart (@code{vc-diff-outstanding}).
+branch and its upstream counterpart (@code{vc-diff-unintegrated}).
 
 @item C-x v T D
 Display a diff of all changes since the merge base of this branch and
-its upstream counterpart (@code{vc-root-diff-outstanding}).
+its upstream counterpart (@code{vc-root-diff-unintegrated}).
 
 @item C-x v T l
 Display log messages for changes to the VC fileset since the merge base
 of this branch and its upstream counterpart
-(@code{vc-log-outstanding}).
+(@code{vc-log-unintegrated}).
 
 @item C-x v T L
 Display log messages for all changes since the merge base of this branch
-and its upstream counterpart (@code{vc-root-log-outstanding}).
+and its upstream counterpart (@code{vc-root-log-unintegrated}).
 @end table
 
 For decentralized version control systems (@pxref{VCS Repositories}),
@@ -324,21 +324,21 @@ both when working on a single branch and when developing features on a
 separate branch (@pxref{Branches}).  These two cases are conceptually
 distinct, and so we will introduce them separately.
 
-First, consider working on a single branch.  @dfn{Outstanding changes}
+First, consider working on a single branch.  @dfn{Unintegrated changes}
 are those which you haven't yet pushed upstream.  This includes both
 unpushed commits and uncommitted changes in your working tree.  In many
 cases the reason these changes are not pushed yet is that they are not
 finished: the changes committed so far don't make sense in isolation.
 
 @kindex C-x v T =
-@findex vc-diff-outstanding
+@findex vc-diff-unintegrated
 @kindex C-x v T D
-@findex vc-root-diff-outstanding
-Type @kbd{C-x v T D} (@code{vc-root-diff-outstanding}) to display a
+@findex vc-root-diff-unintegrated
+Type @kbd{C-x v T D} (@code{vc-root-diff-unintegrated}) to display a
 summary of all these changes, committed and uncommitted.  This summary
 is in the form of a diff of what committing and pushing (@pxref{Pulling
 / Pushing}) all these changes would do to the upstream repository.  You
-can use @kbd{C-x v T =} (@code{vc-diff-outstanding}) instead to limit
+can use @kbd{C-x v T =} (@code{vc-diff-unintegrated}) instead to limit
 the display of changes to the current VC fileset.  (The difference
 between @w{@kbd{C-x v T D}} and @w{@kbd{C-x v T =}} is like the
 difference between @kbd{C-x v D} and @kbd{C-x v =} (@pxref{Old
@@ -350,13 +350,13 @@ commands, you can use a prefix argument to specify a particular upstream
 location.}
 
 @kindex C-x v T l
-@findex vc-log-outstanding
+@findex vc-log-unintegrated
 @kindex C-x v T L
-@findex vc-root-log-outstanding
-Type @kbd{C-x v T L} (@code{vc-root-log-outstanding}) to display a
+@findex vc-root-log-unintegrated
+Type @kbd{C-x v T L} (@code{vc-root-log-unintegrated}) to display a
 summary of the same changes in the form of a revision log; this does not
 include uncommitted changes.  You can use @kbd{C-x v T l}
-(@code{vc-log-outstanding}) instead to limit the display of changes to
+(@code{vc-log-unintegrated}) instead to limit the display of changes to
 the current VC fileset.
 
 Second, consider developing a feature on a separate branch.  Call this
@@ -369,11 +369,11 @@ or other branches are repeatedly merged into.} and call the branch from
 which the topic branch was originally created the @dfn{trunk} or
 @dfn{development trunk}.
 
-In this case, outstanding changes is a more specific notion than just
+In this case, unintegrated changes is a more specific notion than just
 unpushed and uncommitted changes on the topic branch.  You're not
 finished sharing changes with your collaborators until they have been
 merged into the trunk, and pushed.  Therefore, in this example,
-outstanding changes are those which haven't yet been integrated into the
+unintegrated changes are those which haven't yet been included in the
 upstream repository's development trunk.  That means committed changes
 on the topic branch that haven't yet been merged into the trunk, plus
 uncommitted changes.
diff --git a/etc/NEWS b/etc/NEWS
index 4f6dec10e99..b5c09ed78e0 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2998,12 +2998,12 @@ include were committed and will be pushed.
 current VC fileset.
 
 +++
-*** New commands to report information about outstanding changes.
-'C-x v T =' ('vc-diff-outstanding') and 'C-x v T D'
-('vc-root-diff-outstanding') report diffs of changes since the merge
+*** New commands to report information about unintegrated changes.
+'C-x v T =' ('vc-diff-unintegrated') and 'C-x v T D'
+('vc-root-diff-unintegrated') report diffs of changes since the merge
 base with the remote branch, including uncommitted changes.
-'C-x v T l' ('vc-log-outstanding') and 'C-x v T L'
-('vc-root-log-outstanding') show the corresponding revision logs.
+'C-x v T l' ('vc-log-unintegrated') and 'C-x v T L'
+('vc-root-log-unintegrated') show the corresponding revision logs.
 These are useful to view all outstanding (unmerged, unpushed) changes on
 the current branch.  They are also available as 'T =', 'T D', 'T l' and
 'T L' in VC Directory buffers.
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 77329cd6c26..8094148c051 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -408,10 +408,10 @@ an \\+`up-to-date' or \\+`ignored' file."
     (define-key map (kbd "M-s a M-C-s") #'vc-dir-isearch-regexp)
     (define-key map "G" #'vc-dir-ignore)
     (define-key map "@" #'vc-revert)
-    (define-key map "Tl" #'vc-log-outstanding)
-    (define-key map "TL" #'vc-root-log-outstanding)
-    (define-key map "T=" #'vc-diff-outstanding)
-    (define-key map "TD" #'vc-root-diff-outstanding)
+    (define-key map "Tl" #'vc-log-unintegrated)
+    (define-key map "TL" #'vc-root-log-unintegrated)
+    (define-key map "T=" #'vc-diff-unintegrated)
+    (define-key map "TD" #'vc-root-diff-unintegrated)
     (define-key map "V" #'vc-dir-root-next-action)
 
     (let ((branch-map (make-sparse-keymap)))
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index db7ff66468a..6b9530c9570 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -820,7 +820,7 @@ This works by considering the current branch as a topic branch
 (whether or not it actually is).
 
 If there is a distinct push remote for this branch, assume the target
-for outstanding changes is the tracking branch, and return that.
+for unintegrated changes is the tracking branch, and return that.
 
 Otherwise, fall back to the following algorithm, which requires that the
 corresponding trunk exists as a local branch.  Find all merge bases
@@ -1980,7 +1980,7 @@ log entries."
                 "^commit +\\([0-9a-z]+\\)"))
   ;; Allow expanding short log entries.
   (when (memq vc-log-view-type
-              '(short log-outgoing log-incoming log-outstanding mergebase))
+              '(short log-outgoing log-incoming log-unintegrated mergebase))
     (setq truncate-lines t)
     (setq-local log-view-expanded-log-entry-function
                 'vc-git-expanded-log-entry))
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 588d24e36d6..af143a4b1da 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -447,7 +447,7 @@ the log starting from that revision."
              (cond ((not (stringp limit))
                     (format "-r%s:0" start))
                    ((memq vc-log-view-type '(log-outgoing
-                                             log-outstanding))
+                                             log-unintegrated))
                     (format "-rreverse(only(%s, %s))" start limit))
                    (t
                     (format "-r%s:%s & !%s" start limit limit)))
@@ -472,7 +472,7 @@ the log starting from that revision."
 (define-derived-mode vc-hg-log-view-mode log-view-mode "Hg-Log-View"
   (require 'add-log) ;; we need the add-log faces
   (let ((shortp (memq vc-log-view-type
-                      '(short log-incoming log-outgoing log-outstanding))))
+                      '(short log-incoming log-outgoing log-unintegrated))))
    (setq-local log-view-file-re regexp-unmatchable)
    (setq-local log-view-per-file-logs nil)
    (setq-local log-view-message-re
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 2dcae7362b7..d5f87f859d9 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -1036,10 +1036,10 @@ In the latter case, VC mode is deactivated for this buffer."
   "O"   #'vc-root-log-outgoing
   "M L" #'vc-log-mergebase
   "M D" #'vc-diff-mergebase
-  "T l" #'vc-log-outstanding
-  "T L" #'vc-root-log-outstanding
-  "T =" #'vc-diff-outstanding
-  "T D" #'vc-root-diff-outstanding
+  "T l" #'vc-log-unintegrated
+  "T L" #'vc-root-log-unintegrated
+  "T =" #'vc-diff-unintegrated
+  "T D" #'vc-root-diff-unintegrated
   "m"   #'vc-merge
   "r"   #'vc-retrieve-tag
   "s"   #'vc-create-tag
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index a01a65d9c6c..e083ea88da0 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -638,7 +638,7 @@
 ;;   determination can be made.
 ;;
 ;;   What counts as a longer-lived or shorter-lived branch for VC is
-;;   explained in Info node `(emacs)Outstanding Changes' and in the
+;;   explained in Info node `(emacs)Unintegrated Changes' and in the
 ;;   docstring for `vc-trunk-or-topic-p'.
 ;;
 ;; - topic-outgoing-base ()
@@ -648,7 +648,7 @@
 ;;   branch.  That is, on the assumption that the current branch is a
 ;;   shorter-lived branch which will later be merged into a longer-lived
 ;;   branch, return, if possible, the upstream location to which those
-;;   changes will be merged.  See Info node `(emacs) Outstanding
+;;   changes will be merged.  See Info node `(emacs) Unintegrated
 ;;   Changes'.  The return value should be suitable for passing to the
 ;;   incoming-revision backend function as its UPSTREAM-LOCATION
 ;;   argument.  For example, for Git the value will typically be of the
@@ -3140,7 +3140,7 @@ to.  When called interactively with a prefix argument, prompt for
 UPSTREAM-LOCATION.  In some version control systems UPSTREAM-LOCATION
 can be a remote branch name.
 
-This command is like `vc-root-diff-outstanding' except that it does
+This command is like `vc-root-diff-unintegrated' except that it does
 not include uncommitted changes.
 
 See `vc-use-incoming-outgoing-prefixes' regarding giving this command a
@@ -3159,7 +3159,7 @@ can be a remote branch name.
 When called from Lisp optional argument FILESET overrides the VC
 fileset.
 
-This command is like `vc-diff-outstanding' except that it does not
+This command is like `vc-diff-unintegrated' except that it does not
 include uncommitted changes.
 
 See `vc-use-incoming-outgoing-prefixes' regarding giving this command a
@@ -3359,8 +3359,8 @@ BACKEND is the VC backend."
 
 (defun vc--outgoing-base (backend)
   "Return an outgoing base for the current branch under VC backend BACKEND.
-The outgoing base is the upstream location for which outstanding changes
-on this branch are destined once they are no longer outstanding.
+The outgoing base is the upstream location for which unintegrated
+changes on this branch are destined once they are integrated.
 
 There are two stages to determining the outgoing base.
 First we decide whether we think this is a shorter-lived or a
@@ -3397,7 +3397,7 @@ REFRESH is passed on to `vc--incoming-revision'."
                                           refresh)))
 
 ;;;###autoload
-(defun vc-root-diff-outstanding (&optional upstream-location)
+(defun vc-root-diff-unintegrated (&optional upstream-location)
   "Report diff of all changes since the merge base with UPSTREAM-LOCATION.
 The merge base with UPSTREAM-LOCATION means the common ancestor of the
 working revision and UPSTREAM-LOCATION.
@@ -3421,10 +3421,10 @@ topic branch.  (With a double prefix argument, this command is like
 `vc-diff-outgoing' except that it includes uncommitted changes.)"
   (interactive (list (vc--maybe-read-outgoing-base)))
   (vc--with-backend-in-rootdir "VC root-diff"
-    (vc-diff-outstanding upstream-location `(,backend (,rootdir)))))
+    (vc-diff-unintegrated upstream-location `(,backend (,rootdir)))))
 
 ;;;###autoload
-(defun vc-diff-outstanding (&optional upstream-location fileset)
+(defun vc-diff-unintegrated (&optional upstream-location fileset)
   "Report changes to VC fileset since the merge base with UPSTREAM-LOCATION.
 
 The merge base with UPSTREAM-LOCATION means the common ancestor of the
@@ -3460,7 +3460,7 @@ When called from Lisp, optional argument FILESET overrides the fileset."
                       (called-interactively-p 'interactive))))
 
 ;;;###autoload
-(defun vc-log-outstanding (&optional upstream-location fileset)
+(defun vc-log-unintegrated (&optional upstream-location fileset)
   "Show log for the VC fileset since the merge base with UPSTREAM-LOCATION.
 The merge base with UPSTREAM-LOCATION means the common ancestor of the
 working revision and UPSTREAM-LOCATION.
@@ -3490,10 +3490,10 @@ When called from Lisp, optional argument FILESET overrides the fileset."
     (vc-print-log-internal backend (cadr fileset) nil nil
                            (vc--outgoing-base-mergebase backend
                                                         upstream-location)
-                           'log-outstanding)))
+                           'log-unintegrated)))
 
 ;;;###autoload
-(defun vc-root-log-outstanding (&optional upstream-location)
+(defun vc-root-log-unintegrated (&optional upstream-location)
   "Show log of revisions since the merge base with UPSTREAM-LOCATION.
 The merge base with UPSTREAM-LOCATION means the common ancestor of the
 working revision and UPSTREAM-LOCATION.
@@ -3515,7 +3515,7 @@ i.e., treat this branch as a trunk branch even if Emacs thinks it is a
 topic branch."
   (interactive (list (vc--maybe-read-outgoing-base)))
   (vc--with-backend-in-rootdir "VC revision log"
-    (vc-log-outstanding upstream-location `(,backend (,rootdir)))))
+    (vc-log-unintegrated upstream-location `(,backend (,rootdir)))))
 
 (declare-function ediff-load-version-control "ediff" (&optional silent))
 (declare-function ediff-vc-internal "ediff-vers"
@@ -4209,14 +4209,14 @@ LIMIT can also be a string, which means the revision before which to stop."
   "Set this to record the type of VC log shown in the current buffer.
 Supported values are:
 
-  `short'           -- short log form, one line for each commit
-  `long'            -- long log form, including full log message and author
-  `with-diff'       -- log including diffs
-  `log-outgoing'    -- log of changes to be pushed to upstream
-  `log-incoming'    -- log of changes to be brought by pulling from upstream
-  `log-outstanding' -- log of changes you've not yet finished sharing
-  `log-search'      -- log entries matching a pattern; shown in long format
-  `mergebase'       -- log created by `vc-log-mergebase'.")
+  `short'            -- short log form, one line for each commit
+  `long'             -- long log form, including full log message and author
+  `with-diff'        -- log including diffs
+  `log-outgoing'     -- log of changes to be pushed to upstream
+  `log-incoming'     -- log of changes to be brought by pulling from upstream
+  `log-unintegrated' -- log of changes you've not yet finished sharing
+  `log-search'       -- log entries matching a pattern; shown in long format
+  `mergebase'        -- log created by `vc-log-mergebase'.")
 (put 'vc-log-view-type 'permanent-local t)
 (defvar vc-sentinel-movepoint)
 

From 09c5fb7631246815c14347ab8a0f75d85a39f021 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Mon, 27 Apr 2026 13:36:12 +0100
Subject: [PATCH 245/463] ; Regenerate ldefs-boot.el.

---
 lisp/ldefs-boot.el | 199 +++++++++++++++++++++++++++++++++------------
 1 file changed, 147 insertions(+), 52 deletions(-)

diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index d84e2340dbd..d338e4f981a 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -5134,9 +5134,20 @@ Otherwise, it saves all modified buffers without asking.")
 (defvar compilation-search-path '(nil)
 "List of directories to search for source files named in error messages.
 Elements should be directory names, not file names of directories.
-The value nil as an element means to try the default directory.")
+The value nil as an element means to try the default directory.
+
+For directory-local customizations, prefer
+`compilation-search-extra-path' instead.")
 (custom-autoload 'compilation-search-path "compile" t)
-(defvar compile-command (format "make -k -j%d " (ceiling (num-processors) 1.5))
+(defvar compilation-search-extra-path nil
+"List of extra directories to search for source files named in error messages.
+Elements in this list will be searched before those in
+`compilation-search-path'.
+
+The buffer-local value of this variable will be inherited by the
+compilation buffer.")
+(custom-autoload 'compilation-search-extra-path "compile" t)
+(defcustom compile-command (format "make -k -j%d " (ceiling (num-processors) 1.5))
 "Last shell command used to do a compilation; default for next compilation.
 
 Sometimes it is useful for files to supply local values for this variable.
@@ -5152,7 +5163,7 @@ You might also use mode hooks to specify it in certain modes, like this:
 			  (shell-quote-argument
 			    (file-name-sans-extension buffer-file-name))))))))
 
-It's often useful to leave a space at the end of the value.")
+It's often useful to leave a space at the end of the value." :group 'compilation :initialize #'custom-initialize-delay :type 'string)
 (custom-autoload 'compile-command "compile" t)
 (put 'compile-command 'safe-local-variable (lambda (a) (and (stringp a) (if (boundp 'compilation-read-command) compilation-read-command t))))
 (defvar compilation-disable-input nil
@@ -5262,6 +5273,8 @@ evaluate the variable `compilation-shell-minor-mode'.
 The mode's hook is called both when the mode is enabled and when it is
 disabled.
 
+\\{compilation-shell-minor-mode-map}
+
 (fn &optional ARG)" t)
 (autoload 'compilation-minor-mode "compile"
 "Toggle Compilation minor mode.
@@ -5284,6 +5297,8 @@ evaluate the variable `compilation-minor-mode'.
 The mode's hook is called both when the mode is enabled and when it is
 disabled.
 
+\\{compilation-minor-mode-map}
+
 (fn &optional ARG)" t)
 (autoload 'compilation-next-error-function "compile"
 "Advance to the next error message and visit the file where the error was.
@@ -6368,6 +6383,26 @@ even if it doesn't match the type.)
 (autoload 'setopt--set "cus-edit"
 "
 
+(fn VARIABLE VALUE)")
+(autoload 'setopt-local "cus-edit"
+"Set buffer local VARIABLE/VALUE pairs, and return the final VALUE.
+This is like `setq-local', but is meant for user options instead of
+plain variables.  This means that `setopt-local' will execute any
+`custom-set' form associated with VARIABLE.  Unlike `setopt',
+`setopt-local' does not affect a user option's global value.
+
+Note that `setopt-local' will emit a warning if the type of a VALUE does
+not match the type of the corresponding VARIABLE as declared by
+`defcustom'.  (VARIABLE will be assigned the value even if it doesn't
+match the type.)
+
+Signal an error if a `custom-set' form does not support the
+`buffer-local' argument.
+
+(fn [VARIABLE VALUE]...)" nil t)
+(autoload 'setopt--set-local "cus-edit"
+"
+
 (fn VARIABLE VALUE)")
 (autoload 'customize-save-variable "cus-edit"
 "Set the default for VARIABLE to VALUE, and save it for future sessions.
@@ -8059,6 +8094,10 @@ Type \\[describe-mode] after entering Dired for more info.
 
 If DIRNAME is already in a Dired buffer, that buffer is used without refresh.
 
+(fn DIRNAME &optional SWITCHES)" t)
+(autoload 'dired-from-menubar "dired"
+"Edit an existing directory.
+
 (fn DIRNAME &optional SWITCHES)" t)
  (keymap-set ctl-x-4-map "d" #'dired-other-window)
 (autoload 'dired-other-window "dired"
@@ -9923,7 +9962,7 @@ Argument BOTTOM is the bottom margin in number of lines or percent of window.
 
 ;;; Generated autoloads from progmodes/eglot.el
 
-(push '(eglot 1 21) package--builtin-versions)
+(push '(eglot 1 23) package--builtin-versions)
 (define-obsolete-function-alias 'eglot-update #'eglot-upgrade-eglot "29.1")
 (autoload 'eglot "eglot"
 "Start LSP server for PROJECT's buffers under MANAGED-MAJOR-MODES.
@@ -9985,7 +10024,7 @@ needed.")
 "Update Eglot to latest version.
 
 (fn &rest _)" t)
-(put 'eglot-workspace-configuration 'safe-local-variable #'listp)
+(put 'eglot-workspace-configuration 'safe-local-variable (lambda (v) (and (listp v) (not (functionp v)))))
 (put 'eglot--debbugs-or-github-bug-uri 'bug-reference-url-format t)
 (defun eglot--debbugs-or-github-bug-uri nil (format (if (string= (match-string 2) "github") "https://github.com/joaotavora/eglot/issues/%s" "https://debbugs.gnu.org/%s") (match-string 3)))
 (register-definition-prefixes "eglot" '("eglot-"))
@@ -10643,9 +10682,13 @@ Message buffer where you can explain more about the patch.
  (autoload 'emoji-recent "emoji" nil t)
  (autoload 'emoji-search "emoji" nil t)
 (autoload 'emoji-list "emoji"
-"List emojis and allow selecting and inserting one of them.
+"List Emoji and allow selecting and inserting one of them.
+If you are displaying Emoji on a text-only terminal, and some
+of them look incorrect, or there are display artifacts when
+scrolling the display, turn off `auto-composition-mode'.
+
 Select the emoji by typing \\<emoji-list-mode-map>\\[emoji-list-select] on its picture.
-The glyph will be inserted into the buffer that was current
+The selected glyph will be inserted into the buffer that was current
 when the command was invoked." t)
 (autoload 'emoji-describe "emoji"
 "Display the name of the grapheme cluster composed from GLYPH.
@@ -13808,6 +13851,8 @@ evaluate the variable `flymake-mode'.
 The mode's hook is called both when the mode is enabled and when it is
 disabled.
 
+\\{flymake-mode-map}
+
 (fn &optional ARG)" t)
 (autoload 'flymake-mode-on "flymake"
 "Turn Flymake mode on.")
@@ -15004,6 +15049,9 @@ DELAY is a string, giving the length of the time.  Possible values are:
 * YYYY-MM-DD for a specific date.  The time of day is given by the
   variable `gnus-delay-default-hour', minute and second are zero.
 
+* YYYY-MM-DD hh:mm(:ss) for a specific date and time.  If seconds are left
+  out, they will be zero.
+
 * hh:mm for a specific time.  Use 24h format.  If it is later than this
   time, then the deadline is tomorrow, else today.
 
@@ -17071,6 +17119,24 @@ disabled.
 (defvar hs-special-modes-alist nil)
 (autoload 'turn-off-hideshow "hideshow"
 "Unconditionally turn off `hs-minor-mode'.")
+(autoload 'hs-indentation-mode "hideshow"
+"Toggle indentation-based hiding/showing.
+
+This is a minor mode.  If called interactively, toggle the
+`Hs-Indentation mode' mode.  If the prefix argument is positive, enable
+the mode, and if it is zero or negative, disable the mode.
+
+If called from Lisp, toggle the mode if ARG is `toggle'.  Enable the
+mode if ARG is nil, omitted, or is a positive number.  Disable the mode
+if ARG is a negative number.
+
+To check whether the minor mode is enabled in the current buffer,
+evaluate the variable `hs-indentation-mode'.
+
+The mode's hook is called both when the mode is enabled and when it is
+disabled.
+
+(fn &optional ARG)" t)
 (autoload 'hs-minor-mode "hideshow"
 "Minor mode to selectively hide/show code and comment blocks.
 
@@ -19051,6 +19117,7 @@ quoted using shell quote syntax.
 
 ;;; Generated autoloads from info.el
 
+(put 'Info-documentlanguage 'safe-local-variable #'symbolp)
 (defvar Info-default-directory-list nil
 "Default list of directories to search for Info documentation files.
 They are searched in the order they are given in the list.
@@ -19985,7 +20052,7 @@ penultimate step during initialization.
 
 ;;; Generated autoloads from jsonrpc.el
 
-(push '(jsonrpc 1 0 27) package--builtin-versions)
+(push '(jsonrpc 1 0 28) package--builtin-versions)
 (register-definition-prefixes "jsonrpc" '("jsonrpc-"))
 
 
@@ -20167,16 +20234,14 @@ With \\[universal-argument], call second macro in macro ring.
 "Call last keyboard macro, ending it first if currently being defined.
 With numeric prefix ARG, repeat macro that many times.
 Zero argument means repeat until there is an error.
+If triggered via a mouse EVENT, moves point to the position clicked
+with the mouse before calling the macro.
 
 To give a macro a name, so you can call it even after defining other
 macros, use \\[kmacro-name-last-macro].
 
-(fn ARG &optional NO-REPEAT)" t)
-(autoload 'kmacro-end-call-mouse "kmacro"
-"Move point to the position clicked with the mouse and call last kbd macro.
-If kbd macro currently being defined end it before activating it.
-
-(fn EVENT)" t)
+(fn ARG &optional NO-REPEAT EVENT)" t)
+(define-obsolete-function-alias 'kmacro-end-call-mouse #'kmacro-end-and-call-macro "31.1")
 (autoload 'kmacro "kmacro"
 "Create a `kmacro' for macro bound to symbol or key.
 KEYS should be a vector or a string that obeys `key-valid-p'.
@@ -20202,9 +20267,10 @@ Such a \"function\" cannot be called from Lisp, but it is a valid editor command
 
 ;;; Generated autoloads from language/korea-util.el
 
-(defvar default-korean-keyboard (if (string-search "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "")
+(defcustom default-korean-keyboard (if (string-search "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "")
 "The kind of Korean keyboard for Korean (Hangul) input method.
-\"\" for 2, \"3\" for 3, and \"3f\" for 3f.")
+\"\" for 2, \"3\" for 3, and \"3f\" for 3f." :initialize #'custom-initialize-delay :group 'korean :version "31.1" :type 'string)
+(custom-autoload 'default-korean-keyboard "korea-util" t)
 (autoload 'setup-korean-environment-internal "korea-util")
 (register-definition-prefixes "korea-util" '("exit-korean-environment" "isearch-" "korean-key-bindings" "quail-hangul-switch-" "toggle-korean-input-method"))
 
@@ -20358,9 +20424,13 @@ penultimate step during initialization." t)
 (push '(let-alist 1 0 6) package--builtin-versions)
 (autoload 'let-alist "let-alist"
 "Let-bind dotted symbols to their cdrs in ALIST and execute BODY.
-Dotted symbol is any symbol starting with a `.'.  Only those present
-in BODY are let-bound and this search is done at compile time.
-A number will result in a list index.
+Dotted symbol is any symbol starting with a `.'.  This macro creates
+let-bindings for dotted symbols that appear literally in BODY (whether
+or not they are actually used).  It does not create bindings for dotted
+symbols that are introdcued by macro-expansion in BODY.
+
+A symbol of the form `.foo.N' where N is a natural number refers to the
+Nth element of the value that ALIST associates to key `foo'.
 
 For instance, the following code
 
@@ -20372,7 +20442,7 @@ For instance, the following code
 
 essentially expands to
 
-  (let ((.title (nth 0 (cdr (assq \\='title alist))))
+  (let ((.title.0 (nth 0 (cdr (assq \\='title alist))))
         (.body  (cdr (assq \\='body alist)))
         (.site  (cdr (assq \\='site alist)))
         (.site.contents (cdr (assq \\='contents (cdr (assq \\='site alist))))))
@@ -23476,6 +23546,11 @@ step during initialization." t)
 
 (register-definition-prefixes "ob-core" '("org-"))
 
+
+;;; Generated autoloads from org/ob-csharp.el
+
+(register-definition-prefixes "ob-csharp" '("org-babel-"))
+
 
 ;;; Generated autoloads from org/ob-css.el
 
@@ -23484,7 +23559,7 @@ step during initialization." t)
 
 ;;; Generated autoloads from org/ob-ditaa.el
 
-(register-definition-prefixes "ob-ditaa" '("org-"))
+(register-definition-prefixes "ob-ditaa" '("ob-ditaa--ensure-jar-file" "org-"))
 
 
 ;;; Generated autoloads from org/ob-dot.el
@@ -23700,7 +23775,7 @@ ARG is the prefix argument received when calling interactively the function.
 
 ;;; Generated autoloads from org/oc-bibtex.el
 
-(register-definition-prefixes "oc-bibtex" '("org-cite-bibtex-export-"))
+(register-definition-prefixes "oc-bibtex" '("org-cite-bibtex-"))
 
 
 ;;; Generated autoloads from org/oc-csl.el
@@ -23865,7 +23940,7 @@ penultimate step during initialization." t)
 
 ;;; Generated autoloads from org/org.el
 
-(push '(org 9 7 11) package--builtin-versions)
+(push '(org 9 8 3) package--builtin-versions)
 (autoload 'org-babel-do-load-languages "org"
 "Load the languages defined in `org-babel-load-languages'.
 
@@ -23946,11 +24021,14 @@ If the file does not exist, throw an error.
 (fn PATH &optional IN-EMACS LINE SEARCH)")
 (autoload 'org-open-at-point-global "org"
 "Follow a link or a timestamp like Org mode does.
+Pass ARG to `org-link-open-to-string'.
 Also follow links and emails as seen by `thing-at-point'.
 This command can be called in any mode to follow an external
 link or a timestamp that has Org mode syntax.  Its behavior
 is undefined when called on internal links like fuzzy links.
-Raise a user error when there is nothing to follow." t)
+Raise a user error when there is nothing to follow.
+
+(fn &optional ARG)" t)
 (autoload 'org-offer-links-in-entry "org"
 "Offer links in the current entry and return the selected link.
 If there is only one link, return it.
@@ -25120,14 +25198,12 @@ installs takes precedence.
 (fn PACKAGE &optional REV BACKEND NAME)" t)
 (autoload 'package-vc-checkout "package-vc"
 "Clone the sources for PKG-DESC into DIRECTORY and visit that directory.
-Unlike `package-vc-install', this does not yet set up the package
-for use with Emacs; use `package-vc-install-from-checkout' for
-setting the package up after this function finishes.  Optional
-argument REV means to clone a specific version of the package; it
-defaults to the last version available from the package's
-repository.  If REV has the special value
-`:last-release' (interactively, the prefix argument), that stands
-for the last released version of the package.
+Unlike `package-vc-install', this does not yet set up the package for
+use with Emacs.  Optional argument REV means to clone a specific version
+of the package; it defaults to the last version available from the
+package's repository.  If REV has the special value
+`:last-release' (interactively, the prefix argument), that stands for
+the last released version of the package.
 
 (fn PKG-DESC DIRECTORY &optional REV)" t)
 (autoload 'package-vc-install-from-checkout "package-vc"
@@ -25140,7 +25216,7 @@ If the optional argument INTERACTIVE is non-nil (as happens
 interactively), DIR must be an absolute file name.
 
 (fn DIR &optional NAME INTERACTIVE)" t)
-(make-obsolete 'package-vc-install-from-checkout '"use the User Lisp directory instead." "31.1")
+(make-obsolete 'package-vc-install-from-checkout '"Use the User Lisp directory instead, see Info node `(emacs) User Lisp Directory'." "31.1")
 (autoload 'package-vc-rebuild "package-vc"
 "Rebuild the installation for package given by PKG-DESC.
 Rebuilding an installation means scraping for new autoload
@@ -26694,7 +26770,7 @@ are both set to t.
 ;;; Generated autoloads from proced.el
 
 (autoload 'proced "proced"
-"Generate a listing of UNIX system processes.
+"Generate a listing of system processes and their attributes.
 \\<proced-mode-map>
 If invoked with optional non-negative ARG, do not select the
 window displaying the process information.
@@ -28001,6 +28077,8 @@ evaluate the variable `rectangle-mark-mode'.
 The mode's hook is called both when the mode is enabled and when it is
 disabled.
 
+\\{rectangle-mark-mode-map}
+
 (fn &optional ARG)" t)
 (register-definition-prefixes "rect" '("apply-on-rectangle" "clear-rectangle-line" "delete-" "extract-rectangle-" "killed-rectangle" "ope" "rectangle-" "spaces-string" "string-rectangle-"))
 
@@ -29926,11 +30004,11 @@ in the cited portion of the message.
 If this hook is entirely empty (nil), a default action is taken
 instead of no action.")
 (custom-autoload 'mail-citation-hook "sendmail" t)
-(defvar mail-citation-prefix-regexp "\\([ \11]*\\([[:word:]]\\|[_.]\\)+>+\\|[ \11]*[>|]\\)+"
+(defvar mail-citation-prefix-regexp "\\(?:[ \11]*\\(?:[[:word:]_.]+>\\|[>|]\\)\\)+"
 "Regular expression to match a citation prefix plus whitespace.
 It should match whatever sort of citation prefixes you want to handle,
-with whitespace before and after; it should also match just whitespace.
-The default value matches citations like `foo-bar>' plus whitespace.")
+including leading whitespace.  The default value matches citations
+like `foo_bar>' plus any leading whitespace.")
 (custom-autoload 'mail-citation-prefix-regexp "sendmail" t)
 (defvar mail-signature t
 "Text inserted at end of mail buffer when a message is initialized.
@@ -30517,12 +30595,8 @@ be created if necessary, and new remote connections are inhibited.
 
 ;;; Generated autoloads from emacs-lisp/shortdoc.el
 
-(autoload 'shortdoc--check "shortdoc"
-"
-
-(fn GROUP FUNCTIONS)")
 (defvar shortdoc--groups nil)
-(defmacro define-short-documentation-group (group &rest functions)
+(autoload 'define-short-documentation-group "shortdoc"
 "Add GROUP to the list of defined documentation groups.
 FUNCTIONS is a list of elements on the form:
 
@@ -30584,7 +30658,9 @@ execution of the documented form depends on some conditions.
 
 A FUNC form can have any number of `:no-eval' (or `:no-value'),
 `:no-eval*', `:result', `:result-string', `:eg-result' and
-`:eg-result-string' properties." (declare (indent defun)) (shortdoc--check group functions) `(progn (setq shortdoc--groups (delq (assq ',group shortdoc--groups) shortdoc--groups)) (push (cons ',group ',functions) shortdoc--groups)))
+`:eg-result-string' properties.
+
+(fn GROUP &rest FUNCTIONS)" nil t)
 (autoload 'shortdoc-display-group "shortdoc"
 "Pop to a buffer with short documentation summary for functions in GROUP.
 Interactively, prompt for GROUP.
@@ -32254,6 +32330,8 @@ This construct can only be used with lexical binding.
 "Create a work buffer, and evaluate BODY there like `progn'.
 Like `with-temp-buffer', but reuse an already created temporary
 buffer when possible, instead of creating a new one on each call.
+Avoid retaining state referring to a work buffer, and kill
+any indirect buffers you create that use a work buffer as a base.
 
 (fn &rest BODY)" nil t)
 (autoload 'string-pixel-width "subr-x"
@@ -33858,6 +33936,10 @@ value of `texinfo-mode-hook'." t)
 
 ;;; Generated autoloads from international/textsec.el
 
+(autoload 'textsec--create-script-table "textsec"
+"Create the textsec--char-scripts char table.
+
+(fn DATA)")
 (register-definition-prefixes "textsec" '("textsec-"))
 
 
@@ -35116,7 +35198,7 @@ Interactively, with a prefix argument, prompt for a different method." t)
 
 ;;; Generated autoloads from transient.el
 
-(push '(transient 0 12 0) package--builtin-versions)
+(push '(transient 0 13 0) package--builtin-versions)
 (autoload 'transient-insert-suffix "transient"
 "Insert a SUFFIX into PREFIX before LOC.
 PREFIX is a prefix command, a symbol.
@@ -35679,6 +35761,11 @@ occurred.  Each pair is one of:
 symbol that says something about where the error occurred, and
 DATA is a list (possibly nil) that describes the error further.
 
+(:peer GNUTLS-INFO) - GnuTLS information for the retrieval request.
+This will be present only if GnuTLS was used to make an HTTPS request,
+in which case GNUTLS-INFO is the list returned by `gnutls-peer-status'
+describing the state of TLS connection with the peer.
+
 Return the buffer URL will load into, or nil if the process has
 already completed (i.e. URL was a mailto URL or similar; in this case
 the callback is not called).
@@ -36852,7 +36939,7 @@ to.  When called interactively with a prefix argument, prompt for
 UPSTREAM-LOCATION.  In some version control systems UPSTREAM-LOCATION
 can be a remote branch name.
 
-This command is like `vc-root-diff-outstanding' except that it does
+This command is like `vc-root-diff-unintegrated' except that it does
 not include uncommitted changes.
 
 See `vc-use-incoming-outgoing-prefixes' regarding giving this command a
@@ -36868,7 +36955,7 @@ can be a remote branch name.
 When called from Lisp optional argument FILESET overrides the VC
 fileset.
 
-This command is like `vc-diff-outstanding' except that it does not
+This command is like `vc-diff-unintegrated' except that it does not
 include uncommitted changes.
 
 See `vc-use-incoming-outgoing-prefixes' regarding giving this command a
@@ -36879,7 +36966,7 @@ global binding.
      #'vc--safe-branch-regexps-p)
  (put 'vc-topic-branch-regexps 'safe-local-variable
      #'vc--safe-branch-regexps-p)
-(autoload 'vc-root-diff-outstanding "vc"
+(autoload 'vc-root-diff-unintegrated "vc"
 "Report diff of all changes since the merge base with UPSTREAM-LOCATION.
 The merge base with UPSTREAM-LOCATION means the common ancestor of the
 working revision and UPSTREAM-LOCATION.
@@ -36902,7 +36989,7 @@ topic branch.  (With a double prefix argument, this command is like
 `vc-diff-outgoing' except that it includes uncommitted changes.)
 
 (fn &optional UPSTREAM-LOCATION)" t)
-(autoload 'vc-diff-outstanding "vc"
+(autoload 'vc-diff-unintegrated "vc"
 "Report changes to VC fileset since the merge base with UPSTREAM-LOCATION.
 
 The merge base with UPSTREAM-LOCATION means the common ancestor of the
@@ -36928,7 +37015,7 @@ topic branch.  (With a double prefix argument, this command is like
 When called from Lisp, optional argument FILESET overrides the fileset.
 
 (fn &optional UPSTREAM-LOCATION FILESET)" t)
-(autoload 'vc-log-outstanding "vc"
+(autoload 'vc-log-unintegrated "vc"
 "Show log for the VC fileset since the merge base with UPSTREAM-LOCATION.
 The merge base with UPSTREAM-LOCATION means the common ancestor of the
 working revision and UPSTREAM-LOCATION.
@@ -36951,7 +37038,7 @@ topic branch.
 When called from Lisp, optional argument FILESET overrides the fileset.
 
 (fn &optional UPSTREAM-LOCATION FILESET)" t)
-(autoload 'vc-root-log-outstanding "vc"
+(autoload 'vc-root-log-unintegrated "vc"
 "Show log of revisions since the merge base with UPSTREAM-LOCATION.
 The merge base with UPSTREAM-LOCATION means the common ancestor of the
 working revision and UPSTREAM-LOCATION.
@@ -37283,14 +37370,22 @@ If called interactively, read FILE-OR-FILES, defaulting to the current
 buffer's file name if it's under version control.
 When called from Lisp, FILE-OR-FILES can be a file name or a list of
 file names.
+When called from Lisp, optional argument NOCONFIRM non-nil means don't
+prompt to confirm deletion.
+For some VCS, FILE-OR-FILES can include directories.
+These are recursively deleted.
 
-(fn FILE-OR-FILES)" t)
+(fn FILE-OR-FILES &optional NOCONFIRM)" t)
 (autoload 'vc-rename-file "vc"
 "Rename file OLD to NEW in both working tree and repository.
 When called interactively, read OLD and NEW, defaulting OLD to the
 current buffer's file name if it's under version control.
+If NEW is a directory name, rename FILE to a like-named file under NEW.
+For NEW to be recognized as a directory name, it should end in a slash.
+Signal a `file-already-exists' error if a file NEW already exists unless
+called from Lisp with optional argument OK-IF-ALREADY-EXISTS non-nil.
 
-(fn OLD NEW)" t)
+(fn OLD NEW &optional OK-IF-ALREADY-EXISTS)" t)
 (autoload 'vc-update-change-log "vc"
 "Find change log file and add entries from recent version control logs.
 Normally, find log entries for all registered files in the default

From 8d4c47c88000a6801e84d529c67f6581a96c9220 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 27 Apr 2026 15:41:27 +0300
Subject: [PATCH 246/463] Fix vc-tests for SRC

* lisp/vc/vc-src.el (vc-src-register): Support "registering"
directories in FILES.
(vc-src-rename-file): Fix implementation and support renaming
directories.

* test/lisp/vc/vc-tests/vc-tests.el (vc-test--rename-file)
(vc-test-src-version-diff): Skip parts that don't work with SRC.
(Bug#80862)
---
 lisp/vc/vc-src.el                 | 14 ++++++++++++--
 test/lisp/vc/vc-tests/vc-tests.el |  6 +++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el
index c43b37627fb..fbfbfa52228 100644
--- a/lisp/vc/vc-src.el
+++ b/lisp/vc/vc-src.el
@@ -239,7 +239,14 @@ This function differs from `vc-do-command' in that it invokes `vc-src-program'."
 
 (defun vc-src-register (files &optional _comment)
   "Register FILES under src.  COMMENT is ignored."
-  (vc-src-command nil files "add"))
+  (let* ((dirs (seq-filter #'file-directory-p files))
+         (files (seq-remove #'file-directory-p files)))
+    ;; SRC doesn't track directories (because RCS doesn't), but we do
+    ;; need to create the '.src' subdirectory if it doesn't exist.
+    (dolist (dir dirs)
+      (make-directory (expand-file-name ".src" dir) t))
+    (and files
+         (vc-src-command nil files "add"))))
 
 (defun vc-src-responsible-p (file)
   "Return the directory if SRC thinks it would be responsible for FILE."
@@ -329,7 +336,10 @@ If LIMIT is non-nil, show no more than this many entries."
 
 (defun vc-src-rename-file (old new)
   "Rename file from OLD to NEW using `src mv'."
-  (vc-src-command nil 0 new "mv" old))
+  (if (file-directory-p old)
+      ;; SRC doesn't track directories.
+      (rename-file old new)
+    (vc-do-command "*vc*" 0 vc-src-program (list old new) "mv")))
 
 (provide 'vc-src)
 
diff --git a/test/lisp/vc/vc-tests/vc-tests.el b/test/lisp/vc/vc-tests/vc-tests.el
index 1199d94cd03..67589be7314 100644
--- a/test/lisp/vc/vc-tests/vc-tests.el
+++ b/test/lisp/vc/vc-tests/vc-tests.el
@@ -592,8 +592,8 @@ This checks also `vc-backend' and `vc-responsible-backend'."
                                'added))))
 
             ;; Test OK-IF-ALREADY-EXISTS.
-            ;; RCS doesn't support `vc-delete-file'.
-            (unless (eq backend 'RCS)
+            ;; RCS and SRC don't support `vc-delete-file'.
+            (unless (memq backend '(RCS SRC))
               (let ((tmp-name (expand-file-name "qux" default-directory))
                     (new-name (expand-file-name "quuux" default-directory)))
                 (write-region "qux" nil tmp-name nil 'nomessage)
@@ -1261,7 +1261,7 @@ This checks also `vc-backend' and `vc-responsible-backend'."
                  (format "vc-test-%s01-register" backend-string))))))
           ;; `vc-mtn.el' gives me:
           ;; "Failed (status 1): mtn commit -m Testing vc-version-diff\n\n foo"
-          (skip-when (memq ',backend '(Mtn)))
+          (skip-when (memq ',backend '(Mtn SRC)))
           ;; `vc-hg.el' gives me, only on MS-Windows and only in batch mode:
           ;; "Failed (status 255): hg --config ui.report_untrusted=0 commit -m Testing vc-version-diff\n\n foo"
           (skip-when (and (memq ',backend '(Hg))

From 08a22b8965eca05982be748f768d92bc6f299051 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 27 Apr 2026 15:47:57 +0300
Subject: [PATCH 247/463] ; Don't skip 'vc-test-src-version-diff' test

* test/lisp/vc/vc-tests/vc-tests.el (vc-test-src-version-diff):
Don't skip, it passes.
---
 test/lisp/vc/vc-tests/vc-tests.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/lisp/vc/vc-tests/vc-tests.el b/test/lisp/vc/vc-tests/vc-tests.el
index 67589be7314..1fb17842478 100644
--- a/test/lisp/vc/vc-tests/vc-tests.el
+++ b/test/lisp/vc/vc-tests/vc-tests.el
@@ -1261,7 +1261,7 @@ This checks also `vc-backend' and `vc-responsible-backend'."
                  (format "vc-test-%s01-register" backend-string))))))
           ;; `vc-mtn.el' gives me:
           ;; "Failed (status 1): mtn commit -m Testing vc-version-diff\n\n foo"
-          (skip-when (memq ',backend '(Mtn SRC)))
+          (skip-when (memq ',backend '(Mtn)))
           ;; `vc-hg.el' gives me, only on MS-Windows and only in batch mode:
           ;; "Failed (status 255): hg --config ui.report_untrusted=0 commit -m Testing vc-version-diff\n\n foo"
           (skip-when (and (memq ',backend '(Hg))

From 15380908891516f20f51ade422b25e5dff2115aa Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 27 Apr 2026 15:03:19 -0400
Subject: [PATCH 248/463] (completion--file-name-table): Improve completion of
 `/a/~b/c`

The solution used is far from perfect, but hopefully it helps more
often than it hurts.  And since it affects only completion, we hope
the cases where it hurts won't be too serious.  (bug#32215)

* lisp/minibuffer.el (completion--sifn-regardless-of-system-users):
New function.
(completion--file-name-table): Use it.
---
 lisp/minibuffer.el | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 94fc63440b4..636d0951645 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -3679,6 +3679,27 @@ same as `substitute-in-file-name'."
               all))))))
     (file-error nil)))               ;PCM often calls with invalid directories.
 
+(defun completion--sifn-regardless-of-system-users (filename)
+  ;; `substitute-in-file-name' handles `~FOO' specially (by cutting
+  ;; any prefix to it that ends in `/', so `/foo/~bar/baz' turns into
+  ;; `~bar/baz') but only if `FOO' is the name of a user on the system.
+  ;; Completion of `~FOO' against the set of user names is handled
+  ;; already in `completion-file-name-table' when `~FOO' occurs at the
+  ;; beginning of the file name, but if we want to support such completions
+  ;; "in the middle", I see two ways to do it:
+  ;; - Do something similar to `completion--embedded-envvar-table'.
+  ;; - Extend `substitute-in-file-name's handling of `~FOO' so
+  ;;   `/foo/~bar/baz' turns into `~bar/baz' regardless if `bar'
+  ;;   is a valid user name (because we hope that it will be completed
+  ;;   to a user name).
+  ;; The second option is what we do here.  (bug#32215)
+  ;; FIXME: This breaks completion when you have a file or directory
+  ;; whose name starts with `~'.
+  ;; FIXME: This doesn't take file-name-handlers into account.
+  (while (string-match "/~[[:alnum:]_*-]" filename)
+    (setq filename (substring filename (1+ (match-beginning 0)))))
+  (substitute-in-file-name filename))
+
 (defun completion--sifn-requote (upos qstr)
   ;; We're looking for (the largest) `qpos' such that:
   ;; (equal (substring (substitute-in-file-name qstr) 0 upos)
@@ -3761,7 +3782,10 @@ except that it passes the file name through `substitute-in-file-name'."
   (let ((table #'completion-file-name-table))
     (if (eq (car-safe action) 'boundaries)
         (cons 'boundaries (completion--sifn-boundaries orig table pred (cdr action)))
-      (let* ((sifned (substitute-in-file-name orig))
+      (let* ((sifned
+              (if (eq action 'lambda)
+                  (substitute-in-file-name orig)
+                (completion--sifn-regardless-of-system-users orig)))
              (orig-start (car (completion--sifn-boundaries orig table pred "")))
              (sifned-start (car (completion-boundaries sifned table pred "")))
              (orig-in-bounds (substring orig orig-start))

From 046db64044268ec62dd63681c821edb11297f905 Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Mon, 27 Apr 2026 21:11:52 +0200
Subject: [PATCH 249/463] Call format-spec substitution functions in current
 buffer

* lisp/format-spec.el (format-spec): Call format-spec substitution
functions in current buffer.  I.e., in the same buffer in which
substitution expressions are evaluated.  Previously functions were
instead called in the temporary buffer used to deal with FORMAT.
---
 lisp/format-spec.el | 116 +++++++++++++++++++++++---------------------
 1 file changed, 60 insertions(+), 56 deletions(-)

diff --git a/lisp/format-spec.el b/lisp/format-spec.el
index b08c7a1cdee..d2c47bf26ab 100644
--- a/lisp/format-spec.el
+++ b/lisp/format-spec.el
@@ -87,62 +87,66 @@ any occurrences of \"%%\" in FORMAT verbatim in the result.
 
 If SPLIT, instead of returning a single string, a list of strings
 is returned, where each format spec is its own element."
-  (with-temp-buffer
-    (let ((split-start (point-min))
-          (split-result nil))
-      (insert format)
-      (goto-char (point-min))
-      (while (search-forward "%" nil t)
-        (cond
-         ;; Quoted percent sign.
-         ((= (following-char) ?%)
-          (when (memq ignore-missing '(nil ignore delete))
-            (delete-char 1)))
-         ;; Valid format spec.
-         ((looking-at (rx (? (group (+ (in " 0<>^_-"))))
-                          (? (group (+ digit)))
-                          (? (group ?. (+ digit)))
-                          (group alpha)))
-          (let* ((beg (point))
-                 (end (match-end 0))
-                 (flags (match-string 1))
-                 (width (match-string 2))
-                 (trunc (match-string 3))
-                 (char (string-to-char (match-string 4)))
-                 (text (let ((res (cdr (assq char specification))))
-                         (if (functionp res) (funcall res) res))))
-            (when (and split
-                       (not (= (1- beg) split-start)))
-              (push (buffer-substring split-start (1- beg)) split-result))
-            (cond (text
-                   ;; Handle flags.
-                   (setq text (format-spec--do-flags
-                               (format "%s" text)
-                               (format-spec--parse-flags flags)
-                               (and width (string-to-number width))
-                               (and trunc (car (read-from-string trunc 1)))))
-                   ;; Insert first, to preserve text properties.
-                   (insert-and-inherit text)
-                   ;; Delete the specifier body.
-                   (delete-region (point) (+ end (length text)))
-                   ;; Delete the percent sign.
-                   (delete-region (1- beg) beg))
-                  ((eq ignore-missing 'delete)
-                   ;; Delete the whole format spec.
-                   (delete-region (1- beg) end))
-                  ((not ignore-missing)
-                   (error "Invalid format character: `%%%c'" char)))
-            (when split
-              (push (buffer-substring (1- beg) (point)) split-result)
-              (setq split-start (point)))))
-         ;; Signal an error on bogus format strings.
-         ((not ignore-missing)
-          (error "Invalid format string"))))
-      (if (not split)
-          (buffer-string)
-        (unless (= split-start (point-max))
-          (push (buffer-substring split-start (point-max)) split-result))
-        (nreverse split-result)))))
+  (let ((orig-buffer (current-buffer)))
+    (with-temp-buffer
+      (let ((split-start (point-min))
+            (split-result nil))
+        (insert format)
+        (goto-char (point-min))
+        (while (search-forward "%" nil t)
+          (cond
+           ;; Quoted percent sign.
+           ((= (following-char) ?%)
+            (when (memq ignore-missing '(nil ignore delete))
+              (delete-char 1)))
+           ;; Valid format spec.
+           ((looking-at (rx (? (group (+ (in " 0<>^_-"))))
+                            (? (group (+ digit)))
+                            (? (group ?. (+ digit)))
+                            (group alpha)))
+            (let* ((beg (point))
+                   (end (match-end 0))
+                   (flags (match-string 1))
+                   (width (match-string 2))
+                   (trunc (match-string 3))
+                   (char (string-to-char (match-string 4)))
+                   (text (let ((res (cdr (assq char specification))))
+                           (if (functionp res)
+                               (with-current-buffer orig-buffer
+                                 (funcall res))
+                             res))))
+              (when (and split
+                         (not (= (1- beg) split-start)))
+                (push (buffer-substring split-start (1- beg)) split-result))
+              (cond (text
+                     ;; Handle flags.
+                     (setq text (format-spec--do-flags
+                                 (format "%s" text)
+                                 (format-spec--parse-flags flags)
+                                 (and width (string-to-number width))
+                                 (and trunc (car (read-from-string trunc 1)))))
+                     ;; Insert first, to preserve text properties.
+                     (insert-and-inherit text)
+                     ;; Delete the specifier body.
+                     (delete-region (point) (+ end (length text)))
+                     ;; Delete the percent sign.
+                     (delete-region (1- beg) beg))
+                    ((eq ignore-missing 'delete)
+                     ;; Delete the whole format spec.
+                     (delete-region (1- beg) end))
+                    ((not ignore-missing)
+                     (error "Invalid format character: `%%%c'" char)))
+              (when split
+                (push (buffer-substring (1- beg) (point)) split-result)
+                (setq split-start (point)))))
+           ;; Signal an error on bogus format strings.
+           ((not ignore-missing)
+            (error "Invalid format string"))))
+        (if (not split)
+            (buffer-string)
+          (unless (= split-start (point-max))
+            (push (buffer-substring split-start (point-max)) split-result))
+          (nreverse split-result))))))
 
 (defun format-spec--do-flags (str flags width trunc)
   "Return STR formatted according to FLAGS, WIDTH, and TRUNC.

From 800a272b62598637904457bb156138c3b4e45b0b Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Mon, 27 Apr 2026 21:35:44 +0200
Subject: [PATCH 250/463] Fix defining a few faces as empty

e72afa9dbf92f45 replaced nil, which is invalid as a face definition,
with ((t (:inherit default))), but that does not actually result in
an "empty" face, which doesn't set any attributes.  Instead it doubles
down on all attributes set for the default face.  Replace that with
((t)), which accomplishes what appears to have been the intention.

* lisp/net/shr.el (shr-h4, shr-h5, shr-h6):
* lisp/nxml/nxml-mode.el (nxml-text):
* lisp/progmodes/make-mode.el (makefile-shell): Use empty face
definition ((t)), instead of ((t (:inherit default))).
---
 lisp/net/shr.el             | 6 +++---
 lisp/nxml/nxml-mode.el      | 2 +-
 lisp/progmodes/make-mode.el | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 0488564f653..7e47d93d81c 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -292,17 +292,17 @@ temporarily blinks with this face."
   :version "28.1")
 
 (defface shr-h4
-  '((t (:inherit default)))
+  '((t))
   "Face for <h4> elements."
   :version "28.1")
 
 (defface shr-h5
-  '((t (:inherit default)))
+  '((t))
   "Face for <h5> elements."
   :version "28.1")
 
 (defface shr-h6
-  '((t (:inherit default)))
+  '((t))
   "Face for <h6> elements."
   :version "28.1")
 
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 64e6219e115..9b617b40f09 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -152,7 +152,7 @@ This is not used directly, but only via inheritance by other faces."
   :group 'nxml-faces)
 
 (defface nxml-text
-  '((t (:inherit default)))
+  '((t))
   "Face used to highlight text."
   :group 'nxml-faces)
 
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index e34eaba3150..a93b6bfc7a9 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -93,7 +93,7 @@
   :version "22.1")
 
 (defface makefile-shell
-  '((t (:inherit default)))
+  '((t))
   ;;'((((class color) (min-colors 88) (background light)) (:background  "seashell1"))
   ;;  (((class color) (min-colors 88) (background dark)) (:background  "seashell4")))
   "Face to use for additionally highlighting Shell commands in Font-Lock mode."

From 42f6459bad0771f66ca014a1b53a92caa6663c22 Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Mon, 27 Apr 2026 21:37:14 +0200
Subject: [PATCH 251/463] Set indent property for
 with-connection-local-variables

* lisp/files-x.el (with-connection-local-variables): Set indent
property.
---
 lisp/files-x.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/files-x.el b/lisp/files-x.el
index 9b7189c9fd8..0d8c1d96a9f 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -877,7 +877,7 @@ If APPLICATION is nil, `connection-local-default-application' is used."
 (defmacro with-connection-local-variables (&rest body)
   "Apply connection-local variables according to `default-directory'.
 Execute BODY, and unwind connection-local variables."
-  (declare (debug t))
+  (declare (debug t) (indent 0))
   `(with-connection-local-variables-1 (lambda () ,@body)))
 
 ;;;###autoload

From 977a7607b6481574a72de9524ba1dc1f6cb44769 Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Mon, 27 Apr 2026 21:58:39 +0200
Subject: [PATCH 252/463] Use plain autoload cookie with
 transient-define-prefix

; * lisp/international/emoji.el (emoji-insert, emoji-recent):
(emoji-search, emoji-list-select): Use plain autoload cookie with
transient-define-prefix
---
 lisp/international/emoji.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/international/emoji.el b/lisp/international/emoji.el
index 237062cc328..db1553318f4 100644
--- a/lisp/international/emoji.el
+++ b/lisp/international/emoji.el
@@ -70,7 +70,7 @@ representing names.  For instance:
 (define-multisession-variable emoji--recent (list "😀" "😖"))
 (defvar emoji--insert-buffer)
 
-;;;###autoload (autoload 'emoji-insert "emoji" nil t)
+;;;###autoload
 (transient-define-prefix emoji-insert ()
   "Choose and insert an emoji glyph."
   :variable-pitch t
@@ -83,7 +83,7 @@ representing names.  For instance:
                        `(("Recent" ,@(multisession-value emoji--recent))
                          ,@emoji--labels)))
 
-;;;###autoload (autoload 'emoji-recent "emoji" nil t)
+;;;###autoload
 (transient-define-prefix emoji-recent ()
   "Choose and insert one of the recently-used emoji glyphs."
   :variable-pitch t
@@ -95,7 +95,7 @@ representing names.  For instance:
   (emoji--setup-prefix 'emoji-recent "Recent" t
                        (multisession-value emoji--recent)))
 
-;;;###autoload (autoload 'emoji-search "emoji" nil t)
+;;;###autoload
 (transient-define-prefix emoji-search (glyph derived)
   "Choose and insert an emoji glyph by typing its Unicode name.
 This command prompts for an emoji name, with completion, and
@@ -261,7 +261,7 @@ the name is not known."
   :interactive nil
   (setq-local truncate-lines t))
 
-;;;###autoload (autoload 'emoji-list-select "emoji" nil t)
+;;;###autoload
 (transient-define-prefix emoji-list-select (event)
   "Select the emoji under point."
   :variable-pitch t

From 8b41b66e6fe8da490a586cecb5ac8963664455cb Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Mon, 27 Apr 2026 19:39:49 -0700
Subject: [PATCH 253/463] ; * lisp/treesit.el (treesit-buffer-root-node): Fix
 docstring.

---
 lisp/treesit.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 5fe17d5d382..5e60617bce2 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -361,8 +361,9 @@ If INCLUDE-NODE is non-nil, return NODE if it satisfies PRED."
 Use the first parser in the parser list if LANGUAGE is omitted.
 
 If LANGUAGE is non-nil, use the first parser for LANGUAGE with TAG in
-the parser list.  If there's no such parser, return nil.  TAG defaults
-to nil."
+the parser list.  TAG defaults to nil.
+
+If no parser is available, throw `treesit-no-parser'."
   (let ((parser
          (or (car (treesit-parser-list nil language tag))
              (signal 'treesit-no-parser (list language)))))

From 09f8ce0f52953772095bbb4322fc2d08d34ac2c7 Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Mon, 27 Apr 2026 19:40:06 -0700
Subject: [PATCH 254/463] Better heuristic in treesit-font-lock-fontify-region
 in multi-parser

* lisp/treesit.el (treesit-font-lock-fontify-region): Use
primary parser.
---
 lisp/treesit.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 5e60617bce2..3c7817ab9a3 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -2171,7 +2171,8 @@ If LOUDLY is non-nil, display some debugging information."
         (when (eq treesit--font-lock-fast-mode 'unspecified)
           (pcase-let ((`(,max-depth ,max-width)
                        (treesit-subtree-stat
-                        (treesit-buffer-root-node language))))
+                        (treesit-parser-root-node
+                         treesit-primary-parser))))
             (setq treesit--font-lock-fast-mode
                   (or (> max-depth 100) (> max-width 4000)))))
 

From d969185878bf50faedbafbd609c361875b891b53 Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Mon, 27 Apr 2026 22:40:08 -0700
Subject: [PATCH 255/463] Use treesit-language-available-p for language check
 (bug#80909)

* lisp/treesit.el (treesit-ensure-installed): Use
treesit-language-available-p for checking if a language is
installed.  treesit-ready-p also checks for buffer size, etc, so
it's not the right check.
---
 lisp/treesit.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 3c7817ab9a3..2fd6a9eb1d9 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -5729,7 +5729,7 @@ on the mode."
 The option `treesit-auto-install-grammar' defines whether to install
 the grammar library if it's unavailable."
   (when (treesit-available-p)
-    (or (treesit-ready-p lang t)
+    (or (treesit-language-available-p lang)
         (let ((out-dir (or (seq-find #'file-writable-p
                                      treesit-extra-load-path)
                            (locate-user-emacs-file "tree-sitter"))))
@@ -5748,7 +5748,7 @@ Install grammar for `%s' to" nil lang)
                                t))))
             (treesit-install-language-grammar lang out-dir)
             ;; Check that the grammar was installed successfully
-            (treesit-ready-p lang))))))
+            (treesit-language-available-p lang))))))
 
 ;;; Treesit enabled modes
 

From 071fdf27510fa0987ce860a7340284ca434a374a Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 28 Apr 2026 15:13:50 +0300
Subject: [PATCH 256/463] ; Avoid byte-compilation warnings in transient.el.

---
 lisp/transient.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lisp/transient.el b/lisp/transient.el
index 4068966dafd..e04437dd914 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -5523,6 +5523,8 @@ search instead."
                   2)
             lisp-imenu-generic-expression :test #'equal)
 
+(defvar overriding-text-conversion-style)
+
 (defun transient--suspend-text-conversion-style ()
   (when (and text-conversion-style
              (bound-and-true-p overriding-text-conversion-style))

From 3897a808d920944adc541c6a62c23ea6edfc622d Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Tue, 28 Apr 2026 10:34:52 -0400
Subject: [PATCH 257/463] ; Fix an inconsistency in C symbol naming

This is the one case out of 1902 where the C name didn't match the subr
name.

* src/xfns.c (Fx_display_last_user_time): renamed to Fx_display_set_last_user_time
---
 src/xfns.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xfns.c b/src/xfns.c
index 0c9215b9d6b..3cf9bbc22f0 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -10058,7 +10058,7 @@ DEFUN ("x-gtk-debug", Fx_gtk_debug, Sx_gtk_debug, 1, 1, 0,
 #endif /* HAVE_GTK3 */
 #endif	/* USE_GTK */
 
-DEFUN ("x-display-set-last-user-time", Fx_display_last_user_time,
+DEFUN ("x-display-set-last-user-time", Fx_display_set_last_user_time,
        Sx_display_set_last_user_time, 1, 2, 0,
        doc: /* Set the last user time of TERMINAL to TIME-OBJECT.
 TIME-OBJECT is the X server time, in milliseconds, of the last user

From 4477ade0fa4a95de981e25c48a548ca22c232057 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 28 Apr 2026 16:21:47 -0400
Subject: [PATCH 258/463] lisp/emacs-lisp/crm.el (crm-complete-and-exit):
 Simplify docstring

---
 lisp/emacs-lisp/crm.el | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el
index 39a01490365..b68d3d55525 100644
--- a/lisp/emacs-lisp/crm.el
+++ b/lisp/emacs-lisp/crm.el
@@ -193,16 +193,10 @@ Like `minibuffer-complete-word' but for `completing-read-multiple'."
     (completion-in-region--single-word beg end)))
 
 (defun crm-complete-and-exit (&optional no-exit)
-  "If all of the minibuffer elements are valid completions then exit.
-All elements in the minibuffer must match.  If there is a mismatch, move point
-to the location of mismatch and do not exit.
-
-If a completion candidate is selected in the *Completions* buffer, it
-will be inserted in the minibuffer first.  If NO-EXIT is non-nil, don't
-actually exit the minibuffer, just insert the selected completion if
-any.
-
-This function is modeled after `minibuffer-complete-and-exit'."
+  "Exit if all of the minibuffer elements are valid completions.
+Otherwise, try to complete the minibuffer contents.
+This behaves like `minibuffer-complete-and-exit' (which see),
+adjusted for the presence of multiple elements."
   (interactive "P")
   (when (completion--selected-candidate)
     (minibuffer-choose-completion t t))

From 7de1d99d3a9f93b7e7c1cf05675f8ed480186368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Wed, 29 Apr 2026 10:06:03 +0100
Subject: [PATCH 259/463] In fido-vertical-mode, let C-s and C-r recover their
 original use

Fido-mode is meant for ido-mode emulation, so it makes some
sense C-r and C-s moves forward and backward in the list as
ido-mode once did.  The price to pay is losing easy access to
isearch-backward/forward in completions.  In fido-vertical-mode,
this price is unreasonably high given C-p and C-n are the
natural bindings for moving about in the vertical list.

* lisp/icomplete.el (icomplete-fido-mode-map): Disable C-s and C-r
in fido-vertical-mode.
---
 lisp/icomplete.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 875c41bd841..9a1202c30af 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -489,8 +489,10 @@ if that doesn't produce a completion match."
   "C-m"     #'icomplete-fido-ret
   "DEL"     #'icomplete-fido-backward-updir
   "M-j"     #'icomplete-fido-exit
-  "C-s"     #'icomplete-forward-completions
-  "C-r"     #'icomplete-backward-completions
+  "C-s"     `(menu-item "" icomplete-forward-completions
+                        :filter ,(lambda (x) (unless fido-vertical-mode x)))
+  "C-r"     `(menu-item "" icomplete-backward-completions
+                        :filter ,(lambda (x) (unless fido-vertical-mode x)))
   "<right>" #'icomplete-forward-completions
   "<left>"  #'icomplete-backward-completions
   "C-."     #'icomplete-forward-completions

From dee5ca5acd330fcd4612ce585762ae1ee8c83831 Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <basil@contovou.net>
Date: Tue, 28 Apr 2026 23:34:23 +0200
Subject: [PATCH 260/463] ; Avoid mutation in string-collate-lessp example.

---
 src/fns.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fns.c b/src/fns.c
index f3044204cb5..1041938531c 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -606,7 +606,8 @@ This function obeys the conventions for collation order in your
 locale settings.  For example, punctuation and whitespace characters
 might be considered less significant for sorting:
 
-\(sort \\='("11" "12" "1 1" "1 2" "1.1" "1.2") \\='string-collate-lessp)
+\(sort \\='("11" "12" "1 1" "1 2" "1.1" "1.2")
+      :lessp #\\='string-collate-lessp)
   => ("11" "1 1" "1.1" "12" "1 2" "1.2")
 
 The optional argument LOCALE, a string, overrides the setting of your

From ae40c3a43862339b757a4eb9281d866d2739a05d Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 29 Apr 2026 14:46:37 +0100
Subject: [PATCH 261/463] New commands to report diffs of all local changes

* lisp/vc/vc.el (vc-root-diff-outgoing-and-edited)
(vc-diff-outgoing-and-edited): New commands (bug#80434).
* lisp/vc/vc-dir.el (vc-dir-mode-map):
* lisp/vc/vc-hooks.el (vc-prefix-map): Bind them.
* doc/emacs/maintaining.texi (VC Change Log):
* etc/NEWS: Document them.
---
 doc/emacs/maintaining.texi | 20 ++++++++++++++++++++
 etc/NEWS                   |  7 +++++++
 lisp/vc/vc-dir.el          |  3 +++
 lisp/vc/vc-hooks.el        |  8 ++++++++
 lisp/vc/vc.el              | 35 +++++++++++++++++++++++++++++++++++
 5 files changed, 73 insertions(+)

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index b482f5658c3..2400440f951 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1109,6 +1109,15 @@ but limited to the current fileset.
 If you customize @code{vc-use-incoming-outgoing-prefixes} to
 non-@code{nil}, this command becomes available on @kbd{C-x v O =}.
 
+@item C-x v E D
+Display a combined diff of all changes that will be sent by the next
+push operation plus any uncommitted changes.
+
+@item C-x v E =
+Display a combined diff of all changes that will be sent by the next
+push operation plus any uncommitted changes, but limited to the current
+fileset.
+
 @item C-x v h
 Display the history of changes made in the region of file visited by
 the current buffer (@code{vc-region-history}).
@@ -1223,6 +1232,17 @@ The difference is that the diffs reported are limited to the current
 fileset.  Don't forget that actual pull and push operations always
 affect the whole working tree, not just the current fileset.
 
+@kindex C-x v E =
+@kindex C-x v E D
+@findex vc-diff-outgoing-and-edited
+@findex vc-root-diff-outgoing-and-edited
+  Finally, there is also @kbd{C-x v E D}
+(@code{vc-root-diff-outgoing-and-edited}) which shows a combined diff of
+all changes that would be pushed plus any uncommitted changes.  It is
+useful to show all work that's present only locally.  There is also
+@kbd{C-x v E =} (@code{vc-diff-outgoing-and-edited}) which is the same
+but limited to the current fileset.
+
 @cindex VC log buffer, commands in
 @cindex vc-log buffer
   In the @file{*vc-change-log*} buffer, you can use the following keys
diff --git a/etc/NEWS b/etc/NEWS
index b5c09ed78e0..8e9e2ce8ed9 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3008,6 +3008,13 @@ These are useful to view all outstanding (unmerged, unpushed) changes on
 the current branch.  They are also available as 'T =', 'T D', 'T l' and
 'T L' in VC Directory buffers.
 
++++
+*** New commands to report combined diffs of all local changes.
+'C-x v E =' ('vc-diff-outgoing-and-edited') and 'C-x v E D'
+('vc-root-diff-outgoing-and-edited') report combined diffs of all
+outgoing changes plus any uncommitted changes.  They are useful to show
+all work that's present only locally.
+
 +++
 *** New user option 'vc-use-incoming-outgoing-prefixes'.
 If this is customized to non-nil, 'C-x v I' and 'C-x v O' become prefix
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 8094148c051..2b8e5d4540c 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -412,6 +412,9 @@ an \\+`up-to-date' or \\+`ignored' file."
     (define-key map "TL" #'vc-root-log-unintegrated)
     (define-key map "T=" #'vc-diff-unintegrated)
     (define-key map "TD" #'vc-root-diff-unintegrated)
+    (define-key map "EL" #'vc-root-log-outgoing)
+    (define-key map "E=" #'vc-diff-outgoing-and-edited)
+    (define-key map "ED" #'vc-root-diff-outgoing-and-edited)
     (define-key map "V" #'vc-dir-root-next-action)
 
     (let ((branch-map (make-sparse-keymap)))
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index d5f87f859d9..a7d7352b069 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -1040,6 +1040,14 @@ In the latter case, VC mode is deactivated for this buffer."
   "T L" #'vc-root-log-unintegrated
   "T =" #'vc-diff-unintegrated
   "T D" #'vc-root-diff-unintegrated
+  ;; There are no -log-outgoing-and-edited commands because by
+  ;; definition these are the same as -log-outgoing.
+  ;; Additionally bind the -log-outgoing commands under C-x v E l/L as
+  ;; nothing else could conceivably go there and it might help someone.
+  ;; (Fileset-specific outgoing log command coming in Emacs 32.  --spwhitton)
+  "E L" #'vc-root-log-outgoing
+  "E =" #'vc-diff-outgoing-and-edited
+  "E D" #'vc-root-diff-outgoing-and-edited
   "m"   #'vc-merge
   "r"   #'vc-retrieve-tag
   "s"   #'vc-create-tag
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index e083ea88da0..30a5c296898 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -3459,6 +3459,41 @@ When called from Lisp, optional argument FILESET overrides the fileset."
                       nil
                       (called-interactively-p 'interactive))))
 
+;;;###autoload
+(defun vc-root-diff-outgoing-and-edited (&optional upstream-location)
+  "Report combined diff of all outgoing and uncommitted changes.
+Outgoing changes are those that would be pushed to UPSTREAM-LOCATION.
+When unspecified UPSTREAM-LOCATION is the place \\[vc-push] would push
+to.  When called interactively with a prefix argument, prompt for
+UPSTREAM-LOCATION.  In some version control systems UPSTREAM-LOCATION
+can be a remote branch name.
+When called from Lisp optional argument FILESET overrides the VC
+fileset.
+
+This command is the same as `vc-root-diff-unintegrated' used on a trunk."
+  (declare (interactive-only vc-root-diff-unintegrated))
+  (interactive (list (or (vc--maybe-read-outgoing-base) t)))
+  (vc-root-diff-unintegrated upstream-location))
+
+;;;###autoload
+(defun vc-diff-outgoing-and-edited (&optional upstream-location fileset)
+  "Report combined diff of outgoing and uncommitted changes to VC fileset.
+Outgoing changes are those that would be pushed to UPSTREAM-LOCATION.
+When unspecified UPSTREAM-LOCATION is the place \\[vc-push] would push
+to.  When called interactively with a prefix argument, prompt for
+UPSTREAM-LOCATION.  In some version control systems UPSTREAM-LOCATION
+can be a remote branch name.
+When called from Lisp optional argument FILESET overrides the VC
+fileset.
+
+This command is the same as `vc-diff-unintegrated' used on a trunk."
+  (declare (interactive-only vc-diff-unintegrated))
+  (interactive (let ((fileset (vc-deduce-fileset t)))
+                 (list (or (vc--maybe-read-outgoing-base (car fileset))
+                           t)
+                       fileset)))
+  (vc-diff-unintegrated upstream-location fileset))
+
 ;;;###autoload
 (defun vc-log-unintegrated (&optional upstream-location fileset)
   "Show log for the VC fileset since the merge base with UPSTREAM-LOCATION.

From 7d9dad4241439569ef954e654cbf04c52dcfe5cc Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 18 Feb 2026 11:37:51 +0000
Subject: [PATCH 262/463] New VC commands for remote unintegrated changes

* lisp/vc/vc.el (vc--outgoing-base, vc--outgoing-base-mergebase):
New FORCE-TOPIC parameter.
(vc--maybe-read-outgoing-base): New NO-DOUBLE parameter.
(vc-root-diff-remote-unintegrated, vc-diff-remote-unintegrated)
(vc-log-remote-unintegrated, vc-root-log-remote-unintegrated):
New commands (bug#80434).
* lisp/vc/vc-dir.el (vc-dir-mode-map):
* lisp/vc/vc-hooks.el (vc-prefix-map): Bind them.
* doc/emacs/vc1-xtra.texi (Unintegrated Changes):
* etc/NEWS: Document them.
---
 doc/emacs/vc1-xtra.texi |  40 +++++++++++-
 etc/NEWS                |   6 ++
 lisp/vc/vc-dir.el       |   4 ++
 lisp/vc/vc-hooks.el     |   4 ++
 lisp/vc/vc.el           | 140 ++++++++++++++++++++++++++++++++++++----
 5 files changed, 181 insertions(+), 13 deletions(-)

diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 1fc098c0693..2be32e8a717 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -296,6 +296,7 @@ yet merged into the target branch.
 @node Unintegrated Changes
 @subsubsection Commands to see all unintegrated changes
 @cindex unintegrated changes
+@cindex remote unintegrated changes
 
 @table @kbd
 @item C-x v T =
@@ -314,6 +315,26 @@ of this branch and its upstream counterpart
 @item C-x v T L
 Display log messages for all changes since the merge base of this branch
 and its upstream counterpart (@code{vc-root-log-unintegrated}).
+
+@item C-x v T R =
+Display diffs of remote changes to the VC fileset since the merge base
+of this topic branch and its upstream counterpart
+(@code{vc-diff-remote-unintegrated}).
+
+@item C-x v T R D
+Display a diff of all remote changes since the merge base of this topic
+branch and its upstream counterpart
+(@code{vc-root-diff-remote-unintegrated}).
+
+@item C-x v T R l
+Display log messages for remote changes to the VC fileset since the
+merge base of this topic branch and its upstream counterpart
+(@code{vc-log-remote-unintegrated}).
+
+@item C-x v T R L
+Display log messages for all remote changes since the merge base of this
+topic branch and its upstream counterpart
+(@code{vc-root-log-remote-unintegrated}).
 @end table
 
 For decentralized version control systems (@pxref{VCS Repositories}),
@@ -388,7 +409,24 @@ changes to the current VC fileset.  @kbd{C-x v T L} and @kbd{C-x v T l}
 show the corresponding revision logs, excluding uncommitted changes as
 above.
 
-This functionality relies on Emacs correctly detecting whether the
+@findex vc-diff-remote-unintegrated
+@findex vc-root-diff-remote-unintegrated
+@findex vc-log-remote-unintegrated
+@findex vc-root-log-remote-unintegrated
+On topic branches, it is sometimes also useful to see the same
+information but for the remote repository's version of the topic branch.
+This is the outstanding work on the topic branch that has been pushed,
+but not yet merged.  It is visible to your collaborators but is
+otherwise still unintegrated.  We call such work @dfn{remote
+unintegrated changes}.  There is a command corresponding to each of the
+four commands discussed so far but which operates on the remote
+repository's version of the current topic branch: @w{@kbd{C-x v R T =}}
+(@code{vc-diff-remote-unintegrated}), @w{@kbd{C-x v R T D}}
+(@code{vc-root-diff-remote-unintegrated}), @w{@kbd{C-x v R T l}}
+(@code{vc-log-remote-unintegrated}), and @w{@kbd{C-x v R T L}}
+(@code{vc-root-log-remote-unintegrated}).
+
+All this functionality relies on Emacs correctly detecting whether the
 current branch is a trunk or a topic branch, and in the latter case,
 correctly determining the branch to which the topic branch will
 eventually be merged.  If the autodetection doesn't produce the right
diff --git a/etc/NEWS b/etc/NEWS
index 8e9e2ce8ed9..971feb4edaf 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3008,6 +3008,12 @@ These are useful to view all outstanding (unmerged, unpushed) changes on
 the current branch.  They are also available as 'T =', 'T D', 'T l' and
 'T L' in VC Directory buffers.
 
+'C-x v T R =' ('vc-diff-remote-unintegrated'), 'C-x v T R D'
+('vc-root-diff-remote-unintegrated'), 'C-x v T R l'
+('vc-log-remote-unintegrated') and 'C-x v T R L'
+('vc-root-log-remote-unintegrated') are corresponding commands which
+report information about the remote versions of a topic branch.
+
 +++
 *** New commands to report combined diffs of all local changes.
 'C-x v E =' ('vc-diff-outgoing-and-edited') and 'C-x v E D'
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 2b8e5d4540c..580539b6706 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -412,6 +412,10 @@ an \\+`up-to-date' or \\+`ignored' file."
     (define-key map "TL" #'vc-root-log-unintegrated)
     (define-key map "T=" #'vc-diff-unintegrated)
     (define-key map "TD" #'vc-root-diff-unintegrated)
+    (define-key map "TRl" #'vc-log-remote-unintegrated)
+    (define-key map "TRL" #'vc-root-log-remote-unintegrated)
+    (define-key map "TR=" #'vc-diff-remote-unintegrated)
+    (define-key map "TRD" #'vc-root-diff-remote-unintegrated)
     (define-key map "EL" #'vc-root-log-outgoing)
     (define-key map "E=" #'vc-diff-outgoing-and-edited)
     (define-key map "ED" #'vc-root-diff-outgoing-and-edited)
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index a7d7352b069..d0f292d2c9d 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -1040,6 +1040,10 @@ In the latter case, VC mode is deactivated for this buffer."
   "T L" #'vc-root-log-unintegrated
   "T =" #'vc-diff-unintegrated
   "T D" #'vc-root-diff-unintegrated
+  "T R l" #'vc-log-remote-unintegrated
+  "T R L" #'vc-root-log-remote-unintegrated
+  "T R =" #'vc-diff-remote-unintegrated
+  "T R D" #'vc-root-diff-remote-unintegrated
   ;; There are no -log-outgoing-and-edited commands because by
   ;; definition these are the same as -log-outgoing.
   ;; Additionally bind the -log-outgoing commands under C-x v E l/L as
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 30a5c296898..0b64ea93efb 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -3357,27 +3357,30 @@ BACKEND is the VC backend."
         ;; branch has no name.
         (vc-call-backend backend 'trunk-or-topic-p branch))))
 
-(defun vc--outgoing-base (backend)
+(defun vc--outgoing-base (backend force-topic)
   "Return an outgoing base for the current branch under VC backend BACKEND.
 The outgoing base is the upstream location for which unintegrated
 changes on this branch are destined once they are integrated.
 
 There are two stages to determining the outgoing base.
 First we decide whether we think this is a shorter-lived or a
-longer-lived (\"trunk\") branch by calling `vc-trunk-or-topic-p'.
-If that function returns nil, assume this is a shorter-lived branch.
-This is based on how it's commands primarily intended for working with
-shorter-lived branches that call this function.
+longer-lived (\"trunk\") branch.  If FORCE-TOPIC is non-nil, assume this
+is a shorter-lived branch.  Otherwise call `vc-trunk-or-topic-p'.
+If that function returns nil, also assume this is a shorter-lived
+branch.  This is based on how it's commands primarily intended for
+working with shorter-lived branches that call this function.
 Second, if we have determined that this is a trunk, return nil, meaning
 that the outgoing base is the place to which `vc-push' would push.
 Otherwise, we have determined that this is a shorter-lived branch, and
 we return the value of calling BACKEND's `topic-outgoing-base' VC API
 function."
   ;; For further discussion see bug#80006.
-  (and (memq (vc-trunk-or-topic-p nil backend) '(topic nil))
+  (and (or force-topic
+           (memq (vc-trunk-or-topic-p nil backend) '(topic nil)))
        (vc-call-backend backend 'topic-outgoing-base)))
 
-(defun vc--outgoing-base-mergebase (backend &optional upstream-location refresh)
+(defun vc--outgoing-base-mergebase
+    (backend &optional upstream-location refresh force-topic)
   "Return, under VC backend BACKEND, the merge base with UPSTREAM-LOCATION.
 Normally UPSTREAM-LOCATION, if non-nil, is a string.
 If UPSTREAM-LOCATION is nil, it means to call `vc--outgoing-base' and
@@ -3387,12 +3390,15 @@ If UPSTREAM-LOCATION is the special value t, it means to use the place
 to which `vc-push' would push as UPSTREAM-LOCATION, unconditionally.
 (This is passed when the user invokes an outgoing base command with a
  \\`C-u C-u' prefix argument; see `vc--maybe-read-outgoing-base'.)
-REFRESH is passed on to `vc--incoming-revision'."
+REFRESH is passed on to `vc--incoming-revision'.
+FORCE-TOPIC is passed on to `vc--outgoing-base'."
   (vc-call-backend backend 'mergebase
                    (vc--incoming-revision backend
                                           (pcase upstream-location
                                             ('t nil)
-                                            ('nil (vc--outgoing-base backend))
+                                            ('nil
+                                             (vc--outgoing-base backend
+                                                                force-topic))
                                             (_ upstream-location))
                                           refresh)))
 
@@ -3552,6 +3558,115 @@ topic branch."
   (vc--with-backend-in-rootdir "VC revision log"
     (vc-log-unintegrated upstream-location `(,backend (,rootdir)))))
 
+;;;###autoload
+(defun vc-root-diff-remote-unintegrated (&optional upstream-location)
+  "Report diff of remote changes since merge base with UPSTREAM-LOCATION.
+Remote changes are changes in the incoming revision (instead of the
+working revision), and the merge base with UPSTREAM-LOCATION is the
+common ancestor of the incoming revision and UPSTREAM-LOCATION.
+This command only makes sense for decentralized VCS, because otherwise
+there is no distinction between locally committed changes and upstream
+changes.
+
+When unspecified, UPSTREAM-LOCATION is the outgoing base when this
+branch is considered as a topic branch (whether or not it actually is).
+This command with unspecified UPSTREAM-LOCATION only makes sense on
+topic branches.  See `vc-trunk-or-topic-p'.
+
+When called interactively with a prefix argument, prompt for
+UPSTREAM-LOCATION, which should be a remote branch name."
+  (interactive (list (vc--maybe-read-outgoing-base nil 'no-double)))
+  (vc--with-backend-in-rootdir "VC root-diff"
+    (vc-diff-remote-unintegrated upstream-location
+                                 `(,backend (,rootdir)))))
+
+;;;###autoload
+(defun vc-diff-remote-unintegrated (&optional upstream-location fileset)
+  "Show remote fileset changes since merge base with UPSTREAM-LOCATION.
+Remote changes are changes in the incoming revision (instead of the
+working revision), and the merge base with UPSTREAM-LOCATION is the
+common ancestor of the incoming revision and UPSTREAM-LOCATION.
+This command only makes sense for decentralized VCS, because otherwise
+there is no distinction between locally committed changes and remote
+changes.
+
+When unspecified, UPSTREAM-LOCATION is the outgoing base when this
+branch is considered as a topic branch (whether or not it actually is).
+This command with unspecified UPSTREAM-LOCATION only makes sense on
+topic branches.  See `vc-trunk-or-topic-p'.
+
+When called interactively with a prefix argument, prompt for
+UPSTREAM-LOCATION, which should be a remote branch name.
+
+When called from Lisp, optional argument FILESET overrides the fileset."
+  (interactive (let ((fileset (vc-deduce-fileset t)))
+                 (list (vc--maybe-read-outgoing-base (car fileset)
+                                                     'no-double)
+                       fileset)))
+  (let* ((fileset (or fileset (vc-deduce-fileset t)))
+         (backend (car fileset)))
+    (vc-diff-internal vc-allow-async-diff fileset
+                      (vc--outgoing-base-mergebase backend
+                                                   upstream-location
+                                                   'refresh 'force-topic)
+                      ;; REFRESH nil here because we just refreshed.
+                      (vc--incoming-revision backend)
+                      (called-interactively-p 'interactive))))
+
+;;;###autoload
+(defun vc-log-remote-unintegrated (&optional upstream-location fileset)
+  "Show remote log for VC fileset since merge base with UPSTREAM-LOCATION.
+Remote changes are changes in the incoming revision (instead of the
+working revision), and the merge base with UPSTREAM-LOCATION is the
+common ancestor of the incoming revision and UPSTREAM-LOCATION.
+This command only makes sense for decentralized VCS, because otherwise
+there is no distinction between locally committed changes and remote
+changes.
+
+When unspecified, UPSTREAM-LOCATION is the outgoing base when this
+branch is considered as a topic branch (whether or not it actually is).
+This command with unspecified UPSTREAM-LOCATION only makes sense on
+topic branches.  See `vc-trunk-or-topic-p'.
+
+When called interactively with a prefix argument, prompt for
+UPSTREAM-LOCATION, which should be a remote branch name.
+
+When called from Lisp, optional argument FILESET overrides the fileset."
+  (interactive (let ((fileset (vc-deduce-fileset t)))
+                 (list (vc--maybe-read-outgoing-base (car fileset))
+                       fileset)))
+  (let* ((fileset (or fileset (vc-deduce-fileset t)))
+         (backend (car fileset)))
+    (vc-print-log-internal backend (cadr fileset)
+                           (vc--incoming-revision backend nil 'refresh)
+                           'is-start-revision
+                           ;; REFRESH nil here because we just refreshed.
+                           (vc--outgoing-base-mergebase backend
+                                                        upstream-location
+                                                        nil 'force-topic))))
+
+;;;###autoload
+(defun vc-root-log-remote-unintegrated (&optional upstream-location)
+  "Show log of remote revisions since merge base with UPSTREAM-LOCATION.
+Remote changes are changes in the incoming revision (instead of the
+working revision), and the merge base with UPSTREAM-LOCATION is the
+common ancestor of the incoming revision and UPSTREAM-LOCATION.
+This command only makes sense for decentralized VCS, because otherwise
+there is no distinction between locally committed changes and remote
+changes.
+
+When unspecified, UPSTREAM-LOCATION is the outgoing base when this
+branch is considered as a topic branch (whether or not it actually is).
+This command with unspecified UPSTREAM-LOCATION only makes sense on
+topic branches.  See `vc-trunk-or-topic-p'.
+
+When called interactively with a prefix argument, prompt for
+UPSTREAM-LOCATION, which should be a remote branch name."
+  (interactive (list (vc--maybe-read-outgoing-base nil 'no-double)))
+  (vc--with-backend-in-rootdir "VC revision log"
+    (vc-log-remote-unintegrated upstream-location
+                                `(,backend (,rootdir)))))
+
 (declare-function ediff-load-version-control "ediff" (&optional silent))
 (declare-function ediff-vc-internal "ediff-vers"
                   (rev1 rev2 &optional startup-hooks))
@@ -4481,14 +4596,15 @@ starting at that revision.  Tags and remote references also work."
                                nil 'vc-remote-location-history)))
          (and (not (string-empty-p res)) res))))
 
-(defun vc--maybe-read-outgoing-base (&optional backend)
+(defun vc--maybe-read-outgoing-base (&optional backend no-double)
   "Return upstream location for interactive uses of outgoing base commands.
 If there is no prefix argument, return nil.
-If the current prefix argument is \\`C-u C-u', return t.
+If the current prefix argument is \\`C-u C-u' and NO-DOUBLE is nil,
+return t.
 Otherwise prompt for an upstream location.
 BACKEND is the VC backend."
   (cond
-   ((equal current-prefix-arg '(16)) t)
+   ((and (not no-double) (equal current-prefix-arg '(16))) t)
    (current-prefix-arg
     (let* ((outgoing-base (vc-call-backend (or backend
                                                (vc-deduce-backend))

From e452c4a59fb88db8eaf7079a7e7967014dc63497 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 29 Apr 2026 14:55:23 +0100
Subject: [PATCH 263/463] ; Update ldefs-boot.el.

---
 lisp/ldefs-boot.el | 112 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 108 insertions(+), 4 deletions(-)

diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index d338e4f981a..b8664c9693d 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -10678,9 +10678,9 @@ Message buffer where you can explain more about the patch.
 
 ;;; Generated autoloads from international/emoji.el
 
- (autoload 'emoji-insert "emoji" nil t)
- (autoload 'emoji-recent "emoji" nil t)
- (autoload 'emoji-search "emoji" nil t)
+(autoload 'emoji-insert "emoji")
+(autoload 'emoji-recent "emoji")
+(autoload 'emoji-search "emoji")
 (autoload 'emoji-list "emoji"
 "List Emoji and allow selecting and inserting one of them.
 If you are displaying Emoji on a text-only terminal, and some
@@ -10700,7 +10700,7 @@ If called from Lisp, return the name as a string; return nil if
 the name is not known.
 
 (fn GLYPH &optional INTERACTIVE)" t)
- (autoload 'emoji-list-select "emoji" nil t)
+(autoload 'emoji-list-select "emoji")
 (autoload 'emoji--init "emoji"
 "
 
@@ -37015,6 +37015,34 @@ topic branch.  (With a double prefix argument, this command is like
 When called from Lisp, optional argument FILESET overrides the fileset.
 
 (fn &optional UPSTREAM-LOCATION FILESET)" t)
+(autoload 'vc-root-diff-outgoing-and-edited "vc"
+"Report combined diff of all outgoing and uncommitted changes.
+Outgoing changes are those that would be pushed to UPSTREAM-LOCATION.
+When unspecified UPSTREAM-LOCATION is the place \\[vc-push] would push
+to.  When called interactively with a prefix argument, prompt for
+UPSTREAM-LOCATION.  In some version control systems UPSTREAM-LOCATION
+can be a remote branch name.
+When called from Lisp optional argument FILESET overrides the VC
+fileset.
+
+This command is the same as `vc-root-diff-unintegrated' used on a trunk.
+
+(fn &optional UPSTREAM-LOCATION)" t)
+(function-put 'vc-root-diff-outgoing-and-edited 'interactive-only 'vc-root-diff-unintegrated)
+(autoload 'vc-diff-outgoing-and-edited "vc"
+"Report combined diff of outgoing and uncommitted changes to VC fileset.
+Outgoing changes are those that would be pushed to UPSTREAM-LOCATION.
+When unspecified UPSTREAM-LOCATION is the place \\[vc-push] would push
+to.  When called interactively with a prefix argument, prompt for
+UPSTREAM-LOCATION.  In some version control systems UPSTREAM-LOCATION
+can be a remote branch name.
+When called from Lisp optional argument FILESET overrides the VC
+fileset.
+
+This command is the same as `vc-diff-unintegrated' used on a trunk.
+
+(fn &optional UPSTREAM-LOCATION FILESET)" t)
+(function-put 'vc-diff-outgoing-and-edited 'interactive-only 'vc-diff-unintegrated)
 (autoload 'vc-log-unintegrated "vc"
 "Show log for the VC fileset since the merge base with UPSTREAM-LOCATION.
 The merge base with UPSTREAM-LOCATION means the common ancestor of the
@@ -37058,6 +37086,82 @@ use the place to which \\[vc-push] would push to as the outgoing base,
 i.e., treat this branch as a trunk branch even if Emacs thinks it is a
 topic branch.
 
+(fn &optional UPSTREAM-LOCATION)" t)
+(autoload 'vc-root-diff-remote-unintegrated "vc"
+"Report diff of remote changes since merge base with UPSTREAM-LOCATION.
+Remote changes are changes in the incoming revision (instead of the
+working revision), and the merge base with UPSTREAM-LOCATION is the
+common ancestor of the incoming revision and UPSTREAM-LOCATION.
+This command only makes sense for decentralized VCS, because otherwise
+there is no distinction between locally committed changes and upstream
+changes.
+
+When unspecified, UPSTREAM-LOCATION is the outgoing base when this
+branch is considered as a topic branch (whether or not it actually is).
+This command with unspecified UPSTREAM-LOCATION only makes sense on
+topic branches.  See `vc-trunk-or-topic-p'.
+
+When called interactively with a prefix argument, prompt for
+UPSTREAM-LOCATION, which should be a remote branch name.
+
+(fn &optional UPSTREAM-LOCATION)" t)
+(autoload 'vc-diff-remote-unintegrated "vc"
+"Show remote fileset changes since merge base with UPSTREAM-LOCATION.
+Remote changes are changes in the incoming revision (instead of the
+working revision), and the merge base with UPSTREAM-LOCATION is the
+common ancestor of the incoming revision and UPSTREAM-LOCATION.
+This command only makes sense for decentralized VCS, because otherwise
+there is no distinction between locally committed changes and remote
+changes.
+
+When unspecified, UPSTREAM-LOCATION is the outgoing base when this
+branch is considered as a topic branch (whether or not it actually is).
+This command with unspecified UPSTREAM-LOCATION only makes sense on
+topic branches.  See `vc-trunk-or-topic-p'.
+
+When called interactively with a prefix argument, prompt for
+UPSTREAM-LOCATION, which should be a remote branch name.
+
+When called from Lisp, optional argument FILESET overrides the fileset.
+
+(fn &optional UPSTREAM-LOCATION FILESET)" t)
+(autoload 'vc-log-remote-unintegrated "vc"
+"Show remote log for VC fileset since merge base with UPSTREAM-LOCATION.
+Remote changes are changes in the incoming revision (instead of the
+working revision), and the merge base with UPSTREAM-LOCATION is the
+common ancestor of the incoming revision and UPSTREAM-LOCATION.
+This command only makes sense for decentralized VCS, because otherwise
+there is no distinction between locally committed changes and remote
+changes.
+
+When unspecified, UPSTREAM-LOCATION is the outgoing base when this
+branch is considered as a topic branch (whether or not it actually is).
+This command with unspecified UPSTREAM-LOCATION only makes sense on
+topic branches.  See `vc-trunk-or-topic-p'.
+
+When called interactively with a prefix argument, prompt for
+UPSTREAM-LOCATION, which should be a remote branch name.
+
+When called from Lisp, optional argument FILESET overrides the fileset.
+
+(fn &optional UPSTREAM-LOCATION FILESET)" t)
+(autoload 'vc-root-log-remote-unintegrated "vc"
+"Show log of remote revisions since merge base with UPSTREAM-LOCATION.
+Remote changes are changes in the incoming revision (instead of the
+working revision), and the merge base with UPSTREAM-LOCATION is the
+common ancestor of the incoming revision and UPSTREAM-LOCATION.
+This command only makes sense for decentralized VCS, because otherwise
+there is no distinction between locally committed changes and remote
+changes.
+
+When unspecified, UPSTREAM-LOCATION is the outgoing base when this
+branch is considered as a topic branch (whether or not it actually is).
+This command with unspecified UPSTREAM-LOCATION only makes sense on
+topic branches.  See `vc-trunk-or-topic-p'.
+
+When called interactively with a prefix argument, prompt for
+UPSTREAM-LOCATION, which should be a remote branch name.
+
 (fn &optional UPSTREAM-LOCATION)" t)
 (autoload 'vc-version-ediff "vc"
 "Show differences between REV1 and REV2 of FILES using ediff.

From 7017fcc4c5d1737a196c814728fd7516f4f772d2 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 29 Apr 2026 18:04:48 +0300
Subject: [PATCH 264/463] ; Add new test to files-tests

* test/lisp/files-tests.el
(files-tests-directory-files-recursively-w32): New test.
---
 test/lisp/files-tests.el | 48 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index f3a2bd2df10..1dcd5161ee9 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -696,6 +696,54 @@ unquoted file names."
       (tmpdir nospecial-dir t)
     (should-error (directory-files-and-attributes nospecial-dir))))
 
+(ert-deftest files-tests-directory-files-recursively-w32 ()
+  "Test MS-Windows specific features of `directory-files-recursively'."
+  (skip-unless (eq system-type 'windows-nt))
+  (files-tests--with-temp-non-special (tmpdir nospecial-dir t)
+    (let ((files-list
+           ;; The list should be in the order that
+           ;; 'directory-files-recursively' returns files and
+           ;; directories.
+           '("Dir/SubDir/SubSubDir/SuBSubFile"
+             "Dir/SubDir/SubSubDir/"
+             "Dir/SubDir/"
+             "Dir/SuBfIlE1"
+             "Dir/sUbFiLe2"
+             "Dir/"
+             "FiLe1"))
+          (fnrel (lambda (fn) (file-relative-name fn tmpdir))))
+      (dolist (file files-list)
+        (if (directory-name-p file)
+            (make-directory (expand-file-name file nospecial-dir) t)
+          (make-empty-file
+           (expand-file-name file tmpdir) t)))
+      ;; Run them through 'directory-file-name' because the list above
+      ;; uses directory names, whereas 'directory-files-recursively'
+      ;; returns their file names.
+      (should (equal (mapcar 'directory-file-name files-list)
+                     ;; Make the returned file names relative.
+                     (mapcar fnrel
+                             (directory-files-recursively tmpdir ".*" t))))
+      ;; Test that 'directory-files-recursively' downcases file names it
+      ;; returns when 'w32-downcase-file-names' is non-nil.
+      (let ((w32-downcase-file-names t))
+        (should (equal (mapcar 'downcase
+                               (mapcar 'directory-file-name files-list))
+                       (mapcar fnrel
+                               (directory-files-recursively tmpdir ".*" t)))))
+      ;; Test that backslashes are mirrored when files are returned.
+      (let* ((tmpdir-with-backslashes
+              (string-replace "/" "\\" (directory-file-name tmpdir)))
+             (nelt 2)
+             (subdir (file-name-concat
+                      (concat tmpdir-with-backslashes "\\")
+                      (string-replace "/" "\\" (nth nelt files-list)))))
+        (should (equal (mapcar 'directory-file-name
+                               (butlast files-list (- (length files-list)
+                                                      nelt)))
+                       (mapcar fnrel
+                             (directory-files-recursively subdir ".*" t))))))))
+
 (ert-deftest files-tests-file-name-non-special-dired-compress-handler ()
   ;; `dired-compress-file' can get confused by filenames with ":" in
   ;; them, which causes this to fail on `windows-nt' systems.

From 8c8a43bc54553bec5a873ef9c4d3e8005e8195cf Mon Sep 17 00:00:00 2001
From: Roi Martin <jroi.martin@gmail.com>
Date: Tue, 28 Apr 2026 20:34:13 +0200
Subject: [PATCH 265/463] Fix warning when building Calc manual

These warnings are emitted at least by Texinfo 7.2.
* doc/misc/calc.texi (Introduction): Conditionally set prev node to
avoid warning.
(Interactive Tutorial): Update chapter title to match node name and
menu entry.
(Top): Add description to `Interactive Tutorial' menu entry.
(Bug#80923)
---
 doc/misc/calc.texi | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index b1e4221bd5b..dd90dfdef7c 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -168,7 +168,7 @@ longer Info tutorial.)
 @menu
 * Getting Started::       General description and overview.
 @ifinfo
-* Interactive Tutorial::
+* Interactive Tutorial::  Using the Emacs Info system with this tutorial.
 @end ifinfo
 @ifnotinfo
 * Tutorial::              A step-by-step introduction for beginners.
@@ -1246,7 +1246,7 @@ finished in two weeks.
 @ifinfo
 @c This node is accessed by the 'C-x * t' command.
 @node Interactive Tutorial, Introduction, Getting Started, Top
-@chapter Tutorial
+@chapter Interactive Tutorial
 
 @noindent
 Some brief instructions on using the Emacs Info system for this tutorial:
@@ -9573,7 +9573,12 @@ the last rule.
 
 @c [reference]
 
-@node Introduction
+@ifinfo
+@node Introduction, Data Types, Interactive Tutorial, Top
+@end ifinfo
+@ifnotinfo
+@node Introduction, Data Types, Tutorial, Top
+@end ifnotinfo
 @chapter Introduction
 
 @noindent

From f06786499e59a0f7fa6f37420626dac427e6345d Mon Sep 17 00:00:00 2001
From: Daniel Colascione <dancol@dancol.org>
Date: Tue, 28 Apr 2026 14:26:39 -0400
Subject: [PATCH 266/463] Make TS query cache work, grow less

We were using the wrong key when inserting entries into
treesit--query-cache, making the cache both ineffective and
liable to grow without bound.  On very long sessions, the cache
could end up using hundreds.

* lisp/treesit.el (treesit--compile-query-with-cache): Use
correct cache key.
---
 lisp/treesit.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 2fd6a9eb1d9..a9e8b4bd466 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1448,10 +1448,10 @@ queries."
             (signal 'treesit-query-error value))
         (condition-case err
             (let ((compiled (treesit-query-compile lang query 'eager)))
-              (puthash (cons lang query) compiled treesit--query-cache)
+              (puthash (cons lang query-source) compiled treesit--query-cache)
               compiled)
           (treesit-query-error
-           (puthash (cons lang query) (cdr err) treesit--query-cache)
+           (puthash (cons lang query-source) (cdr err) treesit--query-cache)
            (signal 'treesit-query-error (cdr err))))))))
 
 (defvar-local treesit-font-lock-settings nil

From d278e51f43c51a65e3086fff9ea9cb4b18ff2d21 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 29 Apr 2026 15:05:58 -0400
Subject: [PATCH 267/463] (loaddefs-generate--make-autoload): Fix autoload for
 `emoji-insert`

To decide if a `defalias` will define a command, we need to look inside
the `lambda` and search for an interactive spec.  Until now we assumed
`defalias`s argument would take the shape of `(function (lambda ...))`,
which failed miserably for `transient-define-prefix` which
macroexpands to `(defalias 'foo (lambda ...))` instead.
So make sure we macroexpand the arg to turn the `(lambda ...)` into
`(function (lambda ...))` before we try to dig into it.

* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload):
Macroexpand the `defalias` argument before checking if it's an
interactive function.
---
 lisp/emacs-lisp/loaddefs-gen.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el
index 7d1ca74ea94..a418364bee5 100644
--- a/lisp/emacs-lisp/loaddefs-gen.el
+++ b/lisp/emacs-lisp/loaddefs-gen.el
@@ -158,6 +158,7 @@ expand)' among their `declare' forms."
      ((and expansion (eq car 'defalias))
       (pcase-let*
           ((`(,_ ,_ ,arg . ,rest) form)
+           (arg (macroexpand arg))
            ;; `type' is non-nil if it defines a macro.
            ;; `fun' is the function part of `arg' (defaults to `arg').
            ((or (and (or `(cons 'macro ,fun) `'(macro . ,fun)) (let type t))

From 4e420d0b20eb4558545a97b88729d3fa69dc88f9 Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Wed, 29 Apr 2026 16:31:11 -0700
Subject: [PATCH 268/463] In tree-sitter, signal if predicate function causes
 reparse

A reparse will make the TSTreeCursor or TSNode to possibly point
to freed memory (because the TSTree they point to is freed.)

* src/treesit.c (treesit_pred_with_guard): New function.
(treesit_predicate_pred):
(treesit_eval_predicates):
(Ftreesit_query_capture):
(treesit_traverse_match_predicate):
(treesit_build_sparse_tree): Add guard that signals if buffer is
changed when calling predicate function.
(Qtreesit_buffer_changed): New symbol.
---
 src/treesit.c | 48 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/treesit.c b/src/treesit.c
index 5315c348634..54c36e3a208 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2229,6 +2229,21 @@ void treesit_ensure_query_compiled_signal (Lisp_Object lisp_query)
     xsignal (signal_symbol, signal_data);
 }
 
+/* Call PRED with NODE, signal an error if PRED caused PARSER to
+   re-parse.  Return the funcall result.  If PRED just changes buffer
+   but didn't trigger a reparser, we let it go, to be as out-of-the-way
+   as possible.  */
+static Lisp_Object treesit_pred_with_guard
+(Lisp_Object pred, Lisp_Object node, Lisp_Object parser)
+{
+  ptrdiff_t pre_timestamp = XTS_PARSER (parser)->timestamp;
+  Lisp_Object res = calln (pred, node);
+  if (XTS_PARSER (parser)->timestamp != pre_timestamp)
+    {
+      xsignal (Qtreesit_buffer_changed, list1 (pred));
+    }
+  return res;
+}
 
 /* Lisp definitions.  */
 
@@ -3775,7 +3790,7 @@ treesit_predicate_match (Lisp_Object args, struct capture_range captures,
    if error occurs, set it to a suitable signal data.  */
 static bool
 treesit_predicate_pred (Lisp_Object args, struct capture_range captures,
-			Lisp_Object *signal_data)
+			Lisp_Object *signal_data, Lisp_Object parser)
 {
   if (list_length (args) < 2)
     {
@@ -3799,7 +3814,14 @@ treesit_predicate_pred (Lisp_Object args, struct capture_range captures,
   }
   nodes = Fnreverse (nodes);
 
-  return !NILP (CALLN (Fapply, fn, nodes));
+  ptrdiff_t ts = XTS_PARSER (parser)->timestamp;
+  Lisp_Object val = CALLN (Fapply, fn, nodes);
+  if (XTS_PARSER (parser)->timestamp != ts)
+    {
+      *signal_data = list1 (fn);
+      return false;
+    }
+  return !NILP (val);
 }
 
 /* If all predicates in PREDICATES pass, return true; otherwise
@@ -3807,7 +3829,7 @@ treesit_predicate_pred (Lisp_Object args, struct capture_range captures,
    error occurs, set it to a suitable signal data.  */
 static bool
 treesit_eval_predicates (struct capture_range captures, Lisp_Object predicates,
-			 Lisp_Object *signal_data)
+			 Lisp_Object *signal_data, Lisp_Object parser)
 {
   bool pass = true;
   /* Evaluate each predicates.  */
@@ -3822,7 +3844,7 @@ treesit_eval_predicates (struct capture_range captures, Lisp_Object predicates,
       else if (!NILP (Fstring_equal (fn, Vtreesit_str_match_question_mark)))
 	pass &= treesit_predicate_match (args, captures, signal_data);
       else if (!NILP (Fstring_equal (fn, Vtreesit_str_pred_question_mark)))
-	pass &= treesit_predicate_pred (args, captures, signal_data);
+	pass &= treesit_predicate_pred (args, captures, signal_data, parser);
       else
 	{
 	  *signal_data = list3 (build_string ("Invalid predicate"),
@@ -4167,7 +4189,7 @@ the query.  */)
 	}
       bool match
 	= treesit_eval_predicates (captures_range, predicates,
-				   &predicate_signal_data);
+				   &predicate_signal_data, lisp_parser);
 
       if (!NILP (predicate_signal_data))
 	break;
@@ -4568,7 +4590,8 @@ treesit_traverse_validate_predicate (Lisp_Object pred,
    This function assumes PRED is in one of its valid forms.  If NAMED
    is true, also check that the node is named.
 
-   This function may signal if the predicate function signals.  */
+   This function may signal if the predicate function signals or changes
+   the buffer.  */
 static bool
 treesit_traverse_match_predicate (TSTreeCursor *cursor, Lisp_Object pred,
 				  Lisp_Object parser, bool named)
@@ -4590,7 +4613,8 @@ treesit_traverse_match_predicate (TSTreeCursor *cursor, Lisp_Object pred,
 	   && !(SYMBOLP (pred) && !NILP (Fget (pred, Qtreesit_thing_symbol))))
     {
       Lisp_Object lisp_node = make_treesit_node (parser, node);
-      return !NILP (calln (pred, lisp_node));
+      Lisp_Object res = treesit_pred_with_guard (pred, lisp_node, parser);
+      return !NILP (res);
     }
   else if (SYMBOLP (pred) && BASE_EQ (pred, Qnamed))
     return ts_node_is_named (node);
@@ -4899,7 +4923,8 @@ always traverse leaf nodes first, then upwards.  */)
    Note that the top-level children list is reversed, because
    reasons.
 
-   This function may signal if the predicate function signals.  */
+   This function may signal if the predicate function signals or changes
+   buffer.  */
 static void
 treesit_build_sparse_tree (TSTreeCursor *cursor, Lisp_Object parent,
 			   Lisp_Object pred, Lisp_Object process_fn,
@@ -4913,7 +4938,7 @@ treesit_build_sparse_tree (TSTreeCursor *cursor, Lisp_Object parent,
       TSNode node = ts_tree_cursor_current_node (cursor);
       Lisp_Object lisp_node = make_treesit_node (parser, node);
       if (!NILP (process_fn))
-	lisp_node = calln (process_fn, lisp_node);
+	lisp_node = treesit_pred_with_guard (process_fn, lisp_node, parser);
 
       Lisp_Object this = Fcons (lisp_node, Qnil);
       Fsetcdr (parent, Fcons (this, Fcdr (parent)));
@@ -5275,6 +5300,8 @@ syms_of_treesit (void)
 	  "treesit-load-language-error");
   DEFSYM (Qtreesit_node_outdated,
 	  "treesit-node-outdated");
+  DEFSYM (Qtreesit_buffer_changed,
+	  "treesit-buffer_changed");
   DEFSYM (Qtreesit_node_buffer_killed,
 	  "treesit-node-buffer-killed");
   DEFSYM (Quser_emacs_directory,
@@ -5312,6 +5339,9 @@ syms_of_treesit (void)
   define_error (Qtreesit_node_outdated,
 		"This node is outdated, please retrieve a new one",
 		Qtreesit_error);
+  define_error (Qtreesit_buffer_changed,
+		"Buffer content changed, please don't edit buffer in predicate function, etc",
+		Qtreesit_error);
   define_error (Qtreesit_node_buffer_killed,
 		"The buffer associated with this node is killed",
 		Qtreesit_error);

From d2d49057eb435a88621cb8fac8d3e4b9efd4a25b Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Wed, 29 Apr 2026 19:59:02 -0700
Subject: [PATCH 269/463] ; * lisp/treesit.el (treesit-ready-p): Fix docstring.

---
 lisp/treesit.el | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index a9e8b4bd466..4579d416f34 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -4611,6 +4611,10 @@ as belonging to the node that ends before POS (by subtracting 1 from POS)."
 LANGUAGE is the language symbol to check for availability.
 It can also be a list of language symbols.
 
+It checks that tree-sitter available, the language(s) grammar are
+available, and the current buffer's size isn't too
+large (`treesit-max-buffer-size').
+
 If tree-sitter is not ready, emit a warning and return nil.  If
 the user has chosen to activate tree-sitter for LANGUAGE and
 tree-sitter is ready, return non-nil.  If QUIET is t, don't emit

From 27a18cfd7e3911771e78a627949637b43ef3cc12 Mon Sep 17 00:00:00 2001
From: Vladimir Kazanov <vekazanov@gmail.com>
Date: Thu, 16 Apr 2026 12:11:14 +0100
Subject: [PATCH 270/463] Add ERT coverage for read_key_sequence behaviour

* test/src/keyboard-tests.el
(keyboard-tests--rks-fake-posn)
(keyboard-tests--rks-observe)
(keyboard-tests--rks-execute)
(keyboard-tests--rks-with-function-key-bindings)
(keyboard-tests--rks-with-event-kinds)
(keyboard-tests--rks-call-with-live-window-maps): Test helpers.
(keyboard-tests-rks-prefix-then-key)
(keyboard-tests-rks-unbound-returns-sequence)
(keyboard-tests-rks-bound-sequence-ends-read)
(keyboard-tests-rks-decode-fires-without-binding)
(keyboard-tests-rks-input-decode-map)
(keyboard-tests-rks-function-key-map)
(keyboard-tests-rks-function-key-map-on-undefined)
(keyboard-tests-rks-key-translation-before-function-key)
(keyboard-tests-rks-function-key-skipped-when-bound)
(keyboard-tests-rks-input-decode-after-function-key)
(keyboard-tests-rks-key-translation-overrides-bound-sequence)
(keyboard-tests-rks-upcase-fallback)
(keyboard-tests-rks-no-upcase-fallback)
(keyboard-tests-rks-dont-downcase-last)
(keyboard-tests-rks-shifted-function-key-fallback)
(keyboard-tests-rks-switch-frame-delayed)
(keyboard-tests-rks-unbound-down-mouse-dropped)
(keyboard-tests-rks-mode-line-fake-prefix)
(keyboard-tests-rks-mode-line-fake-prefix-continued)
(keyboard-tests-rks-clicked-buffer-switch)
(keyboard-tests-rks-help-char): Tests covering for read_key_sequence.
---
 test/src/keyboard-tests.el | 367 +++++++++++++++++++++++++++++++++++++
 1 file changed, 367 insertions(+)

diff --git a/test/src/keyboard-tests.el b/test/src/keyboard-tests.el
index d3787090794..ae47e4b3b4b 100644
--- a/test/src/keyboard-tests.el
+++ b/test/src/keyboard-tests.el
@@ -81,5 +81,372 @@
     (should-error (read-event "foo: "))
     (should-error (read-char-exclusive "foo: "))))
 
+;;; Tests for `read-key-sequence' code paths.
+
+;;;; Helpers
+
+(defun keyboard-tests--rks-fake-posn (window &optional area)
+  "Return a synthetic mouse position list for WINDOW.
+AREA, when non-nil, is a non-text part such as `mode-line'."
+  (list window (or area 1) '(0 . 0) 0 nil 1
+        '(0 . 0) nil '(0 . 0) '(1 . 1)))
+
+(defun keyboard-tests--rks-observe (events local-map &optional dont-downcase-last)
+  "Fill `read-key-sequence-vector' with EVENTS under LOCAL-MAP.
+EVENTS is a list pushed into `unread-command-events'.
+LOCAL-MAP is bound as `overriding-terminal-local-map'.
+DONT-DOWNCASE-LAST is forwarded to `read-key-sequence-vector'.
+Return a plist with :sequence, :binding, and :shift-translated."
+  (clear-this-command-keys)
+  (let* (this-command-keys-shift-translated
+         ;; This rules over all other keymaps.
+         (overriding-terminal-local-map local-map)
+         ;; Has priority over keyboard events.
+         (unread-command-events events)
+         ;; Wrapper around `read-key-sequence'.  Pushes events through
+         ;; the machinery.
+         (sequence (read-key-sequence-vector nil nil dont-downcase-last))
+         (binding (key-binding sequence)))
+    (list :sequence sequence
+          :binding binding
+          :shift-translated this-command-keys-shift-translated)))
+
+(defun keyboard-tests--rks-execute (events &optional local-map)
+  "Execute EVENTS through the command loop using LOCAL-MAP."
+  (let ((overriding-terminal-local-map local-map))
+    ;; This runs translated events through the full command loop, not
+    ;; just the sequence.
+    (execute-kbd-macro (vconcat events))))
+
+(defun keyboard-tests--rks-with-function-key-bindings (bindings thunk)
+  "Run THUNK with BINDINGS installed in `local-function-key-map'."
+  (let ((oldmap local-function-key-map)
+        (local-function-key-map (make-sparse-keymap)))
+    (set-keymap-parent local-function-key-map oldmap)
+    (dolist (b bindings)
+      (define-key local-function-key-map (car b) (cdr b)))
+    (funcall thunk)))
+
+(defun keyboard-tests--rks-with-event-kinds (kinds thunk)
+  "Set the `event-kind' property of each KIND, call THUNK, then restore.
+KINDS is a list of (SYMBOL . KIND)."
+  (let ((saved (mapcar (lambda (k) (cons (car k) (get (car k) 'event-kind)))
+                       kinds)))
+    (unwind-protect
+        (progn
+          (dolist (k kinds) (put (car k) 'event-kind (cdr k)))
+          (funcall thunk))
+      (dolist (k saved) (put (car k) 'event-kind (cdr k))))))
+
+(defun keyboard-tests--rks-call-with-live-window-maps (map-a map-b fn)
+  "Call FN with two live buffers/windows whose local maps are MAP-A and MAP-B.
+FN is called with BUFFER-A WINDOW-A BUFFER-B WINDOW-B."
+  (let ((buffer-a (generate-new-buffer " *keyboard-tests-a*"))
+        (buffer-b (generate-new-buffer " *keyboard-tests-b*")))
+    (unwind-protect
+        (save-window-excursion
+          (delete-other-windows)
+          (let* ((window-a (selected-window))
+                 (window-b (split-window-right)))
+            (set-window-buffer window-a buffer-a)
+            (set-window-buffer window-b buffer-b)
+            (with-current-buffer buffer-a (use-local-map map-a))
+            (with-current-buffer buffer-b (use-local-map map-b))
+            (funcall fn buffer-a window-a buffer-b window-b)))
+      (kill-buffer buffer-a)
+      (kill-buffer buffer-b))))
+
+;;;; Keymap interaction
+
+(ert-deftest keyboard-tests-rks-prefix-then-key ()
+    "Check reading a prefix key and a following key."
+  ;; C-c a -> [C-c a]
+  (let ((map (make-sparse-keymap)))
+    (define-key map [?\C-c ?a] 'ignore)
+    (let ((obs (keyboard-tests--rks-observe (list ?\C-c ?a) map)))
+      (should (equal [?\C-c ?a] (plist-get obs :sequence)))
+      (should (eq 'ignore (plist-get obs :binding))))))
+
+(ert-deftest keyboard-tests-rks-unbound-returns-sequence ()
+  "An unbound symbol event returns as a one-element vector unchanged."
+  ;; 'symbol-not-bound -> [symbol-not-bound]
+  (let* ((map (make-sparse-keymap))
+         (obs (keyboard-tests--rks-observe
+               (list 'symbol-not-bound) map)))
+    (should (equal [symbol-not-bound]
+                   (plist-get obs :sequence)))))
+
+(ert-deftest keyboard-tests-rks-bound-sequence-ends-read ()
+  "Check that a complete binding ends the sequence.
+This happens even when `input-decode-map' has a prefix match starting at
+the tail.
+Example: on a tty, ESC O B is mapped to `<down>' using
+`input-decode-map'.  When the user types ESC ESC ESC O B, the last ESC
+could be the start of an ESC O B escape sequence.  But once the keys read so
+far have a complete binding, `read-key-sequence' returns immediately
+even if `input-decode-map' has not yet scanned the tail."
+  ;; feed C-c C-c C-c a b -> [C-c C-c C-c]; trailing a b is left
+  ;; unscanned
+  (let ((map (make-sparse-keymap))
+        (input-decode-map (make-sparse-keymap)))
+    (define-key input-decode-map [?\C-c ?a ?b] [f99])
+    (define-key map [?\C-c ?\C-c ?\C-c] 'ignore)
+    (define-key map [f99] 'undo)
+    (let ((obs (keyboard-tests--rks-observe
+                (list ?\C-c ?\C-c ?\C-c ?a ?b) map)))
+      (should (equal [?\C-c ?\C-c ?\C-c] (plist-get obs :sequence)))
+      (should (eq 'ignore (plist-get obs :binding))))))
+
+(ert-deftest keyboard-tests-rks-decode-fires-without-binding ()
+  "With no prefix binding `input-decode-map' can translate the tail."
+  ;; feed C-c C-c C-c a b -> [C-c C-c f99]; trailing a b is translated
+  (let ((map (make-sparse-keymap))
+        (input-decode-map (make-sparse-keymap)))
+    (define-key input-decode-map [?\C-c ?a ?b] [f99])
+    (define-key map [?\C-c ?\C-c f99] 'ignore)
+    (let ((obs (keyboard-tests--rks-observe
+                (list ?\C-c ?\C-c ?\C-c ?a ?b) map)))
+      (should (equal [?\C-c ?\C-c f99] (plist-get obs :sequence)))
+      (should (eq 'ignore (plist-get obs :binding))))))
+
+;;;; Translation pipeline
+;;
+;; `read_key_sequence' runs three translation machines (in THIS order):
+;; `input-decode-map', then `local-function-key-map'/`function-key-map'
+;; parent), then `key-translation-map'.
+;;
+;; These are not the same!
+;;
+;; 1. `input-decode-map' can rewrite raw input even when a binding exists;
+;;
+;; 2. `function-key-map' translation is only allowed when the sequence is undefined;
+;;
+;; 3. `key-translation-map' runs last and can rescan the result of
+;; function-key translation.
+;;
+;; Example: if raw `C-c a' is decoded to `C-c b', function-key
+;; translation must not look inside `C-c b' again.  But if function-key
+;; translation rewrites `C-c a' to `C-c b', `key-translation-map' is
+;; still allowed to turn that into `C-c c'.
+
+(ert-deftest keyboard-tests-rks-input-decode-map ()
+  "Input-decode rewrites a raw sequence before lookup."
+  ;; C-c a -> [C-c b]
+  (let ((map (make-sparse-keymap))
+        (input-decode-map (make-sparse-keymap)))
+    (define-key map [?\C-c ?b] 'ignore)
+    (define-key input-decode-map [?\C-c ?a] [?\C-c ?b])
+    (let ((obs (keyboard-tests--rks-observe (list ?\C-c ?a) map)))
+      (should (equal [?\C-c ?b] (plist-get obs :sequence)))
+      (should (eq 'ignore (plist-get obs :binding))))))
+
+(ert-deftest keyboard-tests-rks-function-key-map ()
+  "Check that `local-function-key-map' rewrites undefined bindings."
+  ;;  C-c a -> [C-c b].
+  (let ((map (make-sparse-keymap)))
+    (define-key map [?\C-c ?b] 'ignore)
+    (keyboard-tests--rks-with-function-key-bindings
+     '(([?\C-c ?a] . [?\C-c ?b]))
+     (lambda ()
+       (let ((obs (keyboard-tests--rks-observe (list ?\C-c ?a) map)))
+         (should (equal [?\C-c ?b] (plist-get obs :sequence)))
+         (should (eq 'ignore (plist-get obs :binding))))))))
+
+(ert-deftest keyboard-tests-rks-function-key-map-on-undefined ()
+  "An explicit binding still allows function-key translation."
+  (let ((map (make-sparse-keymap)))
+    (define-key map [?\C-c ?a] 'undefined)
+    (define-key map [?\C-c ?b] 'ignore)
+    (keyboard-tests--rks-with-function-key-bindings
+     '(([?\C-c ?a] . [?\C-c ?b]))
+     (lambda ()
+       (let ((obs (keyboard-tests--rks-observe (list ?\C-c ?a) map)))
+         (should (equal [?\C-c ?b] (plist-get obs :sequence)))
+         (should (eq 'ignore (plist-get obs :binding))))))))
+
+(ert-deftest keyboard-tests-rks-input-decode-before-function-key ()
+  "Check that input decode happens before function key translation."
+  ;; input-decode-map rewrites C-c a -> C-c b; function-key-map cannot
+  ;; rescan the translated positions to apply C-c b -> C-c c.
+  (let ((map (make-sparse-keymap))
+        (input-decode-map (make-sparse-keymap)))
+    (define-key map [?\C-c ?c] 'ignore)
+    (define-key input-decode-map [?\C-c ?a] [?\C-c ?b])
+    (keyboard-tests--rks-with-function-key-bindings
+     '(([?\C-c ?b] . [?\C-c ?c]))
+     (lambda ()
+       (let ((obs (keyboard-tests--rks-observe (list ?\C-c ?a) map)))
+         (should (equal [?\C-c ?b] (plist-get obs :sequence))))))))
+
+(ert-deftest keyboard-tests-rks-function-key-skipped-when-bound ()
+  "A real binding should win over `function-key-map'."
+  ;; C-a a -> [C-a a] (no translation)
+  (let ((map (make-sparse-keymap)))
+    (define-key map [?\C-c ?a] 'ignore)
+    (define-key map [?\C-c ?b] 'undo)
+    (keyboard-tests--rks-with-function-key-bindings
+     '(([?\C-c ?a] . [?\C-c ?b]))
+     (lambda ()
+       (let ((obs (keyboard-tests--rks-observe (list ?\C-c ?a) map)))
+         (should (equal [?\C-c ?a] (plist-get obs :sequence)))
+         (should (eq 'ignore (plist-get obs :binding))))))))
+
+(ert-deftest keyboard-tests-rks-key-translation-after-function-key ()
+  "Check that `key-translation-map' translates after `function-key-map'."
+  ;; function-key-map rewrites C-c a -> C-c b; key-translation-map
+  ;; rescans the translated positions to apply C-c b -> C-c c.
+  (let ((map (make-sparse-keymap))
+        (key-translation-map (make-sparse-keymap)))
+    (define-key map [?\C-c ?c] 'ignore)
+    (define-key key-translation-map [?\C-c ?b] [?\C-c ?c])
+    (keyboard-tests--rks-with-function-key-bindings
+     '(([?\C-c ?a] . [?\C-c ?b]))
+     (lambda ()
+       (let ((obs (keyboard-tests--rks-observe (list ?\C-c ?a) map)))
+         (should (equal [?\C-c ?c] (plist-get obs :sequence)))
+         (should (eq 'ignore (plist-get obs :binding))))))))
+
+(ert-deftest keyboard-tests-rks-key-translation-overrides-bound-sequence ()
+  "The final translation layer can override a bound sequence."
+  (let ((map (make-sparse-keymap))
+        (key-translation-map (make-sparse-keymap)))
+    (define-key map [?\C-c ?a] 'ignore)
+    (define-key map [?\C-c ?b] 'undo)
+    (define-key key-translation-map [?\C-c ?a] [?\C-c ?b])
+    (let ((obs (keyboard-tests--rks-observe (list ?\C-c ?a) map)))
+      (should (equal [?\C-c ?b] (plist-get obs :sequence)))
+      (should (eq 'undo (plist-get obs :binding))))))
+
+;;;; Postprocessing and fallbacks
+
+(ert-deftest keyboard-tests-rks-upcase-fallback ()
+  "Check that uppercase fallback works."
+  ;; C-c A -> [C-c a]
+  (let ((map (make-sparse-keymap)))
+    (define-key map [?\C-c ?a] 'ignore)
+    (let ((obs (keyboard-tests--rks-observe (list ?\C-c ?A) map)))
+      (should (equal [?\C-c ?a] (plist-get obs :sequence)))
+      (should (eq 'ignore (plist-get obs :binding)))
+      (should (plist-get obs :shift-translated)))))
+
+(ert-deftest keyboard-tests-rks-no-upcase-fallback ()
+  "Check that disabling uppercase translation works."
+  ;; C-c A -> [C-c A] (with translate-upper-case-key-bindings set to t)
+  (let ((map (make-sparse-keymap))
+        (translate-upper-case-key-bindings nil))
+    (define-key map [?\C-c ?a] 'ignore)
+    (let ((obs (keyboard-tests--rks-observe (list ?\C-c ?A) map)))
+      (should (equal [?\C-c ?A] (plist-get obs :sequence)))
+      (should-not (plist-get obs :shift-translated)))))
+
+(ert-deftest keyboard-tests-rks-dont-downcase-last ()
+  "Uppercase is restored after a lowercase lookup with dont-downcase-last."
+  ;; C-c A -> [C-c A] (note the dont-downcase-last arg)
+  (let ((map (make-sparse-keymap)))
+    (define-key map [?\C-c ?a] 'ignore)
+    (let ((obs (keyboard-tests--rks-observe (list ?\C-c ?A) map t)))
+      (should (equal [?\C-c ?A] (plist-get obs :sequence)))
+      (should-not (plist-get obs :shift-translated)))))
+
+(ert-deftest keyboard-tests-rks-shifted-function-key-fallback ()
+  "Shifted function-key fallback works."
+  ;; S-f2 to [f2]
+  (let ((map (make-sparse-keymap)))
+    (define-key map [f2] 'ignore)
+    (let ((obs (keyboard-tests--rks-observe (list 'S-f2) map)))
+      (should (equal [f2] (plist-get obs :sequence)))
+      (should (eq 'ignore (plist-get obs :binding)))
+      (should (plist-get obs :shift-translated)))))
+
+;;;; Frames, buffers, mouse events, help
+
+(ert-deftest keyboard-tests-rks-switch-frame-delayed ()
+  "A mid-sequence switch-frame is delayed, so the read is finished."
+  ;; C-c (switch-event ..) b -> [C-c b]
+  (let ((map (make-sparse-keymap)))
+    (define-key map [?\C-c ?b] 'ignore)
+    (let* ((switch-event (list 'switch-frame (selected-frame)))
+           (obs (keyboard-tests--rks-observe
+                 (list ?\C-c switch-event ?b) map)))
+      (should (equal [?\C-c ?b] (plist-get obs :sequence)))
+      (should (eq 'ignore (plist-get obs :binding)))
+      ;; the (switch-frame ...) event is postponed but not lost
+      (let ((unread-command-events nil))
+        (should (equal switch-event (read-event nil nil 0.01)))))))
+
+(ert-deftest keyboard-tests-rks-unbound-down-mouse-dropped ()
+  "Drop an unbound down-mouse event and read the following key."
+  (let ((map (make-sparse-keymap)))
+    (define-key map [?a] 'ignore)
+    (let* ((down (list 'down-mouse-9
+                       (keyboard-tests--rks-fake-posn (selected-window))))
+           (obs (keyboard-tests--rks-observe (list down ?a) map)))
+      (should (equal [?a] (plist-get obs :sequence)))
+      (should (eq 'ignore (plist-get obs :binding))))))
+
+(ert-deftest keyboard-tests-rks-mode-line-fake-prefix ()
+  "A mode-line click gains the fake prefix `mode-line'."
+  (keyboard-tests--rks-with-event-kinds
+   '((mouse-1 . mouse-click))
+   (lambda ()
+     (let ((map (make-sparse-keymap)))
+       (define-key map [mode-line mouse-1] 'ignore)
+       (let* ((click (list 'mouse-1
+                           (keyboard-tests--rks-fake-posn
+                            (selected-window) 'mode-line)))
+              (obs (keyboard-tests--rks-observe (list click) map))
+              (seq (plist-get obs :sequence)))
+         (should (= 2 (length seq)))
+         (should (eq 'mode-line (aref seq 0)))
+         (should (eq 'ignore (plist-get obs :binding))))))))
+
+(ert-deftest keyboard-tests-rks-mode-line-fake-prefix-continued ()
+  "After fake-prefix insertion, the next key continues in that sub-map."
+  (keyboard-tests--rks-with-event-kinds
+   '((mouse-1 . mouse-click))
+   (lambda ()
+     (let ((map (make-sparse-keymap)))
+       (define-key map [mode-line mouse-1 ?a] 'ignore)
+       (let* ((click (list 'mouse-1
+                           (keyboard-tests--rks-fake-posn
+                            (selected-window) 'mode-line)))
+              (obs (keyboard-tests--rks-observe (list click ?a) map))
+              (seq (plist-get obs :sequence)))
+         (should (= 3 (length seq)))
+         (should (eq 'mode-line (aref seq 0)))
+         (should (eq 'mouse-1 (car-safe (aref seq 1))))
+         (should (eq ?a (aref seq 2)))
+         (should (eq 'ignore (plist-get obs :binding))))))))
+
+(ert-deftest keyboard-tests-rks-clicked-buffer-switch ()
+  "A first mouse click in another window selects that window's local map."
+  (keyboard-tests--rks-with-event-kinds
+   '((mouse-1 . mouse-click))
+   (lambda ()
+     (let ((map-a (make-sparse-keymap))
+           (map-b (make-sparse-keymap))
+           (called nil))
+       (keyboard-tests--rks-call-with-live-window-maps
+        map-a map-b
+        (lambda (_buffer-a window-a _buffer-b window-b)
+          (define-key map-a [mouse-1]
+                      (lambda () (interactive) (setq called 'a)))
+          (define-key map-b [mouse-1]
+                      (lambda () (interactive) (setq called 'b)))
+          (select-window window-a)
+          (keyboard-tests--rks-execute
+           (list (list 'mouse-1
+                       (keyboard-tests--rks-fake-posn window-b))))
+          (should (eq 'b called))))))))
+
+(ert-deftest keyboard-tests-rks-help-char ()
+  "Help-char read mid-sequence should end the read."
+  (let* ((map (make-sparse-keymap))
+         (called nil)
+         (prefix-help-command (lambda () (interactive) (setq called t))))
+    (define-key map [?\C-c ?x] 'ignore)
+    (keyboard-tests--rks-execute (list ?\C-c ?\C-h) map)
+    (should called)))
+
 (provide 'keyboard-tests)
 ;;; keyboard-tests.el ends here

From 3ce42ffd609c1004df537fa51d4ab6b2cb168c51 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 30 Apr 2026 07:47:02 +0300
Subject: [PATCH 271/463] ; * src/treesit.c (treesit_pred_with_guard): Fix
 style conventions.

---
 src/treesit.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/treesit.c b/src/treesit.c
index 54c36e3a208..3d342be3dcc 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2239,9 +2239,8 @@ static Lisp_Object treesit_pred_with_guard
   ptrdiff_t pre_timestamp = XTS_PARSER (parser)->timestamp;
   Lisp_Object res = calln (pred, node);
   if (XTS_PARSER (parser)->timestamp != pre_timestamp)
-    {
-      xsignal (Qtreesit_buffer_changed, list1 (pred));
-    }
+    xsignal (Qtreesit_buffer_changed, list1 (pred));
+
   return res;
 }
 

From 4fcc8a473a19c2d80ac984c8b6ed4dda8d6679df Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 29 Apr 2026 22:42:22 -0700
Subject: [PATCH 272/463] ; Spelling fixes.

---
 ChangeLog.4                       |  6 +++---
 doc/misc/org.org                  |  2 +-
 etc/NEWS                          |  2 +-
 etc/themes/modus-themes.el        |  2 +-
 lisp/calendar/diary-icalendar.el  |  2 +-
 lisp/calendar/icalendar-ast.el    |  4 ++--
 lisp/calendar/icalendar-parser.el |  2 +-
 lisp/calendar/icalendar-recur.el  | 20 ++++++++++----------
 lisp/emacs-lisp/package.el        |  4 ++--
 lisp/files.el                     |  2 +-
 lisp/net/tramp.el                 |  2 +-
 lisp/org/org-list.el              |  2 +-
 lisp/vc/vc.el                     |  2 +-
 src/charset.c                     |  2 +-
 test/lisp/dired-tests.el          |  6 +++---
 test/lisp/files-tests.el          |  2 +-
 test/src/fileio-tests.el          |  2 +-
 17 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/ChangeLog.4 b/ChangeLog.4
index 1eb44ba7b44..0624cc5a199 100644
--- a/ChangeLog.4
+++ b/ChangeLog.4
@@ -22242,7 +22242,7 @@
 
 2024-03-10  Andreas Schwab  <schwab@linux-m68k.org>
 
-	Avoid dependency on nonexisting target in lispref makefile
+	Avoid dependency on nonexistent target in lispref makefile
 
 	* doc/lispref/Makefile.in (auxfiles): Change target into a
 	variable.
@@ -83524,7 +83524,7 @@
 
 2023-12-04  Philipp Stephani  <p.stephani2@gmail.com>
 
-	Don't claim to signal an error when deleting a nonexisting file.
+	Don't claim to signal an error when deleting a nonexistent file.
 
 	The behavior has changed in commit
 	1a65afb7ecc2a52127d6164bad19313440237f9d to no longer signal an error
@@ -150001,7 +150001,7 @@
 
 2022-04-27  Lars Ingebrigtsen  <larsi@gnus.org>
 
-	Give better error message in dired-toggle-read-only on nonexisting dirs
+	Give better error message in dired-toggle-read-only on nonexistent dirs
 
 	* lisp/dired.el (dired-toggle-read-only): Refuse to edit
 	non-existent directories (bug#23276).
diff --git a/doc/misc/org.org b/doc/misc/org.org
index 13b9ac2026a..ab0f8a9c1a6 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -2252,7 +2252,7 @@ instead of letting Calc handle the formatting.  A few examples:
 | =exp($2)+exp($1)=  | Math functions can be used                          |
 | =$0;%.1f=          | Reformat current cell to 1 decimal                  |
 | =($3-32)*5/9=      | Fahrenheit to Celsius conversion                    |
-| =$c/$1/$cm=        | Herz to centimeter conversion, using =constants.el= |
+| =$c/$1/$cm=        | Hertz to centimeter conversion using =constants.el= |
 | =tan($1);Dp3s1=    | Compute in degrees, precision 3, display SCI 1      |
 | =sin($1);Dp3%.1e=  | Same, but use ~format~ specifier for display        |
 | =vmean($2..$7)=    | Compute column range mean, using vector function    |
diff --git a/etc/NEWS b/etc/NEWS
index 971feb4edaf..fd39d965a40 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -766,7 +766,7 @@ more terminals and applications than the old capabilities, 'setf24' and
 +++
 ** New user option 'xterm-update-cursor' to update cursor display on TTYs.
 When enabled, Emacs sends Xterm escape sequences on Xterm-compatible
-terminals to update the cursor's appearacse.  Emacs can update the
+terminals to update the cursor's appearance.  Emacs can update the
 cursor's shape and color.  For example, if you use a purple bar cursor
 on graphical displays then when this option is enabled Emacs will use a
 purple bar cursor on compatible terminals as well.  See the Info node
diff --git a/etc/themes/modus-themes.el b/etc/themes/modus-themes.el
index e61436e1cbc..8994dc68985 100644
--- a/etc/themes/modus-themes.el
+++ b/etc/themes/modus-themes.el
@@ -4564,7 +4564,7 @@ FG and BG are the main colors."
 ;;     :underline (:style wave :color unspecified)
 ;;
 ;; I checked all the relevant faces and feel that users will not be
-;; benefitting form such a style anyway.  What would be the point of a
+;; benefiting form such a style anyway.  What would be the point of a
 ;; spell checker that cannot highlight its errors, for example?
 ;; Granted, we could have another kind of highlight, but I am here
 ;; focusing on the use of this:
diff --git a/lisp/calendar/diary-icalendar.el b/lisp/calendar/diary-icalendar.el
index 994258dedd4..bc58e7b5924 100644
--- a/lisp/calendar/diary-icalendar.el
+++ b/lisp/calendar/diary-icalendar.el
@@ -1124,7 +1124,7 @@ attendee's address matches the regexp in
       (dlet ((attendee-address (ical:strip-mailto value))
              (attendee-cn (when cn (string-trim cn)))
              (attendee-cutype cutype)
-             (attende-role role)
+             (attendee-role role)
              (attendee-partstat partstat)
              (attendee-rsvp rsvp))
         (with-temp-buffer
diff --git a/lisp/calendar/icalendar-ast.el b/lisp/calendar/icalendar-ast.el
index fc8f23a3a27..c4faf48173f 100644
--- a/lisp/calendar/icalendar-ast.el
+++ b/lisp/calendar/icalendar-ast.el
@@ -66,7 +66,7 @@
 
 ;; Constructing nodes with these macros automatically validates them
 ;; with the function `icalendar-ast-node-valid-p', which signals an
-;; `icalendar-validation-error' if the node is not valid acccording to
+;; `icalendar-validation-error' if the node is not valid according to
 ;; RFC5545.
 
 
@@ -639,7 +639,7 @@ the following forms:
   or any other expression that evaluates to a parameter node.
 
 \(COMPONENT-TYPE CHILD [CHILD ...]) - constructs a component node of
-  COMPONENT-TYPE with CHILDs as child nodes.  Each CHILD should either be
+  COMPONENT-TYPE with given child nodes.  Each CHILD should either be
   a template for a property (as above), a template for a
   sub-component (of the same form), or any other expression that
   evaluates to an iCalendar syntax node.
diff --git a/lisp/calendar/icalendar-parser.el b/lisp/calendar/icalendar-parser.el
index 86dbcff1ce3..93293f19cbf 100644
--- a/lisp/calendar/icalendar-parser.el
+++ b/lisp/calendar/icalendar-parser.el
@@ -112,7 +112,7 @@ errors instead of silently accepting such data."
 ;; `ical:unfold-region'. `ical:fold-region' will fold content lines
 ;; using line breaks appropriate to the buffer's coding system.
 ;;
-;; All the parsing-related code belows assumes that lines have
+;; All the parsing-related code below assumes that lines have
 ;; already been unfolded if necessary.
 (defcustom ical:pre-unfolding-hook nil
   "Hook run before unfolding iCalendar data.
diff --git a/lisp/calendar/icalendar-recur.el b/lisp/calendar/icalendar-recur.el
index cf751c83184..fcebbc9c6f0 100644
--- a/lisp/calendar/icalendar-recur.el
+++ b/lisp/calendar/icalendar-recur.el
@@ -896,7 +896,7 @@ BYHOUR=... clause; see `icalendar-recur' for the possible values."
                                             :hour h :minute 0 :second 0
                                             :tz vtimezone))
                (high (ical:date/time-add low :hour 1 vtimezone)))
-          (ignore-errors ; do not generate subintervals for nonexisting times
+          (ignore-errors ; do not generate subintervals for nonexistent times
             (when (ical:date/time< low curr-dt)
               (setq low curr-dt))
             (when (ical:date/time< interval-end high)
@@ -932,7 +932,7 @@ BYMINUTE=... clause; see `icalendar-recur' for the possible values."
         (let* ((low (ical:date-time-variant curr-dt :minute m :second 0
                                             :tz vtimezone))
                (high (ical:date/time-add low :minute 1 vtimezone)))
-          (ignore-errors ; do not generate subintervals for nonexisting times
+          (ignore-errors ; do not generate subintervals for nonexistent times
             ;; Clip the subinterval, as above
             (when (ical:date/time< low interval-start)
               (setq low curr-dt))
@@ -1703,7 +1703,7 @@ The check is performed with `icalendar-time<='."
        (ical:time<= dt (encode-time end)))))
 
 ;; DRAGONS DRAGONS DRAGONS
-(defun icr:tz-observance-on (dt vtimezone &optional update nonexisting)
+(defun icr:tz-observance-on (dt vtimezone &optional update nonexistent)
   "Return the time zone observance in effect on DT in VTIMEZONE.
 
 If there is such an observance, the returned value is a list (OBSERVANCE
@@ -1727,7 +1727,7 @@ If UPDATE is non-nil, the observance found will be used to update the
 offset value in DT (as a side effect) before returning the observance
 and onset.
 
-If UPDATE is non-nil, NONEXISTING specifies how to handle clock times
+If UPDATE is non-nil, NONEXISTENT specifies how to handle clock times
 that do not exist in the observance (see
 `icalendar-recur-tz-nonexistent-date-time-p').  The keyword `:error'
 means to signal an \\='icalendar-tz-nonexistent-time error, without
@@ -1735,13 +1735,13 @@ modifying any of the fields in DT.  Otherwise, the default is to
 interpret DT using the offset from UTC before the onset of the found
 observance, and then reset the clock time in DT to the corresponding
 existing time after the onset of the observance.  For example, the
-nonexisting time 2:30AM in Standard time on the day of the switch to
+nonexistent time 2:30AM in Standard time on the day of the switch to
 Daylight time in the US Eastern time zone will be reset to 3:30AM
 Eastern Daylight time.
 
 If DT is a Lisp timestamp, it represents an absolute time and
 comparisons with the onsets in VTIMEZONE are performed with absolute
-times.  UPDATE and NONEXISTING have no meaning in this case and are
+times.  UPDATE and NONEXISTENT have no meaning in this case and are
 ignored."
   (ical:with-component vtimezone
     ((ical:standard :all stds)
@@ -1916,7 +1916,7 @@ ignored."
       (when (and update given-clock-time nearest-observance updated)
         ;; signal an error when `dt' does not exist if requested, so the
         ;; nonexistence can be handled further up the stack:
-        (when (and (eq :error nonexisting)
+        (when (and (eq :error nonexistent)
                    (not (ical:date-time-locally-simultaneous-p dt updated)))
           (signal 'ical:tz-nonexistent-time
                   (list
@@ -1984,7 +1984,7 @@ decoded directly into this UTC offset, and its dst slot is set to -1."
      :dst (if observance (ical:daylight-component-p observance)
             -1))))
 
-(defun icr:tz-set-zone (dt vtimezone &optional nonexisting)
+(defun icr:tz-set-zone (dt vtimezone &optional nonexistent)
   "Set the time zone offset and dst flag in DT based on VTIMEZONE.
 
 DT should be an `icalendar-date-time' and VTIMEZONE should be an
@@ -1999,7 +1999,7 @@ where a different time zone observance may be in effect in the original
 date-time.  It cannot be used to re-decode a fixed point in time into a
 different time zone; for that, see `icalendar-recur-tz-decode-time'.
 
-If given, NONEXISTING is a keyword that specifies what to do if DT
+If given, NONEXISTENT is a keyword that specifies what to do if DT
 represents a clock time that does not exist according to the relevant
 observance in VTIMEZONE.  The value :error means to signal an
 \\='icalendar-tz-nonexistent-time error, and nil means to reset the
@@ -2030,7 +2030,7 @@ clock time in DT to an existing one; see
       ;; This updates the relevant slots in dt as a side effect:
       ;; TODO: if no observance is found, is it ever sensible to signal an error,
       ;; instead of just leaving the zone slot unset?
-      (icr:tz-observance-on dt vtimezone t nonexisting)))
+      (icr:tz-observance-on dt vtimezone t nonexistent)))
     dt)
 
 (defun icr:tz-set-zones-in (vtimezones node)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 93fdc81164f..e1486418876 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -4593,7 +4593,7 @@ SUG should be of the form as described in `package--suggestion-applies-p'."
           (with-current-buffer buf
             (funcall-interactively (or (cadddr sug) (car sug)))))))))
 
-(defun package--autosugest-prompt (packages)
+(defun package--autosuggest-prompt (packages)
   "Query the user whether to install PACKAGES or not.
 PACKAGES is a list of package suggestions in the form described in
 `package--suggestion-applies-p'.  The function returns a non-nil value
@@ -4676,7 +4676,7 @@ The optional argument CANDIDATES may be a list of package suggestions
 in the form described in `package--suggestion-applies-p'.  If omitted
 or nil, the list of candidates will be computed from the database."
   (interactive)
-  (package--autosugest-prompt
+  (package--autosuggest-prompt
    (or candidates
        (package--autosuggest-find-candidates)
        (user-error "No package suggestions found"))))
diff --git a/lisp/files.el b/lisp/files.el
index d555fab7323..9b1fc09fcfa 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -7989,7 +7989,7 @@ RULE has the form (MATCH EXPANSION...).
 
 MATCH is a regular expression that should match a file name which might
 have a sibling.  It can contain sub-expressions that will be used in
-EXPANSIONs as \\N and \\& replacements.
+each EXPANSION as \\N and \\& replacements.
 
 Each EXPANSION is a string that matches names of files that are to be
 considered siblings of a file whose name matches MATCH.  For instance,
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 553b76bd044..6219d097f4f 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2428,7 +2428,7 @@ arguments to pass to the OPERATION."
 An entry has the form `(OPERATION . ARG-TYPE)'.  ARG-TYPE can be the
 symbol
 
-- `file': the first argument of OERATION is the remote file name to be
+- `file': the first argument of OPERATION is the remote file name to be
   checked.
 - `default-directory': `default-directory' is the remote file name to be
   checked.
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 687098c1c14..c13ec193ffe 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -1860,7 +1860,7 @@ Initial position of cursor is restored after the changes."
 	  ;; Shift the indentation between END and BEG by DELTA.
 	  ;; Start from the line before END.
           ;; Take care not to shift to or before IND, which is the
-          ;; containg list item indentation. (otherwise, we are going
+          ;; containing list item indentation. (otherwise, we are going
           ;; to break the list structure)
 	  (lambda (end beg delta ind)
 	    (goto-char end)
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 0b64ea93efb..3d8c4bf4f1c 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -294,7 +294,7 @@
 ;;   RCS and CVS, and is otherwise silently ignored.
 ;;
 ;;   If the backend supports async checkins and `vc-async-checkin' is
-;;   non-nil, the implementation should start an asychronous process to
+;;   non-nil, the implementation should start an asynchronous process to
 ;;   commit the changes, and return a cons whose car is `async' and
 ;;   whose cdr is that process object.
 ;;
diff --git a/src/charset.c b/src/charset.c
index e4d95653e66..9ff3191b7e3 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -2357,7 +2357,7 @@ init_charset_once (void)
   PDUMPER_REMEMBER_SCALAR (charset_ksc5601);
 }
 
-/* Intitial value for charset_table_size.  As of October 2025, the
+/* Initial value for charset_table_size.  As of October 2025, the
    charset table uses 179 entries.  charset_table grows if needed and
    we only dump the used entries; so getting the initial value right
    is not overly important.  */
diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el
index b2e0f257a15..f77d56637fd 100644
--- a/test/lisp/dired-tests.el
+++ b/test/lisp/dired-tests.el
@@ -728,9 +728,9 @@ The current directory at call time should not affect the result (Bug#50630)."
     (delete-directory dir t)))
 
 (ert-deftest dired-test-ls-error-message () ; bug#80499
-  "Test invoking `dired' on a nonexisting file.
+  "Test invoking `dired' on a nonexistent file.
 A buffer should pop up containing the error emitted by ls.  The buffer
-visiting the nonexisting file should killed before `dired' returns,
+visiting the nonexistent file should killed before `dired' returns,
 hence another buffer should be returned."
   (let* ((dir (ert-resource-file (file-name-as-directory "empty-dir")))
          (name (concat dir "bla"))
@@ -755,7 +755,7 @@ hence another buffer should be returned."
                  (null ls-lisp-use-insert-directory-program))
       (let ((errbuf (get-buffer "*ls error*"))
             ;; Since different `ls' programs can produce different
-            ;; messages for the nonexisting file error, we make a sample
+            ;; messages for the nonexistent file error, we make a sample
             ;; message to use for comparing the expected message with
             ;; the string in the error buffer.
             (ls-err (lambda (fn)
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index 1dcd5161ee9..55011cd461a 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -1080,7 +1080,7 @@ unquoted file names."
             ;; handler prefix has been removed.
             (nospecial-dir (string-remove-prefix "/:" nospecial-dir))
             ;; Since different `ls' programs can produce different
-            ;; messages for the nonexisting file error, we make a sample
+            ;; messages for the nonexistent file error, we make a sample
             ;; message to use for comparing the expected message with
             ;; the string in the error buffer.
             (ls-err (lambda (fn)
diff --git a/test/src/fileio-tests.el b/test/src/fileio-tests.el
index 6d687b85033..b130f37620a 100644
--- a/test/src/fileio-tests.el
+++ b/test/src/fileio-tests.el
@@ -216,7 +216,7 @@ Also check that an encoding error can appear in a symlink."
 (put 'fileio-tests--identity-expand-handler 'operations '(expand-file-name))
 
 (ert-deftest fileio--file-name-case-insensitive-p ()
-  ;; Check that we at least don't crash if given nonexisting files
+  ;; Check that we at least don't crash if given nonexistent files
   ;; without a directory (bug#56443).
 
   ;; Use an identity file-name handler, as if called by `ffap'.

From 51ae6e12b922092b3b8a50cb2e5c2bd26235471b Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.funk1@gmail.com>
Date: Wed, 29 Apr 2026 20:04:09 -0700
Subject: [PATCH 273/463] Pacify -Wunused-but-set-variable from gcc 16 and
 clang 13

* src/coding.c: Remove file wide ignore pragma for
-Wunused-but-set-variable.
(detect_coding_XXX) <consumed_chars>: Mention that this variable might
need to be declared with the MAYBE_UNUSED attribute.
(detect_coding_utf_8, detect_coding_emacs_mule, detect_coding_iso_2022)
(encode_designation_at_bol, detect_coding_sjis, detect_coding_big5)
(detect_coding_ccl, detect_coding_charset) <consumed_chars>: Use the
MAYBE_UNUSED attribute.
---
 src/coding.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/coding.c b/src/coding.c
index d5833a98c23..dd767c80ab4 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -159,6 +159,9 @@ detect_coding_XXX (struct coding_system *coding,
   const unsigned char *src = coding->source;
   const unsigned char *src_end = coding->source + coding->src_bytes;
   bool multibytep = coding->src_multibyte;
+  /* Some encodings do not need this variable, however it is incremented in the
+     ONE_MORE_BYTE macro.  In that case mark it with MAYBE_UNUSED to silence
+     compiler warnings.  */
   ptrdiff_t consumed_chars = 0;
   int found = 0;
   ...;
@@ -652,11 +655,6 @@ growable_destination (struct coding_system *coding)
     consumed_chars++;					\
   } while (0)
 
-/* Suppress clang warnings about consumed_chars never being used.
-   Although correct, the warnings are too much trouble to code around.  */
-#if 13 <= __clang_major__ - defined __apple_build_version__
-# pragma clang diagnostic ignored "-Wunused-but-set-variable"
-#endif
 
 /* Safely get two bytes from the source text pointed by SRC which ends
    at SRC_END, and set C1 and C2 to those bytes while skipping the
@@ -1135,7 +1133,7 @@ detect_coding_utf_8 (struct coding_system *coding,
   const unsigned char *src = coding->source, *src_base;
   const unsigned char *src_end = coding->source + coding->src_bytes;
   bool multibytep = coding->src_multibyte;
-  ptrdiff_t consumed_chars = 0;
+  MAYBE_UNUSED ptrdiff_t consumed_chars = 0;
   bool bom_found = 0;
   ptrdiff_t nchars = coding->head_ascii;
 
@@ -1843,7 +1841,7 @@ detect_coding_emacs_mule (struct coding_system *coding,
   const unsigned char *src = coding->source, *src_base;
   const unsigned char *src_end = coding->source + coding->src_bytes;
   bool multibytep = coding->src_multibyte;
-  ptrdiff_t consumed_chars = 0;
+  MAYBE_UNUSED ptrdiff_t consumed_chars = 0;
   int c;
   int found = 0;
 
@@ -2933,7 +2931,7 @@ detect_coding_iso_2022 (struct coding_system *coding,
   bool single_shifting = 0;
   int id;
   int c, c1;
-  ptrdiff_t consumed_chars = 0;
+  MAYBE_UNUSED ptrdiff_t consumed_chars = 0;
   int i;
   int rejected = 0;
   int found = 0;
@@ -4321,7 +4319,7 @@ encode_designation_at_bol (struct coding_system *coding,
   /* Table of charsets to be designated to each graphic register.  */
   int r[4];
   int c, found = 0, reg;
-  ptrdiff_t produced_chars = 0;
+  MAYBE_UNUSED ptrdiff_t produced_chars = 0;
   bool multibytep = coding->dst_multibyte;
   Lisp_Object attrs;
   Lisp_Object charset_list;
@@ -4583,7 +4581,7 @@ detect_coding_sjis (struct coding_system *coding,
   const unsigned char *src = coding->source, *src_base;
   const unsigned char *src_end = coding->source + coding->src_bytes;
   bool multibytep = coding->src_multibyte;
-  ptrdiff_t consumed_chars = 0;
+  MAYBE_UNUSED ptrdiff_t consumed_chars = 0;
   int found = 0;
   int c;
   Lisp_Object attrs, charset_list;
@@ -4638,7 +4636,7 @@ detect_coding_big5 (struct coding_system *coding,
   const unsigned char *src = coding->source, *src_base;
   const unsigned char *src_end = coding->source + coding->src_bytes;
   bool multibytep = coding->src_multibyte;
-  ptrdiff_t consumed_chars = 0;
+  MAYBE_UNUSED ptrdiff_t consumed_chars = 0;
   int found = 0;
   int c;
 
@@ -5076,7 +5074,7 @@ detect_coding_ccl (struct coding_system *coding,
   const unsigned char *src = coding->source, *src_base;
   const unsigned char *src_end = coding->source + coding->src_bytes;
   bool multibytep = coding->src_multibyte;
-  ptrdiff_t consumed_chars = 0;
+  MAYBE_UNUSED ptrdiff_t consumed_chars = 0;
   int found = 0;
   unsigned char *valids;
   ptrdiff_t head_ascii = coding->head_ascii;
@@ -5371,7 +5369,7 @@ detect_coding_charset (struct coding_system *coding,
   const unsigned char *src = coding->source, *src_base;
   const unsigned char *src_end = coding->source + coding->src_bytes;
   bool multibytep = coding->src_multibyte;
-  ptrdiff_t consumed_chars = 0;
+  MAYBE_UNUSED ptrdiff_t consumed_chars = 0;
   Lisp_Object attrs, valids, name;
   int found = 0;
   ptrdiff_t head_ascii = coding->head_ascii;
@@ -7100,7 +7098,7 @@ produce_chars (struct coding_system *coding, Lisp_Object translation_table,
 	  if (coding->src_multibyte)
 	    {
 	      bool multibytep = 1;
-	      ptrdiff_t consumed_chars = 0;
+	      MAYBE_UNUSED ptrdiff_t consumed_chars = 0;
 
 	      while (1)
 		{

From 6731146e44bc5011ccf31548189dc1f23523ef03 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 30 Apr 2026 09:32:59 +0300
Subject: [PATCH 274/463] ; * doc/misc/calc.texi (Top): Improve menu item
 description (bug#80923).

---
 doc/misc/calc.texi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index dd90dfdef7c..a626ee09f8e 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -168,7 +168,8 @@ longer Info tutorial.)
 @menu
 * Getting Started::       General description and overview.
 @ifinfo
-* Interactive Tutorial::  Using the Emacs Info system with this tutorial.
+* Interactive Tutorial::  Tutorial, and brief instructions on using
+                           the Emacs Info system for reading this manual.
 @end ifinfo
 @ifnotinfo
 * Tutorial::              A step-by-step introduction for beginners.

From 17f755366efc9bca3488738219484d8d94ccf755 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 30 Apr 2026 11:41:46 +0100
Subject: [PATCH 275/463] ; Fix shortdoc for seq-concatenate (bug#80810).

---
 lisp/emacs-lisp/shortdoc-doc.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/emacs-lisp/shortdoc-doc.el b/lisp/emacs-lisp/shortdoc-doc.el
index eb642c1600b..9b1f00df127 100644
--- a/lisp/emacs-lisp/shortdoc-doc.el
+++ b/lisp/emacs-lisp/shortdoc-doc.el
@@ -998,6 +998,7 @@
    :eval (seq-some #'floatp '(1 2.0 3)))
   "Building Sequences"
   (seq-concatenate
+   :args (type &rest sequences)
    :eval (seq-concatenate 'vector '(1 2) '(c d)))
   (seq-copy
    :eval (seq-copy '(a 2)))

From a0b7ae5abf88fd78425b2f5798b339f83ec56980 Mon Sep 17 00:00:00 2001
From: Timon Reinold <tirei+gn@agon.one>
Date: Sun, 12 Apr 2026 14:02:52 +0200
Subject: [PATCH 276/463] eww-handle-link: Split HTML rel on spaces

* lisp/net/eww.el (eww-handle-link): The HTML rel attribute's
value is a space-separated set of keywords, so split it before
matching against known keywords (bug#80816).

Copyright-paperwork-exempt: yes
---
 lisp/net/eww.el | 52 ++++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index fb53d067e4f..70d70185688 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -883,30 +883,34 @@ This replaces the region with the preprocessed HTML."
 
 (defun eww-handle-link (dom)
   (let* ((rel (dom-attr dom 'rel))
-	 (href (dom-attr dom 'href))
-	 (where (assoc
-		 ;; The text associated with :rel is case-insensitive.
-		 (if rel (downcase rel))
-		 '(("next" . :next)
-		   ;; Texinfo uses "previous", but HTML specifies
-		   ;; "prev", so recognize both.
-		   ("previous" . :previous)
-		   ("prev" . :previous)
-		   ;; HTML specifies "start" but also "contents",
-		   ;; and Gtk seems to use "home".  Recognize
-		   ;; them all; but store them in different
-		   ;; variables so that we can readily choose the
-		   ;; "best" one.
-		   ("start" . :start)
-		   ("home" . :home)
-		   ("contents" . :contents)
-		   ("up" . :up)))))
-    (when (and href where)
-      (when (memq (cdr where) '(:next :previous))
-        ;; Multi-page isearch support.
-        (setq-local multi-isearch-next-buffer-function
-                    #'eww-isearch-next-buffer))
-      (plist-put eww-data (cdr where) href))))
+         (href (dom-attr dom 'href)))
+    (when (and href rel)
+      ;; `rel' is a case-insensitive whitespace-separated set, but
+      ;; without considering vertical tab "\v" whitespace (as defined at
+      ;; https://infra.spec.whatwg.org/#ascii-whitespace).
+      (dolist (relation (split-string (downcase rel) "[\t\n\f\r ]+"))
+        (when-let*
+            ((where (assoc
+                     relation
+                     '(("next" . :next)
+                       ;; Texinfo uses "previous", but HTML specifies
+                       ;; "prev", so recognize both.
+                       ("previous" . :previous)
+                       ("prev" . :previous)
+                       ;; HTML specifies "start" but also "contents",
+                       ;; and Gtk seems to use "home".  Recognize
+                       ;; them all; but store them in different
+                       ;; variables so that we can readily choose the
+                       ;; "best" one.
+                       ("start" . :start)
+                       ("home" . :home)
+                       ("contents" . :contents)
+                       ("up" . :up)))))
+          (when (memq (cdr where) '(:next :previous))
+            ;; Multi-page isearch support.
+            (setq-local multi-isearch-next-buffer-function
+                        #'eww-isearch-next-buffer))
+          (plist-put eww-data (cdr where) href))))))
 
 (defvar eww-redirect-level 1)
 

From 978c14b131890b0db8a60d7f684daefd3647d72d Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 30 Apr 2026 12:41:33 +0100
Subject: [PATCH 277/463] cl-lambda-list, cl-lambda-list1: Fix &key spec

* lisp/emacs-lisp/cl-macs.el (cl-lambda-list, cl-lambda-list1):
Fix &key specification to support empty lists of keyword
arguments (bug#80878).  Fix due to Thuna <thuna.cing@gmail.com>.
---
 lisp/emacs-lisp/cl-macs.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 19b8bc68d6f..9fa2a2b7cf0 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -197,7 +197,7 @@ The name is made by appending a number to PREFIX, default \"T\"."
   '(([&rest cl-lambda-arg]
     [&optional ["&optional" cl-&optional-arg &rest cl-&optional-arg]]
     [&optional ["&rest" cl-lambda-arg]]
-    [&optional ["&key" [cl-&key-arg &rest cl-&key-arg]
+    [&optional ["&key" [&optional cl-&key-arg &rest cl-&key-arg]
 		&optional "&allow-other-keys"]]
     [&optional ["&aux" &rest
 		&or (cl-lambda-arg &optional def-form) arg]]
@@ -217,8 +217,8 @@ The name is made by appending a number to PREFIX, default \"T\"."
      [&rest cl-lambda-arg]
      [&optional ["&optional" cl-&optional-arg &rest cl-&optional-arg]]
      [&optional ["&rest" cl-lambda-arg]]
-     [&optional ["&key" cl-&key-arg &rest cl-&key-arg
-                 &optional "&allow-other-keys"]]
+     [&optional ["&key" [&optional cl-&key-arg &rest cl-&key-arg]
+		 &optional "&allow-other-keys"]]
      [&optional ["&aux" &rest
                  &or (cl-lambda-arg &optional def-form) arg]]
      . [&or arg nil])))

From 2db707cfd23eb8126990b57f326d27a03a65177e Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 30 Apr 2026 10:24:36 -0400
Subject: [PATCH 278/463] (seq-concatenate): Fix docstring (bug#80810)

* lisp/emacs-lisp/seq.el (seq-concatenate): Remove confusing
`(fn TYPE SEQUENCE...)` which made `help-function-arglist`
return less informative results and wasn't even consistent with
the rest of the docstring.

* lisp/emacs-lisp/shortdoc-doc.el (sequence): Revert last
change, since it's now redundant.
---
 lisp/emacs-lisp/seq.el          | 4 +---
 lisp/emacs-lisp/shortdoc-doc.el | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el
index e0a41b380b5..b8f35c10def 100644
--- a/lisp/emacs-lisp/seq.el
+++ b/lisp/emacs-lisp/seq.el
@@ -310,9 +310,7 @@ This does not modify SEQUENCE."
 (cl-defgeneric seq-concatenate (type &rest sequences)
   "Concatenate SEQUENCES into a single sequence of type TYPE.
 TYPE must be one of following symbols: `vector', `string' or `list'.
-This does not modify any of the SEQUENCES.
-
-\n(fn TYPE SEQUENCE...)"
+This does not modify any of the SEQUENCES."
   (setq sequences (mapcar #'seq-into-sequence sequences))
   (pcase type
     ('vector (apply #'vconcat sequences))
diff --git a/lisp/emacs-lisp/shortdoc-doc.el b/lisp/emacs-lisp/shortdoc-doc.el
index 9b1f00df127..eb642c1600b 100644
--- a/lisp/emacs-lisp/shortdoc-doc.el
+++ b/lisp/emacs-lisp/shortdoc-doc.el
@@ -998,7 +998,6 @@
    :eval (seq-some #'floatp '(1 2.0 3)))
   "Building Sequences"
   (seq-concatenate
-   :args (type &rest sequences)
    :eval (seq-concatenate 'vector '(1 2) '(c d)))
   (seq-copy
    :eval (seq-copy '(a 2)))

From b4e128b0cb257f135c995f331addbb611225b2cd Mon Sep 17 00:00:00 2001
From: Eshel Yaron <me@eshelyaron.com>
Date: Thu, 30 Apr 2026 16:54:19 +0200
Subject: [PATCH 279/463] ; * lisp/emacs-lisp/let-alist.el (let-alist): Fix
 typo.

---
 lisp/emacs-lisp/let-alist.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/let-alist.el b/lisp/emacs-lisp/let-alist.el
index 62465884d0a..3140e2b243d 100644
--- a/lisp/emacs-lisp/let-alist.el
+++ b/lisp/emacs-lisp/let-alist.el
@@ -121,7 +121,7 @@ symbol, and each cdr is the same symbol without the `.'."
 Dotted symbol is any symbol starting with a `.'.  This macro creates
 let-bindings for dotted symbols that appear literally in BODY (whether
 or not they are actually used).  It does not create bindings for dotted
-symbols that are introdcued by macro-expansion in BODY.
+symbols that are introduced by macro-expansion in BODY.
 
 A symbol of the form `.foo.N' where N is a natural number refers to the
 Nth element of the value that ALIST associates to key `foo'.

From edc19c35369670e1dcf8afdd00c54bc68fc5594b Mon Sep 17 00:00:00 2001
From: Randy Taylor <dev@rjt.dev>
Date: Wed, 29 Apr 2026 22:18:13 -0400
Subject: [PATCH 280/463] Always compile w32image.c on MinGW (Bug#80924)

This enables features unrelated to native image APIs, such as
'w32-export-frame' and 'yank-media', which need to call GDI+
functions.
* configure.ac (HAVE_W32) [!CYGWIN]: Always include w32image.o in
W32_OBJ.
* etc/NEWS: Drop 'yank-media' '--without-native-image-api' caveat.
* src/emacs.c (main):
* src/w32select.c (convert_dibv5_to_png):
* src/w32term.c (w32_draw_image_foreground): Replace
HAVE_NATIVE_IMAGE_API with WINDOWSNT.
* src/w32.c (term_ntproc): Remove redundant HAVE_NATIVE_IMAGE_API guard.
* src/w32fns.c (Fw32_export_frame) [!WINDOWSNT]: Return nil on Cygwin.
---
 configure.ac    | 3 +--
 etc/NEWS        | 4 +---
 src/emacs.c     | 4 ++--
 src/w32.c       | 3 +--
 src/w32fns.c    | 4 ++++
 src/w32select.c | 4 ++--
 src/w32term.c   | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9f3677bea34..a3ba5e69a2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3079,14 +3079,13 @@ if test "${HAVE_W32}" = "yes"; then
     # the rc file), not a linker script.
     W32_RES_LINK="-Wl,emacs.res"
   else
-    W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32inevt.o w32proc.o"
+    W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32image.o w32inevt.o w32proc.o"
     dnl FIXME: This should probably be supported for Cygwin/w32 as
     dnl well, but the Cygwin build needs to link against -lgdiplus
     if test "${with_native_image_api}" = yes; then
       AC_DEFINE([HAVE_NATIVE_IMAGE_API], [1],
 	[Define to use native OS APIs for images.])
       NATIVE_IMAGE_API="yes (w32)"
-      W32_OBJ="$W32_OBJ w32image.o"
     fi
     W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32"
     W32_LIBS="$W32_LIBS -lmpr -lwinspool -lole32 -lcomctl32"
diff --git a/etc/NEWS b/etc/NEWS
index fd39d965a40..c54941382c3 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -4681,9 +4681,7 @@ color Emoji font installed on your system for the 'emoji' script.
 +++
 ** Emacs on MS-Windows now supports 'yank-media'.
 This command inserts clipboard data of different formats into the
-current buffer, if the major mode supports it.  (Support for
-'yank-media' will be unavailable on MS-Windows if Emacs was configured
-'--without-native-image-api'.)
+current buffer, if the major mode supports it.
 
 ---
 ** Emacs on MS-Windows now supports up to 1024 sub-processes.
diff --git a/src/emacs.c b/src/emacs.c
index 23e0c6f5318..7ae572120f6 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2362,7 +2362,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
       syms_of_fringe ();
       syms_of_image ();
 #ifdef HAVE_NTGUI
-# if HAVE_NATIVE_IMAGE_API
+# if WINDOWSNT
       syms_of_w32image ();
 # endif
 #endif	/* HAVE_NTGUI */
@@ -2504,7 +2504,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
       globals_of_w32font ();
       globals_of_w32fns ();
       globals_of_w32menu ();
-# if HAVE_NATIVE_IMAGE_API
+# if WINDOWSNT
       globals_of_w32image ();
 # endif
 #endif  /* HAVE_NTGUI */
diff --git a/src/w32.c b/src/w32.c
index f43c96902e8..409d4238bc9 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -10548,9 +10548,8 @@ term_ntproc (int ignored)
   term_w32select ();
   /* Exit all worker threads of sys_select if necessary.  */
   free_wait_pool ();
-#if HAVE_NATIVE_IMAGE_API
+
   w32_gdiplus_shutdown ();
-#endif
 }
 
 void
diff --git a/src/w32fns.c b/src/w32fns.c
index 33f1006d398..1749f2ba390 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -11469,6 +11469,7 @@ Optional arg TYPE should be either `jpeg' (default), `bmp', `png',
 Value is non-nil if FRAME was successfully exported, nil otherwise.  */)
   (Lisp_Object frame, Lisp_Object file, Lisp_Object type)
 {
+#ifdef WINDOWSNT
   struct frame *f = decode_live_frame (frame);
 
   if (NILP (type))
@@ -11494,6 +11495,9 @@ Value is non-nil if FRAME was successfully exported, nil otherwise.  */)
   unblock_input ();
 
   return result >= 0 ? Qt : Qnil;
+#else  /* !WINDOWSNT */
+  return Qnil;
+#endif
 }
 
 
diff --git a/src/w32select.c b/src/w32select.c
index e3c948b3c8b..b1f00853e87 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -825,7 +825,7 @@ static const char *stdfmt_name[] = {
 static bool
 convert_dibv5_to_png (char *data, int size, char *temp_file)
 {
-#ifdef HAVE_NATIVE_IMAGE_API
+#ifdef WINDOWSNT
   CLSID clsid_png;
 
   if (!w32_gdiplus_startup ()
@@ -859,7 +859,7 @@ convert_dibv5_to_png (char *data, int size, char *temp_file)
   if (status != Ok)
     return false;
   return true;
-#else  /* !HAVE_NATIVE_IMAGE_API */
+#else  /* !WINDOWSNT */
   return false;
 #endif
 }
diff --git a/src/w32term.c b/src/w32term.c
index 5b7d9c5f17d..43d2440854b 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2109,7 +2109,7 @@ w32_draw_image_foreground (struct glyph_string *s)
 		    compat_hdc, s->slice.x, s->slice.y, SRCCOPY);
 	  else
 	    {
-#ifdef HAVE_NATIVE_IMAGE_API
+#ifdef WINDOWSNT
 	      if (s->img->smoothing && w32_gdiplus_startup ())
 		{
 		  GpGraphics *graphics;

From b54cde91194e575af9d1f24f059ffc431bf21ed7 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 30 Apr 2026 19:39:42 +0300
Subject: [PATCH 281/463] Fix value of 'default-line-height'

* lisp/simple.el (default-line-height): Fix use of buffer-local
value of 'line-spacing'.  (Bug#80929)
---
 lisp/simple.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/simple.el b/lisp/simple.el
index 441f7ff3440..9346af5e8af 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7864,8 +7864,9 @@ This function uses the definition of the default face for the currently
 selected frame."
   (let ((dfh (default-font-height))
 	(lsp (if (display-graphic-p)
-		 (total-line-spacing (or line-spacing
-		                         (default-value 'line-spacing)
+		 (total-line-spacing (or (if (local-variable-p 'line-spacing)
+                                             line-spacing
+		                           (default-value 'line-spacing))
 		                         (frame-parameter nil 'line-spacing)
 		                         0))
 	       0)))

From f6d404145ed0c6c587545b7267957dc11990ddb4 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 30 Apr 2026 18:51:00 +0200
Subject: [PATCH 282/463] Precise quoting of file names with a leading tilde

* doc/emacs/files.texi (File Names, Quoted File Names):
Precise quoting of file names with a leading tilde.
---
 doc/emacs/files.texi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 96abaa1816f..b223540b97d 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -123,7 +123,7 @@ expansion, type @samp{$$}.  This pair is converted to a single
 @samp{$} at the same time that variable substitution is performed for
 a single @samp{$}.  Alternatively, quote the whole file name with
 @samp{/:} (@pxref{Quoted File Names}).  File names which begin with a
-literal @samp{~} should also be quoted with @samp{/:}.
+literal @samp{~} should be quoted with @samp{/:./}.
 
   You can include non-@acronym{ASCII} characters in file names.
 @xref{File Name Coding}.
@@ -2408,6 +2408,8 @@ remote file name, you can quote just the local part.
   @samp{/:} can also prevent @samp{~} from being treated as a special
 character for a user's home directory.  For example, @file{/:/tmp/~hack}
 refers to a file whose name is @file{~hack} in directory @file{/tmp}.
+If @samp{~} is at the beginning of the file name, it must be quoted with
+@samp{/:./}, like in @samp{/:./~foo/bar}.
 
   Quoting with @samp{/:} is also a way to enter in the minibuffer a
 file name that contains @samp{$}.  In order for this to work, the

From a24ff52a79b4ef91fa36cba1406e4112b24fa167 Mon Sep 17 00:00:00 2001
From: Eshel Yaron <me@eshelyaron.com>
Date: Thu, 30 Apr 2026 21:19:19 +0200
Subject: [PATCH 283/463] New variable 'completion-preview-is-calling'

* lisp/completion-preview.el (completion-preview-is-calling):
New variable.
(completion-preview--capf-wrapper): Bind it to t when calling
the CAPF.
* etc/NEWS: Announce it.
---
 etc/NEWS                   |  5 +++++
 lisp/completion-preview.el | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/etc/NEWS b/etc/NEWS
index c54941382c3..8f266f2d670 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -4489,6 +4489,11 @@ the minibuffer, instead of waiting with 'sit-for' and then clearing it.
 This makes 'minibuffer-message' usable in Lisp programs which want to
 print a message and then continue to perform work.
 
+---
+** New variable 'completion-preview-is-calling'.
+Completion functions (in 'completion-at-point-functions') can check this
+variable to tell if they are being called by Completion Preview mode.
+
 ** Special Events
 
 +++
diff --git a/lisp/completion-preview.el b/lisp/completion-preview.el
index ff348ebf9af..907068fdb67 100644
--- a/lisp/completion-preview.el
+++ b/lisp/completion-preview.el
@@ -523,9 +523,20 @@ candidates or if there are multiple matching completions and
             (setq sorted (cdr sorted)))
           (list (substring string 0 base) common suffixes))))))
 
+(defvar completion-preview-is-calling nil
+  "Non-nil while Completion Preview mode is calling a completion function.
+
+Completion functions (in `completion-at-point-functions') can check this
+variable and adjust their behavior for completion preview.
+For example, a completion function can skip calculating annotations for
+candidates it produces for display in the completion preview, which does
+not make use of such annotations.")
+
 (defun completion-preview--capf-wrapper (capf)
   "Translate return value of CAPF to properties for completion preview overlay."
-  (let ((res (ignore-errors (funcall capf))))
+  (let ((res (ignore-errors
+               (let ((completion-preview-is-calling t))
+                 (funcall capf)))))
     (and (consp res)
          (not (functionp res))
          (seq-let (beg end table &rest plist) res

From 40b6f0180b378d26fac2f20b1974d89807ea2b44 Mon Sep 17 00:00:00 2001
From: "F. Jason Park" <jp@neverwas.me>
Date: Fri, 3 Apr 2026 17:35:42 -0700
Subject: [PATCH 284/463] ; Tweak some ERC tests and related utilities

* test/lisp/erc/erc-scenarios-keep-place-indicator.el
(erc-scenarios-keep-place-indicator--follow): Intersperse more
`redisplay' calls to update the indicator's overlay.
* test/lisp/erc/erc-tests.el (erc-tests--assert-printed-in-subprocess):
Wrap CODE form in keyword sentinel.
(erc--find-mode, erc--essential-hook-ordering): Use modified interface.
(erc--find-group--real, erc--find-group/realistic): Rename former to
latter and run in subprocess.
(erc--update-modules/realistic): Redo to run in subprocess instead of
mocking.
* test/lisp/erc/resources/erc-d/erc-d-t.el
(erc-d-t-kill-related-buffers): Don't bother canceling
`erc-server-flood-timer', even in an actual ERC buffer, since
`erc-server-send-queue' first checks whether its BUFFER argument is
still live before sending anything to the process.  Also, don't bother
collecting buffers only to immediately kill them.
* test/lisp/erc/resources/erc-d/erc-d.el (erc-d--filter): Always clear
remainder.  Otherwise, partial emissions from the peer that aren't
terminated by a newline will confuse subsequent processing.
* test/lisp/erc/resources/erc-scenarios-common.el
(erc-scenarios-common--run-in-term): Look for a library called
`erc-tests-compat', which ERC uses in its external CI to provide
compatibility shims of definitions too obscure or unfit for inclusion in
the Compat package on ELPA.
* test/lisp/erc/resources/erc-tests-common.el
(erc-tests-common-kill-buffers): Also kill non-`erc-mode' buffers whose
names match a scheme used by ERC for work buffers.  Allow for the
EXTRA-BUFFERS argument to possibly contain killed and null buffers.
---
 .../erc/erc-scenarios-keep-place-indicator.el |   5 +
 test/lisp/erc/erc-tests.el                    | 113 ++++++++++--------
 test/lisp/erc/resources/erc-d/erc-d-t.el      |  28 ++---
 test/lisp/erc/resources/erc-d/erc-d.el        |   3 +-
 .../erc/resources/erc-scenarios-common.el     |   7 ++
 test/lisp/erc/resources/erc-tests-common.el   |  13 +-
 6 files changed, 100 insertions(+), 69 deletions(-)

diff --git a/test/lisp/erc/erc-scenarios-keep-place-indicator.el b/test/lisp/erc/erc-scenarios-keep-place-indicator.el
index 332247667eb..ee2729ddf8f 100644
--- a/test/lisp/erc/erc-scenarios-keep-place-indicator.el
+++ b/test/lisp/erc/erc-scenarios-keep-place-indicator.el
@@ -79,6 +79,7 @@
         (switch-to-buffer (erc-d-t-wait-for 10 (get-buffer "#spam"))) ; lower
         (other-window 1)
         (switch-to-buffer "#spam") ; upper
+        (redisplay)
         (erc-scenarios-common-say "one")
         (funcall expect 10 "Ay, the heads")
 
@@ -94,6 +95,7 @@
         ;; Lower window is still centered at start.
         (other-window 1)
         (switch-to-buffer "#chan")
+        (redisplay)
         (save-excursion
           (goto-char (window-point))
           (should (looking-back (rx "<alice> tester, welcome!")))
@@ -107,8 +109,10 @@
 
         (other-window 1) ; upper still at indicator, switches first
         (switch-to-buffer "#spam")
+        (redisplay)
         (other-window 1)
         (switch-to-buffer "#spam") ; lower follows, speaks to sync
+        (redisplay)
         (erc-scenarios-common-say "two")
         (funcall expect 10 "<bob> Cause they take")
         (goto-char (point-max))
@@ -116,6 +120,7 @@
         ;; Upper switches back first, finds indicator gone.
         (other-window 1)
         (switch-to-buffer "#chan")
+        (redisplay)
         (save-excursion
           (goto-char (window-point))
           (should (looking-back (rx "<bob> tester, welcome!")))
diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el
index 6d0172e98fc..dd439e73fc9 100644
--- a/test/lisp/erc/erc-tests.el
+++ b/test/lisp/erc/erc-tests.el
@@ -3729,11 +3729,14 @@ keyword :result."
       (get-buffer-create
        (concat "*" (symbol-name (ert-test-name (ert-running-test))) "*"))
     (unwind-protect
-        (let ((proc (erc-tests-common-create-subprocess code '("-batch") nil)))
+        (let ((proc (erc-tests-common-create-subprocess
+                     `(,@(butlast code) (prin1 (list :result ,@(last code))))
+                     '("-batch") nil)))
           (while (accept-process-output proc 10))
           (goto-char (point-min))
-          (search-forward "(:result " nil t)
-          (unless (equal (ignore-errors (read (current-buffer))) expected)
+          (unless (equal (and (search-forward "(:result " nil t)
+                              (read (current-buffer)))
+                         expected)
             (ert-fail (list "Mismatch"
                             :expected expected
                             :buffer-string (buffer-string)))))
@@ -3755,18 +3758,15 @@ keyword :result."
         (unless (keywordp mod)
           (push (if-let* ((mode (erc--find-mode mod))) mod (list :missing mod))
                 moded)))
-      (prin1 (list :result
-                   (sort moded (lambda (a b)
-                                 (string< (symbol-name a) (symbol-name b)))))))
+      (sort moded (lambda (a b) (string< (symbol-name a) (symbol-name b)))))
    erc-tests--modules))
 
 (ert-deftest erc--essential-hook-ordering ()
   (erc-tests--assert-printed-in-subprocess
    '(progn
       (erc-update-modules)
-      (prin1 (list :result
-                   (list :erc-insert-modify-hook erc-insert-modify-hook
-                         :erc-send-modify-hook erc-send-modify-hook))))
+      (list :erc-insert-modify-hook erc-insert-modify-hook
+            :erc-send-modify-hook erc-send-modify-hook))
 
    '( :erc-insert-modify-hook (erc-controls-highlight ; 0
                                erc-button-add-buttons ; 30
@@ -3798,26 +3798,37 @@ keyword :result."
     (should (eq (erc--find-group 'foo nil) 'erc))
     (should (eq (erc--find-group 'fake 'baz) 'erc-foo))))
 
-(ert-deftest erc--find-group--real ()
-  :tags '(:unstable)
-  (require 'erc-services)
-  (require 'erc-stamp)
-  (require 'erc-sound)
-  (require 'erc-page)
-  (require 'erc-join)
-  (require 'erc-capab)
-  (require 'erc-pcomplete)
-  (should (eq (erc--find-group 'services 'nickserv) 'erc-services))
-  (should (eq (erc--find-group 'stamp 'timestamp) 'erc-stamp))
-  (should (eq (erc--find-group 'sound 'ctcp-sound) 'erc-sound))
-  (should (eq (erc--find-group 'page 'ctcp-page) 'erc-page))
-  (should (eq (erc--find-group 'autojoin) 'erc-autojoin))
-  (should (eq (erc--find-group 'pcomplete 'Completion) 'erc-pcomplete))
-  (should (eq (erc--find-group 'capab-identify) 'erc-capab))
-  (should (eq (erc--find-group 'completion) 'erc-pcomplete))
-  ;; No group specified.
-  (should (eq (erc--find-group 'smiley nil) 'erc))
-  (should (eq (erc--find-group 'unmorse nil) 'erc)))
+(ert-deftest erc--find-group/realistic ()
+  (erc-tests--assert-printed-in-subprocess
+   '(progn
+      (require 'erc-services)
+      (require 'erc-stamp)
+      (require 'erc-sound)
+      (require 'erc-page)
+      (require 'erc-join)
+      (require 'erc-capab)
+      (require 'erc-pcomplete)
+      (list (erc--find-group 'services 'nickserv)
+            (erc--find-group 'stamp 'timestamp)
+            (erc--find-group 'sound 'ctcp-sound)
+            (erc--find-group 'page 'ctcp-page)
+            (erc--find-group 'autojoin)
+            (erc--find-group 'pcomplete 'Completion)
+            (erc--find-group 'completion)
+            (erc--find-group 'capab-identify)
+            ;; No group specified.
+            (erc--find-group 'smiley nil)
+            (erc--find-group 'unmorse nil)))
+   '(erc-services
+     erc-stamp
+     erc-sound
+     erc-page
+     erc-autojoin
+     erc-pcomplete
+     erc-pcomplete
+     erc-capab
+     erc
+     erc)))
 
 (ert-deftest erc--sort-modules ()
   (should (equal (erc--sort-modules '(networks foo fill bar fill stamp bar))
@@ -3920,28 +3931,32 @@ keyword :result."
                         "(req . explicit-feature-lib)")))))))
 
 (ert-deftest erc--update-modules/realistic ()
-  (let ((calls nil)
-        ;; Module `pcomplete' "resolves" to `completion'.
-        (erc-modules '(pcomplete autojoin networks)))
-    (cl-letf (((symbol-function 'require)
-               (lambda (s &rest _) (push (cons 'req s) calls)))
+  (erc-tests--assert-printed-in-subprocess
+   '(progn
+      (require 'ert)
+      (require 'erc)
+      (should (featurep 'erc-networks))
+      (should-not erc-networks-mode)
+      ;; The pcomplete module isn't loaded, and the non-alias form of
+      ;; its command isn't autoloaded, so `erc--find-mode' will do so.
+      (should-not (featurep 'erc-pcomplete))
+      (should-not (intern-soft "erc-pcomplete-mode"))
+      ;; The join module is autoloaded.
+      (should-not (featurep 'erc-join))
+      (should (fboundp 'erc-autojoin-mode))
+      (should-not (boundp 'erc-autojoin-mode))
 
-              ;; Spoof global module detection.
-              ((symbol-function 'custom-variable-p)
-               (lambda (v)
-                 (memq v '(erc-autojoin-mode erc-networks-mode
-                                             erc-completion-mode))))
-              ;; Mock and spy real builtins.
-              ((symbol-function 'erc-autojoin-mode)
-               (lambda (n) (push (cons 'autojoin n) calls)))
-              ((symbol-function 'erc-networks-mode)
-               (lambda (n) (push (cons 'networks n) calls)))
-              ((symbol-function 'erc-completion-mode)
-               (lambda (n) (push (cons 'completion n) calls))))
+      ;; These are all global modules, so no return value is expected.
+      (let ((erc-modules (cons (seq-random-elt '(completion pcomplete))
+                               '(networks autojoin))))
+        (should-not (erc--update-modules erc-modules)))
 
-      (should-not (erc--update-modules erc-modules)) ; no locals
-      (should (equal (nreverse calls)
-                     '((completion . 1) (autojoin . 1) (networks . 1)))))))
+      (list erc-networks-mode
+            (featurep 'erc-pcomplete)
+            (featurep 'erc-join)
+            (symbol-value (intern-soft "erc-pcomplete-mode"))
+            (bound-and-true-p erc-autojoin-mode)))
+   '(t t t t t)))
 
 (ert-deftest erc--merge-local-modes ()
   (cl-letf (((get 'erc-b-mode 'erc-module) 'b)
diff --git a/test/lisp/erc/resources/erc-d/erc-d-t.el b/test/lisp/erc/resources/erc-d/erc-d-t.el
index dbfe9181887..f6a9464d219 100644
--- a/test/lisp/erc/resources/erc-d/erc-d-t.el
+++ b/test/lisp/erc/resources/erc-d/erc-d-t.el
@@ -28,22 +28,20 @@
 
 (defun erc-d-t-kill-related-buffers ()
   "Kill all erc- or erc-d- related buffers."
-  (let (buflist)
-    (dolist (buf (buffer-list))
-      (with-current-buffer buf
-        (when (or erc-d-u--process-buffer
-                  (derived-mode-p 'erc-mode 'erc-dcc-chat-mode))
-          (push buf buflist))))
-    (dolist (buf buflist)
-      (when (and (boundp 'erc-server-flood-timer)
-                 (timerp erc-server-flood-timer))
-        (cancel-timer erc-server-flood-timer))
-      (when-let* ((proc (get-buffer-process buf)))
-        (delete-process proc))
-      (when (buffer-live-p buf)
+  (dolist (buf (buffer-list))
+    (with-current-buffer buf
+      (when (or erc-d-u--process-buffer
+                (derived-mode-p 'erc-mode
+                                'erc-dcc-chat-mode)
+                (string-match (rx bot
+                                  (? " ") "*erc" (in "- ") (+ nonl) "*"
+                                  eot)
+                              (buffer-name)))
+        (when-let* ((proc (get-buffer-process buf)))
+          (delete-process proc))
         (kill-buffer buf))))
-  (while (when-let* ((buf (pop erc-d-u--canned-buffers)))
-           (kill-buffer buf))))
+  (while-let ((buf (pop erc-d-u--canned-buffers)))
+    (kill-buffer buf)))
 
 (defun erc-d-t-silence-around (orig &rest args)
   "Run ORIG function with ARGS silently.
diff --git a/test/lisp/erc/resources/erc-d/erc-d.el b/test/lisp/erc/resources/erc-d/erc-d.el
index 040980c906f..7397c5dbbc2 100644
--- a/test/lisp/erc/resources/erc-d/erc-d.el
+++ b/test/lisp/erc/resources/erc-d/erc-d.el
@@ -462,8 +462,7 @@ including line delimiters."
                        (substring string (match-end 0))))
         (erc-d--log process line nil)
         (ring-insert queue (erc-d-i--parse-message line nil))))
-    (when string
-      (setf (process-get process :stashed-input) string))))
+    (setf (process-get process :stashed-input) string)))
 
 ;; Misc process properties:
 ;;
diff --git a/test/lisp/erc/resources/erc-scenarios-common.el b/test/lisp/erc/resources/erc-scenarios-common.el
index f0b2afdc8b0..fa187cc59f7 100644
--- a/test/lisp/erc/resources/erc-scenarios-common.el
+++ b/test/lisp/erc/resources/erc-scenarios-common.el
@@ -267,6 +267,10 @@ Dialog resource directories are located by expanding the variable
                               (package-initialize))))
                    (require 'erc)
                    (cl-assert (equal erc-version ,erc-version) t)))
+         ;; Load test-related compat shims too niche for Compat, such as
+         ;; a <31 definition of `ert-with-buffer-selected'.
+         (tcompat (and (featurep 'erc-tests-compat)
+                       (locate-library "erc-tests-compat")))
          ;; Make subprocess terminal bigger than controlling.
          (buf (cl-letf (((symbol-function 'window-screen-lines)
                          (lambda () (car erc-scenarios-common--term-size)))
@@ -277,6 +281,9 @@ Dialog resource directories are located by expanding the variable
                        nil `(,@(or init '("-Q")) "-nw"
                              "-eval" ,(format "%S" setup)
                              "-l" ,file-name
+                             ,@(and tcompat
+                                    (list "-L" (file-name-directory tcompat)
+                                          "-l" tcompat))
                              "-eval" ,(format "%S" cmd)))))
          (proc (get-buffer-process buf))
          (err (lambda ()
diff --git a/test/lisp/erc/resources/erc-tests-common.el b/test/lisp/erc/resources/erc-tests-common.el
index f27cf2f3271..525bc2ed868 100644
--- a/test/lisp/erc/resources/erc-tests-common.el
+++ b/test/lisp/erc/resources/erc-tests-common.el
@@ -81,11 +81,18 @@ Assign the result to `erc-server-process' in the current buffer."
         ;; To facilitate automatic testing when a fake-server has already
 	;; been created by an earlier ERT test.
 	(kill-buffer-query-functions nil))
-    (dolist (buf (erc-buffer-list))
-      (kill-buffer buf))
+    (mapc #'kill-buffer
+          (match-buffers
+           `(or ,@(static-if (>= emacs-major-version 30)
+                     '((derived-mode erc-mode erc-dcc-chat-mode))
+                   '((major-mode . erc-mode) (major-mode . erc-dcc-chat-mode)))
+                ,(rx bot (? ?\s) "*erc" (in "- ") (+ nonl) ?* eot))))
     (named-let doit ((buffers extra-buffers))
       (dolist (buf buffers)
-        (if (consp buf) (doit buf) (kill-buffer buf))))))
+        (if (consp buf)
+            (doit buf)
+          (when (buffer-live-p buf)
+            (kill-buffer buf)))))))
 
 (defun erc-tests-common-with-process-input-spy (test-fn)
   "Mock `erc-process-input-line' and call TEST-FN.

From c7bca9f3405239fc6b08d13144b6c7728996c505 Mon Sep 17 00:00:00 2001
From: "F. Jason Park" <jp@neverwas.me>
Date: Sun, 19 Apr 2026 18:28:02 -0700
Subject: [PATCH 285/463] Define variable alias for erc-completion-mode

* lisp/erc/erc-pcomplete.el (erc-completion-mode): New alias for the
variable `erc-pcomplete-mode' to complement the function alias of the
corresponding minor-mode command.  Given that user code operating on the
value of `erc-modules' needs to detect whether members are active, it
only makes sense to address this specially.  Before this change,
applying `bound-and-true-p' to `erc-completion-mode' would always return
nil, even when the module was active.  For normal aliases, that's indeed
expected because `define-erc-module' doesn't automatically define a mode
variable for a non-nil ALIAS argument.  Although in the long term it
probably should, while also obsoleting the "new" alias simultaneously,
that would likely break some user code and doubtless complicate things
majorly for `pcomplete', the one in-tree outlier.  The latter module
would then require changing either its preferred name, the one
advertised by `erc-modules' in its Custom definition, to `pcomplete' or
its primary name to `completion'.  Both are quite churn-inducing.
---
 lisp/erc/erc-pcomplete.el | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el
index e5c72cda796..df94097a00f 100644
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@ -61,6 +61,11 @@ add this string to nicks completed."
 ;;;###autoload(put 'completion 'erc--feature 'erc-pcomplete)
 ;;;###autoload(autoload 'erc-completion-mode "erc-pcomplete" nil t)
 (put 'completion 'erc-group 'erc-pcomplete)
+;; For historical reasons, (the downcased version of) this module's
+;; alias is the canonical name used by `erc-modules'.  But user code
+;; still needs to detect whether the module is enabled based on that
+;; name alone, hence this variable alias.
+(defvaralias 'erc-completion-mode 'erc-pcomplete-mode)
 (define-erc-module pcomplete Completion
   "In ERC Completion mode, the TAB key does completion whenever possible."
   ((add-hook 'erc-mode-hook #'pcomplete-erc-setup)

From ba2a150740691146454955055067d3285edc52d5 Mon Sep 17 00:00:00 2001
From: "F. Jason Park" <jp@neverwas.me>
Date: Tue, 28 Apr 2026 14:44:45 -0700
Subject: [PATCH 286/463] Restore erc-last-saved-position from previous session

* lisp/erc/erc-log.el (erc-log-setup-logging): Restore
`erc-last-saved-position' from previous session.  By default, a
non-/QUIT disconnect does not write out any remaining buffer text to
logs, instead leaving it until the buffer or Emacs is killed.  But if a
successful reconnect occurs beforehand, the uncommitted portion must be
seen to somehow.  Before this change, it would be lost because the
function `erc-initialize-log-marker' remakes the marker at the prompt
instead of recovering the previous value as now done here.  Moreover,
the traditional workaround of customizing `erc-log-write-after-insert'
and `erc-log-write-after-send' to t should not be required to prevent
gaps in any decent IRC client.
* test/lisp/erc/erc-scenarios-log.el (erc-scenarios-log--reconnect): New
function.
(erc-scenarios-log--reconnect/auto, erc-scenarios-log--reconnect/manual):
New tests.
;; * test/lisp/erc/resources/join/reconnect/foonet-again.eld: Add QUIT.
---
 lisp/erc/erc-log.el                           |   6 +
 test/lisp/erc/erc-scenarios-log.el            | 112 ++++++++++++++++++
 .../resources/join/reconnect/foonet-again.eld |   4 +
 3 files changed, 122 insertions(+)

diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 01ea1a3d3c8..2bd1304210e 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -256,6 +256,12 @@ This function is destined to be run from `erc-connect-pre-hook'.
 The current buffer is given by BUFFER."
   (when (erc-logging-enabled buffer)
     (with-current-buffer buffer
+      (when-let* ((erc-last-saved-position)
+                  (priors (or erc--server-reconnecting erc--target-priors))
+                  (val (alist-get 'erc-last-saved-position priors))
+                  (_ (eq buffer (marker-buffer val))))
+        ;; Will have been initialized by `erc-initialize-log-marker'.
+        (move-marker erc-last-saved-position val))
       (auto-save-mode -1)
       (setq buffer-file-name nil)
       (add-hook 'write-file-functions #'erc-save-buffer-in-logs nil t)
diff --git a/test/lisp/erc/erc-scenarios-log.el b/test/lisp/erc/erc-scenarios-log.el
index 063cdfdcfd4..7452062e3c5 100644
--- a/test/lisp/erc/erc-scenarios-log.el
+++ b/test/lisp/erc/erc-scenarios-log.el
@@ -460,4 +460,116 @@
     (erc-truncate-mode -1)
     (when noninteractive (delete-directory tempdir :recursive))))
 
+;; These tests check whether logs contain gaps when reconnecting.
+(defun erc-scenarios-log--reconnect (autop)
+
+  (erc-scenarios-common-with-cleanup
+      ((erc-scenarios-common-dialog "join/reconnect")
+       (dumb-server (erc-d-run "localhost" t 'foonet 'foonet-again))
+       (tempdir (make-temp-file "erc-tests-log." t nil nil))
+       (erc-log-channels-directory tempdir)
+       (erc-modules `(log ,@erc-modules))
+       (erc-timestamp-format-left "\n[@@DATE__STAMP@@]\n")
+       (port (process-contact dumb-server :service))
+       (erc-server-auto-reconnect autop)
+       (erc-server-flood-penalty 0.1)
+       (expect (erc-d-t-make-expecter))
+       ;; Bind these so they'll be killed on teardown.
+       (server-log-buffer (get-buffer-create "*erc-log FooNet*"))
+       (chan-log-buffer (get-buffer-create "*erc-log #chan*"))
+       (spam-log-buffer (get-buffer-create "*erc-log #spam*")))
+
+    (ert-info ("Connect")
+      (with-current-buffer (erc :server "127.0.0.1"
+                                :port port
+                                :nick "tester"
+                                :password "changeme"
+                                :full-name "tester")
+        (funcall expect 10 "debug mode")))
+
+    (ert-info ("#chan populated")
+      (with-current-buffer (erc-d-t-wait-for 10 (get-buffer "#chan"))
+        (funcall expect 10 "@@DATE__STAMP@@")
+        (funcall expect 10 "<alice> tester, welcome")))
+
+    (ert-info ("#spam populated")
+      (with-current-buffer (erc-d-t-wait-for 10 (get-buffer "#spam"))
+        (funcall expect 10 "@@DATE__STAMP@@")
+        (funcall expect 10 "<alice> tester, welcome")))
+
+    (ert-info ("Reconnect")
+      (with-current-buffer "FooNet"
+        (funcall expect 10 "Connection failed!")
+
+        (if autop
+            (funcall expect 10 "Reconnecting")
+          (erc-scenarios-common-say "/reconnect"))
+
+        (funcall expect 10 "Welcome")
+        (funcall expect 10 "debug mode")))
+
+    (with-current-buffer "#chan"
+      (funcall expect -0.01 "@@DATE__STAMP@@")
+      (funcall expect 10 "<alice> bob: Well, this"))
+
+    (with-current-buffer "#spam"
+      (funcall expect -0.01 "@@DATE__STAMP@@")
+      (funcall expect 10 "<alice> bob: Our queen and all"))
+
+    (with-current-buffer "FooNet"
+      (erc-scenarios-common-say "/quit")
+      (funcall expect 10 "Quit"))
+
+    (with-current-buffer "FooNet"
+      (let ((file (erc-current-logfile (current-buffer))))
+        (with-current-buffer server-log-buffer
+          (insert-file-contents file)
+          (funcall expect 1 "@@DATE__STAMP@@")
+          (funcall expect 1 "*** Welcome to the foonet")
+          (funcall expect 1 "debug mode")
+          (funcall expect 1 "*** Connection failed!")
+          ;; Full output again on reconnect.
+          (funcall expect -0.01 "@@DATE__STAMP@@") ; but no stamp
+          (funcall expect 1 "*** Welcome to the foonet")
+          (funcall expect 1 "debug mode"))))
+
+    (with-current-buffer "#chan"
+      (let ((file (erc-current-logfile (current-buffer))))
+        (with-current-buffer chan-log-buffer
+          (insert-file-contents file)
+          (funcall expect 1 "@@DATE__STAMP@@")
+          (funcall expect 1 "*** You have joined channel #chan")
+          (funcall expect 1 "<alice> tester, welcome!")
+          ;; No stamp on reconnect.
+          (funcall expect -0.01 "@@DATE__STAMP@@")
+          (funcall expect 1 "*** You have joined channel #chan")
+          (funcall expect 1 "<alice> bob: Well, this is the forest"))))
+
+    (with-current-buffer "#spam"
+      (let ((file (erc-current-logfile (current-buffer))))
+        (with-current-buffer spam-log-buffer
+          (insert-file-contents file)
+          (funcall expect 1 "@@DATE__STAMP@@")
+          (funcall expect 1 "*** You have joined channel #spam")
+          (funcall expect 1 "<alice> tester, welcome!")
+          ;; No stamp on reconnect.
+          (funcall expect -0.01 "@@DATE__STAMP@@")
+          (funcall expect 1 "*** You have joined channel #spam")
+          (funcall expect 1 "<alice> bob: Our queen and all her elves come"))))
+
+    (erc-log-mode -1)
+
+    (if noninteractive
+        (delete-directory tempdir :recursive)
+      (add-hook 'kill-emacs-hook
+                (lambda () (delete-directory tempdir :recursive))))))
+
+(ert-deftest erc-scenarios-log--reconnect/auto ()
+  :tags '(:expensive-test)
+  (erc-scenarios-log--reconnect 'autop))
+
+(ert-deftest erc-scenarios-log--reconnect/manual ()
+  :tags '(:expensive-test)
+  (erc-scenarios-log--reconnect nil))
+
 ;;; erc-scenarios-log.el ends here
diff --git a/test/lisp/erc/resources/join/reconnect/foonet-again.eld b/test/lisp/erc/resources/join/reconnect/foonet-again.eld
index f1fcc439cc3..e530634f73c 100644
--- a/test/lisp/erc/resources/join/reconnect/foonet-again.eld
+++ b/test/lisp/erc/resources/join/reconnect/foonet-again.eld
@@ -43,3 +43,7 @@
  (0 ":irc.foonet.org 329 tester #spam 1620104779")
  (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #spam :alice: Signior Iachimo will not from it. Pray, let us follow 'em.")
  (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #spam :bob: Our queen and all her elves come here anon."))
+
+((quit 10 "QUIT :\2ERC\2")
+ (0.07 ":tester!~u@h3f95zveyc38a.irc QUIT :Quit: \2ERC\2 5.5 (IRC client for GNU Emacs 30.0.50)")
+ (0.01 "ERROR :Quit: \2ERC\2 5.5 (IRC client for GNU Emacs 30.0.50)"))

From cf9728c4be8f50c4a176b78cee6e23e1e485788a Mon Sep 17 00:00:00 2001
From: "F. Jason Park" <jp@neverwas.me>
Date: Sun, 19 Oct 2025 05:29:18 -0700
Subject: [PATCH 287/463] Only perform erc-log-insert-log-on-open setup once

* etc/ERC-NEWS: Add entry for option `erc-log-insert-log-on-open'.
Mention deprecation of `erc-log-setup-logging'.
* lisp/erc/erc-log.el (erc-log-insert-log-on-open): Expand type from
boolean to choice of boolean, predicate, and new function item
`erc-log-new-target-buffer-p'.
(erc-log-mode, erc-log-enable, erc-log-disable): Replace
`erc-log-setup-logging' on `erc-connect-pre-hook' with
`erc-log--insert-log-on-open' at depth 80.  Replace calls to
`erc-log-setup-logging' with ones to `erc-log--setup'.
(erc-log-new-target-buffer-p): New function.  While the name could
perhaps do more to indicate that it's only useful when called from
`erc-open', that's the only place ERC typically sets up new target
buffers.
(erc-log-setup-logging): Deprecate and replace body with adapter that
calls `erc-log--setup' and `erc-log--insert-log-on-open'.
(erc-log--setup): New function whose body is mostly from the
"nondestructive" portion of `erc-log-setup-logging'.  Instead of moving
the `erc-saved-last-position' marker to the old value, expect it not to
have been initialized by `erc-initialize-log-marker' because
`erc-connect-pre-hook' now runs after this code, which is now
incorporated more judiciously into the module's "enable body".
(erc-log--insert-log-on-open): New function whose body is mostly from
the "destructive" portion of the previous incarnation of
`erc-log-setup-logging'.  Unlike the original, if option
`erc-log-insert-log-on-open' is a function, call it to decide whether to
insert a log file atop its buffer.  Also, don't advance the marker
`erc-last-saved-position' to the prompt area, where it can get stuck and
prevent logs from being saved when `erc-log-insert-log-on-open' is
non-nil.  Thanks to Libera user Lionyx for reporting the bug, which has
been around since at least ERC 5.4 and Emacs 28.1.
(erc-log-disable-logging): Remove `erc-save-buffer-in-logs' from
`write-file-functions' to undo its buffer-local addition in what is now
`erc--log-setup'.
* test/lisp/erc/erc-scenarios-log-options.el: New file.  (Bug#79665)
---
 etc/ERC-NEWS                               |  17 ++
 lisp/erc/erc-log.el                        |  85 +++++---
 test/lisp/erc/erc-scenarios-log-options.el | 214 +++++++++++++++++++++
 3 files changed, 293 insertions(+), 23 deletions(-)
 create mode 100644 test/lisp/erc/erc-scenarios-log-options.el

diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 9ede2566e6d..082c10702f3 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -14,8 +14,25 @@ GNU Emacs since Emacs version 22.1.
 
 * Changes in ERC 5.6.2
 
+** Option 'erc-log-insert-log-on-open' can be a function.
+Rather than insert redundant logs into all buffers when reconnecting,
+which is what happens when this option is set to t, ERC 5.6.2 allows
+users to exercise more control by specifying a predicate.  The provided
+'erc-log-new-target-buffer-p' tells ERC to only insert logs when
+creating a new target buffer, such as when issuing a "/JOIN" or a
+"/QUERY" or when connecting for the first time with autojoin configured.
+
 ** Changes in the library API.
 
+*** Function 'erc-log-setup-logging' deprecated.
+In order to ensure proper buffer-local setup, the 'log' module has
+always run this function somewhat indiscriminately and overly often.
+This might be fine were it not for the function's interest in the option
+'erc-log-insert-log-on-open' and its consequent altering of buffer text
+in a manner only conducive to buffer creation.  The module now conducts
+such business in a tidier and more internal fashion that no longer has
+any use for the function nor its presence in 'erc-connect-pre-hook'.
+
 *** Accessors like 'erc-channel-user-voice' may ignore assignments.
 ERC now silently ignores attempts to enable certain status flags on
 'erc-channel-user' objects if the connection's "PREFIX" parameter omits
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 2bd1304210e..e7160aa482f 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -157,8 +157,16 @@ arguments."
 		 (const :tag "Disable logging" nil)))
 
 (defcustom erc-log-insert-log-on-open nil
-  "Insert log file contents into the buffer if a log file exists."
-  :type 'boolean)
+  "Insert an existing log file's contents into its associated buffer.
+A legacy value of t does so upon connecting and reconnecting in all
+buffers, often in an overlapping and redundant fashion.  A value of
+`erc-log-new-target-buffer-p' does so in new target buffers only.  If
+set to an arbitrary predicate, ERC calls it with no args in the
+associated buffer."
+  :type '(choice boolean
+                 (function-item :tag "Only new target buffers"
+                                erc-log-new-target-buffer-p)
+                 (function "User-defined predicate taking no args")))
 
 (defcustom erc-save-buffer-on-part t
   "Save the channel buffer content using `erc-save-buffer-in-logs' on PART.
@@ -231,10 +239,9 @@ also be a predicate function.  To only log when you are not set away, use:
    (add-hook 'erc-quit-hook #'erc-conditional-save-queries)
    (add-hook 'erc-part-hook #'erc-conditional-save-buffer)
    ;; append, so that 'erc-initialize-log-marker runs first
-   (add-hook 'erc-connect-pre-hook #'erc-log-setup-logging 'append)
-   ;; FIXME use proper local "setup" function and major-mode hook.
-   (dolist (buffer (erc-buffer-list))
-     (erc-log-setup-logging buffer))
+   (add-hook 'erc-connect-pre-hook #'erc-log--insert-log-on-open 80)
+   (add-hook 'erc-mode-hook #'erc-log--setup)
+   (unless erc--updating-modules-p (erc-buffer-do #'erc-log--setup))
    (erc--modify-local-map t "C-c C-l" #'erc-save-buffer-in-logs))
   ;; disable
   ((remove-hook 'erc-insert-post-hook #'erc-save-buffer-in-logs)
@@ -244,42 +251,74 @@ also be a predicate function.  To only log when you are not set away, use:
    (remove-hook 'kill-emacs-hook #'erc-log-save-all-buffers)
    (remove-hook 'erc-quit-hook #'erc-conditional-save-queries)
    (remove-hook 'erc-part-hook #'erc-conditional-save-buffer)
-   (remove-hook 'erc-connect-pre-hook #'erc-log-setup-logging)
-   (dolist (buffer (erc-buffer-list))
-     (erc-log-disable-logging buffer))
+   (remove-hook 'erc-connect-pre-hook #'erc-log--insert-log-on-open)
+   (remove-hook 'erc-mode-hook #'erc-log--setup)
+   (erc-buffer-do #'erc-log--setup)
    (erc--modify-local-map nil "C-c C-l" #'erc-save-buffer-in-logs)))
 
-;;; functionality referenced from erc.el
+(defun erc-log-new-target-buffer-p ()
+  "Return non-nil during `erc-open' if the current buffer is a new target.
+That is, return nil if it's a server buffer or a target being
+reassociated from a previous session."
+  (and (erc-target) (null erc--target-priors)))
+
+;; This function served double duty as the local setup function for both
+;; idempotent tasks and destructive ones typically confined to
+;; `erc-open'.  The caller was implicitly tasked with selectively
+;; inhibiting the destructive portion by binding
+;; `erc-log-insert-log-on-open' to nil when calling it, which led to
+;; bugs.
 (defun erc-log-setup-logging (buffer)
   "Setup the buffer-local logging variables in the current buffer.
 This function is destined to be run from `erc-connect-pre-hook'.
 The current buffer is given by BUFFER."
-  (when (erc-logging-enabled buffer)
-    (with-current-buffer buffer
-      (when-let* ((erc-last-saved-position)
-                  (priors (or erc--server-reconnecting erc--target-priors))
-                  (val (alist-get 'erc-last-saved-position priors))
-                  (_ (eq buffer (marker-buffer val))))
-        ;; Will have been initialized by `erc-initialize-log-marker'.
-        (move-marker erc-last-saved-position val))
+  (declare (obsolete "use `erc-log-mode' or mimic `erc-log--setup'" "31.1"))
+  (with-current-buffer buffer
+    (let ((erc-log-mode t))
+      (erc-log--setup)
+      (erc-log--insert-log-on-open))))
+
+;; This module's differs from other global modules in that it allows for
+;; effectively disabling itself in a subset of buffers by setting the
+;; option `erc-enable-logging' locally to nil.  Though not
+;; permanent-local, this option's variable is never explicitly killed
+;; when the module is disabled, such as via its mode command.
+(defun erc-log--setup ()
+  "Perform buffer-local setup for ERC's log module."
+  (if erc-log-mode
+    (when (erc-logging-enabled)
+      ;; If reconnecting, preserve `erc-last-saved-position' from prev
+      ;; session and preempt `erc-initialize-log-marker' in `erc-open'.
+      (unless erc-last-saved-position
+        (when-let* ((priors (or erc--server-reconnecting erc--target-priors))
+                    (val (alist-get 'erc-last-saved-position priors))
+                    (_ (eq (current-buffer) (marker-buffer val))))
+          (setq erc-last-saved-position val)))
       (auto-save-mode -1)
       (setq buffer-file-name nil)
       (add-hook 'write-file-functions #'erc-save-buffer-in-logs nil t)
       (add-function :before (local 'erc--clear-function)
-                    #'erc-log--save-on-clear '((depth . 50)))
-      (when erc-log-insert-log-on-open
+                    #'erc-log--save-on-clear '((depth . 50))))
+    (erc-log-disable-logging (current-buffer))))
+
+(defun erc-log--insert-log-on-open (&rest _)
+  "Conditionally perform insertion for `erc-log-insert-log-on-open'."
+  (when (if (functionp erc-log-insert-log-on-open)
+            (funcall erc-log-insert-log-on-open)
+          erc-log-insert-log-on-open)
+    (with-silent-modifications
+      (progn
 	(ignore-errors
 	  (save-excursion
 	    (goto-char (point-min))
-	    (insert-file-contents (erc-current-logfile)))
-	  (move-marker erc-last-saved-position
-		       (1- (point-max))))))))
+            (insert-file-contents (erc-current-logfile))))))))
 
 (defun erc-log-disable-logging (buffer)
   "Disable logging in BUFFER."
   (when (erc-logging-enabled buffer)
     (with-current-buffer buffer
       (remove-function (local 'erc--clear-function) #'erc-log--save-on-clear)
+      (remove-hook 'write-file-functions #'erc-save-buffer-in-logs t)
       (setq buffer-offer-save nil
 	    erc-enable-logging nil))))
 
diff --git a/test/lisp/erc/erc-scenarios-log-options.el b/test/lisp/erc/erc-scenarios-log-options.el
new file mode 100644
index 00000000000..c1fe946e844
--- /dev/null
+++ b/test/lisp/erc/erc-scenarios-log-options.el
@@ -0,0 +1,214 @@
+;;; erc-scenarios-log-options.el --- erc-log options scenarios -*- lexical-binding: t -*-
+
+;; Copyright (C) 2026 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'ert-x)
+(eval-and-compile
+  (let ((load-path (cons (ert-resource-directory) load-path)))
+    (require 'erc-scenarios-common)))
+
+(require 'erc-log)
+
+;; This checks that logs are only inserted in new buffers.
+(defun erc-scenarios-log-options--insert-on-open (test-fn)
+
+  (erc-scenarios-common-with-cleanup
+      ((erc-scenarios-common-dialog "join/reconnect")
+       (dumb-server (erc-d-run "localhost" t 'foonet 'foonet-again))
+       (tempdir (make-temp-file "erc-tests-log." t nil nil))
+       (erc-log-channels-directory tempdir)
+       (erc-modules `(log ,@erc-modules))
+       (erc-timestamp-format-left "\n[@@DATE__STAMP@@]\n")
+       (port (process-contact dumb-server :service))
+       (erc-server-auto-reconnect t)
+       (erc-server-flood-penalty 0.1)
+       (expect (erc-d-t-make-expecter))
+       ;; Bind these so they'll be killed on teardown.
+       (server-log-buffer (get-buffer-create "*erc-log FooNet*"))
+       (chan-log-buffer (get-buffer-create "*erc-log #chan*"))
+       (uh-suffix (format "!tester@127.0.0.1:%d.txt" port)))
+
+    (let ((file (concat "127.0.0.1:" (number-to-string port) uh-suffix)))
+      (with-temp-file (expand-file-name file tempdir)
+        (insert "\n@@OLD__BEG@@\n" "file: " file "\n@@OLD__END@@\n\n")))
+
+    (with-temp-file (expand-file-name (concat "foonet" uh-suffix) tempdir)
+      (insert "\n@@OLD__BEG@@\n"
+              "file: " (concat "foonet" uh-suffix)
+              "\n@@OLD__END@@\n\n"))
+
+    (with-temp-file (expand-file-name (concat "#chan" uh-suffix) tempdir)
+      (insert "\n@@OLD__BEG@@\n"
+              "file: " (concat "#chan" uh-suffix)
+              "\n@@OLD__END@@\n\n"))
+
+    (ert-info ("Connect")
+      (with-current-buffer (erc :server "127.0.0.1"
+                                :port port
+                                :nick "tester"
+                                :password "changeme"
+                                :full-name "tester")
+        (funcall expect 10 "debug mode")))
+
+    (ert-info ("#chan populated")
+      (with-current-buffer (erc-d-t-wait-for 10 (get-buffer "#chan"))
+        (funcall expect 10 "@@DATE__STAMP@@")
+        (funcall expect 10 "<alice> tester, welcome")))
+
+    (ert-info ("Reconnect")
+      (with-current-buffer "FooNet"
+        (funcall expect 10 "Connection failed!")
+        (funcall expect 10 "Reconnecting")
+        (funcall expect 10 "Welcome")
+        (funcall expect 10 "debug mode")))
+
+    (with-current-buffer "#chan"
+      (funcall expect -0.01 "@@DATE__STAMP@@")
+      (funcall expect 10 "<alice> bob: Well, this"))
+
+    (with-current-buffer "FooNet"
+      (erc-scenarios-common-say "/quit")
+      (funcall expect 10 "ERROR"))
+
+    ;; Ensure no redundant logging.
+    (with-current-buffer "FooNet"
+      (let ((file (erc-current-logfile (current-buffer))))
+        (with-current-buffer server-log-buffer
+          (insert-file-contents file)
+          (funcall expect 1 "@@DATE__STAMP@@")
+          (funcall expect -0.01 "@@DATE__STAMP@@")
+          ;; Full output again on reconnect.
+          (funcall expect 1 "*** Welcome to the foonet")
+          (funcall expect 1 "debug mode")
+          (funcall expect 1 "*** Connection failed!")
+          (funcall expect 1 "*** Welcome to the foonet")
+          (funcall expect 1 "debug mode"))))
+
+    (with-current-buffer "#chan"
+      (let ((file (erc-current-logfile (current-buffer))))
+        (with-current-buffer chan-log-buffer
+          (insert-file-contents file)
+          (funcall expect 1 "@@OLD__BEG@@")
+          (funcall expect -0.01 "@@OLD__BEG@@") ; only appearance
+          (funcall expect 1 "file: #chan")
+          (funcall expect 1 "@@OLD__END@@")
+          (funcall expect 1 "@@DATE__STAMP@@")
+          (funcall expect -0.01 "@@DATE__STAMP@@")
+          ;; Full output again on reconnect.
+          (funcall expect 1 "*** You have joined channel #chan")
+          (funcall expect 1 "<alice> tester, welcome!")
+          (funcall expect -0.01 "@@DATE__STAMP@@")
+          (funcall expect 1 "*** You have joined channel #chan")
+          (funcall expect 1 "<alice> bob: Well, this is the forest"))))
+
+    (funcall test-fn expect)
+    (erc-log-mode -1)
+
+    (if noninteractive
+        (delete-directory tempdir :recursive)
+      (add-hook 'kill-emacs-hook
+                (lambda () (delete-directory tempdir :recursive))))))
+
+;; This shows that the legacy default value of t ends up inserting
+;; existing log content on reconnect as well, leading to redundant
+;; insertions.
+(ert-deftest erc-scenarios-log-options--insert-on-open/default ()
+  (let ((erc-log-insert-log-on-open t))
+    (erc-scenarios-log-options--insert-on-open
+     (lambda (expect)
+
+       (with-current-buffer "*erc-log FooNet*"
+         (funcall expect 1 "@@OLD__BEG@@" (point-min))
+         (funcall expect -0.01 "@@OLD__BEG@@") ; not repeated
+         (funcall expect 1 "file: foonet")
+         (funcall expect 1 "@@OLD__END@@")
+         (funcall expect 1 "@@DATE__STAMP@@"))
+
+       ;; For server buffers, the file name changes because the buffer
+       ;; is renamed after the network is announced during the initial
+       ;; session.
+       (with-current-buffer "FooNet"
+
+         (funcall expect 1 "@@OLD__BEG@@" (point-min))
+         ;; Existing log contents inserted once per connection (most
+         ;; recent first).
+         (funcall expect 1 "file: foonet")
+         (funcall expect 1 "@@OLD__END@@")
+
+         ;; Insertion from initial connection last.
+         (funcall expect 1 "@@OLD__BEG@@")
+         (funcall expect 1 "file: 127.0.0.1")
+         (funcall expect -0.01 "@@OLD__BEG@@")
+         (funcall expect 1 "@@OLD__END@@")
+
+         (funcall expect 1 "@@DATE__STAMP@@"))
+
+       (ert-info ("Repeated in #chan")
+         (with-current-buffer "#chan"
+           (funcall expect 1 "@@OLD__BEG@@" (point-min))
+           (funcall expect 1 "file: #chan")
+           (funcall expect 1 "@@OLD__END@@")
+
+           ;; Existing log is indeed repeated in full once per connection.
+           (funcall expect 1 "@@OLD__BEG@@")
+           (funcall expect -0.01 "@@OLD__BEG@@")
+           (funcall expect 1 "file: #chan")
+           (funcall expect 1 "@@OLD__END@@")
+
+           (funcall expect 1 "@@DATE__STAMP@@")))))))
+
+(ert-deftest erc-scenarios-log-options--insert-on-open/target-p ()
+  (let ((erc-log-insert-log-on-open #'erc-log-new-target-buffer-p))
+    (erc-scenarios-log-options--insert-on-open
+     (lambda (expect)
+
+       (ert-info ("Absent from server buffer")
+         (with-current-buffer "FooNet"
+           ;; No insertions in the server buffer.
+           (funcall expect -0.01 "@@OLD__BEG@@" (point-min))
+           (funcall expect 1 "@@DATE__STAMP@@")))
+
+       (ert-info ("Once in server log")
+         ;; No redundancies in the server's log file, though previously
+         ;; existing content is obviously present.
+         (with-current-buffer "*erc-log FooNet*"
+           (funcall expect 1 "@@OLD__BEG@@" (point-min))
+           (funcall expect -0.01 "@@OLD__BEG@@") ; no repeats
+           (funcall expect 1 "file: foonet")
+           (funcall expect 1 "@@OLD__END@@")
+           (funcall expect 1 "@@DATE__STAMP@@")))
+
+       ;; Also, as asserted in the fixture body, the associated log file
+       ;; for #chan has no redundancy.
+       (ert-info ("Not repeated in #chan")
+         (with-current-buffer "#chan"
+           (funcall expect 1 "@@OLD__BEG@@" (point-min))
+           (funcall expect 1 "file: #chan")
+           (funcall expect 1 "@@OLD__END@@")
+
+           ;; Existing scrollback only inserted at most once per buffer.
+           (funcall expect -0.01 "@@OLD__BEG@@")
+           (funcall expect 1 "@@DATE__STAMP@@")))))))
+
+(require 'erc-log)
+
+;;; erc-scenarios-log-options.el ends here

From da4ab3d7381e7f5b196d5df44e6c7d6afd7856ed Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 30 Apr 2026 17:55:43 -0700
Subject: [PATCH 288/463] Pacify GCC 16.0.1 -Wanalyzer-null-dereference in
 xdisp.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* src/xdisp.c (glyph_string_containing_background_width):
Although it’s not immediately obvious whether the GCC 16 warning
is valid, adding an eassume here shouldn’t hurt.
---
 src/xdisp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index a05e5bda48a..4c46d7711be 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -31382,7 +31382,10 @@ glyph_string_containing_background_width (struct glyph_string *s)
 {
   if (s->cmp)
     while (s->cmp_from)
-      s = s->prev;
+      {
+	s = s->prev;
+	eassume (s);
+      }
 
   return s;
 }

From a6a3b32208c5763de20c874da1a0d8af47e4dd93 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dmitry@gutov.dev>
Date: Fri, 1 May 2026 02:19:40 +0300
Subject: [PATCH 289/463] Try to resize or resize-and-move child frames in one
 update

This pertains to X11 toolkit builds.  Other ports (including
PGTK) seem to have mostly atomic window updates already.

* src/xterm.c (x_set_window_size_1): Resize the Xt widget eagerly,
so the next redraw is not clipped.  Update the "desired" Cairo
surface dimensions.  Skip waiting for next XEvent.  Do all that
for child frames only.  Update old comments (bug#80662).
(x_set_window_size_and_position_1): Same.  Also clear the widget's
cached position coordinates (we don't keep them up to date).
(x_set_window_size, x_set_window_size_and_position): Skip
redrawing the border on child frames, it will happen during
redisplay anyway.

* src/gtkutil.c (xg_frame_set_size_and_position): On child
frames, resize the GTK widget hierarchy immediately.  Update the
"desired" Cairo surface dimensions.  Skip waiting for events.

* src/widget.c (EmacsFrameResize):
When resize should be a no-op, exit early (minor optimization).
(EmacsFrameExpose): Redraw the border on the last Expose event.

* src/xdisp.c (clear_garbaged_frames): Don't redraw borders here.

* src/xfns.c (x_window): Undo the previous change in bit_gravity
in the no-toolkit build.  StaticGravity works the best for it
thanks to no nesting in window configuration.
---
 src/gtkutil.c | 16 ++++++++++-
 src/widget.c  |  6 +++++
 src/xdisp.c   |  5 ----
 src/xfns.c    |  2 +-
 src/xterm.c   | 75 +++++++++++++++++++++++++++++++++++----------------
 5 files changed, 74 insertions(+), 30 deletions(-)

diff --git a/src/gtkutil.c b/src/gtkutil.c
index b01bb6804ed..fd83943e033 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1421,6 +1421,16 @@ xg_frame_set_size_and_position (struct frame *f, int width, int height)
 
 #ifndef HAVE_PGTK
   gdk_window_move_resize (gwin, x, y, outer_width, outer_height);
+  if (FRAME_PARENT_FRAME (f))
+    {
+      /* Resize all inner widgets and Cairo surface right away so the
+	 next redisplay drawing isn't clipped to the old size.  */
+      GtkAllocation alloc = {0, 0, outer_width, outer_height};
+      gtk_widget_size_allocate (FRAME_GTK_OUTER_WIDGET (f), &alloc);
+#ifdef USE_CAIRO
+      x_cr_update_surface_desired_size (f, width, height);
+#endif
+    }
 #else
   if (FRAME_GTK_OUTER_WIDGET (f))
     gdk_window_move_resize (gwin, x, y, outer_width, outer_height);
@@ -1432,7 +1442,11 @@ xg_frame_set_size_and_position (struct frame *f, int width, int height)
   SET_FRAME_GARBAGED (f);
   cancel_mouse_face (f);
 
-  if (FRAME_VISIBLE_P (f))
+  /* For child frames, don't wait for events — that would flush the X
+     buffer and might show outdated contents in the frame.  Same for
+     invisible frames: this way is faster and x_make_frame_visible will
+     wait for event anyway.  */
+  if (FRAME_VISIBLE_P (f) && !FRAME_PARENT_FRAME (f))
     {
       /* Must call this to flush out events */
       (void)gtk_events_pending ();
diff --git a/src/widget.c b/src/widget.c
index e767b006e3f..b843bca1fb9 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -428,6 +428,10 @@ EmacsFrameResize (Widget widget)
        ew->core.width, ew->core.height,
        f->new_width, f->new_height);
 
+  if (FRAME_PIXEL_WIDTH (f) == ew->core.width
+      && FRAME_PIXEL_HEIGHT (f) == ew->core.height)
+    return;
+
   change_frame_size (f, ew->core.width, ew->core.height,
 		     false, true, false);
 
@@ -495,6 +499,8 @@ EmacsFrameExpose (Widget widget, XEvent *event, Region region)
 
   expose_frame (f, event->xexpose.x, event->xexpose.y,
 		event->xexpose.width, event->xexpose.height);
+  if (event->xexpose.count == 0)
+    x_clear_under_internal_border (f);
   flush_frame (f);
 }
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 4c46d7711be..4f3b23f1698 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13661,11 +13661,6 @@ clear_garbaged_frames (void)
 	      if (is_tty_frame (f))
 		current_matrices_cleared = true;
 
-#ifdef HAVE_WINDOW_SYSTEM
-              if (FRAME_WINDOW_P (f)
-                  && FRAME_RIF (f)->clear_under_internal_border)
-                FRAME_RIF (f)->clear_under_internal_border (f);
-#endif
 	      fset_redisplay (f);
 	      f->garbaged = false;
 	      f->resized_p = false;
diff --git a/src/xfns.c b/src/xfns.c
index 3cf9bbc22f0..423209436c4 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4483,7 +4483,7 @@ x_window (struct frame *f)
 
   attributes.background_pixel = FRAME_BACKGROUND_PIXEL (f);
   attributes.border_pixel = f->output_data.x->border_pixel;
-  attributes.bit_gravity = NorthWestGravity;
+  attributes.bit_gravity = StaticGravity;
   attributes.backing_store = NotUseful;
   attributes.save_under = True;
   attributes.event_mask = STANDARD_EVENT_SET;
diff --git a/src/xterm.c b/src/xterm.c
index 4de0b24081f..ee727d163f5 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -28484,6 +28484,19 @@ x_set_window_size_1 (struct frame *f, bool change_gravity,
     f->win_gravity = NorthWestGravity;
   x_wm_set_size_hint (f, 0, false);
 
+#ifdef USE_X_TOOLKIT
+  if (FRAME_PARENT_FRAME (f) && f->output_data.x->widget)
+    {
+      /* Resize all inner widgets and Cairo surface right away so the
+	 next redisplay drawing isn't clipped to the old size.  */
+      XtResizeWidget (f->output_data.x->widget,
+		      width, height + FRAME_MENUBAR_HEIGHT (f), 0);
+#ifdef USE_CAIRO
+      x_cr_update_surface_desired_size (f, width, height);
+#endif
+    }
+  else
+#endif
   XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
 		 width, height + FRAME_MENUBAR_HEIGHT (f));
 
@@ -28499,30 +28512,25 @@ x_set_window_size_1 (struct frame *f, bool change_gravity,
   if (!NILP (Vx_lax_frame_positioning))
     return;
 
-  /* Now, strictly speaking, we can't be sure that this is accurate,
+  /* Now, strictly speaking, we can't be sure that this is final,
      but the window manager will get around to dealing with the size
      change request eventually, and we'll hear how it went when the
      ConfigureNotify event gets here.
 
-     We could just not bother storing any of this information here,
-     and let the ConfigureNotify event set everything up, but that
-     might be kind of confusing to the Lisp code, since size changes
-     wouldn't be reported in the frame parameters until some random
-     point in the future when the ConfigureNotify event arrives.
-
-     Pass true for DELAY since we can't run Lisp code inside of
-     a BLOCK_INPUT.  */
-
-  /* But the ConfigureNotify may in fact never arrive, and then this is
-     not right if the frame is visible.  Instead wait (with timeout)
-     for the ConfigureNotify.  */
-  if (FRAME_VISIBLE_P (f))
+     We could just let the ConfigureNotify update everything, but
+     waiting creates an implicit X flush which might flicker with
+     outdated contents in the frame.  For child frames, the window
+     manager is not a concern and it's better to finish quickly.  */
+  if (FRAME_VISIBLE_P (f) && !FRAME_PARENT_FRAME (f))
     {
+      /* The event may create delayed size change (delayed because we
+	 can't run Lisp code inside of a BLOCK_INPUT) which will be
+	 applied right after by do_pending_window_change.  */
       x_wait_for_event (f, ConfigureNotify);
 
       if (CONSP (frame_size_history))
 	frame_size_history_extra
-	  (f, build_string ("x_set_window_size_1, visible"),
+	  (f, build_string ("x_set_window_size_1, waited for event"),
 	   FRAME_PIXEL_WIDTH (f), FRAME_PIXEL_HEIGHT (f), width, height,
 	   f->new_width, f->new_height);
     }
@@ -28530,7 +28538,7 @@ x_set_window_size_1 (struct frame *f, bool change_gravity,
     {
       if (CONSP (frame_size_history))
 	frame_size_history_extra
-	  (f, build_string ("x_set_window_size_1, invisible"),
+	  (f, build_string ("x_set_window_size_1, not waited for event"),
 	   FRAME_PIXEL_WIDTH (f), FRAME_PIXEL_HEIGHT (f), width, height,
 	   f->new_width, f->new_height);
 
@@ -28561,7 +28569,8 @@ x_set_window_size (struct frame *f, bool change_gravity,
     x_set_window_size_1 (f, change_gravity, width, height);
 #else /* not USE_GTK */
   x_set_window_size_1 (f, change_gravity, width, height);
-  x_clear_under_internal_border (f);
+  if (!FRAME_PARENT_FRAME (f))
+    x_clear_under_internal_border (f);
 #endif /* not USE_GTK */
 
   /* If cursor was outside the new size, mark it as off.  */
@@ -28586,16 +28595,35 @@ x_set_window_size_and_position_1 (struct frame *f, int width, int height)
 
   x_wm_set_size_hint (f, 0, false);
 
-  XMoveResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
-		     x, y, width, height + FRAME_MENUBAR_HEIGHT (f));
+#ifdef USE_X_TOOLKIT
+  if (FRAME_PARENT_FRAME (f) && f->output_data.x->widget)
+    {
+      /* Clear widget's position coordinates because it only sends
+	 changed values with its XConfigureWindow command.  And these
+	 are likely outdated because XtDispatchEvent does not save them.
+	 The alternative would be to always use XtMoveWidget instead of
+	 XMoveWindow.  */
+      f->output_data.x->widget->core.x = -1;
+      f->output_data.x->widget->core.y = -1;
+      /* Resize all inner widgets and Cairo surface right away so the
+	 next redisplay drawing isn't clipped to the old size.  */
+      XtConfigureWidget (f->output_data.x->widget,
+			 x, y, width, height + FRAME_MENUBAR_HEIGHT (f), 0);
+#ifdef USE_CAIRO
+      x_cr_update_surface_desired_size (f, width, height);
+#endif
+    }
+  else
+#endif
+    XMoveResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
+		       x, y, width, height + FRAME_MENUBAR_HEIGHT (f));
 
   SET_FRAME_GARBAGED (f);
 
-  if (FRAME_VISIBLE_P (f))
+  /* Same as x_set_window_size_1.  */
+  if (FRAME_VISIBLE_P (f) && !FRAME_PARENT_FRAME (f))
     x_wait_for_event (f, ConfigureNotify);
   else
-    /* Call adjust_frame_size right away as with GTK.  It might be
-       tempting to clear out f->new_width and f->new_height here.  */
     adjust_frame_size (f, FRAME_PIXEL_TO_TEXT_WIDTH (f, width),
 		       FRAME_PIXEL_TO_TEXT_HEIGHT (f, height),
 		       5, 0, Qx_set_window_size_1);
@@ -28615,7 +28643,8 @@ x_set_window_size_and_position (struct frame *f, int width, int height)
   x_set_window_size_and_position_1 (f, width, height);
 #endif /* USE_GTK */
 
-  x_clear_under_internal_border (f);
+  if (!FRAME_PARENT_FRAME (f))
+    x_clear_under_internal_border (f);
 
   /* If cursor was outside the new size, mark it as off.  */
   mark_window_cursors_off (XWINDOW (FRAME_ROOT_WINDOW (f)));

From 83b19f4d0f406cb92bd78f9a3ae42e6311d50e1c Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dmitry@gutov.dev>
Date: Fri, 1 May 2026 02:33:18 +0300
Subject: [PATCH 290/463] Don't wait out the whole event timeout unnecessarily

* src/xterm.c (x_wait_for_event): If f->wait_event_type has been
cleared (in handle_one_xevent), don't go into pselect wait.

* src/androidterm.c (android_wait_for_event): Likewise.
---
 src/androidterm.c | 5 ++++-
 src/xterm.c       | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/androidterm.c b/src/androidterm.c
index ac1f2c88569..a74b595d499 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -2260,10 +2260,13 @@ android_wait_for_event (struct frame *f, int eventtype)
     {
       pending_signals = true;
       totally_unblock_input ();
-      /* XTread_socket is called after unblock.  */
+      /* android_read_socket is called after unblock.  */
       block_input ();
       interrupt_input_blocked = level;
 
+      if (!f->wait_event_type)
+	break;
+
       time_now = current_timespec ();
       if (timespec_cmp (tmo_at, time_now) < 0)
 	break;
diff --git a/src/xterm.c b/src/xterm.c
index ee727d163f5..fc4fa4f2fc7 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -28455,6 +28455,9 @@ x_wait_for_event (struct frame *f, int eventtype)
       block_input ();
       interrupt_input_blocked = level;
 
+      if (!f->wait_event_type)
+	break;
+
       FD_ZERO (&fds);
       FD_SET (fd, &fds);
 

From 049a94b4e565a87e05a24d007385729f9fbf12d1 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dmitry@gutov.dev>
Date: Fri, 1 May 2026 03:49:09 +0300
Subject: [PATCH 291/463] Remove the effect of x_gtk_resize_child_frames=hide

* src/gtkutil.c (xg_frame_set_char_size): Remove the effect of
x_gtk_resize_child_frames, effectively reverting that part of
c49d379f17bc (bug#80662).

* src/pgtkfns.c (syms_of_pgtkfns): Remove defsyms Qhide and
Qresize_mode, never used with PGTK.

* src/xfns.c (x-gtk-resize-child-frames): Update docstring.
---
 src/gtkutil.c | 56 +--------------------------------------------------
 src/pgtkfns.c |  2 --
 src/xfns.c    |  4 ----
 3 files changed, 1 insertion(+), 61 deletions(-)

diff --git a/src/gtkutil.c b/src/gtkutil.c
index fd83943e033..73e93c38906 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1181,8 +1181,6 @@ xg_frame_set_char_size (struct frame *f, int width, int height)
   int outer_height
     = height + FRAME_TOOLBAR_HEIGHT (f) + FRAME_MENUBAR_HEIGHT (f);
   int outer_width = width + FRAME_TOOLBAR_WIDTH (f);
-  bool was_visible = false;
-  bool hide_child_frame;
 
 #ifndef HAVE_PGTK
   gtk_window_get_size (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
@@ -1251,58 +1249,6 @@ xg_frame_set_char_size (struct frame *f, int width, int height)
 				     outer_width, gheight);
       }
 #endif
-  else if (FRAME_PARENT_FRAME (f) && FRAME_VISIBLE_P (f))
-    {
-      was_visible = true;
-#ifndef HAVE_PGTK
-      hide_child_frame = EQ (x_gtk_resize_child_frames, Qhide);
-#else
-      hide_child_frame = false;
-#endif
-
-      if (outer_width != gwidth || outer_height != gheight)
-	{
-          if (hide_child_frame)
-            {
-              block_input ();
-#ifndef HAVE_PGTK
-              gtk_widget_hide (FRAME_GTK_OUTER_WIDGET (f));
-#else
-	      gtk_widget_hide (FRAME_WIDGET (f));
-#endif
-              unblock_input ();
-            }
-
-#ifndef HAVE_PGTK
-	  gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-			     outer_width, outer_height);
-#else
-	  if (FRAME_GTK_OUTER_WIDGET (f))
-	    {
-	      gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-				 outer_width, outer_height);
-	    }
-	  else
-	    {
-	      gtk_widget_set_size_request (FRAME_GTK_WIDGET (f),
-					   outer_width, outer_height);
-	    }
-#endif
-
-          if (hide_child_frame)
-            {
-              block_input ();
-#ifndef HAVE_PGTK
-              gtk_widget_show_all (FRAME_GTK_OUTER_WIDGET (f));
-#else
-	      gtk_widget_show_all (FRAME_WIDGET (f));
-#endif
-              unblock_input ();
-            }
-
-	  fullscreen = Qnil;
-	}
-    }
   else
     {
 #ifndef HAVE_PGTK
@@ -1333,7 +1279,7 @@ xg_frame_set_char_size (struct frame *f, int width, int height)
      size as fast as possible.
      For unmapped windows, we can set rows/cols.  When
      the frame is mapped again we will (hopefully) get the correct size.  */
-  if (FRAME_VISIBLE_P (f) && !was_visible)
+  if (FRAME_VISIBLE_P (f))
     {
       if (CONSP (frame_size_history))
 	frame_size_history_extra
diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index 53fe5fbc9d0..4257dc45f98 100644
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -3778,8 +3778,6 @@ syms_of_pgtkfns (void)
   DEFSYM (Qframe_title_format, "frame-title-format");
   DEFSYM (Qicon_title_format, "icon-title-format");
   DEFSYM (Qdark, "dark");
-  DEFSYM (Qhide, "hide");
-  DEFSYM (Qresize_mode, "resize-mode");
 
   DEFVAR_LISP ("x-cursor-fore-pixel", Vx_cursor_fore_pixel,
 	       doc: /* SKIP: real doc in xfns.c.  */);
diff --git a/src/xfns.c b/src/xfns.c
index 423209436c4..7427144b103 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -10484,10 +10484,6 @@ default and usually works with most desktops.  Some desktop environments
 however, may refuse to resize a child frame when Emacs is built with
 GTK3.  For those environments, the two settings below are provided.
 
-If this equals the symbol `hide', Emacs temporarily hides the child
-frame during resizing.  This approach seems to work reliably, may
-however induce some flicker when the frame is made visible again.
-
 If this equals the symbol `resize-mode', Emacs uses GTK's resize mode to
 always trigger an immediate resize of the child frame.  This method is
 deprecated by GTK and may not work in future versions of that toolkit.

From 73fe7a7097da69897c04f8000a60a4f24cd6e468 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dmitry@gutov.dev>
Date: Fri, 1 May 2026 03:58:17 +0300
Subject: [PATCH 292/463] Simplify the fullscreen adjustment in
 xg_frame_set_char_size

* src/gtkutil.c (xg_frame_set_char_size): Simplify.  Use the
fullscreen value check to alter the values of outer_width and
outer_height rather than have several larger branches (bug#80662).
---
 src/gtkutil.c | 57 +++++++++++----------------------------------------
 1 file changed, 12 insertions(+), 45 deletions(-)

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 73e93c38906..00ec0a5b728 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1218,56 +1218,23 @@ xg_frame_set_char_size (struct frame *f, int width, int height)
      remain unchanged but giving the frame back its normal size will
      be broken ... */
   if (EQ (fullscreen, Qfullwidth) && width == FRAME_PIXEL_WIDTH (f))
-#ifndef HAVE_PGTK
-    gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-		       gwidth, outer_height);
-#else
-    if (FRAME_GTK_OUTER_WIDGET (f))
-      {
-	gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-			   gwidth, outer_height);
-      }
-    else
-      {
-	gtk_widget_set_size_request (FRAME_GTK_WIDGET (f),
-				     gwidth, outer_height);
-      }
-#endif
+    outer_width = gwidth;
   else if (EQ (fullscreen, Qfullheight) && height == FRAME_PIXEL_HEIGHT (f))
-#ifndef HAVE_PGTK
-    gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-		       outer_width, gheight);
-#else
-    if (FRAME_GTK_OUTER_WIDGET (f))
-      {
-	gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-			   outer_width, gheight);
-      }
-    else
-      {
-	gtk_widget_set_size_request (FRAME_GTK_WIDGET (f),
-				     outer_width, gheight);
-      }
-#endif
+    outer_height = gheight;
   else
-    {
+    fullscreen = Qnil;
+
 #ifndef HAVE_PGTK
-      gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-			 outer_width, outer_height);
+  gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
+		     outer_width, outer_height);
 #else
-      if (FRAME_GTK_OUTER_WIDGET (f))
-	{
-	  gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-			     outer_width, outer_height);
-	}
-      else
-	{
-	  gtk_widget_set_size_request (FRAME_GTK_WIDGET (f),
-				       outer_width, outer_height);
-	}
+  if (FRAME_GTK_OUTER_WIDGET (f))
+    gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
+		       outer_width, outer_height);
+  else
+    gtk_widget_set_size_request (FRAME_GTK_WIDGET (f),
+				 outer_width, outer_height);
 #endif
-      fullscreen = Qnil;
-    }
 
   SET_FRAME_GARBAGED (f);
   cancel_mouse_face (f);

From 6cd5b16dd0e92ce0819530052c7983593a427bb3 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dmitry@gutov.dev>
Date: Fri, 1 May 2026 04:42:57 +0300
Subject: [PATCH 293/463] Resize child frames with GTK3 immediately too

* src/gtkutil.c (xg_frame_set_char_size): Resize child frame and
its GTK widget hierarchy immediately.  Update the "desired" Cairo
surface dimensions.  Skip waiting for events. (bug#80662)
Remove the unnecessary call to clear_under_internal_border.
---
 src/gtkutil.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 00ec0a5b728..8c01f26ef2f 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1200,9 +1200,6 @@ xg_frame_set_char_size (struct frame *f, int width, int height)
     }
 #endif
 
-  /* Do this before resize, as we don't know yet if we will be resized.  */
-  FRAME_RIF (f)->clear_under_internal_border (f);
-
   outer_height /= xg_get_scale (f);
   outer_width /= xg_get_scale (f);
 
@@ -1225,13 +1222,26 @@ xg_frame_set_char_size (struct frame *f, int width, int height)
     fullscreen = Qnil;
 
 #ifndef HAVE_PGTK
-  gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-		     outer_width, outer_height);
+  if (FRAME_PARENT_FRAME (f))
+    {
+      gdk_window_resize (gtk_widget_get_window (FRAME_GTK_OUTER_WIDGET (f)),
+			 outer_width, outer_height);
+      /* Resize all inner widgets and Cairo surface right away so the
+	 next redisplay drawing isn't clipped to the old size.  */
+      GtkAllocation alloc = {0, 0, outer_width, outer_height};
+      gtk_widget_size_allocate (FRAME_GTK_OUTER_WIDGET (f), &alloc);
+#ifdef USE_CAIRO
+      x_cr_update_surface_desired_size (f, width, height);
+#endif
+    }
+  else
+    gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
+		       outer_width, outer_height);
 #else
   if (FRAME_GTK_OUTER_WIDGET (f))
     gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
 		       outer_width, outer_height);
-  else
+  else				/* PGTK child frame.  */
     gtk_widget_set_size_request (FRAME_GTK_WIDGET (f),
 				 outer_width, outer_height);
 #endif
@@ -1246,7 +1256,7 @@ xg_frame_set_char_size (struct frame *f, int width, int height)
      size as fast as possible.
      For unmapped windows, we can set rows/cols.  When
      the frame is mapped again we will (hopefully) get the correct size.  */
-  if (FRAME_VISIBLE_P (f))
+  if (FRAME_VISIBLE_P (f) && !FRAME_PARENT_FRAME (f))
     {
       if (CONSP (frame_size_history))
 	frame_size_history_extra
@@ -1347,7 +1357,7 @@ xg_frame_set_size_and_position (struct frame *f, int width, int height)
 #else
   if (FRAME_GTK_OUTER_WIDGET (f))
     gdk_window_move_resize (gwin, x, y, outer_width, outer_height);
-  else
+  else				/* PGTK child frame.  */
     gtk_widget_set_size_request (FRAME_GTK_WIDGET (f),
 				 outer_width, outer_height);
 #endif

From 19696dbc24fc765604121ac4e73cbf354080f199 Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Thu, 30 Apr 2026 21:29:36 -0700
Subject: [PATCH 294/463] ; Add comment thing for c-ts-mode

* lisp/progmodes/c-ts-mode.el (c-ts-mode--thing-settings): Add
comment thing.
---
 lisp/progmodes/c-ts-mode.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 591000cb440..c8120d5752c 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -1274,7 +1274,8 @@ if `c-ts-mode-emacs-sources-support' is non-nil."
                     "goto_statement"
                     "case_statement")))
     (text ,(regexp-opt '("comment"
-                         "raw_string_literal"))))
+                         "raw_string_literal")))
+    (comment "comment"))
   "`treesit-thing-settings' for both C and C++.")
 
 ;;; Support for FOR_EACH_* macros

From dd3f0053d25188c1f230b4b8dfeee9709f3e1c5a Mon Sep 17 00:00:00 2001
From: Eshel Yaron <me@eshelyaron.com>
Date: Fri, 1 May 2026 11:22:14 +0200
Subject: [PATCH 295/463] ; (external-completion-table): Fix a couple of typos.

---
 lisp/external-completion.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/external-completion.el b/lisp/external-completion.el
index aa23c949241..a361710b686 100644
--- a/lisp/external-completion.el
+++ b/lisp/external-completion.el
@@ -67,8 +67,8 @@ may be a shell utility, an inferior process, an http server, etc.
 Given a pattern string, the external tool matches it to an
 arbitrarily large set of candidates.  Since the full set doesn't
 need to be transferred to Emacs's address space, this often
-results in much faster overall experience, at the expense of the
-convenience of offered by other completion styles.
+results in a much faster overall experience, at the expense of the
+convenience offered by other completion styles.
 
 CATEGORY is a symbol uniquely naming the external tool.  This
 function links CATEGORY to the style `external', by modifying
@@ -95,7 +95,7 @@ non-list.
 
 METADATA is an alist of additional properties such as
 `cycle-sort-function' to associate with CATEGORY.  This means
-that the caller may still retain control the sorting of the
+that the caller may still retain control of the sorting of the
 candidates while the tool controls the matching.
 
 Optional TRY-COMPLETION-FUNCTION helps some frontends partially
@@ -105,7 +105,7 @@ ALL-COMPLETIONS), where PATTERN and POINT are as described above
 and ALL-COMPLETIONS are gathered by LOOKUP for these
 arguments (this function ensures LOOKUP isn't called more than
 needed).  If you know the matching method that the external tool
-using, TRY-COMPLETION-FUNCTION may return a cons
+is using, TRY-COMPLETION-FUNCTION may return a cons
 cell (EXPANDED-PATTERN . NEW-POINT).  For example, if the tool is
 completing by prefix, one could call `try-completion' to find the
 largest common prefix in ALL-COMPLETIONS and then return that as

From d80c9e534d78c8e07f9e32092762cc426403aa8b Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Fri, 1 May 2026 10:46:16 +0100
Subject: [PATCH 296/463] ; project.el: Use when-let* not if-let* where
 appropriate.

---
 lisp/progmodes/project.el | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index e7078d8e972..9a9dc6df186 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -2222,10 +2222,10 @@ With some possible metadata (to be decided).")
   "Initialize `project--list' if it isn't already initialized."
   (when (eq project--list 'unset)
     (project--read-project-list)
-    (if-let* ((pred (alist-get 'list-first-read project-prune-zombie-projects))
-              ((consp project--list))
-              (inhibit-message t))
-        (project--delete-zombie-projects pred))))
+    (when-let* ((pred (alist-get 'list-first-read project-prune-zombie-projects))
+                ((consp project--list))
+                (inhibit-message t))
+      (project--delete-zombie-projects pred))))
 
 (defun project--write-project-list ()
   "Save `project--list' in `project-list-file'."
@@ -2234,10 +2234,10 @@ With some possible metadata (to be decided).")
       (insert ";;; -*- lisp-data -*-\n")
       (let ((print-length nil)
             (print-level nil))
-        (if-let* ((pred (alist-get 'list-write project-prune-zombie-projects))
-                  ((consp project--list))
-                  (inhibit-message t))
-            (project--delete-zombie-projects pred))
+        (when-let* ((pred (alist-get 'list-write project-prune-zombie-projects))
+                    ((consp project--list))
+                    (inhibit-message t))
+          (project--delete-zombie-projects pred))
         (pp (mapcar (lambda (elem)
                       (let ((name (car elem)))
                         (list (if (file-remote-p name) name
@@ -2323,9 +2323,9 @@ Unless REQUIRE-KNOWN is non-nil, it's also possible to enter an
 arbitrary directory not in the list of known projects.
 If ALLOW-EMPTY is non-nil, it is possible to exit with no input."
   (project--ensure-read-project-list)
-  (if-let* ((pred (alist-get 'prompt project-prune-zombie-projects))
-            (inhibit-message t))
-      (project--delete-zombie-projects pred))
+  (when-let* ((pred (alist-get 'prompt project-prune-zombie-projects))
+              (inhibit-message t))
+    (project--delete-zombie-projects pred))
   (let* ((dir-choice "... (choose a dir)")
          (choices
           ;; XXX: Just using this for the category (for the substring
@@ -2367,9 +2367,9 @@ function; see `project-prompter' for more details.
 Unless REQUIRE-KNOWN is non-nil, it's also possible to enter an
 arbitrary directory not in the list of known projects.
 If ALLOW-EMPTY is non-nil, it is possible to exit with no input."
-  (if-let* ((pred (alist-get 'prompt project-prune-zombie-projects))
-            (inhibit-message t))
-      (project--delete-zombie-projects pred))
+  (when-let* ((pred (alist-get 'prompt project-prune-zombie-projects))
+              (inhibit-message t))
+    (project--delete-zombie-projects pred))
   (let* ((dir-choice "... (choose a dir)")
          project--name-history
          (choices

From 6583cc4fdfc43a59059ace281dcb24b70280c4f2 Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Fri, 1 May 2026 16:00:26 +0200
Subject: [PATCH 297/463] Update to Transient v0.13.1-10-gc168d396

---
 doc/misc/transient.texi |  4 ++--
 lisp/transient.el       | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/misc/transient.texi b/doc/misc/transient.texi
index b0eebec3071..35544b2917c 100644
--- a/doc/misc/transient.texi
+++ b/doc/misc/transient.texi
@@ -31,7 +31,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Transient User and Developer Manual
-@subtitle for version 0.13.0
+@subtitle for version 0.13.1
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
@@ -53,7 +53,7 @@ resource to get over that hurdle is Psionic K's interactive tutorial,
 available at @uref{https://github.com/positron-solutions/transient-showcase}.
 
 @noindent
-This manual is for Transient version 0.13.0.
+This manual is for Transient version 0.13.1.
 
 @insertcopying
 @end ifnottex
diff --git a/lisp/transient.el b/lisp/transient.el
index e04437dd914..ae49a38579d 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -5,7 +5,7 @@
 ;; Author: Jonas Bernoulli <jonas@bernoul.li>
 ;; URL: https://github.com/magit/transient
 ;; Keywords: extensions
-;; Version: 0.13.0
+;; Version: 0.13.1
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -39,7 +39,7 @@
 ;;; Code:
 ;;;; Frontmatter
 
-(defconst transient-version "v0.13.0-10-g5b2ff26f-builtin")
+(defconst transient-version "v0.13.1-10-gc168d396-builtin")
 
 (require 'cl-lib)
 (require 'eieio)
@@ -5523,11 +5523,11 @@ search instead."
                   2)
             lisp-imenu-generic-expression :test #'equal)
 
-(defvar overriding-text-conversion-style)
-
 (defun transient--suspend-text-conversion-style ()
-  (when (and text-conversion-style
-             (bound-and-true-p overriding-text-conversion-style))
+  (when (and (bound-and-true-p text-conversion-style)
+             (bound-and-true-p overriding-text-conversion-style)
+             ;; Somehow the above does not silence the compiler.
+             (boundp 'overriding-text-conversion-style))
     (letrec ((suspended overriding-text-conversion-style)
              (fn (lambda ()
                    (setq overriding-text-conversion-style nil)

From 92788f3be43b43f82876b9d0e263d5e55d00ec0e Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Fri, 1 May 2026 22:06:03 +0200
Subject: [PATCH 298/463] Update to Transient v0.13.2-10-gf7894ca4

---
 doc/misc/transient.texi | 4 ++--
 lisp/transient.el       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/misc/transient.texi b/doc/misc/transient.texi
index 35544b2917c..f454d81c63e 100644
--- a/doc/misc/transient.texi
+++ b/doc/misc/transient.texi
@@ -31,7 +31,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Transient User and Developer Manual
-@subtitle for version 0.13.1
+@subtitle for version 0.13.2
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
@@ -53,7 +53,7 @@ resource to get over that hurdle is Psionic K's interactive tutorial,
 available at @uref{https://github.com/positron-solutions/transient-showcase}.
 
 @noindent
-This manual is for Transient version 0.13.1.
+This manual is for Transient version 0.13.2.
 
 @insertcopying
 @end ifnottex
diff --git a/lisp/transient.el b/lisp/transient.el
index ae49a38579d..20b61d0f4c3 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -5,7 +5,7 @@
 ;; Author: Jonas Bernoulli <jonas@bernoul.li>
 ;; URL: https://github.com/magit/transient
 ;; Keywords: extensions
-;; Version: 0.13.1
+;; Version: 0.13.2
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -39,7 +39,7 @@
 ;;; Code:
 ;;;; Frontmatter
 
-(defconst transient-version "v0.13.1-10-gc168d396-builtin")
+(defconst transient-version "v0.13.2-10-gf7894ca4-builtin")
 
 (require 'cl-lib)
 (require 'eieio)

From 0179e3e062b9287bc5b9812e4be0cbe7eac49ac0 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 1 May 2026 17:59:14 -0700
Subject: [PATCH 299/463] Work around GCC bug 125116

* configure.ac: When configured with --enable-gcc-warnings,
use the -Wno-analyzer-allocation-size option if available.
This works around a false positive bug in
GCC 16.0.1 20260321 (Red Hat 16.0.1-0) x86-64; see
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=125116>.
---
 configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index a3ba5e69a2f..eeaaaa53a3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1790,7 +1790,9 @@ AS_IF([test $gl_gcc_warnings = no],
        ;;
   esac
   AS_IF([test $gl_gcc_warnings = yes],
-    [WERROR_CFLAGS=-Werror],
+    [WERROR_CFLAGS=-Werror
+     # Work around GCC bug 125116.
+     gl_WARN_ADD([-Wno-analyzer-allocation-size])],
     [# Use -fanalyzer and related options only if --enable-gcc-warnings,
      # as they slow GCC considerably.
      nw="$nw -fanalyzer -Wno-analyzer-double-free -Wno-analyzer-malloc-leak"

From 1b14d6f92b1b8a692ae4654699abeee03fc6b289 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 2 May 2026 10:03:53 +0300
Subject: [PATCH 300/463] * src/.gdbinit: Ignore SIGPIPE.  (Bug#80911)

---
 src/.gdbinit | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/.gdbinit b/src/.gdbinit
index f9ecb2cef5a..a82fedf3027 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -41,15 +41,13 @@ handle SIGTSTP nopass
 handle SIGUSR1 noprint pass
 handle SIGUSR2 noprint pass
 
+# Similarly with SIGPIPE (happens, e.g., with GnuTLS).
+handle SIGPIPE nostop noprint pass
+
 # Don't pass SIGALRM to Emacs.  This makes problems when
 # debugging.
 handle SIGALRM ignore
 
-# On selection send failed.
-if defined_HAVE_PGTK
-  handle SIGPIPE nostop noprint
-end
-
 # Helper command to get the pointer to the C struct that holds the data
 # of a Lisp object given as argument, by removing the GC and type-tag bits.
 # Stores the result in $ptr.

From 17f9f0c97d342305b4d97f9b11892def97c751e9 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Fri, 1 May 2026 19:19:25 +0200
Subject: [PATCH 301/463] * etc/themes/newcomers-presets-theme.el: Fix checkdoc
 issue

---
 etc/themes/newcomers-presets-theme.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/themes/newcomers-presets-theme.el b/etc/themes/newcomers-presets-theme.el
index 2c69f26da4c..2163631324e 100644
--- a/etc/themes/newcomers-presets-theme.el
+++ b/etc/themes/newcomers-presets-theme.el
@@ -19,7 +19,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
-;;; Commentary
+;;; Commentary:
 
 ;; This theme configures user options that we can reasonably expect the
 ;; average, new user to want to enable, but would otherwise be unlikely

From 87da929eb50c614a5e1c4e8cba5279b8b1d5c04c Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sat, 2 May 2026 10:03:33 +0200
Subject: [PATCH 302/463] Don't break line when inserting <code> tags

* lisp/textmodes/sgml-mode.el (html-tag-alist): Remove '\n' from
the completion rules for "code" tag.  (Bug#80771)
---
 lisp/textmodes/sgml-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 2170fcea6e9..42aa1ed4d3b 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -2034,7 +2034,7 @@ This takes effect when first loading the library.")
       ("caption" ("valign" ("top") ("bottom")))
       ("center" \n)
       ("cite")
-      ("code" \n)
+      ("code")
       ("datalist" \n)
       ("dd" ,(not sgml-xml-mode))
       ("del" nil ("cite") ("datetime"))

From cb21b7d71f4ef0f5df160c5fabdb9622416283e2 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sat, 2 May 2026 10:24:10 +0200
Subject: [PATCH 303/463] Mark myself as maintainer of sgml-mode

* admin/MAINTAINERS: Update my entry.
* lisp/textmodes/sgml-mode.el: Update "Maintainer" header.
---
 admin/MAINTAINERS           | 1 +
 lisp/textmodes/sgml-mode.el | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index 41bc780d1cc..3ffa21c0d45 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -235,6 +235,7 @@ Philip Kaludercic
        lisp/emacs-lisp/package.el
        lisp/emacs-lisp/package-vc.el
        lisp/emacs-lisp/compat.el
+       lisp/textmodes/sgml-mode.el
 
 Yuan Fu
        src/treesit.c
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 42aa1ed4d3b..c95386c16ac 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -4,7 +4,7 @@
 ;; Foundation, Inc.
 
 ;; Author: James Clark <jjc@jclark.com>
-;; Maintainer: emacs-devel@gnu.org
+;; Maintainer: Philip Kaludercic <philipk@posteo.net>
 ;; Adapted-By: ESR, Daniel Pfeiffer <occitan@esperanto.org>,
 ;;             F.Potorti@cnuce.cnr.it
 ;; Keywords: text, hypermedia, comm, languages

From 4795e83a69484de276c1e2b0b2d9a04525d9b05c Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Fri, 1 May 2026 11:33:41 +0100
Subject: [PATCH 304/463] Project prompters always default to current project,
 if any

* lisp/progmodes/project.el (project-prompter)
(project-prompt-project-dir, project-prompt-project-name):
Delete ALLOW-EMPTY parameter.  Default to the current project if
there is one.
* lisp/vc/vc.el (project-root): Declare.
(vc--prompt-other-working-tree): Replace ALLOW-EMPTY parameter
with new ALLOW-CURRENT parameter.
(vc-working-tree-switch-project): Allow selecting the current
working tree, for symmetry with project-switch-project.
* etc/NEWS: Update.
---
 etc/NEWS                  |   5 +-
 lisp/progmodes/project.el | 108 ++++++++++++++++++++------------------
 lisp/vc/vc.el             |  40 +++++++-------
 3 files changed, 80 insertions(+), 73 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 8f266f2d670..f195e0a9b51 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -976,11 +976,10 @@ It is equivalent to running 'project-any-command' with
 The prompt now displays the chosen project on which to invoke a command.
 
 ---
-*** 'project-prompter' values may be called with up to four arguments.
+*** 'project-prompter' values may be called with up to three arguments.
 These allow callers of the value of 'project-prompter' to specify a
 prompt string; prompt the user to choose between a subset of all the
-known projects; disallow returning arbitrary directories; and allow
-returning an empty string.
+known projects; and disallow returning arbitrary directories.
 See the docstring of 'project-prompter' for a full specification of
 these new optional arguments.
 
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 9a9dc6df186..7e794330b1f 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -212,8 +212,8 @@ When it is non-nil, `project-current' will always skip prompting too.")
 
 (defcustom project-prompter #'project-prompt-project-dir
   "Function to call to prompt for a project.
-The function is called either with no arguments or with up to four
-optional arguments: (&optional PROMPT PREDICATE REQUIRE-KNOWN ALLOW-EMPTY).
+The function is called either with no arguments or with up to three
+optional arguments: (&optional PROMPT PREDICATE REQUIRE-KNOWN).
 
 PROMPT is the prompt string to use.
 
@@ -231,12 +231,14 @@ may allow the user to input arbitrary directories.  If PREDICATE and
 REQUIRE-KNOWN are both non-nil, the value of `project-prompter' should
 not return any project root directory for which PREDICATE returns nil.
 
-If ALLOW-EMPTY is non-nil, then irrespective of REQUIRE-KNOWN, the user
-may enter nothing (i.e., just type RET).
-In this case the function should return \"\".  Conventionally this is
-used to allow the user to select the current project.
-Callers should append something like \" (empty for current project)\" to
-PROMPT when passing ALLOW-EMPTY non-nil."
+The function must always return a valid project.
+
+If there is a current project, it satisfies PREDICATE (or PREDICATE is
+nil), and the method of prompting involves a default selection, then
+this default selection should be the current project root.  For example
+if the function uses `completing-read' then the current project, if any,
+should be passed as the DEF argument to `completing-read', and returned
+in the case that the user replies with empty input."
   :type '(choice (const :tag "Prompt for a project directory"
                         project-prompt-project-dir)
                  (const :tag "Prompt for a project name"
@@ -1416,7 +1418,7 @@ directories listed in `vc-directory-exclusion-list'."
                 project "Find file"
                 all-files nil 'file-name-history
                 suggested-filename)))
-    (if (string= file "")
+    (if (string-empty-p file)
         (user-error "You didn't specify the file")
       (find-file file))))
 
@@ -1845,7 +1847,7 @@ Return non-nil if PROJECT is not a remote project."
       '(metadata . ((category . project-buffer)
                     (cycle-sort-function . identity))))
      ((and (eq action t)
-           (equal string ""))           ;Pcm completion or empty prefix.
+           (string-empty-p string))     ;Pcm completion or empty prefix.
       (let* ((all (complete-with-action action buffers string pred))
              (non-internal (cl-remove-if (lambda (b) (= (aref b 0) ?\s)) all)))
         (if (null non-internal)
@@ -2311,8 +2313,7 @@ the project list."
 
 (defvar project--dir-history)
 
-(defun project-prompt-project-dir
-    (&optional prompt predicate require-known allow-empty)
+(defun project-prompt-project-dir (&optional prompt predicate require-known)
   "Prompt the user for a directory that is one of the known project roots.
 The project is chosen among projects known from the project list,
 see `project-list-file'.
@@ -2320,13 +2321,17 @@ If PROMPT is non-nil, use it as the prompt string.
 If PREDICATE is non-nil, filter possible project choices using this
 function; see `project-prompter' for more details.
 Unless REQUIRE-KNOWN is non-nil, it's also possible to enter an
-arbitrary directory not in the list of known projects.
-If ALLOW-EMPTY is non-nil, it is possible to exit with no input."
+arbitrary directory not in the list of known projects."
   (project--ensure-read-project-list)
   (when-let* ((pred (alist-get 'prompt project-prune-zombie-projects))
               (inhibit-message t))
     (project--delete-zombie-projects pred))
   (let* ((dir-choice "... (choose a dir)")
+         (current (and-let* ((p (project-current))
+                             (_ (or (null predicate)
+                                    (funcall predicate
+                                             (project-root p)))))
+                    (project-root p)))
          (choices
           ;; XXX: Just using this for the category (for the substring
           ;; completion style).
@@ -2334,30 +2339,29 @@ If ALLOW-EMPTY is non-nil, it is possible to exit with no input."
            (if require-known project--list
              (append project--list `(,dir-choice)))))
          (project--dir-history (project-known-project-roots))
-         pr-dir)
-    (cl-loop
-     do (setq pr-dir
-              (let (history-add-new-input)
-                (completing-read (if prompt
-                                     ;; TODO: Use `format-prompt' (Emacs 28.1+)
-                                     (format "%s: " (substitute-command-keys prompt))
-                                   "Select project: ")
-                                 choices
-                                 (and predicate
-                                      (lambda (choice)
-                                        (or (equal choice dir-choice)
-                                            (funcall predicate choice))))
-                                 t nil 'project--dir-history)))
-     ;; If the user simply pressed RET, do this again until they don't.
-     while (and (not allow-empty) (equal pr-dir "")))
+         (pr-dir ""))
+    (while (string-empty-p pr-dir)
+      ;; If the user simply pressed RET (and CURRENT is nil), do this
+      ;; again until they don't.
+      (setq pr-dir
+            (let (history-add-new-input)
+              (completing-read
+               ;; Emacs 28.1+: Use `format-prompt'.
+               (cond (prompt (format "%s: " prompt))
+                     (current "Select project (default current project): ")
+                     (t "Select project: "))
+               choices (and predicate
+                            (lambda (choice)
+                              (or (equal choice dir-choice)
+                                  (funcall predicate choice))))
+               t nil 'project--dir-history current))))
     (if (equal pr-dir dir-choice)
         (read-directory-name "Select directory: " default-directory nil t)
       pr-dir)))
 
 (defvar project--name-history)
 
-(defun project-prompt-project-name
-    (&optional prompt predicate require-known allow-empty)
+(defun project-prompt-project-name (&optional prompt predicate require-known)
   "Prompt the user for a project, by name, that is one of the known project roots.
 The project is chosen among projects known from the project list,
 see `project-list-file'.
@@ -2365,13 +2369,17 @@ If PROMPT is non-nil, use it as the prompt string.
 If PREDICATE is non-nil, filter possible project choices using this
 function; see `project-prompter' for more details.
 Unless REQUIRE-KNOWN is non-nil, it's also possible to enter an
-arbitrary directory not in the list of known projects.
-If ALLOW-EMPTY is non-nil, it is possible to exit with no input."
+arbitrary directory not in the list of known projects."
   (when-let* ((pred (alist-get 'prompt project-prune-zombie-projects))
               (inhibit-message t))
     (project--delete-zombie-projects pred))
   (let* ((dir-choice "... (choose a dir)")
          project--name-history
+         (current (and-let* ((p (project-current))
+                             (_ (or (null predicate)
+                                    (funcall predicate
+                                             (project-root p)))))
+                    (project-name p)))
          (choices
           (let (ret)
             ;; Iterate in reverse order so project--name-history is in
@@ -2390,22 +2398,22 @@ If ALLOW-EMPTY is non-nil, it is possible to exit with no input."
          (table (project--file-completion-table
                  (reverse (if require-known choices
                             (cons dir-choice choices)))))
-         pr-name)
-    (cl-loop
-     do (setq pr-name
-              (let (history-add-new-input)
-                (completing-read (if prompt
-                                     (format "%s: " prompt)
-                                   "Select project: ")
-                                 table nil t nil 'project--name-history)))
-     ;; If the user simply pressed RET, do this again until they don't.
-     while (and (not allow-empty) (equal pr-name "")))
-    (pcase pr-name
-      ("" "")
-      ((pred (equal dir-choice)) (read-directory-name "Select directory: "
-                                                      default-directory nil t))
-      (_ (let ((proj (assoc pr-name choices)))
-           (if (stringp proj) proj (project-root (cdr proj))))))))
+         (pr-name ""))
+    (while (string-empty-p pr-name)
+      ;; If the user simply pressed RET (and CURRENT is nil), do this
+      ;; again until they don't.
+      (setq pr-name
+            (let (history-add-new-input)
+              (completing-read
+               ;; Emacs 28.1+: Use `format-prompt'.
+               (cond (prompt (format "%s: " prompt))
+                     (current "Select project (default current project): ")
+                     (t "Select project: "))
+               table nil t nil 'project--name-history current))))
+    (if (equal pr-name dir-choice)
+        (read-directory-name "Select directory: " default-directory nil t)
+      (let ((proj (assoc pr-name choices)))
+        (if (stringp proj) proj (project-root (cdr proj)))))))
 
 ;;;###autoload
 (defun project-known-project-roots ()
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 3d8c4bf4f1c..303926b8159 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -5732,15 +5732,14 @@ When called from Lisp, BACKEND is the VC backend."
   (dired directory))
 
 (defvar project-prompter)
+(declare-function project-root "project")
 
-(defun vc--prompt-other-working-tree (backend prompt &optional allow-empty)
+(defun vc--prompt-other-working-tree (backend prompt &optional allow-current)
   "Invoke `project-prompter' to choose another working tree.
 BACKEND is the VC backend.
 PROMPT is the prompt string for `project-prompter'.
-If ALLOW-EMPTY is non-nil, empty input means the current working tree.
-In typical usage ALLOW-EMPTY non-nil means that it makes sense to apply
-the caller's operation to the current working tree."
-  ;; If there are no other working trees and ALLOW-EMPTY is non-nil, we
+If ALLOW-CURRENT is non-nil, allow selecting the current working tree."
+  ;; If there are no other working trees and ALLOW-CURRENT is non-nil we
   ;; still invoke the `project-prompter' and require the user to type
   ;; \\`RET', even though it's redundant.  Doing it this way means that
   ;; invoking the command on the current working tree works the same
@@ -5752,25 +5751,25 @@ the caller's operation to the current working tree."
   ;; stopping to look at the echo area.
   (let ((trees (vc-call-backend backend 'known-other-working-trees))
         res)
-    (unless (or trees allow-empty)
-      (user-error
-       (substitute-command-keys
-        "No other working trees.  Use \\[vc-add-working-tree] to add one")))
     (require 'project)
+    (cond* ((bind-and* (_ allow-current)
+                       (p (project-current)))
+            (push (project-root p) trees))
+           ((null trees)
+            (user-error
+             (substitute-command-keys
+              "No other working trees.  Use \\[vc-add-working-tree] to add one"))))
     (dolist (tree trees)
       (when-let* ((p (project-current nil tree)))
         (project-remember-project p nil t)))
     (setq res
           (funcall project-prompter
-                   (if allow-empty
-                       (format "%s (empty for this working tree)"
-                               prompt)
+                   (if allow-current
+                       (concat prompt " (default current working tree)")
                      prompt)
-                   (if trees
-                       (lambda (k &optional _v)
-                         (member (or (car-safe k) k) trees))
-                     #'ignore)
-                   t allow-empty))
+                   (lambda (k &optional _v)
+                     (member (or (car-safe k) k) trees))
+                   'require-known))
     (if (string-empty-p res) (vc-root-dir) res)))
 
 (defvar project-current-directory-override)
@@ -5801,7 +5800,8 @@ Prompts for the directory file name of the other working tree."
   (interactive
    (list
     (vc--prompt-other-working-tree (vc-responsible-backend default-directory)
-                                   "Other working tree to switch to")))
+                                   "Other working tree to switch to"
+                                   'allow-current)))
   (project-switch-project dir))
 
 ;;;###autoload
@@ -5814,7 +5814,7 @@ BACKEND is the VC backend."
    (let ((backend (vc-responsible-backend default-directory)))
      (list backend
            (vc--prompt-other-working-tree backend "Delete working tree"
-                                          'allow-empty))))
+                                          'allow-current))))
   (let* ((delete-this (file-in-directory-p default-directory directory))
          (directory (expand-file-name directory))
          (default-directory
@@ -5860,7 +5860,7 @@ BACKEND is the VC backend."
    (let ((backend (vc-responsible-backend default-directory)))
      (list backend
            (vc--prompt-other-working-tree backend "Relocate working tree"
-                                          'allow-empty)
+                                          'allow-current)
            (read-directory-name "New location for working tree: "
                                 (file-name-parent-directory (vc-root-dir))))))
   (let* ((move-this (file-in-directory-p default-directory from))

From 2207a588997c3ccd15ad51cf41c4bbdd8b73191f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Sat, 2 May 2026 09:53:20 +0100
Subject: [PATCH 305/463] Eglot: find well behaved UTF char for code actions
 (bug#80326)

* lisp/progmodes/eglot.el (eglot-code-action-indicator): No lighbulb, no
fancy lightning bolt, just use zigzags which seem to display well on
typical fonts and typically have a width of 1.
---
 lisp/progmodes/eglot.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 13d578d550a..b41fd3d2212 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -625,12 +625,12 @@ Note additionally:
   :package-version '(Eglot . "1.19"))
 
 (defcustom eglot-code-action-indicator
-  (cl-loop for c in '(?💡 ?⚡?✓ ?α ??)
+  (cl-loop for c in '(?↯ ?⭍ ?✓ ?α ??)
            when (char-displayable-p c)
            return (make-string 1 c))
   "Indicator string for code action suggestions."
   :type (let ((basic-choices
-               (cl-loop for c in '(?💡 ?⚡?✓ ?α ??)
+               (cl-loop for c in '(?↯ ?⭍ ?✓ ?α ??)
                         when (char-displayable-p c)
                         collect `(const :tag ,(format "Use `%c'" c)
                                         ,(make-string 1 c)))))

From e575817e8feffd3db3b4fe953e0cc8640481acd1 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 2 May 2026 12:35:48 +0300
Subject: [PATCH 306/463] ; Improve documentation of Emacs server-client
 protocol

* lib-src/emacsclient.c (main):
* lisp/server.el (server-process-filter): Document the protocol
requirements regarding the terminating newline.  (Bug#80807)
---
 lib-src/emacsclient.c | 14 +++++++++++---
 lisp/server.el        |  4 +++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 134c2217650..0769c94a89d 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -2257,6 +2257,11 @@ main (int argc, char **argv)
       char *p = recv_buf;
       for (char *end_p = p; end_p < recv_buf + nrecv; p = end_p)
 	{
+	  /* An unquoted newline ends a server command.  Keep reading,
+             possibly growing the buffer, until a buffer with a newline
+             is received.  This handles commands with arbitrary-long
+             arguments (actually needed in 'print' and 'error' commands,
+             which are followed by strings).  */
 	  end_p = memchr (p, '\n', recv_buf + nrecv - p);
 	  if (!end_p)
 	    break;
@@ -2288,7 +2293,8 @@ main (int argc, char **argv)
             }
           else if (strprefix ("-print ", p))
             {
-              /* -print STRING: Print STRING on the terminal. */
+              /* -print STRING: Print STRING, preceeded by a newline, on
+                  the terminal. */
 	      if (!suppress_output)
 		{
 		  char *str = unquote_argument (p + strlen ("-print "));
@@ -2299,8 +2305,10 @@ main (int argc, char **argv)
 	    }
           else if (strprefix ("-print-nonl ", p))
             {
-              /* -print-nonl STRING: Print STRING on the terminal.
-                 Used to continue a preceding -print command.  */
+              /* -print-nonl STRING: Print STRING on the terminal
+                 without a preceding newlin.  Used to continue a
+                 preceding -print command.  Nowadays used only for
+                 servers in Emacs versions before 31.  */
 	      if (!suppress_output)
 		{
 		  char *str = unquote_argument (p + strlen ("-print-nonl "));
diff --git a/lisp/server.el b/lisp/server.el
index c2aa854a4bb..b912b185275 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1143,7 +1143,9 @@ The following commands are accepted by the client:
 `-print-nonl STRING'
   Print STRING on stdout.  Used to continue a
   preceding -print command that would be too big to send
-  in a single message.
+  in a single message.  Unused in the server since Emacs 31;
+  mentioned here only for completeness, because the client
+  needs to support it when it connects to older Emacsen.
 
 `-error DESCRIPTION'
   Signal an error and delete process PROC.

From 25659d5a75e837bdd2197b11fac1d02969a7da06 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 2 May 2026 13:10:33 +0300
Subject: [PATCH 307/463] ; * lisp/emacs-lisp/pcase.el (pcase-exhaustive): Doc
 fix.

---
 lisp/emacs-lisp/pcase.el | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index 6126679e870..166b346fbbe 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -228,10 +228,9 @@ Emacs Lisp manual for more information and examples."
 ;;;###autoload
 (defmacro pcase-exhaustive (exp &rest cases)
   "The exhaustive version of `pcase' (which see).
-If EXP fails to match any of the patterns in CASES, an error is
-signaled.
+If EXP fails to match any of the patterns in CASES, signal an error.
 
-In contrast, `pcase' will return nil if there is no match, but
+In contrast, `pcase' will return nil if there is no match, but will
 not signal an error."
   (declare (indent 1) (debug pcase))
   (let* ((x (gensym "x"))

From 0d0891c1bb8a6cb29f26c243afd6edaf1d94092a Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 2 May 2026 13:26:46 +0300
Subject: [PATCH 308/463] ; Fix an issue with counting glyphs on TTY frames

* src/dispnew.c (fake_current_matrices): Fix the 'used' count of
glyphs for the right margin and the text-area.  (Bug#80900)
---
 src/dispnew.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/dispnew.c b/src/dispnew.c
index 736647408cb..284a0eb175f 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1937,6 +1937,11 @@ fake_current_matrices (Lisp_Object window)
 		{
 		  r->used[LEFT_MARGIN_AREA] = m->left_margin_glyphs;
 		  r->used[RIGHT_MARGIN_AREA] = m->right_margin_glyphs;
+		  /* Non-rightmost windows have the border glyph at the
+		     end of the right margin, if any, in addition to the
+		     glyphs reserved for the margin itself.  */
+		  if (m->right_margin_glyphs > 0 && !WINDOW_RIGHTMOST_P (w))
+		    r->used[RIGHT_MARGIN_AREA]++;
 		  r->used[TEXT_AREA] = (m->matrix_w
 					- r->used[LEFT_MARGIN_AREA]
 					- r->used[RIGHT_MARGIN_AREA]);

From d51a4722316efe0960994d371e1859099894d1ca Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 2 May 2026 14:17:14 +0300
Subject: [PATCH 309/463] ; * src/sfnt.c (sfnt_read_name_table): Avoid 32-bit
 overflow.

---
 src/sfnt.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/sfnt.c b/src/sfnt.c
index d9cf1fa1213..f778179a5ff 100644
--- a/src/sfnt.c
+++ b/src/sfnt.c
@@ -5792,6 +5792,10 @@ sfnt_read_name_table (int fd, struct sfnt_offset_subtable *subtable)
   if (directory->length < required)
     return NULL;
 
+  /* Avoid overflow in xmalloc argument below.  */
+  if (directory->length > UINT_MAX - sizeof *name)
+    return NULL;
+
   /* Allocate enough to hold the name table and variable length
      data.  */
   name = xmalloc (sizeof *name + directory->length);

From b376c405aa8d0bec62e38b0dd526b6db31c2e350 Mon Sep 17 00:00:00 2001
From: Chris Roberts <git@chobert.org>
Date: Fri, 1 May 2026 15:23:27 +0200
Subject: [PATCH 310/463] ; Add a test for sqlite-close

* test/src/sqlite-tests.el (sqlite-closed-db): Add test.
(Bug#80908)

Copyright-paperwork-exempt: yes
---
 test/src/sqlite-tests.el | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/src/sqlite-tests.el b/test/src/sqlite-tests.el
index a9fab7da681..bcd80124dfd 100644
--- a/test/src/sqlite-tests.el
+++ b/test/src/sqlite-tests.el
@@ -185,6 +185,14 @@
     (sqlite-close db)
     (should-error (sqlite-select db "select * from test6"))))
 
+(ert-deftest sqlite-closed-db ()
+  "Verify that `sqlite-close' on a closed database is a no-op."
+  (skip-unless (sqlite-available-p))
+  (let (db)
+    (setq db (sqlite-open))
+    (should (eq (sqlite-close db)
+                (sqlite-close db)))))
+
 (ert-deftest sqlite-load-extension ()
   (skip-unless (sqlite-available-p))
   (skip-unless (fboundp 'sqlite-load-extension))

From 939e5956d98e8fa5aae974a5bb17d9cf0488f06d Mon Sep 17 00:00:00 2001
From: Eshel Yaron <me@eshelyaron.com>
Date: Sat, 2 May 2026 13:28:05 +0200
Subject: [PATCH 311/463] Demote 'completion-preview-is-calling'

See discussion at
https://yhetil.org/emacs/87pl3egzww.fsf@mail.eshelyaron.com/

* lisp/completion-preview.el (completion-preview-is-calling):
Rename to...
(completion-preview--is-calling): ...this.
(completion-preview--capf-wrapper): Update accordingly.
* etc/NEWS: Remove announcement.
---
 etc/NEWS                   |  5 -----
 lisp/completion-preview.el | 12 +++---------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index f195e0a9b51..dd9db73285c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -4488,11 +4488,6 @@ the minibuffer, instead of waiting with 'sit-for' and then clearing it.
 This makes 'minibuffer-message' usable in Lisp programs which want to
 print a message and then continue to perform work.
 
----
-** New variable 'completion-preview-is-calling'.
-Completion functions (in 'completion-at-point-functions') can check this
-variable to tell if they are being called by Completion Preview mode.
-
 ** Special Events
 
 +++
diff --git a/lisp/completion-preview.el b/lisp/completion-preview.el
index 907068fdb67..9ff726f3707 100644
--- a/lisp/completion-preview.el
+++ b/lisp/completion-preview.el
@@ -523,19 +523,13 @@ candidates or if there are multiple matching completions and
             (setq sorted (cdr sorted)))
           (list (substring string 0 base) common suffixes))))))
 
-(defvar completion-preview-is-calling nil
-  "Non-nil while Completion Preview mode is calling a completion function.
-
-Completion functions (in `completion-at-point-functions') can check this
-variable and adjust their behavior for completion preview.
-For example, a completion function can skip calculating annotations for
-candidates it produces for display in the completion preview, which does
-not make use of such annotations.")
+(defvar completion-preview--is-calling nil
+  "Non-nil while Completion Preview mode is calling a completion function.")
 
 (defun completion-preview--capf-wrapper (capf)
   "Translate return value of CAPF to properties for completion preview overlay."
   (let ((res (ignore-errors
-               (let ((completion-preview-is-calling t))
+               (let ((completion-preview--is-calling t))
                  (funcall capf)))))
     (and (consp res)
          (not (functionp res))

From e420725935836298f0083c2a83e2c4fa3f0b4375 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 2 May 2026 14:34:59 +0300
Subject: [PATCH 312/463] ; * lisp/emacs-lisp/subr-x.el (work-buffer--release):
 Autoload (bug#80947).

---
 lisp/emacs-lisp/subr-x.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index be86051ff2f..d5a39b77c2e 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -322,6 +322,7 @@ automatically killed, which means that in a such case
         buffer
       (generate-new-buffer " *work*" t))))
 
+;;;###autoload
 (defun work-buffer--release (buffer)
   "Release work BUFFER."
   (if (buffer-live-p buffer)

From e05fab5775c96f8f88eab8d75dea40253bfb78eb Mon Sep 17 00:00:00 2001
From: Stephen Berman <stephen.berman@gmx.net>
Date: Sat, 2 May 2026 15:11:37 +0200
Subject: [PATCH 313/463] Fix 'vc-dir-resynch-file' (bug#80803)

* lisp/vc/vc-dir.el (vc-dir-resynch-file): Apply 'file-truename'
instead of 'expand-file-name' to FNAME argument to prevent
spurious display of symlinked files in *vc-dir* buffer.
---
 lisp/vc/vc-dir.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 580539b6706..21658312a13 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -1305,7 +1305,7 @@ that file."
 
 (defun vc-dir-resynch-file (&optional fname)
   "Update the entries for FNAME in any directory buffers that list it."
-  (let ((file (expand-file-name (or fname buffer-file-name)))
+  (let ((file (file-truename (or fname buffer-file-name)))
         (drop '()))
     (save-current-buffer
       ;; look for a vc-dir buffer that might show this file.

From 7c708160668340c6b095a29f65f168adcb95d0b7 Mon Sep 17 00:00:00 2001
From: Eshel Yaron <me@eshelyaron.com>
Date: Sat, 2 May 2026 21:43:24 +0200
Subject: [PATCH 314/463] Remove 'completion-preview--is-calling'

We decided to leave it out for now, see discussion at
https://yhetil.org/emacs/jwvqzntzvvg.fsf-monnier+emacs@gnu.org/
This brings completion-preview.el back to how it were before
commit a24ff52a79b.

* lisp/completion-preview.el (completion-preview--is-calling):
Delete.
(completion-preview--capf-wrapper): Adapt.
---
 lisp/completion-preview.el | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lisp/completion-preview.el b/lisp/completion-preview.el
index 9ff726f3707..ff348ebf9af 100644
--- a/lisp/completion-preview.el
+++ b/lisp/completion-preview.el
@@ -523,14 +523,9 @@ candidates or if there are multiple matching completions and
             (setq sorted (cdr sorted)))
           (list (substring string 0 base) common suffixes))))))
 
-(defvar completion-preview--is-calling nil
-  "Non-nil while Completion Preview mode is calling a completion function.")
-
 (defun completion-preview--capf-wrapper (capf)
   "Translate return value of CAPF to properties for completion preview overlay."
-  (let ((res (ignore-errors
-               (let ((completion-preview--is-calling t))
-                 (funcall capf)))))
+  (let ((res (ignore-errors (funcall capf))))
     (and (consp res)
          (not (functionp res))
          (seq-let (beg end table &rest plist) res

From d0f72ef864920a7f5029bf36c20403dae78cc099 Mon Sep 17 00:00:00 2001
From: Manuel Giraud <manuel@ledu-giraud.fr>
Date: Mon, 20 Apr 2026 14:21:51 +0200
Subject: [PATCH 315/463] Gnus logo in server buffer's mode line (bug#80850)

* lisp/gnus/gnus-srvr.el (gnus-server-mode): Initialize needed
format specifications and call 'gnus-set-mode-line' for the
server buffer.
* lisp/gnus/gnus-sum.el (gnus-set-mode-line): Handle when WHERE
is set to 'server.
* lisp/gnus/gnus.el (gnus-updated-mode-lines): Add server.
---
 lisp/gnus/gnus-srvr.el |  3 +++
 lisp/gnus/gnus-sum.el  | 13 ++++++++-----
 lisp/gnus/gnus.el      |  5 +++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index 312862df165..b4802cb72d4 100644
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -31,6 +31,7 @@
 (require 'gnus-int)
 (require 'gnus-range)
 (require 'gnus-cloud)
+(require 'gnus-sum)
 
 (autoload 'gnus-group-read-ephemeral-search-group "nnselect")
 
@@ -250,6 +251,8 @@ The following commands are available:
 \\{gnus-server-mode-map}"
   (when (gnus-visual-p 'server-menu 'menu)
     (gnus-server-make-menu-bar))
+  (gnus-update-format-specifications nil 'server 'server-mode)
+  (gnus-set-mode-line 'server)
   (gnus-simplify-mode-line)
   (gnus-set-default-directory)
   (setq mode-line-process nil)
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 0fdb97d496c..cf635db0f02 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -6161,16 +6161,19 @@ If WHERE is `summary', the summary mode line format will be used."
 	     (symbol-value
 	      (intern (format "gnus-%s-mode-line-format-spec" where))))
     (let (mode-string)
-      ;; We evaluate this in the summary buffer since these
-      ;; variables are buffer-local to that buffer.
-      (with-current-buffer gnus-summary-buffer
+      ;; We evaluate this in the summary or server buffer (depending on
+      ;; WHERE) since these variables are buffer-local to these buffers.
+      (with-current-buffer (if (eq where 'server)
+                               gnus-server-buffer
+                             gnus-summary-buffer)
         ;; We bind all these variables that are used in the `eval' form
 	;; below.
 	(let* ((mformat (symbol-value
 			 (intern
 			  (format "gnus-%s-mode-line-format-spec" where))))
-	       (gnus-tmp-group-name (gnus-mode-string-quote
-				     gnus-newsgroup-name))
+	       (gnus-tmp-group-name (and gnus-newsgroup-name
+                                         (gnus-mode-string-quote
+				          gnus-newsgroup-name)))
 	       (gnus-tmp-article-number (or gnus-current-article 0))
 	       (gnus-tmp-unread gnus-newsgroup-unreads)
 	       (gnus-tmp-unread-and-unticked (length gnus-newsgroup-unreads))
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index b6c307f9037..bcc8b8744f8 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1420,7 +1420,7 @@ this variable.  I think."
 
 (gnus-redefine-select-method-widget)
 
-(defcustom gnus-updated-mode-lines '(group article summary tree)
+(defcustom gnus-updated-mode-lines '(group article summary tree server)
   "List of buffers that should update their mode lines.
 The list may contain the symbols `group', `article', `tree' and
 `summary'.  If the corresponding symbol is present, Gnus will keep
@@ -1430,7 +1430,8 @@ If this variable is nil, screen refresh may be quicker."
   :type '(set (const group)
 	      (const article)
 	      (const summary)
-	      (const tree)))
+	      (const tree)
+              (const server)))
 
 (defcustom gnus-mode-non-string-length 30
   "Max length of mode-line non-string contents.

From 963d2ebffbfc7ead85c24b6df119846cdfba10ac Mon Sep 17 00:00:00 2001
From: Matto Fransen <matto@matto.nl>
Date: Sun, 3 May 2026 12:06:54 +0100
Subject: [PATCH 316/463] ; * doc/lispintro/emacs-lisp-intro.texi: Update
 *Backtrace* outputs.

Copyright-paperwork-exempt: yes
---
 doc/lispintro/emacs-lisp-intro.texi | 61 ++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 22 deletions(-)

diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 85aa8107232..fc1da41af8b 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -1366,8 +1366,11 @@ following in it:
 ---------- Buffer: *Backtrace* ----------
 Debugger entered--Lisp error: (void-function this)
   (this is an unquoted list)
-  eval((this is an unquoted list) nil)
+  (progn (this is an unquoted list))
+  eval((progn (this is an unquoted list)) t)
   elisp--eval-last-sexp(nil)
+  #f(compiled-function () #<bytecode ...>)()
+  handler-bind-1(#f(compiled-function () #<bytecode ...>) (error) eval-expression--debug)
   eval-last-sexp(nil)
   funcall-interactively(eval-last-sexp nil)
   call-interactively(eval-last-sexp nil nil)
@@ -1807,6 +1810,8 @@ Debugger entered--Lisp error: (void-function fill-column)
   (fill-column)
   eval((fill-column) nil)
   elisp--eval-last-sexp(nil)
+  #f(compiled-function () #<bytecode ...>)()
+  handler-bind-1(#f(compiled-function () #<bytecode ...>) (error) eval-expression--debug)
   eval-last-sexp(nil)
   funcall-interactively(eval-last-sexp nil)
   call-interactively(eval-last-sexp nil nil)
@@ -1843,8 +1848,10 @@ says:
 @group
 ---------- Buffer: *Backtrace* ----------
 Debugger entered--Lisp error: (void-variable +)
-  eval(+)
+  eval(+ nil)
   elisp--eval-last-sexp(nil)
+  #f(compiled-function () #<bytecode ...>)()
+  handler-bind-1(#f(compiled-function () #<bytecode ...>) (error) eval-expression--debug)
   eval-last-sexp(nil)
   funcall-interactively(eval-last-sexp nil)
   call-interactively(eval-last-sexp nil nil)
@@ -2099,15 +2106,16 @@ You will create and enter a @file{*Backtrace*} buffer that says:
 @smallexample
 @group
 ---------- Buffer: *Backtrace* ----------
-Debugger entered--Lisp error:
-         (wrong-type-argument number-or-marker-p hello)
+Debugger entered--Lisp error: (wrong-type-argument number-or-marker-p hello)
   +(2 hello)
   eval((+ 2 'hello) nil)
-  elisp--eval-last-sexp(t)
+  elisp--eval-last-sexp(nil)
+  #f(compiled-function () #<bytecode ...>)()
+  handler-bind-1(#f(compiled-function () #<bytecode ...>) (error) eval-expression--debug)
   eval-last-sexp(nil)
-  funcall-interactively(eval-print-last-sexp nil)
-  call-interactively(eval-print-last-sexp nil nil)
-  command-execute(eval-print-last-sexp)
+  funcall-interactively(eval-last-sexp nil)
+  call-interactively(eval-last-sexp nil nil)
+  command-execute(eval-last-sexp)
 ---------- Buffer: *Backtrace* ----------
 @end group
 @end smallexample
@@ -17938,13 +17946,16 @@ Debugger entered--Lisp error: (void-function 1=)
   (let ((total 0)) (while (> number 0) (setq total ...)
     (setq number ...)) total)
   triangle-bugged(4)
+  eval((triangle-bugged 4) nil)
 @end group
 @group
-  eval((triangle-bugged 4) nil)
-  eval-expression((triangle-bugged 4) nil nil 127)
-  funcall-interactively(eval-expression (triangle-bugged 4) nil nil 127)
-  call-interactively(eval-expression nil nil)
-  command-execute(eval-expression)
+  elisp--eval-last-sexp(nil)
+  #f(compiled-function () #<bytecode ...>)()
+  handler-bind-1(#f(compiled-function () #<bytecode ...>) (error) eval-expression--debug)
+  eval-last-sexp(nil)
+  funcall-interactively(eval-last-sexp nil)
+  call-interactively(eval-last-sexp nil nil)
+  command-execute(eval-last-sexp)
 ---------- Buffer: *Backtrace* ----------
 @end group
 @end smallexample
@@ -18042,10 +18053,13 @@ Debugger entered--entering a function:
   eval((triangle-bugged 5) nil)
 @end group
 @group
-  eval-expression((triangle-bugged 5) nil nil 127)
-  funcall-interactively(eval-expression (triangle-bugged 5) nil nil 127)
-  call-interactively(eval-expression nil nil)
-  command-execute(eval-expression)
+  elisp--eval-last-sexp(nil)
+  #f(compiled-function () #<bytecode ...>)()
+  handler-bind-1(#f(compiled-function () #<bytecode ...>) (error) eval-expression--debug)
+  eval-last-sexp(nil)
+  funcall-interactively(eval-last-sexp nil)
+  call-interactively(eval-last-sexp nil nil)
+  command-execute(eval-last-sexp)
 ---------- Buffer: *Backtrace* ----------
 @end group
 @end smallexample
@@ -18094,12 +18108,15 @@ Debugger entered--beginning evaluation of function call form:
         (setq number ...)) total)
 * triangle-bugged(5)
   eval((triangle-bugged 5) nil)
-@group
 @end group
-  eval-expression((triangle-bugged 5) nil nil 127)
-  funcall-interactively(eval-expression (triangle-bugged 5) nil nil 127)
-  call-interactively(eval-expression nil nil)
-  command-execute(eval-expression)
+@group
+  elisp--eval-last-sexp(nil)
+  #f(compiled-function () #<bytecode ...>)()
+  handler-bind-1(#f(compiled-function () #<bytecode ...>) (error) eval-expression--debug)
+  eval-last-sexp(nil)
+  funcall-interactively(eval-last-sexp nil)
+  call-interactively(eval-last-sexp nil nil)
+  command-execute(eval-last-sexp)
 ---------- Buffer: *Backtrace* ----------
 @end group
 @end smallexample

From 5beeb4446f14cd72e1a08c8da22d1b1a05cb6a04 Mon Sep 17 00:00:00 2001
From: Juri Linkov <juri@linkov.net>
Date: Sun, 3 May 2026 18:38:43 +0300
Subject: [PATCH 317/463] * lisp/treesit.el (treesit-outline-level): Add guard
 condition.

---
 lisp/treesit.el | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 4579d416f34..baebdbb31dc 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -4454,12 +4454,14 @@ For BOUND, MOVE, BACKWARD, LOOKING-AT, see the descriptions in
       (setq level (1+ level)))
 
     ;; Continue counting the host nodes.
-    (dolist (parser (mapcar #'cdr (treesit-parsers-at (point) nil t '(global local))))
-      (let* ((node (treesit-node-at (point) parser))
-             (lang (treesit-parser-language parser))
-             (pred (alist-get lang treesit-aggregated-outline-predicate)))
-        (while (setq node (treesit-parent-until node pred))
-          (setq level (1+ level)))))
+    (when treesit-aggregated-outline-predicate
+      (dolist (parser (mapcar #'cdr (treesit-parsers-at
+                                     (point) nil t '(global local))))
+        (let* ((node (treesit-node-at (point) parser))
+               (lang (treesit-parser-language parser))
+               (pred (alist-get lang treesit-aggregated-outline-predicate)))
+          (while (setq node (treesit-parent-until node pred))
+            (setq level (1+ level))))))
 
     level))
 

From a1739bc75e1b12b458e338ed9a22aa3adbbea384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20Bela=C3=AFche?= <vincentb1@users.sourceforge.net>
Date: Tue, 2 Jan 2024 00:28:55 +0100
Subject: [PATCH 318/463] ; * doc/translations/fr/misc/ses-fr.texi: Typo.

---
 doc/translations/fr/misc/ses-fr.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/translations/fr/misc/ses-fr.texi b/doc/translations/fr/misc/ses-fr.texi
index ead9ed33609..10bb20420a9 100644
--- a/doc/translations/fr/misc/ses-fr.texi
+++ b/doc/translations/fr/misc/ses-fr.texi
@@ -58,7 +58,7 @@ modify this GNU manual.''
 @top @acronym{SES}: Simple Emacs Spreadsheet
 
 @display
-@acronym{SES} est mode majeur de GNU Emacs pour éditer des fichiers
+@acronym{SES} est un mode majeur de GNU Emacs pour éditer des fichiers
 tableur, c.-à-d.@: des fichiers contenant une grille rectangulaire de
 cellules. Les valeurs des cellules sont spécifiées par des formules
 pouvant se référer aux valeurs d’autres cellules.
@@ -70,7 +70,7 @@ Pour les rapports d’anomalie, utiliser @kbd{M-x report-emacs-bug}.
 @insertcopying
 
 @menu
-* Boniment: Sales Pitch.        Pourquoi utiliser @acronym{SES}?
+* Boniment: Sales Pitch.        Pourquoi utiliser @acronym{SES} ?
 * Tuto: Quick Tutorial.         Une introduction sommaire
 * Les bases: The Basics.        Les commandes de base du tableur
 * Fonctions avancées: Advanced Features. Vous voulez en savoir plus ?

From e682959b6b05fc9b174b2ded11fe38d38e5e8463 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 3 May 2026 13:32:51 -0400
Subject: [PATCH 319/463] (package--builtin-alist): Don't use `defconst` since
 we later change it

* lisp/emacs-lisp/package.el (package--builtin-alist): Use `defvar`.
---
 lisp/emacs-lisp/package.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index e1486418876..73d9357a839 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -468,7 +468,7 @@ BI-DESC should be a `package--bi-desc' object."
                        :summary (package--bi-desc-summary bi-desc)
                        :dir 'builtin))
 
-(defconst package--builtin-alist nil)
+(defvar package--builtin-alist nil)
 (defun package--builtin-alist ()
   "Return a alist of built-in packages in the form of `package-alist'.
 The alist doesn't include the pseudo-package for Emacs."

From fe58f45782cb2e61af8ac6f870494f659a6b6ea0 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 3 May 2026 17:45:15 +0200
Subject: [PATCH 320/463] Allow changing SGML "quick keys" after loading
 sgml-mode.el

* lisp/textmodes/sgml-mode.el (sgml-quick-keys): Replace with
user option, that adjusts 'sgml-mode-map'.
(sgml-mode-map): Don't insert quick keys.
(html-quick-keys): Replace with user option, that adjusts
'html-mode-map'.
(html-mode-map): Don't insert quick keys.
---
 lisp/textmodes/sgml-mode.el | 171 ++++++++++++++++++++----------------
 1 file changed, 94 insertions(+), 77 deletions(-)

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index c95386c16ac..854da2c8535 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -114,49 +114,57 @@ Including ?- makes double dashes into comment delimiters, but
 they are really only supposed to delimit comments within DTD
 definitions.  So we normally turn it off.")
 
-(defvar sgml-quick-keys nil
-  "Use <, >, &, /, SPC and `sgml-specials' keys \"electrically\" when non-nil.
-This takes effect when first loading the `sgml-mode' library.")
-
 (defvar sgml-mode-map
   (let ((map (make-keymap)))	;`sparse' doesn't allow binding to charsets.
-    (define-key map "\C-c\C-i" #'sgml-tags-invisible)
+    (define-key map (kbd "C-c C-i") #'sgml-tags-invisible)
     (define-key map "/" #'sgml-slash)
-    (define-key map "\C-c\C-n" #'sgml-name-char)
-    (define-key map "\C-c\C-t" #'sgml-tag)
-    (define-key map "\C-c\C-a" #'sgml-attributes)
-    (define-key map "\C-c\C-b" #'sgml-skip-tag-backward)
-    (define-key map [?\C-c left] #'sgml-skip-tag-backward)
-    (define-key map "\C-c\C-f" #'sgml-skip-tag-forward)
-    (define-key map [?\C-c right] #'sgml-skip-tag-forward)
-    (define-key map "\C-c\C-d" #'sgml-delete-tag)
-    (define-key map "\C-c\^?" #'sgml-delete-tag)
-    (define-key map "\C-c?" #'sgml-tag-help)
-    (define-key map "\C-c]" #'sgml-close-tag)
-    (define-key map "\C-c/" #'sgml-close-tag)
+    (define-key map (kbd "C-c C-n") #'sgml-name-char)
+    (define-key map (kbd "C-c C-t") #'sgml-tag)
+    (define-key map (kbd "C-c C-a") #'sgml-attributes)
+    (define-key map (kbd "C-c C-b") #'sgml-skip-tag-backward)
+    (define-key map (kbd "C-c <left>") #'sgml-skip-tag-backward)
+    (define-key map (kbd "C-c C-f") #'sgml-skip-tag-forward)
+    (define-key map (kbd "C-c <right>") #'sgml-skip-tag-forward)
+    (define-key map (kbd "C-c C-d") #'sgml-delete-tag)
+    (define-key map (kbd "C-c ^ ?") #'sgml-delete-tag)
+    (define-key map (kbd "C-c ?") #'sgml-tag-help)
+    (define-key map (kbd "C-c ]") #'sgml-close-tag)
+    (define-key map (kbd "C-c /") #'sgml-close-tag)
 
     ;; Redundant keybindings, for consistency with TeX mode.
-    (define-key map "\C-c\C-o" #'sgml-tag)
-    (define-key map "\C-c\C-e" #'sgml-close-tag)
+    (define-key map (kbd "C-c C-o") #'sgml-tag)
+    (define-key map (kbd "C-c C-e") #'sgml-close-tag)
 
-    (define-key map "\C-c8" #'sgml-name-8bit-mode)
-    (define-key map "\C-c\C-v" #'sgml-validate)
-    (when sgml-quick-keys
-      (define-key map "&" #'sgml-name-char)
-      (define-key map "<" #'sgml-tag)
-      (define-key map " " #'sgml-auto-attributes)
-      (define-key map ">" #'sgml-maybe-end-tag)
-      (when (memq ?\" sgml-specials)
-        (define-key map "\"" #'sgml-name-self))
-      (when (memq ?' sgml-specials)
-        (define-key map "'" #'sgml-name-self)))
-    (let ((c 127)
-	  (map (nth 1 map)))
-      (while (< (setq c (1+ c)) 256)
-	(aset map c #'sgml-maybe-name-self)))
+    (define-key map (kbd "C-c 8") #'sgml-name-8bit-mode)
+    (define-key map (kbd "C-c C-v") #'sgml-validate)
+
+    (cl-loop for c from 128 upto 255
+             do (define-key map (string c) #'sgml-maybe-name-self))
     map)
   "Keymap for SGML mode.  See also `sgml-specials'.")
 
+(defcustom sgml-quick-keys nil
+  "Use <, >, &, /, SPC and `sgml-specials' keys \"electrically\" when non-nil.
+By setting the option to `indent', Emacs will eagerly reindent the
+current line when you manually close a tag."
+  :set (lambda (sym val)
+         (set-default sym val)
+         (dolist (bind `(("&"  . ,#'sgml-name-char)
+                         ("<"  . ,#'sgml-tag)
+                         ("\s" . ,#'sgml-auto-attributes)
+                         (">"  . ,#'sgml-maybe-end-tag)
+                         ("\"" . ,(and (memq ?\" sgml-specials) #'sgml-name-self))
+                         ("'"  . ,(and (memq ?' sgml-specials) #'sgml-name-self))))
+           (if (and val (cdr bind))
+               (define-key sgml-mode-map (car bind) (cdr bind))
+             (define-key sgml-mode-map (car bind) nil t)))
+         (custom-reevaluate-setting 'html-quick-keys))
+  :type '(choice (const :tag "Enabled" t)
+                 (const :tag "Enabled, and indent when closing tags" indent)
+                 ;; Omit `close' because `electric-pair-mode' already
+                 ;; takes care of paring "<" and ">".
+                 (const :tag "Disabled" nil)))
+
 (easy-menu-define sgml-mode-menu sgml-mode-map
   "Menu for SGML mode."
   '("SGML"
@@ -1792,54 +1800,63 @@ Currently just returns (EMPTY-TAGS UNCLOSED-TAGS)."
   :type 'hook
   :options '(html-autoview-mode))
 
-(defvar html-quick-keys sgml-quick-keys
-  "Use C-c X combinations for quick insertion of frequent tags when non-nil.
-This defaults to `sgml-quick-keys'.
-This takes effect when first loading the library.")
-
 (defvar html-mode-map
   (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map  sgml-mode-map)
-    (define-key map "\C-c6" #'html-headline-6)
-    (define-key map "\C-c5" #'html-headline-5)
-    (define-key map "\C-c4" #'html-headline-4)
-    (define-key map "\C-c3" #'html-headline-3)
-    (define-key map "\C-c2" #'html-headline-2)
-    (define-key map "\C-c1" #'html-headline-1)
-    (define-key map "\C-c\r" #'html-paragraph)
-    (define-key map "\C-c\n" #'html-line)
-    (define-key map "\C-c\C-c-" #'html-horizontal-rule)
-    (define-key map "\C-c\C-co" #'html-ordered-list)
-    (define-key map "\C-c\C-cu" #'html-unordered-list)
-    (define-key map "\C-c\C-cr" #'html-radio-buttons)
-    (define-key map "\C-c\C-cc" #'html-checkboxes)
-    (define-key map "\C-c\C-cl" #'html-list-item)
-    (define-key map "\C-c\C-ch" #'html-href-anchor)
-    (define-key map "\C-c\C-cf" #'html-href-anchor-file)
-    (define-key map "\C-c\C-cn" #'html-name-anchor)
-    (define-key map "\C-c\C-c#" #'html-id-anchor)
-    (define-key map "\C-c\C-ci" #'html-image)
-    (when html-quick-keys
-      (define-key map "\C-cp" #'html-paragraph)
-      (define-key map "\C-c-" #'html-horizontal-rule)
-      (define-key map "\C-cd" #'html-div)
-      (define-key map "\C-co" #'html-ordered-list)
-      (define-key map "\C-cu" #'html-unordered-list)
-      (define-key map "\C-cr" #'html-radio-buttons)
-      (define-key map "\C-cc" #'html-checkboxes)
-      (define-key map "\C-cl" #'html-list-item)
-      (define-key map "\C-ch" #'html-href-anchor)
-      (define-key map "\C-cf" #'html-href-anchor-file)
-      (define-key map "\C-cn" #'html-name-anchor)
-      (define-key map "\C-c#" #'html-id-anchor)
-      (define-key map "\C-ci" #'html-image)
-      (define-key map "\C-cs" #'html-span))
-    (define-key map "\C-c\C-s" #'html-autoview-mode)
-    (define-key map "\C-c\C-v" #'browse-url-of-buffer)
-    (define-key map "\M-o" 'facemenu-keymap)
+    (set-keymap-parent map sgml-mode-map)
+    (define-key map (kbd "C-c 6") #'html-headline-6)
+    (define-key map (kbd "C-c 5") #'html-headline-5)
+    (define-key map (kbd "C-c 4") #'html-headline-4)
+    (define-key map (kbd "C-c 3") #'html-headline-3)
+    (define-key map (kbd "C-c 2") #'html-headline-2)
+    (define-key map (kbd "C-c 1") #'html-headline-1)
+    (define-key map (kbd "C-c C-m") #'html-paragraph)
+    (define-key map (kbd "C-c C-j") #'html-line)
+    (define-key map (kbd "C-c C-c -") #'html-horizontal-rule)
+    (define-key map (kbd "C-c C-c o") #'html-ordered-list)
+    (define-key map (kbd "C-c C-c u") #'html-unordered-list)
+    (define-key map (kbd "C-c C-c r") #'html-radio-buttons)
+    (define-key map (kbd "C-c C-c c") #'html-checkboxes)
+    (define-key map (kbd "C-c C-c l") #'html-list-item)
+    (define-key map (kbd "C-c C-c h") #'html-href-anchor)
+    (define-key map (kbd "C-c C-c f") #'html-href-anchor-file)
+    (define-key map (kbd "C-c C-c n") #'html-name-anchor)
+    (define-key map (kbd "C-c C-c #") #'html-id-anchor)
+    (define-key map (kbd "C-c C-c i") #'html-image)
+    (define-key map (kbd "C-c C-s") #'html-autoview-mode)
+    (define-key map (kbd "C-c C-v") #'browse-url-of-buffer)
+    (define-key map (kbd "M-o") 'facemenu-keymap)
     map)
   "Keymap for commands for use in HTML mode.")
 
+(defcustom html-quick-keys sgml-quick-keys
+  "Use C-c X combinations for quick insertion of frequent tags when non-nil.
+This defaults to `sgml-quick-keys', which see."
+  :set (lambda (sym val)
+         (set-default sym val)
+         (dolist (bind `((,(kbd "C-c p") . ,#'html-paragraph)
+                         (,(kbd "C-c -") . ,#'html-horizontal-rule)
+                         (,(kbd "C-c d") . ,#'html-div)
+                         (,(kbd "C-c o") . ,#'html-ordered-list)
+                         (,(kbd "C-c u") . ,#'html-unordered-list)
+                         (,(kbd "C-c r") . ,#'html-radio-buttons)
+                         (,(kbd "C-c c") . ,#'html-checkboxes)
+                         (,(kbd "C-c l") . ,#'html-list-item)
+                         (,(kbd "C-c h") . ,#'html-href-anchor)
+                         (,(kbd "C-c f") . ,#'html-href-anchor-file)
+                         (,(kbd "C-c n") . ,#'html-name-anchor)
+                         (,(kbd "C-c #") . ,#'html-id-anchor)
+                         (,(kbd "C-c i") . ,#'html-image)
+                         (,(kbd "C-c s") . ,#'html-span)))
+           (if val
+               (define-key html-mode-map (car bind) (cdr bind))
+             (define-key html-mode-map (car bind) nil t))))
+  :set-after '(sgml-quick-keys)
+  :type '(choice (const :tag "Enabled" t)
+                 (const :tag "Enabled, and indent when closing tags" indent)
+                 ;; Omit `close' because `electric-pair-mode' already
+                 ;; takes care of paring "<" and ">".
+                 (const :tag "Disabled" nil)))
+
 (easy-menu-define html-mode-menu html-mode-map
   "Menu for HTML mode."
   '("HTML"

From 7a710c3c0e856630814a97fe3555c0e79c6d0e83 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 3 May 2026 17:46:23 +0200
Subject: [PATCH 321/463] Allow setting 'sgml-xml-mode' buffer locally

* lisp/textmodes/sgml-mode.el (sgml-xml-mode): Add :safe property.
---
 lisp/textmodes/sgml-mode.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 854da2c8535..e736342007b 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -73,6 +73,7 @@ When 2, attribute indentation looks like this:
 It is set to be buffer-local when the file has
 a DOCTYPE or an XML declaration."
   :type 'boolean
+  :safe #'booleanp
   :version "22.1")
 
 (define-obsolete-variable-alias 'sgml-transformation

From dbc2e073c0554e46d1bd2cb2514037ad1aa76e1f Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 3 May 2026 17:47:11 +0200
Subject: [PATCH 322/463] Refine SGML offset user option types

* lisp/textmodes/sgml-mode.el (sgml-basic-offset)
(sgml-attribute-offset): Allow natural numbers, not arbitrary
integers.
---
 lisp/textmodes/sgml-mode.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index e736342007b..39e785e66a2 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -47,8 +47,8 @@
 
 (defcustom sgml-basic-offset 2
   "Specifies the basic indentation level for `sgml-indent-line'."
-  :type 'integer
-  :safe #'integerp)
+  :type 'natnum
+  :safe #'natnump)
 
 (defcustom sgml-attribute-offset 0
   "Specifies a delta for attribute indentation in `sgml-indent-line'.
@@ -65,8 +65,8 @@ When 2, attribute indentation looks like this:
       attribute=\"value\">
   </element>"
   :version "25.1"
-  :type 'integer
-  :safe #'integerp)
+  :type 'natnum
+  :safe #'natnump)
 
 (defcustom sgml-xml-mode nil
   "When non-nil, tag insertion functions will be XML-compliant.

From c704ae0ffc5ac39eced99968ff3cff2fadd3d3bb Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 3 May 2026 17:48:07 +0200
Subject: [PATCH 323/463] Implement 'sgml-name-8bit-mode' as a proper minor
 mode

* lisp/textmodes/sgml-mode.el (sgml-name-8bit-mode): Merge
'defcustom' and 'defun' into a 'define-minor-mode'.
---
 lisp/textmodes/sgml-mode.el | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 39e785e66a2..7221bc2f019 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -220,7 +220,7 @@ current line when you manually close a tag."
     table)
   "Syntax table used to parse SGML tags.")
 
-(defcustom sgml-name-8bit-mode nil
+(define-minor-mode sgml-name-8bit-mode
   "When non-nil, insert non-ASCII characters as named entities."
   :type 'boolean)
 
@@ -783,14 +783,6 @@ Uses `sgml-char-names'."
       (sgml-name-char last-command-event)
     (self-insert-command 1)))
 
-(defun sgml-name-8bit-mode ()
-  "Toggle whether to insert named entities instead of non-ASCII characters.
-This only works for Latin-1 input."
-  (interactive)
-  (setq sgml-name-8bit-mode (not sgml-name-8bit-mode))
-  (message "sgml name entity mode is now %s"
-	   (if sgml-name-8bit-mode "ON" "OFF")))
-
 ;; When an element of a skeleton is a string "str", it is passed
 ;; through `skeleton-transformation-function' and inserted.
 ;; If "str" is to be inserted literally, one should obtain it as

From 77e968b97c074ae61c98170ac086f8d8e7f97ae7 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 3 May 2026 17:51:15 +0200
Subject: [PATCH 324/463] Raise an error if 'sgml-validate-command' is not
 configured

* lisp/textmodes/sgml-mode.el (sgml-validate-command): If no
known program is installed, fall back to nil as the default
value instead of a warning message.
---
 lisp/textmodes/sgml-mode.el | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 7221bc2f019..b85ba5c26d4 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -286,12 +286,11 @@ Currently, only Latin-1 characters are supported.")
         ((executable-find "onsgmls")
          ;; onsgmls is the community version of `nsgmls'
          ;; hosted on https://openjade.sourceforge.net/
-         "onsgmls -s")
-        (t "Install (o)nsgmls, tidy, or some other SGML validator, and set `sgml-validate-command'"))
+         "onsgmls -s"))
   "The command to validate an SGML document.
 The file name of current buffer file name will be appended to this,
 separated by a space."
-  :type 'string
+  :type '(choice (const :tag "Unset" nil) string)
   :version "21.1")
 
 (defvar sgml-saved-validate-command nil

From 29f2c6eee030cd060fcd4bca8a3eb0827bc68a78 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 3 May 2026 17:51:52 +0200
Subject: [PATCH 325/463] Use 'read-shell-command' to read SGML validation
 command

* lisp/textmodes/sgml-mode.el (sgml-validate): Update
interactive spec.
---
 lisp/textmodes/sgml-mode.el | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index b85ba5c26d4..aaf05e4df1a 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1199,13 +1199,14 @@ with output going to the buffer `*compilation*'.
 You can then use the command \\[next-error] to find the next error message
 and move to the line in the SGML document that caused it."
   (interactive
-   (list (read-string "Validate command: "
-		      (or sgml-saved-validate-command
-			  (concat sgml-validate-command
-				  " "
-                                  (when-let* ((name (buffer-file-name)))
-				    (shell-quote-argument
-				     (file-name-nondirectory name))))))))
+   (list (read-shell-command "Validate command: "
+		             (or sgml-saved-validate-command
+                                 sgml-validate-command
+			         (concat sgml-validate-command
+				         " "
+                                         (when-let* ((name (buffer-file-name)))
+				           (shell-quote-argument
+				            (file-name-nondirectory name))))))))
   (setq sgml-saved-validate-command command)
   (save-some-buffers (not compilation-ask-about-save) nil)
   (compilation-start command))

From 9f6cf73b8e69a142a6ebeb4ed2258162007b1b3e Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 3 May 2026 17:58:20 +0200
Subject: [PATCH 326/463] Prevent indentation within whitespace sensitive HTML
 tags

* lisp/textmodes/sgml-mode.el (sgml-whitespace-sensitive-tags):
Add new variable.
(sgml-calculate-indent): Check if in the context of a tag
specified by 'sgml-whitespace-sensitive-tags'.
(html-mode): Set 'sgml-whitespace-sensitive-tags' to not adjust
the indentation within <pre> and <textarea> tags.
---
 lisp/textmodes/sgml-mode.el | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index aaf05e4df1a..ef06db06127 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1617,6 +1617,8 @@ the current start-tag or the current comment or the current cdata, ..."
   (and (not sgml-xml-mode)
        (assoc-string tag-name sgml-unclosed-tags 'ignore-case)))
 
+(defvar sgml-whitespace-sensitive-tags nil
+  "List of tags where the contents shouldn't be reindented.")
 
 (defun sgml-calculate-indent (&optional lcon)
   "Calculate the column to which this line should be indented.
@@ -1629,7 +1631,16 @@ LCON is the lexical context, if any."
 	   (save-excursion (goto-char (cdr lcon)) (looking-at "<!--")))
       (setq lcon (cons 'comment (+ (cdr lcon) 2))))
 
-  (pcase (car lcon)
+  (pcase-exhaustive (car lcon)
+
+    ((or (guard (let ((case-fold-search t))
+              (cl-find (concat "\\`" (regexp-opt sgml-whitespace-sensitive-tags) "\\'")
+                       (save-excursion (sgml-get-context))
+                       :test #'string-match-p
+                       :key #'sgml-tag-name)))
+         ;; We don't know how to indent it.  Let's be honest about it.
+         'pi 'cdata)
+     nil)
 
     ('string
      ;; Go back to previous non-empty line.
@@ -1660,11 +1671,6 @@ LCON is the lexical context, if any."
 	 (forward-char 2) (skip-chars-forward " \t"))
        (current-column)))
 
-    ;; We don't know how to indent it.  Let's be honest about it.
-    ('cdata nil)
-    ;; We don't know how to indent it.  Let's be honest about it.
-    ('pi nil)
-
     ('tag
      (goto-char (+ (cdr lcon) sgml-attribute-offset))
      (skip-chars-forward "^ \t\n")	;Skip tag name.
@@ -1733,12 +1739,7 @@ LCON is the lexical context, if any."
 	(t
 	 (goto-char there)
 	 (+ (current-column)
-	    (* sgml-basic-offset (length context)))))))
-
-    (_
-     (error "Unrecognized context %s" (car lcon)))
-
-    ))
+	    (* sgml-basic-offset (length context)))))))))
 
 (defun sgml-indent-line ()
   "Indent the current line as SGML."
@@ -2409,6 +2410,7 @@ To work around that, do:
   (setq-local sgml-tag-alist html-tag-alist)
   (setq-local sgml-face-tag-alist html-face-tag-alist)
   (setq-local sgml-tag-help html-tag-help)
+  (setq-local sgml-whitespace-sensitive-tags '("pre" "textarea"))
   (setq-local outline-regexp "^.*<[Hh][1-6]\\>")
   (setq-local outline-heading-end-regexp "</[Hh][1-6]>")
   (setq-local outline-level

From f2de11f1f030867175464bd842d26126e4a83775 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 3 May 2026 18:40:49 +0200
Subject: [PATCH 327/463] Add for <details> to 'html-tag-alist' and
 'html-tag-help'

* lisp/textmodes/sgml-mode.el (html-tag-alist): Add skeleton.
(html-tag-help): Add description.
---
 lisp/textmodes/sgml-mode.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index ef06db06127..1201651dd72 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -2049,6 +2049,8 @@ This defaults to `sgml-quick-keys', which see."
       ("datalist" \n)
       ("dd" ,(not sgml-xml-mode))
       ("del" nil ("cite") ("datetime"))
+      ("details"
+       (\n "<summary>" (read-string "Title: ") "</summary>" \n _))
       ("dfn")
       ("div" \n ("id") ("class"))
       ("dl" (nil \n
@@ -2191,6 +2193,7 @@ This defaults to `sgml-quick-keys', which see."
     ("datalist" . "A set of predefined options")
     ("dd" . "Definition of term")
     ("del" . "Deleted text")
+    ("details" . "Details disclosure")
     ("dfn" . "Defining instance of a term")
     ("dir" . "Directory list (obsolete)")
     ("div" . "Generic block-level container")

From 75a36bde59fcdbc7c44c69c1e9a90e09d24c9101 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 3 May 2026 19:38:25 +0200
Subject: [PATCH 328/463] Add for <picture> to 'html-tag-alist' and
 'html-tag-help'

* lisp/textmodes/sgml-mode.el (html-tag-alist): Add very basic skeleton.
(html-tag-help): Add description.
---
 lisp/textmodes/sgml-mode.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 1201651dd72..be14462d1a0 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -2112,6 +2112,7 @@ This defaults to `sgml-quick-keys', which see."
       ("param" t ("name") ("value")
        ("valuetype" ("data") ("ref") ("object")) ("type"))
       ("person") ;; Tag for person's name tag deprecated in HTML 3.2
+      ("picture" \n)                    ;TODO: suggest inserting <source> and <img>
       ("pre" \n)
       ("progress" nil ("value") ("max"))
       ("q" nil ("cite"))
@@ -2261,6 +2262,7 @@ This defaults to `sgml-quick-keys', which see."
     ("panel" . "Floating panel")
     ("param" . "Parameters for an object")
     ("person" . "Person's name")
+    ("picture" . "Picture")
     ("pre" . "Preformatted fixed width text")
     ("progress" . "Completion progress of a task")
     ("q" . "Quotation")

From 9be140466a5a8493ae61f0951b2875ee9d4bd65c Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 3 May 2026 20:12:37 +0200
Subject: [PATCH 329/463] Ensure package archives are loaded for
 'package-isolate'

* lisp/emacs-lisp/package.el (package-isolate): Use
'package--archive-contents' instead of the actual variable, to
ensure that we load the archive contents if missing.  This is
likely the case if 'package-isolate' is the first package
function invoked during a session.
---
 lisp/emacs-lisp/package.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 73d9357a839..068b94360d4 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2566,7 +2566,7 @@ intended for testing Emacs and/or the packages in a clean environment."
   (interactive
    (cl-loop for p in (append
                       (cl-loop for p in (package--alist) append (cdr p))
-                      (cl-loop for p in package-archive-contents append (cdr p)))
+                      (cl-loop for p in (package--archive-contents) append (cdr p)))
 	    unless (package-built-in-p p)
 	    collect (cons (package-desc-full-name p) p) into table
 	    finally return

From 9ff07688046da27d980ea55e8cff1f9eee533563 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dmitry@gutov.dev>
Date: Mon, 4 May 2026 05:21:34 +0300
Subject: [PATCH 330/463] Re-add a call to clear_under_internal_border in
 clear_garbaged_frames

* src/xdisp.c (clear_garbaged_frames): Re-add the call to
clear_under_internal_border, reverting that part of commit
a6a3b32208c5 as not essential to the fix (bug#80662).
---
 src/xdisp.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/xdisp.c b/src/xdisp.c
index 4f3b23f1698..4c46d7711be 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13661,6 +13661,11 @@ clear_garbaged_frames (void)
 	      if (is_tty_frame (f))
 		current_matrices_cleared = true;
 
+#ifdef HAVE_WINDOW_SYSTEM
+              if (FRAME_WINDOW_P (f)
+                  && FRAME_RIF (f)->clear_under_internal_border)
+                FRAME_RIF (f)->clear_under_internal_border (f);
+#endif
 	      fset_redisplay (f);
 	      f->garbaged = false;
 	      f->resized_p = false;

From 9b3855e164de8c3aec1bfc94735aa55bc7310fdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Fri, 24 Apr 2026 10:25:17 +0100
Subject: [PATCH 331/463] Jsonrpc: rework sync request handling (bug#80623)

When the remote endpoint is handling a local request 'LR' it can
sometimes make a remote sync request 'RR' as part of its handling.  Some
endpoints (like Go's gopls) wait for Emacs's reply to 'RR' before
responding to 'LR'.  Others (like Julia's JETLS) respond to 'LR'
immediately, and only then wait for Emacs's reply to 'RR'.  Both
approaches are valid.  However, in the latter case, the handling of 'RR'
(which could well be waiting for user input from the minibuffer to
complete) is vulnerable to 'throw' from process filters handling (which
is just what happens when the endpoints replies to 'LR'), so if that
happens it will unexpectedly be aborted when the reply to 'LR' comes in,
suprising the user and causing a spurious -32603 reply to be sent.

To solve this problem, this commit first refactors the sync
request/anxious queue handling and replace plain integer keys of the
rebaptized "scontrol" alist with structured (:local ID) / (:remote ID)
pairs, using `equal' for comparisons.  This is to introduce some
clarity/sanity into this somewhat hairy code.

Then, the 'RR' situation is fixed: we push a (:remote ID) entry onto the
top of the 'jsonrpc-connection--control' stack and only then call
rdispatcher.  Any 'LR' reply arriving during dispatch is deferred as an
"anxious" continuation rather than firing its `throw' immediately.  When
rdispatcher is done, we call jsonrpc--continue at a safe point, this
will run any "anxious" continuations.

* lisp/jsonrpc.el (jsonrpc-connection): Rename -sync-request-alist to
-scontrol; accessor from jsonrpc--sync-request-alist to
jsonrpc--scontrol; update docstring for new key structure.

(jsonrpc-connection-receive): Update with-slots binding to scontrol.
Tighten anxious check to match (:local ID) keys with `equal'.  In
remote-request branch, push (:remote ID) entry before rdispatcher and
call jsonrpc--continue after jsonrpc--reply.

(jsonrpc-request): Pass (:local ID) to jsonrpc--continue.

(jsonrpc--continue): Use jsonrpc--scontrol; change `=' to `equal' in
sanity check.
p
(jsonrpc--async-request-1): Push (:local ID) entry.

(jsonrpc--log-event): Use jsonrpc--scontrol.
---
 lisp/jsonrpc.el | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el
index 77010b76ab5..174c99afc86 100644
--- a/lisp/jsonrpc.el
+++ b/lisp/jsonrpc.el
@@ -86,12 +86,14 @@
     :documentation "Map (DEFERRED BUF) to (FN TIMER ID).  FN is\
 a saved DEFERRED `async-request' from BUF, to be sent not later\
 than TIMER as ID.")
-   (-sync-request-alist ; bug#67945
+   (-scontrol ; bug#67945
     :initform nil
-    :accessor jsonrpc--sync-request-alist
-    :documentation "List of ((ID [ANXIOUS...])) where ID refers  \
-to a sync `jsonrpc-request' and each ANXIOUS to another completed\
-request that is higher up in the stack but couldn't run.")
+    :accessor jsonrpc--scontrol
+    :documentation "List of ((KEY [ANXIOUS...])) where KEY is \
+(:local ID) for an outstanding sync `jsonrpc-request', or \
+(:remote ID) while a remote request with that ID is being \
+dispatched.  Each ANXIOUS is a completed response deferred \
+until KEY's entry is popped.")
    (-next-request-id
     :initform 0
     :accessor jsonrpc--next-request-id
@@ -291,7 +293,7 @@ dispatcher in CONN."
           (with-slots (last-error
                        (rdispatcher -request-dispatcher)
                        (ndispatcher -notification-dispatcher)
-                       (sr-alist -sync-request-alist))
+                       (scontrol -scontrol))
               conn
             (setf last-error error)
             (cond
@@ -311,23 +313,31 @@ dispatcher in CONN."
               )
              (;; A remote response that can't run yet (bug#67945)
               (and response-p
-                   (and sr-alist (not (eq id (caar sr-alist)))))
+                   (and scontrol (not (equal `(:local ,id) (caar scontrol)))))
               (jsonrpc--event
                conn 'internal
                :log-text
                (format "anxious continuation to %s can't run, held up by %s"
                        id
-                       (mapcar #'car sr-alist)))
+                       (mapcar #'car scontrol)))
               (push (cons cont (list result error))
-                    (cdr (car sr-alist))))
+                    (cdr (car scontrol))))
              (;; A remote response that can continue now
               response-p
-              (jsonrpc--continue conn id cont result error))
+              (jsonrpc--continue conn `(:local ,id) cont result error))
              (;; A remote request
               (and method id)
               (let* ((debug-on-error (and debug-on-error
                                           (not jsonrpc-inhibit-debug-on-error)))
                      reply)
+                ;; While the rdispatcher runs, any arriving response to
+                ;; a previous sync request must not fire its
+                ;; continuation immediately: the resulting `throw' would
+                ;; unwind through the dispatcher and trigger a spurious
+                ;; -32603 instead of a reply.  Use `jsonrpc--scontrol'
+                ;; mechanism to defer such continuations until the end
+                ;; of the cleanup below.
+                (push `((:remote ,id)) (jsonrpc--scontrol conn))
                 (unwind-protect
                     (setq
                      reply
@@ -349,7 +359,8 @@ dispatcher in CONN."
                   (unless reply
                     (setq reply
                           `(:error (:code -32603 :message "Internal error"))))
-                  (apply #'jsonrpc--reply conn id method reply))))
+                  (apply #'jsonrpc--reply conn id method reply)
+                  (jsonrpc--continue conn `(:remote ,id)))))
              (;; A remote notification
               method
               (funcall ndispatcher conn (intern method) params))
@@ -513,7 +524,7 @@ to the original request (normal or error) are ignored."
         ;; request, it might have been holding up any outer
         ;; "anxious" continuations.  The following ensures we
         ;; call them.
-        (jsonrpc--continue connection id)))
+        (jsonrpc--continue connection `(:local ,id))))
     (cond ((eq 'error (car retval))
            (signal 'jsonrpc-error
                    (cons
@@ -902,11 +913,11 @@ Return the full continuation (ID SUCCESS-FN ERROR-FN TIMER)"
 (defun jsonrpc--continue (conn id &optional cont result error)
   (pcase-let* ((`(,cont-id ,_method ,success-fn ,error-fn ,_timer)
                 cont)
-               (head (pop (jsonrpc--sync-request-alist conn)))
+               (head (pop (jsonrpc--scontrol conn)))
                (anxious (cdr head)))
     (cond
      (anxious
-      (when (not (= (car head) id)) ; sanity check
+      (when (not (equal (car head) id)) ; sanity check
         (error "Internal error: please report this bug"))
       ;; If there are "anxious" `jsonrpc-request' continuations
       ;; that should already have been run, they should run now.
@@ -998,7 +1009,7 @@ TIMEOUT is nil)."
     ;; Setup some control structures
     ;;
     (when sync-request
-      (push (list id) (jsonrpc--sync-request-alist connection)))
+      (push `((:local ,id)) (jsonrpc--scontrol connection)))
 
     (jsonrpc--schedule
      connection id method
@@ -1108,7 +1119,7 @@ of the API instead.")
       (cl-destructuring-bind (&key method id error &allow-other-keys) message
         (let* ((inhibit-read-only t)
                (depth (length
-                       (jsonrpc--sync-request-alist connection)))
+                       (jsonrpc--scontrol connection)))
                (preamble (format "[jsonrpc] %s[%s]%s "
                                  (pcase type ('error "E") ('debug "D")
                                         (_ (pcase origin

From e24d9232e0352d63a9d47fea3c3a26051970ca27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Fri, 24 Apr 2026 10:26:01 +0100
Subject: [PATCH 332/463] Jsonrpc: add new tests using Python subprocesses

Most of these tests are for the scontrol/"anxious continuation"
mechanism (bug#80623)

The new ERT tests use Python subprocesses via stdin/stdout pipe as
JSONRPC endpoints.  A shared framing library lives in
jsonrpc-resources/common.py.

* test/lisp/jsonrpc-tests.el (jsonrpc--test-dir): New constant.
(jsonrpc--with-python-fixture): New macro.
(scontrol-remote-during-sync-1)
(scontrol-remote-during-sync-2)
(scontrol-anxious-nested)
(scontrol-remote-error)
(shutdown-clean-after-notification): New tests.

* test/lisp/jsonrpc-resources/common.py: New file.

* test/lisp/jsonrpc-resources/server-remote-during-sync-1.py: New file.

* test/lisp/jsonrpc-resources/server-remote-during-sync-2.py: New file.

* test/lisp/jsonrpc-resources/server-anxious-nested.py: New file.

* test/lisp/jsonrpc-resources/server-remote-error.py: New file.

* test/lisp/jsonrpc-resources/server-harakiri.py: New file.
---
 test/lisp/jsonrpc-resources/common.py         |  32 ++++
 .../server-anxious-nested.py                  |  54 +++++++
 .../lisp/jsonrpc-resources/server-harakiri.py |  24 +++
 .../server-remote-during-sync-1.py            |  42 ++++++
 .../server-remote-during-sync-2.py            |  42 ++++++
 .../jsonrpc-resources/server-remote-error.py  |  44 ++++++
 test/lisp/jsonrpc-tests.el                    | 137 ++++++++++++++++++
 7 files changed, 375 insertions(+)
 create mode 100644 test/lisp/jsonrpc-resources/common.py
 create mode 100755 test/lisp/jsonrpc-resources/server-anxious-nested.py
 create mode 100755 test/lisp/jsonrpc-resources/server-harakiri.py
 create mode 100755 test/lisp/jsonrpc-resources/server-remote-during-sync-1.py
 create mode 100755 test/lisp/jsonrpc-resources/server-remote-during-sync-2.py
 create mode 100755 test/lisp/jsonrpc-resources/server-remote-error.py

diff --git a/test/lisp/jsonrpc-resources/common.py b/test/lisp/jsonrpc-resources/common.py
new file mode 100644
index 00000000000..6bcc1db8bba
--- /dev/null
+++ b/test/lisp/jsonrpc-resources/common.py
@@ -0,0 +1,32 @@
+"""Common JSONRPC framing helpers for jsonrpc.el test servers."""
+
+import json
+import sys
+
+def read_msg():
+    """Read one Content-Length-framed JSON-RPC message from stdin."""
+    headers = {}
+    while True:
+        line = sys.stdin.buffer.readline()
+        if not line:
+            return None
+        text = line.decode('utf-8').rstrip('\r\n')
+        if not text:
+            break
+        if ':' in text:
+            k, _, v = text.partition(':')
+            headers[k.strip()] = v.strip()
+    n = int(headers.get('Content-Length', 0))
+    return json.loads(sys.stdin.buffer.read(n).decode('utf-8')) if n else None
+
+def write_msg(msg):
+    """Write one Content-Length-framed JSON-RPC message to stdout."""
+    body = json.dumps(msg, ensure_ascii=False).encode('utf-8')
+    sys.stdout.buffer.write(
+        f'Content-Length: {len(body)}\r\n\r\n'.encode('utf-8') + body
+    )
+    sys.stdout.buffer.flush()
+
+def log(text):
+    """Write a log line to stderr."""
+    print(f'[test-server] {text}', file=sys.stderr, flush=True)
diff --git a/test/lisp/jsonrpc-resources/server-anxious-nested.py b/test/lisp/jsonrpc-resources/server-anxious-nested.py
new file mode 100755
index 00000000000..8169b0936d1
--- /dev/null
+++ b/test/lisp/jsonrpc-resources/server-anxious-nested.py
@@ -0,0 +1,54 @@
+#!/usr/bin/env python3
+"""Test server for scontrol-anxious-nested.
+
+Choreography (exercises the anxious-continuation mechanism):
+
+  client -> server:  LR1              (id=1)
+  server -> client:  RR1              (id=1000)
+  server -> client:  response LR1     "lr1-ok"
+  client -> server:  LR2              (id=2)
+  server -> client:  response LR2     "lr2-ok"
+  client -> server:  response RR1     "lr2-ok"
+
+LR2 should complete first, then RR1, then LR1.
+"""
+import os
+import sys
+sys.path.insert(0, os.path.dirname(__file__))
+from common import read_msg, write_msg, log
+
+
+def main():
+    while True:
+        lr1 = read_msg()
+        if lr1 is None:
+            break
+        mid = lr1.get('id')
+        method = lr1.get('method')
+        log(f'<- {method or "(response)"} id={mid}')
+        if method == 'harakiri':
+            log('-> very clean harakiri')
+            break
+        elif method == 'LR1':
+            # Send RR1, then immediately respond to LR1 without awaiting
+            # anything.  The response-to-LR1 will be queued as anxious on the
+            # client while its rdispatcher blocks waiting for LR2.
+            write_msg({'jsonrpc': '2.0', 'id': 1000,
+                       'method': 'RR1', 'params': {}})
+            log('-> RR1 id=1000')
+            write_msg({'jsonrpc': '2.0', 'id': mid, 'result': 'lr1-ok'})
+            log(f'-> (response LR1) id={mid}')
+            # LR2 arrives next: the client's rdispatcher for RR1
+            # issues it as a nested sync request.
+            lr2 = read_msg()
+            fid = lr2.get('id') if lr2 else None
+            log(f'<- LR2 id={fid}')
+            write_msg({'jsonrpc': '2.0', 'id': fid, 'result': 'lr2-ok'})
+            log(f'-> (response LR2) id={fid}')
+            # Finally collect the RR1 response (rdispatcher return value).
+            rr1_resp = read_msg()
+            log(f'<- (response RR1) id={rr1_resp.get("id") if rr1_resp else None}')
+
+
+if __name__ == '__main__':
+    main()
diff --git a/test/lisp/jsonrpc-resources/server-harakiri.py b/test/lisp/jsonrpc-resources/server-harakiri.py
new file mode 100755
index 00000000000..c20a3fbdaee
--- /dev/null
+++ b/test/lisp/jsonrpc-resources/server-harakiri.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+"""Test server for shutdown-clean test.
+
+Waits for a 'harakiri' notification and then exits cleanly.
+"""
+import os, sys
+sys.path.insert(0, os.path.dirname(__file__))
+from common import read_msg, log
+
+
+def main():
+    while True:
+        msg = read_msg()
+        if msg is None:
+            break
+        method = msg.get('method')
+        log(f'<- {method or "(response)"} id={msg.get("id")}')
+        if method == 'harakiri':
+            log('-> very clean harakiri')
+            break
+
+
+if __name__ == '__main__':
+    main()
diff --git a/test/lisp/jsonrpc-resources/server-remote-during-sync-1.py b/test/lisp/jsonrpc-resources/server-remote-during-sync-1.py
new file mode 100755
index 00000000000..b8cb549bbd5
--- /dev/null
+++ b/test/lisp/jsonrpc-resources/server-remote-during-sync-1.py
@@ -0,0 +1,42 @@
+#!/usr/bin/env python3
+"""Test server for scontrol-remote-during-sync-1.
+
+Choreography (tests bug#80623):
+
+  client -> server:  LR1            (id=1)
+  server -> client:  RR1            (id=1000)
+  server -> client:  response LR1   "lr1-ok"
+  client -> server:  response RR1   "rr1-ok"
+"""
+import os
+import sys
+sys.path.insert(0, os.path.dirname(__file__))
+from common import read_msg, write_msg, log
+
+
+def main():
+    while True:
+        msg = read_msg()
+        if msg is None:
+            break
+        mid = msg.get('id')
+        method = msg.get('method')
+        log(f'<- {method or "(response)"} id={mid}')
+        if method == 'harakiri':
+            log('-> very clean harakiri')
+            break
+        elif method == 'LR1':
+            # Send RR1 request
+            write_msg({'jsonrpc': '2.0', 'id': 1000,
+                       'method': 'RR1', 'params': {}})
+            log('-> RR1 id=1000')
+            # Immediately reply to LR1
+            write_msg({'jsonrpc': '2.0', 'id': mid, 'result': 'lr1-ok'})
+            log(f'-> (response LR1) id={mid}')
+            # Now wait for reply to RR1
+            resp = read_msg()
+            log(f'<- (response RR1) id={resp.get("id") if resp else None}')
+
+
+if __name__ == '__main__':
+    main()
diff --git a/test/lisp/jsonrpc-resources/server-remote-during-sync-2.py b/test/lisp/jsonrpc-resources/server-remote-during-sync-2.py
new file mode 100755
index 00000000000..e6250a0553b
--- /dev/null
+++ b/test/lisp/jsonrpc-resources/server-remote-during-sync-2.py
@@ -0,0 +1,42 @@
+#!/usr/bin/env python3
+"""Test server for scontrol-remote-during-sync-2.
+
+Choreography (tests bug#80623):
+
+  client -> server:  LR1            (id=1)
+  server -> client:  RR1            (id=1000)
+  client -> server:  response RR1   "rr1-ok"
+  server -> client:  response LR1   "lr1-ok"
+"""
+import os
+import sys
+sys.path.insert(0, os.path.dirname(__file__))
+from common import read_msg, write_msg, log
+
+
+def main():
+    while True:
+        msg = read_msg()
+        if msg is None:
+            break
+        mid = msg.get('id')
+        method = msg.get('method')
+        log(f'<- {method or "(response)"} id={mid}')
+        if method == 'harakiri':
+            log('-> very clean harakiri')
+            break
+        elif method == 'LR1':
+            # Send RR1 request
+            write_msg({'jsonrpc': '2.0', 'id': 1000,
+                       'method': 'RR1', 'params': {}})
+            log('-> RR1 id=1000')
+            # Wait for reply to RR1
+            resp = read_msg()
+            log(f'<- (response RR1) id={resp.get("id") if resp else None}')
+            # Only NOW answer LR1
+            write_msg({'jsonrpc': '2.0', 'id': mid, 'result': 'lr1-ok'})
+            log(f'-> (response LR1) id={mid}')
+
+
+if __name__ == '__main__':
+    main()
diff --git a/test/lisp/jsonrpc-resources/server-remote-error.py b/test/lisp/jsonrpc-resources/server-remote-error.py
new file mode 100755
index 00000000000..00c907e189b
--- /dev/null
+++ b/test/lisp/jsonrpc-resources/server-remote-error.py
@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+"""Test server for scontrol-remote-error.
+
+Choreography (anxious continuation survives an rdispatcher error):
+
+  client -> server:  LR1               (id=1)
+  server -> client:  badMethod           (id=1000)
+  server -> client:  response LR1      "ok"
+  client -> server:  error response badMethod {code: -32601}
+
+Even though the remote-request dispatch produces an error reply, the
+anxious continuation for LR1 must still fire and resolve to "ok".
+"""
+import os, sys
+sys.path.insert(0, os.path.dirname(__file__))
+from common import read_msg, write_msg, log
+
+
+def main():
+    while True:
+        msg = read_msg()
+        if msg is None:
+            break
+        mid = msg.get('id')
+        method = msg.get('method')
+        log(f'<- {method or "(response)"} id={mid}')
+        if method == 'harakiri':
+            log('-> very clean harakiri')
+            break
+        elif method == 'LR1':
+            # Send badMethod BEFORE responding to LR1; the client
+            # rdispatcher will signal a jsonrpc-error for it.
+            write_msg({'jsonrpc': '2.0', 'id': 1000,
+                       'method': 'badMethod', 'params': {}})
+            log('-> badMethod id=1000')
+            write_msg({'jsonrpc': '2.0', 'id': mid, 'result': 'ok'})
+            log(f'-> (response LR1) id={mid}')
+            # Collect the error response to badMethod.
+            err = read_msg()
+            log(f'<- (error response badMethod): {err}')
+
+
+if __name__ == '__main__':
+    main()
diff --git a/test/lisp/jsonrpc-tests.el b/test/lisp/jsonrpc-tests.el
index ca26f3c5a30..cdb4e04fc39 100644
--- a/test/lisp/jsonrpc-tests.el
+++ b/test/lisp/jsonrpc-tests.el
@@ -252,5 +252,142 @@
       (should (eq 2 n-deferred-2))
       (should (eq 0 (hash-table-count (jsonrpc--deferred-actions conn)))))))
 
+
+;;; Tests using Python subprocesses (scontrol / anxious mechanism)
+;;;
+
+(defconst jsonrpc--test-dir
+  (file-name-directory (or load-file-name buffer-file-name))
+  "Directory of this test file, captured at load time.")
+
+(cl-defmacro jsonrpc--with-python-fixture ((script conn &rest initargs) &body body)
+  "Start SCRIPT under python3 as a pipe subprocess, bind connection to CONN.
+SCRIPT is a path relative to this file's directory.
+INITARGS are passed to `make-instance' for `jsonrpc-process-connection'."
+  (declare (indent 1))
+  `(let ((,conn nil))
+     (unwind-protect
+         (progn
+           (setq ,conn
+                 (make-instance
+                  'jsonrpc-process-connection
+                  :name "jsonrpc-python-test"
+                  :process (make-process
+                             :name "jsonrpc-python-test"
+                             :command (list "python3"
+                                            (expand-file-name
+                                             ,script
+                                             jsonrpc--test-dir))
+                             :connection-type 'pipe
+                             :noquery t)
+                  ,@initargs))
+           (with-timeout (5
+                          (when ,conn
+                            (let ((buf (jsonrpc--events-buffer ,conn)))
+                              (when (buffer-live-p buf)
+                                (if noninteractive
+                                    (progn
+                                      (message "contents of `%s':" (buffer-name buf))
+                                      (princ (with-current-buffer buf (buffer-string))
+                                             #'external-debugging-output))
+                                  (message "Preserved for inspection: %s"
+                                           (buffer-name buf))))))
+                          (ert-fail "Test timed out after 5s"))
+             ,@body))
+       (when ,conn
+         (ignore-errors
+          (jsonrpc-notify ,conn 'harakiri nil)
+          (kill-buffer (jsonrpc--events-buffer ,conn))
+          (jsonrpc-shutdown ,conn))))))
+
+(ert-deftest scontrol-remote-during-sync-1 ()
+  "Anxious local continuations.
+Endpoint sends a remote request RR1 on LR1, then replies to LR1
+immediately before waiting for RR1 to resolve.
+This is what JETLS does (bug#80623)."
+  (skip-unless (executable-find "python3"))
+  (skip-when (eq system-type 'windows-nt))
+  (jsonrpc--with-python-fixture
+      ("jsonrpc-resources/server-remote-during-sync-1.py" conn
+       :request-dispatcher
+       (lambda (_conn method _params)
+         (pcase method
+           ('RR1 "rr1-ok")
+           (_ (error "unexpected method: %s" method)))))
+    (should (equal "lr1-ok" (jsonrpc-request conn 'LR1 [] :timeout 5)))))
+
+(ert-deftest scontrol-remote-during-sync-2 ()
+  "Anxious local continuations.
+Exactly the same test as 2, but different endpoint, which now still
+sends RR1 on LR1 but now waits for RR1 to resolve before replying to
+LR1.
+This is what GoPls does (bug#80623)."
+  (skip-unless (executable-find "python3"))
+  (skip-when (eq system-type 'windows-nt))
+  (jsonrpc--with-python-fixture
+      ("jsonrpc-resources/server-remote-during-sync-2.py" conn
+       :request-dispatcher
+       (lambda (_conn method _params)
+         (pcase method
+           ('RR1 "rr1-ok")
+           (_ (error "unexpected method: %s" method)))))
+    (should (equal "lr1-ok" (jsonrpc-request conn 'LR1 [] :timeout 5)))))
+
+(ert-deftest scontrol-anxious-nested ()
+  "Nested anxious continuations
+Two local sync requests LR1 and LR2 with a remote RR1 in between.
+Vaguely similar to Julia's JETLS (bug#80623), but more complex."
+  (skip-unless (executable-find "python3"))
+  (skip-when (eq system-type 'windows-nt))
+  (let (lr2-result completed)
+    (jsonrpc--with-python-fixture
+     ("jsonrpc-resources/server-anxious-nested.py" conn
+      :request-dispatcher
+      (lambda (conn method _params)
+        (pcase method
+          ('RR1
+           (setq lr2-result
+                 (jsonrpc-request conn 'LR2 [] :timeout 5))
+           (push "lr2" completed)
+           (push "rr1" completed))
+          (_ (error "unexpected method: %s" method)))))
+     (should (equal "lr1-ok" (jsonrpc-request conn 'LR1 [] :timeout 5)))
+     (push "lr1" completed)
+     (should (equal "lr2-ok" lr2-result))
+     (should (equal '("lr1" "rr1" "lr2") completed)))))
+
+(ert-deftest scontrol-remote-error ()
+  "Anxious continuation even when rdispatcher signals errors."
+  (skip-unless (executable-find "python3"))
+  (skip-when (eq system-type 'windows-nt))
+  (jsonrpc--with-python-fixture
+      ("jsonrpc-resources/server-remote-error.py" conn
+       :request-dispatcher
+       (lambda (_conn method _params)
+         (pcase method
+           ('badMethod
+            (signal 'jsonrpc-error
+                    '((jsonrpc-error-message . "method not allowed")
+                      (jsonrpc-error-code . -32601))))
+           (_ (error "unexpected method: %s" method)))))
+    (should (equal "ok" (jsonrpc-request conn 'LR1 [] :timeout 5)))))
+
+(ert-deftest shutdown-clean-after-notification ()
+  "Server exits cleanly after harakiri notification.
+`jsonrpc-shutdown' should not emit a \"Sentinel hasn't run\" warning."
+  (skip-unless (executable-find "python3"))
+  (skip-when (eq system-type 'windows-nt))
+  (let (warned)
+    (cl-letf (((symbol-function 'jsonrpc--warn)
+               (lambda (fmt &rest args)
+                 (setq warned (apply #'format fmt args)))))
+      (jsonrpc--with-python-fixture
+          ("jsonrpc-resources/server-harakiri.py" conn)
+        (jsonrpc-notify conn 'harakiri nil)
+        ;; Give the server time to exit before shutdown checks the sentinel.
+        (accept-process-output nil 0.3)
+        (jsonrpc-shutdown conn)))
+    (should-not warned)))
+
 (provide 'jsonrpc-tests)
 ;;; jsonrpc-tests.el ends here

From 0848cbb326caacb193bdadccefd879ac9c4994fc Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 4 May 2026 16:08:22 +0200
Subject: [PATCH 333/463] * admin/notes/documentation: Recommend not using
 "it's".

---
 admin/notes/documentation | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/admin/notes/documentation b/admin/notes/documentation
index f6fa321b217..d355ad06412 100644
--- a/admin/notes/documentation
+++ b/admin/notes/documentation
@@ -106,7 +106,7 @@ For instance, this
     anywhere in sight is too confusing.
 
 may not need mentioning, because --daemon will give an error message
-saying it's not implemented, and other cases aren't affected.
+saying it is not implemented, and other cases aren't affected.
 
 The kind of change for which the user really needs help from Antinews
 is where a feature works _differently_ in the previous version.
@@ -164,3 +164,5 @@ like subr.el, which are not quoted.
 Call 'emacs-news-view-mode'.  Lisp symbols and Info manual links shall
 be decorated, and clicking on them shall lead to the respective Help
 buffer or Info node.
+
+*** Do not use "it's", "you're" and alike.

From cbc912ed637a62f98a341fd488e948c245a0896f Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 4 May 2026 16:08:43 +0200
Subject: [PATCH 334/463] ; * admin/notes/jargon: Add entries.

---
 admin/notes/jargon | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/admin/notes/jargon b/admin/notes/jargon
index 22e72f997b8..35f7a8c1037 100644
--- a/admin/notes/jargon
+++ b/admin/notes/jargon
@@ -54,6 +54,7 @@ GNU      - GNU is not Unix
 HTH      - hope this helps
 IANAL    - I am not a lawyer
 ICYMI    - in case you missed it
+IDK      - I don't know
 IIRC     - if I recall correctly
 IIUC     - if I understand correctly
 IMHO     - in my humble opinion
@@ -62,6 +63,7 @@ IMO      - in my opinion
 IOW      - in other words
 LGTM     - looks good to me
 LMK      - let me know
+MRE      - minimal reproducible example
 OOO      - out of office
 OOTB     - out of the box
 OTOH     - on the other hand

From 9c0a699c59ebe127950cf561b98a40f6e5916a03 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 4 May 2026 16:09:10 +0200
Subject: [PATCH 335/463] Adaot tramp-tests.el

* test/lisp/net/tramp-tests.el (ert-remote-temporary-file-directory):
Ensure that it is expanded.
---
 test/lisp/net/tramp-tests.el | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index a19a17dcecf..05c3f72229d 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -219,16 +219,13 @@
     '(fset 'tramp-gvfs-handler-askquestion
 	   (lambda (_message _choices) '(t nil 0)))))
 
-(defconst tramp-test-vec
-  (and (file-remote-p ert-remote-temporary-file-directory)
-       (tramp-dissect-file-name ert-remote-temporary-file-directory))
-  "The used `tramp-file-name' structure.")
-
 (setq auth-source-cache-expiry nil
       auth-source-save-behavior nil
       auto-revert-remote-files t
       auto-revert-use-notify t
       ert-batch-backtrace-right-margin nil
+      ert-remote-temporary-file-directory
+      (expand-file-name ert-remote-temporary-file-directory)
       password-cache-expiry nil
       remote-file-name-inhibit-cache nil
       tramp-allow-unsafe-temporary-files t
@@ -239,6 +236,11 @@
       tramp-verbose 0
       vc-handled-backends (unless noninteractive vc-handled-backends))
 
+(defconst tramp-test-vec
+  (and (file-remote-p ert-remote-temporary-file-directory)
+       (tramp-dissect-file-name ert-remote-temporary-file-directory))
+  "The used `tramp-file-name' structure.")
+
 (defconst tramp-test-name-prefix "tramp-test"
   "Prefix to use for temporary test files.")
 

From a952324e9be37869158e8a9cc4f676fa6113a343 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 1 May 2026 13:17:20 -0400
Subject: [PATCH 336/463] keyboard.c: Allow SIGINT to `quit` in batch mode,
 instead of exit

In terminal sessions, SIGINT is turned into a `quit` ELisp signal,
but in batch it has traditionally killed Emacs.  It can be very
useful to cause a `quit` from outside the process when running
in batch (e.g. for "batch" sessions that provide a REPL via stdin/out),
so add a new var 'kill-emacs-on-sigint' to control that behavior.
(bug#80942)

* src/keyboard.c (handle_interrupt_signal): Obey `kill_emacs_on_sigint`.
(init_keyboard): Use `deliver_interrupt_signal` for SIGINT also for
batch sessions.
(syms_of_keyboard): New variable `kill_emacs_on_sigint`.

* test/src/keyboard-tests.el (keyboard-sigint-to-quit): New test.

* doc/emacs/cmdargs.texi (Initial Options): Mention the effect of
`kill-emacs-on-sigint` in batch mode.
---
 doc/emacs/cmdargs.texi     |  7 ++++++-
 etc/NEWS                   |  8 ++++++++
 src/keyboard.c             | 37 +++++++++++++++++++++++++------------
 test/src/keyboard-tests.el | 28 ++++++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 5a3c1c14ab1..f9904d1f2e6 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -260,9 +260,14 @@ on.  To invoke a Lisp program, use the @samp{-batch} option in
 conjunction with one or more of @samp{-l}, @samp{-f} or @samp{--eval}
 (@pxref{Action Arguments}).  @xref{Command Example}, for an example.
 
+@vindex kill-emacs-on-sigint
 In batch mode, Emacs does not display the text being edited, and the
 standard terminal interrupt characters such as @kbd{C-z} and @kbd{C-c}
-have their usual effect.  Emacs functions that normally print a
+have their usual effect: for @kbd{C-c} that effect is either to
+exit Emacs or to signal @code{quit}, depending on the variable
+@code{kill-emacs-on-sigint}.
+
+Emacs functions that normally print a
 message in the echo area will print to either the standard output
 stream (@code{stdout}) or the standard error stream (@code{stderr})
 instead.  (To be precise, functions like @code{prin1}, @code{princ}
diff --git a/etc/NEWS b/etc/NEWS
index dd9db73285c..8caf6d5cbfa 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -4593,6 +4593,14 @@ is a proper list, in which case the list will be returned as is,
 otherwise the function will return the object wrapped in a
 singleton list.
 
+---
+** In batch mode, 'C-c' (i.e. SIGINT) can either 'quit' or kill Emacs.
+By default it kills Emacs, as before, but 'kill-emacs-on-sigint'
+can be set to nil to change that.
+The response to SIGINT in interactive sessions is unaffected,
+e.g. in a normal GUI session it still kills Emacs whereas in a terminal
+it causes 'quit' since it is used for 'C-g'.
+
 
 * Changes in Emacs 31.1 on Non-Free Operating Systems
 
diff --git a/src/keyboard.c b/src/keyboard.c
index c64b2a6dd57..6f0b5fbb2ec 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -12543,11 +12543,17 @@ handle_interrupt_signal (int sig)
   struct terminal *terminal = get_named_terminal (dev_tty);
   if (!terminal)
     {
-      /* If there are no frames there, let's pretend that we are a
-         well-behaving UN*X program and quit.  We must not call Lisp
+      /* There are no frames, so either 'quit' or exit.
+         If 'kill-emacs-on-sigint', pretend that we are a
+         well-behaving UN*X program and exit.  We must not call Lisp
          in a signal handler, so tell maybe_quit to exit when it is
          safe.  */
-      Vquit_flag = Qkill_emacs;
+      Vquit_flag = (kill_emacs_on_sigint
+		    /* Don't risk running ELisp code while shutting down
+		       and limit the effect of 'kill_emacs_on_sigint'
+		       to batch sessions.  */
+		    || NILP (Vrun_hooks) || !noninteractive
+		    ? Qkill_emacs : Qt);
     }
   else
     {
@@ -13224,17 +13230,18 @@ init_keyboard (void)
      it for the initial terminal since there is no window system there.  */
   init_kboard (current_kboard, Qnil);
 
+  /* Before multi-tty support, these handlers used to be installed
+     only if the current session was a tty session.  Now an Emacs
+     session may have multiple display types, so we always handle
+     SIGINT.  There is special code in handle_interrupt_signal to exit
+     Emacs on SIGINT when there are no termcap frames on the
+     controlling terminal.  */
+  struct sigaction action;
+  emacs_sigaction_init (&action, deliver_interrupt_signal);
+  sigaction (SIGINT, &action, 0);
+
   if (!noninteractive)
     {
-      /* Before multi-tty support, these handlers used to be installed
-         only if the current session was a tty session.  Now an Emacs
-         session may have multiple display types, so we always handle
-         SIGINT.  There is special code in handle_interrupt_signal to exit
-         Emacs on SIGINT when there are no termcap frames on the
-         controlling terminal.  */
-      struct sigaction action;
-      emacs_sigaction_init (&action, deliver_interrupt_signal);
-      sigaction (SIGINT, &action, 0);
 #ifndef DOS_NT
       /* For systems with SysV TERMIO, C-g is set up for both SIGINT and
 	 SIGQUIT and we can't tell which one it will give us.  */
@@ -13401,6 +13408,12 @@ syms_of_keyboard (void)
 	       doc: /* Message displayed by `normal-top-level'.  */);
   Vinternal__top_level_message = regular_top_level_message;
 
+  DEFVAR_BOOL ("kill-emacs-on-sigint", kill_emacs_on_sigint,
+	       doc: /* If non-nil, a SIGINT event causes Emacs to exit.
+If nil, a SIGINT event causes a `quit` signal instead.
+This is effective only in `noninteractive' sessions.  */);
+  kill_emacs_on_sigint = true;
+
   /* Tool-bars.  */
   DEFSYM (QCimage, ":image");
   DEFSYM (Qhelp_echo, "help-echo");
diff --git a/test/src/keyboard-tests.el b/test/src/keyboard-tests.el
index ae47e4b3b4b..e4a1bf36a63 100644
--- a/test/src/keyboard-tests.el
+++ b/test/src/keyboard-tests.el
@@ -81,6 +81,34 @@
     (should-error (read-event "foo: "))
     (should-error (read-char-exclusive "foo: "))))
 
+(ert-deftest keyboard-sigint-to-quit () ;; bug#80942
+  (with-temp-buffer
+    (let* ((exit-msg "Exit via Quit")
+           (proc
+            (make-process
+             :name "keyboard-sigint-to-quit"
+             :buffer (current-buffer)
+             :command
+             `(,(expand-file-name invocation-name invocation-directory)
+               "-Q" "--batch" "--eval"
+               ,(prin1-to-string
+                 `(progn (setq kill-emacs-on-sigint nil)
+                         (message "Ready!")
+                         (condition-case nil
+                             (dotimes (_ 3) (sit-for 1))
+                           (quit (message "%s" ,exit-msg)))))))))
+      (while (progn (accept-process-output proc 1.0)
+                    (goto-char (point-min))
+                    (not (re-search-forward "Ready!" nil t)))
+        ) ;; (message "Waiting for subprocess to be ready")
+      ;; (message "Subprocess is ready")
+      (interrupt-process proc)
+      (while (prog1 (memq (process-status proc) '(run))
+               (accept-process-output proc 1.0))
+        ) ;; (message "Waiting for subprocess to exit")
+      (goto-char (point-min))
+      (should (re-search-forward exit-msg nil t)))))
+
 ;;; Tests for `read-key-sequence' code paths.
 
 ;;;; Helpers

From bc4a4500fc7e0d1add19f45629abf42ce1265e77 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 4 May 2026 19:37:02 -0400
Subject: [PATCH 337/463] lisp/emacs-lisp/lisp-mode.el (lisp-fdefs): Avoid
 obsolete "face vars"

---
 lisp/emacs-lisp/lisp-mode.el | 64 +++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index c326c110408..a28123088ce 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -432,10 +432,11 @@ This will generate compile-time constants from BINDINGS."
                   "\\(([ \t']*\\)?" ;; An opening paren.
                   "\\(\\(setf\\)[ \t]+" (rx lisp-mode-symbol)
                   "\\|" (rx lisp-mode-symbol) "\\)?")
-          (1 font-lock-keyword-face)
-          (3 (let ((type (get (intern-soft (match-string 1)) 'lisp-define-type)))
-               (cond ((eq type 'var) font-lock-variable-name-face)
-                     ((eq type 'type) font-lock-type-face)
+          (1 'font-lock-keyword-face)
+          (3 (let ((type (get (intern-soft (match-string 1))
+                              'lisp-define-type)))
+               (cond ((eq type 'var) 'font-lock-variable-name-face)
+                     ((eq type 'type) 'font-lock-type-face)
                      ;; If match-string 2 is non-nil, we encountered a
                      ;; form like (defalias (intern (concat s "-p"))),
                      ;; unless match-string 4 is also there.  Then its a
@@ -443,12 +444,12 @@ This will generate compile-time constants from BINDINGS."
                      ((or (not (match-string 2)) ;; Normal defun.
                           (and (match-string 2)  ;; Setf method.
                                (match-string 4)))
-                      font-lock-function-name-face)))
+                      'font-lock-function-name-face)))
              nil t))
         ;; Emacs Lisp autoload cookies.  Supports the slightly different
         ;; forms used by mh-e, calendar, etc.
-        (,lisp-mode-autoload-regexp (3 font-lock-warning-face prepend)
-                                    (2 font-lock-function-name-face prepend t)))
+        (,lisp-mode-autoload-regexp (3 'font-lock-warning-face prepend)
+                                    (2 'font-lock-function-name-face prepend t)))
       "Subdued level highlighting for Emacs Lisp mode.")
 
     (defconst lisp-cl-font-lock-keywords-1
@@ -459,14 +460,15 @@ This will generate compile-time constants from BINDINGS."
                   "\\(([ \t']*\\)?" ;; An opening paren.
                   "\\(\\(setf\\)[ \t]+" (rx lisp-mode-symbol)
                   "\\|" (rx lisp-mode-symbol) "\\)?")
-          (1 font-lock-keyword-face)
-          (3 (let ((type (get (intern-soft (match-string 1)) 'lisp-define-type)))
-               (cond ((eq type 'var) font-lock-variable-name-face)
-                     ((eq type 'type) font-lock-type-face)
+          (1 'font-lock-keyword-face)
+          (3 (let ((type (get (intern-soft (match-string 1))
+                              'lisp-define-type)))
+               (cond ((eq type 'var) 'font-lock-variable-name-face)
+                     ((eq type 'type) 'font-lock-type-face)
                      ((or (not (match-string 2)) ;; Normal defun.
                           (and (match-string 2)  ;; Setf function.
                                (match-string 4)))
-                      font-lock-function-name-face)))
+                      'font-lock-function-name-face)))
              nil t)))
       "Subdued level highlighting for Lisp modes.")
 
@@ -476,17 +478,17 @@ This will generate compile-time constants from BINDINGS."
       (append
        lisp-el-font-lock-keywords-1
        `( ;; Regexp negated char group.
-         ("\\[\\(\\^\\)" 1 font-lock-negation-char-face prepend)
+         ("\\[\\(\\^\\)" 1 'font-lock-negation-char-face prepend)
          ;; Erroneous structures.
          (,(concat "(" el-errs-re "\\_>")
-          (1 font-lock-warning-face))
+          (1 'font-lock-warning-face))
          ;; Control structures.  Common Lisp forms.
          (lisp--el-match-keyword . 1)
          ;; Exit/Feature symbols as constants.
          (,(concat "(\\(catch\\|throw\\|featurep\\|provide\\|require\\)\\_>"
                    "[ \t']*\\(" (rx lisp-mode-symbol) "\\)?")
-           (1 font-lock-keyword-face)
-           (2 font-lock-constant-face nil t))
+           (1 'font-lock-keyword-face)
+           (2 'font-lock-constant-face nil t))
          ;; Words inside \\[], \\<>, \\{} or \\`' tend to be for
          ;; `substitute-command-keys'.
          (,(rx "\\\\" (or (seq "["
@@ -495,27 +497,27 @@ This will generate compile-time constants from BINDINGS."
                                      ;; allow multiple words, e.g. "C-x a"
                                      lisp-mode-symbol (* " " lisp-mode-symbol))
                                "'")))
-          (1 font-lock-constant-face prepend))
+          (1 'font-lock-constant-face prepend))
          (,(rx "\\\\" (or (seq "<"
                                (group-n 1 (seq lisp-mode-symbol (not "\\"))) ">")
                           (seq "{"
                                (group-n 1 (seq lisp-mode-symbol (not "\\"))) "}")))
-          (1 font-lock-variable-name-face prepend))
+          (1 'font-lock-variable-name-face prepend))
          ;; Ineffective backslashes (typically in need of doubling).
          ("\\(\\\\\\)\\([^\"\\]\\)"
           (1 (elisp--font-lock-backslash) prepend))
          ;; Words inside ‘’, '' and `' tend to be symbol names.
          (,(concat "[`‘']\\(" (rx lisp-mode-symbol) "\\)['’]")
-          (1 font-lock-constant-face prepend))
+          (1 'font-lock-constant-face prepend))
          ;; \\= tends to be an escape in doc strings.
          (,(rx "\\\\=")
-          (0 font-lock-builtin-face prepend))
+          (0 'font-lock-builtin-face prepend))
          ;; Constant values.
          (,(lambda (bound) (lisp-mode--search-key ":" bound))
-          (0 font-lock-builtin-face))
+          (0 'font-lock-builtin-face))
          ;; Elisp and Common Lisp `&' keywords as types.
          (,(lambda (bound) (lisp-mode--search-key "&" bound))
-          (0 font-lock-type-face))
+          (0 'font-lock-type-face))
          ;; Elisp regexp grouping constructs
          (,(lambda (bound)
              (catch 'found
@@ -546,31 +548,31 @@ This will generate compile-time constants from BINDINGS."
       (append
        lisp-cl-font-lock-keywords-1
        `( ;; Regexp negated char group.
-         ("\\[\\(\\^\\)" 1 font-lock-negation-char-face prepend)
+         ("\\[\\(\\^\\)" 1 'font-lock-negation-char-face prepend)
          ;; Control structures.  Common Lisp forms.
          (,(concat "(" cl-kws-re "\\_>") . 1)
          ;; Exit/Feature symbols as constants.
          (,(concat "(\\(catch\\|throw\\|provide\\|require\\)\\_>"
                    "[ \t']*\\(" (rx lisp-mode-symbol) "\\)?")
-           (1 font-lock-keyword-face)
-           (2 font-lock-constant-face nil t))
+           (1 'font-lock-keyword-face)
+           (2 'font-lock-constant-face nil t))
          ;; Erroneous structures.
          (,(concat "(" cl-errs-re "\\_>")
-           (1 font-lock-warning-face))
+           (1 'font-lock-warning-face))
          ;; Words inside ‘’ and `' tend to be symbol names.
          (,(concat "[`‘]\\("
                    (rx (* lisp-mode-symbol (+ space)) lisp-mode-symbol)
                    "\\)['’]")
-          (1 font-lock-constant-face prepend))
+          (1 'font-lock-constant-face prepend))
          ;; Uninterned symbols, e.g., (defpackage #:my-package ...)
          ;; must come before keywords below to have effect
-         (,(concat "#:" (rx lisp-mode-symbol) "") 0 font-lock-builtin-face)
+         (,(concat "#:" (rx lisp-mode-symbol) "") 0 'font-lock-builtin-face)
          ;; Constant values.
          (,(lambda (bound) (lisp-mode--search-key ":" bound))
-          (0 font-lock-builtin-face))
+          (0 'font-lock-builtin-face))
          ;; Elisp and Common Lisp `&' keywords as types.
          (,(lambda (bound) (lisp-mode--search-key "&" bound))
-          (0 font-lock-type-face))
+          (0 'font-lock-type-face))
          ;; Elisp regexp grouping constructs
          ;; This is too general -- rms.
          ;; A user complained that he has functions whose names start with `do'
@@ -578,7 +580,7 @@ This will generate compile-time constants from BINDINGS."
          ;; That user has violated the https://www.cliki.net/Naming+conventions:
          ;; CL (but not EL!) `with-' (context) and `do-' (iteration)
          (,(concat "(\\(\\(do-\\|with-\\)" (rx lisp-mode-symbol) "\\)")
-           (1 font-lock-keyword-face))
+           (1 'font-lock-keyword-face))
          (lisp--match-hidden-arg
           (0 '(face font-lock-warning-face
                help-echo "Easy to misread; consider moving the element to the next line")

From ed1fe2ca9590a97aee62f74630f7f1f9d795bcb2 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 4 May 2026 20:21:31 -0400
Subject: [PATCH 338/463] nadvice.el: Make it easier to find how to change an
 interactive-form

* lisp/emacs-lisp/nadvice.el (advice--how-alist): Add ':interactive-only'.
* doc/lispref/functions.texi (Advice Combinators): Document it.
(Core Advising Primitives): Use it.
---
 doc/lispref/functions.texi | 24 ++++++++++++++++++------
 etc/NEWS                   |  6 ++++++
 lisp/emacs-lisp/nadvice.el |  3 ++-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 5444cea7fa9..53597236da8 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -2100,6 +2100,7 @@ Call the function @var{f} for every piece of advice that was added to
 and its properties.
 @end defun
 
+@anchor{advice-eval-interactive-spec}
 @defun advice-eval-interactive-spec spec
 Evaluate the interactive @var{spec} just like an interactive call to a function
 with such a spec would, and then return the corresponding list of arguments
@@ -2112,7 +2113,7 @@ For instance, if you want to make the @kbd{C-x m}
 could say something like this:
 
 @example
-(defun my-compose-mail-advice (orig &rest args)
+(defun my-compose-mail-advice (&rest _)
   "Read From: address interactively."
   (interactive
    (lambda (spec)
@@ -2126,9 +2127,10 @@ could say something like this:
        ;; Put the From header into the OTHER-HEADERS argument.
        (push (cons 'From from) (nth 2 spec))
        spec)))
-  (apply orig args))
+  ;; This body is not used.
+  nil)
 
-(advice-add 'compose-mail :around #'my-compose-mail-advice)
+(advice-add 'compose-mail :interactive-only #'my-compose-mail-advice)
 @end example
 @end defun
 
@@ -2148,8 +2150,8 @@ instead.  This separate set of functions to manipulate pieces of advice applied
 to named functions, offers the following extra features compared to
 @code{add-function}: they know how to deal with macros and autoloaded
 functions, they let @code{describe-function} preserve the original docstring as
-well as document the added advice, and they let you add and remove advice
-before a function is even defined.
+well as document the added advice, and they let you add and remove
+pieces of advice before a function is even defined.
 
   @code{advice-add} can be useful for altering the behavior of existing calls
 to an existing function without having to redefine the whole function.
@@ -2338,8 +2340,18 @@ More specifically, the composition of the two functions behaves like:
 @example
 (lambda (&rest r) (funcall @var{function} (apply @var{oldfun} r)))
 @end example
-@end table
 
+@item :interactive-only
+While the @var{where} option controls how the body of the two functions
+are composed, it does not actually affect the way interactive forms are
+composed.  So, in a sense, this does the opposite of @code{:override}:
+call only the old function as if no advice was applied.  But it still
+affects the interactive form like any other @var{where} value would: The
+interactive form of @var{function}, if any, overrides that of
+@var{oldfun} and if it is a lambda expression, it receives
+@var{function}'s interactive form as argument.
+See @pxref{advice-eval-interactive-spec} for an example.
+@end table
 
 @node Porting Old Advice
 @subsection Adapting code using the old defadvice
diff --git a/etc/NEWS b/etc/NEWS
index 8caf6d5cbfa..f8d3fc9960e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -4601,6 +4601,12 @@ The response to SIGINT in interactive sessions is unaffected,
 e.g. in a normal GUI session it still kills Emacs whereas in a terminal
 it causes 'quit' since it is used for 'C-g'.
 
++++
+** New ':interactive-only' way to add an advice.
+While it is marginally more efficient than ':after' or ':before',
+the main purpose it to make the intention more obvious when the advice
+modifies only the interactive form and not the actual behavior
+of the function.
 
 * Changes in Emacs 31.1 on Non-Free Operating Systems
 
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 7421ce079ab..80467caeb40 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -74,7 +74,8 @@
    (:before-until (or (apply car r) (apply cdr r)))
    (:before-while (and (apply car r) (apply cdr r)))
    (:filter-args (apply cdr (funcall car r)))
-   (:filter-return (funcall car (apply cdr r))))
+   (:filter-return (funcall car (apply cdr r)))
+   (:interactive-only (apply cdr r)))
   "List of descriptions of how to add a function.
 Each element has the form (HOW OCL DOC) where HOW is a keyword,
 OCL is a \"prototype\" function of type `advice', and

From b20307c4c789dc33da8ad66794c527b40cf5d81b Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 5 May 2026 07:59:08 +0300
Subject: [PATCH 339/463] ; Fix doc strings of timer-set-* functions

* lisp/emacs-lisp/timer.el (timer-set-time, timer-set-idle-time):
Doc fix.
---
 lisp/emacs-lisp/timer.el | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 84b9e6789da..3b5405b500b 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -90,7 +90,8 @@
 
 (defun timer-set-time (timer time &optional delta)
   "Set the trigger time of TIMER to TIME.
-TIME must be a Lisp time value.
+TIME must be a Lisp time value: an integer, a floating-point number,
+or a value in the internal time format returned by, e.g., `current-time'.
 If optional third argument DELTA is a positive number, make the timer
 fire repeatedly that many seconds apart."
   (setf (timer--time timer) time)
@@ -100,8 +101,8 @@ fire repeatedly that many seconds apart."
 (defun timer-set-idle-time (timer secs &optional repeat)
   ;; FIXME: Merge with timer-set-time.
   "Set the trigger idle time of TIMER to SECS.
-SECS may be an integer, floating point number, or the internal
-time format returned by, e.g., `current-idle-time'.
+SECS may be an integer, floating point number, or a value in
+the internal time format returned by, e.g., `current-idle-time'.
 If optional third argument REPEAT is non-nil, make the timer
 fire each time Emacs is idle for that many seconds."
   (setf (timer--time timer) secs)

From 151ea29a8e2f486e4725a16a05c18fe6f6f9a6ef Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 5 May 2026 10:05:28 +0300
Subject: [PATCH 340/463] ; Fix doc string of 'elisp-fontify-semantically'
 (bug#80948)

* lisp/progmodes/elisp-mode.el (elisp-fontify-semantically): Doc fix.
---
 lisp/progmodes/elisp-mode.el | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index cf380ada975..ce338cb06f1 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -287,6 +287,10 @@ If this is non-nil, `emacs-lisp-mode' uses code analysis to determine
 the role of each symbol and highlight it accordingly.  We call this kind
 of highlighting \"semantic highlighting\".
 
+If `elisp-add-help-echo' is non-nil, also annotate the symbol with the
+`help-echo' text property.  If `cursor-sensor-mode' is enabled,
+also optionally annotate the symbol with `cursor-sensor-functions'.
+
 Semantic highlighting works best when you keep your code syntactically
 correct while editing it, for example by using `electric-pair-mode'.
 

From b36a26bb3b81c5573f50d05d432061ed2d68c1f4 Mon Sep 17 00:00:00 2001
From: Rahul Martim Juliato <rahul.juliato@gmail.com>
Date: Fri, 3 Apr 2026 23:41:47 -0300
Subject: [PATCH 341/463] Improve 'markdown-ts-mode'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Overhaul 'markdown-ts-mode' with comprehensive fontification,
code block handling, editing commands, fill-paragraph support,
inline image previews, a mode menu, and table editing.  Add
'markdown-ts-mode-x.el' with conversion/export and TOC support.

* lisp/textmodes/markdown-ts-mode.el: Add Version,
Package-Requires, and Keywords header fields.  Expand Commentary
with documentation for code block language modes, code block
commands, bidirectional text, and known tree-sitter grammar
bugs.
(require 'goto-addr, xref, icons): New requirements.
(markdown-ts): New customization group with :version and
:package-version tags.
(markdown-ts-hide-markup): Add :version and :package-version.
(markdown-ts-ellipsis): New option for folded heading ellipsis.
(markdown-ts-menu-bar-show): New option to toggle mode menu.
(markdown-ts-default-folding): New option for default fold
level.
(markdown-ts-inline-images): New option to display inline
images.
(markdown-ts-image-max-width): New option for image max width.
(markdown-ts-display-remote-inline-images): New option for
remote image handling.
(markdown-ts--resolve-display-value): New helper to resolve
display values using char-displayable-p.
(markdown-ts-checked-checkbox): New option for checked checkbox
display string or icon.
(markdown-ts-checked-checkbox-icon): New icons.el icon for the
checked variant.
(markdown-ts-unchecked-checkbox): New option for unchecked
checkbox display string or icon.
(markdown-ts-unchecked-checkbox-icon): New icons.el icon for the
unchecked variant.
(markdown-ts-thematic-break-character): New option for thematic
break display character.
(markdown-ts-hard-line-break-backslash): New option for the
glyph shown in place of a trailing-backslash hard line break
when markup is hidden.
(markdown-ts-hard-line-break-space): New option for the glyph
shown in place of a trailing-spaces hard line break when markup
is hidden.
(markdown-ts-code-block-in-context-mode-lighter): New option for
code block context mode lighter string.
(markdown-ts-inhibit-code-block-mode-warnings): New option to
inhibit code-block major-mode messages and warnings.
(markdown-ts-table-default-column-width): New option for default
table column width.
(markdown-ts-enable-table-mode): New option to enable table
mode.
(markdown-ts-table-auto-align): New option for triggers that
cause automatic table alignment.
(markdown-ts-table-align-features): New option for table align
features.
(markdown-ts-in-table-mode-lighter): New option for
markdown-ts-in-table-mode lighter string.
(markdown-ts-emphasis, markdown-ts-bold)
(markdown-ts-strikethrough, markdown-ts-link)
(markdown-ts-link-destination, markdown-ts-code-span)
(markdown-ts-code-block, markdown-ts-code-block-markup-hidden)
(markdown-ts-indented-code-block, markdown-ts-html-tag)
(markdown-ts-html-block, markdown-ts-thematic-break)
(markdown-ts-entity-reference)
(markdown-ts-numeric-character-reference, markdown-ts-latex)
(markdown-ts-table-header, markdown-ts-table-cell)
(markdown-ts-table-delimiter-cell, markdown-ts-task-unchecked)
(markdown-ts-task-checked): New faces.
(markdown-ts-hard-line-break-backslash)
(markdown-ts-hard-line-break-backslash-hidden)
(markdown-ts-hard-line-break-space)
(markdown-ts-hard-line-break-space-hidden): New faces for the
two hard-line-break variants, with distinct shown/hidden
appearances.
(markdown-ts-in-code-block): New face for when point is inside a
fenced code block.
(markdown-ts-table): New face for Markdown pipe table
background.
(markdown-ts-in-table): New face for markdown-ts-in-table-mode
when point is in a table.
(markdown-ts--set-up-inline): New variable for lightweight setup
in embedded inline markdown-ts-mode buffers used by code block
commands.
(markdown-ts-default-code-block-mode): New variable to define
default mode for anonymous code blocks.
(markdown-ts-fontify-code-blocks-natively): New option to
enable/disable native fontification of fenced code block
contents.
(markdown-ts-enable-code-block-context-mode): New option to
enable/disable code block context integration.
(markdown-ts-code-block-modes): New variable replacing
markdown-ts--code-block-language-map and
markdown-ts-code-block-source-mode-map with unified language to
mode mapping including heuristic lookup.
(markdown-ts-code-block-force-conventional-modes): New variable
listing tree-sitter modes whose fontification of code block
content should be harvested via a temporary buffer.
(markdown-ts-table-export-buffer): New constant for table export
output buffer name.
(markdown-ts--table-row-types, markdown-ts--table-cell-types)
(markdown-ts--table-delimiter-cell-types)
(markdown-ts--table-delimiter-cell-subtypes): New constants for
pipe table node type classification.
(markdown-ts--make-link-button): New function to create
clickable link buttons with mailto, browse-url, and find-file
dispatch.
(markdown-ts--fontify-link-destination): New fontifier that
hides link destinations when markup is hidden.
(markdown-ts--link-ref-cache, markdown-ts--link-ref-cache-tick)
(markdown-ts--link-ref-definitions)
(markdown-ts--resolve-link-ref): New link reference definition
cache with case-insensitive matching per CommonMark spec.
(markdown-ts--fontify-link-node): New fontifier for inline,
reference, shortcut, and collapsed links as clickable buttons.
(markdown-ts--fontify-autolink): New fontifier for URI and email
autolinks with angle bracket hiding.
(markdown-ts--fontify-link-ref-label)
(markdown-ts--fontify-link-ref-destination): New fontifiers for
link reference definitions.
(markdown-ts--slug-github-strip-re, markdown-ts--slug-github)
(markdown-ts--slug-pandoc, markdown-ts--explicit-id-re)
(markdown-ts--heading-text-and-id)
(markdown-ts--heading-id-cache)
(markdown-ts--heading-id-cache-tick)
(markdown-ts--build-heading-ids, markdown-ts--heading-ids)
(markdown-ts--follow-fragment): New fragment link support with
GitHub and Pandoc slug algorithms.
(markdown-ts--latex-block-valid-p)
(markdown-ts--fontify-latex-block): New LaTeX/math fontifier
with cross-paragraph validation.
(markdown-ts--fontify-backslash-escape): New fontifier that
hides backslash in escapes except inside LaTeX blocks.
(markdown-ts--decode-entity, markdown-ts--fontify-entity): New
HTML entity decoder and fontifier using org-entities and
sgml-char-names with display property for decoded values.
(markdown-ts--fontify-checkbox): New fontifier showing the
configured checkbox glyph when markup is hidden.
(markdown-ts--fontify-hard-line-break): New fontifier for
'hard_line_break' nodes.
(markdown-ts--fontify-heading): New fontifier for ATX and Setext
headings.
(markdown-ts--fontify-thematic-break): New fontifier showing
horizontal line when markup is hidden.
(markdown-ts--fontify-code-block): New fontifier applying
background overlay to code blocks with language and mode
properties.
(markdown-ts-at-code-block-p)
(markdown-ts-code-block-language-at)
(markdown-ts-code-block-mode-at): New accessors for code block
overlay properties.
(markdown-ts--imenu-code-block-node-p): New helper for imenu
code block detection.
(markdown-ts--image-alone-on-line-p)
(markdown-ts--fontify-image): New inline image display with
standalone and inline positioning.
(markdown-ts--bare-url-regexp)
(markdown-ts--bare-email-uri-regexp)
(markdown-ts--fontify-bare-uri): New bare URL/email
fontification via jit-lock using goto-addr regexps.
(markdown-ts--treesit-settings): Rewrite with dedicated faces,
custom fontifiers, and new font-lock features for all inline and
block elements.  Also add a new 'error' font-lock feature
highlighting tree-sitter ERROR nodes.
(markdown-ts--code-block-languages)
(markdown-ts--code-block-non-ts-modes): New buffer-local alists
for code block language tracking.
(markdown-ts--harvest-mode-treesit-configuration): Rename from
markdown-ts--harvest-treesit-configs with delay-mode-hooks.
(markdown-ts--configure-current-buffer): Rename from
markdown-ts--add-config-for-mode.
(markdown-ts--language-at-node): New helper extracting language
symbol from code_fence_content node.
(markdown-ts--non-ts-fontify-cache): New buffer-local hash table
caching fontification results for non-tree-sitter code blocks.
(markdown-ts--fontify-non-ts-collect-faces): New function
harvesting face properties from a mode in an indirect or
temporary buffer.
(markdown-ts--fontify-non-ts-code-block): New fontifier for
non-tree-sitter modes via temporary buffer font-lock.
(markdown-ts--code-block-language-mode): New function with
heuristic mode name probing.
(markdown-ts--code-block-ts-language): Rename from
markdown-ts--convert-code-block-language with support for non-ts
modes and recursive markdown handling.
(markdown-ts-code-block-commands)
(markdown-ts-code-block-thing-commands)
(markdown-ts-code-block-region-commands): New command lists for
code-block context execution.
(markdown-ts--enable-code-block-in-context-mode)
(markdown-ts--maybe-run-command-in-code-block)
(markdown-ts--code-block-xref-find-definitions)
(markdown-ts--run-command-in-code-block): New code block minor
mode with temp-buffer command dispatch.
(markdown-ts--code-block-newline): New command for newline
inside code blocks, dispatching to the block's mode.
(markdown-ts--range-settings): Update range configuration;
remove :range-fn treesit-range-fn-exclude-children.
(markdown-ts--remove-image-overlays)
(markdown-ts--outline-view-change): New helpers for image
overlay management during outline fold/unfold.
(markdown-ts--outline-invisible-p): New helper testing whether a
position is inside an outline-folded region.
(markdown-ts--host-ranges-notifier): New function pruning stale
code block overlays when the host parse tree changes.
(markdown-ts--barf-if-not-mode): New helper signaling a
user-error when the current buffer is not derived from
markdown-ts-mode.
(markdown-ts-code-block-in-context-mode): New minor mode enabled
when point is within a fenced code block, activating
markdown-ts-code-block-in-context-mode-map so eligible commands
dispatch to the block's major mode.
(markdown-ts--set-hide-markup): Clear image overlays when
toggling markup visibility.
(markdown-ts--set-inline-images)
(markdown-ts-toggle-inline-images): New functions for toggling
inline image display.
(markdown-ts--parser-heading-max-level): New constant.
(markdown-ts--heading-at-point, markdown-ts--heading-level)
(markdown-ts--section-at-point): New heading navigation helpers.
(markdown-ts-promote, markdown-ts-demote): New commands for
heading and list item promotion/demotion with region support.
(markdown-ts--promote-or-demote)
(markdown-ts--promote-or-demote-region): New heading level
adjustment functions.
(markdown-ts-move-subtree-up, markdown-ts-move-subtree-down):
New commands for moving sections and list items.
(markdown-ts--section-folded-p)
(markdown-ts--move-subtree-up-or-down): New subtree move with
folding state preservation.
(markdown-ts-toggle-checkbox): New command to toggle task list
checkboxes.
(markdown-ts--list-item-at-point): New helper with block quote
marker handling.
(markdown-ts--list-marker-width, markdown-ts--list-item-region)
(markdown-ts--list-ordered-item-p): New list item helpers.
(markdown-ts--list-promote-or-demote): New function with ordered
list nesting guard.
(markdown-ts--list-node-bol, markdown-ts--list-move): New list
item movement functions.
(markdown-ts-renumber-list): New command for sequential list
renumbering with prefix argument support.
(markdown-ts--list-item-new-marker)
(markdown-ts--new-marker-for-line): New marker string generators
for list item insertion.
(markdown-ts--line-block-quote-depth): New helper counting block
quote depth.
(markdown-ts-newline): New RET command for context-aware
newline.
(markdown-ts-insert-list-item): New M-RET command that creates a
new list item.
(markdown-ts--fill-unfillable-block-query): New tree-sitter
query for unfillable blocks.
(markdown-ts--list-item-text-column): New helper for list item
text alignment.
(markdown-ts--fill-list-item): New function filling within list
items without merging adjacent items.
(markdown-ts--adaptive-fill): New adaptive fill function for
list item continuation.
(markdown-ts--fill-forward-paragraph): New paragraph motion
respecting list items and unfillable blocks.
(markdown-ts-fill-paragraph): New fill-paragraph-function with
cond* dispatch for lists, block quotes, HTML comments, and
unfillable blocks.
(markdown-ts--fill-html-comment): New HTML comment filler with
continuation alignment.
(markdown-ts--block-quote-prefix): New helper preserving
existing block quote marker style.
(markdown-ts--fill-block-quote): New block quote filler with
list item text column alignment.
(markdown-ts-emphasis-alist): New alist of emphasis markers.
(markdown-ts--emphasis-node-at-point): New tree-sitter based
emphasis detection.
(markdown-ts-remove-emphasis): New command removing emphasis at
point or region.
(markdown-ts-emphasize): New interactive emphasis insertion with
region wrapping and word-at-point support.
(markdown-ts-insert-structure): New command for inserting code
blocks, block quotes, and dividers.
(markdown-ts--insert-code-block): New function with language
completion from known modes.
(markdown-ts--insert-block-quote): New function with region
wrapping.
(markdown-ts--insert-divider): New function for horizontal
rules.
(markdown-ts--apply-ellipsis): New function applying custom
ellipsis via display table.
(markdown-ts--set-up): Rename from markdown-ts-setup.
(markdown-ts-outline-cycle): New TAB command cycling outline
visibility on headings.
(markdown-ts-mode-map): New keymap for code block navigation,
bindings for heading navigation, structure editing, emphasis,
and list operations.
(markdown-ts-code-block-in-context-mode-map): New keymap for
code block context.
(markdown-ts-mode-menu): New menu bar with Show/Hide, Navigate
Headings, Edit Structure, and Editing sections.
(markdown-ts-mode): Add outline-minor-mode, ellipsis, folding,
fill-paragraph integration, code-block-context-mode hooks,
comment settings, and outline-view-change-hook.  Use
markdown-ts-mode directly in auto-mode-alist instead of
markdown-ts-mode-maybe.
(markdown-ts-mode-install-parsers): New command for installing
required and optional tree-sitter language grammars.
(markdown-ts-code-block-context-mode): New minor mode for code
block context.
(markdown-ts--find-code-block-delimiter)
(markdown-ts--find-next-code-block-delimiter): New helpers for
locating fenced code block delimiter nodes.
(markdown-ts-move-to-next-code-block)
(markdown-ts-move-to-previous-code-block): New commands for
navigating between fenced code blocks.
(markdown-ts--table-abutting-pos, markdown-ts--table-node-cell)
(markdown-ts--table-node-row, markdown-ts--table-parse-error-p):
New pipe table node helpers.
(markdown-ts-at-table-p): New predicate returning non-nil when
point is at or within a pipe table.
(markdown-ts--enable-in-table-mode): New helper enabling
markdown-ts-in-table-mode from post-command-hook.
(markdown-ts--table-body-row-near-pos): New helper locating the
nearest body row to a position.
(markdown-ts--table-compute-node-column)
(markdown-ts-table--goto-column): New helpers for column-based
table navigation.
(markdown-ts--table-aligners, markdown-ts--table-make-aligner)
(markdown-ts--table-align-cell): New table cell alignment
helpers.
(markdown-ts-table-insert-table): New command to insert a pipe
table with configurable rows and columns.
(markdown-ts-table-delete-table): New command to delete the pipe
table at point.
(markdown-ts-table-previous-row, markdown-ts-table-next-row)
(markdown-ts-table-previous-cell, markdown-ts-table-next-cell):
New commands for navigating table rows and cells.
(markdown-ts-table-insert-row-below)
(markdown-ts-table-insert-row-above)
(markdown-ts-table-clone-row-below)
(markdown-ts-table-clone-row-above)
(markdown-ts-table-insert-row): New commands for inserting and
cloning table rows.
(markdown-ts-table-delete-row, markdown-ts-table-move-row-up)
(markdown-ts-table-move-row-down, markdown-ts-table-move-row):
New commands for deleting and moving table rows.
(markdown-ts-table-insert-column-left)
(markdown-ts-table-insert-column-right)
(markdown-ts-table-clone-column-left)
(markdown-ts-table-clone-column-right)
(markdown-ts-table-insert-column): New commands for inserting
and cloning table columns.
(markdown-ts-table-delete-column)
(markdown-ts-table-move-column-left)
(markdown-ts-table-move-column-right)
(markdown-ts-table-move-column): New commands for deleting and
moving table columns.
(markdown-ts-table-align-column-left)
(markdown-ts-table-align-column-center)
(markdown-ts-table-align-column-right)
(markdown-ts-table-align-column): New commands for setting
column alignment.
(markdown-ts-table-align-table): New command to align all
columns in the table at point.
(markdown-ts-table-transpose-table): New command to transpose
the table at point.
(markdown-ts-table-convert-csv-region)
(markdown-ts-table-convert-tsv-region)
(markdown-ts-table-convert-region): New commands to convert
delimited text regions to pipe tables.
(markdown-ts-table-export-table-csv)
(markdown-ts-table-export-table-tsv)
(markdown-ts-table-export-table): New commands to export the
pipe table at point to CSV or TSV format.
(markdown-ts-in-table-mode-map): New keymap for
markdown-ts-in-table-mode.
(markdown-ts--code-block-in-context-mode-ov): New buffer-local
variable for code block context overlay.
(markdown-ts--code-block-in-context-mode-update-ov): New
function updating the code block context overlay.
(markdown-ts-in-table-mode): New minor mode enabled when point
is within a pipe table, activating markdown-ts-in-table-mode-map.
(markdown-ts--in-table-mode-ov)
(markdown-ts--in-table-mode-get-ov)
(markdown-ts--table-tick-update)
(markdown-ts--table-tick-stale-p)
(markdown-ts--in-table-mode-update-ov): New helpers supporting
markdown-ts-in-table-mode overlay management.
(markdown-ts-table-mode): New minor mode providing table editing
commands and auto-alignment.
(markdown-ts-mode-maybe): Remove; auto-mode-alist now uses
markdown-ts-mode directly.
Auto-mode-alist: Add .markdown and .mdx extensions.

* lisp/textmodes/markdown-ts-mode-x.el: New file providing extra
features for markdown-ts-mode.
(markdown-ts-commonmark-spec-url, markdown-ts-gfm-spec-url): New
constants for CommonMark and GFM specification URLs.
(markdown-ts-browse-commonmark-spec)
(markdown-ts-browse-gfm-spec): New commands to browse the
CommonMark and GFM specifications.
(markdown-ts-convert): New customization group for Markdown
conversion/export features.
(markdown-ts-default-converter): New option to set the default
format and converter for Markdown export.
(markdown-ts-convert-display-function): New option specifying
the function used to display converted output.
(markdown-ts-converters): New variable listing format/converter
configurations for pandoc, cmark, cmark-gfm, markdown, and
markdown.pl.
(markdown-ts-convert-file, markdown-ts-convert): New commands to
convert Markdown buffers or files to HTML, PDF, and other
formats via external converters.
(markdown-ts-toc): New customization group for table of contents
features.
(markdown-ts-toc-generate-warn-if-none): New option controlling
behavior when no TOC is found during generation.
(markdown-ts-toc-update-before-save-mode-lighter): New option
for the before-save TOC update minor mode lighter string.
(markdown-ts-toc-slug-function): New option to select the slug
algorithm used for TOC heading anchors.
(markdown-ts--toc-handles, markdown-ts--toc-handle-classes): New
variables defining TOC handle types and classes.
(markdown-ts--toc-expand-candidate-handles, markdown-ts--tocs)
(markdown-ts--tocs-sanity-check)
(markdown-ts--toc-collect-candidates)
(markdown-ts--toc-list-item-depth)
(markdown-ts--toc-atx_header-normalize)
(markdown-ts--toc-text-normalizers)
(markdown-ts--toc-text-normalize): New internal helpers for TOC
parsing and text normalization.
(markdown-ts-toc-update-before-save-mode): New minor mode that
regenerates tables of contents before saving.
(markdown-ts-toc-clear-and-remove, markdown-ts-toc-clear): New
commands to remove or clear TOC bodies.
(markdown-ts-toc-insert-template): New command to insert a TOC
template at point.
(markdown-ts-toc-generate): New command to generate tables of
contents in the current buffer.

Includes fixes for: (bug#80613) (bug#80625) (bug#80690)

Co-authored-by: Stéphane Marks <shipmints@gmail.com>
---
 lisp/textmodes/markdown-ts-mode-x.el | 1134 ++++++
 lisp/textmodes/markdown-ts-mode.el   | 5461 ++++++++++++++++++++++++--
 2 files changed, 6305 insertions(+), 290 deletions(-)
 create mode 100644 lisp/textmodes/markdown-ts-mode-x.el

diff --git a/lisp/textmodes/markdown-ts-mode-x.el b/lisp/textmodes/markdown-ts-mode-x.el
new file mode 100644
index 00000000000..7405078ab4b
--- /dev/null
+++ b/lisp/textmodes/markdown-ts-mode-x.el
@@ -0,0 +1,1134 @@
+;;; markdown-ts-mode-x.el --- markdown-ts-mode extras -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2026 Free Software Foundation, Inc.
+
+;; Author           : Rahul Martim Juliato <rahul.juliato@gmail.com>
+;;                  : Stéphane Marks <shipmints@gmail.com>
+;; Maintainer       : Rahul Martim Juliato <rahul.juliato@gmail.com>
+;; Created          : April 2026
+;; Version          : 1.0
+;; Package-Requires : ((emacs "31.1"))
+;; Keywords         : markdown md text edit languages tree-sitter
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'markdown-ts-mode)
+
+;;; Convenience:
+
+(defconst markdown-ts-commonmark-spec-url
+  "https://spec.commonmark.org/current/")
+
+(defconst markdown-ts-gfm-spec-url
+  "https://github.github.com/gfm/")
+
+(defun markdown-ts-browse-commonmark-spec ()
+  "Browse the CommonMark Markdown spec in a web browser."
+  (interactive)
+  (browse-url markdown-ts-commonmark-spec-url))
+
+(defun markdown-ts-browse-gfm-spec ()
+  "Browse the GitHub Flavored Markdown spec in a web browser."
+  (interactive)
+  (browse-url markdown-ts-gfm-spec-url))
+
+;;; Export and preview:
+
+(defgroup markdown-ts-convert nil
+  "Convert `markdown-ts-mode' buffers or files."
+  :prefix "markdown-ts-convert-"
+  :group 'text
+  :group 'editing
+  :version "31.1")
+
+(defcustom markdown-ts-default-converter nil
+  "Default Markdown format and converter.
+If nil, you will be prompted for a format and a converter.
+See `markdown-ts-converters'."
+  :type '(choice (const :tag "Prompt for format and converter" nil)
+                 (const :tag "PDF via Pandoc" (pdf . pandoc))
+                 (const :tag "HTML via Pandoc" (html . pandoc))
+                 (const :tag "HTML via cmark" (html . cmark))
+                 (const :tag "HTML via cmark-gfm (GitHub bells and whistles)" (html . cmark-gfm))
+                 (const :tag "HTML via markdown" (html . markdown))
+                 (const :tag "HTML via markdown.pl" (html . markdown.pl))
+                 (cons  :tag "Format and Converter"
+                        (symbol :tag "Format")
+                        (symbol :tag "Converter")))
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-convert-display-function #'eww-open-file
+  "Function to display converted Markdown the output file.
+The function is called with one argument, the file name."
+  :type '(choice (const :tag "Display using `eww'" eww-open-file)
+                 (const :tag "Display in a browser" browse-url-of-file)
+                 (const :tag "Display output file in a buffer" find-file-other-window)
+                 (function :tag "Other function"))
+  :version "31.1"
+  :package-version "1.0")
+
+(defconst markdown-ts--convert-error-buffer
+  "*markdown-ts-convert errors*")
+
+(defconst markdown-ts--convert-output-buffer
+  "*markdown-ts-convert output*")
+
+(defvar markdown-ts-converters
+  (list
+   (cons 'html
+         (list
+          (cons 'pandoc
+                (list :command "pandoc"
+                      :input '(file stdin)
+                      :output '(file)
+                      :arguments-function
+                      (lambda (input-file output-file)
+                        (append (list "-f" "gfm"
+                                      "-t" "html5"
+                                      "--standalone"
+                                      "-o" output-file)
+                                (when input-file
+                                  (list input-file))))))
+          (cons 'cmark
+                (list :command "cmark"
+                      :input '(file stdin)
+                      :output '(stdout)
+                      :arguments-function
+                      (lambda (input-file _output-file)
+                        (append (list "-t" "html")
+                                (when input-file
+                                  (list input-file))))))
+          (cons 'cmark-gfm
+                (list :command "cmark-gfm"
+                      :input '(file stdin)
+                      :output '(stdout)
+                      :arguments-function
+                      (lambda (input-file _output-file)
+                        (append (list "-t" "html"
+                                      ;; Use GitHub-style <pre lang> for code blocks
+                                      "--github-pre-lang"
+                                      ;; Include remainder of code block info
+                                      ;; string in a separate attribute.
+                                      "--full-info-string"
+                                      ;; Use style attributes to align table
+                                      ;; cells instead of align attributes.
+                                      "--table-prefer-style-attributes"
+                                      "--extension" "footnotes"
+                                      "--extension" "table"
+                                      "--extension" "strikethrough"
+                                      "--extension" "autolink"
+                                      "--extension" "tagfilter"
+                                      "--extension" "tasklist")
+                                (when input-file
+                                  (list input-file))))))
+          ;; 'markdown.pl is the same as 'markdown with another common file
+          ;; name.
+          (cons 'markdown.pl
+                (list :command "markdown.pl"
+                      :input '(file stdin)
+                      :output '(stdout)
+                      :arguments-function
+                      (lambda (input-file _output-file)
+                        (append (list "--html4tags")
+                                (when input-file
+                                  (list "--" input-file))))))
+          ;; 'markdown is the same as 'markdown.pl with another common file
+          ;; name.
+          (cons 'markdown
+                (list :command "markdown"
+                      :input '(file stdin)
+                      :output '(stdout)
+                      :arguments-function
+                      (lambda (input-file _output-file)
+                        (append (list "--html4tags")
+                                (when input-file
+                                  (list "--" input-file))))))))
+   (cons 'pdf
+         (list
+          (cons 'pandoc
+                (list :command "pandoc"
+                      :input '(file stdin)
+                      :output '(file)
+                      :arguments-function
+                      (lambda (input-file output-file)
+                        (append (list "-f" "gfm"
+                                      "-t" "pdf"
+                                      "-o" output-file)
+                                (when input-file
+                                  (list input-file)))))))))
+  "An alist of format/converter configurations.
+It is a two level alist with the first level being format, for example
+`html' or `pdf', and the second being the converter name, for example
+`pandoc'.  A converter configuration entry is a plist of the form:
+
+  \\='(:command \"command name\"
+    :input (file stdin) ; accepts file name or stdin
+    :output (stdout)    ; produces stdout only
+    :arguments-function ; function; e.g.,
+     (lambda (input-file _output-file)
+       (append (list \"-t\" \"html\")
+               (when input-file
+                 (list input-file)))))
+
+`arguments-function' is passed two arguments, INPUT-FILE and
+OUTPUT-FILE.  If INPUT-FILE is nil, assume stdin, or it is a
+fully-qualified file name.  If OUTPUT-FILE is nil, assume stdout, or it
+is a fully-qualified file name.  It should return a list of
+arguments suitable for `call-process'.")
+
+;;;###autoload
+(defun markdown-ts-convert-file (input-file
+                                 &optional
+                                 format
+                                 output-file
+                                 display overwrite quiet)
+  "Convert Markdown INPUT-FILE to FORMAT.
+If optional DISPLAY is non-nil, show the output file in a buffer, if
+possible, using the function `markdown-ts-convert-display-function'.
+
+With a prefix argument, DISPLAY will be non-nil.
+
+Optional FORMAT is a format/converter pair specified as a cons
+\\='(format . converter) for example \\='(html . pandoc).  See
+`markdown-ts-converters'.  If nil, prompt for the format and converter.
+
+If optional OVERWRITE is non-nil, silently overwrite OUTPUT-FILE if it
+exists.
+
+If QUIET is non-nil, inhibit showing conversion warnings or errors.
+
+The external executable specified by a converter must be installed and
+found; see the variable `exec-path'."
+  (interactive "fConvert Markdown file: ")
+  (markdown-ts-convert input-file output-file
+                       format
+                       (or display current-prefix-arg)
+                       overwrite
+                       quiet))
+
+;;;###autoload
+(defun markdown-ts-convert (&optional
+                            input-file output-file
+                            format display overwrite quiet)
+  "Convert a `markdown-ts-mode' buffer or file to FORMAT.
+Convert INPUT-FILE to OUTPUT-FILE.
+
+If INPUT-FILE is nil, use the current buffer.
+
+If OUTPUT-FILE is nil, prompt for an output file.
+
+Optional FORMAT is a format/converter pair specified as a cons
+\\='(format . converter) for example \\='(html . pandoc).  See
+`markdown-ts-converters'.  If nil, prompt for the format and converter.
+
+If optional DISPLAY is non-nil, show the output file in a buffer, if
+possible, using the function `markdown-ts-convert-display-function'.
+
+With a prefix argument, DISPLAY will be non-nil.
+
+If optional OVERWRITE is non-nil, silently overwrite OUTPUT-FILE if it
+exists.
+
+If QUIET is non-nil, inhibit showing conversion warnings or errors.
+
+The external executable specified by a converter must be installed and
+found; see the variable `exec-path'."
+  (interactive)
+  (when (and input-file
+             (equal buffer-file-name (expand-file-name input-file))
+             (buffer-modified-p))
+    (when (yes-or-no-p "Save modified buffer before converting? ")
+      (save-buffer)))
+  (unless input-file
+    (markdown-ts--barf-if-not-mode 'markdown-ts-convert))
+
+  (setq display (or display current-prefix-arg))
+
+  (let* ((converter-format
+          (or (car format)
+              (car markdown-ts-default-converter)
+              (intern
+               (completing-read
+                "Select an output format: "
+                (mapcar (lambda (elt) (symbol-name (car elt)))
+                        markdown-ts-converters)
+                nil
+                t
+                nil
+                'markdown-ts-converter-format))))
+         (converter
+          (or (cdr format)
+              (cdr markdown-ts-default-converter)
+              (intern
+               (completing-read
+                "Select a converter: "
+                (mapcar (lambda (elt) (symbol-name (car elt)))
+                        (alist-get converter-format markdown-ts-converters))
+                nil
+                t
+                nil
+                'markdown-ts-converter))))
+         (config (alist-get converter
+                            (alist-get converter-format
+                                       markdown-ts-converters)))
+         (command (plist-get config :command))
+         (command-input (plist-get config :input))
+         (command-output (plist-get config :output))
+         (stdin-only (equal command-input '(stdin)))
+         (stdout-only (equal command-output '(stdout))))
+    (unless output-file
+      (setq output-file
+            (read-file-name "Output file name: "
+                            nil
+                            nil
+                            nil
+                            (concat (file-name-sans-extension
+                                     (file-relative-name
+                                      (or input-file buffer-file-name)))
+                                    "."
+                                    (symbol-name converter-format))))
+      (unless output-file
+        (user-error "Output file name is required")))
+    (when output-file
+      (when (and (not overwrite)
+                 (file-exists-p output-file)
+                 (not (yes-or-no-p (format "%s exists; overwrite?" output-file))))
+        (user-error "Not overwriting existing file: %s" output-file))
+      (setq output-file (expand-file-name output-file)))
+
+
+    (let ((command-args (funcall (plist-get config :arguments-function)
+                                 (when input-file (expand-file-name input-file))
+                                 output-file)))
+      (unless (executable-find command)
+        (user-error "`%s' executable not found" command))
+      (let ((error-buffer (get-buffer-create
+                           markdown-ts--convert-error-buffer))
+            (error-temp-file (make-temp-file "markdown-ts-convert-stderr"
+                                             nil ".log"))
+            (stdout-buffer (when stdout-only
+                             (get-buffer-create
+                              markdown-ts--convert-output-buffer))))
+        (unwind-protect
+            (let (exit-status)
+              (with-current-buffer error-buffer
+                (special-mode)
+                (setq buffer-read-only nil)
+                (widen)
+                (erase-buffer))
+              (when stdout-buffer
+                (with-current-buffer stdout-buffer
+                  (special-mode)
+                  (setq buffer-read-only nil)
+                  (widen)
+                  (erase-buffer)))
+              (cond
+               ((and input-file (not stdin-only))
+                (setq exit-status
+                      (apply #'call-process
+                             command
+                             nil
+                             (list stdout-buffer error-temp-file)
+                             nil
+                             command-args)))
+               ((and input-file stdin-only)
+                (with-temp-buffer
+                  (insert-file-contents input-file)
+                  (setq exit-status
+                        (apply #'call-process-region
+                               nil
+                               nil
+                               command
+                               nil
+                               (list stdout-buffer error-temp-file)
+                               nil
+                               command-args))))
+               (t
+                (without-restriction
+                  (setq exit-status
+                        (apply #'call-process-region
+                               nil
+                               nil
+                               command
+                               nil
+                               (list stdout-buffer error-temp-file)
+                               nil
+                               command-args)))))
+              (let ((error-size (file-attribute-size (file-attributes error-temp-file))))
+                (when (and error-size (> error-size 0))
+                  (with-current-buffer error-buffer
+                    (insert-file-contents error-temp-file)
+                    (goto-char (point-min)))))
+              (cond ((eq 0 exit-status) ; Integer or string.
+                     (when stdout-buffer
+                       (with-current-buffer stdout-buffer
+                         (write-region (point-min) (point-max) output-file)))
+                     (when display
+                       (funcall markdown-ts-convert-display-function
+                                output-file))
+                     (when (and (not quiet)
+                                (not (zerop (buffer-size error-buffer)))
+                                (yes-or-no-p
+                                 (format-message
+                                  "Conversion file `%s' successfully created with warnings; display them?"
+                                  output-file)))
+                       (display-buffer error-buffer))
+                     (message "Conversion file successfully created `%s'%s"
+                              output-file
+                              (if (zerop (buffer-size error-buffer))
+                                  ""
+                                (format " with warnings; see buffer `%s'" error-buffer))))
+                    (t
+                     (if quiet
+                         (error
+                          "Converter aborted with exit code %S; see buffer `%s' for errors"
+                          exit-status
+                          markdown-ts--convert-error-buffer)
+                       (when (yes-or-no-p (format
+                                           "Converter aborted with exit code %S; display errors?"
+                                           exit-status))
+                         (display-buffer error-buffer))))))
+          (delete-file error-temp-file))))))
+
+;;; Table of contents:
+
+(defgroup markdown-ts-toc nil
+  "Table of contents for `markdown-ts-mode' buffers."
+  :prefix "markdown-ts-toc-"
+  :group 'text
+  :group 'editing
+  :version "31.1")
+
+(defcustom markdown-ts-toc-generate-warn-if-none 'insert-template
+  "Warn if no tables were processed when calling `markdown-ts-toc-generate'.
+If nil, do nothing.  If the symbol `insert-template' and
+`markdown-ts-toc-generate' was called interactively, offer to insert a
+template if there are none.  If `no-tables', warn when there are no
+tables in the buffer.  `no-active-tables', is the same as `no-tables'
+with the addition of a warning if there are tables, but none are active."
+  :type '(choice (const :tag "No warnings" nil)
+                 (const :tag "Insert a table template (if interactive)" insert-template)
+                 (const :tag "Warn if no tables were processed" no-tables)
+                 (const :tag "Warn if no active tables were processed" no-active-tables))
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-toc-update-before-save-mode-lighter " [toc on save]"
+  "Minor-mode \"lighter\" for `markdown-ts-toc-update-before-save-mode'.
+Note the single space prefix."
+  :type '(choice (const :tag "Default" " [toc on save]")
+                 (const :tag "None" nil)
+                 (string :tag "Other string"))
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-toc-slug-function #'markdown-ts--slug-github
+  "Function to generate Markdown heading \"slugs\" in tables of contents."
+  :type '(choice (const :tag "GitHub slug" markdown-ts--slug-github)
+                 (const :tag "Pandoc slug" markdown-ts--slug-pandoc)
+                 (function :tag "Other function"))
+  :version "31.1"
+  :package-version "1.0")
+
+(defvar markdown-ts--toc-handles
+  '((heading . (h1 h2 h3 h4 h5 h6))
+    (setext . (sh1 sh2))
+    (item . (minus plus star))
+    (numbered-item . (dot paren))
+    (code . (code)))
+  "Map high level node handles to their base constituents.
+The special symbol `all' means all handles.")
+
+(defvar markdown-ts--toc-handle-classes
+  (let ((x))
+    (dolist (elt markdown-ts--toc-handles)
+      (dolist (val (cdr elt))
+        (push `(,val . ,(car elt)) x)))
+    x)
+"Inverse of `markdown-ts--toc-handles'.")
+
+(defun markdown-ts--toc-expand-candidate-handles (handles)
+  "Expand candidate HANDLES and keep only base handles.
+See `markdown-ts--toc-handles'."
+  (let ((expanded (make-hash-table))
+        (res))
+    (unless (listp handles)
+      (setq handles (list handles)))
+    (when (equal handles '(all))
+      (setq handles (mapcar #'car markdown-ts--toc-handles)))
+    (dolist (elt handles)
+      (setq elt (alist-get elt markdown-ts--toc-handles elt))
+      (cond ((consp elt)
+             (dolist (k elt) (puthash k t expanded)))
+            (t (puthash elt t expanded))))
+    (maphash (lambda (k _v) (push k res)) expanded)
+    res))
+
+(defun markdown-ts--tocs (&optional beg end)
+  "Scan the current buffer for toc entries from BEG to END.
+If BEG is nil, use `point-min'.  If END is nil, use `point-max'.
+
+Return an alist of the form:
+  \\='((keyword (node beg end vars)))
+
+Vars are expanded via `hack-local-variables-prop-line'.
+
+Return the list in the order of appearance in the buffer."
+  ;; NOTE: This scans all matching nodes below BEG with no maximum count
+  ;; even when we want only a single next matching item.  Perhaps
+  ;; `treesit-query-capture' could be improved to accept a max-count
+  ;; argument.
+  ;;
+  ;; Match "markdown-ts-toc:", "markdown-ts-toc-abc123:" but not
+  ;; "markdown-ts-tocxxx:".
+  (let ((res))
+    (dolist (node
+             (treesit-query-capture
+              'markdown
+              '((((html_block) @markdown-ts-toc)
+                 (:match "<!--[[:blank:]]*markdown-ts-toc\\(-[[:alnum:]]+\\)*:" @markdown-ts-toc)))
+              (or beg (point-min))
+              (or end (point-max))
+              'node-only))
+      (let* ((s (treesit-node-text node 'no-property))
+             (match (string-match "\\(markdown-ts-toc\\(-[[:alnum:]]+\\)*\\):.*" s))
+             (keyword (when match (match-string 1 s))))
+        (let ((vars))
+          (with-work-buffer
+            (insert s)
+            (setq vars (hack-local-variables-prop-line)))
+          (push
+           `(,keyword
+             (node . ,node)
+             (beg . ,(treesit-node-start node))
+             (end . ,(treesit-node-end node))
+             (vars . ,vars))
+           res))))
+    (nreverse res)))
+
+(defun markdown-ts--tocs-sanity-check (tocs)
+  "Sanity check TOCS for paired markdown-ts-toc: markdown-ts-toc-end: nodes.
+Signal an error if TOCS are insane.
+See `markdown-ts--tocs'."
+  (seq-map-indexed
+   (lambda (elt idx)
+     (when (equal "markdown-ts-toc" (car elt))
+       (unless (equal "markdown-ts-toc-end" (car (nth (1+ idx) tocs)))
+         (user-error
+          "\"markdown-ts-toc\" at position %d must be followed by a matching \"markdown-ts-toc-end\""
+          (alist-get 'beg elt)))))
+   tocs))
+
+(defun markdown-ts--toc-collect-candidates (toc-start-node
+                                            toc-end-node handles from)
+  "Return an alist of toc entry candidates from the current buffer.
+HANDLES is a list of base handles; see `markdown-ts--toc-handles'.
+
+TOC-START-NODE is the \"markdown-ts-toc-start\" node.
+TOC-END-NODE is the \"markdown-ts-toc-end\" node.
+
+If FROM is the symbol `above', source candidates from the beginning of
+the buffer until the toc start node.  If `below', source candidates from
+toc start node until the end of the buffer.  If `all', use the whole
+buffer.
+
+Remove ignored candidates containing \"<!-- markdown-ts-ignore: -->\".
+
+Sort the list by the starting character positions of nodes.
+
+The alist is of the form:
+  \\='((handle . node))"
+  (let (candidates beg end)
+    (pcase from
+      ('above
+       (setq beg (point-min))
+       (setq end (treesit-node-start toc-start-node)))
+      ('below
+       (setq beg (treesit-node-end toc-end-node))
+       (setq end (point-max)))
+      ('all
+       (setq beg (point-min))
+       (setq end (point-max))))
+
+    ;; It looks like we cannot get them in one fell swoop.
+    (dolist (elt handles)
+      (setq
+       candidates
+       (append
+        candidates
+        (pcase elt
+          ('h1 (treesit-query-capture
+                'markdown '((atx_heading (atx_h1_marker) (inline) @h1)) beg end))
+          ('h2 (treesit-query-capture
+                'markdown '((atx_heading (atx_h2_marker) (inline) @h2)) beg end))
+          ('h3 (treesit-query-capture
+                'markdown '((atx_heading (atx_h3_marker) (inline) @h3)) beg end))
+          ('h4 (treesit-query-capture
+                'markdown '((atx_heading (atx_h4_marker) (inline) @h4)) beg end))
+          ('h5 (treesit-query-capture
+                'markdown '((atx_heading (atx_h5_marker) (inline) @h5)) beg end))
+          ('h6 (treesit-query-capture
+                'markdown '((atx_heading (atx_h6_marker) (inline) @h6)) beg end))
+          ('sh1 (treesit-query-capture
+                 'markdown '((setext_heading heading_content: (_) @sh1 (setext_h1_underline))) beg end))
+          ('sh2 (treesit-query-capture
+                 'markdown '((setext_heading heading_content: (_) @sh2 (setext_h2_underline))) beg end))
+          ('minus (treesit-query-capture
+                   'markdown '((list_item (list_marker_minus) (paragraph (inline) @minus))) beg end))
+          ('plus (treesit-query-capture
+                  'markdown '((list_item (list_marker_plus) (paragraph (inline) @plus))) beg end))
+          ('star (treesit-query-capture
+                  'markdown '((list_item (list_marker_star) (paragraph (inline) @star))) beg end))
+          ('dot (treesit-query-capture
+                 'markdown '((list_item (list_marker_dot) (paragraph (inline) @dot))) beg end))
+          ('paren (treesit-query-capture
+                   'markdown '((list_item (list_marker_parenthesis) (paragraph (inline) @paren))) beg end))
+          ('code (treesit-query-capture
+                  'markdown '((fenced_code_block (info_string (language)) @code)) beg end))))))
+    (sort
+     (seq-remove
+      (lambda (elt)
+        (string-match-p "<!--[[:blank:]]*markdown-ts-ignore:[[:blank:]]*-->"
+                        (treesit-node-text (cdr elt) t)))
+      candidates)
+     :key (lambda (elt)
+            (treesit-node-start (cdr elt)))
+     :lessp #'<
+     :in-place t)))
+
+(defun markdown-ts--toc-list-item-depth (node)
+  "Return NODE's item depth relative to its predecessors.
+If NODE is not part of a list, return nil."
+    (let ((depth nil) (n (treesit-node-parent node)))
+      (while n
+        (when (equal (treesit-node-type n) "list")
+          (setq depth (1+ (or depth 0))))
+        (setq n (treesit-node-parent n)))
+      depth))
+
+(defun markdown-ts--toc-atx_header-normalize (text)
+  "Remove trailing # from TEXT unless they are backslash escaped.
+First remove HTML comments."
+  (if (string-match-p "[[:blank:]]*\\\\+#+[[:blank:]]*\n*\\'" text)
+      text
+    (replace-regexp-in-string "[[:blank:]]*#+[[:blank:]]*\n*\\'" "" text)))
+
+(defvar markdown-ts--toc-text-normalizers
+  `((heading . markdown-ts--toc-atx_header-normalize)
+    (h1 . markdown-ts--toc-atx_header-normalize)
+    (h2 . markdown-ts--toc-atx_header-normalize)
+    (h3 . markdown-ts--toc-atx_header-normalize)
+    (h4 . markdown-ts--toc-atx_header-normalize)
+    (h5 . markdown-ts--toc-atx_header-normalize)
+    (h6 . markdown-ts--toc-atx_header-normalize))
+  "Map node type handles to functions that normalize its text.
+See `markdown-ts--toc-text-normalize'.
+Each function accepts one argument, the string TEXT, and returns a string.")
+
+(defun markdown-ts--toc-text-normalize (handle node &optional text)
+  "Normalize NODE's TEXT according to its HANDLE.
+TEXT should have no text properties.  If TEXT is nil, use the NODE's
+text.  This is not always correct so it's best to pass TEXT if you know
+it in the calling context.
+
+If no normalizer is found, return TEXT.
+
+One example normalization is atx_heading text that ends in trailing hash
+signs which are intended to be elided so \"Heading Text ##\" is
+transformed into \"Heading Text\"."
+  (setq text (or text (treesit-node-text node 'no-property)))
+  (if-let* ((fixer (alist-get handle markdown-ts--toc-text-normalizers)))
+      (funcall fixer text)
+    text))
+
+;;;###autoload
+(define-minor-mode markdown-ts-toc-update-before-save-mode
+  "If enabled, update `markdown-ts-mode' tables of contents before saving."
+  :init-value nil
+  :global nil
+  :lighter markdown-ts-toc-update-before-save-mode-lighter
+  (if (derived-mode-p 'markdown-ts-mode)
+      (if markdown-ts-toc-update-before-save-mode
+          (add-hook 'before-save-hook #'markdown-ts-toc-generate nil 'local)
+        (remove-hook 'before-save-hook #'markdown-ts-toc-generate 'local))
+    (setq markdown-ts-toc-update-before-save-mode nil)
+    (lwarn 'markdown-ts-toc-update-before-save-mode
+           :warning
+           "Minor mode valid only in `markdown-ts-mode' buffers.")))
+
+;;;###autoload
+(defun markdown-ts-toc-clear-and-remove (&optional beg end)
+  "Remove `markdown-ts-mode' table of contents bodies and templates.
+Operate on the active region BEG to END, otherwise operate on the
+buffer, which may be narrowed."
+  (interactive "R")
+  (markdown-ts--barf-if-not-mode 'markdown-ts-toc-clear-and-remove)
+  (markdown-ts-toc-clear beg end 'remove))
+
+;;;###autoload
+(defun markdown-ts-toc-clear (&optional beg end remove)
+  "Clear `markdown-ts-mode' table of contents bodies.
+Operate on the active region BEG to END, otherwise operate on the
+buffer, which may be narrowed.
+If optional REMOVE is non-nil, remove tables including their templates."
+  (interactive "R")
+  (markdown-ts--barf-if-not-mode 'markdown-ts-toc-clear)
+  (setq beg (or beg (point-min)))
+  (setq end (or end (point-max)))
+  (unless (eq beg end)
+    ;; Convert markers to absolute positions.
+    (setq beg (if (markerp beg) (marker-position beg) beg))
+    (setq end (if (markerp end) (marker-position end) end))
+    ;; NOTE: Operate on the widened buffer to avoid treesiter crash issues.
+    (without-restriction
+      (let ((tocs)
+            (beg-pos beg)
+            (end-pos end))
+        ;; We scan each pass because their positions change.
+        (while (and (< beg-pos end-pos)
+                    (setq tocs (markdown-ts--tocs beg-pos end-pos)))
+          (markdown-ts--tocs-sanity-check tocs)
+          ;; After sanity checking, we know the second element is a
+          ;; toc-end.
+          (let* ((toc (nth 0 tocs))
+                 (toc-end (nth 1 tocs))
+                 (reg-beg (if remove
+                              (alist-get 'beg toc)
+                            (alist-get 'end toc)))
+                 (reg-end (if remove
+                              (alist-get 'end toc-end)
+                            (alist-get 'beg toc-end)))
+                 (reg-size (- reg-end reg-beg)))
+            (delete-region reg-beg reg-end)
+            ;; Start the next pass after this toc-end.  Adjust for the
+            ;; deleted region.
+            (setq beg-pos (- (alist-get 'end toc-end)
+                             reg-size))
+            (setq end-pos (min (point-max) (- end-pos reg-size)))))))))
+
+;;;###autoload
+(defun markdown-ts-toc-insert-template (&optional char)
+  "Insert a `markdown-ts-mode` table of contents template at point.
+
+CHAR is the template type \"b\" for basic, \"c\" for complete.  If CHAR
+is nil and the command is run interactively, prompt for a template.
+
+The basic template uses all defaults and is likely the best choice for
+most uses.  The complete template illustrates all parameters set to
+their defaults and is useful as a starting point to customize a table."
+  (interactive "cTemplate [b]asic [c]omplete:")
+  (pcase char
+    (?b
+     (insert "<!-- markdown-ts-toc: -->\n"
+             "<!-- markdown-ts-toc-end: -->\n"))
+    (?c
+     (insert "<!-- markdown-ts-toc: -*- "
+             "min-depth: 1; "
+             "max-depth: nil; "
+             "candidates: (heading); "
+             "from: below; "
+             "style: item; "
+             "indent: 1; "
+             "no-link: nil; "
+             "relative-depth: nil; "
+             "ignore: nil; "
+             "-*- -->\n"
+             "<!-- markdown-ts-toc-end: -->\n"))
+    (_ (user-error "No such template type: %c" char))))
+
+;;;###autoload
+(defun markdown-ts-toc-generate (&optional interactive beg end)
+  "Generate tables of contents in the current buffer.
+`markdown-ts-mode' uses Markdown HTML comment elements to identify table
+of contents (aka toc) insertion boundaries and the parameters for each
+table.  Derive table content from the Markdown elements in the current
+buffer which are usually headings but can also be list items, setext
+headers, named code blocks.
+
+Operate on the active region BEG to END, otherwise operate on the
+buffer, which may be narrowed.
+
+Each time you run this command, existing tables of contents are cleared
+and refreshed with new content.  So don't place toc elements around
+important text.
+
+The buffer can have one or more tocs.  By default, populate each toc
+with elements that appear in the buffer below the toc.  Therefore, the
+easiest way to insert a complete table of contents, is to put the toc
+template near the top of your buffer.
+
+A basic empty toc template looks like this:
+
+Header text you want here.
+
+<!-- markdown-ts-toc: -->
+Contents inserted between these elements.
+<!-- markdown-ts-toc-end: -->
+
+Footer text you want here.
+
+Use the command `markdown-ts-toc-insert-template' to insert a table of
+contents template.
+
+Use the command `markdown-ts-toc-clear' to clear table content, and the
+command `markdown-ts-toc-clear-and-remove' to both clear and remove
+table content and templates.
+
+By default, a toc includes headers at all levels below the toc which are
+presented as list items with links.
+
+To ignore a Markdown element that would otherwise be included in the
+toc, add a toc ignore element:
+
+## Ignore Me <!-- markdown-ts-toc-ignore: -->
+
+The starting toc element accepts parameters in the syntax of Emacs file
+variables.
+
+For example, if you want to generate a table of contents limited to
+headings two levels deep:
+
+<!-- markdown-ts-toc: -*- max-depth: 2; -*- -->
+<!-- markdown-ts-toc-end: -->
+
+Or use only headings two and three levels deep.
+
+<!-- markdown-ts-toc: -*- min-depth: 2; max-depth: 3; -*- -->
+<!-- markdown-ts-toc-end: -->
+
+These are the supported parameters which are optional.  They each list
+their defaults.
+
+  min-depth: 1          ; an integer
+  max-depth: nil        ; an integer
+  candidates: (heading) ; a list
+  from: below           ; a symbol
+  style: item           ; a symbol
+  indent: 1             ; a number
+  no-link: nil          ; a boolean
+  relative-depth: nil   ; a boolean
+  ignore: nil           ; a boolean
+
+`min-depth' and `max-depth' both default to using all candidates at
+every level.  Use `min-depth' to ignore level 1 headings like \"#
+Heading\", by using 2.  Use `max-depth' to control how deep into the
+heading hierarchy you need your toc to go.  Use 3 to stop at level three
+headings.
+
+Headings dictate the level of their children even if headings are
+excluded from candidates.  Other element types inherit the level of
+their preceding heading.
+
+`candidates' is a list and can contain any of the following Markdown
+element shortcut names.  You can mix higher-level grouping symbols and
+lower level symbols.
+
+  all (includes everything)
+  heading (includes the below)
+    h1 h2 h3 h4 h5 h6
+  setext (includes the below)
+    sh1 sh2
+  item (includes the below)
+    minus plus star
+  numbered-item (includes the below)
+    dot paren
+  code (named code blocks)
+
+`from' controls the direction and scope from which candidates are
+selected.  Typically, a toc is placed at the beginning of a buffer and
+`from' is `below' to capture entry candidates after the toc.  If you set
+`from' to `above', candidates are selected from above the toc.  Use
+`all' to capture every entry candidate.  This is useful to create a
+complete toc at the end of your buffer.
+
+The `style' parameter can be nil, `item', `number' or `number.'.  Under
+nil, entries have no decorations.  If `item', entries are prefixed with
+\"-\".  If `bullet', prefix with \"*\".  If `number', numeric prefixes
+are generated, for example 1, 1.1, 2, 2.1, 2.1.1, 2.1.2.  Use `number.'
+to add a period to each entry's number.
+
+`indent' is an integer between 0 and 10.  0 means nothing should be
+indented.  Otherwise, each entry is indented by the number of spaces of
+its Markdown level multiplied by this value.  Candidates that have no
+native level such as list items inherit the base indentation level of
+its preceding header.  List item hierarchies and code blocks indent
+under that base.
+
+Set `no-link' to t if you do not want your entries to have header links.
+By default, each entry derived from a heading is presented as a link to
+its source heading.  NOTE: The elements represented by `setext', `item',
+`numbered-item', `code' do not support links.
+
+Use `relative-depth' to create a toc underneath a heading, limiting the
+toc to heading depths underneath the preceding header and specify the
+levels relative to that header.  More concretely, if the preceding
+header is a level 1 \"#\" header, `min-depth' 1 and `max-depth' 2 will
+be interpreted to be 2 and 3.  If you demote the header to level 2
+\"##\" they will be interpreted as 3 and 4.  This is useful to avoid
+fussing with toc configurations under headers when you change their
+levels.
+
+For example:
+
+<!-- markdown-ts-toc: -*- relative-depth: t; min-depth: 1; max-depth: 2; -*- -->
+<!-- markdown-ts-toc-end: -->
+
+Finally, if `ignore' is t, you can keep a toc element in place and skip
+it.
+
+INTERACTIVE will be non-nil if this command was invoked interactively.
+
+See `markdown-ts-toc-generate-warn-if-none' to configure warnings about
+tables not being processed when this function is called."
+  (interactive "p\nR")
+  ;; NOTE: If parameters or their defaults change, be sure to mirror
+  ;; them in `markdown-ts-toc-insert-template'.
+  (markdown-ts--barf-if-not-mode 'markdown-ts-toc-generate)
+  (setq beg (or beg (point-min)))
+  (setq end (or end (point-max)))
+  (unless (eq beg end)
+    ;; Convert markers to absolute positions.
+    (setq beg (if (markerp beg) (marker-position beg) beg))
+    (setq end (if (markerp end) (marker-position end) end))
+    ;; NOTE: Operate on the widened buffer to avoid treesiter crash issues.
+    (without-restriction
+      (let ((tocs (markdown-ts--tocs beg end)))
+        (unless tocs
+          (if (and interactive
+                   (eq 'insert-template markdown-ts-toc-generate-warn-if-none))
+              (progn
+                (markdown-ts-toc-insert-template)
+                ;; If the user didn't quit the prompt, a template may have
+                ;; been added, so rescan the buffer.
+                (setq tocs (markdown-ts--tocs)))
+            (when (eq 'no-tables markdown-ts-toc-generate-warn-if-none)
+              (lwarn 'markdown-ts-toc-generate
+                     :warning
+                     "No tables of contents found in %s."
+                     (buffer-name (current-buffer))))))
+        (markdown-ts--tocs-sanity-check tocs)
+
+        ;; Strategy is process one toc at a time from the top to the
+        ;; bottom of the range BEG END.  Subsequent toc and entry
+        ;; candidate node positions change as we update each toc text so
+        ;; we have to retrieve them fresh from the end of the most recent
+        ;; toc.
+        (let ((tocs)
+              (num-tocs-processed 0)
+              (toc)
+              (toc-end)
+              (toc-size)
+              ;; These are adjusted by the size of inserted text each pass.
+              (beg-pos beg)
+              (end-pos end)
+              (source-buffer (current-buffer)))
+          ;; Find each "markdown-ts-toc" in succession starting at the end
+          ;; of each previous one we find within the requested region.
+          (while (and (< beg-pos end-pos)
+                      (setq tocs (markdown-ts--tocs beg-pos end-pos)))
+            (setq toc (car tocs))
+            (setq toc-size 0)
+
+            (when (equal "markdown-ts-toc" (car toc))
+              ;; After sanity checking, we know the second element is a
+              ;; toc-end.
+              (setq toc-end (nth 1 tocs))
+              (let* ((toc-node (alist-get 'node toc))
+                     (toc-vars (alist-get 'vars toc))
+                     (toc-ignore (alist-get 'ignore toc-vars)))
+                (unless toc-ignore
+                  ;; Build the toc one candidate at a time, tracking
+                  ;; indentation and creating links if needed.
+                  (let* ((toc-end-node (alist-get 'node toc-end))
+                         (reg-beg (treesit-node-end toc-node))
+                         (reg-end (treesit-node-start toc-end-node))
+                         (toc-handles (markdown-ts--toc-expand-candidate-handles
+                                       (or (cdr-safe (assq 'candidates toc-vars))
+                                           'heading)))
+                         ;; Now add headings to always retrieve and derive
+                         ;; levels even if they are excluded from the toc.
+                         (seed-handles (copy-tree toc-handles))
+                         (_ (dolist (elt (alist-get 'heading markdown-ts--toc-handles))
+                              (cl-pushnew elt seed-handles)))
+                         (toc-from (or (cdr-safe (assq 'from toc-vars)) 'below))
+                         (toc-style (or (cdr-safe (assq 'style toc-vars)) 'item))
+                         (toc-no-link (alist-get 'no-link toc-vars))
+                         (toc-indent (min 10
+                                          (max 0 (or (cdr-safe (assq 'indent toc-vars)) 1))))
+                         (toc-min-depth (max 1
+                                             (or (cdr-safe (assq 'min-depth toc-vars)) 1)))
+                         (toc-max-depth (max toc-min-depth
+                                             (or (cdr-safe (assq 'max-depth toc-vars))
+                                                 most-positive-fixnum)))
+                         (toc-relative-depth (cdr-safe (assq 'relative-depth toc-vars)))
+                         (toc-candidates (markdown-ts--toc-collect-candidates
+                                          toc-node toc-end-node seed-handles toc-from))
+                         (toc-relative-heading-depth
+                          (1+ (or (seq-position
+                                   '("atx_h1_marker" "atx_h2_marker" "atx_h3_marker"
+                                     "atx_h4_marker" "atx_h5_marker" "atx_h6_marker")
+                                   (treesit-node-type
+                                    (treesit-node-child
+                                     (treesit-search-forward
+                                      toc-node
+                                      "atx_heading" 'backward) 0 'named))
+                                   #'equal)
+                                  -1)))
+                         (slug-to-pos (markdown-ts--heading-ids))
+                         (pos-to-slug
+                          (let ((ht (make-hash-table :size (hash-table-count slug-to-pos)
+                                                     :test #'equal)))
+                            (maphash (lambda (k v) (puthash v k ht)) slug-to-pos)
+                            ht)))
+
+                    (with-work-buffer
+                      (insert "<!-- NOTE: markdown-ts-toc generated text section may be overwritten. -->\n")
+                      (let ((handle) (handle-class)
+                            (node)
+                            (indent 0) (level 1) (level-prev 0)
+                            ;; Heading level takes precedence over items under
+                            ;; it.  If there are no headings, it will remain 1.
+                            (level-heading 1)
+                            ;; Adjust for non headings under headings.
+                            (number-stack))
+
+                        ;; Candidates should be in buffer order.
+                        (dolist (candidate toc-candidates)
+                          (let ((slug-pos) (text) (link-target)
+                                (level-adj 0))
+                            (setq handle (car candidate)
+                                  handle-class (alist-get
+                                                handle markdown-ts--toc-handle-classes))
+                            (setq node (cdr candidate))
+                            (setq slug-pos nil)
+
+                            ;; Strip trailing newlines.  Add them consistently below.
+                            (setq text (string-trim-right
+                                        (markdown-ts--toc-text-normalize
+                                         handle node
+                                         (treesit-node-text node 'no-property))))
+
+                            ;; Candidate node type logic.
+                            (pcase handle-class
+                              ('heading
+                               (let ((x (seq-position '(h1 h2 h3 h4 h5 h6) handle)))
+                                 (setq slug-pos (treesit-node-start
+                                                 (treesit-search-forward node "atx_heading" 'backward)))
+                                 (setq level (setq level-heading (1+ x)))
+                                 (setq level-adj 0)
+                                 (setq indent (1- level))
+                                 (setq link-target text)))
+                              ('setext
+                               (let ((x (seq-position '(sh1 sh2) handle)))
+                                 (setq level (1+ x))
+                                 (setq level-adj 0)
+                                 (setq indent (1- level))
+                                 (setq link-target nil)))
+                              ((or 'item 'numbered-item)
+                               (setq level level-heading)
+                               (setq level-adj (markdown-ts--toc-list-item-depth node))
+                               (setq indent (1-  (+ level level-adj)))
+                               (setq link-target nil))
+                              ('code
+                               ;; Inherit the ambient level.
+                               (setq level-adj 1)
+                               (setq indent (1-  (+ level level-adj)))
+                               (setq link-target nil)))
+
+                            ;; Filter desired handles and levels.
+                            (when (and (memq handle toc-handles)
+                                       (>= level (+ toc-min-depth
+                                                    (if toc-relative-depth
+                                                        toc-relative-heading-depth 0)))
+                                       (<= level (+ toc-max-depth
+                                                    (if toc-relative-depth
+                                                        toc-relative-heading-depth 0))))
+
+                              ;; Create the entry with indent, item/number prefix, link.
+
+                              ;; Corner case: initial level higher than 1.
+                              (when (and (> level 1)
+                                         (eq level-prev 0))
+                                (setq level 1))
+                              (when (and (not toc-no-link) link-target)
+                                ;; Sanitize the id to conform to CSS ident syntax.
+                                (setq text
+                                      (format "[%s](#%s)"
+                                              text
+                                              (if-let* ((slug (gethash slug-pos pos-to-slug)))
+                                                  slug
+                                                (funcall markdown-ts-toc-slug-function
+                                                         link-target)))))
+                              (insert (make-string (* (1- (max indent 1)) toc-indent) ?\s)
+                                      (pcase toc-style
+                                        ('item "- ")
+                                        ('bullet "* ")
+                                        ((or 'number 'number.)
+                                         (let ((level (+ level level-adj)))
+                                           (cond ((or (not number-stack)
+                                                      (> level (caar number-stack)))
+                                                  (push `(,level . 0) number-stack))
+                                                 ((and number-stack
+                                                       (< level (caar number-stack)))
+                                                  (while (and number-stack
+                                                              (< level (caar number-stack)))
+                                                    (pop number-stack))
+                                                  (unless number-stack
+                                                    (push `(,level . 0) number-stack)))))
+                                         (setcdr (car number-stack) (1+ (cdar number-stack)))
+                                         (let ((s) (n (length number-stack)))
+                                           (seq-map-indexed
+                                            (lambda (elt idx)
+                                              (setq s
+                                                    (concat
+                                                     s
+                                                     (format "%d" (cdr elt))
+                                                     (if (eq (1+ idx) n) "" "."))))
+                                            (reverse number-stack))
+                                           (concat s
+                                                   (when (eq toc-style 'number.) ".")
+                                                   ") ")))
+                                        (_ ""))
+                                      text
+                                      ;; Add a hard line break.  Backslash
+                                      ;; seems less well supported by
+                                      ;; renderers.
+                                      (make-string 2 ?\s)
+                                      "\n"))
+                            (setq level-prev level))))
+                      (setq toc-size (buffer-size))
+                      (let ((temp-buffer (current-buffer)))
+                        (with-current-buffer source-buffer
+                          (replace-region-contents reg-beg reg-end temp-buffer)))))
+                  (setq num-tocs-processed (1+ num-tocs-processed)))))
+            ;; Start the next pass after this toc-end.  Adjust for the
+            ;; inserted text size.
+            (setq beg-pos (+ (alist-get 'end toc-end) toc-size))
+            (setq end-pos (min (point-max) (+ end-pos toc-size))))
+          (when (and (eq num-tocs-processed 0)
+                     (eq 'no-active-tables markdown-ts-toc-generate-warn-if-none))
+            (lwarn 'markdown-ts-toc-generate
+                   :warning
+                   "No tables of contents generated in %s."
+                   (buffer-name (current-buffer)))))))))
+
+(provide 'markdown-ts-mode-x)
+;;; markdown-ts-mode-x.el ends here
diff --git a/lisp/textmodes/markdown-ts-mode.el b/lisp/textmodes/markdown-ts-mode.el
index 657d6bc466d..05f016ab377 100644
--- a/lisp/textmodes/markdown-ts-mode.el
+++ b/lisp/textmodes/markdown-ts-mode.el
@@ -1,11 +1,14 @@
-;;; markdown-ts-mode.el --- tree sitter support for Markdown  -*- lexical-binding: t; -*-
+;;; markdown-ts-mode.el --- tree sitter support for Markdown -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2024-2026 Free Software Foundation, Inc.
 
-;; Author     : Rahul Martim Juliato <rahul.juliato@gmail.com>
-;; Maintainer : Rahul Martim Juliato <rahul.juliato@gmail.com>
-;; Created    : April 2024
-;; Keywords   : markdown md languages tree-sitter
+;; Author           : Rahul Martim Juliato <rahul.juliato@gmail.com>
+;;                  : Stéphane Marks <shipmints@gmail.com>
+;; Maintainer       : Rahul Martim Juliato <rahul.juliato@gmail.com>
+;; Created          : April 2024
+;; Version          : 1.0
+;; Package-Requires : ((emacs "31.1"))
+;; Keywords         : markdown md text edit languages tree-sitter
 
 ;; This file is part of GNU Emacs.
 
@@ -22,25 +25,688 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
-;;; Tree-sitter language versions
+;;; Commentary:
+
+;;;; Tree-sitter Language Versions
 ;;
 ;; markdown-ts-mode has been tested with the following grammars and version:
 ;; - tree-sitter-markdown: v0.4.1
 ;; - tree-sitter-markdown-inline: v0.4.1
 ;;
-;; We try our best to make builtin modes work with latest grammar
-;; versions, so a more recent grammar has a good chance to work too.
-;; Send us a bug report if it doesn't.
-
-;;; Commentary:
+;; We try our best to make built-in modes work with latest grammar
+;; versions, so a more recent grammar has a good chance to work.  Send
+;; us a bug report if it doesn't.
 ;;
+;; Bidirectional Text Considerations
+;;
+;; Text with markup may need an extra newline before bidirectional text
+;; for it to show correctly.  This is a limitation in the Emacs display
+;; engine.
+;;
+;; Code Block Language Mode Considerations
+;;
+;; Fenced code block language modes are derived from the table
+;; `markdown-ts-code-block-modes' and heuristics adding "-ts-mode" and
+;; "-mode" to the language name.  If your language's mode is not
+;; properly recognized, add it to `markdown-ts-code-block-modes', which
+;; see.
+;;
+;; Each language's major mode is enabled once per `markdown-ts-mode'
+;; buffer in a temporary buffer to extract its default font-lock and
+;; tree-sitter settings.  In conventional non-treesit code blocks, the
+;; major mode is enabled each time the block is fontified.
+;;
+;; NOTE: Major mode hooks are not run and font-lock, treesit, indent,
+;; comment recognition, etc. customizations that you might have in your
+;; hooks are not applied.  As a result, your code blocks might appear
+;; different in `markdown-ts-mode' mode than in native major mode
+;; buffers.  Not running hooks avoids the cost of each mode hook and
+;; avoids potential recursive treesit callback issues.
+;;
+;;;; Code Block Commands
+;;
+;; Some common commands will operate within a code block and in its
+;; mode.  These operate in an indirect buffer and some commands may
+;; operate slightly differently to the same commands invoked in a native
+;; mode buffer.  `indent-for-tab-command' may invoke
+;; `completion-at-point' under the covers and may return results from
+;; the surrounding Markdown buffer instead of the code block's context.
+;; You can invoke `completion-at-point' directly by using its key
+;; binding, `C-M-i`.
+;;
+;;;; Pipe Tables
+;;
+;; These are a GitHub Flavored Markdown (GFM) extension and are a de
+;; facto standard given their popularity and implementations across
+;; products.  They might as well be folded into the CommonMark standard.
+;;
+;; A pipe table is a rectangle of text surrounded to the east and west
+;; by pipe symbols and where pipes separate columns.  It has a header
+;; row immediately followed by header alignment row, both of which must
+;; contain the same number of cells.  Body rows are optional.  A table
+;; ends with a blank line or at the start of a new Markdown block
+;; element.
+;;
+;; The header alignment row column must have a minimum of three hyphens
+;; which indicates default alignment (i.e., whatever a renderer
+;; chooses).  To indicate left alignment, prefix the hyphen string with
+;; a colon like this :---.  For center alignment, prefix and suffix with
+;; colons like this :---:.  For right alignment, suffix with a colon
+;; like this ---:.
+;;
+;; Each table header or body cell can contain the usual Markdown inline
+;; style indicators.  A cell cannot contain a block element such as a
+;; headings, thematic breaks, block quotes, fenced code blocks.
+;;
+;; Table cells do not need to align visually; i.e., the pipe symbols do
+;; not need to line up vertically.  The tree-sitter parser and renderers
+;; detect cell boundaries using pipe symbols, not their relative alignment.
+;;
+;; If you want to include what looks like code, you can use backticks to
+;; wrap such text ala `this is code`.  This mode will not fontify such
+;; code.
+;;
+;; If you want to include a pipe symbol in a cell, escape it thusly \|.
+;;
+;; Technically, body rows do not need to contain the same number of
+;; cells as the header has columns and rows do not need to share the
+;; same number of cells among themselves.  Note: Many renderers get
+;; confused if the table is "ragged" with an uneven number of columns
+;; among rows.  Some renderers will insert empty cells on a row that
+;; contains fewer cells than the header has columns.  Some elide cells
+;; that exceed the number of columns in the header.
+;;
+;;;; Pipe Table Recommendations
+;;
+;; - Always use pipe symbols at the start and end of each table line.
+;; - Use a uniform number of columns spanning the table.
+;; - If you detect a parsing error which presents as different
+;;   fontification and which is often caused by an empty first cell on the
+;;   final row, try putting some characters in that cell.
+;; - Renderers often exclude certain empty cells such as an "empty" final
+;;   cell in a table.  Follow the next item to avoid this.
+;; - If you need that cell to appear blank and are converting to HTML,
+;;   try using a non-printing HTML entity, such as a non-breaking space
+;;   "&nbsp;", which parse as concrete characters yet render as blank.
+;; - HTML comments <!-- --> can also be used as a non-blank character
+;;   string that does not get rendered.  These are considered cell text
+;;   and when placed at the end of a row, that row's number of columns is
+;;   increased and might exceed the number of header columns.
+;; - There are tree-sitter parser quirks.  Commands such as
+;;   `markdown-ts-table-delete-column' and `markdown-ts-table-move-column'
+;;   follow the parser tree and can lead to unexpected results so follow
+;;   these recommendations and table operations should be as expected.
+;;
+;;;; Tree Sitter Bugs
+;;
+;; `markdown-ts-mode' relies on the underlying tree-sitter library in
+;; Emacs (chosen at its build time), and language grammars you have
+;; installed.  There are known and reported bugs which negatively affect
+;; certain features.  This mode should benefit as these bugs are fixed
+;; or worked around.
+;;
+;; - The Markdown grammar inserts block_continuation nodes as children
+;;   of code_fence_content, which confuses both the inspector and the
+;;   embedded parser.  This affects code blocks inside block quotes.
+;;
+;; - HTML block type 4 (`<!' followed by an uppercase letter, e.g.,
+;;   `<!DOCTYPE html>') causes the parser to consume all subsequent
+;;   content.  Lowercase `<!doctype html>' works as a workaround.
+;;   See <https://github.com/tree-sitter-grammars/tree-sitter-markdown/issues/233>.
+;;
+;; - Superscript (`^text^') and subscript (`~text~') syntax is not
+;;   supported by the grammar.  No EXTENSION_ build flag exists for
+;;   this.  This is Pandoc / PHP Markdown Extra syntax, not CommonMark
+;;   or GFM.
+;;
+;; - Ordered (numbered) lists do not nest by indentation.  Indenting
+;;   a `1.' item under another ordered item does not produce a nested
+;;   list node; the parser either treats it as a flat sibling or
+;;   absorbs it into the parent item's paragraph as a
+;;   block_continuation.  Unordered (`-', `*', `+') lists nest
+;;   correctly.  Demote/promote of ordered list items is therefore
+;;   disabled.
+;;
+;; - Renumbering ordered lists (`markdown-ts-renumber-list') may only
+;;   affect items from point downward if the parser splits a single
+;;   list into separate `list' nodes, or may continue numbering across
+;;   two separate lists if the parser merges them into one node.
+;;
+;; - Empty lines following an `indented_code_block' may be claimed by
+;;   the parser as continuation lines of that block, rather than being
+;;   treated as blank separators.
+;;
+;; - Pipe tables are inconsistently parsed.  Whitespace is correctly
+;;   trimmed at the start of a cell content but trailing whitespace is
+;;   incorrectly included.  Empty cells can contain uneven "ragged" row
+;;   column configurations that can confuse the parser.
+;;
+;;   Markdown pipe tables with parsing issues:
+;;
+;;   |Column 1|Column 2|Column 3|
+;;   |--------|--------|--------|
+;;   |        |        |        |
+;;   |        |        |        | <-- parse error
+;;
+;;   |Column 1|Column 2|Column 3|
+;;   |--------|--------|--------|
+;;   |        |        |        |
+;;   | xxx    |        |        | <-- parsed correctly
+;;
+;;   |Column 1|Column 2| <-- 2 columns correct
+;;   |--------|--------| <-- 2 columns correct
+;;            |        | <-- 1 column incorrect
+;;            |        | <-- parse error
+;;   |        |        | <-- not a row after the error, above
+;;
+;;   See <https://github.com/tree-sitter-grammars/tree-sitter-markdown/issues/241>
+;;       <https://github.com/tree-sitter-grammars/tree-sitter-markdown/issues/242>
+;;
+;; - The grammar's external scanner has a buffer overflow in its
+;;   `serialize' function: when the parser state exceeds the
+;;   serialization buffer provided by tree-sitter, `memcpy' writes past
+;;   the end and can corrupt the stack.  Triggered in practice while
+;;   parsing Markdown in Emacs.
+;;   See <https://github.com/tree-sitter-grammars/tree-sitter-markdown/issues/243>.
+;;
+;;;; Batch Fontification
+;;
+;; Some downstream packages fontify multiple unrelated Markdown
+;; fragments by joining them in a single buffer with a separator and
+;; running `markdown-ts-mode' over the whole thing.  Choice of separator
+;; matters: the tree-sitter-markdown grammar does not list the NUL byte
+;; (`\0') as extra/whitespace, so a NUL separator yields an ERROR node
+;; and the parser enters error recovery, which can leak inline faces
+;; (e.g., strikethrough) across fragment boundaries.  Regex-based modes
+;; tolerate NUL silently because they do not parse structure; this is a
+;; behavioral difference, not a regression.
+;;
+;; A form feed (`^L', `\f') flanked by blank lines works as a clean
+;; drop-in separator: the parser treats it as a paragraph break and
+;; inline state does not bleed across fragments.
 
 ;;; Code:
 
 (require 'treesit)
 (require 'subr-x)
-(require 'outline)
 (require 'seq)
+(require 'outline)
+(require 'goto-addr)
+(require 'xref)
+(require 'icons)
+
+;;; Customizations:
+
+(defgroup markdown-ts nil
+  "Major mode for viewing and editing Markdown buffers."
+  :prefix "markdown-ts-"
+  :group 'text
+  :group 'editing
+  :version "31.1")
+
+(defcustom markdown-ts-hide-markup nil
+  "Non-nil means hide Markdown markup delimiters in this buffer."
+  :type 'boolean
+  :local t
+  :safe #'booleanp
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-ellipsis nil
+  "The ellipsis to use in folded headings.
+When nil, use the standard three dots.  When a non-empty string,
+use that string instead."
+  :type '(choice (const  :tag "Default (...)" nil)
+                 (string :tag "String" :value " ⌄"))
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-menu-bar-show t
+  "Non-nil means show the Markdown menu in the menu bar."
+  :type 'boolean
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-default-folding 'show-all
+  "Default heading folding level."
+  :type '(choice
+          (const :tag "Show everything" show-all)
+          (const :tag "Fold everything, showing top-level headings" fold-all)
+          (const :tag "Fold headings, showing all heading levels" fold-headings))
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-inline-images nil
+  "Non-nil means display inline images below image links."
+  :type 'boolean
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-image-max-width 'window
+  "Maximum width of inline images in pixels.
+When `window', use the window body width.  When a number, use
+that as the maximum pixel width."
+  :type '(choice (const  :tag "Window width" window)
+                 (natnum :tag "Pixel width"))
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-display-remote-inline-images nil
+  "How to display remote inline images.
+When nil, do not display remote images.  When `download', fetch the
+image into a temporary buffer and display it.
+
+Remote images are skipped by default for security."
+  :type '(choice (const :tag "Skip remote images" nil)
+                 (const :tag "Download remote images" download))
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-checked-checkbox '("☑" . "+")
+  "If markup is hidden, display this for a checked task list marker.
+Value forms:
+ - cons (PREFERRED . FALLBACK): PREFERRED is used if its first character
+   passes `char-displayable-p', otherwise FALLBACK.
+ - symbol `icon': defer to the icons.el icon
+   `markdown-ts-checked-checkbox-icon'; customize via
+   \\[customize-icon].
+ - nil: display the raw markup."
+  :type '(choice (cons (string :tag "Preferred (GUI)")
+                       (string :tag "Fallback (TTY)"))
+                 (const :tag "Use icons.el icon" icon)
+                 (const :tag "Display original markup" nil))
+  :version "31.1"
+  :package-version "1.0")
+
+(define-icon markdown-ts-checked-checkbox-icon nil
+  '((image "checked.svg" :height line :ascent center)
+    (symbol "☑")
+    (text "+"))
+  "Icon used for a checked task list marker when markup is hidden.
+Consulted only when `markdown-ts-checked-checkbox' is the symbol
+`icon'."
+  :version "31.1")
+
+(defcustom markdown-ts-unchecked-checkbox '("☐" . "-")
+  "If markup is hidden, display this for an unchecked task list marker.
+Value forms:
+ - cons (PREFERRED . FALLBACK): PREFERRED is used if its first character
+   passes `char-displayable-p', otherwise FALLBACK.
+ - symbol `icon': defer to the icons.el icon
+   `markdown-ts-unchecked-checkbox-icon'; customize via
+   \\[customize-icon].
+ - nil: display the raw markup."
+  :type '(choice (cons (string :tag "Preferred (GUI)")
+                       (string :tag "Fallback (TTY)"))
+                 (const :tag "Use icons.el icon" icon)
+                 (const :tag "Display original markup" nil))
+  :version "31.1"
+  :package-version "1.0")
+
+(define-icon markdown-ts-unchecked-checkbox-icon nil
+  '((image "unchecked.svg" :height line :ascent center)
+    (symbol "☐")
+    (text "-"))
+  "Icon used for an unchecked task list marker when markup is hidden.
+Consulted only when `markdown-ts-unchecked-checkbox' is the symbol
+`icon'."
+  :version "31.1")
+
+(defcustom markdown-ts-thematic-break-character '(?─ . ?-)
+  "If markup is hidden, display this character for thematic breaks.
+It is repeated to fill the window width.
+The value is a cons (PREFERRED . FALLBACK): PREFERRED is used if it passes
+`char-displayable-p', otherwise FALLBACK is used.
+nil displays the raw markup."
+  :type '(choice (cons (character :tag "Preferred (GUI)")
+                       (character :tag "Fallback (TTY)"))
+                 (const :tag "Display original markup" nil))
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-hard-line-break-backslash '(?¶ . ?|)
+  "If markup is hidden, display this character for a backslash hard line break.
+The value is a cons (PREFERRED . FALLBACK): PREFERRED is used if it passes
+`char-displayable-p', otherwise FALLBACK is used.
+nil keeps the raw markup."
+  :type '(choice (cons (character :tag "Preferred (GUI)")
+                       (character :tag "Fallback (TTY)"))
+                 (const :tag "Display original markup" nil))
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-hard-line-break-space
+  (lambda (n)
+    (let* ((val (markdown-ts--resolve-display-value
+                 markdown-ts-hard-line-break-backslash))
+           (ch (if (characterp val) val ?|)))
+      (make-string n ch)))
+  "If markup is hidden, display this for a trailing-spaces hard line break.
+The value can be:
+- a character or string: shown once at the start of the trailing spaces,
+  with no repetition (the remaining spaces stay invisible);
+- a function: called with one argument, the number of trailing spaces,
+  and must return the string to display in place of the run;
+- nil: keep the raw markup."
+  :type '(choice (character :tag "Display specified character (no repetition)")
+                 (string :tag "Display specified string (no repetition)")
+                 (function :tag "Function from count to display string")
+                 (const :tag "Display original markup" nil))
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-fontify-code-blocks-natively t
+  "Non-nil means fontify code block contents using the language's mode.
+When non-nil, fenced code blocks are highlighted with syntax of the
+embedded language (via tree-sitter for languages with a tree-sitter
+mode, or via conventional font-lock for the rest).  When nil, code
+blocks keep only the `markdown-ts-code-block' background face.  Toggling
+for the ts-embedded path takes effect after restarting
+`markdown-ts-mode' in the buffer."
+  :type 'boolean
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-enable-code-block-context-mode t
+  "Non-nil automatically enables `markdown-ts-code-block-context-mode'.
+If non-nil and `point' is in a fenced code block, this runs
+`indent-for-tab-command', `newline', et.al., in the mode of the code
+block."
+  :type 'boolean
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-code-block-in-context-mode-lighter " [code]"
+  "Minor mode `markdown-ts-code-block-context-mode' lighter string.
+Set to nil to disable the lighter."
+  :type 'string
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-inhibit-code-block-mode-warnings t
+  "If non-nil, inhibit code-block major-mode messages and warnings.
+Some fenced code-block major modes produce messages or warnings which
+have little relevance to Markdown buffers.  Use this option to inhibit
+them.  Major modes may be enabled for fontification or editing in the
+mode's context."
+  :type 'boolean
+  :version "31.1"
+  :package-version "1.0")
+
+(defvar warning-minimum-level)
+
+(defmacro markdown-ts--inhibit-messages-and-warnings (var &rest body)
+  "Execute BODY with messages and warnings inhibited.
+VAR is a variable's symbol; e.g.,
+\\='markdown-ts-inhibit-code-block-mode-warnings.  If the symbol's value
+is non-nil, do what it says on the tin.
+Inhibit messages in the echo area.
+Inhibit messages in the log.
+Inhibit warnings with level < :error."
+  (declare (indent defun))
+  `(let* ((val (symbol-value ,var))
+          (inhibit-message val)
+         ;; Also inhibit logging to *Messages*
+         (message-log-max (if val nil message-log-max))
+         (warning-minimum-level
+          (if val :error warning-minimum-level)))
+     (progn ,@body)))
+
+(defcustom markdown-ts-default-code-block-mode 'text-mode
+  "Default mode for anonymous code blocks."
+  :type '(choice
+          (const  :tag "Text mode" text-mode)
+          (const  :tag "Fundamental mode" fundamental-mode)
+          (symbol :tag "Other mode symbol"
+                  :validate (lambda (wid)
+                              (let ((val (widget-value wid)))
+                                (unless (and val (eq 'symbol (type-of val)))
+                                  (widget-put wid :error "Must be a non-nil symbol")
+                                  wid)))))
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-table-default-column-width 5
+  "Column width for new columns.
+You may make this wider, but smaller than 5 is not recommended."
+  :type 'integer
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-enable-table-mode t
+  "Non-nil automatically enables `markdown-ts-table-mode'.
+If non-nil, enable `markdown-ts-table-mode' if `point' is in a Markdown
+table."
+  :type 'boolean
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-table-auto-align '(cell-navigation transpose)
+  "Automatically align the table at point during these operations.
+If t, trigger on all supported operations.
+If nil, do not auto align.
+Otherwise, it is a list of symbols representing table operations."
+  :type '(choice
+          (const :tag "Do not automatically align" nil)
+          (const :tag "Always automatically align" t)
+          (set
+           (const :tag "Cell navigation" cell-navigation)
+           (const :tag "Transpose" transpose)))
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-table-align-features '(justify-cells)
+  "Use these optional features when aligning a table.
+Aligning a table aligns each column to the width of its widest cell.  It
+can also justify each cell according to the table's delimiter line left,
+center, or right-hand justification rules.
+
+Customizing this user option is most useful when the user option
+`markdown-ts-table-auto-align' is enabled and to avoid having to use a
+prefix argument before every auto-alignment operation.
+
+If t, enable all optional alignment operations.
+If nil, operations are enabled beyond basic column alignment.
+Otherwise, it is a list of symbols."
+  :type '(choice
+          (const :tag "No optional features" nil)
+          (const :tag "All optional features" t)
+          (set
+           (const :tag "Justify cells" justify-cells)))
+  :version "31.1"
+  :package-version "1.0")
+
+(defcustom markdown-ts-in-table-mode-lighter " [table]"
+  "Minor mode `markdown-ts-in-table-mode' lighter string.
+Set to nil to disable the lighter."
+  :type 'string
+  :version "31.1"
+  :package-version "1.0")
+
+;;; Faces:
+
+(defgroup markdown-ts-faces nil
+  "Faces used by Markdown-TS."
+  :group 'markdown-ts-faces
+  :group 'faces)
+
+(defface markdown-ts-delimiter '((t (:inherit shadow)))
+  "Face for the # before Markdown headings."
+  :version "31.1")
+
+(defface markdown-ts-heading-1 '((t (:inherit outline-1)))
+  "Face for first level Markdown headings."
+  :version "31.1")
+
+(defface markdown-ts-setext-heading '((t (:inherit markdown-ts-heading-1)))
+  "Face for setext Markdown headings (headings underlined by === or ---)."
+  :version "31.1")
+
+(defface markdown-ts-heading-2 '((t (:inherit outline-2)))
+  "Face for second level Markdown headings."
+  :version "31.1")
+
+(defface markdown-ts-heading-3 '((t (:inherit outline-3)))
+  "Face for third level Markdown headings."
+  :version "31.1")
+
+(defface markdown-ts-heading-4 '((t (:inherit outline-4)))
+  "Face for fourth level Markdown headings."
+  :version "31.1")
+
+(defface markdown-ts-heading-5 '((t (:inherit outline-5)))
+  "Face for fifth level Markdown headings."
+  :version "31.1")
+
+(defface markdown-ts-heading-6 '((t (:inherit outline-6)))
+  "Face for sixth level Markdown headings."
+  :version "31.1")
+
+(defface markdown-ts-emphasis '((t (:inherit italic)))
+  "Face for Markdown emphasis (italic) text."
+  :version "31.1")
+
+(defface markdown-ts-bold '((t (:inherit bold)))
+  "Face for Markdown strong emphasis (bold) text."
+  :version "31.1")
+
+(defface markdown-ts-strikethrough '((t (:strike-through t)))
+  "Face for Markdown strikethrough text."
+  :version "31.1")
+
+(defface markdown-ts-block-quote '((t (:inherit italic)))
+  "Face for Markdown block quotes."
+  :version "31.1")
+
+(defface markdown-ts-link '((t (:inherit link)))
+  "Face for Markdown link text and image descriptions."
+  :version "31.1")
+
+(defface markdown-ts-link-destination '((t (:inherit font-lock-string-face)))
+  "Face for Markdown link destinations (URLs)."
+  :version "31.1")
+
+(defface markdown-ts-code-span '((t (:inherit font-lock-string-face)))
+  "Face for Markdown inline code spans."
+  :version "31.1")
+
+(defface markdown-ts-code-block '((t (:extend t)))
+  "Face for Markdown fenced code block content.
+Alter this face to add a `:background' for a visually distinct
+code block region, e.g.:
+  (set-face-attribute \\='markdown-ts-code-block nil :background \"gray95\")"
+  :version "31.1")
+
+(defface markdown-ts-in-code-block '((t (:extend t)))
+  "Face for when point is in a Markdown code block.
+See `markdown-ts-code-block-in-context-mode'.
+Alter this face to add a `:background' for a visually distinct table
+region, e.g.:
+  (set-face-attribute \\='markdown-ts-in-code-block :background \"gray95\")"
+  :version "31.1")
+
+(defface markdown-ts-code-block-markup-hidden
+  '((((background light)) (:background "gray95" :extend t))
+    (((background dark))  (:background "gray15" :extend t)))
+  "Face for Markdown fenced code block content when markup is hidden.
+Used instead of `markdown-ts-code-block' when `markdown-ts-hide-markup'
+is non-nil."
+  :version "31.1")
+
+(defface markdown-ts-indented-code-block '((t (:inherit font-lock-string-face)))
+  "Face for Markdown indented code blocks."
+  :version "31.1")
+
+(defface markdown-ts-html-tag '((t (:inherit font-lock-doc-markup-face)))
+  "Face for inline HTML tags in Markdown."
+  :version "31.1")
+
+(defface markdown-ts-html-block '((t (:inherit font-lock-doc-markup-face)))
+  "Face for HTML blocks in Markdown."
+  :version "31.1")
+
+(defface markdown-ts-thematic-break '((t (:inherit shadow :extend t)))
+  "Face for Markdown thematic breaks (horizontal rules).
+Customize this face to add a :background for a full-width visual rule."
+  :version "31.1")
+
+(defface markdown-ts-entity-reference '((t (:inherit font-lock-builtin-face)))
+  "Face for named HTML entity references like &amp; and &copy;."
+  :version "31.1")
+
+(defface markdown-ts-numeric-character-reference
+  '((t (:inherit font-lock-escape-face)))
+  "Face for numeric character references like &#65; and &#x41;."
+  :version "31.1")
+
+(defface markdown-ts-latex '((t (:inherit font-lock-string-face)))
+  "Face for LaTeX / math content in Markdown ($...$ and $$...$$)."
+  :version "31.1")
+
+(defface markdown-ts-table-header '((t (:inherit (bold font-lock-doc-face))))
+  "Face for Markdown pipe table header cells."
+  :version "31.1")
+
+(defface markdown-ts-table-cell '((t (:inherit default)))
+  "Face for Markdown pipe table data cells."
+  :version "31.1")
+
+(defface markdown-ts-table-delimiter-cell '((t (:inherit font-lock-doc-face)))
+  "Face for Markdown pipe table delimiter cells (--- separators)."
+  :version "31.1")
+
+(defface markdown-ts-table '((t (:extend t)))
+  "Face for Markdown table.
+Alter this face to add a `:background' for a visually distinct table
+region, e.g.:
+  (set-face-attribute \\='markdown-ts-table nil :background \"gray95\")"
+  :version "31.1")
+
+(defface markdown-ts-in-table '((t (:extend t)))
+  "Face for Markdown `markdown-ts-in-table-mode' when point is in a table.
+Alter this face to add a `:background' for a visually distinct table
+region, e.g.:
+  (set-face-attribute \\='markdown-ts-in-table nil :background \"gray95\")"
+  :version "31.1")
+
+(defface markdown-ts-language-keyword '((t (:inherit font-lock-keyword-face)))
+  "Face for the language keyword for Markdown code blocks."
+  :version "31.1")
+
+(defface markdown-ts-list-marker '((t (:inherit shadow)))
+  "Face for Markdown list markers like - and *."
+  :version "31.1")
+
+(defface markdown-ts-hard-line-break-backslash
+  '((t (:inherit outline-4 :weight bold)))
+  "Face for Markdown hard line breaks introduced by a trailing backslash."
+  :version "31.1")
+
+(defface markdown-ts-hard-line-break-backslash-hidden
+  '((t (:inherit outline-4 :weight bold)))
+  "Face for trailing-backslash hard line break when markup is hidden."
+  :version "31.1")
+
+(defface markdown-ts-hard-line-break-space
+  '((((background light)) (:background "gray70" :weight bold))
+    (((background dark))  (:background "gray40" :weight bold)))
+  "Face for Markdown hard line breaks introduced by two trailing spaces.
+The trailing spaces are otherwise invisible, so they are shown as a
+shadow-colored block."
+  :version "31.1")
+
+(defface markdown-ts-hard-line-break-space-hidden
+  '((t (:inherit outline-4 :weight bold)))
+  "Face for trailing-spaces hard line break when markup is hidden."
+  :version "31.1")
+
+(defface markdown-ts-task-unchecked '((t (:inherit markdown-ts-list-marker)))
+  "Face for Markdown unchecked task list markers."
+  :version "31.1")
+
+(defface markdown-ts-task-checked '((t (:inherit markdown-ts-list-marker)))
+  "Face for Markdown checked task list markers."
+  :version "31.1")
 
 (treesit-declare-unavailable-functions)
 
@@ -51,6 +717,7 @@
    :commit "413285231ce8fa8b11e7074bbe265b48aa7277f9"
    :source-dir "tree-sitter-markdown/src")
  t)
+
 (add-to-list
  'treesit-language-source-alist
  '(markdown-inline
@@ -59,101 +726,60 @@
    :source-dir "tree-sitter-markdown-inline/src")
  t)
 
-;;; Helper functions
+;;; Variables:
 
-(defvar markdown-ts--code-block-language-map
-  '(("c++" . cpp)
-    ("c#" . c-sharp)
-    ("sh" . bash))
-  "Alist mapping code block language names to tree-sitter languages.
+(defvar markdown-ts--set-up-inline nil
+  "Let bind this to non-nil for inline `markdown-ts-mode' buffers.")
 
-Keys should be strings, and values should be language symbols.
+(defvar markdown-ts-code-block-modes
+  `((sh bash-ts-mode)
+    (shell bash-ts-mode)
+    (,(intern "c#") csharp-ts-mode)
+    (cpp c++-ts-mode)
+    (el emacs-lisp-mode)
+    (elisp emacs-lisp-mode)
+    (golang go-ts-mode)
+    (gomod go-mod-ts-mode)
+    (gowork go-work-ts-mode)
+    (javascript js-ts-mode)
+    (md markdown-ts-mode)
+    (py python-ts-mode)
+    (rb ruby-ts-mode)
+    (rs rust-ts-mode)
+    (tex latex-mode)
+    (ts typescript-ts-mode)
+    (yml yaml-ts-mode))
+  "Extra mappings from code block language tags to major modes.
 
-For example, \"c++\" in
+Entries here are only needed when the language tag in a fenced code
+block does NOT match the conventional mode name derivation, e.g. the
+user writes \\=`\\=`\\=`ts instead of \\=`\\=`\\=`typescript, or
+\\=`\\=`\\=`py instead of \\=`\\=`\\=`python.  For tags that already
+resolve via the standard \"-ts-mode\"/\"-mode\" heuristics there is no
+need to add an entry.
 
-    ```c++
-    int main() {
-        return 0;
-    }
-    ```
+The alist is of the form (LANGUAGE MAJOR-MODE). MAJOR-MODE can be a
+tree-sitter or a conventional mode.
 
-maps to tree-sitter language `cpp'.")
+If you prefer a conventional mode over its tree-sitter variant, add or
+replace relevant entries.  For example:
 
-(defvar markdown-ts-code-block-source-mode-map
-  '((bash . bash-ts-mode)
-    (c . c-ts-mode)
-    (c-sharp . csharp-ts-mode)
-    (cmake . cmake-ts-mode)
-    (cpp . c++-ts-mode)
-    (css . css-ts-mode)
-    (dockerfile . dockerfile-ts-mode)
-    (elixir . elixir-ts-mode)
-    (go . go-ts-mode)
-    (gomod . go-mod-ts-mode)
-    (gowork . go-work-ts-mode)
-    (heex . heex-ts-mode)
-    (html . html-ts-mode)
-    (java . java-ts-mode)
-    (javascript . js-ts-mode)
-    (json . json-ts-mode)
-    (lua . lua-ts-mode)
-    (php . php-ts-mode)
-    (python . python-ts-mode)
-    (ruby . ruby-ts-mode)
-    (rust . rust-ts-mode)
-    (toml . toml-ts-mode)
-    (tsx . tsx-ts-mode)
-    (typescript . typescript-ts-mode)
-    (yaml . yaml-ts-mode))
-  "An alist of supported code block languages and their major mode.")
+    (add-to-list \\='markdown-ts-code-block-modes
+      \\='(python python-mode))
+    (setf (alist-get \\='py markdown-ts-code-block-modes)
+          \\='(python-mode))
 
-(defcustom markdown-ts-hide-markup nil
-  "Non-nil means hide Markdown markup delimiters in this buffer."
-  :type 'boolean
-  :safe #'booleanp
-  :group 'markdown-ts)
+Code blocks for that non tree-sitter modes will be fontified using the
+mode's conventional font-lock rules.")
 
-;;; Faces
+(defvar markdown-ts-code-block-force-conventional-modes
+  '(markdown-ts-mode
+    php-ts-mode)
+  "Treat these code block tree-sitter modes as conventional.
+Some modes that embed multiple `treesit' parsers need to be treated with
+conventional font-lock.  `markdown-ts-mode' itself is one of them.")
 
-(defgroup markdown-ts-faces nil
-  "Faces used in Markdown TS Mode."
-  :group 'markdown-ts-faces
-  :group 'faces)
-
-(defface markdown-ts-delimiter '((t (:inherit shadow)))
-  "Face for the # before Markdown headings.")
-
-(defface markdown-ts-heading-1 '((t (:inherit outline-1)))
-  "Face for first level Markdown headings.")
-
-(defface markdown-ts-setext-heading '((t (:inherit markdown-ts-heading-1)))
-  "Face for setext Markdown headings (headings underlined by === or ---).")
-
-(defface markdown-ts-heading-2 '((t (:inherit outline-2)))
-  "Face for second level Markdown headings.")
-
-(defface markdown-ts-heading-3 '((t (:inherit outline-3)))
-  "Face for third level Markdown headings.")
-
-(defface markdown-ts-heading-4 '((t (:inherit outline-4)))
-  "Face for fourth level Markdown headings.")
-
-(defface markdown-ts-heading-5 '((t (:inherit outline-5)))
-  "Face for fifth level Markdown headings.")
-
-(defface markdown-ts-heading-6 '((t (:inherit outline-6)))
-  "Face for sixth level Markdown headings.")
-
-(defface markdown-ts-list-marker '((t (:inherit shadow)))
-  "Face for Markdown list markers like - and *.")
-
-(defface markdown-ts-block-quote '((t (:inherit italic)))
-  "Face for Markdown block quotes.")
-
-(defface markdown-ts-language-keyword '((t (:inherit font-lock-keyword-face)))
-  "Face for the language keyword for Markdown code blocks.")
-
-;;; Font-lock
+;;; Font-lock:
 
 (defun markdown-ts--fontify-delimiter (node override start end &rest _)
   "Fontify delimiter NODE and optionally hide its markup.
@@ -168,23 +794,837 @@ OVERRIDE, START, and END are passed through to
     (put-text-property (treesit-node-start node) (treesit-node-end node)
                        'invisible 'markdown-ts--markup)))
 
+(defvar url-mail-command) ; url/url-vars.el
+
+(defun markdown-ts--make-link-button (beg end url)
+  "Make the region from BEG to END a clickable button for URL.
+For mailto: URIs, use `url-mail-command'.  For other schemes
+\(e.g., http, ftp), open with `browse-url'.  Otherwise, treat as
+a relative file path and open with `find-file'.
+
+Do not pass `face' to `make-text-button': the link face is already
+applied by `markdown-ts--fontify-link-node' via
+`treesit-fontify-with-override' (with `:override append'), and
+`add-text-properties' would otherwise replace the appended face
+list with a single `markdown-ts-link', clobbering an enclosing
+heading face."
+  ;; NOTE: URI scheme and host name are case-insensitive per RFC 3986
+  ;; and RFC 7230.
+  (let ((case-fold-search nil))
+    (make-text-button beg end
+                      'action (lambda (_button)
+                                (cond
+                                 ((string-prefix-p "#" url)
+                                  (markdown-ts--follow-fragment
+                                   (substring url 1)))
+                                 ((string-match-p "\\`mailto:" url)
+                                  (funcall url-mail-command
+                                           (replace-regexp-in-string
+                                            "\\`mailto:" "" url)))
+                                 ((string-match-p "\\`[a-z]+:" url)
+                                  (browse-url url))
+                                 (t (find-file url))))
+                      'help-echo url)))
+
+(defun markdown-ts--fontify-link-destination (node override start end &rest _)
+  "Fontify link destination NODE and hide it when markup is hidden.
+OVERRIDE, START, and END are passed through to
+`treesit-fontify-with-override'."
+  (treesit-fontify-with-override
+   (treesit-node-start node) (treesit-node-end node)
+   'markdown-ts-link-destination override start end)
+  (when markdown-ts-hide-markup
+    (put-text-property (treesit-node-start node) (treesit-node-end node)
+                       'invisible 'markdown-ts--markup)))
+
+(defvar-local markdown-ts--link-ref-cache nil
+  "Cached alist of (LABEL . URL) from link reference definitions.
+Each entry is a cons cell mapping a downcased label string to its
+destination URL.")
+
+(defvar-local markdown-ts--link-ref-cache-tick nil
+  "Value of `buffer-chars-modified-tick' when the cache was built.")
+
+(defun markdown-ts--link-ref-definitions ()
+  "Return an alist of (LABEL . URL) from link reference definitions.
+LABEL is downcased for case-insensitive matching.  Results are
+cached and rebuilt only when the buffer changes."
+  (let ((tick (buffer-chars-modified-tick)))
+    (unless (eq tick markdown-ts--link-ref-cache-tick)
+      (let* ((root (treesit-buffer-root-node 'markdown))
+             (matches (treesit-query-capture
+                       root
+                       '((link_reference_definition
+                          (link_label) @label
+                          (link_destination) @dest))))
+             defs)
+        (while matches
+          (let* ((label-pair (pop matches))
+                 (dest-pair (pop matches))
+                 (lbl-text (string-trim (treesit-node-text (cdr label-pair) t)
+                                        "\\[" "\\]")))
+            (push (cons (downcase lbl-text)
+                        (treesit-node-text (cdr dest-pair) t))
+                  defs)))
+        (setq markdown-ts--link-ref-cache (nreverse defs)
+              markdown-ts--link-ref-cache-tick tick)))
+    markdown-ts--link-ref-cache))
+
+(defun markdown-ts--resolve-link-ref (label)
+  "Resolve LABEL to a URL via link reference definitions.
+LABEL should be the text without brackets.  Matching is
+case-insensitive per CommonMark spec section 4.7."
+  (alist-get (downcase label) (markdown-ts--link-ref-definitions)
+             nil nil #'equal))
+
+;;; Fragment links:
+
+(defconst markdown-ts--slug-github-strip-re
+  "[][!\"#$%&'()*+,./:;<=>?@\\^`{|}~]"
+  "Punctuation stripped by GitHub's gh-slugger before hyphenation.")
+
+(defun markdown-ts--slug-github (text)
+  "Return the GitHub-flavor slug for heading TEXT.
+Mirrors the gh-slugger algorithm: lowercase, strip a fixed
+punctuation set, replace spaces with hyphens."
+  (let* ((lc (downcase text))
+         (stripped (replace-regexp-in-string
+                    markdown-ts--slug-github-strip-re "" lc)))
+    (replace-regexp-in-string "[[:blank:]]" "-" stripped)))
+
+(defun markdown-ts--slug-pandoc (text)
+  "Return the Pandoc-flavor auto-id slug for heading TEXT.
+Mirrors Pandoc's algorithm: drop everything before the first
+letter, keep alphanumerics and `_-.', collapse whitespace runs to
+hyphens, lowercase.  Falls back to \"section\" if empty."
+  (let* ((lc (downcase text))
+         (from-letter (if (string-match "[[:alpha:]]" lc)
+                          (substring lc (match-beginning 0))
+                        ""))
+         (kept (replace-regexp-in-string
+                "[^[:alnum:]_.\n\t[:blank:]-]" "" from-letter))
+         (hyphenated (replace-regexp-in-string "[[:blank:]\t\n]+" "-" kept))
+         (trimmed (replace-regexp-in-string "-+\\'" "" hyphenated)))
+    (if (string-empty-p trimmed) "section" trimmed)))
+
+(defconst markdown-ts--explicit-id-re
+  "[ \t]*{[ \t]*#\\([^} \t]+\\)[ \t]*}[ \t]*\\'"
+  "Match a Pandoc-style trailing `{#id}' on a heading line.
+Capture group 1 is the explicit id.")
+
+(defun markdown-ts--heading-text-and-id (raw)
+  "Split RAW heading text into (VISIBLE . EXPLICIT-ID).
+EXPLICIT-ID is non-nil if RAW ends with a Pandoc-style `{#id}',
+in which case VISIBLE is RAW with that suffix removed."
+  (if (string-match markdown-ts--explicit-id-re raw)
+      (cons (substring raw 0 (match-beginning 0))
+            (match-string 1 raw))
+    (cons raw nil)))
+
+(defvar-local markdown-ts--heading-id-cache nil
+  "Cached hash table mapping heading slug strings to buffer positions.
+Each value is the buffer position of the start of the matching
+`atx_heading' or `setext_heading' node.  Built lazily by
+`markdown-ts--heading-ids', invalidated by buffer-tick change.")
+
+(defvar-local markdown-ts--heading-id-cache-tick nil
+  "Value of `buffer-chars-modified-tick' when the heading-id cache was built.")
+
+(defun markdown-ts--build-heading-ids ()
+  "Walk all headings in the buffer and return a hash table.
+Which maps each slug to the buffer position of its heading.  Each
+heading contributes its GitHub slug, its Pandoc slug, and its explicit
+`{#id}' if present.  Both slug algorithms are stored in the same buffer
+because a markdown file is often previewed by several renderers (GitHub
+web UI, Pandoc, mdBook, Hugo, and so on) and the same source should
+resolve regardless of which one the author wrote the link for.  For most
+headings the two algorithms produce the same slug anyway.
+Duplicate slugs (within one algorithm) are disambiguated by appending
+`-1', `-2', and so on, in document order, matching GitHub's behavior.
+When two distinct headings would otherwise share a slug, the first
+occurrence in document order wins."
+  (let ((table (make-hash-table :test #'equal))
+        ;; Per-algorithm dedupe counters: how many times this base slug
+        ;; has been seen so far in document order.
+        (gh-counts (make-hash-table :test #'equal))
+        (pd-counts (make-hash-table :test #'equal))
+        (root (treesit-buffer-root-node 'markdown)))
+    (dolist (cap (treesit-query-capture
+                  root
+                  '(((atx_heading) @h)
+                    ((setext_heading) @h))))
+      (let* ((node (cdr cap))
+             (pos (treesit-node-start node))
+             (raw (string-trim (treesit-node-text node t)))
+             ;; Strip the leading marker (### or ====/----).
+             ;; For atx, drop leading #'s and following space.
+             ;; For setext, drop the trailing underline line.
+             (text (cond
+                    ((string-match "\\`#+[ \t]*\\(.*?\\)[ \t]*#*[ \t]*\\'" raw)
+                     (match-string 1 raw))
+                    ((string-match "\\`\\(.*?\\)\n[=-]+[ \t]*\\'" raw)
+                     (match-string 1 raw))
+                    (t raw)))
+             (split (markdown-ts--heading-text-and-id text))
+             (visible (car split))
+             (explicit (cdr split)))
+        ;; Explicit {#id} wins outright; first occurrence keeps it.
+        (when (and explicit (not (gethash explicit table)))
+          (puthash explicit pos table))
+        ;; Auto slugs (GitHub + Pandoc), deduped per algorithm.
+        (let* ((gh-base (markdown-ts--slug-github visible))
+               (pd-base (markdown-ts--slug-pandoc visible))
+               (gh-n (gethash gh-base gh-counts 0))
+               (pd-n (gethash pd-base pd-counts 0))
+               (gh-id (if (zerop gh-n) gh-base
+                        (format "%s-%d" gh-base gh-n)))
+               (pd-id (if (zerop pd-n) pd-base
+                        (format "%s-%d" pd-base pd-n))))
+          (puthash gh-base (1+ gh-n) gh-counts)
+          (puthash pd-base (1+ pd-n) pd-counts)
+          ;; First-writer-wins so document order tiebreaks collisions.
+          (unless (gethash gh-id table) (puthash gh-id pos table))
+          (unless (gethash pd-id table) (puthash pd-id pos table)))))
+    table))
+
+(defun markdown-ts--heading-ids ()
+  "Return the heading-id hash table for the current buffer.
+Cache is rebuilt only when `buffer-chars-modified-tick' has advanced
+since the last call (mirrors `markdown-ts--link-ref-cache')."
+  (let ((tick (buffer-chars-modified-tick)))
+    (unless (eq tick markdown-ts--heading-id-cache-tick)
+      (setq markdown-ts--heading-id-cache (markdown-ts--build-heading-ids)
+            markdown-ts--heading-id-cache-tick tick))
+    markdown-ts--heading-id-cache))
+
+(defun markdown-ts--follow-fragment (id)
+  "Jump to the heading whose slug matches ID (without leading `#').
+Pushes the mark before moving so `C-u C-SPC' returns.  Signals
+`user-error' if no heading matches."
+  (if-let* ((pos (gethash id (markdown-ts--heading-ids))))
+      (progn
+        (push-mark)
+        (goto-char pos)
+        (recenter))
+    (user-error "No heading for fragment: #%s" id)))
+
+(defun markdown-ts--fontify-heading (node _override _start _end &rest _)
+  "Apply the heading face across NODE.
+Layer the face on top of child sub-nodes (e.g. an inline link) so
+their own faces are preserved.  Strip any prior copy of the face
+first so it does not accumulate when the heading is refontified or
+its level/type changes during editing.
+
+For ATX headings, also fontify any optional trailing closing-`#'
+sequence as a delimiter.  The tree-sitter grammar does not produce a
+separate node for these; per CommonMark they are decorative and
+must be preceded by a space or tab."
+  (let* ((type (treesit-node-type node))
+         (n-start (treesit-node-start node))
+         (n-end   (treesit-node-end node))
+         (face (cond
+                ((equal type "setext_heading")
+                 'markdown-ts-setext-heading)
+                (t
+                 (let ((marker (treesit-node-child node 0)))
+                   (intern (format "markdown-ts-heading-%d"
+                                   (length (treesit-node-text marker t)))))))))
+    (font-lock--remove-face-from-text-property n-start n-end 'face face)
+    (font-lock-append-text-property n-start n-end 'face face)
+    (when (string-prefix-p "atx_" type)
+      (save-excursion
+        (goto-char n-end)
+        (skip-chars-backward " \t\n" n-start)
+        (let ((line-end (point)))
+          (skip-chars-backward " \t" n-start)
+          (let ((trailing-end (point)))
+            (skip-chars-backward "#" n-start)
+            (let ((trailing-start (point)))
+              (when (and (< trailing-start trailing-end)
+                         (> trailing-start n-start)
+                         (memq (char-before trailing-start) '(?\s ?\t)))
+                (font-lock--remove-face-from-text-property
+                 trailing-start trailing-end
+                 'face 'markdown-ts-delimiter)
+                (font-lock-prepend-text-property
+                 trailing-start trailing-end
+                 'face 'markdown-ts-delimiter)
+                (when markdown-ts-hide-markup
+                  ;; Also hide the space(s) preceding the closer and any
+                  ;; trailing whitespace, so the heading looks clean.
+                  (let ((hide-start (save-excursion
+                                      (goto-char trailing-start)
+                                      (skip-chars-backward " \t" n-start)
+                                      (point))))
+                    (put-text-property hide-start line-end
+                                       'invisible
+                                       'markdown-ts--markup)))))))))))
+
+(defun markdown-ts--fontify-link-node (node override start end &rest _)
+  "Fontify link or image text NODE as a clickable button.
+Works for inline links, reference links, shortcut links, and
+image descriptions.  The URL is taken from a sibling
+`link_destination' node when present, or resolved from a
+link reference definition, or the node text itself is used as
+fallback.  OVERRIDE, START, and END are passed through to
+`treesit-fontify-with-override'."
+  (let ((parent (treesit-node-parent node)))
+    ;; When NODE is a link_label inside a full_reference_link that
+    ;; also has a link_text, skip it, link_text handles that link.
+    (unless (and (string= (treesit-node-type node) "link_label")
+                 (treesit-search-subtree parent "\\`link_text\\'"))
+      (treesit-fontify-with-override
+       (treesit-node-start node) (treesit-node-end node)
+       'markdown-ts-link override start end)
+      (let* ((dest (treesit-search-subtree parent "\\`link_destination\\'"))
+             (url (if dest
+                      (treesit-node-text dest t)
+                    ;; Reference links: resolve via link_label or link_text.
+                    (let* ((label-node (treesit-search-subtree
+                                        parent "\\`link_label\\'"))
+                           (label (if label-node
+                                      (string-trim (treesit-node-text
+                                                    label-node t)
+                                                   "\\[" "\\]")
+                                    (treesit-node-text node t))))
+                      (or (markdown-ts--resolve-link-ref label)
+                          label)))))
+        (markdown-ts--make-link-button
+         (treesit-node-start node) (treesit-node-end node) url)))))
+
+(defun markdown-ts--fontify-autolink (node override start end &rest _)
+  "Fontify autolink NODE (URI or email) as a clickable button.
+For email autolinks, the URL is prefixed with \"mailto:\".
+Angle bracket delimiters are hidden when markup is hidden.
+OVERRIDE, START, and END are passed through to
+`treesit-fontify-with-override'."
+  (let* ((node-start (treesit-node-start node))
+         (node-end (treesit-node-end node))
+         (inner (buffer-substring-no-properties
+                 (1+ node-start) (1- node-end)))
+         (url (if (string= (treesit-node-type node) "email_autolink")
+                  (concat "mailto:" inner)
+                inner)))
+    (treesit-fontify-with-override
+     node-start node-end 'markdown-ts-link override start end)
+    (markdown-ts--make-link-button node-start node-end url)
+    (when markdown-ts-hide-markup
+      (put-text-property node-start (1+ node-start)
+                         'invisible 'markdown-ts--markup)
+      (put-text-property (1- node-end) node-end
+                         'invisible 'markdown-ts--markup))))
+
+(defun markdown-ts--fontify-link-ref-label (node override start end &rest _)
+  "Fontify link reference definition label NODE as a clickable button.
+The brackets and colon are hidden when markup is hidden.
+OVERRIDE, START, and END are passed through to
+`treesit-fontify-with-override'."
+  (let* ((node-start (treesit-node-start node))
+         (node-end (treesit-node-end node))
+         (parent (treesit-node-parent node))
+         (dest-node (treesit-search-subtree parent "\\`link_destination\\'"))
+         (url (when dest-node (treesit-node-text dest-node t))))
+    ;; Fontify the label text (inside brackets).
+    (treesit-fontify-with-override
+     (1+ node-start) (1- node-end)
+     'markdown-ts-link override start end)
+    ;; Make it a clickable button.
+    (when url
+      (markdown-ts--make-link-button (1+ node-start) (1- node-end) url))
+    ;; Hide "[" before label and "]: " between label and destination.
+    (when markdown-ts-hide-markup
+      (put-text-property node-start (1+ node-start)
+                         'invisible 'markdown-ts--markup)
+      (let ((colon-end (if dest-node (treesit-node-start dest-node)
+                         (1+ node-end))))
+        (put-text-property (1- node-end) colon-end
+                           'invisible 'markdown-ts--markup)))))
+
+(defun markdown-ts--fontify-link-ref-destination (node override start end
+                                                       &rest _)
+  "Fontify link reference destination NODE and hide when markup hidden.
+OVERRIDE, START, and END are passed through to
+`treesit-fontify-with-override'."
+  (treesit-fontify-with-override
+   (treesit-node-start node) (treesit-node-end node)
+   'markdown-ts-link-destination override start end)
+  (when markdown-ts-hide-markup
+    (put-text-property (treesit-node-start node) (treesit-node-end node)
+                       'invisible 'markdown-ts--markup)))
+
+(defun markdown-ts--latex-block-valid-p (node)
+  "Return non-nil if latex block NODE is within a single inline scope.
+The global inline parser can create false `latex_block' matches
+spanning across paragraph boundaries.  Check that the opening and
+closing delimiters share the same markdown `inline' ancestor."
+  (let ((node-start (treesit-node-start node))
+        (node-end (1- (treesit-node-end node))))
+    (when-let* ((md-start (treesit-node-at node-start 'markdown))
+                (md-end (treesit-node-at node-end 'markdown))
+                (inline-start (treesit-parent-until
+                               md-start
+                               (lambda (n)
+                                 (equal (treesit-node-type n) "inline"))))
+                (inline-end (treesit-parent-until
+                             md-end
+                             (lambda (n)
+                               (equal (treesit-node-type n) "inline")))))
+      (eq (treesit-node-start inline-start)
+          (treesit-node-start inline-end)))))
+
+(defun markdown-ts--fontify-latex-block (node override start end &rest _)
+  "Fontify latex block NODE and hide its delimiters when markup is hidden.
+Skip fontification for false matches that span across paragraph boundaries.
+OVERRIDE, START, and END are passed through to
+`treesit-fontify-with-override'."
+  (when (markdown-ts--latex-block-valid-p node)
+    (treesit-fontify-with-override
+     (treesit-node-start node) (treesit-node-end node)
+     'markdown-ts-latex override start end)
+    (when markdown-ts-hide-markup
+      (dotimes (i (treesit-node-child-count node))
+        (let ((child (treesit-node-child node i)))
+          (when (equal (treesit-node-type child) "latex_span_delimiter")
+            (put-text-property (treesit-node-start child)
+                               (treesit-node-end child)
+                               'invisible 'markdown-ts--markup)))))))
+
+(defun markdown-ts--fontify-backslash-escape (node override start end &rest _)
+  "Fontify backslash escape NODE, hiding the backslash when markup is hidden.
+Skip hiding inside `latex_block' where backslashes are LaTeX syntax.
+OVERRIDE, START, and END are passed through to
+`treesit-fontify-with-override'."
+  (let ((node-start (treesit-node-start node))
+        (in-latex (equal (treesit-node-type (treesit-node-parent node))
+                         "latex_block")))
+    (treesit-fontify-with-override
+     node-start (1+ node-start)
+     'markdown-ts-delimiter override start end)
+    (when (and markdown-ts-hide-markup (not in-latex))
+      (put-text-property node-start (1+ node-start)
+                         'invisible 'markdown-ts--markup))))
+
+(defvar sgml-char-names)
+(declare-function org-entity-get "org/org-entities.el")
+
+(defun markdown-ts--decode-entity (text)
+  "Decode HTML entity TEXT (e.g., \"&amp;\") to its character string.
+Return the decoded string, or nil if the entity is unknown."
+  (cond
+   ;; Numeric hex &#x1F4A9;
+   ((string-match "\\`&#x\\([[:xdigit:]]+\\);\\'" text)
+    (char-to-string (string-to-number (match-string 1 text) 16)))
+   ;; Numeric decimal &#123;
+   ((string-match "\\`&#\\([[:digit:]]+\\);\\'" text)
+    (char-to-string (string-to-number (match-string 1 text))))
+   ;; Named &amp; &copy; via org-entities, fall back to sgml-char-names
+   ((string-match "\\`&\\([[:alnum:]]+\\);\\'" text)
+    (let ((name (match-string 1 text)))
+      (require 'org-entities)
+      (if-let* ((entry (org-entity-get name))
+                (utf8 (nth 6 entry)))
+          utf8
+        (require 'sgml-mode)
+        (when-let* ((code (seq-position sgml-char-names name #'equal)))
+          (char-to-string code)))))))
+
+(defun markdown-ts--fontify-entity (node override start end &rest _)
+  "Fontify entity NODE and show its decoded value when markup is hidden.
+OVERRIDE, START, and END are passed through to
+`treesit-fontify-with-override'."
+  (let ((node-start (treesit-node-start node))
+        (node-end (treesit-node-end node))
+        (face (if (equal (treesit-node-type node) "entity_reference")
+                  'markdown-ts-entity-reference
+                'markdown-ts-numeric-character-reference)))
+    (treesit-fontify-with-override node-start node-end face
+                                   override start end)
+    (if markdown-ts-hide-markup
+        (when-let* ((decoded (markdown-ts--decode-entity
+                              (treesit-node-text node t)))
+                    ((char-displayable-p (aref decoded 0))))
+          (put-text-property node-start node-end 'display decoded))
+      (remove-text-properties node-start node-end '(display nil)))))
+
+(defun markdown-ts--resolve-display-value (val)
+  "Resolve VAL, a cons (PREFERRED . FALLBACK), to a displayable value.
+Return PREFERRED if its first character passes `char-displayable-p',
+otherwise return FALLBACK.  Return nil if VAL is nil."
+  (when val
+    (let* ((preferred (car val))
+           (ch (if (characterp preferred) preferred (aref preferred 0))))
+      (if (char-displayable-p ch) (car val) (cdr val)))))
+
+(defun markdown-ts--fontify-checkbox (node override start end &rest _)
+  "Fontify task list checkbox NODE, show a Unicode symbol when markup is hidden.
+OVERRIDE, START, and END are passed through to
+`treesit-fontify-with-override'."
+  (let* ((node-start (treesit-node-start node))
+         (node-end (treesit-node-end node))
+         (checked (equal (treesit-node-type node) "task_list_marker_checked"))
+         (face (if checked 'markdown-ts-task-checked
+                 'markdown-ts-task-unchecked))
+         (value (if checked
+                    markdown-ts-checked-checkbox
+                  markdown-ts-unchecked-checkbox))
+         (replacement
+          (cond ((eq value 'icon)
+                 (icon-string (if checked
+                                  'markdown-ts-checked-checkbox-icon
+                                'markdown-ts-unchecked-checkbox-icon)))
+                (t (markdown-ts--resolve-display-value value))))
+         ;; If `icon-string' returned an image, its `display' property
+         ;; on char 0 holds the actual image spec; nested `display'
+         ;; props are not honored when a string is the value of a
+         ;; `display' text-property, so apply the spec directly.
+         (display-spec
+          (or (and (eq value 'icon) replacement
+                   (get-text-property 0 'display replacement))
+              replacement)))
+    (treesit-fontify-with-override node-start node-end face
+                                   override start end)
+    (if (and markdown-ts-hide-markup replacement
+             (or (eq value 'icon)
+                 (char-displayable-p (aref replacement 0))))
+        (put-text-property node-start node-end 'display display-spec)
+      (remove-text-properties node-start node-end '(display nil)))))
+
+(defun markdown-ts--fontify-hard-line-break (node override start end &rest _)
+  "Fontify hard line break NODE; show a Unicode symbol when markup is hidden.
+A backslash break gets `markdown-ts-hard-line-break-backslash' (or its
+`-hidden' variant when markup is hidden); a trailing-spaces break gets
+`markdown-ts-hard-line-break-space' (or `-hidden').  When hidden, a
+backslash break is replaced by a single `markdown-ts-hard-line-break'
+glyph; a trailing-spaces break replaces each space with the glyph, so the run
+of pilcrows fills the line up to the newline.
+OVERRIDE, START, and END are passed through to
+`treesit-fontify-with-override'."
+  (let* ((node-start (treesit-node-start node))
+         (node-end   (treesit-node-end node))
+         (text       (treesit-node-text node t))
+         (backslash  (and (> (length text) 0) (eq (aref text 0) ?\\)))
+         ;; Determine the actual range to fontify and replace.  The
+         ;; hard_line_break node may not cover the full run of trailing
+         ;; spaces, so walk back from end-of-line ourselves for the
+         ;; spaces variant.
+         (region     (if backslash
+                         (cons node-start
+                               (if (and (> node-end node-start)
+                                        (eq (char-before node-end) ?\n))
+                                   (1- node-end)
+                                 node-end))
+                       (save-excursion
+                         (goto-char node-start)
+                         (let ((eol (line-end-position)))
+                           (cons (save-excursion
+                                   (goto-char eol)
+                                   (skip-chars-backward
+                                    " " (line-beginning-position))
+                                   (point))
+                                 eol)))))
+         (region-start (car region))
+         (region-end   (cdr region))
+         (face       (cond
+                      ((and backslash markdown-ts-hide-markup)
+                       'markdown-ts-hard-line-break-backslash-hidden)
+                      (backslash 'markdown-ts-hard-line-break-backslash)
+                      (markdown-ts-hide-markup
+                       'markdown-ts-hard-line-break-space-hidden)
+                      (t 'markdown-ts-hard-line-break-space))))
+    (treesit-fontify-with-override region-start region-end face
+                                   override start end)
+    ;; Always start by clearing any stale `display' property.  We never
+    ;; span the trailing newline with `display' (it confuses
+    ;; redisplay's cursor placement), and we only paint a single
+    ;; combined string onto the first character of the run, leaving
+    ;; the rest of the markup alone.
+    (remove-text-properties region-start region-end '(display nil))
+    (when markdown-ts-hide-markup
+      (let* ((spec (if backslash
+                       (markdown-ts--resolve-display-value
+                        markdown-ts-hard-line-break-backslash)
+                     markdown-ts-hard-line-break-space))
+             (str (cond
+                   ((null spec) nil)
+                   ((characterp spec) (char-to-string spec))
+                   ((stringp spec) spec)
+                   ((functionp spec)
+                    (funcall spec (- region-end region-start))))))
+        (when (and (stringp str)
+                   (> (length str) 0)
+                   (char-displayable-p (aref str 0)))
+          (put-text-property region-start (1+ region-start)
+                             'display str)
+          ;; For the trailing-spaces variant, hide the remaining
+          ;; spaces in the run so the line doesn't end with leftover
+          ;; whitespace after the substituted glyph.  Each position
+          ;; gets its own empty-string `display' so cursor placement
+          ;; stays unambiguous.
+          (unless backslash
+            (let ((i (1+ region-start)))
+              (while (< i region-end)
+                (put-text-property i (1+ i) 'display "")
+                (setq i (1+ i))))))))))
+
+(defun markdown-ts--fontify-thematic-break (node override start end &rest _)
+  "Fontify thematic break NODE and show a line when markup is hidden.
+OVERRIDE, START, and END are passed through to
+`treesit-fontify-with-override'."
+  (let ((node-start (treesit-node-start node))
+        (node-end (treesit-node-end node)))
+    (treesit-fontify-with-override node-start node-end
+                                   'markdown-ts-thematic-break
+                                   override start end)
+    (let ((char (markdown-ts--resolve-display-value
+                 markdown-ts-thematic-break-character)))
+      (if (and markdown-ts-hide-markup char (char-displayable-p char))
+          (let* ((col (save-excursion (goto-char node-start)
+                                      (current-column)))
+                 ;; Span if the face has non-nil :extend.
+                 (span-length (if (face-attribute 'markdown-ts-thematic-break
+                                                  :extend nil 'default)
+                                  (- (window-body-width) col)
+                                12)))
+            (put-text-property node-start node-end
+                               'display
+                               (concat
+                                (make-string span-length char)
+                                "\n")))
+        (remove-text-properties node-start node-end '(display nil))))))
+
+(defun markdown-ts--fontify-code-block (node _override _start _end &rest _)
+  "Fontify code block content NODE with a background overlay.
+Use `markdown-ts-code-block-markup-hidden' when markup is hidden,
+`markdown-ts-code-block' otherwise.  Use an overlay so the
+background layers itself behind language-specific fontification.
+The overlay also stores the code block language and mode as
+properties `markdown-ts-code-block-language' and
+`markdown-ts-code-block-mode', accessible via
+`markdown-ts-code-block-language-at'."
+  (let* ((node-start (save-excursion
+                       (goto-char (treesit-node-start node))
+                       (line-beginning-position)))
+         (node-end (save-excursion
+                     (goto-char (treesit-node-end node))
+                     (skip-chars-backward " \t")
+                     (point)))
+         (face (if markdown-ts-hide-markup
+                   'markdown-ts-code-block-markup-hidden
+                 'markdown-ts-code-block))
+         (lang (markdown-ts--language-at-node node))
+         (mode (when lang
+                 (markdown-ts--code-block-language-mode lang)))
+         (existing (seq-find (lambda (ov)
+                               (overlay-get ov 'markdown-ts-code-block))
+                             (overlays-at node-start))))
+    (if existing
+        (progn
+          (move-overlay existing node-start node-end)
+          (overlay-put existing 'face face)
+          (overlay-put existing 'markdown-ts-code-block-language lang)
+          (overlay-put existing 'markdown-ts-code-block-mode mode))
+      (let ((ov (make-overlay node-start node-end nil t nil)))
+        ;; Markers need to be set only once.
+        (overlay-put ov 'markdown-ts-code-beg-marker (set-marker (make-marker)
+                                                                 node-start))
+        (overlay-put ov 'markdown-ts-code-end-marker (set-marker (make-marker)
+                                                                 node-end))
+        (overlay-put ov 'markdown-ts-code-block t)
+        (overlay-put ov 'face face)
+        (overlay-put ov 'priority '(nil . 10))
+        (overlay-put ov 'markdown-ts-code-block-language lang)
+        (overlay-put ov 'markdown-ts-code-block-mode mode)
+        (overlay-put ov 'evaporate t)))))
+
+(defun markdown-ts-at-code-block-p (&optional pos)
+  "Return non nil if point is in a code block.
+If POS is nil, use point."
+  (get-char-property (or pos (point)) 'markdown-ts-code-block))
+
+(defun markdown-ts-code-block-language-at (&optional pos)
+  "Return the language symbol of the code block at POS.
+If POS is nil, use point.  Returns nil if POS is not inside a fenced
+code block.  This works regardless of whether a guest tree-sitter parser
+is active, since the language is stored on the code block overlay by the
+host parser's fontification."
+  (get-char-property (or pos (point)) 'markdown-ts-code-block-language))
+
+(defun markdown-ts-code-block-mode-at (&optional pos)
+  "Return the major mode for the code block at POS.
+If POS is nil, use point.  Returns nil if POS is not inside a fenced
+code block or if the language has no recognized mode."
+  (when (markdown-ts-at-code-block-p pos)
+    (or (get-char-property (or pos (point)) 'markdown-ts-code-block-mode)
+        markdown-ts-default-code-block-mode)))
+
+(defun markdown-ts--host-ranges-notifier (ranges _parser)
+  "Prune stale code block overlays after the host parser reparses.
+RANGES is a list of (START . END) cons cells marking regions where
+the markdown parse tree changed.  For each `markdown-ts-code-block'
+overlay intersecting a changed range, verify that a containing
+`fenced_code_block' node still exists in the host tree.  If not,
+the fences were deleted, so delete the overlay to avoid running
+commands in a stale block context."
+  (dolist (range ranges)
+    (let ((beg (car range))
+          (end (cdr range)))
+      (dolist (ov (overlays-in beg end))
+        (when (overlay-get ov 'markdown-ts-code-block)
+          (let* ((ov-start (overlay-start ov))
+                 (node (and ov-start
+                            (treesit-node-at ov-start 'markdown))))
+            (unless (and node
+                         (treesit-parent-until
+                          node "\\`fenced_code_block\\'" t))
+              (delete-overlay ov))))))))
+
+;;; Image handling:
+
+(defun markdown-ts--image-alone-on-line-p (node)
+  "Return non-nil if image NODE is the only content on its line.
+Whitespace, block quote markers (`>'), and list markers
+\(`-', `*', `+', `1.') before the image are ignored."
+  (let ((node-start (treesit-node-start node))
+        (node-end (treesit-node-end node)))
+    (save-excursion
+      (goto-char node-start)
+      (let ((bol (line-beginning-position))
+            (eol (line-end-position)))
+        ;; Before the image: only block quote markers, whitespace,
+        ;; and an optional list marker are allowed.
+        (and (string-match-p
+              (rx bos
+                  (zero-or-more (any "> \t"))
+                  (optional (or (seq (any "-*+") " ")
+                                (seq (one-or-more digit) (any ".)" ) " ")))
+                  eos)
+              (buffer-substring-no-properties bol node-start))
+             ;; After the image: only trailing whitespace allowed.
+             (string-match-p
+              (rx bos (zero-or-more (any " \t")) eos)
+              (buffer-substring-no-properties node-end eol)))))))
+
+(defun markdown-ts--fontify-image (node _override _start _end &rest _)
+  "Show an inline image at NODE.
+When `markdown-ts-inline-images' is non-nil, display the image.
+If the image link is the only content on its line, display the
+image below the link.  If the image is inline within a paragraph,
+display it right after the link text.
+Remote images are controlled by
+`markdown-ts-display-remote-inline-images'."
+  (let* ((node-start (treesit-node-start node))
+         (node-end (treesit-node-end node))
+         (eol (save-excursion (goto-char node-end)
+                              (line-end-position)))
+         (search-end (min (1+ eol) (point-max))))
+    ;; Always clear stale overlays for this node's range.
+    (dolist (ov (overlays-in node-start search-end))
+      (when (and (overlay-get ov 'markdown-ts-image)
+                 (>= (overlay-start ov) node-start)
+                 (<= (overlay-end ov) search-end))
+        (delete-overlay ov)))
+    (when (and markdown-ts-inline-images
+               ;; Don't create image overlays for nodes inside
+               ;; folded (outline-invisible) headings, since the
+               ;; images wouldn't be visible and could interfere
+               ;; with the folded display.
+               (not (markdown-ts--outline-invisible-p node-start)))
+      (let* ((dest (treesit-search-subtree node "\\`link_destination\\'"))
+             (url (and dest (treesit-node-text dest t)))
+             (remotep (and url (string-match-p "\\`https?://" url)))
+             (displayable
+              (when url
+                (if remotep
+                    (when (eq markdown-ts-display-remote-inline-images
+                              'download)
+                      (ignore-errors
+                        (require 'url-handlers)
+                        (with-work-buffer
+                          (set-buffer-multibyte nil)
+                          (url-insert-file-contents url)
+                          (buffer-string))))
+                  (let ((file (expand-file-name url)))
+                    (and (not (file-remote-p file))
+                         (file-exists-p file)
+                         (image-supported-file-p file)
+                         file)))))
+             (max-w (and displayable
+                         (if (eq markdown-ts-image-max-width 'window)
+                             (window-body-width nil t)
+                           markdown-ts-image-max-width)))
+             (img (and max-w
+                       (create-image displayable nil remotep
+                                     :max-width max-w
+                                     :scale 1))))
+        (when img
+          (let* ((alone (markdown-ts--image-alone-on-line-p node))
+                 (str (if alone
+                          (concat "\n" (propertize " " 'display img))
+                        (propertize " " 'display img)))
+                 (ov (make-overlay (1- node-end) node-end nil t nil)))
+            (overlay-put ov 'markdown-ts-image t)
+            (overlay-put ov 'after-string str)
+            (overlay-put ov 'evaporate t)))))))
+
+;;; URL/URI handling:
+
+(defvar markdown-ts--bare-url-regexp goto-address-url-regexp
+  "Regexp matching bare URLs not wrapped in angle brackets or link syntax.")
+
+(defvar markdown-ts--bare-email-uri-regexp goto-address-mail-regexp
+  "Regexp matching bare email addresses not wrapped in angle brackets.")
+
+(defun markdown-ts--fontify-bare-uri (start end)
+  "Fontify bare URL or email URI between START and END.
+Skip matches already inside tree-sitter link or autolink nodes."
+  (dolist (re (list markdown-ts--bare-url-regexp
+                    markdown-ts--bare-email-uri-regexp))
+    (goto-char start)
+    (while (re-search-forward re end t)
+      (let* ((uri-start (match-beginning 0))
+             (uri-end (match-end 0))
+             (uri (match-string 0))
+             (node (treesit-node-at uri-start 'markdown-inline))
+             (parent (and node (treesit-node-parent node)))
+             (parent-type (and parent (treesit-node-type parent))))
+        (unless (or (member parent-type
+                            '("inline_link" "full_reference_link"
+                              "collapsed_reference_link" "shortcut_link"
+                              "image" "uri_autolink" "email_autolink"
+                              "link_destination"))
+                    (member (and node (treesit-node-type node))
+                            '("uri_autolink" "email_autolink"
+                              "link_destination" "code_span"
+                              "code_fence_content" "info_string"))
+                    (get-text-property uri-start 'button))
+          (markdown-ts--make-link-button
+           uri-start uri-end
+           (if (eq uri-start 0)
+               uri
+             (concat "mailto:" uri))))))))
+
+;;; treesit settings:
+
 (defvar markdown-ts--treesit-settings
   (treesit-font-lock-rules
+   :language 'markdown
+   :feature 'error
+   :override t
+   '((ERROR) @font-lock-warning-face)
+
    :language 'markdown-inline
    :override t
    :feature 'delimiter
-   '((inline_link [ "[" "]" "(" ")" ] @shadow)
-     (image [ "!" "[" "]" "(" ")" ] @shadow))
+   '((inline_link [ "[" "]" "(" ")" ] @markdown-ts--fontify-delimiter)
+     (full_reference_link [ "[" "]" ] @markdown-ts--fontify-delimiter)
+     (collapsed_reference_link [ "[" "]" ] @markdown-ts--fontify-delimiter)
+     (shortcut_link [ "[" "]" ] @markdown-ts--fontify-delimiter)
+     (image [ "!" "[" "]" "(" ")" ] @markdown-ts--fontify-delimiter))
 
    :language 'markdown
    :feature 'heading
-   '((atx_heading (atx_h1_marker)) @markdown-ts-heading-1
-     (atx_heading (atx_h2_marker)) @markdown-ts-heading-2
-     (atx_heading (atx_h3_marker)) @markdown-ts-heading-3
-     (atx_heading (atx_h4_marker)) @markdown-ts-heading-4
-     (atx_heading (atx_h5_marker)) @markdown-ts-heading-5
-     (atx_heading (atx_h6_marker)) @markdown-ts-heading-6
-     (setext_heading) @markdown-ts-setext-heading)
+   '(((atx_heading)    @markdown-ts--fontify-heading)
+     ((setext_heading) @markdown-ts--fontify-heading))
 
    :language 'markdown
    :feature 'heading
@@ -194,16 +1634,40 @@ OVERRIDE, START, and END are passed through to
      (atx_h3_marker) @markdown-ts--fontify-delimiter
      (atx_h4_marker) @markdown-ts--fontify-delimiter
      (atx_h5_marker) @markdown-ts--fontify-delimiter
-     (atx_h6_marker) @markdown-ts--fontify-delimiter)
+     (atx_h6_marker) @markdown-ts--fontify-delimiter
+     (setext_h1_underline) @markdown-ts--fontify-delimiter
+     (setext_h2_underline) @markdown-ts--fontify-delimiter)
 
    :language 'markdown
    :feature 'paragraph
-   '(((thematic_break) @markdown-ts-delimiter)
-     ((indented_code_block) @font-lock-string-face)
+   '(((thematic_break) @markdown-ts--fontify-thematic-break)
+     ((html_block) @markdown-ts-html-block)
+     ((indented_code_block) @markdown-ts-indented-code-block)
      (list_item (list_marker_star) @markdown-ts-list-marker)
      (list_item (list_marker_plus) @markdown-ts-list-marker)
      (list_item (list_marker_minus) @markdown-ts-list-marker)
-     (list_item (list_marker_dot) @markdown-ts-list-marker))
+     (list_item (list_marker_dot) @markdown-ts-list-marker)
+     (list_item (list_marker_parenthesis) @markdown-ts-list-marker)
+     (list_item (task_list_marker_unchecked) @markdown-ts--fontify-checkbox)
+     (list_item (task_list_marker_checked) @markdown-ts--fontify-checkbox)
+     (link_reference_definition
+      (link_label) @markdown-ts--fontify-link-ref-label)
+     (link_reference_definition
+      (link_destination) @markdown-ts--fontify-link-ref-destination)
+     (link_reference_definition
+      (link_title) @markdown-ts-link-destination))
+
+   :language 'markdown
+   :feature 'paragraph
+   :override 'prepend
+   '((pipe_table_header "|" @markdown-ts-table-header)
+     (pipe_table_header (pipe_table_cell) @markdown-ts-table-header)
+     (pipe_table_row "|" @markdown-ts-table-delimiter-cell)
+     (pipe_table_row (pipe_table_cell) @markdown-ts-table-cell)
+     (pipe_table_delimiter_row "|" @markdown-ts-table-delimiter-cell)
+     ((pipe_table) @markdown-ts-table)
+     (pipe_table_delimiter_row (pipe_table_delimiter_cell)
+                               @markdown-ts-table-delimiter-cell))
 
    :language 'markdown
    :feature 'paragraph
@@ -212,89 +1676,999 @@ OVERRIDE, START, and END are passed through to
      (block_quote_marker) @markdown-ts--fontify-delimiter
      (fenced_code_block_delimiter) @markdown-ts--fontify-delimiter
      (fenced_code_block
-      (info_string (language) @markdown-ts-language-keyword) @markdown-ts--fontify-delimiter)
+      (info_string (language) @markdown-ts-language-keyword)
+      @markdown-ts--fontify-delimiter)
      (block_quote
       (block_quote_marker) @markdown-ts--fontify-delimiter
       (paragraph (inline (block_continuation) @markdown-ts--fontify-delimiter))))
 
+   :language 'markdown
+   :feature 'paragraph
+   :override 'append
+   '((fenced_code_block
+      (info_string (language))
+      (code_fence_content) @markdown-ts--fontify-non-ts-code-block))
+
+   :language 'markdown
+   :feature 'paragraph
+   :override 'append
+   '((fenced_code_block (code_fence_content) @markdown-ts--fontify-code-block))
+
    :language 'markdown-inline
    :override 'append
    :feature 'paragraph-inline
-   '(((image_description) @link)
-     ((link_destination) @font-lock-string-face)
-     ((code_span) @font-lock-string-face)
+   '(((link_destination) @markdown-ts--fontify-link-destination)
+     ((code_span) @markdown-ts-code-span)
      ((code_span_delimiter) @markdown-ts--fontify-delimiter)
-     ((emphasis) @italic)
-     ((strong_emphasis) @bold)
-     (inline_link (link_text) @link)
-     (inline_link (link_destination) @font-lock-string-face)
-     (shortcut_link (link_text) @link))
+     ((emphasis) @markdown-ts-emphasis)
+     ((strong_emphasis) @markdown-ts-bold)
+     ((strikethrough) @markdown-ts-strikethrough)
+     (inline_link (link_text) @markdown-ts--fontify-link-node)
+     (full_reference_link (link_text) @markdown-ts--fontify-link-node)
+     (full_reference_link (link_label) @markdown-ts--fontify-link-node)
+     (collapsed_reference_link (link_text) @markdown-ts--fontify-link-node)
+     (shortcut_link (link_text) @markdown-ts--fontify-link-node)
+     (image (image_description) @markdown-ts--fontify-link-node)
+     ((uri_autolink) @markdown-ts--fontify-autolink)
+     ((email_autolink) @markdown-ts--fontify-autolink)
+     (inline_link (link_title) @markdown-ts-link-destination)
+     ((backslash_escape) @markdown-ts--fontify-backslash-escape)
+     ((entity_reference) @markdown-ts--fontify-entity)
+     ((numeric_character_reference) @markdown-ts--fontify-entity)
+     ((html_tag) @markdown-ts-html-tag)
+     ((hard_line_break) @markdown-ts--fontify-hard-line-break)
+     ((latex_block) @markdown-ts--fontify-latex-block))
 
    :language 'markdown-inline
    :feature 'paragraph-inline
    :override 'append
    '((emphasis_delimiter) @markdown-ts--fontify-delimiter)
-   ))
 
-;;; Imenu
+   :language 'markdown-inline
+   :feature 'image-preview
+   :override 'append
+   '((image) @markdown-ts--fontify-image)))
 
-(defun markdown-ts-imenu-node-p (node)
+;;; Imenu:
+
+(defun markdown-ts--imenu-heading-node-p (node)
   "Check if NODE is a valid entry to imenu."
-  (equal (treesit-node-type (treesit-node-parent node))
-         "atx_heading"))
+  (and (equal (treesit-node-type node) "inline")
+       (equal (treesit-node-type (treesit-node-parent node))
+              "atx_heading")))
 
-(defun markdown-ts-imenu-name-function (node)
+(defun markdown-ts--imenu-heading-name-function (node)
   "Return an imenu entry if NODE is a valid header."
   (let ((name (treesit-node-text node)))
-    (if (markdown-ts-imenu-node-p node)
-	(thread-first (treesit-node-parent node) (treesit-node-text))
+    (if (markdown-ts--imenu-heading-node-p node)
+        (car (split-string (treesit-node-text
+                           (treesit-node-parent node))
+                          "\n" t " "))
       name)))
 
-(defun markdown-ts-outline-predicate (node)
-  "Match a hierarchical section that has a heading."
+(defun markdown-ts--imenu-code-block-node-p (node)
+  "Check if NODE is an info_string with descriptive text after the language."
+  (and (equal (treesit-node-type node) "info_string")
+       (when-let* ((lang-node (treesit-search-subtree node "language"))
+                   ((< (treesit-node-end lang-node)
+                       (treesit-node-end node))))
+         (not (string-blank-p
+               (buffer-substring-no-properties
+                (treesit-node-end lang-node)
+                (treesit-node-end node)))))))
+
+(defun markdown-ts--imenu-code-block-name-function (node)
+  "Return an imenu entry name for a code block info_string NODE.
+Uses the descriptive text after the language name."
+  (when-let* ((lang-node (treesit-search-subtree node "language"))
+              (desc (string-trim
+                     (buffer-substring-no-properties
+                      (treesit-node-end lang-node)
+                      (treesit-node-end node)))))
+    (format "%s: %s" (treesit-node-text lang-node) desc)))
+
+(defun markdown-ts--outline-predicate (node)
+  "Match NODE if it is a hierarchical section that has a heading."
   (and (equal (treesit-node-type node) "section")
        (when-let* ((child (treesit-node-child node 0)))
          (equal (treesit-node-type child) "atx_heading"))))
 
-;;; Code blocks
+;;; Heading manipulation:
 
-(defvar-local markdown-ts--configured-languages nil
-  "A list of languages that have been setup in this buffer.
+(defconst markdown-ts--parser-heading-max-level 6
+  "Maximum ATX heading level in Markdown (h1-h6).
+Defined by the CommonMark spec and the tree-sitter grammar.")
 
-When a code block of a language appears, `markdown-ts-mode' loads
-language setups like font-lock and indentation for that language, and
-adds that language to this list.")
+(defun markdown-ts--heading-at-point ()
+  "Return the atx_heading node at or before point, or nil."
+  (when-let* ((node (treesit-node-at (point) 'markdown)))
+    (if (equal (treesit-node-type node) "atx_heading")
+        node
+      (treesit-parent-until
+       node (lambda (n) (equal (treesit-node-type n) "atx_heading"))))))
 
-(defun markdown-ts--harvest-treesit-configs (mode)
-  "Harvest tree-sitter configs from MODE.
-Return a plist with the following keys and value:
+(defun markdown-ts--heading-level (heading)
+  "Return HEADING level (range 1 to `markdown-ts--parser-heading-max-level')."
+  (let ((marker (treesit-node-child heading 0)))
+    (length (treesit-node-text marker t))))
+
+(defun markdown-ts--section-at-point ()
+  "Return the section node containing point."
+  (when-let* ((node (treesit-node-at (point) 'markdown)))
+    (treesit-parent-until
+     node (lambda (n) (equal (treesit-node-type n) "section")))))
+
+(defun markdown-ts-promote ()
+  "Promote the heading or list item at point.
+For headings, decrease the level (e.g., ## to #).
+For list items, decrease nesting (dedent).
+With `transient-mark-mode' on and mark active, promote all
+headings in the region."
+  (interactive)
+  (cond
+   ((and transient-mark-mode mark-active)
+    (markdown-ts--promote-or-demote-region -1))
+   ((markdown-ts--list-item-at-point)
+    (markdown-ts--list-promote-or-demote nil))
+   (t (markdown-ts--promote-or-demote -1))))
+
+(defun markdown-ts-demote ()
+  "Demote the heading or list item at point.
+For headings, increase the level (e.g., # to ##).
+For list items, increase nesting (indent).
+With `transient-mark-mode' on and mark active, demote all headings
+in the region."
+  (interactive)
+  (cond
+   ((and transient-mark-mode mark-active)
+    (markdown-ts--promote-or-demote-region 1))
+   ((markdown-ts--list-item-at-point)
+    (markdown-ts--list-promote-or-demote t))
+   (t (markdown-ts--promote-or-demote 1))))
+
+(defun markdown-ts--promote-or-demote (delta)
+  "Change the heading at point by DELTA levels.
+Negative DELTA promotes (fewer #), positive demotes (more #).
+If the heading has an optional trailing closing-`#' sequence, that
+sequence is resized to match the new level."
+  (when-let* ((heading (markdown-ts--heading-at-point))
+              (marker (treesit-node-child heading 0))
+              (level (length (treesit-node-text marker t)))
+              (new-level (+ level delta)))
+    (when (and (>= new-level 1)
+               (<= new-level markdown-ts--parser-heading-max-level))
+      (let* ((opener-beg (treesit-node-start marker))
+             (opener-end (treesit-node-end marker))
+             (line-end (save-excursion
+                         (goto-char opener-end)
+                         (line-end-position)))
+             ;; Detect a CommonMark closing-`#' sequence: optional
+             ;; trailing whitespace, a run of `#', and at least one
+             ;; space/tab between it and the heading text.
+             (closer (save-excursion
+                       (goto-char line-end)
+                       (skip-chars-backward " \t" opener-end)
+                       (let ((end (point)))
+                         (skip-chars-backward "#" opener-end)
+                         (let ((beg (point)))
+                           (when (and (< beg end)
+                                      (> beg opener-end)
+                                      (memq (char-before beg)
+                                            '(?\s ?\t)))
+                             (cons beg end)))))))
+        (save-excursion
+          ;; Resize the closer first so it doesn't shift the opener.
+          (when closer
+            (delete-region (car closer) (cdr closer))
+            (goto-char (car closer))
+            (insert (make-string new-level ?#)))
+          (delete-region opener-beg opener-end)
+          (goto-char opener-beg)
+          (insert (make-string new-level ?#)))))))
+
+(defun markdown-ts--promote-or-demote-region (delta)
+  "Change all headings in the active region by DELTA levels.
+Negative DELTA promotes (fewer #), positive demotes (more #)."
+  (let ((beg (region-beginning))
+        (end (region-end)))
+    (save-excursion
+      (goto-char beg)
+      (while (< (point) end)
+        (when (markdown-ts--heading-at-point)
+          (markdown-ts--promote-or-demote delta))
+        (forward-line 1)))))
+
+(defun markdown-ts-move-subtree-up ()
+  "Move the current section or list item up past the previous sibling."
+  (interactive)
+  (if (markdown-ts--list-item-at-point)
+      (markdown-ts--list-move t)
+    (markdown-ts--move-subtree-up-or-down t)))
+
+(defun markdown-ts-move-subtree-down ()
+  "Move the current section or list item down past the next sibling."
+  (interactive)
+  (if (markdown-ts--list-item-at-point)
+      (markdown-ts--list-move nil)
+    (markdown-ts--move-subtree-up-or-down nil)))
+
+(defun markdown-ts--section-folded-p (section)
+  "Return non-nil if SECTION's heading is folded.
+Checks whether the end of the heading line has an outline
+invisible overlay."
+  (let ((heading (treesit-node-child section 0)))
+    (when (and heading
+               (equal (treesit-node-type heading) "atx_heading"))
+      (save-excursion
+        (goto-char (treesit-node-start heading))
+        (outline-invisible-p (pos-eol))))))
+
+(defun markdown-ts--move-subtree-up-or-down (up)
+  "Move the current section subtree.
+If UP is non-nil, move past the previous sibling; otherwise move down.
+Preserves the folding state of both sections."
+  (when-let* ((section (markdown-ts--section-at-point))
+              (sibling (if up
+                           (treesit-node-prev-sibling section)
+                         (treesit-node-next-sibling section))))
+    (when (equal (treesit-node-type sibling) "section")
+      (let* ((first (if up sibling section))
+             (second (if up section sibling))
+             (first-folded (markdown-ts--section-folded-p first))
+             (second-folded (markdown-ts--section-folded-p second))
+             (first-start (treesit-node-start first))
+             (second-start (treesit-node-start second))
+             (second-end (treesit-node-end second))
+             ;; Extract separator between items and trailing whitespace.
+             (first-raw (buffer-substring first-start second-start))
+             (first-text (string-trim-right first-raw))
+             (separator (substring first-raw (length first-text)))
+             (second-raw (buffer-substring second-start second-end))
+             (second-text (string-trim-right second-raw))
+             (trailing (substring second-raw (length second-text)))
+             (line-offset (- (line-number-at-pos (point))
+                             (line-number-at-pos (treesit-node-start section)))))
+        (delete-region first-start second-end)
+        (goto-char first-start)
+        (insert second-text separator first-text trailing)
+        ;; Restore folding state
+        (save-excursion
+          (goto-char first-start)
+          (when (outline-on-heading-p)
+            (if second-folded
+                (outline-hide-subtree)
+              (outline-show-subtree)))
+          (outline-next-heading)
+          (when (outline-on-heading-p)
+            (if first-folded
+                (outline-hide-subtree)
+              (outline-show-subtree))))
+        (goto-char (if up
+                       first-start
+                     (+ first-start (length second-text)
+                        (length separator))))
+        (with-suppressed-warnings ((interactive-only next-line))
+          (next-line line-offset))))))
+
+;;; List manipulation:
+
+(defun markdown-ts-toggle-checkbox ()
+  "Toggle the task list checkbox on the current line.
+Switches between `[ ]' and `[x]'."
+  (interactive)
+  (when-let* ((pos (save-excursion (back-to-indentation) (point)))
+              (node (treesit-node-at pos 'markdown))
+              (item (treesit-parent-until
+                     node (lambda (n)
+                            (equal (treesit-node-type n) "list_item")))))
+    (when-let* ((marker (seq-find
+                         (lambda (child)
+                           (member (treesit-node-type child)
+                                   '("task_list_marker_checked"
+                                     "task_list_marker_unchecked")))
+                         (treesit-node-children item))))
+      (let ((beg (treesit-node-start marker))
+            (end (treesit-node-end marker))
+            (checked (equal (treesit-node-type marker)
+                            "task_list_marker_checked")))
+        (save-excursion
+          (goto-char beg)
+          (delete-region beg end)
+          (insert (if checked "[ ]" "[x]")))))))
+
+(defun markdown-ts--list-item-at-point ()
+  "Return the innermost list_item node containing point, or nil.
+Uses the position after `back-to-indentation' so that point in
+a line's leading whitespace resolves to the item on that line,
+not to a preceding item whose node spans the whitespace.
+Inside block quotes, also try from the content position past
+the `>' markers."
+  (when-let* ((pos (save-excursion (back-to-indentation) (point)))
+              (node (treesit-node-at pos 'markdown))
+              (bol (line-beginning-position))
+              (eol (line-end-position)))
+    (or (let ((item (treesit-parent-until
+                     node (lambda (n)
+                            (equal (treesit-node-type n) "list_item")))))
+          ;; Verify the current line is within the item's range.
+          ;; `treesit-node-at' can return a node inside a list_item
+          ;; even when point is on a preceding line.
+          (when (and item
+                     (<= (treesit-node-start item) eol)
+                     (>= (treesit-node-end item) bol))
+            item))
+        ;; When back-to-indentation lands on block quote markers,
+        ;; skip past them and try from the content position.
+        (let ((content-pos (save-excursion
+                             (beginning-of-line)
+                             (skip-chars-forward "> \t")
+                             (point))))
+          (when (> content-pos pos)
+            (when-let* ((cnode (treesit-node-at content-pos 'markdown)))
+              (let ((item (treesit-parent-until
+                           cnode
+                           (lambda (n)
+                             (equal (treesit-node-type n) "list_item")))))
+                (when (and item
+                           (<= (treesit-node-start item) eol)
+                           (>= (treesit-node-end item) bol))
+                  item))))))))
+
+(defun markdown-ts--list-marker-width (item)
+  "Return the width of ITEM's list marker including trailing space."
+  (let ((marker (treesit-node-child item 0)))
+    (- (treesit-node-end marker) (treesit-node-start marker))))
+
+(defun markdown-ts--list-item-region (item)
+  "Return the (BEG . END) region for ITEM, clamped to full lines.
+BEG starts at the beginning of the line containing the item.
+END is clamped so it does not extend into the next line's
+indentation, which tree-sitter may include in the node."
+  (let ((beg (save-excursion
+               (goto-char (treesit-node-start item))
+               (line-beginning-position)))
+        (end (save-excursion
+               (goto-char (treesit-node-end item))
+               (if (bolp) (point) (line-beginning-position)))))
+    (cons beg end)))
+
+(defun markdown-ts--list-ordered-item-p (item)
+  "Return non-nil if ITEM is an ordered (numbered) list item."
+  (let ((marker (treesit-node-child item 0)))
+    (equal (treesit-node-type marker) "list_marker_dot")))
+
+(defun markdown-ts--list-promote-or-demote (demote)
+  "Change nesting of the list item at point.
+If DEMOTE is non-nil, demote (indent); otherwise promote (dedent).
+Ordered (numbered) list items are skipped because the grammar does
+not support nesting them by indentation."
+  (when-let* ((item (markdown-ts--list-item-at-point))
+              (region (markdown-ts--list-item-region item))
+              (beg (car region))
+              (end (cdr region)))
+    (when (markdown-ts--list-ordered-item-p item)
+      (user-error "Ordered list items cannot be nested (grammar limitation)"))
+    (if demote
+        ;; Demote: indent by marker width, only if there is a previous
+        ;; sibling to nest under (like org-mode).
+        (when (treesit-node-prev-sibling item)
+          (indent-rigidly beg end (markdown-ts--list-marker-width item)))
+      ;; Promote: dedent to grandparent level.
+      (let* ((parent-list (treesit-node-parent item))
+             (grandparent (and parent-list (treesit-node-parent parent-list)))
+             (item-col (save-excursion
+                         (goto-char beg) (current-indentation))))
+        (when (and grandparent
+                   (equal (treesit-node-type grandparent) "list_item")
+                   (> item-col 0))
+          (let ((gp-col (save-excursion
+                          (goto-char (treesit-node-start grandparent))
+                          (current-indentation))))
+            (indent-rigidly beg end (- gp-col item-col))))))))
+
+(defun markdown-ts--list-node-bol (node)
+  "Return the beginning of the line containing NODE's start."
+  (save-excursion
+    (goto-char (treesit-node-start node))
+    (line-beginning-position)))
+
+(defun markdown-ts--list-move (up)
+  "Move the list item at point.
+If UP is non-nil, move past the previous sibling; otherwise move down."
+  (when-let* ((item (markdown-ts--list-item-at-point))
+              (sibling (if up
+                           (treesit-node-prev-sibling item)
+                         (treesit-node-next-sibling item))))
+    (when (equal (treesit-node-type sibling) "list_item")
+      (let* ((first (if up sibling item))
+             (second (if up item sibling))
+             (first-start (markdown-ts--list-node-bol first))
+             (second-start (markdown-ts--list-node-bol second))
+             (second-end (treesit-node-end second))
+             ;; Extract separator between items and trailing whitespace.
+             (first-raw (buffer-substring first-start second-start))
+             (first-text (string-trim-right first-raw))
+             (separator (substring first-raw (length first-text)))
+             (second-raw (buffer-substring second-start second-end))
+             (second-text (string-trim-right second-raw))
+             (trailing (substring second-raw (length second-text)))
+             (line-offset (- (line-number-at-pos (point))
+                             (line-number-at-pos
+                              (treesit-node-start item)))))
+        (delete-region first-start second-end)
+        (goto-char first-start)
+        (insert second-text separator first-text trailing)
+        (goto-char (if up
+                       first-start
+                     (+ first-start (length second-text)
+                        (length separator))))
+        (with-suppressed-warnings ((interactive-only next-line))
+          (next-line line-offset))))))
+
+(defun markdown-ts-renumber-list (&optional start)
+  "Renumber the ordered list at point.
+Numbers are assigned sequentially starting from the first item's
+number.  With a prefix argument START, start numbering from that
+value instead.  Does nothing for unordered lists."
+  (interactive "P")
+  (when-let* ((item (markdown-ts--list-item-at-point))
+              (list-node (treesit-node-parent item)))
+    (when (equal (treesit-node-type list-node) "list")
+      (let* ((children (treesit-node-children list-node))
+             (items (seq-filter (lambda (n)
+                                  (equal (treesit-node-type n) "list_item"))
+                                children))
+             (first-marker (treesit-node-child (car items) 0))
+             (marker-type (treesit-node-type first-marker)))
+        (when (member marker-type '("list_marker_dot" "list_marker_parenthesis"))
+          (let* ((base (if start
+                           (prefix-numeric-value start)
+                         (string-to-number
+                          (treesit-node-text first-marker t))))
+                 (count (length items))
+                 ;; Start from the last number and work backwards so
+                 ;; that earlier buffer positions remain valid.
+                 (num (+ base count -1)))
+            (dolist (it (reverse items))
+              (let* ((marker (treesit-node-child it 0))
+                     (marker-end (treesit-node-end marker))
+                     (bol (save-excursion
+                            (goto-char (treesit-node-start marker))
+                            (line-beginning-position)))
+                     ;; Full text from bol to end of marker includes
+                     ;; any leading whitespace, the number, and the
+                     ;; separator (e.g., ". " or ".\t").
+                     (full-text (buffer-substring-no-properties
+                                 bol marker-end))
+                     (indent-str
+                      (if (string-match
+                           "\\`\\([[:blank:]]*\\)[0-9]" full-text)
+                          (match-string 1 full-text)
+                        ""))
+                     (suffix-str
+                      (if (string-match
+                           "\\`[[:blank:]]*[0-9]+\\(.*\\)\\'" full-text)
+                          (match-string 1 full-text)
+                        ". "))
+                     (new-text (concat indent-str
+                                       (number-to-string num)
+                                       suffix-str)))
+                (save-excursion
+                  (delete-region bol marker-end)
+                  (goto-char bol)
+                  (insert new-text)))
+              (cl-decf num))
+            (message "Renumbered %d items" count)))))))
+
+(defun markdown-ts--list-item-new-marker (item)
+  "Return the marker string for a new item following ITEM.
+For unordered items, reuse the same marker character.
+For ordered items, increment the number."
+  (let* ((marker (treesit-node-child item 0))
+         (type (treesit-node-type marker))
+         (indent (save-excursion
+                   (goto-char (treesit-node-start item))
+                   (current-indentation)))
+         (prefix (make-string indent ?\s)))
+    (pcase type
+      ("list_marker_minus" (concat prefix "- "))
+      ("list_marker_plus"  (concat prefix "+ "))
+      ("list_marker_star"  (concat prefix "* "))
+      ("list_marker_dot"
+       (let ((num (string-to-number (treesit-node-text marker t))))
+         (concat prefix (number-to-string (1+ num)) ". ")))
+      ("list_marker_parenthesis"
+       (let ((num (string-to-number (treesit-node-text marker t))))
+         (concat prefix (number-to-string (1+ num)) ") ")))
+      (_ (concat prefix "- ")))))
+
+(defun markdown-ts--new-marker-for-line (item)
+  "Return the marker string for a new item following ITEM.
+When the current line has a list marker pattern at a different
+indentation than ITEM (e.g., a nested marker that the grammar did
+not recognize as a list_item), use the current line's marker.
+Otherwise, fall back to `markdown-ts--list-item-new-marker'."
+  (let ((marker-node (treesit-node-child item 0)))
+    (if (= (line-number-at-pos)
+            (line-number-at-pos (treesit-node-start marker-node)))
+        ;; Item's marker is on the current line: use it normally.
+        (markdown-ts--list-item-new-marker item)
+      ;; Item's marker is on a different line.  The parser may have
+      ;; failed to recognize a nested marker (e.g., a lone `  - '
+      ;; parsed as a setext heading).  Read the current line.
+      (let ((line (buffer-substring-no-properties
+                   (line-beginning-position) (line-end-position))))
+        (if (string-match
+             "\\`\\([[:blank:]]*\\)\\([-*+] \\|\\([0-9]+\\)\\([.)] \\)\\)"
+             line)
+            (let ((indent (match-string 1 line))
+                  (num (match-string 3 line))
+                  (suffix (match-string 4 line))
+                  (unordered (match-string 2 line)))
+              (if num
+                  (concat indent (number-to-string
+                                  (1+ (string-to-number num)))
+                          suffix)
+                (concat indent unordered)))
+          ;; No marker pattern on current line: use item's marker.
+          (markdown-ts--list-item-new-marker item))))))
+
+(defun markdown-ts--line-block-quote-depth (&optional pos)
+  "Count the number of `>' block quote markers on the line at POS."
+  (save-excursion
+    (when pos (goto-char pos))
+    (beginning-of-line)
+    (let ((count 0))
+      (while (and (not (eolp))
+                  (memq (char-after) '(?> ?\s ?\t)))
+        (when (eq (char-after) ?>)
+          (setq count (1+ count)))
+        (forward-char 1))
+      count)))
+
+(defun markdown-ts-newline ()
+  "Insert a newline, continuing the current context.
+Inside a list item, the new line is indented to the item's text
+column so the paragraph continues.  A second RET on a blank
+continuation line removes the indentation, dropping point to
+column 0 so the tree-sitter grammar ends the list.
+Inside a block quote, the new line includes the quote prefix.
+Otherwise, insert a plain newline."
+  (interactive)
+  (let* ((node (treesit-node-at
+                (save-excursion (back-to-indentation) (point))
+                'markdown))
+         ;; Tree-sitter may report a node inside a block_quote even
+         ;; when point is on a blank line past the quote (the node
+         ;; span can extend beyond the `>' lines).  Only treat the
+         ;; line as inside a block quote if it actually starts with
+         ;; a `>' marker.
+         (in-bq (and (treesit-parent-until node "\\`block_quote\\'")
+                     (save-excursion
+                       (beginning-of-line)
+                       (looking-at-p "[ \t]*>"))))
+         (item (markdown-ts--list-item-at-point)))
+    (cond
+     (item
+      (let* ((col (markdown-ts--list-item-text-column item))
+             (bq-prefix (when in-bq (markdown-ts--block-quote-prefix)))
+             ;; `col' is the absolute column of the item's text,
+             ;; which inside a block quote includes the "> " prefix
+             ;; width.  Since we insert `bq-prefix' separately, we
+             ;; must subtract its length to avoid doubling it.
+             (indent (- col (length (or bq-prefix ""))))
+             ;; The current line is "blank" if it contains only
+             ;; whitespace (or quote prefix + whitespace) and no
+             ;; actual text from a previous RET's continuation indent.
+             (blank-line-p (save-excursion
+                             (beginning-of-line)
+                             (looking-at-p
+                              "^[> \t]*$")))
+             ;; Point is before the item's text (at or before the
+             ;; marker).  A plain newline is appropriate here, adding
+             ;; continuation indent would shift the existing content
+             ;; to the right.
+             (before-text-p (<= (current-column) col)))
+        (cond
+         (blank-line-p
+          ;; The user pressed RET on an already-blank continuation
+          ;; line.  Instead of adding yet another indented blank
+          ;; line, remove the indentation and insert a plain
+          ;; newline.  This drops point to column 0, which is the
+          ;; only way the tree-sitter markdown grammar ends a list:
+          ;; blank lines alone do NOT end a list, only
+          ;; non-indented content does.  So this gives the user a
+          ;; natural "RET RET to exit the list" workflow.
+          (delete-region (line-beginning-position) (line-end-position))
+          (newline))
+         (before-text-p
+          ;; Point is on or before the list marker; just insert a
+          ;; plain newline so the item is pushed down unchanged.
+          (newline))
+         (t
+          (delete-horizontal-space)
+          (newline)
+          (when bq-prefix (insert bq-prefix))
+          (insert (make-string indent ?\s))))))
+     (in-bq
+      (let ((bq-prefix (markdown-ts--block-quote-prefix))
+            ;; A line with only quote markers and whitespace (e.g.,
+            ;; "> ") is "blank" inside the quote.  RET here exits the
+            ;; quote, same as RET on a blank continuation line exits a
+            ;; list: remove the prefix and drop to column 0.
+            (blank-line-p (save-excursion
+                            (beginning-of-line)
+                            (looking-at-p "^[> \t]*$"))))
+        (if blank-line-p
+            (progn
+              (delete-region (line-beginning-position) (line-end-position))
+              (newline))
+          (delete-horizontal-space)
+          (newline)
+          (insert bq-prefix))))
+     ;; Default: plain newline.  This also handles empty list markers
+     ;; (e.g., "- " with no text) that the grammar parses as ERROR
+     ;; nodes rather than list_item nodes.
+     ;;
+     ;; When the current line is blank (whitespace only), it is a
+     ;; continuation-indent line left by a previous RET that
+     ;; tree-sitter no longer considers part of a list_item.  Clear
+     ;; the whitespace so no trailing spaces remain, and insert a
+     ;; plain newline at column 0 to exit the list context.
+     (t
+      (when (save-excursion
+              (beginning-of-line)
+              (looking-at-p "^[ \t]+$"))
+        (delete-region (line-beginning-position) (line-end-position)))
+      (newline)))))
+
+(defun markdown-ts-insert-list-item ()
+  "Insert a new list item, splitting text at point.
+Text after point moves to the new item.  At the beginning of a line,
+an empty item is inserted above and the current content is pushed down.
+Inside a block quote, the new line includes the quote prefix.
+For ordered lists, the number is incremented.
+When not inside a list, fall back to `markdown-ts-newline'."
+  (interactive)
+  (let* ((node (treesit-node-at
+                (save-excursion (back-to-indentation) (point))
+                'markdown))
+         (in-bq (and (treesit-parent-until node "\\`block_quote\\'")
+                     (save-excursion
+                       (beginning-of-line)
+                       (looking-at-p "[ \t]*>"))))
+         (bq-prefix (when in-bq (markdown-ts--block-quote-prefix)))
+         (item (markdown-ts--list-item-at-point)))
+    (cond
+     ((and item
+           (or (not in-bq)
+               (>= (markdown-ts--line-block-quote-depth)
+                   (markdown-ts--line-block-quote-depth
+                    (treesit-node-start (treesit-node-child item 0))))))
+      (let* ((new-marker (markdown-ts--new-marker-for-line item))
+             (at-bol (<= (current-column)
+                         (save-excursion
+                           (back-to-indentation)
+                           (current-column))))
+             (tail (when (and (not at-bol)
+                              (not (looking-at-p "[ \t]*$")))
+                     (delete-and-extract-region
+                      (point) (line-end-position)))))
+        (if at-bol
+            ;; At BOL: insert empty item above, push current line down.
+            (progn
+              (beginning-of-line)
+              (when bq-prefix (insert bq-prefix))
+              (insert new-marker "\n")
+              (back-to-indentation))
+          ;; Mid-line or EOL: new item below with tail text.
+          (delete-horizontal-space)
+          (newline)
+          (when bq-prefix (insert bq-prefix))
+          (insert new-marker)
+          (when tail (save-excursion (insert (string-trim-left tail)))))))
+
+     ;; Not in a list: fall back to newline behavior.
+     (t (markdown-ts-newline)))))
+
+;;; Filling:
+
+;; TODO: Remove the pipe_table block if we implement pipe_table fill.
+(defconst markdown-ts--fill-unfillable-block-query
+  '([(fenced_code_block) (indented_code_block) (pipe_table)] @block)
+  "Tree-sitter query matching blocks where filling is inhibited.")
+
+(defun markdown-ts--list-item-text-column (item)
+  "Return the column where the text of list ITEM starts.
+This is the column of the first paragraph node inside ITEM, or
+the width of the list marker if no paragraph is found."
+  (let ((paragraph (treesit-search-subtree item "\\`paragraph\\'")))
+    (if paragraph
+        (save-excursion
+          (goto-char (treesit-node-start paragraph))
+          (current-column))
+      (let ((marker (treesit-node-child item 0)))
+        (- (treesit-node-end marker)
+           (treesit-node-start marker))))))
+
+(defun markdown-ts--fill-list-item (item justify)
+  "Fill the contents of list ITEM, preserving its indentation.
+Narrows to ITEM's own paragraph content (excluding nested lists)
+and sets `fill-prefix' to align continuation lines with the start
+of the item's text.  JUSTIFY is as in `fill-paragraph'."
+  (let* ((fill-prefix (make-string (markdown-ts--list-item-text-column item)
+                                   ?\s))
+         ;; Find the item's own paragraph (first paragraph child).
+         ;; If the item has nested lists, narrow to just the
+         ;; paragraph so we don't merge nested items.
+         (para (treesit-search-subtree item "\\`paragraph\\'" nil nil 1))
+         (beg (treesit-node-start item))
+         (end (if para
+                  (treesit-node-end para)
+                (treesit-node-end item)))
+         ;; Use default paragraph motion inside the narrowed region
+         ;; so that the inner `fill-paragraph' does not re-enter our
+         ;; custom paragraph-finding logic.
+         (fill-forward-paragraph-function #'forward-paragraph))
+    (save-restriction
+      (narrow-to-region beg end)
+      (fill-paragraph justify))
+    ;; Return non-nil to signal that filling has been handled,
+    ;; as per the contract of `fill-paragraph-function'.
+    t))
+
+(defun markdown-ts--adaptive-fill ()
+  "Return the fill prefix for the current line in Markdown.
+When inside a list item, return spaces matching the column where
+the item's text starts."
+  (and-let* ((node (treesit-node-at
+                    (save-excursion (back-to-indentation) (point))
+                    'markdown))
+             (item (treesit-parent-until node "\\`list_item\\'")))
+    (make-string (markdown-ts--list-item-text-column item) ?\s)))
+
+(defun markdown-ts--fill-forward-paragraph (arg)
+  "Move forward by ARG paragraphs, respecting Markdown structure.
+List items are treated as individual paragraphs.  Blocks matched
+by `markdown-ts--fill-unfillable-block-query' are skipped: both
+forward and backward motion move to the end of the block, so
+`fill-region' sees a zero-length region and leaves the block
+unfilled."
+  (let ((direction (if (> arg 0) 1 -1))
+        (count (abs arg))
+        (moved 0))
+    (dotimes (_ count)
+      ;; For backward motion, skip back over whitespace to find
+      ;; the item we are leaving, not the next one.
+      (let* ((pos (if (< direction 0)
+                      (save-excursion
+                        (skip-chars-backward " \t\n")
+                        (max (point-min) (1- (point))))
+                    (point)))
+             (block (car (treesit-query-capture
+                          (treesit-buffer-root-node 'markdown)
+                          markdown-ts--fill-unfillable-block-query
+                          pos (1+ pos))))
+             (indented-pos (save-excursion
+                             (goto-char pos)
+                             (back-to-indentation)
+                             (point)))
+             (node (treesit-node-at indented-pos 'markdown))
+             (item (treesit-parent-until node "\\`list_item\\'")))
+        ;; When moving forward from whitespace between list items,
+        ;; skip to the next non-blank position and check again.
+        (when (and (not item) (not block) (> direction 0))
+          (let ((next-pos (save-excursion
+                            (skip-chars-forward " \t\n")
+                            (point))))
+            (setq node (treesit-node-at next-pos 'markdown))
+            (setq item (treesit-parent-until node "\\`list_item\\'"))))
+        (cond
+         ;; Inside an unfillable block: skip over it entirely.
+         (block
+          (goto-char (treesit-node-end (cdr block)))
+          (setq moved (1+ moved)))
+         ;; Inside a list item: treat as paragraph boundary.
+         (item
+          (if (> direction 0)
+              (goto-char (treesit-node-end item))
+            (goto-char (treesit-node-start item)))
+          (setq moved (1+ moved)))
+         ;; Default: use standard paragraph motion.
+         (t
+          (forward-paragraph direction)
+          (setq moved (1+ moved))))))
+    ;; Return the number of paragraphs left to move (0 = all done).
+    (- count moved)))
+
+(defun markdown-ts--fill-paragraph (&optional justify)
+  "Fill the current paragraph, respecting Markdown block structure.
+This function prevents filling inside blocks matched by
+`markdown-ts--fill-unfillable-block-query', and fills within list
+items without merging adjacent items.  JUSTIFY is as in
+`fill-paragraph'."
+  (cond*
+   ;; Don't fill inside unfillable blocks.  Use a query against the
+   ;; root node because `treesit-node-at' may not return a node
+   ;; inside the block when point is on anonymous (unnamed) text.
+   ((treesit-query-capture
+     (treesit-buffer-root-node 'markdown)
+     markdown-ts--fill-unfillable-block-query
+     (point) (min (1+ (point)) (point-max)))
+    t)
+   ;; Fill within the enclosing list item.  Use
+   ;; `markdown-ts--list-item-at-point' which handles block quote
+   ;; markers.  When the list item is inside a block quote, delegate
+   ;; to the block quote filler which handles `> ' prefixes correctly.
+   ((bind-and* (item (markdown-ts--list-item-at-point)))
+    (if (treesit-parent-until item "\\`block_quote\\'")
+        (markdown-ts--fill-block-quote justify)
+      (markdown-ts--fill-list-item item justify)))
+   ;; Point is on a blank line before a list.  If the next
+   ;; non-whitespace position falls inside a list item, fill that item.
+   ((save-excursion
+      (beginning-of-line)
+      (looking-at-p "[ \t]*$"))
+    (and-let* ((next-pos (save-excursion
+                           (skip-chars-forward " \t\n")
+                           (point)))
+               (next-node (treesit-node-at next-pos 'markdown))
+               (item (treesit-parent-until
+                      next-node "\\`list_item\\'")))
+      (markdown-ts--fill-list-item item justify)))
+   ;; Fill within a block quote.  Narrow to the paragraph node at
+   ;; point's nesting level so lines with different `> ' depths
+   ;; are not merged.
+   ((treesit-parent-until
+     (treesit-node-at
+      (save-excursion (back-to-indentation) (point))
+      'markdown)
+     "\\`block_quote\\'")
+    (markdown-ts--fill-block-quote justify))
+   ;; Fill within an HTML comment.  The node type is "html_block"
+   ;; in grammar v0.4.x and "comment" in some other versions.
+   ((bind-and* (block (let ((n (treesit-node-at (point) 'markdown)))
+                        (or (treesit-parent-until
+                             n "\\`\\(?:html_block\\|comment\\)\\'")
+                            (and (member (treesit-node-type n)
+                                         '("html_block" "comment"))
+                                 n)))))
+    (markdown-ts--fill-html-comment block justify))
+   ;; Default: let fill-paragraph handle it.
+   (t nil)))
+
+(defun markdown-ts--fill-html-comment (node justify)
+  "Fill HTML comment NODE, aligning continuation lines.
+Return t if NODE is a comment and was filled, nil otherwise.
+JUSTIFY is as in `fill-paragraph'."
+  (when (save-excursion
+          (goto-char (treesit-node-start node))
+          (looking-at-p "<!--"))
+    (let ((fill-prefix (save-excursion
+                         (goto-char (treesit-node-start node))
+                         (make-string (+ (current-column)
+                                         (length "<!-- "))
+                                      ?\s)))
+          (adaptive-fill-function nil)
+          (fill-forward-paragraph-function #'forward-paragraph)
+          (fill-paragraph-function nil))
+      (save-restriction
+        (narrow-to-region (treesit-node-start node)
+                          (treesit-node-end node))
+        (fill-paragraph justify))
+      t)))
+
+(defun markdown-ts--block-quote-prefix ()
+  "Return the block quote prefix string from the current line.
+Read the actual `>' markers (with whatever spacing the user wrote)
+from the beginning of the line so that fill preserves the existing
+style (e.g., `>>> ' stays `>>> ', `> > > ' stays `> > > ')."
+  (save-excursion
+    (beginning-of-line)
+    (if (looking-at "\\([> \t]*>\\)[ \t]*")
+        (concat (match-string 0))
+      "> ")))
+
+(defun markdown-ts--fill-block-quote (justify)
+  "Fill the paragraph at point inside a block quote.
+Find the paragraph node at point within the block quote and fill
+only that paragraph, preserving the `> ' prefix.  When the
+paragraph is inside a list item, align continuation lines with
+the item's text column.  JUSTIFY is as in `fill-paragraph'."
+  ;; Skip past `> ' markers and any list marker to land inside the
+  ;; content, where the paragraph node lives.
+  (let* ((content-pos (save-excursion
+                        (beginning-of-line)
+                        (skip-chars-forward "> \t")
+                        ;; If we land on a list marker, skip past it.
+                        (when (looking-at "[-*+] \\|[0-9]+[.)]\s")
+                          (goto-char (match-end 0)))
+                        (min (1+ (point)) (point-max))))
+         (node (treesit-node-at content-pos 'markdown))
+         (para (treesit-parent-until
+                node (lambda (n)
+                       (equal (treesit-node-type n) "paragraph")))))
+    (when para
+      ;; The grammar may include trailing block_continuation nodes
+      ;; (blank `> >' lines) as children of the paragraph.  Use the
+      ;; end of the last inline child so fill does not merge across
+      ;; what should be a paragraph boundary.
+      (let* ((last-inline
+              (seq-find (lambda (child)
+                          (equal (treesit-node-type child) "inline"))
+                        (reverse (treesit-node-children para))))
+             (para-end (if last-inline
+                           (treesit-node-end last-inline)
+                         (treesit-node-end para)))
+             (bq-prefix (markdown-ts--block-quote-prefix))
+             ;; When inside a list item, extend the prefix with spaces
+             ;; so continuation lines align with the item's text.
+             (list-item (treesit-parent-until para "\\`list_item\\'"))
+             (prefix (if list-item
+                         (let* ((text-col (markdown-ts--list-item-text-column
+                                           list-item))
+                                (extra (max 0 (- text-col (length bq-prefix)))))
+                           (concat bq-prefix (make-string extra ?\s)))
+                       bq-prefix))
+             (adaptive-fill-function nil)
+             (fill-forward-paragraph-function #'forward-paragraph)
+             (fill-paragraph-function nil))
+        (save-restriction
+          ;; Narrow to the full lines of the paragraph so that the
+          ;; `> ' markers are included in the fill region.
+          (narrow-to-region
+           (save-excursion
+             (goto-char (treesit-node-start para))
+             (beginning-of-line)
+             (point))
+           para-end)
+          (let ((fill-prefix prefix))
+            (fill-paragraph justify))))))
+  t)
+
+;;; Code blocks:
+
+(defvar-local markdown-ts--code-block-languages nil
+  "Alist mapping language node names to ts language.
+If a language is not a ts language or is not mapped to one, it will be
+in `markdown-ts--code-block-non-ts-modes'.")
+
+(defvar-local markdown-ts--code-block-non-ts-modes nil
+  "Alist mapping languages to non-tree-sitter modes for code blocks.
+Populated by `markdown-ts--code-block-ts-language' to identify a
+code-block language mode which is not a tree-sitter mode or for which
+the tree-sitter grammar is unavailable.")
+
+(defun markdown-ts--harvest-mode-treesit-configuration (mode)
+  "Harvest tree-sitter configuration from MODE.
+Return a plist with the following keys and values:
 
     :font-lock (from `treesit-font-lock-settings')
     :simple-indent (from `treesit-simple-indent-rules')
     :range (from `treesit-range-settings')"
-  (with-temp-buffer
-    (funcall mode)
-    (list :font-lock treesit-font-lock-settings
+  (with-work-buffer
+    (markdown-ts--inhibit-messages-and-warnings
+      'markdown-ts-inhibit-code-block-mode-warnings
+      (delay-mode-hooks (funcall mode)))
+    (list :language (treesit-language-at (point-min))
+          :font-lock treesit-font-lock-settings
           :simple-indent treesit-simple-indent-rules
           :range treesit-range-settings)))
 
-(defun markdown-ts--add-config-for-mode (language mode)
-  "Add configurations for LANGUAGE from MODE to current buffer.
-
-Configuration includes font-lock and indent.  For font-lock rules, use
-the same features enabled in MODE."
-  (let ((configs (markdown-ts--harvest-treesit-configs mode)))
-    (ignore language) ; We might make use of this later.
-    (setq treesit-font-lock-settings
-          (append treesit-font-lock-settings
-                  ;; Get all the font-lock settings, including ones that
-                  ;; don't pertain to LANGUAGE.  This way we get jsdoc
-                  ;; from js-ts-mode, for example.
-                  (plist-get configs :font-lock)))
-    (setq treesit-simple-indent-rules
-          (append treesit-simple-indent-rules
-                  ;; Similarly, get all indent rules.
-                  (plist-get configs :simple-indent)))
+(defun markdown-ts--configure-current-buffer (configuration)
+  "Add CONFIGURATION to the current buffer.
+CONFIGURATION includes font-lock and indent rules.  For font-lock rules,
+use the same features enabled in MODE."
+  (setq treesit-font-lock-settings
+        (append treesit-font-lock-settings
+                ;; Get all the font-lock settings, including ones that
+                ;; don't pertain to MODE.  This way, we get jsdoc
+                ;; from js-ts-mode, for example.
+                (plist-get configuration :font-lock)))
+  (setq treesit-simple-indent-rules
+        (append treesit-simple-indent-rules
+                ;; Similarly, get all indent rules.
+                (plist-get configuration :simple-indent)))
     (setq treesit-range-settings
           (append treesit-range-settings
                   ;; Filter out function queries, because they are
@@ -302,45 +2676,1946 @@ the same features enabled in MODE."
                   ;; Case in point: c-ts-mode's range setting.
                   (seq-filter (lambda (setting)
                                 (not (functionp (car setting))))
-                              (plist-get configs :range))))
-    (setq-local indent-line-function #'treesit-indent)
-    (setq-local indent-region-function #'treesit-indent-region)))
+                              (plist-get configuration :range))))
+  (setq-local indent-line-function #'treesit-indent)
+  (setq-local indent-region-function #'treesit-indent-region))
 
-(defun markdown-ts--convert-code-block-language (node)
+(defun markdown-ts--language-at-node (node)
+  "Return the language symbol for code_fence_content NODE."
+  (when-let* ((parent (treesit-node-parent node))
+              (lang-node (when parent
+                           (treesit-search-subtree parent "\\`language\\'"))))
+    (intern (treesit-node-text lang-node t))))
+
+(defvar-local markdown-ts--non-ts-fontify-cache (make-hash-table :test #'equal)
+  "Cache for non-tree-sitter code block fontification.
+Keys are (LANG . CONTENT-HASH) cons cells, values are lists of
+\(OFFSET-START OFFSET-END FACE) triples.")
+
+(defvar-local markdown-ts--non-ts-fontify-cache-tick nil
+  "For blunt `buffer-chars-modified-tick' cache invalidation.")
+
+(defun markdown-ts--fontify-non-ts-code-block (node override start end &rest _)
+  "Fontify code_fence_content NODE using a non-tree-sitter mode.
+Apply the code-block mode's conventional font-lock in a temporary
+buffer.  OVERRIDE, START, and END are passed through to
+`treesit-fontify-with-override'.
+
+Cache results to avoid fontification of unchanged code blocks.
+
+NODE should already have passed through
+`markdown-ts--code-block-ts-language' which may have classified this
+node as a non-ts mode."
+  (when-let* ((_ markdown-ts-fontify-code-blocks-natively)
+              (lang (markdown-ts--language-at-node node))
+              (mode (alist-get lang markdown-ts--code-block-non-ts-modes))
+              (tick (buffer-chars-modified-tick))
+              (block-start (treesit-node-start node))
+              ;; Cannot use markers 'markdown-ts-code-beg-marker
+              ;; 'markdown-ts-code-end-marker they are set after this
+              ;; function runs.
+              (node-start (save-excursion
+                            (goto-char (treesit-node-start node))
+                            (line-beginning-position)))
+              (node-end (save-excursion
+                          (goto-char (treesit-node-end node))
+                          (skip-chars-backward " \t")
+                          (point))))
+    (when (> node-end node-start)
+      (unless (eq tick markdown-ts--non-ts-fontify-cache-tick)
+        (clrhash markdown-ts--non-ts-fontify-cache))
+      (let* ((cache-key (cons lang (secure-hash
+                                    'sha256
+                                    (current-buffer) node-start node-end)))
+             (props
+              (or (gethash cache-key
+                           markdown-ts--non-ts-fontify-cache)
+                  (let ((result
+                         (markdown-ts--fontify-non-ts-collect-faces
+                          mode node-start node-end)))
+                    (puthash cache-key result
+                             markdown-ts--non-ts-fontify-cache)
+                    (setq markdown-ts--non-ts-fontify-cache-tick tick)
+                    result))))
+        (dolist (range props)
+          (treesit-fontify-with-override
+           (nth 0 range)
+           (nth 1 range)
+           (nth 2 range)
+           override start end))))))
+
+(defun markdown-ts--fontify-non-ts-collect-faces (mode beg end)
+  "Run MODE on the BEG..END region's text and harvest face properties.
+Return a list of (BUF-BEG BUF-END FACE) triples in base-buffer
+coordinates.
+
+For non-tree-sitter modes use an indirect buffer narrowed to BEG..END:
+regex/syntactic font-lock honors narrowing and the indirect buffer
+shares text with the base, so this is less expensive and copy-free.
+
+For ts modes in `markdown-ts-code-block-force-conventional-modes', fall
+back to a temp buffer.  A parser created in the source buffer does not
+react to narrowing in an indirect buffer derived from it (only parsers
+created in that indirect buffer would honor its narrowing), so reusing
+the host parser via an indirect buffer is not an option here.  And in
+the host buffer itself, the inner content of a fenced code block is
+just opaque text inside a `code_fence_content' node, never re-parsed
+as a fresh document.  A temp buffer with a fresh parser sees the inner
+content as a standalone markdown document, which is what we want."
+  (cond ((memq mode markdown-ts-code-block-force-conventional-modes)
+         (let ((content (buffer-substring-no-properties beg end))
+               res)
+           (with-work-buffer
+             (insert content)
+             (markdown-ts--inhibit-messages-and-warnings
+               'markdown-ts-inhibit-code-block-mode-warnings
+               (delay-mode-hooks
+                 (let ((markdown-ts--set-up-inline t))
+                   (markdown-ts-mode))))
+             (font-lock-ensure)
+             (let ((pos (point-min)))
+               (while (< pos (point-max))
+                 (let ((next (next-single-property-change
+                              pos 'face nil (point-max)))
+                       (face (get-text-property pos 'face)))
+                   (when face
+                     ;; Translate temp-buffer offsets back to base-buffer
+                     ;; positions: temp `point-min' corresponds to BEG.
+                     (push (list (+ beg (1- pos)) (+ beg (1- next)) face)
+                           res))
+                   (setq pos next)))))
+           (nreverse res)))
+        (t
+         (let ((indirect-buffer (make-indirect-buffer
+                                 (current-buffer)
+                                 (generate-new-buffer-name (buffer-name))
+                                 nil 'inhibit-buffer-hooks))
+               res)
+           (unwind-protect
+               (with-current-buffer indirect-buffer
+                 (markdown-ts--inhibit-messages-and-warnings
+                   'markdown-ts-inhibit-code-block-mode-warnings
+                   (delay-mode-hooks (funcall mode)))
+                 (narrow-to-region beg end)
+                 (font-lock-ensure)
+                 (let ((pos (point-min)))
+                   (while (< pos (point-max))
+                     (let ((next (next-single-property-change
+                                  pos 'face nil (point-max)))
+                           (face (get-text-property pos 'face)))
+                       (when face
+                         (push (list pos next face) res))
+                       (setq pos next)))))
+             (kill-buffer indirect-buffer))
+           (nreverse res)))))
+
+(defun markdown-ts--code-block-language-mode (lang)
+  "Compute and cache a mode symbol from LANG, a symbol.
+Consult the `markdown-ts-code-block-modes' cache, or consult
+`treesit-major-mode-remap-alist' and `major-mode-remap-alist', or brute
+force mode probe.  Return a valid mode symbol or nil."
+  (if-let* ((mapped-mode (car (alist-get lang markdown-ts-code-block-modes))))
+      mapped-mode
+    (let* ((lang-string (symbol-name lang))
+           (lang-mode (concat lang-string "-mode"))
+           (mode))
+      (if (setq mode (alist-get lang-mode treesit-major-mode-remap-alist))
+          mode
+        (if (setq mode (alist-get lang-mode major-mode-remap-alist))
+            mode
+          (catch :mode
+            (dolist (mode
+                     (list
+                      ;; Try a treesit mode using the raw string.
+                      (concat lang-string "-ts-mode")
+                      ;; Try a conventional mode using the raw string.
+                      lang-mode
+                      ;; Try a treesit mode using the downcased string.
+                      (concat (downcase lang-string) "-ts-mode")
+                      ;; Try a conventional mode using the downcased string.
+                      (concat (downcase lang-string) "-mode")))
+              (setq mode (intern mode))
+              (when (fboundp mode)
+                (push (list lang mode) markdown-ts-code-block-modes)
+                (throw :mode mode)))))))))
+
+(defun markdown-ts--code-block-ts-language (node)
   "Convert NODE to a language for the code block."
-  (let* ((lang-string (alist-get (treesit-node-text node)
-                                 markdown-ts--code-block-language-map
-                                 (treesit-node-text node) nil #'equal))
-         (lang (if (symbolp lang-string)
-                   lang-string
-                 (intern (downcase lang-string)))))
-    ;; FIXME: Kind of a hack here: we use this function as a hook for
-    ;; loading up configs for the language for the code block on-demand.
-    (let ((mode (alist-get lang markdown-ts-code-block-source-mode-map)))
-      ;; If there's no supported mode for the language, return nil,
-      ;; which makes Emacs skip the code block.
-      (if (not (and mode (fboundp mode)))
-          nil
-        ;; If there's a major mode for the language, set up the config
-        ;; and return the language.
-        (when (not (memq lang markdown-ts--configured-languages))
-          (markdown-ts--add-config-for-mode lang mode)
-          (push lang markdown-ts--configured-languages))
-        lang))))
+  (let* ((lang (intern (treesit-node-text node)))
+         (mode (markdown-ts--code-block-language-mode lang))
+         (ts-language (alist-get lang markdown-ts--code-block-languages))
+         (non-ts-language (alist-get lang markdown-ts--code-block-non-ts-modes)))
+    (cond
+     ((fboundp mode)
+      (cond
+       ;; Return known treesit language.
+       (ts-language ts-language)
+       ;; Return nil for known non-treesit language for font-lock.
+       (non-ts-language nil)
+       ;; Markdown itself needs two parsers (markdown +
+       ;; markdown-inline), so treesit embedding (which creates only
+       ;; one) cannot fully fontify it.  Route through the non-ts
+       ;; path so the temp buffer runs the full mode with both
+       ;; parsers.
+       ((provided-mode-derived-p mode 'markdown-ts-mode)
+        (unless (assq lang markdown-ts--code-block-non-ts-modes)
+          (push (cons lang mode) markdown-ts--code-block-non-ts-modes))
+        nil)
+       (t
+        (let* ((configuration (markdown-ts--harvest-mode-treesit-configuration
+                               mode))
+               (ts-language (plist-get configuration :language)))
+          (cond
+           ((and ts-language
+                 (plist-get configuration :font-lock))
+            (markdown-ts--configure-current-buffer configuration)
+            (unless (assq lang markdown-ts--code-block-languages)
+              (push (cons lang ts-language) markdown-ts--code-block-languages))
+            ts-language)
+           ;; Otherwise, classify mode as non-tree-sitter.
+           (t
+            (unless (assq lang markdown-ts--code-block-non-ts-modes)
+              (push (cons lang mode) markdown-ts--code-block-non-ts-modes))
+            nil))))))
+     (t nil))))
+
+;;; Code block minor mode support and code-block context commands:
+
+(defvar markdown-ts-code-block-commands '(indent-for-tab-command
+                                          electric-newline-and-maybe-indent
+                                          completion-at-point
+                                          newline
+                                          comment-dwim
+                                          comment-line
+                                          comment-or-uncomment-region
+                                          markdown-ts--code-block-fill-paragraph
+                                          prog-fill-reindent-defun)
+  "Commands to execute in a code-block context.
+See `markdown-ts--run-command-in-code-block'.")
+
+(defvar markdown-ts-code-block-thing-commands '(xref-find-definitions)
+  "Commands that need a \"thing\" at point in a code-block context.
+See `markdown-ts--run-command-in-code-block'.")
+
+(defvar markdown-ts-code-block-region-commands '(comment-or-uncomment-region)
+  "Commands that need a region in a code-block context.
+See `markdown-ts--run-command-in-code-block'.")
+
+(defun markdown-ts--enable-code-block-in-context-mode ()
+  "Enable `markdown-ts-code-block-in-context-mode' if in a fenced code block."
+  (markdown-ts-code-block-in-context-mode
+   (if (markdown-ts-at-code-block-p) 1 -1)))
+
+;; NOTE: Do not add this command to `markdown-ts-code-block-commands'.
+(defun markdown-ts--code-block-newline (&optional arg interactive)
+  "Insert a newline, and move to left margin of the new line.
+With prefix argument ARG, insert that many newlines.
+
+If `electric-indent-mode' is enabled, this indents the final new line
+that it adds, and reindents the preceding line.  To just insert
+a newline, use \\[electric-indent-just-newline].
+
+If `auto-fill-mode' is enabled, this may cause automatic line
+breaking of the preceding line.  A non-nil ARG inhibits this.
+
+If variable `use-hard-newlines' is enabled, the newline is marked with
+the text-property `hard'.
+
+A non-nil INTERACTIVE argument means to run the `post-self-insert-hook'."
+  (interactive "*P\np")
+  (if-let* ((block-mode (markdown-ts-code-block-mode-at))
+            ((fboundp block-mode)))
+      (markdown-ts--run-command-in-code-block block-mode
+                                              #'newline
+                                              arg
+                                              interactive)
+    (funcall-interactively #'newline arg interactive)))
+
+(defun markdown-ts--code-block-fill-paragraph (&optional justify)
+  "Refill or reindent the markdown content that contains point.
+If the point is in a string or a comment, fill the paragraph that
+contains point or follows point.
+
+Otherwise, reindent the function definition that contains point or
+follows point.
+
+If JUSTIFY is non-nil (interactively, with prefix argument), justify as
+well."
+  (interactive "P")
+  (cond ((derived-mode-p 'prog-mode)
+         (call-interactively #'prog-fill-reindent-defun justify))
+        (t
+         (call-interactively #'fill-paragraph justify))))
+
+;; NOTE: Do not add this command to `markdown-ts-code-block-commands'.
+(defun markdown-ts--code-block-xref-find-definitions (&rest args)
+  "Helper command for `xref-find-definitions' in a code-block context.
+Find thing at point.
+Adjust the references on the xref stack to the base buffer.
+Pass through ARGS if not in a code block with an available mode."
+  (interactive)
+  (if-let* ((block-mode (markdown-ts-code-block-mode-at))
+            ((fboundp block-mode)))
+      (condition-case err
+          (unwind-protect
+              (progn
+                ;; Record a placeholder xref marker in the base buffer.  This
+                ;; will be retained if the command succeeds to push a marker in
+                ;; the code-block buffer which we will pop.
+                (xref-push-marker-stack)
+                ;; `xref-find-definitions' is a thing command in
+                ;; `markdown-ts-code-block-thing-commands'.
+                (markdown-ts--run-command-in-code-block block-mode
+                                                        #'xref-find-definitions
+                                                        args))
+            ;; Pop the top xref marker.  If the command succeeded, the
+            ;; top marker will be the code-block buffer marker.  If it
+            ;; failed, we'll pop the placeholder which is now of no
+            ;; value.
+            ;; TODO: Propose an `xref' pop function that doesn't "go
+            ;; back".
+            (let ((history (xref--get-history)))
+              (unless (null (car history))
+                (pop (car history)))))
+        (error
+         ;; Propagate the signal.
+         (signal (car err) (cdr err))))
+    ;; Not in a code block context.  This should really never happen.
+    (funcall-interactively #'xref-find-definitions args)))
+
+(defun markdown-ts--maybe-run-command-in-code-block ()
+  "Helper function to wrap a command for a code-block context.
+If `this-command' is a member of `markdown-ts-code-block-commands' and
+point is within a code block with an available mode, it will run in that
+code block's mode in a buffer narrowed to its content.  Otherwise, the
+command will run in the context of the `markdown-ts-mode' buffer."
+  (when (memq this-command markdown-ts-code-block-commands)
+    (when-let* ((command this-command)
+                (block-mode (markdown-ts-code-block-mode-at))
+                ((fboundp block-mode)))
+      (setq this-command (lambda (&rest args)
+                           (interactive)
+                           (apply #'markdown-ts--run-command-in-code-block
+                                  block-mode
+                                  command
+                                  args))))))
+
+(defun markdown-ts--run-command-in-code-block (block-mode command &rest args)
+  "Run COMMAND in BLOCK-MODE.
+ARGS are captured by `markdown-ts--maybe-run-command-in-code-block'."
+  (when-let* ((beg (get-char-property (point) 'markdown-ts-code-beg-marker))
+              (end (get-char-property (point) 'markdown-ts-code-end-marker))
+              (str (buffer-substring-no-properties beg end)))
+    ;; Use a temp (or work) buffer because treesit currently confuses
+    ;; nodes in an indirect buffer even if the indirect buffer is not
+    ;; narrowed.
+    (let* ((temp-deactivate-mark)
+           (orig-point (point))
+           (orig-mark (mark t))
+           (orig-mark-active mark-active)
+           (region-beg (use-region-beginning))
+           (region-end (use-region-end))
+           (adj-point (1+ (- orig-point beg)))
+           (adj-mark (when orig-mark (1+ (- orig-mark beg))))
+           (adj-region-beg (when region-beg (1+ (- orig-point region-beg))))
+           (adj-region-end (when region-end (1+ (- orig-point region-end))))
+           (point-delta 0)
+           (source-buffer (current-buffer)))
+      (with-work-buffer
+        (insert str)
+        (goto-char adj-point)
+        ;; Propagate mark (and region).
+        (when orig-mark-active
+          (set-mark adj-mark))
+        (markdown-ts--inhibit-messages-and-warnings
+          'markdown-ts-inhibit-code-block-mode-warnings
+          (delay-mode-hooks
+            (let ((markdown-ts--set-up-inline
+                   (provided-mode-derived-p block-mode 'markdown-ts-mode)))
+              (funcall block-mode))))
+        (let ((point (point))
+              (arity (cdr (func-arity command))))
+          (cond
+           ((memq command markdown-ts-code-block-thing-commands)
+            (when-let* ((thing (thing-at-point 'symbol)))
+              (funcall-interactively command thing)))
+           ((memq command markdown-ts-code-block-region-commands)
+            (when (and adj-region-beg adj-region-end)
+              (apply #'funcall-interactively command
+                     adj-region-beg adj-region-end args)))
+           ((zerop arity)
+            (funcall-interactively command))
+           ((eq 1 arity)
+            (funcall-interactively command (car args)))
+           (t
+            (apply #'funcall-interactively command args)))
+          (setq str (buffer-substring-no-properties (point-min) (point-max)))
+          (setq temp-deactivate-mark deactivate-mark)
+          (setq point-delta (- (point) point)))
+        (let ((work-buffer (current-buffer)))
+          (with-current-buffer source-buffer
+            (replace-region-contents beg end work-buffer)
+            ;; Propagate mark deactivation to the source buffer.
+            (setq deactivate-mark temp-deactivate-mark)
+            ;; Move point if it moved in the temp buffer.
+            (goto-char (+ orig-point point-delta))
+            ;; Record the original command.
+            (setq this-command command)
+            ;; This helps maintain discrete command actions.
+            (undo-boundary)
+            ;; Make sure the originating region is refontified.
+            (font-lock-flush beg end)))))))
+
+(defun markdown-ts--find-code-block-delimiter (pos &optional backward)
+  "Return the next or previous fenced_code_block_delimiter node, or nil.
+Search starting at POS.
+Search backward if BACKWARD is non-nil."
+  (treesit-search-forward (treesit-node-at pos 'markdown)
+                          (lambda (node)
+                            (string= (treesit-node-type node)
+                                     "fenced_code_block_delimiter"))
+                          backward))
+
+(defun markdown-ts--find-next-code-block-delimiter (&optional
+                                                    pos backward remain)
+  "Return the next or previous fenced_code_block_delimiter node, or nil.
+Search starting at POS or `point', if POS is nil.
+Search backward if BACKWARD is non-nil.
+If REMAIN is non-nil, move to the top or bottom of the current code
+block, if in one."
+  (setq pos (or pos (point)))
+  (and-let* ((node (markdown-ts--find-code-block-delimiter pos backward)))
+    (let ((in-block (markdown-ts-at-code-block-p pos)))
+      (cond
+       ((and remain in-block)
+        node)
+       (remain
+        nil)
+       (t
+        (while (and node
+                    ;; If backward, skip the current block's
+                    ;; starting delimiter.
+                    (or (and backward in-block (treesit-node-next-sibling node))
+                        (not (treesit-node-next-sibling node))))
+          (setq in-block (markdown-ts-at-code-block-p pos))
+          (setq pos (if backward
+                        (treesit-node-start node)
+                      (treesit-node-end node)))
+          (setq node (markdown-ts--find-code-block-delimiter pos backward)))
+        node)))))
+
+(defun markdown-ts-move-to-next-code-block (arg)
+  "Move point to the start of the next code block.
+With the prefix argument ARG, remain within the current code block."
+  (interactive "P")
+  (when-let* ((node
+               (markdown-ts--find-next-code-block-delimiter nil nil arg)))
+    (goto-char (treesit-node-start node))))
+
+(defun markdown-ts-move-to-previous-code-block (arg)
+  "Move point to the start of the previous code block.
+With the prefix argument ARG, remain within the current code block."
+  (interactive "P")
+  (when-let* ((node
+               (markdown-ts--find-next-code-block-delimiter nil 'backward arg)))
+    (goto-char (treesit-node-start node))))
+
+;;; Tables aka pipe tables:
+
+;;;; Utilities:
+
+(defconst markdown-ts-table-export-buffer
+  "*markdown-ts-table-export*")
+
+;; In frequency matching order.
+(defconst markdown-ts--table-row-types
+  '("pipe_table_row"
+    "pipe_table_delimiter_row"
+    "pipe_table_header"))
+
+;; In frequency matching order.
+(defconst markdown-ts--table-cell-types
+  '("pipe_table_cell"
+    "pipe_table_delimiter_cell"))
+
+(defconst markdown-ts--table-delimiter-cell-types
+  '("pipe_table_delimiter_cell"
+    "pipe_table_align_left"
+    "pipe_table_align_right"))
+
+(defconst markdown-ts--table-delimiter-cell-subtypes
+  '("pipe_table_align_left"
+    "pipe_table_align_right"))
+
+(defun markdown-ts--table-abutting-pos (pos)
+  "Adjust POS to abut its closest text.
+Return pos adjusted to the position of the nearest non-blank character.
+Otherwise, return nil, for example, if the line is empty."
+  (save-excursion
+    (goto-char pos)
+    (skip-chars-forward "[[:blank:]]" (pos-eol))
+    (if (eq pos (pos-eol))
+        (progn
+          (goto-char pos)
+          (skip-chars-backward "[[:blank:]]" (pos-bol))
+          (unless (eq pos (pos-bol))
+            (max (point-min) (1- (point)))))
+      (min (point-max) (1+ (point))))))
+
+(defun markdown-ts--table-node-cell (&optional node pos abutting)
+  "Compute table cell from named NODE at POS.
+If NODE is nil, use the node at POS.
+If POS is nil, use `point'.
+If NODE is a cell type, return it.
+If NODE is a subtype, promote it.
+If ABUTTING is non-nil, adjust POS to the nearest non-blank character.
+Otherwise, return nil."
+  ;; We could sanity check via `treesit-node-named' and error if not.
+  (setq pos (or pos (point)))
+  (when abutting
+    (setq pos (or (markdown-ts--table-abutting-pos pos) pos)))
+  (when-let* ((node (or node
+                        (treesit-node-at pos 'markdown 'named)))
+              (type (treesit-node-type node)))
+    (cond ((member type markdown-ts--table-cell-types)
+           node)
+          ((member type markdown-ts--table-delimiter-cell-subtypes)
+           (treesit-node-parent node))
+          ((member type markdown-ts--table-row-types)
+           (cond ((eq abutting 'left)
+                  (treesit-node-child node 0 'named))
+                 ;; Account for 'right or t.
+                 (t
+                  (treesit-node-child node -1 'named)))))))
+
+(defun markdown-ts--table-node-row (&optional node pos)
+  "Compute table row from named NODE at POS.
+If NODE is nil, use the node at POS.
+If POS is nil, use `point'.
+If NODE is a row type, return it.
+If NODE is a table cell type, return its row.
+Otherwise, return nil."
+  ;; We could sanity check via `treesit-node-named' and error if not.
+  (when-let* ((node (or node
+                        (treesit-node-at (or pos (point)) 'markdown 'named)))
+              (type (treesit-node-type node)))
+    (if (member type markdown-ts--table-row-types)
+        node
+       (treesit-node-parent (markdown-ts--table-node-cell node)))))
+
+(defun markdown-ts--table-parse-error-p (&optional node pos)
+  "Return non-nil if named NODE at POS is in an \"ERROR\" subtree.
+NODE must be a table element; i.e., its type prefix is \"pipe_table\".
+If NODE is a table, return nil (it shouldn't be in ERROR).
+If NODE is not a table element, return nil.
+If NODE's nearby ancestor is an \"ERROR\" node, return t.
+Otherwise, return nil."
+  ;; We could sanity check via `treesit-node-named' and error if not.
+  (when-let* ((row (markdown-ts--table-node-row node pos))
+              (type (treesit-node-type row))
+              (parent (treesit-node-parent row))
+              (parent-type (treesit-node-type parent)))
+    (cond ((equal type "pipe_table")
+           nil)
+          ((equal parent-type "pipe_table")
+           nil)
+          ((equal parent-type "ERROR")
+           t)
+          (t
+           (error "Should never happen")))))
+
+(defun markdown-ts-at-table-p (&optional pos abutting)
+  "Return non-nil if POS is at or in a pipe table.
+If POS is nil, use point.
+Return cons (pos . table-node) if POS is within a table, otherwise
+return nil.
+if POS is within a table but with parse errors, signal an error.
+If ABUTTING is non-nil, adjust POS to the nearest non-blank character.
+If the parsed table is in ERROR, return nil."
+  (setq pos (or pos (point)))
+  (save-excursion
+    (goto-char pos)
+    ;; If point is on an empty line, it is never a table.
+    (unless (and (eolp) (bolp))
+      ;; If point is bol or eol it might be abutting a pipe symbol so
+      ;; look forwards or backwards one character to test if that pos
+      ;; is a table.
+      (when abutting
+        (setq pos (or (markdown-ts--table-abutting-pos pos) pos)))
+      (when-let* ((row (markdown-ts--table-node-row nil pos)))
+        (if (markdown-ts--table-parse-error-p row)
+            ;; Do not use error or warning here.  Errors interfere with
+            ;; the command loop.  Warnings are annoying.
+            (progn
+              (message "Incorrectly formatted Markdown table (parser error)")
+              nil)
+          (cons pos (treesit-search-forward
+                     row
+                     "\\`pipe_table\\'" 'backward)))))))
+
+(defun markdown-ts--enable-in-table-mode ()
+  "Enable `markdown-ts-in-table-mode' if in a table.
+A table with a parser ERROR is ineligible."
+  (markdown-ts-in-table-mode
+   (if (markdown-ts-at-table-p nil t) 1 -1)))
+
+(defun markdown-ts--table-body-row-near-pos (&optional pos abutting)
+  "Return the row near POS.
+Return nil if not at a table or there is no row.
+Otherwise return cons (row . in-header) where in-header is nil or t.
+This is useful to insert a new row just below the header instead of just
+below the first row.
+If POS is nil use `point'.
+If ABUTTING is non-nil, use (1- POS) if POS is immediately after a pipe
+symbol."
+  (setq pos (or pos (point)))
+  (let (in-header)
+    (when-let* ((at-table (markdown-ts-at-table-p pos abutting))
+                (pos (car at-table))
+                (table (cdr at-table))
+                (cell (markdown-ts--table-node-cell nil pos abutting))
+                (cell-type (treesit-node-type cell))
+                (parent (treesit-node-parent cell))
+                (parent-type (treesit-node-type parent))
+                (lineage (list cell-type parent-type))
+                ;; Find the first row after the header or the row at POS is
+                ;; on and in the same table.
+                (row (cond ((or (member "pipe_table_header" lineage)
+                                (member "pipe_table_delimiter_row" lineage))
+                            (setq in-header t)
+                            (treesit-search-forward cell "\\`pipe_table_row\\'"))
+                           ((equal cell-type "pipe_table_row")
+                            cell)
+                           ((equal parent-type "pipe_table_row")
+                            parent))))
+      (when (treesit-node-eq table (treesit-search-forward
+                                    row
+                                    "\\`pipe_table\\'" 'backward))
+        (cons row in-header)))))
+
+(defun markdown-ts--table-compute-node-column (row node)
+  "Compute NODE's column in ROW.
+Return nil if NODE is not in ROW (this should not happen).
+NODE must be a node in ROW.
+ROW must be a pipe_table_header, pipe_table_delimiter_row, or
+pipe_table_row."
+  (catch :column
+    (let ((count 0))
+      (dolist (cell (treesit-node-children row 'named))
+        (when (treesit-node-eq node cell)
+          (throw :column count))
+        (setq count (1+ count))))))
+
+(defun markdown-ts-table--goto-column (column &optional no-error)
+  "Move point on the current row to COLUMN.
+COLUMN is a 0-based index.
+Return non-nil if successful.
+If NO-ERROR is non-nil, return nil if the current row does not extend to
+COLUMN, otherwise signal an error.
+Signal an error if point is not at a table."
+  (if-let* ((cell (markdown-ts--table-node-cell nil nil t))
+            (row (markdown-ts--table-node-row cell))
+            (cols (treesit-node-children row 'named)))
+      (if-let* ((target-cell (nth column cols)))
+          (goto-char (treesit-node-start target-cell))
+        (unless no-error
+          (error "Column %S not found" column)))
+    (error "Not at a table")))
+
+(defun markdown-ts--table-aligners (table)
+  "Extract the header line aligners from node TABLE.
+Return a list of lists of the form:
+  (:beg xxx :end xxx :align left)
+:align is one of `left' `center' `right' `unspecified'."
+  (let* ((delimiter-row (treesit-search-subtree
+                         table
+                         "\\`pipe_table_delimiter_row\\'"))
+         (aligners
+          (let (res)
+            (dolist (elt (treesit-node-children delimiter-row 'named))
+              (let ((align-beg (treesit-node-type
+                                (treesit-node-child elt 0 'name)))
+                    (align-end (treesit-node-type
+                                (treesit-node-child elt -1 'name))))
+                (push (list
+                       :beg (treesit-node-start elt)
+                       :end (treesit-node-end elt)
+                       :align
+                       (cond ((and
+                               (equal align-beg "pipe_table_align_left")
+                               (equal align-end "pipe_table_align_left"))
+                              'left)
+                             ((and
+                               (equal align-beg "pipe_table_align_left")
+                               (equal align-end "pipe_table_align_right"))
+                              'center)
+                             ((and
+                               (equal align-beg "pipe_table_align_right")
+                               (equal align-end "pipe_table_align_right"))
+                              'right)
+                             (t 'unspecified)))
+                      res)))
+            (nreverse res))))
+    aligners))
+
+(defun markdown-ts--table-make-aligner (width align)
+  "Make a Markdown column aligner.
+WIDTH is the column width.
+ALIGN is one of `left' `center' `right' `unspecified'."
+  (pcase align
+    ('left
+     (concat ":" (make-string (1- width) ?-)))
+    ('center
+     (concat ":" (make-string (- width 2) ?-) ":"))
+    ('right
+     (concat (make-string (1- width) ?-) ":"))
+    (_
+     (concat (make-string width ?-)))))
+
+(defun markdown-ts--table-align-cell (text width align)
+  "Return TEXT padded to WIDTH aligned using ALIGN.
+Truncate TEXT wider than WIDTH.  It is the caller's responsibility to
+ensure text will fit.
+ALIGN is one of `left' `center' `right' `unspecified'."
+  (let* ((strlen (length text))
+         (strlen0 (min width strlen))
+         (text0 (substring text 0 strlen0))
+         (pad (- width strlen0)))
+    (pcase align
+      ('center
+       (let* ((half-pad (make-string (floor (/ pad 2)) ?\s))
+              (s (concat
+                  half-pad
+                  text0
+                  half-pad)))
+         (string-pad
+          (substring s 0 (min (length s) width))
+          width)))
+      ('right
+       (string-pad text width nil 'start))
+      (_
+       (string-pad text width)))))
+
+;;;; Commands:
+
+(defun markdown-ts-table-insert-table (&optional nrows ncols headings body)
+  "Insert a Markdown pipe table.
+NROWS is the number of rows in the new table and defaults to 3.
+
+NCOLS is the number of columns and defaults to 3.
+
+HEADINGS is a list of headings and defaults to left-aligned synthesized
+column names.  If NCOLS is nil, use HEADINGS length.  If both NCOLS and
+HEADINGS are non-nil, use up to NCOLS headings, synthesizing the
+remainder.
+
+Each heading in the list can be a string column name or a cons of the
+form (name . alignment) where alignment is one of the symbols `left',
+`right', or `center'.  If a string, default alignment is unspecified.
+
+If BODY is non-nil, it is a list of NROWS rows where each row is a list
+of NCOLS body cells.
+
+For convenience and aesthetics, pad each body cell to the width of its
+column's header, and accommodate alignment indicators.  If a BODY cell
+is longer than its column header, insert it unchanged.
+
+Note: A blank line is needed before the table for it to properly render.
+If the line preceding `point' is not blank, insert one.
+
+Note: Due to an issue with the tree-sitter Markdown grammar, a row of
+empty cells causes a parsing error.  To avoid this, an empty row will
+contain a single period in its first cell."
+  (interactive)
+  (setq nrows (or nrows 3))
+  (setq ncols (or ncols (and headings (length headings)) 3))
+  (setq headings
+        (let (res)
+          (dotimes (x ncols)
+            (push (or (nth x headings)
+                      (format "Column %d" (1+ x)))
+                  res))
+          (nreverse res)))
+  (let ((heading-widths
+         (let (res)
+           (dolist (elt headings)
+             (let ((str (if (consp elt) (car elt) elt)))
+               (push (max markdown-ts-table-default-column-width
+                          (length str))
+                     res)))
+           (nreverse res))))
+    ;; If point is not at bol, insert a newline.
+    (unless (eq (point) (pos-bol))
+      (insert "\n"))
+    ;; Insert an empty line if needed.
+    (unless (save-excursion
+              (forward-line -1)
+              (eq (pos-bol) (pos-eol)))
+      (insert "\n"))
+    ;; Insert padded heading text.
+    (insert "|")
+    (dotimes (x ncols)
+      (let* ((elt (nth x headings))
+             (str (if (consp elt) (car elt) elt))
+             (width (max 3 (nth x heading-widths)))
+             (pad-width (- width (length str))))
+        (insert str (make-string pad-width ?\s) "|")))
+    (insert "\n")
+    ;; Insert padded heading aligners.
+    (insert "|")
+    (dotimes (x ncols)
+      (let* ((elt (nth x headings))
+             (align (if (consp elt) (cdr elt) 'unspecified))
+             (width (max 3 (nth x heading-widths))))
+        (insert (markdown-ts--table-make-aligner width align)))
+      (insert "|"))
+    (insert "\n")
+    ;; Insert BODY cells or empty cells.
+    (dotimes (y nrows)
+      (insert "|")
+      (let ((row (nth y body)))
+        (dotimes (x ncols)
+          ;; TODO: Remove the placeholder character if the tree-sitter
+          ;; grammar is repaired.
+          (let* ((str (or (nth x row) (and (eq x 0) ".") ""))
+                 (strlen (length str))
+                 (width (nth x heading-widths))
+                 (pad-width (max 0 (- width strlen))))
+            (insert str
+                    (make-string pad-width ?\s)
+                    "|")))
+        (insert "\n")))))
+
+(defun markdown-ts-table-delete-table ()
+  "Remove the Markdown table at point.
+If point is not at a table, do nothing."
+  (interactive)
+  (markdown-ts--barf-if-not-mode 'markdown-ts-table-delete-table)
+  (when-let* ((at-table (markdown-ts-at-table-p nil t))
+              (table (cdr at-table)))
+    ;; TODO: Remove after bug#23903 Undo after kb differs from after M-x
+    (push (point) buffer-undo-list)
+    (delete-region (treesit-node-start table) (treesit-node-end table))))
+
+(defun markdown-ts-table-previous-row ()
+  "Move to the previous row in the table.
+If not in a table, do nothing."
+  (interactive)
+  (markdown-ts-table-next-row -1))
+
+(defun markdown-ts-table-next-row (&optional n)
+  "Move to the next row in the table.
+If N is negative, move to the previous row.
+If point is on the last row of the table, insert a new row below and
+move into it.  With a prefix argument, clone the final row into the new
+one.
+If not in a table, do nothing."
+  (interactive)
+  (markdown-ts--barf-if-not-mode 'markdown-ts-table-next-row)
+  (let ((backwards (and n (< n 0))))
+    ;; Don't use `markdown-ts--table-body-row-near-pos' because we want
+    ;; to operate in the header.
+    (when-let* ((at-table (markdown-ts-at-table-p nil t))
+                (pos (car at-table))
+                (table (cdr at-table))
+                (row (markdown-ts--table-node-row nil pos)))
+      ;; If no next or prev sibling, we're on the last/first row.
+      (let ((current-column (current-column))
+            (next-row (if backwards
+                          (treesit-node-prev-sibling row 'named)
+                        (treesit-node-next-sibling row 'named))))
+        (if next-row
+            (goto-char (treesit-node-start next-row))
+          (unless backwards
+            (markdown-ts-table-insert-row-below current-prefix-arg)))
+        (move-to-column current-column)))))
+
+(defun markdown-ts-table-previous-cell ()
+  "Move to the previous cell in the table.
+If not in a table, do nothing."
+  (interactive)
+  (markdown-ts-table-next-cell -1))
+
+(defun markdown-ts-table-next-cell (&optional n)
+  "Move to the next cell in the table.
+If N is negative, move to the previous cell.
+If not in a table, do nothing."
+  (interactive)
+  (markdown-ts--barf-if-not-mode 'markdown-ts-table-next-cell)
+  (let ((backwards (and n (< n 0))))
+    (when-let* ((at-table (markdown-ts-at-table-p nil t))
+                (pos (car at-table))
+                (table (cdr at-table))
+                (node (treesit-node-at pos 'markdown 'named))
+                (cell (markdown-ts--table-node-cell node))
+                (cell-type (treesit-node-type node))
+                (row (markdown-ts--table-node-row cell))
+                (row-type (treesit-node-type row))
+                (next-cell
+                 (cond
+                  ;; If in a pipe_table_delimiter_row and not the first
+                  ;; or final cell in the row, stay within the row
+                  ;; otherwise, the default condition should match.
+                  ((and (equal row-type "pipe_table_delimiter_row")
+                        (if backwards
+                            (treesit-node-prev-sibling cell 'named)
+                          (treesit-node-next-sibling cell 'named)))
+                   (if backwards
+                       (treesit-node-prev-sibling cell 'named)
+                     (treesit-node-next-sibling cell 'named)))
+                  ;; If on the first pipe_table_row's first cell moving
+                  ;; backwards, move into the final
+                  ;; pipe_table_delimiter_cell.
+                  ((and (equal cell-type "pipe_table_cell")
+                        (equal (treesit-node-type
+                                (treesit-node-prev-sibling row 'named))
+                               "pipe_table_delimiter_row")
+                        (not (treesit-node-prev-sibling cell 'named))
+                        backwards)
+                   (treesit-search-forward
+                    cell
+                    "\\`pipe_table_delimiter_cell\\'" backwards))
+                  ;; If on the first pipe_table_header's final cell
+                  ;; moving forwards, move into the first
+                  ;; pipe_table_delimiter_cell.
+                  ((and (equal cell-type "pipe_table_cell")
+                        (equal (treesit-node-type
+                                (treesit-node-next-sibling row 'named))
+                               "pipe_table_delimiter_row")
+                        (not (treesit-node-next-sibling cell 'named))
+                        (not backwards))
+                   (treesit-search-forward
+                    cell
+                    "\\`pipe_table_delimiter_cell\\'" backwards))
+                  (t
+                   (treesit-search-forward
+                    cell
+                    "\\`pipe_table_cell\\'" backwards)))))
+      ;; Keep point within the current table.
+      (when (treesit-node-eq table (treesit-search-forward
+                                    next-cell
+                                    "\\`pipe_table\\'" 'backward))
+        (goto-char (treesit-node-start next-cell)))
+      (when (or (eq markdown-ts-table-auto-align t)
+                (memq 'cell-navigation markdown-ts-table-auto-align))
+        (markdown-ts-table-align-table)))))
+
+(defun markdown-ts-table-insert-row-below (&optional clone)
+  "Insert a table row below point.
+If point is in the header, insert below the first row of the table.
+If CLONE is non-nil, or with a prefix argument, clone the current row.
+If point is not at a table, do nothing."
+  (interactive "P")
+  (setq clone (or clone current-prefix-arg))
+    (markdown-ts-table-insert-row 'below clone))
+
+(defun markdown-ts-table-insert-row-above (&optional clone)
+  "Insert a table row above point.
+If point is in the header, insert above the first row of the table.
+If CLONE is non-nil, or with a prefix argument, clone the current row.
+If point is not at a table, do nothing."
+  (interactive "P")
+  (setq clone (or clone current-prefix-arg))
+    (markdown-ts-table-insert-row 'above clone))
+
+(defun markdown-ts-table-clone-row-below ()
+  "Insert a table row below point.
+If point is in the header, insert below the first row of the table.
+If point is not at a table, do nothing."
+  (interactive)
+  (markdown-ts-table-insert-row-below 'clone))
+
+(defun markdown-ts-table-clone-row-above ()
+  "Insert a table row above point.
+If point is in the header, insert above the first row of the table.
+If point is not at a table, do nothing."
+  (interactive)
+  (markdown-ts-table-insert-row-above 'clone))
+
+(defun markdown-ts-table-insert-row (&optional above clone)
+  "Insert a table row below point.
+If point is in the header, insert below the first row of the table.
+If ABOVE is non-nil and is not `below', or with a prefix argument,
+insert the row above point.
+If CLONE is non-nil, clone the current row, otherwise insert empty
+cells.
+If point is not at a table, do nothing."
+  (interactive "P")
+  (markdown-ts--barf-if-not-mode 'markdown-ts-table-insert-row)
+  (setq above (cond ((eq above 'below) nil)
+                    (above above)
+                    (current-prefix-arg t)))
+  (when-let* ((at-table (markdown-ts-at-table-p nil t))
+              (pos (car at-table))
+              (table (cdr at-table))
+              (delimiter-row (treesit-search-subtree
+                              table
+                              "\\`pipe_table_delimiter_row\\'"))
+              (ncols (treesit-node-child-count delimiter-row 'named))
+              (heading-widths
+               (let (res)
+                 (dolist (elt (treesit-node-children delimiter-row 'named))
+                   (push (length (treesit-node-text elt)) res))
+                 (nreverse res))))
+    (let* ((near (markdown-ts--table-body-row-near-pos pos))
+           (row (car near))
+           (current-column (current-column)))
+      ;; If row is nil, there are zero rows so add one below the
+      ;; delimiter-row.
+      (unless row
+        (setq clone nil)
+        (setq row delimiter-row)
+        (setq above nil))
+      (save-excursion
+        (cond (above
+               (goto-char (treesit-node-start row)))
+              (t
+               (goto-char (treesit-node-end row))
+               (insert "\n")))
+        (cond (clone
+               ;; The clone strategy is WYSIWYG.  Just copy the text
+               ;; and don't fuss with cell content and pipe symbols.
+               ;; The grammar includes the final newline (and
+               ;; sometimes not).
+               (insert (string-trim-right
+                        (treesit-node-text row 'no-property) "\n")))
+              (t
+               (insert "|")
+               (dotimes (x ncols)
+                 (let ((pad-width (nth x heading-widths)))
+                   ;; TODO: Remove the placeholder character if the
+                   ;; tree-sitter grammar is repaired.
+                   (insert (if (eq x 0) "." "")
+                           (make-string (- pad-width (if (eq x 0) 1 0)) ?\s)
+                           "|")))))
+        (when above
+          (insert "\n")))
+      (cond (above
+             (when (> current-column 0)
+               (with-suppressed-warnings ((interactive-only previous-line))
+                 (previous-line))))
+            (t (with-suppressed-warnings ((interactive-only next-line))
+                 (next-line)))))))
+
+(defun markdown-ts-table-delete-row ()
+  "Delete the table row at point.
+If point is on the header or delimiter row, do nothing.
+If point is not at a table, do nothing."
+  (interactive)
+  (markdown-ts--barf-if-not-mode 'markdown-ts-table-delete-row)
+  (when-let* ((near (markdown-ts--table-body-row-near-pos nil t))
+              ;; Bail if point is on the header or delimiter row — do
+              ;; not silently delete a body row the user did not select.
+              ((not (cdr near)))
+              (row (car near)))
+    (let ((current-column (current-column)))
+      (delete-region (treesit-node-start row)
+                     (min (1+ (treesit-node-end row)) (point-max)))
+      (move-to-column current-column))))
+
+(defun markdown-ts-table-move-row-up ()
+  "Move the row at point up one line.
+If point is not at a table, do nothing."
+  (interactive)
+  (markdown-ts-table-move-row))
+
+(defun markdown-ts-table-move-row-down ()
+  "Move the row at point down one line.
+If point is not at a table, do nothing."
+  (interactive)
+  (markdown-ts-table-move-row 'down))
+
+(defun markdown-ts-table-move-row (&optional down)
+  "Move the row at point up one line.
+If DOWN is non-nil, or with a prefix argument, move the row down one
+line.
+If point is on the header or delimiter row, do nothing.
+If point is not at a table, do nothing."
+  (interactive)
+  (markdown-ts--barf-if-not-mode 'markdown-ts-table-move-row)
+  (setq down (or down current-prefix-arg))
+  (when-let* ((at-table (markdown-ts-at-table-p nil t))
+              (pos (car at-table))
+              (table (cdr at-table))
+              (near (markdown-ts--table-body-row-near-pos pos))
+              ;; Bail if point is on the header or delimiter row — do
+              ;; not silently move a body row the user did not select.
+              ((not (cdr near)))
+              (row (car near)))
+    ;; Do not move above the pipe_table_delimiter_row.
+    ;; Do not move below the bottom of the table.
+    (unless (or (and (not down)
+                     (equal (treesit-node-type
+                             (treesit-node-prev-sibling row 'named))
+                            "pipe_table_delimiter_row"))
+                (and down
+                     (not (treesit-node-next-sibling row 'named))))
+      (let ((row2 (if down
+                      (treesit-node-next-sibling row 'named)
+                    (treesit-node-prev-sibling row 'named)))
+            (row-end (treesit-node-end row)))
+        ;; TODO: Remove after bug#23903 Undo after kb differs from after M-x
+        (push (point) buffer-undo-list)
+        ;; If row point is outside its source region, e.g., at eol, move
+        ;; it inside the region for stability.
+        (when (>= (point) row-end)
+          (goto-char (max (point-min) (1- row-end))))
+        (transpose-regions (treesit-node-start row)
+                           (treesit-node-end row)
+                           (treesit-node-start row2)
+                           (treesit-node-end row2))))))
+
+(defun markdown-ts-table-insert-column-left (&optional clone)
+  "Insert a table column to the left of point's column.
+If CLONE is non-nil, or with a prefix argument, clone the current
+column, otherwise insert empty cells.
+Point can be in the table header or body.
+If point is not at a table, do nothing."
+  (interactive "P")
+  (markdown-ts-table-insert-column 'left clone))
+
+(defun markdown-ts-table-insert-column-right (&optional clone)
+  "Insert a table column to the right of point's column.
+If CLONE is non-nil, or with a prefix argument, clone the current
+column, otherwise insert empty cells.
+Point can be in the table header or body.
+If point is not at a table, do nothing."
+  (interactive "P")
+  (markdown-ts-table-insert-column 'right clone))
+
+(defun markdown-ts-table-clone-column-left ()
+  "Clone the current column to its left.
+Point can be in the table header or body.
+If point is not at a table, do nothing."
+  (interactive)
+  (markdown-ts-table-insert-column-left 'clone))
+
+(defun markdown-ts-table-clone-column-right ()
+  "Clone the current column to its right.
+Point can be in the table header or body.
+If point is not at a table, do nothing."
+  (interactive)
+  (markdown-ts-table-insert-column-right 'clone))
+
+(defun markdown-ts-table-insert-column (&optional left clone)
+  "Insert a table column after point's current column.
+If LEFT is non-nil and is not `right', or with a prefix argument,
+insert the column to the left of the current column.
+If CLONE is non-nil, clone the current column, otherwise insert empty
+cells.
+If CLONE is a list, its first element is target-column-number.  It is
+the caller's responsibility that this value is valid for the table,
+though it may be invalid for a non-uniform ragged row.
+Point can be in the table header or body.
+If point is not at a table, do nothing."
+  (interactive)
+  (markdown-ts--barf-if-not-mode 'markdown-ts-table-insert-column)
+  (setq left (cond ((eq left 'right) nil)
+                   (left left)
+                   (current-prefix-arg t)))
+  (when-let* ((at-table (markdown-ts-at-table-p nil t))
+              (pos (car at-table))
+              (table (cdr at-table))
+              (delimiter-row (treesit-search-subtree
+                              table "\\`pipe_table_delimiter_row\\'"))
+              ;; Column pos for inserting missing leading pipes.
+              (delim0-pipe-col
+               (save-excursion
+                 (let* ((delim-cell (treesit-node-child
+                                     delimiter-row 0 'named))
+                        (beg (treesit-node-start delim-cell)))
+                   (goto-char beg)
+                   (goto-char (pos-bol))
+                   (if (search-forward "|" beg t)
+                       (1- (current-column))
+                     (goto-char beg)
+                     (current-column)))))
+              (node (treesit-node-at pos 'markdown 'named))
+              (cell (markdown-ts--table-node-cell node))
+              (point-row (markdown-ts--table-node-row cell)))
+    (let ((table-column (markdown-ts--table-compute-node-column point-row cell)))
+      (unless table-column
+        (error "Could not compute the table column"))
+      ;; NOTE: GFM tables allow non-uniform table rows.  The current row
+      ;; could have a differing number of columns from other rows.  We
+      ;; silently do nothing to a row that does not extend to the
+      ;; computed column.
+      ;;
+      ;; NOTE: The grammar annoyingly ignores cell leading whitespace
+      ;; but includes trailing whitespace, so cells are bounded by the
+      ;; first graph character up to the last character just before the
+      ;; pipe symbol, including whitespace.  The result is the range
+      ;; does not start immediately after the optional leading pipe
+      ;; symbol yet inconsistently continues until just before the
+      ;; trailing pipe.
+      (let* ((adj 0) ; Adjust node position offsets by inserted text.
+             (width markdown-ts-table-default-column-width)
+             (empty (make-string width ?\s))
+             ;; TODO: Remove the placeholder character if the tree-sitter
+             ;; grammar is repaired.
+             (placeholder (concat "." (make-string (1- width) ?\s)))
+             (delim (make-string width ?-))
+             (rows (treesit-node-children table 'named))
+             (nrows (length rows))
+             (target-column-number (and (listp clone) (car clone)))
+             ;; Position to move point to after all rows have been
+             ;; updated.  Deterministic placement avoids depending on
+             ;; tree-sitter navigation through freshly-inserted empty
+             ;; cells, which the grammar does not always reparse as
+             ;; pipe_table_cell nodes.
+             (target-pos))
+        ;; TODO: Remove after bug#23903 Undo after kb differs from after M-x
+        (push (point) buffer-undo-list)
+        (save-excursion
+          (without-restriction
+            (dotimes (x nrows)
+              (when-let* ((row (nth x rows))
+                          (row-type (treesit-node-type row))
+                          (cols (treesit-node-children row 'named))
+                          (ncols (length cols))
+                          ;; source-cell will be nil if table-column is beyond this
+                          ;; row's column set and that row will be skipped.
+                          (source-cell (nth table-column cols))
+                          ;; If cloning with a specified target-column-number,
+                          ;; target-cell will be nil and the row will be skipped.
+                          (target-cell (if target-column-number
+                                          (nth target-column-number cols)
+                                        source-cell))
+                          ;; Compute the insertion point.
+                          (beg (cond
+                                ;; If cloning to a specified target, use
+                                ;; target-cell's end.
+                                (target-column-number
+                                 (+ adj
+                                    (treesit-node-end target-cell)))
+                                ;; If inserting to the left of the first
+                                ;; column, use source cell's start
+                                ;; adjusted for its optional pipe to
+                                ;; capture its whitespace.  If there is
+                                ;; no pipe, use bol.
+                                ((and left (eq table-column 0))
+                                 (let ((p (+ adj
+                                             (treesit-node-start source-cell))))
+                                   (goto-char p)
+                                   (goto-char (pos-bol))
+                                   (if (search-forward "|" p t)
+                                       (setq p (1- (point)))
+                                     (setq p (pos-bol)))
+                                   p))
+                                ;; If inserting left and any other
+                                ;; column, use the end of the prior
+                                ;; cell.
+                                (left
+                                 (+ adj
+                                    (1+ (treesit-node-end
+                                         (nth (1- table-column) cols)))))
+                                ;; If inserting right, use the end of
+                                ;; the current cell.
+                                (t
+                                 (+ adj
+                                    (treesit-node-end source-cell))))))
+                (goto-char beg)
+                (let* ((orig-point (point))
+                       (missing-leading-pipe
+                        (when (eq table-column 0)
+                          (save-excursion
+                            (goto-char (pos-bol))
+                            (unless (search-forward
+                                     "|"
+                                     (+ adj (treesit-node-start source-cell)) t)
+                              "|"))))
+                       (text (cond
+                              ;; If cloning, retrieve the source cell text.
+                              (clone (buffer-substring-no-properties
+                                      ;; Back up to bol or the pipe
+                                      ;; to capture the whitespace
+                                      ;; the grammar leaves out.
+                                      (save-excursion
+                                        (goto-char
+                                         (+ adj
+                                            (treesit-node-start source-cell)))
+                                        (skip-chars-backward "[[:blank:]]"
+                                                             (pos-bol))
+                                        (point))
+                                      (+ adj (treesit-node-end source-cell))))
+                              ;; If new column, and this is the
+                              ;; delimiter row, insert a default
+                              ;; delimiter.
+                              ((equal row-type "pipe_table_delimiter_row")
+                               delim)
+                              ;; If new column, and this is the a header
+                              ;; or body row, insert a default empty
+                              ;; string.
+                              (t
+                               empty))))
+                  (cond
+                   (clone
+                    (cond
+                    ;; Clone the first column to the left.  If there is
+                    ;; no pipe before the cell content, insert one.
+                     ((and left (eq table-column 0))
+                        (insert "|"
+                                text
+                                (or missing-leading-pipe "")))
+                    ;; Clone the first column to the right.
+                     ((and (not left) (eq table-column 0))
+                      (insert "|"
+                              text)
+                      ;; For a positive user experience given grammar
+                      ;; bugs, add a missing leading pipe to the first
+                      ;; cell at a pleasing position after cloning.
+                      (when missing-leading-pipe
+                        (save-excursion
+                          (move-to-column delim0-pipe-col)
+                          (insert "|"))))
+                    ;; Clone the final column to the left.
+                     ((and left (eq table-column (1- ncols)))
+                      (insert text
+                              "|"))
+                     ;; Clone a middle column to the left.
+                     (left
+                      (insert text
+                              "|"))
+                     ;; Clone a middle or final column to the right.
+                     (t
+                      (insert "|"
+                              text))))
+
+                   ;; Not cloning, insert a new column.
+                   ((and left (eq table-column 0) (eq x (1- nrows))
+                         (not (equal row-type "pipe_table_delimiter_row")))
+                   ;; TODO: remove placeholder logic.
+                    (insert
+                     "|"
+                     placeholder
+                     (or missing-leading-pipe "")))
+                   ((and left (eq table-column 0))
+                      (insert
+                       "|"
+                       text
+                       (or missing-leading-pipe "")))
+                   (left
+                    (insert
+                     text
+                     "|"))
+                   (t
+                    (insert
+                     "|"
+                     text)))
+
+                  ;; Capture the start of the new cell's content in
+                  ;; the row that originally contained point.
+                  (when (and (not target-pos)
+                             (treesit-node-eq row point-row))
+                    (setq target-pos
+                          (cond
+                           (target-column-number
+                            (treesit-node-start target-cell))
+                           (t
+                            (if (and left (not (eq table-column 0)))
+                                ;; "text |" inserted at beg.
+                                orig-point
+                              ;; All other branches insert "|" first.
+                              (1+ orig-point))))))
+
+                  ;; Adjust offset for deleted text.
+                  (setq adj (+ adj (- (point) orig-point))
+                        orig-point (point)))))))
+        (when target-pos
+          (goto-char target-pos))))))
+
+(defun markdown-ts-table-delete-column ()
+  "Delete the table column at point.
+Point can be in the table header or body.
+If point is not at a table, do nothing."
+  (interactive)
+  (markdown-ts--barf-if-not-mode 'markdown-ts-table-delete-column)
+  (when-let* ((at-table (markdown-ts-at-table-p nil t))
+              (pos (car at-table))
+              (table (cdr at-table))
+              (cell (markdown-ts--table-node-cell nil pos))
+              (row (markdown-ts--table-node-row cell))
+              (cols (treesit-node-children row 'named))
+              (ncols (length cols)))
+    (let ((table-column (markdown-ts--table-compute-node-column row cell)))
+      (unless table-column
+        (error "Could not compute the table column"))
+      ;; NOTE: GFM tables allow non-uniform table rows.  The current row
+      ;; could have a differing number of columns from other rows.  We
+      ;; silently do nothing to a row that does not extend to the
+      ;; computed column.
+      ;;
+      ;; NOTE: The grammar annoyingly ignores cell leading whitespace
+      ;; but does include trailing whitespace so cells are bounded by
+      ;; the first graph character up to the last character just before
+      ;; the pipe symbol, including whitespace.
+      ;;
+      ;; The grammar also considers the trailing pipe symbol to be a
+      ;; part of its preceding cell so that's what we delete when we
+      ;; delete a column's cell; i.e., if there is a pipe before the
+      ;; first column, we delete it.
+      (let* ((adj 0) ; Adjust node position offsets by deleted text.
+             (rows (treesit-node-children table 'named))
+             (nrows (length rows)))
+        (save-excursion
+          (without-restriction
+            (dotimes (x nrows)
+              ;; If cell is nil, it is beyond the table-column and its
+              ;; row is ignored.
+              (when-let* ((row (nth x rows))
+                          (cols (treesit-node-children row 'named))
+                          (ncols (length cols))
+                          (cell (nth table-column cols))
+                          (cell-beg (treesit-node-start cell))
+                          (cell-end (treesit-node-end cell))
+                          ;; Adjust beg to trim the grammar
+                          ;; unaccounted-for leading whitespace.
+                          (beg (cond
+                                ;; If this is the sole column, delete from bol.
+                                ((eq ncols 1)
+                                 (goto-char (- cell-beg adj))
+                                 (pos-bol))
+                                ;; If this is the first column, delete
+                                ;; from the pipe, if there is one,
+                                ;; otherwise cell-beg.
+                                ((eq table-column 0)
+                                 (let ((p (- cell-beg adj)))
+                                   (goto-char p)
+                                   (goto-char (pos-bol))
+                                   (if (search-forward "|" p t)
+                                       (1- (point))
+                                     p)))
+                                ;; If this is the final column, delete from the prior pipe symbol.
+                                ((eq table-column (1- ncols))
+                                 (let ((p (- (treesit-node-end
+                                              (nth (1- table-column) cols)) adj)))
+                                   (goto-char p)
+                                   (if (search-forward "|" (- cell-beg adj) t)
+                                       (point)
+                                     p)))
+                                ;; Otherwise, start at the end of the
+                                ;; prior cell.
+                                (t
+                                 (- (treesit-node-end
+                                         (nth (1- table-column) cols))
+                                    adj))))
+                          ;; Adjust end to trim the trailing pipe symbol
+                          ;; considered by the grammar to be part of its
+                          ;; preceding cell.
+                          (end (cond
+                                ;; If this is the sole column, delete until eol.
+                                ((eq ncols 1)
+                                 (goto-char (- cell-beg adj))
+                                 (pos-eol))
+                                ;; If this is the final column, delete until eol.
+                                ((eq table-column (1- ncols))
+                                 (goto-char (- cell-end adj))
+                                 (pos-eol))
+                                ;; Otherwise, look forward from cell-end
+                                ;; (which includes the cell's trailing
+                                ;; whitespace) for a pipe symbol.
+                                (t
+                                 (goto-char (- cell-end adj))
+                                 (if (re-search-forward "|+?" (pos-eol) t)
+                                     (1- (point))
+                                   cell-end)))))
+                (delete-region beg end)
+                (setq adj (+ adj (- end beg)))))))))))
+
+(defun markdown-ts-table-move-column-left ()
+  "Move the table column at point to its left.
+Point can be in the table header or body.
+If point is not at a table, do nothing."
+  (interactive)
+  (markdown-ts-table-move-column 'left))
+
+(defun markdown-ts-table-move-column-right ()
+  "Move the table column at point to its right.
+Point can be in the table header or body.
+If point is not at a table, do nothing."
+  (interactive)
+  (markdown-ts-table-move-column 'right))
+
+(defun markdown-ts-table-move-column (&optional left)
+  "Move the table column at point right or left.
+If LEFT is non-nil and is not `right', or with a prefix argument,
+move the column to its left.
+Do nothing if a row being moved is not within the columns of the header.
+Do nothing if moving left and the current column is the first column of
+the current row.
+Do nothing if moving right and the current column is the final column of
+the current row.
+Point can be in the table header or body.
+If point is not at a table, do nothing."
+  (interactive)
+  (markdown-ts--barf-if-not-mode 'markdown-ts-table-move-column)
+  (setq left (cond ((eq left 'right) nil)
+                   (left left)
+                   (current-prefix-arg t)))
+  (when-let* ((at-table (markdown-ts-at-table-p nil t))
+              (pos (car at-table))
+              (table (cdr at-table))
+              (node (treesit-node-at pos 'markdown 'named))
+              (cell (markdown-ts--table-node-cell node))
+              (row (markdown-ts--table-node-row node))
+              (header-row (treesit-search-subtree
+                              table
+                              "\\`pipe_table_header\\'"))
+              (nheaders (length (treesit-node-children header-row 'named)))
+              (cols (treesit-node-children row 'named))
+              (ncols (length cols)))
+    (let ((table-column (markdown-ts--table-compute-node-column row cell)))
+      (unless table-column
+        (error "Could not compute the table column"))
+      (if (>= table-column nheaders)
+          (message "Ragged/uneven column cannot be moved")
+        ;; A B C D -> B A C D
+        ;; Move A left: do nothing
+        ;; Move D right: do nothing
+        ;; Move current column left:
+        ;;   source column = t - 1
+        ;; Move current column right:
+        ;;   clone t to t+1 if the final column, otherwise t+2
+        ;;   delete t
+        (cond ((and left (eq table-column 0))
+               (message "Leftmost column cannot be moved left")
+               nil)
+              ((and (not left) (eq table-column (1- ncols)))
+               (message "Rightmost column cannot be moved right")
+               nil)
+              (t
+               (let ((source-column (if left
+                                        (1- table-column)
+                                      table-column))
+                     (target-column (if left
+                                        table-column
+                                      (1+ table-column))))
+                 (save-excursion
+                   (markdown-ts-table--goto-column source-column)
+                   (markdown-ts-table-insert-column
+                    'right (list
+                            target-column)))
+                 (markdown-ts-table--goto-column source-column)
+                 (markdown-ts-table-delete-column)
+                 ;; Empty cells can confuse the grammar, so no-error here.
+                 (if left
+                     (markdown-ts-table--goto-column
+                      source-column 'no-error)
+                   (markdown-ts-table--goto-column
+                    target-column 'no-error)))))))))
+
+(defun markdown-ts-table-align-column-left ()
+  "Align the table column at point to the left.
+Do the work with `markdown-ts-table-align-column', which see for more
+details."
+  (interactive)
+  (markdown-ts-table-align-column 'left))
+
+(defun markdown-ts-table-align-column-center ()
+  "Align the table column at point to the center.
+Do the work with `markdown-ts-table-align-column', which see for more
+details."
+  (interactive)
+  (markdown-ts-table-align-column 'center))
+
+(defun markdown-ts-table-align-column-right ()
+  "Align the table column at point to the right.
+Do the work with `markdown-ts-table-align-column', which see for more
+details."
+  (interactive)
+  (markdown-ts-table-align-column 'right))
+
+(defun markdown-ts-table-align-column (&optional align)
+  "Alter the table column alignment at point.
+Alter the column point is in.
+
+Note: To compute the column, point must be within the column and cannot
+be on the leading or trailing whitespace or on a column delimiter.
+
+ALIGN can be one of the symbols `left', `center', `right' or nil for
+unspecified or the characters l, c, or r.
+
+If ALIGN is nil, assume unspecified.  Make the alignment string a
+minimum of 5 characters to accommodate Markdown conventions.
+
+If point is not at a table, do nothing."
+  (interactive "cAlign column [l]eft [c]enter [r]ight [u]nspecified:")
+  (markdown-ts--barf-if-not-mode 'markdown-ts-table-align-column)
+  (setq align (if (characterp align)
+                  (pcase align (?l 'left) (?c 'center) (?r 'right))
+                align))
+  (when-let* ((at-table (markdown-ts-at-table-p nil t))
+              (pos (car at-table))
+              (table (cdr at-table))
+              (node (treesit-node-at pos 'markdown 'named))
+              (cell (markdown-ts--table-node-cell node))
+              (row (markdown-ts--table-node-row cell))
+              (aligners (markdown-ts--table-aligners table)))
+    (let ((table-column (markdown-ts--table-compute-node-column row cell)))
+      (unless table-column
+        (error "Could not compute the table column"))
+      ;; NOTE: GFM tables allow non-uniform table rows.  The current row
+      ;; could have a differing number of columns from the header.  We
+      ;; silently do nothing if we can't find a matching header column.
+      (when-let* ((aligner (nth table-column aligners))
+                  (beg (plist-get aligner :beg))
+                  (end (plist-get aligner :end))
+                  (str (buffer-substring-no-properties beg end))
+                  (strlen (max 5 (length str))))
+        (delete-region beg end)
+        (save-excursion
+          (goto-char beg)
+          (insert (markdown-ts--table-make-aligner strlen align)))))))
+
+(defun markdown-ts-table-align-table (&optional align-cells)
+  "Align the Markdown table at point.
+Adjust each column's width to accommodate its widest constituent cell.
+If ALIGN-CELLS is non-nil, or with a prefix argument, apply the
+delimiter row's alignment to cell content.  ALIGN-CELLS is non-nil if
+the user option `markdown-ts-table-align-features' includes
+`justify-cells'.
+Anchor the columns to the delimiter row.  Ignore rows that contain
+columns beyond the delimiter row.
+If not in a table, do nothing."
+  (interactive "P")
+  (markdown-ts--barf-if-not-mode 'markdown-ts-table-align-table)
+  (when-let* ((at-table (markdown-ts-at-table-p nil t))
+              (table (cdr at-table))
+              (beg (treesit-node-start table))
+              (end (treesit-node-end table))
+              (_ (markdown-ts--table-tick-stale-p beg))
+              (rows (treesit-node-children table 'named))
+              (nrows (length rows))
+              (delimiter-row (treesit-search-subtree
+                         table
+                         "\\`pipe_table_delimiter_row\\'"))
+              (aligners (markdown-ts--table-aligners table))
+              (cols (treesit-node-children delimiter-row 'named))
+              (ncols (length cols))
+              (col-widths (make-hash-table :size ncols :test 'equal))
+              (cell-text (make-hash-table :size (* nrows ncols) :test 'equal)))
+    (setq align-cells (or align-cells
+                          current-prefix-arg
+                          (memq 'justify-cells markdown-ts-table-align-features)))
+    (without-restriction
+      ;; Collect cell text and compute max column widths.
+      ;; Do not use the delimiter row for width computation.
+      (dotimes (x nrows)
+        (let* ((row (nth x rows))
+               (cells (treesit-node-children row 'named)))
+          (dotimes (y ncols)
+            ;; Skip nil cells--the parser got confused.
+            (when-let* ((cell (nth y cells))
+                        (text (string-trim-right
+                               (treesit-node-text cell 'no-property)))
+                        (w (length text))
+                        (w0 (or (gethash y col-widths) 0)))
+              ;; Elide delimiter widths.
+              (unless (eq x 1)
+                (when (> w w0)
+                  (puthash y w col-widths)))
+              (puthash (cons x y) text cell-text)))))
+
+      (let ((source-buffer (current-buffer)))
+        (with-temp-buffer
+          (dotimes (x nrows)
+            (dotimes (y ncols)
+              (let* ((width (or (gethash y col-widths)
+                                markdown-ts-table-default-column-width))
+                     (align (or (plist-get (nth y aligners) :align)
+                                'unspecified))
+                     ;; Confused cells have nil text.
+                     (text (or (gethash (cons x y) cell-text) ""))
+                     (text0 (markdown-ts--table-align-cell
+                             text width
+                             (if align-cells
+                                 align
+                               'unspecified))))
+                (cond
+                 ;; Header row.
+                 ((eq x 0)
+                  (insert "|" text0))
+                 ;; Delimiter row.  Use unaligned text.
+                 ((eq x 1)
+                  (insert "|"
+                          (markdown-ts--table-make-aligner width align)))
+                 ;; Body row.
+                 (t
+                  (insert "|" text0)))))
+            (insert "|" "\n"))
+          (let ((temp-buffer (current-buffer)))
+            (with-current-buffer source-buffer
+              (replace-region-contents beg end temp-buffer))))))
+    (markdown-ts--table-tick-update beg)))
+
+(defun markdown-ts-table-transpose-table ()
+  "Transpose the rows and columns of the Markdown table at point.
+Use unspecified column alignment in the transposed table.
+If table's rows are not uniform with those on the delimiter row, signal
+an error.
+If not in a table, do nothing."
+  (interactive)
+  (markdown-ts--barf-if-not-mode 'markdown-ts-table-transpose-table)
+  (when-let* ((at-table (markdown-ts-at-table-p nil t))
+              (table (cdr at-table))
+              (beg (treesit-node-start table))
+              (end (treesit-node-end table))
+              (rows (treesit-node-children table 'named))
+              (nrows (length rows))
+              (delimiter-row (treesit-search-subtree
+                         table
+                         "\\`pipe_table_delimiter_row\\'"))
+              (aligners (markdown-ts--table-aligners table))
+              (cols (treesit-node-children delimiter-row 'named))
+              (ncols (length cols))
+              (cell-text (make-hash-table :size (* nrows ncols) :test 'equal)))
+    (without-restriction
+      ;; Collect cell text and invert coordinates.
+      (dotimes (x nrows)
+        (let* ((row (nth x rows))
+               (cells (treesit-node-children row 'named)))
+          (dotimes (y ncols)
+            ;; Skip nil cells--the parser got confused.
+            (when-let* ((cell (nth y cells))
+                        (text (string-trim-right
+                               (treesit-node-text cell 'no-property))))
+              (puthash (cons y x) text cell-text)))))
+
+      (let ((source-buffer (current-buffer)))
+        (with-temp-buffer
+          (dotimes (x ncols)
+            ;; Synthesize a delimiter row.
+            (when (eq x 1)
+              (dotimes (_y (1- nrows))
+                (insert "|"
+                        (markdown-ts--table-make-aligner
+                         (max 5 markdown-ts-table-default-column-width)
+                         'unspecified)))
+              (insert "|" "\n"))
+            (dotimes (y nrows)
+              ;; Skip the original delimiter row.
+              (unless (eq y 1)
+                ;; Confused cells have nil text.
+                (let ((text (or (gethash (cons x y) cell-text) "")))
+                  (insert "|" text))))
+            (insert "|" "\n"))
+          (let ((temp-buffer (current-buffer)))
+            (with-current-buffer source-buffer
+              (replace-region-contents beg end temp-buffer))))))
+    (when (or (eq markdown-ts-table-auto-align t)
+              (memq 'transpose markdown-ts-table-auto-align))
+      (markdown-ts-table-align-table))))
+
+(defun markdown-ts-table-convert-csv-region ( beg end
+                                              &optional
+                                              header-line replace)
+  "Convert the comma-separated region BEG to END to a Markdown table.
+If HEADER-LINE is non-nil, use the first line of the region as the table
+column header.  If nil, infer the number of columns and synthesize
+column names from the first line.
+
+Note: Body columns beyond the provided or inferred number of columns are
+dropped.
+
+If REPLACE is non-nil, overwrite the region BEG END with the Markdown
+table, otherwise insert the table after END.
+
+With a single prefix argument, HEADER-LINE is non-nil.
+With a double prefix argument, REPLACE is non-nil.
+With a triple prefix argument, both are non-nil."
+  (interactive "R")
+  (markdown-ts-table-convert-region beg end header-line replace 'csv))
+
+(defun markdown-ts-table-convert-tsv-region ( beg end
+                                              &optional
+                                              header-line replace)
+  "Convert the tab-separated region BEG to END to a Markdown table.
+If HEADER-LINE is non-nil, use the first line of the region as the table
+column header.  If nil, infer the number of columns and synthesize
+column names from the first line.
+
+Note: Body columns beyond the provided or inferred number of columns are
+dropped.
+
+If REPLACE is non-nil, overwrite the region BEG END with the Markdown
+table, otherwise insert the table after END.
+
+With a single prefix argument, HEADER-LINE is non-nil.
+With a double prefix argument, REPLACE is non-nil.
+With a triple prefix argument, both are non-nil."
+  (interactive "R")
+  (markdown-ts-table-convert-region beg end header-line replace 'tsv))
+
+(defun markdown-ts-table-convert-region ( beg end
+                                          &optional
+                                          header-line replace format)
+  "Convert the comma-separated region BEG to END to a Markdown table.
+If HEADER-LINE is non-nil, use the first line of the region as the table
+column header.  If nil, infer the number of columns and synthesize
+column names from the first line.
+
+Note: Body columns beyond the provided or inferred number of columns are
+dropped.
+
+If REPLACE is non-nil, overwrite the region BEG END with the Markdown
+table, otherwise insert the table after END.
+
+FORMAT is one of the symbols `csv' for comma-separated values, or `tsv'
+for tab-separated values.  If any other value, use `csv'.
+
+With a single prefix argument, HEADER-LINE is non-nil.
+With a double prefix argument, REPLACE is non-nil.
+With a triple prefix argument, both are non-nil."
+  (interactive "R")
+  (markdown-ts--barf-if-not-mode 'markdown-ts-table-convert-region)
+
+  (cond ((equal current-prefix-arg '(4))
+         (setq header-line t))
+        ((equal current-prefix-arg '(16))
+         (setq replace t))
+        ((equal current-prefix-arg '(64))
+         (setq header-line t
+               replace t)))
+  (let (rows)
+    (save-restriction
+      (narrow-to-region beg end)
+      (goto-char (point-min))
+      (while (< (point) (point-max))
+        (pcase format
+          ('tsv
+             (push
+              (split-string
+               (buffer-substring-no-properties (point) (pos-eol)) "\t")
+              rows))
+           (_
+            (let (row)
+              (while (re-search-forward
+                      "\"\\(?:[^\"]\\|\"\"\\)*\"\\|[^,]+\\|\"\""
+                      (pos-eol) t)
+                (push
+                 (replace-regexp-in-string
+                  "\"\"" "\""
+                  (replace-regexp-in-string
+                   "\\`\"\\(\.*\\)\"\\'"
+                   "\\1"
+                   (substring-no-properties (match-string 0))))
+                 row))
+              (push (nreverse row) rows))))
+        (forward-line 1))
+        (setq rows (nreverse rows))
+        (cond (replace (delete-region beg end))
+              (t (goto-char end)))
+        (if header-line
+            (markdown-ts-table-insert-table (1- (length rows))
+                                            (length (car rows))
+                                            (car rows)
+                                            (cdr rows))
+          (markdown-ts-table-insert-table (length rows)
+                                          (length (car rows))
+                                          nil
+                                          rows)))))
+
+(defun markdown-ts-table-export-table-csv (&optional display)
+  "Export the Markdown table at point to comma-separated in a buffer.
+If DISPLAY is non-nil, or with a prefix argument, display the export
+buffer after exporting.
+If point is not at a table, do nothing."
+  (interactive "P")
+  (markdown-ts-table-export-table display 'csv))
+
+(defun markdown-ts-table-export-table-tsv (&optional display)
+  "Export the Markdown table at point to tab-separated in a buffer.
+If DISPLAY is non-nil, or with a prefix argument, display the export
+buffer after exporting.
+If point is not at a table, do nothing."
+  (interactive "P")
+  (markdown-ts-table-export-table display 'tsv))
+
+(defun markdown-ts-table-export-table (&optional display format)
+  "Export the Markdown table at point to CSV in a buffer.
+If DISPLAY is non-nil, or with a prefix argument, display the export
+buffer after exporting.
+FORMAT is one of the symbols `csv' for comma-separated values aka CSV,
+or `tsv' for tab-separated values aka TSV.  If any other value, use
+`csv'.  If TSV, replace any tabs within a field with a space.
+Do not export the table's header delimiter row.
+If point is not at a table, do nothing."
+  (interactive "P")
+  (markdown-ts--barf-if-not-mode 'markdown-ts-table-export-table)
+  (when-let* ((at-table (markdown-ts-at-table-p nil t))
+              (table (cdr at-table))
+              (rows (treesit-node-children table 'named))
+              (header (treesit-search-subtree table "\\`pipe_table_header\\'"))
+              (delimiter-row (treesit-search-subtree
+                              table "\\`pipe_table_delimiter_row\\'"))
+              (export-buffer (get-buffer-create
+                              markdown-ts-table-export-buffer)))
+    (with-current-buffer export-buffer
+      (special-mode)
+      (let ((inhibit-read-only t))
+        (widen)
+        (erase-buffer)
+        (dolist (row rows)
+          (unless (equal row delimiter-row)
+            (let* ((elts (treesit-node-children row 'named))
+                   (len (length elts)))
+              (dotimes (x len)
+                (let ((s (string-trim (treesit-node-text (nth x elts)
+                                                         'no-property))))
+                  (pcase format
+                    ('tsv
+                     (insert (replace-regexp-in-string "\t" "\s" s))
+                     (when (< x (1- len))
+                       (insert "\t")))
+                    (_
+                     (insert
+                      (if (string-match "[\",]" s)
+                          (concat "\""
+                                  (mapconcat
+                                   'identity (split-string s "\"") "\"\"")
+                                  "\"")
+                        s))
+                     (when (< x (1- len))
+                       (insert ","))))))
+              (insert "\n"))))
+        (goto-char (point-min))))
+    (when display
+      (display-buffer export-buffer))))
+
+;;; Helpers:
+
+(defun markdown-ts--outline-invisible-p (pos)
+  "Return non-nil if POS is inside an outline-folded region."
+  (cl-some (lambda (ov) (eq (overlay-get ov 'invisible) 'outline))
+           (overlays-at pos)))
 
 (defun markdown-ts--range-settings ()
   "Return range settings for `markdown-ts-mode'."
-  (treesit-range-rules
-   :embed 'markdown-inline
-   :host 'markdown
-   :range-fn #'treesit-range-fn-exclude-children
-   '((inline) @markdown-inline)
+  (apply
+   #'treesit-range-rules
+   `(:embed markdown-inline
+     :host markdown
+     ((inline) @markdown-inline)
+     ,@(when markdown-ts-fontify-code-blocks-natively
+         '(:embed markdown-ts--code-block-ts-language
+           :host markdown
+           :local t
+           ((fenced_code_block (info_string (language) @language)
+                               (code_fence_content) @content)))))))
 
-   :embed #'markdown-ts--convert-code-block-language
-   :host 'markdown
-   :local t
-   '((fenced_code_block (info_string (language) @language)
-                        (code_fence_content) @content))))
+(defun markdown-ts--remove-image-overlays ()
+  "Remove all inline image overlays from the current buffer."
+  (dolist (ov (overlays-in (point-min) (point-max)))
+    (when (overlay-get ov 'markdown-ts-image)
+      (delete-overlay ov))))
+
+(defun markdown-ts--outline-view-change ()
+  "Update image overlays after outline fold/unfold.
+Removes image overlays in folded regions and triggers
+refontification so that images in unfolded regions are recreated."
+  (when markdown-ts-inline-images
+    (markdown-ts--remove-image-overlays)
+    (font-lock-flush)))
 
 (defun markdown-ts--set-hide-markup (value)
   "Set hiding of Markdown markup delimiters in the current buffer.
@@ -348,6 +4623,8 @@ VALUE non-nil hides markup, nil shows it."
   (if value
       (add-to-invisibility-spec 'markdown-ts--markup)
     (remove-from-invisibility-spec 'markdown-ts--markup))
+  (when markdown-ts-inline-images
+    (markdown-ts--remove-image-overlays))
   (font-lock-flush))
 
 (defun markdown-ts-toggle-hide-markup ()
@@ -356,122 +4633,726 @@ VALUE non-nil hides markup, nil shows it."
   (setq markdown-ts-hide-markup (not markdown-ts-hide-markup))
   (markdown-ts--set-hide-markup markdown-ts-hide-markup))
 
+(defun markdown-ts--set-inline-images (value)
+  "Set display of inline images in the current buffer.
+VALUE non-nil displays images, nil removes them."
+  (if value
+      (treesit-font-lock-recompute-features '(image-preview))
+    (treesit-font-lock-recompute-features nil '(image-preview)))
+  (markdown-ts--remove-image-overlays)
+  (font-lock-flush))
 
-;;; Major mode
+(defun markdown-ts-toggle-inline-images ()
+  "Toggle display of inline images in the current buffer."
+  (interactive)
+  (setq markdown-ts-inline-images (not markdown-ts-inline-images))
+  (markdown-ts--set-inline-images markdown-ts-inline-images)
+  (message "Inline images %s" (if markdown-ts-inline-images
+                                  "enabled" "disabled")))
 
-(defun markdown-ts-setup ()
-  "Setup treesit for `markdown-ts-mode'."
-  (make-local-variable 'markdown-ts-hide-markup)
+;;; Emphasis:
+
+(defvar markdown-ts-emphasis-alist
+  '((?b . "**")
+    (?B . "__")
+    (?i . "*")
+    (?I . "_")
+    (?s . "~~")
+    (?c . "`")
+    (?a . "***"))
+  "Alist of emphasis markers for `markdown-ts-emphasize'.
+Each entry is (KEY . MARKER) where KEY is a character (not a string) and
+MARKER is the Markdown emphasized text prefix/suffix.")
+
+(defun markdown-ts--emphasis-node-at-point ()
+  "Return the emphasis node at point, or nil.
+Finds the innermost `emphasis', `strong_emphasis',
+`strikethrough', or `code_span' node."
+  (when-let* ((node (treesit-node-at (point) 'markdown-inline)))
+    (treesit-parent-until
+     node (lambda (n)
+            (member (treesit-node-type n)
+                    '("emphasis" "strong_emphasis"
+                      "strikethrough" "code_span"))))))
+
+(defun markdown-ts-remove-emphasis ()
+  "Remove emphasis around point or region.
+With an active region, strip the outermost emphasis markers from
+the selected text.  Without a region, find the emphasis node at
+point using tree-sitter and remove its markers."
+  (interactive)
+  (if (use-region-p)
+      (let* ((beg (region-beginning))
+             (end (region-end))
+             (text (buffer-substring beg end))
+             (stripped nil))
+        (cl-loop for (_key . m) in (sort (copy-sequence
+                                          markdown-ts-emphasis-alist)
+                                         (lambda (a b)
+                                           (> (length (cdr a))
+                                              (length (cdr b)))))
+                 for re = (concat "\\`" (regexp-quote m)
+                                  "\\(\\(?:.\\|\n\\)*\\)"
+                                  (regexp-quote m) "\\'")
+                 when (string-match re text)
+                 do (setq stripped (match-string 1 text))
+                 and return nil)
+        (when stripped
+          (delete-region beg end)
+          (insert stripped)))
+    ;; Find the outermost emphasis node at point.
+    (when-let* ((inner (markdown-ts--emphasis-node-at-point))
+                (node (let ((n inner))
+                        (while (let ((parent (treesit-node-parent n)))
+                                 (when (and parent
+                                            (member (treesit-node-type parent)
+                                                    '("emphasis"
+                                                      "strong_emphasis"
+                                                      "strikethrough"
+                                                      "code_span")))
+                                   (setq n parent))))
+                        n))
+                (start (treesit-node-start node))
+                (end (treesit-node-end node))
+                (text (treesit-node-text node t))
+                (type (treesit-node-type node))
+                (mlen (pcase type
+                        ("strong_emphasis"
+                         (if (string-prefix-p "_" text) 2 2))
+                        ("emphasis"
+                         (if (string-prefix-p "_" text) 1 1))
+                        ("strikethrough" 2)
+                        ("code_span" 1)))
+                (inner-text (substring text mlen (- (length text) mlen))))
+      (let ((offset (- (point) start mlen)))
+        (delete-region start end)
+        (goto-char start)
+        (insert inner-text)
+        (goto-char (+ start (max 0 offset)))))))
+
+(defun markdown-ts-emphasize (&optional char)
+  "Insert or change emphasis on text.
+If there is an active region, wrap it with emphasis markers.
+If there is no region, insert marker pairs and place point between
+them.  CHAR selects the emphasis type:
+
+  b   **bold**       B  __bold__
+  i   *italic*       I  _italic_
+  a   ***bold+italic***
+  s   ~~strikethrough~~
+  c   `code`
+  SPC remove emphasis at point or region"
+  (interactive
+   "cEmphasis [b]old [B]old_ [i]talic [I]talic_ [a]ll [s]trike [c]ode SPC remove:")
+  (if (eq char ?\s)
+      (markdown-ts-remove-emphasis)
+    (if-let* ((marker (cdr (assq char markdown-ts-emphasis-alist))))
+        (if (use-region-p)
+            (let ((beg (region-beginning))
+                  (end (copy-marker (region-end))))
+              (save-excursion
+                (goto-char end)
+                (insert marker)
+                (goto-char beg)
+                (insert marker)))
+          (if-let* ((bounds (bounds-of-thing-at-point 'word)))
+              (save-excursion
+                (goto-char (cdr bounds))
+                (insert marker)
+                (goto-char (car bounds))
+                (insert marker))
+            (insert marker marker)
+            (backward-char (length marker))))
+      (user-error "No such emphasis marker: %c" char))))
+
+;;; Block structure:
+
+(defun markdown-ts-insert-structure (&optional char)
+  "Insert a block structure.
+If there is an active region, wrap it.  Otherwise, insert an empty
+block and place point inside.  CHAR selects the structure type:
+
+  `  fenced code block (```)
+  ~  tilde fenced code block (~~~)
+  q  block quote (> )
+  d  horizontal divider/rule (---)
+  t  table"
+  (interactive
+   "cStructure [`]back-tick code block [~]tilde code block [q]uote [d]ivider [t]able:")
+  (pcase char
+    (?` (markdown-ts--insert-code-block ?`))
+    (?~ (markdown-ts--insert-code-block ?~))
+    (?q (markdown-ts--insert-block-quote))
+    (?d (markdown-ts--insert-divider))
+    (?t (markdown-ts-table-insert-table))
+    (_ (user-error "No such structure: %c" char))))
+
+(defun markdown-ts--insert-code-block (char &optional language)
+  "Insert a fenced code block using a CHAR sequence.
+CHAR should be one of a backtick or a tilde.
+LANGUAGE is a whitespace free language string."
+  (setq language
+        (or language
+            (replace-regexp-in-string
+             "[[:blank:]]" ""
+             (let ((completion-ignore-case nil)
+                   (candidates
+                    (seq-map
+                     #'symbol-name
+                     (seq-uniq
+                      (append (mapcar #'car markdown-ts--code-block-languages)
+                              (mapcar #'car markdown-ts--code-block-non-ts-modes)
+                              (mapcar #'car markdown-ts-code-block-modes))))))
+               (completing-read
+                "Code block language: "
+                candidates
+                nil
+                'confirm ; Prompt if the language is not on our list.
+                nil
+                'markdown-ts-language-history)))))
+  (let ((fence-string (make-string 3 char)))
+    (if (use-region-p)
+        (let ((beg (region-beginning))
+              (end (region-end)))
+          (save-excursion
+            (goto-char end)
+            (unless (bolp) (insert "\n"))
+            (insert fence-string "\n")
+            (goto-char beg)
+            (insert fence-string language "\n")))
+      (insert fence-string language "\n\n" fence-string)
+      (forward-line -1))))
+
+(defun markdown-ts--insert-block-quote ()
+  "Insert a block quote."
+  (if (use-region-p)
+      (let ((beg (region-beginning))
+            (end (copy-marker (region-end))))
+        (save-excursion
+          (goto-char beg)
+          (while (< (point) end)
+            (insert "> ")
+            (forward-line 1))))
+    (insert "> ")))
+
+(defun markdown-ts--insert-divider ()
+  "Insert a horizontal rule."
+  (unless (bolp) (insert "\n"))
+  (insert "\n---\n\n"))
+
+(defun markdown-ts--apply-ellipsis ()
+  "Apply `markdown-ts-ellipsis' to the current buffer's display table."
+  (if (and (stringp markdown-ts-ellipsis)
+           (not (string-empty-p markdown-ts-ellipsis)))
+      (let ((table (or buffer-display-table
+                       (make-display-table))))
+        (set-display-table-slot
+         table 4
+         (vconcat (mapcar (lambda (c) (make-glyph-code c 'shadow))
+                          markdown-ts-ellipsis)))
+        (setq buffer-display-table table))
+    (when buffer-display-table
+      (set-display-table-slot buffer-display-table 4 nil))))
+
+;;; Major mode:
+
+(defun markdown-ts-outline-cycle ()
+  "Cycle visibility of the heading at point.
+On a heading, call `outline-cycle'.  Otherwise do nothing."
+  (interactive)
+  (when (outline-on-heading-p)
+    (outline-cycle)))
+
+(defvar-keymap markdown-ts-mode-map
+  :doc "Keymap for `markdown-ts-mode'."
+  "M-<left>"    #'markdown-ts-promote
+  "M-<right>"   #'markdown-ts-demote
+  "M-<up>"      #'markdown-ts-move-subtree-up
+  "M-<down>"    #'markdown-ts-move-subtree-down
+  "C-c C-n"     #'outline-next-heading
+  "C-c C-p"     #'outline-previous-heading
+  "C-c C-u"     #'outline-up-heading
+  "C-c C-f"     #'outline-forward-same-level
+  "C-c C-b"     #'outline-backward-same-level
+  "C-c C-x C-f" #'markdown-ts-emphasize
+  "C-c C-x C-m" #'markdown-ts-toggle-hide-markup
+  "C-c C-x C-v" #'markdown-ts-toggle-inline-images
+  "C-c C-c"     #'markdown-ts-toggle-checkbox
+  "C-c C-r"     #'markdown-ts-renumber-list
+  "C-c C-,"     #'markdown-ts-insert-structure
+  "C-c C-v n"   #'markdown-ts-move-to-next-code-block
+  "C-c C-v p"   #'markdown-ts-move-to-previous-code-block
+  "RET"         #'markdown-ts-newline
+  "M-RET"       #'markdown-ts-insert-list-item
+  "TAB"         #'markdown-ts-outline-cycle)
+
+(defvar-keymap markdown-ts-code-block-in-context-mode-map
+  :doc "Keymap for `markdown-ts-code-block-in-context-mode'.
+These override keys in `markdown-ts-mode-map' to support executing their
+commands in a code-block context."
+  :parent markdown-ts-mode-map
+  :menu nil
+  "M-."         #'markdown-ts--code-block-xref-find-definitions
+  "TAB"         #'indent-for-tab-command
+  "RET"         #'markdown-ts--code-block-newline
+  "C-j"         #'markdown-ts--code-block-newline
+  "M-RET"       #'markdown-ts--code-block-newline
+  "M-q"         #'markdown-ts--code-block-fill-paragraph)
+
+(defvar-keymap markdown-ts-in-table-mode-map
+  :doc "Keymap for `markdown-ts-in-table-mode'.
+These override keys in `markdown-ts-mode-map' to support executing their
+commands in a table context."
+  :parent markdown-ts-mode-map
+  :menu nil
+  "<return>"    #'markdown-ts-table-next-row
+  "S-<return>"  #'markdown-ts-table-previous-row
+  "<tab>"       #'markdown-ts-table-next-cell
+  "<backtab>"   #'markdown-ts-table-previous-cell
+  "M-<up>"      #'markdown-ts-table-move-row-up
+  "M-<down>"    #'markdown-ts-table-move-row-down
+  "M-<left>"    #'markdown-ts-table-move-column-left
+  "M-<right>"   #'markdown-ts-table-move-column-right
+  "M-S-<up>"    #'markdown-ts-table-insert-row-above
+  "M-S-<down>"  #'markdown-ts-table-delete-row
+  "M-S-<right>" #'markdown-ts-table-insert-column-left
+  "M-S-<left>"  #'markdown-ts-table-delete-column
+  "C-c C-t a"   #'markdown-ts-table-align-column
+  "C-c C-c"     #'markdown-ts-table-align-table
+  "C-c C-t t"   #'markdown-ts-table-transpose-table)
+
+(easy-menu-define markdown-ts-mode-menu markdown-ts-mode-map
+  "`markdown-ts-mode' menu."
+  '("Markdown" :visible markdown-ts-menu-bar-show
+    "--"
+    ["Cycle Outline Visibility"  markdown-ts-outline-cycle              :help "Cycle heading visibility from point"]
+    ["Toggle Hide Markup"        markdown-ts-toggle-hide-markup         :help "Toggle display of markup characters" :style toggle :selected markdown-ts-hide-markup]
+    ["Toggle Inline Images"      markdown-ts-toggle-inline-images       :help "Toggle display of inline images below links" :style toggle :selected markdown-ts-inline-images]
+    "--"
+    ["Up"                        outline-up-heading                     :help "Move to the parent heading"]
+    ["Next"                      outline-next-heading                   :help "Move to the next heading"]
+    ["Previous"                  outline-previous-heading               :help "Move to the previous heading"]
+    ["Next Same Level"           outline-forward-same-level             :help "Move to the next heading at the same level"]
+    ["Previous Same Level"       outline-backward-same-level            :help "Move to the previous heading at the same level"]
+    "--"
+    ["Jump"                      imenu                                  :help "Jump to a heading via completion"]
+    "--"
+    ["Move Subtree Up"           markdown-ts-move-subtree-up            :help "Move the current section or list item up"]
+    ["Move Subtree Down"         markdown-ts-move-subtree-down          :help "Move the current section or list item down"]
+    ["Promote"                   markdown-ts-promote                    :help "Promote heading or list item"]
+    ["Demote"                    markdown-ts-demote                     :help "Demote heading or list item"]
+    "--"
+    ["Emphasis..."               markdown-ts-emphasize                  :help "Add or change emphasis on region"]
+    ["Add Block Structure"       markdown-ts-insert-structure           :help "Insert a code block, quote, or other structure"]
+    "--"
+    ["Toggle Checkbox"           markdown-ts-toggle-checkbox            :help "Toggle task list checkbox at point"]
+    ["New List Item"             markdown-ts-insert-list-item           :help "Insert a new list item after the current one"]
+    ["Renumber List"             markdown-ts-renumber-list              :help "Renumber the ordered list at point"]
+    "--"
+    ("Table"
+     ["Insert table"             markdown-ts-table-insert-table         :help "Insert an empty table at point"]
+     ["Delete table"             markdown-ts-table-delete-table         :help "Delete the table at point"]
+     "--"
+     ["Next cell"                markdown-ts-table-next-cell            :help "Move point to the next cell"]
+     ["Previous cell"            markdown-ts-table-previous-cell        :help "Move point to the previous cell"]
+     "--"
+     ["Next row"                 markdown-ts-table-next-row             :help "Move point to the next row"]
+     ["Previous row"             markdown-ts-table-previous-row         :help "Move point to the previous row"]
+     ["Insert row below"         markdown-ts-table-insert-row-below     :help "Insert an empty row below point"]
+     ["Insert row above"         markdown-ts-table-insert-row-above     :help "Insert an empty row above point"]
+     ["Clone row below"          markdown-ts-table-clone-row-below      :help "Clone the current row below it"]
+     ["Clone row above"          markdown-ts-table-clone-row-above      :help "Clone the current row above it"]
+     ["Move row up"              markdown-ts-table-move-row-up          :help "Move the row at point up"]
+     ["Move row down"            markdown-ts-table-move-row-down        :help "Move the row at point down"]
+     ["Delete row"               markdown-ts-table-delete-row           :help "Delete the row at point"]
+     "--"
+     ["Insert column left"       markdown-ts-table-insert-column-left   :help "Insert an empty column to the left of point"]
+     ["Insert column right"      markdown-ts-table-insert-column-right  :help "Insert an empty column to the right of point"]
+     ["Clone column left"        markdown-ts-table-clone-column-left    :help "Insert an empty column to the left of point"]
+     ["Clone column right"       markdown-ts-table-clone-column-right   :help "Insert an empty column to the right of point"]
+     ["Move column left"         markdown-ts-table-move-column-left     :help "Move the current column to its left"]
+     ["Move column right"        markdown-ts-table-move-column-right    :help "Move the current column to its right"]
+     ["Align column..."          markdown-ts-table-align-column         :help "Align column at point to the left, center, or right"]
+     ["Delete column"            markdown-ts-table-delete-column        :help "Delete the column at point"]
+     "--"
+     ["Align table columns"      markdown-ts-table-align-table          :help "Align the table at point in an easy-to-edit format"]
+     ["Transpose table"          markdown-ts-table-transpose-table      :help "Transpose the table at point swapping its rows and columns"]
+     "--"
+     ["Convert CSV to table"     markdown-ts-table-convert-csv-region   :help "Convert a range of comma-separated values to a new table at point"]
+     ["Convert TSV to table"     markdown-ts-table-convert-tsv-region   :help "Convert a range of tab-separated values to a new table at point"]
+     ["Export table to CSV"      markdown-ts-table-export-table-csv     :help "Export the table at point to a comma-separated values buffer"]
+     ["Export table to TSV"      markdown-ts-table-export-table-tsv     :help "Export the table at point to a tab-separated values buffer"])))
+
+(defun markdown-ts--set-up ()
+  "Set up the buffer for `markdown-ts-mode'.
+If `markdown-ts--set-up-inline' is non-nil, use a lightweight set up for
+embedded inline `markdown-ts-mode' buffers.
+
+NOTE: Call this function only when the treesit `markdown' and
+`markdown-inline' parsers are available."
+
+  ;; Set these up for both master and inline for code-block buffers.
+  (setq-local comment-start "<!-- "
+              comment-end " -->"
+              comment-start-skip "<!--[ \t]*"
+              comment-end-skip "[ \t]*-->"
+              comment-use-syntax nil)
+
+  (setq-local fill-paragraph-function
+              #'markdown-ts--fill-paragraph
+              fill-forward-paragraph-function
+              #'markdown-ts--fill-forward-paragraph)
+
+  ;; `adaptive-fill-function' takes precedence over
+  ;; `adaptive-fill-regexp'; the default regexp is fine as a
+  ;; fallback for plain (non-list) paragraphs.
+  (setq-local adaptive-fill-function #'markdown-ts--adaptive-fill)
+
+  ;; Create and configure the parsers.
+  (treesit-parser-create 'markdown-inline)
+  (setq treesit-primary-parser
+        (treesit-parser-create 'markdown))
+
+  (setq-local font-lock-defaults nil)
   (setq-local treesit-font-lock-settings markdown-ts--treesit-settings)
-  (setq-local treesit-range-settings (markdown-ts--range-settings))
-  (add-to-list 'font-lock-extra-managed-props 'invisible)
+  (setq-local treesit-font-lock-feature-list '((delimiter heading)
+                                               (paragraph)
+                                               (paragraph-inline)
+                                               (image-preview error)))
 
-  (when (treesit-ready-p 'html t)
-    (treesit-parser-create 'html)
-    (require 'html-ts-mode)
-    (defvar html-ts-mode--font-lock-settings)
-    (defvar html-ts-mode--treesit-font-lock-feature-list)
-    (setq-local treesit-font-lock-settings
-                (append treesit-font-lock-settings
-                        html-ts-mode--font-lock-settings))
-    (setq-local treesit-font-lock-feature-list
-                (treesit-merge-font-lock-feature-list
-                 treesit-font-lock-feature-list
-                 html-ts-mode--treesit-font-lock-feature-list))
-    (setq-local treesit-range-settings
-                (append treesit-range-settings
-                        (treesit-range-rules
-                         :embed 'html
-                         :host 'markdown
-                         :local t
-                         '((html_block) @html)
+  (cond (markdown-ts--set-up-inline
+          (setq-local treesit-range-settings
+                      (treesit-range-rules
+                       :embed 'markdown-inline
+                       :host 'markdown
+                       '((inline) @markdown-inline))))
+        (t
+         ;; Range settings differ in the master buffer vs. inline above.
+         (setq-local treesit-range-settings (markdown-ts--range-settings))
 
-                         :embed 'html
-                         :host 'markdown-inline
-                         '((html_tag) @html)))))
+         ;; Configure features needed only in the master buffer.
 
-  (when (treesit-ready-p 'yaml t)
-    (require 'yaml-ts-mode)
-    (defvar yaml-ts-mode--font-lock-settings)
-    (defvar yaml-ts-mode--font-lock-feature-list)
-    (setq-local treesit-font-lock-settings
-                (append treesit-font-lock-settings
-                        yaml-ts-mode--font-lock-settings))
-    (setq-local treesit-font-lock-feature-list
-                (treesit-merge-font-lock-feature-list
-                 treesit-font-lock-feature-list
-                 yaml-ts-mode--font-lock-feature-list))
-    (setq-local treesit-range-settings
-                (append treesit-range-settings
-                        (treesit-range-rules
-                         :embed 'yaml
-                         :host 'markdown
-                         :local t
-                         '((minus_metadata) @yaml)))))
+         ;; Imenu support.
+         (setq-local treesit-simple-imenu-settings
+                     `(("Headings" ,#'markdown-ts--imenu-heading-node-p
+                        nil ,#'markdown-ts--imenu-heading-name-function)
+                       ("Code Blocks" ,#'markdown-ts--imenu-code-block-node-p
+                        nil ,#'markdown-ts--imenu-code-block-name-function)))
 
-  (when (treesit-ready-p 'toml t)
-    (require 'toml-ts-mode)
-    (defvar toml-ts-mode--font-lock-settings)
-    (defvar toml-ts-mode--font-lock-feature-list)
-    (setq treesit-font-lock-settings
-          (append treesit-font-lock-settings
-                  toml-ts-mode--font-lock-settings))
-    (setq-local treesit-font-lock-feature-list
-                (treesit-merge-font-lock-feature-list
-                 treesit-font-lock-feature-list
-                 toml-ts-mode--font-lock-feature-list))
-    (setq-local treesit-range-settings
-                (append treesit-range-settings
-                        (treesit-range-rules
-                         :embed 'toml
-                         :host 'markdown
-                         :local t
-                         '((plus_metadata) @toml)))))
+         ;; Outline support.
+         (setq-local treesit-outline-predicate #'markdown-ts--outline-predicate)
+         (setq-local outline-minor-mode-cycle t)
+         (outline-minor-mode 1)
+         (markdown-ts--apply-ellipsis)
+
+         ;; NOTE: `outline-view-change-hook' was obsoleted in 29.1 (commit
+         ;; 53b1e6f96cb) on the grounds that only lazy-lock used it, but no
+         ;; replacement was provided and outline.el itself still runs the hook
+         ;; in 10+ places.
+         (with-suppressed-warnings ((obsolete outline-view-change-hook))
+           (add-hook 'outline-view-change-hook
+                     #'markdown-ts--outline-view-change nil t))
+
+         (progn
+           (make-local-variable 'markdown-ts-hide-markup)
+           (make-local-variable 'font-lock-extra-managed-props)
+           (dolist (prop '(invisible display button category action help-echo))
+             (add-to-list 'font-lock-extra-managed-props prop)))
+
+         (when (treesit-ready-p 'html t)
+           (treesit-parser-create 'html)
+           (require 'html-ts-mode)
+           (defvar html-ts-mode--font-lock-settings)
+           (defvar html-ts-mode--treesit-font-lock-feature-list)
+           (setq-local treesit-font-lock-settings
+                       (append treesit-font-lock-settings
+                               html-ts-mode--font-lock-settings))
+           (setq-local treesit-font-lock-feature-list
+                       (treesit-merge-font-lock-feature-list
+                        treesit-font-lock-feature-list
+                        html-ts-mode--treesit-font-lock-feature-list))
+           (setq-local treesit-range-settings
+                       (append treesit-range-settings
+                               (treesit-range-rules
+                                :embed 'html
+                                :host 'markdown
+                                :local t
+                                '((html_block) @html)
+
+                                :embed 'html
+                                :host 'markdown-inline
+                                '((html_tag) @html)))))
+
+         (when (treesit-ready-p 'yaml t)
+           (require 'yaml-ts-mode)
+           (defvar yaml-ts-mode--font-lock-settings)
+           (defvar yaml-ts-mode--font-lock-feature-list)
+           (setq-local treesit-font-lock-settings
+                       (append treesit-font-lock-settings
+                               yaml-ts-mode--font-lock-settings))
+           (setq-local treesit-font-lock-feature-list
+                       (treesit-merge-font-lock-feature-list
+                        treesit-font-lock-feature-list
+                        yaml-ts-mode--font-lock-feature-list))
+           (setq-local treesit-range-settings
+                       (append treesit-range-settings
+                               (treesit-range-rules
+                                :embed 'yaml
+                                :host 'markdown
+                                :local t
+                                '((minus_metadata) @yaml)))))
+
+         (when (treesit-ready-p 'toml t)
+           (require 'toml-ts-mode)
+           (defvar toml-ts-mode--font-lock-settings)
+           (defvar toml-ts-mode--font-lock-feature-list)
+           (setq treesit-font-lock-settings
+                 (append treesit-font-lock-settings
+                         toml-ts-mode--font-lock-settings))
+           (setq-local treesit-font-lock-feature-list
+                       (treesit-merge-font-lock-feature-list
+                        treesit-font-lock-feature-list
+                        toml-ts-mode--font-lock-feature-list))
+           (setq-local treesit-range-settings
+                       (append treesit-range-settings
+                               (treesit-range-rules
+                                :embed 'toml
+                                :host 'markdown
+                                :local t
+                                '((plus_metadata) @toml)))))
+
+         ;; Support for executing commands in a code-block context.
+         (when markdown-ts-enable-code-block-context-mode
+           (markdown-ts-code-block-context-mode))
+
+         ;; Support for table mode.
+         (when markdown-ts-enable-table-mode
+           (markdown-ts-table-mode))))
 
   (treesit-major-mode-setup)
-  (markdown-ts--set-hide-markup markdown-ts-hide-markup))
+
+  ;; Do not enable `jit-lock-mode' in indirect buffers such as the one
+  ;; we use for code block commands.
+  (unless (buffer-base-buffer)
+    (jit-lock-register #'markdown-ts--fontify-bare-uri))
+
+  (unless markdown-ts--set-up-inline
+    ;; Order matters: `markdown-ts--set-hide-markup' calls `font-lock-flush'
+    ;; (only meaningful once `treesit-major-mode-setup' has wired up
+    ;; font-lock), and `markdown-ts-default-folding' calls outline
+    ;; commands that rely on `outline-search-function', which
+    ;; `treesit-major-mode-setup' installs from `treesit-outline-predicate'.
+    (markdown-ts--set-hide-markup markdown-ts-hide-markup)
+    ;; Respect the user's default outline folding.
+    (pcase markdown-ts-default-folding
+      ('show-all (ignore))
+      ('fold-all (outline-hide-sublevels 1))
+      ('fold-headings (outline-show-all)
+                      (outline-hide-region-body (point-min) (point-max))))))
+
+(defun markdown-ts-mode-install-parsers (arg)
+  "Install `markdown-ts-mode' tree-sitter language parsers.
+If needed, install the required parsers for `markdown' and `markdown-inline'.
+With a prefix argument, ARG, if needed, install parsers for `html',
+`yaml', and `toml'."
+  (interactive "P")
+  (unless (treesit-language-available-p 'markdown)
+    (treesit-install-language-grammar 'markdown))
+  (unless (treesit-language-available-p 'markdown-inline)
+    (treesit-install-language-grammar 'markdown-inline))
+  (when arg
+    (unless (treesit-language-available-p 'html)
+      (require 'html-ts-mode)
+      (treesit-install-language-grammar 'html))
+    (unless (treesit-language-available-p 'yaml)
+      (require 'yaml-ts-mode)
+      (treesit-install-language-grammar 'yaml))
+    (unless (treesit-language-available-p 'toml)
+      (require 'toml-ts-mode)
+      (treesit-install-language-grammar 'toml))))
 
 ;;;###autoload
 (define-derived-mode markdown-ts-mode text-mode "Markdown"
-  "Major mode for editing Markdown using tree-sitter grammar."
-
-  (setq-local comment-start "<!-- ")
-  (setq-local comment-end " -->")
-
-  (setq-local font-lock-defaults nil
-	      treesit-font-lock-feature-list '((delimiter heading)
-					       (paragraph)
-					       (paragraph-inline)))
-
-  (setq-local treesit-simple-imenu-settings
-              `(("Headings" ,#'markdown-ts-imenu-node-p
-                 nil ,#'markdown-ts-imenu-name-function)))
-  (setq-local treesit-outline-predicate #'markdown-ts-outline-predicate)
-
-  (when (and (treesit-ensure-installed 'markdown)
-             (treesit-ensure-installed 'markdown-inline))
-    (treesit-parser-create 'markdown-inline)
-    (treesit-parser-create 'markdown)
-    (markdown-ts-setup)))
+  "Major mode for editing Markdown using tree-sitter grammar.
+NOTE: See `markdown-ts--set-up-inline'."
+  (treesit-ensure-installed 'markdown)
+  (treesit-ensure-installed 'markdown-inline)
+  ;; Bypass `treesit-max-buffer-size' so the mode activates in large
+  ;; buffers instead of refusing.  `treesit-ready-p' would otherwise
+  ;; refuse and emit a misleading "parsers not found" message even when
+  ;; they are installed.  Revisit if `treesit-parser-create' gains its
+  ;; own buffer-size guard (see bug#80909).
+  (let ((treesit-max-buffer-size most-positive-fixnum))
+    (if (treesit-ready-p '(markdown markdown-inline) t)
+        (markdown-ts--set-up)
+      (warn "markdown-ts-mode cannot be set up; using fundamental-mode.
+The tree-sitter parsers `markdown' and `markdown-inline' were not found.
+Use the command `markdown-ts-mode-install-parsers' to install them.
+With a prefix argument, it can also install optional parsers.")
+      (fundamental-mode))))
 
 (derived-mode-add-parents 'markdown-ts-mode '(markdown-mode))
 
-;;;###autoload
-(defun markdown-ts-mode-maybe ()
-  "Enable `markdown-ts-mode' when its grammar is available.
-Also propose to install the grammar when `treesit-enabled-modes'
-is t or contains the mode name."
-  (declare-function treesit-language-available-p "treesit.c")
-  (if (or (treesit-language-available-p 'markdown)
-          (eq treesit-enabled-modes t)
-          (memq 'markdown-ts-mode treesit-enabled-modes))
-      (markdown-ts-mode)
-    (fundamental-mode)))
+(defun markdown-ts--barf-if-not-mode (&optional context)
+  "Signal an error if the current buffer is not a `markdown-ts-mode' buffer.
+Prefix the error message with CONTEXT."
+  (unless (derived-mode-p 'markdown-ts-mode)
+    (user-error "%sis valid only in `markdown-ts-mode' buffers"
+                (if context (format "%s: " context) ""))))
+
+(define-minor-mode markdown-ts-code-block-in-context-mode
+  "Minor mode enabled if point is within a fenced code block.
+This enables the keymap `markdown-ts-code-block-in-context-mode-map'."
+  :group 'markdown-ts
+  :lighter markdown-ts-code-block-in-context-mode-lighter
+  :interactive nil
+  (markdown-ts--code-block-in-context-mode-update-ov))
+
+(defvar-local markdown-ts--code-block-in-context-mode-ov nil)
+
+(defun markdown-ts--code-block-in-context-mode-update-ov ()
+  "Manage `markdown-ts--code-block-in-context-mode-ov'."
+  (cond (markdown-ts-code-block-in-context-mode
+         (let ((beg (get-char-property (point) 'markdown-ts-code-beg-marker))
+               (end (get-char-property (point) 'markdown-ts-code-end-marker)))
+           (if markdown-ts--code-block-in-context-mode-ov
+               (move-overlay markdown-ts--code-block-in-context-mode-ov beg end)
+             (setq markdown-ts--code-block-in-context-mode-ov
+                   (make-overlay beg end nil t nil)))
+           (overlay-put markdown-ts--code-block-in-context-mode-ov
+                        'markdown-ts-in-code-block t)
+           (overlay-put markdown-ts--code-block-in-context-mode-ov
+                        'evaporate t)
+           (overlay-put markdown-ts--code-block-in-context-mode-ov
+                        'priority '(nil . 20))
+           (overlay-put markdown-ts--code-block-in-context-mode-ov
+                        'face 'markdown-ts-in-code-block)))
+        (t
+         (when markdown-ts--code-block-in-context-mode-ov
+           (delete-overlay markdown-ts--code-block-in-context-mode-ov)))))
+
+(define-minor-mode markdown-ts-code-block-context-mode
+  "Minor mode to enable commands in fenced code block context.
+If non-nil and `point' is in a fenced code block, run `indent-for-tab-command',
+`newline', et.al., in the mode of the code block."
+  :group 'markdown-ts
+  :interactive nil
+  (markdown-ts--barf-if-not-mode 'markdown-ts-code-block-context-mode)
+  (cond (markdown-ts-code-block-context-mode
+         ;; Enable the minor mode `markdown-ts-code-block-in-context-mode' and
+         ;; its keymap when point is within a code block.
+         (add-hook 'post-command-hook
+                   #'markdown-ts--enable-code-block-in-context-mode nil 'local)
+         ;; If `save-place-mode' or similar is used, point could start within
+         ;; a code block so initialize from that state.
+         (run-with-timer 0.01 nil
+                         #'markdown-ts--enable-code-block-in-context-mode)
+         ;; For each eligible command, execute it in a code-block context,
+         ;; otherwise in the `markdown-ts-mode' buffer's context.
+         (add-hook 'pre-command-hook
+                   #'markdown-ts--maybe-run-command-in-code-block nil 'local)
+         ;; Prune stale code block overlays when the host parse tree
+         ;; changes (e.g., when fenced code block delimiters are
+         ;; deleted but the overlay from a prior fontification remains).
+         (treesit-parser-add-notifier
+          treesit-primary-parser
+          #'markdown-ts--host-ranges-notifier))
+        (t
+         (remove-hook 'post-command-hook
+                      #'markdown-ts--enable-code-block-in-context-mode 'local)
+         (remove-hook 'pre-command-hook
+                      #'markdown-ts--maybe-run-command-in-code-block 'local)
+         (treesit-parser-remove-notifier
+          treesit-primary-parser
+          #'markdown-ts--host-ranges-notifier))))
+
+(define-minor-mode markdown-ts-in-table-mode
+  "Minor mode enabled if point is within a table.
+This enables the keymap `markdown-ts-in-table-mode-map'."
+  :group 'markdown-ts
+  :lighter markdown-ts-in-table-mode-lighter
+  :interactive nil
+  (markdown-ts--in-table-mode-update-ov))
+
+(defvar-local markdown-ts--in-table-mode-ov nil)
+
+(defun markdown-ts--in-table-mode-get-ov (pos)
+  "Return the `markdown-ts-in-table-mode' overlay at POS."
+  (seq-find (lambda (ov)
+              (when (overlay-get ov 'markdown-ts-in-table)
+                ov))
+            (overlays-at pos)))
+
+(defun markdown-ts--table-tick-update (pos)
+  "Update the `markdown-ts-in-table-mode' overlay tick at POS.
+If the overlay is not found, do nothing."
+  (when-let* ((ov (markdown-ts--in-table-mode-get-ov pos)))
+    (overlay-put ov
+                 'markdown-ts-in-table-tick
+                 (buffer-chars-modified-tick))))
+
+(defun markdown-ts--table-tick-stale-p (pos)
+  "Return non-nil if the table at POS might have changed.
+It is up to this function's callers to call
+`markdown-ts--table-tick-update'."
+  (when-let* ((ov (markdown-ts--in-table-mode-get-ov pos)))
+    (not (eq (overlay-get ov 'markdown-ts-in-table-tick)
+             (buffer-chars-modified-tick)))))
+
+(defun markdown-ts--in-table-mode-update-ov ()
+  "Manage `markdown-ts--in-table-mode-ov'."
+  (cond (markdown-ts-in-table-mode
+         (when-let* ((at-table (markdown-ts-at-table-p nil t))
+                     (table (cdr at-table))
+                     (beg (treesit-node-start table))
+                     (end (treesit-node-end table)))
+           (if markdown-ts--in-table-mode-ov
+               ;; Move the overlay, if needed, and reset the tick if so.
+               (when (not (eq (overlay-start markdown-ts--in-table-mode-ov)
+                              beg))
+                 (move-overlay markdown-ts--in-table-mode-ov beg end)
+                 (overlay-put markdown-ts--in-table-mode-ov
+                              'markdown-ts-in-table-tick nil))
+             (setq markdown-ts--in-table-mode-ov
+                   (make-overlay beg end nil t nil)))
+           (overlay-put markdown-ts--in-table-mode-ov
+                        'markdown-ts-in-table t)
+           (overlay-put markdown-ts--in-table-mode-ov
+                        'evaporate t)
+           (overlay-put markdown-ts--in-table-mode-ov
+                        'priority '(nil . 20))
+           (overlay-put markdown-ts--in-table-mode-ov
+                        'face 'markdown-ts-in-table)
+           ))
+        (t
+         (when markdown-ts--in-table-mode-ov
+           (delete-overlay markdown-ts--in-table-mode-ov)))))
+
+(define-minor-mode markdown-ts-table-mode
+  "Minor mode to enable commands in tables.
+If non-nil and `point' is in a table, enable
+`markdown-ts-in-table-mode'."
+  :group 'markdown-ts
+  :interactive nil
+  (markdown-ts--barf-if-not-mode 'markdown-ts-table-mode)
+  (cond (markdown-ts-table-mode
+         ;; Enable the minor mode `markdown-ts-in-table-mode' and
+         ;; its keymap when point is within a code block.
+         (add-hook 'post-command-hook
+                   #'markdown-ts--enable-in-table-mode nil 'local)
+         ;; If `save-place-mode' or similar is used, point could start within
+         ;; a table, so initialize from that state.
+         (run-with-timer 0.01 nil
+                         #'markdown-ts--enable-in-table-mode))
+        (t
+         (remove-hook 'post-command-hook
+                      #'markdown-ts--enable-in-table-mode 'local))))
 
 ;;;###autoload
 (when (boundp 'treesit-major-mode-remap-alist)
-  (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-ts-mode-maybe))
-  ;; To be able to toggle between an external package and core ts-mode:
+  (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-ts-mode))
+  (add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-ts-mode))
+  (add-to-list 'auto-mode-alist '("\\.mdx\\'" . markdown-ts-mode))
   (add-to-list 'treesit-major-mode-remap-alist
                '(markdown-mode . markdown-ts-mode)))
 

From c878753d39641510329c37dc169311f6bbfb4926 Mon Sep 17 00:00:00 2001
From: Augusto Stoffel <arstoffel@gmail.com>
Date: Tue, 21 Apr 2026 09:38:49 +0200
Subject: [PATCH 342/463] Accept stream type as 4th argument of
 X-Message-SMTP-Method header

* lisp/gnus/message.el (message-multi-smtp-send-mail): Set
'smtpmail-stream-type' if specificed in the header.
* doc/misc/message.texi (Mail Variables): Document that.
(Bug#80880)
---
 doc/misc/message.texi |  9 +++++++++
 lisp/gnus/message.el  | 18 ++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index db3d4d0f7c1..e6dfac92b65 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1972,6 +1972,15 @@ This is the same as the above, but uses @samp{other-user} as the user
 name when authenticating.  This is handy if you have several
 @acronym{SMTP} accounts on the same server.
 
+Normally, the connection to the SMTP server follows the value of
+@code{smtpmail-stream-type} except if port is 465, in which case a TLS
+connection is required.  To enforce a specific stream type, mention one
+of the possible values of that variable, like so:
+
+@example
+X-Message-SMTP-Method: smtp smtp.fsf.org 587 other-user starttls
+@end example
+
 This header may also be used to specify an alternative MTA by using a
 @samp{mailer} keyword, where @samp{mailer} is the name of an MTA with
 a corresponding @code{message-send-mail-with-'mailer'} function.  For
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 861540ea1fa..0879f3be1b4 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5054,13 +5054,19 @@ that instead."
                (smtpmail-smtp-server (nth 1 method))
                (service (nth 2 method))
                (port (string-to-number service))
-               ;; If we're talking to the TLS SMTP port, then force a
-               ;; TLS connection.
-               (smtpmail-stream-type (if (= port 465)
-                                         'tls
-                                       smtpmail-stream-type))
                (smtpmail-smtp-service (if (> port 0) port service))
-               (smtpmail-smtp-user (or (nth 3 method) smtpmail-smtp-user)))
+               (smtpmail-smtp-user (or (nth 3 method) smtpmail-smtp-user))
+               (stream-type (nth 4 method))
+               (smtpmail-stream-type
+                (cond ((member stream-type '("nil" "starttls" "plain" "tls"))
+                       (intern stream-type))
+                      (stream-type
+                       (user-error "Invalid stream type: %s" stream-type))
+                      ;; If the user didn't say anything and we're
+                      ;; talking to the TLS SMTP port, then force a TLS
+                      ;; connection.
+                      ((= port 465) 'tls)
+                      (t smtpmail-stream-type))))
           (message-smtpmail-send-it)))
        (send-function
         (funcall send-function))

From d24b10ca75f49217f8585ce9c0fb53209693f882 Mon Sep 17 00:00:00 2001
From: Andrea Alberti <a.alberti82@gmail.com>
Date: Sun, 3 May 2026 21:25:14 +0200
Subject: [PATCH 343/463] Introduce 'margin' face for window margin background

A new basic face 'margin' is used for text displayed in the left and
right margin areas, i.e., the areas typically used by VCS and LSP
packages for per-line annotations.  Its background defaults to the
frame default, preserving existing behavior for users who do not
customize it.
* etc/NEWS: Document the new 'margin' face.
* lisp/faces.el (margin): Add 'margin' face, inheriting from 'default'.
* src/dispextern.h (face_id): Add MARGIN_FACE_ID.
* src/xdisp.c (face_at_pos): Use 'margin' as the base face for
strings displayed in margin areas so that they inherit the gutter
background by default.
(extend_face_to_end_of_line): Compute 'margin_fill_face_id' from the
'margin' face.  Use while loops to explicitly fill all empty character
slots in both left and right margins for both GUI and TTY branches.
(display_line): Call 'extend_face_to_end_of_line' for beyond-EOB rows
when the window has margins.  Also extend the existing condition for
text rows with empty margins to trigger when the 'margin' face
background differs from the frame default, not only when the default
face is remapped.
* src/xfaces.c (realize_basic_faces): Realize 'margin' as a basic
face to support face-remapping and efficient lookup.
(Bug#80693)
---
 doc/lispref/display.texi |  19 ++--
 etc/NEWS                 |   8 ++
 lisp/faces.el            |   7 ++
 src/dispextern.h         |   1 +
 src/xdisp.c              | 198 ++++++++++++++++++++++++++++++---------
 src/xfaces.c             |   2 +
 6 files changed, 184 insertions(+), 51 deletions(-)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index cded3ecd8d0..763a8be7ce9 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -3817,6 +3817,11 @@ Basic faces used for the corresponding decorations of GUI frames.
 @item cursor
 The basic face used for the text cursor.
 
+@item margin
+The basic face used for window margins, both on the left and on the
+right.  It is commonly used to customize the background of the empty
+areas of the margins.  It inherits from the @code{default} face.
+
 @item mouse
 The basic face used for displaying mouse-sensitive text when the mouse
 pointer is on that text.
@@ -5909,12 +5914,14 @@ that text, put on that text an overlay with a @code{before-string}
 property, and put the margin display specification on the contents of
 the before-string.
 
-  Note that if the string to be displayed in the margin doesn't
-specify a face, its face is determined using the same rules and
-priorities as it is for strings displayed in the text area
-(@pxref{Displaying Faces}).  If this results in undesirable
-``leaking'' of faces into the margin, make sure the string has an
-explicit face specified for it.
+  Note that if the string to be displayed in the margin doesn't fully
+specify its face, the nonspecified attributes are inherited from the
+@code{margin} face (@pxref{Basic Faces}).  The face merging mechanism
+ensures that the margin background remains consistent when margin
+annotations specify only a foreground color.  If you want a margin
+string to have a specific appearance independent of the @code{margin}
+face, make sure the string has a face specifying all required
+attributes.
 
   Before the display margins can display anything, you must give
 them a nonzero width.  The usual way to do that is to set these
diff --git a/etc/NEWS b/etc/NEWS
index f8d3fc9960e..0e1268f4c9a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -24,6 +24,14 @@ applies, and please also update docstrings as needed.
 
 * Installation Changes in Emacs 31.1
 
++++
+** New face 'margin' for the window margin background.
+A new basic face 'margin' is used by default for text displayed in the
+left and right margin areas, i.e., the areas reserved by packages such as
+git-gutter, lsp-mode, and hl-diff for per-line annotations.  Its
+background defaults to the frame default, so existing behavior is
+unchanged for users who do not customize it.
+
 +++
 ** Unexec dumper removed.
 The traditional unexec dumper, deprecated since Emacs 27, has been
diff --git a/lisp/faces.el b/lisp/faces.el
index 97620822b88..94da4ba0290 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2913,6 +2913,13 @@ used to display the prompt text."
 (setq minibuffer-prompt-properties
       (append minibuffer-prompt-properties (list 'face 'minibuffer-prompt)))
 
+(defface margin
+  '((t :inherit default))
+  "Basic face for window margins (both left and right).
+This face is used to customize the appearance of the margin areas."
+  :version "31.1"
+  :group 'basic-faces)
+
 (defface fringe
   '((((class color) (background light))
      :background "grey95")
diff --git a/src/dispextern.h b/src/dispextern.h
index 16565b8ad18..d08bd7ee7a9 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1966,6 +1966,7 @@ enum face_id
   TAB_BAR_FACE_ID,
   TAB_LINE_ACTIVE_FACE_ID,
   TAB_LINE_INACTIVE_FACE_ID,
+  MARGIN_FACE_ID,
   BASIC_FACE_ID_SENTINEL
 };
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 4c46d7711be..b1e9d834aae 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4874,6 +4874,17 @@ face_at_pos (const struct it *it, enum lface_attribute_index attr_filter)
 	    : underlying_face_id (it);
 	}
 
+      /* For strings displayed in a margin area via a 'display' property,
+         use the realized 'margin' face as the base so that unspecified
+         attributes (notably background) are inherited from 'margin'
+         rather than from 'default' or the buffer face at point.  This
+         allows packages to specify only a foreground color for a margin
+         annotation and have the margin background fill in automatically.  */
+      if (it->string_from_display_prop_p
+	  && it->area != TEXT_AREA
+	  && it->w)
+	base_face_id = lookup_basic_face (it->w, it->f, MARGIN_FACE_ID);
+
       return face_at_string_position (it->w,
                                       it->string,
                                       IT_STRING_CHARPOS (*it),
@@ -24285,13 +24296,14 @@ append_space_for_newline (struct it *it, bool default_face_p)
   return false;
 }
 
-
-/* Extend the face of the last glyph in the text area of IT->glyph_row
-   to the end of the display line.  Called from display_line.  If the
-   glyph row is empty, add a space glyph to it so that we know the
-   face to draw.  Set the glyph row flag fill_line_p.  If the glyph
-   row is R2L, prepend a stretch glyph to cover the empty space to the
-   left of the leftmost glyph.  */
+ /* Extend the face of the last glyph in the text area of IT->glyph_row
+    to the end of the display line.  Also fill the window margins with
+    the 'margin' face.  If the text area is empty, a space glyph is
+    added to it to carry the face used for clearing the line.  In the
+    margin areas, empty cells are explicitly filled with space glyphs
+    (TTY) or a single stretch glyph (GUI).  Set the glyph row flag
+    fill_line_p.  If the glyph row is R2L, prepend a stretch glyph to
+    cover the empty space to the left of the leftmost glyph.  */
 
 static void
 extend_face_to_end_of_line (struct it *it)
@@ -24340,6 +24352,18 @@ extend_face_to_end_of_line (struct it *it)
                                         ? it->saved_face_id
                                         : extend_face_id));
 
+  /* Use the 'margin' face to fill empty cells in the left and right
+     margin areas.  That face defaults to the frame default, so it is a
+     no-op unless the user customizes its background.  This is the only
+     way to give the margin area below point-max (where no overlay can
+     place glyphs) a non-default background.  The approach is analogous
+     to 'maybe_produce_line_number' for the line-number area.  */
+  int margin_fill_face_id = lookup_basic_face (it->w, f, MARGIN_FACE_ID);
+
+  /* Skip if none of the conditions that require extending the face to the
+     end of line are met: text face extends to EOL, box/underline/etc are
+     drawn, fill-column indicator is shown, or the 'margin' face has a
+     non-default background in a window that has margins.  */
   if (FRAME_WINDOW_P (f)
       && MATRIX_ROW_DISPLAYS_TEXT_P (it->glyph_row)
       && face->box == FACE_NO_BOX
@@ -24351,7 +24375,11 @@ extend_face_to_end_of_line (struct it *it)
       && !face->stipple
 #endif
       && !it->glyph_row->reversed_p
-      && !display_fill_column_indicator)
+      && !display_fill_column_indicator
+      && !(FACE_FROM_ID (f, margin_fill_face_id)->background
+	   != FRAME_BACKGROUND_PIXEL (f)
+	   && (WINDOW_LEFT_MARGIN_WIDTH (it->w) > 0
+	       || WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0)))
     return;
 
   /* Set the glyph row flag indicating that the face of the last glyph
@@ -24391,23 +24419,81 @@ extend_face_to_end_of_line (struct it *it)
 #endif
 	    ))
 	{
+	  /* The third condition is a safety bound preventing writes
+	     past the end of the left-margin glyph array.  In the
+	     non-window-system branch the equivalent bound is expressed
+	     via a pointer 'g' initialized to the first empty slot and
+	     advanced by 'g++', so the limit arises naturally from the
+	     iteration.  Here we index by 'n = used' directly and
+	     recompute the equivalent pointer bound inline.  */
+	  /* Left Margin GUI; GUI-specific optimization: use one stretch glyph
+	     to fill the rest.  */
 	  if (WINDOW_LEFT_MARGIN_WIDTH (it->w) > 0
-	      && it->glyph_row->used[LEFT_MARGIN_AREA] == 0)
+	      && (it->glyph_row->used[LEFT_MARGIN_AREA]
+		  < WINDOW_LEFT_MARGIN_WIDTH (it->w)))
 	    {
-	      it->glyph_row->glyphs[LEFT_MARGIN_AREA][0] = space_glyph;
-	      it->glyph_row->glyphs[LEFT_MARGIN_AREA][0].face_id =
-		default_face->id;
-	      it->glyph_row->glyphs[LEFT_MARGIN_AREA][0].frame = f;
-	      it->glyph_row->used[LEFT_MARGIN_AREA] = 1;
+	      int used = it->glyph_row->used[LEFT_MARGIN_AREA];
+	      int remaining_pixels = (WINDOW_LEFT_MARGIN_WIDTH (it->w)
+				      * FRAME_COLUMN_WIDTH (f));
+
+	      /* Subtract width of existing glyphs.  */
+	      struct glyph *g = it->glyph_row->glyphs[LEFT_MARGIN_AREA];
+	      for (int i = 0; i < used; ++i)
+		remaining_pixels -= (g++)->pixel_width;
+
+	      if (remaining_pixels > 0)
+		{
+		  int saved_face_id = it->face_id;
+		  enum glyph_row_area saved_area = it->area;
+		  struct text_pos saved_pos = it->position;
+
+		  it->face_id = margin_fill_face_id;
+		  it->area = LEFT_MARGIN_AREA;
+		  /* Set position to 0 for the filler glyph. */
+		  clear_position (it);
+
+		  append_stretch_glyph (it, Qnil, remaining_pixels,
+					it->ascent + it->descent, it->max_ascent);
+
+		  it->position = saved_pos;
+		  it->face_id = saved_face_id;
+		  it->area = saved_area;
+		}
 	    }
+
+	  /* Right Margin GUI; GUI-specific optimization: use one stretch glyph
+	     to fill the rest.  */
 	  if (WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0
-	      && it->glyph_row->used[RIGHT_MARGIN_AREA] == 0)
+	      && (it->glyph_row->used[RIGHT_MARGIN_AREA]
+		  < WINDOW_RIGHT_MARGIN_WIDTH (it->w)))
 	    {
-	      it->glyph_row->glyphs[RIGHT_MARGIN_AREA][0] = space_glyph;
-	      it->glyph_row->glyphs[RIGHT_MARGIN_AREA][0].face_id =
-		default_face->id;
-	      it->glyph_row->glyphs[RIGHT_MARGIN_AREA][0].frame = f;
-	      it->glyph_row->used[RIGHT_MARGIN_AREA] = 1;
+	      int used = it->glyph_row->used[RIGHT_MARGIN_AREA];
+	      int remaining_pixels = (WINDOW_RIGHT_MARGIN_WIDTH (it->w)
+				      * FRAME_COLUMN_WIDTH (f));
+
+	      /* Subtract width of existing glyphs.  */
+	      struct glyph *g = it->glyph_row->glyphs[RIGHT_MARGIN_AREA];
+	      for (int i = 0; i < used; ++i)
+		remaining_pixels -= (g++)->pixel_width;
+
+	      if (remaining_pixels > 0)
+		{
+		  int saved_face_id = it->face_id;
+		  enum glyph_row_area saved_area = it->area;
+		  struct text_pos saved_pos = it->position;
+
+		  it->face_id = margin_fill_face_id;
+		  it->area = RIGHT_MARGIN_AREA;
+		  /* Set position to 0 for the filler glyph. */
+		  clear_position (it);
+
+		  append_stretch_glyph (it, Qnil, remaining_pixels,
+					it->ascent + it->descent, it->max_ascent);
+
+		  it->position = saved_pos;
+		  it->face_id = saved_face_id;
+		  it->area = saved_area;
+		}
 	    }
 
 	  struct font *font = (default_face->font
@@ -24576,11 +24662,16 @@ extend_face_to_end_of_line (struct it *it)
       it->c = it->char_to_display = ' ';
       it->len = 1;
 
+      /* Fill the left margin if it is only partially covered by glyphs and
+	 the margin face or the extended face differ from the frame default.
+	 Mode-line rows are excluded because they have no margin area.  */
       if (WINDOW_LEFT_MARGIN_WIDTH (it->w) > 0
 	  && (it->glyph_row->used[LEFT_MARGIN_AREA]
 	      < WINDOW_LEFT_MARGIN_WIDTH (it->w))
 	  && !it->glyph_row->mode_line_p
-	  && face->background != FRAME_BACKGROUND_PIXEL (f))
+	  && (face->background != FRAME_BACKGROUND_PIXEL (f)
+	      || FACE_FROM_ID (f, margin_fill_face_id)->background
+	      != FRAME_BACKGROUND_PIXEL (f)))
 	{
 	  struct glyph *g = it->glyph_row->glyphs[LEFT_MARGIN_AREA];
 	  struct glyph *e = g + it->glyph_row->used[LEFT_MARGIN_AREA];
@@ -24593,7 +24684,7 @@ extend_face_to_end_of_line (struct it *it)
 	    it->wrap_prefix_width = it->current_x;
 
 	  it->area = LEFT_MARGIN_AREA;
-	  it->face_id = default_face->id;
+	  it->face_id = margin_fill_face_id;
 	  while (it->glyph_row->used[LEFT_MARGIN_AREA]
 		 < WINDOW_LEFT_MARGIN_WIDTH (it->w)
 		 && g < it->glyph_row->glyphs[TEXT_AREA])
@@ -24655,7 +24746,9 @@ extend_face_to_end_of_line (struct it *it)
 	  && (it->glyph_row->used[RIGHT_MARGIN_AREA]
 	      < WINDOW_RIGHT_MARGIN_WIDTH (it->w))
 	  && !it->glyph_row->mode_line_p
-	  && face->background != FRAME_BACKGROUND_PIXEL (f))
+	  && (face->background != FRAME_BACKGROUND_PIXEL (f)
+	      || FACE_FROM_ID (f, margin_fill_face_id)->background
+	      != FRAME_BACKGROUND_PIXEL (f)))
 	{
 	  struct glyph *g = it->glyph_row->glyphs[RIGHT_MARGIN_AREA];
 	  struct glyph *e = g + it->glyph_row->used[RIGHT_MARGIN_AREA];
@@ -24664,7 +24757,7 @@ extend_face_to_end_of_line (struct it *it)
 	    it->current_x += g->pixel_width;
 
 	  it->area = RIGHT_MARGIN_AREA;
-	  it->face_id = default_face->id;
+	  it->face_id = margin_fill_face_id;
 	  while (it->glyph_row->used[RIGHT_MARGIN_AREA]
 		 < WINDOW_RIGHT_MARGIN_WIDTH (it->w)
 		 && g < it->glyph_row->glyphs[LAST_AREA])
@@ -25915,17 +26008,21 @@ display_line (struct it *it, int cursor_vpos)
 	  it->font_height = Qnil;
 	  it->voffset = 0;
 	  row->ends_at_zv_p = true;
-	  /* A row that displays right-to-left text must always have
-	     its last face extended all the way to the end of line,
-	     even if this row ends in ZV, because we still write to
-	     the screen left to right.  We also need to extend the
-	     last face if the default face is remapped to some
-	     different face, otherwise the functions that clear
-	     portions of the screen will clear with the default face's
-	     background color.  */
+	  /* A row that displays right-to-left text must always have its
+	     last face extended all the way to the end of line, even if
+	     this row ends in ZV, because we still write to the screen
+	     left to right.  We also need to extend the last face if the
+	     default face is remapped to some different face, otherwise
+	     the functions that clear portions of the screen will clear
+	     with the default face's background color.  We also call
+	     extend_face_to_end_of_line when the window has a left or
+	     right margin so that the empty areas of the margins are
+	     filled with the 'margin' face background.  */
 	  if (row->reversed_p
 	      || lookup_basic_face (it->w, it->f, DEFAULT_FACE_ID)
-              != DEFAULT_FACE_ID)
+              != DEFAULT_FACE_ID
+	      || WINDOW_LEFT_MARGIN_WIDTH (it->w) > 0
+	      || WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0)
 	    extend_face_to_end_of_line (it);
 	  break;
 	}
@@ -26502,18 +26599,6 @@ display_line (struct it *it, int cursor_vpos)
 		    }
 		  it->hpos = hpos_before;
 		}
-	      /* If the default face is remapped, and the window has
-                 display margins, and no glyphs were written yet to the
-                 margins on this screen line, we must add one space
-                 glyph to the margin area to make sure the margins use
-                 the background of the remapped default face.  */
-	      if (lookup_basic_face (it->w, it->f, DEFAULT_FACE_ID)
-		  != DEFAULT_FACE_ID /* default face is remapped */
-		  && ((WINDOW_LEFT_MARGIN_WIDTH (it->w) > 0
-		       && it->glyph_row->used[LEFT_MARGIN_AREA] == 0)
-		      || (WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0
-			  && it->glyph_row->used[RIGHT_MARGIN_AREA] == 0)))
-		extend_face_to_end_of_line (it);
 	    }
 	  else if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
 	    {
@@ -26536,6 +26621,29 @@ display_line (struct it *it, int cursor_vpos)
 	      it->hpos = hpos_before;
 	    }
 
+	  /* If the default face is remapped or the 'margin' face has a
+	     non-default background, and the window has display margins,
+	     and no glyphs were written yet to the margins on this screen
+	     line, fill the margin area so that the margins use the
+	     correct background.  Placed here, after the if/else-if chain
+	     above, so it fires for all three truncation paths: TTY/no-fringe
+	     truncation glyph, GUI newline-overflow-into-fringe, and GUI
+	     regular truncation where the indicator is drawn as a fringe
+	     bitmap.  */
+	  {
+	    int margin_face_id =
+	      lookup_basic_face (it->w, it->f, MARGIN_FACE_ID);
+	    if ((lookup_basic_face (it->w, it->f, DEFAULT_FACE_ID)
+	         != DEFAULT_FACE_ID
+	         || FACE_FROM_ID (it->f, margin_face_id)->background
+	         != FRAME_BACKGROUND_PIXEL (it->f))
+	        && ((WINDOW_LEFT_MARGIN_WIDTH (it->w) > 0
+	             && it->glyph_row->used[LEFT_MARGIN_AREA] == 0)
+	            || (WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0
+	                && it->glyph_row->used[RIGHT_MARGIN_AREA] == 0)))
+	      extend_face_to_end_of_line (it);
+	  }
+
 	  row->truncated_on_right_p = true;
 	  it->continuation_lines_width = 0;
 	  reseat_at_next_visible_line_start (it, false);
diff --git a/src/xfaces.c b/src/xfaces.c
index 6c4267b8afa..010b0e1847e 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5211,6 +5211,7 @@ lookup_basic_face (struct window *w, struct frame *f, int face_id)
     case WINDOW_DIVIDER_LAST_PIXEL_FACE_ID:	name = Qwindow_divider_last_pixel;	break;
     case INTERNAL_BORDER_FACE_ID:	name = Qinternal_border; 	break;
     case CHILD_FRAME_BORDER_FACE_ID:	name = Qchild_frame_border; 	break;
+    case MARGIN_FACE_ID:		name = Qmargin;			break;
 
     default:
       emacs_abort (); /* the caller is supposed to pass us a basic face id */
@@ -5978,6 +5979,7 @@ realize_basic_faces (struct frame *f)
       realize_named_face (f, Qtab_bar, TAB_BAR_FACE_ID);
       realize_named_face (f, Qtab_line_active, TAB_LINE_ACTIVE_FACE_ID);
       realize_named_face (f, Qtab_line_inactive, TAB_LINE_INACTIVE_FACE_ID);
+      realize_named_face (f, Qmargin, MARGIN_FACE_ID);
       unbind_to (count, Qnil);
 
       /* Reflect changes in the `menu' face in menu bars.  */

From d48b7745247a71ea2098881b1dd0a2d268450e09 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 5 May 2026 11:22:56 +0300
Subject: [PATCH 344/463] ; Fix last change

* src/xdisp.c (extend_face_to_end_of_line): Fix last argument to
'append_stretch_glyph', to avoid assertion violations.  (Bug#80693)
---
 src/xdisp.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index b1e9d834aae..52f8257e76f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -24419,6 +24419,10 @@ extend_face_to_end_of_line (struct it *it)
 #endif
 	    ))
 	{
+	  struct font *font = (default_face->font
+	                       ? default_face->font
+	                       : FRAME_FONT (f));
+
 	  /* The third condition is a safety bound preventing writes
 	     past the end of the left-margin glyph array.  In the
 	     non-window-system branch the equivalent bound is expressed
@@ -24452,8 +24456,12 @@ extend_face_to_end_of_line (struct it *it)
 		  /* Set position to 0 for the filler glyph. */
 		  clear_position (it);
 
+		  int stretch_ascent =
+		    ((it->ascent + it->descent) * FONT_BASE (font))
+		    / FONT_HEIGHT (font);
 		  append_stretch_glyph (it, Qnil, remaining_pixels,
-					it->ascent + it->descent, it->max_ascent);
+					it->ascent + it->descent,
+					stretch_ascent);
 
 		  it->position = saved_pos;
 		  it->face_id = saved_face_id;
@@ -24487,8 +24495,12 @@ extend_face_to_end_of_line (struct it *it)
 		  /* Set position to 0 for the filler glyph. */
 		  clear_position (it);
 
+		  int stretch_ascent =
+		    ((it->ascent + it->descent) * FONT_BASE (font))
+		    / FONT_HEIGHT (font);
 		  append_stretch_glyph (it, Qnil, remaining_pixels,
-					it->ascent + it->descent, it->max_ascent);
+					it->ascent + it->descent,
+					stretch_ascent);
 
 		  it->position = saved_pos;
 		  it->face_id = saved_face_id;
@@ -24496,10 +24508,6 @@ extend_face_to_end_of_line (struct it *it)
 		}
 	    }
 
-	  struct font *font = (default_face->font
-	                       ? default_face->font
-	                       : FRAME_FONT (f));
-
 	  const int char_width = (font->average_width
 	                          ? font->average_width
 	                          : font->space_width);

From 47e014ff90ef7da7d91cd384b78c85f4198df193 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 5 May 2026 11:42:12 +0300
Subject: [PATCH 345/463] ; Fix byte-compilation warnings in markdown-ts-mode

* lisp/textmodes/markdown-ts-mode-x.el: Use
'treesit-declare-unavailable-functions'.

* lisp/treesit.el (treesit-declare-unavailable-functions): Add
declaration.
---
 lisp/textmodes/markdown-ts-mode-x.el | 2 ++
 lisp/treesit.el                      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/lisp/textmodes/markdown-ts-mode-x.el b/lisp/textmodes/markdown-ts-mode-x.el
index 7405078ab4b..1327191828e 100644
--- a/lisp/textmodes/markdown-ts-mode-x.el
+++ b/lisp/textmodes/markdown-ts-mode-x.el
@@ -91,6 +91,8 @@ The function is called with one argument, the file name."
 (defconst markdown-ts--convert-output-buffer
   "*markdown-ts-convert output*")
 
+(treesit-declare-unavailable-functions)
+
 (defvar markdown-ts-converters
   (list
    (cons 'html
diff --git a/lisp/treesit.el b/lisp/treesit.el
index baebdbb31dc..c03740159c7 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -131,6 +131,8 @@ in a Emacs not built with tree-sitter library."
 
      (declare-function treesit-available-p "treesit.c")
 
+     (declare-function treesit-parser-remove-notifier "treesit.c")
+
      (defvar treesit-thing-settings)
      (defvar treesit-major-mode-remap-alist)
      (defvar treesit-extra-load-path)))

From 288f8d0b0529fc99630928490e744d1e892edf28 Mon Sep 17 00:00:00 2001
From: Eshel Yaron <me@eshelyaron.com>
Date: Tue, 5 May 2026 10:27:59 +0200
Subject: [PATCH 346/463] ; (elisp-fontify-symbol): Improve docstring.

---
 lisp/progmodes/elisp-mode.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index ce338cb06f1..64ff21e3578 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -611,7 +611,11 @@ semantic highlighting takes precedence."
 
 If `elisp-add-help-echo' is non-nil, also annotate the symbol with the
 `help-echo' text property.  If `cursor-sensor-mode' is enabled and ID is
-non-nil, also annotate the symbol with `cursor-sensor-functions'."
+non-nil, also annotate the symbol with `cursor-sensor-functions'.
+
+For the precise meaning of the arguments of this function, see the
+docstring of `elisp-scope-analyze-form'.  This function is intended for
+use with `elisp-scope-analyze-form' as its CALLBACK argument."
   (let ((end (progn (goto-char beg) (read (current-buffer)) (point))))
     (let ((face (elisp-scope-get-symbol-role-property role :face)))
       (add-face-text-property

From 5789621632aab090ce2ef66a48a234a9505ddec2 Mon Sep 17 00:00:00 2001
From: Eshel Yaron <me@eshelyaron.com>
Date: Tue, 5 May 2026 11:08:53 +0200
Subject: [PATCH 347/463] elisp-mode: Cache 'help-echo' function results
 (bug#80948)

This ensures we only compute the 'help-echo' string once per
symbol in a certain position.

* lisp/progmodes/elisp-mode.el
(elisp--annotate-symbol-with-help-echo): Add caching for
when the symbol role's :help property is a function.
---
 lisp/progmodes/elisp-mode.el | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 64ff21e3578..8dab8d57ec3 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -575,7 +575,12 @@ This option has effect only if `elisp-fontify-semantically' is non-nil."
      ;; HLP is either a string, or a function that takes SYM as an
      ;; additional argument on top of the usual WINDOW, OBJECT and POS
      ;; that `help-echo' functions takes.
-     (if (stringp hlp) hlp (apply-partially hlp sym)))))
+     (if (stringp hlp) hlp
+       (let ((cache 'unset))
+         (lambda (win obj pos)
+           (if (eq cache 'unset)
+               (setq cache (funcall hlp sym win obj pos))
+             cache)))))))
 
 (defvar font-lock-beg)
 (defvar font-lock-end)

From 8f9607d53223c3faa533e260ff7db277f0ae5fc7 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Tue, 5 May 2026 11:00:52 +0100
Subject: [PATCH 348/463] vc-finish-logentry: Skip displaying async command
 buffer sometimes

* lisp/vc/vc-dispatcher.el (vc-finish-logentry): Don't display
the async command buffer if vc-display-failed-async-commands is
non-nil.
---
 lisp/vc/vc-dispatcher.el | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index f8118b1babc..ba55a622d9e 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -1021,7 +1021,13 @@ the buffer contents as a comment."
             (t
              (quit-windows-on logbuf nil 0)))
 
-      (when (eq (car-safe log-operation-ret) 'async)
+      (when (and (eq (car-safe log-operation-ret) 'async)
+                 ;; For an async commit, if we will display the buffer
+                 ;; if the command fails, don't display it sooner.
+                 ;; The output from successful commit commands isn't
+                 ;; interesting and VC-Dir will show the files as being
+                 ;; committed while it's in progress.
+                 (not vc-display-failed-async-commands))
         (vc--display-async-command-buffer (process-buffer
                                            (cadr log-operation-ret))))
 

From 283b47ab2e38503aa657d877f5cf353e652e1cd7 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Tue, 5 May 2026 12:17:53 +0100
Subject: [PATCH 349/463] vc-switch-working-tree: Don't find non-VC projects

* lisp/vc/vc.el (project-current-directory-override):
Delete declaration.
(project-find-matching-buffer-function): Declare.
(vc-switch-working-tree):
Don't find non-VC projects (bug#80939).
---
 lisp/vc/vc.el | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 303926b8159..4ecfb2d1e98 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -5772,7 +5772,7 @@ If ALLOW-CURRENT is non-nil, allow selecting the current working tree."
                    'require-known))
     (if (string-empty-p res) (vc-root-dir) res)))
 
-(defvar project-current-directory-override)
+(defvar project-find-matching-buffer-function)
 
 ;;;###autoload
 (defun vc-switch-working-tree (directory)
@@ -5786,8 +5786,17 @@ to the root of this working tree."
    (list
     (vc--prompt-other-working-tree (vc-responsible-backend default-directory)
                                    "Other working tree to visit")))
-  (let ((project-current-directory-override directory))
-    (project-find-matching-buffer)))
+  (let ((backend (or (vc-deduce-backend)
+                     (vc-responsible-backend default-directory)
+                     (error "No VC backend"))))
+    ;; Manually construct VC project objects because `project-current'
+    ;; might find a non-VC project within the VC working tree containing
+    ;; DIRECTORY, but we should ignore that (bug#80939).
+    (funcall project-find-matching-buffer-function
+             `(vc ,backend ,(vc-root-dir backend))
+             `(vc ,backend
+                  ,(let ((default-directory directory))
+                     (vc-root-dir backend))))))
 
 ;;;###autoload
 (defun vc-working-tree-switch-project (dir)

From 0649c501add25d1098f3a8a8b253f22b7b823c57 Mon Sep 17 00:00:00 2001
From: Eshel Yaron <me@eshelyaron.com>
Date: Tue, 5 May 2026 14:30:59 +0200
Subject: [PATCH 350/463] ; (elisp-scope-analyze-form): Improve docstring.

---
 lisp/emacs-lisp/elisp-scope.el | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lisp/emacs-lisp/elisp-scope.el b/lisp/emacs-lisp/elisp-scope.el
index bb2ee08db84..178117e9bf1 100644
--- a/lisp/emacs-lisp/elisp-scope.el
+++ b/lisp/emacs-lisp/elisp-scope.el
@@ -2821,10 +2821,12 @@ It is passed to `elisp-scope-1', which see."
 Call CALLBACK for each analyzed symbol SYM with arguments ROLE, POS,
 SYM, ID and DEF, where ROLE is a symbol that specifies the semantics of
 SYM; POS is the position of SYM in STREAM; ID is an object that uniquely
-identifies (co-)occurrences of SYM in the current defun; and DEF is the
-position in which SYM is locally defined, or nil.  If SYM is itself a
-binding occurrence, then POS and DEF are equal.  If SYM is not lexically
-bound, then DEF is nil.
+identifies the local reference of SYM in the current defun, so different
+occurrences of SYM get the same ID (up to `equal') if and only if they
+refer to the same object; and lastly, DEF is the position in which SYM
+is locally defined, or nil.  If SYM is itself a binding occurrence, then
+POS and DEF are equal.  If SYM is not lexically bound, then DEF is nil
+and so is ID.
 
 If STREAM is nil, it defaults to the current buffer.  When reading from
 the current buffer, this function leaves point at the end of the form.

From c9078c505b017f6caded2c07741145f174418fed Mon Sep 17 00:00:00 2001
From: Juri Linkov <juri@linkov.net>
Date: Tue, 5 May 2026 19:45:28 +0300
Subject: [PATCH 351/463] Improve 'context-menu-send-to' (bug#79512)

* lisp/mouse.el (context-menu-functions): Add missing
'context-menu-send-to' to :type.
(context-menu-send-to): Get non-nil items to avoid
useless message "Nothing to send".

* lisp/send-to.el (send-to-handlers): Change from
'defvar-local' to 'defvar' to allow easier global configuration.
(send-to-supported-p): Check for non-nil handler.
---
 lisp/mouse.el   | 13 +++++++++----
 lisp/send-to.el | 16 +++++++++-------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 24fe57cdc50..20c819ee0a8 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -407,6 +407,7 @@ and should return the same menu with changes such as added new menu items."
                   (function-item context-menu-global)
                   (function-item context-menu-local)
                   (function-item context-menu-minor)
+                  (function-item context-menu-send-to)
                   (function-item context-menu-buffers)
                   (function-item context-menu-project)
                   (function-item context-menu-vc)
@@ -541,12 +542,16 @@ Some context functions add menu items below the separator."
 (defun context-menu-send-to (menu _click)
   "Add a \"Send to...\" context MENU entry on supported platforms."
   (run-hooks 'activate-menubar-hook 'menu-bar-update-hook)
-  (when (send-to-supported-p)
+  (when-let* ((_ (send-to-supported-p))
+              (handler (send-to--resolve-handler))
+              (collect (map-elt handler :collect))
+              (items (funcall collect)))
     (define-key-after menu [separator-send] menu-bar-separator)
     (define-key-after menu [send]
-      '(menu-item "Send to..." (lambda ()
-                                 (interactive)
-                                 (send-to))
+      `(menu-item "Send to..."
+                  ,(lambda ()
+                     (interactive)
+                     (send-to items))
                   :help
                   "Send item (region, buffer file, or Dired files) to applications or service")))
   menu)
diff --git a/lisp/send-to.el b/lisp/send-to.el
index b4c3c339029..f1795cfa7a0 100644
--- a/lisp/send-to.el
+++ b/lisp/send-to.el
@@ -47,12 +47,13 @@
   :group 'external
   :version "31.1")
 
-(defvar-local send-to-handlers '(((:supported . send-to--ns-supported-p)
-                                  (:collect . send-to--collect-items)
-                                  (:send . send-to--ns-send-items))
-                                 ((:supported . send-to--open-externally-supported-p)
-                                  (:collect . send-to--collect-items)
-                                  (:send . send-to--open-externally)))
+(defvar send-to-handlers
+  '(((:supported . send-to--ns-supported-p)
+     (:collect . send-to--collect-items)
+     (:send . send-to--ns-send-items))
+    ((:supported . send-to--open-externally-supported-p)
+     (:collect . send-to--collect-items)
+     (:send . send-to--open-externally)))
   "A list of handlers that may be able to send files to applications or services.
 
 Sending is handled by the first supported handler from `send-to-handlers' whose
@@ -82,7 +83,8 @@ paths known to exist. In these instances, files will be sent instead.\"
 ;;;###autoload
 (defun send-to-supported-p ()
   "Return non-nil for platforms where `send-to' is supported."
-  (funcall (map-elt (send-to--resolve-handler) :supported)))
+  (when-let* ((handler (send-to--resolve-handler)))
+    (funcall (map-elt handler :supported))))
 
 ;;;###autoload
 (defun send-to (&optional items)

From b57124b747ee1fb4143d56eb45b03c581ca8ca8a Mon Sep 17 00:00:00 2001
From: Eshel Yaron <me@eshelyaron.com>
Date: Tue, 5 May 2026 19:02:02 +0200
Subject: [PATCH 352/463] ; More 'elisp-scope' and 'elisp-fontify-semantically'
 doc improvements

See discussion at
https://yhetil.org/emacs/86y0hy9e6g.fsf@gnu.org/

* lisp/emacs-lisp/elisp-scope.el (elisp-scope-analyze-form):
Add example in docstring.
* lisp/progmodes/elisp-mode.el (elisp-fontify-semantically):
Clarify use of 'cursor-sensor-mode'.
---
 lisp/emacs-lisp/elisp-scope.el | 33 +++++++++++++++++++++++++++++++++
 lisp/progmodes/elisp-mode.el   |  6 ++++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/elisp-scope.el b/lisp/emacs-lisp/elisp-scope.el
index 178117e9bf1..1dad4a558a3 100644
--- a/lisp/emacs-lisp/elisp-scope.el
+++ b/lisp/emacs-lisp/elisp-scope.el
@@ -2828,6 +2828,39 @@ is locally defined, or nil.  If SYM is itself a binding occurrence, then
 POS and DEF are equal.  If SYM is not lexically bound, then DEF is nil
 and so is ID.
 
+As an example, when this function analyzes the following form
+
+  (lambda (mode) (let ((mode (or mode major-mode))) (symbol-name mode)))
+
+the CALLBACK function is invoked four times with SYM `mode':
+
+- Once for the `mode' in the `lambda' arguments list, with ROLE
+  `binding-variable', some non-nil ID value MODE-ID1, and with POS and
+  DEF both being the same position POS1 where this `mode' occurs.
+
+- Another time for the binder in the let form, with ROLE
+  `binding-variable' some non-nil ID value MODE-ID2 that is not `equal'
+  to MODE-ID1, and with POS and DEF both being the same position POS2.
+
+- Another for the first argument of `or', with ROLE `bound-variable' and
+  ID of MODE-ID1, since this occurrence of `mode' is bound by the
+  `lambda' argument `mode'.  Similarly, DEF is POS1, and POS is now a
+  different position, POS3.
+
+- Finally, CALLBACK is also invoked for the `mode' that appears in the
+  body of `let' as the argument of `symbol-name', with ROLE set to
+  `bound-variable', ID set to MODE-ID2, and DEF set to POS3.
+
+In the above example, CALLBACK is also invoked for `lambda', `let',
+`or', `major-mode' and `symbol-name'.  Since those symbols do not have
+local references (they refer to global functions/macros/variables),
+CALLBACK gets nil ID and nil DEF.
+
+Note that if SYM is locally-bound, but has no specific binding position,
+then DEF is nil while ID is non-nil.  This is the case when SYM is bound
+by a binder that is only introduced during macro expansion and does not
+appear literally in the analyzed code.
+
 If STREAM is nil, it defaults to the current buffer.  When reading from
 the current buffer, this function leaves point at the end of the form.
 
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 8dab8d57ec3..b12f406cc19 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -288,8 +288,10 @@ the role of each symbol and highlight it accordingly.  We call this kind
 of highlighting \"semantic highlighting\".
 
 If `elisp-add-help-echo' is non-nil, also annotate the symbol with the
-`help-echo' text property.  If `cursor-sensor-mode' is enabled,
-also optionally annotate the symbol with `cursor-sensor-functions'.
+`help-echo' text property.  If `cursor-sensor-mode' is enabled, also
+arrange for all occurrences of the each local variable to be highlighted
+with the `elisp-variable-at-point' face whenever point is on any of that
+variable's occurrences.
 
 Semantic highlighting works best when you keep your code syntactically
 correct while editing it, for example by using `electric-pair-mode'.

From a3f79f9da145c6a7b5f59bc16fd17237c573629e Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 5 May 2026 21:40:48 +0300
Subject: [PATCH 353/463] ; * lisp/progmodes/elisp-mode.el
 (elisp-fontify-semantically): Fix typo.

---
 lisp/progmodes/elisp-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index b12f406cc19..6ccbe14f265 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -289,7 +289,7 @@ of highlighting \"semantic highlighting\".
 
 If `elisp-add-help-echo' is non-nil, also annotate the symbol with the
 `help-echo' text property.  If `cursor-sensor-mode' is enabled, also
-arrange for all occurrences of the each local variable to be highlighted
+arrange for all occurrences of each local variable to be highlighted
 with the `elisp-variable-at-point' face whenever point is on any of that
 variable's occurrences.
 

From b3b2b3de5db37d87b5b59ee8b32db5f04d456e10 Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <basil@contovou.net>
Date: Tue, 5 May 2026 21:23:07 +0200
Subject: [PATCH 354/463] ; * etc/NEWS: Fix typo in recent change.

---
 etc/NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/NEWS b/etc/NEWS
index 0e1268f4c9a..72754769822 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -4612,7 +4612,7 @@ it causes 'quit' since it is used for 'C-g'.
 +++
 ** New ':interactive-only' way to add an advice.
 While it is marginally more efficient than ':after' or ':before',
-the main purpose it to make the intention more obvious when the advice
+the main purpose is to make the intention more obvious when the advice
 modifies only the interactive form and not the actual behavior
 of the function.
 

From 930f298f4d0edb55b824e40854907c213ba5a5ac Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 5 May 2026 16:42:28 -0400
Subject: [PATCH 355/463] (help--symbol-completion-table): Try and fix
 bug#80873

* lisp/help-fns.el (help--symbol-completion-table): Don't let
`test-completion` pretend that `definition-prefixes` are
actually valid function names.
---
 lisp/help-fns.el | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index f1ee109c87e..8910f42e758 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -215,7 +215,15 @@ type specifier when available."
           (help--load-prefixes prefixes))))
     (let ((prefix-completions
            (and help-enable-completion-autoload
-                (mapcar #'intern (all-completions string definition-prefixes)))))
+                ;; For `all-completions' and `try-completion', consider
+                ;; `definition-prefixes' as valid completions, to help users
+                ;; complete the input to the point where the above
+                ;; `help-enable-completion-autoload' code can take over.
+                ;; But don't do it for other operations, like `test-completion'
+                ;; (bug#80873).
+                (memq action '(nil t))
+                (mapcar #'intern (all-completions string
+                                                  definition-prefixes)))))
       (complete-with-action action obarray string
                             (if pred (lambda (sym)
                                        (or (funcall pred sym)

From 14f17722aaf34f4a7cf27981be98d0779cf3f72b Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dmitry@gutov.dev>
Date: Wed, 6 May 2026 04:31:22 +0300
Subject: [PATCH 356/463] Fix flicker of child frame right after
 make-frame-visible

* src/xterm.c (x_make_frame_visible): Call SET_FRAME_GARBAGED
before making a child frame visible (bug#80943).
---
 src/xterm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/xterm.c b/src/xterm.c
index fc4fa4f2fc7..f93ea391f70 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -29200,6 +29200,7 @@ x_make_frame_visible (struct frame *f)
 #endif
 	  unblock_input ();
 
+	  SET_FRAME_GARBAGED (f);
 	  SET_FRAME_VISIBLE (f, true);
 	  SET_FRAME_ICONIFIED (f, false);
 	}

From 61e9dfe5f7d95c7d94f26934aebd5aaf7f92c781 Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Tue, 5 May 2026 19:22:14 -0700
Subject: [PATCH 357/463] ; * lisp/treesit.el (treesit--update-ranges-local):
 Fix let-binding.

---
 lisp/treesit.el | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index c03740159c7..01e82b56bb8 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1234,27 +1234,27 @@ Return the created local parsers as a list."
         ;; Each element of RANGES can be either (START . END) or ((START
         ;; . END)...).
         (dolist (range ranges)
-          (let ((beg (treesit--range-start range))
-                (end (treesit--range-end range))
-                (existing-local-parser
-                 (catch 'done
-                   (dolist (ov (overlays-in beg end) nil)
-                     ;; Update range of local parser.
-                     (when-let* ((embedded-parser
-                                  (overlay-get ov 'treesit-parser))
-                                 (parser-lang (treesit-parser-language
-                                               embedded-parser))
-                                 (parser-level (treesit-parser-embed-level
-                                                embedded-parser)))
-                       (when (and (overlay-get ov 'treesit-parser-local-p)
-                                  (eq parser-lang embedded-lang)
-                                  (eq embed-level parser-level))
-                         (treesit--set-embed-ranges
-                          range embedded-parser host-parser)
-                         (move-overlay ov beg end)
-                         (overlay-put ov 'treesit-parser-ov-timestamp
-                                      modified-tick)
-                         (throw 'done embedded-parser)))))))
+          (let* ((r-start (treesit--range-start range))
+                 (r-end (treesit--range-end range))
+                 (existing-local-parser
+                  (catch 'done
+                    (dolist (ov (overlays-in r-start r-end) nil)
+                      ;; Update range of local parser.
+                      (when-let* ((embedded-parser
+                                   (overlay-get ov 'treesit-parser))
+                                  (parser-lang (treesit-parser-language
+                                                embedded-parser))
+                                  (parser-level (treesit-parser-embed-level
+                                                 embedded-parser)))
+                        (when (and (overlay-get ov 'treesit-parser-local-p)
+                                   (eq parser-lang embedded-lang)
+                                   (eq embed-level parser-level))
+                          (treesit--set-embed-ranges
+                           range embedded-parser host-parser)
+                          (move-overlay ov r-start r-end)
+                          (overlay-put ov 'treesit-parser-ov-timestamp
+                                       modified-tick)
+                          (throw 'done embedded-parser)))))))
             (if existing-local-parser
                 (push existing-local-parser touched-parsers)
               ;; Create overlay and local parser.  Refer to
@@ -1262,7 +1262,7 @@ Return the created local parsers as a list."
               ;; local parser overlays.
               (let ((embedded-parser (treesit-parser-create
                                       embedded-lang nil t 'embedded))
-                    (ov (make-overlay beg end nil nil t)))
+                    (ov (make-overlay r-start r-end nil nil t)))
                 (treesit-parser-set-embed-level embedded-parser embed-level)
                 (overlay-put ov 'treesit-parser embedded-parser)
                 (overlay-put ov 'treesit-parser-local-p t)

From d962c83aa37ea0d50cd4780c23663c901cd9c947 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 6 May 2026 14:19:50 +0300
Subject: [PATCH 358/463] ; Improve doc strings of several Help-related user
 options

* lisp/help-fns.el (help-enable-completion-autoload)
(help-enable-symbol-autoload):
* lisp/help.el (help-enable-autoload): Doc fixes.
---
 lisp/help-fns.el | 7 +++++--
 lisp/help.el     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 8910f42e758..b7292eafb8a 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -127,7 +127,7 @@ current help buffer.")
 (defcustom help-enable-completion-autoload t
   "Whether completion for Help commands can perform autoloading.
 If non-nil, whenever invoking completion for `describe-function'
-or `describe-variable' load files that might contain definitions
+or `describe-variable', load files that might contain definitions
 with the current prefix.  The files are chosen according to
 `definition-prefixes'."
   :type 'boolean
@@ -148,7 +148,10 @@ edited even if this option is enabled."
   :version "29.1")
 
 (defcustom help-enable-symbol-autoload nil
-  "Perform autoload if docs are missing from autoload objects."
+  "Perform autoload if doc string is missing from an autoloaded object.
+If non-nil, if an autoloaded object lacks a doc string, Help commands
+will load the file where the object is defined, in order to be able
+to show its documentation."
   :type 'boolean
   :group 'help
   :version "28.1")
diff --git a/lisp/help.el b/lisp/help.el
index 1576fb61dc8..f5fe34435bb 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -2110,7 +2110,7 @@ Also see `help-window-select'."
   'help-enable-autoload "27.1")
 
 (defcustom help-enable-autoload t
-  "Whether Help commands can perform autoloading.
+  "Whether Help commands can perform autoloading in order to show key bindings.
 If non-nil, whenever \\[describe-function] is called for an
 autoloaded function whose docstring contains any key substitution
 construct (see `substitute-command-keys'), the library is loaded,

From dfc7cf8e411964d220843cd03a15be1ce06fbb3f Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 6 May 2026 14:48:28 +0300
Subject: [PATCH 359/463] ; * etc/NEWS (margin): Fix a typo, improve wording,
 move to proper place.

---
 etc/NEWS | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 72754769822..0c221d049e0 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -24,14 +24,6 @@ applies, and please also update docstrings as needed.
 
 * Installation Changes in Emacs 31.1
 
-+++
-** New face 'margin' for the window margin background.
-A new basic face 'margin' is used by default for text displayed in the
-left and right margin areas, i.e., the areas reserved by packages such as
-git-gutter, lsp-mode, and hl-diff for per-line annotations.  Its
-background defaults to the frame default, so existing behavior is
-unchanged for users who do not customize it.
-
 +++
 ** Unexec dumper removed.
 The traditional unexec dumper, deprecated since Emacs 27, has been
@@ -96,6 +88,13 @@ Previously, only spacing below the line could be specified.  The user
 option can now be set to a cons cell to specify spacing both above and
 below the line, which allows for vertically centering text.
 
++++
+** New face 'margin' for the window margin display.
+A new basic face 'margin' is used by default for text displayed in the
+left and right margin areas, which are used by various packages for
+per-line annotations.  Its background defaults to the frame default, so
+existing behavior is unchanged for users who do not customize it.
+
 +++
 ** 'prettify-symbols-mode' attempts to ignore undisplayable characters.
 Previously, such characters would be rendered as, e.g., white boxes.

From eae96d9fcb8ea44f94eaf9e4511739a7f93aadf8 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 6 May 2026 16:06:50 +0200
Subject: [PATCH 360/463] Handle long environment variables in Tramp oricesses

* lisp/net/tramp-sh.el (tramp-sh-handle-make-process):
Handle loooong environment variables.  (Bug#80783)

* test/lisp/net/tramp-tests.el (tramp-test33-environment-variables):
Adapt test.
---
 lisp/net/tramp-sh.el         | 14 ++++++++++++++
 test/lisp/net/tramp-tests.el | 15 +++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 8cade9ce095..92002b854b3 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3093,6 +3093,15 @@ will be used."
 			  (setq uenv (cons elt uenv))))))
 	     (env (setenv-internal
 		   env "INSIDE_EMACS" (tramp-inside-emacs) 'keep))
+	     ;; Environment is too large.  Keep it here.
+	     (eenv (and (> (apply #'+ (length env) (seq-map #'length env)) 2000)
+			env))
+	     (env (if (not eenv) env
+		    `(,(concat
+			"INSIDE_EMACS=" (getenv-internal "INSIDE_EMACS" env))
+		      ,(concat "PS1=" (getenv-internal "PS1" env)))))
+	     (eenv (setenv-internal eenv "INSIDE_EMACS" nil nil))
+	     (eenv (setenv-internal eenv "PS1" nil nil))
 	     (command
 	      (when (stringp program)
 		(format "cd %s && %s exec %s %s env %s %s"
@@ -3207,6 +3216,11 @@ will be used."
 			(widen)
 			(delete-region mark (point-max))
 			(narrow-to-region (point-max) (point-max))
+			;; Send delayed environment.
+			(dolist (entry eenv)
+			  (tramp-send-command
+			   v (format
+			      "export %s" (tramp-shell-quote-argument entry))))
 			;; Now do it.
 			(if command
 			    ;; Send the command.
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 05c3f72229d..c76d6d54c3d 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -6519,7 +6519,7 @@ INPUT, if non-nil, is a string sent to the process."
 	       ;; 	(should (= 11 (point)))))))))))))
 	       )))))))))
 
-;; This test is inspired by Bug#23952.
+;; This test is inspired by Bug#23952 and Bug#80783.
 (ert-deftest tramp-test33-environment-variables ()
   "Check that remote processes set / unset environment variables properly."
   :tags '(:expensive-test)
@@ -6611,7 +6611,18 @@ INPUT, if non-nil, is a string sent to the process."
 	      ;; We must suppress "_=VAR...".
 	      (funcall
 	       this-shell-command-to-string
-	       "printenv | grep -v PS1 | grep -v _=")))))))))
+	       "printenv | grep -v PS1 | grep -v _="))))))
+
+      ;; Handle looooong environment variables.  Bug#80783.
+      ;; FIXME: Make it also work in the synchronous case.
+      (unless (or (eq this-shell-command-to-string 'shell-command-to-string)
+		  (tramp-direct-async-process-p))
+	(let* ((bad (concat envvar "=" (make-string 2024 ?x)))
+	       (process-environment
+		(cl-list* bad bad bad bad process-environment)))
+	  (should
+	   (string-match-p
+	    "foo" (funcall this-shell-command-to-string "echo foo"))))))))
 
 (tramp--test-deftest-direct-async-process tramp-test33-environment-variables)
 

From 39e15056832d9136d05c26bc04a96a1f549669cf Mon Sep 17 00:00:00 2001
From: Eshel Yaron <me@eshelyaron.com>
Date: Wed, 6 May 2026 15:24:53 +0200
Subject: [PATCH 361/463] ; Expand 'elisp-fontify-symbol' and
 'elisp-scope-analyze-form' docs

See discussion at
https://yhetil.org/emacs/868q9wag3h.fsf@gnu.org/

* lisp/progmodes/elisp-mode.el (elisp-fontify-symbol):
* lisp/emacs-lisp/elisp-scope.el (elisp-scope-analyze-form):
Expand docstring.
---
 lisp/emacs-lisp/elisp-scope.el | 4 ++++
 lisp/progmodes/elisp-mode.el   | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/elisp-scope.el b/lisp/emacs-lisp/elisp-scope.el
index 1dad4a558a3..7f66e277b2f 100644
--- a/lisp/emacs-lisp/elisp-scope.el
+++ b/lisp/emacs-lisp/elisp-scope.el
@@ -2828,6 +2828,10 @@ is locally defined, or nil.  If SYM is itself a binding occurrence, then
 POS and DEF are equal.  If SYM is not lexically bound, then DEF is nil
 and so is ID.
 
+CALLBACK should use ID by checking if it is nil or `equal' to other ID
+values produced in the same call to this function.  The specific value
+of a given ID is otherwise meaningless.
+
 As an example, when this function analyzes the following form
 
   (lambda (mode) (let ((mode (or mode major-mode))) (symbol-name mode)))
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 6ccbe14f265..5a550b33016 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -618,7 +618,9 @@ semantic highlighting takes precedence."
 
 If `elisp-add-help-echo' is non-nil, also annotate the symbol with the
 `help-echo' text property.  If `cursor-sensor-mode' is enabled and ID is
-non-nil, also annotate the symbol with `cursor-sensor-functions'.
+non-nil (i.e. SYM is local variable), also annotate the symbol with
+`cursor-sensor-functions' that highlight all occurrences of SYM with the
+same ID whenever point is on this SYM.
 
 For the precise meaning of the arguments of this function, see the
 docstring of `elisp-scope-analyze-form'.  This function is intended for

From 187efe4e312f48c93a8afd406997acd4aaf8c0db Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 6 May 2026 18:54:09 +0300
Subject: [PATCH 362/463] ; * lisp/emacs-lisp/elisp-scope.el
 (elisp-scope-analyze-form): Doc fix.

---
 lisp/emacs-lisp/elisp-scope.el | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lisp/emacs-lisp/elisp-scope.el b/lisp/emacs-lisp/elisp-scope.el
index 7f66e277b2f..e0198b53b63 100644
--- a/lisp/emacs-lisp/elisp-scope.el
+++ b/lisp/emacs-lisp/elisp-scope.el
@@ -2824,9 +2824,10 @@ SYM; POS is the position of SYM in STREAM; ID is an object that uniquely
 identifies the local reference of SYM in the current defun, so different
 occurrences of SYM get the same ID (up to `equal') if and only if they
 refer to the same object; and lastly, DEF is the position in which SYM
-is locally defined, or nil.  If SYM is itself a binding occurrence, then
-POS and DEF are equal.  If SYM is not lexically bound, then DEF is nil
-and so is ID.
+is locally defined, or nil.  For the occurrence of SYM at the position
+where it is locally defined (a.k.a. \"bound\"), the values of POS and
+DEF are equal.  If SYM is not lexically bound, then DEF is nil and so
+is ID.
 
 CALLBACK should use ID by checking if it is nil or `equal' to other ID
 values produced in the same call to this function.  The specific value

From 581db34a7724c74195958ab1aad6c9a8781feddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Marks?= <shipmints@gmail.com>
Date: Sun, 3 May 2026 06:39:29 -0400
Subject: [PATCH 363/463] ; Fix crash in macOS Accessibility Zoom timer
 (bug#80624)

* src/nsterm.m (cancel_ns_deferred_UAZoomChangeFocus_timer): New function.
([EmacsView windowWillClose:]): New method. Cancel the timer if the window
closes before it runs.
([EmacsView deferredhandler:]): Guard against emacsframe being deleted before
the timer runs.
---
 src/nsterm.m | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/nsterm.m b/src/nsterm.m
index 0dbb59344a3..2507053f3a1 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -8420,14 +8420,38 @@ - (void)windowDidBecomeKey      /* for direct calls */
   ns_send_appdefined (-1);  // Kick main loop
 }
 
+#ifdef NS_IMPL_COCOA
+static void cancel_ns_deferred_UAZoomChangeFocus_timer ()
+{
+  if (ns_deferred_UAZoomChangeFocus_timer
+      && ns_deferred_UAZoomChangeFocus_timer.valid)
+    {
+      [ns_deferred_UAZoomChangeFocus_timer invalidate];
+      [ns_deferred_UAZoomChangeFocus_timer release];
+    }
+  ns_deferred_UAZoomChangeFocus_timer = nil;
+}
+#endif
+
+- (void)windowWillClose: (NSNotification *)notification
+{
+#ifdef NS_IMPL_COCOA
+  /* Cancel the zoom focus change timer if its window is closed before
+     it runs.  */
+  cancel_ns_deferred_UAZoomChangeFocus_timer ();
+#endif
+}
+
 #ifdef NS_IMPL_COCOA
 - (void)deferred_UAZoomChangeFocus_handler: (NSTimer *)timer
 {
-  EmacsView *view = FRAME_NS_VIEW (emacsframe);
-  ns_UAZoomChangeFocus (view, true);
-  [ns_deferred_UAZoomChangeFocus_timer invalidate];
-  [ns_deferred_UAZoomChangeFocus_timer release];
-  ns_deferred_UAZoomChangeFocus_timer = nil;
+  /* The frame may be deleted before the timer fires.  */
+  if (FRAME_LIVE_P (emacsframe))
+    {
+      EmacsView *view = FRAME_NS_VIEW (emacsframe);
+      ns_UAZoomChangeFocus (view, true);
+    }
+  cancel_ns_deferred_UAZoomChangeFocus_timer ();
 }
 #endif
 

From 6c3dc7aafd368b50c351fc4585dfc5d9ad41ba51 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dmitry@gutov.dev>
Date: Thu, 7 May 2026 03:55:03 +0300
Subject: [PATCH 364/463] [GTK3] Improve the resize -> hide -> show scenario

* src/gtkutil.c (xg_frame_set_char_size)
(xg_frame_set_size_and_position): Call gtk_window_resize for
child frames too, to record _GtkWindowGeometryInfo#resize_width
and resize_height.  They are later looked up by
gtk_widget_show_all in x_make_frame_visible (bug#80662).
Without this the widgets go back and forth between the
remembered and actual sizes after make-visible.
---
 src/gtkutil.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 8c01f26ef2f..ce91d2a189b 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1224,6 +1224,7 @@ xg_frame_set_char_size (struct frame *f, int width, int height)
 #ifndef HAVE_PGTK
   if (FRAME_PARENT_FRAME (f))
     {
+      /* Send the resize request immediately.  */
       gdk_window_resize (gtk_widget_get_window (FRAME_GTK_OUTER_WIDGET (f)),
 			 outer_width, outer_height);
       /* Resize all inner widgets and Cairo surface right away so the
@@ -1234,9 +1235,8 @@ xg_frame_set_char_size (struct frame *f, int width, int height)
       x_cr_update_surface_desired_size (f, width, height);
 #endif
     }
-  else
-    gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-		       outer_width, outer_height);
+  gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
+		     outer_width, outer_height);
 #else
   if (FRAME_GTK_OUTER_WIDGET (f))
     gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
@@ -1346,6 +1346,8 @@ xg_frame_set_size_and_position (struct frame *f, int width, int height)
   gdk_window_move_resize (gwin, x, y, outer_width, outer_height);
   if (FRAME_PARENT_FRAME (f))
     {
+      /* Record the dimensions for GTK to remember after remapping.  */
+      gtk_window_resize (GTK_WINDOW (gwin), outer_width, outer_height);
       /* Resize all inner widgets and Cairo surface right away so the
 	 next redisplay drawing isn't clipped to the old size.  */
       GtkAllocation alloc = {0, 0, outer_width, outer_height};

From f20e3e473d10501ca9bc9f232ac7a0fd24ca72de Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dmitry@gutov.dev>
Date: Thu, 7 May 2026 04:00:54 +0300
Subject: [PATCH 365/463] [GTK3] Move the frame to position before showing

* src/xterm.c (x_make_frame_visible): Move XMoveWindow call before
gtk_widget_show_all, so that the move happens before the frame
become visible (bug#80662).
---
 src/xterm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xterm.c b/src/xterm.c
index f93ea391f70..c021d06dd5d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -29192,9 +29192,9 @@ x_make_frame_visible (struct frame *f)
 	{
 	  block_input ();
 #ifdef USE_GTK
-	  gtk_widget_show_all (FRAME_GTK_OUTER_WIDGET (f));
 	  XMoveWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
 		       f->left_pos, f->top_pos);
+	  gtk_widget_show_all (FRAME_GTK_OUTER_WIDGET (f));
 #else
 	  XMapRaised (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f));
 #endif

From 0c51be894f73597322adce4df9ec9b77f72b0292 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 7 May 2026 14:12:25 +0100
Subject: [PATCH 366/463] Unpreload package-activate-all

See <https://debbugs.gnu.org/80079#49> for my reasoning.

* lisp/emacs-lisp/package-activate.el (package-activate-all):
Unpreload.
---
 lisp/emacs-lisp/package-activate.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/package-activate.el b/lisp/emacs-lisp/package-activate.el
index f2d117cf44a..d79628b172b 100644
--- a/lisp/emacs-lisp/package-activate.el
+++ b/lisp/emacs-lisp/package-activate.el
@@ -431,7 +431,6 @@ Newer versions are always activated, regardless of FORCE."
   "Non-nil if `package-activate-all' has been run.")
 
 ;;;###autoload
-(progn ;; Make the function usable without loading `package.el'.
 (defun package-activate-all ()
   "Activate all installed packages.
 The variable `package-load-list' controls which packages to load."
@@ -460,7 +459,7 @@ The variable `package-load-list' controls which packages to load."
           ;; `declare-function' is currently not scoped, so if we use
           ;; it here, we end up with a redefinition warning instead :-)
           (with-no-warnings
-            (package--activate-all)))))))
+            (package--activate-all))))))
 
 (defun package--activate-all ()
   (dolist (elt (package--alist))

From 174f75f88893d255c993d9d7aa141c2acb37b050 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 7 May 2026 15:18:19 +0100
Subject: [PATCH 367/463] ; Fixes to Acknowledgments lists.

---
 doc/emacs/ack.texi   |  3 ++-
 doc/emacs/emacs.texi | 32 ++++++++++++++++++--------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 003047fc547..b17d0d87e3b 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -22,7 +22,8 @@ the distribution.
 @c and anyone who has made major enhancements in Emacs
 @c that many users would notice and consider important.
 @c Note this file is only used ifnottex; otherwise a shorter version in
-@c emacs.texi is used.
+@c emacs.texi is used.  Adding a name to this list should entail adding
+@c it to the list in emacs.texi too.
 
 @itemize @bullet
 @item
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 2071aaf3878..5111c59f637 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1463,27 +1463,30 @@ USA
 @node Acknowledgments
 @unnumberedsec Acknowledgments
 
+@c Nowadays we add names to this list only while simultaneously adding
+@c them to ack.texi.  There remain lots of names here that aren't in
+@c ack.texi for historical reasons.
 @c It's hard to update this fairly.
 @c I wonder if it would be better to drop it in favor of AUTHORS?
 Contributors to GNU Emacs include Jari Aalto, Eric Abrahamsen, Per Abrahamsen, Tomas
 Abrahamsson, Jay K. Adams, Alon Albert, Michael Albinus, Nagy
-Andras, Benjamin Andresen, Ralf Angeli, Dmitry Antipov, Joe Arceneaux, Emil @AA{}str@"om,
+Andras, Benjamin Andresen, Ralf Angeli, Dmitry Antipov, Aur@'elien
+Aptel, Joe Arceneaux, Emil @AA{}str@"om,
 Miles Bader, David Bakhash, Juanma Barranquero, Eli Barzilay, Thomas
 Baumann, Steven L. Baur, Jay Belanger, Alexander L. Belikoff,
 Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Stephen Berman, Jonas Bernoulli, Karl
-Berry, Anna M. Bigatti, Ray Blaak, Martin Blais, Jim Blandy, Johan
+Berry, Anna M. Bigatti, Ray Blaak, David Blacka, Martin Blais, Jim Blandy, Johan
 Bockg@aa{}rd, Jan B@"ocker, Joel Boehland, Lennart Borgman, Per Bothner,
 Terrence Brannon, Frank Bresz, Peter Breton, Emmanuel Briot, Kevin
 Broadey, Vincent Broman, Michael Brouwer, David M. Brown, Ken Brown, Stefan Bruda,
-Damien Cassou, Daniel Colascione,
 Georges Brun-Cottan, Joe Buehler, Scott Byer, W@l{}odek Bzyl, Tino Calancha,
-Bill Carpenter, Per Cederqvist, Hans Chalupsky, Chris Chase, Bob
-Chassell, Andrew Choi, Chong Yidong, Sacha Chua, Stewart Clamen, James
+Bill Carpenter, Damien Cassou, Per Cederqvist, Hans Chalupsky, Chris Chase, Bob
+Chassell, Jihyun Cho, Andrew Choi, Chong Yidong, Sacha Chua, Stewart Clamen, James
 Clark, Mike Clarkson, Glynn Clements, Andrea Corallo, Andrew Cohen, Daniel Colascione,
 Christoph Conrad, Ludovic Court@`es, Andrew Csillag,
 Toby Cubitt, Baoqiu Cui, Doug Cutting, Mathias Dahl, Yue Daian, Julien Danjou, Satyaki
 Das, Vivek Dasmohapatra, Dan Davison, Michael DeCorte, Gary Delp, Nachum
-Dershowitz, Dave Detlefs, Matthieu Devin, Christophe de Dinechin, Eri
+Dershowitz, Dave Detlefs, Matthieu Devin, Christophe de Dinechin, Eric
 Ding, Jan Dj@"arv, Lawrence R. Dodd, Carsten Dominik, Scott Draves,
 Benjamin Drieu, Viktor Dukhovni, Jacques Duthen, Dmitry Dzhus, John
 Eaton, Rolf Ebert, Carl Edman, David Edmondson, Paul Eggert, Stephen
@@ -1495,17 +1498,17 @@ Fuchs, Shigeru Fukaya, Xue Fuqiao, Hallvard Furuseth, Keith Gabryelski, Peter S.
 Galbraith, Kevin Gallagher, Fabi@'an E. Gallina, Kevin Gallo, Juan Le@'en Lahoz Garc@'ia,
 Howard Gayle, Daniel German, Stephen Gildea, Julien Gilles, David
 Gillespie, Bob Glickstein, Nicolas Goaziou, Deepak Goel, David De La Harpe Golden, Boris
-Goldowsky, David Goodger, Chris Gray, Kevin Greiner, Michelangelo Grigni, Odd
+Goldowsky, David Goodger, Jacob Gore, Chris Gray, Kevin Greiner, Michelangelo Grigni, Odd
 Gripenstam, Kai Gro@ss{}johann, Michael Gschwind, Bastien Guerry, Henry
 Guillaume, Dmitry Gutov, Doug Gwyn, Bruno Haible, Ken'ichi Handa, Lars Hansen, Chris
 Hanson, Jesper Harder, Alexandru Harsanyi, K. Shane Hartman, John
 Heidemann, Jon K. Hellan, Magnus Henoch, Markus Heritsch, Dirk
-Herrmann, Karl Heuer, Manabu Higashida, Konrad Hinsen, Torsten Hilbrich, Anders Holst,
+Herrmann, Karl Heuer, Manabu Higashida, Joe Hildebrand, Konrad Hinsen, Torsten Hilbrich, Anders Holst,
 Jeffrey C. Honig, J@"urgen H@"otzel, Tassilo Horn, Kurt Hornik, Khaled Hosny, Tom Houlder, Joakim
 Hove, Denis Howe, Lars Ingebrigtsen, Andrew Innes, Seiichiro Inoue,
 Philip Jackson, Martyn Jago, Pavel Janik, Paul Jarc, Ulf Jasper,
 Thorsten Jolitz, Michael K. Johnson, Kyle Jones, Terry Jones, Simon
-Josefsson, Alexandre Julliard, Arne J@o{}rgensen, Tomoji Kagatani,
+Josefsson, Alexandre Julliard, Arne J@o{}rgensen, Jambunathan K, Tomoji Kagatani,
 Brewster Kahle, Tokuya Kameshima, Lute Kamstra, Stefan Kangas, Ivan Kanis, David
 Kastrup, David Kaufman, Henry Kautz, Taichi Kawabata, Taro Kawagishi,
 Howard Kaye, Michael Kifer, Richard King, Wilhelm Kirschbaum, Peter Kleiweg,
@@ -1524,7 +1527,7 @@ Brian Marick, Simon Marshall, Bengt Martensson, Charlie Martin,
 Yukihiro Matsumoto, Tomohiro Matsuyama, David Maus, Thomas May, Will Mengarini, David
 Megginson, Jimmy Aguilar Mena, Stefan Merten, Ben A. Mesander, Wayne Mesard, Brad
 Miller, Lawrence Mitchell, Richard Mlynarik, Gerd M@"ollmann, Dani Moncayo, Stefan
-Monnier, Keith Moore, Jan Moringen, Morioka Tomohiko, Glenn Morris,
+Monnier, David Moore, Keith Moore, Jan Moringen, Morioka Tomohiko, Glenn Morris,
 Don Morrison, John Muhl, Diane Murray, Riccardo Murri, Sen Nagata, Erik Naggum,
 Gergely Nagy, Nobuyoshi Nakada, Thomas Neumann, Mike Newton, Thien-Thi Nguyen,
 Jurgen Nickelsen, Dan Nicolaescu, Hrvoje Nik@v{s}i@'c, Jeff Norden,
@@ -1535,7 +1538,8 @@ Jeff Peck, Damon Anton Permezel, Tom Perrine, William M. Perry, Per
 Persson, Jens Petersen, Nicolas Petton, Daniel Pfeiffer, Justus Piater, Richard L.
 Pieri, Fred Pierresteguy, Fran@,{c}ois Pinard, Daniel Pittman, Christian
 Plaunt, Alexander Pohoyda, David Ponce, Noam Postavsky, Francesco A. Potort@`i,
-Michael D. Prange, Mukesh Prasad, Steve Purcell, Vincenzo Pupillo, Ken Raeburn,
+Michael D. Prange, Mukesh Prasad, Steve Purcell, Vincenzo Pupillo,
+Jim Radford, Ken Raeburn,
 Marko Rahamaa, Ashwin Ram, Eric S. Raymond, Paul Reilly, Edward M. Reingold, David
 Reitter, Alex Rezinsky, Rob Riepel, Lara Rios, Adrian Robert, Nick
 Roberts, Roland B. Roberts, John Robinson, Denis B. Roegel, Danny
@@ -1550,18 +1554,18 @@ Schwartz, Oliver Seidel, Daniel Semyonov, Manuel Serrano, Paul Sexton,
 Hovav Shacham, Stanislav Shalunov, Marc Shapiro, Richard Sharman, Olin
 Shivers, Tibor @v{S}imko, Espen Skoglund, Rick Sladkey, Lynn Slater, Chris Smith,
 David Smith, JD Smith, Paul D. Smith, Wilson Snyder, William Sommerfeld, Simon
-South, Andre Spiegel, Michael Staats, Thomas Steffen, Ulf Stegemann,
+South, Andre Spiegel, Michael Staats, Richard M. Stallman, Thomas Steffen, Ulf Stegemann,
 Reiner Steib, Sam Steingold, Ake Stenhoff, Philipp Stephani, Peter Stephenson, Ken
 Stevens, Andy Stewart, Jonathan Stigelman, Martin Stjernholm, Kim F.
 Storm, Steve Strassmann, Christopher Suckling, Olaf Sylvester, Naoto
 Takahashi, Steven Tamm, Jan Tatarik, Jo@~ao T@'avora, Luc Teirlinck,
 Jean-Philippe Theberge, Jens T.@: Berger Thielemann, Spencer Thomas,
-Jim Thompson, Theodor Thornhill, Toru Tomabechi, David O'Toole, Markus Triska,
+Jim Thompson, Theodor Thornhill, Toru Tomabechi, Andy Oram, David O'Toole, Markus Triska,
 Tom Tromey, Eli Tziperman, Daiki Ueno, Masanobu Umeda, Rajesh Vaidheeswarran, Neil
 W. Van Dyke, Didier Verna, Joakim Verona, Ulrik Vieth, Geoffrey
 Voelker, Johan Vromans, Inge Wallin, John Paul Wallington, Colin
 Walters, Barry Warsaw, Christoph Wedler, Ilja Weis, Zhang Weize,
-Morten Welinder, Joseph Brian Wells, Rodney Whitby, John Wiegley,
+Morten Welinder, Joseph Brian Wells, Rodney Whitby, Sean Whitton, John Wiegley,
 Sascha Wilde, Ed Wilkinson, Mike Williams, Roland Winkler, Bill
 Wohler, Steven A. Wood, Dale R. Worley, Francis J. Wright, Felix
 S. T. Wu, Tom Wurgler, Yamamoto Mitsuharu, Po Lu, Katsumi Yamaoka,

From 838fc3547aa256bdada724447ad98368e07d5f12 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 7 May 2026 15:19:40 +0100
Subject: [PATCH 368/463] ; * doc/emacs/emacs.texi (Acknowledgments): Fill.

---
 doc/emacs/emacs.texi | 201 ++++++++++++++++++++++---------------------
 1 file changed, 104 insertions(+), 97 deletions(-)

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 5111c59f637..5e0bc37854f 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1468,107 +1468,114 @@ USA
 @c ack.texi for historical reasons.
 @c It's hard to update this fairly.
 @c I wonder if it would be better to drop it in favor of AUTHORS?
-Contributors to GNU Emacs include Jari Aalto, Eric Abrahamsen, Per Abrahamsen, Tomas
-Abrahamsson, Jay K. Adams, Alon Albert, Michael Albinus, Nagy
-Andras, Benjamin Andresen, Ralf Angeli, Dmitry Antipov, Aur@'elien
-Aptel, Joe Arceneaux, Emil @AA{}str@"om,
-Miles Bader, David Bakhash, Juanma Barranquero, Eli Barzilay, Thomas
-Baumann, Steven L. Baur, Jay Belanger, Alexander L. Belikoff,
-Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Stephen Berman, Jonas Bernoulli, Karl
-Berry, Anna M. Bigatti, Ray Blaak, David Blacka, Martin Blais, Jim Blandy, Johan
-Bockg@aa{}rd, Jan B@"ocker, Joel Boehland, Lennart Borgman, Per Bothner,
-Terrence Brannon, Frank Bresz, Peter Breton, Emmanuel Briot, Kevin
-Broadey, Vincent Broman, Michael Brouwer, David M. Brown, Ken Brown, Stefan Bruda,
-Georges Brun-Cottan, Joe Buehler, Scott Byer, W@l{}odek Bzyl, Tino Calancha,
-Bill Carpenter, Damien Cassou, Per Cederqvist, Hans Chalupsky, Chris Chase, Bob
-Chassell, Jihyun Cho, Andrew Choi, Chong Yidong, Sacha Chua, Stewart Clamen, James
-Clark, Mike Clarkson, Glynn Clements, Andrea Corallo, Andrew Cohen, Daniel Colascione,
-Christoph Conrad, Ludovic Court@`es, Andrew Csillag,
-Toby Cubitt, Baoqiu Cui, Doug Cutting, Mathias Dahl, Yue Daian, Julien Danjou, Satyaki
-Das, Vivek Dasmohapatra, Dan Davison, Michael DeCorte, Gary Delp, Nachum
-Dershowitz, Dave Detlefs, Matthieu Devin, Christophe de Dinechin, Eric
-Ding, Jan Dj@"arv, Lawrence R. Dodd, Carsten Dominik, Scott Draves,
-Benjamin Drieu, Viktor Dukhovni, Jacques Duthen, Dmitry Dzhus, John
-Eaton, Rolf Ebert, Carl Edman, David Edmondson, Paul Eggert, Stephen
-Eglen, Christian Egli, Torbj@"orn Einarsson, Helmut Eller, Tsugutomo
-Enami, David Engster, Hans Henrik Eriksen, Michael Ernst, Ata Etemadi, Frederick
-Farnbach, Oscar Figueiredo, Jared Finder, Fred Fish, Steve Fisk, Thomas Fitzsimmons,
-Karl Fogel, Gary Foster, Eric S. Fraga, Romain Francoise, Noah Friedman, Andreas
-Fuchs, Shigeru Fukaya, Xue Fuqiao, Hallvard Furuseth, Keith Gabryelski, Peter S.
-Galbraith, Kevin Gallagher, Fabi@'an E. Gallina, Kevin Gallo, Juan Le@'en Lahoz Garc@'ia,
+Contributors to GNU Emacs include Jari Aalto, Eric Abrahamsen, Per
+Abrahamsen, Tomas Abrahamsson, Jay K. Adams, Alon Albert, Michael
+Albinus, Nagy Andras, Benjamin Andresen, Ralf Angeli, Dmitry Antipov,
+Aur@'elien Aptel, Joe Arceneaux, Emil @AA{}str@"om, Miles Bader, David
+Bakhash, Juanma Barranquero, Eli Barzilay, Thomas Baumann, Steven
+L. Baur, Jay Belanger, Alexander L. Belikoff, Thomas Bellman, Scott
+Bender, Boaz Ben-Zvi, Sergey Berezin, Stephen Berman, Jonas Bernoulli,
+Karl Berry, Anna M. Bigatti, Ray Blaak, David Blacka, Martin Blais, Jim
+Blandy, Johan Bockg@aa{}rd, Jan B@"ocker, Joel Boehland, Lennart
+Borgman, Per Bothner, Terrence Brannon, Frank Bresz, Peter Breton,
+Emmanuel Briot, Kevin Broadey, Vincent Broman, Michael Brouwer, David
+M. Brown, Ken Brown, Stefan Bruda, Georges Brun-Cottan, Joe Buehler,
+Scott Byer, W@l{}odek Bzyl, Tino Calancha, Bill Carpenter, Damien
+Cassou, Per Cederqvist, Hans Chalupsky, Chris Chase, Bob Chassell,
+Jihyun Cho, Andrew Choi, Chong Yidong, Sacha Chua, Stewart Clamen, James
+Clark, Mike Clarkson, Glynn Clements, Andrea Corallo, Andrew Cohen,
+Daniel Colascione, Christoph Conrad, Ludovic Court@`es, Andrew Csillag,
+Toby Cubitt, Baoqiu Cui, Doug Cutting, Mathias Dahl, Yue Daian, Julien
+Danjou, Satyaki Das, Vivek Dasmohapatra, Dan Davison, Michael DeCorte,
+Gary Delp, Nachum Dershowitz, Dave Detlefs, Matthieu Devin, Christophe
+de Dinechin, Eric Ding, Jan Dj@"arv, Lawrence R. Dodd, Carsten Dominik,
+Scott Draves, Benjamin Drieu, Viktor Dukhovni, Jacques Duthen, Dmitry
+Dzhus, John Eaton, Rolf Ebert, Carl Edman, David Edmondson, Paul Eggert,
+Stephen Eglen, Christian Egli, Torbj@"orn Einarsson, Helmut Eller,
+Tsugutomo Enami, David Engster, Hans Henrik Eriksen, Michael Ernst, Ata
+Etemadi, Frederick Farnbach, Oscar Figueiredo, Jared Finder, Fred Fish,
+Steve Fisk, Thomas Fitzsimmons, Karl Fogel, Gary Foster, Eric S. Fraga,
+Romain Francoise, Noah Friedman, Andreas Fuchs, Shigeru Fukaya, Xue
+Fuqiao, Hallvard Furuseth, Keith Gabryelski, Peter S. Galbraith, Kevin
+Gallagher, Fabi@'an E. Gallina, Kevin Gallo, Juan Le@'en Lahoz Garc@'ia,
 Howard Gayle, Daniel German, Stephen Gildea, Julien Gilles, David
-Gillespie, Bob Glickstein, Nicolas Goaziou, Deepak Goel, David De La Harpe Golden, Boris
-Goldowsky, David Goodger, Jacob Gore, Chris Gray, Kevin Greiner, Michelangelo Grigni, Odd
-Gripenstam, Kai Gro@ss{}johann, Michael Gschwind, Bastien Guerry, Henry
-Guillaume, Dmitry Gutov, Doug Gwyn, Bruno Haible, Ken'ichi Handa, Lars Hansen, Chris
-Hanson, Jesper Harder, Alexandru Harsanyi, K. Shane Hartman, John
-Heidemann, Jon K. Hellan, Magnus Henoch, Markus Heritsch, Dirk
-Herrmann, Karl Heuer, Manabu Higashida, Joe Hildebrand, Konrad Hinsen, Torsten Hilbrich, Anders Holst,
-Jeffrey C. Honig, J@"urgen H@"otzel, Tassilo Horn, Kurt Hornik, Khaled Hosny, Tom Houlder, Joakim
-Hove, Denis Howe, Lars Ingebrigtsen, Andrew Innes, Seiichiro Inoue,
-Philip Jackson, Martyn Jago, Pavel Janik, Paul Jarc, Ulf Jasper,
-Thorsten Jolitz, Michael K. Johnson, Kyle Jones, Terry Jones, Simon
-Josefsson, Alexandre Julliard, Arne J@o{}rgensen, Jambunathan K, Tomoji Kagatani,
-Brewster Kahle, Tokuya Kameshima, Lute Kamstra, Stefan Kangas, Ivan Kanis, David
+Gillespie, Bob Glickstein, Nicolas Goaziou, Deepak Goel, David De La
+Harpe Golden, Boris Goldowsky, David Goodger, Jacob Gore, Chris Gray,
+Kevin Greiner, Michelangelo Grigni, Odd Gripenstam, Kai Gro@ss{}johann,
+Michael Gschwind, Bastien Guerry, Henry Guillaume, Dmitry Gutov, Doug
+Gwyn, Bruno Haible, Ken'ichi Handa, Lars Hansen, Chris Hanson, Jesper
+Harder, Alexandru Harsanyi, K. Shane Hartman, John Heidemann, Jon
+K. Hellan, Magnus Henoch, Markus Heritsch, Dirk Herrmann, Karl Heuer,
+Manabu Higashida, Joe Hildebrand, Konrad Hinsen, Torsten Hilbrich,
+Anders Holst, Jeffrey C. Honig, J@"urgen H@"otzel, Tassilo Horn, Kurt
+Hornik, Khaled Hosny, Tom Houlder, Joakim Hove, Denis Howe, Lars
+Ingebrigtsen, Andrew Innes, Seiichiro Inoue, Philip Jackson, Martyn
+Jago, Pavel Janik, Paul Jarc, Ulf Jasper, Thorsten Jolitz, Michael
+K. Johnson, Kyle Jones, Terry Jones, Simon Josefsson, Alexandre
+Julliard, Arne J@o{}rgensen, Jambunathan K, Tomoji Kagatani, Brewster
+Kahle, Tokuya Kameshima, Lute Kamstra, Stefan Kangas, Ivan Kanis, David
 Kastrup, David Kaufman, Henry Kautz, Taichi Kawabata, Taro Kawagishi,
-Howard Kaye, Michael Kifer, Richard King, Wilhelm Kirschbaum, Peter Kleiweg,
-Karel Kl@'i@v{c}, Shuhei Kobayashi, Pavel Kobyakov, Larry K. Kolodney, David
-Howard Kaye, Michael Kifer, Richard King, Peter Kleiweg,
-M. Koppelman, Koseki Yoshinori, Robert Krawitz, Sebastian Kremer,
-Ryszard Kubiak, Tak Kunihiro, Igor Kuzmin, David K@aa{}gedal, Daniel LaLiberte, Karl
-Landstrom, Mario Lang, Aaron Larson, James R. Larus, Gemini Lasswell, Vinicius Jose
-Latorre, Werner Lemberg, Frederic Lepied, Peter Liljenberg, Christian
-Limpach, Lars Lindberg, Chris Lindblad, Anders Lindgren, Thomas Link,
-Juri Linkov, Francis Litterio, Sergey Litvinov, Leo Liu, Emilio C. Lopes,
-Martin Lorentzson, Dave Love, Eric Ludlam, K@'aroly L@H{o}rentey, Sascha
-L@"udecke, Greg McGary, Roland McGrath, Michael McNamara, Alan Mackenzie,
-Christopher J. Madsen, Neil M. Mager, Arni Magnusson, Artur Malabarba, Ken Manheimer, Bill Mann,
-Brian Marick, Simon Marshall, Bengt Martensson, Charlie Martin,
-Yukihiro Matsumoto, Tomohiro Matsuyama, David Maus, Thomas May, Will Mengarini, David
-Megginson, Jimmy Aguilar Mena, Stefan Merten, Ben A. Mesander, Wayne Mesard, Brad
-Miller, Lawrence Mitchell, Richard Mlynarik, Gerd M@"ollmann, Dani Moncayo, Stefan
-Monnier, David Moore, Keith Moore, Jan Moringen, Morioka Tomohiko, Glenn Morris,
-Don Morrison, John Muhl, Diane Murray, Riccardo Murri, Sen Nagata, Erik Naggum,
-Gergely Nagy, Nobuyoshi Nakada, Thomas Neumann, Mike Newton, Thien-Thi Nguyen,
-Jurgen Nickelsen, Dan Nicolaescu, Hrvoje Nik@v{s}i@'c, Jeff Norden,
-Andrew Norman, Theresa O'Connor, Kentaro Ohkouchi, Christian Ohler,
-Kenichi Okada, Alexandre Oliva, Bob Olson, Michael Olson, Takaaki Ota,
-Mark Oteiza, Pieter E. J. Pareit, Ross Patterson, David Pearson, Juan Pechiar,
-Jeff Peck, Damon Anton Permezel, Tom Perrine, William M. Perry, Per
-Persson, Jens Petersen, Nicolas Petton, Daniel Pfeiffer, Justus Piater, Richard L.
-Pieri, Fred Pierresteguy, Fran@,{c}ois Pinard, Daniel Pittman, Christian
-Plaunt, Alexander Pohoyda, David Ponce, Noam Postavsky, Francesco A. Potort@`i,
-Michael D. Prange, Mukesh Prasad, Steve Purcell, Vincenzo Pupillo,
-Jim Radford, Ken Raeburn,
-Marko Rahamaa, Ashwin Ram, Eric S. Raymond, Paul Reilly, Edward M. Reingold, David
-Reitter, Alex Rezinsky, Rob Riepel, Lara Rios, Adrian Robert, Nick
-Roberts, Roland B. Roberts, John Robinson, Denis B. Roegel, Danny
-Roozendaal, Sebastian Rose, William Rosenblatt, Markus Rost, Guillermo
-J. Rozas, Martin Rudalics, Ivar Rummelhoff, Jason Rumney, Wolfgang
-Rupprecht, Benjamin Rutt, Kevin Ryde, Phil Sainty, James B. Salem, Masahiko Sato,
-Timo Savola, Jorgen Sch@"afer, Holger Schauer, William Schelter, Ralph
-Schleicher, Gregor Schmid, Michael Schmidt, Ronald S. Schnell,
-Philippe Schnoebelen, Jan Schormann, Alex Schroeder, Stefan Schoef,
-Rainer Sch@"opf, Raymond Scholz, Eric Schulte, Andreas Schwab, Randal
-Schwartz, Oliver Seidel, Daniel Semyonov, Manuel Serrano, Paul Sexton,
-Hovav Shacham, Stanislav Shalunov, Marc Shapiro, Richard Sharman, Olin
-Shivers, Tibor @v{S}imko, Espen Skoglund, Rick Sladkey, Lynn Slater, Chris Smith,
-David Smith, JD Smith, Paul D. Smith, Wilson Snyder, William Sommerfeld, Simon
-South, Andre Spiegel, Michael Staats, Richard M. Stallman, Thomas Steffen, Ulf Stegemann,
-Reiner Steib, Sam Steingold, Ake Stenhoff, Philipp Stephani, Peter Stephenson, Ken
-Stevens, Andy Stewart, Jonathan Stigelman, Martin Stjernholm, Kim F.
+Howard Kaye, Michael Kifer, Richard King, Wilhelm Kirschbaum, Peter
+Kleiweg, Karel Kl@'i@v{c}, Shuhei Kobayashi, Pavel Kobyakov, Larry
+K. Kolodney, David Howard Kaye, Michael Kifer, Richard King, Peter
+Kleiweg, M. Koppelman, Koseki Yoshinori, Robert Krawitz, Sebastian
+Kremer, Ryszard Kubiak, Tak Kunihiro, Igor Kuzmin, David K@aa{}gedal,
+Daniel LaLiberte, Karl Landstrom, Mario Lang, Aaron Larson, James
+R. Larus, Gemini Lasswell, Vinicius Jose Latorre, Werner Lemberg,
+Frederic Lepied, Peter Liljenberg, Christian Limpach, Lars Lindberg,
+Chris Lindblad, Anders Lindgren, Thomas Link, Juri Linkov, Francis
+Litterio, Sergey Litvinov, Leo Liu, Emilio C. Lopes, Martin Lorentzson,
+Dave Love, Eric Ludlam, K@'aroly L@H{o}rentey, Sascha L@"udecke, Greg
+McGary, Roland McGrath, Michael McNamara, Alan Mackenzie, Christopher
+J. Madsen, Neil M. Mager, Arni Magnusson, Artur Malabarba, Ken
+Manheimer, Bill Mann, Brian Marick, Simon Marshall, Bengt Martensson,
+Charlie Martin, Yukihiro Matsumoto, Tomohiro Matsuyama, David Maus,
+Thomas May, Will Mengarini, David Megginson, Jimmy Aguilar Mena, Stefan
+Merten, Ben A. Mesander, Wayne Mesard, Brad Miller, Lawrence Mitchell,
+Richard Mlynarik, Gerd M@"ollmann, Dani Moncayo, Stefan Monnier, David
+Moore, Keith Moore, Jan Moringen, Morioka Tomohiko, Glenn Morris, Don
+Morrison, John Muhl, Diane Murray, Riccardo Murri, Sen Nagata, Erik
+Naggum, Gergely Nagy, Nobuyoshi Nakada, Thomas Neumann, Mike Newton,
+Thien-Thi Nguyen, Jurgen Nickelsen, Dan Nicolaescu, Hrvoje Nik@v{s}i@'c,
+Jeff Norden, Andrew Norman, Theresa O'Connor, Kentaro Ohkouchi,
+Christian Ohler, Kenichi Okada, Alexandre Oliva, Bob Olson, Michael
+Olson, Takaaki Ota, Mark Oteiza, Pieter E. J. Pareit, Ross Patterson,
+David Pearson, Juan Pechiar, Jeff Peck, Damon Anton Permezel, Tom
+Perrine, William M. Perry, Per Persson, Jens Petersen, Nicolas Petton,
+Daniel Pfeiffer, Justus Piater, Richard L. Pieri, Fred Pierresteguy,
+Fran@,{c}ois Pinard, Daniel Pittman, Christian Plaunt, Alexander
+Pohoyda, David Ponce, Noam Postavsky, Francesco A. Potort@`i, Michael
+D. Prange, Mukesh Prasad, Steve Purcell, Vincenzo Pupillo, Jim Radford,
+Ken Raeburn, Marko Rahamaa, Ashwin Ram, Eric S. Raymond, Paul Reilly,
+Edward M. Reingold, David Reitter, Alex Rezinsky, Rob Riepel, Lara Rios,
+Adrian Robert, Nick Roberts, Roland B. Roberts, John Robinson, Denis
+B. Roegel, Danny Roozendaal, Sebastian Rose, William Rosenblatt, Markus
+Rost, Guillermo J. Rozas, Martin Rudalics, Ivar Rummelhoff, Jason
+Rumney, Wolfgang Rupprecht, Benjamin Rutt, Kevin Ryde, Phil Sainty,
+James B. Salem, Masahiko Sato, Timo Savola, Jorgen Sch@"afer, Holger
+Schauer, William Schelter, Ralph Schleicher, Gregor Schmid, Michael
+Schmidt, Ronald S. Schnell, Philippe Schnoebelen, Jan Schormann, Alex
+Schroeder, Stefan Schoef, Rainer Sch@"opf, Raymond Scholz, Eric Schulte,
+Andreas Schwab, Randal Schwartz, Oliver Seidel, Daniel Semyonov, Manuel
+Serrano, Paul Sexton, Hovav Shacham, Stanislav Shalunov, Marc Shapiro,
+Richard Sharman, Olin Shivers, Tibor @v{S}imko, Espen Skoglund, Rick
+Sladkey, Lynn Slater, Chris Smith, David Smith, JD Smith, Paul D. Smith,
+Wilson Snyder, William Sommerfeld, Simon South, Andre Spiegel, Michael
+Staats, Richard M. Stallman, Thomas Steffen, Ulf Stegemann, Reiner
+Steib, Sam Steingold, Ake Stenhoff, Philipp Stephani, Peter Stephenson,
+Ken Stevens, Andy Stewart, Jonathan Stigelman, Martin Stjernholm, Kim F.
 Storm, Steve Strassmann, Christopher Suckling, Olaf Sylvester, Naoto
 Takahashi, Steven Tamm, Jan Tatarik, Jo@~ao T@'avora, Luc Teirlinck,
-Jean-Philippe Theberge, Jens T.@: Berger Thielemann, Spencer Thomas,
-Jim Thompson, Theodor Thornhill, Toru Tomabechi, Andy Oram, David O'Toole, Markus Triska,
-Tom Tromey, Eli Tziperman, Daiki Ueno, Masanobu Umeda, Rajesh Vaidheeswarran, Neil
-W. Van Dyke, Didier Verna, Joakim Verona, Ulrik Vieth, Geoffrey
-Voelker, Johan Vromans, Inge Wallin, John Paul Wallington, Colin
-Walters, Barry Warsaw, Christoph Wedler, Ilja Weis, Zhang Weize,
-Morten Welinder, Joseph Brian Wells, Rodney Whitby, Sean Whitton, John Wiegley,
-Sascha Wilde, Ed Wilkinson, Mike Williams, Roland Winkler, Bill
-Wohler, Steven A. Wood, Dale R. Worley, Francis J. Wright, Felix
-S. T. Wu, Tom Wurgler, Yamamoto Mitsuharu, Po Lu, Katsumi Yamaoka,
+Jean-Philippe Theberge, Jens T.@: Berger Thielemann, Spencer Thomas, Jim
+Thompson, Theodor Thornhill, Toru Tomabechi, Andy Oram, David O'Toole,
+Markus Triska, Tom Tromey, Eli Tziperman, Daiki Ueno, Masanobu Umeda,
+Rajesh Vaidheeswarran, Neil W. Van Dyke, Didier Verna, Joakim Verona,
+Ulrik Vieth, Geoffrey Voelker, Johan Vromans, Inge Wallin, John Paul
+Wallington, Colin Walters, Barry Warsaw, Christoph Wedler, Ilja Weis,
+Zhang Weize, Morten Welinder, Joseph Brian Wells, Rodney Whitby, Sean
+Whitton, John Wiegley, Sascha Wilde, Ed Wilkinson, Mike Williams, Roland
+Winkler, Bill Wohler, Steven A. Wood, Dale R. Worley, Francis J. Wright,
+Felix S. T. Wu, Tom Wurgler, Yamamoto Mitsuharu, Po Lu, Katsumi Yamaoka,
 Masatake Yamato, Jonathan Yavner, Ryan Yeske, Ilya Zakharevich, Milan
 Zamazal, Victor Zandy, Eli Zaretskii, Jamie Zawinski, Andrew Zhilin,
 Shenghuo Zhu, Piotr Zieli@'nski, Ian T. Zimmermann, Reto Zimmermann,

From fdab8a91858f0581209b6058dabdd706b608edb5 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 7 May 2026 15:24:10 +0100
Subject: [PATCH 369/463] ; Revert Eric's commits from February.

These will be resubmitted as patches for review.

Revert "Repair another test bollixed by aggressive optimization."
This reverts commit 47735e0243ba15a485e1a6f25be53f6e42dafa24.

Revert "Repair ab ecal test by making a variable kexical,"
This reverts commit ca42055b0ca3bba1b635e314f084239f5a205534.

Revert "Complete the test set for floatfns,c."
This reverts commit 1b0c8d6b95f0704936e4449270a815abb8865c3d.

Revert "Tesrts for the portable primitives in fileio.c."
This reverts commit a339c6827c0bb1e80de1cfb9c51b4c4b764046bc.

Revert "Tests for primitives in coding.c and charset.c."
This reverts commit 5749b2e4f4d11dd646892e70f520700e4f0f16f5.

Revert "Tests for primitives from the character.c module."
This reverts commit b09f8df206aae1e4b70d8961e6693d574aea6a30.

Revert "Tests for the lreaf.c amd print.c primitives."
This reverts commit d7a3d442b4cdfd88447eec49339dfa5d69342de9.

Revert "Tests for remaining functions iun eval.c."
This reverts commit cd038e5617ff940ead880fbc9c1df95e61453246.

Revert "Completing test coverage for dataa.c orimitives."
This reverts commit a6e19d6179ad608688c6edcc2b1f7368c05dff69.

Revert "More correctness tesrs for orinitives from fns.c."
This reverts commit 40ff4512ad12fd29a5bea887fe77c3bddfa4caec.

Revert "More tests for edit functions, buffers, and markers."
This reverts commit 67e8f875627e38450a6c713e810dcea2106c6d9c.

Revert "Added more buffer/marker/editing test coverage."
This reverts commit 3dda4b85e8a66a0c5592197dcc2895d65c04bc51.

Revert "Category/charset/coding + char-table tests."
This reverts commit 7a93a7b3345f7ae4e8f487b562b19a4b5fed8496.

Revert "More test coverage improvements."
This reverts commit fc7339c46dc87d5d7051f976206bb5c4d9efdfb8.

Revert "More test coverage improvements."
This reverts commit 95329bf445841a763bafa4ea5e853fc1c6f6bf0a.

Revert "More test coverage improvements for ERT."
This reverts commit e42c579a544d3d254e55db2f6b70e55205987d36.

Revert "Crrections to tedt coverrage extensuion after bootstrap build."
This reverts commit 90af3295c7fa705381bf680ec8559503ea875683.

Revert "Improve test coverage of builtin predicates."
This reverts commit 6eb170b007a4ad63fe5666033df191f52d480739.

Revert "Tests for 2 marker primitives previously not covered."
This reverts commit 6d7f0acf9cc15b388f90363d012aaba3d95be6c8.

Revert "Tests for 7 editor primitives previously not covered."
This reverts commit bb403e70aec25677393d4f37d544487a9aebab9e.
---
 test/src/buffer-tests.el       |  72 --------
 test/src/category-tests.el     |  71 --------
 test/src/character-tests.el    |  15 --
 test/src/charset-tests.el      | 121 -------------
 test/src/chartab-tests.el      |   9 -
 test/src/coding-tests.el       | 149 ----------------
 test/src/data-tests.el         | 199 ---------------------
 test/src/editfns-tests.el      | 308 ---------------------------------
 test/src/emacs-module-tests.el |   7 -
 test/src/eval-tests.el         | 172 ------------------
 test/src/fileio-tests.el       |  64 -------
 test/src/floatfns-tests.el     |  44 +----
 test/src/fns-tests.el          | 179 -------------------
 test/src/keymap-tests.el       |  16 --
 test/src/lread-tests.el        |  46 -----
 test/src/marker-tests.el       | 115 ------------
 test/src/minibuf-tests.el      |   4 -
 test/src/print-tests.el        |  40 -----
 18 files changed, 1 insertion(+), 1630 deletions(-)
 delete mode 100644 test/src/category-tests.el

diff --git a/test/src/buffer-tests.el b/test/src/buffer-tests.el
index 42c67459db5..3fae18011fb 100644
--- a/test/src/buffer-tests.el
+++ b/test/src/buffer-tests.el
@@ -25,8 +25,6 @@
 (require 'cl-lib)
 (require 'let-alist)
 
-(defvar buffer-tests--local-var :default)
-
 (defun overlay-tests-start-recording-modification-hooks (overlay)
   "Start recording modification hooks on OVERLAY.
 
@@ -271,76 +269,6 @@ with parameters from the *Messages* buffer modification."
   (with-temp-buffer
     (should (eq (buffer-base-buffer (current-buffer)) nil))))
 
-(ert-deftest buffer-tests--basic-buffer-primitives ()
-  (let ((buf (generate-new-buffer " *buffer-tests-basic*")))
-    (unwind-protect
-        (progn
-          (should (bufferp buf))
-          (should (buffer-live-p buf))
-          (should (equal (buffer-name buf) " *buffer-tests-basic*"))
-          (should (eq (get-buffer " *buffer-tests-basic*") buf))
-          (should (eq (get-buffer buf) buf))
-          (should (eq (get-buffer-create " *buffer-tests-basic*") buf))
-          (with-current-buffer buf
-            (insert "abc")
-            (should (= (buffer-size) 3))
-            (should (eq (set-buffer buf) buf)))
-          (with-current-buffer buf
-            (let ((new-name (rename-buffer " *buffer-tests-renamed*" t)))
-              (should (equal new-name " *buffer-tests-renamed*"))
-              (should (eq (get-buffer new-name) buf))))
-          (should (memq buf (buffer-list))))
-      (when (buffer-live-p buf)
-        (kill-buffer buf)))
-    (should-not (buffer-live-p buf))))
-
-(ert-deftest buffer-tests--other-buffer ()
-  (let ((b1 (generate-new-buffer " *buffer-tests-ob1*"))
-        (b2 (generate-new-buffer " *buffer-tests-ob2*")))
-    (unwind-protect
-        (with-current-buffer b1
-          (let ((other (other-buffer (current-buffer) t)))
-            (should (bufferp other))
-            (should (buffer-live-p other))
-            (should-not (eq other (current-buffer)))))
-      (when (buffer-live-p b1)
-        (kill-buffer b1))
-      (when (buffer-live-p b2)
-        (kill-buffer b2)))))
-
-(ert-deftest buffer-tests--buffer-last-name ()
-  (let ((buf (generate-new-buffer " *buffer-tests-last-name*")))
-    (unwind-protect
-        (with-current-buffer buf
-          (let ((first (buffer-name)))
-            (rename-buffer " *buffer-tests-last-name-2*" t)
-            (should (equal (buffer-last-name) first))
-            (rename-buffer " *buffer-tests-last-name-3*" t)
-            (should (equal (buffer-last-name) " *buffer-tests-last-name-2*"))))
-      (when (buffer-live-p buf)
-        (kill-buffer buf)))))
-
-(ert-deftest buffer-tests--buffer-local-value ()
-  (let ((buf1 (generate-new-buffer " *buffer-tests-local-1*"))
-        (buf2 (generate-new-buffer " *buffer-tests-local-2*"))
-        (old buffer-tests--local-var))
-    (unwind-protect
-        (progn
-          (setq buffer-tests--local-var :default)
-          (with-current-buffer buf1
-            (setq-local buffer-tests--local-var :buf1))
-          (with-current-buffer buf2
-            (setq-local buffer-tests--local-var :buf2))
-          (should (eq (buffer-local-value 'buffer-tests--local-var buf1) :buf1))
-          (should (eq (buffer-local-value 'buffer-tests--local-var buf2) :buf2))
-          (should (eq (buffer-local-value 'buffer-tests--local-var (current-buffer))
-                      :default)))
-      (setq buffer-tests--local-var old)
-      (when (buffer-live-p buf1)
-        (kill-buffer buf1))
-      (when (buffer-live-p buf2)
-        (kill-buffer buf2)))))
-
 (ert-deftest buffer-tests--overlays-indirect-bug58928 ()
   (with-temp-buffer
     (insert "hello world")
diff --git a/test/src/category-tests.el b/test/src/category-tests.el
deleted file mode 100644
index e66d7d40fe6..00000000000
--- a/test/src/category-tests.el
+++ /dev/null
@@ -1,71 +0,0 @@
-;;; category-tests.el --- Tests for category.c -*- lexical-binding: t -*-
-
-;; Copyright (C) 2026 Free Software Foundation, Inc.
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'ert)
-
-(ert-deftest category-tests-category-table ()
-  (let ((table (make-category-table)))
-    (should (category-table-p table))
-    (should (category-table-p (standard-category-table)))
-    (should-not (category-table-p (make-char-table 'foo)))))
-
-(ert-deftest category-tests-define-category-docstring ()
-  (let ((table (make-category-table)))
-    (define-category ?a "Alpha category." table)
-    (should (equal (category-docstring ?a table) "Alpha category."))
-    (should-error (define-category ?a "Duplicate." table))))
-
-(ert-deftest category-tests-set-category-table ()
-  (let ((table (make-category-table)))
-    (with-temp-buffer
-      (should (eq (set-category-table table) table))
-      (should (eq (category-table) table)))))
-
-(ert-deftest category-tests-category-set-mnemonics ()
-  (let ((set (make-category-set "aZ")))
-    (should (equal (category-set-mnemonics set) "Za")))
-  (let ((set (make-category-set "")))
-    (should (equal (category-set-mnemonics set) ""))))
-
-(ert-deftest category-tests-char-category-set ()
-  (let ((table (make-category-table)))
-    (define-category ?a "Alpha category." table)
-    (modify-category-entry ?x ?a table)
-    (with-temp-buffer
-      (set-category-table table)
-      (let ((mnemonics (category-set-mnemonics (char-category-set ?x))))
-        (should (string-match-p "a" mnemonics))))))
-
-(ert-deftest category-tests-copy-category-table ()
-  (let ((table (make-category-table)))
-    (define-category ?a "Alpha category." table)
-    (modify-category-entry ?x ?a table)
-    (let ((copy (copy-category-table table)))
-      (modify-category-entry ?x ?a table t)
-      (with-temp-buffer
-        (set-category-table copy)
-        (should (equal (category-set-mnemonics (char-category-set ?x)) "a")))
-      (with-temp-buffer
-        (set-category-table table)
-        (should (equal (category-set-mnemonics (char-category-set ?x)) ""))))))
-
-(provide 'category-tests)
-;;; category-tests.el ends here
diff --git a/test/src/character-tests.el b/test/src/character-tests.el
index ab94ae663dd..9c3dac24637 100644
--- a/test/src/character-tests.el
+++ b/test/src/character-tests.el
@@ -44,19 +44,4 @@
   (should (= (string-width "הַרְבֵּה אַהֲבָה") 9))
   (should (= (string-width "הַרְבֵּה אַהֲבָה" nil 8) 4)))
 
-(ert-deftest character-tests--multibyte-char-to-unibyte ()
-  (should (= (multibyte-char-to-unibyte ?A) ?A))
-  (should (= (multibyte-char-to-unibyte ?\N{LATIN SMALL LETTER E WITH ACUTE})
-             233))
-  (should (= (multibyte-char-to-unibyte ?\N{GREEK SMALL LETTER LAMDA}) -1))
-  (should-error (multibyte-char-to-unibyte "A")
-                :type 'wrong-type-argument))
-
-(ert-deftest character-tests--char-resolve-modifiers ()
-  (should (= (char-resolve-modifiers (logior ?\C-\0 ?a)) ?\C-a))
-  (should (= (char-resolve-modifiers (logior ?\S-\0 ?a)) ?A))
-  (should (= (char-resolve-modifiers (logior ?\C-\0 ??)) ?\C-?))
-  (let ((val (logior ?\M-\0 ?a)))
-    (should (= (char-resolve-modifiers val) val))))
-
 ;;; character-tests.el ends here
diff --git a/test/src/charset-tests.el b/test/src/charset-tests.el
index ff7af4fc5c2..1b26dc2a2ae 100644
--- a/test/src/charset-tests.el
+++ b/test/src/charset-tests.el
@@ -25,127 +25,6 @@
   "Test `decode-char'."
   (should-error (decode-char 'ascii 0.5)))
 
-(ert-deftest charset-tests-charsetp ()
-  (should (charsetp 'ascii))
-  (should (charsetp 'unicode))
-  (should-not (charsetp 'charset-tests-no-such-charset)))
-
-(ert-deftest charset-tests-charset-id-internal ()
-  (let ((id (charset-id-internal 'ascii)))
-    (should (integerp id))
-    (should (<= 0 id))))
-
-(ert-deftest charset-tests-charset-plist ()
-  (let ((plist (charset-plist 'ascii)))
-    (should (listp plist))
-    (should (stringp (plist-get plist :short-name)))))
-
-(ert-deftest charset-tests-charset-priority-list ()
-  (let ((list (charset-priority-list)))
-    (should (listp list))
-    (should (consp list))
-    (should (memq 'ascii list))
-    (dolist (cs list)
-      (should (charsetp cs))))
-  (let ((highest (charset-priority-list t)))
-    (should (symbolp highest))
-    (should (charsetp highest))))
-
-(ert-deftest charset-tests-charset-after ()
-  (with-temp-buffer
-    (insert "a")
-    (goto-char (point-min))
-    (should (eq (charset-after) 'ascii))
-    (should-not (charset-after (1+ (point-max))))))
-
-(ert-deftest charset-tests-find-charset-string ()
-  (let ((charsets (find-charset-string "abc")))
-    (should (memq 'ascii charsets))
-    (dolist (cs charsets)
-      (should (charsetp cs))))
-  (let ((charsets (find-charset-string "あ")))
-    (should (consp charsets))
-    (dolist (cs charsets)
-      (should (charsetp cs)))))
-
-(ert-deftest charset-tests-find-charset-region ()
-  (with-temp-buffer
-    (insert "abc")
-    (let ((charsets (find-charset-region (point-min) (point-max))))
-      (should (memq 'ascii charsets))
-      (dolist (cs charsets)
-        (should (charsetp cs))))))
-
-(ert-deftest charset-tests--map-charset-chars ()
-  (let (chars)
-    (map-charset-chars (lambda (range _arg)
-                         (setq chars (append chars
-                                             (number-sequence
-                                              (car range) (cdr range)))))
-                       'ascii nil 65 67)
-    (setq chars (sort (delete-dups chars) #'<))
-    (should (equal chars '(65 66 67)))))
-
-(ert-deftest charset-tests--define-charset-internal-errors ()
-  (should-error (define-charset-internal)))
-
-(defvar charset-tests--internal-counter 0)
-
-(ert-deftest charset-tests--define-charset-alias ()
-  (let ((alias (intern (format "charset-tests--alias-%d"
-                               (setq charset-tests--internal-counter
-                                     (1+ charset-tests--internal-counter))))))
-    (define-charset-alias alias 'ascii)
-    (should (charsetp alias))))
-
-(ert-deftest charset-tests--set-charset-plist ()
-  (let ((orig (charset-plist 'ascii)))
-    (unwind-protect
-        (progn
-          (set-charset-plist 'ascii '(:charset-tests t))
-          (should (equal (charset-plist 'ascii) '(:charset-tests t))))
-      (set-charset-plist 'ascii orig))))
-
-(ert-deftest charset-tests--unify-charset-error ()
-  (should-error (unify-charset 'ascii)))
-
-(ert-deftest charset-tests--get-unused-iso-final-char ()
-  (let ((val (get-unused-iso-final-char 1 94)))
-    (when val
-      (should (<= ?0 val))
-      (should (<= val ??)))))
-
-(ert-deftest charset-tests--declare-equiv-charset ()
-  (should-not (declare-equiv-charset 1 94 ?B 'ascii))
-  (should (eq (iso-charset 1 94 ?B) 'ascii)))
-
-(ert-deftest charset-tests--split-char ()
-  (let ((parts (split-char ?A)))
-    (should (eq (car parts) 'ascii))
-    (should (equal (cdr parts) '(65)))))
-
-(ert-deftest charset-tests--iso-charset ()
-  (should (eq (iso-charset 1 94 ?B) 'ascii)))
-
-(ert-deftest charset-tests--clear-charset-maps ()
-  (should-not (clear-charset-maps)))
-
-(ert-deftest charset-tests--set-charset-priority ()
-  (let ((orig (charset-priority-list)))
-    (unwind-protect
-        (progn
-          (set-charset-priority 'unicode)
-          (should (eq (charset-priority-list t) 'unicode)))
-      (apply #'set-charset-priority orig))))
-
-(ert-deftest charset-tests--sort-charsets ()
-  (let* ((priority (charset-priority-list))
-         (a (car priority))
-         (b (cadr priority)))
-    (skip-unless (and a b))
-    (let ((sorted (sort-charsets (list b a))))
-      (should (equal sorted (list a b))))))
-
 (ert-deftest charset-tests-define-charset ()
   (eval '(define-charset 'charset-tests-cs-1
            "Only used for testing"
diff --git a/test/src/chartab-tests.el b/test/src/chartab-tests.el
index 24b0f6d12d4..0f2e65b89a0 100644
--- a/test/src/chartab-tests.el
+++ b/test/src/chartab-tests.el
@@ -69,14 +69,5 @@
     (set-char-table-extra-slot tbl 1 'bar)
     (should (eq (char-table-extra-slot tbl 1) 'bar))))
 
-(ert-deftest chartab-test-char-table-range ()
-  (let ((tbl (make-char-table nil nil)))
-    (set-char-table-range tbl '(?a . ?z) 'letters)
-    (should (eq (char-table-range tbl ?a) 'letters))
-    (should (eq (char-table-range tbl '(?a . ?z)) 'letters))
-    (should-not (char-table-range tbl ?0))
-    (set-char-table-range tbl nil 'default)
-    (should (eq (char-table-range tbl nil) 'default))))
-
 (provide 'chartab-tests)
 ;;; chartab-tests.el ends here
diff --git a/test/src/coding-tests.el b/test/src/coding-tests.el
index c318b6f4e50..dc1abec2d58 100644
--- a/test/src/coding-tests.el
+++ b/test/src/coding-tests.el
@@ -24,10 +24,6 @@
 
 (require 'ert)
 
-;; Optional internal helpers (only defined with ENABLE_UTF_8_CONVERTER_TEST).
-(declare-function internal-encode-string-utf-8 "coding.c")
-(declare-function internal-decode-string-utf-8 "coding.c")
-
 ;; Directory to hold test data files.
 (defvar coding-tests-workdir
   (expand-file-name "coding-tests" temporary-file-directory))
@@ -425,48 +421,6 @@
         (should-not (eq (encode-coding-string s coding nil) s))
         (should (eq (encode-coding-string s coding t) s))))))
 
-(ert-deftest coding-tests-coding-system-p ()
-  (should (coding-system-p nil))
-  (should (coding-system-p 'utf-8))
-  (should-not (coding-system-p 'coding-tests-no-such-system)))
-
-(ert-deftest coding-tests-check-coding-system ()
-  (should (eq (check-coding-system 'utf-8) 'utf-8))
-  (should (eq (check-coding-system nil) nil))
-  (should-error (check-coding-system 'coding-tests-no-such-system)
-                :type 'coding-system-error))
-
-(ert-deftest coding-tests-coding-system-priority-list ()
-  (let ((list (coding-system-priority-list)))
-    (should (listp list))
-    (should (consp list))
-    (dolist (cs list)
-      (should (coding-system-p cs))))
-  (let ((highest (coding-system-priority-list t)))
-    (should (symbolp highest))
-    (should (coding-system-p highest))))
-
-(ert-deftest coding-tests-coding-system-aliases ()
-  (let ((aliases (coding-system-aliases 'utf-8)))
-    (should (listp aliases))
-    (should (memq 'utf-8 aliases))))
-
-(ert-deftest coding-tests-coding-system-plist ()
-  (let ((plist (coding-system-plist 'utf-8)))
-    (should (listp plist))
-    (should (plist-member plist :mnemonic))))
-
-(ert-deftest coding-tests-coding-system-put ()
-  (let* ((cs 'utf-8)
-         (mnemonic (plist-get (coding-system-plist cs) :mnemonic)))
-    (coding-system-put cs :mnemonic mnemonic)
-    (should (eq (plist-get (coding-system-plist cs) :mnemonic) mnemonic))))
-
-(ert-deftest coding-tests-coding-system-eol-type ()
-  (let ((eol (coding-system-eol-type 'utf-8-unix)))
-    (should (integerp eol))
-    (should (memq eol '(0 1 2)))))
-
 
 (ert-deftest coding-check-coding-systems-region ()
   (should (equal (check-coding-systems-region "aå" nil '(utf-8))
@@ -476,108 +430,5 @@
                  '((iso-latin-1 3) (us-ascii 1 3))))
   (should-error (check-coding-systems-region "å" nil '(bad-coding-system))))
 
-(ert-deftest coding-tests--detect-coding-string-null-byte ()
-  (let ((inhibit-null-byte-detection nil))
-    (should (memq 'no-conversion
-                  (detect-coding-string (string ?a ?\0 ?b)))))
-  (let ((inhibit-null-byte-detection t))
-    (should (memq 'undecided
-                  (detect-coding-string (string ?a ?\0 ?b))))))
-
-(ert-deftest coding-tests--detect-coding-string-iso-escape ()
-  (let ((s (decode-coding-string
-            (unibyte-string #x1b ?$ ?B ?A ?A #x1b ?\( ?B)
-            'no-conversion)))
-    (let ((inhibit-iso-escape-detection nil))
-      (should (memq 'iso-2022-7bit (detect-coding-string s))))
-    (let ((inhibit-iso-escape-detection t))
-      (should (memq 'undecided (detect-coding-string s))))))
-
-(ert-deftest coding-tests--detect-coding-region ()
-  (with-temp-buffer
-    (insert "abc")
-    (let ((coding (detect-coding-region (point-min) (point-max) t)))
-      (should (coding-system-p coding)))))
-
-(ert-deftest coding-tests--find-coding-systems-region-internal ()
-  (should (eq (find-coding-systems-region-internal "abc" nil nil) t))
-  (let ((result (find-coding-systems-region-internal (string #x03B1)
-                                                     nil nil)))
-    (should (listp result))
-    (should (memq 'utf-8 result))))
-
-(ert-deftest coding-tests--decode-encode-sjis ()
-  (should (equal (decode-sjis-char #x82A0) ?あ))
-  (should (= (encode-sjis-char ?あ) #x82A0))
-  (should-error (decode-sjis-char #x817F)))
-
-(ert-deftest coding-tests--decode-encode-big5 ()
-  (should (equal (decode-big5-char ?A) ?A))
-  (should (= (encode-big5-char ?A) ?A))
-  (should-error (decode-big5-char #xA17F)))
-
-(ert-deftest coding-tests--terminal-coding-system-internal ()
-  (let ((orig (terminal-coding-system)))
-    (unwind-protect
-        (progn
-          (set-terminal-coding-system-internal 'utf-8 nil)
-          (should (eq (terminal-coding-system) 'utf-8))
-          (set-safe-terminal-coding-system-internal 'us-ascii))
-      (set-terminal-coding-system-internal (or orig 'undecided) nil))))
-
-(ert-deftest coding-tests--keyboard-coding-system-internal ()
-  (let ((orig (keyboard-coding-system)))
-    (unwind-protect
-        (progn
-          (set-keyboard-coding-system-internal 'utf-8 nil)
-          (should (eq (keyboard-coding-system) 'utf-8)))
-      (set-keyboard-coding-system-internal orig nil))))
-
-(ert-deftest coding-tests--find-operation-coding-system ()
-  (let ((file-coding-system-alist '(("foo\\.txt\\'" . utf-8))))
-    (should (equal (find-operation-coding-system 'insert-file-contents
-                                                 "foo.txt")
-                   '(utf-8 . utf-8))))
-  (let ((file-coding-system-alist '(("foo\\.txt\\'" . coding-tests--cs-fn))))
-    (defun coding-tests--cs-fn (_args) 'utf-8)
-    (should (equal (find-operation-coding-system 'insert-file-contents
-                                                 "foo.txt")
-                   '(utf-8 . utf-8)))))
-
-(ert-deftest coding-tests--set-coding-system-priority ()
-  (let ((orig (coding-system-priority-list)))
-    (unwind-protect
-        (progn
-          (set-coding-system-priority 'utf-8)
-          (should (eq (coding-system-priority-list t) 'utf-8)))
-      (apply #'set-coding-system-priority orig))))
-
-(defvar coding-tests--internal-counter 0)
-
-(ert-deftest coding-tests--define-coding-system-internal ()
-  (let* ((name (intern (format "coding-tests--raw-%d"
-                               (setq coding-tests--internal-counter
-                                     (1+ coding-tests--internal-counter)))))
-         (plist (list :docstring "coding-tests raw")))
-    (define-coding-system-internal name ?r 'raw-text (list 'ascii)
-                                   t nil nil nil nil ?\  t plist 'unix)
-    (should (coding-system-p name))
-    (should (equal (plist-get (coding-system-plist name) :docstring)
-                   "coding-tests raw"))
-    (let ((alias (intern (format "coding-tests--raw-alias-%d"
-                                 coding-tests--internal-counter))))
-      (define-coding-system-alias alias name)
-      (should (memq alias (coding-system-aliases name)))
-      (should (eq (coding-system-base alias) name)))))
-
-(ert-deftest coding-tests--internal-utf-8-converters ()
-  (skip-unless (fboundp 'internal-encode-string-utf-8))
-  (let ((enc (internal-encode-string-utf-8 "abc" nil nil nil nil nil 1))
-        (dec (internal-decode-string-utf-8 "abc" nil nil nil nil nil 1)))
-    (should (stringp enc))
-    (should (equal enc "abc"))
-    (should (stringp dec))
-    (should (equal dec "abc"))))
-
 (provide 'coding-tests)
 ;;; coding-tests.el ends here
diff --git a/test/src/data-tests.el b/test/src/data-tests.el
index c64a8a98725..2fc971d0214 100644
--- a/test/src/data-tests.el
+++ b/test/src/data-tests.el
@@ -23,10 +23,6 @@
 
 (require 'cl-lib)
 
-(declare-function subr-native-comp-unit "data.c" (subr))
-(declare-function native-comp-unit-file "data.c" (comp-unit))
-(declare-function native-comp-unit-set-file "data.c" (comp-unit new-file))
-
 (defconst data-tests--float-greater-than-fixnums (+ 1.0 most-positive-fixnum)
   "A floating-point value that is greater than all fixnums.
 It is also as small as conveniently possible, to make the tests sharper.
@@ -35,159 +31,6 @@ practical Emacs platforms, since the result is a power of 2 and
 this is exactly representable and is greater than
 `most-positive-fixnum', which is just less than a power of 2.")
 
-(defvar data-tests--special-var nil
-  "Variable used to test `special-variable-p'.")
-
-(defvar data-tests--watch-var nil
-  "Variable used to test variable watchers.")
-
-(defvar data-tests--local-if-set-var :default
-  "Variable used to test local-variable-if-set-p and binding locus.")
-
-(ert-deftest data-tests-type-predicates ()
-  (let ((sym-with-pos (position-symbol 'data-tests--sym 3)))
-    (should (bare-symbol-p 'data-tests--sym))
-    (should-not (bare-symbol-p sym-with-pos))
-    (should-not (bare-symbol-p 42)))
-  (should (char-or-string-p ?a))
-  (should (char-or-string-p "a"))
-  (should-not (char-or-string-p 'a))
-  (should-not (char-or-string-p '(a)))
-  (let ((vec [1 2])
-        (ct (make-char-table 'data-tests--ct))
-        (bv (make-bool-vector 3 nil)))
-    (should (vector-or-char-table-p vec))
-    (should (vector-or-char-table-p ct))
-    (should-not (vector-or-char-table-p bv))
-    (should-not (vector-or-char-table-p "x")))
-  (let ((bv (bool-vector t nil t)))
-    (should (bool-vector-p bv))
-    (should-not (bool-vector-p [t nil]))
-    (should-not (bool-vector-p "t")))
-  (let ((a (bool-vector t nil t))
-        (b (bool-vector t t t))
-        (c (bool-vector nil nil t)))
-    (should (bool-vector-subsetp a b))
-    (should-not (bool-vector-subsetp b a))
-    (should (bool-vector-subsetp c b))
-    (should-error (bool-vector-subsetp a (bool-vector t nil))))
-  (let* ((interp (eval '(lambda (x) x)))
-         (bytec (byte-compile (eval '(lambda (x) x)))))
-    (should (closurep interp))
-    (should-not (closurep #'car))
-    (should (interpreted-function-p interp))
-    (should-not (interpreted-function-p bytec))
-    (should-not (interpreted-function-p #'car)))
-  (should (subrp (symbol-function 'car)))
-  (should (subrp (symbol-function '+)))
-  (should-not (subrp (lambda (x) x)))
-  (should-not (subrp 'car))
-  (should (special-variable-p 'data-tests--special-var))
-  (should (special-variable-p 'standard-output))
-  (should-not (special-variable-p 'data-tests--not-special)))
-
-(ert-deftest data-tests-basic-predicates ()
-  (should-not (nlistp nil))
-  (should-not (nlistp '(1 2)))
-  (should (nlistp 3))
-  (should (nlistp "x"))
-  (let ((sym-with-pos (position-symbol 'data-tests--sym 42)))
-    (should (symbol-with-pos-p sym-with-pos))
-    (should-not (symbol-with-pos-p 'data-tests--sym))
-    (should (= (symbol-with-pos-pos sym-with-pos) 42))
-    (should (eq (remove-pos-from-symbol sym-with-pos) 'data-tests--sym))
-    (should (eq (remove-pos-from-symbol 'data-tests--sym) 'data-tests--sym)))
-  (should (arrayp "abc"))
-  (should (arrayp [1 2]))
-  (should-not (arrayp '(1 2)))
-  (should (sequencep '(1 2)))
-  (should (sequencep nil))
-  (should (sequencep "abc"))
-  (should (sequencep [1 2]))
-  (should-not (sequencep 'data-tests--sym))
-  (with-temp-buffer
-    (should (markerp (point-marker)))
-    (should-not (markerp 1))))
-
-(ert-deftest data-tests-subr-introspection ()
-  (should (equal (subr-arity (symbol-function 'car)) '(1 . 1)))
-  (should (equal (subr-arity (symbol-function 'cons)) '(2 . 2)))
-  (should (equal (subr-arity (symbol-function 'list)) '(0 . many)))
-  (should (equal (subr-arity (symbol-function 'if)) '(2 . unevalled)))
-  (should (equal (subr-name (symbol-function 'car)) "car"))
-  (should (equal (subr-name (symbol-function 'cons)) "cons"))
-  (should (equal (subr-name (symbol-function 'if)) "if")))
-
-(ert-deftest data-tests-symbol-plist ()
-  (let* ((sym 'data-tests--plist-sym)
-         (orig (symbol-plist sym)))
-    (unwind-protect
-        (progn
-          (setplist sym '(a 1 b 2))
-          (should (equal (symbol-plist sym) '(a 1 b 2))))
-      (setplist sym orig))))
-
-(ert-deftest data-tests-subr-native-lambda-list ()
-  (let ((res (subr-native-lambda-list (symbol-function 'car))))
-    (should (or (eq res t) (listp res)))))
-
-(ert-deftest data-tests-native-comp-unit ()
-  (skip-unless (fboundp 'subr-native-comp-unit))
-  (let ((unit (subr-native-comp-unit (symbol-function 'symbol-file))))
-    (skip-unless unit)
-    (let ((orig (native-comp-unit-file unit)))
-      (native-comp-unit-set-file unit "data-tests-unit")
-      (should (equal (native-comp-unit-file unit) "data-tests-unit"))
-      (native-comp-unit-set-file unit orig))))
-
-(ert-deftest data-tests-command-modes ()
-  (defun data-tests--command () (interactive) t)
-  (unwind-protect
-      (progn
-        (put 'data-tests--command 'command-modes '(data-tests-mode))
-        (should (equal (command-modes 'data-tests--command) '(data-tests-mode))))
-    (put 'data-tests--command 'command-modes nil)
-    (fmakunbound 'data-tests--command)))
-
-(ert-deftest data-tests-get-variable-watchers ()
-  (let ((watcher (lambda (&rest _args) nil)))
-    (unwind-protect
-        (progn
-          (add-variable-watcher 'data-tests--watch-var watcher)
-          (should (member watcher (get-variable-watchers 'data-tests--watch-var))))
-      (remove-variable-watcher 'data-tests--watch-var watcher)
-      (should-not (get-variable-watchers 'data-tests--watch-var)))))
-
-(ert-deftest data-tests-local-variable-if-set-p ()
-  (with-temp-buffer
-    (should-not (local-variable-if-set-p 'data-tests--local-if-set-var))
-    (setq-local data-tests--local-if-set-var :local)
-    (should (local-variable-if-set-p 'data-tests--local-if-set-var))))
-
-(ert-deftest data-tests-variable-binding-locus ()
-  (with-temp-buffer
-    (should-not (variable-binding-locus 'data-tests--local-if-set-var))
-    (setq-local data-tests--local-if-set-var :local)
-    (should (eq (variable-binding-locus 'data-tests--local-if-set-var)
-                (current-buffer)))))
-
-(ert-deftest data-tests-indirect-function ()
-  (defun data-tests--if-target () 'ok)
-  (defalias 'data-tests--if-alias 'data-tests--if-target)
-  (unwind-protect
-      (progn
-        (should (eq (indirect-function 'data-tests--if-alias)
-                    (symbol-function 'data-tests--if-target)))
-        (let ((fun (lambda (x) x)))
-          (should (eq (indirect-function fun) fun))))
-    (fmakunbound 'data-tests--if-alias)
-    (fmakunbound 'data-tests--if-target)))
-
-(ert-deftest data-tests-byteorder ()
-  (let ((bo (byteorder)))
-    (should (integerp bo))
-    (should (memq bo (list ?B ?l)))))
-
 (ert-deftest data-tests-= ()
   (should-error (=))
   (should (= 1))
@@ -852,19 +695,12 @@ comparing the subr with a much slower Lisp implementation."
     (should (/= b-1 0.0e+NaN))))
 
 (ert-deftest data-tests-+ ()
-  (should (= (+) 0))
-  (should (= (+ 5) 5))
   (should-not (fixnump (+ most-positive-fixnum most-positive-fixnum)))
   (should (> (+ most-positive-fixnum most-positive-fixnum) most-positive-fixnum))
   (should (eq (- (+ most-positive-fixnum most-positive-fixnum)
                  (+ most-positive-fixnum most-positive-fixnum))
               0)))
 
-(ert-deftest data-tests-* ()
-  (should (= (*) 1))
-  (should (= (* 7) 7))
-  (should (= (* 2 3 4) 24)))
-
 (ert-deftest data-tests-/ ()
   (let* ((x (* most-positive-fixnum 8))
          (y (* most-negative-fixnum 8))
@@ -912,26 +748,6 @@ comparing the subr with a much slower Lisp implementation."
 (ert-deftest data-tests-logcount-2 ()
   (should (= (logcount (read "#xffffffffffffffffffffffffffffffff")) 128)))
 
-(ert-deftest data-tests-logcount-negative-bignum ()
-  (let ((n (- (ash 1 200))))
-    (should (bignump n))
-    (should (= (logcount n) (logcount (lognot n))))))
-
-(ert-deftest data-tests-lognot-bignum ()
-  (let ((n (ash 1 200))
-        (m (- (ash 1 180))))
-    (should (bignump n))
-    (should (bignump m))
-    (should (= (lognot n) (- -1 n)))
-    (should (= (lognot m) (- -1 m)))))
-
-(ert-deftest data-tests-bignum-bit-identities ()
-  (let ((n (1+ most-positive-fixnum)))
-    (should (bignump n))
-    (should (= (logand n (lognot n)) 0))
-    (should (= (logior n (lognot n)) -1))
-    (should (= (logxor n n) 0))))
-
 (ert-deftest data-tests-logior ()
   (should (= -1 (logior -1) (logior -1 -1)))
   (should (= -1 (logior most-positive-fixnum most-negative-fixnum))))
@@ -965,21 +781,6 @@ comparing the subr with a much slower Lisp implementation."
     (data-tests-check-sign (% -1 -3) (% nb1 nb3))
     (data-tests-check-sign (mod -1 -3) (mod nb1 nb3))))
 
-(ert-deftest data-tests-bignum-remainder-invariants ()
-  (let* ((b (1+ most-positive-fixnum))
-         (d 7)
-         (r (mod b d)))
-    (should (= b (+ (* d (floor (/ b d))) r)))
-    (should (<= 0 r))
-    (should (< r (abs d))))
-  (let* ((b (- (1+ most-positive-fixnum)))
-         (d 7)
-         (q (/ b d))
-         (r (% b d)))
-    (should (= b (+ (* q d) r)))
-    (should (<= r 0))
-    (should (> r (- (abs d))))))
-
 (ert-deftest data-tests-mod-0 ()
   (dolist (num (list (1- most-negative-fixnum) -1 0 1
                      (1+ most-positive-fixnum)))
diff --git a/test/src/editfns-tests.el b/test/src/editfns-tests.el
index ffede950bcf..9bdd5cf5db6 100644
--- a/test/src/editfns-tests.el
+++ b/test/src/editfns-tests.el
@@ -132,142 +132,6 @@
   "Number of args for `propertize' must be odd."
   (should-error (propertize "foo" 'bar) :type 'wrong-number-of-arguments))
 
-(ert-deftest editfns-tests--char-to-string-and-string-to-char ()
-  (should (equal (char-to-string ?A) "A"))
-  (should (= (string-to-char "A") ?A))
-  (should (= (string-to-char "") 0))
-  (should-error (char-to-string "A")))
-
-(ert-deftest editfns-tests--char-equal ()
-  (with-temp-buffer
-    (let ((case-fold-search nil))
-      (should (char-equal ?a ?a))
-      (should-not (char-equal ?a ?A))
-      (should-not (char-equal ?a ?b)))
-    (let ((case-fold-search t))
-      (should (char-equal ?a ?A))
-      (should (char-equal ?A ?a))
-      (should-not (char-equal ?a ?b)))))
-
-(ert-deftest editfns-tests--point-and-goto-char ()
-  (with-temp-buffer
-    (insert "abc")
-    (goto-char (point-min))
-    (should (= (point) (point-min)))
-    (should (= (goto-char 2) 2))
-    (should (= (point) 2))
-    (let ((m (point-marker)))
-      (should (= (marker-position m) 2))
-      (goto-char 3)
-      (should (= (point) 3)))))
-
-(ert-deftest editfns-tests--point-min-max-and-buffer-size ()
-  (with-temp-buffer
-    (insert "abc")
-    (should (= (point-min) 1))
-    (should (= (point-max) (1+ (buffer-size))))))
-
-(ert-deftest editfns-tests--region-beginning-end ()
-  (with-temp-buffer
-    (insert "abcd")
-    (goto-char 3)
-    (let ((mark-even-if-inactive t))
-      (set-mark 1)
-      (should (= (region-beginning) 1))
-      (should (= (region-end) 3))
-      (should (eq (marker-buffer (mark-marker)) (current-buffer)))
-      (should (= (marker-position (mark-marker)) 1)))))
-
-(ert-deftest editfns-tests--buffer-string-compare-substrings ()
-  (let ((buf1 (generate-new-buffer " *editfns-tests-cmp-1*"))
-        (buf2 (generate-new-buffer " *editfns-tests-cmp-2*")))
-    (unwind-protect
-        (progn
-          (with-current-buffer buf1
-            (insert "abc")
-            (should (equal (buffer-string) "abc")))
-          (with-current-buffer buf2
-            (insert "abd"))
-          (let ((case-fold-search nil))
-            (should (= (compare-buffer-substrings buf1 1 4 buf1 1 4) 0))
-            (should (= (compare-buffer-substrings buf1 1 4 buf2 1 4) -3))))
-      (when (buffer-live-p buf1)
-        (kill-buffer buf1))
-      (when (buffer-live-p buf2)
-        (kill-buffer buf2)))))
-
-(ert-deftest editfns-tests--gap-position-size ()
-  (with-temp-buffer
-    (insert "abc")
-    (goto-char 2)
-    (insert "Z")
-    (should (integerp (gap-position)))
-    (should (integerp (gap-size)))
-    (should (>= (gap-size) 0))
-    (should (<= (point-min) (gap-position) (point-max)))
-    (should (= (gap-position) (point)))))
-
-(ert-deftest editfns-tests--internal-labeled-narrow-widen ()
-  (with-temp-buffer
-    (insert "abcdef")
-    (internal--labeled-narrow-to-region 2 6 'label)
-    (should (equal (buffer-substring (point-min) (point-max)) "bcde"))
-    ;; Attempt to widen beyond labeled restriction should be clamped.
-    (narrow-to-region 1 7)
-    (should (equal (buffer-substring (point-min) (point-max)) "bcde"))
-    ;; Narrowing further within the labeled restriction is allowed.
-    (narrow-to-region 3 5)
-    (should (equal (buffer-substring (point-min) (point-max)) "cd"))
-    (internal--labeled-widen 'label)
-    (should (equal (buffer-substring (point-min) (point-max)) "abcdef"))))
-
-(ert-deftest editfns-tests--subst-char-in-region ()
-  (with-temp-buffer
-    (insert "ababa")
-    (subst-char-in-region (point-min) (point-max) ?b ?x)
-    (should (equal (buffer-string) "axaxa"))))
-
-(ert-deftest editfns-tests--line-boundaries ()
-  (with-temp-buffer
-    (insert "ab\ncd\n")
-    (goto-char (point-min))
-    (should (bobp))
-    (should (bolp))
-    (should-not (eobp))
-    (should (= (line-beginning-position) (point-min)))
-    (should (= (line-end-position) 3))
-    (forward-char 1)
-    (should-not (bolp))
-    (should-not (eolp))
-    (goto-char (line-end-position))
-    (should (eolp))
-    (forward-char 1)
-    (should (bolp))
-    (goto-char (point-max))
-    (should (eobp))
-    (should-not (bobp))))
-
-(ert-deftest editfns-tests--current-column-move-to-column ()
-  (with-temp-buffer
-    (insert "ab  cd\n")
-    (goto-char (point-min))
-    (should (= (current-column) 0))
-    (move-to-column 4)
-    (should (= (current-column) 4))
-    (should (= (point) (+ (point-min) 4)))))
-
-(ert-deftest editfns-tests--pos-bol-eol ()
-  (with-temp-buffer
-    (insert "ab\ncde\nf")
-    (goto-char (point-min))
-    (forward-char 1)
-    (should (= (pos-bol) (point-min)))
-    (should (= (pos-eol) 3))
-    (should (= (pos-bol 2) 4))
-    (should (= (pos-eol 2) 7))
-    (should (= (pos-bol 3) 8))
-    (should (= (pos-eol 3) 9))))
-
 ;; Tests for bug#5131.
 (defun transpose-test-reverse-word (start end)
   "Reverse characters in a word by transposing pairs of characters."
@@ -1074,176 +938,4 @@ sufficiently large to avoid truncation."
                        (pos-bol 2) (pos-eol 2))
     (should (equal (buffer-string) "toto\nEmacs forever!\n"))))
 
-;; Additional coverage for editfns primitives used in batch mode.
-
-(ert-deftest editfns-tests--byte-to-position ()
-  (with-temp-buffer
-    (insert "éa")
-    (let* ((b1 (position-bytes 1))
-           (b2 (position-bytes 2)))
-      (should (= b1 1))
-      (should (> b2 b1))
-      (should (= (byte-to-position b1) 1))
-      (should (= (byte-to-position b2) 2))
-      ;; Byte position in the middle of a multibyte character maps back
-      ;; to the character head.
-      (should (= (byte-to-position (1- b2)) 1))
-      (should-not (byte-to-position 0))
-      (should-not (byte-to-position (1+ (position-bytes (point-max))))))))
-
-(ert-deftest editfns-tests--byte-to-string ()
-  (let ((s (byte-to-string 65)))
-    (should (stringp s))
-    (should (not (multibyte-string-p s)))
-    (should (= (length s) 1))
-    (should (= (aref s 0) 65)))
-  (should-error (byte-to-string -1))
-  (should-error (byte-to-string 256)))
-
-(ert-deftest editfns-tests--insert-byte ()
-  (with-temp-buffer
-    (insert-byte ?A 3)
-    (should (equal (buffer-string) "AAA")))
-  (with-temp-buffer
-    (insert-byte 200 1)
-    (should (= (aref (buffer-string) 0)
-               (unibyte-char-to-multibyte 200))))
-  (should-error (with-temp-buffer (insert-byte 256 1))))
-
-(ert-deftest editfns-tests--insert-buffer-substring ()
-  (with-temp-buffer
-    (let ((source (current-buffer)))
-      (insert "abcDEF")
-      (put-text-property 4 6 'foo t)
-      (with-temp-buffer
-        (insert "X")
-        (insert-buffer-substring source 2 5)
-        (should (equal (buffer-string) "XbcD"))
-        (should-not (get-text-property 2 'foo))
-        (should (get-text-property 4 'foo))))))
-
-(ert-deftest editfns-tests--insert-before-markers-and-inherit ()
-  (with-temp-buffer
-    (insert (propertize "a" 'foo t))
-    (let ((m (point-marker)))
-      (insert-before-markers-and-inherit "b")
-      (should (equal (buffer-string) "ab"))
-      (should (= (marker-position m) (point)))
-      (should (eq (get-text-property 2 'foo) t)))))
-
-(ert-deftest editfns-tests--field-string-and-delete ()
-  (with-temp-buffer
-    (insert "abcDEFghi")
-    (put-text-property 1 4 'field 'a)
-    (put-text-property 4 7 'field 'b)
-    (put-text-property 7 10 'field 'c)
-    (let ((s (field-string-no-properties 2)))
-      (should (equal s "abc"))
-      (should-not (text-properties-at 0 s)))
-    (should (equal (field-string-no-properties 5) "DEF"))
-    (delete-field 5)
-    (should (equal (buffer-string) "abcghi"))
-    (should (equal (field-string-no-properties 5) "ghi"))))
-
-(ert-deftest editfns-tests--constrain-to-field ()
-  (let ((inhibit-field-text-motion nil))
-    (with-temp-buffer
-      (insert "abcDEFghi")
-      (put-text-property 1 4 'field 'a)
-      (put-text-property 4 7 'field 'b)
-      (put-text-property 7 10 'field 'c)
-      (should (= (constrain-to-field 2 5) 4))
-      (should (= (constrain-to-field 8 5) 7))
-      (goto-char 2)
-      (should (= (constrain-to-field nil 5) 4))
-      (should (= (point) 4)))))
-
-(ert-deftest editfns-tests--char-before-after ()
-  (with-temp-buffer
-    (insert "abc")
-    (goto-char (point-min))
-    (should-not (char-before))
-    (should (eq (char-after) ?a))
-    (should (eq (char-after 1) ?a))
-    (should-not (char-after 0))
-    (goto-char (point-max))
-    (should-not (char-after))
-    (should (eq (char-before) ?c))
-    (should (eq (char-before (point-max)) ?c))
-    (should-not (char-before (1+ (point-max))))
-    (narrow-to-region 2 3)
-    (goto-char (point-min))
-    (should-not (char-before))
-    (should (eq (char-after) ?b))
-    (goto-char (point-max))
-    (should-not (char-after))
-    (should (eq (char-before) ?b))))
-
-(ert-deftest editfns-tests--following-preceding-char ()
-  (with-temp-buffer
-    (insert "abc")
-    (goto-char (point-min))
-    (should (= (following-char) ?a))
-    (should (= (preceding-char) 0))
-    (goto-char (point-max))
-    (should (= (following-char) 0))
-    (should (= (preceding-char) ?c))
-    (narrow-to-region 2 3)
-    (goto-char (point-min))
-    (should (= (preceding-char) 0))
-    (goto-char (point-max))
-    (should (= (following-char) 0))))
-
-(ert-deftest editfns-tests--buffer-substring-properties ()
-  (with-temp-buffer
-    (insert "abc")
-    (add-text-properties (point-min) (point-max) '(foo bar))
-    (let ((with-props (buffer-substring (point-min) (point-max)))
-          (without-props (buffer-substring-no-properties
-                          (point-min) (point-max))))
-      (should (equal with-props "abc"))
-      (should (equal without-props "abc"))
-      (should (eq (get-text-property 0 'foo with-props) 'bar))
-      (should-not (get-text-property 0 'foo without-props)))))
-
-(ert-deftest editfns-tests--insert-and-inherit ()
-  (with-temp-buffer
-    (insert "a")
-    (add-text-properties 1 2 '(foo bar))
-    (goto-char (point-max))
-    (insert "b")
-    (should-not (get-text-property 2 'foo))
-    (erase-buffer))
-  (with-temp-buffer
-    (insert "a")
-    (add-text-properties 1 2 '(foo bar))
-    (goto-char (point-max))
-    (insert-and-inherit "b")
-    (should (eq (get-text-property 2 'foo) 'bar))))
-
-(ert-deftest editfns-tests--line-beginning-end-position ()
-  (with-temp-buffer
-    (insert "aa\nbb\ncc")
-    (goto-char 5)
-    (should (= (line-beginning-position) 4))
-    (should (= (line-end-position) 6))
-    (should (= (line-beginning-position 2) 7))
-    (should (= (line-end-position 2) (point-max)))
-    (goto-char (point-min))
-    (should (= (line-beginning-position 5) (point-max)))
-    (should (= (line-end-position 5) (point-max)))))
-
-(ert-deftest editfns-tests--current-column ()
-  (with-temp-buffer
-    (let ((tab-width 4))
-      (insert "ab\tcd")
-      (goto-char (point-min))
-      (should (= (current-column) 0))
-      (forward-char 2)
-      (should (= (current-column) 2))
-      (forward-char 1)
-      (should (= (current-column) 4))
-      (forward-char 2)
-      (should (= (current-column) 6)))))
-
 ;;; editfns-tests.el ends here
diff --git a/test/src/emacs-module-tests.el b/test/src/emacs-module-tests.el
index 5d3abb0d76b..e678fba3873 100644
--- a/test/src/emacs-module-tests.el
+++ b/test/src/emacs-module-tests.el
@@ -192,13 +192,6 @@ changes."
     (should (integerp r))
     (should (= r n))))
 
-(ert-deftest mod-test-userptrp ()
-  (skip-unless (fboundp 'user-ptrp))
-  (let ((v (mod-test-userptr-make 7)))
-    (should (user-ptrp v))
-    (should-not (user-ptrp 7))
-    (should-not (user-ptrp "x"))))
-
 ;; TODO: try to test finalizer
 
 ;;; Vector tests
diff --git a/test/src/eval-tests.el b/test/src/eval-tests.el
index 1cb6dcea43e..1e7c33069a7 100644
--- a/test/src/eval-tests.el
+++ b/test/src/eval-tests.el
@@ -374,22 +374,6 @@ expressions works for identifiers starting with period."
             (error err))))
     (should (eq inner-error outer-error))))
 
-(ert-deftest eval-tests--condition-case-basic ()
-  (should (equal (condition-case err
-                     42
-                   (error (list 'err err)))
-                 42))
-  (should (equal (condition-case err
-                     (signal 'wrong-type-argument '(integerp "x"))
-                   (wrong-type-argument (list 'wt err))
-                   (error (list 'err err)))
-                 '(wt (wrong-type-argument integerp "x"))))
-  (should (equal (condition-case err
-                     (signal 'error '("boom"))
-                   (wrong-type-argument (list 'wt err))
-                   (error (list 'err err)))
-                 '(err (error "boom")))))
-
 (ert-deftest eval-bad-specbind ()
   (should-error (eval '(let (((a b) 23)) (+ 1 2)) t)
                 :type 'wrong-type-argument)
@@ -399,160 +383,4 @@ expressions works for identifiers starting with period."
                 :type 'wrong-type-argument)
   (should-error (eval '(funcall '(lambda ((a b) 3.15) 84) 5 4))))
 
-(ert-deftest eval-tests--make-interpreted-closure ()
-  (let* ((env (list (cons 'y 40)))
-         (closure (make-interpreted-closure '(x)
-                                            (list '(+ x y))
-                                            env
-                                            "doc"
-                                            nil)))
-    (should (closurep closure))
-    (should (= (funcall closure 2) 42))
-    (should (equal (documentation closure t) "doc"))
-    (should-not (commandp closure)))
-  (let ((closure (make-interpreted-closure '()
-                                           (list '(+ 1 1))
-                                           nil
-                                           nil
-                                           '(interactive "p"))))
-    (should (commandp closure))
-    (should (equal (interactive-form closure) '(interactive "p")))))
-
-(ert-deftest eval-tests--internal-define-uninitialized-variable ()
-  (let ((sym (make-symbol "eval-tests--uninit-var")))
-    (should-not (boundp sym))
-    (internal--define-uninitialized-variable sym "doc")
-    (should-not (boundp sym))
-    (should (special-variable-p sym))
-    (should (equal (documentation-property sym 'variable-documentation) "doc")))
-  (let ((sym (make-symbol "eval-tests--uninit-var-keep")))
-    (set sym 'value)
-    (internal--define-uninitialized-variable sym "doc")
-    (should (eq (symbol-value sym) 'value))))
-
-(ert-deftest eval-tests--defvar-1 ()
-  (let ((sym (make-symbol "eval-tests--defvar-1")))
-    (defvar-1 sym 'init "doc")
-    (should (eq (symbol-value sym) 'init))
-    (should (special-variable-p sym))
-    (should (equal (documentation-property sym 'variable-documentation) "doc"))
-    (set sym 'old)
-    (defvar-1 sym 'new "doc2")
-    (should (eq (symbol-value sym) 'old))))
-
-(ert-deftest eval-tests--defconst-1 ()
-  (let ((sym (make-symbol "eval-tests--defconst-1")))
-    (set sym 'old)
-    (defconst-1 sym 'new "doc")
-    (should (eq (symbol-value sym) 'new))
-    (should (special-variable-p sym))
-    (should (equal (documentation-property sym 'variable-documentation) "doc"))
-    (should (eq (get sym 'risky-local-variable) t))))
-
-(ert-deftest eval-tests--internal-make-var-non-special ()
-  (let ((sym (make-symbol "eval-tests--non-special")))
-    (defvar-1 sym 'init nil)
-    (should (special-variable-p sym))
-    (internal-make-var-non-special sym)
-    (should-not (special-variable-p sym))))
-
-(ert-deftest eval-tests--handler-bind-1 ()
-  (let (seen)
-    (should (equal (catch 'hb
-                     (handler-bind-1
-                      (lambda () (error "boom"))
-                      'error
-                      (lambda (err)
-                        (setq seen err)
-                        (throw 'hb 'handled))))
-                   'handled))
-    (should (consp seen))
-    (should (eq (car seen) 'error)))
-  (let (called)
-    (should-error
-     (handler-bind-1
-      (lambda () (error "boom"))
-      'error
-      (lambda (_err) (setq called t) nil)))
-    (should called))
-  (should (equal (handler-bind-1 (lambda () 'ok)
-                                 'error
-                                 (lambda (_err) 'bad))
-                 'ok))
-  (should-error (handler-bind-1 (lambda () 'ok) 'error)))
-
-(ert-deftest eval-tests--run-hook-wrapped ()
-  (let* ((hook (make-symbol "eval-tests--hook"))
-         (calls nil)
-         (wrapper (lambda (fun &rest args)
-                    (apply fun args))))
-    (set hook (list (lambda (x) (push (list 'first x) calls) nil)
-                    (lambda (x) (push (list 'second x) calls) 'stop)
-                    (lambda (x) (push (list 'third x) calls) t)))
-    (should (eq (run-hook-wrapped hook wrapper 42) 'stop))
-    (should (equal (nreverse calls) '((first 42) (second 42))))))
-
-(ert-deftest eval-tests--debugger-trap ()
-  (should-not (debugger-trap)))
-
-(defun eval-tests--backtrace-frame-helper (a b)
-  (ignore a b)
-  (backtrace-frame--internal
-   (lambda (evald func args flags)
-     (list evald func args flags))
-   0 'eval-tests--backtrace-frame-helper))
-
-(ert-deftest eval-tests--backtrace-frame--internal ()
-  (let ((result (eval-tests--backtrace-frame-helper 1 2)))
-    (should (eq (car result) t))
-    (should (eq (nth 1 result) 'eval-tests--backtrace-frame-helper))
-    (should (equal (nth 2 result) '(1 2)))
-    (should (null (nth 3 result)))))
-
-(defun eval-tests--backtrace-debug-helper ()
-  (backtrace-debug 0 t 'eval-tests--backtrace-debug-helper)
-  (unwind-protect
-      (backtrace-frame--internal
-       (lambda (_evald _func _args flags) flags)
-       0 'eval-tests--backtrace-debug-helper)
-    (backtrace-debug 0 nil 'eval-tests--backtrace-debug-helper)))
-
-(ert-deftest eval-tests--backtrace-debug ()
-  (let ((flags (eval-tests--backtrace-debug-helper)))
-    (should (eq (plist-get flags :debug-on-exit) t))))
-
-(ert-deftest eval-tests--backtrace-frames-from-thread ()
-  (skip-unless (fboundp 'current-thread))
-  (let* ((frames (backtrace--frames-from-thread (current-thread)))
-         (found nil))
-    (dolist (frame frames)
-      (when (and (consp frame)
-                 (memq (car frame) '(t nil))
-                 (functionp (cadr frame)))
-        (setq found t)))
-    (should (listp frames))
-    (should found)))
-
-(defvar eval-tests--backtrace-eval-dyn)
-(defun eval-tests--backtrace-eval-helper ()
-  (backtrace-eval 'eval-tests--backtrace-eval-dyn 1 'backtrace-eval))
-
-(ert-deftest eval-tests--backtrace-eval ()
-  (let ((eval-tests--backtrace-eval-dyn 42))
-    ;; Ensure the binding is established before the target frame.
-    ;; backtrace-eval temporarily unrewinds the specpdl to the frame it
-    ;; evaluates in, which would otherwise undo this binding.
-    (should (= (eval-tests--backtrace-eval-helper) 42))))
-
-(defvar eval-tests--backtrace-locals-dyn)
-(defun eval-tests--backtrace-locals-helper ()
-  (let ((eval-tests--backtrace-locals-dyn 7))
-    (backtrace--locals 1 'backtrace--locals)))
-
-(ert-deftest eval-tests--backtrace-locals ()
-  (let* ((locals (eval-tests--backtrace-locals-helper))
-         (entry (assq 'eval-tests--backtrace-locals-dyn locals)))
-    (should entry)
-    (should (eq (cdr entry) 7))))
-
 ;;; eval-tests.el ends here
diff --git a/test/src/fileio-tests.el b/test/src/fileio-tests.el
index b130f37620a..2c27ef35701 100644
--- a/test/src/fileio-tests.el
+++ b/test/src/fileio-tests.el
@@ -277,69 +277,5 @@ Also check that an encoding error can appear in a symlink."
       ;; We should have prompted about the supersession threat.
       (should asked))))
 
-(defvar fileio-tests--internal-counter 0)
-
-(ert-deftest fileio-tests--directory-name-p ()
-  (should (directory-name-p "/"))
-  (should (directory-name-p "foo/"))
-  (should-not (directory-name-p "foo")))
-
-(ert-deftest fileio-tests--make-temp-file-internal ()
-  (ert-with-temp-directory dir
-    (let* ((prefix (expand-file-name "fileio-test" dir))
-           (file (make-temp-file-internal prefix nil ".tmp" "hello")))
-      (should (file-exists-p file))
-      (should (equal (with-temp-buffer
-                       (insert-file-contents file)
-                       (buffer-string))
-                     "hello"))
-      (delete-file file))
-    (let* ((prefix (expand-file-name "fileio-test" dir))
-           (name (make-temp-file-internal prefix 0 "" nil)))
-      (should (stringp name))
-      (should-not (file-exists-p name)))
-    (let* ((prefix (expand-file-name "fileio-dir" dir))
-           (name (make-temp-file-internal prefix t "" nil)))
-      (should (file-directory-p name))
-      (delete-directory name))))
-
-(ert-deftest fileio-tests--make-delete-directory-internal ()
-  (ert-with-temp-directory dir
-    (let ((subdir (expand-file-name "subdir" dir)))
-      (make-directory-internal subdir)
-      (should (file-directory-p subdir))
-      (delete-directory-internal subdir)
-      (should-not (file-exists-p subdir)))))
-
-(ert-deftest fileio-tests--delete-file-internal ()
-  (ert-with-temp-file file
-    (write-region "data" nil file nil 'silent)
-    (should (file-exists-p file))
-    (delete-file-internal file)
-    (should-not (file-exists-p file))))
-
-(ert-deftest fileio-tests--unix-sync ()
-  (skip-unless (fboundp 'unix-sync))
-  (should-not (unix-sync)))
-
-(ert-deftest fileio-tests--auto-save-flags ()
-  (with-temp-buffer
-    (insert "abc")
-    (should-not (recent-auto-save-p))
-    (set-buffer-auto-saved)
-    (should (recent-auto-save-p))
-    (clear-buffer-auto-save-failure)
-    (should (recent-auto-save-p))))
-
-(ert-deftest fileio-tests--next-read-file-uses-dialog-p ()
-  (skip-unless (and (boundp 'use-dialog-box) (boundp 'use-file-dialog)))
-  (let ((use-dialog-box nil)
-        (use-file-dialog nil))
-    (should-not (next-read-file-uses-dialog-p))))
-
-(ert-deftest fileio-tests--set-binary-mode ()
-  (should (memq (set-binary-mode 'stdout t) '(nil t)))
-  (should-error (set-binary-mode 'not-a-stream t)))
-
 
 ;;; fileio-tests.el ends here
diff --git a/test/src/floatfns-tests.el b/test/src/floatfns-tests.el
index 1c0df17594c..49e76b809a3 100644
--- a/test/src/floatfns-tests.el
+++ b/test/src/floatfns-tests.el
@@ -21,14 +21,6 @@
 
 (require 'ert)
 
-(defun floatfns-tests--approx= (a b &optional tol)
-  "Return non-nil if A and B are approximately equal.
-This avoids spurious failures due to platform-specific libm behavior."
-  (let* ((tol (or tol 1e-12))
-         (diff (abs (- a b)))
-         (scale (max 1.0 (abs a) (abs b))))
-    (< diff (* tol scale))))
-
 (ert-deftest floatfns-tests-cos ()
   (should (= (cos 0) 1.0))
   (should (= (cos float-pi) -1.0)))
@@ -39,22 +31,6 @@ This avoids spurious failures due to platform-specific libm behavior."
 (ert-deftest floatfns-tests-tan ()
   (should (= (tan 0) 0.0)))
 
-(ert-deftest floatfns-tests-asin-acos-atan ()
-  (let ((eps 1e-12))
-    (should (< (abs (- (asin 0.0) 0.0)) eps))
-    (should (< (abs (- (asin 1.0) (/ float-pi 2))) eps))
-    (should (< (abs (- (acos 1.0) 0.0)) eps))
-    (should (< (abs (- (acos 0.0) (/ float-pi 2))) eps))
-    (should (< (abs (- (atan 0.0) 0.0)) eps))
-    (should (< (abs (- (atan 1.0) (/ float-pi 4))) eps))
-    (should (< (abs (- (atan 0.0 -1.0) float-pi)) eps))))
-
-(ert-deftest floatfns-tests-copysign ()
-  (should (= (copysign 1.0 2.0) 1.0))
-  (should (= (copysign 1.0 -2.0) -1.0))
-  (should (= (copysign -1.0 2.0) 1.0))
-  (should (= (copysign -1.0 -2.0) -1.0)))
-
 (ert-deftest floatfns-tests-isnan ()
   (should (isnan 0.0e+NaN))
   (should (isnan -0.0e+NaN))
@@ -67,8 +43,7 @@ This avoids spurious failures due to platform-specific libm behavior."
   (should (= (expt 2 8) 256)))
 
 (ert-deftest floatfns-tests-log ()
-  (should (= (log 1000 10) 3.0))
-  (should (floatfns-tests--approx= (log 8 2) 3.0)))
+  (should (= (log 1000 10) 3.0)))
 
 (ert-deftest floatfns-tests-sqrt ()
   (should (= (sqrt 25) 5)))
@@ -77,23 +52,6 @@ This avoids spurious failures due to platform-specific libm behavior."
   (should (= (abs 10) 10))
   (should (= (abs -10) 10)))
 
-(ert-deftest floatfns-tests-float ()
-  (should (= (float 0) 0.0))
-  (should (= (float 1) 1.0))
-  (should (= (float -1) -1.0))
-  (should (= (float 1.5) 1.5)))
-
-(ert-deftest floatfns-tests-frexp-ldexp ()
-  (dolist (x '(0.0 1.0 -1.0 2.0 3.5 0.5 -0.5 1024.0))
-    (pcase-let ((`(,sig . ,exp) (frexp x)))
-      (should (floatp sig))
-      (should (integerp exp))
-      (if (zerop x)
-          (should (= sig 0.0))
-        (should (<= 0.5 (abs sig)))
-        (should (< (abs sig) 1.0)))
-      (should (floatfns-tests--approx= (ldexp sig exp) (float x) 1e-12)))))
-
 (ert-deftest floatfns-tests-logb ()
   (should (= (logb 10000) 13)))
 
diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el
index d0cb11c2305..0288e3a460e 100644
--- a/test/src/fns-tests.el
+++ b/test/src/fns-tests.el
@@ -64,133 +64,6 @@
 (ert-deftest fns-tests-string-bytes ()
   (should (= (string-bytes "abc") 3)))
 
-(ert-deftest fns-tests-string-make-multibyte ()
-  (let* ((ascii (string-make-unibyte "abc"))
-         (ascii-mb (string-make-multibyte ascii)))
-    (should (string= ascii-mb "abc"))
-    (should-not (multibyte-string-p ascii-mb)))
-  (let* ((u (string-make-unibyte "é"))
-         (m (string-make-multibyte u)))
-    (should (multibyte-string-p m))
-    (should (string= (string-as-unibyte m) u))))
-
-(ert-deftest fns-tests-string-make-unibyte ()
-  (let ((s (propertize "é" 'foo 'bar)))
-    (let ((u (string-make-unibyte s)))
-      (should-not (multibyte-string-p u))
-      (should (equal (aref u 0) ?\xE9))
-      (should-not (text-properties-at 0 u)))))
-
-(ert-deftest fns-tests-string-as-multibyte ()
-  (let* ((u (string-make-unibyte "abc"))
-         (m (string-as-multibyte u)))
-    (should (string= m "abc"))
-    (should (multibyte-string-p m))
-    (should-not (text-properties-at 0 m)))
-  (let ((m "abc"))
-    (should (string= (string-as-multibyte m) m))))
-
-(ert-deftest fns-tests-fillarray ()
-  (let ((v (vector 1 2 3)))
-    (fillarray v 'x)
-    (should (equal v [x x x])))
-  (let ((s (string-make-unibyte "aaa")))
-    (fillarray s ?b)
-    (should (string= s "bbb"))
-    (should-not (multibyte-string-p s)))
-  (let ((bv (make-bool-vector 4 nil)))
-    (fillarray bv t)
-    (should (equal bv (make-bool-vector 4 t))))
-  (let ((ct (make-char-table 'fns-tests)))
-    (fillarray ct 'z)
-    (should (eq (char-table-range ct ?a) 'z))))
-
-(ert-deftest fns-tests-clear-string ()
-  (let ((s (propertize "é" 'foo 'bar)))
-    (clear-string s)
-    (should-not (multibyte-string-p s))
-    (should (equal s (make-string 2 0)))
-    (should-not (text-properties-at 0 s))))
-
-(ert-deftest fns-tests-load-average ()
-  (let ((res (condition-case err
-                 (list :ok (load-average) (load-average t))
-               (error (list :error err)))))
-    (pcase res
-      (`(:ok ,ints ,floats)
-       (should (listp ints))
-       (should (<= 1 (length ints) 3))
-       (dolist (v ints)
-         (should (integerp v))
-         (should (>= v 0)))
-       (should (listp floats))
-       (should (<= 1 (length floats) 3))
-       (dolist (v floats)
-         (should (floatp v))
-         (should (>= v 0.0))))
-      (`(:error ,err)
-       (should (string-match-p "load-average not implemented"
-                               (error-message-string err)))))))
-
-(ert-deftest fns-tests-locale-info ()
-  (let ((codeset (locale-info 'codeset)))
-    (should (or (null codeset) (stringp codeset))))
-  (let ((days (locale-info 'days)))
-    (should (or (null days) (and (vectorp days) (= (length days) 7)))))
-  (let ((months (locale-info 'months)))
-    (should (or (null months) (and (vectorp months) (= (length months) 12)))))
-  (let ((paper (locale-info 'paper)))
-    (should (or (null paper)
-                (and (consp paper)
-                     (= (length paper) 2)
-                     (integerp (car paper))
-                     (integerp (cadr paper))))))
-  (should-not (locale-info 'fns-tests-no-such-item)))
-
-(ert-deftest fns-tests-sxhash-eql ()
-  (let* ((a (1+ most-positive-fixnum))
-         (b (+ most-positive-fixnum 1)))
-    (should (eql a b))
-    (should (integerp (sxhash-eql a)))
-    (should (= (sxhash-eql a) (sxhash-eql b)))))
-
-(ert-deftest fns-tests-sxhash-equal-including-properties ()
-  (let ((a (propertize "foo" 'face 'bold))
-        (b (propertize "foo" 'face 'bold)))
-    (should (equal-including-properties a b))
-    (should (integerp (sxhash-equal-including-properties a)))
-    (should (= (sxhash-equal-including-properties a)
-               (sxhash-equal-including-properties b)))))
-
-(ert-deftest fns-tests-hash-table-metadata ()
-  (let ((h (make-hash-table :test 'equal)))
-    (puthash "a" 1 h)
-    (puthash "b" 2 h)
-    (should (= (hash-table-rehash-size h) 1.5))
-    (should (= (hash-table-rehash-threshold h) 0.8125))
-    (should (integerp (hash-table-size h)))
-    (should (>= (hash-table-size h) (hash-table-count h)))
-    (should (integerp (internal--hash-table-index-size h)))
-    (let ((hist (internal--hash-table-histogram h)))
-      (should (or (null hist)
-                  (and (consp hist)
-                       (consp (car hist))
-                       (integerp (caar hist))
-                       (integerp (cdar hist))))))
-    (let ((buckets (internal--hash-table-buckets h)))
-      (should (listp buckets))
-      (let ((keys (cl-loop for bucket in buckets
-                           append (mapcar #'car bucket))))
-        (should (member "a" keys))
-        (should (member "b" keys))))))
-
-(ert-deftest fns-tests-secure-hash-algorithms ()
-  (let ((algs (secure-hash-algorithms)))
-    (should (listp algs))
-    (should (memq 'md5 algs))
-    (should (memq 'sha1 algs))
-    (should (memq 'sha256 algs))))
-
 ;; Test that equality predicates work correctly on NaNs when combined
 ;; with hash tables based on those predicates.  This was not the case
 ;; for eql in Emacs 26.
@@ -662,58 +535,6 @@
   (should (equal (fns-tests--with-region base64-encode-region "\x14\xfb\x9c\x03\xd9\x7e") "FPucA9l+"))
   (should (equal (fns-tests--with-region base64-encode-region "\x14\xfb\x9c\x03\xd9\x7f") "FPucA9l/")))
 
-(defun fns-tests--base64-decode-region (input &optional base64url ignore-invalid)
-  (with-temp-buffer
-    (set-buffer-multibyte nil)
-    (insert input)
-    (let ((len (base64-decode-region (point-min) (point-max)
-                                     base64url ignore-invalid)))
-      (list len (buffer-string)))))
-
-(defun fns-tests--as-unibyte (string)
-  (encode-coding-string string 'binary))
-
-(ert-deftest fns-tests-base64-decode-region ()
-  ;; standard variant RFC2045
-  (should (equal (fns-tests--base64-decode-region "") '(0 "")))
-  (should (equal (fns-tests--base64-decode-region "Zg==") '(1 "f")))
-  (should (equal (fns-tests--base64-decode-region "Zm8=") '(2 "fo")))
-  (should (equal (fns-tests--base64-decode-region "Zm9v") '(3 "foo")))
-  (should (equal (fns-tests--base64-decode-region "Zm9vYg==") '(4 "foob")))
-  (should (equal (fns-tests--base64-decode-region "Zm9vYmE=") '(5 "fooba")))
-  (should (equal (fns-tests--base64-decode-region "Zm9vYmFy") '(6 "foobar")))
-  (let* ((res (fns-tests--base64-decode-region "FPucA9l+"))
-         (len (nth 0 res))
-         (out (nth 1 res)))
-    (should (= len (string-bytes out)))
-    (should (equal (fns-tests--as-unibyte out)
-                   (fns-tests--as-unibyte "\x14\xfb\x9c\x03\xd9\x7e"))))
-  (let* ((res (fns-tests--base64-decode-region "FPucA9l/"))
-         (len (nth 0 res))
-         (out (nth 1 res)))
-    (should (= len (string-bytes out)))
-    (should (equal (fns-tests--as-unibyte out)
-                   (fns-tests--as-unibyte "\x14\xfb\x9c\x03\xd9\x7f"))))
-
-  ;; url variant
-  (let* ((res (fns-tests--base64-decode-region "FPucA9l-" t))
-         (len (nth 0 res))
-         (out (nth 1 res)))
-    (should (= len (string-bytes out)))
-    (should (equal (fns-tests--as-unibyte out)
-                   (fns-tests--as-unibyte "\x14\xfb\x9c\x03\xd9\x7e"))))
-  (let* ((res (fns-tests--base64-decode-region "FPucA9l_" t))
-         (len (nth 0 res))
-         (out (nth 1 res)))
-    (should (= len (string-bytes out)))
-    (should (equal (fns-tests--as-unibyte out)
-                   (fns-tests--as-unibyte "\x14\xfb\x9c\x03\xd9\x7f"))))
-
-  ;; ignore invalid characters
-  (should (equal (fns-tests--base64-decode-region "Zg==@" nil t) '(1 "f")))
-  (should (equal (fns-tests--base64-decode-region "Zg==@" t t) '(1 "f")))
-  (should-error (fns-tests--base64-decode-region "Zg=")))
-
 (ert-deftest fns-tests-base64-encode-string ()
   ;; standard variant RFC2045
   (should (equal (base64-encode-string "") ""))
diff --git a/test/src/keymap-tests.el b/test/src/keymap-tests.el
index 004ec1cee04..c53ab7871c3 100644
--- a/test/src/keymap-tests.el
+++ b/test/src/keymap-tests.el
@@ -37,22 +37,6 @@
 (ert-deftest keymap-make-sparse-keymap ()
   (keymap-tests--make-keymap-test #'make-sparse-keymap))
 
-(ert-deftest keymap-accessible-keymaps ()
-  (let* ((map (make-sparse-keymap))
-         (sub (make-sparse-keymap)))
-    (define-key map (kbd "C-x") sub)
-    (define-key sub (kbd "C-f") #'find-file)
-    (define-key map (kbd "C-c") #'ignore)
-    (let ((maps (accessible-keymaps map)))
-      (should (equal (caar maps) []))
-      (should (eq (cdar maps) map))
-      (should (assoc [?\C-x] maps))
-      (should (eq (cdr (assoc [?\C-x] maps)) sub))
-      (should-not (assoc [?\C-c] maps)))
-    (let ((pref (accessible-keymaps map (kbd "C-x"))))
-      (should (equal (caar pref) [?\C-x]))
-      (should (eq (cdar pref) sub)))))
-
 (ert-deftest keymap-keymapp ()
   (should (keymapp (make-keymap)))
   (should (keymapp (make-sparse-keymap)))
diff --git a/test/src/lread-tests.el b/test/src/lread-tests.el
index 50281471389..e621a9d58b9 100644
--- a/test/src/lread-tests.el
+++ b/test/src/lread-tests.el
@@ -504,50 +504,4 @@ literals (Bug#20852)."
       (should (equal (oa-syms oa) (list s2))))
     ))
 
-(ert-deftest lread-tests--get-load-suffixes ()
-  (let ((load-suffixes '(".el" ".elc"))
-        (load-file-rep-suffixes '("" ".gz")))
-    (should (equal (get-load-suffixes)
-                   '(".el" ".el.gz" ".elc" ".elc.gz")))))
-
-(ert-deftest lread-tests--locate-file-internal ()
-  (let* ((dir (make-temp-file "lread-tests" t))
-         (file (expand-file-name "foo.el" dir))
-         (subdir (expand-file-name "bar" dir)))
-    (unwind-protect
-        (progn
-          (with-temp-file file)
-          (make-directory subdir)
-          (should (equal (locate-file-internal "foo" (list dir) '(".el") nil)
-                         file))
-          (should-not (locate-file-internal "bar" (list dir) nil nil))
-          (should (equal (locate-file-internal
-                          "bar" (list dir) nil
-                          (lambda (path)
-                            (if (file-directory-p path) 'dir-ok
-                              (file-readable-p path))))
-                         subdir)))
-      (ignore-errors (delete-file file))
-      (ignore-errors (delete-directory subdir))
-      (ignore-errors (delete-directory dir)))))
-
-(ert-deftest lread-tests--internal-obarray-buckets ()
-  (let* ((oa (obarray-make 7))
-         (s1 (intern "alpha" oa))
-         (s2 (intern "beta" oa))
-         (s3 (intern "gamma" oa))
-         (buckets (internal--obarray-buckets oa))
-         (flat nil)
-         (expected (list s1 s2 s3)))
-    (dolist (bucket buckets)
-      (dolist (sym bucket)
-        (push sym flat)))
-    (should (= (length flat) (length (delete-dups (copy-sequence flat)))))
-    (setq flat (sort flat (lambda (a b)
-                            (string< (symbol-name a) (symbol-name b)))))
-    (setq expected (sort (copy-sequence expected)
-                         (lambda (a b)
-                           (string< (symbol-name a) (symbol-name b)))))
-    (should (equal flat expected))))
-
 ;;; lread-tests.el ends here
diff --git a/test/src/marker-tests.el b/test/src/marker-tests.el
index 2a29b788f32..ddd8bc702e4 100644
--- a/test/src/marker-tests.el
+++ b/test/src/marker-tests.el
@@ -57,119 +57,4 @@
     (set-marker marker-2 marker-1)
     (should (goto-char marker-2))))
 
-(ert-deftest marker-tests--insertion-type ()
-  (with-temp-buffer
-    (insert "ab")
-    (goto-char 2)
-    (let ((m1 (point-marker))
-          (m2 (copy-marker (point) t)))
-      (should-not (marker-insertion-type m1))
-      (should (marker-insertion-type m2))
-      (insert "X")
-      (should (= (marker-position m1) 2))
-      (should (= (marker-position m2) 3)))))
-
-(ert-deftest marker-tests--set-marker-insertion-type ()
-  (with-temp-buffer
-    (insert "ab")
-    (goto-char 2)
-    (let ((m (point-marker)))
-      (should-not (marker-insertion-type m))
-      (should (eq (set-marker-insertion-type m t) t))
-      (should (marker-insertion-type m))
-      (insert "X")
-      (should (= (marker-position m) 3))
-      (goto-char (marker-position m))
-      (should (eq (set-marker-insertion-type m nil) nil))
-      (should-not (marker-insertion-type m))
-      (insert "Y")
-      (should (= (marker-position m) 3)))))
-
-(ert-deftest marker-tests--copy-marker-nil ()
-  (let ((m (copy-marker nil)))
-    (should-not (marker-buffer m))
-    (should-not (marker-position m))))
-
-(ert-deftest marker-tests--marker-buffer ()
-  (with-temp-buffer
-    (let ((m (make-marker)))
-      (should-not (marker-buffer m))
-      (set-marker m (point) (current-buffer))
-      (should (eq (marker-buffer m) (current-buffer)))
-      (set-marker m nil)
-      (should-not (marker-buffer m)))))
-
-(ert-deftest marker-tests--last-position-after-kill ()
-  (let (marker pos)
-    (with-temp-buffer
-      (insert "abc")
-      (setq marker (point-marker))
-      (setq pos (point))
-      (should (= (marker-position marker) pos)))
-    (should-not (marker-buffer marker))
-    (should-not (marker-position marker))
-    (should (= (marker-last-position marker) pos))))
-
-(ert-deftest marker-tests--copy-marker ()
-  (with-temp-buffer
-    (insert "abc")
-    (goto-char 2)
-    (let ((m1 (point-marker))
-          (m2 (copy-marker (point) t))
-          (m3 (copy-marker (point) nil))
-          (m4 (copy-marker 1)))
-      (should (equal m1 m2))
-      (should (eq (marker-buffer m1) (marker-buffer m2)))
-      (should (marker-insertion-type m2))
-      (should-not (marker-insertion-type m3))
-      (should (eq (marker-buffer m4) (current-buffer)))
-      (should (= (marker-position m4) 1)))))
-
-(ert-deftest marker-tests--set-marker-and-move-marker ()
-  (let ((m (make-marker))
-        (m2 (make-marker)))
-    (with-temp-buffer
-      (insert "abc")
-      (should (eq (set-marker m 2 (current-buffer)) m))
-      (should (eq (marker-buffer m) (current-buffer)))
-      (should (= (marker-position m) 2))
-      (should (eq (move-marker m 1 (current-buffer)) m))
-      (should (= (marker-position m) 1))
-      (set-marker m2 nil)
-      (set-marker m m2)
-      (should-not (marker-buffer m))
-      (should-not (marker-position m))
-      (set-marker m 1 (current-buffer))
-      (set-marker m nil)
-      (should-not (marker-buffer m))
-      (should-not (marker-position m)))))
-
-(ert-deftest marker-tests--point-min-max-marker-narrowing ()
-  (with-temp-buffer
-    (insert "abcd")
-    (narrow-to-region 2 3)
-    (let ((minm (point-min-marker))
-          (maxm (point-max-marker)))
-      (should (= (marker-position minm) 2))
-      (should (= (marker-position maxm) 3))
-      (should (eq (marker-buffer minm) (current-buffer))))))
-
-(ert-deftest marker-tests--move-marker-between-buffers ()
-  (let ((buf-1 (generate-new-buffer " *marker-tests-1*"))
-        (buf-2 (generate-new-buffer " *marker-tests-2*")))
-    (unwind-protect
-        (let ((m (make-marker)))
-          (with-current-buffer buf-1
-            (insert "abc")
-            (set-marker m 2 (current-buffer)))
-          (should (eq (marker-buffer m) buf-1))
-          (should (= (marker-position m) 2))
-          (with-current-buffer buf-2
-            (insert "xyz")
-            (set-marker m 1 (current-buffer)))
-          (should (eq (marker-buffer m) buf-2))
-          (should (= (marker-position m) 1)))
-      (kill-buffer buf-1)
-      (kill-buffer buf-2))))
-
 ;;; marker-tests.el ends here
diff --git a/test/src/minibuf-tests.el b/test/src/minibuf-tests.el
index 36ca3604acf..5bfbe710b10 100644
--- a/test/src/minibuf-tests.el
+++ b/test/src/minibuf-tests.el
@@ -431,9 +431,5 @@
                   (error nil))
                 'inhibit))))
 
-(ert-deftest minibuf-tests-active-minibuffer-window ()
-  (should-not (active-minibuffer-window))
-  (should (windowp (minibuffer-window))))
-
 
 ;;; minibuf-tests.el ends here
diff --git a/test/src/print-tests.el b/test/src/print-tests.el
index 033049afbdf..1485e063ab3 100644
--- a/test/src/print-tests.el
+++ b/test/src/print-tests.el
@@ -570,45 +570,5 @@ otherwise, use a different charset."
   (should (equal (prin1-to-string (make-symbol "th\303\251"))
                  (string-to-multibyte "th\303\251"))))
 
-(ert-deftest print-tests--write-char ()
-  (should (equal (with-output-to-string (write-char ?A)) "A"))
-  (let (out)
-    (should (= (write-char ?Z (lambda (c)
-                                (setq out (concat out (string c)))))
-               ?Z))
-    (should (equal out "Z"))))
-
-(ert-deftest print-tests--redirect-debugging-output ()
-  (let ((file (make-temp-file "print-tests-debug")))
-    (unwind-protect
-        (progn
-          (redirect-debugging-output file nil)
-          (external-debugging-output ?A)
-          (external-debugging-output ?B)
-          (redirect-debugging-output nil)
-          (should (equal (with-temp-buffer
-                           (insert-file-contents file)
-                           (buffer-string))
-                         "AB")))
-      (ignore-errors (redirect-debugging-output nil))
-      (ignore-errors (delete-file file)))))
-
-(ert-deftest print-tests--preprocess ()
-  (let* ((x (list 1 2))
-         (obj (list x x))
-         (print-circle t)
-         (print-number-table nil))
-    (print--preprocess obj)
-    (should (hash-table-p print-number-table))
-    (should (> (hash-table-count print-number-table) 0))
-    (should (gethash x print-number-table)))
-  (let* ((x (list 1 2))
-         (obj (list x x))
-         (print-circle nil)
-         (print-number-table (make-hash-table :test 'eq)))
-    (puthash 'sentinel 'value print-number-table)
-    (print--preprocess obj)
-    (should (eq (gethash 'sentinel print-number-table) 'value))))
-
 (provide 'print-tests)
 ;;; print-tests.el ends here

From 4beb8e89636b700b6857b106e645be0f1bfbe93b Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 7 May 2026 17:45:19 +0300
Subject: [PATCH 370/463] Fix infloop in redisplay due to continuation glyphs

* src/xdisp.c (display_line): When inserting continuation glyphs,
account for the border glyph in non-rightmost windows on TTY
frames.  (Bug#80975)
---
 src/xdisp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 52f8257e76f..773aba2789f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26316,7 +26316,10 @@ display_line (struct it *it, int cursor_vpos)
 		      /* Fill the rest of the row with continuation
 			 glyphs like in 20.x.  */
 		      while (row->glyphs[TEXT_AREA] + row->used[TEXT_AREA]
-			     < row->glyphs[1 + TEXT_AREA])
+			     < (row->glyphs[1 + TEXT_AREA]
+				/* Account for the border glyph.  */
+				- (!WINDOW_RIGHTMOST_P (it->w)
+				   && WINDOW_RIGHT_MARGIN_WIDTH (it->w) == 0)))
 			produce_special_glyphs (it, IT_CONTINUATION,
 						it->bidi_it.paragraph_dir, false);
 

From f833e560c15388f617c823f090e1fee6f2e5bdd1 Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Thu, 7 May 2026 17:35:17 +0200
Subject: [PATCH 371/463] Update to Transient v0.13.3-10-g87d0ca08

---
 doc/misc/transient.texi |  4 +-
 lisp/transient.el       | 94 ++++++++++++++++++++---------------------
 2 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/doc/misc/transient.texi b/doc/misc/transient.texi
index f454d81c63e..aa3cfe770ac 100644
--- a/doc/misc/transient.texi
+++ b/doc/misc/transient.texi
@@ -31,7 +31,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Transient User and Developer Manual
-@subtitle for version 0.13.2
+@subtitle for version 0.13.3
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
@@ -53,7 +53,7 @@ resource to get over that hurdle is Psionic K's interactive tutorial,
 available at @uref{https://github.com/positron-solutions/transient-showcase}.
 
 @noindent
-This manual is for Transient version 0.13.2.
+This manual is for Transient version 0.13.3.
 
 @insertcopying
 @end ifnottex
diff --git a/lisp/transient.el b/lisp/transient.el
index 20b61d0f4c3..4879f1acc24 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -5,7 +5,7 @@
 ;; Author: Jonas Bernoulli <jonas@bernoul.li>
 ;; URL: https://github.com/magit/transient
 ;; Keywords: extensions
-;; Version: 0.13.2
+;; Version: 0.13.3
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -39,7 +39,7 @@
 ;;; Code:
 ;;;; Frontmatter
 
-(defconst transient-version "v0.13.2-10-gf7894ca4-builtin")
+(defconst transient-version "v0.13.3-10-g87d0ca08-builtin")
 
 (require 'cl-lib)
 (require 'eieio)
@@ -813,7 +813,7 @@ See also option `transient-highlight-mismatched-keys'."
 (defun transient--pp-to-file (value file)
   (when (or value (file-exists-p file))
     (make-directory (file-name-directory file) t)
-    (setq value (cl-sort (copy-sequence value) #'string< :key #'car))
+    (setq value (sort (copy-sequence value) :lessp #'string< :key #'car))
     (with-temp-file file
       (let ((print-level nil)
             (print-length nil)
@@ -848,11 +848,11 @@ should not change it manually.")
 
 (defun transient-save-history ()
   (setq transient-history
-        (cl-sort (mapcar (pcase-lambda (`(,key . ,val))
-                           (cons key (seq-take (delete-dups val)
-                                               transient-history-limit)))
-                         transient-history)
-                 #'string< :key #'car))
+        (sort (mapcar (pcase-lambda (`(,key . ,val))
+                        (cons key (take transient-history-limit
+                                        (delete-dups val))))
+                      transient-history)
+              :lessp #'string< :key #'car))
   (transient--pp-to-file transient-history transient-history-file))
 
 (defun transient-maybe-save-history ()
@@ -1483,7 +1483,7 @@ commands are aliases for."
                      (format
                       "transient:%s:%s:%d" prefix
                       (replace-regexp-in-string (plist-get args :key) " " "")
-                      (prog1 gensym-counter (cl-incf gensym-counter))))))
+                      (prog1 gensym-counter (incf gensym-counter))))))
            (use :command
                 `(prog1 ',sym
                    (put ',sym 'interactive-only t)
@@ -1760,9 +1760,9 @@ layout of PREFIX."
       (let* ((siblings (aref parent 2))
              (pos (cl-position group siblings)))
         (aset parent 2
-              (nconc (seq-take siblings pos)
+              (nconc (take pos siblings)
                      (transient--get-children group)
-                     (seq-drop siblings (1+ pos))))))))
+                     (drop (1+ pos) siblings)))))))
 
 ;;;###autoload
 (defun transient-remove-suffix (prefix loc)
@@ -2456,14 +2456,12 @@ of the corresponding object."
         (pcase this-command
           ('transient-update
            (setq transient--showp t)
-           (let ((keys (listify-key-sequence (this-single-command-raw-keys))))
+           (let ((keys (listify-key-sequence (this-single-command-keys))))
              (setq unread-command-events (mapcar (lambda (key) (cons t key)) keys))
              keys))
           ('transient-quit-seq
            (setq unread-command-events
-                 (butlast (listify-key-sequence
-                           (this-single-command-raw-keys))
-                          2))
+                 (butlast (listify-key-sequence (this-single-command-keys)) 2))
            (butlast transient--redisplay-key))
           (_ nil)))
   (let ((topmap (make-sparse-keymap))
@@ -3536,8 +3534,7 @@ transient is active."
   (cond
     (interactivep
      (setq transient--helpp t))
-    ((lookup-key transient--transient-map
-                 (this-single-command-raw-keys))
+    ((lookup-key transient--transient-map (this-single-command-keys))
      (setq transient--helpp nil)
      (with-demoted-errors "transient-help: %S"
        (transient--display-help #'transient-show-help
@@ -3578,7 +3575,7 @@ For example:
                (and transient--editp
                     (setq command prefix)))
            (list command
-                 (let ((keys (this-single-command-raw-keys)))
+                 (let ((keys (this-single-command-keys)))
                    (and (lookup-key transient--transient-map keys)
                         (progn
                           (transient--show)
@@ -3731,7 +3728,7 @@ such as when suggesting a new feature or reporting an issue."
   :description "Echo arguments"
   :key "x"
   (interactive (list (transient-args transient-current-command)))
-  (if (seq-every-p #'stringp arguments)
+  (if (all #'stringp arguments)
       (message "%s: %s" (key-description (this-command-keys))
                (mapconcat (lambda (arg)
                             (propertize (if (string-match-p " " arg)
@@ -3809,7 +3806,7 @@ Call `transient-default-value' but because that is a noop for
                                 (match-string 1 v)))))
               (if multi-value
                   (delq nil (mapcar match value))
-                (cl-some match value)))))))
+                (seq-some match value)))))))
 
 (cl-defmethod transient-init-value ((obj transient-switch))
   "Extract OBJ's value from the value of the prefix object."
@@ -4357,9 +4354,10 @@ Append \"=\ to ARG to indicate that it is an option."
   (when-let* ((_ transient--stack)
               (command (oref obj command))
               (suffix-obj (transient-suffix-object command))
-              (_(memq (if (slot-boundp suffix-obj 'transient)
-                          (oref suffix-obj transient)
-                        (oref transient-current-prefix transient-suffix))
+              (_(memq (cond ((slot-boundp suffix-obj 'transient)
+                             (oref suffix-obj transient))
+                            (transient-current-prefix
+                             (oref transient-current-prefix transient-suffix)))
                       (list t 'recurse #'transient--do-recurse))))
     (oset obj return t)))
 
@@ -4590,27 +4588,25 @@ have a history of their own.")
      "%s- [%s] %s"
      (key-description (this-command-keys))
      (oref transient--prefix command)
-     (mapconcat
-      #'identity
-      (sort
-       (mapcan
-        (lambda (suffix)
-          (let ((key (kbd (oref suffix key))))
-            ;; Don't list any common commands.
-            (and (not (memq (oref suffix command)
-                            `(,(lookup-key transient-map key)
-                              ,(lookup-key transient-sticky-map key)
-                              ;; From transient-common-commands:
-                              transient-set
-                              transient-save
-                              transient-history-prev
-                              transient-history-next
-                              transient-quit-one
-                              transient-toggle-common
-                              transient-set-level)))
-                 (list (propertize (oref suffix key) 'face 'transient-key)))))
-        transient--suffixes)
-       #'string<)
+     (string-join
+      (sort (seq-keep
+             (lambda (suffix)
+               (let ((key (kbd (oref suffix key))))
+                 ;; Don't list any common commands.
+                 (and (not (memq (oref suffix command)
+                                 `(,(lookup-key transient-map key)
+                                   ,(lookup-key transient-sticky-map key)
+                                   ;; From transient-common-commands:
+                                   transient-set
+                                   transient-save
+                                   transient-history-prev
+                                   transient-history-next
+                                   transient-quit-one
+                                   transient-toggle-common
+                                   transient-set-level)))
+                      (propertize (oref suffix key) 'face 'transient-key))))
+             transient--suffixes)
+            :lessp #'string<)
       (propertize "|" 'face 'transient-delimiter)))))
 
 (defun transient--insert-menu (setup)
@@ -4837,14 +4833,14 @@ as a button."
         (let ((len (length transient--redisplay-key))
               (seq (cl-coerce (edmacro-parse-keys key t) 'list)))
           (cond
-            ((member (seq-take seq len)
+            ((member (take len seq)
                      (list transient--redisplay-key
                            (thread-last transient--redisplay-key
                              (cl-substitute ?- 'kp-subtract)
                              (cl-substitute ?= 'kp-equal)
                              (cl-substitute ?+ 'kp-add))))
-             (let ((pre (key-description (vconcat (seq-take seq len))))
-                   (suf (key-description (vconcat (seq-drop seq len)))))
+             (let ((pre (key-description (vconcat (take len seq))))
+                   (suf (key-description (vconcat (drop len seq)))))
                (setq pre (string-replace "RET" "C-m" pre))
                (setq pre (string-replace "TAB" "C-i" pre))
                (setq suf (string-replace "RET" "C-m" suf))
@@ -5080,8 +5076,8 @@ apply the face `transient-unreachable' to the complete string."
 (defun transient--key-unreachable-p (obj)
   (and transient--redisplay-key
        (let ((key (oref obj key)))
-         (not (or (equal (seq-take (cl-coerce (edmacro-parse-keys key t) 'list)
-                                   (length transient--redisplay-key))
+         (not (or (equal (take (length transient--redisplay-key)
+                               (cl-coerce (edmacro-parse-keys key t) 'list))
                          transient--redisplay-key)
                   (transient--lookup-key transient-sticky-map (kbd key)))))))
 

From a9064bfdd9c4bf4888a0cf043a0537ada36f454e Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 7 May 2026 19:05:39 +0300
Subject: [PATCH 372/463] ; * lisp/term/x-win.el (icon-map-list): Fix :type
 (bug#80982)

---
 lisp/term/x-win.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 7f03e9be585..c9713287d0e 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1491,7 +1491,10 @@ If you don't want stock icons, set the variable to nil."
   :type '(choice (const :tag "Don't use stock icons" nil)
 		 (repeat (choice symbol
 				 (cons (string :tag "Emacs icon")
-				       (string :tag "Stock/named")))))
+                                       (choice
+                                        (group (string "Named")
+                                               (string "Stock"))
+				        (string :tag "Stock/named"))))))
   :group 'x)
 
 (defcustom x-display-cursor-at-start-of-preedit-string nil

From 2f73996647ab34410440c2ae7965199577c59522 Mon Sep 17 00:00:00 2001
From: Zeke Dou <zeke@zekedou.live>
Date: Sun, 5 Apr 2026 15:16:53 +0200
Subject: [PATCH 373/463] Move ns_init_colors() after init_callproc()
 (bug#80752)

'data-directory' needs to be established in advance of 'ns_init_colors'
to ensure the file "etc/rgb.txt" is read.  This was encountered on an
out-of-tree Nix build.

* src/emacs.c (main): Move the 'ns_init_colors' after 'init_callproc'.

Copyright-paperwork-exempt: yes
---
 src/emacs.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/emacs.c b/src/emacs.c
index 7ae572120f6..11fe567737a 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2050,10 +2050,6 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
 #endif
 
 #ifdef HAVE_NS
-  /* For early calls to ns_lisp_to_color or Fns_list_colors.  */
-  if (!dump_mode)
-    ns_init_colors ();
-
   if (!noninteractive)
     {
 #ifdef NS_IMPL_COCOA
@@ -2293,6 +2289,13 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
   check_windows_init_file ();
 #endif
 
+#ifdef HAVE_NS
+  /* For early calls to ns_lisp_to_color or Fns_list_colors.
+     Must follow init_callproc which sets data-directory.  */
+  if (!dump_mode)
+    ns_init_colors ();
+#endif
+
   /* Intern the names of all standard functions and variables;
      define standard keys.  */
 

From 311f1fe2ba2a4d069715c992ba839645b55a9427 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 7 May 2026 17:38:20 +0100
Subject: [PATCH 374/463] Cut the emacs-31 release branch

* README:
* configure.ac:
* exec/configure.ac:
* java/AndroidManifest.xml.in (Version-code):
* msdos/sed2v2.inp:
* nt/README.W32: Bump Emacs version to 31.0.60.
* lisp/cus-edit.el (customize-changed-options-previous-release):
Set last version to 30.2.
---
 README                      | 2 +-
 configure.ac                | 2 +-
 exec/configure.ac           | 2 +-
 java/AndroidManifest.xml.in | 2 +-
 lisp/cus-edit.el            | 2 +-
 msdos/sed2v2.inp            | 2 +-
 nt/README.W32               | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README b/README
index 4c6bab5d3cb..4bd79384117 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Copyright (C) 2001-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This directory tree holds version 31.0.50 of GNU Emacs, the extensible,
+This directory tree holds version 31.0.60 of GNU Emacs, the extensible,
 customizable, self-documenting real-time display editor.
 
 The file INSTALL in this directory says how to build and install GNU
diff --git a/configure.ac b/configure.ac
index eeaaaa53a3d..8bc5f6daa11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.65])
 dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el.
-AC_INIT([GNU Emacs], [31.0.50], [bug-gnu-emacs@gnu.org], [],
+AC_INIT([GNU Emacs], [31.0.60], [bug-gnu-emacs@gnu.org], [],
   [https://www.gnu.org/software/emacs/])
 
 if test "$XCONFIGURE" = "android"; then
diff --git a/exec/configure.ac b/exec/configure.ac
index bc35b41e14e..d3907b61bc8 100644
--- a/exec/configure.ac
+++ b/exec/configure.ac
@@ -22,7 +22,7 @@ dnl  You should have received a copy of the GNU General Public License
 dnl  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.65])
-AC_INIT([libexec], [31.0.50], [bug-gnu-emacs@gnu.org], [],
+AC_INIT([libexec], [31.0.60], [bug-gnu-emacs@gnu.org], [],
   [https://www.gnu.org/software/emacs/])
 
 AH_TOP([/* Copyright (C) 2026 Free Software Foundation, Inc.
diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in
index a1760294046..138a0fb8b1e 100644
--- a/java/AndroidManifest.xml.in
+++ b/java/AndroidManifest.xml.in
@@ -350,6 +350,6 @@ repositories require an incrementing numeric version code to detect
 upgrades, which is provided here and is altered by admin/admin.el.
 Refer to e.g. https://forum.f-droid.org/t/emacs-packaging/30424/25.
 
-Version-code: 310050000
+Version-code: 310060000
 
 -->
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 87d8ecade54..a54ecfab614 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1344,7 +1344,7 @@ Show the buffer in another window, but don't select it."
     (unless (eq symbol basevar)
       (message "`%s' is an alias for `%s'" symbol basevar))))
 
-(defvar customize-changed-options-previous-release "30.1"
+(defvar customize-changed-options-previous-release "30.2"
   "Version for `customize-changed' to refer back to by default.")
 
 ;; Packages will update this variable, so make it available.
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index d7441f1e34d..47ffc77835f 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -66,7 +66,7 @@
 /^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/
 /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/
 /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
-/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "31.0.50"/
+/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "31.0.60"/
 /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/
 /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
 /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
diff --git a/nt/README.W32 b/nt/README.W32
index 788a87af8a8..5ac4e1dba7f 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,7 +1,7 @@
 Copyright (C) 2001-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
-		Emacs version 31.0.50 for MS-Windows
+		Emacs version 31.0.60 for MS-Windows
 
   This README file describes how to set up and run a precompiled
   distribution of the latest version of GNU Emacs for MS-Windows.  You

From edd345c33ffabdc5df12601305a8817566134b25 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 7 May 2026 17:40:02 +0100
Subject: [PATCH 375/463] ; Move etc/NEWS to etc/NEWS.31.

---
 etc/{NEWS => NEWS.31} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename etc/{NEWS => NEWS.31} (100%)

diff --git a/etc/NEWS b/etc/NEWS.31
similarity index 100%
rename from etc/NEWS
rename to etc/NEWS.31

From 0d287aa2761af39f64d5d0d7f4e6b74430ec8b74 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 7 May 2026 17:46:43 +0100
Subject: [PATCH 376/463] Bump master Emacs version to 32.0.50

* README:
* configure.ac:
* etc/refcards/ru-refcard.tex:
* exec/configure.ac:
* java/AndroidManifest.xml.in (Version-code):
* msdos/sed2v2.inp:
* nt/README.W32: Bump Emacs version to 32.0.50.
* etc/NEWS: Empty for Emacs 32.
* lisp/cus-edit.el (customize-changed-options-previous-release):
Set last version to 31.1.
* src/emacs-module.in.h (struct emacs_env_32): Add.
* src/module-env-31.h: Remove header comment.
* src/module-env-32.h: New file.
---
 README                      |  2 +-
 configure.ac                |  4 +-
 etc/NEWS                    | 74 +++++++++++++++++++++++++++++++++++++
 etc/refcards/ru-refcard.tex |  2 +-
 exec/configure.ac           |  2 +-
 java/AndroidManifest.xml.in |  2 +-
 lisp/cus-edit.el            |  2 +-
 msdos/sed2v2.inp            |  2 +-
 nt/README.W32               |  2 +-
 src/emacs-module.in.h       | 19 ++++++++++
 src/module-env-31.h         |  3 --
 src/module-env-32.h         |  3 ++
 12 files changed, 106 insertions(+), 11 deletions(-)
 create mode 100644 etc/NEWS
 create mode 100644 src/module-env-32.h

diff --git a/README b/README
index 4c6bab5d3cb..7181870155b 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Copyright (C) 2001-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This directory tree holds version 31.0.50 of GNU Emacs, the extensible,
+This directory tree holds version 32.0.50 of GNU Emacs, the extensible,
 customizable, self-documenting real-time display editor.
 
 The file INSTALL in this directory says how to build and install GNU
diff --git a/configure.ac b/configure.ac
index eeaaaa53a3d..6c45f2ccb48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.65])
 dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el.
-AC_INIT([GNU Emacs], [31.0.50], [bug-gnu-emacs@gnu.org], [],
+AC_INIT([GNU Emacs], [32.0.50], [bug-gnu-emacs@gnu.org], [],
   [https://www.gnu.org/software/emacs/])
 
 if test "$XCONFIGURE" = "android"; then
@@ -5100,6 +5100,7 @@ AC_SUBST_FILE([module_env_snippet_28])
 AC_SUBST_FILE([module_env_snippet_29])
 AC_SUBST_FILE([module_env_snippet_30])
 AC_SUBST_FILE([module_env_snippet_31])
+AC_SUBST_FILE([module_env_snippet_32])
 module_env_snippet_25="$srcdir/src/module-env-25.h"
 module_env_snippet_26="$srcdir/src/module-env-26.h"
 module_env_snippet_27="$srcdir/src/module-env-27.h"
@@ -5107,6 +5108,7 @@ module_env_snippet_28="$srcdir/src/module-env-28.h"
 module_env_snippet_29="$srcdir/src/module-env-29.h"
 module_env_snippet_30="$srcdir/src/module-env-30.h"
 module_env_snippet_31="$srcdir/src/module-env-31.h"
+module_env_snippet_31="$srcdir/src/module-env-32.h"
 emacs_major_version=`AS_ECHO([$PACKAGE_VERSION]) | sed 's/[[.]].*//'`
 AC_SUBST([emacs_major_version])
 
diff --git a/etc/NEWS b/etc/NEWS
new file mode 100644
index 00000000000..edb682a4968
--- /dev/null
+++ b/etc/NEWS
@@ -0,0 +1,74 @@
+GNU Emacs NEWS -- history of user-visible changes.
+
+Copyright (C) 2022-2026 Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+Please send Emacs bug reports to 'bug-gnu-emacs@gnu.org'.
+If possible, use 'M-x report-emacs-bug'.
+
+This file is about changes in Emacs version 32.
+
+See file HISTORY for a list of GNU Emacs versions and release dates.
+See files NEWS.31, NEWS.30, ..., NEWS.18, and NEWS.1-17 for changes
+in older Emacs versions.
+
+You can narrow news to a specific version by calling 'view-emacs-news'
+with a prefix argument or by typing 'C-u C-h C-n'.
+
+Temporary note:
++++ indicates that all relevant manuals in doc/ have been updated.
+--- means no change in the manuals is needed.
+When you add a new item, use the appropriate mark if you are sure it
+applies, and please also update docstrings as needed.
+
+
+* Installation Changes in Emacs 32.1
+
+
+* Startup Changes in Emacs 32.1
+
+
+* Changes in Emacs 32.1
+
+
+* Editing Changes in Emacs 32.1
+
+
+* Changes in Specialized Modes and Packages in Emacs 32.1
+
+
+* New Modes and Packages in Emacs 32.1
+
+
+* Incompatible Lisp Changes in Emacs 32.1
+
+
+* Lisp Changes in Emacs 32.1
+
+
+* Changes in Emacs 32.1 on Non-Free Operating Systems
+
+
+----------------------------------------------------------------------
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+
+Local variables:
+coding: utf-8
+mode: outline
+mode: emacs-news
+paragraph-separate: "[	 ]"
+end:
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index 53fa116722e..23a44b11473 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -40,7 +40,7 @@
 \newlength{\ColThreeWidth}
 \setlength{\ColThreeWidth}{25mm}
 
-\newcommand{\versionemacs}[0]{31} % version of Emacs this is for
+\newcommand{\versionemacs}[0]{32} % version of Emacs this is for
 \newcommand{\cyear}[0]{2026}       % copyright year
 
 \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
diff --git a/exec/configure.ac b/exec/configure.ac
index bc35b41e14e..81780359904 100644
--- a/exec/configure.ac
+++ b/exec/configure.ac
@@ -22,7 +22,7 @@ dnl  You should have received a copy of the GNU General Public License
 dnl  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.65])
-AC_INIT([libexec], [31.0.50], [bug-gnu-emacs@gnu.org], [],
+AC_INIT([libexec], [32.0.50], [bug-gnu-emacs@gnu.org], [],
   [https://www.gnu.org/software/emacs/])
 
 AH_TOP([/* Copyright (C) 2026 Free Software Foundation, Inc.
diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in
index a1760294046..10e121134e4 100644
--- a/java/AndroidManifest.xml.in
+++ b/java/AndroidManifest.xml.in
@@ -350,6 +350,6 @@ repositories require an incrementing numeric version code to detect
 upgrades, which is provided here and is altered by admin/admin.el.
 Refer to e.g. https://forum.f-droid.org/t/emacs-packaging/30424/25.
 
-Version-code: 310050000
+Version-code: 320050000
 
 -->
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 87d8ecade54..3687f231f94 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1344,7 +1344,7 @@ Show the buffer in another window, but don't select it."
     (unless (eq symbol basevar)
       (message "`%s' is an alias for `%s'" symbol basevar))))
 
-(defvar customize-changed-options-previous-release "30.1"
+(defvar customize-changed-options-previous-release "31.1"
   "Version for `customize-changed' to refer back to by default.")
 
 ;; Packages will update this variable, so make it available.
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index d7441f1e34d..899d30e7f99 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -66,7 +66,7 @@
 /^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/
 /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/
 /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
-/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "31.0.50"/
+/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "32.0.50"/
 /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/
 /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
 /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
diff --git a/nt/README.W32 b/nt/README.W32
index 788a87af8a8..9efff8c9406 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,7 +1,7 @@
 Copyright (C) 2001-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
-		Emacs version 31.0.50 for MS-Windows
+		Emacs version 32.0.50 for MS-Windows
 
   This README file describes how to set up and run a precompiled
   distribution of the latest version of GNU Emacs for MS-Windows.  You
diff --git a/src/emacs-module.in.h b/src/emacs-module.in.h
index 7157ca75681..bf9d63b3fa3 100644
--- a/src/emacs-module.in.h
+++ b/src/emacs-module.in.h
@@ -215,6 +215,25 @@ struct emacs_env_31
 @module_env_snippet_31@
 };
 
+struct emacs_env_32
+{
+@module_env_snippet_25@
+
+@module_env_snippet_26@
+
+@module_env_snippet_27@
+
+@module_env_snippet_28@
+
+@module_env_snippet_29@
+
+@module_env_snippet_30@
+
+@module_env_snippet_31@
+
+@module_env_snippet_32@
+};
+
 /* Every module should define a function as follows.  */
 extern int emacs_module_init (struct emacs_runtime *runtime)
   EMACS_NOEXCEPT
diff --git a/src/module-env-31.h b/src/module-env-31.h
index e9827b18382..e69de29bb2d 100644
--- a/src/module-env-31.h
+++ b/src/module-env-31.h
@@ -1,3 +0,0 @@
-  /* Add module environment functions newly added in Emacs 31 here.
-     Before Emacs 31 is released, remove this comment and start
-     module-env-32.h on the master branch.  */
diff --git a/src/module-env-32.h b/src/module-env-32.h
new file mode 100644
index 00000000000..8051066bf88
--- /dev/null
+++ b/src/module-env-32.h
@@ -0,0 +1,3 @@
+  /* Add module environment functions newly added in Emacs 32 here.
+     Before Emacs 32 is released, remove this comment and start
+     module-env-33.h on master (see admin/release-branch.txt).  */

From ddde687b3f931137fdfc37daa71fe9b205afeeb0 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 7 May 2026 17:46:57 +0100
Subject: [PATCH 377/463] ; * admin/admin.el (set-version): Fix punctuation.

---
 admin/admin.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/admin.el b/admin/admin.el
index d4639ce4bc9..305449fd25e 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -192,7 +192,7 @@ Documentation changes might not have been completed!"))))
                     "mv" newsfile oldnewsfile)
       (when (y-or-n-p "Commit move of NEWS file?")
         (call-process admin-git-command nil nil nil
-                      "commit" "-m" (format "; Move etc/%s to etc/%s"
+                      "commit" "-m" (format "; Move etc/%s to etc/%s."
                                             (file-name-nondirectory newsfile)
                                             (file-name-nondirectory oldnewsfile))))
       (find-file oldnewsfile)           ; to prompt you to commit it

From 3c6c3f5a69065dfea31938d7691a912146a53c69 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 7 May 2026 20:04:04 +0100
Subject: [PATCH 378/463] ; Fix two file headers misunderstood by authors.el.

---
 lisp/org/ob-ditaa.el       |  3 ++-
 lisp/progmodes/lua-mode.el | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lisp/org/ob-ditaa.el b/lisp/org/ob-ditaa.el
index 55d375a8589..82995d4789c 100644
--- a/lisp/org/ob-ditaa.el
+++ b/lisp/org/ob-ditaa.el
@@ -2,7 +2,8 @@
 
 ;; Copyright (C) 2009-2026 Free Software Foundation, Inc.
 
-;; Authors: Eric Schulte, Jarmo Hurri
+;; Authors: Eric Schulte
+;;          Jarmo Hurri
 ;; Keywords: literate programming, reproducible research
 ;; URL: https://orgmode.org
 
diff --git a/lisp/progmodes/lua-mode.el b/lisp/progmodes/lua-mode.el
index ec13bec54b2..dca93a86888 100644
--- a/lisp/progmodes/lua-mode.el
+++ b/lisp/progmodes/lua-mode.el
@@ -7,11 +7,11 @@
 ;;         2006 Juergen Hoetzel <juergen@hoetzel.info>
 ;;         2004 various (support for Lua 5 and byte compilation)
 ;;         2001 Christian Vogler <cvogler@gradient.cis.upenn.edu>
-;;         1997 Bret Mogilefsky <mogul-lua@gelatinous.com> starting from
-;;              tcl-mode by Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>
-;;              with tons of assistance from
-;;              Paul Du Bois <pld-lua@gelatinous.com> and
-;;              Aaron Smith <aaron-lua@gelatinous.com>.
+;;         1997 Bret Mogilefsky <mogul-lua@gelatinous.com>
+;; Bret Mogilefsky started from tcl-mode by
+;;                               Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>
+;; with tons of assistance from  Paul Du Bois <pld-lua@gelatinous.com>
+;;                          and  Aaron Smith <aaron-lua@gelatinous.com>.
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages, processes, tools
 

From 991f6100eb1fa9c78a723f48ea903971d7c44de9 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 7 May 2026 20:04:26 +0100
Subject: [PATCH 379/463] ; * admin/make-tarball.txt: Suggest load-file, not
 require.

---
 admin/make-tarball.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 3257dc6ce46..2ef31c0042b 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -108,7 +108,7 @@ General steps (for each step, check for possible errors):
 
     Now:
 
-      M-: (require 'authors) RET
+      M-x load-file RET admin/authors.el RET
       M-x authors RET
 
     If this says "Problem updating ChangeLog", find the reason for the

From 1ec79b48f3802b71b017399aef29b2dbdc5e7d2d Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 7 May 2026 20:08:43 +0100
Subject: [PATCH 380/463] ; Update exported ChangeLog files and etc/AUTHORS

There are still unfixed problems in *Authors Errors*.

* ChangeLog.3: Fix typos.
* ChangeLog.5: Export from VCS history.
* Makefile.in: Update PREFERRED_BRANCH.
* admin/authors.el (authors-aliases, authors-ignored-files)
(authors-valid-file-names, authors-renamed-files-alist): Add
some entries.
* etc/AUTHORS: Regenerate.
---
 ChangeLog.3      |     4 +-
 ChangeLog.5      | 63125 ++++++++++++++++++++++++++++++++++++++++++++-
 Makefile.in      |     2 +-
 admin/authors.el |    60 +-
 etc/AUTHORS      |  1426 +-
 5 files changed, 64029 insertions(+), 588 deletions(-)

diff --git a/ChangeLog.3 b/ChangeLog.3
index 7d9ac034cdc..e34e7bfc6f4 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -3149,7 +3149,7 @@
 
 	Remove mention of removed `gnus-treat-play-sounds' variable from manual
 
-	* info/gnus.info: Remove `gnus-treat-play-sounds' from
+	* doc/misc/gnus.texi: Remove `gnus-treat-play-sounds' from
 	manual. According to lisp/gnus/ChangeLog.3 this variable was
 	removed in 2010 (bug#53192).
 
@@ -46460,7 +46460,7 @@
 
 	* lisp/subr.el (ctl-x-map): Initialize inside the declaration.
 
-	* src/command.h (control_x_map):
+	* src/commands.h (control_x_map):
 	* src/keymap.c (control_x_map): Delete variable.
 	(syms_of_keymap):
 	* src/keyboard.c (keys_of_keyboard):
diff --git a/ChangeLog.5 b/ChangeLog.5
index 43806515e08..ff0d0aebc80 100644
--- a/ChangeLog.5
+++ b/ChangeLog.5
@@ -1,3 +1,63126 @@
+2026-05-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Cut the emacs-31 release branch
+
+	* README:
+	* configure.ac:
+	* exec/configure.ac:
+	* java/AndroidManifest.xml.in (Version-code):
+	* msdos/sed2v2.inp:
+	* nt/README.W32: Bump Emacs version to 31.0.60.
+	* lisp/cus-edit.el (customize-changed-options-previous-release):
+	Set last version to 30.2.
+
+2026-05-07  Zeke Dou  <zeke@zekedou.live>  (tiny change)
+
+	Move ns_init_colors() after init_callproc() (bug#80752)
+
+	'data-directory' needs to be established in advance of 'ns_init_colors'
+	to ensure the file "etc/rgb.txt" is read.  This was encountered on an
+	out-of-tree Nix build.
+
+	* src/emacs.c (main): Move the 'ns_init_colors' after 'init_callproc'.
+
+2026-05-07  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Update to Transient v0.13.3-10-g87d0ca08
+
+2026-05-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix infloop in redisplay due to continuation glyphs
+
+	* src/xdisp.c (display_line): When inserting continuation glyphs,
+	account for the border glyph in non-rightmost windows on TTY
+	frames.  (Bug#80975)
+
+2026-05-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Unpreload package-activate-all
+
+	See <https://debbugs.gnu.org/80079#49> for my reasoning.
+
+	* lisp/emacs-lisp/package-activate.el (package-activate-all):
+	Unpreload.
+
+2026-05-07  Dmitry Gutov  <dmitry@gutov.dev>
+
+	[GTK3] Move the frame to position before showing
+
+	* src/xterm.c (x_make_frame_visible): Move XMoveWindow call before
+	gtk_widget_show_all, so that the move happens before the frame
+	become visible (bug#80662).
+
+2026-05-07  Dmitry Gutov  <dmitry@gutov.dev>
+
+	[GTK3] Improve the resize -> hide -> show scenario
+
+	* src/gtkutil.c (xg_frame_set_char_size)
+	(xg_frame_set_size_and_position): Call gtk_window_resize for
+	child frames too, to record _GtkWindowGeometryInfo#resize_width
+	and resize_height.  They are later looked up by
+	gtk_widget_show_all in x_make_frame_visible (bug#80662).
+	Without this the widgets go back and forth between the
+	remembered and actual sizes after make-visible.
+
+2026-05-06  Michael Albinus  <michael.albinus@gmx.de>
+
+	Handle long environment variables in Tramp oricesses
+
+	* lisp/net/tramp-sh.el (tramp-sh-handle-make-process):
+	Handle loooong environment variables.  (Bug#80783)
+
+	* test/lisp/net/tramp-tests.el (tramp-test33-environment-variables):
+	Adapt test.
+
+2026-05-06  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Fix flicker of child frame right after make-frame-visible
+
+	* src/xterm.c (x_make_frame_visible): Call SET_FRAME_GARBAGED
+	before making a child frame visible (bug#80943).
+
+2026-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(help--symbol-completion-table): Try and fix bug#80873
+
+	* lisp/help-fns.el (help--symbol-completion-table): Don't let
+	`test-completion` pretend that `definition-prefixes` are
+	actually valid function names.
+
+2026-05-05  Juri Linkov  <juri@linkov.net>
+
+	Improve 'context-menu-send-to' (bug#79512)
+
+	* lisp/mouse.el (context-menu-functions): Add missing
+	'context-menu-send-to' to :type.
+	(context-menu-send-to): Get non-nil items to avoid
+	useless message "Nothing to send".
+
+	* lisp/send-to.el (send-to-handlers): Change from
+	'defvar-local' to 'defvar' to allow easier global configuration.
+	(send-to-supported-p): Check for non-nil handler.
+
+2026-05-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-switch-working-tree: Don't find non-VC projects
+
+	* lisp/vc/vc.el (project-current-directory-override):
+	Delete declaration.
+	(project-find-matching-buffer-function): Declare.
+	(vc-switch-working-tree):
+	Don't find non-VC projects (bug#80939).
+
+2026-05-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-finish-logentry: Skip displaying async command buffer sometimes
+
+	* lisp/vc/vc-dispatcher.el (vc-finish-logentry): Don't display
+	the async command buffer if vc-display-failed-async-commands is
+	non-nil.
+
+2026-05-05  Eshel Yaron  <me@eshelyaron.com>
+
+	elisp-mode: Cache 'help-echo' function results (bug#80948)
+
+	This ensures we only compute the 'help-echo' string once per
+	symbol in a certain position.
+
+	* lisp/progmodes/elisp-mode.el
+	(elisp--annotate-symbol-with-help-echo): Add caching for
+	when the symbol role's :help property is a function.
+
+2026-05-05  Andrea Alberti  <a.alberti82@gmail.com>
+
+	Introduce 'margin' face for window margin background
+
+	A new basic face 'margin' is used for text displayed in the left and
+	right margin areas, i.e., the areas typically used by VCS and LSP
+	packages for per-line annotations.  Its background defaults to the
+	frame default, preserving existing behavior for users who do not
+	customize it.
+	* etc/NEWS: Document the new 'margin' face.
+	* lisp/faces.el (margin): Add 'margin' face, inheriting from 'default'.
+	* src/dispextern.h (face_id): Add MARGIN_FACE_ID.
+	* src/xdisp.c (face_at_pos): Use 'margin' as the base face for
+	strings displayed in margin areas so that they inherit the gutter
+	background by default.
+	(extend_face_to_end_of_line): Compute 'margin_fill_face_id' from the
+	'margin' face.  Use while loops to explicitly fill all empty character
+	slots in both left and right margins for both GUI and TTY branches.
+	(display_line): Call 'extend_face_to_end_of_line' for beyond-EOB rows
+	when the window has margins.  Also extend the existing condition for
+	text rows with empty margins to trigger when the 'margin' face
+	background differs from the frame default, not only when the default
+	face is remapped.
+	* src/xfaces.c (realize_basic_faces): Realize 'margin' as a basic
+	face to support face-remapping and efficient lookup.
+	(Bug#80693)
+
+2026-05-05  Augusto Stoffel  <arstoffel@gmail.com>
+
+	Accept stream type as 4th argument of X-Message-SMTP-Method header
+
+	* lisp/gnus/message.el (message-multi-smtp-send-mail): Set
+	'smtpmail-stream-type' if specificed in the header.
+	* doc/misc/message.texi (Mail Variables): Document that.
+	(Bug#80880)
+
+2026-05-05  Rahul Martim Juliato  <rahul.juliato@gmail.com>
+	    Stéphane Marks  <shipmints@gmail.com>
+
+	Improve 'markdown-ts-mode'
+
+	Overhaul 'markdown-ts-mode' with comprehensive fontification,
+	code block handling, editing commands, fill-paragraph support,
+	inline image previews, a mode menu, and table editing.  Add
+	'markdown-ts-mode-x.el' with conversion/export and TOC support.
+
+	* lisp/textmodes/markdown-ts-mode.el: Add Version,
+	Package-Requires, and Keywords header fields.  Expand Commentary
+	with documentation for code block language modes, code block
+	commands, bidirectional text, and known tree-sitter grammar
+	bugs.
+	(require 'goto-addr, xref, icons): New requirements.
+	(markdown-ts): New customization group with :version and
+	:package-version tags.
+	(markdown-ts-hide-markup): Add :version and :package-version.
+	(markdown-ts-ellipsis): New option for folded heading ellipsis.
+	(markdown-ts-menu-bar-show): New option to toggle mode menu.
+	(markdown-ts-default-folding): New option for default fold
+	level.
+	(markdown-ts-inline-images): New option to display inline
+	images.
+	(markdown-ts-image-max-width): New option for image max width.
+	(markdown-ts-display-remote-inline-images): New option for
+	remote image handling.
+	(markdown-ts--resolve-display-value): New helper to resolve
+	display values using char-displayable-p.
+	(markdown-ts-checked-checkbox): New option for checked checkbox
+	display string or icon.
+	(markdown-ts-checked-checkbox-icon): New icons.el icon for the
+	checked variant.
+	(markdown-ts-unchecked-checkbox): New option for unchecked
+	checkbox display string or icon.
+	(markdown-ts-unchecked-checkbox-icon): New icons.el icon for the
+	unchecked variant.
+	(markdown-ts-thematic-break-character): New option for thematic
+	break display character.
+	(markdown-ts-hard-line-break-backslash): New option for the
+	glyph shown in place of a trailing-backslash hard line break
+	when markup is hidden.
+	(markdown-ts-hard-line-break-space): New option for the glyph
+	shown in place of a trailing-spaces hard line break when markup
+	is hidden.
+	(markdown-ts-code-block-in-context-mode-lighter): New option for
+	code block context mode lighter string.
+	(markdown-ts-inhibit-code-block-mode-warnings): New option to
+	inhibit code-block major-mode messages and warnings.
+	(markdown-ts-table-default-column-width): New option for default
+	table column width.
+	(markdown-ts-enable-table-mode): New option to enable table
+	mode.
+	(markdown-ts-table-auto-align): New option for triggers that
+	cause automatic table alignment.
+	(markdown-ts-table-align-features): New option for table align
+	features.
+	(markdown-ts-in-table-mode-lighter): New option for
+	markdown-ts-in-table-mode lighter string.
+	(markdown-ts-emphasis, markdown-ts-bold)
+	(markdown-ts-strikethrough, markdown-ts-link)
+	(markdown-ts-link-destination, markdown-ts-code-span)
+	(markdown-ts-code-block, markdown-ts-code-block-markup-hidden)
+	(markdown-ts-indented-code-block, markdown-ts-html-tag)
+	(markdown-ts-html-block, markdown-ts-thematic-break)
+	(markdown-ts-entity-reference)
+	(markdown-ts-numeric-character-reference, markdown-ts-latex)
+	(markdown-ts-table-header, markdown-ts-table-cell)
+	(markdown-ts-table-delimiter-cell, markdown-ts-task-unchecked)
+	(markdown-ts-task-checked): New faces.
+	(markdown-ts-hard-line-break-backslash)
+	(markdown-ts-hard-line-break-backslash-hidden)
+	(markdown-ts-hard-line-break-space)
+	(markdown-ts-hard-line-break-space-hidden): New faces for the
+	two hard-line-break variants, with distinct shown/hidden
+	appearances.
+	(markdown-ts-in-code-block): New face for when point is inside a
+	fenced code block.
+	(markdown-ts-table): New face for Markdown pipe table
+	background.
+	(markdown-ts-in-table): New face for markdown-ts-in-table-mode
+	when point is in a table.
+	(markdown-ts--set-up-inline): New variable for lightweight setup
+	in embedded inline markdown-ts-mode buffers used by code block
+	commands.
+	(markdown-ts-default-code-block-mode): New variable to define
+	default mode for anonymous code blocks.
+	(markdown-ts-fontify-code-blocks-natively): New option to
+	enable/disable native fontification of fenced code block
+	contents.
+	(markdown-ts-enable-code-block-context-mode): New option to
+	enable/disable code block context integration.
+	(markdown-ts-code-block-modes): New variable replacing
+	markdown-ts--code-block-language-map and
+	markdown-ts-code-block-source-mode-map with unified language to
+	mode mapping including heuristic lookup.
+	(markdown-ts-code-block-force-conventional-modes): New variable
+	listing tree-sitter modes whose fontification of code block
+	content should be harvested via a temporary buffer.
+	(markdown-ts-table-export-buffer): New constant for table export
+	output buffer name.
+	(markdown-ts--table-row-types, markdown-ts--table-cell-types)
+	(markdown-ts--table-delimiter-cell-types)
+	(markdown-ts--table-delimiter-cell-subtypes): New constants for
+	pipe table node type classification.
+	(markdown-ts--make-link-button): New function to create
+	clickable link buttons with mailto, browse-url, and find-file
+	dispatch.
+	(markdown-ts--fontify-link-destination): New fontifier that
+	hides link destinations when markup is hidden.
+	(markdown-ts--link-ref-cache, markdown-ts--link-ref-cache-tick)
+	(markdown-ts--link-ref-definitions)
+	(markdown-ts--resolve-link-ref): New link reference definition
+	cache with case-insensitive matching per CommonMark spec.
+	(markdown-ts--fontify-link-node): New fontifier for inline,
+	reference, shortcut, and collapsed links as clickable buttons.
+	(markdown-ts--fontify-autolink): New fontifier for URI and email
+	autolinks with angle bracket hiding.
+	(markdown-ts--fontify-link-ref-label)
+	(markdown-ts--fontify-link-ref-destination): New fontifiers for
+	link reference definitions.
+	(markdown-ts--slug-github-strip-re, markdown-ts--slug-github)
+	(markdown-ts--slug-pandoc, markdown-ts--explicit-id-re)
+	(markdown-ts--heading-text-and-id)
+	(markdown-ts--heading-id-cache)
+	(markdown-ts--heading-id-cache-tick)
+	(markdown-ts--build-heading-ids, markdown-ts--heading-ids)
+	(markdown-ts--follow-fragment): New fragment link support with
+	GitHub and Pandoc slug algorithms.
+	(markdown-ts--latex-block-valid-p)
+	(markdown-ts--fontify-latex-block): New LaTeX/math fontifier
+	with cross-paragraph validation.
+	(markdown-ts--fontify-backslash-escape): New fontifier that
+	hides backslash in escapes except inside LaTeX blocks.
+	(markdown-ts--decode-entity, markdown-ts--fontify-entity): New
+	HTML entity decoder and fontifier using org-entities and
+	sgml-char-names with display property for decoded values.
+	(markdown-ts--fontify-checkbox): New fontifier showing the
+	configured checkbox glyph when markup is hidden.
+	(markdown-ts--fontify-hard-line-break): New fontifier for
+	'hard_line_break' nodes.
+	(markdown-ts--fontify-heading): New fontifier for ATX and Setext
+	headings.
+	(markdown-ts--fontify-thematic-break): New fontifier showing
+	horizontal line when markup is hidden.
+	(markdown-ts--fontify-code-block): New fontifier applying
+	background overlay to code blocks with language and mode
+	properties.
+	(markdown-ts-at-code-block-p)
+	(markdown-ts-code-block-language-at)
+	(markdown-ts-code-block-mode-at): New accessors for code block
+	overlay properties.
+	(markdown-ts--imenu-code-block-node-p): New helper for imenu
+	code block detection.
+	(markdown-ts--image-alone-on-line-p)
+	(markdown-ts--fontify-image): New inline image display with
+	standalone and inline positioning.
+	(markdown-ts--bare-url-regexp)
+	(markdown-ts--bare-email-uri-regexp)
+	(markdown-ts--fontify-bare-uri): New bare URL/email
+	fontification via jit-lock using goto-addr regexps.
+	(markdown-ts--treesit-settings): Rewrite with dedicated faces,
+	custom fontifiers, and new font-lock features for all inline and
+	block elements.  Also add a new 'error' font-lock feature
+	highlighting tree-sitter ERROR nodes.
+	(markdown-ts--code-block-languages)
+	(markdown-ts--code-block-non-ts-modes): New buffer-local alists
+	for code block language tracking.
+	(markdown-ts--harvest-mode-treesit-configuration): Rename from
+	markdown-ts--harvest-treesit-configs with delay-mode-hooks.
+	(markdown-ts--configure-current-buffer): Rename from
+	markdown-ts--add-config-for-mode.
+	(markdown-ts--language-at-node): New helper extracting language
+	symbol from code_fence_content node.
+	(markdown-ts--non-ts-fontify-cache): New buffer-local hash table
+	caching fontification results for non-tree-sitter code blocks.
+	(markdown-ts--fontify-non-ts-collect-faces): New function
+	harvesting face properties from a mode in an indirect or
+	temporary buffer.
+	(markdown-ts--fontify-non-ts-code-block): New fontifier for
+	non-tree-sitter modes via temporary buffer font-lock.
+	(markdown-ts--code-block-language-mode): New function with
+	heuristic mode name probing.
+	(markdown-ts--code-block-ts-language): Rename from
+	markdown-ts--convert-code-block-language with support for non-ts
+	modes and recursive markdown handling.
+	(markdown-ts-code-block-commands)
+	(markdown-ts-code-block-thing-commands)
+	(markdown-ts-code-block-region-commands): New command lists for
+	code-block context execution.
+	(markdown-ts--enable-code-block-in-context-mode)
+	(markdown-ts--maybe-run-command-in-code-block)
+	(markdown-ts--code-block-xref-find-definitions)
+	(markdown-ts--run-command-in-code-block): New code block minor
+	mode with temp-buffer command dispatch.
+	(markdown-ts--code-block-newline): New command for newline
+	inside code blocks, dispatching to the block's mode.
+	(markdown-ts--range-settings): Update range configuration;
+	remove :range-fn treesit-range-fn-exclude-children.
+	(markdown-ts--remove-image-overlays)
+	(markdown-ts--outline-view-change): New helpers for image
+	overlay management during outline fold/unfold.
+	(markdown-ts--outline-invisible-p): New helper testing whether a
+	position is inside an outline-folded region.
+	(markdown-ts--host-ranges-notifier): New function pruning stale
+	code block overlays when the host parse tree changes.
+	(markdown-ts--barf-if-not-mode): New helper signaling a
+	user-error when the current buffer is not derived from
+	markdown-ts-mode.
+	(markdown-ts-code-block-in-context-mode): New minor mode enabled
+	when point is within a fenced code block, activating
+	markdown-ts-code-block-in-context-mode-map so eligible commands
+	dispatch to the block's major mode.
+	(markdown-ts--set-hide-markup): Clear image overlays when
+	toggling markup visibility.
+	(markdown-ts--set-inline-images)
+	(markdown-ts-toggle-inline-images): New functions for toggling
+	inline image display.
+	(markdown-ts--parser-heading-max-level): New constant.
+	(markdown-ts--heading-at-point, markdown-ts--heading-level)
+	(markdown-ts--section-at-point): New heading navigation helpers.
+	(markdown-ts-promote, markdown-ts-demote): New commands for
+	heading and list item promotion/demotion with region support.
+	(markdown-ts--promote-or-demote)
+	(markdown-ts--promote-or-demote-region): New heading level
+	adjustment functions.
+	(markdown-ts-move-subtree-up, markdown-ts-move-subtree-down):
+	New commands for moving sections and list items.
+	(markdown-ts--section-folded-p)
+	(markdown-ts--move-subtree-up-or-down): New subtree move with
+	folding state preservation.
+	(markdown-ts-toggle-checkbox): New command to toggle task list
+	checkboxes.
+	(markdown-ts--list-item-at-point): New helper with block quote
+	marker handling.
+	(markdown-ts--list-marker-width, markdown-ts--list-item-region)
+	(markdown-ts--list-ordered-item-p): New list item helpers.
+	(markdown-ts--list-promote-or-demote): New function with ordered
+	list nesting guard.
+	(markdown-ts--list-node-bol, markdown-ts--list-move): New list
+	item movement functions.
+	(markdown-ts-renumber-list): New command for sequential list
+	renumbering with prefix argument support.
+	(markdown-ts--list-item-new-marker)
+	(markdown-ts--new-marker-for-line): New marker string generators
+	for list item insertion.
+	(markdown-ts--line-block-quote-depth): New helper counting block
+	quote depth.
+	(markdown-ts-newline): New RET command for context-aware
+	newline.
+	(markdown-ts-insert-list-item): New M-RET command that creates a
+	new list item.
+	(markdown-ts--fill-unfillable-block-query): New tree-sitter
+	query for unfillable blocks.
+	(markdown-ts--list-item-text-column): New helper for list item
+	text alignment.
+	(markdown-ts--fill-list-item): New function filling within list
+	items without merging adjacent items.
+	(markdown-ts--adaptive-fill): New adaptive fill function for
+	list item continuation.
+	(markdown-ts--fill-forward-paragraph): New paragraph motion
+	respecting list items and unfillable blocks.
+	(markdown-ts-fill-paragraph): New fill-paragraph-function with
+	cond* dispatch for lists, block quotes, HTML comments, and
+	unfillable blocks.
+	(markdown-ts--fill-html-comment): New HTML comment filler with
+	continuation alignment.
+	(markdown-ts--block-quote-prefix): New helper preserving
+	existing block quote marker style.
+	(markdown-ts--fill-block-quote): New block quote filler with
+	list item text column alignment.
+	(markdown-ts-emphasis-alist): New alist of emphasis markers.
+	(markdown-ts--emphasis-node-at-point): New tree-sitter based
+	emphasis detection.
+	(markdown-ts-remove-emphasis): New command removing emphasis at
+	point or region.
+	(markdown-ts-emphasize): New interactive emphasis insertion with
+	region wrapping and word-at-point support.
+	(markdown-ts-insert-structure): New command for inserting code
+	blocks, block quotes, and dividers.
+	(markdown-ts--insert-code-block): New function with language
+	completion from known modes.
+	(markdown-ts--insert-block-quote): New function with region
+	wrapping.
+	(markdown-ts--insert-divider): New function for horizontal
+	rules.
+	(markdown-ts--apply-ellipsis): New function applying custom
+	ellipsis via display table.
+	(markdown-ts--set-up): Rename from markdown-ts-setup.
+	(markdown-ts-outline-cycle): New TAB command cycling outline
+	visibility on headings.
+	(markdown-ts-mode-map): New keymap for code block navigation,
+	bindings for heading navigation, structure editing, emphasis,
+	and list operations.
+	(markdown-ts-code-block-in-context-mode-map): New keymap for
+	code block context.
+	(markdown-ts-mode-menu): New menu bar with Show/Hide, Navigate
+	Headings, Edit Structure, and Editing sections.
+	(markdown-ts-mode): Add outline-minor-mode, ellipsis, folding,
+	fill-paragraph integration, code-block-context-mode hooks,
+	comment settings, and outline-view-change-hook.  Use
+	markdown-ts-mode directly in auto-mode-alist instead of
+	markdown-ts-mode-maybe.
+	(markdown-ts-mode-install-parsers): New command for installing
+	required and optional tree-sitter language grammars.
+	(markdown-ts-code-block-context-mode): New minor mode for code
+	block context.
+	(markdown-ts--find-code-block-delimiter)
+	(markdown-ts--find-next-code-block-delimiter): New helpers for
+	locating fenced code block delimiter nodes.
+	(markdown-ts-move-to-next-code-block)
+	(markdown-ts-move-to-previous-code-block): New commands for
+	navigating between fenced code blocks.
+	(markdown-ts--table-abutting-pos, markdown-ts--table-node-cell)
+	(markdown-ts--table-node-row, markdown-ts--table-parse-error-p):
+	New pipe table node helpers.
+	(markdown-ts-at-table-p): New predicate returning non-nil when
+	point is at or within a pipe table.
+	(markdown-ts--enable-in-table-mode): New helper enabling
+	markdown-ts-in-table-mode from post-command-hook.
+	(markdown-ts--table-body-row-near-pos): New helper locating the
+	nearest body row to a position.
+	(markdown-ts--table-compute-node-column)
+	(markdown-ts-table--goto-column): New helpers for column-based
+	table navigation.
+	(markdown-ts--table-aligners, markdown-ts--table-make-aligner)
+	(markdown-ts--table-align-cell): New table cell alignment
+	helpers.
+	(markdown-ts-table-insert-table): New command to insert a pipe
+	table with configurable rows and columns.
+	(markdown-ts-table-delete-table): New command to delete the pipe
+	table at point.
+	(markdown-ts-table-previous-row, markdown-ts-table-next-row)
+	(markdown-ts-table-previous-cell, markdown-ts-table-next-cell):
+	New commands for navigating table rows and cells.
+	(markdown-ts-table-insert-row-below)
+	(markdown-ts-table-insert-row-above)
+	(markdown-ts-table-clone-row-below)
+	(markdown-ts-table-clone-row-above)
+	(markdown-ts-table-insert-row): New commands for inserting and
+	cloning table rows.
+	(markdown-ts-table-delete-row, markdown-ts-table-move-row-up)
+	(markdown-ts-table-move-row-down, markdown-ts-table-move-row):
+	New commands for deleting and moving table rows.
+	(markdown-ts-table-insert-column-left)
+	(markdown-ts-table-insert-column-right)
+	(markdown-ts-table-clone-column-left)
+	(markdown-ts-table-clone-column-right)
+	(markdown-ts-table-insert-column): New commands for inserting
+	and cloning table columns.
+	(markdown-ts-table-delete-column)
+	(markdown-ts-table-move-column-left)
+	(markdown-ts-table-move-column-right)
+	(markdown-ts-table-move-column): New commands for deleting and
+	moving table columns.
+	(markdown-ts-table-align-column-left)
+	(markdown-ts-table-align-column-center)
+	(markdown-ts-table-align-column-right)
+	(markdown-ts-table-align-column): New commands for setting
+	column alignment.
+	(markdown-ts-table-align-table): New command to align all
+	columns in the table at point.
+	(markdown-ts-table-transpose-table): New command to transpose
+	the table at point.
+	(markdown-ts-table-convert-csv-region)
+	(markdown-ts-table-convert-tsv-region)
+	(markdown-ts-table-convert-region): New commands to convert
+	delimited text regions to pipe tables.
+	(markdown-ts-table-export-table-csv)
+	(markdown-ts-table-export-table-tsv)
+	(markdown-ts-table-export-table): New commands to export the
+	pipe table at point to CSV or TSV format.
+	(markdown-ts-in-table-mode-map): New keymap for
+	markdown-ts-in-table-mode.
+	(markdown-ts--code-block-in-context-mode-ov): New buffer-local
+	variable for code block context overlay.
+	(markdown-ts--code-block-in-context-mode-update-ov): New
+	function updating the code block context overlay.
+	(markdown-ts-in-table-mode): New minor mode enabled when point
+	is within a pipe table, activating markdown-ts-in-table-mode-map.
+	(markdown-ts--in-table-mode-ov)
+	(markdown-ts--in-table-mode-get-ov)
+	(markdown-ts--table-tick-update)
+	(markdown-ts--table-tick-stale-p)
+	(markdown-ts--in-table-mode-update-ov): New helpers supporting
+	markdown-ts-in-table-mode overlay management.
+	(markdown-ts-table-mode): New minor mode providing table editing
+	commands and auto-alignment.
+	(markdown-ts-mode-maybe): Remove; auto-mode-alist now uses
+	markdown-ts-mode directly.
+	Auto-mode-alist: Add .markdown and .mdx extensions.
+
+	* lisp/textmodes/markdown-ts-mode-x.el: New file providing extra
+	features for markdown-ts-mode.
+	(markdown-ts-commonmark-spec-url, markdown-ts-gfm-spec-url): New
+	constants for CommonMark and GFM specification URLs.
+	(markdown-ts-browse-commonmark-spec)
+	(markdown-ts-browse-gfm-spec): New commands to browse the
+	CommonMark and GFM specifications.
+	(markdown-ts-convert): New customization group for Markdown
+	conversion/export features.
+	(markdown-ts-default-converter): New option to set the default
+	format and converter for Markdown export.
+	(markdown-ts-convert-display-function): New option specifying
+	the function used to display converted output.
+	(markdown-ts-converters): New variable listing format/converter
+	configurations for pandoc, cmark, cmark-gfm, markdown, and
+	markdown.pl.
+	(markdown-ts-convert-file, markdown-ts-convert): New commands to
+	convert Markdown buffers or files to HTML, PDF, and other
+	formats via external converters.
+	(markdown-ts-toc): New customization group for table of contents
+	features.
+	(markdown-ts-toc-generate-warn-if-none): New option controlling
+	behavior when no TOC is found during generation.
+	(markdown-ts-toc-update-before-save-mode-lighter): New option
+	for the before-save TOC update minor mode lighter string.
+	(markdown-ts-toc-slug-function): New option to select the slug
+	algorithm used for TOC heading anchors.
+	(markdown-ts--toc-handles, markdown-ts--toc-handle-classes): New
+	variables defining TOC handle types and classes.
+	(markdown-ts--toc-expand-candidate-handles, markdown-ts--tocs)
+	(markdown-ts--tocs-sanity-check)
+	(markdown-ts--toc-collect-candidates)
+	(markdown-ts--toc-list-item-depth)
+	(markdown-ts--toc-atx_header-normalize)
+	(markdown-ts--toc-text-normalizers)
+	(markdown-ts--toc-text-normalize): New internal helpers for TOC
+	parsing and text normalization.
+	(markdown-ts-toc-update-before-save-mode): New minor mode that
+	regenerates tables of contents before saving.
+	(markdown-ts-toc-clear-and-remove, markdown-ts-toc-clear): New
+	commands to remove or clear TOC bodies.
+	(markdown-ts-toc-insert-template): New command to insert a TOC
+	template at point.
+	(markdown-ts-toc-generate): New command to generate tables of
+	contents in the current buffer.
+
+	Includes fixes for: (bug#80613) (bug#80625) (bug#80690)
+
+2026-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	nadvice.el: Make it easier to find how to change an interactive-form
+
+	* lisp/emacs-lisp/nadvice.el (advice--how-alist): Add ':interactive-only'.
+	* doc/lispref/functions.texi (Advice Combinators): Document it.
+	(Core Advising Primitives): Use it.
+
+2026-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/emacs-lisp/lisp-mode.el (lisp-fdefs): Avoid obsolete "face vars"
+
+2026-05-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	keyboard.c: Allow SIGINT to `quit` in batch mode, instead of exit
+
+	In terminal sessions, SIGINT is turned into a `quit` ELisp signal,
+	but in batch it has traditionally killed Emacs.  It can be very
+	useful to cause a `quit` from outside the process when running
+	in batch (e.g. for "batch" sessions that provide a REPL via stdin/out),
+	so add a new var 'kill-emacs-on-sigint' to control that behavior.
+	(bug#80942)
+
+	* src/keyboard.c (handle_interrupt_signal): Obey `kill_emacs_on_sigint`.
+	(init_keyboard): Use `deliver_interrupt_signal` for SIGINT also for
+	batch sessions.
+	(syms_of_keyboard): New variable `kill_emacs_on_sigint`.
+
+	* test/src/keyboard-tests.el (keyboard-sigint-to-quit): New test.
+
+	* doc/emacs/cmdargs.texi (Initial Options): Mention the effect of
+	`kill-emacs-on-sigint` in batch mode.
+
+2026-05-04  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adaot tramp-tests.el
+
+	* test/lisp/net/tramp-tests.el (ert-remote-temporary-file-directory):
+	Ensure that it is expanded.
+
+2026-05-04  Michael Albinus  <michael.albinus@gmx.de>
+
+	* admin/notes/documentation: Recommend not using "it's".
+
+2026-05-04  João Távora  <joaotavora@gmail.com>
+
+	Jsonrpc: add new tests using Python subprocesses
+
+	Most of these tests are for the scontrol/"anxious continuation"
+	mechanism (bug#80623)
+
+	The new ERT tests use Python subprocesses via stdin/stdout pipe as
+	JSONRPC endpoints.  A shared framing library lives in
+	jsonrpc-resources/common.py.
+
+	* test/lisp/jsonrpc-tests.el (jsonrpc--test-dir): New constant.
+	(jsonrpc--with-python-fixture): New macro.
+	(scontrol-remote-during-sync-1)
+	(scontrol-remote-during-sync-2)
+	(scontrol-anxious-nested)
+	(scontrol-remote-error)
+	(shutdown-clean-after-notification): New tests.
+
+	* test/lisp/jsonrpc-resources/common.py: New file.
+
+	* test/lisp/jsonrpc-resources/server-remote-during-sync-1.py: New file.
+
+	* test/lisp/jsonrpc-resources/server-remote-during-sync-2.py: New file.
+
+	* test/lisp/jsonrpc-resources/server-anxious-nested.py: New file.
+
+	* test/lisp/jsonrpc-resources/server-remote-error.py: New file.
+
+	* test/lisp/jsonrpc-resources/server-harakiri.py: New file.
+
+2026-05-04  João Távora  <joaotavora@gmail.com>
+
+	Jsonrpc: rework sync request handling (bug#80623)
+
+	When the remote endpoint is handling a local request 'LR' it can
+	sometimes make a remote sync request 'RR' as part of its handling.  Some
+	endpoints (like Go's gopls) wait for Emacs's reply to 'RR' before
+	responding to 'LR'.  Others (like Julia's JETLS) respond to 'LR'
+	immediately, and only then wait for Emacs's reply to 'RR'.  Both
+	approaches are valid.  However, in the latter case, the handling of 'RR'
+	(which could well be waiting for user input from the minibuffer to
+	complete) is vulnerable to 'throw' from process filters handling (which
+	is just what happens when the endpoints replies to 'LR'), so if that
+	happens it will unexpectedly be aborted when the reply to 'LR' comes in,
+	suprising the user and causing a spurious -32603 reply to be sent.
+
+	To solve this problem, this commit first refactors the sync
+	request/anxious queue handling and replace plain integer keys of the
+	rebaptized "scontrol" alist with structured (:local ID) / (:remote ID)
+	pairs, using `equal' for comparisons.  This is to introduce some
+	clarity/sanity into this somewhat hairy code.
+
+	Then, the 'RR' situation is fixed: we push a (:remote ID) entry onto the
+	top of the 'jsonrpc-connection--control' stack and only then call
+	rdispatcher.  Any 'LR' reply arriving during dispatch is deferred as an
+	"anxious" continuation rather than firing its `throw' immediately.  When
+	rdispatcher is done, we call jsonrpc--continue at a safe point, this
+	will run any "anxious" continuations.
+
+	* lisp/jsonrpc.el (jsonrpc-connection): Rename -sync-request-alist to
+	-scontrol; accessor from jsonrpc--sync-request-alist to
+	jsonrpc--scontrol; update docstring for new key structure.
+
+	(jsonrpc-connection-receive): Update with-slots binding to scontrol.
+	Tighten anxious check to match (:local ID) keys with `equal'.  In
+	remote-request branch, push (:remote ID) entry before rdispatcher and
+	call jsonrpc--continue after jsonrpc--reply.
+
+	(jsonrpc-request): Pass (:local ID) to jsonrpc--continue.
+
+	(jsonrpc--continue): Use jsonrpc--scontrol; change `=' to `equal' in
+	sanity check.
+	p
+	(jsonrpc--async-request-1): Push (:local ID) entry.
+
+	(jsonrpc--log-event): Use jsonrpc--scontrol.
+
+2026-05-04  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Re-add a call to clear_under_internal_border in clear_garbaged_frames
+
+	* src/xdisp.c (clear_garbaged_frames): Re-add the call to
+	clear_under_internal_border, reverting that part of commit
+	a6a3b32208c5 as not essential to the fix (bug#80662).
+
+2026-05-03  Philip Kaludercic  <philipk@posteo.net>
+
+	Ensure package archives are loaded for 'package-isolate'
+
+	* lisp/emacs-lisp/package.el (package-isolate): Use
+	'package--archive-contents' instead of the actual variable, to
+	ensure that we load the archive contents if missing.  This is
+	likely the case if 'package-isolate' is the first package
+	function invoked during a session.
+
+2026-05-03  Philip Kaludercic  <philipk@posteo.net>
+
+	Add for <picture> to 'html-tag-alist' and 'html-tag-help'
+
+	* lisp/textmodes/sgml-mode.el (html-tag-alist): Add very basic skeleton.
+	(html-tag-help): Add description.
+
+2026-05-03  Philip Kaludercic  <philipk@posteo.net>
+
+	Add for <details> to 'html-tag-alist' and 'html-tag-help'
+
+	* lisp/textmodes/sgml-mode.el (html-tag-alist): Add skeleton.
+	(html-tag-help): Add description.
+
+2026-05-03  Philip Kaludercic  <philipk@posteo.net>
+
+	Prevent indentation within whitespace sensitive HTML tags
+
+	* lisp/textmodes/sgml-mode.el (sgml-whitespace-sensitive-tags):
+	Add new variable.
+	(sgml-calculate-indent): Check if in the context of a tag
+	specified by 'sgml-whitespace-sensitive-tags'.
+	(html-mode): Set 'sgml-whitespace-sensitive-tags' to not adjust
+	the indentation within <pre> and <textarea> tags.
+
+2026-05-03  Philip Kaludercic  <philipk@posteo.net>
+
+	Use 'read-shell-command' to read SGML validation command
+
+	* lisp/textmodes/sgml-mode.el (sgml-validate): Update
+	interactive spec.
+
+2026-05-03  Philip Kaludercic  <philipk@posteo.net>
+
+	Raise an error if 'sgml-validate-command' is not configured
+
+	* lisp/textmodes/sgml-mode.el (sgml-validate-command): If no
+	known program is installed, fall back to nil as the default
+	value instead of a warning message.
+
+2026-05-03  Philip Kaludercic  <philipk@posteo.net>
+
+	Implement 'sgml-name-8bit-mode' as a proper minor mode
+
+	* lisp/textmodes/sgml-mode.el (sgml-name-8bit-mode): Merge
+	'defcustom' and 'defun' into a 'define-minor-mode'.
+
+2026-05-03  Philip Kaludercic  <philipk@posteo.net>
+
+	Refine SGML offset user option types
+
+	* lisp/textmodes/sgml-mode.el (sgml-basic-offset)
+	(sgml-attribute-offset): Allow natural numbers, not arbitrary
+	integers.
+
+2026-05-03  Philip Kaludercic  <philipk@posteo.net>
+
+	Allow setting 'sgml-xml-mode' buffer locally
+
+	* lisp/textmodes/sgml-mode.el (sgml-xml-mode): Add :safe property.
+
+2026-05-03  Philip Kaludercic  <philipk@posteo.net>
+
+	Allow changing SGML "quick keys" after loading sgml-mode.el
+
+	* lisp/textmodes/sgml-mode.el (sgml-quick-keys): Replace with
+	user option, that adjusts 'sgml-mode-map'.
+	(sgml-mode-map): Don't insert quick keys.
+	(html-quick-keys): Replace with user option, that adjusts
+	'html-mode-map'.
+	(html-mode-map): Don't insert quick keys.
+
+2026-05-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(package--builtin-alist): Don't use `defconst` since we later change it
+
+	* lisp/emacs-lisp/package.el (package--builtin-alist): Use `defvar`.
+
+2026-05-03  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el (treesit-outline-level): Add guard condition.
+
+2026-05-03  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Gnus logo in server buffer's mode line (bug#80850)
+
+	* lisp/gnus/gnus-srvr.el (gnus-server-mode): Initialize needed
+	format specifications and call 'gnus-set-mode-line' for the
+	server buffer.
+	* lisp/gnus/gnus-sum.el (gnus-set-mode-line): Handle when WHERE
+	is set to 'server.
+	* lisp/gnus/gnus.el (gnus-updated-mode-lines): Add server.
+
+2026-05-02  Eshel Yaron  <me@eshelyaron.com>
+
+	Remove 'completion-preview--is-calling'
+
+	We decided to leave it out for now, see discussion at
+	https://yhetil.org/emacs/jwvqzntzvvg.fsf-monnier+emacs@gnu.org/
+	This brings completion-preview.el back to how it were before
+	commit a24ff52a79b.
+
+	* lisp/completion-preview.el (completion-preview--is-calling):
+	Delete.
+	(completion-preview--capf-wrapper): Adapt.
+
+2026-05-02  Stephen Berman  <stephen.berman@gmx.net>
+
+	Fix 'vc-dir-resynch-file' (bug#80803)
+
+	* lisp/vc/vc-dir.el (vc-dir-resynch-file): Apply 'file-truename'
+	instead of 'expand-file-name' to FNAME argument to prevent
+	spurious display of symlinked files in *vc-dir* buffer.
+
+2026-05-02  Eshel Yaron  <me@eshelyaron.com>
+
+	Demote 'completion-preview-is-calling'
+
+	See discussion at
+	https://yhetil.org/emacs/87pl3egzww.fsf@mail.eshelyaron.com/
+
+	* lisp/completion-preview.el (completion-preview-is-calling):
+	Rename to...
+	(completion-preview--is-calling): ...this.
+	(completion-preview--capf-wrapper): Update accordingly.
+	* etc/NEWS: Remove announcement.
+
+2026-05-02  João Távora  <joaotavora@gmail.com>
+
+	Eglot: find well behaved UTF char for code actions (bug#80326)
+
+	* lisp/progmodes/eglot.el (eglot-code-action-indicator): No lighbulb, no
+	fancy lightning bolt, just use zigzags which seem to display well on
+	typical fonts and typically have a width of 1.
+
+2026-05-02  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Project prompters always default to current project, if any
+
+	* lisp/progmodes/project.el (project-prompter)
+	(project-prompt-project-dir, project-prompt-project-name):
+	Delete ALLOW-EMPTY parameter.  Default to the current project if
+	there is one.
+	* lisp/vc/vc.el (project-root): Declare.
+	(vc--prompt-other-working-tree): Replace ALLOW-EMPTY parameter
+	with new ALLOW-CURRENT parameter.
+	(vc-working-tree-switch-project): Allow selecting the current
+	working tree, for symmetry with project-switch-project.
+	* etc/NEWS: Update.
+
+2026-05-02  Philip Kaludercic  <philipk@posteo.net>
+
+	Mark myself as maintainer of sgml-mode
+
+	* admin/MAINTAINERS: Update my entry.
+	* lisp/textmodes/sgml-mode.el: Update "Maintainer" header.
+
+2026-05-02  Philip Kaludercic  <philipk@posteo.net>
+
+	Don't break line when inserting <code> tags
+
+	* lisp/textmodes/sgml-mode.el (html-tag-alist): Remove '\n' from
+	the completion rules for "code" tag.  (Bug#80771)
+
+2026-05-02  Philip Kaludercic  <philipk@posteo.net>
+
+	* etc/themes/newcomers-presets-theme.el: Fix checkdoc issue
+
+2026-05-02  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/.gdbinit: Ignore SIGPIPE.  (Bug#80911)
+
+2026-05-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Work around GCC bug 125116
+
+	* configure.ac: When configured with --enable-gcc-warnings,
+	use the -Wno-analyzer-allocation-size option if available.
+	This works around a false positive bug in
+	GCC 16.0.1 20260321 (Red Hat 16.0.1-0) x86-64; see
+	<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=125116>.
+
+2026-05-01  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Update to Transient v0.13.2-10-gf7894ca4
+
+	Update to Transient v0.13.1-10-gc168d396
+
+2026-05-01  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Resize child frames with GTK3 immediately too
+
+	* src/gtkutil.c (xg_frame_set_char_size): Resize child frame and
+	its GTK widget hierarchy immediately.  Update the "desired" Cairo
+	surface dimensions.  Skip waiting for events. (bug#80662)
+	Remove the unnecessary call to clear_under_internal_border.
+
+2026-05-01  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Simplify the fullscreen adjustment in xg_frame_set_char_size
+
+	* src/gtkutil.c (xg_frame_set_char_size): Simplify.  Use the
+	fullscreen value check to alter the values of outer_width and
+	outer_height rather than have several larger branches (bug#80662).
+
+2026-05-01  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Remove the effect of x_gtk_resize_child_frames=hide
+
+	* src/gtkutil.c (xg_frame_set_char_size): Remove the effect of
+	x_gtk_resize_child_frames, effectively reverting that part of
+	c49d379f17bc (bug#80662).
+
+	* src/pgtkfns.c (syms_of_pgtkfns): Remove defsyms Qhide and
+	Qresize_mode, never used with PGTK.
+
+	* src/xfns.c (x-gtk-resize-child-frames): Update docstring.
+
+2026-05-01  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Don't wait out the whole event timeout unnecessarily
+
+	* src/xterm.c (x_wait_for_event): If f->wait_event_type has been
+	cleared (in handle_one_xevent), don't go into pselect wait.
+
+	* src/androidterm.c (android_wait_for_event): Likewise.
+
+2026-05-01  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Try to resize or resize-and-move child frames in one update
+
+	This pertains to X11 toolkit builds.  Other ports (including
+	PGTK) seem to have mostly atomic window updates already.
+
+	* src/xterm.c (x_set_window_size_1): Resize the Xt widget eagerly,
+	so the next redraw is not clipped.  Update the "desired" Cairo
+	surface dimensions.  Skip waiting for next XEvent.  Do all that
+	for child frames only.  Update old comments (bug#80662).
+	(x_set_window_size_and_position_1): Same.  Also clear the widget's
+	cached position coordinates (we don't keep them up to date).
+	(x_set_window_size, x_set_window_size_and_position): Skip
+	redrawing the border on child frames, it will happen during
+	redisplay anyway.
+
+	* src/gtkutil.c (xg_frame_set_size_and_position): On child
+	frames, resize the GTK widget hierarchy immediately.  Update the
+	"desired" Cairo surface dimensions.  Skip waiting for events.
+
+	* src/widget.c (EmacsFrameResize):
+	When resize should be a no-op, exit early (minor optimization).
+	(EmacsFrameExpose): Redraw the border on the last Expose event.
+
+	* src/xdisp.c (clear_garbaged_frames): Don't redraw borders here.
+
+	* src/xfns.c (x_window): Undo the previous change in bit_gravity
+	in the no-toolkit build.  StaticGravity works the best for it
+	thanks to no nesting in window configuration.
+
+2026-05-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify GCC 16.0.1 -Wanalyzer-null-dereference in xdisp.c
+
+	* src/xdisp.c (glyph_string_containing_background_width):
+	Although it’s not immediately obvious whether the GCC 16 warning
+	is valid, adding an eassume here shouldn’t hurt.
+
+2026-04-30  F. Jason Park  <jp@neverwas.me>
+
+	Only perform erc-log-insert-log-on-open setup once
+
+	* etc/ERC-NEWS: Add entry for option `erc-log-insert-log-on-open'.
+	Mention deprecation of `erc-log-setup-logging'.
+	* lisp/erc/erc-log.el (erc-log-insert-log-on-open): Expand type from
+	boolean to choice of boolean, predicate, and new function item
+	`erc-log-new-target-buffer-p'.
+	(erc-log-mode, erc-log-enable, erc-log-disable): Replace
+	`erc-log-setup-logging' on `erc-connect-pre-hook' with
+	`erc-log--insert-log-on-open' at depth 80.  Replace calls to
+	`erc-log-setup-logging' with ones to `erc-log--setup'.
+	(erc-log-new-target-buffer-p): New function.  While the name could
+	perhaps do more to indicate that it's only useful when called from
+	`erc-open', that's the only place ERC typically sets up new target
+	buffers.
+	(erc-log-setup-logging): Deprecate and replace body with adapter that
+	calls `erc-log--setup' and `erc-log--insert-log-on-open'.
+	(erc-log--setup): New function whose body is mostly from the
+	"nondestructive" portion of `erc-log-setup-logging'.  Instead of moving
+	the `erc-saved-last-position' marker to the old value, expect it not to
+	have been initialized by `erc-initialize-log-marker' because
+	`erc-connect-pre-hook' now runs after this code, which is now
+	incorporated more judiciously into the module's "enable body".
+	(erc-log--insert-log-on-open): New function whose body is mostly from
+	the "destructive" portion of the previous incarnation of
+	`erc-log-setup-logging'.  Unlike the original, if option
+	`erc-log-insert-log-on-open' is a function, call it to decide whether to
+	insert a log file atop its buffer.  Also, don't advance the marker
+	`erc-last-saved-position' to the prompt area, where it can get stuck and
+	prevent logs from being saved when `erc-log-insert-log-on-open' is
+	non-nil.  Thanks to Libera user Lionyx for reporting the bug, which has
+	been around since at least ERC 5.4 and Emacs 28.1.
+	(erc-log-disable-logging): Remove `erc-save-buffer-in-logs' from
+	`write-file-functions' to undo its buffer-local addition in what is now
+	`erc--log-setup'.
+	* test/lisp/erc/erc-scenarios-log-options.el: New file.  (Bug#79665)
+
+2026-04-30  F. Jason Park  <jp@neverwas.me>
+
+	Restore erc-last-saved-position from previous session
+
+	* lisp/erc/erc-log.el (erc-log-setup-logging): Restore
+	`erc-last-saved-position' from previous session.  By default, a
+	non-/QUIT disconnect does not write out any remaining buffer text to
+	logs, instead leaving it until the buffer or Emacs is killed.  But if a
+	successful reconnect occurs beforehand, the uncommitted portion must be
+	seen to somehow.  Before this change, it would be lost because the
+	function `erc-initialize-log-marker' remakes the marker at the prompt
+	instead of recovering the previous value as now done here.  Moreover,
+	the traditional workaround of customizing `erc-log-write-after-insert'
+	and `erc-log-write-after-send' to t should not be required to prevent
+	gaps in any decent IRC client.
+	* test/lisp/erc/erc-scenarios-log.el (erc-scenarios-log--reconnect): New
+	function.
+	(erc-scenarios-log--reconnect/auto, erc-scenarios-log--reconnect/manual):
+	New tests.
+	;; * test/lisp/erc/resources/join/reconnect/foonet-again.eld: Add QUIT.
+
+2026-04-30  F. Jason Park  <jp@neverwas.me>
+
+	Define variable alias for erc-completion-mode
+
+	* lisp/erc/erc-pcomplete.el (erc-completion-mode): New alias for the
+	variable `erc-pcomplete-mode' to complement the function alias of the
+	corresponding minor-mode command.  Given that user code operating on the
+	value of `erc-modules' needs to detect whether members are active, it
+	only makes sense to address this specially.  Before this change,
+	applying `bound-and-true-p' to `erc-completion-mode' would always return
+	nil, even when the module was active.  For normal aliases, that's indeed
+	expected because `define-erc-module' doesn't automatically define a mode
+	variable for a non-nil ALIAS argument.  Although in the long term it
+	probably should, while also obsoleting the "new" alias simultaneously,
+	that would likely break some user code and doubtless complicate things
+	majorly for `pcomplete', the one in-tree outlier.  The latter module
+	would then require changing either its preferred name, the one
+	advertised by `erc-modules' in its Custom definition, to `pcomplete' or
+	its primary name to `completion'.  Both are quite churn-inducing.
+
+2026-04-30  Eshel Yaron  <me@eshelyaron.com>
+
+	New variable 'completion-preview-is-calling'
+
+	* lisp/completion-preview.el (completion-preview-is-calling):
+	New variable.
+	(completion-preview--capf-wrapper): Bind it to t when calling
+	the CAPF.
+	* etc/NEWS: Announce it.
+
+2026-04-30  Michael Albinus  <michael.albinus@gmx.de>
+
+	Precise quoting of file names with a leading tilde
+
+	* doc/emacs/files.texi (File Names, Quoted File Names):
+	Precise quoting of file names with a leading tilde.
+
+2026-04-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix value of 'default-line-height'
+
+	* lisp/simple.el (default-line-height): Fix use of buffer-local
+	value of 'line-spacing'.  (Bug#80929)
+
+2026-04-30  Randy Taylor  <dev@rjt.dev>
+
+	Always compile w32image.c on MinGW (Bug#80924)
+
+	This enables features unrelated to native image APIs, such as
+	'w32-export-frame' and 'yank-media', which need to call GDI+
+	functions.
+	* configure.ac (HAVE_W32) [!CYGWIN]: Always include w32image.o in
+	W32_OBJ.
+	* etc/NEWS: Drop 'yank-media' '--without-native-image-api' caveat.
+	* src/emacs.c (main):
+	* src/w32select.c (convert_dibv5_to_png):
+	* src/w32term.c (w32_draw_image_foreground): Replace
+	HAVE_NATIVE_IMAGE_API with WINDOWSNT.
+	* src/w32.c (term_ntproc): Remove redundant HAVE_NATIVE_IMAGE_API guard.
+	* src/w32fns.c (Fw32_export_frame) [!WINDOWSNT]: Return nil on Cygwin.
+
+2026-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(seq-concatenate): Fix docstring (bug#80810)
+
+	* lisp/emacs-lisp/seq.el (seq-concatenate): Remove confusing
+	`(fn TYPE SEQUENCE...)` which made `help-function-arglist`
+	return less informative results and wasn't even consistent with
+	the rest of the docstring.
+
+	* lisp/emacs-lisp/shortdoc-doc.el (sequence): Revert last
+	change, since it's now redundant.
+
+2026-04-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	cl-lambda-list, cl-lambda-list1: Fix &key spec
+
+	* lisp/emacs-lisp/cl-macs.el (cl-lambda-list, cl-lambda-list1):
+	Fix &key specification to support empty lists of keyword
+	arguments (bug#80878).  Fix due to Thuna <thuna.cing@gmail.com>.
+
+2026-04-30  Timon Reinold  <tirei+gn@agon.one>  (tiny change)
+
+	eww-handle-link: Split HTML rel on spaces
+
+	* lisp/net/eww.el (eww-handle-link): The HTML rel attribute's
+	value is a space-separated set of keywords, so split it before
+	matching against known keywords (bug#80816).
+
+2026-04-30  Collin Funk  <collin.funk1@gmail.com>
+
+	Pacify -Wunused-but-set-variable from gcc 16 and clang 13
+
+	* src/coding.c: Remove file wide ignore pragma for
+	-Wunused-but-set-variable.
+	(detect_coding_XXX) <consumed_chars>: Mention that this variable might
+	need to be declared with the MAYBE_UNUSED attribute.
+	(detect_coding_utf_8, detect_coding_emacs_mule, detect_coding_iso_2022)
+	(encode_designation_at_bol, detect_coding_sjis, detect_coding_big5)
+	(detect_coding_ccl, detect_coding_charset) <consumed_chars>: Use the
+	MAYBE_UNUSED attribute.
+
+2026-04-30  Vladimir Kazanov  <vekazanov@gmail.com>
+
+	Add ERT coverage for read_key_sequence behaviour
+
+	* test/src/keyboard-tests.el
+	(keyboard-tests--rks-fake-posn)
+	(keyboard-tests--rks-observe)
+	(keyboard-tests--rks-execute)
+	(keyboard-tests--rks-with-function-key-bindings)
+	(keyboard-tests--rks-with-event-kinds)
+	(keyboard-tests--rks-call-with-live-window-maps): Test helpers.
+	(keyboard-tests-rks-prefix-then-key)
+	(keyboard-tests-rks-unbound-returns-sequence)
+	(keyboard-tests-rks-bound-sequence-ends-read)
+	(keyboard-tests-rks-decode-fires-without-binding)
+	(keyboard-tests-rks-input-decode-map)
+	(keyboard-tests-rks-function-key-map)
+	(keyboard-tests-rks-function-key-map-on-undefined)
+	(keyboard-tests-rks-key-translation-before-function-key)
+	(keyboard-tests-rks-function-key-skipped-when-bound)
+	(keyboard-tests-rks-input-decode-after-function-key)
+	(keyboard-tests-rks-key-translation-overrides-bound-sequence)
+	(keyboard-tests-rks-upcase-fallback)
+	(keyboard-tests-rks-no-upcase-fallback)
+	(keyboard-tests-rks-dont-downcase-last)
+	(keyboard-tests-rks-shifted-function-key-fallback)
+	(keyboard-tests-rks-switch-frame-delayed)
+	(keyboard-tests-rks-unbound-down-mouse-dropped)
+	(keyboard-tests-rks-mode-line-fake-prefix)
+	(keyboard-tests-rks-mode-line-fake-prefix-continued)
+	(keyboard-tests-rks-clicked-buffer-switch)
+	(keyboard-tests-rks-help-char): Tests covering for read_key_sequence.
+
+2026-04-30  Yuan Fu  <casouri@gmail.com>
+
+	In tree-sitter, signal if predicate function causes reparse
+
+	A reparse will make the TSTreeCursor or TSNode to possibly point
+	to freed memory (because the TSTree they point to is freed.)
+
+	* src/treesit.c (treesit_pred_with_guard): New function.
+	(treesit_predicate_pred):
+	(treesit_eval_predicates):
+	(Ftreesit_query_capture):
+	(treesit_traverse_match_predicate):
+	(treesit_build_sparse_tree): Add guard that signals if buffer is
+	changed when calling predicate function.
+	(Qtreesit_buffer_changed): New symbol.
+
+2026-04-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(loaddefs-generate--make-autoload): Fix autoload for `emoji-insert`
+
+	To decide if a `defalias` will define a command, we need to look inside
+	the `lambda` and search for an interactive spec.  Until now we assumed
+	`defalias`s argument would take the shape of `(function (lambda ...))`,
+	which failed miserably for `transient-define-prefix` which
+	macroexpands to `(defalias 'foo (lambda ...))` instead.
+	So make sure we macroexpand the arg to turn the `(lambda ...)` into
+	`(function (lambda ...))` before we try to dig into it.
+
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload):
+	Macroexpand the `defalias` argument before checking if it's an
+	interactive function.
+
+2026-04-29  Daniel Colascione  <dancol@dancol.org>
+
+	Make TS query cache work, grow less
+
+	We were using the wrong key when inserting entries into
+	treesit--query-cache, making the cache both ineffective and
+	liable to grow without bound.  On very long sessions, the cache
+	could end up using hundreds.
+
+	* lisp/treesit.el (treesit--compile-query-with-cache): Use
+	correct cache key.
+
+2026-04-29  Roi Martin  <jroi.martin@gmail.com>
+
+	Fix warning when building Calc manual
+
+	These warnings are emitted at least by Texinfo 7.2.
+	* doc/misc/calc.texi (Introduction): Conditionally set prev node to
+	avoid warning.
+	(Interactive Tutorial): Update chapter title to match node name and
+	menu entry.
+	(Top): Add description to `Interactive Tutorial' menu entry.
+	(Bug#80923)
+
+2026-04-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New VC commands for remote unintegrated changes
+
+	* lisp/vc/vc.el (vc--outgoing-base, vc--outgoing-base-mergebase):
+	New FORCE-TOPIC parameter.
+	(vc--maybe-read-outgoing-base): New NO-DOUBLE parameter.
+	(vc-root-diff-remote-unintegrated, vc-diff-remote-unintegrated)
+	(vc-log-remote-unintegrated, vc-root-log-remote-unintegrated):
+	New commands (bug#80434).
+	* lisp/vc/vc-dir.el (vc-dir-mode-map):
+	* lisp/vc/vc-hooks.el (vc-prefix-map): Bind them.
+	* doc/emacs/vc1-xtra.texi (Unintegrated Changes):
+	* etc/NEWS: Document them.
+
+2026-04-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New commands to report diffs of all local changes
+
+	* lisp/vc/vc.el (vc-root-diff-outgoing-and-edited)
+	(vc-diff-outgoing-and-edited): New commands (bug#80434).
+	* lisp/vc/vc-dir.el (vc-dir-mode-map):
+	* lisp/vc/vc-hooks.el (vc-prefix-map): Bind them.
+	* doc/emacs/maintaining.texi (VC Change Log):
+	* etc/NEWS: Document them.
+
+2026-04-29  João Távora  <joaotavora@gmail.com>
+
+	In fido-vertical-mode, let C-s and C-r recover their original use
+
+	Fido-mode is meant for ido-mode emulation, so it makes some
+	sense C-r and C-s moves forward and backward in the list as
+	ido-mode once did.  The price to pay is losing easy access to
+	isearch-backward/forward in completions.  In fido-vertical-mode,
+	this price is unreasonably high given C-p and C-n are the
+	natural bindings for moving about in the vertical list.
+
+	* lisp/icomplete.el (icomplete-fido-mode-map): Disable C-s and C-r
+	in fido-vertical-mode.
+
+2026-04-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/emacs-lisp/crm.el (crm-complete-and-exit): Simplify docstring
+
+2026-04-28  Yuan Fu  <casouri@gmail.com>
+
+	Use treesit-language-available-p for language check (bug#80909)
+
+	* lisp/treesit.el (treesit-ensure-installed): Use
+	treesit-language-available-p for checking if a language is
+	installed.  treesit-ready-p also checks for buffer size, etc, so
+	it's not the right check.
+
+2026-04-28  Yuan Fu  <casouri@gmail.com>
+
+	Better heuristic in treesit-font-lock-fontify-region in multi-parser
+
+	* lisp/treesit.el (treesit-font-lock-fontify-region): Use
+	primary parser.
+
+2026-04-27  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Use plain autoload cookie with transient-define-prefix
+
+	(emoji-search, emoji-list-select): Use plain autoload cookie with
+	transient-define-prefix
+
+2026-04-27  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Set indent property for with-connection-local-variables
+
+	* lisp/files-x.el (with-connection-local-variables): Set indent
+	property.
+
+2026-04-27  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Fix defining a few faces as empty
+
+	e72afa9dbf92f45 replaced nil, which is invalid as a face definition,
+	with ((t (:inherit default))), but that does not actually result in
+	an "empty" face, which doesn't set any attributes.  Instead it doubles
+	down on all attributes set for the default face.  Replace that with
+	((t)), which accomplishes what appears to have been the intention.
+
+	* lisp/net/shr.el (shr-h4, shr-h5, shr-h6):
+	* lisp/nxml/nxml-mode.el (nxml-text):
+	* lisp/progmodes/make-mode.el (makefile-shell): Use empty face
+	definition ((t)), instead of ((t (:inherit default))).
+
+2026-04-27  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Call format-spec substitution functions in current buffer
+
+	* lisp/format-spec.el (format-spec): Call format-spec substitution
+	functions in current buffer.  I.e., in the same buffer in which
+	substitution expressions are evaluated.  Previously functions were
+	instead called in the temporary buffer used to deal with FORMAT.
+
+2026-04-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(completion--file-name-table): Improve completion of `/a/~b/c`
+
+	The solution used is far from perfect, but hopefully it helps more
+	often than it hurts.  And since it affects only completion, we hope
+	the cases where it hurts won't be too serious.  (bug#32215)
+
+	* lisp/minibuffer.el (completion--sifn-regardless-of-system-users):
+	New function.
+	(completion--file-name-table): Use it.
+
+2026-04-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix vc-tests for SRC
+
+	* lisp/vc/vc-src.el (vc-src-register): Support "registering"
+	directories in FILES.
+	(vc-src-rename-file): Fix implementation and support renaming
+	directories.
+
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-test--rename-file)
+	(vc-test-src-version-diff): Skip parts that don't work with SRC.
+	(Bug#80862)
+
+2026-04-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Rename outstanding changes commands to "unintegrated changes"
+
+	* doc/emacs/vc1-xtra.texi (Outstanding Changes): Rename node
+	from this ...
+	(Unintegrated Changes): ... to this (bug#80434).  References
+	changed.
+	* etc/NEWS: Document the change.
+	* lisp/vc/vc-git.el (vc-git-topic-outgoing-base)
+	(vc-git-log-view-mode):
+	* lisp/vc/vc-hg.el (vc-hg-print-log, vc-hg-log-view-mode):
+	* lisp/vc/vc.el (vc-root-diff-outstanding, vc-diff-outstanding)
+	(vc-log-outstanding, vc-root-log-outstanding):
+	Rename from these ...
+	(vc-root-diff-unintegrated, vc-diff-unintegrated)
+	(vc-log-unintegrated, vc-root-log-unintegrated):
+	... to these (bug#80434).  All uses changed.
+	(vc-log-view-type): Rename 'log-outstanding' type to
+	'log-unintegrated'.  All uses changed.
+
+2026-04-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC Annotate for Mercurial repositories shows changeset hashes
+
+	* lisp/vc/vc-hg.el (vc-hg-annotate-show-revision-numbers): New
+	option.
+	(vc-hg-annotate-command): If it's nil, show changeset hashes not
+	revision numbers by passing "-c" not "-n" to 'hg annotate'.
+	(vc-hg-annotate-re): Update.
+	* etc/NEWS: Document the change.
+
+2026-04-27  Chris Roberts  <git@chobert.org>  (tiny change)
+
+	sqlite-close: no-op for already closed connections
+
+	This behavior is more expected than throwing an error,
+	as passing NULL (closed db connection) to 'sqlite3_close'
+	is a "harmless no-op" according to the documentation.
+	* src/sqlite.c (sqlite-close): Ignore already closed connections.
+	(Bug#80908)
+
+2026-04-27  Philip Kaludercic  <philipk@posteo.net>
+
+	Add lexical-binding cookies to multi-file-0.2.3.tar
+
+	* test/lisp/emacs-lisp/package-resources/multi-file-0.2.3.tar:
+	Update multi-file.el and multi-file-sub.el files.
+
+2026-04-27  Philip Kaludercic  <philipk@posteo.net>
+
+	Do not warn about 'lexical-binding' if buffer is not compiled
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-file): Check
+	'no-byte-compile' before issuing a warning.  This prevents
+	false-positives when running into .dir-locals.el or -pkg.el
+	files.  (Bug#80352)
+
+2026-04-27  Philip Kaludercic  <philipk@posteo.net>
+
+	Do not regard selected packages as removable
+
+	* lisp/emacs-lisp/package.el (package--removable-packages):
+	Handle the fact that 'package--dependencies' doesn't return the
+	package itself as a dependency, so we have to check
+	'package-selected-packages' separately.  Also fix the way we
+	check the return value of 'package--dependencies', keeping in
+	mind that the value is an alist.  (Bug#80907)
+
+2026-04-27  Philip Kaludercic  <philipk@posteo.net>
+
+	Ensure that 'package--builtin-alist' can be populated
+
+	This is a partial reversion of 931e04a34ba.
+
+	* lisp/emacs-lisp/package.el (package--builtin-alist): Add a
+	function that loads 'finder-inf', which in turn will populate
+	'package--builtins', if necessary, caching the result.
+	(package--upgradeable-packages, describe-package-1)
+	(package-menu--refresh, package--mapc, package-get-descriptor):
+	Use the function instead of the variable.
+
+2026-04-27  Jonas Bernoulli  <jonas@bernoul.li>
+
+	(transient--suspend-text-conversion-style): Avoid static-if
+
+	safer version/platform conditional.
+
+2026-04-27  Eli Zaretskii  <eliz@gnu.org>
+
+	diff-kill-creations-deletions: Look for /dev/null on all platforms
+
+	* lisp/vc/diff-mode.el (diff-kill-creations-deletions): Look for
+	/dev/null on platforms when null-device is something else.
+
+2026-04-27  Yuan Fu  <casouri@gmail.com>
+
+	Fix tree-sitter embedded parser range
+
+	If a host parser has some ranges, and an embedded parser also
+	has some ranges, the final range used by the embedded parser
+	should be an intersection of the two.  This patch adds this
+	logic.
+
+	* lisp/treesit.el (treesit--range-verbose): New variable.
+	(treesit--intersect-ranges):
+	(treesit--set-embed-ranges): New function.
+	(treesit--update-ranges-non-local):
+	(treesit--update-ranges-local): Use the new functions.
+	* test/src/treesit-tests.el:
+	(treesit-intersect-ranges): New test.
+
+2026-04-27  Yuan Fu  <casouri@gmail.com>
+
+	Add treesit-query-with-fallback
+
+	* lisp/treesit.el (treesit-font-lock-rules): Handle
+	treesit-query-with-fallback.
+	(treesit-query-with-fallback): New function.
+	* doc/lispref/modes.texi (Parser-based Font Lock): Mention
+	treesit-query-with-fallback.
+
+2026-04-27  Yuan Fu  <casouri@gmail.com>
+
+	Fix treesit-range-fn-exclude-children
+
+	* lisp/treesit.el (treesit-range-fn-exclude-children): Exclude
+	0-length ranges.
+
+2026-04-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(register--get-method-type): Fix one more case (bug#80894)
+
+	* lisp/register.el (register--get-method-type): Refine the cl-generic hack
+	yet a but further.
+	* test/lisp/register-tests.el (register--jumpable-p): Fix the test.
+
+2026-04-26  Aaron L. Zeng  <azeng@janestreet.com>
+
+	Support Elisp debugging and backtraces in code called by modules
+
+	* src/lisp.h (handlertype) <CATCHER_ALL_DEBUGGABLE>: New enumeration
+	value.
+	* src/emacs-module.c (MODULE_HANDLE_NONLOCAL_EXIT):
+	* src/eval.c (Fthrow, signal_or_quit): Use it.
+
+	* test/src/emacs-module-tests.el
+	(mod-test-non-local-exit-funcall-debug-on-error): New test.
+
+	Bug#80714
+
+2026-04-26  Kai Ma  <justksqsf@gmail.com>
+
+	New user option compilation-search-extra-path
+
+	* lisp/progmodes/compile.el (compilation-search-extra-path): New
+	option (bug#80279).
+	(compilation-start): Use it.
+	(compilation-search-path):
+	* doc/emacs/building.texi:
+	* etc/NEWS: Document it, and also compilation-search-path.
+
+2026-04-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix renaming files and directories under RCS
+
+	* lisp/vc/vc-rcs.el (vc-rcs-register): Filter out directories from
+	FILES.
+	(vc-rcs-rename-file): Support OLD being a directory.
+
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-test--rename-file)
+	(vc-test--rename-directory): Re-enable these tests for RCS.
+	(vc-test--rename-directory): Disable 'yes-or-no-p' questions that
+	RCS asks when it needs to create the RCS/ subdirectory: this lets
+	the test run without user interaction.
+
+2026-04-26  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-delete-file: Narrow binding of default-directory
+
+	* lisp/vc/vc.el (vc-delete-file): In the delete-file branch,
+	narrow the binding of default-directory to cover only the call
+	into the backend.
+	Suggested by Aaron L. Zeng <azeng@janestreet.com> in bug#80875.
+
+2026-04-26  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC: Support deleting directories
+
+	* lisp/vc/vc.el (delete-files): Specify that implementations of
+	this should handle deleting directories.
+	* lisp/vc/vc-git.el (vc-git-delete-files):
+	* lisp/vc/vc-hg.el (vc-hg-delete-files):
+	* lisp/vc/vc.el (vc-delete-file): Handle deleting directories.
+
+2026-04-25  Philip Kaludercic  <philipk@posteo.net>
+
+	Use 'package-get-descriptor' in 'package--query-desc'
+
+	* lisp/emacs-lisp/package.el (package--query-desc): Replace
+	manual 'assoc' call.
+
+2026-04-25  Philip Kaludercic  <philipk@posteo.net>
+
+	Improve 'package-get-descriptor' performance
+
+	* lisp/emacs-lisp/package.el (package-get-descriptor): Use
+	'assq' to look up element in package alists instead of iterative
+	over them manually.  This was initially not possible, since we
+	merged all alists into one, which would require using a consing
+	function like 'map-merge-with' to look up all package descriptor
+	objects we want to consider in a single 'assq' call.  As we
+	ended up not merging lists, we can assume that there are no
+	duplicate keys in the alists, making the efficient 'assq'
+	viable.
+
+2026-04-25  Philip Kaludercic  <philipk@posteo.net>
+
+	Prevent force reloading of package archive contents
+
+	* lisp/emacs-lisp/package.el (package--compatible-packages):
+	Drop 'package-read-all-archive-contents' call, as
+	'package--build-compatibility-table' will load the archive
+	contents on demand via 'package--mapc' anyway.  (Bug#80902)
+
+2026-04-25  Philip Kaludercic  <philipk@posteo.net>
+
+	Replace 'package--builtin-alist' function with constant
+
+	* lisp/emacs-lisp/package.el (package--builtin-alist):
+	(package--upgradeable-packages, package--mapc)
+	(package-get-descriptor):
+	* lisp/emacs-lisp/package.el (package--builtin-alist): Replace
+	function with constant, as the result of the function is always
+	the same within an Emacs session, since the set of built-in
+	packages don't change during execution.
+	(package--upgradeable-packages, package--mapc)
+	(package-get-descriptor): Use variable instead of function.
+	(package-menu--refresh, describe-package-1): Lookup desc in
+	alist instead of calling 'package--from-builtin'.
+
+	(Bug#80902)
+
+2026-04-25  Philip Kaludercic  <philipk@posteo.net>
+
+	Restore previous 'package-get-descriptor' signature
+
+	* lisp/emacs-lisp/package.el (package-get-descriptor): Allow
+	SOURCES to not be specified for the sake of backwards
+	compatibility.
+
+2026-04-25  Philip Kaludercic  <philipk@posteo.net>
+
+	Adjust default value of 'user-lisp-ignored-directories'
+
+	* lisp/startup.el (user-lisp-ignored-directories): Ignore all
+	directories that VC would also exclude.  (Bug#80853)
+
+2026-04-25  Philip Kaludercic  <philipk@posteo.net>
+
+	Clarify how to customize 'user-lisp-ignored-directories'
+
+	* lisp/startup.el (user-lisp-ignored-directories): Update docstring.
+
+	(Bug#80853)
+
+2026-04-25  Yuan Fu  <casouri@gmail.com>
+
+	Make :range-fn in treesit-range-rules actually work
+
+	* lisp/treesit.el (treesit--range-start):
+	(treesit--range-end):
+	(treesit--flatten-ranges): New helpers.
+	(treesit-query-range):
+	(treesit-query-range-by-language): Don't flatten the ranges
+	returned by each range-fn.
+	(treesit--update-ranges-non-local):
+	(treesit--update-ranges-local): Handle the case where the range
+	is a complicated ((START . END)...).
+	* test/src/treesit-tests.el (treesit-range-helper): New test.
+
+2026-04-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	register.el: Allow jumping to kmacros again (bug#80894)
+
+	* lisp/register.el (register--get-method-type): Fix handling for
+	OClosure args.
+	* test/lisp/register-tests.el (register--jumpable-p): New test.
+
+2026-04-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(Info-documentlanguage): Keep Info-related code in `info.el`
+
+	* lisp/simple.el (Info-documentlanguage): Move from here...
+	* lisp/info.el (Info-documentlanguage): ...to here.
+
+2026-04-25  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix line-truncation on horizontally-split TTY frames
+
+	* src/term.c (append_glyph, append_composite_glyph)
+	(append_glyphless_glyph): Account for the right-border glyph
+	when computing the end glyph of TEXT_AREA.  (Bug#80900)
+
+2026-04-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	Some minor Tramp fixes
+
+	* doc/misc/tramp.texi (Customizing Methods): Add comment.
+
+	* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
+	Comment out setting `command-line-max-length', it doesn't work reliably.
+
+	* test/lisp/net/tramp-tests.el (tramp-test03-file-error)
+	(tramp-test26-file-name-completion-boundaries): Adapt tests.
+
+2026-04-24  Pip Cet  <pipcet@protonmail.com>
+
+	Don't modify kbd_fetch_ptr in x_delete_selection_requests (bug#80863)
+
+	This code may be called from within the loop in process_special_events
+	which assumed kbd_fetch_ptr remains unchanged.  This caused a buffer
+	underflow which resulted in the entire kbd buffer being replayed.
+
+	* src/xterm.c (x_delete_selection_requests): Simply clear deleted
+	events rather than rotating the kbd buffer.
+
+2026-04-24  Martin Rudalics  <rudalics@gmx.at>
+
+	;; Clarify doc on 'dedicated' 'display-buffer' action alist entry
+
+	* doc/lispref/windows.texi (Buffer Display Action Alists):
+	Clarify that only new windows can be marked as dedicated via the
+	action alist entry.
+
+2026-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(work-buffer--release): Fix bug#80813
+
+	* lisp/emacs-lisp/subr-x.el (work-buffer--release): Make sure the
+	buffer is not left read-only.  Clarify potential limitations to
+	the cleanup performed, especially w.r.t indirect buffers.
+	Don't bother binding `deactivate-mark` since that variable is buffer-local
+	nowadays anyway.
+
+2026-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(comint--fontify-input-fontify-region): Silence messages (bug#80870)
+
+	`syntax-propertize` currently doesn't support propertizing only
+	parts of a buffer.  Maybe we should improve it, maybe via
+	something like `font-lock-dont-widen` or the `syntax-ppss` support for
+	narrowing, but in the mean time, teach comint to avoid holes in
+	the propertization.
+
+	* lisp/comint.el (comint--dummy-fontify-syntax): New function.
+	(comint--fontify-input-fontify-region): Use it to silence the
+	new "Cannot syntax-propertize" message in `syntax.el`.
+	Also, refine args to reflect the fact that it's an advice.
+
+2026-04-23  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-hg-after-dir-status: Rewrite to handle current 'hg status' output
+
+	* lisp/vc/vc-hg.el (vc-hg-after-dir-status): Rewrite to handle
+	renames where the "R" line comes arbitrarily later in the
+	output.
+	* test/lisp/vc/vc-hg-tests.el
+	(vc-hg-test--after-dir-status-expect): New function.
+	(vc-hg-after-dir-status): New test.
+
+2026-04-23  Lee Thompson  <lee.p.thomp@gmail.com>
+
+	Add language-environment and input methods for Syriac
+
+	* lisp/leim/quail/syriac.el: New file
+	* lisp/language/misc-lang.el: ("Syriac"): New language environment.
+	("Arabic"): Add comment explaining usage of `arabic-shape-gstring'
+	for Syriac as well as Arabic.
+	* etc/NEWS: Announce the new language environment and input methods.
+	* etc/HELLO: Add a Syriac greeting.
+	(Bug#80451)
+
+2026-04-23  Peter Oliver  <git@mavit.org.uk>
+
+	Document setrgbb, setrgbf, and Tc terminal capabilities
+
+	* doc/misc/efaq.texi (Colors on a TTY): Mention the unofficial
+	setrgbb, setrgbf, and Tc terminal capabilities, and give an
+	example custom terminfo defintion using them.  (Bug#70941)
+
+2026-04-23  Peter Oliver  <git@mavit.org.uk>
+
+	Simplify Tc/COLORTERM=truecolor escape sequence
+
+	This should be more readable to most people, since C is
+	more widely familiar than the terminfo language.
+	* src/term.c (init_tty): Do the conversion from a single integer
+	24-bit color value to three 8-bit RGB values up-front.
+	(Bug#70941)
+
+2026-04-23  Tim Ruffing  <crypto@timruffing.de>
+
+	Support setrgbb/setrgbf for setting 24-bit color
+
+	* src/term.c (turn_on_face): Account for TF_rgb_separate.
+	(init_tty): Support setrgbf/setrrgbb and set TF_rgb_separate
+	accordingly.
+	* src/termchar.h: Update commentary.
+	(Bug#70941)
+
+2026-04-23  Peter Oliver  <git@mavit.org.uk>
+
+	Use expected escape sequence for terminfo Tc and COLORTERM=truecolor
+
+	When the non-standard terminfo capability Tc is present, or the
+	environment variable COLORTERM is set to truecolor, use a
+	hard-coded escape sequence that addresses all colors directly by
+	their RGB values.
+
+	Previously we used escape sequences cribbed from terminfo's
+	setaf/setab for direct color, that expect that we will only try to
+	use colors 000000 to 000007 for the first eight indexed colors.
+	This isn't something we currently handle.
+
+	* doc/misc/efaq.texi (Colors on a TTY): Fix off-by-one error in list
+	of indexed colors for terminfo RGB terminals.
+	* src/term.c (init_tty): Don’t use any indexed colors with terminfo
+	Tc capability or COLORTERM=truecolor environment variable (bug#70941).
+
+2026-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(loaddefs--defining-macros): Delete var
+
+	Now that Transient-0.13.0 has been merged, we don't need to
+	treat its macros specially any more because they come with the
+	appropriate `autoload-macro` property.
+
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs--defining-macros): Delete var.
+	(loaddefs-generate--make-autoload): Delete corresponding code.
+
+2026-04-22  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Update to Transient v0.13.0-10-g5b2ff26f
+
+2026-04-22  Roi Martin  <jroi.martin@gmail.com>
+
+	Test that ERT creates a list of executed tests from erts files
+
+	* test/lisp/emacs-lisp/ert-resources/erts-file-test-list-fail.erts:
+	* test/lisp/emacs-lisp/ert-resources/erts-file-test-list.erts: New erts
+	files.
+	* test/lisp/emacs-lisp/ert-tests.el (ert-test-list-of-erts-file-tests):
+	New test.
+
+2026-04-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(mail-citation-prefix-regexp): Fix excessive backtracking (bug#80808)
+
+	* lisp/mail/sendmail.el (mail-citation-prefix-regexp): Simplify regexp
+	and fix docstring to reflect reality since commit 0b8ee42164cc4569.
+
+2026-04-22  João Távora  <joaotavora@gmail.com>
+
+	Eglot: add eglot--server-buffer-name and use it consistently
+
+	* lisp/progmodes/eglot.el (eglot--server-buffer-name): New function.
+
+	(eglot--connect): Rename events and stderr buffers after serverInfo
+	arrives to include the server's self-reported name.
+
+	(eglot-show-workspace-configuration, eglot-describe-connection)
+	(eglot--define-hierarchy-command): Use eglot--server-buffer-name.
+
+	(eglot--propose-changes-as-diff): Add SERVER argument; use
+	eglot--server-buffer-name.
+
+	(eglot--apply-workspace-edit): Add SERVER argument; pass server to
+	eglot--propose-changes-as-diff.
+
+	(eglot-handle-request workspace/applyEdit, eglot-execute)
+	(eglot-rename): Pass server to eglot--apply-workspace-edit.
+
+2026-04-22  João Távora  <joaotavora@gmail.com>
+
+	Eglot: add eglot--server-name helper
+
+	* lisp/progmodes/eglot.el (eglot--server-name): New function.
+	(eglot--list-connections-entries, eglot-describe-connection): Use it.
+
+2026-04-21  Michael Albinus  <michael.albinus@gmx.de>
+
+	Improve files-tests.el for quoted file names
+
+	* test/lisp/files-tests.el
+	(files-tests-file-name-non-special--temp-file-prefixes): New defconst.
+	(files-tests-file-name-non-special--subprocess)
+	(files-tests-file-name-non-special--buffers): Loop over it.
+	(files-tests--with-temp-non-special)
+	(files-tests--with-temp-non-special-and-file-name-handler): Simplify.
+	(files-tests-file-name-non-special-make-symbolic-link):
+	Pacify compiler warning.
+
+2026-04-21  Juri Linkov  <juri@linkov.net>
+
+	Rebind 'tab-bar-mouse-close-tab' from <down-mouse-2> to <mouse-2>
+
+	* lisp/tab-bar.el (tab-bar-map): Unbind <mouse-2> from 'ignore'.
+	Bind 'tab-bar-mouse-close-tab' to <mouse-2> instead of <down-mouse-2>
+	(bug#80858).
+
+2026-04-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'toggle-truncate-lines' when 'visual-line-mode' is ON
+
+	* lisp/simple.el (toggle-truncate-lines): Force 'truncate-lines'
+	non-nil, even if visual-line-mode needs to be turned off.
+	(Bug#80741)
+
+2026-04-21  Leo C. Stein  <leo.stein@gmail.com>
+
+	Add missing Greek subscripts to TeX input method
+
+	* lisp/leim/quail/latin-ltx.el: Add a regex to match Greek
+	subscripts. Currently there are only five in unicode: beta, gamma,
+	rho, phi, and chi. They can now be input with the TeX input method
+	as, e.g., _\beta .  (Bug#80791)
+
+2026-04-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix unsafe use of SDATA in 'display_tty_menu_separator'
+
+	* src/xdisp.c (display_tty_menu_separator): Pass Lisp string to
+	display_string, not a pointer to its SDATA.  This is safer
+	GC-wise.
+
+2026-04-21  Roi Martin  <jroi.martin@gmail.com>
+
+	Show executed tests from erts files via the ERT results buffer
+
+	* lisp/emacs-lisp/ert.el: Add key binding.
+	(ert--erts-file-test-execution-observer): New variable.
+	(ert--signal-erts-file-test-execution): New function.
+	(ert-test-result): Add field.
+	(ert-run-test): Collect tests from erts files.
+	(ert-results-mode-menu): Add entry.
+	(ert--erts-file-test-name-button): New button type.
+	(ert--erts-file-test-name-button-action): New function.
+	(ert-results-pop-to-erts-file-tests-for-test-at-point): New function.
+	(ert-test--erts-test): Record execution of test from erts file.
+	* doc/misc/ert.texi (Running Tests Interactively): Update manual.
+	* etc/NEWS: Update NEWS.  (Bug#80806)
+
+2026-04-21  João Távora  <joaotavora@gmail.com>
+
+	Eglot: handle visited file name changes (typically C-x C-w)
+
+	When the user renames a buffer's file via set-visited-file-name,
+	notify the server with didClose (old URI) and didOpen (new URI).
+	The TextDocumentIdentifier cache still holds the old URI when
+	after-set-visited-file-name-hook fires, so didClose uses it
+	correctly; didOpen then clears and rebuilds it from the new name.
+
+	* lisp/progmodes/eglot.el (eglot--managed-mode): Hook and unhook
+	eglot--after-set-visited-file-name-hook.
+	(eglot--after-set-visited-file-name-hook): New function.
+
+2026-04-21  João Távora  <joaotavora@gmail.com>
+
+	Eglot: use Unicode box-drawing chars in hierarchy buffers
+
+	Use box-drawing characters for the tree guides in hierarchy
+	buffers when the display supports them.
+
+	* lisp/progmodes/eglot.el (eglot--hierarchy-2): Rework.
+
+2026-04-21  Philip Kaludercic  <philipk@posteo.net>
+
+	Extend utility of 'package-get-descriptor'
+
+	The general idea here is to make it easier to handle situations
+	where you might have a symbol designating a package name or a
+	'package-desc' object, but you really want the latter.
+
+	* lisp/emacs-lisp/package.el (package--get-deps): Remove
+	function superseded by 'package--dependencies'.
+	(package--builtin-alist, package--archive-contents): Add new
+	functions.
+	(package--removable-packages): Use 'package--dependencies'.
+	(package--dependencies): Check for circular dependencies.
+	(package-upgrade, package--upgradeable-packages)
+	(package--user-installed-p, package-reinstall, package-recompile)
+	(describe-package-1, package-desc-status, package--mapc)
+	(package-menu--find-upgrades): Use 'package-get-descriptor'.
+	(package-get-descriptor): Add optional arguments to allow for
+	different kinds of queries.
+
+	* lisp/emacs-lisp/package-vc.el
+	(package-vc-install-selected-packages)
+	(package-vc--generate-description-file)
+	(package-vc-install-dependencies, package-vc--read-package-desc)
+	(package-vc-install, package-vc-checkout): Use
+	'package-get-descriptor'.
+
+2026-04-20  João Távora  <joaotavora@gmail.com>
+
+	Eglot: unbreak diagnostics in symlinked projects
+
+	Now that 'eglot-uri-to-path' tries to return
+	"project-root-familiar" paths, unresolving the absolute path
+	name, it's important to update 'eglot--find-buffer-visiting' to
+	consider the two alternative ways to refer to a file.  IOW, this
+	was already a bug, but the latest changes to 'eglot-uri-to-path'
+	made it more evident.
+
+	* lisp/progmodes/eglot.el (eglot--find-buffer-visiting): Also
+	consider buffer-file-name.
+
+2026-04-20  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix control window setup in 'ediff-setup-windows-plain-compare' (Bug#80809)
+
+	* lisp/vc/ediff-wind.el (ediff-setup-windows-plain-compare): Do
+	not call 'display-buffer-in-direction' directly (Bug#80809).
+
+2026-04-20  Roland Winkler  <winkler@gnu.org>
+
+	proced-format: Simplify last change
+
+	* lisp/proced.el (proced-current-process): Rename from
+	proced-format-current-process.
+	(proced-format): Use it.  Simplify.
+
+2026-04-20  Kyle Meyer  <kyle@kyleam.com>
+
+	Update to Org 9.8.3
+
+2026-04-20  Yuan Fu  <casouri@gmail.com>
+
+	Make sure treesit-fill-reindent-defun handles nil defun (bug#80860)
+
+	* lisp/treesit.el (treesit-fill-reindent-defun): Display error
+	when there's no defun at point.
+
+2026-04-20  Yuan Fu  <casouri@gmail.com>
+
+	* src/treesit.c (Ftreesit__linecol_at): Add treesit_check_position.
+
+2026-04-20  Yuan Fu  <casouri@gmail.com>
+
+	Fix tree-sitter variable name
+
+	* lisp/treesit.el:
+	(treesit-languages-require-line-column-tracking): This is what
+	treesit.c uses.
+	* src/treesit.c: Fix comment typo.
+
+2026-04-19  Michael Albinus  <michael.albinus@gmx.de>
+
+	Some minor Tramp changes
+
+	* lisp/net/tramp-sh.el (tramp-get-remote-arg-max): New defun.
+	(tramp-open-connection-setup-interactive-shell): Use it.
+
+	* lisp/net/tramp.el (tramp-multi-hop-p-hook): New defvar.
+	(tramp-multi-hop-p): Use it.
+	(tramp-handle-make-process): Set TERM environment.
+
+2026-04-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	emacs server sending long-line simplification
+
+	Now that emacsclient can receive long lines without problems,
+	don’t bother splitting long lines when sending to it.
+	* lisp/server.el (server-msg-size): Now obsolete.
+	(server-reply-print): Send qtext without trying to break it
+	into pieces (Bug#80807#49).
+
+2026-04-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify clang 21.1.8 + gdk-pixbuf 2.44
+
+	* src/pgtkfns.c (xg_set_icon_from_xpm_data):
+	* src/xfns.c (xg_set_icon_from_xpm_data):
+	Also pacify clang when --enable-gcc-warnings is used.
+
+2026-04-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(js-jsx--detect-after-change): Fix test regression
+
+	Commit 6942d508f0c made js-mode-regexp-syntax-bug-25529 fail,
+	because it changes the moment and place in which
+	`syntax-propertize` gets called, uncovering a bug where
+	`js-jsx--detect-after-change` narrows the buffer, then calls
+	`re-search-forward` which calls `syntax-propertize`, so we end
+	up doing `syntax-propertize` while narrowed which can fail in
+	all kinds of ways.
+
+	* lisp/progmodes/js.el (js-jsx--detect-and-enable): Change optional arg
+	to BEG and END.
+	(js-jsx--detect-after-change): Use them to avoid narrowing.
+
+	* lisp/emacs-lisp/syntax.el (syntax-propertize): Emit a message
+	when called narrowed and the narrowing starts later than the
+	nearest already propertized position.
+
+2026-04-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	8f535370b9e * src/image.c (svg_load_image): Fix off-by-one mistake (b...
+	fe90f2d87ec * test/infra/gitlab-ci.yml (default): User docker 28.5.2.
+
+	# Conflicts:
+	#	src/image.c
+
+2026-04-18  Philip Kaludercic  <philipk@posteo.net>
+
+	Suppress queries when installing package from file
+
+	* lisp/emacs-lisp/package.el (package-install-file): Assume it
+	is OK to set the visited file name, since we are not actually
+	touching anything on disk, and prevent the modified flag from
+	preventing us to kill the temporary buffer.  The flag is set by
+	tar-mode.
+
+2026-04-18  Philip Kaludercic  <philipk@posteo.net>
+
+	Use git-diff(1) in 'package-review-diff-command' if available
+
+	* lisp/emacs-lisp/package.el (package--review-git-diff-command):
+	Add new constant to avoid duplicating the exact command as the
+	default value and in the type of the user option.
+	(package-review-diff-command): Use git-diff(1) if Git is
+	installed, and fall back to regular diff(1) otherwise.  The
+	previous default value has been moved to the user option, as a
+	suggested alternative.
+	(package-review): Support the ability to use symbols, that get
+	replaced and expanded into the list of switches.
+
+	(Bug#80684)
+
+	Co-Authored-By: Daniel Mendler <mail@daniel-mendler.de>
+
+2026-04-18  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/image.c (svg_load_image): Fix off-by-one mistake (bug#80851).
+
+2026-04-18  Yuan Fu  <casouri@gmail.com>
+
+	Fix c-ts-mode-set-style when STYLE is a function (bug#80777)
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode-set-style): Prepend the
+	language symbol in front of the styles.
+
+2026-04-18  Rahguzar  <rahguzar@mailbox.org>
+
+	proced-format: Use internal var for speed-up (bug#77775).
+
+	* lisp/proced.el (proced-format-current-process): New variable.
+	* lisp/proced.el (proced-format-pid, proced-format): Use it.
+
+2026-04-18  Rahguzar  <rahguzar@mailbox.org>
+
+	proced-format: Use process-alist for standard attributes (bug#77775).
+
+	* lisp/proced.el (proced-format): Use process-alist for standard
+	attributes.
+
+2026-04-17  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-hg--checkin: Use vc-hg--active-bookmark-internal
+
+	* lisp/vc/vc-hg.el (vc-hg--active-bookmark-internal): Make it
+	work when default-directory is not the repository root.
+	(vc-hg--checkin): Use vc-hg--active-bookmark-internal instead of
+	vc-hg--working-branch.
+
+2026-04-17  Stephen Berman  <stephen.berman@gmx.net>
+
+	Restrict Dired handling of newlines in file names
+
+	* lisp/dired.el (dired--ls-accept-b-switch-p): New function.
+	(dired-internal-noselect): Use it in the condition on displaying
+	warning about filenames with newlines.
+	(dired--set-auto-toggle-b-switch): Use it to conditionalize
+	calling 'dired--toggle-b-switch'.
+	(dired-auto-toggle-b-switch, dired--toggle-b-switch): Improve doc
+	string.
+
+	* test/lisp/dired-tests.el (dired-test-filename-with-newline-1)
+	(dired-test-filename-with-newline-2): Skip unless Dired uses an
+	'ls' that supports the '-b' switch.
+
+	* etc/NEWS: Adjust accordingly the announcements of the Dired
+	warning and the new user option for file names with newlines.
+
+2026-04-17  Aaron L. Zeng  <azeng@janestreet.com>  (tiny change)
+
+	vc-hg--checkin: When committing a patch, advance active hg bookmark
+
+	* lisp/vc/vc-hg.el (vc-hg--checkin): When committing a patch,
+	advance any active hg bookmark (bug#80848).
+
+2026-04-17  Michael Albinus  <michael.albinus@gmx.de>
+
+	Extend integration of external operations in Tramp
+
+	* doc/misc/tramp.texi (Extension packages): Use another format
+	char in example.
+	(New operations): Document different argument types.  Extend example.
+
+	* lisp/net/tramp.el: Use consequently `eq', `assq', `memq'.
+	(tramp-file-name-for-operation-external): Extend docstring.
+	(tramp-file-name-for-operation): Make more use of
+	`tramp-file-name-for-operation-external'.
+	(tramp-add-external-operation): New optional argument `arg-type'.
+
+	* test/lisp/net/tramp-tests.el (tramp--handle-test-operation):
+	Rename from `tramp--handler-for-test-operation'.
+	(tramp--handle-process-id)
+	(tramp--test-operation-file-name-for-operation): New defuns.
+	(tramp-test49-external-backend-function): Extend test.
+
+2026-04-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Append newline to server -error commands
+
+	Problem reported by Zhengyi Fu (bug#80844).
+	* lisp/server.el (server--process-filter-1, server-return-error)
+	(server-edit-abort): Append newline to -error commands, too.
+	Otherwise emacsclient has no reliable way to find the end of the
+	error command’s argument, except to wait for EOF which is
+	undesirable since the Emacs server keeps the socket open
+	for a while, waiting for emacsclient to exit.
+
+2026-04-17  Yuan Fu  <casouri@gmail.com>
+
+	Make sure range (1, 1) doesn't capture anything (bug#80798)
+
+	* src/treesit.c (Ftreesit_query_capture): Return Qnil if
+	querying (1, 1).
+
+2026-04-17  Yuan Fu  <casouri@gmail.com>
+
+	Accept marker as position in treesit.c functions (bug#80830)
+
+	* src/treesit.c (treesit_check_positive_integer): Remove.
+	(treesit_check_position):
+	(Ftreesit_node_first_child_for_pos):
+	(Ftreesit_node_descendant_for_range):
+	(Ftreesit_query_capture):
+	(Ftreesit__linecol_at): Use fix_position.
+
+	* test/src/treesit-tests.el:
+	(treesit-query-marker-position): Test.
+
+2026-04-17  João Távora  <joaotavora@gmail.com>
+
+	Eglot: add M-x eglot-describe-connection
+
+	Also add more bindings to M-x eglot-list-connections
+
+	* lisp/progmodes/eglot.el (eglot-list-connections-mode-map): Add
+	bindings for e, w, RET.
+	(eglot-events-buffer-of-listed-connection)
+	(eglot-show-workspace-configuration-of-listed-connection)
+	(eglot-describe-listed-connection): New commands.
+	(eglot-describe-connection): New command.
+
+	* doc/misc/eglot.texi: Document new keys and eglot-describe-connection.
+
+	* etc/EGLOT-NEWS: Announce.
+
+2026-04-16  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-file-tree-walk: Stop emitting messages
+
+	* lisp/vc/vc.el (vc-file-tree-walk, vc-file-tree-walk-internal):
+	Stop emitting messages about traversing directories.
+
+2026-04-16  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-file-tree-walk-internal: Use vc-registered
+
+	* lisp/vc/vc.el (vc-file-tree-walk-internal): Use vc-registered
+	not vc-backend, for robustness.
+
+2026-04-16  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-rename-file: Fix skipping calling into the backend
+
+	* lisp/vc/vc.el (vc-rename-file): Replace broken attempted use
+	of vc-dir-status-files with walking OLD using vc-file-tree-walk.
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-test--rename-directory):
+	Assert that the files are registered or not as appropriate.  New
+	test case in which there are only registered files.
+
+2026-04-16  João Távora  <joaotavora@gmail.com>
+
+	Jsonrpc: simplify previous change
+
+	* lisp/jsonrpc.el (jsonrpc--save-excursion-maybe): Delete.
+	(jsonrpc--forwarding-buffer, jsonrpc--log-event): Use simple
+	save-excursion.
+
+2026-04-16  João Távora  <joaotavora@gmail.com>
+
+	Eglot: adjust previous change to eglot-uri-to-path
+
+	* lisp/progmodes/eglot.el (eglot-uri-to-path): Tweak.
+
+2026-04-16  Juri Linkov  <juri@linkov.net>
+
+	Update 'crm-complete-and-exit' from 'minibuffer-complete-and-exit'
+
+	* lisp/emacs-lisp/crm.el (crm-complete-and-exit):
+	Add new arg 'no-exit'.  Call 'minibuffer-choose-completion'
+	when 'completion--selected-candidate' returns non-nil (bug#80821).
+
+2026-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	src/syntax.c (update_syntax_table): Remove redundant assignment
+
+2026-04-16  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+
+	Announce ert-play-keys in etc/NEWS.
+
+2026-04-16  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+
+	ert-play-keys function
+
+	* lisp/emacs-lisp/ert-x.el (ert-play-keys): new defun.
+
+	* test/lisp/simple-tests.el (undo-test-kill-c-a-then-undo)
+	(undo-test-point-after-forward-kill): Use new function
+	`ert-play-keys' and `(ert-with-test-buffer (:selected t) ...)'
+	rather (with-temp-buffer (switch-to-buffer (current-buffer) ...)'.
+
+	* test/lisp/erc/erc-scenarios-spelling.el
+	(erc-scenarios-spelling--auto-correct): Use new function
+	`ert-play-keys' and `(ert-with-buffer-selected ...)' rather than
+	`execute-kbd-macro' and `(with-current-buffer
+	... (set-window-buffer nil (current-buffer) ...)'.
+
+	* doc/misc/ert.texi (Helper Functions): Document ert-play-keys,
+	and differences between ert-simulate-command, ert-simulate-keys
+	& ert-play-keys.
+
+	* test/lisp/emacs-lisp/ert-x-tests.el
+	(ert-x-tests-play-keys)
+	(ert-x-tests-simulate-command, ert-x-tests-simulate-keys): New
+	tests.
+
+2026-04-16  João Távora  <joaotavora@gmail.com>
+
+	Eglot: add shutdown/reconnect bindings to eglot-list-connections buffer
+
+	* lisp/progmodes/eglot.el (eglot-list-connections-mode-map): New
+	defvar.
+
+	* lisp/progmodes/eglot.el (eglot--list-connections-entries): New
+	function, extracted from eglot-list-connections.
+
+	* lisp/progmodes/eglot.el (eglot--list-connections-cmd): New macro.
+
+	* lisp/progmodes/eglot.el (eglot-shutdown-listed-connection)
+	(eglot-reconnect-listed-connection): New commands.
+
+	* lisp/progmodes/eglot.el (eglot-list-connections): Use
+	eglot--list-connections-entries.
+
+	* doc/misc/eglot.texi: Document eglot-list-connections and new keys.
+
+	* etc/EGLOT-NEWS: Announce.
+
+2026-04-16  João Távora  <joaotavora@gmail.com>
+
+	Jsonrpc: don't suddenly jump point in events buffer
+
+	* lisp/jsonrpc.el (jsonrpc--save-excursion-maybe): New macro.
+
+	* lisp/jsonrpc.el (jsonrpc--log-event, jsonrpc--forwarding-buffer):
+	Use it.
+
+2026-04-16  João Távora  <joaotavora@gmail.com>
+
+	Eglot: un-canonicalize server URIs to project's root
+
+	Some LSP servers prefer to canonicalize all document URIs to
+	their "true name", chasing all fs symbolic links.  If the user
+	is visiting a project under a symlink, say ~/myprojects/foo
+	which points to /data/true/projects/foo.  When visiting a
+	~/myprojects/foo/f.c and trying to jump to a nearby file f.h via
+	LSP 'xref-find-definitions', the path should probably be
+	~/myproject/foo/f.h, not /data/true/projects/foo/f.h.
+
+	Even though Emacs can recognize that the two files are the same,
+	'buffer-file-name' is not.  This confuses tools like C-x C-f,
+	ibuffer, and ultimately the users themselves who probably
+	oblivious to the true place of the project.  After all they
+	started Eglot under a syminked file.
+
+	* lisp/progmodes/eglot.el (eglot-lsp-server): Add trueroot slot.
+	(eglot-uri-to-path): Rework to consider trueroot and project root.
+
+2026-04-15  Toby Dylan Hocking  <toby.hocking@r-project.org>  (tiny change)
+
+	Make | optional for 'gnu' regexp in compilation-mode (bug#80681)
+
+	* lisp/progmodes/compile.el
+	(compilation-error-regexp-alist-alist): Make leading '|'
+	optional when there are leading spaces (bug#80681).
+	* etc/compilation.txt (GNU style): New error with two leading
+	spaces.
+	* test/lisp/progmodes/compile-tests.el
+	(compile-test-error-regexps): Increment expected
+	compilation-num-errors-found.
+	(compile-tests--test-regexps-data): New error test case for
+	'gnu' with two leading spaces.  Change expected match for
+	'cucumber' to match again 'gnu'.
+
+2026-04-15  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-rename-file: Fix case of directory with only untracked files
+
+	* lisp/vc/vc.el (vc-rename-file): Don't call into the backend if
+	moving a directory containing only untracked files.
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-test--rename-directory):
+	New test for this case.
+
+2026-04-15  Juri Linkov  <juri@linkov.net>
+
+	Handle the symbol property 'isearch-exit' in 'isearch-occur' (bug#80785)
+
+	* lisp/isearch.el (isearch-occur): When the command has
+	a non-nil symbol property 'isearch-exit', exit the search
+	before running the command.
+
+2026-04-15  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix renaming whole directories with Mercurial
+
+	* lisp/vc/vc-hg.el (vc-hg-rename-file): Use 'hg mv --after'.
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-test--rename-directory):
+	New test.
+
+2026-04-15  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-rename-file: New OK-IF-ALREADY-EXISTS parameter
+
+	* lisp/vc/vc.el (vc-delete-file): New NOCONFIRM parameter.
+	(vc-rename-file): New OK-IF-ALREADY-EXISTS parameter.
+	* lisp/dired-aux.el (dired-rename-file): Pass it.
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-test--rename-file): Test
+	it.  Also test moving files into an existing directory.
+
+2026-04-14  Juri Linkov  <juri@linkov.net>
+
+	New faces 'tab-line-active' and 'tab-line-inactive' (bug#80742)
+
+	This is intended to parallel the 'mode-line-active/inactive'
+	and 'header-line-active/inactive' distinction.
+
+	* doc/emacs/display.texi (Standard Faces): Document the new faces.
+
+	* lisp/faces.el (tab-line-active, tab-line-inactive): Add new faces.
+
+	* lisp/tab-line.el (tab-line-faces): Add new faces
+	to MEMBERS arg of 'defgroup'.
+	(tab-line-auto-hscroll): Use one of the faces
+	depending on 'mode-line-window-selected-p'.
+
+	* src/dispextern.h (CURRENT_TAB_LINE_ACTIVE_FACE_ID_3)
+	(CURRENT_TAB_LINE_ACTIVE_FACE_ID): New macros
+	based on header-line equivalents.
+	(CURRENT_TAB_LINE_HEIGHT): Use CURRENT_TAB_LINE_ACTIVE_FACE_ID.
+	(face_id): Use TAB_LINE_ACTIVE_FACE_ID and
+	TAB_LINE_INACTIVE_FACE_ID instead of TAB_LINE_FACE_ID.
+
+	* src/xdisp.c (window_box_height, pos_visible_p, init_iterator)
+	(window_text_pixel_size, display_mode_lines, display_mode_line)
+	(format-mode-line): Replace all uses of TAB_LINE_FACE_ID with
+	either a new macro or the new face IDs.
+
+	* src/xfaces.c (lookup_basic_face, realize_basic_faces):
+	Map new face IDs to their lisp symbols.
+	(syms_of_xfaces): New lisp symbols.
+
+2026-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(loaddefs-generate--make-autoload): Avoid `%s` on compound values
+
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload):
+	Avoid `%s` on compound values.
+
+2026-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	SETUP_SYNTAX_TABLE: syntax-propertize more lazily (bug#80600)
+
+	Many regexps do not pay attention to syntax tables at all
+	because they don't use things like \s, \b, \<, or \_<.
+	So delay the actual initialization of the machinery for
+	`syntax-table` properties (especially the call to `syntax-propertize`)
+	until the first time we actually need to consult the syntax of
+	a character.
+
+	* src/syntax.c (uninitialized_interval): New constant.
+	(RE_SETUP_SYNTAX_TABLE_FOR_OBJECT, SETUP_SYNTAX_TABLE):
+	Set `forw/backward_i` to that new constant to indicate they haven't
+	actually be initialized yet.
+	Set `start` and `stop` fields right away, instead of delegating it to
+	`update_syntax_table`, so that `e_property` and `b_property`
+	can be set independently.
+	(update_syntax_table): Remove the `init` argument.  Instead, discover
+	the need for initialization based on the fact that `forw/backward_i`
+	are uninitialized.  Presume `start` and `stop` fields have been
+	set already.
+	(parse_sexp_propertize): Update call accordingly.
+	(update_syntax_table_forward): Remove the `init` argument.
+
+	* src/syntax.h (update_syntax_table, update_syntax_table_forward):
+	Remove the `init` argument.
+	(UPDATE_SYNTAX_TABLE_FORWARD, UPDATE_SYNTAX_TABLE_BACKWARD):
+	Update calls accordingly.
+
+2026-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/international/mule.el (auto-coding-alist): Fix name (bug#80818)
+
+2026-04-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix hangs on MS-Windows when deleting a pipe process
+
+	* src/w32.c (sys_close): Don't close a descriptor from which the
+	reader thread is reading, to avoid hanging Emacs.  (Bug#80770)
+
+2026-04-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix MinGW64 build broken by changes in emacsclient.c
+
+	* nt/gnulib-cfg.mk (getdelim, getline): Do not omit.  It is now
+	needed for 'emacsclient', but MinGW64 doesn't have it in its runtime
+	libraries (mingw.org's MinGW does have it).  (Bug#80770)
+
+2026-04-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "; Fix node names in modus-themes.org"
+
+	This reverts commit d4002877d3b4d7dcc3c7d5e6ecdef10aad06b8a6.
+	It is no longer needed with the latest Org v9.8.2.
+
+2026-04-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "; Fix last change."
+
+	This reverts commit 670bb34d91179eef087b6964edb445244180e8f6.
+	It is no longer needed with the latest Org 9.8.2.
+
+2026-04-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+	emacsclient receiving long-line fixes
+
+	Do not mishandle long lines, or lines containing NUL,
+	when receiving data.
+	* lib-src/emacsclient.c (check_socket_timeout, main):
+	Use ssize_t for return values from recv,
+	since in theory the value could exceed INT_MAX now.
+	(main): Do not use a fixed-size buffer for receiving data;
+	instead, grow the buffer as needed (admittedly unlikely).
+	When a partial line is received via recv, do not discard its data;
+	instead, keep reading, possibly with a grown buffer.
+	Do not ignore received data after a null byte is received.
+	Add a comment about when received data is ignored due to a goto.
+
+2026-04-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+	emacsclient send_buffer size--
+
+	* lib-src/emacsclient.c (send_to_emacs_len):
+	No need to add 1 to SEND_BUFFER_SIZE.
+
+2026-04-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+	emacsclient config+sending long-line fixes
+
+	Do not mishandle long lines, or lines containing NUL,
+	when getting configuration or sending data.
+	* lib-src/emacsclient.c (send_to_emacs_len, quote_argument_len):
+	New functions, generalizing the old send_to_emacs and quote_argument.
+	Rewrite the old functions to use the new ones.
+	(get_server_config): Do not mishandle long lines in the config file.
+	(set_tcp_socket): No longer a need to null-terminate auth string.
+	(main): Do not mishandle long lines from stdin, or lines with NUL.
+
+2026-04-12  Kyle Meyer  <kyle@kyleam.com>
+
+	Update to Org 9.8.2
+
+2026-04-12  Elias Gabriel Perez  <eg642616@gmail.com>
+
+	hideshow: New function 'hs-add-cycle-binding' (Bug#80657)
+
+	https://lists.gnu.org/archive/html/emacs-devel/2026-02/msg00153.html
+
+	* lisp/progmodes/hideshow.el (hs-cycle-filter)
+	(hs-minor-mode-map): Update.
+	(hs--filter-function, hs-add-cycle-binding): New functions.
+	(hs-cycle): Minor rework.
+
+2026-04-12  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-bar.el (tab-bar-show): Support the 0 value (bug#80713).
+
+	Add explicit choice for the 0 value to always show the tab bar.
+	Also add a choice for other non-negative numbers.
+	In the setter enable 'tab-bar-mode' only for numbers,
+	but not for the t value that should not enable the tab bar
+	after customization, only after creating a new tab.
+
+2026-04-12  Dirk-Jan C. Binnema  <djcb@djcbsoftware.nl>  (tiny change)
+
+	xwidgets: re-enable with newer webkit2gtk
+
+	By disabling hw-acceleration we can re-enable xwidgets with newer
+	webkit2gtk versions (Bug#80728).
+	Newer versions were disallowed (Bug#66068) since they abort when a
+	webkit view is created; however, they work fine as long as we disable
+	hw-acceleration, since the off-screen windows that xwidgets uses do not
+	support that.
+	* configure.ac: Remove upper-bound for webkit2gtk version check.
+	* src/xwidget.c (Fmake_xwidget): Turn off hardware-acceleration.
+
+2026-04-12  Philip Kaludercic  <philipk@posteo.net>
+
+	Clean up 'Info-directory-list' after deleting package
+
+	* lisp/emacs-lisp/package.el (package--delete-directory): Remove
+	manual before physically deleting the package.  (Bug#80776)
+
+2026-04-12  Philip Kaludercic  <philipk@posteo.net>
+
+	Fix computation of package description file
+
+	* lisp/subr.el (package--description-file): Do not expect
+	non-numeric version components to be followed directly by a
+	number.  (Bug#80744)
+
+2026-04-12  Philip Kaludercic  <philipk@posteo.net>
+
+	Add face for obsolete packages in package menu
+
+	* lisp/emacs-lisp/package.el (package-status-obsolete): New face.
+	(package-menu-status-faces): Use new face instead of hard-coding
+	a font-lock face.
+
+2026-04-12  Richard Lawrence  <rwl@recursewithless.net>
+
+	Add short documentation group for iCalendar lib
+
+	Define a short documentation group and document the major functions:
+
+	* lisp/calendar/icalendar-shortdoc.el: New file.
+	* lisp/calendar/diary-icalendar.el:
+	* lisp/calendar/icalendar-ast.el:
+	* lisp/calendar/icalendar-parser.el:
+	* lisp/calendar/icalendar-recur.el:
+	* lisp/calendar/icalendar-utils.el: Refer to icalendar-shortdoc.el in
+	file commentary.
+	* lisp/calendar/icalendar-macs.el: Ditto, and also mention the macros
+	for binding values.
+	* lisp/calendar/icalendar.el: Ditto, and also remove some obsolete
+	commentary.
+
+	Also make some improvements to documentation strings that the above
+	changes revealed would be helpful:
+
+	* lisp/calendar/icalendar-recur.el
+	(icalendar-recur-recurrences-in-window-w/end-times): Fix broken ref.
+	(icalendar-recur-current-tz-to-vtimezone): Clarify docstring.
+	* lisp/calendar/icalendar-parser.el (icalendar-parse): Clarify
+	docstring.
+
+	(Bug#80727)
+
+2026-04-12  Richard Lawrence  <rwl@recursewithless.net>
+
+	Improve performance of icalendar-recur.el and its tests
+
+	As discussed in Bug#80520.
+
+	* test/lisp/calendar/icalendar-recur-tests.el
+	(icalendar-test-rrule-test-rfc5545-sec3.8.5.3/3)
+	(icalendar-test-rrule-test-rfc5545-sec3.8.5.3/29)
+	(icalendar-test-rrule-test-rfc5545-sec3.8.5.3/30)
+	(icalendar-test-rrule-test-rfc5545-sec3.8.5.3/31)
+	(icalendar-test-rrule-test-rfc5545-sec3.8.5.3/33)
+	(icalendar-test-rrule-test-rfc5545-sec3.8.5.3/34)
+	(icalendar-test-rrule-test-rfc5545-sec3.8.5.3/38): Mark tests expensive.
+
+	Abstract the implementation of intervals in icalendar-recur.el.  Don't
+	store interval NEXT-LOW when it's the same as HIGH.  This reduces
+	allocations, and shaves about ~20% off the full test suite.
+
+	* lisp/calendar/icalendar-recur.el
+	(icalendar-recur-make-interval)
+	(icalendar-recur-interval-low)
+	(icalendar-recur-interval-high)
+	(icalendar-recur-interval-next): Implement intervals and subintervals as
+	vectors.  Only store NEXT-LOW when it's non-nil.
+	(icalendar-recur-find-absolute-interval)
+	(icalendar-recur-find-daily-interval)
+	(icalendar-recur-find-weekly-interval)
+	(icalendar-recur-find-monthly-interval)
+	(icalendar-recur-find-yearly-interval)
+	(icalendar-recur-next-interval)
+	(icalendar-recur-previous-interval)
+	(icalendar-recur-refine-byyearday)
+	(icalendar-recur-refine-byweekno)
+	(icalendar-recur-refine-bymonth)
+	(icalendar-recur-refine-bymonthday)
+	(icalendar-recur-refine-byday)
+	(icalendar-recur-refine-byhour)
+	(icalendar-recur-refine-byminute)
+	(icalendar-recur-refine-bysecond)
+	(icalendar-recur-subintervals-to-date-times)
+	(icalendar-recur-subintervals-to-dates)
+	(icalendar-recur-recurrences-in-interval)
+	(icalendar-recur-recurrences-in-window)
+	(icalendar-recur--key-from-interval): Use new interval constructor and
+	accessors.  Don't generate NEXT-LOW when it's the same as HIGH.
+	* lisp/calendar/icalendar-utils.el (icalendar-dates-until): Use new
+	interval constructor and accessors.
+	* test/lisp/calendar/icalendar-recur-tests.el
+	(icalendar-test-recur-find-secondly-interval)
+	(icalendar-test-recur-find-minutely-interval)
+	(icalendar-test-recur-find-hourly-interval)
+	(icalendar-test-recur-find-daily-interval-w/date)
+	(icalendar-test-recur-find-daily-interval-w/date-time)
+	(icalendar-test-recur-find-weekly-interval-w/date)
+	(icalendar-test-recur-find-weekly-interval-w/date-time)
+	(icalendar-test-recur-find-monthly-interval)
+	(icalendar-test-recur-find-yearly-interval)
+	(icalendar-test-recur-refine-byyearday)
+	(icalendar-test-recur-refine-bymonth)
+	(icalendar-test-recur-refine-bymonthday)
+	(icalendar-test-recur-refine-byday)
+	(icalendar-test-recur-refine-byhour)
+	(icalendar-test-recur-refine-byminute)
+	(icalendar-test-recur-refine-bysecond)
+	(icalendar-test-recur-subintervals-to-dates)
+	(icalendar-test-recur-subintervals-to-date-times)
+	(icalendar-test-rrule-test): Use new interval constructor and accessors.
+
+	Rearrange loops when refining subintervals, so that the loop always runs
+	once but doesn't run a second no-op iteration.  Astonishingly this cuts
+	the running time of the full test suite by almost 50%.
+
+	* lisp/calendar/icalendar-recur.el (icalendar-recur-refine-byyearday)
+	(icalendar-recur-refine-byweekno)
+	(icalendar-recur-refine-bymonth)
+	(icalendar-recur-refine-bymonthday)
+	(icalendar-recur-refine-byday)
+	(icalendar-recur-refine-byhour)
+	(icalendar-recur-refine-byminute)
+	(icalendar-recur-refine-bysecond): Tighten up loop bounds when refining
+	subintervals.
+
+	Improve performance of `icalendar-recur-tz-observance-on'.  This also
+	brings about a ~20% performance gain.
+
+	* lisp/calendar/icalendar-recur.el
+	(icalendar-recur-tz-observance-on): Eliminate calculation of previous
+	interval recurrences when it's unnecessary.  Add a cheap upper bound check to
+	prevent fully computing recurrences for irrelevant observances.
+	(icalendar-recur--w/in-locally-p):
+	(icalendar-recur--w/in-abs-p): New helper functions for the upper bound check.
+
+	Other more minor changes:
+
+	Improve performance in `icalendar-recur-refine-byday'
+
+	* lisp/calendar/icalendar-recur.el (icalendar-recur-refine-byday): Avoid
+	calculating Gregorian from absolute date unless it's necessary.
+
+	Improve performance of BYSETPOS filtering in icalendar-recur.el:
+	η-reduce `icalendar-recur-make-bysetpos-filter'.
+	Thanks to Mattias Engdegård for the suggestion and implementation.
+
+	* lisp/calendar/icalendar-recur.el
+	(icalendar-recur-make-bysetpos-filter): Rename to
+	`icalendar-recur-bysetpos-filter' and avoid `seq-map-indexed'.
+	(icalendar-recur-recurrences-in-interval): Use new function.
+	* test/lisp/calendar/icalendar-recur-tests.el
+	(icalendar-test-recur-bysetpos-filter): Use new function.
+
+	Improve sorting performance:
+	Thanks to Mattias Engdegård for the suggestion and implementation.
+
+	* lisp/calendar/icalendar-recur.el (icalendar-recur-refine-byyearday):
+	(icalendar-recur-refine-byweekno):
+	(icalendar-recur-refine-bymonthday):
+	(icalendar-recur-refine-byday): Use :key instead of :lessp in `sort'
+	calls.
+
+	Eliminate `apply-partially' and `seq-take':
+	Thanks to Mattias Engdegård for the suggestion and implementation.
+
+	* lisp/calendar/icalendar-recur.el
+	(icalendar-recur-recurrences-in-window): Eliminate `apply-partially'.
+	(icalendar-recur-recurrences-in-interval): Eliminate
+	`apply-partially' and replace `seq-take' with `take'.
+
+	Reduce consing:
+
+	* lisp/calendar/icalendar-recur.el
+	(icalendar-recur-subintervals-to-dates):
+	(icalendar-recur-recurrences-in-window):
+	(icalendar-recur-recurrences-in-window-w/end-times):
+	(icalendar-recur-recurrences-to-count): Replace `append' with `nconc'.
+
+	Avoid a few uses of `seq-filter' in common functions in icalendar-ast.el:
+
+	* lisp/calendar/icalendar-ast.el (icalendar-ast-node-children-of):
+	Reimplement filter imperatively.
+
+2026-04-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix setting and restoring cursor shape on Windows Terminal
+
+	* src/w32console.c (w32con_set_cursor_size): New function.
+	(w32con_reset_terminal_modes, w32con_set_terminal_modes)
+	(Fset_cursor_size): Use it to change cursor shape on Windows
+	Terminal.
+
+2026-04-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix display of ambiguous-width characters on MS-Windows terminal
+
+	* src/w32console.c (syms_of_ntterm) <w32--terminal-is-conhost>:
+	New variable.
+	(initialize_w32_display): Set 'w32--terminal-is-conhost' non-nil
+	when running on ConHost.
+
+	* lisp/international/characters.el (use-cjk-char-width-table):
+	When Emacs runs on MS-Windows Terminal, behave as if
+	'cjk-ambiguous-chars-are-wide' were nil even in CJK locales.
+	(Bug#79298)
+
+2026-04-11  Stephen Berman  <stephen.berman@gmx.net>
+
+	Improve tests involving 'ls' error message
+
+	* test/lisp/dired-tests.el (dired-test-ls-error-message):
+	* test/lisp/files-tests.el
+	(files-tests-file-name-non-special-insert-directory): Make test
+	comparing the expected 'ls' error message with the string in the
+	'ls' error buffer more robust (bug#80499).
+
+2026-04-11  Stephen Berman  <stephen.berman@gmx.net>
+
+	Ensure Dired does not list deleted 'ls' error file
+
+	* lisp/dired.el (dired--ls-error-file): New variable.
+	(dired-readin-insert): Use it to find and remove entry in Dired
+	buffer of already deleted temporary 'ls' error file (bug#80499).
+
+	* lisp/files.el (insert-directory): Set it to temporary 'ls' error file.
+
+2026-04-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix face extension in 'visual-line-mode'
+
+	* src/xdisp.c (display_line): Under WORD_WRAP, save and restore
+	the iterator _before_ the wrap point.  This fixes face extension
+	under 'visual-line-mode', because otherwise 'extend_face_to_end_of_line'
+	is called with the value of 'it' that corresponds to the first display
+	element on the next screen line.  (Bug#80673)
+
+2026-04-11  Stephen Berman  <stephen.berman@gmx.net>
+
+	Handle 'dired' called with -Al switches (bug#80711)
+
+	* lisp/dired.el (dired-internal-noselect): After reading in
+	directory, check whether there was an 'ls' error instead of
+	checking for file entries, since there may be none is the -Al
+	switches (or just -l) were used.
+	(dired--display-ls-error): Ensure the 'ls' error buffer is a live buffer.
+
+	* lisp/files.el (insert-directory-clean): Ensure deletion of
+	"//DIRED-OPTIONS//" line when using -Al switches (or just -l).
+
+2026-04-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	uni-script.el: Fix failure when loading the file directly
+
+	* lisp/international/textsec.el (textsec--create-script-table): Autoload
+	and don't define while compiling.
+	(uni-script): Require only when loading, not when compiling.
+
+2026-04-10  Pip Cet  <pipcet@protonmail.com>
+
+	Don't continue FOR_EACH_FRAME loops after delete_frame (bug#80789)
+
+	* src/xterm.c (x_connection_closed, x_delete_terminal): Restart
+	FOR_EACH_FRAME loops after deleting one (or potentially more) frames.
+
+2026-04-10  Pip Cet  <pipcet@protonmail.com>
+
+	Ensure selected_frame isn't the deleted frame (bug#80789)
+
+	The previous code would sometimes exit the loop with frame1 set to the
+	last considered frame, even if that wasn't a suitable frame to switch
+	to.
+
+	* src/frame.c (delete_frame): Reset 'frame1' in the loops if we don't
+	match the break condition, so we don't think we've found a suitable
+	replacement frame if we haven't. Error if, for some reason, that
+	fails.
+
+2026-04-10  Pip Cet  <pipcet@protonmail.com>
+
+	Don't accept dead selected_frame in x_connection_closed (bug#80789)
+
+	* src/xterm.c (x_connection_closed): Try to restore frame if the
+	selected frame is dead. If that fails, abort.
+
+2026-04-10  Mike Kupfer  <kupfer@rawbw.com>
+
+	Improve previous change.
+
+	* lisp/mh-e/mh-thread.el: Require 'mh-folder.
+	(mh-thread-refile): Update the docstring.
+
+2026-04-10  Henrique Martins  <mh-e-users-2009@martins.cc>  (tiny change)
+
+	MH-E: remember destination when refiling a thread (SF#473)
+
+	* lisp/mh-e/mh-thread.el (mh-thread-refile): Add an optional argument
+	'dont-update-last-destination-flag'.  If it is nil, update
+	'mh-last-destination' and 'mh-last-destination-folder'.
+
+2026-04-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	src/eval.c (Fdefault_toplevel_value): Improve docstring (bug#80775)
+
+2026-04-10  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/infra/gitlab-ci.yml (default): User docker 28.5.2.
+
+	* test/infra/gitlab-ci.yml (default): User docker 28.5.2.
+
+2026-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(elisp--font-lock-flush-elisp-buffers): Avoid eager font-locking
+
+	When jit-lock is not in use, `font-lock-flush` is too costly to
+	justify using it just to maybe update the highlighting of a few macro calls.
+
+	* lisp/progmodes/elisp-mode.el (elisp--font-lock-flush-elisp-buffers):
+	Skip buffers that use jit-lock, like the `*ielm*-comint-indirect` buffer.
+
+2026-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(elisp--local-variables): Restore point earlier
+
+	* lisp/progmodes/elisp-mode.el (elisp--local-variables): Restore
+	point before calling `elisp--safe-macroexpand-all` in case this
+	triggers a temporary redisplay.
+
+2026-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/vc/vc.el (vc-checkin): Use `vc-dir-buffers` like we do everywhere else
+
+2026-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(listify-key-sequence): Fix breakage with unibyte chars
+
+	* lisp/subr.el (listify-key-sequence): The funny
+	"7th bit is Meta" applies only to unibyte strings.
+
+	* test/lisp/subr-tests.el (subr-listify-key-sequence): New test.
+
+2026-04-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc.el (vc-checkin): Don't assume vc-dir is loaded.
+
+2026-04-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	with-vc-properties: Don't substitute in a global value
+
+	* lisp/vc/vc.el (with-vc-properties): Don't substitute in the
+	value vc-touched-properties happens to have at macro expansion
+	time.  This was left over from when vc-touched-properties was
+	bound to a local gensym.
+
+2026-04-09  समीर सिंह Sameer Singh  <lumarzeli30@gmail.com>
+
+	Fix emoji--insert-buffer being wiped by emoji-list-mode
+
+	* lisp/international/emoji.el (emoji-list): Set insert-buffer after the
+	emoji buffer is set up.  (bug#80773)
+
+2026-04-09  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Fix "Narrowing src/ file breaks xref"
+
+	* lisp/emacs-lisp/find-func.el (find-function-C-source):
+	Look outside of the current narrowing as well (bug#80749).
+
+2026-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/emacs-lisp/cl-macs.el (cl-typep): Undo accidental change
+
+	src/data.c (set_internal): Mention var which can't be unbound in error msg
+
+2026-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(take-while, drop-while, all, member-if)
+
+	* lisp/subr.el (take-while, drop-while, all, member-if): Don't inline
+	if `pred` is not a "constant" since it wouldn't bring any
+	significant benefit.  Also, don't explicitly `macroexpand-all` since
+	the compiler macro will be called (again) after macro-expansion,
+	if needed.
+	(internal--effect-free-fun-arg-p): Return nil for variable references.
+
+2026-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(dired-at-point-prompter): Fix bug#80545
+
+	* lisp/ffap.el (ffap-read-file-or-url): Add `read-dir` argument to
+	indicate we expect a directory as return value.
+	Avoid `read-file-name` when we want a directory and the dialog UI
+	might prevent us from doing so.
+	(dired-at-point-prompter): Use the new arg.
+
+2026-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(natnum, keyword, command): Fix bootstrap warnings (bug#80732)
+
+	To break the interdependence between `cl-macs` and `cl-preloaded`,
+	we refrain from defining some types in `cl-macs` in some corner case
+	situations which affect only the early bootstrap.
+	`transient.el` is used during early bootstrap (while loading
+	`emoji.el` to produce `emoji-labels.el`) and it uses the
+	`keyword` and `command` types, so make sure they're not among
+	those types that are sometimes not defined.
+
+	Include `natnum` while we're at it, so the only types still
+	affected by this corner case are "Common Lisp" types, which are
+	less likely to be used during early bootstrap.
+
+	* lisp/emacs-lisp/cl-macs.el (natnum, keyword, command): Move type
+	declaration from here to...
+
+	* lisp/emacs-lisp/cl-preloaded.el (natnum, keyword, command): ...here.
+
+2026-04-08  Pip Cet  <pipcet@protonmail.com>
+
+	Avoid infinite recursion in bind-keys-form (bug#80759)
+
+	* lisp/bind-key.el (bind-keys-form): Always continue loop after
+	matching a keyword argument.
+
+2026-04-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/misc/tramp.texi (New operations): Extend example.
+
+2026-04-08  ewantown  <ewan@etown.dev>
+
+	Support 24-bit TrueColor on MS-Windows console
+
+	* src/w32console.c (DEFAULTP, SSPRINTF, w32con_write_vt_seq)
+	(w32con_get_cursor_coords): New functions and macros.
+	(w32con_write_glyphs): Hide cursor before writing to the console.
+	Add code for writing in virtual-terminal mode when
+	'w32_use_virtual_terminal' is non-zero.
+	(w32con_write_glyphs_with_face): Add code for writing in
+	virtual-terminal mode when 'w32_use_virtual_terminal' is non-zero.
+	(w32con_setup_virtual_terminal): New function.
+	(w32con_set_terminal_modes): Call it.
+	(turn_on_face, turn_off_face): New functions.
+	(initialize_w32_display): Save background and foreground, and the
+	current TTY.
+	(Fset_screen_color): Accept an additional optional argument VTP;
+	if non-nil, arrange for 24-bit display to use the specified
+	colors.
+	(Fget_screen_color): Accept an additional optional argument VTP;
+	if non-nil, return colors used by 24-bit display.
+	(Fw32_use_virtual_terminal, Fw32_use_virtual_terminal_p): New
+	functions.
+	* src/term.c (tty_setup_colors) [WINDOWSNT]: Set up
+	virtual-terminal sequences for colors.
+	(init_tty) [WINDOWSNT]: Set up terminfo capabilities for Windows
+	virtual-terminal.
+	* src/xdisp.c (redisplay_internal): Don't call set_tty_color_mode
+	for WINDOWSNT.
+
+	* lisp/term/w32console.el (w32-tty-set-base-colors)
+	(w32-tty-define-base-colors, w32-tty-define-8bit-colors)
+	(w32-tty-define-24bit-colors, w32-tty-get-pixel): New functions.
+	(terminal-init-w32console): Remove color setup.
+	(w32-tty-setup-colors): New function.
+	* lisp/term/tty-colors.el (tty-color-mode-alist): Add --color
+	modes for 256 and 24-bit color modes.
+	* lisp/startup.el (tty-handle-args): Fix --color handling.
+	* lisp/faces.el (tty-set-up-initial-frame-faces): Set up colors
+	for MS-Windows consoles.
+
+	* etc/NEWS:
+	* doc/emacs/msdos.texi (Windows Misc):
+	* doc/emacs/cmdargs.texi (Colors X): Document 24-bit color support
+	on MS-Windows.
+	(Bug#79298)
+
+2026-04-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'url-retrieve' and GnuTLS peer status
+
+	* doc/misc/url.texi (Retrieving URLs): Describe the ':peer' entry
+	of the STATUS argument passed to CALLBACK of 'url-retrieve'.
+
+	* lisp/url/url.el (url-retrieve):
+	* src/gnutls.c (Fgnutls_peer_status): Doc fixes.
+	(Bug#80762)
+
+2026-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Don't load `package` just for `lm-package-needs-footer-line`
+
+	* lisp/emacs-lisp/lisp-mnt.el (lm-package-requires):
+	Don't require `package`.
+
+2026-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/progmodes/project.el (generator): Don't require at run-time
+
+2026-04-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tweak remote-file-name-inhibit-cache in Tramp
+
+	* lisp/net/tramp-cache.el
+	(tramp-suppress-remote-file-name-inhibit-cache): New defsubst.
+
+	* lisp/net/tramp.el (tramp-skeleton-file-name-all-completions):
+	* lisp/net/tramp-sh.el (tramp-get-remote-path): Use it.
+
+2026-04-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-hg-working-revision: Return changeset hashes
+
+	* lisp/vc/vc-hg.el (vc-hg-working-revision): Return changeset
+	hashes instead of revision numbers.  Respect
+	vc-use-short-revision.
+	* etc/NEWS: Document the change.
+
+2026-04-06  Diep Pham  <diep@calif.io>  (tiny change)
+
+	Eglot: improve safety spec of eglot-workspace-configuration
+
+	* lisp/progmodes/eglot.el (eglot-workspace-configuration): Improve
+	safety spec.
+
+2026-04-06  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/lisp/net/tramp-tests.el (tramp-test21-file-links): Extend test.
+
+2026-04-06  Michael Albinus  <michael.albinus@gmx.de>
+
+	Keep cache in tramp-skeleton-file-name-all-completions
+
+	* lisp/net/tramp.el (tramp-skeleton-file-name-all-completions):
+	Don't expire cache for large directories.
+
+2026-04-06  Joseph Mingrone  <jrm@ftfl.ca>
+
+	lisp/net/tramp.el: Fix performance regression with completions
+
+	* lisp/net/tramp.el (tramp-skeleton-file-name-all-completions):
+	Use `file-directory-p' directly instead of calling `file-symlink-p'
+	and file-truename first.  Since `file-directory-p' already follows
+	symlinks, symlinked directories are handled correctly without the
+	extra indirection.
+
+2026-04-05  Philip Kaludercic  <philipk@posteo.net>
+
+	Disable 'package-review-policy' during package-tests
+
+	* test/lisp/emacs-lisp/package-tests.el (with-package-test):
+	Disable package reviewing during testing to not require manual
+	user input during tests.
+
+2026-04-05  Philip Kaludercic  <philipk@posteo.net>
+
+	Mention package version in 'package-autoremove' prompt
+
+	* lisp/emacs-lisp/package.el (package--removable-packages):
+	Return package descriptors instead of names.
+	(package-autoremove): Adapt code to handle package descriptors
+	instead of names.
+
+2026-04-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix vc-default-checkin-patch for vc-async-checkin non-nil
+
+	* lisp/vc/vc.el (vc-default-checkin-patch): Fix for
+	vc-async-checkin non-nil (bug#80746).
+
+2026-04-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc-dir.el (vc-dir-update): Remove empty directory entries.
+
+2026-04-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New option vc-dir-auto-hide-up-to-date
+
+	* lisp/vc/vc-dir.el (vc-dir-hide-up-to-date-on-revert): Delete.
+	(vc-dir-auto-hide-up-to-date): New option.
+	(vc-dir-update, vc-dir-revert-buffer-function): Use it.
+	* etc/NEWS: Document it.
+
+2026-04-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC-Dir next action: Offer to hide up-to-date items
+
+	* lisp/vc/vc-dir.el (vc-dir--up-to-date-states): New constant.
+	(vc-dir-hide-state): Use it.
+	(vc-dir--only-files-state-and-model): New function.
+	(vc-dir-root-next-action, vc-dir-deduce-fileset): Use it.
+	* lisp/vc/vc.el (vc-only-files-state-and-model): Improve error
+	message readability.
+
+2026-04-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/diff-mode.el (diff-mode-read-only-map): Bind 'v'.
+
+2026-04-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix display in window margins when text-area text is reordered
+
+	* src/xdisp.c (handle_stop_backwards): Don't overwrite
+	'stop_charpos' if we end up on a different stack level of the
+	iterator.  (Bug#80693)
+
+2026-04-05  Yuan Fu  <casouri@gmail.com>
+
+	Fix treesit-query-capture's NODE-ONLY param
+
+	Before the fix, if user uses the NODE-ONLY option, we don't keep
+	the capture names in the results, then predicates won't work
+	because they can't reference capture names.
+
+	* src/treesit.c (query_capture_remove_capture_name): New
+	function.
+	(Ftreesit_query_capture): Use the new function to remove capture
+	names AFTER running the predicate.
+	* test/src/treesit-tests.el:
+	(treesit-query-node-only-and-grouped): New test.
+
+2026-04-05  Kyle Meyer  <kyle@kyleam.com>
+
+	* etc/NEWS: Announce Org update.
+
+	Update to Org 9.8.1
+
+2026-04-04  Philip Kaludercic  <philipk@posteo.net>
+
+	List recursive dependencies in the package description
+
+	* lisp/emacs-lisp/package.el (describe-package-1): List and
+	indicate if a package will require a recursive dependency.
+
+2026-04-04  Philip Kaludercic  <philipk@posteo.net>
+
+	Recursively check dependencies for package compatibility
+
+	* lisp/emacs-lisp/package.el (package--compatible-packages): Add
+	new function.
+	(package-install): Use new function to restrict suggestions to
+	not include incompatible packages.
+	(package--incompatible-p): Check all dependencies to determine
+	package compatibility.
+	* etc/NEWS: Mention change.  (Bug#80695)
+
+2026-04-04  Philip Kaludercic  <philipk@posteo.net>
+
+	Adjust return format of 'package--dependencies'
+
+	* lisp/emacs-lisp/package.el (package--dependencies): Return
+	required dependency version along with every dependency.
+	(package-menu--list-to-prompt): Discard required versions.
+
+2026-04-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix use of special glyphs with faces from display-table
+
+	* src/xdisp.c (produce_special_glyphs): Fix the case where the
+	display-table specifies a face for truncation/continuation glyphs.
+	(Bug#80693)
+
+2026-04-04  Jens Lechtenbörger  <jens.lechtenboerger@fsfe.org>
+
+	Avoid line breaks in IMAP AUTHENTICATE PLAIN
+
+	* lisp/net/imap.el (imap-plain-auth): Avoid line breaks in
+	AUTHENTICATE PLAIN command (bug#80687).
+
+2026-04-04  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/net/tramp.el (tramp-expand-args): Handle ARGS being nil.
+
+2026-04-03  Stéphane Marks  <shipmints@gmail.com>
+
+	Inform macOS Accessibility Zoom of cursor position (bug#80624)
+
+	Enable cursor focus tracking for visually-impaired users that
+	rely on macOS Zoom screen magnification.
+
+	* src/nsterm.m: Import ApplicationServices.h.
+	(ns_ua_zoom_enabled_p, ns_cg_rect_flip_y, ns_UAZoomChangeFocus):
+	New static function.  Advise UAZoomChangeFocus of potentially
+	new cursor position.
+	(ns_update_end): Call ns_UAZoomChangeFocus.
+	(ns_draw_window_cursor): Cache the cursor position.
+	(applicationDidFinishLaunching): NSLog Accessibility API
+	permissions AXIsProcessTrusted.
+	(windowDidBecomeKey): Schedule a call to ns_UAZoomChangeFocus.
+	(deferred_UAZoomChangeFocus_handler): New view method to call
+	ns_UAZoomChangeFocus.
+	(accessibilityFrame): New view method to help UAZoomChangeFocus.
+	(initFrameFromEmacs): Initialize ns_UAZoom_cursor_rect_new and
+	ns_UAZoom_cursor_rect_old.
+	* etc/NEWS: Announce the change.
+
+2026-04-03  Stéphane Marks  <shipmints@gmail.com>
+
+	Support setopt-local in treesit--font-lock-level-setter (bug#80731)
+
+	* lisp/treesit.el (treesit--font-lock-level-setter): Add
+	buffer-local behavior as invoked by 'setopt-local'.
+
+2026-04-03  Yuan Fu  <casouri@gmail.com>
+
+	Filter out some range settings in markdown-ts-mode
+
+	* lisp/textmodes/markdown-ts-mode.el:
+	(markdown-ts--add-config-for-mode): Filter out functional queries.
+
+2026-04-03  Dmitry Gutov  <dmitry@gutov.dev>
+
+	grep-edit--prepare-buffer: Fix allowed insertion positions
+
+	* lisp/progmodes/grep.el (grep-edit--prepare-buffer): Fix allowed
+	insertion positions, like previously in xref-edit--prepare-buffer.
+
+2026-04-03  Dmitry Gutov  <dmitry@gutov.dev>
+
+	pgtk_set_window_size: Clear out unused code
+
+	* src/pgtkterm.c (pgtk_set_window_size): Remove unused code.
+	Rename the last two parameters to pixelwidth and pixelheight so
+	they can be used directly (bug#80698).  And remove the
+	xg_wm_set_size_hint call because it's called indirectly through
+	xg_frame_set_char_size already.
+	Update the commentary above.
+
+2026-04-03  Dmitry Gutov  <dmitry@gutov.dev>
+
+	xref-edit--prepare-buffer: Prohibit insertion before group headers too
+
+	* lisp/progmodes/xref.el (xref-edit--prepare-buffer): Do the
+	previous change for group headers as well (no insertion in front).
+
+2026-04-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/help.el (help-function-arglist): Fix last change
+
+	lisp/help.el (help-function-arglist): Handle advised aliases (bug#80725)
+
+2026-04-02  Stéphane Marks  <shipmints@gmail.com>
+
+	New macro setopt-local and function set-local (bug#80709)
+
+	'setopt-local' is the buffer local equivalent of 'setopt'.
+
+	Unify 'setopt', 'setopt-local', 'setq-local',
+	'buffer-local-set-state' with 'setq' to signal
+	'wrong-number-of-arguments'.
+
+	* lisp/cus-edit.el (setopt): Change error signal to
+	'wrong-number-of-arguments'.
+	(setopt-local): New macro.
+	(setopt--set-local): New function.
+	* lisp/subr.el (set-local): New function.
+	(setq-local, buffer-local-set-state): Signal
+	'wrong-number-of-arguments' rather than 'error'.
+	* doc/emacs/custom.texi (Examining): Document 'setopt-local'.
+	* etc/NEWS: Announce the new macro and function.
+
+2026-04-02  Roi Martin  <jroi.martin@gmail.com>
+
+	Assume wide chars may span any number of columns during semlf filling
+
+	* lisp/textmodes/fill.el (fill-region-as-paragraph-semlf): Use
+	`most-positive-fixnum' as the fill-column value during the unfill phase.
+
+2026-04-02  João Távora  <joaotavora@gmail.com>
+
+	Eglot: release version 1.23
+
+	* lisp/progmodes/eglot.el (Version): Bump to 1.23.
+
+	* etc/EGLOT-NEWS: Announce new version.
+
+2026-04-02  João Távora  <joaotavora@gmail.com>
+
+	Jsonrpc: release version 1.0.28
+
+	(Version): Bump to 1.0.28.
+
+2026-04-02  João Távora  <joaotavora@gmail.com>
+
+	Eglot: unbreak eglot-report-progress when set to 'messages' (bug#80653)
+
+	* lisp/progmodes/eglot.el (eglot-mode-line-progress): Fix cl-loop thinko.
+
+2026-04-01  João Távora  <joaotavora@gmail.com>
+
+	Eglot: release version 1.22
+
+	* lisp/progmodes/eglot.el (Version): Bump to 1.22.
+	(Package-Requires): Bump eldoc to 1.16.0, flymake to 1.4.5,
+	jsonrpc to 1.0.27, xref to 1.7.0.
+
+	* etc/EGLOT-NEWS: Announce new version.
+
+2026-04-01  João Távora  <joaotavora@gmail.com>
+
+	Eglot: revert part of last change
+
+	* lisp/progmodes/eglot.el (eglot--sig-info): Go back to adding
+	1, so it's clear that parlabel's are off-by-one.
+
+2026-04-01  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix last change
+
+2026-04-01  Michael Albinus  <michael.albinus@gmx.de>
+
+	Make epa-file-insert-file-contents more secure
+
+	* lisp/epa-file.el (epa-file-insert-file-contents):
+	Use `make-temp-file' instead of `make-temp-name'.
+
+2026-04-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	newcomers-presets: Set two more variables
+
+	* etc/themes/newcomers-presets-theme.el (newcomers-presets): Set
+	column-number-mode and compilation-scroll-output.  Suggested by
+	Abdulnafé Toulaïmat <abdulnafe.toulaimat@gmail.com>.
+
+2026-04-01  Tassilo Horn  <tsdh@gnu.org>
+
+	Fix text visibility issue with show-paren--show-context-in-overlay
+
+	* lisp/paren.el (show-paren--show-context-in-overlay): Fix issue where
+	the overlay's text was hardly visible in certain cases (bug#59527).
+
+2026-04-01  Dmitry Gutov  <dmitry@gutov.dev>
+
+	xref-edit--prepare-buffer: Fix text insertion behavior around prefix
+
+	* lisp/progmodes/xref.el (xref-edit--prepare-buffer): Fix text
+	insertion behavior before and after the line-number prefix.
+
+2026-04-01  Dmitry Gutov  <dmitry@gutov.dev>
+
+	xref-edit-mode: Compute 'occur-target' markers lazily
+
+	* lisp/progmodes/xref.el (xref-edit--before-change-function):
+	New function (bug#80616).
+	(xref-change-to-xref-edit-mode, xref-edit-save-changes):
+	Use it in before-change-functions hook.
+	(xref-edit--prepare-buffer): Don't add 'occur-target' here.
+
+2026-04-01  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Change "XREF" to "Xref" in mode lighter
+
+	* lisp/progmodes/xref.el (xref--xref-buffer-mode)
+	(xref--transient-buffer-mode, xref-edit-save-changes):
+	Change "XREF" to "Xref" for internal consistency.
+
+	* doc/emacs/maintaining.texi (Xref Commands):
+	Same.
+
+2026-04-01  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Add xref-edit-mode (bug#80616)
+
+	Based on the existing grep-edit-mode code.
+
+	* lisp/progmodes/xref.el (xref-edit--prepare-buffer): New function.
+	(xref-edit-mode-map, xref-edit-mode-hook): New variables.
+	(xref-edit-mode, xref-change-to-xref-edit-mode)
+	(xref-edit-save-changes): New functions.
+	(xref--xref-buffer-mode-map): New binding ("e").
+
+	* doc/emacs/maintaining.texi (Identifier Search):
+	Mention xref-change-to-xref-edit-mode.
+
+	* etc/NEWS: Describe the addition.
+
+2026-03-31  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/epa-file.el (epa-file-insert-file-contents): Fix last change.
+
+2026-03-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	python-tests.el: Fix test failures introduced by commit c1c08f3c9f6
+
+	* test/lisp/progmodes/python-tests.el (python-ts-mode-dotted-decorator-face-2)
+	(python-ts-mode-builtin-call-face)
+	(python-ts-mode-level-fontification-wo-interpolation)
+	(python-ts-mode-disabled-string-interpolation): Call `font-lock-ensure`
+	after setting a var that may flush the font-locking.
+
+2026-03-31  Michael Albinus  <michael.albinus@gmx.de>
+
+	Improve file name handler usage in epa-file.el
+
+	* lisp/epa-file.el (epa-file-insert-file-contents): Handle other
+	file name handlers.  (Bug#80641)
+
+2026-03-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(treesit--font-lock-level-setter): Work a bit more lazily
+
+	* lisp/treesit.el (treesit--font-lock-level-setter):
+	Use `font-lock-flush` (as discused in bug#80626).
+	(treesit-font-lock-fontify-region): Simplify a bit.
+
+2026-03-30  Michael Albinus  <michael.albinus@gmx.de>
+
+	Allow format specifiers in `tramp-login-program'
+
+	* doc/misc/tramp.texi (Extension packages): Explain how to use own
+	format specifiers.
+
+	* lisp/net/tramp.el (tramp-expand-args): Make DEFAULT argument
+	optional.  Handle also ARGS being an atom.
+	(tramp-handle-make-process):
+	* lisp/net/tramp-container.el (tramp-skeleton-completion-function):
+	* lisp/net/tramp-sh.el (tramp-ssh-or-plink-options)
+	(tramp-maybe-open-connection):
+	* lisp/net/tramp-sshfs.el (tramp-sshfs-handle-process-file):
+	Call `tramp-expand-args' for `tramp-login-program'.
+
+2026-03-28  Ulrich Müller  <ulm@gentoo.org>
+
+	Fix typos in char-acronym-table
+
+	* lisp/international/characters.el (c0-acronyms): Fix #x1c "FS".
+	(c1-acronyms): Fix #x8d "RI", #x8f "SS3", and #x9a "SCI".
+	Leave #x99 alone because standards use both "SGCI" and "SGC".
+
+2026-03-28  Richard Lawrence  <rwl@recursewithless.net>
+
+	Update gnus-icalendar to use new iCalendar library
+
+	This change updates gnus-icalendar.el to use the new iCalendar
+	library instead of obsolete functions from icalendar.el.
+	* lisp/gnus/gnus-icalendar.el
+	(gnus-icalendar-event)
+	(gnus-icalendar-event:recurring-p)
+	(gnus-icalendar-event:recurring-interval)
+	(gnus-icalendar-event:recurring-days)
+	(gnus-icalendar-event--find-attendee)
+	(gnus-icalendar-event-from-ical)
+	(gnus-icalendar-event-from-buffer)
+	(gnus-icalendar-event--build-reply)
+	(gnus-icalendar-event-reply-from-buffer)
+	(gnus-icalendar-event:org-repeat): Reimplement using new iCalendar functions.
+	(gnus-icalendar-event--attendees-by-type): Rename from
+	`gnus-icalendar-event--get-attendee-names'.
+	(gnus-icalendar-event--build-reply): Rename from
+	`gnus-icalendar-event--build-reply-event-body'.
+	(gnus-icalendar--format-participant-list): Expect list of
+	`icalendar-attendee's.  Add docstring.
+	(Bug#80426)
+
+	* test/lisp/gnus/gnus-icalendar-tests.el: Update tests.
+
+2026-03-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Better support for anonymous faces in Enriched Text mode
+
+	* lisp/textmodes/enriched.el (enriched-face-ans): Support
+	:underline, :weight, and :slant in anonymous faces.  Suggested by
+	Madhu <enometh@meer.net>.
+
+2026-03-28  Adam Sjøgren  <asjo@koldfront.dk>  (tiny change)
+
+	Gnus: Accept date and time when specifying delay of a new article
+
+	* lisp/gnus/gnus-delay.el (gnus-delay-article): Accept YYYY-MM-DD
+	hh:mm(:ss) as a valid format.  (Bug#80637)
+
+2026-03-28  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix tramp-smb-handle-copy-file
+
+	* lisp/net/tramp-smb.el (tramp-smb-handle-copy-file):
+	Suppress `jka-compr-handler'.  Reported by Seppo Ronkainen
+	<sodr80@protonmail.com>.  (Bug#80667)
+
+2026-03-28  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix file-name-all-completions for symlinked directories in Tramp
+
+	* lisp/net/tramp.el (tramp-skeleton-file-name-all-completions):
+	* lisp/net/tramp-adb.el (tramp-adb-handle-file-name-all-completions):
+	* lisp/net/tramp-crypt.el (tramp-crypt-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):
+	* lisp/net/tramp-sh.el (tramp-sh-handle-file-name-all-completions):
+	* lisp/net/tramp-smb.el (tramp-smb-handle-file-name-all-completions):
+	* lisp/net/tramp-sudoedit.el
+	(tramp-sudoedit-handle-file-name-all-completions): Simplify.
+	* test/lisp/net/tramp-tests.el (tramp-test32-shell-command): Adapt
+	test.
+
+	* lisp/net/tramp-ftp.el (tramp-disable-ange-ftp): Use `seq-difference'.
+
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-monitor-process-filter):
+	Use `thread-last'.
+
+	* lisp/net/tramp-sh.el (tramp-sh-handle-insert-directory):
+	Use `seq-difference'.
+	(tramp-sh-gio-monitor-process-filter): Use `thread-last'.
+
+	* lisp/net/tramp-smb.el (tramp-smb-get-file-entries): Do not add
+	virtual entry ""; it isn't needed anymore.
+
+	* lisp/net/tramp.el (tramp-make-tramp-hop-name): Use `thread-last'.
+	(tramp-completion-handle-file-directory-p): Use `tramp-prefix-format'.
+	(tramp-fnac-add-trailing-slash): New defvar.
+	(tramp-skeleton-file-name-all-completions): Handle also symlinked
+	directories.
+	(tramp-skeleton-directory-files): Use `tramp-fnac-add-trailing-slash'.
+	(tramp-handle-file-name-completion): Use `seq-difference'.
+	(tramp-handle-make-process): Handle "%w" format specifier.
+
+	* test/lisp/net/tramp-tests.el (tramp-test26-file-name-completion)
+	(tramp-test32-shell-command, tramp-test36-vc-registered): Adapt tests.
+
+2026-03-27  Emil Ingelman Sahlén  <shadewind@gmail.com>  (tiny change)
+
+	Fix recombination of side windows (Bug#80665)
+
+	* lisp/window.el (window--make-major-side-window): Protect the
+	sibling (the main-window group) from recombination.  Without
+	this, deleting a side window can flatten the group into the
+	root, causing subsequent side windows on other sides to be
+	placed incorrectly (Bug#80665).
+
+2026-03-27  Stephen Berman  <stephen.berman@gmx.net>
+
+	Implement new Dired handling of errors from 'ls'
+
+	The error messages are now displayed in a popped up buffer instead
+	of being output in the Dired buffer and signalling an error.  The
+	file name bounds in Dired entries are now determined solely by the
+	offsets calculated by 'ls' with the --dired option and
+	consequently Dired now reliably recognizes file names that contain
+	a newline (bug#80499).
+
+	* etc/NEWS: Announce new Dired handling of errors from 'ls'.
+
+	* lisp/dired.el (dired-internal-noselect): Check Dired buffer for
+	file entries and if there are none kill the buffer to prevent
+	displaying a Dired buffer with no file entries.
+	(dired--ls-error-buffer): New variable.
+	(dired--display-ls-error): New function.
+	(dired, dired-other-window, dired-other-frame, dired-other-tab):
+	Use it to pop up buffer with error message emitted by 'ls'.
+
+	* lisp/files.el (insert-directory-clean): Remove the code that
+	treats lines beginning at column 0 in a Dired buffer as error
+	lines and consequently also remove the code using these lines to
+	adjust the offsets specifying the bounds of the file name in the
+	Dired entries.  If the buffer contains a //DIRED-OPTIONS// line
+	output by --dired, delete this line even when it is at BOB.
+	(insert-directory): Remove the code that checks the return value
+	of 'ls' and signals an error based on that value.  Write any error
+	message emitted by 'ls' to a temporary file and insert its content
+	into a buffer, which will be popped when invoking a Dired command
+	results in the 'ls' error.  Adjust the comment above this function
+	to accommodate file names containing a newline in Dired entries.
+	(insert-directory-adj-pos): Remove this now unused function.
+
+	* test/lisp/dired-tests.el (dired-test-filename-with-newline-1)
+	(dired-test-filename-with-newline-2)
+	(dired-test-ls-error-message): New tests.
+
+	* test/lisp/files-tests.el
+	(files-tests-file-name-non-special-insert-directory): Adjust test
+	to use of 'ls' error buffer instead of signaling an error.
+
+2026-03-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(c++-ts-mode): Fix bug#80682
+
+	* lisp/progmodes/c-ts-mode.el (c++-ts-mode): Set
+	`editorconfig-indent-size-vars` since it can't be guessed.
+
+2026-03-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(kmacro-end-call-mouse): Make obsolete
+
+	* lisp/kmacro.el (kmacro-end-and-call-macro): Add EVENT argument.
+	(kmacro-end-call-mouse): Define as obsolete alias
+	of `kmacro-end-and-call-macro`.
+
+2026-03-27  Philip Kaludercic  <philipk@posteo.net>
+
+	Elaborate the motivation for the "newcomers-presets" theme
+
+2026-03-27  YugaEgo  <yet@ego.team>
+
+	* lisp/textmodes/css-mode.el (css-pseudo-class-ids): Add 'has' (bug#80664).
+
+2026-03-26  Basil L. Contovounesios  <basil@contovou.net>
+
+	Add predicate for initial_terminal
+
+	This introduces the predicate frame-initial-p, which uses
+	struct frame.output_method or struct terminal.type to detect
+	initial_terminal without relying on its name (bug#80629).
+	For some prior discussion, see:
+	https://lists.gnu.org/r/emacs-devel/2019-12/msg00480.html
+	https://lists.gnu.org/r/emacs-devel/2020-01/msg00120.html
+
+	* doc/lispref/frames.texi (Frames): Document frame-initial-p.
+	(Finding All Frames): Fix grammar.
+	* etc/NEWS (Lisp Changes in Emacs 31.1): Announce frame-initial-p.
+	* lisp/desktop.el (desktop--check-dont-save):
+	* lisp/emacs-lisp/debug.el (debug):
+	* lisp/frameset.el (frameset-restore):
+	* lisp/menu-bar.el (menu-bar-update-buffers):
+	* lisp/xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal):
+	Use frame-initial-p instead of checking the "initial_terminal" name.
+	* lisp/emacs-lisp/byte-opt.el: Mark frame-initial-p as error-free.
+
+	* src/pgtkterm.c (pgtk_focus_changed): Use IS_DAEMON in place of
+	Fdaemonp, thus also accepting a named daemon session.
+	* src/terminal.c (decode_tty_terminal): Clarify commentary.
+	(Fframe_initial_p): New function.
+	(syms_of_terminal): Expose it.
+	(init_initial_terminal): Update commentary now that
+	menu-bar-update-buffers uses frame-initial-p (bug#53740).
+
+	* test/lisp/xt-mouse-tests.el (with-xterm-mouse-mode): Simulate the
+	lack of an initial terminal by overriding frame-initial-p now
+	that turn-on-xterm-mouse-tracking-on-terminal uses it.
+	* test/src/terminal-tests.el: New file.
+
+2026-03-26  Basil L. Contovounesios  <basil@contovou.net>
+
+	Simplify some struct frame.output_method checks
+
+	* src/lisp.h (inhibit_window_system): Fix typo in commentary.
+	* src/dispnew.c (Fopen_termscript):
+	(init_display_interactive) [!HAVE_ANDROID, !MSDOS]:
+	* src/dosfns.c [MSDOS] (dos_cleanup):
+	* src/frame.c (frame_inhibit_resize, frame_windows_min_size)
+	(do_switch_frame, delete_frame):
+	(make_terminal_frame) [MSDOS]:
+	(Fmake_terminal_frame) [MSDOS, WINDOWSNT]:
+	* src/keyboard.c (read_decoded_event_from_main_queue) [!WINDOWSNT]:
+	(Fcurrent_input_mode):
+	* src/menu.c (single_menu_item):
+	* src/msdos.c [MSDOS] (internal_terminal_init):
+	* src/sysdep.c (init_sys_modes):
+	* src/term.c: [HAVE_GPM] (Fgpm_mouse_start, Fgpm_mouse_stop):
+	[MSDOS] (tty_free_frame_resources):
+	* src/w32xfns.c (get_frame_dc):
+	* src/xdisp.c (clear_garbaged_frames, hscroll_window_tree)
+	(redisplay_internal):
+	* src/xfaces.c (Fdisplay_supports_face_attributes_p)
+	(realize_default_face, realize_face, realize_tty_face): Use
+	is_tty_frame, FRAME_INITIAL_P, FRAME_MSDOS_P, FRAME_TERMCAP_P,
+	FRAME_W32_P, and FRAME_TTY as appropriate instead of open-coding
+	them (bug#80629).
+
+2026-03-26  Basil L. Contovounesios  <basil@contovou.net>
+
+	Improve last change to auth-source-pass
+
+	* lisp/auth-source-pass.el (auth-source-pass-search): Remove
+	redundant expand-file-name.
+	* test/lisp/auth-source-pass-tests.el
+	(auth-source-pass--with-store): Bind auth-source-pass-filename to an
+	existing directory to satisfy the new guard in
+	auth-source-pass-search (bug#76323).
+
+2026-03-26  Naofumi Yasufuku  <naofumi@yasufuku.dev>  (tiny change)
+
+	Don't error on nonexistent ~/.password-store
+
+	* lisp/auth-source-pass.el (auth-source-pass-search):
+	If auth-source-pass-filename is not a directory, just do nothing to
+	avoid repeated errors raised by directory-files-recursively in
+	auth-source-pass-entries which is called for each search pattern.
+	(Bug#76323)
+
+2026-03-25  Jens Schmidt  <jschmidt4gnu@vodafonemail.de>
+
+	Split up shortdoc functions and groups, fix their format
+
+	Move shortdoc group definitions from shortdoc.el to a separate file
+	shortdoc-doc.el.  Document shortdoc group format in a future-proof way
+	and guide package authors on how to use shortdoc groups across past
+	Emacs versions.
+
+	* lisp/emacs-lisp/shortdoc-doc.el: New file.
+	* lisp/emacs-lisp/shortdoc.el: Document shortdoc group format in a
+	future-proof way.  Require 'shortdoc-doc'.
+	(shortdoc--keyword-plist-p): New function.
+	(shortdoc--check): Update to check the documented shortdoc group format.
+	(shortdoc--groups, define-short-documentation-group): Pull out of
+	autoloaded 'progn'.
+	(define-short-documentation-group): Report errors in terms of byte
+	compiler warnings.
+	(alist, map, string, file-name, file, hash-table, list, symbol)
+	(comparison, vector, regexp, sequence, buffer, overlay, process, number)
+	(text-properties, keymaps): Move group to shortdoc-doc.el.
+	(shortdoc): Move alias to after function.
+	(shortdoc-add-function): Add argument checks.
+	* doc/lispref/tips.texi (Documentation Group Tips): New section.
+	* doc/lispref/elisp.texi (Top):
+	* doc/lispref/tips.texi (Tips): Add references to it.
+	* doc/lispref/help.texi (Documentation Groups): Ditto, and add some
+	concept index entries.  (bug#80297)
+
+2026-03-25  Stephen Berman  <stephen.berman@gmx.net>
+
+	Fix Dired check for newlines in file names
+
+	Ensure that Dired does not treat the sequence "\\n" within a file
+	name as a newline (bug#80608).
+
+	* lisp/dired.el (dired--filename-with-newline-p): Rewrite using
+	'directory-files' with match for regexp "\n".
+
+	* test/lisp/dired-tests.el
+	(dired-test--filename-with-backslash-n): New function.
+	(dired-test-filename-with-backslash-n): New test.
+
+2026-03-25  Pip Cet  <pipcet@protonmail.com>
+
+	Allow retrieving scheduler information in seccomp (bug#80656)
+
+	* lib-src/seccomp-filter.c (main): Add rules for 'sched_getscheduler'
+	and 'sched_getaffinity'.
+
+2026-03-25  Basil L. Contovounesios  <basil@contovou.net>
+
+	Give compile-command a :group again
+
+	Like the commit of 2022-07-31
+	"Fix further package.el loaddefs byte-compile warnings"
+	this pacifies the warning that compile-command fails to specify
+	a containing group when byte-compiling loaddefs.el (bug#80648).
+
+	* lisp/progmodes/compile.el (compile-command): Restore explicit
+	custom :group on autoloaded user option.
+
+2026-03-25  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix "File->Open Directory" menu item after 'ffap-bindings'
+
+	* lisp/dired.el (dired-from-menubar): New function.
+	* lisp/menu-bar.el (menu-bar-file-menu): Use it in the "Open
+	Directory" menu item, instead of calling Dired directly.  This
+	ensures we show the correct GUI dialog even if some package remaps
+	'dired' to something else (like 'ffap-bindings' does).
+	(Bug#80545)
+
+2026-03-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	minibuffer.el: De-iconify a `*Completions*` frame only for eager display
+
+	* lisp/minibuffer.el (completions--after-change)
+	(minibuffer--completions-visible): Don't consider an iconified
+	frame as visible.
+
+2026-03-24  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+
+	Check all SES local variables are always set locally.
+
+	Rename ses tests with prefix ses-tests-...
+
+2026-03-24  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+
+	Fix SES tests indentation.
+
+	* test/lisp/ses-tests.el (ses-jump-B2-lowcase)
+	(ses-jump-B2-lowcase-keys): Fix indentation.
+
+2026-03-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid segfaults in 'bidi_mirror_char' during startup
+
+	* src/bidi.c (bidi_mirror_char): Make sure 'bidi_mirror_table' is
+	initialized before accessing it.  (Bug#80668)
+
+2026-03-24  F. Jason Park  <jp@neverwas.me>
+
+	Add tests for erc-track-faces-normal-list regression
+
+	* test/lisp/erc/erc-track-tests.el
+	(erc-track-tests--modified-channels/baseline): Update assertion to
+	expect an unchanged mode line segment if `erc-track-faces-normal-list'
+	lacks a ranked face in the latest inserted message.
+	(erc-track-modified-channels/baseline/nonotice)
+	(erc-track-modified-channels/priority-only-all/baseline/nonotice): New
+	tests.  (Bug#80659)
+
+2026-03-24  Ivan  <iv@ivanrg.es>  (tiny change)
+
+	Fix erc-track-faces-normal-list regression
+
+	* lisp/erc/erc-track.el (erc-track--select-mode-line-face): Check
+	whether ranked faces in the message appear in the value of the option
+	`erc-track-faces-normal-list' rather than repeatedly checking if the
+	current nominee does, usually the highest ranked face in the message.
+	Failure to do so caused ERC to treat faces absent from the option's
+	value as being present and thus eligible to replace ranked faces in the
+	mode line segment.  This bug was introduced in ERC 5.6 and is also part
+	of 5.6.1.  (Bug#80659)
+
+2026-03-24  F. Jason Park  <jp@neverwas.me>
+
+	Avoid nested erc-display-message in alert utility
+
+	* lisp/erc/erc.el (erc--warn-once-before-connect): Don't call
+	`erc-display-message' from insertion hooks because doing so places an
+	unnecessary burden on the caller to preserve the insertion marker and
+	"msg prop" environment.
+
+2026-03-23  Basil L. Contovounesios  <basil@contovou.net>
+
+	Fix recent whitespace.el changes
+
+	* etc/NEWS
+	(Changes in Specialized Modes and Packages in Emacs 31.1):
+	Announce new user option whitespace-global-mode-buffers (bug#79230).
+	* lisp/whitespace.el (whitespace-global-modes): Improve docstring
+	grammar.
+	(whitespace-global-mode-buffers): Make default value match *scratch*
+	exactly for backward compatibility.  Fix custom :type.
+	(whitespace-enable-predicate): Prefer any over seq-find.
+
+2026-03-22  Pip Cet  <pipcet@protonmail.com>
+
+	Delay initializing 'compile-command' to runtime (bug#80648)
+
+	* lisp/progmodes/compile.el (compile-command): Use
+	'custom-initialize-delay'.
+
+2026-03-22  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/subr.el (member-if): Fix compiler macro multiple evaluation.
+
+	Problem reported by Pip Cet <pipcet@protonmail.com>.
+
+2026-03-22  Daniel Mendler  <mail@daniel-mendler.de>
+
+	(dabbrev-completion): Improve last fix for bug#80645
+
+	* lisp/dabbrev.el (dabbrev-completion): Signal the error that
+	`dabbrev-capf` doesn't signal any more.
+
+2026-03-22  Helmut Eller  <eller.helmut@gmail.com>
+
+	Staticpro executing_kbd_macro
+
+	* src/macros.c (syms_of_macros): Staticpro executing_kbd_macro.
+	(executing_kbd_macro): Update comment.
+	* src/macros.h (executing_kbd_macro): Remove redundant comment.
+
+2026-03-22  Basil L. Contovounesios  <basil@contovou.net>
+
+	Fix no-focus-on-map on X without GTK
+
+	* src/xterm.c [!USE_GTK] (x_update_frame_user_time_window): When
+	replacing _NET_WM_USER_TIME with a new _NET_WM_USER_TIME_WINDOW and
+	the frame has requested no-focus-on-map, ensure _NET_WM_USER_TIME is
+	zero also on the new _NET_WM_USER_TIME_WINDOW.
+	(x_make_frame_visible) [!USE_GTK]: Don't overwrite _NET_WM_USER_TIME
+	before mapping a frame that has requested no-focus-on-map, and whose
+	_NET_WM_USER_TIME should thus remain zero (bug#80525).
+
+2026-03-22  Guilherme de Almeida Suckevicz  <guito.linux@gmail.com>  (tiny change)
+
+	Fix wrong type argument error in 'find-file-read-only-other-tab' (Bug#80630)
+
+	* lisp/tab-bar.el (find-file-read-only-other-tab): Pass the
+	function 'find-file-other-tab' directly to
+	'find-file--read-only' (Bug#80630).
+
+2026-03-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(dabbrev-capf): Fix bug#80645.
+
+	* lisp/dabbrev.el (dabbrev-capf): Return an empty table rather than
+	signaling an error when there are no completions.
+	The completion UI already takes care of emitting a message like
+	"No match".
+
+2026-03-21  Helmut Eller  <eller.helmut@gmail.com>
+
+	* test/src/charset-tests.el (charset-tests-define-charset): New.
+
+2026-03-21  Helmut Eller  <eller.helmut@gmail.com>
+
+	Use signed ints in struct charset_table
+
+	* src/charset.h (struct charset_table): Make the slots size and used
+	signed.
+	(charset_attributes_getter): Fix spacing.
+
+2026-03-21  Helmut Eller  <eller.helmut@gmail.com>
+
+	* src/charset.c (Fdefine_charset_internal): Fix memory leak.
+
+	* src/charset.c (shrink_charset_table): Simplify.
+
+2026-03-21  Helmut Eller  <eller.helmut@gmail.com>
+
+	Introduce a struct charset_table
+
+	The fields of the new struct are what the global variables
+	charset_table, charset_table_size, charset_table_used, and
+	charset_attributes_table used to be.  The struct should make it clearer
+	that those fields must be kept in sync.
+
+	* src/charset.h (struct charset_table): New struct.
+	(charset_attributes_getter): Adjust accordingly.
+	* src/charset.c (charset_table): Change type to struct charset_table.
+	(charset_table_size, charset_table_used, charset_attributes_table):
+	Moved to the struct.
+	(Fdefine_charset_internal, Ffind_charset_region, Ffind_charset_string)
+	(shrink_charset_table, syms_of_charset): Adjust to struct charset_table.
+	* src/pdumper.c (dump_charset, dump_charset_table): Adjust to struct
+	charset_table.
+
+2026-03-21  Helmut Eller  <eller.helmut@gmail.com>
+
+	* src/charset.h (charset_attributes_getter): Add assertion.
+
+2026-03-21  Helmut Eller  <eller.helmut@gmail.com>
+
+	Remove the charset_table_init array
+
+	Determining the best size for a static array seems difficult; so
+	allocate it dynamically.
+
+	* src/charset.c (CHARSET_TABLE_INIT_SIZE): New constant.
+	(syms_of_charset): Malloc charset_table here.
+	(charset_table_init): Removed.
+	(shrink_charset_table): New function.
+	(Fclear_charset_maps): Call it.
+	* src/charset.h (charset_table_init): Removed.
+	(charset_attributes_getter): Add an assertion.
+	* src/pdumper.c (dump_charset_table): Assert that charset_table_size ==
+	charset_table_used.
+
+2026-03-21  Helmut Eller  <eller.helmut@gmail.com>
+
+	Move the attribute field of charsets to a separate vector
+
+	This simplifies the GC code, as this was the only field in the charset
+	struct that referenced the GC heap.  Without it, we no longer need to
+	trace the charset_table.
+
+	* src/charset.h (struct charset.attributes): Removed.
+	(charset_attributes_getter): New helper.
+	(CHARSET_ATTRIBUTES): Use it.
+	* src/charset.c (charset_attributes_table): New.
+	(Fdefine_charset_internal): Place attrs in charset_attributes_table.
+	(syms_of_charset): Initialize charset_attributes_table.
+	(mark_charset): Deleted.
+	* src/pdumper.c (dump_charset): Skip attributes field.
+	* src/lisp.h (mark_charset): Deleted.
+	* src/alloc.c (garbage_collect): mark_charset no longer needed.
+
+2026-03-21  Basil L. Contovounesios  <basil@contovou.net>
+
+	Make member-if compiler-macro hygienic
+
+	* lisp/subr.el (member-if): Use uninterned symbol in
+	compiler-macro (bug#80647).
+
+2026-03-21  Stéphane Marks  <shipmints@gmail.com>
+
+	vtable truncate-string-pixelwise, ellipsis can be a string (bug#80026)
+
+	Eliminate 'vtable--limit-string' in favor of the more efficient
+	'truncate-string-pixelwise'.  Remove extraneous pre-measurement
+	calls to 'string-pixel-width' and ellipsis concatenation as
+	'truncate-string-pixelwise' does both.
+	The 'make-vtable' 'ellipsis' keyword can be a string to override
+	the default returned by 'truncate-string-ellipsis'.
+
+	* lisp/emacs-lisp/vtable.el (vtable--ellipsis): New defun.
+	(vtable-insert-object, vtable--insert): Use 'vtable--ellipsis'.
+	(vtable--insert-line, vtable--insert-header-line): Call
+	'truncate-string-pixelwise' instead of 'vtable--limit-string'.
+	(vtable--limit-string): Remove function.
+
+	* test/lisp/emacs-lisp/vtable-tests.el
+	(test-vtable--limit-string-with-face-remapped-buffer): Remove
+	test, obsoleted by misc-test-truncate-string-pixelwise.
+
+	* doc/misc/vtable.texi: Document that :ellipsis can be a string.
+
+2026-03-21  Jeff Valk  <jv@jeffvalk.com>  (tiny change)
+
+	Ensure correct expansion in 'find-sibling-file-search'
+
+	* lisp/files.el (find-sibling-file-search): Following expansion
+	of each EXPANSION, advance the search start position to reflect
+	the actual length of the expanded text (the updated string), not
+	the length of the "\\([&0-9]+\\)" (the string before expansion).
+	(Bug#80636)
+
+2026-03-21  Tassilo Horn  <tsdh@gnu.org>
+
+	Fix wrong-type-argument error in package-upgrade
+
+	* lisp/emacs-lisp/package.el (package-upgrade): Fix wrong-type-argument
+	error when upgrading a builtin package (bug#80633).
+
+2026-03-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	simple-tests.el: Use `kmacro` function
+
+	* test/lisp/simple-tests.el (undo-test-kill-c-a-then-undo)
+	(undo-test-point-after-forward-kill): Use `kmacro` function.
+
+2026-03-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cursor-sensor.el: Partial fix for bug#80255
+
+	This provides limited support for window-specific overlay properties.
+	To complete it, we still need to add support for it to
+	`next/previous-single-char-property-change`.
+
+	* lisp/emacs-lisp/cursor-sensor.el (cursor-sensor--intangible-p):
+	Add `window` argument.
+	(cursor-sensor-tangible-pos, cursor-sensor--detect):
+	Pass `window` argument to the functions
+	looking for overlay properties.
+
+2026-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(Fmakunbound): Break aliasing, if present (bug#80538)
+
+	* src/data.c (Fmakunbound): Break aliasing, if present.
+	* doc/lispref/variables.texi (Void Variables): Document it.
+
+2026-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	diff-mode.el: Don't recompute the position of Git preamble/footer
+
+	On some profiles (after disabling syntax and refined
+	fontification), this was taking >90% of the time to fontify a buffer.
+
+	* lisp/vc/diff-mode.el (diff--git-preamble-overlay)
+	(diff--git-footer-overlay): New variables.
+	(diff--git-preamble-end, diff--git-footer-start): Use them to cache
+	the result.
+
+2026-03-19  Ihor Radchenko  <yantar92@posteo.net>
+
+	New option to enable global-whitespace-mode in special-buffers (bug#79230)
+
+	* lisp/whitespace.el (whitespace-global-mode-buffers): New custom
+	option.
+	(whitespace-enable-predicate): Use it.
+	(whitespace-global-modes): Refer to the new option.
+
+2026-03-19  Elias Gabriel Perez  <eg642616@gmail.com>
+
+	hideshow: Fix 'hs-hide-block-behavior' set to 'after-cursor'.
+
+	Bug#80455.
+
+	* etc/NEWS: Document changed behavior.
+
+	* lisp/progmodes/hideshow.el (hs-get-near-block): Remove
+	'forward-line'.
+	(hs-hide-block-behavior): Update docstring.
+
+	* doc/emacs/programs.texi (Hideshow): Update.
+
+	Suggested-by: Dima Kogan <dima@secretsauce.net>
+
+2026-03-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix "make install-nt" in parallel builds
+
+	* Makefile.in (install-nt): Add order-only dependency on $(NTDIR).
+	Suggested by Joel Reicher <joel.reicher@gmail.com>.  (Bug#80470)
+
+2026-03-19  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: New minor mode 'hs-indentation-mode'. (Bug#80179)
+
+	This minor mode configures hs-minor-mode to use
+	indentation-based folding.
+
+	* lisp/progmodes/hideshow.el (hs-hideable-block-p): New
+	function.
+	(hs-indentation-respect-end-block): New option.
+	(hs-indentation--store-vars): New variable.
+	(hs-cycle-filter, hs-get-first-block-on-line, hs-get-near-block)
+	(hs-find-block-beg-fn--default): Adapt code to use
+	'hs-hideable-block-p'.
+	(hs-block-positions): Update.
+	(hs-indentation-mode): New minor mode.
+
+	* doc/emacs/programs.texi (Hideshow): Update documentation.
+
+	* etc/NEWS: Announce changes
+
+	* test/lisp/progmodes/hideshow-tests.el: Add 'require'.
+	(hideshow-check-indentation-folding): New test.
+
+2026-03-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/progmodes/elisp-mode.el (elisp--local-macroenv): Add `static-if`
+
+2026-03-18  Stéphane Marks  <shipmints@gmail.com>
+
+	Kick the event loop in NS drag and drop (bug#80592)
+
+	Eliminate an annoying event-loop delay after dropping into an
+	Emacs window.
+
+	* src/nsterm.m: ([EmacsView performDragOperation:]): Kick the
+	event loop after posting the DRAG_N_DROP_EVENT.
+
+2026-03-17  Michael R. Mauger  <michael@mauger.com>
+
+	Window handling bug fixes.
+
+	* lisp/play/zone.el: (zone--build-zone-buffer): select window.
+	(zone--prepare-frames): Avoid dedicated windows.
+
+2026-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(delete-selection-repeat-replace-region): Partial fix for bug#80216
+
+	* lisp/delsel.el (delete-selection-repeat-replace-region): Clarify the
+	need for `delete-selection-save-to-register`.
+
+2026-03-17  Tassilo Horn  <tsdh@gnu.org>
+
+	Further improve blink-matching-paren-highlight-offscreen
+
+	* lisp/simple.el (blink-matching-paren-offscreen): Inherit from
+	show-paren-match face.
+	(blink-paren-open-paren-line-string): Add blink-matching-paren-offscreen
+	face properties to opening paren instead of replacing original
+	fontification.
+	* lisp/paren.el (show-paren-context-when-offscreen): Mention
+	blink-matching-paren-highlight-offscreen in docstring.
+
+2026-03-16  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Assign bit gravity to window in Lucid and Motif ports too
+
+	* src/widget.c (EmacsFrameRealize): Assign bit_gravity, and use
+	the value of NorthWestGravity which matches the GTK3 behavior,
+	and the general intuition that window's contents should move
+	with its top-left corner.  The result is that the frame is not
+	blinking during resizing (bug#80369).
+
+	* src/xfns.c (x_window) [!USE_X_TOOLKIT]: Change bit_gravity from
+	StaticGravity to NorthWestGravity as well, to match the others.
+
+2026-03-16  Pip Cet  <pipcet@protonmail.com>
+
+	Count characters correctly in 'str_as_multibyte'
+
+	* src/character.c (str_as_multibyte): Increment CHARS for each
+	character produced, not just once.
+
+2026-03-16  Basil L. Contovounesios  <basil@contovou.net>
+
+	Remove more regex macros from src/conf_post.h
+
+	Further to bug#80428, they are no longer used since commit of
+	2018-08-05 "Simplify regex-emacs code by assuming Emacs".
+	Suggested by Pip Cet <pipcet@protonmail.com>.
+
+	* src/conf_post.h [emacs] (RE_TRANSLATE_TYPE): Remove;
+	no longer used except under lib-src.
+	[emacs] (RE_TRANSLATE): Remove; redefined in src/regex-emacs.c.
+
+2026-03-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/emacs-lisp/shortdoc.el (list): Fix `ensure-proper-list' examples.
+
+2026-03-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	Use consistent alias name in tramp-compat.el
+
+	* lisp/net/tramp-compat.el (tramp-compat-error-type-p):
+	Rename from `tramp-error-type-p'.
+
+2026-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/startup.el (command-line): Simplify with `error-message-string`
+
+	Suggested by Basil L. Contovounesios <basil@contovou.net>.
+
+2026-03-15  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Set frame-inhibit-implied-resize in newcomers-presets
+
+	* etc/themes/newcomers-presets-theme.el (newcomers-presets): Set
+	frame-inhibit-implied-resize as suggested by Martin Rudalics.
+
+2026-03-15  Philip Kaludercic  <philipk@posteo.net>
+
+	Add new function 'ensure-proper-list' (bug#80598)
+
+	* doc/lispref/lists.texi (Building Lists): Document it.
+	* etc/NEWS: Mention it.
+	* lisp/emacs-lisp/shortdoc.el (list): Demonstrate it.
+	* lisp/subr.el (ensure-proper-list): Add it.
+
+2026-03-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid segfaults in TTY menu-item selection
+
+	* src/term.c (tty_menu_show): Don't allow "selection" of items in
+	a bogus menu.  (Bug#80603)
+
+2026-03-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid another assertion violation in TTY menus
+
+	* src/term.c (tty_menu_show): Reject bogus menus whose 'menu_items'
+	is nil.  (Bug#80603)
+
+2026-03-14  Philip Kaludercic  <philipk@posteo.net>
+
+	Add references to "User Lisp" Info node where applicable
+
+	* etc/NEWS: Update 'package-vc-install-from-checkout'
+	obsoletion notice.
+	* lisp/emacs-lisp/package-vc.el (package-vc-install-from-checkout):
+	Update obsoletion declaration.
+
+2026-03-14  Philip Kaludercic  <philipk@posteo.net>
+
+	Remove references to 'package-vc-install-from-checkout' in docs
+
+	* lisp/emacs-lisp/package-vc.el: Remove mention in Commentary section.
+	(package-vc-checkout): Remove suggestion in docstring.
+
+2026-03-14  Basil L. Contovounesios  <basil@contovou.net>
+
+	Rename emacs-module.h.in -> emacs-module.in.h
+
+	* src/emacs-module.h.in: Rename...
+	* src/emacs-module.in.h: ...to this, for consistency with all other
+	lib/*.in.h files (bug#80428).
+	* Makefile.in (CONFIG_STATUS_FILES_IN):
+	* admin/release-branch.txt:
+	* src/emacs-module.c: All uses updated.
+	* admin/authors.el (authors-renamed-files-alist): Register rename.
+	* configure.ac: Specify non-default AC_CONFIG_FILES input file.
+
+2026-03-14  Basil L. Contovounesios  <basil@contovou.net>
+
+	Review some attribute macro usage
+
+	* .dir-locals.el (c-noise-macro-names): Remove ANDROID_EXPORT, which
+	is no longer used.  Add ATTRIBUTE_COLD, ATTRIBUTE_CONST,
+	ATTRIBUTE_MAY_ALIAS, ATTRIBUTE_NONSTRING, ATTRIBUTE_RETURNS_NONNULL,
+	EXTERNALLY_VISIBLE, MAYBE_UNUSED, and NODISCARD.
+	(c-noise-macro-with-parens-names): Also tell cc-mode about some
+	function-like attribute macros in use (bug#80428).
+
+	* src/conf_post.h (RE_TRANSLATE_P): Remove; it is no longer used.
+
+2026-03-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid assertion violations in tty menus in rare cases
+
+	* src/term.c (mouse_get_xy): Restore the lost protection against
+	'mouse_position' returning nil as mouse coordinates.  (Bug#80603)
+
+2026-03-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix backward motion in Info manuals under 'scroll-conservatively'
+
+	* lisp/info.el (Info-find-node-2): Don't skip the header or
+	breadcrumbs line when 'scroll-conservatively' is set to a value
+	that could leave the beginning of the node outside of the window.
+	(Bug#80553)
+
+2026-03-14  Timon Reinold  <tirei+gn@agon.one>  (tiny change)
+
+	Fix auto-correct previous word with 'flyspell-prog-mode'
+
+	* lisp/textmodes/flyspell.el (flyspell-generic-progmode-verify):
+	Take into account the word 'flyspell-auto-correct-previous-word'
+	moved to (i.e., the word starting at point, not the character
+	before point), when checking whether it should be checked/corrected
+	by flyspell-prog-mode.  (Bug#80289)
+
+2026-03-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(smerge--refine-prepare-regions): Reduce number of args and retvals
+
+	* lisp/vc/smerge-mode.el (smerge--refine-set-overlay-props):
+	New function, extracted from `smerge--refine-prepare-regions`.
+	(smerge--refine-prepare-regions): Take overlays rather than beg/end
+	arguments and remove all overlay property manipulation.
+	(smerge-refine-regions): Create the overlays and pass them to those
+	two functions.
+
+2026-03-14  Dmitry Gutov  <dmitry@gutov.dev>
+
+	etags-regen: Don't try to generate tags during completion, by default
+
+	* etc/NEWS: Describe the change.
+
+	* lisp/progmodes/etags-regen.el
+	(etags-regen-create-on-completion): New option.
+	(etags-regen-create-on-completion--set): New function.
+	(etags-regen-mode): Use it.  Discussed in
+	https://lists.gnu.org/archive/html/emacs-devel/2026-03/msg00405.html
+
+2026-03-13  Philip Kaludercic  <philipk@posteo.net>
+
+	Simplify 'xref-mouse-mode-map'
+
+	See https://mail.gnu.org/archive/html/emacs-devel/2026-03/msg00386.html.
+
+	* lisp/progmodes/xref.el (xref-mouse-mode-map): Prevent
+	C-<down-mouse-1> from triggering 'mouse-buffer-menu' and drop
+	C-<drag-mouse-1> binding.
+
+2026-03-13  Philip Kaludercic  <philipk@posteo.net>
+
+	* etc/NEWS: Announce 'package-vc-install-from-checkout' obsoletion
+
+	(Bug#80604)
+
+2026-03-13  Philip Kaludercic  <philipk@posteo.net>
+
+	Give an example of how to use use-package+:vc without :rev
+
+	* doc/misc/use-package.texi (Install package): Add an example
+	block that doesn't use :rev, and instead shows that you can just
+	pass a URL as a string to :vc.
+
+2026-03-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Ignore Emacs developer’s global core.whitespace
+
+	* build-aux/git-hooks/pre-commit: Use EMACS_GIT_CORE_WHITESPACE,
+	not the global core.whitespace, for whitespace checks when committing.
+	This defaults to empty, which means to use the Git default, and
+	this should fix Bug#80428 “C indentation in .gitattributes, macros
+	in .dir-locals.el”.  The environment variable is a better way to
+	temporarily override the default.
+
+2026-03-13  Helmut Eller  <eller.helmut@gmail.com>
+
+	* lisp/loadup.el: No longer GC after loading each file
+
+	With the portable dumper it's no longer needed as discussed in
+	bug#79021.  Originally this was done for the unexec based dumping (see
+	bug#4287 and commit 0e328d3779d1).
+
+2026-03-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid assertion violations in 'display_menu_bar'
+
+	* src/xdisp.c (display_menu_bar): Return immediately if the
+	menu-bar items were not yet computed.  This avoids assertion
+	violations when this function is called as part of creating a new
+	frame.  (Bug#80603)
+
+2026-03-13  Basil L. Contovounesios  <basil@contovou.net>
+
+	Fix project-recompile directory
+
+	* lisp/progmodes/project.el: Remove stale compilation-read-command
+	declarations.  Autoload recompile for Emacs versions prior to 31, to
+	allow calling project-recompile before project-compile (bug#74631).
+	(project-recompile): Set compilation-directory to avoid recompile
+	using a value unrelated to the current project (bug#68570).
+
+2026-03-12  Basil L. Contovounesios  <basil@contovou.net>
+
+	Replace remaining uses of Qwrong_type_argument
+
+	For discussion, see:
+	https://lists.gnu.org/r/emacs-devel/2026-03/msg00306.html
+
+	* src/comp.c (helper_GET_SYMBOL_WITH_POSITION): Use
+	symbol-with-pos-p, not wrong-type-argument, in the
+	wrong-type-argument error predicate slot.
+	* src/data.c (Fbare_symbol):
+	* src/print.c (print_bind_overrides):
+	* src/treesit.c (Ftreesit_parser_create, treesit_resolve_node):
+	Prefer wrong_type_argument over xsignal2.
+
+2026-03-12  Basil L. Contovounesios  <basil@contovou.net>
+
+	Fix window-height of project-kill-buffers
+
+	An alternative to setting window-height and preserve-size is to rely
+	on display-buffer--maybe-at-bottom's support for
+	temp-buffer-resize-mode.
+
+	* lisp/progmodes/project.el (project-kill-buffers): Set
+	window-height to a function, not a form/cons (bug#52148).
+
+2026-03-12  Julian Scheid  <julians37@gmail.com>
+
+	Fix 'comp--func-unique-in-cu-p' to match docstring
+
+	* lisp/emacs-lisp/comp.el (comp--func-unique-in-cu-p): Check
+	only the callee name instead of requiring global uniqueness.
+	* test/src/comp-resources/comp-test-direct-call.el: New file.
+	* test/src/comp-resources/comp-test-direct-call-dup.el: New file.
+	* test/src/comp-tests.el (comp-tests-has-direct-call-p)
+	(comp-tests-direct-call-with-lambdas)
+	(comp-tests-direct-call-with-duplicate-names): New tests.
+
+2026-03-12  Philip Kaludercic  <philipk@posteo.net>
+
+	Add 'xref-mouse-mode' minor mode
+
+	* doc/emacs/maintaining.texi (Looking Up Identifiers): Document
+	it.
+	* etc/NEWS (bindings): Mention it.
+	* etc/themes/newcomers-presets-theme.el (newcomers-presets): Add
+	it.
+	* lisp/progmodes/xref.el (xref-mouse-mode-map, xref-mouse-mode)
+	(global-xref-mouse-mode): Implement it.
+
+2026-03-12  Tassilo Horn  <tsdh@gnu.org>
+
+	Don't strip face properties in blink-paren-open-paren-line-string
+
+	With bug#59527 we ensured that the open paren line string was fontified
+	which was broken again with bug#63089 because there, the opening paren
+	was fontified with a new face.
+
+	With this change, the returned string is fontified again.  Only if
+	`blink-matching-paren-highlight-offscreen' is non-nil, the opening paren
+	is unfontified and then fontified again with the
+	`blink-matching-paren-offscreen' face.
+
+	* lisp/simple.el (blink-paren-open-paren-line-string): Keep returned
+	line string fontified with slight exception if
+	`blink-matching-paren-highlight-offscreen' is non-nil.
+
+2026-03-11  Philip Kaludercic  <philipk@posteo.net>
+
+	Add ecomplete support for more header types
+
+	* lisp/gnus/message.el (message-put-addresses-in-ecomplete):
+	Handle "BCC" and "X-Debbugs-CC" headers.
+
+2026-03-11  Philip Kaludercic  <philipk@posteo.net>
+
+	Do not initialize Info during package activation
+
+	* lisp/emacs-lisp/package-activate.el (package--add-info-node):
+	Use 'Info-default-directory-list' if Info has not been
+	initialized, otherwise fall back to 'Info-directory-list'
+	without calling 'info-initialize' beforehand, since the function
+	initializes 'Info-directory-list'.  (Bug#80495)
+
+2026-03-11  Philip Kaludercic  <philipk@posteo.net>
+
+	Adjust structure of 'newcomers-presets-mode-enabled-local-modes'
+
+	* etc/themes/newcomers-presets-theme.el
+	(newcomers-presets-mode-enabled-local-modes): Interpret the
+	variable as a proper alist without duplicate keys.
+	(newcomers-presets-mode): Handle new structure.
+
+2026-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(elisp--shorthand-aware-(f)boundp): Don't allocate
+
+	* lisp/progmodes/elisp-mode.el (elisp--read-symbol-shorthands):
+	New function, extracted from `elisp--completion-local-symbols`.
+	Remember the longhand symbol in `elisp--longhand` property.
+	(elisp--completion-local-symbols): Use it.
+	(elisp--shorthand-aware-fboundp, elisp--shorthand-aware-boundp):
+	Use the new `elisp--longhand` property.
+
+2026-03-11  Basil L. Contovounesios  <basil@contovou.net>
+
+	Tweak recent error descriptor changes
+
+	* etc/NEWS: Fix capitalization and markup.
+	* lisp/emacs-lisp/ert.el (ert--should-error-handle-error): Prefer
+	any over cl-some where either will do.
+	* lisp/epa-file.el (epa-file--find-file-not-found-function):
+	Reindent.
+	(epa-file--error-add-context): Use correct variables.  Add
+	docstring.
+	* lisp/ffap.el (ffap-machine-p):
+	* lisp/gnus/nnmaildir.el (nnmaildir--emlink-p): Prefer
+	string-equal-ignore-case over case fiddling.
+	* lisp/gnus/gnus-search.el (gnus-search-run-query): Fix typo in
+	error re-signaling.
+	* lisp/ibuffer.el (ibuffer-confirm-operation-on): Prefer string
+	search over regexp matching where either will do.
+	* test/lisp/vc/vc-tests/vc-tests.el
+	(vc-test--run-maybe-unsupported-function): Pacify unused
+	condition-case error variable warnings (bug#72212).
+
+2026-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	etc/NEWS.26 (Changes in Emacs 26.1): List new names (for `C-h f`)
+
+2026-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(subr-error-API): New test.  Also, improve the etc/NEWS
+
+	* test/lisp/subr-tests.el (subr-error-API): New test.
+
+2026-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/vc/smerge-mode.el (smerge--refine-apply-diff): Typo
+
+2026-03-11  Andrea Corallo  <acorallo@gnu.org>
+
+	Fix negated equality assumptions (bug#80327)
+
+	* lisp/emacs-lisp/comp.el (comp--add-cond-cstrs): Skip
+	negated equality assumptions only for relational non-immediate
+	operands. Keep immediate false-branch constraints.
+	* test/src/comp-resources/comp-test-funcs.el
+	(comp-test-80327-hash, comp-test-80327-f): Add reproducer.
+	* test/src/comp-tests.el (comp-tests-bug-80327): Add regression
+	test.
+
+2026-03-11  Michael Albinus  <michael.albinus@gmx.de>
+
+	Improve tramp-tests.el
+
+	* test/lisp/net/tramp-tests.el (ert-temp-file-prefix)
+	(ert-temp-file-suffix, ert--with-temp-file-generate-suffix)
+	(ert-with-temp-file, ert-with-temp-directory): Add them if they
+	don't exist.
+	(tramp--test-make-temp-name, tramp--test-kubernetes-p)
+	(tramp--test-supports-set-file-times-p): New defuns.
+	(tramp--test-make-temp-name): Use `tramp--test-make-temp-prefix'.
+	(tramp-test03-file-error, tramp-test20-file-modes)
+	(tramp-test22-file-times, tramp-test26-file-name-completion):
+	Adapt tests.
+
+2026-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/subr.el (run-hook-query-error-with-timeout): Avoid `%s` for lists
+
+2026-03-11  Phil Sainty  <psainty@orcon.net.nz>
+
+	Handle compressed filenames in `native--compile-async-skip-p' (bug#57627)
+
+	* lisp/emacs-lisp/comp-run.el (native--compile-async-skip-p):
+	Process *.el.gz filenames as if they were *.el filenames.
+
+2026-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(smerge-refine-regions): Refactor a bit and work between buffers
+
+	* lisp/vc/smerge-mode.el (smerge--refine-chopup-region):
+	Replace `beg..end` arg with an overlay.
+	(smerge-refine-regions): Replace `beg` arg with an overlay.
+	(smerge--refine-prepare-regions, smerge--refine-apply-diff-1):
+	New functions, extracted from `smerge-refine-regions`.
+	(smerge--refine-apply-diff): New function.
+	(smerge-refine-regions): Use them.  Also delete temp files right after
+	running `diff` rather than after applying diff's output.
+
+2026-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(error-data): Delete function
+
+	Remove `error-data` from the new error API: it is not really
+	compatible with a more abstract view of error descriptors, and
+	in practice it seems to be used only in two ways (both of them rare):
+
+	- To add some contextual info to an error.  We should maybe add
+	  a dedicated support for that, but it's not clear what shape it
+	  should take, ideally (there was a discussion about with Alan
+	  and myself in emacs-devel a few years ago).
+	- To do some other massaging whose correctness is dubious anyway.
+
+	* doc/lispref/control.texi (Handling Errors): Remove `error-data`.
+
+	* lisp/epa-file.el (epa-file--find-file-not-found-function): Don't use
+	`error-data`.
+	(epa-file--error-add-context): New function, extracted from
+	`epa-file-insert-file-contents`.
+	(epa-file-insert-file-contents): Use it instead of `error-data`.
+
+	* lisp/subr.el (error-data): Delete function.
+
+2026-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	test subdirectory: Use new error-API
+
+	* test/lisp/vc/vc-tests/vc-tests.el
+	(vc-test--run-maybe-unsupported-function): Remove dummy branch in
+	`condition-case`.
+	* test/lisp/arc-mode-tests.el (define-arc-mode-test-on-type):
+	Use `error-slot-value`.
+
+	* test/src/process-tests.el (process-tests--ignore-EMFILE):
+	* test/src/filelock-tests.el (filelock-tests-unlock-spoiled)
+	(filelock-tests-kill-buffer-spoiled):
+	* test/lisp/vc/vc-git-tests.el (vc-git-test--run):
+	* test/lisp/proced-tests.el (proced--assert-process-valid-cpu-refinement):
+	* test/lisp/emacs-lisp/pp-tests.el (pp-tests--sanity):
+	* test/lisp/emacs-lisp/edebug-tests.el (edebug-tests-with-normal-env)
+	(edebug-tests-post-command):
+	* test/lisp/autorevert-tests.el (auto-revert--deftest-remote):
+	* test/infra/android/test-controller.el (ats-connect):
+
+2026-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Use single-arg form of `signal` to re-throw an error
+
+	* lisp/vc/smerge-mode.el (smerge-extend):
+	* lisp/vc/diff-mode.el (diff-beginning-of-file-and-junk):
+	* lisp/transient.el (transient--with-emergency-exit):
+	* lisp/textmodes/tex-mode.el (latex-forward-sexp):
+	* lisp/tar-mode.el (tar-mode):
+	* lisp/savehist.el (savehist--reload):
+	* lisp/progmodes/octave.el (inferior-octave-resync-dirs):
+	* lisp/progmodes/js.el (js--re-search-forward):
+	* lisp/plstore.el (plstore--decrypt):
+	* lisp/net/dbus.el (dbus-ignore-errors, dbus-register-signal)
+	(dbus-handle-event):
+	* lisp/mouse.el (mouse-drag-track, mouse-drag-region-rectangle):
+	* lisp/minibuffer.el (completion-pcm--find-all-completions):
+	* lisp/mail/rfc2231.el (rfc2231-parse-string):
+	* lisp/mail/rfc2047.el (rfc2047-encode-region):
+	* lisp/jit-lock.el (jit-lock-fontify-now):
+	* lisp/international/ja-dic-utl.el (skkdic-lookup-key):
+	* lisp/gnus/nnselect.el (nnselect-generate-artlist):
+	* lisp/gnus/mml-sec.el (mml-secure-epg-encrypt, mml-secure-epg-sign):
+	* lisp/gnus/mail-source.el (mail-source-fetch-pop)
+	(mail-source-check-pop):
+	* lisp/gnus/gnus-art.el (gnus-article-read-summary-keys):
+	* lisp/files.el (basic-save-buffer-2, files--ensure-directory)
+	(files--force, copy-directory):
+	* lisp/eshell/esh-io.el (eshell-output-object-to-target):
+	* lisp/epa.el (epa-decrypt-file, epa-verify-file, epa-sign-file)
+	(epa-encrypt-file, epa-decrypt-region, epa-verify-region)
+	(epa-sign-region, epa-encrypt-region, epa-delete-keys)
+	(epa-export-keys, epa-insert-keys):
+	* lisp/emacs-lisp/package.el (package--unless-error):
+	* lisp/emacs-lisp/multisession.el (multisession--read-file-value):
+	* lisp/emacs-lisp/lisp.el (up-list-default-function):
+	* lisp/desktop.el (desktop-kill):
+	* lisp/calendar/time-date.el (date-to-time):
+	* lisp/calendar/appt.el (appt-display-message):
+	* lisp/calc/calc.el (calc-do):
+	* lisp/bookmark.el (bookmark-handle-bookmark):
+	* src/fileio.c (report_file_errno):
+	* lisp/vc/vc.el (vc-checkout, vc-pull): Use `(signal err)` instead
+	of `(signal (car err) (cdr err))`.
+
+2026-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Use the new error API functions
+
+	* lisp/epa-file.el (epa-file--find-file-not-found-function):
+	Use `error-slot-value` and `error-data`.
+	(epa-file-insert-file-contents): Use `error-has-type-p`,
+	`error-slot-value`, and `error-data`.
+
+	* lisp/jka-compr.el (jka-compr-insert-file-contents):
+	Use `error-has-type-p` and `error-slot-value` as well as new
+	re-signaling form of `signal`.
+
+	* lisp/simple.el (minibuffer-error-function): Use `error-has-type-p`.
+
+	* lisp/startup.el (startup--load-user-init-file):
+	Use `error-message-string`.
+	(command-line): Use `error-has-type-p` and `error-message-string`.
+
+	* lisp/type-break.el (type-break-demo-life):
+	Use `error-message-string`.
+
+	* lisp/emacs-lisp/bytecomp.el (batch-byte-compile-file):
+	Use `error-message-string` and `error-has-type-p`.
+
+	* lisp/emacs-lisp/edebug.el (edebug-safe-eval, edebug-report-error)
+	(edebug-eval-expression):
+	* lisp/emacs-lisp/debug.el (debugger-eval-expression):
+	Use `error-message-string`.
+
+	* lisp/emacs-lisp/ert.el (ert--should-error-handle-error):
+	Use `error-has-type-p` and `error-type`.
+
+	* lisp/net/sasl.el (sasl-error): Use `define-error`.
+
+	* lisp/net/tramp-compat.el (tramp-error-type-p): New function.
+	(tramp-permission-denied, tramp-compat-permission-denied): Use it.
+
+	* lisp/progmodes/elisp-mode.el (elisp-completion-at-point):
+	Use `error-type-p`.
+
+	* lisp/xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal)
+	(turn-off-xterm-mouse-tracking-on-terminal): Use `error-slot-value`.
+
+	* lisp/simple.el (next-line, previous-line): Remove useless
+	`condition-case` handler, and hence the whole `condition-case`, and
+	then simplify.
+
+	* lisp/gnus/nnrss.el (nnrss-insert): Use `with-demoted-errors`.
+
+	* lisp/gnus/nnmaildir.el (nnmaildir--emlink-p, nnmaildir--enoent-p)
+	(nnmaildir--eexist-p): Use `error-has-type-p`.
+	(nnmaildir--new-number, nnmaildir-request-set-mark): Use single-arg
+	`signal`.
+
+	* lisp/ffap.el (ffap-machine-p): Use `error-slot-value`.
+
+	* lisp/emacs-lisp/comp.el (comp--native-compile):
+	Use `error-has-type-p` as well as single-arg `signal`.
+
+	* lisp/net/ange-ftp.el (ange-ftp-hook-function): Use single-arg
+	`signal`.
+
+	* lisp/ebuff-menu.el (electric-buffer-menu-looper): Use `error-has-type-p`.
+	* lisp/progmodes/ebrowse.el (ebrowse-electric-list-looper):
+	Use `error-has-type-p`.
+	(ebrowse-electric-position-looper): Make it an alias of
+	`ebrowse-electric-list-looper`.
+
+	* lisp/ibuffer.el (ibuffer-confirm-operation-on):
+	* lisp/ls-lisp.el (ls-lisp--insert-directory):
+	* lisp/gnus/gnus-search.el (gnus-search-run-query):
+	* lisp/mail/mail-extr.el (mail-extr-safe-move-sexp):
+	* lisp/net/dbus.el (dbus-set-property):
+	* lisp/net/eudc-export.el (eudc-bbdbify-phone):
+	* lisp/net/imap.el (imap-fetch-safe):
+	* lisp/vc/vc.el (vc-root-dir): Use `error-slot-value` and
+	single-arg `signal` to re-signal.
+
+2026-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Improve the error API
+
+	Define new functions to manipulate error descriptors and
+	add support for `signal` to *re*signal a previous error.
+
+	 * src/eval.c (Fsignal): Make the second arg optional and document
+	the possibility of passing a whole error descriptor to re-signal it.
+	(signal_or_quit): Fix a few corner case issues when
+	DATA is `nil` and ERROR_SYMBOL is an error descriptor.
+
+	* lisp/subr.el (error-type-p, error--p, error-type, error-data)
+	(error-has-type-p, error-slot-value): New function.
+
+	* doc/lispref/control.texi (Handling Errors): Prefer "error descriptor"
+	to "error description".  Use the new single-arg call to `signal` to
+	re-throw an error.
+	Document `error-type`, `error-data` and `error-slot-value`.
+	(Error Symbols): Document the new functions `error-type-p` and
+	`error-has-type-p`.
+
+2026-03-10  Sean Whitton  <spwhitton@spwhitton.name>
+
+	unfill-paragraph: Use most-positive-fixnum
+
+	* lisp/textmodes/fill.el (unfill-paragraph): Use
+	most-positive-fixnum.
+
+2026-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Fix `signal` calls where the data argument is not a list
+
+	* test/src/thread-tests.el (threads-join-error):
+	* test/src/emacs-module-resources/mod-test.c (Fmod_test_signal):
+	* src/print.c (print_bind_overrides):
+	* lisp/url/url-future.el (url-future-finish, url-future-errored)
+	(url-future-call, url-future-cancel): Make sure signal's data is a list.
+
+	* test/src/emacs-module-tests.el (mod-test-non-local-exit-signal-test):
+	Adjust accordingly.
+
+2026-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Error handling clarifications found during error-API
+
+	* lisp/simple.el (next-line, previous-line): Remove useless
+	`condition-case` handler, and hence the whole `condition-case`, and
+	then simplify.
+
+	* lisp/emacs-lisp/comp.el (comp--error-add-context): New function.
+	(comp--native-compile): Use it.
+
+	* lisp/gnus/nnrss.el (nnrss-insert): Use `with-demoted-errors`.
+
+2026-03-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	newcomers-presets: Drop after-save-hook entry
+
+	* etc/themes/newcomers-presets-theme.el
+	(newcomers-presets-mode-enabled-local-modes): Remove
+	executable-make-buffer-file-executable-if-script-p.
+
+2026-03-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'emacs-news-find-heading'
+
+	* lisp/textmodes/emacs-news-mode.el (emacs-news-find-heading):
+	HEADING must be a complete line, otherwise we have false positives
+	and false negatives.  (Bug#80569)
+
+2026-03-09  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	* lisp/time-stamp.el (time-stamp-warn-inactive): Doc string.
+
+2026-03-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	newcomers-presets: Always show the tab bar
+
+	* etc/themes/newcomers-presets-theme.el (newcomers-presets): Set
+	tab-bar-show to 0.
+
+2026-03-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Restore use of cl-member-if and cl-plusp to flymake.el
+
+	* lisp/progmodes/flymake.el (flymake-goto-next-error): Use
+	cl-member-if not member-if and cl-plusp not plusp because this
+	is a `:core' ELPA package (bug#79930).
+
+2026-03-09  Yuan Fu  <casouri@gmail.com>
+
+	Ensure c-ts-mode tests are never stuck (bug#80565)
+
+	* test/lisp/progmodes/c-ts-mode-tests.el: Don't prompt for
+	installing cpp grammar when they're not installed.
+
+2026-03-09  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Fix Non-existent commands in flymake-diagnostics-buffer-mode-map
+
+	* lisp/progmodes/flymake.el (flymake-diagnostics-buffer-mode-map):
+	Only bind 'n' and 'p' when 'next-error-this-buffer-no-select' is
+	defined.  For releasing on ELPA (bug#79930).
+	Bump the package version to 1.4.4.
+
+2026-03-08  Philip Kaludercic  <philipk@posteo.net>
+
+	Mention newcomers theme on 'normal-mouse-startup-screen'
+
+	* lisp/startup.el (startup-insert-newcomers-theme): Factor out
+	new function from 'normal-no-mouse-startup-screen'.
+	(normal-mouse-startup-screen, normal-no-mouse-startup-screen):
+	Call new function.
+
+2026-03-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cl-seq.el: Prefer `:test` to `:if`
+
+	* lisp/emacs-lisp/cl-seq.el (cl-remove-if, cl-remove-if-not)
+	(cl-delete-if, cl-delete-if-not, cl-substitute-if)
+	(cl-substitute-if-not, cl-nsubstitute-if, cl-nsubstitute-if-not)
+	(cl-find-if, cl-find-if-not, cl-position-if, cl-position-if-not)
+	(cl-count-if, cl-count-if-not, cl-member-if, cl-member-if-not)
+	(cl-assoc-if, cl-assoc-if-not, cl-rassoc-if, cl-rassoc-if-not)
+	(cl-subst-if, cl-subst-if-not, cl-nsubst-if, cl-nsubst-if-not):
+	Prefer the Common Lisp standard `:test` to the cl-lib specific `:if`.
+
+2026-03-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	iso-transl.el: Revert cosmetic change
+
+	* lisp/international/iso-transl.el (iso-transl-char-map):
+	Re-add ineffective backslashes removed in in previous patch.
+
+2026-03-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/textmodes/fill.el (unfill-paragraph): Fix for wide chars.
+
+2026-03-08  shynur  <shynur@outlook.com>
+
+	* lisp/files.el (auto-mode-alist): Recognize /etc/profile as sh.
+
+2026-03-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Use images in Emacs Lisp Intro manual (bug#80519)
+
+	* doc/lispintro/emacs-lisp-intro.texi (Lists diagrammed)
+	(Symbols as Chest, kill-ring-yank-pointer, lambda): Use @image and
+	remove ASCII-art diagrams, which are now on separate *.txt files.
+	(header): Remove print-postscript-figures and its commentary.
+
+	* doc/lispintro/Makefile.in (auxfiles): New file list.
+	(${buildinfodir}/%.txt, ${buildinfodir}/%.png): New targets.
+	(${buildinfodir}/eintr.info): Depend on ${auxfiles}.
+	(infoclean): Remove ${auxfiles}.
+
+	* doc/lispintro/cons-1.png:
+	* doc/lispintro/cons-1.txt:
+	* doc/lispintro/cons-2.png:
+	* doc/lispintro/cons-2.txt:
+	* doc/lispintro/cons-2a.png:
+	* doc/lispintro/cons-2a.txt:
+	* doc/lispintro/cons-3.png:
+	* doc/lispintro/cons-3.txt:
+	* doc/lispintro/cons-4.png:
+	* doc/lispintro/cons-4.txt:
+	* doc/lispintro/cons-5.png:
+	* doc/lispintro/cons-5.txt:
+	* doc/lispintro/drawers.png:
+	* doc/lispintro/drawers.txt:
+	* doc/lispintro/lambda-1.png:
+	* doc/lispintro/lambda-1.txt:
+	* doc/lispintro/lambda-2.png:
+	* doc/lispintro/lambda-2.txt:
+	* doc/lispintro/lambda-3.png:
+	* doc/lispintro/lambda-3.txt: New files, from Matto Fransen
+	<matto@matto.nl>.
+
+2026-03-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix mpuz under text-scaling
+
+	* lisp/play/mpuz.el (mpuz-switch-to-window): Don't unconditionally
+	turn on 'mpuz-mode', as that kills all local variables.  (Bug#80567)
+
+2026-03-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	iso-transl.el: Remove ineffective backslashes in previous patch
+
+	* lisp/international/iso-transl.el (iso-transl-char-map):
+	Remove ineffective backslashes in previous patch.
+
+2026-03-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Add "C-x 8" commands for letters with breeve
+
+	* lisp/international/iso-transl.el (iso-transl-char-map): Add
+	Latin letters with breve.  (Bug#80515)
+
+2026-03-07  Pip Cet  <pipcet@protonmail.com>
+
+	Fix infloop when decoding incomplete embedded UTF-8 input
+
+	* src/coding.c (decode_coding_iso_2022): Record conversion result for
+	incomplete data.
+
+2026-03-07  kobarity  <kobarity@gmail.com>
+
+	Improve Python setup codes to avoid leaving global names
+
+	* lisp/progmodes/python.el (python-shell-setup-code)
+	(python-shell-readline-detect): Improve Python code.  (Bug#80551)
+
+2026-03-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'define-keymap'
+
+	* lisp/emacs-lisp/shortdoc.el (keymaps): Add example for adding
+	key bindings to an existing keymap.
+	* lisp/keymap.el (define-keymap): Doc fix.  (Bug#80556)
+
+2026-03-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix segfaults in 'kbd_buffer_get_event'
+
+	* src/keyboard.c (kbd_buffer_get_event): Ignore selection-request
+	events when accessing the frame of an event.  Suggested by dick
+	r. chiang <dick.r.chiang@gmail.com>.  (Bug#80558)
+
+2026-03-06  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/recentf.el (recentf-exclude-file-by-extension-p): Fix thinko.
+
+2026-03-06  Martin Rudalics  <rudalics@gmx.at>
+
+	Additional fixes for 'get-mru-frame' (Bug#80397)
+
+	* src/frame.c (delete_frame): Call 'get-mru-frame' safely and
+	with EXCLUDE-FRAME argument set up correctly.
+	* lisp/frame.el (get-mru-frames, get-mru-frame): Fix doc-strings.
+
+2026-03-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix last change in recentf.el
+
+	* lisp/recentf.el (recentf-exclude-ignored-extensions): Doc fix.
+	(recentf-exclude-file-by-extension-p): Rename from
+	`recentf-exclude-ignored-extensions'; all references changed.
+	Doc fix.
+
+	* etc/NEWS: Improve wording of the entry which announces the
+	above.
+
+2026-03-05  Philip Kaludercic  <philipk@posteo.net>
+
+	Mention newcomer theme on "no-mouse" splash screen
+
+	* lisp/startup.el (normal-no-mouse-startup-screen): Add a button
+	to toggle the "newcomers-presets" theme.
+
+2026-03-05  Stéphane Marks  <shipmints@gmail.com>
+
+	New user option and function 'recentf-exclude-ignored-extensions'
+
+	* lisp/recentf.el (recentf-exclude-ignored-extensions): New
+	user option.
+	(recentf-exclude-ignored-extensions): New function.
+	* etc/NEWS: Announce the new option and function.
+
+	(Bug#80347)
+
+2026-03-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	unfill-paragraph: Reimplement in terms of fill-region
+
+	* lisp/textmodes/fill.el (unfill-paragraph): Reimplement in
+	terms of fill-region.
+
+2026-03-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New user option vc-display-failed-async-commands
+
+	* lisp/vc/vc-dispatcher.el (vc-display-failed-async-commands):
+	New user option.
+	(vc-do-async-command): Use it.
+	* doc/emacs/vc1-xtra.texi (General VC Options):
+	* etc/NEWS: Document it.
+	* lisp/vc/vc-dispatcher.el (vc-do-command): Adjust message to
+	begin "Failed" not "Done" when command exits non-zero.
+	* lisp/vc/vc.el (vc-checkin): Adjust message to end in
+	"...failed" not "...done" when async command exits non-zero.
+
+2026-03-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-do-command: Tidy up some messaging
+
+	* lisp/vc/vc-dispatcher.el (vc--inhibit-message): New defvar,
+	replacing the undeclared vc-inhibit-message.  All uses changed.
+	(vc--command-message): New function, factored out.
+	(vc-do-command): Call it.
+
+2026-03-05  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix segfault introduced by recent 'get-mru-frame' change
+
+	* src/frame.c (delete_frame): Fix segfault when deleting a
+	frame and 'get-mru-frame' returns that frame.
+
+2026-03-05  Stéphane Marks  <shipmints@gmail.com>
+
+	Make 'frame-use-time' more reliable. (bug#80397)
+
+	Walking the window tree is more reliable than using the selected
+	window.  Implement 'get-mru-frame' on top of 'get-mru-frames'
+	using 'frame-use-time'.
+
+	* lisp/frame.el (frame-use-time): Change to walk the window tree
+	for the specified frame.
+	(get-mru-frames): New defun.
+	(get-mru-frame): Change to call 'get-mru-frames'.
+	* doc/lispref/frames.texi: Update documentation.
+	* etc/NEWS: Update announcement.
+
+2026-03-04  Alan Third  <alan@idiocy.org>
+
+	Fix seg fault when image dimensions don't match (bug#80518)
+
+	* src/image.c (four_corners_best): [USE_CAIRO] Reset the image
+	dimensions to real values.
+	(Fimage_transforms_p): Fix typo.
+
+2026-03-04  Michael Albinus  <michael.albinus@gmx.de>
+
+	Revert "Repair serious breakage in the batch tests."
+
+	This reverts commit feac53141577161c32a7a6dfe75399a5ae98a7c1.
+
+	This patch has deactivated 253 test cases without a sufficient reasoning.
+	Instead it speaks about a shotgun in its commite message.
+
+	The patch is reverted because
+
+	- It hasn't been discussed on emacs-devel. It should have, because it is
+	  a serious change in our infrastructure (new official tag :nobatch). Any
+	  documentation of this change, for example in test/README, is missing.
+
+	- The proper way to deactivate such tests would have been
+
+	  (skip-when noninteractive)
+
+	  Even better to skip for the respective reasons.
+
+	- There is no fault report. There is no information about how these tests
+	  have failed. Since it hasn't been a problem so far for us, nobody will
+	  work on a fix forever.
+
+2026-03-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(flymake-start): Give a bit more info in the log
+
+	* lisp/progmodes/flymake.el (flymake-start): Log the reason why
+	it's disabled when not starting a backend.
+
+2026-03-04  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Rename 'any' to 'member-if' and deprecate 'cl-member-if'
+
+	* lisp/subr.el (any): Rename from this ...
+	(member-if): ... to this.  All uses changed.
+	(any): New function alias.
+	* lisp/emacs-lisp/cl-seq.el (cl-member-if): Mark obsolete.
+	* lisp/obsolete/cl.el (member-if): Delete obsolete function
+	alias.
+	* doc/lispref/lists.texi (List Elements):
+	* doc/misc/cl.texi (Lists as Sets):
+	* etc/NEWS: Document the change.
+
+2026-03-04  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New command 'unfill-paragraph'
+
+	* lisp/simple.el (unfill-paragraph): New command.
+	* doc/emacs/indent.texi (Indentation Commands):
+	* etc/NEWS: Document it.
+
+2026-03-04  Stéphane Marks  <shipmints@gmail.com>
+
+	In 'frame--purify-parameters' fix frame-inherited-parameters (Bug#80536)
+
+	* lisp/frame.el (frame--purify-parameters):
+	'frame-inherited-parameters' is a parameter list, not an alist.
+
+2026-03-03  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Revert "Rename 'any' to 'member-if' and deprecate 'cl-member-if'"
+
+	This reverts commit 2bdf15f6d8293b21234cd236f39ce68f62e1f6c3.
+
+	There is no consensus for this change.
+
+2026-03-03  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Faster JSON string serialisation (bug#80529)
+
+	* src/json.c (json_out_string):
+	Optimise for runs of non-special ASCII chars.
+
+	This seems to be a a substantial performance gain for long strings but a
+	smaller regression for short strings (up to 6 chars or thereabouts,
+	depending on cpu, compiler, and/or C library).  Still likely worth it.
+
+	Suggested by Pavel <cyberkm@gmail.com>.
+
+2026-03-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	eglot.el: Avoid `%s` for composite objects
+
+	* lisp/progmodes/eglot.el (eglot--check-object, eglot--check-dspec)
+	(eglot-shutdown-all, eglot--connect, eglot--lsp-position-to-point)
+	(eglot--read-server, eglot-handle-notification, eglot-handle-request):
+	Avoid `%s` for composite objects.
+	(eglot--connect, eglot--format): Use `fboundp` rather than `functionp`
+	to check if something is defined.
+	(eglot--sig-info): Prefer `point-min`.
+
+2026-03-03  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Add mirroring for special glyphs (bug#80440)
+
+	See initial discussion here:
+	https://lists.gnu.org/archive/html/emacs-devel/2026-02/msg00400.html
+
+	* lisp/international/characters.el (pairs): Populate
+	special-mirror-table.
+	* src/xdisp.c (produce_special_glyphs): Add two arguments.  One
+	to identify the paragraph direction and one to identify that the
+	glyph is produced on the left hand side of a window.  Mirror
+	glyph defined in the display table according to the new
+	special-mirror-table.  Bidi mirroring always takes precedence.
+	(init_iterator, insert_left_trunc_glyphs, display_line)
+	(display_string): Call 'produce_special_glyphs' with new arguments.
+	(syms_of_xdisp) <special-mirror-table>: New char-table.
+	* etc/NEWS: Announce the change.
+
+2026-03-03  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: Handle mixed symbols and non-symbols in regexps
+
+	This fixes bug#80507.
+
+	* lisp/progmodes/cc-defs.el (c-make-keywords-re): When a mixed list
+	of symbols and non-symbols is presented to this function, put
+	"\_< .... \_>" brackets around the part which handles the symbols
+	in the resulting regexp.
+
+2026-03-03  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix respecting vc-log-show-limit with new -change-log commands
+
+	* lisp/vc/vc.el (vc-print-change-log, vc-print-root-change-log):
+	Respect vc-log-show-limit when there is no prefix argument (bug#80532).
+
+2026-03-03  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Rename 'any' to 'member-if' and deprecate 'cl-member-if'
+
+	* lisp/subr.el (any): Rename from this ...
+	(member-if): ... to this.  All uses changed.
+	Implement '&key KEY-FN' for backwards compatibility.
+	(any): New function alias.
+	* lisp/emacs-lisp/cl-seq.el (cl-member-if): Make an alias for
+	'member-if'.
+	* lisp/obsolete/cl.el (member-if): Delete obsolete function
+	alias.
+	* doc/lispref/lists.texi (List Elements):
+	* doc/misc/cl.texi (Lists as Sets):
+	* etc/NEWS: Document the change.
+
+2026-03-03  Sean Whitton  <spwhitton@spwhitton.name>
+
+	dired-diff: Fix default input in inserted subdirectory
+
+	* lisp/dired-aux.el (dired-diff): Use default-directory, not
+	dired-current-directory, to determine whether the default input
+	is in another directory (bug#80497).  Use a relative file name
+	to improve readability.
+
+2026-03-03  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Add some settings to newcomers-presets
+
+	* etc/themes/newcomers-presets-theme.el (newcomers-presets): Add
+	mode-line-compact, indent-tabs-mode, imenu-auto-rescan,
+	view-read-only, shell-command-prompt-show-cwd, after-save-hook,
+	etags-regen-mode, vc-deduce-backend-nonvc-modes,
+	vc-dir-save-some-buffers-on-revert, vc-find-revision-no-save,
+	vc-follow-symlinks, vc-use-incoming-outgoing-prefixes,
+	tab-bar-history-mode.
+
+2026-03-03  Yuan Fu  <casouri@gmail.com>
+
+	Make tree-sitter thing navigation handle nested parsers
+
+	Not a bug report, but this is from the emacs-devel thread
+	"Tree-sitter: Transcendental things".
+
+	Improve tree-sitter thing navigation functions to handle the
+	case where there are multiple nested parsers in the
+	buffer. Previously these functions just grab the node at point
+	and are limited to the parser of that node.  Now these functions
+	will thoUrouly search through all parsers that covers point
+	before giving up.
+
+	* doc/lispref/parsing.texi: Mention the change.
+	* lisp/treesit.el (treesit--some): New macro.
+	(treesit--thing-sibling): Use the new macro, add a new PARSER
+	parameter.
+	(treesit-thing-prev):
+	(treesit-thing-next): Add PARSER parameter.
+	(treesit-thing-at):
+	(treesit-navigate-thing): Use the new macro, add a new PARSER
+	parameter.  Also pass the PARSER arg to recursive calls and
+	calls to treesit-thing-prev, etc.
+
+2026-03-03  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix grep defaults
+
+	* lisp/progmodes/grep.el (grep-compute-defaults): Quote "xargs"
+	only for local hosts, running MS Windows.  (Bug#80489)
+
+2026-03-02  Basil L. Contovounesios  <basil@contovou.net>
+
+	Initialize help-window-old-frame again
+
+	Its sole initialization seems to have been accidentally dropped as
+	part of bug#25979.
+
+	* lisp/help.el (help--window-setup): Set help-window-old-frame
+	before showing the help buffer (bug#80505).
+
+2026-03-02  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Simplify some overly defensive compiler macros
+
+	* lisp/emacs-lisp/bytecomp.el (bytecomp--check-eq-args)
+	(bytecomp--check-memq-args, bytecomp--char-before)
+	(bytecomp--backward-char, bytecomp--backward-word):
+	Don't bother with malformed calls; macroexp--compiler-macro won't call
+	the handler unless the arity matches.
+
+2026-03-02  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Don't complain on compiler-macro arity mismatch
+
+	* lisp/emacs-lisp/macroexp.el (macroexp--compiler-macro):
+	Don't warn if calling the compiler-macro handler elicits an arity error.
+
+	This helps in two ways: no messy wrong-number-of-arguments errors during
+	macro-expansion, only the actual warnings emitted by the compiler, and
+	compiler-macros no longer need to be written defensively to avoid such
+	errors.
+
+2026-03-02  James Cherti  <contact@jamescherti.com>  (tiny change)
+
+	sh-script: Mark + and * as punctuation rather than a symbol constituent
+
+	In Bash, the characters + and * are not valid in variable names.
+	In sh, they are also disallowed in both function and variable
+	names.  Treating them as punctuation is appropriate, as they most
+	commonly appear as operators.
+
+	Examples:
+	   . Arithmetic: $((var1*var2))
+	   . Compound assignment: list_name+=("item")
+
+	* lisp/progmodes/sh-script.el (sh-mode-syntax-table): Mark + and *
+	as punctuation in the syntax table.  (Bug#80280)
+
+2026-03-02  Martin Rudalics  <rudalics@gmx.at>
+
+	Handle side windows in 'ediff-setup-windows-plain-compare' (Bug#80415)
+
+	* lisp/vc/ediff-wind.el (ediff-split-window-function)
+	(ediff-merge-split-window-function): Amend doc-strings.
+	(ediff-setup-windows-plain-compare): Simplify minibuffer window
+	handling, handle side windows (Bug#80415), avoid 'other-window'
+	and 'switch-to-buffer' calls.
+
+2026-03-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify clang -Wunused-result
+
+	Problem reported by badli al rashid (bug#80512).
+	* lib-src/make-docfile.c (scan_c_stream): Avoid a tricky ungetc+getc.
+
+2026-03-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+	* admin/merge-gnulib (GNULIB_MODULES): Add memeq, streq and remove
+	stringeq, to adjust to a module splitup in Gnulib.
+	* lib/memeq.c, lib/streq.c, lib/strnul.c, m4/memeq.m4, m4/streq.m4:
+	New files.
+	* lib/string.c, m4/stringeq.m4: Remove.
+
+2026-03-01  Jacek Świerk  <jacekswierk@gmail.com>  (tiny change)
+
+	Add Rust panic message pattern (bug#80403)
+
+	* etc/compilation.txt: Add example.
+	* lisp/progmodes/compile.el (compilation-error-regexp-alist-alist):
+	New rule.
+	* test/lisp/progmodes/compile-tests.el (compile-tests--test-regexps-data)
+	(compile-test-error-regexps): Add test case.
+
+2026-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Teach Emacs on MS-Windows how to export frame screenshots
+
+	* src/w32image.c (w32_gdip_export_frame): New function.
+	(gdiplus_init): Load 'GdipCreateBitmapFromHBITMAP' from GDI+ DLL.
+	* src/w32fns.c (Fw32_export_frame): New primitive.
+
+	* etc/NEWS: Announce the new primitive.
+
+2026-03-01  Michael Albinus  <michael.albinus@gmx.de>
+
+	Implement connection-local `command-line-max-length'
+
+	* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
+	Set connection-local value of `command-line-max-length'.
+
+	* lisp/net/tramp.el (tramp-get-connection-local-criteria): New defsubst.
+	(tramp-set-connection-local-variables): Use it.
+	(tramp-set-connection-local-variables-for-buffer):
+	Use `connection-local-criteria-for-default-directory'.
+
+2026-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Add a few more translations to iso-transl.el
+
+	* lisp/international/iso-transl.el (iso-transl-char-map): Add a
+	few more translations for accented characters and arrows.  (Bug#80515)
+
+2026-02-28  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New variable 'multiple-terminals-merge-keyboards'
+
+	* src/keyboard.c (syms_of_keyboard):
+	<multiple_terminals_merge_keyboards>: New variable.
+	(read_event_from_main_queue): Mention it in message.
+	* lisp/cus-start.el: Make it customizable.
+	* src/callint.c (Ffuncall_interactively):
+	* src/keyboard.c (Frecursive_edit):
+	* src/minibuf.c (read_minibuf): When its value is true, don't
+	enter single-kboard mode (bug#79892).
+	* admin/notes/multi-tty:
+	* etc/NEWS: Document it.
+
+2026-02-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Don’t stuff keyboard input uselessly
+
+	Also, document stuffing better.
+	* src/keyboard.c (stuff_buffered_input):
+	Give up on stuffing if it fails.
+	* src/sysdep.c (stuff_char): Return failure indication.
+
+2026-02-28  Basil L. Contovounesios  <basil@contovou.net>
+
+	Better project-find-file error in empty project
+
+	* lisp/progmodes/project.el (project--read-file-name): Signal a
+	user-error and don't call project-read-file-name-function if the
+	file name collection is empty, since the default options for
+	project-read-file-name-function expect a cons (bug#80509).
+	(project-find-file-in): Avoid redundant consing for
+	vc-directory-exclusion-list in default case of include-all=nil.
+
+2026-02-28  Michael Albinus  <michael.albinus@gmx.de>
+
+	multiple-command-partition-arguments: Use connection-local value
+
+	* lisp/subr.el (multiple-command-partition-arguments): Use
+	connection-local value for command-line-max-length.
+
+2026-02-28  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Correct manual entry for string-lessp
+
+	* doc/lispref/strings.texi (Text Comparison):
+	The old text was wrong: non-ASCII unibyte chars overlap part of Unicode.
+
+2026-02-28  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Implement string> as a compiler macro instead of an optimisation
+
+	This doesn't affect the generated code.
+
+	* lisp/subr.el (string-greaterp): Add compiler macro.
+	* lisp/emacs-lisp/byte-opt.el (byte-optimize-string-greaterp): Remove.
+
+2026-02-28  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Eliminate double arity warnings
+
+	Calls to some functions, such as 'cdr' and '%', would generate two
+	slightly different complaints if given the wrong number of arguments.
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-subr-wrong-args): Remove.
+	Calls are replaced with 'byte-compile-normal-call'.
+
+2026-02-28  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Show a message in locked frames in single-kboard mode
+
+	* src/keyboard.c (kbd_buffer_get_event): Pass the event's frame
+	up to the caller by means of a new 'struct frame **' argument.
+	(read_event_from_main_queue): Show a message in locked frames in
+	single-kboard mode (bug#79892).
+	* src/xdisp.c (log_message): Factor out of message3.
+	(message3): Call it.
+	(message3_nolog): Rename to ...
+	(message3_frame_nolog): ... this.  New 'struct frame *' argument
+	which causes temporarily switching to another frame when
+	displaying the message.
+	(message3_frame, message3_nolog): New functions.
+	* src/lisp.h: Declare message3_frame and message3_frame_nolog.
+	* admin/notes/multi-tty: Remove notes on showing a message.
+
+2026-02-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Document that string ARG of 'kill-emacs' might not work
+
+	* src/emacs.c (Fkill_emacs):
+	* doc/lispref/os.texi (Killing Emacs): Document that EXIT-DATA
+	being a string doesn't always work.  (Bug#80435)
+
+2026-02-28  Richard Lawrence  <rwl@recursewithless.net>
+
+	Fix (or ...) patterns in 'cond*'/'match*'
+
+	This fixes Bug#80121.
+	* lisp/emacs-lisp/cond-star.el (cond*-subpat): Add missing reference to
+	'expression' when clearing multiple backtrack aliases.
+
+2026-02-28  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Initialize command-line-max-length with sysconf(3)
+
+	* lisp/subr.el (command-line-max-length): Move from here ...
+	* src/callproc.c (syms_of_callproc): <Vcommand_line_max_length>:
+	... to here.  Initialize by calling sysconf(3) if possible.
+
+2026-02-28  Peter Oliver  <git@mavit.org.uk>  (tiny change)
+
+	New function rxvt-colorfgbg-background-mode
+
+	* lisp/term/rxvt.el (rxvt-colorfgbg-background-mode): New
+	function (bug#80486).
+	(rxvt-set-background-mode): Call it.
+
+2026-02-28  Philip Kaludercic  <philipk@posteo.net>
+
+	Fix prompting of packages for 'package-report-bug'
+
+	* lisp/emacs-lisp/package.el (package--query-desc): Load
+	'package-alist' if this hasn't already occurred.
+	(package-report-bug): Drop unnecessary ALIST argument when
+	invoking 'package--query-desc'.
+
+2026-02-28  Philip Kaludercic  <philipk@posteo.net>
+
+	Improve 'package-report-bug' robustness
+
+	* lisp/emacs-lisp/package.el (package-maintainers): Add
+	fallbacks if a package doesn't list a single maintainer.
+	(package-report-bug): Check if "emacs-devel@gnu.org" is listed
+	as a maintainer, in which case the message is redirected to
+	bug-gnu-emacs@gnu.org and the X-Debbugs-CC header is set.
+
+	(Bug#80478)
+
+2026-02-28  Philip Kaludercic  <philipk@posteo.net>
+
+	Allow more fine configuration of package retention
+
+	* lisp/emacs-lisp/package.el (package-upgrade-keep-previous):
+	Rename user option to 'package-retention-policy'.
+	(package--policy-type): New constant for policy types.
+	(package-retention-policy): New option.
+	(package-review-policy): Use new type constant.
+	(package--review-p): Rename and generalise to
+	'package-matches-selector-p'.
+	(package-matches-selector-p): New function.
+	(package-upgrade, package-menu--mark-upgrades-1): Respect
+	'package-retention-policy'.
+	* doc/emacs/package.texi (Package Installation): Document new option.
+	* etc/NEWS: Update NEWS entry.  (Bug#79957)
+
+2026-02-28  Philip Kaludercic  <philipk@posteo.net>
+
+	Indicate if 'package-isolate' had to download a package
+
+	* lisp/emacs-lisp/package.el (package-isolate): Change
+	formatting to indicate dependencies to include a note if the
+	package was downloaded in a temporary directory.
+
+2026-02-28  Philip Kaludercic  <philipk@posteo.net>
+
+	Fix 'package-isolate' in combination with quickload
+
+	* lisp/emacs-lisp/package.el (package-isolate): Call
+	'package--activate-all' directly, to ensure that all the package
+	directories are properly loaded.
+
+2026-02-28  Jeremy Bryant  <jb@jeremybryant.net>
+
+	Add option to keep previous package versions on upgrade
+
+	This change adds a conditional to keep old package versions on upgrade.
+	This allows users to keep running multiple Emacsen without a package
+	upgrade in one Emacs breaking another running Emacs.
+
+	* lisp/emacs-lisp/package.el (package-upgrade-keep-previous):
+	New boolean user option.
+	(package-upgrade): Use it.
+	(package-menu--mark-upgrades-1): Use it.
+	(package-menu--find-upgrades): Make consistent with new option.
+	* etc/NEWS: Announce it.
+
+	(Bug#79957)
+
+2026-02-27  Boris Buliga  <boris@d12frosted.io>
+
+	Fix macOS 26 scrolling lag and input handling issues (bug#80268)
+
+	macOS 26 introduced new event processing behavior that causes scrolling
+	lag and input handling problems in Emacs.  This patch disables two
+	features via NSUserDefaults when built against the macOS 26 SDK:
+	- NSEventConcurrentProcessingEnabled
+	- NSApplicationUpdateCycleEnabled
+
+	This fix is based on the equivalent patch in emacs-mac by Mitsuharu
+	Yamamoto.  See: https://bitbucket.org/mituharu/emacs-mac/commits/e52ebfd
+
+	* src/nsterm.m (ns_term_init): Disable problematic event processing
+	when built for macOS 26+.
+
+2026-02-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	emacs-lisp-intro.texi: Eliminate duplicate ASCII art
+
+	* doc/lispintro/emacs-lisp-intro.texi (print-postscript-figures):
+	Set it only if we're outputting TeX.
+	(Lists diagrammed, Lists diagrammed, Lists diagrammed)
+	(Lists diagrammed, Lists diagrammed, Symbols as Chest)
+	(kill-ring-yank-pointer, lambda): Presume that
+	`print-postscript-figures` is set only for TeX output and remove
+	the `@tex...@end tex` around `@image` which do not seem relevant any more.
+
+2026-02-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix bug on MS-Windows with frame title when system-name is non-ASCII
+
+	* src/w32.c (sys_gethostname): Convert system name to UTF-8.
+	Ensure the buffer passed to 'gethostname' is large enough.
+	(Bug#80472)
+
+2026-02-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New 'log-outstanding' value for vc-log-view-type
+
+	This fixes vc-hg-print-log's choice of -r arguments to 'hg log'.
+
+	* lisp/vc/vc.el (vc-log-view-type): New 'log-outstanding' value.
+	(vc-log-outstanding): Pass it.
+	* lisp/vc/vc-git.el (vc-git-log-view-mode):
+	* lisp/vc/vc-hg.el (vc-hg-print-log, vc-hg-log-view-mode): Treat
+	'log-outstanding' the same as 'log-outgoing'.
+
+2026-02-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix renaming directories in VC repositories
+
+	* lisp/dired-aux.el (dired-rename-file): When determining
+	whether to call vc-rename-file, use vc-responsible-backend
+	instead of vc-backend when FILE is a directory.
+	* lisp/vc/vc.el (vc-rename-file): Support renaming directories.
+
+2026-02-26  Richard Lawrence  <rwl@recursewithless.net>
+
+	Fix `diary-rrule' recurrence rule calculation (Bug#80460)
+
+	Thanks to TAKAHASHI Yoshio for reporting and for fixing one of
+	the typos.  In addition to the reported bug involving
+	:include/:exclude, testing revealed that the provided RRULE
+	COUNT clause was also not being handled correctly; this change
+	also fixes that.
+	* lisp/calendar/diary-icalendar.el (diary-rrule): Handle
+	recurrence rules with a COUNT clause.
+	* lisp/calendar/icalendar-recur.el
+	(icalendar-recur-recurrences-in-interval): Fix a couple of
+	typos that caused RDATE/EXDATE calculations to fail.
+	* test/lisp/calendar/diary-icalendar-tests.el
+	(diary-icalendar-test-rrule-bug-80460): New test for this bug.
+
+2026-02-26  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Upgrade 'equal' from side-effect-free to error-free
+
+	* lisp/emacs-lisp/byte-opt.el (side-effect-free-fns)
+	(side-effect-and-error-free-fns): 'equal' and
+	'equal-including-properties' no longer signal 'circular-list'; while
+	they do error on very deep structures, that is more of a resource limit
+	so let's overlook that.
+
+2026-02-26  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Simplify peephole optimisation rule
+
+	* lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode):
+	Remove some obsolete dynamic variable optimisations that no longer
+	improve any code.  Fix broken logging (thanks Pip).
+
+2026-02-26  Yuan Fu  <casouri@gmail.com>
+
+	Make c-ts-common-comment-start-skip public
+
+	* lisp/progmodes/c-ts-common.el:
+	(c-ts-common-comment-start-skip): Change to public.
+	(c-ts-common-comment-2nd-line-anchor):
+	(c-ts-common-comment-setup): Use it.
+
+2026-02-26  Arsen Arsenović  <arsen@aarsen.me>  (tiny change)
+
+	c-ts-mode: Don't assume comment-start-skip is set
+
+	This patch makes it easier to use the existing C and C++
+	language support in other languages.  Without this patch, if the
+	outer mode sets some specific and more accurate
+	comment-start-skip value, or perhaps leaves it unset,
+	indentation will break.
+
+	* lisp/progmodes/c-ts-common.el (c-ts-common--comment-start-skip):
+	Declare to the value c-ts-common-comment-setup used to set as
+	comment-start-skip.
+	(c-ts-common-comment-setup): Use it, rather than hardcoding.
+	(c-ts-common-comment-2nd-line-anchor): Use it, rather than
+	comment-start-skip.  This makes it easier to reuse C/++
+	indentation rules in other TS modes for embedding C/++ segments
+	in other languages.
+
+2026-02-26  Eric S. Raymond  <esr@thyrsus.com>
+
+	Repair another test bollixed by aggressive optimization.
+
+	Repair ab ecal test by making a variable kexical,
+
+	Complete the test set for floatfns,c.
+
+	Tesrts for the portable primitives in fileio.c.
+
+	Tests for primitives in coding.c and charset.c.
+
+	Tests for primitives from the character.c module.
+
+2026-02-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/vc/smerge-mode.el (smerge-refine-shadow-cursor): Make it thinner
+
+	OTOH a thickness of 1 pixel is a bit too thin on my HiDPI
+	displays, but 2 is too thick on non-HiDPI displays, at least with
+	my default smallish font.
+	I originally favored the HiDPI displays and large fonts,
+	thinking it's a more common situation nowadays, but I changed my
+	mind because the "too thick" problem seems actually more severe
+	because it's occasionally bad enough that it's unclear which
+	cursor is the real one.
+
+2026-02-26  Eric S. Raymond  <esr@thyrsus.com>
+
+	Tests for the lreaf.c amd print.c primitives.
+
+2026-02-25  Eric S. Raymond  <esr@thyrsus.com>
+
+	Tests for remaining functions iun eval.c.
+
+	Completing test coverage for dataa.c orimitives.
+
+	More correctness tesrs for orinitives from fns.c.
+
+	More tests for edit functions, buffers, and markers.
+
+	Added more buffer/marker/editing test coverage.
+
+	Category/charset/coding + char-table tests.
+
+	More test coverage improvements.
+
+2026-02-25  Eric S. Raymond  <esr@thyrsus.com>
+
+	Repair serious breakage in the batch tests.
+
+	There were a bunch of tests that were breaking make check and should
+	never be run in batch mode, because they do things like assuming there
+	is a controlling tty or assuming we can access network services when
+	we can't (e/g. in a CI/CD environment). I have shotgunned this
+	problem by tagging all the failing tests with :nobatch and then
+	changing the default and expensive selectors so make check won't barf
+	all over its shoes.
+
+	As many of these :nobatch should be individually removed as possible, after
+	upgrading the test harness to mock the environmental stuff they need.
+	Investigate these failures with "make check-nobatch".
+
+2026-02-25  Eric S. Raymond  <esr@thyrsus.com>
+
+	More test coverage improvements.
+
+	Bignum corner-case tests in data-tests.el.
+	More buffer-primitive tests in editfns-test.el
+	Some condition-case tesrs in eval-tests.el.
+	And another marker-primitive test in marker-tests.el.
+
+2026-02-25  Eric S. Raymond  <esr@thyrsus.com>
+
+	More test coverage improvements for ERT.
+
+	In marker-tests.el, editfbs-tests.el, and data-tests.el.
+
+2026-02-25  Eric S. Raymond  <esr@thyrsus.com>
+
+	Crrections to tedt coverrage extensuion after bootstrap build.
+
+	Files: data-tests.el, editfns-tests.el.
+
+2026-02-25  Eric S. Raymond  <esr@thyrsus.com>
+
+	Improve test coverage of builtin predicates.
+
+2026-02-25  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New function multiple-command-partition-arguments
+
+	* lisp/subr.el (command-line-max-length): New variable.
+	(multiple-command-partition-arguments): New function.
+	* doc/lispref/processes.texi (Shell Arguments):
+	* etc/NEWS: Document them.
+	* test/lisp/subr-tests.el
+	(subr-multiple-command-partition-arguments): New test.
+
+2026-02-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(define-treesit-generic-mode): Improve autoloading support (bug#80480)
+
+	* lisp/treesit-x.el (define-treesit-generic-mode): Mark it as
+	`(autoload-macro expand)`.
+	Don't autoload the `treesit-language-source-alist` setting.
+	Generate simpler code for the common case where AUTO-MODE is a string.
+
+2026-02-25  Eric S. Raymond  <esr@thyrsus.com>
+
+	Tests for 2 marker primitives previously not covered.
+
+	      - insertion-type
+	      - last-position-after-kill
+
+2026-02-25  Eric S. Raymond  <esr@thyrsus.com>
+
+	Tests for 7 editor primitives previously not covered.
+
+	      - byte-to-position
+	      - byte-to-string
+	      - insert-byte
+	      - insert-buffer-substring
+	      - insert-before-markers-and-inherit
+	      - field-string-and-delete
+	      - constrain-to-field
+
+2026-02-25  Liu Hui  <liuhui1610@gmail.com>
+
+	calendar-check-holidays: Call calendar-increment-month
+
+	* lisp/calendar/holidays.el (calendar-check-holidays): Call
+	calendar-increment-month (bug#80476).
+
+2026-02-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	Make ert more robust
+
+	* lisp/emacs-lisp/ert.el (ert-run-test): Check, that `begin-marker'
+	is still valid.  The *Messages* buffer could have been deleted
+	during test run.
+
+2026-02-24  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Fix eglot-tests on MacOS (bug#80479)
+
+	* test/lisp/progmodes/eglot-tests.el (eglot--call-with-fixture):
+	Normalise 'temporary-file-directory' to stave off problems that
+	occur when it contains symlinks, which is common on MacOS.
+
+2026-02-24  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Speed up 'equal'-comparison of vectorlike objects
+
+	* src/fns.c (internal_equal_1): Switch on the vectorlike type instead of
+	using a sequence of type predicates.
+
+2026-02-24  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Compare circular lists in 'equal' without error (bug#80456)
+
+	* src/lisp.h (FOR_EACH_TAIL_INTERNAL): Divvy up the code into...
+	(FOR_EACH_TAIL_BASIC, FOR_EACH_TAIL_STEP_CYCLEP): ...these macros,
+	so that they can be used in more flexible ways.
+	* src/fns.c (internal_equal_1): Detect circular lists and call...
+	(internal_equal_cycle): ...this function that keeps comparing
+	but now detecting cycles in the other argument.
+
+	* lisp/emacs-lisp/testcover.el (testcover-after):
+	Remove unnecessary error handling.
+	* test/src/fns-tests.el (test-cycle-equal): Adapt and extend.
+	* test/lisp/emacs-lisp/testcover-resources/testcases.el
+	(testcover-testcase-cyc1): Remove case that no longer applies.
+
+	* doc/lispref/objects.texi (Equality Predicates): Update.
+	* etc/NEWS: Announce.
+
+2026-02-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix "End" key in PuTTY and older GNU screen
+
+	* lisp/term/xterm.el (xterm-alternatives-map): Map <select> to
+	<end> (bug#80473).
+
+2026-02-24  Juri Linkov  <juri@linkov.net>
+
+	Revert "Unify tab-bar with window/frame times (bug#80465)"
+
+	This reverts commit e4b3fa4a00761b6644ecf28ae64138a82bddb07d.
+	It breaks the recency order of multi-session tabs.
+
+2026-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/files.el (create-file-buffer): Remove left-over comment
+
+	It should have been removed as part of commit 1a724cc2d2e7.
+
+2026-02-23  Juri Linkov  <juri@linkov.net>
+
+	Fix treesit-show-paren-data to match only 2 children nodes or more
+
+	* lisp/treesit.el (treesit-show-paren-data--categorize):
+	Ignore parent that has less than two children (bug#80475).
+	This ensures the distinct first and last node.
+
+2026-02-23  Stéphane Marks  <shipmints@gmail.com>
+
+	Unify tab-bar with window/frame times (bug#80465)
+
+	Change 'float-time' to 'window-use-time'.  One step closer to
+	"recent" tab selection across all frames with unified pseudo
+	clocks.
+
+	* lisp/tab-bar.el (tab-bar--tab): Use 'window-use-time'.
+	(tab-bar--current-tab-make): Add time property.
+
+2026-02-23  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Use an idle timer for completion-eager-update
+
+	Like how completion-eager-display uses an idle timer, also use
+	one for completion-eager-update, and in fact unify the idle
+	timers to just one to avoid unnecessary duplicate updates.
+
+	* lisp/minibuffer.el (completions--should-show-p): New function.
+	(completions--background-update, completion-help-at-point): Call
+	it.
+	(completions--background-update-timer)
+	(completions--start-background-update): Start an idle timer to
+	call background-update. (bug#80055)
+	(completions--start-eager-display, completions--after-change):
+	Call start-background-update.
+
+2026-02-23  Steven Allen  <steven@stebalien.com>
+
+	Fix arguments to project--buffer-check when reading a project buffer
+
+	* lisp/progmodes/project.el (project--read-project-buffer): Pass the
+	buffer object to `project--buffer-check', not the (BUF-NAME . BUF-OBJ)
+	cons.
+
+2026-02-23  Jacob S. Gordon  <jacob.as.gordon@gmail.com>
+
+	New prefix argument for pp-eval-expression
+
+	* lisp/emacs-lisp/pp.el (pp-eval-expression): New optional
+	argument INSERT-P.
+	* etc/NEWS: Announce change.
+
+2026-02-23  Paul Nelson  <ultrono@gmail.com>
+
+	Fix VC Git error when patch matches staged changes
+
+	* lisp/vc/vc-git.el (vc-git--checkin): Check that patch-string
+	is not empty before applying it.  This prevents an error when
+	the patch exactly matches the index (bug#80228).
+	* test/lisp/vc/vc-git-tests.el
+	(vc-git-test-checkin-patch-staged-diff): New test.
+
+2026-02-23  Collin Funk  <collin.funk1@gmail.com>
+
+	Add SHA-3 support to secure-hash
+
+	* admin/merge-gnulib (GNULIB_MODULES): Add crypto/sha3-buffer.
+	* lib/sha3.c: New file, imported by running admin/merge-gnulib.
+	* lib/sha3.h: Likewise.
+	* m4/sha3.m4: Likewise.
+	* lib/gnulib.mk.in: Updated by admin/merge-gnulib.
+	* m4/gnulib-comp.m4: Likewise.
+	* src/fns.c: Include sha3.h
+	(Fsecure_hash_algorithms): Add Qsha3_224, Qsha3_256, Qsha3_384, and
+	Qsha3_512.
+	(secure_hash): Likewise.
+	(Fsecure_hash): List the SHA-3 algorithms in the docstring.
+	(syms_of_fns): Define Qsha3_224, Qsha3_256, Qsha3_384, and Qsha3_512.
+	* test/lisp/net/gnutls-tests.el (gnutls-tests-internal-macs-upcased):
+	Filter out the new SHA-3 algorithms since they are currently not
+	implemented in gnutls.
+	* test/src/fns-tests.el (test-secure-hash): Add test cases for the new
+	algorithms.
+	* doc/lispref/text.texi (Checksum/Hash): List the SHA-3 algorithms.
+	Mention that they are considered secure.
+	* etc/NEWS: Mention the new feature.
+
+2026-02-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2026-02-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Fix broken `FOO-mode-indent-offset` convention
+
+	Variable names to control indentation have never been
+	standardized, but over the years some conventions have naturally
+	arisen, mostly the use of `FOO-indent-offset`,
+	`FOO-basic-offset`, or `FOO-indent-level` for `FOO-mode`.
+
+	When the new TS modes were introduced, a mistake was made that
+	I failed to catch at the time, where those modes used
+	`FOO-mode-indent-offset` instead of the "standard" `FOO-indent-offset`.
+	In order to save packages like `editorconfig-mode` and `indent-bars-mode`
+	from having to cater to yet-another-convention, rename those
+	vars to what they should have been all along.
+
+	* lisp/editorconfig.el (editorconfig-indentation-alist): Remove the
+	ad-hoc entries for the deviating modes using `FOO-mode-indent-offset`.
+
+	* lisp/textmodes/toml-ts-mode.el (toml-ts-indent-offset):
+	* lisp/textmodes/mhtml-ts-mode.el (mhtml-ts-js-css-indent-offset)
+	(mhtml-ts--js-css-indent-offset):
+	* lisp/textmodes/html-ts-mode.el (html-ts-indent-offset):
+	* lisp/progmodes/typescript-ts-mode.el (typescript-ts-indent-offset):
+	* lisp/progmodes/php-ts-mode.el (php-ts-indent-offset)
+	(php-ts-js-css-indent-offset, php-ts-html-indent-offset):
+	* lisp/progmodes/json-ts-mode.el (json-ts-indent-offset):
+	* lisp/progmodes/java-ts-mode.el (java-ts-indent-offset)
+	(java-ts-method-chaining-indent-offset):
+	* lisp/progmodes/go-ts-mode.el (go-ts-indent-offset):
+	* lisp/progmodes/csharp-mode.el (csharp-ts-indent-offset):
+	* lisp/progmodes/cmake-ts-mode.el (cmake-ts-indent-offset):
+	* lisp/progmodes/c-ts-mode.el (c-ts-indent-offset):
+	Rename `FOO-mode-indent-offset` to `FOO-indent-offset`,
+	with obsolete alias.
+
+2026-02-22  Basil L. Contovounesios  <basil@contovou.net>
+
+	Improve m4-mode font lock
+
+	Emacs 28 started fontifying several 'composite' (non-builtin) GNU M4
+	macros which, while listed under '(m4) Macro index', are not defined
+	by GNU M4, and are included in its manual for illustrative purposes.
+
+	These macro keywords range from clearly misleading (e.g., 'example',
+	which the GNU M4 manual explicitly describes as nonexistent),
+	to common in Autoconf's M4sugar layer (e.g., 'm4_quote'),
+	to variations thereof (e.g., 'foreachq').
+
+	It is arguably too late to revert all of these additions, so this
+	patch selects a handful to remove, and categorizes the rest; this
+	should make it easier to hide some categories behind a font lock
+	level or user option in the future, if desired.
+
+	This patch reverts the Emacs 28 addition of 'example', and removes
+	the older 'file', 'line', and 'gnu' macros.  GNU M4 renamed 'gnu' to
+	'__gnu__' already in 1990; and I couldn't find references to the
+	other two which exist as '__file__' and '__line__', respectively.
+
+	The remaining macros are partitioned into three sets: built-in,
+	M4sugar-like, and other (bug#80412).  For discussion, see also:
+	https://lists.gnu.org/r/emacs-devel/2025-10/msg00357.html
+
+	* lisp/progmodes/m4-mode.el (m4-program-options): Remove stale
+	commentary.
+	(m4--macro-list): Remove, replacing with...
+	(m4--builtin, m4--autoconf, m4--composite): ...these new rx
+	definitions.  All uses changed.  Remove 'example', 'file', 'gnu',
+	and 'line' as keywords.
+	(m4-font-lock-keywords): For consistency with real #-comments,
+	fontify dnl macro with font-lock-comment-delimiter-face, and only
+	the rest of its line with font-lock-comment-face.  Fontify argument
+	references with font-lock-variable-use-face rather than
+	font-lock-variable-name-face.  Use font lock faces rather than their
+	eponymous but obsolete variables.  Remove redundant entries for $@
+	and $*.  Prefer shy regexp groups where applicable.
+	(m4-mode-syntax-table): Quote syntactically special characters.
+	(m4-m4-buffer): DRY using m4-m4-region.
+	(m4-m4-region): Take region bounds as optional arguments, as
+	recommended under '(elisp) The Mark'.  Quote shell command.
+	Support non-contiguous regions.
+	(m4-current-defun-name): Recognize m4 backtick in addition to
+	Autoconf bracket.  Prefer shy regexp groups where applicable.
+	(m4-mode): Simplify font-lock-defaults.
+
+	* test/lisp/progmodes/m4-mode-resources/font-lock.m4:
+	* test/lisp/progmodes/m4-mode-tests.el: New test files.
+
+2026-02-22  Basil L. Contovounesios  <basil@contovou.net>
+
+	Fix apropos-print window selection
+
+	The call to get-buffer-window doesn't take into account other
+	frames, and in theory may even return a window other than the one
+	just displayed.  Work around this by buffer-locally mapping the
+	buffer to the window used by with-output-to-temp-buffer (bug#46034).
+
+	* lisp/apropos.el (apropos--window): New buffer-local variable.
+	(apropos--set-window): New hook function.
+	(apropos-print): Add it to the local temp-buffer-show-hook before
+	the end of with-output-to-temp-buffer.  Check apropos--window first,
+	falling back on a get-buffer-window across visible frames.
+
+2026-02-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	* src/dbusbind.c: Include fcntl.h if needed.  (Bug#80373)
+
+2026-02-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix use of older OpenSSH version in Tramp
+
+	* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
+	Adapt `tramp-login-args' argument.  (Bug#80464)
+	(tramp-ssh-setenv-term): New defvar.
+	(tramp-ssh-setenv-term): New defun.
+	(tramp-do-copy-or-rename-file-out-of-band)
+	(tramp-maybe-open-connection): Use it.
+
+	* lisp/net/tramp.el (tramp-methods, tramp-signal-hook-function):
+	Extend docstring.
+
+2026-02-22  Liu Hui  <liuhui1610@gmail.com>
+
+	Support displaying more months in the calendar
+
+	* lisp/calendar/calendar.el (calendar-month-edges): Fix typo.
+	(calendar-total-months): New variable.
+	(calendar-get-month-range, calendar-get-date-range)
+	(calendar--month-overlap-p, calendar-month-visible-p)
+	(calendar-nongregorian-date-visible-p): New functions.
+	(calendar-nongregorian-visible-p): Declare obsolete.
+	(calendar-recompute-layout-variables, calendar-generate):
+	Replace fixed month numbers with 'calendar-total-months'.
+	(calendar-cursor-to-date, calendar-date-is-visible-p): Support
+	the calendar with more than three months.
+	(calendar-mode): Make some variables buffer-local to allow
+	calendar-mode buffers showing different number of months.
+	(calendar-mode-map): Use new command names.
+
+	* lisp/calendar/cal-move.el (calendar-goto-today): Always move
+	the cursor to today's date.
+	(calendar--show-month-at-edge): New function.
+	(calendar-recenter, calendar-forward-day): Support the calendar
+	with more than three months.
+	(calendar-forward-month, calendar-end-of-month)
+	(calendar-beginning-of-year, calendar-end-of-year): Place the
+	new month at the edge instead of the second month segment, to
+	prevent the cursor from jumping back and forth.  This is
+	consistent with the behavior of calendar-forward-day/week.
+	(calendar-scroll-left): Maintain the relative position of the
+	cursor with respect to the window, when the old date is out of
+	view.
+	(calendar-scroll-left-three-months)
+	(calendar-scroll-right-three-months): Replace the fixed month
+	number with the actual number of months.  Rename ...
+	(calendar-scroll-calendar-left, calendar-scroll-calendar-right):
+	... to new commands.  Make old names as aliases and mark them
+	obsolete.
+	(calendar-show-more-months, calendar-show-fewer-months): New
+	commands.
+
+	* lisp/calendar/cal-menu.el (cal-menu-holiday-window-suffix):
+	Use the actual date range instead of three months.
+	(cal-menu-scroll-menu, cal-menu-global-mouse-menu): Use new
+	command names and update description.
+
+	* lisp/calendar/holidays.el (holidays, list-holidays)
+	(calendar-check-holidays, holiday-in-range): Use
+	calendar-total-months.
+	(calendar-list-holidays, holiday-fixed, holiday-float)
+	(holiday-sexp): Replace displayed-year/month with the actual
+	calendar range.
+	(holiday-after, holiday-easter-etc-abs)
+	(holiday-greek-orthodox-easter-abs): New functions.
+	(holiday-advent, holiday-easter-etc)
+	(holiday-greek-orthodox-easter): Look up holidays in all visible
+	years instead of current displayed-year.
+
+	* lisp/calendar/solar.el (solar-equinoxes-solstices): Search
+	equinoxes and solstices in all visible months.
+	(solar-equinoxes-solstices-1): New function.
+
+	* lisp/calendar/lunar.el (lunar-phase-list): Add optional
+	argument.
+	(calendar-lunar-phases): Use visible calendar range.
+
+	* lisp/calendar/cal-china.el (holiday-chinese-new-year)
+	(holiday-chinese-winter-solstice, holiday-chinese-qingming)
+	(holiday-chinese): Replace displayed-year/month with the actual
+	calendar range, and look up holidays in all visible years.
+
+	* lisp/calendar/cal-julian.el (holiday-julian): Use
+	calendar-nongregorian-date-visible-p because there may exist
+	more than one corresponding dates when the calendar shows more
+	months.
+
+	* lisp/calendar/cal-bahai.el (holiday-bahai): Support calendar
+	with more than three months.
+	(holiday-bahai-new-year, holiday-bahai-twin-holy-birthdays):
+	Look up holidays in all visible years.
+	(holiday-bahai-new-year-1, holiday-bahai-twin-holy-birthdays-1):
+	New functions.
+
+	* lisp/calendar/cal-hebrew.el (calendar-hebrew-date-is-visible-p)
+	(holiday-hebrew, calendar-hebrew-mark-date-pattern): Support
+	calendar with more than three months, in which more than one
+	holidays may exist.
+	(holiday-hebrew-rosh-hashanah-1, holiday-hebrew-hanukkah-1)
+	(holiday-hebrew-passover-1): New functions.
+	(holiday-hebrew-rosh-hashanah, holiday-hebrew-hanukkah)
+	(holiday-hebrew-passover, holiday-hebrew-tisha-b-av): Look up
+	holidays in all visible years.
+
+	* lisp/calendar/cal-islam.el (holiday-islamic): Support calendar
+	with more than three months.
+	(holiday-islamic-new-year): Find holidays in all visible years.
+
+	* lisp/calendar/diary-lib.el (diary-mark-sexp-entries)
+	(calendar-mark-days-named, calendar-mark-date-pattern)
+	(calendar-mark-complex): Use the displayed range instead of the
+	three-month range.
+	(calendar-mark-1): Fix marking dates in calendar with more than
+	three months.
+
+	* test/lisp/calendar/holidays-tests.el
+	(holidays-test-holiday-easter-etc, holidays-test--get-holidays)
+	(holidays-test-more-months): New test file.
+
+	* doc/emacs/calendar.texi: Mention new commands and update
+	related description.
+	* etc/NEWS: Announce new commands.  (bug#80099)
+
+2026-02-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix absolute cursor positioning in term.el
+
+	* lisp/term.el (term-handle-ansi-escape): Cursor Character
+	Absolute uses one-based column numbers; adjust to Emacs's
+	zero-based column numbering.  (Bug#80458)
+
+2026-02-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/net/tramp.el (tramp-signal-hook-function): Extend docstring.
+
+2026-02-22  Stéphane Marks  <shipmints@gmail.com>
+
+	New user option 'after-delete-frame-select-mru-frame' (bug#80397)
+
+	Users can revert to the old 'delete-frame' behavior of selecting
+	the oldest frame in 'frame-list' rather than the most-recently
+	used frame.
+
+	* src/frame.c (delete_frame): Consult
+	'after-delete-frame-select-mru-frame'.
+	(syms_of_frame): New defvar
+	'after-delete-frame-select-mru-frame'.
+	* etc/NEWS: Reflect the new user option.
+
+2026-02-22  Rahul Martim Juliato  <rahul.juliato@gmail.com>
+
+	Add support for hiding markup delimiters in markdown-ts-mode
+
+	* lisp/textmodes/markdown-ts-mode.el
+	(markdown-ts-hide-markup): New defcustom controlling
+	visibility of markup delimiters.
+	(markdown-ts--fontify-delimiter): Fontify delimiter nodes and
+	conditionally apply invisibility.
+	(markdown-ts--set-hide-markup): Internal helper to update
+	invisibility state.
+	(markdown-ts-toggle-hide-markup): Interactive command to toggle
+	delimiter visibility.
+	(markdown-ts-setup): Initialize delimiter hiding according to
+	'markdown-ts-hide-markup' and register managed properties.
+	(markdown-ts--treesit-settings): Use
+	'markdown-ts--fontify-delimiter' for delimiter nodes.
+	(require 'outline): Ensure outline faces are available so
+	headings are fontified correctly on first load.
+
+2026-02-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Stop ENUM_BF worrying about gcc -std=c89 -pedantic
+
+	* src/lisp.h (ENUM_BF): Modernize ENUM_BF doc for latest compilers
+	that still have a beef with enum bitfields.  Simplify by dropping
+	support for ‘gcc -std=c89 -pedantic’, as it’s been many years
+	since Emacs worked with C89, for other reasons.
+
+2026-02-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port Lisp_Fwd to strict C bitfields
+
+	ISO C does not require C compilers to support enum bitfields.
+	Problem found with IBM XL C for AIX 16.1 (2018), which IBM
+	supports through 2029.
+	* src/lisp.h (struct Lisp_Fwd): Use ENUM_BF instead of declaring
+	enum bitfields directly.
+
+2026-02-22  Jim Porter  <jporterbugs@gmail.com>
+
+	Preserve the original order of Eshell aliases when loading
+
+	* lisp/eshell/em-alias.el (eshell-read-aliases-list): Reverse the alias
+	list back to its original order at the end of loading.
+
+	* test/lisp/eshell/em-alias-tests.el
+	(em-alias-test/alias-load-preserves-order)
+	(em-alias-test/alias-save-sorted): New tests.
+
+2026-02-22  Arto Jantunen  <viiru@iki.fi>
+
+	Sort Eshell aliases when adding new ones
+
+	The main point is to make the content of 'eshell-aliases-file' stable so
+	that storing it in git becomes feasible.
+
+	This also makes the output of the alias command come out in alphabetical
+	order (bug#80401).
+
+	* lisp/eshell/em-alias.el (eshell/alias): Sort when updating
+	'eshell-command-aliases-list'.
+
+	* test/lisp/eshell/em-alias-tests.el
+	(em-alias-test/alias-list-is-sorted): New test.
+
+	* etc/NEWS: Announce this change.
+
+2026-02-21  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-do-async-command: Set special-mode only when no mode set
+
+	* lisp/vc/vc-dispatcher.el (vc-do-async-command): Set
+	special-mode only when no other mode set.
+
+2026-02-21  Alan Third  <alan@idiocy.org>
+	    Shay Elkin  <shay@elkin.io>
+
+	Fix GNUstep width calculation (bug#80331)
+
+	* src/nsfns.m (Fx_display_mm_height): 'dpi' should have been 'px_to_mm'.
+
+2026-02-21  Shay Elkin  <shay@elkin.io>  (tiny change)
+
+	Use real display geometry on NS (bug#80331)
+
+	In nsfns.m, `x-display-mm-height' and `x-display-mm-weight' computes the
+	display size by dividing its (logical) pixel dimensions by 92 dpi.
+
+	This would often give wrong results: by default, logical pixels on in
+	macOS are computed to 72 dpi, but that can be changed by the user.
+
+	As macOS multi-screen geometry is all computed based on the main
+	screen's cooridnate system, use its dpi to compute the physical size of
+	the bounding box containing all the screens.
+
+	* src/nsfns.m (Fx_display_mm_height):
+	(Fx_display_mm_width): Calculate the total physical display size
+	using the main-screen's geometry.
+
+2026-02-21  Paul Nelson  <ultrono@gmail.com>
+
+	Make Rmail summary address display customizable
+
+	* lisp/mail/rmailsum.el (rmail-summary-sender-function)
+	(rmail-summary-recipient-function, rmail-summary-address-width):
+	New user options.
+	(rmail-summary--address-display, rmail-summary-name-or-address)
+	(rmail-summary-recipient-strip-quoted-names)
+	(rmail-summary-recipient-names): New functions.
+	(rmail-header-summary): Use them when formatting sender and
+	recipient fields (bug#80406).
+
+	* doc/emacs/rmail.texi (Rmail Make Summary): Document them.
+
+	* test/lisp/mail/rmailsum-tests.el: New file.
+	(rmailsum-tests-name-or-address-prefers-name)
+	(rmailsum-tests-name-or-address-fallback-to-address)
+	(rmailsum-tests-recipient-strip-quoted-names-first-line)
+	(rmailsum-tests-recipient-names-folded)
+	(rmailsum-tests-recipient-names-fallback-to-address): New tests.
+
+2026-02-21  Alan Third  <alan@idiocy.org>
+
+	Fix SVG CSS handling (bug#80384)
+
+	This reverts commit 9f5d17cd7219f72066488c6c57f77e4db9ca2563, but
+	includes the fix for adding user CSS after the generated CSS.
+
+	* src/image.c (svg_load_image): Set the CSS stylesheet using the librsvg
+	functions, instead of inserting it into the wrapper.
+
+2026-02-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid segfaults if someone sets 'composition-function-table' to nil
+
+	* src/composite.c (composition_compute_stop_pos)
+	(composition_reseat_it): Recreate 'composition-function-table' if
+	it ever becomes garbled.  (Bug#80462)
+
+2026-02-21  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New command vc-dir-root-next-action
+
+	* lisp/vc/vc-dir.el (vc-dir-root-next-action): New command.
+	(vc-dir-mode-map): Bind it.
+	* doc/emacs/maintaining.texi (VC Directory Commands):
+	* etc/NEWS: Document it.
+
+2026-02-21  Liu Hui  <liuhui1610@gmail.com>
+
+	Use a custom Pdb class in the Python shell
+
+	The custom Pdb class enables native completion in pdb by
+	wrapping the pdb's native completer.  It also makes necessary
+	function definitions like __PYTHON_EL_* available between pdb
+	frames, and enables non-native completion/ffap/eldoc
+	functionalities when debugging inside python modules.
+
+	* lisp/progmodes/python.el (python-shell-send-setup-code): Fix
+	the separator between python-shell-setup-codes.
+	(python-shell-completion-native-setup): Move common completion
+	setup code ...
+	(python-shell-completion-setup-code): ... here.
+	(python-shell-completion-at-point): Enable native completion for
+	pdb and respect the delimiter of pdb completer.
+	(python-shell-pdb-setup-code): New variable.
+	(python-shell-comint-watch-for-first-prompt-output-filter): Send
+	setup codes only once.
+	(python-ffap-module-path, python-eldoc--get-doc-at-point): Stop
+	sending setup code in every function call.
+	* test/lisp/progmodes/python-tests.el (python-tests--pdb-1)
+	(python-shell-pdb-1): New test.
+	* etc/NEWS: Mention the change.  (bug#80182)
+
+2026-02-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Adapt ELisp Intro manual to recent changes in Emacs
+
+	* doc/lispintro/emacs-lisp-intro.texi (Effect of installation):
+	Fix example.  (Bug#80442)
+	(Review): Adapt to recent Emacs.  (Bug#80447)
+
+2026-02-21  Gabriel Santos  <gabrielsantosdesouza@disroot.org>
+
+	browse-url-firefox-program: Add support for more Firefox variants.
+
+	* lisp/net/browse-url.el (browse-url-firefox-program): Add support for
+	Floorp, LibreWolf and Zen Browser.  (Bug#80398)
+	* etc/NEWS: Announce the change.
+
+2026-02-21  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Remove one lambda level in some Gnus' functions
+
+	* lisp/gnus/gnus-agent.el (gnus-agent-get-undownloaded-list):
+	* lisp/gnus/gnus-cloud.el (gnus-cloud-prune-old-chunks):
+	* lisp/gnus/gnus-draft.el (gnus-draft-check-draft-articles):
+	* lisp/gnus/gnus-group.el (gnus-group-sort-flat)
+	(gnus-group-expire-all-groups):
+	* lisp/gnus/gnus-sum.el (gnus-thread-highest-number):
+	* lisp/gnus/gnus-topic.el (gnus-topic-init-alist)
+	(gnus-topic-sort-topic): Replace the (lambda (x) (fun x))
+	pattern with #'fun.  (Bug#80382)
+
+2026-02-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Fix predicate of `plist-member` on `function-history`
+
+	The keys of this plist are strings and should thus be compared
+	with `equal`.  `eq` works surprisingly often (because we often
+	happen to use exactly the same string) but not always.
+
+	* lisp/loadhist.el (loadhist-unload-element):
+	* src/data.c (add_to_function_history): Pass `equal` to `plist-member`.
+
+2026-02-20  Philip Kaludercic  <philipk@posteo.net>
+
+	New command to skip over the head of Customize buffers
+
+	* lisp/cus-edit.el (custom-mode-map): Bind it.
+	(Custom-goto-first-choice): New command.  (Bug#80218)
+
+2026-02-20  Philip Kaludercic  <philipk@posteo.net>
+
+	* lisp/cus-edit.el (custom-mode-map): Bind 'Custom-reset-standard'
+
+	(Bug#80218)
+
+2026-02-20  Philip Kaludercic  <philipk@posteo.net>
+
+	Add new command 'copy-theme-options'
+
+	* doc/emacs/custom.texi (Custom Themes): Mention command in a
+	general context.
+	(Newcomers Theme): Mention command in the context of the
+	'newcomers-preset' theme
+	* etc/NEWS: Mention new command.
+	* lisp/custom.el (copy-theme-options): New command.
+
+2026-02-20  Philip Kaludercic  <philipk@posteo.net>
+
+	Add a theme and minor mode for new users
+
+	* doc/emacs/custom.texi (Beginners Theme): Document new theme.
+	* etc/NEWS: Mention new theme.
+	* etc/themes/newcomers-presets-theme.el: New file including
+	new theme.
+
+2026-02-20  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Optimise closed-over variables earlier
+
+	* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
+	Treat 'internal-get-closed-var' as a special form and delete it in
+	for-effect context.
+
+2026-02-20  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Remove two obsolete peephole optimisation rules
+
+	* lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode):
+	Remove two rules: the first could sometimes skip a varref in a loop;
+	this was useful before lexical binding but now just makes some code
+	slightly bigger.  The second rule attempted to move a conditional branch
+	from the top to the bottom of a loop but depended on the first to work.
+
+	Both were quite slow, easily measurable when compiling big files, and
+	arguably O(n³) which isn't very good for a peephole optimisation.
+
+2026-02-20  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Show "committing" pseudo-state in VC-Dir during an async checkin
+
+	* lisp/vc/vc-dir.el (vc-dir-fileinfo): New 'display-state'
+	field.
+	(vc-dir-update): Use it.
+	(vc-default-dir-printer):
+	* lisp/vc/vc-git.el (vc-git-dir-printer): Use it.  Fontify a
+	display state of "committing" as vc-dir-status-warning.
+	* lisp/vc/vc-hooks.el (vc--file-getinheprop): New function.
+	* lisp/vc/vc.el (vc-checkin): Set "committing" display state on
+	items we are checking in asynchronously.
+
+2026-02-20  Basil L. Contovounesios  <basil@contovou.net>
+
+	Use git ls-files --deduplicate in project.el (bug#80409)
+
+	* lisp/progmodes/project.el (vc-git-project-list-files): Prefer
+	git ls-files --deduplicate, available since Git 2.31 (2021), over
+	delete-consecutive-dups.  Prefer string-prefix-p and string-suffix-p
+	over slower and more error-prone regexp matching.  Prefer
+	string-match-p over string-match when either will do.
+
+2026-02-19  kobarity  <kobarity@gmail.com>
+
+	Remove (featurep 'project) guards in python.el
+
+	* lisp/progmodes/python.el: Since they are included in emacs 29.1,
+	remove the Package-Requires for seq, project, and flymake.
+	(require 'project): Remove 'noerror argument.
+	(python-shell-get-process-name): Remove (featurep 'project).
+	Use 'project-name'.
+	(run-python)
+	(python--import-sources): Remove (featurep 'project).  (Bug#80405)
+
+2026-02-19  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix invalid vc-state after vc-revert
+
+	* lisp/vc/vc.el (vc-revert-file, vc-revert-files): If the
+	vc-state of the file is 'added', set it to 'unregistered' after
+	the operation, not 'up-to-date'.
+	(vc-revert-files): Fix updating vc-checkout-time to affect files
+	within directories within FILES.
+
+2026-02-19  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc-dispatcher.el (vc-do-async-command): Call special-mode.
+
+2026-02-19  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Restore 'cond' one element clauses to 'cond*'
+
+	* lisp/emacs-lisp/cond-star.el (cond*-non-exit-clause-p)
+	(cond*-non-exit-clause-substance): Treat only one element
+	clauses beginning with match*/pcase* pseudoforms as non-exit.
+	(cond*-convert-condition): Handle exiting clauses with only one
+	element, that is a regular Lisp expression.
+	(cond*):
+	* doc/lispref/control.texi (cond* Macro): Document the change.
+
+2026-02-18  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fixes to with-vc-properties
+
+	* lisp/vc/vc.el (with-vc-properties): Un-gensym
+	'vc-touched-properties'; this is a dynamic variable.  Document
+	the longstanding behavior to capture 'file' while evaluating
+	SETTINGS, and to evaluate SETTINGS for each file to be updated.
+	Declare '(indent 0)'.
+
+2026-02-18  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-dir-show-outgoing-count: Mark a safe local variable
+
+	* lisp/vc/vc-dir.el (vc-dir-show-outgoing-count): Mark a safe
+	local variable.
+
+2026-02-18  Eshel Yaron  <me@eshelyaron.com>
+
+	elisp-scope.el: Add variable value specifications
+
+	We add a symbol property 'elisp-scope-variable-spec', which
+	holds a specification for the values of a variable with that
+	property.  For example, (put 'foo '(symbol . face)) says
+	that the value of variable 'foo' is a face name.
+	This allows elisp-scope.el to analyze forms such as
+	(setq foo 'bar) and (let ((foo 'bar)) ...) more accurately.
+	This is also used for analyzing macros that let-bind (one of)
+	their arguments to a specific special variable, such as
+	'with-connection-local-application-variables'.
+
+	We initially add this new property to some common variables.
+
+	* lisp/emacs-lisp/elisp-scope.el: Add
+	'elisp-scope-variable-spec' property to
+	'coding-system-for-read/write' and 'major-mode'.
+	(elisp-scope--variable-spec): New defsubst.
+	(elisp-scope--let-1, elisp-scope-let*, elisp-scope-setq):
+	Use it.
+	* test/lisp/progmodes/elisp-mode-resources/semantic-highlighting.el:
+	Add test form.
+
+2026-02-18  Juri Linkov  <juri@linkov.net>
+
+	Adapt mode-line faces to dark background mode (bug#80135)
+
+	* lisp/faces.el (mode-line, mode-line-highlight): Adapt to dark background.
+	Suggested by Philip Kaludercic <philipk@posteo.net>.
+
+2026-02-18  Juri Linkov  <juri@linkov.net>
+
+	* lisp/net/goto-addr.el (goto-address-fontify): Fix unbalanced parens.
+
+	Use 'bounds-of-thing-at-point' that relies on
+	'thing-at-point--bounds-of-well-formed-url' to get
+	well-formed url with balanced parens (bug#80429).
+
+2026-02-18  Stéphane Marks  <shipmints@gmail.com>
+
+	Add frame-use-time, get-mru-frame, use mru frame in delete-frame (bug#80397)
+
+	* lisp/frame.el (get-mru-frame): New defun.
+	* src/frame.c (delete_frame): Call 'get-mru-frame' (when force
+	is not Qnoelisp) to select the most recently used frame that is
+	not the deleted frame as the candidate to select.
+	(syms_of_frame): Qget_mru_frame new DEFSYM.
+	* doc/lispref/frames.texi: Document the new functions.
+	* etc/NEWS: Announce the new functions.
+
+2026-02-18  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New 'delete-files' VC backend function for faster mass deletions
+
+	* lisp/vc/vc-git.el (vc-git-delete-files):
+	* lisp/vc/vc-hg.el (vc-hg-delete-files): New functions.
+	* lisp/vc/vc.el (vc-delete-file): Use them.
+
+2026-02-18  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix vc-hg-delete-file on files in nonexistent directories
+
+	* lisp/vc/vc-hg.el (vc-hg-delete-file): Always run hg in the
+	repository root.
+
+2026-02-18  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git-pull, vc-git-incoming-revision: Use push remotes
+
+	* lisp/vc/vc-git.el (vc-git-pull, vc-git-incoming-revision): Use
+	configured push remotes.
+	* etc/NEWS: Announce change to vc-git-pull.
+
+2026-02-18  Yuan Fu  <casouri@gmail.com>
+
+	Change back tree-sitter version requirement (bug#80108)
+
+	Now we use treesit_traverse_sibling_helper when it exists, and
+	use the old code otherwise. So we still support older
+	tree-sitter versions.
+
+	* configure.ac (LIBSYSTEMD_CFLAGS): Add back old config checking
+	for the malloc function. Add another check for
+	ts_tree_cursor_goto_previous_sibling.
+	* src/treesit.c: (treesit_traverse_sibling_helper): Add back the
+	old code that doesn't require
+	ts_tree_cursor_goto_previous_sibling.
+
+2026-02-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Depend explicitly on Gnulib ‘attribute’ module
+
+	Problem reported by Basil L. Contovounesios (bug#80428#8).
+	* admin/merge-gnulib (GNULIB_MODULES): Add ‘attribute’.
+
+2026-02-17  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Use -outstanding not -outgoing-base in VC command names
+
+	* lisp/vc/vc.el (vc-root-diff-outgoing-base)
+	(vc-diff-outgoing-base, vc-log-outgoing-base)
+	(vc-root-log-outgoing-base): Rename from these ...
+	(vc-root-diff-outstanding, vc-diff-outstanding)
+	(vc-log-outstanding, vc-root-log-outstanding): ... to these.
+	All uses changed.
+
+2026-02-17  Basil L. Contovounesios  <basil@contovou.net>
+
+	Mark add-log-always-start-new-record as safe
+
+	* lisp/vc/add-log.el (add-log-always-start-new-record): Mark as
+	safe-local-variable (bug#80408).
+
+2026-02-17  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project--delete-zombie-projects: Bind tramp-error-show-message-timeout to nil
+
+	* lisp/progmodes/project.el (project--delete-zombie-projects):
+	Bind tramp-error-show-message-timeout to nil, to instruct Tramp
+	not to display the "failed to connect" and its message, hiding the
+	current prompt (bug#80340).
+
+2026-02-16  Juri Linkov  <juri@linkov.net>
+
+	Change the default value of 'split-width-threshold' from 160 to 150
+
+	* lisp/window.el (split-width-threshold): Change the default value
+	from 160 to 150 (bug#80050).
+	(split-window-preferred-function):
+	Mention 'split-window-preferred-direction' in the docstring.
+
+2026-02-16  Paul Nelson  <ultrono@gmail.com>
+
+	Add repeat-map for smerge-mode commands
+
+	* lisp/vc/smerge-mode.el (smerge-repeat-map): New keymap (bug#80414).
+
+2026-02-16  Elias Gabriel Perez  <eg642616@gmail.com>
+
+	* lisp/treesit.el (treesit-hs-find-next-block): Fix infloop. (bug#80232)
+
+2026-02-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix cross-reference in Emacs Lisp Intro
+
+	* doc/lispintro/emacs-lisp-intro.texi
+	(Lexical & Dynamic Binding Differences): Fix cross-reference.
+	(Bug#80420)
+
+2026-02-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	Minor Tramp doc clarifications
+
+	* doc/misc/tramp.texi (External packages): Mention handler-bind to
+	trap for remote-file-error.
+	(Traces and Profiles): Explain tramp-error-show-message-timeout.
+
+2026-02-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/system-sleep.el (sleep-event-state): Define to autoload.
+
+	* doc/lispref/commands.texi (Special Events): Fix insert-special-event defun.
+
+2026-02-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix SELinux config without -lselinux
+
+	Without this fix, a 64-bit build on Ubuntu 25.10 x86-64 failed
+	when the libselinux1-dev:i386 package (providing <selinux/selinux.h>)
+	was installed but the libselinux1-dev package (providing
+	/usr/lib/x86_64-linux-gnu/libselinux.so) was not.
+	The first symptom was when compiling emacsclient:
+	‘/usr/bin/ld: ../lib/libgnu.a(file-has-acl.o): in function
+	`get_aclinfo': .../lib/file-has-acl.c:247:(.text+0x4d8): undefined
+	reference to `getfilecon'’.
+	* configure.ac: Default with_selinux to maybe, not to yes.
+	Defer our SELinux configuration to after Gnulib’s, so that
+	we handle any SELinux problems that Gnulib discovers.
+
+2026-02-15  Heinz Fridolin  <heinzfridolin@protonmail.com>
+
+	project.el: Fix in submodules with nonexistent git root (bug#80402)
+
+	project-try-vc--search in a submodule directory tries to find the git
+	root directory, so the local variable root would be set to nil if it
+	didn't exist. Calling project--vc-merge-submodules-p on nil would lead
+	to a crash, so now the while loop aborts beforehand.
+
+2026-02-15  Vili Aapro  <vili.aapro@iki.fi>
+
+	elisp--highlight-function-argument: Handle special syntax correctly
+
+	* lisp/progmodes/elisp-mode.el
+	(elisp--highlight-function-argument): Handle special usage
+	syntax correctly when scanning usage arguments using
+	'forward-sexp' (bug#8432).  Before binding 'origin', skip over
+	blanks, so as not to highlight them, and to move immediately
+	before any possible opening square brackets.  After binding
+	'origin' and before calling 'forward-sexp', skip over opening
+	square brackets, so as to highlight them.  After calling
+	'forward-sexp' and before setting 'start' and 'end', skip over
+	closing square brackets and periods, so as to highlight them.
+
+2026-02-15  Vili Aapro  <vili.aapro@iki.fi>
+
+	elisp--highlight-function-argument: Use forward-sexp
+
+	* lisp/progmodes/elisp-mode.el
+	(elisp--highlight-function-argument): Use 'forward-sexp' to move
+	over usage arguments, handling parenthesized argument patterns
+	monolithically (bug#8432).  Set 'start' and 'end' to the
+	beginning and end, respectively, of the usage argument.
+
+2026-02-15  Vili Aapro  <vili.aapro@iki.fi>
+
+	elisp--highlight-function-argument: Use temporary buffer
+
+	* lisp/progmodes/elisp-mode.el
+	(elisp--highlight-function-argument): Insert 'args' into
+	temporary buffer to prepare for better handling of usage
+	arguments (bug#8432).  Move point after the first opening
+	parenthesis of the arguments string.  In the loop, let `origin'
+	track the point.  No functional change.
+
+2026-02-15  Richard Lawrence  <rwl@recursewithless.net>
+
+	Fix failing iCalendar tests when TZ=UTC
+
+	* lisp/calendar/diary-icalendar.el (diary-icalendar--tz-is-utc-p): New
+	function.
+	(diary-icalendar-convert-time-via-strategy): Don't expect a VTIMEZONE
+	for UTC times.
+	(diary-icalendar-export-region): Don't generate a VTIMEZONE for 'local
+	export strategy in UTC.
+	* test/lisp/calendar/diary-icalendar-tests.el
+	(diary-icalendar-test-entry-parser): Don't generate a VTIMEZONE for
+	'local export strategy in UTC.
+
+2026-02-15  Yikai Zhao  <yikai@z1k.dev>
+
+	Fix project-buffers error on buffers with nil default-directory
+
+	* lisp/progmodes/project.el (project-buffers):
+	Check that default-directory is non-nil (bug#80390).
+
+2026-02-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	delsel.el: Improve the overlay for text replacement
+
+	* lisp/delsel.el (delete-selection-replacement-face): Delete var.
+	(delete-selection-replacement): New face, to replace it.
+	(delsel--replace-overlay, delsel--replace-text): Delete vars and ...
+	(delete-selection--replacement-text): ...use this single var instead.
+	(delete-selection--replacement-cursor): New function.
+	(delete-active-region): Use it with `cursor-sensor-mode` to avoid the
+	overlay lingering too long.
+	(delete-selection--replacement-text): New function extracted from
+	`delete-selection-repeat-replace-region`, with adjustments to account
+	for the above changes.
+	(delete-selection-repeat-replace-region): Use it.
+
+	* lisp/emacs-lisp/cursor-sensor.el (cursor-sensor--detect): Do use
+	`get-pos-property` when it works.  Fix the `missing-p` subfunction
+	so as not to get fooled by a missing property at END.
+
+2026-02-14  Kim F. Storm  <storm@cua.dk>
+
+	delsel.el: Use an overlay to track the replacement text
+
+	This patch was sent back in 2014 as part of bug#18886.
+
+	* lisp/delsel.el (delsel--replace-text-or-position): Delete var.
+	(delete-selection-replacement-face): New defcustom.
+	(delsel--replace-text, delsel--replace-overlay): New vars.
+	(delete-active-region, delete-selection-repeat-replace-region):
+	Use overlay to track replacement text instead of abusing the
+	undo-list; this allows the text to be edited before it is
+	used for substitutions.  Add highlight to the replacement text.
+
+2026-02-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	etc/NEWS: Improve text for threads' "buffer disposition"
+
+2026-02-14  Basil L. Contovounesios  <basil@contovou.net>
+
+	Prefer value< with new 'sort' in json.el
+
+	Now that json.el uses the new sort calling convention, there's no
+	need to prefer string< over value<, which may even run faster.
+	Suggested by Mattias Engdegård <mattias.engdegard@gmail.com>.
+
+	* lisp/json.el (json-encoding-object-sort-predicate): Mention value<
+	in docstring.
+	(json-pretty-print-buffer-ordered, json-pretty-print-ordered): Use
+	value< in place of string<.
+	* test/lisp/json-tests.el (test-json-encode-hash-table-sort): Use
+	value< as json-encoding-object-sort-predicate in at least one test.
+
+2026-02-14  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-pull-and-push: Fix when visiting untracked files
+
+	* lisp/vc/vc.el (vc-pull-and-push): Don't fail when called from
+	buffers visiting unregistered or ignored files.
+
+2026-02-14  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc.el (vc-push): Fix when visiting untracked files.
+
+2026-02-14  Philip Kaludercic  <philipk@posteo.net>
+
+	Don't invoke Dired with -R when reviewing packages
+
+	* lisp/emacs-lisp/package.el (package-review): Remove
+	potentially unportable "-R" switch when calling 'dired'.
+
+2026-02-14  Philip Kaludercic  <philipk@posteo.net>
+
+	Do not upgrade VC packages using 'package-upgrade'
+
+	* lisp/emacs-lisp/package.el (package-upgrade): Trigger error
+	redirecting user to use 'package-vc-upgrade'.
+	(package--upgradeable-packages): Exclude VC packages from list
+	of "upgradable" packages.
+
+2026-02-14  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix vc-pull from buffers visiting untracked files
+
+	* lisp/vc/vc.el (vc-pull): Don't fail when called from buffers
+	visiting unregistered or ignored files so long as there is a
+	'pull' function available from the backend.
+
+2026-02-14  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-find-backend-function: Require vc for default implementations
+
+	* lisp/vc/vc-hooks.el (vc-find-backend-function): Require vc for
+	default implementations (bug#80254).  Report and fix due to
+	Daniel Mendler <mail@daniel-mendler.de>.
+
+2026-02-14  Stéphane Marks  <shipmints@gmail.com>
+
+	vtable fixes for tty rendering (bug#80312)
+
+	* lisp/emacs-lisp/vtable.el (vtable--insert-line): Do not
+	produce a divider after the final column.  This thinko is more
+	noticeable on a tty.
+	(vtable--insert-header-line): On a tty, nullify indicator
+	padding.
+	(vtable-tty-char-pixel-width): New defconst.
+	(vtable--compute-width): On a tty, adjust column width specified
+	in pixels down by a factor of 'vtable-tty-char-pixel-width'.
+	(vtable--alter-column-width): On a tty, adjust column width in
+	characters, otherwise in pixels.
+
+2026-02-14  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Improve vc-git-topic-outgoing-base fallback algorithm
+
+	* lisp/vc/vc-hg.el (vc-hg--bookmarks): New function.
+	(vc-hg-trunk-or-topic-p):
+	* lisp/vc/vc-git.el (vc-git--branch-remotes)
+	(vc-git-trunk-or-topic-p): New optional BRANCH argument.
+	(vc-trunk-or-topic-p): Declare.
+	(vc-git-topic-outgoing-base): Consider only local trunks, if
+	there are any (bug#80006).
+	* lisp/vc/vc.el (trunk-or-topic-p): New optional BRANCH
+	argument.
+	(vc-trunk-or-topic-p): New function.
+	(vc--outgoing-base): Call it.
+
+2026-02-14  Visuwesh  <visuweshm@gmail.com>
+
+	Escape attribute values and string DOMs when inserting them
+
+	* lisp/net/shr.el (shr-dom-print): Escape these strings, as done
+	in `dom-print', to prevent producing an erroneous XML document.
+	* test/lisp/net/shr-tests.el (dom-print-escape): Add new test
+	(Bug#80383).
+
+2026-02-14  Eli Zaretskii  <eliz@gnu.org>  (tiny change)
+
+	Fix 'eglot-imenu'
+
+	* lisp/progmodes/eglot.el (eglot--imenu-SymbolInformation): Fix
+	call to 'plist-get'.  Patch by Lester Longley <lester@ieee.org>.
+	(Bug#80367)
+
+2026-02-14  Marco Wahl  <marcowahlsoft@gmail.com>
+
+	Add revert capability for page directory buffer
+
+	* lisp/textmodes/page-ext.el (pages-directory-revert-function): New
+	function.
+	(pages-directory-list-all-headers-p, pages-directory-count-lines-p)
+	(pages-directory-regexp): New variables to store the page directory
+	style.  (Bug#80319)
+
+2026-02-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix handling of window-specific overlays in buffer iteration for display
+
+	* src/xdisp.c (compute_display_string_pos): Pay attention to
+	'display' properties that come from overlays, in case the overlays
+	are window-specific.  Call 'handle_display_prop' with the argument
+	OVERLAY non-nil, if the property is from an overlay.
+	(compute_display_string_end): Accept an additional argument, a
+	pointer to the window; all callers changed.  Pay attention to
+	'display' properties that come from overlays, in case the overlays
+	are window-specific.  In particular, if the property comes from an
+	overlay, use that overlay's end position as the next place where
+	the 'display' property changes, effectively disregarding any
+	properties on buffer text that is replaced by this overlay's
+	'display' property.
+	(handle_single_display_spec): Always use the end position of the
+	overlay which determined the 'display' property as the end of the
+	property, to make sure we obey windows-specific overlays.
+	* src/bidi.c (bidi_fetch_char): Adapt to the above change.
+	* src/dispextern.h: Adjust prototype of 'compute_display_string_end'.
+	(Bug#80255)
+
+2026-02-14  Eshel Yaron  <me@eshelyaron.com>
+
+	New option 'completion-preview-inhibit-functions' (bug#80370)
+
+	* lisp/completion-preview.el
+	(completion-preview-inhibit-functions): New option.
+	(completion-preview--post-command): Respect it.
+	* etc/NEWS: Announce it.
+
+2026-02-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Say in Emacs Lisp Intro how to contribute code to Emacs
+
+	* doc/lispintro/emacs-lisp-intro.texi (Permanent Installation):
+	Add a cross-reference to "Contributing" in the Emacs user manual.
+	Suggested by Matto Fransen <matto@matto.nl>.  (Bug#80393)
+
+2026-02-14  Matthias Meulien  <orontee@gmail.com>
+
+	Support 'speedbar-prefer-window' in 'speedbar-get-focus'
+
+	* lisp/speedbar.el (speedbar-get-focus)
+	(speedbar-frame-or-window): Support for 'speedbar-prefer-window'
+	with fix of 'speedbar-window' trying to delete current frame.
+	(Bug#80392)
+
+2026-02-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Adjust documentation to changes in 'overlays-in' and 'overlays-at'
+
+	* src/buffer.c (overlays_in): Fix commentary to match the code.
+	(Foverlays_in, Foverlays_at): Doc fixes.  (Bug#80242)
+
+	* test/src/buffer-tests.el (test-overlays-at-2): Add one test.
+
+	* doc/lispref/display.texi (Finding Overlays): Update and improve
+	the documentation of 'overlays-in' and 'overlays-at'.
+
+	* etc/NEWS: Announce the changes.
+
+2026-02-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	ede/proj-shared.el: Remove leftover obsolete EIEIO name arguments
+
+	* lisp/cedet/ede/proj-shared.el (ede-gcc-shared-compiler)
+	(ede-gcc-libtool-shared-compiler, ede-cc-linker-libtool)
+	(ede-g++-shared-compiler, ede-g++-libtool-shared-compiler)
+	(ede-g++-linker-libtool): Remove obsolete name argument to `clone`.
+
+2026-02-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify GCC with gdk-pixbuf 2.44
+
+	* src/pgtkfns.c (xg_set_icon_from_xpm_data):
+	* src/xfns.c (xg_set_icon_from_xpm_data):
+	gdk-pixbuf 2.44 (2025-09) deprecated xg_set_icon_from_xpm_data,
+	and this breaks --enable-gcc-warnings builds.
+	For now, pacify GCC by using a pragma.
+
+2026-02-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Remove vla.h
+
+	Uses of <vla.h>’s macro VLA_ELEMS were removed some time ago.
+	* admin/merge-gnulib (GNULIB_MODULES): Remove vla.
+	* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
+	* lib/vla.h: Remove.
+	* src/fns.c, src/lread.c: Do not include <vla.h>.
+
+2026-02-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2026-02-14  Dmitry Gutov  <dmitry@gutov.dev>
+
+	vc-log-show-limit: Change default to 500, and the button to 4X
+
+	* lisp/vc/vc.el (vc-log-show-limit):
+	Change the default to 500 (bug#80037).
+	(vc-print-log-setup-buttons): Have the first button prompt and
+	propose 4X the current limit as the default.
+	(vc-print-fileset-branch-log):
+	Update the reference to the changed button text.
+
+	* lisp/vc/log-view.el (log-view-end-of-defun-1): Same.
+
+	* doc/emacs/maintaining.texi (VC Change Log): Also here.
+
+2026-02-13  João Távora  <joaotavora@gmail.com>
+
+	Rewrite flex completion with Gotoh algorithm
+
+	The greedy regexp matching, broken scoring and broken highlight were
+	sources of frequent complaints about the 'flex' matching style.  This
+	commit fixes that.
+
+	Inspired by the 'hotfuzz' style (available at
+	https://github.com/axelf4/hotfuzz) it uses a modified version of Gotoh's
+	1982 dynamic programming algorithm. It is strictly more correct than the
+	"old" flex.  For example, when matching the pattern 'goto' to no longer
+	will 'eglot-format' be sorted before some hypothetical much better
+	'goobarbaz-goto'.  And of course the highlighting is also correctly
+	placed on the 'goto', not scattered across the candidate.
+
+	Regarding performance, it is faster than the naive 'flex', primarily
+	because of the Elisp rewrite in minibuffer.el.  The matching and costing
+	algorithm matters but is not the bottleneck.
+
+	The Elisp parts of the style were almost completely decoupled from the
+	pcm/substring styles in lisp/minibuffer.el.  Only
+	'completion-flex-try-completion' uses some of pcm's code for pattern
+	augmentation.
+
+	* src/minibuf.c (completion--flex-cost-gotoh): New function.
+
+	* lisp/minibuffer.el (completion-flex--pattern-str): New variable.
+	(flex-score-match-tightness): Make obsolete.
+	(completion--flex-all-completions-1): New helper function.
+	(completion-flex-try-completion, completion-flex-all-completions): Rewrite.
+	(completion-substring--all-completions): No longer take transform-pattern-fn.
+	(completion--flex-adjust-metadata): Tweak.
+	(completion--flex-score, completion--flex-score-1)
+	(completion--flex-score-last-md, completion-flex--make-flex-pattern): Delete.
+
+	* test/lisp/minibuffer-tests.el (completion--sorted-flex-completions):
+	New helper function.
+	(completion-flex-test-non-ascii): New test.
+	(completion--pcm-score): Delete.
+	(completion-pcm-test-3, completion-pcm-test-4)
+	(completion-substring-test-1, completion-substring-test-2)
+	(completion-flex-test-2, completion-flex-test-3): Tweak.
+
+	* etc/NEWS: Describe change.
+
+2026-02-13  Philip Kaludercic  <philipk@posteo.net>
+
+	Only check regular files for package metadata
+
+	* lisp/emacs-lisp/package.el (package-dir-info): Do not check
+	files that do not satisfy 'file-regular-p' when trying to find
+	the file with the package metadata.  (Bug#79742)
+
+2026-02-13  Philip Kaludercic  <philipk@posteo.net>
+
+	Improve 'package-upgrade-all' robustness
+
+	* lisp/emacs-lisp/package.el (package-upgrade-all): Do not quit
+	because a single upgrade fails with an error.  (Bug#80357)
+
+2026-02-13  Philip Kaludercic  <philipk@posteo.net>
+
+	Fix 'help-echo' for package suggestions in mode line
+
+	* lisp/emacs-lisp/package-activate.el (package--autosugest-line-format):
+	Remove variable and function.
+	(package--autosuggest-after-change-mode): Inject upgrade prompt
+	using ':propertize'.  We can drop the condition testing if there
+	are any suggestions, as installing the package changes the major
+	mode and thus also 'mode-name'.
+
+2026-02-13  Philip Kaludercic  <philipk@posteo.net>
+
+	Autoload 'diff-no-select'
+
+	* lisp/emacs-lisp/package.el (package-review): Remove
+	unnecessary 'require'.
+	* lisp/eshell/em-unix.el: Remove declaration.
+	* lisp/files.el (save-some-buffers-action-alist): Remove
+	unnecessary 'require'.
+	* lisp/vc/diff.el (diff-no-select): Autoload it.
+
+	(Bug#80288)
+
+2026-02-13  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/emacs-lisp/cond-star.el (cond*): New Edebug specification.
+
+2026-02-13  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix neocmakelsp invocation
+
+	See https://github.com/joaotavora/eglot/issues/1578
+
+	* lisp/progmodes/eglot.el (eglot-server-programs): Fix neocmakelsp
+
+2026-02-13  kobarity  <kobarity@gmail.com>
+
+	Revert "Use 'project-name-cached' in 'python-shell-get-process-name'"
+
+	This reverts commit 482748592f61abed6f675e7b62b2d56e4e18a146.
+
+	Commit 583a112169f0c964552b94f84ea0c942377a14e6 removed
+	'project-name-cached' and also resolved bug#80045.
+
+2026-02-13  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Fix new eglot test failure due to project cache
+
+	* test/lisp/progmodes/eglot-tests.el
+	(eglot-test-project-wide-diagnostics-rust-analyzer):
+	Bind project-vc-non-essential-cache-timeout to 0 so that the
+	result of project-current is refreshed (bug#80387).
+
+2026-02-12  Philip Kaludercic  <philipk@posteo.net>
+
+	Merge branch 'feature/package-autosuggest'
+
+2026-02-12  Basil L. Contovounesios  <basil@contovou.net>
+
+	Use new 'sort' calling convention in json.el
+
+	* lisp/json.el (json--print-alist): Use new 'sort' calling
+	convention for simplicity and potential performance gains.
+
+2026-02-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp signals 'remote-file-error' consequently
+
+	* doc/misc/tramp.texi (External packages): Mention also special events.
+	Emphasise, that Tramp raises remote-file-error.
+
+	* etc/NEWS: Tramp signals 'remote-file-error' consequently.
+	Presentational fixes and improvements.
+
+	* lisp/net/tramp.el (tramp-skeleton-process-file)
+	(tramp-handle-make-symbolic-link, tramp-process-actions)
+	(tramp-wait-for-regexp, tramp-send-string):
+	* lisp/net/tramp-adb.el (tramp-adb-get-device)
+	(tramp-adb-send-command-and-check, tramp-adb-barf-unless-okay)
+	(tramp-adb-wait-for-output, tramp-adb-maybe-open-connection):
+	* lisp/net/tramp-archive.el (tramp-archive-handle-not-implemented):
+	* lisp/net/tramp-crypt.el (tramp-crypt-do-encrypt-or-decrypt-file-name)
+	(tramp-crypt-do-encrypt-or-decrypt-file):
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-dbus-event-error)
+	(tramp-gvfs-maybe-open-connection):
+	* lisp/net/tramp-sh.el
+	(tramp-do-directory-files-and-attributes-with-perl)
+	(tramp-do-copy-or-rename-file-directly)
+	(tramp-do-copy-or-rename-file-out-of-band)
+	(tramp-sh-handle-file-local-copy, tramp-sh-handle-write-region)
+	(tramp-bundle-read-file-names, tramp-maybe-send-script)
+	(tramp-find-file-exists-command, tramp-barf-if-no-shell-prompt)
+	(tramp-maybe-open-connection, tramp-wait-for-output)
+	(tramp-send-command-and-check, tramp-barf-unless-okay)
+	(tramp-send-command-and-read, tramp-get-ls-command):
+	* lisp/net/tramp-smb.el (tramp-smb-handle-file-attributes)
+	(tramp-smb-handle-make-symbolic-link)
+	(tramp-smb-maybe-open-connection, tramp-smb-call-winexe):
+	* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
+	* lisp/net/tramp-sudoedit.el (tramp-sudoedit-send-command-and-read):
+	Raise a `remote-file-error' in case of connection problems.
+
+	* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection): Improve
+	check for host.
+
+	* lisp/net/tramp-smb.el (tramp-smb-get-localname): Improve error message.
+
+	* lisp/net/tramp-sudoedit.el (tramp-default-host-alist):
+	Set a default for "sudoedit" method.
+	(tramp-sudoedit-maybe-open-connection): Check for proper host name.
+	(tramp-sudoedit-send-command): Do not expand ?h.
+
+	* lisp/net/tramp.el (tramp-compute-multi-hops): Check for cycle
+	proxy definition.
+
+	* test/lisp/net/tramp-archive-tests.el (tramp-archive-test20-file-modes)
+	(tramp-archive-test21-file-links): Check for `rmote-file-error'.
+
+	* test/lisp/net/tramp-tests.el (tramp-file-name-with-sudo): Declare.
+	(tramp--test-ignore-make-symbolic-link-error): Check for
+	`rmote-file-error'.
+	(tramp-test03-file-name-method-rules): Delete.
+	(tramp-test03-file-error): New test.
+	(tramp--test-supports-processes-p): Make it more rebust.
+
+2026-02-12  Basil L. Contovounesios  <basil@contovou.net>
+
+	Check that a UPower battery device IsPresent
+
+	The composite DisplayDevice is meant to be presented to the user
+	only if it IsPresent.  It is not entirely clear whether PowerSupply
+	implies IsPresent, so check both (bug#80229).
+
+	* lisp/battery.el (battery-upower): Skip hot-removable batteries
+	that are missing from the bay.
+
+2026-02-12  Basil L. Contovounesios  <basil@contovou.net>
+
+	Allow disabling battery-update-timer
+
+	Now that battery--upower-subscribe registers to signals from
+	DisplayDevice (bug#80229), it is possible to react to more than just
+	State changes, including Percentage and IsPresent (although the
+	latter may already be covered by the DeviceAdded and DeviceRemoved
+	signals).
+
+	That means that it should be possible to disable polling via
+	battery-update-timer and still get timely mode line updates.
+
+	* etc/NEWS
+	(Changes in Specialized Modes and Packages in Emacs 31.1):
+	Announce new battery-update-interval :type.
+
+	* lisp/battery.el (battery-update-interval): Allow setting to nil.
+	(display-battery-mode): Do not create battery-update-timer then.
+	(battery-upower-display-device-path): New constant.
+	(battery--upower-subscribe): Use it.
+	(battery-upower-subscribe-properties): New variable.
+	(battery--upower-props-changed): Use it for more flexibility over
+	which DisplayDevice properties to react to.
+	(battery--upower-signal-handler): Call battery-update-handler
+	directly when there is no battery-update-timer.
+
+2026-02-12  Morgan Smith  <Morgan.J.Smith@outlook.com>
+
+	battery.el: Update on "DisplayDevice" state change
+
+	* lisp/battery.el (battery--upower-props-changed): Check if the
+	"State" has changed.
+	(battery--upower-subscribe): Subscribe to state changes of the
+	"DisplayDevice" (bug#80229).
+
+2026-02-12  Helmut Eller  <eller.helmut@gmail.com>
+
+	* src/lisp.h (struct Lisp_Fwd): Add comments.
+
+2026-02-12  Helmut Eller  <eller.helmut@gmail.com>
+
+	Add tests for per-buffer variables with predicates
+
+	* test/src/data-tests.el (data-tests-per-buffer-var-predicates): New.
+
+2026-02-12  Helmut Eller  <eller.helmut@gmail.com>
+
+	Move the Lisp_Fwd.bufoffset field back to the union
+
+	* src/lisp.h (struct Lisp_Fwd): With the predicate enum, we can now pack
+	the offset and the predicate into a one-word struct.
+	(XBUFFER_OFFSET): Use the new field name.
+	* src/buffer.c (DEFVAR_PER_BUFFER): Create the one-word struct.
+	* src/data.c (store_symval_forwarding): Use the new field name.
+
+2026-02-12  Helmut Eller  <eller.helmut@gmail.com>
+
+	Introduce an enum Lisp_Fwd_Predicate
+
+	Using an enum instead of a symbol makes it obvious that this field is
+	of no concern to the GC.
+
+	* src/lisp.h (enum Lisp_Fwd_Predicate): New.
+	(struct Lisp_Fwd): Use it instead of a symbol.
+	* src/buffer.c (DEFVAR_PER_BUFFER): Create the necessary enum constant
+	instead of a symbol.
+	* src/data.c (check_fwd_predicate, check_choice): New helpers.
+	(store_symval_forwarding): Use it.
+
+2026-02-12  Helmut Eller  <eller.helmut@gmail.com>
+
+	Remove struct Lisp_Buffer_Objfwd
+
+	* src/lisp.h (struct Lisp_Buffer_Objfwd): Deleted.
+	(struct Lisp_Fwd): Add the fields bufoffset and bufpredicate.
+	Make the type a 1-byte bitfield so that the entire struct still
+	fits in two words.
+	(XBUFFER_OFFSET): Renamed from XBUFFER_OBJFWD.
+	* src/buffer.c (DEFVAR_PER_BUFFER, defvar_per_buffer)
+	(buffer_local_value): Update accordingly.
+	* src/data.c (do_symval_forwarding, store_symval_forwarding)
+	(set_internal, default_value, set_default_internal)
+	(Fmake_local_variable, Fkill_local_variable, Flocal_variable_): Use
+	XBUFFER_OFFSET.
+
+2026-02-12  Helmut Eller  <eller.helmut@gmail.com>
+
+	Remove struct Lisp_Kboard_Objfwd
+
+	* src/lisp.h (struct Lisp_Kboard_Objfwd): Deleted ...
+	(struct Lisp_Fwd): ... replaced with field kbdoffset.
+	(DEFVAR_KBOARD): Use new field.
+	* src/data.c (XKBOARD_OFFSET): Renamed from XKBOARD_OBJFWD.
+	(do_symval_forwarding, store_symval_forwarding
+	(set_default_internal): Use it .
+
+2026-02-12  Helmut Eller  <eller.helmut@gmail.com>
+
+	Remove struct Lisp_Objfwd
+
+	* src/lisp.h (struct Lisp_Objfwd): Deleted.
+	(struct Lisp_Fwd): Replace it with objvar field.
+	(DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_LISP_NOPROX): Use the field.
+	* src/lread.c (defvar_lisp): Updated as needed.
+	* src/pdumper.c (dump_field_fwd): Use the field.
+	* src/data.c (XOBJVAR): Renamed and updated from XOBJFWD.
+	(do_symval_forwarding, store_symval_forwarding): Use it.
+
+2026-02-12  Helmut Eller  <eller.helmut@gmail.com>
+
+	Remove struct Lisp_Boolfwd
+
+	* src/lisp.h (struct Lisp Boolfwd): Deleted
+	(struct Lisp_Fwd): Replaced it with a boolvar field.
+	(DEFVAR_BOOL): Update.
+	* src/data.c (XBOOLVAR): Renamed from XBOOLFWD.
+	(do_symval_forwarding, store_symval_forwarding): Use it.
+	* src/pdumper.c (dump_field_fwd): Use boolvar field.
+
+2026-02-12  Helmut Eller  <eller.helmut@gmail.com>
+
+	Remove struct Lisp_Intfwd
+
+	It was a struct with a single field.
+
+	* src/lisp.h (struct Lisp_Intfwd): Deleted.
+	(struct Lisp_Fwd): Add an intvar field instead.
+	(DEFVAR_INT): Update accordingly.
+	* src/data.c (XINTVAR): Updated and renamed from XFIXNUMFWD.
+	(do_symval_forwarding, store_symval_forwarding): Use it.
+
+2026-02-12  Helmut Eller  <eller.helmut@gmail.com>
+
+	Introduce a struct Lisp_Fwd
+
+	This contains the type and an union of Lisp_Objfwd, Lisp_Intfwd etc.
+	lispfwd is now a pointer to a struct Lisp_Fwd; the void *fwdptr field is
+	gone.
+
+	* src/lisp.h (struct Lisp_Fwd): New.
+	(Lisp_Intfwd, Lisp_Boolfwd, Lisp_Objfwd, Lisp_Buffer_Objfwd)
+	(Lisp_Kboard_Objfwd): The type is in in Lisp_Fwd.
+	(lispwfd): Is now a pointer to struct Lisp_Fwd.
+	(SYMBOL_BLV, SET_SYMBOL_FWD, XFWDTYPE, BUFFER_OBJFWDP): Update
+	accordingly.
+	(defvar_lisp, defvar_lisp_nopro, defvar_bool, defvar_int)
+	(defvar_kboard): These all take now a Lisp_Fwd.
+	(DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL, DEFVAR_INT)
+	(DEFVAR_KBOARD): Update for new types.
+	* src/lread.c (defvar_int, defvar_bool, defvar_lisp_nopro)
+	(defvar_lisp, defvar_kboard): Update for new types.
+	* src/pdumper.c (dump_field_fwd, dump_blv): Update accordingly.
+	(dump_fwd_int, dump_fwd_bool, dump_fwd_obj, dump_fwd_buffer_obj)
+	(dump_fwd): Deleted.
+	* src/buffer.c (DEFVAR_PER_BUFFER, defvar_per_buffer, buffer_local_value)
+	(set_buffer_internal_1): Update accordingly for new types.
+	* src/data.c (XBOOLFWD, XKBOARD_OBJFWD, XFIXNUMFWD, XOBJFWD, boundp)
+	(store_symval_forwarding, swap_in_global_binding)
+	(swap_in_symval_forwarding, find_symbol_value, set_internal)
+	(default_value, set_default_internal, make_blv, Fmake_local_variable):
+	Update accordingly.
+
+2026-02-12  Helmut Eller  <eller.helmut@gmail.com>
+
+	Make Lisp_Buffer_Objfwd objects const
+
+	The predicate field is always a builtin symbol.  That means we know the
+	bit pattern at compile-time and they don't change at runtime.
+
+	* src/buffer.c (DEFVAR_PER_BUFFER): Create a const struct.
+	(defvar_per_buffer): Remove predicate and address arguments.
+	(syms_of_buffer): Instead of &BVAR (current_buffer, foo) use a plain foo
+	as argument to DEFVAR_PER_BUFFER.
+
+	* src/pdumper.c (dump_field_fwd): No more relocs needed for
+	Lisp_Fwd_Buffer_Obj and we can't apply them in the .rodata section.
+
+2026-02-12  Helmut Eller  <eller.helmut@gmail.com>
+
+	Don't dump lispfwd objects
+
+	The forwarding structs already exist in the data or bss section.
+	They are all created with DEFVAR_INT and similar macros.  Instead
+	of creating new structs in the dump, create relocs to the data section.
+
+	* src/pdumper.c (dump_field_fwd): New.
+	(dump_blv, dump_symbol): Use it.
+	(dump_pre_dump_symbol): Don't dump fwd objects.
+
+2026-02-12  Stephen Berman  <stephen.berman@gmx.net>
+
+	Make 'overlays_in' use only real EOB (bug#80242)
+
+	This restores the original behavior of 'overlays_in'.  Changes in
+	this behavior had been made for cases of narrowing, but this
+	resulted in a regression with uses of 'remove-overlays'.
+
+	* src/buffer.c (overlays_in): Change all occurrences of ZV to Z.
+
+	* test/src/buffer-tests.el (test-overlays-in-2)
+	(test-remove-overlays): Adjust expected results to accommodate
+	changes in 'overlays_in'.
+
+2026-02-12  Philip Kaludercic  <philipk@posteo.net>
+
+	Ensure package contents for package suggestions
+
+	* lisp/emacs-lisp/package.el (package--autosugest-prompt): Query
+	archives if the package being described is not listed in
+	package-archive-contents'.
+
+2026-02-12  Philip Kaludercic  <philipk@posteo.net>
+
+	Simplify mode-line prompt for package suggestions
+
+	* lisp/emacs-lisp/package-activate.el (package--autosugest-line-format):
+	Just indicate that packages can be installed, don't mention which.
+
+2026-02-12  Stéphane Marks  <shipmints@gmail.com>
+
+	Move ns_init_colors from ns_term_init to emacs.c (bug#80377)
+
+	Accommodate NS Emacs on a headless system.
+
+	Add error checking for failed calls to NSColorList writeToURL
+	and writeToFile.
+
+	* src/nsterm.m (ns_term_init): Move color initialization to
+	nsfns.m.
+	* src/nsfns.m (ns_init_colors): New function.
+	(Fns_list_colors): Call ns_init_colors.
+
+2026-02-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/calendar/diary-icalendar.el (di:summary-regexp): Fix `:type`
+
+2026-02-12  Arto Jantunen  <viiru@debian.org>
+
+	Avoid errors in shr.el due to fractional colspan attribute
+
+	Apparently some people believe that a colspan can be fractional, and
+	produce HTML with such.  Make it possible for SHR to render such HTML
+	by truncating colspan.
+	* lisp/net/shr.el (shr-make-table-1): Ensure 'colspan' is a fixnum.
+	(Bug#80354)
+
+2026-02-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Add a character to IPA input method
+
+	* lisp/leim/quail/ipa.el ("ipa"): Add ɜ.  Suggested by Coque Couto
+	<coque.couto@gmail.com>.  (Bug#80364)
+
+2026-02-12  Rahul Martim Juliato  <rahuljuliato@gmail.com>
+
+	Fix parsing of Title field in Newsticker List buffer
+
+	* lisp/net/newst-backend.el (newsticker--parse-text-container):
+	Only "xhtml" type contains inline XML nodes that need to be run
+	through 'newsticker--unxml' to serialize back to a string.
+	(Bug#80317)
+
+2026-02-12  समीर सिंह Sameer Singh  <lumarzeli30@gmail.com>
+
+	Improve composition rules for Devanagari script
+
+	* lisp/language/indian.el (devanagari-composable-pattern): Account
+	for contextual positioning of punctuation signs when preceded by
+	a character.  (Bug#80368)
+
+	Improve the Devanagari composition rules to account for contextual
+	positioning of punctuation signs when preceded by a character.
+
+2026-02-12  Martin Rudalics  <rudalics@gmx.at>
+
+	Scale position values in xg_frame_set_size_and_position
+
+	* src/gtkutil.c (xg_frame_set_size_and_position): Scale
+	position values.
+
+2026-02-12  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Revise the paragraph about project-vc's caching
+
+	* doc/emacs/maintaining.texi (VC-Aware Project Backend):
+	Rephrase and mention a way to force invalitation (bug#78545).
+
+2026-02-11  Richard Lawrence  <rwl@recursewithless.net>
+
+	* doc/emacs/calendar.texi (Diary iCalendar Import): Doc fix.
+
+2026-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(describe-mode): Fix bug#80170
+
+	* lisp/help-fns.el (describe-mode--minor-modes): Add argument `buffer`.
+	(describe-mode): Use it to fix call to `documentation` so the
+	docstrings are computed in the right buffer and thus show
+	correctly when bindings are shadowed by minor modes.
+
+2026-02-11  Morgan Willcock  <morgan@ice9.digital>
+
+	Fix typo in smie-rules-function documentation
+
+	Fix a typo in the documentation for the expected arguments when
+	calling smie-rules-function to set the indentation offset of
+	function arguments.
+
+	* doc/lispref/modes.texi (SMIE Indentation):
+	* lisp/emacs-lisp/smie.el (smie-rules-function): Fix typo in
+	documentation for smie-rules-function arguments.
+
+2026-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	make-mode.el: Avoid obsolete font-lock-*-face` variables
+
+	* lisp/progmodes/make-mode.el (makefile-make-font-lock-keywords)
+	(makefile-makepp-font-lock-keywords): Use `font-lock-*-face`
+	faces rather than variables.
+
+2026-02-11  Philip Kaludercic  <philipk@posteo.net>
+
+	Generalize 'scrape-elpa--safe-evil'
+
+	* admin/scrape-elpa.el (scrape-elpa--safe-eval): Extend support
+	from just 'cons' and 'concat' to any side-effect-free function.
+
+2026-02-11  Philip Kaludercic  <philipk@posteo.net>
+
+	Disable 'package-autosuggest-mode' by default
+
+	* lisp/emacs-lisp/package-activate.el (package-autosuggest-mode):
+	Do not set the :init-value when declaring the minor mode.
+
+2026-02-11  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Better 'prog1' optimisation
+
+	* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
+	Always evaporate 'prog1' when the tail is effect-free, even
+	when the value expression isn't.
+
+2026-02-11  Sean Whitton  <spwhitton@spwhitton.name>
+
+	icomplete-ret: Ignore icomplete-show-matches-on-no-input
+
+	* lisp/icomplete.el (icomplete-ret): No longer conditionalize on
+	icomplete-show-matches-on-no-input.
+	Suggested by Juri Linkov <juri@linkov.net> in bug#62108.
+	(icomplete-show-matches-on-no-input, icomplete-ret):
+	* etc/NEWS: Improve documentation.
+
+2026-02-11  Sean Whitton  <spwhitton@spwhitton.name>
+
+	cond*: bind-and* is not always a non-exit clause!
+
+	* lisp/emacs-lisp/cond-star.el (cond*-non-exit-clause-p)
+	(cond*-non-exit-clause-substance): Don't consider a bind-and*
+	clause without ':non-exit' to be a non-exit clause (bug#80376).
+	(cond*):
+	* doc/lispref/control.texi (cond* Macro): Fix docs accordingly.
+
+2026-02-11  Stéphane Marks  <shipmints@gmail.com>
+
+	system-sleep sleep blocker and sleep/wake event package (bug#80348)
+
+	This package provides platform-neutral interfaces to block your
+	system from entering idle sleep and a hook to process pre-sleep
+	and post-wake events.
+
+	Implementations are for D-Bus on GNU/Linux, macOS/GNUstep, and
+	MS-Windows.
+
+	* lisp/system-sleep.el: New package.
+	* src/fns.c: Qpre_sleep, Qpost_wake: New DEFSYM.
+	* src/nsfns.m (Fns_block_system_sleep, Fns_unblock_system_sleep)
+	(syms_of_nsfns): New functions.
+	* src/nsterm.m (applicationDidFinishLaunching): Subscribe to
+	pre-sleep and post-wake notifications.
+	(systemWillSleep, systemDidWake): New function.
+	* src/w32fns.c (Fw32_block_system_sleep)
+	(Fw32_unblock_system_sleep, Fw32_system_sleep_block_count)
+	(sleep_notification_callback)
+	(w32_register_for_sleep_notifications): New function.
+	(syms_of_w32fns): Sw32_unblock_system_sleep
+	Sw32_block_system_sleep Sw32_system_sleep_block_count: New
+	defsubr.
+	* src/w32term.h (Fw32_block_system_sleep): New extern.
+	* src/w32term.c (w32_initialize): Call
+	w32_register_for_sleep_notifications.
+	* doc/lispref/os.texi: Document the system-sleep package.
+	* doc/lispref/commands.texi: Update sleep-event special
+	documentation.
+	* etc/NEWS: Announce the new package.
+
+2026-02-11  Juri Linkov  <juri@linkov.net>
+
+	Don't remap RET to 'icomplete-ret' in 'icomplete-mode' (bug#62108)
+
+	* lisp/icomplete.el (icomplete-show-matches-on-no-input): Fix docstring.
+	(icomplete-minibuffer-map): Don't remap 'minibuffer-complete-and-exit' (RET)
+	to 'icomplete-ret'.
+	(icomplete-ret): Improve docstring.
+
+2026-02-11  Juri Linkov  <juri@linkov.net>
+
+	Revert "New key 'M-j' for 'icomplete-mode' (bug#62108)"
+
+	This reverts commit 3584a762b8cbfb6e13011827ec5934f039344d0f.
+	Another fix follows shortly after this commit.
+
+2026-02-10  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Improve project-vc-*cache-timeout docstrings
+
+	* lisp/progmodes/project.el: (project-vc-cache-timeout)
+	(project-vc-non-essential-cache-timeout): Improve docstrings (bug#78545).
+
+2026-02-10  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/process.c (server_accept_connection): Fix assertion (bug#80237).
+
+2026-02-10  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git--deduce-files-for-stash: Use file-relative-name (bug#80278)
+
+	* lisp/vc/vc-git.el (vc-git--deduce-files-for-stash): Use
+	file-relative-name (bug#80278).
+
+2026-02-10  Dmitry Gutov  <dmitry@gutov.dev>
+	    Juri Linkov  <juri@linkov.net>
+
+	Do cache and timed invalidation in "VC-aware" project backend
+
+	* lisp/progmodes/project.el: Describe the new cache in Commentary,
+	the "VC-aware project" section.
+	(project-vc-cache-timeout)
+	(project-vc-non-essential-cache-timeout): New variables.
+	(project--get-cached, project--set-cached):
+	New functions.
+	(project-try-vc, project--value-in-dir): Use them.
+	(project--read-dir-locals): New function, extracted from the
+	above.  Return the full alist, to be saved to cache at once.
+	(project--clear-cache): New function.
+	(project-remember-projects-under)
+	(project-forget-zombie-projects, project-forget-projects-under):
+	Use it.
+	(project-uniquify-dirname-transform, project-mode-line-format):
+	Bind 'non-essential' to choose the longer caching strategy.
+	(project-name-cache-timeout, project-name-cached): Remove.
+	(project-mode-line-format): Switch to calling 'project-name'
+	directly, with the new caching in use.
+
+2026-02-10  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Amend previous to avoid remote call in project--remove-from-project-list
+
+	* lisp/progmodes/project.el (project--remove-from-project-list):
+	Don't call 'abbreviate-file-name', expect it to be abbreviated
+	already.  The file might be on an inaccessible filesystem.
+	(project-current): Call abbreviate-file-name here (bug#80340).
+
+2026-02-09  Philip Kaludercic  <philipk@posteo.net>
+
+	Enable fewer minor modes in package suggestion buffers
+
+	* lisp/emacs-lisp/package.el (package--autosugest-prompt): Do
+	not enable 'enriched-mode' and 'variable-pitch-mode'.
+
+2026-02-09  Philip Kaludercic  <philipk@posteo.net>
+
+	Detect more package suggestions
+
+	* admin/scrape-elpa.el (scrape-elpa--safe-eval): Add new
+	function.
+	(scrape-elpa): Evaluate part of the matched expression to catch
+	more entries.
+	* etc/package-autosuggest.eld: Update database.
+
+2026-02-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(loaddefs-generate--print-form): Fix bug#80222
+
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--print-form):
+	Remove the "\\\n" hack we used to use together with
+	`src/lread.c` code to avoid allocating heap space for docstrings
+	that were going to be replaced by `Snarf-documentation`.
+	We don't keep ELisp docstrings in DOC any more anyway.
+
+2026-02-09  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Fix selected group sort with topics (bug#80341)
+
+	* lisp/gnus/gnus-topic.el (gnus-group-sort-selected-topic): New
+	function to sort selected groups into topic.
+	(gnus-topic-mode): Use it as sort selected function in topic
+	mode.
+	* etc/NEWS: Announce the change.
+
+2026-02-09  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Add missing symbolic prefix keybinding
+
+	* lisp/gnus/gnus-group.el (:keymap): Add symbolic prefix to
+	group keymap.
+	* etc/NEWS: Announce the change.
+
+2026-02-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/calendar: Style changes
+
+	Fix some misuses of `defconst` and `%s`, avoid uses of the old
+	dynbound dialect of `eval`, delete redundant `:group` arguments,
+	and prefer #' to quote function names.
+	And stop creating alists for completion tables since lists of
+	strings work just as well.
+
+	* lisp/calendar/appt.el: Delete redundant `:group` arguments.
+	Prefer #' to quote function names.
+
+	* lisp/calendar/cal-hebrew.el (solar-time-string): Declare function.
+	(calendar-hebrew-read-date, calendar-hebrew-list-yahrzeits):
+	* lisp/calendar/cal-persia.el (calendar-persian-read-date):
+	* lisp/calendar/cal-mayan.el (calendar-mayan-read-haab-date)
+	(calendar-mayan-read-tzolkin-date):
+	* lisp/calendar/cal-julian.el (calendar-julian-goto-date):
+	* lisp/calendar/cal-islam.el (calendar-islamic-read-date):
+	* lisp/calendar/cal-coptic.el (calendar-coptic-read-date):
+	* lisp/calendar/cal-bahai.el (calendar-bahai-read-date):
+	Completion tables can be lists of strings for decades.
+
+	* lisp/calendar/cal-china.el: Delete redundant `:group` arguments.
+	(calendar-chinese-zodiac-sign-on-or-after)
+	(calendar-chinese-new-moon-on-or-after): Use lexical dialect also
+	for `eval`.
+
+	* lisp/calendar/cal-dst.el: Delete redundant `:group` arguments.
+	Use lexical dialect also for `eval`.
+
+	* lisp/calendar/cal-html.el: Delete redundant `:group` arguments.
+
+	* lisp/calendar/cal-menu.el: Prefer #' to quote function names.
+
+	* lisp/calendar/cal-tex.el: Delete redundant `:group` arguments.
+	(cal-tex-weekly-common): Use lexical dialect also for `eval`.
+
+	* lisp/calendar/calendar.el (calendar-mode-map):
+	Prefer #' to quote function names.
+
+	* lisp/calendar/diary-icalendar.el (di:rrule-sexp-to-recurrence)
+	(di:other-sexp-to-recurrence): Use lexical dialect also for `eval`.
+
+	* lisp/calendar/diary-lib.el: Delete redundant `:group` arguments.
+	Prefer #' to quote function names.
+	(diary-sexp-entry, diary-offset, diary-remind): Use lexical dialect
+	also for `eval`.
+
+	* lisp/calendar/icalendar-macs.el (ical:define-param): Fix misuse of
+	`%s` in `format`.
+
+	* lisp/calendar/icalendar-parser.el (ical:value-types)
+	(ical:param-types, ical:property-types, ical:component-types):
+	Don't use `defconst` on variables we mutate.
+
+	* lisp/calendar/icalendar-recur.el (icr:current-tz-to-vtimezone)
+	(icr:current-tz-to-vtimezone): Use lexical dialect also for `eval`.
+
+	* lisp/calendar/icalendar.el: Delete redundant `:group` arguments.
+
+	* lisp/calendar/lunar.el: Prefer #' to quote function names.
+
+	* lisp/calendar/solar.el (solar-sunrise-sunset-string)
+	(calendar-sunrise-sunset-month): Use lexical dialect also for `eval`.
+
+	* lisp/calendar/timeclock.el: Prefer #' to quote function names.
+
+2026-02-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+	butttonTrans need not be extern
+
+	* lwlib/lwlib-Xaw.c (buttonTrans) [USE_CAIRO || HAVE_XFT]:
+	Now static.  This pacifies gcc -Wmissing-variable-declarations.
+
+2026-02-08  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project--delete-zombie-projects: Handle "Tramp failed to connect"
+
+	* lisp/progmodes/project.el (project--delete-zombie-projects):
+	Handle file-error when DIR is remote and unreachable (bug#80340).
+
+2026-02-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Merge branch 'main' into icalendar
+
+2026-02-08  Daniel Mendler  <mail@daniel-mendler.de>
+
+	completing-read-multiple: Implement on top of completing-read
+
+	Avoid code duplication during minibuffer setup.
+
+	* lisp/emacs-lisp/crm.el (completing-read-multiple): Call
+	`completing-read' instead of duplicating the setup code of
+	`completing-read-default'.
+
+2026-02-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Revert "Extend emacs server protocol for empty arguments"
+
+	This reverts this change:
+
+	  Author:     Andreas Schwab <schwab@linux-m68k.org>
+	  AuthorDate: Sun Feb 8 12:34:02 2026 +0100
+
+	    Extend emacs server protocol for empty arguments
+
+	    An empty argument is represented by &0.  On the receiving side, &0 is
+	    replaced by nothing.
+
+	    * lisp/server.el (server-unquote-arg): Replace "&0" by nothing.
+	    (server-quote-arg): Produce "&0" for an empty string.
+	    * lib-src/emacsclient.c (quote_argument): Produce "&0" for an
+	    empty string.
+	    (unquote_argument): Replace "&0" by nothing.   (Bug#80356)
+
+	The bug in question was already fixed by this change:
+
+	  Author:     Sean Whitton <spwhitton@spwhitton.name>
+	  AuthorDate: Fri Nov 7 12:33:21 2025 +0000
+
+	    Don't discard empty string arguments from emacsclient
+
+	    * lisp/server.el (server--process-filter-1): Don't discard empty
+	    string arguments from emacsclient.
+	    (server-eval-args-left):
+	    * doc/emacs/misc.texi (emacsclient Options):
+	    * etc/NEWS: Document the change.
+
+2026-02-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	cond*: Fix handling of :non-exit keywords
+
+	* lisp/emacs-lisp/cond-star.el (cond*-non-exit-clause-p): Don't
+	return nil for clauses ending with ':non-exit'.
+	(cond*-non-exit-clause-substance): Don't accept just any
+	keyword, require ':non-exit'.
+
+2026-02-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	cond*: Fix handling bind-and* in two places
+
+	* lisp/emacs-lisp/cond-star.el (cond*-non-exit-clause-p)
+	(cond*-non-exit-clause-substance): Handle bind-and* the same as
+	bind*.
+
+2026-02-08  Andreas Schwab  <schwab@linux-m68k.org>
+
+	Extend emacs server protocol for empty arguments
+
+	An empty argument is represented by &0.  On the receiving side, &0 is
+	replaced by nothing.
+
+	* lisp/server.el (server-unquote-arg): Replace "&0" by nothing.
+	(server-quote-arg): Produce "&0" for an empty string.
+	* lib-src/emacsclient.c (quote_argument): Produce "&0" for an
+	empty string.
+	(unquote_argument): Replace "&0" by nothing.   (Bug#80356)
+
+2026-02-08  Matthew Bauer  <mjbauer95@gmail.com>
+
+	Eglot: Add "static-ls" to Haskell LSP list
+
+	This is an alternative language server for Haskell.  Intended to be
+	faster and not use as much memory as haskell-language-server.
+	Making it a backup with lower precedence if both exist.
+	* lisp/progmodes/eglot.el (eglot-server-programs): Add "static-ls".
+	(Bug#80351)
+
+2026-02-07  kobarity  <kobarity@gmail.com>
+
+	Change the type of 'python-eldoc-function-timeout' to number
+
+	* etc/NEWS: Announce the change.
+	* lisp/progmodes/python.el (python-eldoc-function-timeout):
+	Change the type.  (Bug#80045)
+
+2026-02-07  kobarity  <kobarity@gmail.com>
+	    Liu Hui  <liuhui1610@gmail.com>
+
+	Use 'project-name-cached' in 'python-shell-get-process-name'
+
+	* lisp/progmodes/python.el
+	(python-shell-get-project-name): New function.
+	(python-shell-get-process-name): Use it.  (Bug#80045)
+
+2026-02-07  kobarity  <kobarity@gmail.com>
+
+	Revert "Performance improvement of 'python-shell-get-process'"
+
+	This reverts commit 83b4f1ba26844c178e57ecb93ea8db36e8e6fa89.
+	We concluded that it is better to use 'project-name-cached'.
+	(Bug#80045)
+
+2026-02-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	Support D-Bus file descriptor manipulation
+
+	* doc/misc/dbus.texi (Synchronous Methods): Adapt `dbus-call-method'.
+	(Asynchronous Methods): Adapt `dbus-call-method-asynchronously'.
+	(File Descriptors): New chapter, replaces Inhibitor Locks.
+
+	* etc/NEWS: Replace "New D-Bus functions to support systemd
+	inhibitor locks" by "Support D-Bus file descriptor manipulation".
+	Presentational fixes and improvements.
+
+	* lisp/net/dbus.el (dbus-call-method)
+	(dbus-call-method-asynchronously): Adapt docstring.
+	(dbus-list-hash-table): Return (nreverse result).
+	(dbus-monitor-goto-serial): Declare `completion'.
+
+	* src/dbusbind.c (Fdbus_message_internal, xd_read_message_1):
+	Handle `:keep-fd'.
+	(xd_registered_inhibitor_locks, Fdbus_make_inhibitor_lock)
+	(Fdbus_close_inhibitor_lock, Fdbus_registered_inhibitor_locks): Delete.
+	(xd_registered_fds): New variable.
+	(Fdbus__fd_open, Fdbus__fd_close, Fdbus__registered_fds):
+	New DEFUNs.  (Bug#79963)
+	(syms_of_dbusbind_for_pdumper): Initialize `xd_registered_fds'.
+	(syms_of_dbusbind): Remove subroutines
+	`Sdbus_make_inhibitor_lock', `Sdbus_close_inhibitor_lock' and
+	`Sdbus_registered_inhibitor_locks'.  Remove symbol `Qdbus_call_method'.
+	Declare subroutines `Sdbus__fd_open', `Sdbus__fd_close' and
+	`Sdbus__registered_fds'.  Declare symbol `QCkeep_fd'.  staticpro
+	`xd_registered_fds'.
+
+	* test/lisp/net/dbus-tests.el (dbus-test10-inhibitor-locks): Delete.
+	(dbus-test10-keep-fd, dbus-test10-open-close-fd): New tests.
+
+2026-02-07  Philip Kaludercic  <philipk@posteo.net>
+
+	Revert "Enable 'package-autosuggest-mode' at startup"
+
+	This reverts commit ae673183625aa76fb5d7160730c92eda659b10ee.
+
+2026-02-07  Dmitry Gutov  <dmitry@gutov.dev>
+
+	etags-regen--build-program-options: Expand the error message text
+
+	* lisp/progmodes/etags-regen.el (etags-regen--build-program-options):
+	Expand the error message text.
+
+2026-02-07  Dmitry Gutov  <dmitry@gutov.dev>
+
+	etags--xref-backend: Move the definition to autoloads
+
+	* lisp/progmodes/etags.el (etags--xref-backend):
+	Move the definition to autoloads, so that etags.el doesn't have to
+	be loaded before it really is used.
+
+2026-02-06  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Some manual updates for the recent change
+
+	* doc/emacs/maintaining.texi (Looking Up Identifiers):
+	Mention that 'M-.' can signal an error.
+	(Xref): Recommend using 'etags-regen-mode' (bug#43086).
+
+	* etc/NEWS: Add updated marks.
+
+2026-02-06  Philip Kaludercic  <philipk@posteo.net>
+
+	Use 'buffer-file-name' when matching 'auto-mode-alist'
+
+	* lisp/emacs-lisp/package-activate.el (package--suggestion-applies-p):
+	The file name associated with a buffer is a better match for
+	entries in 'auto-mode-alist', so we use that instead of the
+	buffer name that can have additional noise to make the name unique.
+
+2026-02-06  Philip Kaludercic  <philipk@posteo.net>
+
+	Link to "Major Mode" node in manual when suggesting packges
+
+	* lisp/emacs-lisp/package.el (package--autosugest-prompt): Add
+	another button.
+
+2026-02-06  Philip Kaludercic  <philipk@posteo.net>
+
+	Add separate user option to prevent repetitive package suggestions
+
+	* lisp/emacs-lisp/package-activate.el
+	(package-autosuggest-style): Remove option 'once' and defer to
+	new user option.
+	(package-autosuggest-once): Add new option.
+	(package--suggestion-applies-p)
+	(package--autosuggest-after-change-mode): Respect new user option.
+
+2026-02-06  Philip Kaludercic  <philipk@posteo.net>
+
+	Enable 'package-autosuggest-mode' at startup
+
+	* lisp/emacs-lisp/package.el (package-autosuggest-style)
+	(package-autosuggest-mode, package--autosuggest-suggested)
+	(package--suggestion-applies-p, package--autosuggest-database)
+	(package--autosuggest-find-candidates)
+	(package--autosugest-line-format, package-autosuggest-face)
+	(package--autosuggest-after-change-mode, package-autosuggest):
+	Remove definitions needed to recognise suggestions from here.
+
+	* lisp/emacs-lisp/package-activate.el (package-autosuggest-style)
+	(package--autosuggest-database, package--autosuggest-suggested)
+	(package--suggestion-applies-p)
+	(package--autosuggest-find-candidates)
+	(package--autosugest-line-format, package-autosuggest)
+	(package--autosuggest-after-change-mode)
+	(package-autosuggest-mode): Move definitions from package.el.
+
+	(package--activated, package-installed-p, package-get-version)
+	(package-activate-all, package-activate-all): Remove unnecessary
+	autoloads.
+
+	* lisp/loadup.el: Load "package-activate.el".
+
+2026-02-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Separate input histories for 'C-x v !' and Git pulling & pushing
+
+	* lisp/vc/vc-dispatcher.el (vc-user-edit-command-history): Use
+	this as a dynamically bound variable, not a minibuffer history.
+	(vc-user-edit-command): Pass its value to read-shell-command.
+	* lisp/vc/vc-git.el (vc-git--pushpull):
+	* lisp/vc/vc.el (vc-edit-next-command): Bind it.
+	(vc-edit-next-command-history): New variable.
+	* etc/NEWS: Document the change.
+
+2026-02-06  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Allow using xref-find-references without visiting a tags table
+
+	* lisp/progmodes/xref.el (xref-find-backend):
+	Allow returning nil (bug#43086).
+	(xref-backend-definitions, xref-backend-apropos):
+	Signal user-error when no backend is available.  The error text
+	suggests a few built-in Xref backends.
+	(xref-backend-identifier-completion-table): Default to nil.
+	(xref--no-backend-available): New helper function.
+
+	* lisp/progmodes/etags.el (etags--xref-backend):
+	Return nil when no tags table is visited.
+
+2026-02-05  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix thinko in eglot--async-request
+
+	Just because a specific request of a specific "hint" is
+	cancelled doesn't mean we can cancel the other's too.  Also
+	eglot-advertise-cancellation = nil was subtly broken.
+
+	This manifested itself mostly in Eglot semantic tokens.
+
+	* lisp/progmodes/eglot.el (eglot--async-request): Fix thinkos.
+
+2026-02-05  Visuwesh  <visuweshm@gmail.com>
+
+	vc-git--mailinfo: Use file-local-name (bug#80295, bug#80320)
+
+	* lisp/vc/vc-git.el (vc-git--mailinfo):
+	Use file-local-name (bug#80295, bug#80320).
+
+2026-02-05  Protesilaos Stavrou  <info@protesilaos.com>
+
+	New minibuffer history for vc-user-edit-command (bug#80169)
+
+	* lisp/vc/vc-dispatcher.el (vc-user-edit-command-history): New variable.
+	(vc-user-edit-command): Use it (bug#80169).
+	* etc/NEWS: Announce it.
+
+2026-02-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Bind "u", "@" in diff-mode-read-only-map, not diff-mode-shared-map
+
+	* lisp/vc/diff-mode.el (diff-mode-shared-map): Move bindings for
+	"u" and "@" from here ...
+	(diff-mode-read-only-map): ... to here.
+
+2026-02-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Bind "s" in diff-mode-read-only-map, not diff-mode-shared-map
+
+	* lisp/vc/diff-mode.el (diff-mode-shared-map): Move binding for
+	"s" from here ...
+	(diff-mode-read-only-map): ... to here (bug#80330).
+
+2026-02-05  Troy Brown  <brownts@troybrown.dev>  (tiny change)
+
+	Fix last change in align.el
+
+	* lisp/align.el (align-region): Additional fix of last change.
+	(Bug#80316)
+
+2026-02-05  John Wiegley  <johnw@gnu.org>
+
+	Fix aligning buffer regions containing multiple alignment sections
+
+	* lisp/align.el (align-region): Use markers to ensure the regions
+	stay accurate after overlapping aligning modifications.  (Bug#80316)
+
+	* test/lisp/align-tests.el (align-c-multi-section): New test.
+
+2026-02-04  Philip Kaludercic  <philipk@posteo.net>
+
+	Merge remote-tracking branch 'origin/master' into feature/package-autosuggest
+
+2026-02-04  Philip Kaludercic  <philipk@posteo.net>
+
+	Rephrase package suggestion message
+
+	* lisp/emacs-lisp/package.el (package--autosugest-prompt):
+	Follow Richard's suggestion from
+	https://mail.gnu.org/archive/html/emacs-devel/2026-02/msg00040.html.
+
+2026-02-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/comint.el (comint-redirect-hook): Defvar (bug#80313)
+
+2026-02-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(yaml-ts-mode-yamllint-options): Use a list of strings
+
+	It is both simpler to code and marginally more general (allows
+	spaces in arguments).
+
+	* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode-yamllint-options): Use
+	a list.
+	(yaml-ts-mode-flymake): Adjust accordingly.
+
+2026-02-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	shortdoc: Don't burp on missing docstrings
+
+	* lisp/emacs-lisp/shortdoc.el (shortdoc--display-function): Report
+	missing docstrings more cleanly than "Wrong type argument: stringp, nil".
+
+2026-02-04  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	ediff-mult-tests.el: remove temporary directory after test
+
+	* test/lisp/vc/ediff-mult-tests.el (ediff-test-bug3348): Clean up.
+
+2026-02-04  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Make vc-git-tests work with git < 2.46
+
+	* test/lisp/vc/vc-git-tests.el (vc-git-test-branch-remotes):
+	The 'unset' subcommand to 'git config' was introduced in git 2.46; use
+	the '--unset' option instead.
+
+2026-02-03  Philip Kaludercic  <philipk@posteo.net>
+
+	Do not compile database into package.el
+
+	* lisp/emacs-lisp/package.el (package--autosuggest-database):
+	Add new variable.
+	(package--autosuggest-find-candidates): Load the contents of the
+	database from 'data-directory' if necessary, and store them in
+	the new variable.
+
+2026-02-03  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Fix [More] buttons in tutorial and other buttons in Semantic
+
+	* lisp/help-mode.el (help-setup-xref): Update docstring (bug#80276).
+
+	* etc/NEWS: Add description for the earlier change in help-setup-xref.
+
+	* lisp/tutorial.el (tutorial--describe-nonstandard-key)
+	(tutorial--detailed-help): Use 'with-help-window', call it after.
+
+	* lisp/cedet/semantic/util.el (semantic-describe-buffer): Same.
+
+	* lisp/cedet/semantic/decorate/include.el
+	(semantic-decoration-include-describe)
+	(semantic-decoration-unknown-include-describe)
+	(semantic-decoration-fileless-include-describe)
+	(semantic-decoration-unparsed-include-describe)
+	(semantic-decoration-all-include-summary): Same.
+
+2026-02-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	isearch.el: Remove autoloads hacks
+
+	* lisp/isearch.el (char-fold-to-regexp): Remove redundant autoload.
+	(emoji--read-emoji): Use `declare-function` rather than autoload.
+
+2026-02-02  Sean Whitton  <spwhitton@spwhitton.name>
+
+	diff-mode-shared-map: Bind '@' to diff-revert-and-kill-hunk
+
+	* lisp/vc/diff-mode.el (diff-mode-shared-map): Bind '@' to
+	diff-revert-and-kill-hunk.
+
+2026-02-01  Philip Kaludercic  <philipk@posteo.net>
+
+	Merge remote-tracking branch 'origin/master' into feature/package-autosuggest
+
+2026-02-01  Philip Kaludercic  <philipk@posteo.net>
+
+	Adjust formatting of package suggestion buffer
+
+	* lisp/emacs-lisp/package.el (package--autosugest-prompt): Move
+	'describe-package' link into the parentheses after the "Install
+	..." button.
+
+2026-02-01  Philip Kaludercic  <philipk@posteo.net>
+
+	Clarify that package suggestions have to be confirmed
+
+	* lisp/emacs-lisp/package.el (package--autosugest-prompt):
+	Adjust message to indicate that no changes have yet occurred.
+
+	Co-Developed-By: Jens Schmidt <jschmidt4gnu@vodafonemail.de>
+
+2026-02-01  Philip Kaludercic  <philipk@posteo.net>
+
+	Explain why package suggestions match
+
+	* lisp/emacs-lisp/package.el (package--autosugest-prompt): Go
+	through all suggestions for the same package and mention why a
+	package suggestion was relevant.
+
+2026-02-01  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* etc/symbol-releases.eld: 'any' and 'all' added in Emacs 31
+
+2026-02-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor improvements in vertical cusror motion
+
+	* src/xdisp.c (move_it_vertically_backward): Zero out cached value
+	of line height, to avoid using stale and incorrect values.
+	(try_window_reusing_current_matrix): Fix conditions for changes in
+	tab-line height.
+	Reported by Michael Heerdegen <michael_heerdegen@mailbox.org> in
+	https://lists.gnu.org/archive/html/help-gnu-emacs/2026-01/msg00163.html
+	This improves the scrolling a little bit, but doesn't solve the
+	problem entirely.
+
+2026-02-01  Philip Kaludercic  <philipk@posteo.net>
+
+	Enable 'package-autosuggest-mode' by default
+
+	* lisp/emacs-lisp/package.el (package-autosuggest-mode): Set
+	:init-value.
+
+2026-02-01  Richard Lawrence  <rwl@recursewithless.net>
+
+	Fix iCalendar macro (debug ...) forms and indentation
+
+	As discussed in Bug#74994.
+
+	* lisp/calendar/icalendar-ast.el (icalendar-make-param)
+	(icalendar-make-property, icalendar-make-component)
+	(icalendar-make-node-from-templates)
+	* lisp/calendar/icalendar-macs.el (icalendar-with-node-children)
+	(icalendar-with-node-value, icalendar-with-param)
+	(icalendar-with-child-of, icalendar-with-property-of): Remove extraneous
+	arguments in (debug ...) forms.
+	* lisp/calendar/icalendar-recur.el
+	* lisp/calendar/diary-icalendar.el: Fix indentation of calls to them.
+
+	Plus one other minor fix:
+
+	* lisp/calendar/diary-icalendar.el
+	(diary-icalendar-current-tz-to-vtimezone): Ignore unused error
+	variable (fixes a byte compiler warning).
+
+2026-02-01  Philip Kaludercic  <philipk@posteo.net>
+
+	Add more elaborate prompt when suggesting packages
+
+	* lisp/emacs-lisp/package.el (package--autosugest-prompt): Add
+	new function.
+	(package--autosuggest-after-change-mode, package-autosuggest):
+	Call new function.
+
+2026-02-01  Philip Kaludercic  <philipk@posteo.net>
+
+	Display hint for package suggestions after mode name
+
+	* lisp/emacs-lisp/package.el (package--autosugest-line-format):
+	Insert a space before the mode-line hint.
+	(package--autosuggest-after-change-mode): Add hint to 'mode-name'.
+
+2026-02-01  Philip Kaludercic  <philipk@posteo.net>
+
+	Inline database of package suggestions
+
+	* lisp/emacs-lisp/package.el (package--autosuggest-database):
+	Remove unnecessary variable.
+	(package--autosuggest-find-candidates): Load the database at
+	compile time.
+	(package--autosuggest-suggested, package--suggestion-applies-p)
+	(package--autosuggest-install-and-enable): Update documentation.
+
+2026-02-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix desktop saving and restoring in daemon sessions
+
+	* lisp/desktop.el (desktop--check-dont-save): Don't save daemon's
+	initial frame.
+	* lisp/frameset.el (frameset-restore): Don't try deleting the
+	daemon's initial frame.  (Bug#80294)
+
+2026-01-31  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Don't produce zero-length lazy strings
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile--docstring):
+	There is no gain from making an empty string lazy.
+	(It also contributed to bug#80292.)
+
+2026-01-31  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Fix lazy doc string fontify bug in elisp-byte-code-mode (bug#80292)
+
+	* lisp/progmodes/elisp-mode.el (elisp-byte-code-syntax-propertize):
+	Reset point to just after the start of the previous match so that we
+	don't skip past the end of the lazy string, which can happen if it's
+	zero-length; that could lead to an infinite loop.
+
+2026-01-31  Jens Schmidt  <jschmidt4gnu@vodafonemail.de>
+
+	Improve documentation of 'seq-difference'
+
+	* doc/lispref/sequences.texi (Sequence Functions):
+	* lisp/emacs-lisp/seq.el (seq-difference): Clarify the documentation of
+	'seq-difference'.  (Bug#80257)
+
+2026-01-31  Michael Albinus  <michael.albinus@gmx.de>
+
+	Improve connection-local variables documentation.
+
+	* doc/emacs/custom.texi (Connection Variables):
+	* doc/lispref/variables.texi (Applying Connection Local Variables):
+	Improve documentation.
+
+2026-01-31  Boris Buliga  <boris@d12frosted.io>
+
+	Fix macOS 26 (Tahoe) scrolling lag and input handling issues
+
+	macOS 26 introduced new event processing behavior that causes scrolling
+	lag and input handling problems in Emacs.  This patch disables two
+	features via NSUserDefaults when built against the macOS 26 SDK:
+	- NSEventConcurrentProcessingEnabled
+	- NSApplicationUpdateCycleEnabled
+	This fix is based on the equivalent patch in emacs-mac by Mitsuharu
+	Yamamoto.  See: https://bitbucket.org/mituharu/emacs-mac/commits/e52ebfd
+	* src/nsterm.m (ns_term_init): Disable problematic event processing
+	when built for macOS 26+.  (Bug#80268)
+
+2026-01-31  Jacob S. Gordon  <jacob.as.gordon@gmail.com>
+
+	display-time: Add option to customize help-echo format
+
+	This option controls the format of the help-echo when hovering
+	over the time display in mode line.  (Bug#80143)
+	* lisp/time.el (display-time-help-echo-format): Add option.
+	(display-time-string-forms): Use it.
+
+	* etc/NEWS (Time): Announce the new option.
+
+2026-01-31  Kierin Bell  <kierin@kierinbell.com>
+
+	Add new input method for Tuscarora
+
+	* lisp/leim/quail/iroquoian.el: New input method "tuscarora-postfix".
+
+	* etc/NEWS: Announce the new input method.  (Bug#80264)
+
+2026-01-31  Stéphane Marks  <shipmints@gmail.com>
+
+	New function 'truncate-string-pixelwise' (bug#80244)
+
+	This function will truncate a string on a pixelwise basis in a
+	work buffer and using a binary search rather than brute force.
+
+	* lisp/emacs-lisp/subr-x.el (work-buffer--prepare-pixelwise):
+	New defun helper function.
+	(string-pixel-width): Use the helper function.
+	(truncate-string-pixelwise): New defun.
+	* test/lisp/misc-tests.el (misc-test-truncate-string-pixelwise):
+	(misc-test-truncate-string-pixelwise-unicode): New test.
+	* doc/lispref/display.texi (Size of Displayed Text): Document
+	the function.
+	* etc/NEWS: Announce the function.
+
+2026-01-31  Daniel Mendler  <mail@daniel-mendler.de>
+
+	pixel-scroll: Avoid loading `cua-base'
+
+	CUA is not necessarily used together with `pixel-scroll-precision-mode'.
+	Make `pixel-scroll-interpolate-down' and `pixel-scroll-interpolate-up'
+	independent and avoid loading cua-base.
+	* lisp/pixel-scroll.el (pixel-scroll-interpolate-up)
+	(pixel-scroll-interpolate-down): Do not use `cua-scroll-down' and
+	`cua-scroll-up'; replace them with inline code.  (Bug#80245)
+
+2026-01-30  Daniel Colascione  <dancol@dancol.org>
+
+	xsettings: honor GDK DPI scaling values
+
+	Some XWayland setups only report DPI changes through
+	GDK xsettings, so Emacs missed DPI updates there.
+	Recognize the GDK DPI and scaling settings and use
+	them to compute the effective DPI.
+
+	* src/xsettings.c (parse_settings): Recognize
+	Gdk/UnscaledDPI and Gdk/WindowScalingFactor.
+	Use them to compute DPI when present.
+
+2026-01-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc--incoming-revision: Signal error on cache hit
+
+	* lisp/vc/vc.el (vc--incoming-revision): Signal an error instead
+	of returning nil on a cache hit (bug#80270).
+	(vc--outgoing-base-mergebase): Simplify, given that
+	vc--incoming-revision now handles the error case.
+
+2026-01-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Make diff-hunk-kill respect an active region
+
+	* lisp/vc/diff-mode.el (diff--revert-kill-hunks): New workhorse
+	routine.
+	(diff-hunk-kill, diff-revert-and-kill-hunk): Call it.
+	(diff-hunk-kill): New BEG and END parameters and interactive
+	form.
+	* doc/emacs/files.texi (Diff Mode):
+	* etc/NEWS: Document the change.
+
+2026-01-30  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Pass lazy doc string to 'defalias'
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-defalias):
+	We correctly emit a lazy-loaded doc string but then passed a literal
+	string to 'defalias' by mistake; fix that.  Saves 40 KiB in .elc files.
+
+2026-01-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git-topic-outgoing-base: Respect a configure push remote
+
+	* lisp/vc/vc-git.el (vc-git-topic-outgoing-base): If there is a
+	configured push remote, return tracking branch as outgoing base.
+
+2026-01-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Factor out vc-git--branch-remotes
+
+	* lisp/vc/vc-git.el (vc-git--branch-remotes): New function.
+	(vc-git-trunk-or-topic-p): Use it.
+	* test/lisp/vc/vc-git-tests.el (vc-git-test-branch-remotes): New
+	test.
+
+2026-01-30  João Távora  <joaotavora@gmail.com>
+
+	Eglot: recall diagnostics froms unopened files on session start
+
+	This is exclusively for the benefit of rust-analyzer, which
+	sends publishDiagnostics for all project files upfront, and
+	never republishes them on 'didOpen'.
+
+	See https://github.com/joaotavora/eglot/issues/1531.
+
+	* lisp/progmodes/eglot.el (eglot--flymake-handle-push): Simplify.
+	Don't flymake-list-only-diagnostics here.
+	Save original diagnostic in flymake-list-only-diagnostics setting.
+	(eglot--on-shutdown): Cleanup flymake-list-only-diagnostics.
+	(eglot--flymake-report-push+pulled): Hack in data from
+	flymake-list-only-diagnostics.
+
+2026-01-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Bind 's' to diff-split-hunk in read-only diff-mode
+
+	* lisp/vc/diff-mode.el (diff-mode-shared-map): Bind 's' to
+	'diff-split-hunk'.
+	* etc/NEWS: Document the change.
+
+2026-01-30  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/eglot.el (eglot-server-programs): Use "elp" for erlang-mode.
+
+	erlang_ls has been archived in favour of erlang-language-platform.
+	Suggested by Alan & Kim Zimmerman <alan.zimm@gmail.com> (bug#79943).
+
+2026-01-30  Juri Linkov  <juri@linkov.net>
+
+	New function 'checkdoc-batch' (bug#80199)
+
+	* lisp/emacs-lisp/checkdoc.el (checkdoc--batch-flag): New variable.
+	(checkdoc-rogue-spaces, checkdoc-message-text): Use it along the
+	check for interactive calls to be able to collect errors in the
+	diagnostic buffer.
+	(checkdoc-show-diagnostics): Don't show the diagnostic buffer
+	when 'checkdoc--batch-flag' is non-nil.
+	(checkdoc-batch): New function to check the buffer and print the
+	content of the diagnostic buffer.
+
+2026-01-30  Juri Linkov  <juri@linkov.net>
+
+	New key 'M-j' for 'icomplete-mode' (bug#62108)
+
+	* lisp/icomplete.el (icomplete-exit): New alias for 'icomplete-fido-exit'.
+	(icomplete-minibuffer-map): Bind it to "M-j" .
+
+	* lisp/replace.el (multi-occur--prompt): Show "M-j" bound to 'icomplete-exit'
+	in 'icomplete-mode'.
+
+2026-01-30  Spencer Baugh  <sbaugh@janestreet.com>
+
+	eager-display *Completions* again after completion failure
+
+	If the completion table requests eager-update (so *Completions*
+	should be updated as the user types, when already displayed)
+	then *Completions* will be dismissed automatically if the user
+	types something which isn't a completion.  Previously,
+	*Completions* wouldn't be redisplayed until the user requests it
+	again.  Now, if the completion table also enables eager-display
+	in addition to eager-update, then automatically redisplay
+	*Completions* after it disappears.
+
+	* lisp/minibuffer.el (completions--start-eager-display): Add
+	REQUIRE-EAGER-UPDATE argument and don't run if Completions is
+	already displayed.
+	(completions--after-change): Call
+	'completions--start-eager-display'.
+	(minibuffer-completion-help): Add the 'completions--after-change'
+	hook earlier, and let it remove itself (bug#80055).
+
+2026-01-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New C-x v T l and C-x v T L commands
+
+	* lisp/vc/vc.el (vc-log-outgoing-base)
+	(vc-root-log-outgoing-base): New commands.
+	* lisp/vc/vc-dir.el (vc-dir-mode-map):
+	* lisp/vc/vc-hooks.el (vc-prefix-map): Bind them.
+	* doc/emacs/vc1-xtra.texi (Outstanding Changes):
+	* etc/NEWS: Document them.
+
+2026-01-29  Spencer Baugh  <sbaugh@janestreet.com>
+
+	(minibuffer-message): Do not block while displaying message.
+
+	* lisp/minibuffer.el (minibuffer--message-overlay)
+	(minibuffer--message-timer): New variables.
+	(minibuffer--delete-message-overlay): New function.
+	(minibuffer-message): Use a timer and 'pre-command-hook' to
+	clear message overlay instead of blocking with
+	'sit-for'. (bug#79510)
+	* etc/NEWS: Document the change.
+
+2026-01-29  Dmitry Gutov  <dmitry@gutov.dev>
+
+	xref-find-backend: Error instead of returning nil
+
+	* lisp/progmodes/xref.el (xref-find-backend):
+	Signal error when we can't find a backend to use (bug#80246).
+
+2026-01-29  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Use frame-pixel-width/height to determine if frame is landscape
+
+	* lisp/window.el (window--frame-landscape-p): New function.
+	(split-window-sensibly): Call it (bug#80053).
+
+2026-01-29  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	tutorial.el: don't mutate quoted list
+
+	* lisp/tutorial.el (tutorial--default-keys):
+	Don't sort quoted list in-place.  Sort at compile time, not load time.
+	Uniform key representation (vectors) so that the default comparison can
+	be used.  Eliminate unnecessary backquote.
+	(tutorial--sort-keys): Remove.
+
+2026-01-29  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* lisp/tutorial.el (tutorial--describe-nonstandard-key): add space
+
+2026-01-29  Eli Zaretskii  <eliz@gnu.org>  (tiny change)
+
+	Avoid interference between child frame deletion and recentering
+
+	* src/frame.c (delete_frame) [HAVE_X_WINDOWS]: Block input while
+	child frame is displayed, and process the X events triggered by
+	that later.  Patch by Byakuren (https://web.liminal.cafe/~byakuren/).
+	(Bug#76186)
+
+2026-01-28  Dmitry Gutov  <dmitry@gutov.dev>
+
+	xref-matches-in-directory and xref-matches-in-files: More consistency
+
+	* lisp/progmodes/xref.el (xref--parse-hits, xref--sort-hits):
+	Extract from xref-matches-in-directory and xref-matches-in-files.
+	Use in both for better consistency between these functions.
+
+2026-01-28  Dmitry Gutov  <dmitry@gutov.dev>
+
+	xref-matches-in-directory: Don't error on "Binary file ... matches"
+
+	* lisp/progmodes/xref.el (xref-matches-in-directory):
+	Consider the "Binary file ... matches" message (bug#80246).
+
+2026-01-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(loaddefs-generate--make-autoload): Try harder to find `autoload-macro`
+
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload):
+	Try and (auto)load the macro in case that defines `autoload-macro`.
+	Simplify the code for the `loaddefs--defining-macros` case.
+
+2026-01-28  Przemysław Kryger  <pkryger@gmail.com>
+
+	Create package-vc-tests repositories once per tests run (bug#80235)
+
+	* test/lisp/emacs-lisp/package-vc-tests.el
+	(package-vc-tests-repos): New variable.
+	(package-vc-tests-create-repository): Add argument `repos-dir'.
+	(package-vc-tests-make-temp-dir): Create a temporary directory
+	with prefix.
+	(package-vc-with-tests-environment): Use
+	`package-vc-tests-make-temp-dir' to create a temporary directory
+	for package test.  Use `package-vc-tests-repos' to cache test
+	package repository.
+	(package-vc-tests-preserve-pkg-artifacts-p): Detect when to
+	preserve package temporary files.
+	(package-vc-tests-environment-tear-down): Use
+	`package-vc-tests-preserve-pkg-artifacts-p'.  Use plural there
+	are more than one buffer.  Report temporary directory with test
+	repository.
+	(package-vc-tests-add-ert-run-tests-listener): Wrap listener in
+	args with custom functionality for `package-vc-tests'.  On tests
+	run start reset `package-vc-tests-repos' cache.  On tests run
+	end delete temporary directories.
+
+2026-01-28  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Move outstanding changes commands from 'o' to 'T'
+
+	The main reason for this is that then these commands can have
+	the same bindings in VC-Dir buffers that they have under
+	vc-prefix-map.  'T' is a good mnemonic for "Topic" and a
+	serviceable mnemonic for "outsTanding".
+
+	* lisp/vc/vc-hooks.el (vc-prefix-map): Move 'o' to 'T'.
+	* lisp/vc/vc-dir.el (vc-dir-mode-map): New 'T' bindings.
+
+2026-01-28  Michael Albinus  <michael.albinus@gmx.de>
+
+	New Tramp test
+
+	* test/lisp/net/tramp-tests.el (tramp-test45-force-remote-file-error):
+	New test.
+
+2026-01-28  Basil L. Contovounesios  <basil@contovou.net>
+
+	Always unset lisp_data when freeing images
+
+	Historically only the GIF code did this (since it stores animation
+	metadata in lisp_data), and recently the WebP code followed suit.
+	The benefit of clearing lisp_data is not 100% clear (to me:
+	bug#66221#41), but it probably can't hurt, so do it unconditionally
+	for all image types to simplify conditional compilation and avoid
+	warnings (bug#80266).
+
+	* src/image.c (image_clear_image): Set lisp_data to nil.
+	[HAVE_GIF || HAVE_WEBP] (gif_clear_image):
+	[HAVE_IMAGEMAGICK] (imagemagick_clear_image): Remove, replacing all
+	uses with image_clear_image.
+
+2026-01-28  Yuan Fu  <casouri@gmail.com>
+
+	Fix tree-sitter traversal slowness (bug#80108)
+
+	* configure.ac (LIBSYSTEMD_CFLAGS): Increase minimal required
+	tree-sitter version to 0.20.10.
+	* src/treesit.c (treesit_traverse_sibling_helper): When
+	traversing forward, use the new function
+	ts_tree_cursor_goto_previous_sibling.
+
+2026-01-28  Daniel Mendler  <mail@daniel-mendler.de>
+	    Dmitry Gutov  <dmitry@gutov.dev>
+
+	Customizable xref-references-in-directory backend
+
+	Optionally use find and grep directly instead of going through the
+	Semantic framework (bug#80246).
+
+	* lisp/progmodes/project.el (project--vc-ignores): Require 'vc' to
+	ensure that vc-default-ignore-completion-table is available.
+
+	* lisp/progmodes/xref.el (xref-references-in-directory-function):
+	New user option.
+	(xref-references-in-directory): Call it.
+	(xref-references-in-directory-grep): Implementation based on find/grep.
+	(xref-references-in-directory-semantic): Implementation using Semantic.
+	(xref-matches-in-directory): Add new argument DELIMITED.
+
+2026-01-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	Organize tramp-adb-handle-make-process a little bit better
+
+	* lisp/net/tramp-adb.el (tramp-adb-handle-make-process):
+	Call `tramp-taint-remote-process-buffer' where it belongs to.
+
+2026-01-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(pcase--subtype-bitsets): Make it a bit more precise
+
+	`null`, `booleanp`, and `symbolp` were treated as equivalent in
+	`pcase--subtype-bitsets`, which was not incorrect to the extent
+	that we currently use this table only to detect
+	mutual-exclusion, but made it incorrect to use that same table
+	to test things like inclusion.
+
+	* lisp/emacs-lisp/cl-preloaded.el (built-in-class): New slot
+	`non-abstract-supertype`.
+	(cl--define-built-in-type): Add corresponding keyword argument.
+	(symbol, boolean): Use it.
+
+	* lisp/emacs-lisp/pcase.el (pcase--subtype-bitsets): Use it.
+
+	* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda): Require `help`
+	before calling `help--docstring-quote`.  Fixes a corner case bootstrap
+	problem found along the way.
+
+2026-01-27  Przemysław Kryger  <pkryger@gmail.com>
+
+	Ensure skipped package-vc-tests are not installed (bug#80235)
+
+	* test/lisp/emacs-lisp/package-vc-tests.el
+	(package-vc-tests-packages): Add argument `full'.  When `full'
+	is non-nil, then return full entries.
+	(package-vc-test-deftest): Use `pkg-arg' for the name of
+	argument `in-body'.  Call `skip-when' and `skip-unless' before
+	`packgage-vc-tests-with-installed'.
+
+2026-01-27  Stéphane Marks  <shipmints@gmail.com>
+
+	Document frame id related commands and tweak a return value (Bug#80192)
+
+	* doc/lispref/frames.texi (Input Focus): Document the commands
+	'select-frame-by-id' and 'undelete-frame-by-id'.
+	* lisp/frame.el (select-frame-by-id): Clarify return value and
+	add missing optional argument 'noerror' in sympathy with
+	'undelete-frame-by-id'.
+
+2026-01-26  João Távora  <joaotavora@gmail.com>
+
+	Jsonrpc: avoid redisplay_internal calls from jsonrpc-request
+
+	The 'jsonrpc-request' function, when called with non-nil CANCEL-ON-INPUT,
+	relies on 'sit-for' to stop immediately when the user inputs something into
+	Emacs.  Although this behavior is working well, it has the hitherto
+	undiscovered side effect of invoking 'redisplay_internal', which triggers
+	expensive operations such as fontification.
+
+	This bug was noticied when using the 'breadcrumb' package in conjunction
+	with Eglot and a narrowed buffer.  To provide breadcrumbs for the current
+	context, breadcrumb.el invokes 'imenu--make-index-alist' on a timer.  That
+	function temporarily widens the buffer and then eventually calls
+	'redisplay_internal' (through 'eglot-imenu', 'jsonrpc-request', and
+	'sit-for').  This has the effect that the temporarily widened buffer is
+	re-rendered and displayed to the user until the LSP server answers the
+	request and 'imenu--make-index-alist' restores the restriction, an effect
+	that lasts between 0.5 and 2 seconds usually and is annoying and confusing.
+
+	To fix this, using a non-nil NODISP argument in the 'sit-for' is not enough
+	(though it's arguable it should be and maybe that's a separate bug).
+	Binding 'inhibit-redisplay' to 't' around 'sit-for' seems to fix the issue
+	robustly.
+
+	* lisp/jsonrpc.el (jsonrpc-request): Bind inhibit-redisplay to t and pass
+	  NODISP to sit-for.
+
+2026-01-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix image.c compilation when HAVE_GIF is not defined
+
+	* src/image.c (gif_clear_image): Make it available for other image
+	types.  (Bug#80266)
+
+2026-01-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(read_char_minibuf_menu_prompt): Fix bug#80146
+
+	* src/keyboard.c (read_char_minibuf_menu_prompt): Give priority
+	to a binding in the map over the `menu_prompt_more_char` "binding".
+	(follow_key): Move before new first use.
+
+2026-01-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix point-adjustment when overlays are specific to windows
+
+	* src/keyboard.c (adjust_point_for_property): Consider only
+	overlays associated with the selected window.  (Bug#80255)
+
+2026-01-26  Bastien Guerry  <bzg@gnu.org>
+
+	Update TUTORIAL.translators
+
+	* etc/tutorials/TUTORIAL.translators (Maintainer): Add myself
+	as TUTORIAL.fr co-maintainer.
+
+2026-01-26  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Neater pcase predicate transform
+
+	Suggested by Stefan Monnier.
+
+	* lisp/emacs-lisp/pcase.el (pcase--macroexpand): Simplify.
+	* test/lisp/emacs-lisp/pcase-tests.el (pcase-pred-equiv): New test.
+
+2026-01-25  Philip Kaludercic  <philipk@posteo.net>
+
+	Refer to 'package-autosuggest-style' in manual.
+
+	* doc/emacs/package.texi (Package Installation): Mention the
+	user option.
+
+2026-01-25  Philip Kaludercic  <philipk@posteo.net>
+
+	Update 'package-autosuggest' database
+
+	* etc/package-autosuggest.eld: Add changes detected by the
+	'scrape-elpa' command.
+
+2026-01-25  Philip Kaludercic  <philipk@posteo.net>
+
+	Mention scrape-elpa.el file name in autosuggest database
+
+	* admin/scrape-elpa.el (scrape-elpa): Update the inserted comment.
+
+2026-01-25  Philip Kaludercic  <philipk@posteo.net>
+
+	Mark 'package-autosuggest-database' as private
+
+	* admin/scrape-elpa.el (scrape-elpa):
+	* etc/package-autosuggest.eld:
+	* lisp/emacs-lisp/package.el (package-autosuggest-database)
+	(package--autosuggest-suggested, package--suggestion-applies-p)
+	(package--autosuggest-find-candidates)
+	(package--autosuggest-install-and-enable): Rename constant name
+	to add double-dash.
+
+2026-01-25  Philip Kaludercic  <philipk@posteo.net>
+
+	Merge branch 'feature/package-autosuggest'
+
+2026-01-25  Daniel Mendler  <mail@daniel-mendler.de>
+
+	Use a custom buffer name for package review diffs
+
+	* lisp/emacs-lisp/package.el (package-review): Specify a buffer
+	using 'diff-no-select' instead of falling back to the default
+	"*Diff*".
+
+	(Bug#80249)
+
+2026-01-25  Philip Kaludercic  <philipk@posteo.net>
+
+	Have default 'compile-command' run make in parallel
+
+	* lisp/progmodes/compile.el (compile-command): Change default
+	value.
+
+	(Bug#80065)
+
+2026-01-25  F. Moukayed  <alcor@tilde.club>
+
+	Support `undo'ing user input after messages are received
+
+	* lisp/net/rcirc.el (rcirc-update-prompt): Don't track undo info.
+	(rcirc-send-input): Clear undo list after message is sent.
+	(rcirc-update-undo-list): Add new function (copied from erc.el).
+	(rcirc-print): Update (shift) undo list instead of clearing it.
+
+2026-01-25  Stéphane Marks  <shipmints@gmail.com>
+
+	Add 'select-frame-by-id' and 'undelete-frame-by-id' (Bug#80192)
+
+	'select-frame-by-id' will also undelete a deleted frame ID.
+
+	* lisp/frame.el (select-frame-by-id, undelete-frame-by-id): New
+	commands.
+	(make-frame-ids-alist, frame-by-id, frame-id-live-p)
+	(undelete-frame-id-index): New defuns.
+	* etc/NEWS: Announce the commands.
+
+2026-01-25  Po Lu  <luangruo@yahoo.com>
+
+	Adjust Android build system for recent changes to package requirements
+
+	* m4/ndk-build.m4 (ndk_package_map): Map libwebp to webp.
+
+2026-01-24  Basil L. Contovounesios  <basil@contovou.net>
+
+	Clarify libwebp configuration checks
+
+	* configure.ac [HAVE_WEBP]: Explicitly check for both libwebpdemux
+	and libwebp (where the former depends on the latter), since we use
+	both (bug#57420, bug#61988, bug#66221).  Check for WebPDecodeRGBA as
+	a representative of libwebp and libwebpdecoder now that we no longer
+	use WebPGetInfo elsewhere.  Prepend WEBP_LIBS to LIBS as per
+	AC_CHECK_LIB.  Clarify commentary.
+
+2026-01-24  Basil L. Contovounesios  <basil@contovou.net>
+
+	Improve (WebP) image animation
+
+	This adds support for animations with heterogeneous frame durations
+	without sacrificing CPU (bug#47895), and plugs a memory leak in and
+	speeds up WebP animations (bug#66221).
+
+	* lisp/image.el (image-animate): No need to stash
+	image-multi-frame-p data here, as image-animate-timeout now
+	refetches it for each animation frame.
+	(image-show-frame): Fetch image-multi-frame-p anew when checking
+	bounds; a cached value risks going stale.  This is not on the hot
+	path for animations, and is mainly used when framewise stepping
+	through an animation interactively.
+	(image-animate-timeout): Fetch current frame duration anew but do so
+	before image-show-frame to ensure an image cache hit (bug#47895,
+	bug#66221).  Include time taken by local arithmetic in
+	'time-to-load-image'.  Update commentary.
+
+	* src/image.c (parse_image_spec): Simplify using FIXNATP.
+	(filter_image_spec): Remove check for :animate-multi-frame-data as
+	it is no longer used by image.el.
+	[HAVE_ANIMATION && HAVE_GIF] (struct gif_anim_handle):
+	[HAVE_ANIMATION && HAVE_WEBP] (struct webp_anim_handle): New
+	structures formalizing animation cache handles, and allowing for
+	more than two custom fields per image type.
+	(struct anim_cache): Replace generic handle and temp pointers with a
+	union of gif_anim_handle and webp_anim_handle.  All uses updated.
+	Update destructor signature accordingly.
+	(anim_create_cache): Use xzalloc to zero-initialize both integer and
+	pointer fields.  Initialize frames, width, height to -1 for
+	consistency with index.  Mark as ATTRIBUTE_MALLOC.
+	(anim_prune_animation_cache): Check whether destructor (not handle)
+	is null before calling it.
+	(gif_clear_image): Note in commentary that WebP also uses it.
+	(gif_destroy): Free pixmap here now that prune_anim_cache no longer
+	does it automatically.  Remove unused gif_err variable.
+	(gif_load): Avoid UB from casting destructor to a different type.
+	Don't redundantly check for null before xfree.  Change default frame
+	delay from 15fps to t, which image-multi-frame-p will translate into
+	image-default-frame-delay, which the user can control.
+	[HAVE_WEBP && WINDOWSNT] (init_webp_functions): Reconcile library
+	definitions with current webp_load implementation.
+	(webp_destroy): Free owned copy of input WebP bitstream contents.
+	(webp_load): Ownership of both input and decoded memory is a
+	function of :data vs :file and animated vs still.  Make this and
+	transfers of ownership to animation cache clearer by using distinct
+	copy/view variables.  Also make resource freeing clearer by using a
+	single unconditional cleanup and exit path.  Check animation cache
+	early to avoid rereading bitstream and reparsing headers on each
+	call.  Remove redundant call to WebPGetInfo since WebPGetFeatures
+	does the same thing.  Check more libwebpdemux return values for
+	failure and fix file name reported in error messages.  Remove unset
+	local variable 'file'.  If requested :index is ahead, fast-forward
+	instead of restarting from first frame.  If requested :index is
+	behind, reset animation decoder to first frame instead of deleting
+	and recreating it.  Reuse animation decoder's own WebPAnimInfo and
+	WebPDemuxer instance instead of creating and deleting a separate
+	WebPDemuxer.  Fix leak when copying :data to animation cache.  Fix
+	frame duration calculation, and return each frame's own duration now
+	that image.el supports it.  Return t as a default frame duration, as
+	per gif_load.  Consistently use WebPBitstreamFeatures to simplify
+	control flow.  Don't pollute lisp_data image-metadata for still
+	images with animation-related properties.
+	(image_types) [HAVE_WEBP]: Use gif_clear_image to clear lisp_data
+	for consistency with GIF code.
+	(syms_of_image): Remove QCanimate_multi_frame_data; no longer used.
+
+2026-01-24  Basil L. Contovounesios  <basil@contovou.net>
+
+	Improve animation cache documentation
+
+	* doc/lispref/display.texi (Image Cache): Document animation cache
+	argument that clear-image-cache gained in Emacs 29 (bug#56546,
+	bug#66221).
+
+	* lisp/image.el (image-animate-timeout): Note limitation of
+	clear-image-cache with ImageMagick.
+
+	* src/image.c (Fclear_image_cache): Rename animation-cache argument
+	to animation-filter and expand its description for clarity.
+	(struct anim_cache, anim_create_cache, image_prune_animation_caches):
+	Improve commentary.
+	(mark_image_cache): Replace stale commentary that referred to
+	forall_images_in_image_cache with description of mark_image_cache.
+	[HAVE_IMAGEMAGICK] (struct animation_cache): Mention lack of
+	clear-image-cache support in commentary.
+
+2026-01-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix support of listing switches with whitespace in Dired
+
+	* lisp/dired.el (dired-sort-by-date-regexp)
+	(dired-sort-by-name-regexp): Allow quoted arguments with embedded
+	whitespace, per the doc string of 'dired-listing-switches'.
+	(Bug#80200)
+
+2026-01-24  Liu Hui  <liuhui1610@gmail.com>
+
+	Fix inconsistent definition and usage of 'calendar-buffer'
+
+	* lisp/calendar/calendar.el (calendar-buffer): Define it as a
+	variable.
+	* lisp/calendar/diary-lib.el (diary-mark-entries): Set
+	'calendar-buffer' as a string.  (bug#79994)
+
+2026-01-24  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Document 'C-u M-x compile' (bug#80156)
+
+	* doc/emacs/building.texi (Compilation): Document 'C-u M-x
+	compile'.
+
+2026-01-24  Daniel Mendler  <mail@daniel-mendler.de>
+	    Przemysław Alexander Kamiński  <alexander@kaminski.se>
+	    Daniel Mendler  <mail@daniel-mendler.de>
+
+	Support cons cell for 'line-spacing'
+
+	* etc/NEWS: Announce the change.
+	* src/dispextern.h (struct glyph_row): Add
+	'extra_line_spacing_above' member.
+	(struct it): Add 'extra_line_spacing_above' member.
+	* src/frame.h (struct frame): Add 'extra_line_spacing_above'
+	member.  Update comment for 'extra_line_spacing.'
+	* src/buffer.c (syms_of_buffer): Update the docstring of
+	'line-spacing' to describe the cons cell usage.
+	* src/buffer.h (struct buffer): Update comment for
+	'extra_line_spacing'.
+	* src/frame.c (gui_set_line_spacing): Handle cons cell value for
+	'line-spacing'.  Calculate and set 'extra_line_spacing_above'
+	for both integer and float pairs.
+	* src/xdisp.c (init_iterator): Initialize 'extra_line_spacing_above'
+	from buffer or frame 'line-spacing', handling cons cells for both
+	integer and float values.
+	(gui_produce_glyphs): Use 'extra_line_spacing_above' to distribute
+	spacing between ascent and descent.  Update 'max_extra_line_spacing'
+	calculation.
+	(resize_mini_window): Take line spacing into account when resizing the
+	mini window.  Pass height of a single line to 'grow_mini_window' and
+	'shrink_mini_window'.
+	* src/window.c (grow_mini_window, shrink_mini_window): Add unit
+	argument which defines height of a single line.
+	* src/window.h (grow_mini_window, shrink_mini_window): Adjust function
+	prototypes accordingly with unit argument.
+	* lisp/subr.el (total-line-spacing): New function to calculate total
+	spacing from a number or cons cell.
+	(posn-col-row): Use total-line-spacing.
+	* lisp/simple.el (default-line-height): Use 'total-line-spacing'.
+	* lisp/textmodes/picture.el (picture-mouse-set-point): Use
+	'total-line-spacing'.
+	* lisp/window.el (window-default-line-height): Use
+	'total-line-spacing'.
+	(window--resize-mini-window): Take 'line-spacing' into account.
+	* test/lisp/subr-tests.el (total-line-spacing): New test.
+	* test/src/buffer-tests.el (test-line-spacing): New test.
+	* doc/emacs/display.texi (Display Custom): Document that
+	'line-spacing' can be a cons cell.
+	(Line Height): Document the new cons cell format for 'line-spacing'
+	to allow vertical centering.
+
+2026-01-24  Leo C. Stein  <leo.stein@gmail.com>
+
+	Backslashify all open/close punctuation so we don't confuse indenter
+
+	* lisp/leim/quail/latin-ltx.el: Quote characters with general-category
+	Ps and Pe (Punctuation, Open and Punctuation, Close) with backslash,
+	otherwise lisp indentation code gets confused.
+
+2026-01-24  Leo C. Stein  <leo.stein@gmail.com>
+
+	Add a few missing mathematical brackets to TeX input method
+
+	* lisp/leim/quail/latin-ltx.el: Add a few more left/right brackets,
+	especially the ones whose names in ucs-names start with MATHEMATICAL.
+	The macro names are taken from unimath-symbols.pdf, available at
+	http://mirrors.ctan.org/macros/unicodetex/latex/unicode-math/unimath-symbols.pdf
+
+2026-01-24  Leo C. Stein  <leo.stein@gmail.com>
+
+	Add unicode's mathematical alphabets to TeX input method
+
+	* lisp/leim/quail/latin-ltx.el: Add math "alphabets" that can be matched
+	with simple regexps; a few others are added by hand.  There are 13
+	variants: bf, it, bfit, bb, scr, bfscr, frak, bffrak, sf, bfsf, sfit,
+	bfsfit, and tt.
+
+2026-01-24  Leo C. Stein  <leo.stein@gmail.com>
+
+	Add some missing LaTeX macros to TeX input method
+
+	* lisp/leim/quail/latin-ltx.el (latin-ltx--define-rules): Add standard
+	TeX names that were missing; some already had other aliases.  Add a few
+	other non-systematic additions.
+
+2026-01-24  Josh Berdine  <josh@berdine.net>  (tiny change)
+
+	Use math symbols instead of CJK punctuation in TeX input method
+
+	This seems more appropriate given the context, and additionally
+	the CJK symbols often render wider, as a full width CJK glyph,
+	while the math symbols render narrower.  There was some related
+	discussion in bug#12948, where an analogous change was made
+	for \langle and \rangle.
+	* lisp/leim/quail/latin-ltx.el (latin-ltx--define-rules):
+	Change rules for \llbracket, \rrbracket and \ldata, \rdata to
+	generate Unicode code points in the Miscellaneous Mathematical
+	Symbols-A block (U+27E6, U+27E7 and U+27EA, U+27EB) instead of
+	the CJK Symbols and Punctuation block (U+301A, U+301B and
+	U+300A , U+300B).
+
+2026-01-24  Michael Albinus  <michael.albinus@gmx.de>
+
+	Improve handling of not-parallel test runs
+
+	* test/Makefile.in: Distinguish between parallel and not-parallel
+	tests.  Mark lisp/autorevert-tests.log, lisp/filenotify-tests.log
+	and lisp/net/tramp-tests.log to run not-parrallel.  (Bug#80164)
+
+	* test/README: Some of the tests do not run parallel when
+	expensive tests are activated.
+
+	* test/infra/gitlab-ci.yml (.job-template): Use "make -j".
+	Makefile knows how to handle parallel runs properly.
+
+2026-01-24  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Stop project-query-replace-regexp failing on directory symlinks
+
+	* lisp/progmodes/project.el (project--files-safe): New function.
+	(project-search, project-query-replace-regexp): Use it (bug#78209).
+
+2026-01-23  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* lisp/emacs-lisp/pcase.el (pcase--macroexpand): Normalise atom etc.
+
+	Transform (pred P) for P in {atom, nlistp, identity, not} into
+	predicates that pcase already understands in type terms.
+	This doesn't affect the behaviour but generates better code.
+
+2026-01-23  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* test/Makefile.in (SLOW_TESTS): add package-vc-tests (bug#80235)
+
+2026-01-23  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New bindings for vc-revert
+
+	* lisp/vc/vc-dir.el (vc-dir-mode-map): Bind vc-revert to '@'.
+	* lisp/vc/vc-hooks.el (vc-prefix-map): Additionally bind
+	vc-revert to 'C-x v @'.
+	* doc/emacs/maintaining.texi (VC Undo, VC Directory Commands):
+	* etc/NEWS: Document the change.
+
+2026-01-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/simple.el (goto-line): Minor optimization
+
+2026-01-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix MS-Windows build broken by recent updates in MinGW64 headers
+
+	* nt/inc/ms-w32.h (strerror): Redirect to sys_strerror after
+	including <string.h>, to prevent the linker from thinking it
+	should be imported from some DLL.  Reported by Richard Copley
+	<rcopley@gmail.com>.
+
+	* src/w32.c: Remove now unneeded prototype of sys_strerror.
+
+2026-01-22  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Speed up.
+
+	Manicure pcase patterns to avoid performance-sapping internal functions
+	and switch-breaking gaps, resulting in smaller code and less allocation.
+
+2026-01-22  Juri Linkov  <juri@linkov.net>
+
+	Restrict the 'buffer' arg of 'goto-line' only to interactive uses
+
+	* lisp/simple.el (goto-line): Use 'buffer' arg only when
+	'interactive' is non-nil (bug#80150).  Update docstring.
+
+2026-01-21  João Távora  <joaotavora@gmail.com>
+
+	Eglot: simplify Imenu setup again
+
+	See https://github.com/joaotavora/eglot/issues/1569.
+
+	* lisp/progmodes/eglot.el (eglot--managed-mode): Tweak.
+
+	* etc/EGLOT-NEWS: Tweak.
+
+2026-01-21  João Távora  <joaotavora@gmail.com>
+
+	Eglot: display more readable server-originated messages
+
+	* lisp/progmodes/eglot.el (eglot--format-server-message): New helper.
+	(eglot-handle-notification<window/showMessage>)
+	(eglot-handle-request<window/showMessageRequest>): Use it.
+
+2026-01-21  Juri Linkov  <juri@linkov.net>
+
+	Fix down-list navigation in python-ts-mode
+
+	* lisp/progmodes/python.el (python-ts-mode):
+	Set 'treesit-sexp-thing-down-list' to 'list' to override
+	sexp navigation with list navigation (bug#72478).
+
+	* lisp/emacs-lisp/lisp.el (up-list): Mention 'up-list-function' in docstring.
+
+2026-01-21  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	Flymake support for yaml-ts-mode.
+
+	* etc/NEWS: Announce the new customization option (bug#80215).
+	* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode): New customization group.
+	(yaml-ts-mode-yamllint-options): New customization option.
+	(yaml-ts-mode--flymake-process): New variable that stores the reference
+	to the flymake process.
+	(yaml-ts-mode-flymake): New function that implements support for Flymake.
+
+2026-01-21  Binbin Ye  <phantom2501@gmail.com>
+
+	Add JSON path utility command to json-ts-mode
+
+	* lisp/progmodes/json-ts-mode.el (json-ts--get-path-at-node)
+	(json-ts--path-to-jq, json-ts--path-to-python): New functions.
+	(json-ts-jq-path-at-point): New command for getting JSON path at point.
+
+	* test/lisp/progmodes/json-ts-mode-tests.el: New file.
+	Add tests for the utility command.
+
+	* etc/NEWS: Announce new command 'json-ts-jq-path-at-point' (bug#80190).
+
+2026-01-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix updating buffer menu after invoking "M-x term"
+
+	The doc string of 'frame-or-buffer-changed-p' says not to call it
+	with the nil argument, but term.el did.  Since "M-x term" puts
+	'term--update-term-menu' on the 'menu-bar-update-hook' ahead of
+	'menu-bar-update-buffers', it caused the latter decide that there
+	was no change in buffers, because the internal state variable
+	used by 'frame-or-buffer-changed-p' when called with the nil
+	argument was reset by 'term--update-term-menu'.  Fix that by using
+	a non-nil state variable.
+	* lisp/term.el (term--buffers-changed): New variable.
+	(term--update-term-menu): Use it when calling
+	'frame-or-buffer-changed-p'.  (Bug#80231)
+
+2026-01-21  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix textDocument/prepareRename support
+
+	Can't send prepareRename requests willy-nilly.
+
+	See https://github.com/joaotavora/eglot/issues/1554.
+
+	* lisp/progmodes/eglot.el (eglot--rename-interactive): Fix.
+	(eglot-client-capabilities): Advertise "prepareSupport".
+
+	* etc/EGLOT-NEWS: Mention change.
+
+2026-01-21  João Távora  <joaotavora@gmail.com>
+
+	Eglot: set imenu-create-index-function without advice
+
+	See https://github.com/joaotavora/eglot/issues/1569.
+
+	* lisp/progmodes/eglot.el (eglot--managed-mode): Stomp on
+	imenu-create-index-function conditionally.
+	(eglot-imenu): Don't check eglot-server-capable here.
+
+	* etc/EGLOT-NEWS: Mention change.
+
+2026-01-21  João Távora  <joaotavora@gmail.com>
+
+	Eglot: limit the number of file watches
+
+	Some language servers request file watching for a very large number of
+	directories (e.g. Python virtualenvs), which can exhaust system
+	resources and cause slow startup.
+
+	https://github.com/joaotavora/eglot/issues/1568
+
+	* lisp/progmodes/eglot.el (eglot-max-file-watches): New variable.
+	(eglot--count-file-watches): New function.
+	(eglot--watch-globs): Use them to limit watches.  Signal jsonrpc-error
+	when limit is reached.
+	(eglot-watch-files-outside-project-root): Fix docstring punctuation.
+
+	* etc/EGLOT-NEWS: Mention change.
+
+2026-01-21  João Távora  <joaotavora@gmail.com>
+
+	Eglot: support more complex workspace edits (create/rename/delete)
+
+	Advertise support for file resource operations in workspace edits.
+	Implement create, rename, and delete file operations.  Rework
+	confirmation UI to handle mixed operation types.
+
+	* lisp/progmodes/eglot.el (eglot--lsp-interface-alist): Add
+	CreateFile, RenameFile, DeleteFile interfaces.
+	(eglot-client-capabilities): Advertise resourceOperations and
+	failureHandling.
+	(eglot-handle-request<workspace/applyEdit>): Return failureReason.
+	(eglot--apply-text-edits): Tweak error message.
+	(eglot--propose-changes-as-diff): Adjust for new prepared format.
+	Return buffer.
+	(eglot--apply-workspace-edit): Rework.  Handle file operations.
+
+	* etc/EGLOT-NEWS: Mention change.
+
+2026-01-21  João Távora  <joaotavora@gmail.com>
+
+	Eglot: overhaul eglot-confirm-server-edits defcustom
+
+	Now also accepts file operation kinds as keys in the alist form.
+
+	* lisp/progmodes/eglot.el (eglot-confirm-server-edits): Rework
+	default value, docstring and defcustom type.
+	(eglot--confirm-server-edits): Also check for operation-kind-based
+	entries.
+
+2026-01-21  João Távora  <joaotavora@gmail.com>
+
+	Eglot: default eglot-advertise-cancellation to t
+
+	The current 2026 landscape suggests servers (especially gopls
+	and ocamllsp) take advantage of this, so let's give it to them
+	by default.
+
+	* lisp/progmodes/eglot.el (eglot-advertise-cancellation):
+	Default to t.
+
+	* etc/EGLOT-NEWS: Mention change.
+
+2026-01-21  João Távora  <joaotavora@gmail.com>
+
+	Eglot: handle user quits when applying server-initiated edits
+
+	If the user simply C-g's signal a 'jsonrpc-error' with code 32000 to
+	mean "no error", provide an LSP :failureReason and keep server chill.
+
+	* lisp/progmodes/eglot.el (eglot-handle-request<workspace/applyEdit>>):
+
+2026-01-21  João Távora  <joaotavora@gmail.com>
+
+	Eglot: ensure no timeout on remote command executions
+
+	Else, if the server asks us a question, the user has just 10
+	seconds to ponder, which is a bit silly.
+
+	* lisp/progmodes/eglot.el (eglot-execute): Pass timeout=nil to
+	eglot--request.
+
+2026-01-21  João Távora  <joaotavora@gmail.com>
+
+	Eglot: slightly friendlier UI for server window/showMessageRequest
+
+	Previously, the default answer pre-filled in the minibuffer was
+	obscuring the other possible answers.
+
+	* lisp/progmodes/eglot.el
+	(eglot-handle-request<window/showMessageRequest>): Rework.
+
+2026-01-21  João Távora  <joaotavora@gmail.com>
+
+	Eglot: advertise cancellation on eglot--request quits
+
+	* lisp/progmodes/eglot.el (eglot--request): Pass CANCEL-ON-QUIT
+	to jsonrpc-request.
+
+2026-01-21  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix async request cancellation
+
+	It was completely broken, with a cancel being set for every sent (and
+	probably already received) async request, and no actual discarding
+	of the response of a cancelled request.
+
+	* lisp/progmodes/eglot.el (eglot--async-request): Fix cancellation
+	of async requests.
+	(eglot--semtok-request): Don't need 'buf' &aux anymore.
+
+2026-01-21  João Távora  <joaotavora@gmail.com>
+
+	Eglot: treat code=0 JSONRPC errors as benign
+
+	* lisp/progmodes/eglot.el (eglot--request): Shoosh code=0 errors.
+	(eglot-mode-line-error): Check for code=0.
+
+2026-01-21  João Távora  <joaotavora@gmail.com>
+
+	Jsonrpc: don't let remote endpoint requests go unanswered
+
+	Previously, 'quit' could cause remote endpoints to never get a
+	reply and thus sometimes hang.  Ensure we always reply.  Also,
+	give the application a chance to signal jsonrpc-error with the
+	served code=32000, meaning "no error".
+
+	* doc/lispref/text.texi (JSONRPC Overview): Rework section on
+	request dispatchers.
+
+	* lisp/jsonrpc.el (jsonrpc-connection-receive): Rework.
+
+2026-01-21  João Távora  <joaotavora@gmail.com>
+
+	Jsonrpc: allow control over jsonrpc-request quits
+
+	This allows clients such as Eglot to act on the user
+	C-g's/quits out of a blocking jsonrpc-request call.  It also
+	fixes the TIMEOUT=nil passed to jsonrpc-request.  An infinite
+	timeout in that case (for a long-running request, for example)
+	and it was not being transmitted to the lower
+	jsonrpc-async-request.
+
+	* lisp/jsonrpc.el (jsonrpc-request): Add CANCEL-ON-QUIT.  Rework
+	docstring.
+
+2026-01-21  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix thinko in 'quit-restore-window'
+
+	* lisp/window.el (quit-restore-window): Try to restore the
+	previously selected window only if WINDOW is either the selected
+	window or BURY-OR-KILL is neither 'burying' nor 'killing'.
+	Otherwise, this might deliberately change the selected window,
+	for example, when 'kill-buffer-quit-windows' is non-nil and WINDOW
+	shows the buffer to kill.
+
+2026-01-21  Morgan Smith  <Morgan.J.Smith@outlook.com>
+
+	* doc/misc/dbus.texi (Inhibitor Locks): Fix path.
+
+2026-01-21  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Use 'message' instead of 'user-error'. (Bug#80201)
+
+	Using 'user-error' in 'hs-minor-mode', prevents the major-mode
+	from initializing correctly when hideshow is not supported in
+	that mode, using 'message' instead fixes this.
+
+	* lisp/progmodes/hideshow.el (hs-minor-mode): Tweak.
+
+2026-01-21  Jared Finder  <jared@finder.org>
+
+	(xterm--init): Fix probem in async mode (bug#80163)
+
+	In async mode, the workaround for the old Terminal.app collides
+	with the binding we install for the primary DA.  Just drop it.
+
+	* lisp/term/xterm.el (xterm--init): Remove workaround for very old
+	macOS `Terminal.app`.
+
+2026-01-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(garbage-collect-heapsize): New function
+
+	The info returned from `garbage-collect` is really handy to
+	track the evolution of the heap size, but sadly it's available only
+	at the cost of running a full GC, which has two big downsides:
+	it's slow, it affects what we're measuring, and it can't be used
+	in `post-gc-hook`.
+	So, this patch makes it available without running the GC.
+
+	* src/alloc.c (Fgarbage_collect_heapsize): New function, extracted from
+	`Fgarbage_collect`.
+	(Fgarbage_collect): Use it.
+	(syms_of_alloc): defsubr it.
+
+	* doc/lispref/internals.texi (Garbage Collection): Extract
+	documentation for it from that of `garbage-collect`.
+
+2026-01-20  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-bar.el (tab-bar-split-tab): New command.
+
+	(split-tab): Alias for 'tab-bar-split-tab'.
+
+2026-01-20  Michael Albinus  <michael.albinus@gmx.de>
+
+	Extend Tramp traces
+
+	* lisp/net/tramp-message.el (tramp-debug-message):
+	Change selection for `trace-function-background'.
+
+2026-01-20  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tag Tramp tests as :expensive-test
+
+	* test/lisp/net/tramp-tests.el (tramp-test03-file-name-defaults)
+	(tramp-test10-write-region-file-precious-flag)
+	(tramp-test10-write-region-other-file-name-handler)
+	(tramp-test16-file-expand-wildcards)
+	(tramp-test17-dired-with-wildcards)
+	(tramp-test17-insert-directory-one-file)
+	(tramp-test33-environment-variables-and-port-numbers)
+	(tramp-test35-remote-path, tramp-test39-make-lock-file-name)
+	(tramp-test39-detect-external-change, tramp-test42-utf8)
+	(tramp-test43-file-system-info)
+	(tramp-test44-file-user-group-ids, tramp-test48-session-timeout)
+	(tramp-test49-external-backend-function)
+	(tramp-test50-recursive-load): Tag them as :expensive-test.  (Bug#80164)
+
+2026-01-20  Daniel Mendler  <mail@daniel-mendler.de>
+
+	Call browser functions via `browse-url'
+
+	This is in order to apply `browse-url-transform-alist'.
+
+	* lisp/net/browse-url.el (browse-url-with-browser-kind)
+	(browse-url-button-open, browse-url-button-open-url):
+	* lisp/net/shr.el (shr-browse-url):
+	* lisp/net/eww.el (eww-browse-with-external-browser):
+	* lisp/gnus/gnus-sum.el (gnus-summary-browse-url):
+	* lisp/emacs-lisp/package.el (package-browse-url): Let-bind
+	`browse-url-browser-function' and call `browse-url'.
+
+2026-01-20  Pranshu Sharma  <pranshu@bauherren.ovh>
+
+	Factor out calculation of window combination for 'split-frame'
+
+	* lisp/window-x.el (window--get-split-combination): New function.
+	(split-frame): Call it.
+
+2026-01-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Don’t use C basename function
+
+	* src/pdumper.c (pdumper_set_emacs_execdir):
+	Don’t use basename; simply use the pointer we already have.
+	If we ever need a basename-like function in the future, we should
+	use Gnulib’s basename-lgpl module, as POSIX basename modifies its
+	argument string and is incompatible with glibc/Android basename; see
+	<https://www.gnu.org/software/gnulib/manual/html_node/basename.html>.
+
+2026-01-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2026-01-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Omit -Wzero-as-null-pointer-constant
+
+	* configure.ac: If --enable-gcc-warnings, don’t use
+	-Wzero-as-null-pointer-constant, which is enabled by default with
+	bleeding-edge Gnulib (as there seems to be movement in this
+	direction in C2y).  Although -Wzero-as-null-pointer-constant is
+	useful, Emacs isn’t clean for it yet.
+
+2026-01-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Merge Gnulib save-cwd.c changes
+
+	* lib/save-cwd.c: Propagate changes from Gnulib sibling.
+	This doesn’t affect behavior.
+
+2026-01-19  Juri Linkov  <juri@linkov.net>
+
+	Allow non-interactive calls of 'goto-line' (bug#80150)
+
+	* lisp/simple.el (goto-line, goto-line-relative): Add new arg 'interactive'.
+	Remove 'declare' with 'interactive-only'.  Don't push the mark when called
+	non-interactively.
+
+2026-01-19  Juri Linkov  <juri@linkov.net>
+
+	Don't fail in minibuffer--completions-visible for undefined reference buffer
+
+	* lisp/minibuffer.el (minibuffer--completions-visible):
+	Return 'window' even when 'completion-reference-buffer' is nil (bug#80064).
+
+2026-01-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix vertical cursor motion across overlay strings
+
+	* src/indent.c (Fvertical_motion): Fix vertical cursor motion when
+	a screen line begins with an overlay string.  (Bug#80223)
+
+2026-01-19  RadioNoiseE  <rne.kou@icloud.com>
+
+	Fix box cursor width returned for stretch glyph
+
+	* src/window.c (Fwindow_cursor_info): Return canonical character width
+	when on stretch glyph and `x-stretch-cursor' is nil.  (Bug#80211)
+
+2026-01-19  Yavor Doganov  <yavor@gnu.org>
+
+	NS: Fix UI freezes and Lisp threads on GNUstep
+
+	* src/nsterm.m (ns_select_1): Return thread_select if current
+	thread is not the main thread or timeout is zero; otherwise call
+	'thread_select' with a minimal timeout to allow other Lisp
+	threads to run.  (Bug#80110, Bug#80112)
+
+2026-01-19  Michael Albinus  <michael.albinus@gmx.de>
+
+	Suppress parallel make for filenotify-tests and tramp-tests
+
+	* test/Makefile.in (.NOTPARALLEL): Add lisp/filenotify-tests.log
+	and lisp/net/tramp-tests.log.  (Bug#80164)
+
+2026-01-18  Philip Kaludercic  <philipk@posteo.net>
+
+	Have 'package-find-news-file' handle built-in packages
+
+	* lisp/emacs-lisp/package.el (package-find-news-file): Abort
+	early if the package is built-in.
+	(describe-package-1): Do not invoke 'package-find-news-file' if
+	missing a package descriptor.
+
+2026-01-18  Philip Kaludercic  <philipk@posteo.net>
+
+	Portable escape SWITCHES in 'package-review-diff-command'
+
+	* lisp/emacs-lisp/package.el (package-review-diff-command): Use
+	'shell-quote-argument' to quote arguments instead of assuming a
+	POSIX shell.
+
+2026-01-18  Philip Kaludercic  <philipk@posteo.net>
+
+	Improve type of user option 'package-review-policy'
+
+	* lisp/emacs-lisp/package.el (package-review-policy): Move tags
+	to the cons-cell level, so that the labels are displayed in the
+	menu when inserting a new item.
+
+2026-01-18  Wilson Snyder  <wsnyder@wsnyder.org>
+
+	verilog-mode.el: Fix parameter replacements in AUTOINST.
+
+	* lisp/progmodes/verilog-mode.el (verilog-auto-inst-port): Fix
+	parameter replacements in AUTOINST (#1903).
+
+2026-01-18  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix `Man-shell-file-name'
+
+	* lisp/man.el (Man-shell-file-name): Fix for MS Windows.
+	(Bug#80212)
+
+2026-01-18  Philip Kaludercic  <philipk@posteo.net>
+
+	Extract "news" file extraction logic
+
+	* lisp/emacs-lisp/package.el (package-review)
+	(describe-package-1): Use new function.
+	(package-find-news-file): Add new function that also checks for
+	the "NEWS-elpa" file name.
+
+2026-01-18  Philip Kaludercic  <philipk@posteo.net>
+
+	Autoload 'package-delete'
+
+	* lisp/emacs-lisp/package.el (package-delete): Add autoload
+	cookie.  (Bug#80178)
+
+2026-01-17  Philip Kaludercic  <philipk@posteo.net>
+
+	Autoload 'package-browse-url'
+
+	* lisp/emacs-lisp/package.el (package-browse-url): Add autoload
+	cookie.  (Bug#80178)
+
+2026-01-17  Philip Kaludercic  <philipk@posteo.net>
+
+	Remove some mode restriction in interactive specs of package.el
+
+	* lisp/emacs-lisp/package.el (package-browse-url)
+	(package-report-bug): Do not restrict these commands to
+	'package-menu-mode'.  (Bug#80178)
+
+2026-01-17  Philip Kaludercic  <philipk@posteo.net>
+
+	Remove rcirc-set-{en,de}code-coding-system aliases
+
+	These were in the wrong order anyway, so they never had any
+	effect.
+
+	* lisp/net/rcirc.el (rcirc-set-decode-coding-system)
+	(rcirc-set-encode-coding-system): Remove obsoletion aliases.
+	(Bug#80145)
+
+2026-01-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Avoid overflows in image size calculations
+
+	Problem reported by Basil L. Contovounesios (bug#66221#89).
+	* src/image.c (image_size_in_bytes, image_frame_cache_size):
+	Use intptr_t for sizes of collections of objects.
+	(struct anim_cache.byte_size, gif_load, Fimage_cache_size):
+	Use intmax_t for sizes of either files or objects.
+
+2026-01-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Improve doc re integer overflow
+
+	* doc/lispref/internals.texi (Module Values, C Integer Types):
+	Mention that the example assumes Emacs was built with the
+	GMP library, not with mini-gmp.  Mention stdckdint.h for
+	integer overflow checking, and mention Emacs integers
+	for values outside machine range.
+
+2026-01-17  Philip Kaludercic  <philipk@posteo.net>
+
+	Add a default "Subject" for package reviews
+
+	* lisp/emacs-lisp/package.el (package-review): Set the SUBJECT
+	parameter when calling 'compose-mail'.
+
+2026-01-17  Philip Kaludercic  <philipk@posteo.net>
+
+	Quote diff when reviewing package
+
+	* lisp/emacs-lisp/package.el (package-review): Run
+	'comment-region' on the output of diff.
+
+2026-01-17  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Disable diff-restrict-view by default
+
+	* lisp/vc/diff-mode.el (diff-restrict-view): Disable it.
+	* etc/NEWS: Announce the change.
+
+2026-01-17  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Automatically detect the VC outgoing base (bug#80006)
+
+	* lisp/vc/vc-git.el (vc-git--current-branch): Rename to ...
+	(vc-git-working-branch): ... this.  All uses changed.
+	(vc-git-trunk-or-topic-p, vc-git-topic-outgoing-base):
+	* lisp/vc/vc-hg.el (vc-hg--working-branch, vc-hg-working-branch)
+	(vc-hg-trunk-or-topic-p, vc-hg-topic-outgoing-base):
+	* lisp/vc/vc-hooks.el (vc--safe-branch-regexps-p):
+	* lisp/vc/vc.el (vc-default-working-branch)
+	(vc-default-trunk-or-topic-p, vc--match-branch-name-regexps)
+	(vc--outgoing-base, vc--outgoing-base-mergebase)
+	(vc--maybe-read-outgoing-base): New functions.
+	(vc-diff-outgoing-base): Call vc--outgoing-base-mergebase.
+	(vc-root-diff-outgoing-base, vc-diff-outgoing-base): Use
+	vc--maybe-read-outgoing-base in interactive specification.
+	(working-branch, trunk-or-topic-p, topic-outgoing-base): New
+	specifications for backend functions.
+	(vc-trunk-branch-regexps, vc-topic-branch-regexps): New
+	variables.
+	* .dir-locals.el: Commented entries for the new variables.
+	* test/lisp/vc/vc-tests/vc-test-misc.el
+	(vc-test-match-branch-name-regexps): New test.
+	* doc/emacs/vc1-xtra.texi (Outstanding Changes): Document the
+	new functionality.
+
+2026-01-17  kobarity  <kobarity@gmail.com>
+
+	Performance improvement of 'python-shell-get-process'
+
+	'python-shell-get-process' is frequently called from
+	'python-eldoc--get-doc-at-point' and etc., invoking
+	'project-current' unless there is a buffer-specific Inferior
+	Python process.  When the buffer is a remote buffer not
+	belonging to any project and has significant latency,
+	'project-current' may take a long time.  To avoid this,
+	implement a process cache in 'python-shell-get-process'.
+
+	* lisp/progmodes/python.el (python-shell--process-cache)
+	(python-shell--process-cache-valid): New variables.
+	(python-shell--invalidate-process-cache): New function.
+	(python-shell-make-comint): Add a call to the above function.
+	(python-shell-get-process): Add process cache.  (Bug#80045)
+
+2026-01-17  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	csharp-mode.el: Fix indentation after preprocessor statements
+
+	* lisp/progmodes/csharp-mode.el (csharp-ts-mode--indent-rules):
+	Add rules for preprocessor statements.  (Bug#80202)
+
+2026-01-17  Pig Fang  <g-plane@hotmail.com>  (tiny change)
+
+	Eglot: support 'wat-mode'
+
+	* lisp/progmodes/eglot.el (eglot-server-programs): Add wat_server.
+	(Bug#80188)
+
+2026-01-17  Yavor Doganov  <yavor@gnu.org>
+
+	NS: Fix startup with HAVE_NATIVE_COMP && !NS_SELF_CONTAINED
+
+	* src/pdumper.c (pdumper_set_emacs_execdir): Add workaround for
+	!NS_SELF_CONTAINED so that launching Emacs from the app bundle
+	works flawlessly when built with native compilation.
+	* configure.ac: Define BINDIR.  (Bug#80094)
+
+2026-01-17  Daniel Mendler  <mail@daniel-mendler.de>
+
+	gnus-msg-mail: Attempt to start Gnus if not yet alive
+
+	* lisp/gnus/gnus-msg.el (gnus-msg-mail): Attempt to start Gnus
+	if not yet alive.  In case of failure, fall back to plain
+	message mode.  (Bug#80173)
+
+2026-01-17  kobarity  <kobarity@gmail.com>
+
+	Improve non-native completion in Python mode
+
+	Previously, both the definition of __PYTHON_EL_get_completions
+	and the call to __PYTHON_EL_get_completions were sent to the
+	inferior Python each time
+	'python-shell-completion-get-completions' was executed.
+	However, there is no need to send the definition every time as
+	long as the definition remains unchanged.  We improved this so
+	that the definition of __PYTHON_EL_get_completions is only sent
+	during the inferior Python initialization; it is no longer sent
+	during 'python-shell-completion-get-completions' execution.
+	* lisp/progmodes/python.el
+	(python-shell-completion-send-setup-code): New function.
+	(python-shell-first-prompt-hook): Add the above new function.
+	(python-shell-completion-get-completions): Omit sending
+	'python-shell-completion-setup-code'.  (Bug#80182)
+
+2026-01-17  Jacob S. Gordon  <jacob.as.gordon@gmail.com>
+
+	calc: Improve handling of invalid 'calc-string-maximum-character'
+
+	Previously, if 'calc-string-maximum-character' wasn't a valid
+	character 'math-vector-is-string' would throw an error in the
+	comparison, leading to an incomplete display of the stack and a
+	cryptic error message.  Instead, have 'math-vector-is-string'
+	return nil, which effectively disables the display of strings.
+	Refines feature introduced in bug#78528.
+	* doc/misc/calc.texi (Customizing Calc): Update description of
+	behavior for invalid 'calc-string-maximum-character'.
+	* lisp/calc/calccomp.el (math-vector-is-string): Return nil when
+	'calc-string-maximum-character' doesn't represent a character.
+	* test/lisp/calc/calc-tests.el (calc-math-vector-is-string): Correct
+	and simplify tests.
+
+2026-01-17  Amin Bandali  <bandali@gnu.org>
+
+	New minor mode center-line-mode
+
+	* lisp/textmodes/text-mode.el (center-line-mode--track-changes):
+	New local variable for storing the id of the change tracker registered
+	for the current buffer.
+	(center-line-mode--track-changes-signal): New function to be called by
+	the track-changes library whenever there is a change in the current
+	buffer.
+	(center-line-mode--track-changes-function): New function called from the
+	above signal function, iterates over the lines of the modified region,
+	calling 'center-line' for each non-empty line.
+	(center-line-mode): New minor mode.
+	* etc/NEWS: Document the new minor mode.
+
+2026-01-17  Yavor Doganov  <yavor@gnu.org>
+
+	NS: Add native image support for HEIF, SVG and WEBP on GNUstep
+
+	* src/nsimage.m (ns_can_use_native_image_api): Handle HEIF, SVG
+	and WEBP image types on GNUstep.
+	* src/image.c (syms_of_image): Add conditional native image
+	support for HEIF, SVG and WEBP on GNUstep.  (Bug#80101)
+
+2026-01-17  Yavor Doganov  <yavor@gnu.org>
+
+	NS: Fix Meta key on GNUstep
+
+	* src/nsterm.m (syms_of_nsterm): On GNUstep, set
+	ns-command-modifier to "meta" to match the backend default
+	setting.  (Bug#80090)
+
+2026-01-17  Michael Albinus  <michael.albinus@gmx.de>
+
+	New D-Bus functions to support systemd inhibitor locks
+
+	* doc/misc/dbus.texi (Top): Add "Inhibitor Locks" submenu.
+	Remove trailing period from chapter and section titles.
+	(Inhibitor Locks): New node.
+
+	* etc/NEWS: New D-Bus functions to support systemd inhibitor locks.
+	Presentational fixes and improvements.
+
+	* src/dbusbind.c (xd_registered_inhibitor_locks): New variable.
+	(Fdbus_make_inhibitor_lock, Fdbus_close_inhibitor_lock)
+	(Fdbus_registered_inhibitor_locks): New DEFUNs.  (Bug#79963)
+	(syms_of_dbusbind_for_pdumper): Initialize
+	`xd_registered_inhibitor_locks'.
+	(syms_of_dbusbind): Declare subroutines
+	`Sdbus_make_inhibitor_lock', `Sdbus_close_inhibitor_lock' and
+	`Sdbus_registered_inhibitor_locks'.  Declare symbol `Qdbus_call_method'.
+	staticpro `xd_registered_inhibitor_locks'.
+
+	* test/lisp/net/dbus-tests.el (dbus--test-systemd-service)
+	(dbus--test-systemd-path, dbus--test-systemd-manager-interface):
+	New defconsts.
+	(dbus-test10-inhibitor-locks): New test.
+
+2026-01-16  Basil L. Contovounesios  <basil@contovou.net>
+
+	Various housekeeping in image.c
+
+	* doc/lispref/display.texi (Customizing Bitmaps): Fix grammar.
+	(XBM Images): Fix reference to incorrect number of properties.
+	(Multi-Frame Images, Other Image Types): Mention multi-frame WebP
+	support.
+
+	* src/image.c: Don't include pdumper.h; it hasn't been needed since
+	commit of 2019-05-17 "Clean up and simplify image-type setup".  Fix
+	some commentary.
+	(image_pix_container_create_from_bitmap_data): Remove no longer used
+	frame parameter (bug#80191); this continues from commit of
+	2022-11-25 "Remove unused parameter from
+	image_create_pix_container".  All callers updated.
+	(x_create_xrender_picture, initialize_image_type): Simplify.
+	(xbm_image_p): Remove redundant conditional branch.  Update
+	commentary.
+
+2026-01-16  Basil L. Contovounesios  <basil@contovou.net>
+
+	Fix off-by-one error in native_image_p
+
+	* src/image.c (native_image_format): Make array size explicit, to
+	help keep it consistent with its later fmt descriptor copy.
+	(native_image_p): Parse the correct number of keywords (bug#80191).
+
+2026-01-15  Jared Finder  <jared@finder.org>
+
+	Fix behavior for ielm-dynamic-multiline-inputs (bug#80123)
+
+	* lisp/ielm.el (ielm-return): Navigate to before the prompt when
+	looking for prompt (bug#80123).
+
+2026-01-15  Jared Finder  <jared@finder.org>
+
+	New IELM option to insert newline when inside sexp (bug#80123)
+
+	* lisp/ielm.el (ielm-dynamic-return): Add new value `point' to
+	user option.
+	(ielm-return): Implement it (bug#80123).
+
+2026-01-15  Rudolf Adamkovič  <rudolf@adamkovic.org>
+
+	Update SQLite font-lock rules
+
+	* lisp/progmodes/sql.el (sql-mode-sqlite-font-lock-keywords):
+	Synchronize all SQLite keywords with the official documentation.
+
+2026-01-15  Andrea Corallo  <acorallo@gnu.org>
+
+	* Fix 'message' function signature
+
+	* lisp/emacs-lisp/comp-common.el(comp-primitive-type-specifiers): Fix
+	'message' entry.
+
+2026-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(define-ibuffer-column): Fix corner case miscompilations (bug#80180)
+
+	* lisp/ibuf-macs.el (define-ibuffer-column): Don't quote the
+	SUMMARIZER functions as data.
+
+2026-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(make-progress-reporter): Tweak wording of CONTEXT doc
+
+2026-01-14  Stéphane Marks  <shipmints@gmail.com>
+
+	Optionally inhibit echo area progress reporting (bug#80198)
+
+	Add an optional 'context' argument to 'make-progress-reporter'
+	which 'progress-reporter-echo-area' consults to inhibit updates
+	if the context is 'async' and the echo area is busy.
+
+	* lisp/subr.el (make-progress-reporter): Add the optional
+	'context' argument.
+	(progress-reporter-context): New defun accessor.
+	(progress-reporter-echo-area): Consult
+	'progress-reporter-context'.
+	* doc/lispref/display.texi: Document context.
+	* etc/NEWS: Announce context.
+
+2026-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(package-install): Fix accidental regression
+
+	* lisp/emacs-lisp/package.el (package-install): Remove code re-added
+	probably by erroneous merge.
+
+2026-01-14  Paul Nelson  <ultrono@gmail.com>
+
+	Allow Ispell to save corrections as abbrevs
+
+	* lisp/textmodes/ispell.el (ispell-save-corrections-as-abbrevs):
+	New user option.
+	(ispell--abbrev-saving-allowed)
+	(ispell--save-correction-as-abbrev): New variables.
+	(ispell--maybe-save-correction-abbrev): New function.
+	(ispell-word, ispell-process-line): Use them to save corrections
+	as abbrevs when appropriate (bug#79985).
+	(ispell-command-loop): Add C-u as command character to toggle
+	abbrev saving for an immediately following replacement command.
+	(ispell-help): Document C-u binding.
+
+	* doc/emacs/fixit.texi (Spelling): Document new feature.
+
+2026-01-14  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Add new up-down option for minibuffer-visible-completions
+
+	* lisp/emacs-lisp/crm.el (completing-read-multiple): Call
+	'minibuffer-visible-completions--maybe-compose-map'.
+	* lisp/minibuffer.el (completion-in-region-mode): Call
+	'minibuffer-visible-completions--maybe-compose-map'.
+	(minibuffer-visible-completions): Add new value 'up-down' (bug#80024).
+	(minibuffer-visible-completions-up-down-map): Add.
+	(minibuffer-visible-completions--maybe-compose-map): Add helper
+	function.
+	(completing-read-default): Call
+	'minibuffer-visible-completions--maybe-compose-map'.
+	* lisp/simple.el (completion-setup-function): Check
+	'minibuffer-visible-completions' is t, not just non-nil.
+
+2026-01-14  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/project.el: Improve performance of 'project-mode-line'.
+
+	(project-name-cache-timeout): New variable.
+	(project-name-cached): New function (bug#78545).
+	(project-mode-line): New value 'non-remote'.
+	(project-mode-line-format): Don't show the remote project's name
+	when 'project-mode-line' is 'non-remote'.  Use 'project-name-cached'.
+
+2026-01-14  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Rename VC outgoing and incoming log commands to include "-root-"
+
+	* lisp/vc/vc.el (vc-log-incoming, vc-log-outgoing): Rename ...
+	(vc-root-log-incoming, vc-root-log-outgoing): ... to these.  All
+	uses changed.  Leave behind obsolete function aliases.
+	* lisp/emacs-lisp/package-vc.el (package-vc-log-incoming):
+	Rename ...
+	(package-vc-root-log-incoming): ... to this.  All uses changed.
+	Leave behind obsolete function alias.
+
+2026-01-14  Jared Finder  <jared@finder.org>
+
+	Reset Xterm cursor color to default when face is unspecified
+
+	* lisp/term/xterm.el (xterm-update-cursor): Mention OSC 112 in
+	doc string.
+	(xterm--reset-cursor-color-escape-sequence): New constant.
+	(xterm--init-update-cursor, xterm--update-cursor-color): Use it
+	(bug#80091).
+
+2026-01-14  Michael Albinus  <michael.albinus@gmx.de>
+
+	Call all registered D-Bus signal handlers
+
+	* doc/misc/dbus.texi (Signals): All registered signal handlers are
+	called.
+	(Synchronous Methods, Signals, Monitoring Messages): Add function
+	result in examples.
+
+	* src/dbusbind.c (xd_store_event): New function.
+	(xd_read_message_1): Use it.  Call all registered handlers per
+	signal.  (Bug#80168)
+
+	* test/lisp/net/dbus-tests.el (dbus--test-signal-handler): Adapt defun.
+	(dbus--test-signal-handler1, dbus--test-signal-handler2): New defuns.
+	(dbus-test05-register-signal-several-handlers): New test.
+	(dbus-test04-register-method)
+	(dbus-test04-call-method-authorizable)
+	(dbus-test05-register-signal)
+	(dbus-test05-register-signal-with-nils)
+	(dbus-test06-register-property-emits-signal): Adapt tests.
+
+2026-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(loaddefs-generate--make-autoload): Fix bug#80180
+
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload):
+	Avoid accidentally loading the `.elc` file.
+
+2026-01-13  Jonas Bernoulli  <jonas@bernoul.li>
+
+	* lisp/icomplete.el (icomplete--render-vertical): Avoid trailing whitespace
+
+	When a completion candidate has no suffix, then there is no need to
+	add whitespace "between" the candidate and suffix, since there is no
+	need to align suffixes if there are none.  In this case the trailing
+	whitespace only serves to needlessly make all candidates the same
+	length, with the result that if one candidate does not fit one a
+	single line, then all other candidates are made to not fit either.
+
+2026-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	package.el: Fix bug#80172
+
+	* lisp/emacs-lisp/package-activate.el: Move defvar of
+	`Info-directory-list` to when we know it should exist.
+
+	* lisp/emacs-lisp/package.el (Info-directory-list): Defvar before we
+	`let-bind it.
+
+2026-01-13  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Fix buffer menu unmark (bug#80082)
+
+	Now when calling 'Buffer-menu-unmark-all-buffers', only the
+	selected mark is removed.
+
+	* lisp/buff-menu.el (Buffer-menu--unmark): Add a mark parameter
+	to correctly select it in the entry.
+	(Buffer-menu-unmark, Buffer-menu-unmark-all-buffers)
+	(Buffer-menu-backup-unmark): Usage.
+
+2026-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs
+
+2026-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	sgml-mode.el: Prefer `forward-sexp` over `forward-list`
+
+	They're always called immediately before a `<` char, in which case
+	they do the same anyway.  This saves us from having to touch
+	 `forward-list-function` in addition to `forward-exp-function`.
+
+	While at it, change `sgml-tags-invisible` to use `define-minor-mode`.
+
+	* lisp/textmodes/sgml-mode.el (sgml-delete-tag)
+	(sgml-electric-tag-pair-before-change-function): Prefer `forward-sexp`
+	over `forward-list`.
+	(sgml-tags-invisible): Define with `define-minor-mode`.  Don't disable
+	`cursor-sensor-mode` when we don't need it any more, since some other
+	package may be using it.  Remove redundant binding of `inhibit-read-only`.
+
+2026-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(forward-sexp-function): Give it a default value
+
+	* lisp/emacs-lisp/lisp.el (forward-sexp-function): Give it a default value.
+	(forward-sexp): Simplify a bit.
+	(up-list-default-function): Fix for `forward-sexp-default-function`.
+
+2026-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(forward-list-function): Give it a default value
+
+	* lisp/emacs-lisp/lisp.el (forward-list-function): Give it a default value.
+	(forward-list): Simplify.
+
+2026-01-13  Stéphane Marks  <shipmints@gmail.com>
+
+	Inhibit unused variable warning in NSTRACE_WHEN (bug#80096)
+
+	* src/nsterm.h (NSTRACE_WHEN): Mark
+	'nstrace_saved_enabled_global' as unused.
+
+2026-01-13  Stéphane Marks  <shipmints@gmail.com>
+
+	Add frame identifiers (bug#80138)
+
+	A unique frame id is assigned to a new or cloned frame, and
+	reused on an undeleted frame.
+
+	The id facilitates unambiguous identification among frames that
+	share identical names or titles, deleted frames where a live
+	frame object no longer exists that we can resurrect by id, for
+	example via 'tab-bar-undo-close-tab'.  It also aids debugging at
+	the C level using the frame struct member id.
+
+	Rewrite 'clone-frame' and 'undelete-frame' to not let bind
+	variables that 'make-frame' uses to avoid conflicts with nested
+	'make-frame' calls, for example via
+	'after-make-frame-functions'.
+
+	* lisp/frame.el (clone-frame, undelete-frame): Use
+	'frame--purify-parameters' to supply parameters explicitly.
+	(undelete-frame--save-deleted-frame): Save frame id for
+	restoration.
+	(undelete-frame): Restore frame id.
+	(frame--purify-parameters): New defun.
+	(make-frame): Assign a new id for a new or cloned frame, reuse
+	for undeleted frame.
+	* src/frame.h (struct frame): Add id member.
+	(frame_next_id): New extern.
+	* src/frame.c (frame_next_id): New global counter.
+	(frame_set_id, frame_set_id_from_params): New function.
+	(Fframe_id): New DEFUN.
+	(syms_of_frame <Sframe_id>): New defsubr.
+	(syms_of_frame <Qinternal_id>): New DEFSYM.
+	(syms_of_frame <frame_internal_parameters>): Add 'Qinternal_id'.
+	* src/androidfns.c (Fx_create_frame):
+	* src/haikufns.c (Fx_create_frame):
+	* src/nsfns.m (Fx_create_frame):
+	* src/pgtkfns.c (Fx_create_frame):
+	* src/w32fns.c (Fx_create_frame):
+	* src/xfns.c (Fx_create_frame): Call 'frame_set_id_from_params'.
+	* doc/lispref/frames.texi: Add documentation.
+	* etc/NEWS: Announce frame id.
+
+2026-01-13  Juri Linkov  <juri@linkov.net>
+
+	* lisp/textmodes/html-ts-mode.el: Special handling of 'show-paren-mode'.
+
+	(html-ts-mode--show-paren-data): New function to exclude
+	unbalanced tags when the closing tag is missing.
+	(html-ts-mode): Set 'show-paren-data-function' to
+	'html-ts-mode--show-paren-data' (bug#80151).
+
+2026-01-13  Juri Linkov  <juri@linkov.net>
+
+	* lisp/textmodes/sgml-mode.el: Fix for html-ts-mode.
+
+	(sgml-electric-tag-pair-before-change-function):
+	Let-bind 'forward-list-function' to nil.
+	(sgml-delete-tag): Let-bind 'forward-sexp-function'
+	and 'forward-list-function' to nil.
+	(sgml-tags-invisible): Let-bind 'forward-list-function' to nil.
+
+	All this is required to use the default definitions of sexp/list
+	that significantly differ from treesit definitions (bug#80151).
+
+2026-01-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc--read-branch-to-log: Pass BACKEND to vc-read-revision
+
+	* lisp/vc/vc.el (vc--read-branch-to-log): When passing FILES to
+	vc-read-revision, also pass BACKEND.  Necessary in some cases.
+
+2026-01-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	save-place-alist-to-file: Use prin1, not pp (bug#80183)
+
+	* lisp/saveplace.el (save-place-alist-to-file): Use 'prin1', not
+	'pp' (bug#80183).  Suggested by Daniel Mendler
+	<mail@daniel-mendler.de>.
+
+2026-01-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Fix recent test suite regression (bug#80177)
+
+	* lisp/emacs-lisp/cl-generic.el (cl--generic-make-function):
+	Preserve advertised-calling-convention info.
+
+	* test/lisp/emacs-lisp/pcase-tests.el (pcase-tests-quote-optimization):
+	Require `byte-opt` to fix the test when the compiler is not loaded yet.
+
+	* lisp/progmodes/elisp-mode.el: Fix some >80column problems.
+	(elisp--xref-format-extra)
+	(elisp--xref-format): Make them constant, now that we don't have
+	the purespace.  Also, use %S since some of the elements
+	don't necessarily have names and even if they do, we'd want to
+	escape any funny characters in them to avoid ambiguities.
+	(elisp--xref-find-definitions): Fix uses of
+	`elisp--xref-format-extra` accordingly.
+	Improve heuristic to distinguish proper `cl-defgeneric` from
+	implicit ones.
+	(elisp-eldoc-docstring-length-limit)
+	(elisp-eldoc-funcall-with-docstring-length): Remove redundant `:group`.
+	* lisp/cedet/mode-local.el (xref-mode-local-overload): Pass the
+	override symbol rather than its name through `elisp--xref-format-extra`.
+	* test/lisp/progmodes/elisp-mode-tests.el (find-defs-constructor):
+	Adjust test to new text.
+
+2026-01-11  Juri Linkov  <juri@linkov.net>
+
+	Adapt tab-bar/tab-line faces to dark background mode (bug#80135)
+
+	* lisp/faces.el (tab-bar, tab-line): Adapt to dark background.
+	Suggested by Philip Kaludercic <philipk@posteo.net>.
+
+	* lisp/tab-bar.el (tab-bar-tab, tab-bar-tab-inactive, tab-bar-tab-highlight):
+	* lisp/tab-line.el (tab-line-tab, tab-line-tab-inactive)
+	(tab-line-tab-current, tab-line-highlight): Adapt faces to dark background.
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: support textDocument/prepareRename for more accurate eglot-rename
+
+	See https://github.com/joaotavora/eglot/issues/1554.
+
+	* lisp/progmodes/eglot.el (eglot--rename-interactive): New helper.
+	(eglot-rename): Use it.
+
+2026-01-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix Emacs responsiveness when debugging many thread-exit events
+
+	* lisp/progmodes/gdb-mi.el (gdb-start-wait-for-pending): New
+	function.
+	(gdb-thread-exited): Call 'gdb-start-wait-for-pending' to make
+	sure the timer which waits for pending GDB commands is launched
+	just once, even if many =thread-exited notifications are received
+	at a high rate.  Suggested by Neil Roberts <bpeeluk@yahoo.co.uk>.
+	(Bug#80157)
+
+2026-01-11  F. Jason Park  <jp@neverwas.me>
+
+	Use seq-doseq for iterating over strings in ERC
+
+	* lisp/erc/erc-common.el (erc--doarray): Remove unused function.
+	* lisp/erc/erc.el (erc--channel-mode-types, erc--process-channel-modes)
+	(erc--parse-user-modes): Replace `erc--doarray' with `seq-doseq'.
+	* test/lisp/erc/erc-tests.el (erc--doarray): Remove test.
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: release version 1.21
+
+	* lisp/progmodes/eglot.el (Version): Bump to 1.21.
+
+	* etc/EGLOT-NEWS: Announce new version.
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: properly announce semantic tokens support to servers
+
+	* lisp/progmodes/eglot.el (eglot-client-capabilities): Property
+	annouce semantic tokens.
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: solve misc Elisp compatibility problems on Emacs 26.3
+
+	* lisp/progmodes/eglot.el (eglot--semtok-request)
+	(eglot--semtok-after-send-changes): Unbreak for 26.3.
+
+	* test/lisp/progmodes/eglot-tests.el (eglot--tests-connect): Use
+	  split-string.
+	  (eglot-test-rust-completion-exit-function): Use skip-unless.
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: don't use text-property-search-forward unavailable on 26.3
+
+	* lisp/progmodes/eglot.el (eglot--format-markup)
+	(eglot--semtok-font-lock-2): Rewrite.
+
+	* test/lisp/progmodes/eglot-tests.el (eglot--semtok-wait): Rewrite.
+
+2026-01-11  Phil Sainty  <psainty@orcon.net.nz>
+
+	Avoid byte-compiled code in `ibuffer-maybe-show-predicates' value (bug#80117)
+
+	* lisp/ibuffer.el (ibuffer-hidden-buffer-p): New function.
+	(ibuffer-maybe-show-predicates): Use it.
+	(ibuffer-fontification-alist): Use it (for consistency).
+
+	This prevents byte-compiled code appearing in the *Help* buffer
+	and in the customize UI for `ibuffer-maybe-show-predicates'.
+
+2026-01-11  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix crash where dead frame remains on list of live frames  (Bug#80120)
+
+	* src/fns.c (delq_no_quit): New function.
+	* src/lisp.h: Extern delq_no_quit.
+	* src/frame.c (delete_frame): Call delq_no_quit to remove frame
+	from Vframe_list uninterruptedly (Bug#80120).
+
+2026-01-11  Michael Albinus  <michael.albinus@gmx.de>
+
+	Don't use "make -j" when running tests
+
+	* test/infra/gitlab-ci.yml (.job-template):
+	* test/README: Don't use "make -j".
+
+2026-01-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/subr.el (insert-for-yank-1): Use `with-silent-modifications`
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: release version 1.20
+
+	* lisp/progmodes/eglot.el (Version): Bump to 1.20.
+
+	* etc/EGLOT-NEWS: Announce new version.
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: add new command 'eglot-momentary-inlay-hints'
+
+	* doc/misc/eglot.texi (Eglot Commands)
+	(Customization Variables): Advertise eglot-momentary-inlay-hints.
+
+	* etc/EGLOT-NEWS: Advertise new command.
+
+	* lisp/progmodes/eglot.el (eglot--momentary-hints-data): New variable.
+	(eglot-momentary-inlay-hints): New command.
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: de-spam eglot-mode-line-progress
+
+	Too spammy when many progress reporters are created by servers
+	such as rust-analyzer.
+
+	* lisp/progmodes/eglot.el (eglot-mode-line-progress): Tweak.
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: improve diagnostics tests
+
+	* test/lisp/progmodes/eglot-tests.el
+	(eglot-test-basic-diagnostics): Robustify.
+	(eglot-test-basic-pull-diagnostics)
+	(eglot-test-basic-stream-diagnostics): New tests.
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: improve automated test machinery
+
+	* test/lisp/progmodes/eglot-tests.el
+	(eglot--wait-for): Fix thinkos and improve.
+	(eglot--tests-connect): Take TIMEOUT and SERVER kwargs.
+	(eglot-test-eclipse-connect)
+	(eglot-test-slow-sync-connection-wait)
+	(eglot-test-slow-sync-connection-intime): Update
+	eglot--tests-connect call.
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: enhance eglot-list-connections-mode
+
+	* lisp/progmodes/eglot.el (eglot-list-connections-mode)
+	(eglot-list-connections): Tweak.
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: don't notify server of in-disk changes for managed files
+
+	Not only is this notification strictly redundant for files
+	managed by Eglot (since didSave, didClose and didChange are
+	scrupulously sent), but it also confuses some serers which end
+	up posting a bunch of useless textDocument/publishDiagnostics,
+	for example.
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: spectacular optimization in files with many diagnostics
+
+	In a large (or simply long) file with many diagnostics, calling
+	eglot-range-region repeteadly constantly throws Emacs for a spin
+	around the buffer, since each diagnostics comes annotated with a
+	(line/col): LSP range spec that is reasonably expensive to
+	translate into Elisp point positions.
+
+	A much faster approach for such large lists is to first sort all the
+	objects containing ranges by their start lines and then do a
+	single pass of the buffer, moving lines by delta.
+
+	By much faster, I do mean spectacularly (100x) faster. A long python
+	with 7000 "ruff" diagnostics, before the change, typical editor
+	operations (add/delete words) are impossible.
+
+	       14053  84%    - jsonrpc-connection-receive
+	       14052  84%     - #<byte-code-function B94>
+	       14052  84%      - apply
+	       14052  84%       - eglot-handle-notification
+	       14052  84%        - applyn
+	       14052  84%         - #<byte-code-function 6DB>
+	       14052  84%          - eglot--flymake-handle-push
+	       12295  74%           - eglot--flymake-make-diag
+	       12218  73%            + eglot-range-region
+	          50   0%            + eglot--check-object
+	          12   0%              plist-member
+	           3   0%              flymake-make-diagnostic
+
+	After the change:
+
+	          99   1%    - jsonrpc-connection-receive
+	          99   1%     - #<byte-code-function 0EE>
+	          99   1%      - apply
+	          99   1%       - eglot-handle-notification
+	          99   1%        - apply
+	          99   1%         - #<byte-code-function E84>
+	          99   1%          - eglot--flymake-handle-push
+	          99   1%           - eglot--call-with-ranged
+	          99   1%            - #<byte-code-function 2C6>
+	          99   1%             - eglot-move-to-utf-16-linepos
+	          99   1%                line-end-position
+
+	* lisp/progmodes/eglot.el (eglot-move-to-linepos-function):
+	Forward declare.
+	(eglot--call-with-ranged, eglot--collecting-ranged): New helpers.
+	(eglot--flymake-report-1)
+	(eglot--imenu-SymbolInformation): Use eglot--collecting-ranged.
+	(eglot--imenu-DocumentSymbol): Could use eglot--collecting-ranged.
+
+	* etc/EGLOT-NEWS: Mention it
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: add support for experimental $/streamingDiagnosticsProvider
+
+	* lisp/progmodes/eglot.el
+	(eglot-client-capabilities): Advertise $streamingDiagnostics
+	(eglot--streamed-diagnostics): New variable.
+	(eglot-handle-notification<$/streamDiagnostics>): New method.
+	(eglot--flymake-make-diag): Tweak docstring.
+	(eglot-flymake-backend): Rework.
+	(eglot--flymake-reset): Set eglot--streamed-diagnostics.
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: rework Flymake integration ahead of more changes
+
+	LSP Diagnostics are converted to Flymake diagnostics just-in-time.
+	Introduce helpers that allow precise control over the type of the
+	reports (clearing or incremental) and the inhibition of reports.
+
+	* lisp/progmodes/eglot.el
+	(eglot--pulled-diagnostics)
+	(eglot--pushed-diagnostics): Rework docstring.
+	(eglot--flymake-sniff-diagnostics): Rename from
+	eglot--flymake-diagnostics.
+	(eglot--diagnostics-map, cl-loop, eglot-warning)
+	(eglot-note, eglot-error): Move to Flymake section.
+	(eglot--find-buffer-visiting): New helper..
+	(eglot--flymake-handle-push): New helper.
+	(eglot--flymake-report-1, eglot--flymake-report-2)
+	(eglot--flymake-report-push+pulled): New helpers.
+	(eglot--flymake-make-diag): Take REGION arg.
+	(eglot--handle-notification<textDocument/PublishDiagnostics>):
+	Use eglot--flymake-handle-push.
+	(eglot--flymake-pull): Call eglot--flymake-report-push+pulled.
+	(eglot--flymake-report): Delete.
+	(eglot--flymake-reset): New helper.
+	(eglot--managed-mode): Use eglot--flymake-reset.
+	(eglot--diag-to-lsp-diag): Delete.
+	(eglot--signal-textDocument/didOpen)
+	(eglot--managed-mode): Use eglot--flymake-reset.
+	(eglot--maybe-activate-editing-mode): Don't reset Flymake things here.
+	(eglot--code-action-params): Tweak.
+	(eglot--code-action-bounds): Use eglot--flymake-sniff-diagnostics.
+	(eglot--capf-session-flush): Tweak.
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: document LSP server multiplexer support
+
+	This documents how to use LSP multiplexer programs like Rassumfrassum
+	to connect multiple language servers to a single buffer.
+
+	* doc/misc/eglot.texi (Top): Add "Multi-server support" menu entry.
+	(Multi-server support): New chapter.
+	(Using Rassumfrassum, Design rationale): New sections documenting
+	how to use the Rassumfrassum multiplexer program with Eglot, with
+	practical examples for C++, Python, and multi-language files.
+	(Performance): Mention Rassumfrassum as solution for JSONRPC traffic
+	performance issues.
+	(Reporting bugs): Add guidance for troubleshooting multiplexer-related
+	bugs.  Improve project description guidance.  Fix various typos.
+	* lisp/progmodes/eglot.el (eglot-server-programs): Add a couple
+	of rass entries.
+
+	* etc/EGLOT-NEWS: Announce support for LSP server multiplexers via
+	Rassumfrassum.
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Flymake: clarify :region in docstring of f-diagnostic-functions
+
+	* lisp/progmodes/flymake.el (flymake-diagnostic-functions):
+	Clarify meaning of :region.  Re-fill docstring.
+
+2026-01-11  João Távora  <joaotavora@gmail.com>
+
+	Jsonrpc: add major mode for events buffers
+
+	If the 'jq' program is installed, this dramatically simplifies debugging
+	LSP transcripts.
+
+	* lisp/jsonrpc.el (jsonrpc-events-jq-at-point): New function.
+	(jsonrpc-events-occur-at-point): New function.
+	(jsonrpc-events-mode-map): New variable.
+	(jsonrpc-events-mode): New major mode.
+	(jsonrpc-events-buffer): Use new mode.
+
+2026-01-10  JD Smith  <jdtsmith@gmail.com>
+
+	Limit yanks to a single set of modification hook calls
+
+	* lisp/subr.el (insert-for-yank-1): Locally set
+	`inhibit-modification-hooks' to t prior to changing yanked text
+	properties.  Bug#77221
+
+2026-01-10  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Reword documentation (bug#80116)
+
+	* etc/NEWS: Reword entry.
+
+	* lisp/progmodes/hideshow.el: Reword Commentary Header.
+
+	(hs-block-start-mdata-select, hs-block-end-regexp)
+	(hs-c-start-regexp, hs-forward-sexp-function)
+	(hs-adjust-block-beginning-function)
+	(hs-adjust-block-end-function, hs-find-block-beginning-function)
+	(hs-find-next-block-function)
+	(hs-looking-at-block-start-predicate)
+	(hs-inside-comment-predicate): Reword docstrings.
+
+	(hs-block-positions): Reword docstring, and move
+	'hs-adjust-block-beginning-function' so that it is not affected
+	by 'pos-eol'.
+
+	(hs-find-block-beg-fn--default): Use 0 instead of
+	'hs-block-start-mdata-select'.
+
+	* lisp/treesit.el (treesit-hs-find-block-beginning): Update
+	code.
+
+2026-01-10  Jared Finder  <jared@finder.org>
+
+	Update cursor display using Xterm escape sequences
+
+	* lisp/term/xterm.el (xterm-update-cursor): New user option.
+	(xterm--init): Use it.
+	(xterm--post-command-hook): New function for all xterm
+	functionality installed in 'post-command-hook'.
+	(xterm--init-frame-title): Install it.
+	(xterm--init-update-cursor, xterm--set-cursor-type)
+	(xterm--update-cursor-type, xterm--update-cursor-color): New
+	functions.
+	(xterm--cursor-type-to-int): New constant.
+	* doc/emacs/display.texi (Cursor Display):
+	* etc/NEWS: Document the new feature.
+
+2026-01-10  Yavor Doganov  <yavor@gnu.org>
+
+	NS: Use Cocoa implementation of EmacsBell -init if named image is declared
+
+	* configure.ac: Check for 'NSImageNameCaution' declaration when
+	building on GNUstep.
+	* src/nsterm.m ([EmacsBell init]): Use fallback implementation on
+	GNUstep only if 'NSImageNameCaution' is not declared.  (Bug#80107)
+
+2026-01-10  Liu Hui  <liuhui1610@gmail.com>
+
+	Fix cursor position in calendar-generate-window (bug#80069)
+
+	* lisp/calendar/calendar.el (calendar-generate-window): Move
+	cursor to today before running calendar-today-visible-hook.
+
+2026-01-10  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc--apply-to-other-working-tree: Handle 'diff-default-read-only'.
+
+	* lisp/vc/vc.el (vc--apply-to-other-working-tree): Bind
+	inhibit-read-only to non-nil to handle the case when
+	diff-default-read-only is non-nil (bug#80128).
+
+2026-01-10  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc.el (vc-deduce-fileset): Don't return empty FILESET.
+
+	Suggested by Spencer Baugh <sbaugh@janestreet.com>.
+
+2026-01-10  Philip Kaludercic  <philipk@posteo.net>
+
+	Bind 'apropos-user-option' to C-h u
+
+	* doc/emacs/help.texi: Adjust documentation.
+	* etc/NEWS: Mention change.
+	* lisp/help.el (help-map): Add binding.
+
+2026-01-10  Philip Kaludercic  <philipk@posteo.net>
+
+	Allow 'package-isolate' to fetch missing packages
+
+	* lisp/emacs-lisp/package.el (package-isolate): Fetch missing
+	packages and make them available in the new Emacs process, but
+	not the current one.
+	* etc/NEWS: Mention change.
+
+2026-01-10  Philip Kaludercic  <philipk@posteo.net>
+
+	Allow reviewing packages before installaion
+
+	* lisp/emacs-lisp/package.el (package-review-policy)
+	(package-review-directory, package-review-diff-command): Add
+	new options.
+	(package--review-p): Add new function to consult
+	'package-review-policy'.
+	(package-review): Add new function.
+	(package-unpack): Use new functions.
+	(package-install-from-archive): Return package descriptors of
+	installed packages.
+	(package-download-transaction): Handle failure of a incomplete
+	transaction.
+	(package-install): Report if a package installation failed.
+	(package-upgrade): Anticipate a failed package transaction by
+	not deleting a package beforehand.
+	(package-install-from-buffer): Handle the failure to download
+	dependencies or a rejection during the actual package review.
+	* doc/emacs/package.texi: Document feature.
+	* etc/NEWS: Mention new feature.
+
+2026-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cl-generic.el: Avoid an O(N^2) behavior
+
+	When N methods are defined, don't (re)build the dispatch
+	function each time since it takes O(N) time to build it.
+
+	* lisp/emacs-lisp/cl-generic.el (cl--generic-method): Add docstring.
+	(cl--generic): New `lazy-function` slot.
+	(cl--generic-make-function): Use it and delay building the dispatch
+	function until the next call.
+	[toplevel]: Simplify the bootstrap hacks a bit.
+
+2026-01-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cl--generic-build-combined-method): Fix lingering error (bug#80154)
+
+	The cycle detection could occasionally leave some lingering
+	cycle marker leading to bogus errors.  While we're here,
+	streamline the code, to eliminate an unneeded signal+condition-case.
+
+	* lisp/emacs-lisp/cl-generic.el (cl--generic-build-combined-method):
+	Delete error.
+	(cl--generic-build-combined-method): Rewrite.
+
+2026-01-09  Philip Kaludercic  <philipk@posteo.net>
+
+	Merge branch 'package-activate'
+
+2026-01-09  Philip Kaludercic  <philipk@posteo.net>
+
+	Remove definitions not relevant to startup from package-activate
+
+	(Bug#80079)
+
+2026-01-09  Philip Kaludercic  <philipk@posteo.net>
+
+	Extract definitions from package.el used during activation
+
+	This change removes all definitions that we move to
+	package-activate.el in a parallel branch, and then merge back
+	together.  We do this to retain the file history of both files.
+
+	(Bug#80079)
+
+2026-01-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(project-files): Revert part of commit 6c832af15705
+
+	* lisp/progmodes/project.el (project-files): Don't add `ignores` twice.
+
+2026-01-09  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Less stingy lisp-eval-depth supply for debugger
+
+	* src/eval.c (call_debugger, signal_or_quit):
+	Raise extra headroom to 200 levels.  The debugger is sometimes entered
+	via handler-bind so we raise the bar there as well (bug#80154).
+
+2026-01-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/README: Specify, how to invoke "make".  (Bug#80112)
+
+2026-01-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	trace.el: Avoid inf-loops when tracing "core functions"
+
+	This makes it possible to trace at least some of the functions
+	used by the tracer, such as the cl-print functions.
+
+	* lisp/emacs-lisp/trace.el (trace--entry-message)
+	(trace--exit-message): Don't trace the tracing code.
+
+2026-01-08  João Távora  <joaotavora@gmail.com>
+
+	Unobsolete and autoload M-x eglot-manual, mention it in manual
+
+	The only alternative I've found is
+
+	   M-: ( i n f o " ( e g l o t ) " ) RET
+
+	which isn't really very user friendly.
+
+	* lisp/progmodes/eglot.el (eglot-manual): Unobsolete.
+
+	* doc/misc/eglot.texi (Top): Mention M-x eglot-manual.
+
+	* etc/EGLOT-NEWS: Mention unobsoletion.
+
+2026-01-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(package-test-install-single): Fix test failure
+
+	* test/lisp/emacs-lisp/package-tests.el (package-test-install-single):
+	We signal an error only for interactive calls now.
+
+2026-01-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* admin/notes/elpa.md: Update to match current reality
+
+	* admin/notes/elpa: Rename to `elpa.md`.
+	* admin/notes/elpa.md: Rename from `elpa`, adjust to recently
+	changed repository location, mention the "new" NonGNU repository.
+
+2026-01-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	shadowfile.el uses eqhemeral buffer names now
+
+	* etc/NEWS: shadowfile.el uses eqhemeral buffer names now.
+
+	* lisp/shadowfile.el (shadow-find-file-noselect): New function.
+	(shadow-read-files, shadow-write-info-file)
+	(shadow-write-todo-file): Use it.
+
+2026-01-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(package-install): Refine fix for bug#79881
+
+	* lisp/emacs-lisp/package.el (package-install): Demote `user-error` to
+	`message` if the call is not interactive.
+
+2026-01-06  Michael Albinus  <michael.albinus@gmx.de>
+
+	External Tramp methods can be used in multi-hops
+
+	* doc/misc/tramp.texi (External methods): Mention, how external
+	methods are used for multi-hops.
+	(Ad-hoc multi-hops): Change requirement of method.
+
+	* doc/misc/trampver.texi:
+	* lisp/net/trampver.el: Change version to "2.8.2-pre".
+
+	* etc/NEWS: External Tramp methods can be used in multi-hops.
+	Presentational fixes and improvements.
+
+	* lisp/net/tramp-sh.el (tramp-sh-handle-copy-directory): Check for
+	`tramp-method-out-of-band-p' explicitly. Don't flush directory
+	properties.
+	(tramp-method-out-of-band-p): There shouldn't be a multi-hop.
+
+	* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory): Don't
+	flush directory properties.
+
+	* lisp/net/tramp.el (tramp-methods): Adapt docstring.
+	(tramp-barf-if-file-missing)
+	(with-parsed-tramp-file-name): Adapt debug spec.
+	(tramp-skeleton-copy-directory): Flush directory properties.
+	(tramp-add-hops): Check for `tramp-login-args' property.
+
+2026-01-05  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	time-stamp-helper-string-used: New test
+
+	* test/lisp/time-stamp-tests.el (time-stamp-helper-string-used):
+	New test.
+
+2026-01-05  João Távora  <joaotavora@gmail.com>
+
+	Eglot: prevent textDocument/diagnostic from being sent before didOpen
+
+	Set eglot--docver to -1 in LSP documents not yet 'didOpen'ed,
+	then add a check for this in the jsonrpc-connection-ready-p
+	predicate.
+
+	We do this because the call to eglot-flymake-backend may come in
+	so fast that textDocument/diagnostic actually makes it into the
+	jsonrpc queue before the didOpen.  Much like, say, completions
+	before didChange, some servers don't like that, understandibly.
+
+	So use the existing "deferred" mechanism checks to make sure, as
+	usual, that requests targetting a specific LSP document come
+	after the didOpen/didChange informing the server of the actual
+	state of the buffer.
+
+	I _could_ have used nil instead of -1, and it would probably be
+	cleaner.  But -1 is safer, we never know if a version comparison
+	won't slip outside the didOpen period.  Might change my mind
+	about this.
+
+	* lisp/progmodes/eglot.el (eglot--docver): Init to -1.
+	(eglot--managed-mode): Set eglot--docver to -1 when unmanaging.
+	(jsonrpc-connection-ready-p): Check eglot--docver non-negative.
+	(eglot--signal-textDocument/didClose): Set eglot--docver to -1.
+
+2026-01-05  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix typo in 'set-frame-size-and-position'
+
+	* lisp/frame.el (set-frame-size-and-position): Fix typo.
+	Reported by Al Haji-Ali <abdo.haji.ali@gmail.com>.
+
+2026-01-05  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix calculation of outer frame height in NS builds (Bug#80077)
+
+	* src/nsfns.m (frame_geometry): Include tool bar height when
+	calculating a frame's outer height (Bug#80077).
+
+2026-01-05  Martin Rudalics  <rudalics@gmx.at>
+
+	In Elisp manual warn about unpredictable changes of point (Bug#79927)
+
+	* doc/lispref/positions.texi (Point): Define "buffer point".
+	* doc/lispref/windows.texi (Window Point): Say that buffer point
+	can change in unpredictable ways when windows get selected
+	(Bug#79927).
+
+2026-01-04  JD Smith  <jdtsmith@gmail.com>
+
+	repeat: handle non-character keys with hint strings
+
+	When a repeat hint string exists, the hint is formatted using
+	`read-multiple-choice' formatting.  But `rmc--add-key-description' only
+	works on characters, not symbols like 'right or 'left.
+
+	* lisp/repeat.el (repeat-echo-message-string): check for chars
+
+2026-01-04  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Update to Transient v0.12.0-15-gfe5214e6
+
+2026-01-04  João Távora  <joaotavora@gmail.com>
+
+	Eglot: require project 0.11.2 (bug#79809)
+
+	* lisp/progmodes/eglot.el (Package-Requires): Require project 0.11.2
+
+2026-01-04  João Távora  <joaotavora@gmail.com>
+
+	* lisp/progmodes/project.el (Version): Bump to 0.11.2
+
+	(bug#79809)
+
+2026-01-04  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix thinko in recent diagnostics logic change
+
+	If the pushed diagnostics are outdated and we have pulled diagnostics,
+	we want to report them.  And if the pushed diagnostics are up to date,
+	we want to report them along with any pulled ones.  The do-nothing
+	update happens only if the pulled response indicated so explicitly or if
+	there are no pulled diagnostics and the pushed ones are out-of-date.
+
+	* lisp/progmodes/eglot.el (eglot--flymake-report): Tweak.
+
+2026-01-03  Richard Lawrence  <rwl@recursewithless.net>
+
+	Some minor code improvements in iCalendar library
+
+	* lisp/calendar/icalendar-mode.el: Update file header.
+
+	Fix error display in 'icalendar-errors-mode':
+
+	* lisp/calendar/icalendar.el (icalendar-error-regexp): Fix to allow
+	" *UNFOLDED:" prefix in buffer names.  (Extra colon was breaking match.)
+	(icalendar-format-error): Suppress this prefix preferentially in long
+	buffer names.
+
+	Add declarations to some iCalendar macros:
+
+	* lisp/calendar/icalendar-macs.el (icalendar-with-node-value)
+	(icalendar-with-child-of)
+	(icalendar-with-param-of)
+	(icalendar-with-node-children)
+	(icalendar-with-node-value)
+	(icalendar-with-param)
+	* lisp/calendar/icalendar-ast.el (icalendar-make-property)
+	(icalendar-make-component)
+	(icalendar-make-node-from-templates): Add (declare ...) forms.
+
+	Add `icalendar-trimp' to icalendar-utils.el:
+
+	* lisp/calendar/icalendar-utils.el (icalendar-trimp): New function.
+	* lisp/calendar/diary-icalendar.el
+	(diary-icalendar-format-entry)
+	(diary-icalendar-parse-attendees-and-organizer)
+	(diary-icalendar-parse-location)
+	(diary-icalendar-parse-url)
+	(diary-icalendar-parse-uid): Use it to replace diary-icalendar--nonempty.
+	(diary-icalendar--nonempty): Remove.
+
+	Move VTIMEZONE creation to icalendar-recur.el:
+
+	The following changes move `diary-icalendar-current-tz-to-vtimezone' and
+	associated code to icalendar-recur.el.  Library users are likely to need
+	this function, so it makes sense to keep it with other time zone-related
+	code in that file, instead of having them depend on diary-icalendar.
+
+	* lisp/calendar/icalendar-recur.el (icalendar-tz-data-insufficient)
+	(icalendar-tz-unsupported): New error types.
+	(icalendar-recur-current-tz-to-vtimezone): Rename from
+	`diary-icalendar-current-tz-to-vtimezone'; signal new error types.
+	(icalendar-recur--tz-warning): Rename from `diary-icalendar--tz-warning'.
+	(icalendar-recur--emacs-local-tzid): Rename from
+	`diary-icalendar--emacs-local-tzid'.
+	(icalendar-recur--tz-info-sexp-p): Rename from
+	`diary-icalendar--tz-info-sexp-p'.
+	* lisp/calendar/diary-icalendar.el
+	(diary-icalendar-current-tz-to-vtimezone): Reimplement with
+	`icalendar-recur-current-tz-to-vtimezone'.
+	(diary-icalendar--tz-warning)
+	(diary-icalendar--emacs-local-tzid)
+	(diary-icalendar--tz-info-sexp-p): Renamed and moved; see above.
+	(diary-time-zone-export-strategy): Update validation function name.
+
+2026-01-03  Michael Albinus  <michael.albinus@gmx.de>
+
+	Mitigate uutils coreutils problems in Tramp
+
+	* lisp/net/tramp-sh.el (tramp-get-ls-command): Prefer gnuls over ls.
+	(tramp-get-remote-readlink): Prefer gnureadlink over readlink.
+	(Bug#79956, Bug#80075)
+
+2026-01-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Unbreak a build --without-x
+
+	* src/window.c (Fwindow_cursor_info): Provide values for TTY
+	frames.  (Bug#80023)
+
+2026-01-03  Daniel Eklöf  <daniel@ekloef.se>  (tiny change)
+
+	Automatically enable xterm-mouse-mode in the foot terminal
+
+	Foot supports all features required for this (OSC-52, DECSET1000,
+	DECSET1003).
+	* lisp/term/xterm.el (xterm--auto-xt-mouse-allowed-names):
+	Add foot.  (Bug#80083)
+
+2026-01-03  Daniel Eklöf  <daniel@ekloef.se>  (tiny change)
+
+	Use Primary Device Attributes to detect OSC-52 support
+
+	Up until recently, there were no reliable way to detect if a terminal
+	supported OSC-52 or not.
+	A number or terminal emulators decided to remedy this by including '52'
+	in their primary DA response.  In short, the presence of 52 in the DA
+	response means the terminal supports *writing* to the clipboard.
+	Reading the clipboard is _usually_ supported, but not guaranteed.
+	It should be noted that Emacs uses both the 'c' and 'p' parameters in
+	OSC-52, to copy to either PRIMARY, or CLIPBOARD, while the specification
+	only requires the terminal to implement 'c'.  If a terminal doesn't
+	support 'p', the OSC-52 request will be silently ignored.
+	* lisp/term/xterm.el (xterm--init, xterm--primary-da-handler):
+	Query primary device attributes for OSC-52 support.  (Bug#80083)
+
+2026-01-03  Paul Nelson  <ultrono@gmail.com>
+
+	Rmail: fix misplaced "D" after auto-file
+
+	* lisp/mail/rmailsum.el (rmail-summary-mark-deleted): Move to
+	beginning of line before searching for status indicator.
+	(Bug#80097)
+
+2026-01-03  Jared Finder  <jared@finder.org>
+
+	Make tty default face show the face widget in customize
+
+	* lisp/wid-edit.el (widget-color-match): Allow unspecified-fg
+	and unspecified-bg as color names.
+
+2026-01-03  Jared Finder  <jared@finder.org>
+
+	Use tty reported background and foreground colors (Bug#79765)
+
+	* lisp/term/xterm.el (xterm--report-background-handler)
+	(xterm--report-foreground-handler): Record tty background and
+	foreground color in terminal parameters.
+	(xterm--version-handler): Also query foreground color.
+	(xterm--init): Also query foreground color; move background and
+	foreground color handling here.
+	(xterm--set-background-mode): Rename from
+	xterm-maybe-set-dark-background-mode; now always set background
+	mode to dark or light.
+	(xterm-maybe-update-default-face): Update default face
+	background and foreground colors to terminal reported values if
+	they have not yet been customized.
+
+2026-01-03  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Refill 'image-dired-display-image-buffer'
+
+	Bug#68486
+
+	* lisp/image/image-dired.el (image-dired-display-image): Refill
+	'image-dired-display-image-buffer' with image contents instead
+	of killing it.
+
+2026-01-03  john muhl  <jm@pub.pink>
+
+	Fontify 'table.create' in 'lua-mode'
+
+	* lisp/progmodes/lua-mode.el (lua--builtins): Add 'create' to list
+	of built-in methods.  (Bug#80057)
+
+2026-01-03  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	'csharp-ts-mode': fix indentation error for try/catch statement
+
+	* lisp/progmodes/csharp-mode.el (csharp-ts-mode--indent-rules):
+	Fix issue with incomplete try/catch statements when try_definition
+	is parsed, but catch_declaration is not yet parsed (shows in tree
+	as ERROR).  (Bug#80029)
+
+2026-01-03  RadioNoiseE  <rne.kou@icloud.com>
+
+	New function 'window-cursor-info'
+
+	* src/window.c (Fwindow_cursor_info): New function.
+	(syms_of_window): Defsubr it.
+	* doc/lispref/windows.texi (Window Point): Document it.
+	* etc/NEWS: Announce new function.  (Bug#80023)
+
+2026-01-03  kobarity  <kobarity@gmail.com>
+
+	Do not use codecs.open for Python 3
+
+	* lisp/progmodes/python.el (python-shell-eval-file-setup-code):
+	For Python 3, use built-in open instead of codecs.open to address the
+	deprecation of codecs.open in Python 3.14.  (Bug#79723)
+
+2026-01-03  kobarity  <kobarity@gmail.com>
+
+	Improve python-shell-completion-get-completions
+
+	In 'python-shell-completion-get-completions', since output from the
+	inferior Python is expected to be in JSON format, commands being echoed
+	back or warning messages being output caused parsing errors.  We
+	improved this by re-parsing only the last line when a parsing error
+	occurs, preventing echo-back or warning messages from affecting parsing.
+
+	* lisp/progmodes/python.el
+	(python-shell-completion-get-completions): Improved to re-parse
+	only the last line when a JSON parse error occurs.  (Bug#79723)
+
+2026-01-03  Stéphane Marks  <shipmints@gmail.com>
+
+	Add frame parameters 'cloned-from' and 'undeleted' (bug#80104)
+
+	* lisp/frame.el (clone-frame): Set the frame parameter
+	'cloned-from'.
+	(undelete-frame): Set the frame parameter 'undeleted'.
+	* src/frame.c (syms_of_frame): <Qcloned_from> <Qundeleted>: New
+	DEFSYM.
+	(syms_of_frame): Add 'Qcloned_from' and 'Qundeleted' to
+	'frame_internal_parameters'.
+	* doc/lispref/frames.texi: Document these frame parameters.
+	* etc/NEWS: Announce the new frame parameters.
+
+2026-01-03  Michael Albinus  <michael.albinus@gmx.de>
+
+	Set `lexical-binding' buffer-local in shadowfile.el
+
+	* lisp/shadowfile.el (shadow-read-files): Enable `lisp-data-mode'.
+	Set `lexical-binding' cookie.  (Bug#80086)
+
+2026-01-03  Phil Sainty  <psainty@orcon.net.nz>
+
+	Document more display actions in `display-buffer' (bug#80092)
+
+	* lisp/window.el (display-buffer): Add docs for several missing actions:
+	 - display-buffer-in-atom-window
+	 - display-buffer-in-direction
+	 - display-buffer-in-side-window
+	 - display-buffer-reuse-mode-window
+	 - display-buffer-use-some-frame
+	Re-arrange the actions into a less-arbitrary sequence.
+	Re-word some descriptions to use a more consistent phrasing.
+	Re-wrap some lines (based on the longest pre-existing line), to reduce
+	the line count.
+	Un-link the `pop-up-frames' symbol in the alist entry listing.
+
+	(display-buffer--action-function-custom-type): Add missing actions,
+	and re-order as above.
+
+	(display-buffer-reuse-mode-window): Tweak the docstring for better
+	consistency with other display actions.
+
+2026-01-03  Phil Sainty  <psainty@orcon.net.nz>
+
+	Support the `reusable-frames' value 0 for `display-buffer-in-tab'
+
+	* lisp/tab-bar.el (tab-bar--reusable-frames): Implement support for the
+	`reusable-frames' value 0, for better consistency with other buffer
+	display actions. (bug#80092)
+
+2026-01-03  Phil Sainty  <psainty@orcon.net.nz>
+
+	Improve documentation for tab-bar buffer display actions (bug#80092)
+
+	* doc/lispref/windows.texi: Document the display actions
+	`display-buffer-in-tab' and `display-buffer-in-new-tab' and the
+	associated alist entries `tab-name' and `tab-group'.
+
+	* lisp/tab-bar.el (display-buffer-in-tab): Restructure docstring for
+	clarity.  Describe the `reusable-frames' behaviour first (as if it finds
+	a frame with a suitable tab then the `tab-name' entry is not used).
+
+	(display-buffer-in-new-tab): Use consistent wording.
+
+	* lisp/window.el (display-buffer--action-function-custom-type): Add the
+	display actions as customize choices for user options.
+
+	(display-buffer): Document the display actions and alist entries.
+
+2026-01-02  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Make string-trim faster
+
+	* lisp/subr.el (string-trim): Avoid intermediate substring allocation.
+	* test/lisp/subr-tests.el (subr-string-trim-left):
+	(subr-string-trim-right): Move here from subr-x-tests.el.
+	(subr-string-trim): New test.
+
+2026-01-02  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Tramp completion for default method "-"
+
+	* lisp/net/tramp.el (tramp-completion-handle-file-name-all-completions):
+	Keep `tramp-default-method{-alist}' in order to get completion
+	functions for `tramp-default-method-marker'.
+
+2026-01-02  João Távora  <joaotavora@gmail.com>
+
+	Eglot: consider "pulled" and "pushed" diagnostics separately
+
+	This is chiefly for the benefit of rust-analyzer which uses both
+	mechanisms.
+
+	Per https://github.com/joaotavora/eglot/discussions/1562
+
+	* lisp/progmodes/eglot.el
+	(eglot--flymake-report-fn): Rename from eglot--flymake-push-report-fn.
+	(eglot--pulled-diagnostics)
+	(eglot--pushed-diagnostics): Rework from eglot--diagnostics.
+	(eglot--diagnostics): Remove.
+	(eglot--managed-mode): Tweak.
+	(eglot--maybe-activate-editing-mode): Tweak.
+	(eglot-handle-notification): Set eglot--pushed-diagnostics
+	only.  Call eglot--flymake-report.
+	(eglot-flymake-backend): Use eglot--flymake-report and
+	eglot--flymake-report-fn.
+	(eglot--flymake-pull): Rework.
+	(eglot--flymake-report): Renam from eglot--flymake-push and reworked.
+
+2026-01-02  Yuan Fu  <casouri@gmail.com>
+
+	Compile queries in treesit-f-l-recompute-features (bug#80108)
+
+	The direct cause of the problem in the bug report is that when
+	user runs treesit-font-lock-recompute-features to add the
+	emacs-devel feature in c-ts-mode's mode hook, the added query
+	for emacs-devel aren't compiled.
+
+	This change consists of two parts:
+	1. The immediate fix: validate and compile queries in
+	treesit-font-lock-recompute-features.
+	2. To make it more fool-proof, change treesit-font-lock-rules
+	back to compile the queries and make
+	treesit--compile-query-with-cache support compiled queries. This
+	way, as long as the query goes through treesit-font-lock-rules,
+	it'll be compiled eventually and not cause slow-down. I had to
+	add some c-level functions, but they're kind of overdue anyway,
+	so I don't have any problem adding them to the API.
+
+	* lisp/treesit.el (treesit--compile-query-with-cache): Support
+	compiled queries.
+	(treesit-font-lock-rules): Compile the queries (but not
+	eagerly).
+	(treesit-font-lock-recompute-features): Validate and compile
+	queries.
+	(treesit-major-mode-setup): Remove call to
+	treesit-validate-and-compile-font-lock-rules since it's now
+	called in treesit-font-lock-recompute-features.
+
+	* src/treesit.c (Ftreesit_query_eagerly_compiled_p):
+	(Ftreesit_query_source): New functions.
+
+	* doc/lispref/parsing.texi (Pattern Matching): Add manual
+	entries for the new functions.
+
+2026-01-02  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Fix indentation in some project.el functions
+
+	* lisp/progmodes/project.el
+	(vc-git-project-list-files, project--vc-ignores)
+	(project-prompt-project-dir): Fix indentation.
+
+2026-01-02  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project-files<vc>: Fix 'void-function vc-git--program-version'
+
+	* lisp/progmodes/project.el (project-try-vc--search): Re-add the
+	loading of vc-<backend> feature just removed from `project-files'.
+
+2026-01-01  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Clean up a lapcode peephole optimisation rule
+
+	* lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode):
+	Clean up and simplify an old jump-to-conditional-jump rule that was
+	originally intended for moving loop branches from the top to the bottom,
+	but is today not much used because it relies on other transformations
+	only made for dynbound variables.
+
+	This change should not alter code generation.
+
+2026-01-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/diff-mode.el (diff-undo): New obsolete function alias.
+
+2026-01-01  Po Lu  <luangruo@yahoo.com>
+
+	Don't permit special configuration events to trigger `throw-on-input'
+
+	* src/keyboard.c (init_while_no_input_ignore_events): Ignore
+	Qmonitors_changed and Qtoolkit_theme_changed events.
+	(is_ignored_event): Assign symbols to
+	{MONITOR_CHANGED,TOOLKIT_THEME_CHANGED}_EVENT.
+	(syms_of_keyboard) <Qmonitors_changed>
+	<Qtoolkit_theme_changed>: New symbols.  (bug#80022)
+
+2026-01-01  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Allow project-vc-ignores to be applied in more cases
+
+	Discussed in
+	https://lists.gnu.org/archive/html/emacs-devel/2025-12/msg00903.html.
+
+	* lisp/progmodes/project.el (project-files) <vc>: Look up the
+	value of 'project-vc-ignores' inside DIR rather than project root.
+	This allows this variable to be applied in external dirs as well.
+	(project-ignores) <vc>: Do likewise.
+	(project--value-in-dir): Ensure that DIR has a trailing slash.
+	The caller might pass the value without slash if produced
+	differently.
+
+	* test/lisp/progmodes/project-tests.el
+	(project-vc-ignores-in-external-directory): New test.
+	(project-vc-supports-files-in-subdirectory): Update the test,
+	considering the subtle change in behavior: the directory DIR
+	directly includes a .dir-locals.el which sets project-vc-ignores,
+	which wasn't previously applied because it wasn't set in the root.
+
+2025-12-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(native--compile-async): Try and avoid inf-loops (bug#80012)
+
+	* lisp/emacs-lisp/comp-run.el (native--compile-async): Call
+	`comp--run-async-workers` only if we caused the queue to become non-empty.
+
+2025-12-31  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Factor out undo-ignore-read-only (bug#80049)
+
+	* lisp/vc/diff-mode.el (diff-undo): Rename to
+	undo-ignore-read-only.
+	(diff-mode-shared-map): Update "<remap> <undo>" binding.
+	* lisp/simple.el (undo-ignore-read-only): Rename from diff-undo.
+	* lisp/dired.el (dired-undo):
+	* lisp/proced.el (proced-undo): Call it.  New numeric prefix
+	argument to specify a repeat count.
+	* doc/emacs/dired.texi (Marks vs Flags):
+	* etc/NEWS: Document the change.
+
+2025-12-31  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Split diff-mode-shared-map into two maps
+
+	This is easier to understand and easier to customize.
+
+	* lisp/vc/diff-mode.el (diff-mode-shared-map): Move bindings for
+	"W", "w", "A", "r" and "R" from here ...
+	(diff-mode-read-only-map): ... to here, a new map.
+	(diff-mode-map): Bind diff-mode-shared-map to "ESC".
+	(diff-read-only-map): Make a composed map from
+	diff-mode-read-only-map instead of diff-mode-shared-map.
+
+2025-12-31  Michael Albinus  <michael.albinus@gmx.de>
+
+	Sync with Tramp 2.8.1
+
+	* doc/misc/trampver.texi:
+	* lisp/net/trampver.el (tramp-version): Adapt Tramp versions.
+
+2025-12-31  Protesilaos Stavrou  <info@protesilaos.com>
+
+	Update Modus themes to their version 5.2.0
+
+	Release notes: <https://protesilaos.com/codelog/2025-12-31-emacs-modus-themes-5-2-0/>.
+
+2025-12-31  Yuan Fu  <casouri@gmail.com>
+
+	Update c-ts-common--adaptive-fill-prefix for Rust
+
+	* lisp/progmodes/c-ts-common.el:
+	(c-ts-common--adaptive-fill-prefix): Make it support Rust's //! style comment.
+
+2025-12-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	project-vc: Provide default implementation of `project-list-files`
+
+	Rework the implementation of `project-files<vc>` so as to
+	delegate more to the `project-list-files` operation, including
+	the default implementation.
+
+	This can change the behavior in some cases, because it changes
+	which ignore settings apply where and also it can now use
+	a dedicated VC backend implementation even for directories
+	that are outside of the project's root.  But the effect should
+	hopefully be marginal and rather positive by making the behavior
+	more "regular".
+
+	* lisp/progmodes/project.el (project-vc--backend): New function.
+	(project-files) <vc>: Use it.  Call VC's `project-list-files` operation
+	for all dirs with a backend and remove the `vc-not-supported` fallback.
+	Inline the `project--dir-ignores` call.
+	(vc-default-project-list-files): New function, extracted from
+	`project-files<vc>`.
+	(vc-git-project-list-files): Use it instead of signaling `vc-not-supported`.
+	(project--vc-ignores): New function, extracted from `project-ignores<vc>`.
+	Remove the `vc-not-supported` since the operation has a default
+	implementation.  Use DIR's `ignore-completion-table` regardless
+	if we're at the root of the project.
+	(project-ignores) <vc>: Use it.
+
+2025-12-31  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Clarify the type of value that 'ignore-completion-table' returns
+
+	* lisp/vc/vc.el: Clarify the type of value that
+	'ignore-completion-table' returns
+	(https://lists.gnu.org/archive/html/emacs-devel/2025-12/msg00895.html).
+
+2025-12-31  João Távora  <joaotavora@gmail.com>
+
+	Flymake: try to resize margins less frequently
+
+	In particular, don't auto-resize in flymake-start if the current buffer
+	already has suitable margins.  Otherwise it's impossible to operate two
+	windows showing the same buffer with different scrolls while using
+	Flymake.
+
+	Also, when attempting to restore margins, remember to actually apply
+	them.
+
+	* lisp/progmodes/flymake.el (flymake--original-margin-width)
+	(flymake--suitably-fringed-p, flymake--bs-display)
+	(flymake--restore-margins, flymake-restore-margins): Move to
+	separate section.  Rework.
+	(flymake--suitable-margin-width, flymake--apply-margins)
+	(flymake--appropriate-margin): New helpers.
+
+2025-12-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc--maybe-read-upstream-location: Default to returning nil
+
+	This should have been updated along with the recent change to
+	make the UPSTREAM-LOCATION argument to the incoming-revision
+	backend API function optional.
+
+	* lisp/vc/vc.el (vc--maybe-read-upstream-location): Default to
+	returning nil, not an empty string.
+
+2025-12-30  Martin Rudalics  <rudalics@gmx.at>
+
+	Inhibit looping in resize_mini_window (Bug#80017)
+
+	* src/xdisp.c (redisplay_window): Don't call resize_mini_window
+	when the minibuffer is active and minibuffer-only frames shall
+	be resized automatically since that can loop infinitely (Bug#80017).
+
+2025-12-29  Stéphane Marks  <shipmints@gmail.com>
+
+	Improve system-taskbar on unsupported or unenabled back ends (bug#80087)
+
+	* lisp/system-taskbar.el (system-taskbar-mode): Set
+	'system-taskbar-mode' to nil if an unsupported system or
+	unenabled back end.
+
+2025-12-29  Richard Lawrence  <rwl@recursewithless.net>
+
+	Change the format function calling conventions in diary-icalendar.el
+
+	This avoids `calendar-dlet' and unprefixed dynamic variable bindings
+	when calling user format functions, as discussed in Bug#74994.
+
+	* lisp/calendar/diary-icalendar.el (diary-icalendar-time-format): Fix
+	whitespace.
+	(diary-icalendar-format-attendee)
+	(diary-icalendar-format-entry): Use fewer dynamic variables, prefix
+	them, replace `calendar-dlet' with `dlet', and call user format
+	functions with the node to be formatted.
+	(diary-icalendar-attendee-format-function)
+	(diary-icalendar-vevent-format-function)
+	(diary-icalendar-vjournal-format-function)
+	(diary-icalendar-vtodo-format-function): Document these changes.
+	(diary-icalendar-attendee-skeleton)
+	(diary-icalendar-vevent-skeleton)
+	(diary-icalendar-vjournal-skeleton)
+	(diary-icalendar-vtodo-skeleton): Use `defun' with `skeleton-insert'
+	instead of `define-skeleton'.  Update variable references.
+	(diary-icalendar-import-buffer-to-buffer)
+	(diary-icalendar-add-valarms): Replace `calendar-dlet' with `dlet'.
+	* doc/emacs/calendar.texi (Diary iCalendar Import): Update example in
+	manual.
+
+2025-12-29  Richard Lawrence  <rwl@recursewithless.net>
+
+	iCalendar code improvements
+
+	Thanks to Stefan Monnier for the comments in Bug#74994 leading to most
+	of these changes.
+
+	Improvements in diary-icalendar.el and related changes:
+
+	* lisp/calendar/diary-icalendar.el
+	(icalendar-save-binary-atttachment): Rename to
+	`diary-icalendar-save-binary-attachment'.  Document internal require.
+	(diary-icalendar-attendee-skeleton-command): Rename to
+	`diary-icalendar-attendee-format-function'.
+	(diary-icalendar-vevent-skeleton-command): Rename to
+	`diary-icalendar-vevent-format-function'.
+	(diary-icalendar-vjournal-skeleton-command): Rename to
+	`diary-icalendar-vjournal-format-function'.
+	(diary-icalendar-vtodo-skeleton-command): Rename to
+	`diary-icalendar-vtodo-format-function'.
+	* doc/emacs/calendar.texi (Diary iCalendar Import)
+	* lisp/calendar/icalendar.el (icalendar-import-format)
+	(icalendar-import-format-summary, icalendar-import-format-description)
+	(icalendar-import-format-location, icalendar-import-format-organizer)
+	(icalendar-import-format-url, icalendar-import-format-uid)
+	(icalendar-import-format-status, icalendar-import-format-class): Update
+	references to renamed functions.
+	(diary-icalendar-attendee-format-function): Fix quoted function name.
+	(diary-icalendar-attendee-format-function)
+	(diary-icalendar-vevent-format-function)
+	(diary-icalendar-vjournal-format-function)
+	(diary-icalendar-vtodo-format-function)
+	(diary-icalendar-after-mailcap-viewer-hook): Improve docstrings.
+	(diary-icalendar-skip-addresses-regexp): Ensure default value is a
+	regexp.
+	(diary-icalendar-description-regexp): Fix :type declaration to agree
+	with default.
+	(diary-icalendar-format-date): Replace unnecessary `calendar-dlet' with
+	`dlet'.
+	(diary-icalendar-vevent-format-function)
+	(diary-icalendar-vjournal-format-function)
+	(diary-icalendar-vtodo-format-function)
+	(diary-icalendar-format-entry)
+	(diary-icalendar-import-buffer-to-buffer)
+	(diary-icalendar--entry-import)
+	(diary-icalendar-import-buffer)
+	(diary-icalendar-import-file): Change "non-marking" to "nonmarking" in
+	variable names for consistency (cf. `diary-nonmarking-symbol').
+	(diary-icalendar-attendee-skeleton): Remove unnecessary call to
+	`skeleton-insert'.
+	(diary-icalendar-vevent-skeleton)
+	(diary-icalendar-vjournal-skeleton)
+	(diary-icalendar-vtodo-skeleton): Don't insert return values of `let'
+	forms.
+	(diary-icalendar-parse-entry): Call
+	`diary-icalendar-other-properties-parser' with type and properties as
+	arguments, instead of dynamic binding.
+	(diary-icalendar-other-properties-parser): Document the new calling
+	convention.
+	* test/lisp/calendar/diary-icalendar-tests.el
+	(diary-icalendar-test-parse-@-location): Accept the new arguments.
+
+	Clarify `declare-function' usage:
+
+	* lisp/calendar/icalendar-parser.el (icalendar-read-time)
+	(icalendar-period-end, icalendar-parse-calendar)
+	(icalendar-index-insert, icalendar-index-get)
+	* lisp/calendar/icalendar-ast.el (icalendar-printable-value-type-symbol-p)
+	(icalendar-ast-node-valid-value-p)
+	* lisp/calendar/icalendar-utils.el (icalendar-date-time-add)
+	(icalendar-dates-until, icalendar-date-time-variant): Move
+	`declare-function' forms to corresponding `require' forms.
+
+	Improve debugging with icalendar-ast.el macros:
+
+	* lisp/calendar/icalendar-ast.el
+	(icalendar-make-value-node-of): Add explanatory comment to require.
+	(icalendar--make-param--list, icalendar--make-param--nonlist)
+	(icalendar--make-property--list, icalendar--make-property--nonlist): New
+	functions.
+	(icalendar-make-param, icalendar-make-property): Use them to reduce code
+	generated by these macros.  Add (declare (debug ...)) forms.
+	(icalendar-make-component, icalendar-make-node-from-templates):
+	Add (declare (debug ...)) forms.
+	* test/lisp/calendar/icalendar-ast-tests.el: New file.
+
+	Various other minor changes:
+
+	* lisp/calendar/icalendar-macs.el (icalendar-define-type): Improve
+	docstring.
+	(icalendar-define-property): Fix deprecation warning: replace 'any' with
+	'not-newline' in rx definition.
+	*
+	test/lisp/calendar/icalendar-recur-tests.el (icalendar-test-rrule-test):
+	Pass tags on to `ert-deftest' and mark several tests as expensive.
+	* lisp/calendar/calendar.el (diary-date-insertion-form): Remove
+	constants from :set-after list.
+	* lisp/calendar/diary-lib.el (diary-time-regexp): Clarify FIXME comment.
+	* lisp/calendar/icalendar-parser.el
+	(icalendar-x-name): Fix indentation.
+	(icalendar-cal-address): Improve docstring.
+
+2025-12-29  Richard Lawrence  <rwl@recursewithless.net>
+
+	Allow CRLF line endings in iCalendar (.ics) test files
+
+	Thanks to Jim Porter for feedback in Bug#74994.
+
+	* .gitattributes: Allow CRLF endings in iCalendar test files.
+
+2025-12-29  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Fix buffer menu unmark on first line (bug#80089)
+
+	* lisp/buff-menu.el (Buffer-menu-backup-unmark): Remove mark on
+	first line too.
+
+2025-12-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc-hooks.el (vc-prefix-map): Move 'B' to 'o' (bug#80037).
+
+2025-12-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Rename node from "Outgoing Base Diffs" to "Outstanding Changes"
+
+	There are going to be new outstanding changes commands that will
+	deal in logs, not diffs.
+
+	* doc/emacs/vc1-xtra.texi (Outgoing Base Diffs): Rename and
+	retitle node ...
+	(Outstanding Changes): ... to this.
+
+2025-12-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New commands vc-print-change-log & vc-print-root-change-log
+
+	* lisp/vc/vc.el (vc--read-branch-to-log): Call
+	vc-deduce-fileset.  Don't wrap return value in a list.
+	(vc-print-fileset-branch-log, vc-print-root-branch-log): Adjust
+	calls to vc--read-branch-to-log.
+	(vc-print-change-log, vc-print-root-change-log):
+	New commands (bug#80037).
+	* etc/NEWS: Announce them.
+
+2025-12-29  Liu Hui  <liuhui1610@gmail.com>
+
+	Fix the date in the calendar mode line (bug#80069)
+
+	* lisp/calendar/calendar.el (calendar-redraw)
+	(calendar-other-month): Make sure that the mode line is updated
+	after cursor motion in case 'date' is used in
+	'calendar-mode-line-format'.
+	(calendar-set-date-style): Delete call to
+	calendar-update-mode-line because it is called in calendar-draw.
+	(calendar-generate-window): Delete calls to
+	calendar-update-mode-line and calendar-cursor-to-visible-date.
+	It's better for the caller to do it.
+	(calendar-basic-setup): Update cursor position and mode line.
+	* lisp/calendar/cal-move.el (calendar-goto-today): Delete
+	calendar-update-mode-line because calendar-move-hook is called
+	last.  This is consistent with other cal-move commands.
+	* test/lisp/calendar/calendar-tests.el
+	(calendar-test-date-in-mode-line): New test.
+
+2025-12-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	track-changes.el (track-changes-undo-only): New var
+
+	* lisp/emacs-lisp/track-changes.el (track-changes-undo-only): New var.
+	(track-changes-fetch): Bind it.
+	(track-changes--state): New slot `undo`.
+	(track-changes--after): Set it.
+
+	* lisp/vc/diff-mode.el (diff--track-changes-function): Use the
+	new var.
+
+	* doc/lispref/text.texi (Tracking changes): Mention
+	`track-changes-undo-only`.
+
+2025-12-28  Yuan Fu  <casouri@gmail.com>
+
+	Use variable-use-face for assignment in c-ts-mode (bug#79623)
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings):
+	Use variable-use face for the LHS of assignment statements.
+
+2025-12-28  Morgan Willcock  <morgan@ice9.digital>
+
+	Fix specification of 'python-indent-guess-indent-offset-verbose'
+
+	* lisp/progmodes/python.el (python-indent-guess-indent-offset-verbose):
+	Fix typo in configuration of safe value function.  (Bug#80085)
+
+2025-12-28  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New command 'C-x v b l'
+
+	* lisp/vc/vc.el (vc--read-branch-to-log): New function.
+	(vc-print-root-branch-log): Rewrite to use
+	vc--read-branch-to-log and vc--with-backend-in-rootdir.
+	(vc-print-fileset-branch-log): New command.
+	* lisp/vc/vc-dir.el (vc-dir-mode-map):
+	* lisp/vc/vc-hooks.el (vc-prefix-map):
+	(vc-menu-map): Bind it.
+	* doc/emacs/maintaining.texi (VC Change Log):
+	* etc/NEWS: Document it.
+
+2025-12-28  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Factor out vc--read-limit
+
+	* lisp/vc/vc.el (vc--read-limit): New function.
+	(vc-print-root-log): Call it.
+	(vc-print-log): Call it.  Modernize style.  Fix docs regarding
+	LIMIT: it defaults to vc-log-show-limit only for interactive
+	calls.
+
+2025-12-28  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Move 'C-x v b l' to 'C-x v b L', rename command
+
+	* lisp/vc/vc-dir.el (vc-dir-mode-map):
+	* lisp/vc/vc-hooks.el (vc-prefix-map, vc-menu-map): Replace
+	bindings of 'b l' with 'b L'.
+	* lisp/vc/vc.el (vc-print-root-branch-log): Rename from
+	'vc-print-branch-log'.  All uses changed.
+	(vc-print-branch-log): New obsolete alias.
+	* doc/emacs/maintaining.texi (VC Change Log)
+	(VC Directory Commands):
+	* doc/emacs/vc1-xtra.texi (Editing VC Commands):
+	* etc/NEWS: Document the change.
+
+2025-12-28  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Don't use the term 'null' for empty strings
+
+	Zero-length strings are just 'empty'; 'null' can be confusing in several
+	ways.
+
+	* lisp/subr.el (split-string, string-lines):
+	* doc/lispref/strings.texi (Creating Strings):
+	Change argument names from 'omit-nulls' to 'omit-empty'.
+
+2025-12-28  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Clean up split-string documentation
+
+	* doc/lispref/strings.texi (Creating Strings):
+	* lisp/subr.el (split-string):
+
+	Make it clear that the SEPARATORS argument should not match the empty
+	string, since the behaviour was entirely an artefact of the original
+	implementation in this case; it makes little sense otherwise.
+
+	Clean up the examples for conciseness and do not waste space on
+	irrelevant details.
+
+2025-12-28  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Various split-string improvements
+
+	* lisp/subr.el (split-string):
+	Fix quadratic behaviour in (split-string "x:x:x..." ":" nil " +").
+	General code reorganisation for speed and reduced allocation.
+	Fix a regexp bug; eg, (split-string "A;B" "," nil ";\\|:")
+
+	* test/lisp/subr-tests.el (subr-test-split-string):
+	More extensive test coverage.
+
+2025-12-28  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix two thinkos in 'set-frame-size-and-position'
+
+	* lisp/frame.el (set-frame-size-and-position): Correctly
+	interpret width and height of workarea as returned by
+	'frame-monitor-attributes'.  If LEFT or RIGHT are floats,
+	position FRAME according to left/top position of workarea.
+
+2025-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(nxml-compute-indent-in-token): Use `noindent` in CDATA
+
+	`noindent` is more precise than what we did since it gives more
+	info to the caller: `indent-for-tab-command` can treat it
+	differently (e.g. fall back to `indent-relative`) than `indent-region`.
+
+	* lisp/nxml/nxml-mode.el (nxml-compute-indent-in-token): Use `noindent`
+	in CDATA.
+	(nxml-compute-indent-in-delimited-token): Remove CDATA case, not used
+	any nmore.
+
+2025-12-27  Jonas Bernoulli  <jonas@bernoul.li>
+
+	lisp-indent-local-overrides: New variable
+
+2025-12-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Move vc-cloneable-backends-custom-type alias up
+
+	* lisp/vc/vc.el (vc-cloneable-backends-custom-type):
+	Move alias up.  Problem reported by Arash Esbati in:
+	https://lists.gnu.org/r/emacs-devel/2025-12/msg00772.html
+
+2025-12-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* CONTRIBUTE: American English in messages & IDs.
+
+2025-12-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+	December 2025 spelling fixes
+
+	Some of the fixes are to continue to use American
+	rather than British spelling.
+	* doc/misc/modus-themes.org (my-modus-themes-engraved-faces):
+	Fix misspelled ‘:foreground’s.
+	* etc/themes/modus-themes.el (modus-themes-faces):
+	Fix misspelled ‘modus-themes-bold’.
+	* lisp/emacs-lisp/rx.el (rx--normalize-char-pattern):
+	Rename from rx--normalise-char-pattern.
+	(rx--optimize-or-args):	Rename from rx--optimise-or-args.
+	* lisp/frame.el (frame--special-parameters):
+	Fix misspelled "right-divider-width".
+	* lisp/net/tramp.el (tramp-fingerprint-prompt-regexp):
+	Use American spelling “centered”, to match current libfprintf.
+	* lisp/org/org-fold-core.el (org-fold-core--optimize-for-huge-buffers):
+	Rename from org-fold-core--optimise-for-huge-buffers.
+	(org-fold-core-update-optimization):
+	Rename from org-fold-core-update-optimisation,
+	leaving an alias behind.
+	(org-fold-core-remove-optimization):
+	Rename from org-fold-core-remove-optimisation,
+	leaving an alias behind.
+	* lisp/org/org.el (org-advertized-archive-subtree):
+	This alias is now obsolete.
+	* lisp/play/zone.el (zone-ignored-buffers):
+	Fix misspelling of ‘zone--buffer-encrypted-p’.
+	* lisp/progmodes/csharp-mode.el (csharp-ts-mode-faces):
+	Fix misspelling of ‘csharp’ group.
+	* lisp/vc/vc.el (vc-clonable-backends-custom-type):
+	Rename from vc-cloneable-backends-custom-type,
+	leaving an alias behind.
+	* test/lisp/emacs-lisp/bytecomp-tests.el:
+	(bytecomp-tests--warn-arity-non-compiled-callee):
+	Rename from bytecomp-tests--warn-arity-noncompiled-callee.
+	(bytecomp-test-defface-spec): Reword a deliberate misspelling
+	of “default” that is so common I don’t want it to pollute the
+	spelling dictionary.
+	* test/lisp/emacs-lisp/package-vc-tests.el:
+	(package-vc-tests-preserve-artifacts):
+	Rename from package-vc-tests-preserve-artifacts.
+	* test/lisp/eshell/em-prompt-tests.el:
+	(em-prompt-test/forward-backward-paragraph-1):
+	Reword a deliberate misspelling of “goodbye” that is so common I
+	don’t want it to pollute the spelling dictionary.
+
+2025-12-26  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix problem in tramp-adb
+
+	* lisp/net/tramp-adb.el (tramp-adb-do-ls): New function.
+	(tramp-adb-handle-file-attributes)
+	(tramp-adb-handle-directory-files-and-attributes)
+	(tramp-adb-handle-file-name-all-completions): Use it.  (Bug#80054)
+
+2025-12-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2025-12-25  João Távora  <joaotavora@gmail.com>
+
+	Eglot: speed up symbol highlighting (bug#80072)
+
+	In large buffers, responses to textDocument/documentHighlight
+	requests may return thousands of occurrences.  Avoid incurring
+	expensive eglot--lsp-position-to-point calls, by restricting the
+	highlights to visible region in the active window.
+
+	* lisp/progmodes/eglot.el (eglot-highlight-eldoc-function):
+	Rework.
+
+2025-12-24  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-bar.el (tab-bar-merge-tabs): New command.
+
+	(merge-tabs): Alias for 'tab-bar-merge-tabs'.
+	https://lists.gnu.org/archive/html/emacs-devel/2025-12/msg00721.html
+
+2025-12-24  Juri Linkov  <juri@linkov.net>
+
+	* lisp/image-mode.el (image-mode--next-file): Fix infinite loop.
+
+	Fix the case when an image file is visited in the directory with
+	image files without image file extensions, and 'dired-movement-style'
+	is non-nil, and 'dired-next-line' wraps to the top of the dired buffer,
+	doesn't find the next image file and goes into an infinite loop.
+	Remember the original file name and exit the loop when after wrapping
+	'dired-next-line' reaches the original file.
+
+2025-12-24  Stéphane Marks  <shipmints@gmail.com>
+
+	Add ns_set_window_size_and_position
+
+	* src/frame.c (Fset_frame_size_and_position_pixelwise): Correct
+	docstring typo.
+	* src/nsterm.m (compute_offset): New function of common code.
+	(ns_set_offset): Call compute_offset.
+	(ns_set_window_size_and_position): New function.
+	(ns_create_terminal): Add new function to the hook.
+
+2025-12-24  Stéphane Marks  <shipmints@gmail.com>
+
+	In Fns_progress_indicator fix GNUstep enum spelling (bug#79859)
+
+	* src/nsfns.m (Fns_progress_indicator): GNUstep spells its level
+	indicator enum NSContinuousCapacityLevelIndicatorStyle vs. macOS
+	NSLevelIndicatorStyleContinuousCapacity.
+
+2025-12-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'word-combining-categories'
+
+	* src/category.c (syms_of_category) <word-combining-categories>:
+	Doc fix.  (Bug#80042)
+
+2025-12-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Merge branch 'cursor-intangible'
+
+2025-12-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cursor-sensor-tangible-pos): Prefer shortening the motion
+
+	When moving to the middle of an intangible chunk, and either end
+	of the chunk would result in a movement in the right direction, prefer
+	the shorter movement, since it's easier for the users to repeat a
+	movement than to "go back".
+	(see https://lists.gnu.org/archive/html/emacs-devel/2025-12/msg00686.html)
+
+	* lisp/emacs-lisp/cursor-sensor.el (cursor-sensor-tangible-pos):
+	Refine the choice.
+
+2025-12-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cursor-sensor-tangible-pos): Insist on picking a tangible position
+
+	* lisp/emacs-lisp/cursor-sensor.el (cursor-sensor-tangible-pos):
+	Prefer a tangible position, even if it means going in the wrong
+	direction; and don't favor shorter movement.
+
+2025-12-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cursor-sensor-tangible-pos): Clarify edge case
+
+	* lisp/emacs-lisp/cursor-sensor.el (cursor-sensor-tangible-pos):
+	Make it clear that prevpos/nextpos can be nil only at BOB/EOB.
+
+2025-12-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cursor-sensor-tangible-pos): Rewrite
+
+	The main purpose is to make the code more symmetric and make it
+	easier to tweak the behavior, compared to the previous code which
+	focused on moving always in the direction of the overall motion.
+
+	* lisp/emacs-lisp/cursor-sensor.el (cursor-sensor-tangible-pos):
+	Rewrite and allow movement in both directions, tho with (hopefully)
+	minimal changes in behavior.
+
+2025-12-23  milkvetch  <xuhi@distruzione.org>  (tiny change)
+
+	Fix tool-bar commands in Info
+
+	* lisp/info.el (Info-mode-map, Info-history-back-menu)
+	(Info-history-forward-menu): Unbreak tool-bar commands by fixing
+	letter-case.  (Bug#80059)
+
+2025-12-23  Po Lu  <luangruo@yahoo.com>
+
+	Implement set_window_size_and_position_hook on Android
+
+	* java/org/gnu/emacs/EmacsWindow.java (moveResizeWindow): New
+	method, which alters all of the bounding box of a window at
+	once.
+
+	* src/android.c (android_init_emacs_window): Load method
+	`move_resize_window'.
+	(android_move_resize_window): Invoke this method, rather than a
+	sequence of operations that will produce two ConfigureNotify
+	events.
+
+	* src/androidterm.c (android_set_window_size_and_position_1)
+	(android_set_window_size_and_position): New functions; ported
+	from X.
+	(android_create_terminal): Register the same.
+
+2025-12-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	Revert the commit 70678cd5 (bug#80052)
+	* message.el (message-get-reply-headers): Revert.
+
+2025-12-22  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	time-stamp-custom-pattern test: Minor optimization
+
+	* test/lisp/time-stamp-tests.el (time-stamp-custom-pattern): Refactor,
+	lifting the setup of the test buffer out of the loop.
+
+2025-12-22  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Fix handling of border face on tty child frames (bug#80043)
+
+	* src/dispnew.c (box_from_display_table, box_default,
+	box_glyph): New functions, extracted from produce_box_glyphs.
+	(box_from_display_table): Merge face nwith glyph's face.
+	(box_default): Lookup face.
+	(produce_box_glyphs): Use new functions.
+
+2025-12-22  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Repair package-tests failure
+
+	* test/lisp/emacs-lisp/package-tests.el (package-test-install-single):
+	"already installed" is now an error; adapt test.
+
+2025-12-22  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* lisp/cus-start.el: Don't complain about :initialize (bug#80051)
+
+2025-12-22  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Recognise %b and %B in compile-time format string checker
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-format-warn): Add b and B.
+
+2025-12-22  Martin Rudalics  <rudalics@gmx.at>
+
+	Add functions to set frame size and position in one compound step
+
+	* lisp/frame.el (set-frame-size-and-position): New function.
+	* src/frame.c (adjust_frame_size): Handle requests to set size
+	and position.
+	(Fset_frame_size_and_position_pixelwise): New function.
+	* src/gtkutil.c (xg_frame_set_size_and_position): New function.
+	(xg_wm_set_size_hint): Handle any non-NorthWestGravity values
+	for child frames only.  Some GTK implementations don't like
+	them.
+	* src/gtkutil.h (xg_frame_set_size_and_position.): Add external
+	declaration.
+	* src/termhooks.h (set_window_size_and_position_hook): New hook.
+	* src/w32term.c (w32_set_window_size_and_position): New
+	function.
+	(w32_create_terminal): Make it the Microsoft Windows API
+	set_window_size_and_position_hook.
+	* src/xterm.c (x_set_window_size_and_position_1)
+	(x_set_window_size_and_position): New functions.
+	(x_create_terminal): Make x_set_window_size_and_position the
+	set_window_size_and_position_hook for the X protocol.
+	* src/xterm.h (x_set_window_size_and_position): Add external
+	declaration.
+	* etc/NEWS: Announce new functions.
+
+2025-12-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Simplify new %b/%B code many years from now
+
+	* src/editfns.c (styled_format): Do %b and %B with sprintf if
+	sprintf is known to support them.  This will let us simplify this
+	code many years from now.  (Bug#79990)
+
+2025-12-22  Jacob S. Gordon  <jacob.as.gordon@gmail.com>
+	    Paul Eggert  <eggert@cs.ucla.edu>
+
+	Add binary format specifications '%b' and '%B'
+
+	These produce the binary representation of a number.
+	'%#b' and '%#B' prefix with '0b' and '0B', respectively.
+	(bug#79990)
+	* etc/NEWS: Announce change.
+	* doc/lispref/strings.texi (Formatting Strings): Describe new format
+	specs and add to comment on reconstructing the value with 'read'.
+	* src/editfns.c (format): Update doc string.
+	(styled_format): Add support for '%b' and '%B'.  To remain
+	portable, avoid use of 'sprintf' by converting by hand.
+	* test/src/editfns-tests.el (format-binary-zero, format-binary-floats)
+	(format-binary-nonzero-integers): Add tests.
+	(read-large-integer): Add binary test cases.
+
+2025-12-21  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Avoid mutating properties of string literals
+
+	* lisp/emacs-lisp/shortdoc.el (text-properties):
+	* lisp/progmodes/gdb-mi.el (gdb-put-breakpoint-icon):
+	* lisp/progmodes/gud.el (gud-speedbar-buttons):
+	Don't mutate literals in some obvious cases.
+
+2025-12-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Remove binary-as-unsigned (bug#79990)
+
+	This experimental variable caused more trouble than it cured:
+	it was rarely used, and when used it tended to be used incorrectly.
+	* src/editfns.c (binary-as-unsigned): Remove.  All uses removed.
+
+2025-12-21  Sean Whitton  <spwhitton@spwhitton.name>
+
+	diff-sanity-check-hunk: Better handle incomplete lines (bug#80040)
+
+	* lisp/vc/diff-mode.el (diff-sanity-check-hunk): Better handle
+	incomplete lines (bug#80040).
+
+2025-12-21  Juri Linkov  <juri@linkov.net>
+
+	Add text property 'imenu-region' for Eglot and 'M-x imenu' (bug#79980)
+
+	* lisp/imenu.el (imenu--flatten-index-alist)
+	(imenu--parentify-index-alist, imenu-choose-buffer-index):
+	Use the text property 'imenu-region' instead of 'breadcrumb-region'.
+
+	* lisp/progmodes/eglot.el (eglot--imenu-SymbolInformation)
+	(eglot--imenu-DocumentSymbol): Add new text properties 'imenu-region'
+	and 'imenu-kind' while keeping the old text properties 'breadcrumb-region'
+	and 'breadcrumb-kind' for backward-compatibility.
+
+2025-12-21  Philip Kaludercic  <philipk@posteo.net>
+
+	List all packages in 'package-install' prompt
+
+	* lisp/emacs-lisp/package.el (package-install-upgrade-built-in):
+	Update documentation.
+	* lisp/emacs-lisp/package.el (package-install): Raise error when
+	re-installing an installed package.  (Bug#79881)
+
+2025-12-21  Stéphane Marks  <shipmints@gmail.com>
+
+	System GUI taskbar and progress reporter hooks (bug#79859)
+
+	Implement system GUI taskbar/dock/launcher icon badge, icon
+	progress indicator, icon attention alert features for D-Bus
+	platforms (tested on KDE and GNOME), NS (macOS/GNUstep),
+	MS-Windows.
+
+	Add 'progress-reporter-update-functions' abnormal hook to facilitate
+	taskbar progress display, and other custom progress reporters.
+	The default function list is 'progress-reporter-echo-area' which
+	is backward compatible.
+
+	* lisp/subr.el (progress-reporter-update-functions):
+	New defvar.
+	(progress-reporter-echo-area): New defun.
+	(progress-reporter-do-update): Run
+	progress-reporter-update-functions for both numerical and
+	pulsing reporters.
+	(progress-reporter-done): Run progress-reporter-done-functions.
+	* lisp/system-taskbar.el: New file.
+	* src/nsfns.m (Fns_badge, Fns_progress_indicator)
+	(Fns_request_user_attention): New function.
+	(syms_of_nsfns): Add defsubr Sns_badge,
+	Sns_request_user_attention, Sns_progress_indicator. Add DEFSYM
+	Qinformational, Qcritical.
+	* src/w32fns.c (rgb_list_to_colorref, Fw32_badge)
+	(Fw32_request_user_attention, Fw32_progress_indicator): New
+	function.
+	(syms_of_w32fns): Add defsubr Sw32_badge,
+	Sw32_progress_indicator, Sw32_request_user_attention. Add DEFSYM
+	Qinformational, Qcritical.
+	* doc/emacs/frames.texi: User documentation.
+	* doc/lispref/os.texi: Programmer documentation.
+	* etc/NEWS: Announce system-taskbar-mode.  Announce progress
+	reporter callback enhancements.
+
+2025-12-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix VIQR decoding and encoding
+
+	* lisp/language/viet-util.el (viqr-regexp): Include escaped
+	punctuation characters, to handle escaped punctuation correctly.
+	(viqr-punctuation-regexp): New defconst.
+	(viet-encode-viqr-region): Backslash-escape punctuation characters
+	matching 'viqr-punctuation-regexp' before encoding Vietnamese
+	characters with diacritics.  (Bug#80039)
+
+	* test/lisp/language/viet-util-tests.el (viet-util-test-viqr): New
+	file with tests for VIQR encoding and decoding.
+
+2025-12-21  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/misc/tramp.texi (FUSE setup): Extend rclone setup section.
+
+2025-12-21  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project-vc-supports-project-in-different-dir: Tune the expectation for 'find'
+
+	* test/lisp/progmodes/project-tests.el
+	(project-vc-supports-project-in-different-dir):
+	Account for difference in behavior when failing over to 'find'
+	(comments in bug#79809).
+
+2025-12-20  Jens Schmidt  <jschmidt4gnu@vodafonemail.de>
+
+	Add query-replace-read-transpose-from-to
+
+	Provide a command to easily swap FROM and TO arguments in a query
+	replace operation.
+
+	* lisp/replace.el (query-replace-read-transpose-from-to): New function.
+	(query-replace-read-map): New keymap.
+	(query-replace-read-from): Use new keymap to read from minibuffer.
+	(read-regexp-map): Inherit from 'query-replace-read-map'.
+	(query-replace-read-from, query-replace-read-to): Fix parameter
+	references in doc strings.
+	* etc/NEWS: Document the change.  (Bug#79835)
+
+2025-12-20  Juri Linkov  <juri@linkov.net>
+
+	Handle non-leaf nodes with Eglot text properties in 'M-x imenu'
+
+	* lisp/imenu.el (imenu--flatten-index-alist): Add special handling
+	of the text property 'breadcrumb-region' added by 'eglot-imenu'.
+	Add non-leaf nodes with these text properties to the flat index alist.
+	(imenu--parentify-index-alist): New function.
+	(imenu-choose-buffer-index): For the case when imenu-flatten is nil,
+	use 'imenu--parentify-index-alist' to add separate ".." to non-leaf nodes
+	when the first node of 'index-alist' has Eglot text properties (bug#79980).
+
+2025-12-20  Richard Lawrence  <rwl@recursewithless.net>
+
+	Add full support for iCalendar (RFC5545) data
+
+	This is a fix for Bug#74994 that replaces the existing support
+	in icalendar.el.  It implements a full parser, recurrence rule
+	and time zone calculations, diary import and export, and a
+	major mode with syntax highlighting for iCalendar data.  It
+	obsoletes most of the code in icalendar.el.
+
+	In addition to Bug#74994, the proposal to update Emacs' iCalendar
+	support was discussed on emacs-devel in this thread:
+	https://lists.gnu.org/archive/html/emacs-devel/2024-10/msg00425.html
+
+	icalendar.el pre-dates the current standard (RFC5545), contains numerous
+	bugs, is not well documented, and could not easily be updated or
+	extended; starting fresh was the simplest path to creating an iCalendar
+	library that other Emacs applications and packages can rely on.  It was
+	decided to leave icalendar.el's code in place for posterity, but declare
+	it obsolete.  Most of the changes in icalendar.el simply consist of such
+	declarations.  The old To Do list has also been deleted.
+
+	A few changes in icalendar.el, however, consist of new code for
+	library-wide functions and options, especially error handling.  In
+	particular:
+
+	* lisp/calendar/icalendar.el: Log iCalendar library errors in a single
+	buffer.
+	(icalendar-errors-mode): New mode for it.
+	(icalendar-uid-format): Change the default value to "%h", a hash
+	value (for privacy).
+	(icalendar-make-uid): New function, to replace 'icalendar--create-uid'.
+	(icalendar-debug-level, icalendar-vcalendar-prodid): New option.
+	(icalendar-vcalendar-version): New constant.
+	* lisp/calendar/icalendar.el (icalendar-import-format)
+	(icalendar-import-format-summary, icalendar-import-format-description)
+	(icalendar-import-format-location, icalendar-import-format-organizer)
+	(icalendar-import-format-url, icalendar-import-format-uid)
+	(icalendar-import-format-status, icalendar-import-format-class)
+	(icalendar-recurring-start-year, icalendar-export-hidden-diary-entries)
+	(icalendar-export-sexp-enumerate-all, icalendar-export-alarms,
+	icalendar-debug, icalendar--weekday-array, icalendar--dmsg)
+	(icalendar--get-unfolded-buffer icalendar--clean-up-line-endings)
+	(icalendar--rris, icalendar--read-element)
+	(icalendar--get-event-property, icalendar--get-event-properties)
+	(icalendar--get-event-property-attributes)
+	(icalendar--get-children, icalendar--all-events, icalendar--split-value)
+	(icalendar--convert-tz-offset, icalendar--parse-vtimezone)
+	(icalendar--get-most-recent-observance)
+	(icalendar--convert-all-timezones, icalendar--find-time-zone)
+	(icalendar--decode-isodatetime)
+	(icalendar--decode-isoduration, icalendar--add-decoded-times)
+	(icalendar--datetime-to-american-date)
+	(icalendar--datetime-to-european-date, icalendar--datetime-to-iso-date)
+	(icalendar--datetime-to-diary-date, icalendar--datetime-to-colontime)
+	(icalendar--get-month-number, icalendar--get-weekday-number)
+	(icalendar--get-weekday-numbers, icalendar--get-weekday-abbrev)
+	(icalendar--date-to-isodate, icalendar--datestring-to-isodate)
+	(icalendar--diarytime-to-isotime, icalendar--convert-string-for-export)
+	(icalendar--convert-string-for-import, icalendar-export-file)
+	(icalendar-export-region, icalendar--create-uid)
+	(icalendar--parse-summary-and-rest, icalendar--create-ical-alarm)
+	(icalendar--do-create-ical-alarm, icalendar--convert-ordinary-to-ical)
+	(icalendar-first-weekday-of-year, icalendar--convert-weekly-to-ical)
+	(icalendar--convert-yearly-to-ical, icalendar--convert-sexp-to-ical)
+	(icalendar--convert-block-to-ical, icalendar--convert-float-to-ical)
+	(icalendar--convert-date-to-ical, icalendar--convert-cyclic-to-ical)
+	(icalendar--convert-anniversary-to-ical, icalendar-import-file)
+	(icalendar-import-buffer, icalendar--format-ical-event)
+	(icalendar--convert-to-ical, icalendar--convert-ical-to-diary)
+	(icalendar--convert-recurring-to-diary)
+	(icalendar--convert-non-recurring-all-day-to-diary)
+	(icalendar--convert-non-recurring-not-all-day-to-diary)
+	(icalendar--add-diary-entry, icalendar-import-format-sample): Mark them
+	as obsolete.
+
+	In addition to the changes above, the new iCalendar library consists of
+	the following:
+
+	* lisp/calendar/diary-icalendar.el:
+	* lisp/calendar/icalendar-ast.el:
+	* lisp/calendar/icalendar-macs.el:
+	* lisp/calendar/icalendar-mode.el:
+	* lisp/calendar/icalendar-parser.el:
+	* lisp/calendar/icalendar-recur.el:
+	* lisp/calendar/icalendar-utils.el: New files
+
+	A few changes were made to existing files dealing with the calendar and
+	diary:
+
+	* lisp/calendar/calendar.el (calendar-date-from-day-of-year): New
+	function, extracted from calendar-goto-day-of-year.
+	* lisp/calendar/cal-move.el (calendar-goto-day-of-year): Use it.
+	* lisp/calendar/cal-dst.el (calendar-dst-find-data): Improve docstring.
+	* lisp/calendar/calendar.el (diary-date-insertion-form): New option.
+	(diary-american-date-insertion-form, diary-european-date-insertion-form)
+	(diary-iso-date-insertion-form): New constants.
+	* lisp/calendar/diary-lib.el (diary-insert-entry): Use the new
+	'diary-date-insertion-form' option.
+	(diary-time-regexp): Add FIXME to an existing comment.
+
+	The user-facing aspects of the above changes are documented in the Emacs
+	manual and the NEWS file:
+
+	* doc/emacs/calendar.texi (Diary Conversion): Update manual section to
+	describe the new importer and exporter.
+	* doc/emacs/emacs.texi (Detailed node listing): Update to include the
+	new nodes in docs/emacs/calendar.texi.
+	* etc/NEWS: Briefly describe the new library, major mode, and options.
+
+	The remainder of the changes apply to test files.
+
+	The following changes introduce new test files related to the new diary
+	importer and exporter:
+
+	* test/lisp/calendar/diary-icalendar-tests.el (Diary import and export):
+	Tests for diary-icalendar.  In addition to new tests for the exporter,
+	the existing import tests for icalendar.el have been ported here; these
+	use the existing iCalendar files in
+	test/lisp/calendar/icalendar-resources.  (A few new input .ics files
+	have also been added to this directory; see below.)
+	* test/lisp/calendar/diary-icalendar-resources: New directory containing
+	expected outputs for the import tests in diary-icalendar-tests.el.
+	(These have the same or similar names to the output files for the old
+	importer, in test/lisp/calendar/icalendar-resources, but different
+	contents.  Thus they live in a new directory.)
+	* test/lisp/calendar/icalendar-resources/import-legacy-function.ics: New
+	input file to test backward compatibility of the new importer with a
+	function as the value of 'icalendar-import-format', now obsolete.
+	* test/lisp/calendar/icalendar-resources/import-legacy-vars.ics: New
+	input file to test backward compatibility of the new importer with
+	values for options provided by icalendar.el which are now obsolete.
+	* test/lisp/calendar/icalendar-resources/import-with-attachment.ics: New
+	input file to test import of base64-encoded attachments.
+	* icalendar-resources/import-time-format-12hr-blank.ics: New input file
+	to test import with a custom value of 'diary-icalendar-time-format'.
+
+	Two other new test files provide unit tests for the main functions of
+	the library:
+
+	* test/lisp/calendar/icalendar-parser-tests.el (Parser): Tests for
+	icalendar-parser.  Most of these are derived from examples in RFC5545,
+	to ensure the parser implements the standard.
+	* test/lisp/calendar/icalendar-recur-tests.el (Recurrence rules): Tests
+	for icalendar-recur.  Most of these are derived from examples in RFC5545,
+	to ensure the recurrence rule interpreter implements the standard.
+
+	A few of the existing test files for icalendar.el have also been
+	modified.  Besides the specific changes mentioned below, the modified
+	.ics files also now use CR-LF line endings, as required by RFC5545:
+
+	* test/lisp/calendar/icalendar-tests.el (icalendar-deftest-obsolete):
+	New macro.
+	* test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.ics:
+	Correct a malformed VALUE parameter.
+	* test/lisp/calendar/icalendar-resources/import-rrule-anniversary.ics:
+	Correct representation of a recurring event.
+	*
+	test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.ics:
+	Add a required VALUE parameter.
+	* test/lisp/calendar/icalendar-resources/import-rrule-daily.ics:
+	* test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.ics:
+	* test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.ics:
+	* test/lisp/calendar/icalendar-resources/import-rrule-weekly.ics:
+	Correct a malformed RRULE property.
+
+2025-12-20  Jens Schmidt  <jschmidt4gnu@vodafonemail.de>
+
+	Improve handling of non-ASCII characters in 'transpose-regions'
+
+	* src/editfns.c (Ftranspose_regions): Separate code related to character
+	semantics from that related to byte semantics and in that way leverage
+	optimizations for regions of equal length with respect to both
+	semantics.  Move and update comments dating back to the initial
+	implementation.
+	* test/src/editfns-tests.el (editfns-tests--transpose-regions-tests)
+	(editfns-tests--transpose-regions-markups)
+	(editfns-tests--transpose-regions): New test and accompanying variables.
+
+2025-12-20  Jens Schmidt  <jschmidt4gnu@vodafonemail.de>
+
+	Fix byte-vs-char length issue in 'transpose-regions'
+
+	* src/editfns.c (Ftranspose_regions): Calculate length of range between
+	regions both in units of bytes and characters and use these values as
+	appropriate.
+
+2025-12-20  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Support nested comment block in 'hs-hide-level-recursive'
+
+	bug#80009
+
+	* doc/emacs/programs.texi (Hideshow): Update documentation.
+	* lisp/progmodes/hideshow.el (hs-hide-level-recursive): Rework.
+	(hs-get-first-block-on-line): Minor changes.
+	(hs--add-indicators, hs-hide-comments-when-hiding-all)
+	(hs-minor-mode-menu, hs-hide-level, hs-cycle): Update code.
+	* test/lisp/progmodes/hideshow-tests.el
+	(hideshow-hide-levels-with-comments-1): New test.
+
+2025-12-20  Stéphane Marks  <shipmints@gmail.com>
+
+	Add vtable buffer slot (bug#79982)
+
+	This solves for background vtable mutations, i.e., updates
+	initiated from buffers other than the vtable buffer, and for
+	buffer-adjusted string-pixel-width computations.
+
+	* lisp/emacs-lisp/vtable.el (vtable): New '-buffer' slot.
+	(vtable-buffer, vtable-set-buffer): New function.
+	(vtable-update-object, vtable-remove-object)
+	(vtable-insert-object): Wrap operation with the vtable buffer.
+	(vtable--insert): Split from old 'vtable-insert'.
+	(vtable-insert): Insert table and record the buffer.
+	(vtable--insert-line, vtable--insert-header-line): Use
+	'vtable-buffer' for pixel-width computation.
+	(vtable--limit-string, vtable--char-width): Pass buffer to
+	'string-pixel-width'.
+	(vtable-revert): New optional table argument.
+	(vtable--alter-column-width, vtable-revert-command)
+	(vtable-sort-by-current-column): Call 'vtable-revert' with the
+	table.
+
+	* test/lisp/emacs-lisp/vtable-tests.el
+	(vtable-tests--make-no-header-2-object-table): New helper
+	function.
+	(test-vstable-compute-columns): Correct typo in test name.  Use
+	new helper function.
+	(test-vtable-unique-buffer)
+	(test-vtable-non-current-buffer-insert-object)
+	(test-vtable-non-current-buffer-remove-object)
+	(test-vtable-non-current-buffer-update-object)
+	(test-vtable--limit-string-with-face-remapped-buffer): New test.
+
+2025-12-20  Martin Rudalics  <rudalics@gmx.at>
+
+	Don't change visibility of tty root frames (Bug#80032)
+
+	* src/frame.c (Fmake_frame_visible, Fmake_frame_invisible):
+	* doc/lispref/frames.texi (Visibility of Frames): Don't change
+	visibility of tty root frames.  (Bug#80032)
+
+2025-12-20  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	csharp-mode: Fix fontification of catch-expressions
+
+	* lisp/progmodes/csharp-mode.el
+	(csharp-ts-mode--font-lock-settings): Improve specificity
+	of selectors.  Don't let type-selector bleed into
+	name-selector.  (Bug#80038)
+
+2025-12-20  Rudolf Adamkovič  <rudolf@adamkovic.org>
+
+	hi-lock: Use active region for default values in more places
+
+	* lisp/hi-lock.el (hi-lock-line-face-buffer, hi-lock-face-buffer)
+	(hi-lock-face-phrase-buffer): Use the new function
+	`hi-lock-read-regexp' to read font-lock patterns, mirroring
+	`hi-lock-read-face-name' used to read face names.  For end users,
+	all three functions now get the default value from the active
+	region, rather than just `hi-lock-face-buffer'.
+	(hi-lock-read-regexp): Extract font-lock pattern reading
+	functionality from `hi-lock-face-buffer' into this function, to
+	mirror how faces are read with `hi-lock-read-face-name' and to
+	promote reuse.  (Bug#79976)
+
+2025-12-20  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix problem in Tramp completion
+
+	* lisp/net/tramp.el (tramp-completion-handle-expand-file-name):
+	Expand FILENAME also when it is absolute.  (Bug#80031)
+
+2025-12-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Revert to simpler (and we hope faster) TAGGEDP
+
+	Suggested by Mattias Engdegård (bug#80021#17).
+	* src/lisp.h (lisp_h_FIXNUMP, lisp_h_TAGGEDP):
+	Go back to the simpler (X&7) == TAG approach for checking object tags.
+	This reverses my commit ccdb08ef4ed8f96e79aa06cf5e806c9c487d58ad
+	“Improve performance of CONSP, FIXNUMP, etc.”
+	dated 2018-08-25 13:39:18 -0700,
+	though it keeps the TAGGEDP function the older commit introduced.
+	Although the older commit improved performance on its circa 2010
+	platform, when I ran today’s ‘make -C lisp compile-always’
+	benchmark on Ubuntu 25.10 which uses gcc (Ubuntu 15.2.0-4ubuntu4)
+	on an circa-2021 Intel Xeon W-1350, this patch makes the
+	‘make -C lisp compile-always’ benchmark 3.1% faster.  Although the
+	patch unfortunately also makes the Emacs text segment 0.6% larger,
+	in this case speed and simplicity beat text size in importance.
+
+2025-12-19  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Don't make tty child frames visible when selected (bug#80020)
+
+	* src/frame.c (do_switch_frame): Don't change visibility of tty
+	child frames.
+	(Fraise_frame): Doc string fix.
+
+2025-12-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix ‘make compile-always’ with native compilation
+
+	Without the fix, ‘make compile-always’ failed nearly immediately
+	in a native compilation build, with ‘ELC+ELN
+	emacs-lisp/loaddefs-gen.elc’ outputting “Error: file-missing
+	("Cannot open load file" "No such file or directory" "comp")...”.
+	* lisp/Makefile.in (compile-always):
+	Build ../src first, since the ‘find ... -delete’ removes files
+	needed by ‘make compile’.
+
+2025-12-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Remove stray references to $(LOADDEFS)
+
+	They became obsolete some time ago.
+	* lisp/Makefile.in (compile, compile-one-process):
+	Don’t depend on $(LOADDEFS).
+
+2025-12-19  João Távora  <joaotavora@gmail.com>
+
+	Eglot: remove "face" suffix for semtok-specific faces
+
+	* lisp/progmodes/eglot.el (eglot--semtok-define-things)
+	(eglot--semtok-decode-token): Remove "face" suffix for semtok faces.
+
+2025-12-19  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Re-introduce fallback to 'find' for extra ignores with older Git
+
+	* lisp/progmodes/project.el (vc-git-project-list-files):
+	Fall back to 'find' when Git is older than 1.13 and EXTRA-IGNORES
+	is non-nil (bug#79809).
+
+2025-12-19  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Revert "vc-git-project-list-files: Restore support for Git < 2.13"
+
+	This reverts commit 821c0d36dfa2f2cddb9d05a024a8248f2390f478.
+
+	Despite re-enacting what the modern Git versions seem to do under the
+	covers, the effect is not the same: filtering works differently.
+
+2025-12-18  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Make VC-Dir's 'd' able to delete unregistered files
+
+	* lisp/vc/vc.el (vc-delete-file): Simplify.
+	* lisp/vc/vc-dir.el (vc-dir-delete-file): Handle deleting
+	unregistered files, too.
+	(vc-dir-menu-map, vc-dir-mode-map): Replace bindings for
+	vc-dir-clean-files with ones for vc-dir-delete-file.
+	* doc/emacs/maintaining.texi (VC Directory Commands):
+	* etc/NEWS: Document the bindings change.
+
+2025-12-18  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fallback to project-files if no 'find' available (bug#79809)
+
+	When find-based directory listing fails, fallback to project-files
+	strategy for robustness.
+
+	* lisp/progmodes/eglot.el (eglot--watch-globs): Inline directory
+	listing and add error handling with fallback.  Rename BASE-PATH to DIR,
+	add IN-ROOT parameter.
+	(eglot--list-directories): Delete
+	(eglot-register-capability): Adjust caller, group by both DIR and
+	IN-ROOT.
+
+2025-12-18  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-diff-internal: Call into backend with old current buffer
+
+	* lisp/vc/vc.el (vc-diff-internal): Call into the backend with
+	the original current buffer, not BUFFER (see bug#80005).
+
+2025-12-18  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Fix "No such file or directory" "vc-nil" in project-files
+
+	* lisp/progmodes/project.el (project-files):
+	Fix vc-nil backend error (bug#80013).
+
+2025-12-17  Dmitry Gutov  <dmitry@gutov.dev>
+
+	vc-git-project-list-files: Restore support for Git < 2.13
+
+	* lisp/progmodes/project.el (vc-git-project-list-files):
+	Restore support for Git < 2.13 (discussed in bug#79809).
+
+2025-12-17  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New M-RET, M-p, M-n commands in Log View mode
+
+	* lisp/vc/log-view.el (log-view-msg-and-diff-next)
+	(log-view-msg-and-diff-prev, log-view-display-entry-and-diff):
+	New commands.
+	(log-view-mode-map): Bind them.
+	* doc/emacs/maintaining.texi (VC Change Log):
+	* etc/NEWS: Document them.
+
+2025-12-17  Sean Whitton  <spwhitton@spwhitton.name>
+
+	log-view-toggle-entry-display: Don't deactivate the mark
+
+	* lisp/vc/log-view.el (log-view-toggle-entry-display): Bind
+	inhibit-read-only instead of buffer-read-only.  Bind
+	deactivate-mark to nil.
+
+2025-12-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'mode-line-format-right-align' in Olivetti mode
+
+	* lisp/bindings.el (mode--line-format-right-align): Account for
+	the left fringe.  (Bug#80019)
+
+2025-12-17  Liu Hui  <liuhui1610@gmail.com>
+
+	calendar-mode-line-format: Fix regexp
+
+	* lisp/calendar/calendar.el (calendar-mode-line-format): Replace
+	'*' with '\\*'.
+	(calendar-get-buffer, calendar-exit):
+	* lisp/calendar/diary-lib.el (diary-mark-entries): Improve
+	comment and doc string.
+
+2025-12-17  João Távora  <joaotavora@gmail.com>
+
+	Eglot: speed up file watching outside project (bug#79809)
+
+	Use find-based directory listing when watching outside project root,
+	avoiding the expensive delete-dups/file-name-directory/project-files
+	combo.
+
+	* lisp/progmodes/eglot.el (eglot--list-directories): New helper.
+	(eglot--watch-globs): Use it for directories outside project root.
+
+2025-12-17  Stéphane Marks  <shipmints@gmail.com>
+
+	New bookmark-after-load-file-hook (bug#80003)
+
+	* lisp/bookmark.el (bookmark-after-load-file-hook): New
+	defcustom (bug#80003).
+	(bookmark-load): Call the new hook.
+	* etc/NEWS: Announce the new hook.
+
+2025-12-17  Stéphane Marks  <shipmints@gmail.com>
+
+	New optional recentf autosave timer (bug#80002)
+
+	* etc/NEWS: Announce the new user option.
+	* lisp/recentf.el (recentf-auto-cleanup): When canceling the
+	auto-cleanup timer, set recentf-auto-cleanup-timer to nil to
+	avoid false positive timerp.
+	(recentf-autosave-interval): New defcustom.
+	(recentf--autosave-timer, recentf--cancel-autosave-timer)
+	(recentf--manage-autosave-timer): New defun.
+	(recentf-mode): Call recentf--manage-autosave-timer.
+
+2025-12-17  Christoph Wedler  <christoph.wedler@sap.com>
+
+	Fix init of auto/not-auto buffer-local vars in antlr-mode
+
+	* lisp/progmodes/antlr-mode.el (antlr-mode): Fix initialization of
+	variables, some are actually auto buffer-local and others not.
+	Patch by Arash Esbati <arash@gnu.org>.
+
+2025-12-17  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix thinko, group file watchers by base URI (bug#79809)
+
+	It's fairly important to do this to reduce both the number of
+	file-notify watches and the number of expensive project-files among
+	"watcher" items pertaining to the same baseUri.
+
+	* lisp/progmodes/eglot.el (eglot--watch-globs): Rename from
+	eglot--watch-glob.  Accept list of compiled glob/kind pairs.
+	(eglot-register-capability): Group watchers by base-path before
+	setting up watches.
+
+2025-12-16  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix outgoing diff commands including uncommitted changes
+
+	* lisp/vc/vc-hooks.el (vc-symbolic-working-revision): Don't
+	return nil when passed a directory if also passed a backend.
+	* lisp/vc/vc.el (vc-diff-outgoing): Pass backend to
+	vc-symbolic-working-revision.
+
+2025-12-16  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix last change about relativePatternSupport (bug#79809)
+
+	According to the spec, glob patterns are matched against relative paths
+	when server provides a RelativePattern baseUri.  Else match the glob
+	against the absolute path as usual.
+
+	* lisp/progmodes/eglot.el (eglot--watch-glob): Tweak
+
+2025-12-16  João Távora  <joaotavora@gmail.com>
+
+	Eglot: support relativePatternSupport for file watching (bug#79809)
+
+	Announce relativePatternSupport capability.  Parse RelativePattern
+	objects with baseUri and pattern fields.  Add defvar
+	eglot-watch-files-outside-project-root to control filtering.
+
+	Rewrote file watching implementation.  Key by registration ID instead of
+	directory.  Each LSP watchers item spawns directory watchers
+	indenpendently that will look for the associated pattern only.
+
+	This change needs (or at least is known to work more efficiently) with
+	the latest project.el, so we should bump it.
+
+	* lisp/progmodes/eglot.el (eglot-client-capabilities): Announce
+	relativePatternSupport for didChangeWatchedFiles.
+	(eglot-lsp-server): Change file-watches slot to ID-keyed structure.
+	(eglot-watch-files-outside-project-root): New defvar.
+	(eglot--watch-glob): New function.
+	(eglot-register-capability): Rewrite.
+	(eglot-unregister-capability): Simplified for ID-keyed structure.
+	(eglot--on-shutdown): Update watch cleanup.
+
+2025-12-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	Document and test process filters in tramp-smb.el
+
+	* doc/misc/tramp.texi (Remote processes): Provide more details in
+	"Running remote processes on MS Windows hosts".
+
+	* test/lisp/net/tramp-tests.el (tramp-test29-start-file-process)
+	(tramp-test30-make-process): Adapt tests.
+
+2025-12-16  Przemysław Kryger  <pkryger@gmail.com>
+
+	Mark less important package-vc-tests as expensive
+
+	* test/lisp/emacs-lisp/package-vc-tests.el
+	(package-vc-test-deftest): Add support for `:tags' keyword.
+	(upgrade, upgrade-all, upgrade-all-after-require, rebuild)
+	(prepare-patch, log-incoming, pkg-spec-info-manual): Mark as
+	`:expensive-test'.
+
+2025-12-16  Przemysław Kryger  <pkryger@gmail.com>
+
+	Fix package-vc-tests failing when no install-info is available
+
+	* test/lisp/emacs-lisp/package-vc-tests.el
+	(pkg-spec-make-shell-command): Rename from
+	`pkg-spec-doc-make-shell-command'.  Remove assertions related to
+	info manual installation.
+	(pkg-spec-info-manual): Add tests for info manual installation.
+
+2025-12-16  Liu Hui  <liuhui1610@gmail.com>
+
+	Improve support for non-default calendar buffer (bug#79994)
+
+	* lisp/calendar/calendar.el (calendar-get-buffer): New function.
+	(calendar-mode-line-format): Support displaying non-default
+	calendar buffer name.
+	(calendar-exit): Handle non-default calendar buffer separately.
+	(calendar-generate-window): Update mode-line after cursor
+	motion (bug#79994).
+	(calendar-redraw, calendar-update-mode-line, calendar-unmark)
+	(calendar-mark-visible-date):
+	* lisp/calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern)
+	(calendar-hebrew-list-yahrzeits):
+	* lisp/calendar/diary-lib.el (diary-mark-sexp-entries)
+	(calendar-mark-days-named, calendar-mark-date-pattern)
+	(calendar-mark-1): Replace 'calendar-buffer' with the new
+	function or current calendar buffer.
+	(diary-mark-entries): Record current calendar buffer (bug#79994).
+
+2025-12-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cconv-make-interpreted-closure): Be more conservative
+
+	We can't use `cconv-make-interpreted-closure` until it's
+	compiled because it would get called in an infinite recursion.
+	The same holds for a lof of the code needed to compute the interpreted
+	closures used during the computation of `cconv-make-interpreted-closure`.
+	We used to work around this inf-loop in `loadup.el` with a hack
+	that checks if two specific functions have been compiled.
+
+	In practice that worked well enough in normal use, but was brittle
+	if you ever tried to load `cconv.el`, or Edebug or `M-C-x` that code
+	for whatever reason.  So we replace it with a more conservative
+	approach which just short-circuits any recursive invocation.
+	It makes it conservative in that it will sometimes redirect the call
+	to the "dumb" `make-interpreted-closure` even though it would be able
+	to complete the call properly, but it should be infrequent
+	enough to be worth the added reliability.
+
+	* lisp/loadup.el: Simplify setting of
+	`internal-make-interpreted-closure-function`.
+
+	* lisp/emacs-lisp/cconv.el (cconv-make-interpreted-closure):
+	Avoid recursive invocations.
+
+2025-12-15  João Távora  <joaotavora@gmail.com>
+
+	Eglot: improve pull diagnostics support
+
+	* lisp/progmodes/eglot.el (eglot--diagnostics): Move up here.
+	(eglot--managed-mode): Use eglot--flymake-push.
+	(eglot-handle-notification): Simplify.
+	(eglot-flymake-backend): Simplify.
+	(eglot--flymake-pull): Rewrite.
+	(eglot--flymake-push): Tweak.
+
+	* etc/EGLOT-NEWS: Improve slightly.
+
+2025-12-15  Michael Albinus  <michael.albinus@gmx.de>
+
+	Finish process error buffer support in tramp-smb.el
+
+	* doc/misc/tramp.texi (Remote processes): Provide more details in
+	"Running remote processes on MS Windows hosts".
+
+	* lisp/net/tramp-smb.el (tramp-smb-handle-make-process):
+	Suppress lock files.
+
+	* test/lisp/net/tramp-tests.el (auto-revert-notify-watch-descriptor)
+	(auto-revert-remote-files, auto-revert-use-notify): Declare.  Set
+	proper values.
+	(tramp-test30-make-process): Adapt test.
+
+2025-12-15  Juri Linkov  <juri@linkov.net>
+
+	* lisp/vc/vc.el (vc-diff-internal): Reuse the buffer object (bug#80005).
+
+	Instead of delaying hooks, set the variable 'buffer' to the buffer object
+	returned by 'get-buffer-create'.  This allows renaming the diff buffer
+	via 'diff-mode-hook'.
+
+2025-12-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	make-docfile preferring streq
+
+	* lib-src/make-docfile.c (main, add_global, compare_globals):
+	Prefer streq to strcmp where either will do.
+
+2025-12-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Support nested parens in make-docfile args
+
+	* lib-src/make-docfile.c (scan_c_stream): Allow nested parens.
+	E.g., ‘(Lisp_Object XXX (force))’ for the identifier ‘force’,
+	where XXX is a macro.  This is for future changes.
+
+2025-12-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix make-docfile strncmp typo
+
+	* lib-src/make-docfile.c (write_c_args):
+	Don’t mishandle the identifiers ‘v’, ‘vo’, and ‘voi’.
+
+2025-12-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Improve make-docfile.c for C23
+
+	* lib-src/make-docfile.c (write_c_args): Don’t diagnose “()”.
+	In C23 it’s equivalent to (void), and it works fine (albeit with
+	less type-checking) in older C.  Omit first arg, which is no
+	longer needed.  Caller changed.
+
+2025-12-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix some make-docfile core dumps
+
+	This bit me when I ran ‘make’ with typos in the Emacs source.
+	* lib-src/make-docfile.c (struct rcsoc_state.buf_lim):
+	New member.
+	(read_c_string_or_comment): Initialize it.
+	(put_char, scan_c_stream): Check for buffer overflow.
+	(scan_c_stream): Output a diagnostic rather than aborting
+	when the buffer overflows.
+
+2025-12-14  João Távora  <joaotavora@gmail.com>
+
+	Eglot: half-decent pull diagnostics support
+
+	Implement basic LSP 3.17 pull diagnostics ('textDocument/diagnostic').
+	Only diagnostics for the current document are requested.  This is
+	chiefly because virtually no server has been found to support the
+	'relatedDocumentSupport' sub-capability which would allow to test this.
+
+	* etc/EGLOT-NEWS: Announce pull diagnostics support.
+
+	* lisp/progmodes/eglot.el (eglot-client-capabilities): Announce
+	:diagnostic capability.
+	(eglot--flymake-diag-type): New function.
+	(eglot--flymake-make-diag): New function.
+	(eglot--flymake-push-report-fn): Rename from
+	eglot--current-flymake-report-fn.
+	(eglot-flymake-backend): Check for :diagnosticProvider and dispatch
+	to pull or push path.
+	(eglot--flymake-pull): New function.
+	(eglot--flymake-push): Rename from eglot--report-to-flymake.
+	(eglot-handle-notification textDocument/publishDiagnostics): Use
+	eglot--flymake-make-diag helper.
+	(eglot-ignored-server-capabilities): Add diagnosticProvider
+
+2025-12-14  Christoph Wedler  <christoph.wedler@sap.com>
+
+	Add NEWS and auto-load entry for antlr-mode
+
+	* etc/NEWS (Antlr mode): Mention major changes.
+	* lisp/files.el (auto-mode-alist): Add 'antlr-v4-mode' for extension "g4".
+
+2025-12-14  Michael Albinus  <michael.albinus@gmx.de>
+
+	Implement process error buffer in tramp-smb.el
+
+	* lisp/net/tramp-smb.el (tramp-smb-handle-make-process):
+	Handle error buffer.
+
+	* test/lisp/net/tramp-tests.el (tramp-test30-make-process): Adapt test.
+
+2025-12-14  Philip Kaludercic  <philipk@posteo.net>
+
+	Load 'byte-recompile-file' to process User Lisp directory
+
+	* lisp/startup.el (byte-recompile-file): Declare 'byte-recompile-file'.
+	(prepare-user-lisp): Load bytecomp if necessary.  (Bug#79997)
+
+2025-12-14  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc.el (vc-diff-internal): Use delay-mode-hooks.
+
+2025-12-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a bug in 'kill-visual-line' that caused it signal an error
+
+	* lisp/simple.el (kill-visual-line): Don't assume 'posn-at-point'
+	always returns a non-nil value.  (Bug#80004)
+
+2025-12-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Use GCC warning -Wunused-const-variable=2
+
+	* configure.ac: Stop suppresssing -Wunused-const-variable=2 when
+	configured --with-gcc-warnings.  Suppressing no longer seems to be
+	needed with current GCC and src/lisp.h.
+
+2025-12-14  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project-files: Add the 'else' case to the previous change
+
+	* lisp/progmodes/project.el (project-files): Add the 'else' case
+	to the previous change (for DIRS outside of project root).
+
+2025-12-14  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Make project--vc-list-files extensible
+
+	* lisp/progmodes/project.el (project--vc-list-files):
+	Call backend function 'project-list-files'.
+	(project-files): Catch 'vc-not-supported' and default to
+	'project--files-in-directory' using the current project.
+	(vc-git-project-list-files, vc-hg-project-list-files):
+	New functions, extracted from 'project--vc-list-files'.
+	(https://lists.gnu.org/archive/html/emacs-devel/2025-12/msg00290.html)
+
+2025-12-14  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Relax the condition on the values of DIRS in project-files
+
+	* lisp/progmodes/project.el (project-files):
+	Use 'file-in-directory-p' to dispatch to 'project--vc-list-files'
+	when listing subdirectory files too (bug#79809).
+
+2025-12-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	Mention tramp-hlo in Tramp's documentation
+
+	* doc/misc/tramp.texi (Frequently Asked Questions)
+	(New operations): Mention tramp-hlo, again.
+
+2025-12-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	Implement process STDERR file in tramp-smb.el
+
+	* lisp/net/tramp-smb.el (tramp-smb-handle-make-process)
+	(tramp-smb-handle-process-file): Handle STDERR file.
+	(tramp-smb-call-winexe): Regroup sent commands.
+
+	* test/lisp/net/tramp-tests.el (tramp-test28-process-file)
+	(tramp-test30-make-process): Adapt tests.
+
+2025-12-13  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-diff-internal: Call into backend after setting up the major mode
+
+	This means the backend can, for example, enable a minor mode,
+	without our changing the major mode immediately wiping that out.
+
+	* lisp/vc/vc.el (vc-diff-internal): Set up the major mode before
+	calling into the backend.
+
+2025-12-13  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git-dir-status-goto-stage: Accept exit 128 from git-add
+
+	* lisp/vc/vc-git.el (vc-git-dir-status-goto-stage): Accept an
+	exit code of 128 from 'git add --refresh' (bug#79999).
+
+2025-12-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	948c4f7f64f ; * admin/authors.el (authors-aliases): Add Rudolf Adamko...
+
+2025-12-13  Daniel Semyonov  <daniel@dsemy.com>
+
+	nnatom: Fix parsing of empty articles
+
+	* lisp/gnus/nnatom.el (nnatom--read-parts): Fix typo (bug#77539).
+
+2025-12-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2025-12-12  Roi Martin  <jroi.martin@gmail.com>
+
+	Fix interactive call to 'prepare-user-lisp'
+
+	When called interactively with a prefix argument,
+	'prepare-user-lisp' throws a "Wrong type argument: stringp, (4)"
+	error.  This happens because the list passed to the interactive
+	specification is missing one argument and 'current-prefix-arg'
+	is assigned to AUTOLOAD-FILE instead of FORCE.
+
+	* lisp/startup.el (prepare-user-lisp): Fix list passed to
+	'interactive'.  (Bug#79996)
+
+2025-12-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Editorconfig: Merge a few more changes from upstream
+
+	* lisp/editorconfig-core.el: Fix up leading comment.
+	(editorconfig-core-get-properties-hash): Remove unused `confversion` arg.
+
+	* lisp/editorconfig-fnmatch.el (editorconfig-fnmatch--cache-hashtable):
+	Use `defconst`.
+	(editorconfig-fnmatch--do-translate): Don't escape `,` or `-` in regexps.
+
+	* lisp/editorconfig.el (editorconfig-indentation-alist):
+	Remove redundant entries for `ess-mode` and `terra-mode`.
+
+2025-12-12  lolbinarycat  <dogedoge61+github@gmail.com>
+
+	editorconfig-fnmatch: fix ** globs (#374)
+
+	Cherypick of upstream commit 4af10445fcdf1c9dfa7af4f9e5bec59e8a759d6f
+
+2025-12-12  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* lisp/cus-start.el: Better unbound variable filter.
+
+	Remove (almost) all regexp matching and the need for saving match data.
+	Signal an error for unbound variables instead of a timid message,
+	so that it's certain to be noticed.
+
+2025-12-12  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* lisp/cus-start.el: Clean up.
+
+	Avoid computing things unless needed.  Use a slightly more modern elisp
+	style with fewer variable assignments.
+
+2025-12-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix :type in `antlr-tool-command'
+
+	* lisp/progmodes/antlr-mode.el (antlr-tool-command): Give it a
+	proper :type.
+
+2025-12-12  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Warn about uses of the 'any' atom in rx
+
+	'any' is a holdover from the ancient 'sregex' package where it meant
+	'not-newline', but is easily mistaken for 'anychar'.
+
+	* lisp/emacs-lisp/rx.el (rx--translate-symbol): Warn about 'any'.
+	* test/lisp/emacs-lisp/rx-tests.el (rx-atoms): Suppress warning here.
+	* etc/NEWS: Explain.
+
+2025-12-12  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Don't use rx 'any' to mean 'not-newline'
+
+	* lisp/emacs-lisp/package-vc.el (package-vc--unpack-1):
+	* lisp/pcmpl-rpm.el (pcomplete/dnf):
+	* test/lisp/emacs-lisp/package-vc-tests.el (log-incoming):
+	Use 'anychar' instead of 'any', since that's probably what was meant.
+
+2025-12-12  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* doc/lispref/strings.texi (Formatting Strings): Cut obsolete text.
+
+	Since we got bignums the output is platform-independent.
+
+2025-12-12  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* doc/lispref/eval.texi (Backquote): Clarify and simplify.
+
+	The previous phrasing could be read as if backquote expansion were
+	mutable if containing substitions, but that is simply not true;
+	they should always be treated as non-mutable.
+
+2025-12-11  Philip Kaludercic  <philipk@posteo.net>
+
+	Handle remaining usages of 'package-vc-install-from-checkout'
+
+	* doc/emacs/package.texi (Fetching Package Sources): Remove
+	mention of `package-vc-install-from-checkout'.
+	* doc/misc/use-package.texi (Install package): Remove mention of
+	:vc in combination with :load-path.
+	* lisp/use-package/use-package-core.el (use-package-vc-install):
+	Suppress compile-time warning and generate warning during
+	evaluation instead.
+	* test/lisp/emacs-lisp/package-vc-tests.el
+	(package-vc-tests-checkout-from-elpa-install-from-checkout)
+	(package-vc-tests-checkout-with-git-install-from-checkout):
+	Suppress obsoletion warning.
+
+2025-12-11  Philip Kaludercic  <philipk@posteo.net>
+
+	Simplify 'comint-write-input-ring'
+
+	* lisp/comint.el (comint-write-input-ring): Use
+	'with-temp-buffer', 'decf' and write the buffer contents without
+	'buffer-string'.  (bug#79954)
+
+2025-12-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Merge branch 'antlr-mode'
+
+2025-12-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	antlr-mode.el: Cosmetics, mostly to silence compiler warnings
+
+	* lisp/progmodes/antlr-mode.el: Prefer #' to quote function names.
+	Fix a few incorrect ' in docstring markup.
+	(antlr-font-lock-checked-face): Don't use obsolete
+	`font-lock-warning-face` variable.
+	(antlr-do-syntax-propertize): Use `emacs-major-version`.
+	(antlr-set-tool-version-and-mode-line): Don't set
+	`indent-region-function` to a non-function value.
+	(antlr-mode): Remove call to obsolete `easy-menu-add`.
+	(antlr-delphi-indent-action-line, antlr-ruby-indent-action-line):
+	Avoid obsolete functions `point-at-[be]ol`.
+	(antlr-python-indent-action-line): Make sure `syntax-ppss-*` vars are
+	bound dynamically rather than statically.
+
+2025-12-10  Juri Linkov  <juri@linkov.net>
+
+	Evaluate result on first call to throttled func in timeout.el
+
+	* lisp/emacs-lisp/timeout.el (timeout--throttle-advice)
+	(timeout-throttled-func): Replace 'prog1' with 'progn'
+	to return the evaluated value of 'result' (bug#79979).
+	This will capture the correct return value the first time
+	a throttled function is called.  Previously, it would return nil
+	on the very first call.
+	(timeout-debounce, timeout-throttle, timeout-throttled-func)
+	(timeout-debounced-func): Add the autoload cookie.
+
+2025-12-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/emacs-lisp/byte-opt.el (byte-optimize-memq): Beware improper lists
+
+2025-12-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Work even if aclocal is invoked by hand
+
+	Problem reported by Ulrich Müller (bug#79974).
+	* configure.ac (gl_ALIGNASOF): Arrange for it to be defined
+	even if aclocal is invoked other than via admin/merge-gnulib.
+	Also, change comments from # to dnl as they don’t make
+	much sense in the shell script.
+
+2025-12-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Remove no-longer needed MALLOC_0_IS_NONNULL macro.
+
+	* src/conf_post.h (MALLOC_0_IS_NONNULL): Remove.
+	Gnulib no longer needs this.
+
+2025-12-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Garbage-collect Gnulib sources
+
+	Remove Gnulib sources no longer needed or used.
+	admin/merge-gnulib is typically not smart enough to do that.
+	* configure.ac: Do not call gl_EEMALLOC, as it is no longer
+	supplied or needed.
+	* lib/explicit_bzero.c, lib/malloc/scratch_buffer_dupfree.c:
+	* lib/xalloc-oversized.h, m4/eealloc.m4, m4/explicit_bzero.m4:
+	* m4/st_dm_mode.m4, m4/year2038.m4:
+	Remove.
+
+2025-12-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Display done message for async checkins too
+
+	* lisp/vc/vc.el (vc-checkin): When an async checkin completes,
+	display the same "Checking in...done" message.
+
+2025-12-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Make C-g skip counting outgoing revisions for VC-Dir
+
+	* lisp/vc/vc-dir.el (vc-dir--count-outgoing): New function,
+	factored out.
+	(vc-dir-headers): Use it.
+
+2025-12-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port back to GTK2
+
+	Problem reported by Sven Joachim in:
+	https://lists.gnu.org/r/emacs-devel/2025-12/msg00225.html
+	* src/xterm.c (xi_frame_selected_for):
+	Also define if !(defined USE_GTK && defined HAVE_GTK3).
+
+2025-12-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	prepare-user-lisp: Fix adding to load-path
+
+	* lisp/startup.el (prepare-user-lisp): Use directory-file-name
+	when adding to load-path, as documented for the latter.
+
+2025-12-09  Przemysław Kryger  <pkryger@gmail.com>
+
+	Update email and rename packages and buffers in package-vc-tests
+
+	* test/lisp/emacs-lisp/package-vc-tests.el
+	(package-vc-tests-packages): Rename test packages to avoid
+	suffix being treated as a version number by
+	`package--description-file'.
+	(package-vc-tests-add): Ensure suffix capitalisation remains as
+	original when calling `replace-regexp-in-string'.
+	(package-vc-tests-create-repository): Fix typo in temporary
+	email and use a reserved TLD.
+	(package-vc-tests-environment-tear-down): Rename preserved
+	buffers to avoid conflicts between tests.
+
+2025-12-09  Przemysław Kryger  <pkryger@gmail.com>
+
+	Update email in vc-tests and vc-git-tests
+
+	* test/lisp/vc/vc-git-tests.el (vc-git-test--with-repo): Use
+	example.com, domain following RFC 2606.
+	* test/lisp/vc/vc-tests/vc-tests.el
+	(vc-test--with-author-identity): Use example.com, domain
+	following RFC 2606.
+
+2025-12-09  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Don't make a tty child frame visible by selecting it (bug#79960)
+
+	* lisp/xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal):
+	Use the tty-top-frame to avoid accidentally making an invisible
+	child frame visible by selecting it
+
+2025-12-09  Przemysław Kryger  <pkryger@gmail.com>
+
+	Add `lexical-binding' cookie to generated files by package-vc
+
+	* lisp/emacs-lisp/package-vc.el
+	(package-vc--generate-description-file, package-vc--unpack-1):
+	Add `lexical-binding:t' cookie.
+
+2025-12-09  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/hideshow.el (hs-minor-mode): Show/hide margins.
+
+	Increment 'left-margin-width' when 'hs-indicator-type' is 'margin',
+	and decrement it on disabling 'hs-minor-mode'.
+
+2025-12-09  Christoph Wedler  <christoph.wedler@sap.com>
+
+	Update progmodes/antlr-mode.el from v2.2c to v3.2.0
+
+	For the ChangeLog with timeline,
+	see https://sourceforge.net/projects/antlr-mode/files/
+
+	The following is the ChangeLog between v2.2c to v3.2.0
+	without (intermediate) version numbers and changes already in the Emacs
+	repository.
+
+	* lisp/progmodes/antlr-mode.el: Command `antlr-run-tool' now runs
+	on the file for the current buffer by default.
+	(antlr-run-tool-on-buffer-file): New user option.
+	(antlr-run-tool-interactive): Use it.
+
+	* lisp/progmodes/antlr-mode.el: Allow `antlr-tool-version' and
+	`antlr-language' be set in the Local Variables section of a file.
+	(antlr-hack-local-variables-hook): New function.
+	(antlr-set-tool-version-and-mode-line): Adapt
+	(antlr-delayed-mode-hook): Renamed from `antlr-after-body-hook'.
+	(antlr-font-lock-keywords): Correctly call `font-lock-value-in-major-mode'.
+
+	* lisp/progmodes/antlr-mode.el: Miscellaneous corrections and
+	other changes.
+	(antlr-insert-keyword-rule): Make it work in v2 and v4, too.
+	(antlr-indent-line): Correctly calculate beginning of action.
+	(antlr-grammar-header-regexp): Has a value which is valid for v3 and v4.
+	(antlr-v4-grammar-header-regexp, antlr-v3-grammar-header-regexp):
+	Delete.
+	(antlr-tool-version-variables): tool-dependent variable for
+	`antlr-grammar-header-regexp`' is optional.
+	(antlr-upcase-p): Delete XEmacs bug workaround.
+
+	* lisp/progmodes/antlr-mode.el: Enhance options, add v4 language "Cpp".
+	(antlr-v4-language-list): Add "Cpp".
+	(antlr-v4-options-alists, antlr-v3-options-alists)
+	(antlr-v2-options-alists):  Do not hard-code languages.
+	(antlr-read-language): New function used instead.
+	(antlr-v4-options-alists): Add grammar option "contextSuperClass"
+	and Cpp-only "exportMacro".
+	(antlr-insert-option-do): Call the "right" antlr-mode for v4 grammars.
+	(antlr-option-spec): Delete function.
+	(antlr-insert-option-do): Do not use it.
+
+	* lisp/progmodes/antlr-mode.el: Correct command `antlr-insert-options'.
+	(antlr-try-rule-or-grammar-option): New function.
+	(antlr-option-level): Use it, correcting v3 and v4 behavior.
+	(antlr-v2-options-alists): Correct "language" option.
+	(antlr-syntactic-grammar-depth): Correct calculation
+	(antlr-options-style): Make it really obsolete.
+	(antlr-read-value): Do not use it.
+
+	* lisp/progmodes/antlr-mode.el: Disable command
+	`antlr-show-makefile-rules' for ANTLR v3 and v4, these have
+	"-depend" to show Makefile deps.
+	(antlr-show-makefile-rules): User error when used with v3 or v4.
+
+	* lisp/progmodes/antlr-mode.el: Adapt command `antlr-run-tool' to
+	ANTLR v3 and v4, do not calculate v2 option "-glib" for file
+	dependencies.
+	(antlr-tool-command): Make it tool-version dependent
+	(antlr-v4-tool-command, antlr-v3-tool-command)
+	(antlr-v2-tool-command): New user option.
+	(antlr-run-tool-interactive): Only add "-glib" option with v2.
+	(antlr-directory-dependencies): Only calculate deps with v2.
+	(antlr-compilation-error-regexp-alist)
+	(antlr-v4-compilation-error-regexp-alist): New variable.
+	(antlr-tool-version-variables, antlr-run-tool): Use it.
+
+	* lisp/progmodes/antlr-mode.el: Cleanup, miscellaneous.  Replace
+	`match-string' by `match-string-no-properties' (see vc history).
+	(antlr-grammar-file): New function.
+	(antlr-insert-keyword-rule): New command.
+	(antlr-mode-map): Use it.
+	(antlr-font-lock-late-keywords): Correct face name.
+
+	* lisp/progmodes/antlr-mode.el: Allow to write a derived mode for
+	grammars - like for PEG.js - whose rule header and body is
+	separated by an operator other than ":" and other similar
+	deviations.  Also prepare for messages without file name in
+	"*compilation*" buffer.
+	(antlr-rule-body-start-op): New variable.
+	(antlr-end-of-body, antlr-indent-line): Use it.
+	(antlr-grammar-file): New variable.
+	(antlr-run-tool): Set it local in *compilation*" to FILE.
+	(antlr-font-lock-attribute-regexp, antlr-ruleref-assign-regexp):
+	(antlr-v2-ruleref-assign-regexp, antlr-font-lock-negation-regexp):
+	(antlr-font-lock-syntax-spec): New variables.
+	(antlr-font-lock-additional-keywords):
+	(antlr-font-lock-late-keywords): Use them here.
+	(antlr-tool-version-variables): Add `antlr-ruleref-assign-regexp'.
+
+	* lisp/progmodes/antlr-mode.el: Adaptation to Emacs-25.1, cleanup.
+	(antlr-insert-makefile-rules): Set variable properly.
+	(antlr-syntax-propertize-template-literals): Using << inside an
+	unclosed code block could lead to error during font-locking.
+	(antlr-slow-cache-enabling-symbol): Delete variable.
+
+	* lisp/progmodes/antlr-mode.el: Adopt change below and other
+	changes in the Emacs repository to current antlr-mode version.
+
+	* lisp/progmodes/antlr-mode.el: Use syntax-ppss.  Check "are we in
+	the grammar or action code?" does not use extra action
+	syntax-table anymore, but 9th element of syntax-ppss /
+	parse-partial-sexp, whose value is "subject to change" but has not
+	changed since decades.
+	(antlr-action-syntax-table): Delete variable.
+	(antlr-font-lock-defaults): Do not give parentheses symbol syntax.
+	(antlr-slow-context-cache): Delete variable.
+	(antlr-invalidate-context-cache): Delete function.
+	(antlr-syntactic-context): Use syntax-ppss, new optional arg PPSS.
+	Now returns nil instead 0 if in normal grammar code.
+	(antlr-syntax-propertize-template-literals, antlr-re-search-forward)
+	(antlr-search-result, antlr-syntax-propertize-charsets)
+	(antlr-electric-character): Simplify.
+	(antlr-do-syntax-propertize): New variable.
+
+	* lisp/progmodes/antlr-mode.el: Code is not run under extra syntax
+	table anymore.
+	(antlr-syntax-propertize-wholerule, antlr-indent-at-bol-alist)
+	(antlr-v4-grammar-header-regexp, antlr-v3-grammar-header-regexp)
+	(antlr-v2-grammar-header-regexp, antlr-rule-postlude-skip-regexp)
+	(antlr-skip-file-prelude, antlr-font-lock-additional-keywords)
+	(antlr-imenu-create-index-function, antlr-inside-rule-p)
+	(antlr-end-of-rule, antlr-beginning-of-rule antlr-end-of-body)
+	(antlr-hide-actions, antlr-insert-option, antlr-option-level)
+	(antlr-downcase-literals, antlr-file-dependencies)
+	(antlr-guess-tool-version, antlr-indent-line):
+	Do not call deleted function, do not use deleted variables, use
+	regexp \\_> instead \\>., use both \\s_ and \\sw.
+
+	* lisp/progmodes/antlr-mode.el: Minor changes.
+	(antlr-action-face, antlr-symbol-face): New face.
+	(antlr-token-identifier-p): New variable.
+	(antlr-font-lock-late-keywords): Use it, use
+	antlr-grammar-header-regexp, use new faces.
+	(antlr-syntax-propertize-charsets): Ignore @actionscope::name when
+	searching for lexer rules.
+	(antlr-syntax-propertize-template-literals): Change handling if
+	the template literal does not end before eob.
+	(antlr-font-lock-keywords): Use font-lock-eval-keywords.
+	(antlr-rule-postlude-skip-regexp): Allow scope name to begin with
+	underscore.
+
+	* lisp/progmodes/antlr-mode.el: Make antlr-mode more modular -
+	allow to add new target languages without changing existing code.
+	(antlr-language-variables, antlr-language-mode-name)
+	(antlr-java-language-mode-name, antlr-action-mode)
+	(antlr-java-action-mode, antlr-init-cc-mode)
+	(antlr-java-init-cc-mode, antlr-init-submode)
+	(antlr-indent-action-line, antlr-action-font-lock-keywords)
+	(antlr-java-action-font-lock-keywords, antlr-action-scope-names)
+	(antlr-action-names, antlr-java-action-names): New variables.
+	(antlr-c-language-mode-name, antlr-cpp-language-mode-name)
+	(antlr-objc-language-mode-name, antlr-c-action-mode)
+	(antlr-cpp-action-mode, antlr-objc-action-mode)
+	(antlr-c-init-cc-mode, antlr-cpp-init-cc-mode)
+	(antlr-obj-init-cc-mode, antlr-cpp-action-font-lock-keywords)
+	(antlr-c-action-font-lock-keywords)
+	(antlr-objc-action-font-lock-keywords)
+	(antlr-js-language-mode-name, antlr-js-action-mode)
+	(antlr-js-init-submode, antlr-js-action-font-lock-keywords)
+	(antlr-js-indent-action-line, antlr-delphi-language-mode-name)
+	(antlr-delphi-action-mode, antlr-delphi-init-submode)
+	(antlr-delphi-action-font-lock-keywords)
+	(antlr-delphi-indent-action-line, antlr-ruby-language-mode-name)
+	(antlr-ruby-action-mode, antlr-ruby-init-submode)
+	(antlr-ruby-action-font-lock-keywords)
+	(antlr-ruby-indent-action-line, antlr-python-language-mode-name)
+	(antlr-python-action-mode, antlr-python-action-font-lock-keywords)
+	(antlr-python-indent-action-line, antlr-python-init-submode): New
+	variables.
+	(antlr-init-js, antlr-js-indent-action-line, antlr-init-delphi)
+	(antlr-delphi-indent-action-line, antlr-init-ruby)
+	(antlr-ruby-indent-action-line, antlr-init-python)
+	(antlr-python-indent-action-line): New functions.
+	(antlr-font-lock-keywords-alist): Remove variable.
+	(antlr-guess-language): Rename from anlr-language-option, use
+	antlr-language-list, use cl function.
+
+	* lisp/progmodes/antlr-mode.el: Make antlr-mode more modular -
+	allow to add new ANTLR versions/flavors without changing existing
+	code.
+	(antlr-tool-version): Is a symbol now, default to nil = automatic.
+	For backward compatibility, numbers between 20000 and 29999 are
+	set to antlr-v2 in antlr-set-tool-version-and-mode-line.  This
+	variable should not be customized anymore - change :type spec.
+	(antlr-tool-version-variables, antlr-tool-mode-name)
+	(antlr-v4-tool-mode-name, antlr-v3-tool-mode-name)
+	(antlr-v2-tool-mode-name, antlr-language-list)
+	(antlr-v4-language-list, antlr-v3-language-list)
+	(antlr-v2-language-list, antlr-syntax-propertize)
+	(antlr-v4-syntax-propertize, antlr-v3-syntax-propertize)
+	(antlr-v2-syntax-propertize, antlr-v2-options-alist)
+	(antlr-v4-skip-line-regexp, antlr-v3-skip-line-regexp)
+	(antlr-font-lock-symbol-regexp)
+	(antlr-v4-font-lock-symbol-regexp)
+	(antlr-v3-font-lock-symbol-regexp)
+	(antlr-v4-grammar-header-regexp, antlr-v3-grammar-header-regexp)
+	New variables.
+	(antlr-options-alist): Make it tool-dependent.  Remove sub-version
+	specific settings for ANTLR v2.  Remove function.
+	(antlr-v2-grammar-header-regexp): Rename from
+	antlr-class-header-regexp.
+	(antlr-grammar-header-regexp): Make it tool-version dependent.
+	(antlr-mode-menu, antlr-insert-option-interactive)
+	(antlr-options-menu-filter, antlr-option-level)
+	(antlr-insert-option-do): Use tool specific variable.
+	(antlr-option-spec): ...and do not support sub versions.
+	(antlr-guess-tool-version): Rename from antlr-tool-version.
+	(antlr-set-local-variables): New function
+	(antlr-set-tool-version-and-mode-line): Use them.
+
+	* lisp/progmodes/antlr-mode.el: Remove XEmacs and old Emacs
+	compatibility code.
+	(require): require cl-lib instead cl at compile time.
+	(antlr-run-tool-interactive, antlr-insert-makefile-rules)
+	(antlr-set-tabs, antlr-next-rule, antlr-downcase-literals)
+	(antlr-file-dependencies): Use cl- prefix for cXXXr, cXXXXr, incf,
+	decf, list*.
+	(cond-emacs-xemacs, cond-emacs-xemacs-macfn, defunx)
+	(ignore-errors-x, save-buffer-state-x): Delete functions/macros.
+	(antlr-skip-sexps, antlr-hide-actions, antlr-option-kind): Adopt.
+	(antlr-mode-menu): Do not test for Emacs below 21.0.
+	(antlr-with-syntax-table): Delete, use with-syntax-table instead.
+	(antlr-imenu-create-index-function, antlr-inside-rule-p)
+	(antlr-end-of-rule, antlr-beginning-of-rule, antlr-end-of-body)
+	(antlr-downcase-literals, antlr-hide-actions)
+	(antlr-option-level, antlr-file-dependencies, antlr-indent-line)
+	(antlr-electric-character, antlr-tool-version): Adopt.
+	(antlr-default-directory): Delete function.  Actually XEmacs'
+	default-directory as a function is quite useful...
+	(antlr-run-tool-interactive, antlr-insert-makefile-rules): Adopt.
+	(antlr-read-shell-command): Delete, use read-shell-command.
+	(antlr-run-tool-interactive): Adopt.
+	(antlr-with-displaying-help-buffer): Delete.
+	(antlr-show-makefile-rules): Use with-output-to-temp-buffer.
+	(antlr-invalidate-context-cache)
+	(antlr-syntactic-context):  Remove XEmacs code.
+	(antlr-end-of-rule, antlr-beginning-of-rule, antlr-end-of-body)
+	(antlr-beginning-of-body): use interactive "^" for "_" in XEmacs.
+	(antlr-mode): Do not consider cc-mode below 5.30.
+
+	* lisp/progmodes/antlr-mode.el: Scope references inside a v3 rule and import
+	statements in a v4 grammar do not confuse the navigation anymore.
+	(antlr-skip-line-regexp): New variable, contains regexp for v3
+	"scope" / v4 "import" up to the semicolon.
+	(antlr-set-tool-version-and-mode-line): Set it.
+	(antlr-search-result): New function.
+	(antlr-search-forward, antlr-search-backward): Use it.  Add extra
+	regexp parameter for occurrences which should be skipped.
+	(antlr-imenu-create-index-function, antlr-next-rule)
+	(antlr-beginning-of-rule, antlr-indent-line): Provide
+	`antlr-skip-line-regexp' when searching for ";".
+	(antlr-rule-postlude-skip-alist): Make it a `defconst',
+	re-compilation would use previous value.  Add "import".
+	(antlr-skip-rule-postlude): Allow function as SKIP.
+	(antlr-skip-import-statement): New function for postlude skip.
+
+	* lisp/progmodes/antlr-mode.el: Correctly recognize ANTLR v4 lexer charsets,
+	[...], and v3 templates, <<...>>, as literals.
+	(antlr-syntax-propertize-wholerule)
+	(antlr-syntax-propertize-charsets)
+	(antlr-syntax-propertize-template-literals): New function
+	(antlr-set-tool-version-and-mode-line): Use them.
+	(antlr-imenu-create-index-function): Call `syntax-propertize'.
+
+	* lisp/progmodes/antlr-mode.el (antlr-end-of-defun-is-next): New
+	option.  If non-nil, both `antlr-end-of-rule' and
+	`antlr-end-of-rule' jump to beginning of a rule with no or
+	positive prefix arg, and to the end of a rule with negative prefix
+	arg.  Default nil means: `antlr-end-of-rule' jumps to beginning of
+	a rule, `antlr-end-of-rule' jumps to end of a rule.
+	(antlr-end-of-rule): Use it.
+	(antlr-beginning-of-rule): Use it
+
+	* lisp/progmodes/antlr-mode.el: Options support for ANTLR v3 and v4.
+	(antlr-v3-options-alists): Correct prompts.
+	(antlr-v4-options-alists): New variable.
+	(antlr-options-alists): Use it.
+	(antlr-read-boolean): Use `y-or-n-p' without TABLE.
+	(antlr-mode-menu): Do not include empty option menus.
+	(antlr-option-level): Consider non-existent file/subrule options.
+	Correctly recognize v3/v4 grammar definitions.
+
+	* lisp/progmodes/antlr-mode.el: Imenu and syntax-highlighting corrections.
+	(antlr-font-lock-late-keywords): Correct syntax-highlighting of
+	rule definitions with modifiers in same line.
+	(antlr-grammar-header-regexp): New regexp for v3 and v4.
+	(antlr-class-header-regexp): New function.
+	(antlr-imenu-create-index-function): Also collect v4 scanner
+	modes. Correctly scan fragment rules.
+
+	* lisp/progmodes/antlr-mode.el: Correctly skip the part of the
+	rule which comes after the semicolon.  To simplify things)
+	(consider v2 class preamble actions as belonging to the previous
+	definition.
+	(antlr-skip-file-prelude): Skip final ACTION.
+	(antlr-rule-postlude-skip-alist)
+	(antlr-rule-postlude-skip-regexp): New variables.
+	(antlr-skip-rule-postlude): Use them.  Rename from
+	`antlr-skip-exception-part'.
+	(antlr-beginning-of-body): Tool version-dependent error message.
+	(antlr-options-alists): Consider v4 options.
+
+	* lisp/progmodes/antlr-mode.el (antlr-indent-line): For
+	indentation cycling in Python, do not require a patched python.el
+	anymore, but prog-mode.el and python.el from Emacs-24.5.  Do not
+	touch multi-line python actions which do not start in its own line
+	- they are a bad idea anyway.
+
+	* lisp/progmodes/antlr-mode.el: Experimental indentation cycling
+	for Python actions.  Requires a patched python.el.  Note: this
+	patch is just a first proposal by me - things will change.
+	(antlr-indent-line): Bind `python-submode-indentation-context'
+	while calling `python-indent-line'.
+
+	* lisp/progmodes/antlr-mode.el: Use much less intrusive face
+	settings, some minor font-lock changes.
+	(antlr-syntax): Just inherit from `font-lock-keyword-face', face
+	is now only used for AST-relevant operators (!, ^, ->), not
+	parentheses, colons etc anymore - see below.
+	(antlr-keyword): Just inherit from `font-lock-keyword-face'.
+	(antlr-ruledef): Just inherit from `font-lock-function-name-face'.
+	(antlr-tokendef): Just inherit from `font-lock-function-name-face'.
+	(antlr-ruleref): Just inherit from `font-lock-type-face'.
+	(antlr-tokenref): Just inherit from `font-lock-constant-face'.
+	(antlr-attribute): Just inherit from `font-lock-preprocessor-face'.
+	(antlr-literal): Just inherit from `font-lock-string-face' and
+	specify :weight bold.
+	(antlr-grammardef-face): Delete variable introduced in v3.0.2.
+	(antlr-grammardef): Delete face, use `font-lock-type-face'.
+	(antlr-font-lock-late-keywords): Change according to semantic
+	change of `antlr-syntax', properly highlight scope definitions.
+	(antlr-font-lock-additional-keywords): Change highlighting
+	according to ANTLR change concerning grammar element labels, ANTLR
+	v3/v4 only.  Use `font-lock-negation-char-face' for ~, single dot.
+
+	* lisp/progmodes/antlr-mode.el: Be more robust / fix bug
+	introduced with v3.0.5 - class definitions in ANTLR v2 grammars
+	would look strange, makefile dependencies would not work even with
+	ANTLR v2 grammars.
+	(antlr-class-header-regexp): Revert accidentally change in regexp.
+	(antlr-insert-makefile-rules): Be more robust against incomplete
+	grammar files, i.e. those without any extracted dependency.
+
+	* lisp/progmodes/antlr-mode.el: Indentation for non-cc-based languages:
+	JavaScript, Delphi, Ruby - Python actions are left as they are.
+	(antlr-indent-line): For a line starting with the closing brace of
+	bracket of an action / parameter section, use our own indentation
+	engine, not that of the grammar language.
+	(antlr-indent-line): Run indentation functions of `js-mode',
+	`opascal-mode' and `ruby-mode' with buffer restriction starts
+	after the opening brace/bracket.
+	(antlr-indent-command): Preparation for future support for
+	indentation cycling used by Python - do not insert a TAB with
+	repeated call of this command.
+	(antlr-set-tool-version-and-mode-line): Locally set indentation
+	offsets/levels of grammar language according to offset used in the
+	ANTLR grammar.
+
+	* lisp/progmodes/antlr-mode.el: Correct indentation of rule headers.
+	(antlr-indent-line): When looking for the end of a rule header, do
+	not stop at colon if that is followed by another one, because this
+	the scope name of a preceeding grammar action.
+
+	* lisp/progmodes/antlr-mode.el: Support more action languages.
+	(antlr-language-alist): Add entries for C, Delphi, JavaScript,
+	ObjC, Python and Ruby, additional to Java and Cpp.
+	(antlr-language-limit-n-regexp): Allow language name to contain
+	digits.
+	(antlr-font-lock-keywords-alist): Add font-lock specifications for
+	the newly supported languages.
+	(antlr-set-tool-version-and-mode-line): Handle non-cc-based
+	languages, currently hard-coded.
+
+	* lisp/progmodes/antlr-mode.el: Preparation for non-cc-mode-based
+	indentation.
+	(antlr-indent-line): With non-cc-based languages, do not touch
+	lines in braces and brackets, i.e. mainly actions.
+
+	* lisp/progmodes/antlr-mode.el: Bug fixes and minor changes.
+	(antlr-indent-line): Introduced 3.0.4: lines starting with a colon
+	would be incorrectly indented.
+	(antlr-tool-version): v3 grammars with a class definition in a
+	header action or containing a rule called "header" or "class"
+	would be incorrectly categorized as v2 grammar.
+	(antlr-set-tool-version-and-mode-line, antlr-mode): Set
+	`indent-line-function' and friends after initializing cc-mode.
+	(antlr-java-action-names): Renamed from `antlr-action-names',
+	only include action names used with language Java.
+	(antlr-font-lock-late-keywords): Check action names only in Java.
+
+	* lisp/progmodes/antlr-mode.el: Preparation for v3/v4 options support.
+	(antlr-v3-options-alists): New variable.
+	(antlr-options-alists): New function.
+	(antlr-insert-option-interactive, antlr-options-menu-filter)
+	(antlr-insert-option-do): Use it.
+	(antlr-option-spec): Allow options-alist not to specify ANTLR
+	subversions.
+
+	* lisp/progmodes/antlr-mode.el: More flexible tool invocation.
+	(antlr-tool-path): New variable.
+	(antlr-run-tool): Use it.
+	(antlr-tool-command): Can now be a function.
+	(antlr-run-tool-interactive): Change accordingly.
+
+	* lisp/progmodes/antlr-mode.el: Emacs-corrected and more flexible indentation.
+	(antlr-syntactic-context): Bind `parse-sexp-ignore-comments' to t,
+	parentheses inside comments would bring Emacs out of sync.
+	(antlr-base-offset-alist): New user option.
+	(antlr-indent-line): Use it.
+
+	* lisp/progmodes/antlr-mode.el: Delay language recognition and tab settings.
+	(antlr-tool-version): Correctly recognize v2 grammars without
+	header{...}.
+	(antlr-set-tool-version-and-mode-line): Set language here.
+	(antlr-mode): Do not set language here.
+
+	* lisp/progmodes/antlr-mode.el: Bug fixes.
+	(antlr-language-limit-n-regexp): Also recognize 'LANG'.
+	(antlr-imenu-create-index-function): in ANTLR v2 grammars,
+	`which-function-mode' would not work, classes would not appear.
+	(antlr-font-lock-checked-face): action names would not be
+	highlighted, the doc string was inserted at the wrong place...
+
+	* lisp/progmodes/antlr-mode.el: Use "Antlr2"/"Antlr3"/"Antlr4" in mode line.
+	(antlr-tool-version): Set default value to nil = automatic.
+	(antlr-tool-version): New function.
+	(antlr-set-tool-version-and-mode-line): New function.
+	(antlr-after-body-hook): New variable.
+	(antlr-mode): Run it as mode hook.
+	(antlr-v4-mode): Do not update mode line anymore.
+
+	* lisp/progmodes/antlr-mode.el: Minor font-lock changes.
+	(antlr-font-lock-literal-regexp): Also match strings surrounded by
+	single quotes, and symbols and punctuation.
+	(antlr-font-lock-late-keywords): Highlight regexp group 2 of that.
+
+	* lisp/progmodes/antlr-mode.el: Preparation for further v3 and v4 support.
+	(antlr-v4-mode): New major mode for file suffix "g4".
+
+	* lisp/progmodes/antlr-mode.el: Adopt imenu and navigation to ANTLR v3 and v4.
+	(antlr-imenu-create-index-function): Recognize fragment
+	specification and named actions.
+	(antlr-skip-exception-part): With v3 and v4, there is no
+	'exception' keyword, but an additional optional 'finally'.
+
+	* lisp/progmodes/antlr-mode.el: Adopt font-lock to ANTLR v3 and v4.
+	(antlr-grammardef, antlr-attribute): New faces.
+	(antlr-action-names, antlr-action-scope-names): New variables
+	(antlr-font-lock-late-keywords): Recognize new elements.
+	(antlr-font-lock-additional-keywords): Changed font-lock for $attr
+	constructs.
+
+	* lisp/progmodes/antlr-mode.el: Newer cc-mode fontification is very eager,
+	i.e. would overwrite that of antlr-mode.
+	(antlr-font-lock-late-keywords): New variable, also using
+	OVERRIDE in MATCH-HIGHLIGHT.
+	(antlr-font-lock-keywords): Add at end of keywords.
+	(antlr-font-lock-additional-keywords): Delete keywords here.
+
+	* lisp/progmodes/antlr-mode.el: Checked ANTLR up to latest v2.
+	(antlr-tool-version): Set for ANTLR v2.7.7.
+	(antlr-options-alists): Added options introduced with ANTLR
+	v2.7.2, "classHeaderPrefix" and "noConstructors".
+
+	* lisp/progmodes/antlr-mode.el: redisplay during font-lock could signal
+	"c-where-wrt-brace-construct: c-beginning-of-decl-1 returned
+	label".
+	(antlr-font-lock-defaults): Do not set `beginning-of-defun'.
+
+	* lisp/progmodes/antlr-mode.el: Delete support for old cc-mode versions.
+	(antlr-c-init-language-vars): Delete function.
+	(antlr-mode): Do not call it anymore.
+	(antlr-mode-syntax-table): Adopt docstring to changed init.
+
+	* lisp/progmodes/antlr-mode.el: imenu creation could signal
+	"c-where-wrt-brace-construct: c-beginning-of-decl-1 returned
+	label".
+	(antlr-slow-cache-diff-threshold): Delete variable.
+	(antlr-syntactic-context): Do not use it here, do not call
+	`beginning-of-defun' anymore.
+	(antlr-mode): Allow /// etc as `comment-start-skip'. Still set
+	`require-final-newline'.
+
+	* lisp/progmodes/antlr-mode.el (antlr-electric-character): With
+	Emacs, use `last-command-event' instead `last-command-char'.
+
+	* lisp/progmodes/antlr-mode.el: imenu creation could signal
+	"c-where-wrt-brace-construct: c-beginning-of-decl-1 returned
+	label".
+	(antlr-slow-cache-diff-threshold): Deletia.
+	(antlr-syntactic-context): Do not use it here, do not call
+	`beginning-of-defun' anymore.
+
+2025-12-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify -Wunused-function re get_conversion_field
+
+	* src/textconv.c (get_conversion_field): Define only if HAVE_ANDROID,
+	since it is unused on non-Android.
+
+2025-12-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Move Gnulib configuration back to where it was
+
+	* configure.ac: Move the gl_INIT call back to where it was,
+	as Mattias Engdegård reported the following problem:
+	  checking whether pthread_sigmask is a macro... no
+	  ./configure: line 32767: test: =: unary operator expected
+	because moving gl_INIT up made the check for pthread_sigmask’s
+	availability appear later than Gnulib’s check whether it’s a macro.
+	Instead of moving gl_INIT up, call gl_ALIGNASOF earlier,
+	as that’s the only part of gl_INIT that is needed earlier.
+
+2025-12-09  Po Lu  <luangruo@yahoo.com>
+
+	Fix builds without toolkit menu bars
+
+	* src/keyboard.c (make_lispy_event): Call x_y_to_column_row when
+	building internal menu bar events.
+
+	* src/xdisp.c (x_y_to_column_row): Provide DX and DY parameters
+	to x_y_to_column_row.
+
+2025-12-08  João Távora  <joaotavora@gmail.com>
+
+	Jsonrpc: defend against very large stderr lines
+
+	In https://github.com/joaotavora/rassumfrassum/issues/1 we found
+	a language server that emits very large single-line messages
+	(5MB): that eventually end up in Eglot's stderr.  With the
+	output arriving in chunks into the stderr buffer, this creates a
+	significant slowdown of '[stderr] nil' lines, which eventually
+	clogs up the stdout JSONRPC communication.
+
+	This fix exits the `jsonrpc--forwarding-buffer` function early
+	if the forward-line call didn't actually move to a new line.
+
+	* lisp/jsonrpc.el (jsonrpc--forwarding-buffer): Fix.
+	(Version): Bump to 1.0.27.
+
+2025-12-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix xmenu.c USE_X_TOOLKIT duplication
+
+	* src/xmenu.c (Fx_menu_bar_open_internal):
+	Don’t say ‘#ifdef USE_X_TOOLKIT’ inside an #if where
+	it is already known that USE_X_TOOLKIT is defined.
+
+2025-12-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix some C symbol extern visibility
+
+	Make some C symbols static if they don’t need to be extern.
+	Also, remove a couple of functions that were discovered to be
+	unused as a result of this process, and mark two extern
+	functions intended to be usable from GDB.
+	* src/buffer.c (previous_overlay_change):
+	* src/composite.c (composition_lisp_table):
+	* src/fileio.c (file_name_directory):
+	* src/frame.c (check_tty):
+	* src/insdel.c (adjust_markers_for_insert):
+	* src/keyboard.c (unread_switch_frame, read_char)
+	(requeued_events_pending_p):
+	* src/sysdep.c (renameat_noreplace) [!HAVE_ANDROID]:
+	* src/textconv.c (get_conversion_field) [!HAVE_ANDROID]:
+	* src/treesit.c (TREESIT_BOB_LINECOL, TREESIT_TS_POINT_1_0)
+	(treesit_buf_tracks_linecol_p, make_treesit_parser)
+	(make_treesit_node):
+	* src/xdisp.c (x_y_to_hpos_vpos):
+	* src/xfaces.c (load_color) [!MSDOS]:
+	* src/xfns.c (x_real_pos_and_offsets):
+	* src/xterm.c (x_dnd_do_unsupported_drop):
+	Now static.  Move up if necessary.
+	* src/coding.c (utf8_string_p):
+	* src/keyboard.c (detect_input_pending_ignore_squeezables):
+	Remove; unused.
+	* src/frame.c (gui_set_alpha):
+	* src/textconv.c (start_batch_edit, end_batch_edit, commit_text)
+	(finish_composing_text, set_composing_text)
+	(set_composing_region, textconv_set_point_and_mark)
+	(delete_surrounding_text, request_point_update)
+	(textconv_barrier, replace_text, get_extracted_text)
+	(get_surrounding_text):
+	* src/xdisp.c (gui_union_rectangles):
+	* src/xterm.c (xi_frame_selected_for):
+	Define only if needed.
+	* src/treesit.c (treesit_debug_print_parser_list)
+	(treesit_debug_print_linecol): Declare EXTERNALLY_VISIBLE.
+	* src/xdisp.c (x_y_to_column_row): New function, defined
+	only if needed.  All external callers to x_y_to_hpos_vpos changed.
+
+2025-12-08  Przemysław Kryger  <pkryger@gmail.com>
+
+	Fix package-vc-tests
+
+	* lisp/emacs-lisp/package-vc.el (package-vc--make): Use same
+	format for buffer as `package-vc--build-documentation'.
+	* test/lisp/emacs-lisp/package-vc-tests.el
+	(message-auto-save-directory): Silence byte compiler.
+	(package-vc-with-tests-environment): Initialize package archives
+	after setting a temporary `package-user-dir'.  Set up
+	`package-gnupghome-dir'.  Remove `default-directory' binding.
+	(package-vc-tests-environment-tear-down): Fix argument order in
+	`package-vc-tests-log-buffer-name' call.
+	(package-vc-tests-with-installed): Rename from
+	`package-vc-with-installed-tests'.
+	(package-vc-test-deftest): Use
+	`package-vc-tests-with-installed'.
+	(prepare-patch): Bind `message-auto-save-directory' to
+	`package-vc-tests-dir'.
+	* test/lisp/package-vc-tests.el: Rename to
+	test/lisp/emacs-lisp/package-vc-tests.el
+	* test/lisp/package-vc-resources/Makefile.in: Rename to
+	test/lisp/emacs-lisp/package-vc-resources/Makefile.in
+	* test/lisp/package-vc-resources/test-package-SUFFIX-inc.texi.in:
+	Rename to
+	test/lisp/emacs-lisp/package-vc-resources/test-package-SUFFIX-inc.texi.in
+	* test/lisp/package-vc-resources/test-package-SUFFIX-lib-v0.1.el.in:
+	Rename to
+	test/lisp/emacs-lisp/package-vc-resources/test-package-SUFFIX-lib-v0.1.el.in
+	* test/lisp/package-vc-resources/test-package-SUFFIX-lib-v0.2.el.in:
+	Rename to
+	test/lisp/emacs-lisp/package-vc-resources/test-package-SUFFIX-lib-v0.2.el.in
+	* test/lisp/package-vc-resources/test-package-SUFFIX-v0.1.el.in:
+	Rename to
+	test/lisp/emacs-lisp/package-vc-resources/test-package-SUFFIX-v0.1.el.in
+	* test/lisp/package-vc-resources/test-package-SUFFIX-v0.2.el.in:
+	Rename to
+	test/lisp/emacs-lisp/package-vc-resources/test-package-SUFFIX-v0.2.el.in
+	* test/lisp/package-vc-resources/test-package-SUFFIX.texi.in:
+	Rename to
+	test/lisp/emacs-lisp/package-vc-resources/test-package-SUFFIX.texi.in
+
+2025-12-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New 'R' code letter for 'interactive' forms
+
+	* src/callint.c (callint_argfuns): Add use-region-beginning and
+	use-region-end.
+	(syms_of_callint): Protect use-region-beginning and
+	use-region-end.  Add DEFSYM for Quse_region_p.
+	(Fcall_interactively): New 'R' code letter.
+	* lisp/textmodes/paragraphs.el (repunctuate-sentences):
+	* lisp/vc/diff-mode.el (diff-delete-other-hunks, diff-apply-hunk)
+	(diff-revert-and-kill-hunk, diff-apply-buffer):
+	* lisp/vc/log-view.el (log-view-mark-entry)
+	(log-view-unmark-entry): Use it.
+	* doc/lispref/commands.texi (Interactive Codes):
+	* doc/lispref/markers.texi (The Region):
+	* etc/NEWS:
+	* lisp/simple.el (use-region-beginning, use-region-end)
+	(use-region-p):
+	* src/callint.c (Finteractive): Document it.
+
+2025-12-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/help-fns.el (describe-symbol): Don't silently do nothing
+
+2025-12-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(loaddefs-generate--make-autoload): Obey expand-macro at each step
+
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload):
+	Perform one macro expansion at a time.
+
+2025-12-08  Robert Pluim  <rpluim@gmail.com>
+
+	Improve 'auth-source-ignore-non-existing-file' doc
+
+	* doc/misc/auth.texi (Help for users): Improve
+	'auth-source-ignore-non-existing-file' description.  Include
+	warning about storing cleartext in .authinfo.
+
+2025-12-08  Robert Pluim  <rpluim@gmail.com>
+
+	* doc/misc/auth.texi (Help for users): Warn about use of .authinfo
+
+2025-12-08  David Caldwell  <david@porkrind.org>
+
+	NS: Fix compilation on pre macOS 11 macs
+
+	* src/nsterm.m ([EmacsWindow initWithEmacsFrame:fullscreen:screen:]):
+	Add a compile check around setToolbarStyle since it is not available
+	until macOS 11.0 and a run-time check in case it was compiled on
+	macOS >= 11.0 but run on an earlier version.  (Bug#79951)
+
+2025-12-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Simplify conv_sockaddr_to_lisp via strnlen
+
+	* src/process.c (conv_sockaddr_to_lisp):
+	Use strnlen rather than a circumlocution.
+
+2025-12-08  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	* lisp/textmodes/bibtex.el (bibtex-mode): Fix hs variables (bug#79934).
+
+2025-12-08  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Fix 'treesit-hs-block-end' and 'treesit-hs-inside-comment-p' (Bug#79934)
+
+	* lisp/treesit.el (treesit-hs-block-end): Properly get the block
+	end.
+	(treesit-hs-inside-comment-p): Add support for single-line
+	comments.
+
+2025-12-08  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Deep cleaning. (Bug#79934)
+
+	This is just a refactoring change, simplifying most of the code
+	and commentaries and removing/deprecating redundant code.
+
+	* etc/NEWS: Announce changes.
+	* lisp/progmodes/hideshow.el (hs-hide-hook, hs-show-hook): Use
+	'defcustom' instead of 'defvar'.
+	(hs-block-end-regexp, hs-forward-sexp-function)
+	(hs-adjust-block-beginning-function)
+	(hs-adjust-block-end-function, hs-find-block-beginning-function)
+	(hs-find-next-block-function)
+	(hs-looking-at-block-start-predicate)
+	(hs-inside-comment-predicate): Update docstring.
+	(hs-discard-overlays): Simplify.
+	(hs-life-goes-on): Update docstring.
+	(hs-hideable-region-p): Revert previous changes.
+	(hs-overlay-at): Simplify.
+	(hs-make-overlay): Fix performance.
+	(hs-block-positions): Rework.
+	(hs--add-indicators): Fix performance.
+	(hs-isearch-show-temporary): Simplify.
+	(hs-looking-at-block-start-p): Rename ...
+	(hs-looking-at-block-start-p--default): ... to this.
+	(hs-forward-sexp, hs-hide-comment-region): Mark as obsolete.
+	(hs-hide-block-at-point): Rework.
+	(hs-get-first-block): Rename ...
+	(hs-get-first-block-on-line): ... to this.
+	(hs-inside-comment-p--default): Rework.
+	(hs-find-block-beginning): Rename ...
+	(hs-find-block-beg-fn--default): ... to this.
+	(hs-find-next-block): Rename ...
+	(hs-find-next-block-fn--default): ... to this.
+	(hs-hide-level-recursive): Rework.
+	(hs-find-block-beginning-match): Remove function.
+	(hs-already-hidden-p): Simplify.
+	(hs-c-like-adjust-block-beginning): Mark as obsolete.
+	(hs-hide-all, hs-show-all, hs-hide-block, hs-show-block)
+	(hs-hide-level, hs-hide-initial-comment-block, hs-cycle):
+	Simplify.
+	* test/lisp/progmodes/hideshow-tests.el (hideshow-hide-level-1)
+	(hideshow-hide-level-2):
+	* test/lisp/progmodes/python-tests.el
+	(python-hideshow-hide-levels-3, python-hideshow-hide-levels-4):
+	* test/lisp/progmodes/hideshow-tests.el (hideshow-hide-level-1)
+	(hideshow-hide-level-2):
+	* test/lisp/progmodes/python-tests.el
+	(python-hideshow-hide-levels-3, python-hideshow-hide-levels-4):
+	Update tests.
+
+2025-12-08  Po Lu  <luangruo@yahoo.com>
+
+	Fix the DJGPP port
+
+	* msdos/sed2v2.inp (ALIGNOF_EMACS_INT): Define to 4.
+
+	* msdos/sedlibmk.inp (OMIT_GNULIB_MODULE_fchmodat)
+	(OMIT_GNULIB_MODULE_issymlinkat, OMIT_GNULIB_MODULE_issymlink)
+	(OMIT_GNULIB_MODULE_lchmod): Define to true.
+
+	* src/gmalloc.c (__morecore, __after_morecore_hook)
+	(__malloc_initialize_hook): Don't declare till stddef.h has been
+	included for `ptrdiff_t'.
+
+2025-12-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+	* admin/merge-gnulib (AVOIDED_MODULES): Add strncpy, as Emacs is not
+	likely to exercise the FreeBSD 15 strncpy bug that this module fixes.
+	* lib/issymlinkat.h: New file, taken from Gnulib.
+
+2025-12-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Align config.h better to src/lisp.h
+
+	This is mostly a cleanup patch to fix growing discrepancies
+	between src/lisp.h and configure.ac in terms of how they deduce
+	how EMACS_INT aligns.  The patch includes a static check that the
+	two methods now agree.  It also speeds up ‘configure’ a bit.
+	* configure.ac (ALIGNOF_INT, ALIGNOF_LONG, ALIGNOF_LONG_LONG):
+	Remove; no longer used.
+	(ALIGNOF_EMACS_INT): New macro.
+	(system_malloc): Set to 'no' more consistently with what’s
+	in src/lisp.h.
+	* src/lisp.h (ALIGNOF_EMACS_INT): Do not define here, as config.h
+	defines it now.  Check that config.h’s definition equals the
+	actual alignof (EMACS_INT).
+	(USE_USB_TAG): Set more consistently with what’s in configure.ac.
+	(alignas): Don’t second-guess Gnulib.
+
+2025-12-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Work around GCC bug 123042
+
+	* src/ccl.c: The bug occurs in GCC versions after GCC 13.
+
+2025-12-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Include malloc.h early in alloc.c
+
+	* src/alloc.c, src/gmalloc.c: Include <malloc.h> before <stdlib.h>.
+	This mimics include patterns elsewhere, and avoids a problem if
+	malloc.h declares realloc (i.e., rpl_realloc) early as extern,
+	whereas Gnulib stdlib.h declares it later as inline which means it
+	is extern inline, which clashes with gmalloc’s definition of
+	rpl_realloc when gmalloc.o is used.  Problem discovered when
+	building Emacs on Ubuntu 25.10 with "./configure CC='gcc -m32'
+	emacs_cv_struct_alignment=no gl_cv_header_working_stdalign_h=no".
+
+2025-12-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify -Werror=null-dereference in ralloc.c
+
+	* src/ralloc.c (find_heap, update_heap_bloc_correspondence):
+	Omit unnecessary comparisons to NULL that cause GCC to warn.
+
+2025-12-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Move Gnulib configuration up in configure.ac
+
+	This is so that later patches can fix some near-duplication errors
+	in the malloc configuration.
+	* configure.ac: Move Gnulib configuration earlier.
+
+2025-12-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Remove some obsolete C89, C99, Automake cruft
+
+	These have not been needed for some time in configure.ac.
+	* configure.ac (_AC_PROG_CC_C89): Don’t bother redefining to empty.
+	(gl_PROG_CC_C99, AC_PROG_CC_C_O): Remove; no longer needed.
+
+2025-12-07  Philip Kaludercic  <philipk@posteo.net>
+
+	Make 'package-vc-install-from-checkout' as obsolete
+
+	See https://mail.gnu.org/archive/html/emacs-devel/2025-11/msg00039.html.
+
+	* lisp/emacs-lisp/package-vc.el (package-vc-install-from-checkout):
+	Obsolete it.
+
+2025-12-07  Przemysław Kryger  <pkryger@gmail.com>
+
+	Add tests for package-vc
+
+	* test/lisp/package-vc-tests.el
+	(package-vc-tests-preserve-artefacts): When non nil then
+	preserve temporary test files and buffers.
+	(package-vc-tests-dir, package-vc-tests-packages)
+	(package-vc-tests-repository): Silence byte compiler.
+	(package-vc-tests-packages): Define packages to test.
+	(package-vc-tests-add): Copy a an in file template, update
+	SUFFIX in it and add it to index.
+	(package-vc-tests-create-repository): Create a package git
+	repository with a test package's source.
+	(package-vc-tests-package-desc): Retrieve a `package-desc' for
+	tested package.
+	(package-vc-tests-package-spec): Retrieve a pkg-spec for tested
+	package.
+	(package-vc-tests-package-lisp-dir): Determine a lisp directory
+	for a package.
+	(package-vc-tests-package-main-file): Calculate expected
+	location of package's main file.
+	(package-vc-tests-load-history-marker): Create a load history
+	marker.
+	(package-vc-tests-load-history-pattern): Create a regexp pattern
+	to search in `load-history'.
+	(package-vc-tests-load-history-position): Calculate a position
+	in `load-history'.
+	(package-vc-tests-load-history-interesting-entries): Return
+	`load-history' entries related to the current
+	`package-vc-tests-dir'.
+	(package-vc-tests-explain-load-history-position): Return ERT
+	explanation for load history position failures.
+	(package-vc-tests-log-buffer-name): Return name of a log buffer
+	used to build package or its documentation.
+	(package-vc-tests-log-buffer-exists): Return non-nil when a log
+	buffer used to build package or its documentation exists.
+	(package-vc-tests-explain-log-buffer): Print contents of log
+	buffer used to build package or its documentation and return ERT
+	explanation for the failure.
+	(package-vc-tests-elc-files): Check that there are elc files and
+	that there is no compiled autoloads file amongst them.
+	(package-vc-tests-assert-delete-elc): Assert that .elc files are
+	present for a package.
+	(package-vc-tests-assert-package-alist): Assert that
+	`package-alist' contains a `package-desc' for package, and that
+	the `package-desc' has correct slot `version' and slot
+	`dir'.:(package-vc-tests-reset-head^): Reset head of checkout of
+	tested packages to HEAD^.
+	(package-vc-tests-packages-head): Return current checkout
+	revision.
+	(package-vc-tests-make-spec): Make a new test spec for a test
+	package.
+	(with-package-vc-tests-environment): Setup test environment.
+	(package-vc-tests-environment-tear-down): Tear down test
+	environment.
+	(with-package-vc-tests-installed): Withing a test environment,
+	install package, evaluate test body, and then tear down the test
+	environment.
+	(package-vc-tests-install-from-elpa)
+	(package-vc-tests-install-from-spec): Install a test package.
+	(package-vc-tests-checkout-from-elpa-install-from-checkout)
+	(package-vc-tests-checkout-with-git-install-from-checkout):
+	Checkout and install a test package.
+	(package-vc-tests-package-vc-async-wait): Wait for an
+	asynchronous VC command to finish.
+	(package-vc-tests-deftest): Define series tests for each package
+	in `package-vc-tests-under-test'.
+	(install-post-conditions): Tests that after installing a test
+	package the `load-history' entries, package's main file, commit,
+	elc files, and `package-alist' entry are correct.
+	(require): Test that after calling `require' the `load-history'
+	entries are correct.
+	(upgrade, upgrade-all): Test that after calling
+	`package-vc-upgrade'/`package-vc-upgrade-all' the `load-history'
+	entries, package's elc files, commit, and `package-alist' entry
+	are correct.
+	(upgrade-after-require, upgrade-all-after-require): Test that
+	after calling `require' followed by
+	`package-vc-upgrade'/`package-vc-upgrade-all' the `load-history'
+	entries, commit, package's elc files, and `package-alist' entry
+	are correct.
+	(rebuild): Test that after calling `package-vc-rebuild' on an
+	old version of a package, the package's old function, old macro,
+	elc files, and `package-alist' entry are correct.
+	(rebuild-after-require): Test that after calling `require'
+	followed by `package-vc-rebuild' on an old version of a package,
+	the package's old function, old macro, elc files, and
+	`package-alist' entry are correct.
+	(prepare-patch): Test that after calling
+	`package-vc-prepare-patch' the message buffer is correct.
+	(log-incoming): Test that after calling
+	`package-vc-log-incoming' the log buffer is correct.
+	(pkg-spec-doc-make-shell-command): Test that :doc, :make, and
+	:shell-command slots in a pkg spec execute.
+	* test/lisp/package-vc-resources/test-package-SUFFIX-v0.1.el.in:
+	* test/lisp/package-vc-resources/test-package-SUFFIX-lib-v0.1.el.in:
+	Code template of version 0.1 of a test package.
+	* test/lisp/package-vc-resources/test-package-SUFFIX-v0.2.el.in:
+	* test/lisp/package-vc-resources/test-package-SUFFIX-lib-v0.2.el.in:
+	Code template of code of version 0.2 of a test package.
+	* test/lisp/package-vc-resources/test-package-SUFFIX-inc.texi.in:
+	* test/lisp/package-vc-resources/test-package-SUFFIX.texi.in:
+	Documentation template of a test package.
+	* test/lisp/package-vc-resources/Makefile.in: Makefile template of
+	a test package.
+
+	Co-developed-by: Philip Kaludercic <philipk@posteo.net>
+
+	(Bug#79188)
+
+2025-12-07  Philip Kaludercic  <philipk@posteo.net>
+
+	Store VC checkout dir in 'package-desc-extras'
+
+	* lisp/emacs-lisp/package-vc.el (package-vc--url-scheme): Remove constant.
+	(package-vc--checkout-dir): Check 'package-desc-extras'.
+	(package-vc--save-selected-packages): Remove single-use function.
+	(package-vc--unpack): (Re-)inline 'package-vc--save-selected-packages'.
+	(package-vc-install-from-checkout): Set :vc-dir entry in
+	'package-desc-extras' if necessary.  (Bug#79188)
+
+2025-12-07  Przemysław Kryger  <pkryger@gmail.com>
+
+	Fix upgrading, rebuilding, and logging of VC packages
+
+	There are a few issues addressed in this patch:
+
+	1.  Compilation (including native compilation) should happen in
+	directory that contains package's Lisp code.
+
+	2.  After installing a package with
+	`package-vc-install-from-checkout' and subsequently upgrading it
+	with `package-vc-upgrade' the pkg-desc for the package becomes
+	corrupted.  After the upgrade the pkg-desc's dir (a.k.a
+	`pkg-dir') points to checkout directory.  This will cause the
+	subsequent `package-delete' to delete the checkout directory and
+	leaving incorrect forwarding autoloads file in
+	`package-user-directory'.
+
+	3. The detection of package's Lisp directory has been not
+	effective for packages installed with `package-vc-install' and
+	not existent for packages installed with
+	`package-install-from-checkout'.
+
+	4. Deduction of VC backend has been not working when called from
+	outside of deducing context.
+
+	5. Extract maintainers and store them in a package description
+	file when installing a package from a checkout.
+
+	* lisp/emacs-lisp/package-vc.el (package-vc--checkout-dir): New
+	function to determine the real checkout of a VC
+	package.
+	(package-vc--url-scheme): Define scheme for `:url' property.
+	(package-vc--generate-description-file): Extract maintainers
+	from main package file and store them in generated description
+	file.
+	(package-vc--save-selected-packages): Refactor new helper
+	function out of 'package-vc--unpack' to modify
+	'package-vc-selected-packages'.
+	(package-vc--checkout-dir): Use `pcase' to extract checkout
+	directory from `pkg-spec'.  Detect standard lisp sub directory
+	if called with non-nil `lisp-dir'.
+	(package-vc-commit, package-vc--main-file)
+	(package-vc--build-documentation, package-vc-prepare-patch): Use
+	'package-vc--checkout-dir'.
+	(package-vc--unpack-1): Remove superfluous `pkg-dir' argument.
+	Remove elc files before compilation.  Use a `package' with
+	`:dir' pointing to where package code is.  When `checkout-dir'
+	is different than `pkg-dir' then call `package--add-info-node'
+	and after calling `package-activate-1' reload source files in
+	case when `lisp-dir' is a sub directory.  Use the right
+	directories in the right places.
+	(package-vc-install-from-checkout): Remove superfluous
+	`package-vc-selected-packages' binding.  Remove `pkg-dir'
+	argument from `package-vc--unpack-1' calls.
+	(package-vc--unpack): Remove `lisp-dir' variable and convert to
+	`let*'.  Remove superfluous Lisp code sub directory detection -
+	logic moved to `package-vc--checkout-dir'.  Remove `pkg-dir'
+	argument from `package-vc--unpack-1' call. Use
+	'package-vc--save-selected-packages'.
+	(package-vc-upgrade, package-vc-rebuild): Remove `pkg-dir'
+	argument from `package-vc--unpack-1' calls. Use
+	'package-vc--checkout-dir'.
+	(package-vc-log-incoming): Set `vc-deduce-backend-nonvc-modes'
+	to t.  Use 'package-vc--checkout-dir'.
+	* lisp/emacs-lisp/package.el (package--add-info-node): New
+	function to install info node for package.  Extracted from
+	`package-activate-1'.
+	(package-activate-1): Call `package--add-info-node'.
+
+	Co-developed-by: Philip Kaludercic <philipk@posteo.net>
+
+	(Bug#79188)
+
+2025-12-07  Jens Schmidt  <jschmidt4gnu@vodafonemail.de>
+
+	Use a consistent package description
+
+	Ensure that the long description of a package is the same regardless of
+	originating package archive and package installation state.
+
+	* lisp/emacs-lisp/package.el: Add documentation on additional files that
+	Emacs creates during package installation.
+	(package-desc): Update incomplete description of slot `kind'.
+	(package-install-from-archive): Download '*-readme.txt' from the archive
+	and save it as 'README-elpa' to avoid the issues described in bug#79411.
+	* test/lisp/emacs-lisp/package-resources/multi-file-readme.txt:
+	* test/lisp/emacs-lisp/package-resources/simple-single-readme.txt:
+	Update readmes to mark them as "server readmes" and distinguish them
+	from what the packages themselves provide in their documentation.
+	* test/lisp/emacs-lisp/package-tests.el (package-test-install-singlefile)
+	(package-test-describe-installed-with-ws-only-readme): Add tests.
+	(package-test-install-multifile): Test more files for presence.
+	(package-test-describe-package)
+	(package-test-describe-installed-multi-file-package)
+	(package-test-describe-non-installed-package)
+	(package-test-describe-non-installed-multi-file-package): Test for
+	server readme being used as long description. (Bug#79411)
+
+2025-12-07  Jens Schmidt  <jschmidt4gnu@vodafonemail.de>
+
+	Brush up macro with-package-test and related tests
+
+	* test/lisp/emacs-lisp/package-tests.el (with-package-test): Remove
+	unused keyword :update-news and its implementation.  Add documentation
+	for remaining keywords, since in particular :basedir was being overused.
+	Eliminate code redundancy by reimplementing keyword :upload-base in
+	terms of equivalent macro `ert-with-temp-directory' macro.  Implement
+	other minor improvements.
+	(package-test-install-file, package-test-bug58367, package-test-bug65475)
+	(package-test-install-file-EOLs, package-test-install-multifile): Remove
+	superfluous :basedir keyword from `with-package-test' calls to not give
+	future developers bad example.
+	(package-test-install-multifile): Move file tests out of
+	`with-temp-buffer', as they are independent of current buffer.  (Bug#79411)
+
+2025-12-07  Philip Kaludercic  <philipk@posteo.net>
+
+	Prepare and load user scripts at startup
+
+	* doc/emacs/custom.texi (Early Init File): Document feature and
+	related user options.
+	* etc/NEWS: Mention new feature.
+	* lisp/startup.el (user-lisp-auto-scrape, user-lisp-directory)
+	(user-lisp-ignored-directories): New user options.
+	(prepare-user-lisp): New command.
+	(command-line): Invoke 'prepare-user-lisp' during startup if a
+	user-lisp directory exists and if not disabled per
+	'user-lisp-auto-scrape'.
+
+2025-12-07  David Fussner  <dfussner@googlemail.com>
+
+	Fix package-vc to find the GNU "make" executable
+
+	* lisp/emacs-lisp/package-vc.el (package-vc--make): Improve heuristic
+	for finding the name of GNU "make" on the system.
+	(package-vc-make-program): New defcustom to allow the user to specify
+	the name of GNU "make" in case auto-detection doesn't work. (Bug#79729)
+
+2025-12-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-dir-headers: Set a delayed message during vc--count-outgoing
+
+	* lisp/vc/vc-dir.el (vc-dir-headers): Set a delayed message
+	during vc--count-outgoing.
+
+2025-12-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Check for successful exit when parsing output with vc-exec-after
+
+	When using vc-exec-after to parse program output, check that the
+	program didn't die to a signal or exit with an error exit code
+	before attempting the parse.  Continue to use plain
+	vc-run-delayed where we aren't parsing output, because in these
+	cases it doesn't matter to CODE if the output is incomplete.
+
+	* lisp/vc/vc-dispatcher.el (vc-exec-after): <process-status>:
+	Treat PROC dying to a signal the same as PROC exiting non-zero.
+
+	(vc-exec-after): <accept-process-output>: Restore making a
+	nonblocking call, for the case of vc-exec-after called from a
+	process sentinel.  diff-hl *does* require this.
+
+	(vc-exec-after): <OKSTATUS>: New parameter, replacing SUCCESS,
+	which never worked as documented.
+	* test/lisp/vc/vc-tests/vc-test-misc.el (vc-test-exec-after-3):
+	Test it.
+
+	(vc-run-delayed-success): New macro.
+	* lisp/vc/vc-git.el (vc-git-dir-status-goto-stage):
+	* lisp/vc/vc-hg.el (vc-hg-dir-status-files):
+	* lisp/vc/vc.el (vc-pull-and-push): Use it.
+
+	* lisp/obsolete/vc-arch.el (vc-exec-after):
+	* lisp/obsolete/vc-mtn.el (vc-exec-after):
+	* lisp/vc/vc-bzr.el (vc-exec-after):
+	* lisp/vc/vc-cvs.el (vc-exec-after):
+	* lisp/vc/vc-git.el (vc-exec-after):
+	* lisp/vc/vc-hg.el (vc-exec-after):
+	* lisp/vc/vc-svn.el (vc-exec-after): Update declarations.
+
+2025-12-07  Alan Mackenzie  <acm@muc.de>
+
+	Eliminate possible confusion in comments in registry.el.
+
+	This will prevent any recurrence of bug#79870 (whose cause has
+	not been established).
+
+	* lisp/registry.el (Header comments): Replace ";; version: a
+	float" with ";; version - a float", etc., to prevent ";;
+	version:" being wrongly recognized by
+	loaddefs-generate--parse-file.
+
+2025-12-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Allow volume control of system audio device on MS-Windows
+
+	* src/sound.c (Fw32_sound_volume): New function.
+
+	* etc/NEWS: Announce it.
+
+2025-12-07  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	* src/comp.c (emit_EQ): Make a declaration an assignment (bug#79722)
+
+2025-12-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New user option vc-dir-show-outgoing-count
+
+	* lisp/vc/vc-dir.el (vc-dir-show-outgoing-count): New defcustom.
+	(vc-dir-headers): Use it.
+	* doc/emacs/maintaining.texi (VC Directory Buffer):
+	* etc/NEWS: Document it.
+
+2025-12-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git-incoming-revision: Don't fetch when branch has no upstream
+
+	* lisp/vc/vc-git.el (vc-git-incoming-revision): Don't perform a
+	useless fetch when the branch has no upstream (bug#79952).
+
+2025-12-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	998d45d5d10 ; * lisp/calc/calc-units.el: Better reference for CODATA ...
+	fae83f1eb8b ; Improve documentation of 'char-script-table'
+	3e489ed8049 ; * src/font.c (Flist_fonts): Doc fix.
+	4c292b6f703 ; vc-dir-clean-files: Improve docstring and message (bug#...
+	8a6b84dbcbc Fix doc string of 'display-buffer'
+
+2025-12-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Increase the value of 'max-lisp-eval-depth' used when dumping
+
+	* lisp/loadup.el (max-lisp-eval-depth): Bump to 4200.  Problem
+	reported by Gerd Möllmann <gerd.moellmann@gmail.com>.
+
+2025-12-06  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	sh-script: Fix fontification of command-invocations in 'bash-ts-mode'
+
+	* lisp/progmodes/sh-script.el (sh-mode--treesit-settings): Change
+	font-face used for command-invocations.  (Bug#79944)
+
+2025-12-06  Michael Albinus  <michael.albinus@gmx.de>
+
+	Rework remote process support for Tramp's "smb" method
+
+	* doc/misc/tramp.texi (Remote processes): Rewrite subsection
+	"Running remote processes on MS Windows hosts".
+
+	* etc/NEWS: Mention remote process support for Tramp's "smb" method.
+	Presentational fixes and improvements.
+
+	* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
+	Use `tramp-smb-handle-make-process', `tramp-smb-handle-shell-command'
+	and `tramp-handle-start-file-process'.
+	(tramp-smb-matching-line): New defvar.
+	(tramp-smb-handle-make-process, tramp-smb-handle-shell-command)
+	(tramp-smb-shell-prompt): New defuns.
+	(tramp-smb-handle-process-file): Rewrite.
+	(tramp-smb-handle-start-file-process): Remove.
+	(tramp-smb-get-localname, tramp-smb-shell-quote-localname):
+	New optional argument SHARE.
+	(tramp-smb-send-command): Remove echoed command string.
+	(tramp-smb-maybe-open-connection): Initialize variables.
+	(tramp-smb-wait-for-output): Wait more robust.
+	(tramp-smb-call-winexe): Check for share.  Goto current directory.
+	(tramp-smb-connection-local-powershell-variables): New defconst.
+	Set it as connection local variables.
+
+	* test/lisp/net/tramp-tests.el (tramp-test28-process-file)
+	(tramp-test29-start-file-process, tramp-test30-make-process)
+	(tramp-test32-shell-command, tramp--test-async-shell-command)
+	(tramp--test-supports-processes-p): Adapt for "smb" method.
+	(tramp-test34-explicit-shell-file-name)
+	(tramp-test45-asynchronous-requests): Skip for "smb" method.
+	(tramp--test-check-files): Skip shell test for some special
+	characters in the "smb" case.
+	(tramp-test52-unload): Disable further tests.
+
+2025-12-06  Roi Martin  <jroi.martin@gmail.com>
+
+	Simplify fill-tests.el and add tests
+
+	Simplify fill-tests.el by grouping similar tests in the same
+	erts file.  Move the test code into the erts files, so it is
+	closer to the test cases, which provides context.  Add basic
+	test cases for common filling operations and for the scenarios
+	described in Bug#79575.
+
+	* test/lisp/textmodes/fill-tests.el (fill-test-end-period)
+	(fill-test-haskell): Rename from `test-fill-end-period' and
+	`test-fill-haskell' to follow the same naming convention of
+	the other tests.
+	(fill-test-fill-region-as-paragraph-default)
+	(fill-test-fill-region-as-paragraph-semlf)
+	(fill-test-fill-region-as-paragraph, fill-test-fill-region)
+	(fill-test-fill-paragraph, fill-test-fill-paragraph-semlf):
+	Group tests and move test code into erts files.
+	(fill-test-fill-paragraph-semlf-emacs-lisp-mode)
+	(fill-test-fill-paragraph-semlf-c-mode)
+	(fill-test-fill-paragraph-semlf-org-mode)
+	(fill-test-fill-paragraph-semlf-markdown-mode): Rename from
+	`fill-test-semlf-emacs-lisp-mode', `fill-test-semlf-c-mode',
+	`fill-test-semlf-org-mode' and
+	`fill-test-semlf-markdown-mode'.  Move test code into erts
+	files.
+	(fill-test-semlf, fill-test-semlf-fill-region)
+	(fill-test-semlf-justify)
+	(fill-test-semlf-sentence-end-double-space)
+	(fill-test-semlf-fill-column)
+	(fill-test-semlf-punctuation-marks, fill-test-semlf-twice)
+	(fill-test-semlf-fill-prefix, fill-test-semlf-indented-block)
+	(fill-test-semlf-revert): Delete tests since they are now
+	grouped with other tests.
+
+	* test/lisp/textmodes/fill-resources/fill-paragraph.erts:
+	* test/lisp/textmodes/fill-resources/fill-paragraph-semlf.erts:
+	* test/lisp/textmodes/fill-resources/fill-region-as-paragraph.erts:
+	* test/lisp/textmodes/fill-resources/fill-region-as-paragraph-default.erts:
+	* test/lisp/textmodes/fill-resources/fill-region-as-paragraph-semlf.erts:
+	Add test cases for the function specified in the file name,
+	including tests for the scenarios described in the bug report.
+	* test/lisp/textmodes/fill-resources/fill-region.erts: Add
+	test case for custom `fill-region-as-paragraph-function',
+	include test code in the test specification.
+	* test/lisp/textmodes/fill-resources/fill-paragraph-semlf-c-mode.erts:
+	* test/lisp/textmodes/fill-resources/fill-paragraph-semlf-emacs-lisp-mode.erts:
+	* test/lisp/textmodes/fill-resources/fill-paragraph-semlf-markdown-mode.erts:
+	* test/lisp/textmodes/fill-resources/fill-paragraph-semlf-org-mode.erts:
+	Rename from semlf-*-mode.erts, prefix test names with the
+	tested function and include test code in the test
+	specification.
+	* test/lisp/textmodes/fill-resources/semlf-fill-column.erts:
+	* test/lisp/textmodes/fill-resources/semlf-fill-prefix.erts:
+	* test/lisp/textmodes/fill-resources/semlf-fill-region.erts:
+	* test/lisp/textmodes/fill-resources/semlf-fill-region-as-paragraph.erts:
+	* test/lisp/textmodes/fill-resources/semlf-indented-block.erts:
+	* test/lisp/textmodes/fill-resources/semlf-justify.erts:
+	* test/lisp/textmodes/fill-resources/semlf-punctuation-marks.erts:
+	* test/lisp/textmodes/fill-resources/semlf-revert.erts:
+	* test/lisp/textmodes/fill-resources/semlf-sentence-end-double-space.erts:
+	* test/lisp/textmodes/fill-resources/semlf-twice.erts:
+	* test/lisp/textmodes/fill-resources/semlf.erts: Delete
+	files.  (Bug#79575)
+
+2025-12-06  John Wiegley  <johnw@newartisans.com>
+
+	Update Bahá'í calendar for 2014 calendar reform
+
+	In 2014, the Universal House of Justice announced modifications to
+	the Badí' calendar to bring it more in line with its original design.
+	>From 172 BE (Naw-Rúz 2015) onwards, Naw-Rúz is determined by the
+	vernal equinox as observed from Tehran, and the Twin Holy Birthdays
+	are calculated from the eighth new moon after Naw-Rúz.
+
+	* doc/emacs/calendar.texi (Calendar Systems): Update Bahá'í calendar
+	description to mention the 2014 reform, Ayyám-i-Há, and the
+	astronomical basis for Naw-Rúz and Twin Holy Birthday calculations.
+
+	* lisp/calendar/cal-bahai.el: Require 'solar' and 'lunar' for
+	astronomical calculations.
+	(calendar-bahai-tehran-latitude)
+	(calendar-bahai-tehran-longitude)
+	(calendar-bahai-tehran-timezone)
+	(calendar-bahai-reform-year): New constants for Tehran-based
+	astronomical observations and reform year (172 BE).
+	(calendar-bahai-nawruz-for-gregorian-year): New function to calculate
+	Naw-Rúz from vernal equinox relative to Tehran sunset.
+	(calendar-bahai-nawruz): New function returning absolute date of
+	Naw-Rúz for a given Bahá'í year.
+	(calendar-bahai-twin-holy-birthdays-for-year): New function to
+	calculate Birth of the Báb and Birth of Bahá'u'lláh from the eighth
+	new moon after Naw-Rúz.
+	(calendar-bahai-leap-year-p): Handle post-reform years based on gap
+	between successive Naw-Rúz dates.
+	(calendar-bahai-to-absolute, calendar-bahai-from-absolute): Rewrite
+	to use astronomical Naw-Rúz dates for years >= 172 BE.
+	(holiday-bahai-new-year): Calculate variable Naw-Rúz date.
+	(holiday-bahai-twin-holy-birthdays): New function for lunar-based
+	Twin Holy Birthday dates.
+	(holiday-bahai-ridvan): Use Bahá'í calendar dates instead of fixed
+	Gregorian dates.
+	(calendar-bahai--nawruz-reference-dates)
+	(calendar-bahai--twin-birthdays-reference-dates): New constants with
+	official dates from Bahá'í World Centre for 2015-2064.
+	(calendar-bahai--verify-nawruz)
+	(calendar-bahai--verify-twin-birthdays)
+	(calendar-bahai-verify-calculations): New verification functions to
+	test calculations against official reference data.
+
+	* lisp/calendar/holidays.el (holiday-bahai-holidays): Use
+	'holiday-bahai' with Bahá'í calendar dates instead of 'holiday-fixed'
+	with Gregorian dates.  Add 'holiday-bahai-twin-holy-birthdays' for
+	lunar-calculated dates.
+
+2025-12-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'seq-intersection'
+
+	* doc/lispref/sequences.texi (Sequence Functions):
+	* lisp/emacs-lisp/seq.el (seq-intersection): Clarify the
+	documentation of 'seq-intersection'.  (Bug#79844)
+
+2025-12-06  Kristoffer Balintona  <krisbalintona@gmail.com>
+
+	Support 'eager-update' in 'completion-category-overrides' defcustom
+
+	* lisp/minibuffer.el (completion-category-overrides): Accept
+	'eager-update' as a completion property in its :type.  (Bug#79899)
+
+2025-12-06  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix root frame check in store_frame_param (Bug#79947)
+
+	* src/frame.c (store_frame_param): Make sure 'minibuffer',
+	'parent-frame' and 'delete-before' parameters reference frame on
+	same terminal.  Spare GUI frames when checking root frames of
+	tty frames and their surrogate minibuffer frames (Bug#79947).
+
+2025-12-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/diff-mode.el (diff-revert-and-kill-hunk): Fix finding END.
+
+2025-12-04  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Don't emit print-circle refs for empty string and vector
+
+	The empty vector and string(s) are immutable, contain no references and
+	always read as the same objects.
+
+	* src/print.c (PRINT_CIRCLE_CANDIDATE_P): Turn macro into...
+	(print_circle_candidate_p): ...a function, and exclude [] and "".
+	* test/src/print-tests.el (print-circle): Add test case.
+
+2025-12-04  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* lisp/emacs-lisp/bytecomp.el (funarg-positions): amend 'sort'
+
+2025-12-04  Andrea Corallo  <acorallo@gnu.org>
+
+	* Have comp do not use builtin_expect with libgccjit < 14 (bug#79722)
+
+	* src/comp.c (emit_EQ): Do not use '__builtin_expect' with
+	libgccjit < 14.
+
+2025-12-04  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/diff-mode.el (diff-revert-and-kill-hunk): Fix killing.
+
+2025-12-04  Kristoffer Balintona  <krisbalintona@gmail.com>
+
+	Improve performance of 'flyspell-goto-next-error'
+
+	* lisp/textmodes/flyspell.el (flyspell-goto-next-error): Use
+	'next-overlay-change' and 'previous-overlay-change'.
+	(Bug#79933)
+
+2025-12-04  Rudolf Adamkovič  <rudolf@adamkovic.org>
+
+	NS: Fix toolbar style and position
+
+	* src/nsterm.m ([EmacsWindow initWithEmacsFrame:fullscreen:screen:]):
+	Always show the toolbar below the window title.  This is needed on
+	Mac OS 11+ where the toolbar style is decided by the system (which
+	is unpredictable) and the newfangled "compact" toolbar may be chosen
+	(which is undesirable).  (Bug#79900)
+
+2025-12-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Waste 4 fewer bytes in GNU/Linux 32-bit HPPA
+
+	Also, add more commentary about the situation.
+	* src/systhread.h (SYSTHREAD_ALIGN_ROOM): Use alignof (double),
+	not alignof (int), to align the room.  This means we have
+	only 8 (not 12) bytes of slop on 32-bit HPPA GNU/Linux.
+
+2025-12-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/emacs-lisp/bytecomp.el (seq-sort-by): Improve `funarg-positions`
+
+2025-12-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	gnus-icalendar.el: Avoid EIEIO's non-standard FOO-p predicates
+
+	* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event->gnus-calendar)
+	(gnus-icalendar-event:inline-org-buttons): Avoid EIEIO's non-standard
+	FOO-p predicates.
+
+2025-12-03  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Query-on-exit for VC push, pull and async checkin commands
+
+	* lisp/vc/vc-bzr.el (vc-bzr--pushpull):
+	* lisp/vc/vc-git.el (vc-git--checkin, vc-git--pushpull):
+	* lisp/vc/vc-hg.el (vc-hg--checkin, vc-hg--pushpull): Set
+	query-on-exit flag for async processes.
+
+2025-12-03  Paul Nelson  <ultrono@gmail.com>
+
+	Use dedicated minibuffer history for mairix-search
+
+	* lisp/net/mairix.el (mairix-search-history): New variable.
+	(mairix-search): Use it (bug#79926).
+
+2025-12-03  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc.el (vc-pull): Clear cached incoming revisions.
+
+2025-12-03  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Pass the VC backend down through fns called by vc--count-revisions
+
+	* lisp/vc/vc-hooks.el (vc--repo-setprop, vc--repo-getprop)
+	(vc--repo-clearprops):
+	* lisp/vc/vc.el (vc-root-dir): New BACKEND parameter.
+	(vc--incoming-revision, vc-push): Pass it.
+	(vc-default-log-incoming, vc-default-log-outgoing): Pass down
+	BACKEND provided by caller, instead of ignoring it and always
+	calling vc-deduce-backend (bug#79929).
+
+2025-12-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port to GNU/Linux HPPA malloc
+
+	On this platform, you cannot reliably malloc objects containing
+	values of type pthread_mutex_t or pthread_cond_t, since malloc
+	guarantees only 8-byte alignment but these two types require
+	16-byte alignment.  See GCC bug 115750
+	<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115750> reported by
+	Sam James and Emacs bug 79936 <https://bugs.gnu.org/79936>
+	reported by John Paul Adrian Glaubitz.
+	* configure.ac (ALIGNOF_MAX_ALIGN_T, ALIGNOF_PTHREAD_COND_T)
+	(ALIGNOF_PTHREAD_MUTEX_T) [HAVE_PTHREAD]: New C macros.
+	* src/systhread.c (sys_mutex_init, sys_mutex_lock)
+	(sys_mutex_unlock, sys_cond_init, sys_cond_wait)
+	(sys_cond_signal, sys_cond_broadcast, sys_cond_destroy):
+	Use SYTHREAD_ALIGN_PTR to convert sys_mutex_t and sys_cond_t to
+	pthread_mutex_t and pthread_cond_t, since runtime conversion is
+	needed on GNU/Linux HPPA.
+	* src/systhread.h (SYSTHREAD_ALIGN_ROOM, SYSTHREAD_ALIGN_PTR):
+	New macros, which affect the generated code only on
+	unusual platforms like GNU/Linux HPPA.
+	(sys_mutex_t, sys_cond_t) [HAVE_PTHREAD]: Use them.
+
+2025-12-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify gcc -Wdangling-else in dbusbind.c
+
+	* src/dbusbind.c (XD_DBUS_VALIDATE_BUS_NAME)
+	(XD_DBUS_VALIDATE_PATH, XD_DBUS_VALIDATE_INTERFACE)
+	(XD_DBUS_VALIDATE_MEMBER): Make these expand to single statements
+	when they are followed by ‘;’.  All uses changed.
+
+2025-12-02  Juri Linkov  <juri@linkov.net>
+
+	Improve margin handling in outline-minor-mode (bug#76193)
+
+	* lisp/outline.el (outline-minor-mode): Make margin changes
+	idempotent to multiple calls.  When enabling, check for
+	nil 'outline--margin-width' instead of relying on the value
+	of 'left-margin-width'.  When disabling, check for non-nil
+	'outline--margin-width' and set back to nil afterwards.
+	Use kill-local-variable for 'fringes-outside-margins'.
+
+2025-12-02  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc.el (vc-push): Delay clearing incoming revisions cache.
+
+	* lisp/vc/vc.el (vc--incoming-revision): Do store 'nil'.
+
+2025-12-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-dir-headers: Use ngettext, move the newline out of 'propertize'
+
+	* lisp/vc/vc-dir.el (vc-dir-headers): Use ngettext, move the
+	newline out of 'propertize'.
+
+2025-12-01  Elías Gabriel Pérez  <eg642616@gmail.com>
+	    Karthik Chikmagalur  <karthikchikmagalur@gmail.com>
+
+	hideshow.el: New commands 'hs-cycle' and 'hs-toggle-all'. (Bug#79877)
+
+	* etc/NEWS: Announce features.
+	* doc/emacs/programs.texi (Hideshow): Document it.
+	* lisp/progmodes/hideshow.el (hs-prefix-map): Bind the new
+	commands.
+	(hs-hide-level-recursive): Simplify.
+	(hs--toggle-all-state): New variable.
+	(hs-toggle-all, hs-cycle): New commands.
+	(hs-get-near-block): New function.
+	(hs-hide-block): Simplify.
+
+2025-12-01  Juri Linkov  <juri@linkov.net>
+
+	Override 'display-buffer-overriding-action' conditionally in perform-replace
+
+	* lisp/replace.el (perform-replace): For 'diff' display, override
+	'display-buffer-overriding-action' only when it has the default value.
+	https://lists.gnu.org/archive/html/emacs-devel/2025-11/msg01077.html
+
+2025-12-01  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Deduplicate bytecode strings in each top-level form
+
+	This cheap device enables sharing of byte-code for local functions
+	that only differ in their constant vectors (and/or doc strings etc).
+	It makes the .elc files smaller by about 150 KB, and should reduce
+	in-memory usage a little as well.
+
+	* lisp/emacs-lisp/bytecomp.el (bytecomp--code-strings): New.
+	(byte-compile-from-buffer, byte-compile-flush-pending)
+	(byte-compile-lambda): Hash-cons byte-code locally.
+
+2025-12-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix whitespace in remember.el
+
+	* lisp/textmodes/remember.el (remember-mode): Remove redundant
+	whitespace.  Patch by Huang Jing <rne.kou@icloud.com> (bug#79928).
+
+2025-12-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc-dir.el (vc-dir-headers): Put newlines in better places.
+
+2025-12-01  Kristoffer Balintona  <krisbalintona@gmail.com>
+
+	log-edit-show-files: Respect display-buffer-alist
+
+	* lisp/vc/log-edit.el (log-edit-show-files): Consolidate the
+	call to cvs-pop-to-buffer-same-frame,
+	shrink-window-if-larger-than-buffer, and set-window-dedicated-p
+	into a single call to display-buffer.
+
+2025-12-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix log-view-vc-fileset in *vc-incoming* and *vc-outgoing* buffers
+
+	This fixes log-view-modify-change-comment in those buffers.
+
+	* lisp/vc/vc.el (vc-incoming-outgoing-internal): Pass the VC
+	root to vc-log-internal-common.
+
+2025-12-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	log-edit-generate-changelog-from-diff: Special-case Summary field
+
+	* lisp/vc/add-log.el (log-edit-fill-entry): Delete unused
+	declaration.
+	* lisp/vc/log-edit.el (log-edit-generate-changelog-from-diff):
+	Special-case inserting a single line into the Summary field.
+
+2025-11-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New display of outgoing revisions count in VC-Dir
+
+	This relies on how vc--incoming-revision now caches incoming
+	revisions.
+
+	* lisp/vc/vc.el (vc--count-outgoing): New function.
+	* lisp/vc/vc-dir.el (vc-dir-header-urgent-value): New face.
+	(vc-dir-outgoing-revisions-map): New keymap.
+	(vc-dir-headers): Use them.
+	* etc/NEWS: Document the change.
+
+2025-11-30  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	time-stamp: Add test of multi-line start regexp
+
+	* test/lisp/time-stamp-tests.el: (time-stamp-custom-start-multiline):
+	New test, inspired by Amin Bandali.
+
+2025-11-30  Juri Linkov  <juri@linkov.net>
+
+	Make goto-address/bug-reference buttons TAB-navigable in 'button-mode'
+
+	* lisp/net/goto-addr.el (goto-address-fontify): Set overlay property
+	'button' to 'this-overlay', and 'category' to 'goto-address'.
+
+	* lisp/progmodes/bug-reference.el (bug-reference-fontify):
+	Set overlay property 'button' to 'ov' (bug#74792).
+
+2025-11-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc.el (vc-push): Clear cached incoming revision.
+
+	* lisp/vc/vc.el (vc--incoming-revision): Don't cache 'nil'.
+
+2025-11-30  Juri Linkov  <juri@linkov.net>
+
+	Show Flymake diagnostics on clicking mouse-1 on the mode-line indicator
+
+	* lisp/progmodes/flymake.el (flymake--mode-line-counter-map):
+	Bind [mode-line mouse-1] to 'flymake-show-buffer-diagnostics' (bug#76254).
+
+2025-11-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Cache VC incoming revisions
+
+	* lisp/vc/vc-hooks.el (vc-file-setprop): Use cl-pushnew.
+	(vc--repo-setprop, vc--repo-getprop, vc--repo-clearprops): New
+	functions.
+	* lisp/vc/vc.el (vc--incoming-revision): Cache incoming
+	revisions.
+	* src/fns.c (Fput): State that VALUE is returned.
+
+2025-11-30  Juri Linkov  <juri@linkov.net>
+
+	Use treesit-extra-load-path for more values of treesit-auto-install-grammar
+
+	* lisp/treesit.el (treesit-auto-install-grammar): Use the first
+	writable directory from 'treesit-extra-load-path' for values
+	'always', 'ask', 'ask-dir' (bug#79862).
+
+	* src/treesit.c (syms_of_treesit): Extend docstring.
+
+2025-11-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	project-compile: Don't let-bind compile-command
+
+	* lisp/progmodes/project.el (project-compile): Handle ignoring
+	compile-command from a vc-compilation-mode buffer in a way that
+	does not involve let-binding compile-command.
+
+2025-11-30  João Távora  <joaotavora@gmail.com>
+
+	Eglot: revert changes to eglot-rename's interface (bug#79757)
+
+	After some weeks of testing, I've changed by mind on this.  Having the
+	current name appear passed the INITIAL-VALUE to read-from-minibuffer is
+	a jarring backward-incompatible change.  There is no evidence that the
+	majority of renames are simple tweaks to the existing names, and even
+	less evidence that these tweaks happen frequently at the end of the
+	symbol.
+
+	Therefore it's better for the ergonomics of this commonly used command
+	to leave the code as it was and simply rely on C-n to bring in the
+	default value (which is the current symbol name), instead of forcing
+	users accustomed to the previous behaviour remember to press sth like
+	M-DEL to clean the input.
+
+	* lisp/progmodes/eglot.el (eglot-rename): Tweak.
+
+2025-11-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	server--process-filter-1: Fix stripping -auth argument (bug#79889)
+
+	* lisp/server.el (server--process-filter-1): Strip trailing
+	space after -auth argument (bug#79889).  Fix due to Richard
+	Copley <rcopley@gmail.com>.
+
+2025-11-30  Roi Martin  <jroi.martin@gmail.com>
+
+	Fix bug in semantic linefeed filling
+
+	Fix bug in semantic linefeed filling related to wide characters and
+	`sentence-end-without-space'.
+	* lisp/textmodes/fill.el (fill-region-as-paragraph-semlf): Fix the
+	calculation of the maximum column.  Do not depend on where
+	`fill-region-as-paragraph-default' leaves point after being called.
+	(Bug#79575)
+
+2025-11-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix doc string of 'display-buffer'
+
+	* lisp/window.el (display-buffer): Add missing actions and fix
+	quoting to avoid showing hyper-links to non-existent or irrelevant
+	symbols.  (Bug#79912)
+
+2025-11-29  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* test/src/data-tests.el (data-tests-ash-lsh): Test for bug#79876.
+
+2025-11-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/diff-mode.el (diff-filename-drop-dir): Match backslashes.
+
+2025-11-29  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	time-stamp: return quicker when inactive
+
+	* lisp/time-stamp.el (time-stamp-once): Do not look for additional
+	templates once we have displayed the warning about being disabled.
+	Move earlier the check for arguments being the correct type.
+	* test/lisp/time-stamp-tests.el (time-stamp-custom-messages): New test.
+
+2025-11-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Handle copying additions & removals between working trees
+
+	* lisp/vc/diff-mode.el (diff-file-kill): New optional DELETE
+	parameter.
+	(diff-kill-creations-deletions):
+	* lisp/vc/vc.el (vc--fileset-by-state): New functions.
+	(diff-kill-creations-deletions, diff-filename-drop-dir)
+	(diff-hunk-file-names, diff-file-next, diff-hunk-header-re)
+	(vc-dir-resynch-file): Declare.
+	(vc--apply-to-other-working-tree): Handle copying and moving
+	files in the added, removed, missing and unregistered states.
+	* test/lisp/vc/vc-tests/vc-tests.el
+	(vc-test--apply-to-other-working-tree): New test.
+
+2025-11-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix vc-git-uncommit-revisions-from-end
+
+	* lisp/vc/vc-git.el (vc-git-uncommit-revisions-from-end): Don't
+	leave changes staged.
+
+2025-11-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc-svn.el (vc-svn-state): Handle FILE with no directory.
+
+2025-11-29  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	a74b6936835 Clarify use of ':font' in face-remapping functions
+	5c0d2ca79ae ; cl-reduce, seq-reduce: Improve wording.
+
+	# Conflicts:
+	#	lisp/emacs-lisp/seq.el
+
+2025-11-29  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	cb2e9dd4838 * doc/misc/efaq.texi (Spell-checkers): Update ispell URL.
+
+2025-11-29  Eli Zaretskii  <eliz@gnu.org>
+
+	eglot: add "ty" LSP server for Python to 'eglot-server-programs'
+
+	* lisp/progmodes/eglot.el (eglot-server-programs): Add "ty" LSP
+	server for Python.  Patch by Steve Purcell <steve@sanityinc.com>.
+
+2025-11-29  Rudolf Adamkovič  <rudolf@adamkovic.org>
+
+	Add current subject to future history in `message-change-subject'
+
+	* lisp/gnus/message.el (message-change-subject): Read the new subject
+	with the old subject in the "future history".
+	* etc/NEWS (minutes): Announce the feature.  (Bug#79815)
+
+2025-11-29  Eli Zaretskii  <eliz@gnu.org>
+
+	Clarify use of ':font' in face-remapping functions
+
+	* lisp/face-remap.el (face-remap-add-relative)
+	(face-remap-set-base, buffer-face-set, buffer-face-toggle)
+	(buffer-face-mode-invoke): Clarify how to use ':font' in face
+	attribute lists.  (Bug#79906)
+
+2025-11-28  João Távora  <joaotavora@gmail.com>
+	    Lua Viana Reis  <me@lua.blog.br>
+
+	Eglot: re-do semantic tokens again (bug#79374)
+
+	After a week of intense testing, found out there were various insidious
+	bugs related to out-of-date requests that rear their heads in different
+	typing patterns.  One way to sort this out and still minimize the number
+	of requests is to have Eglot's semtok code be aware of the states a
+	request for tokens can be in: inexistent/invalid, unsent, sent, valid.
+
+	The needs and optimization opportunities for servers that support "full"
+	and "full/delta" requests are considerably different from the ones of
+	servers which only support "full" and "range".  The latter seem to be in
+	the minority, so for now I've removed the range requests.  These servers
+	should still work with "full" requests.
+
+	In a further bug, at least two servers (clangd and lean) were found to
+	plainly abuse the semanticTokens/refresh server request.  This confuses
+	the state logic.  The solution is to simply no-op this request handler,
+	it doesn't seem to do anything useful.
+
+	Finally, when auto-reverting with preserve-modes (as done by vc-revert
+	and auto-revert-mode), the font-lock state needs to be reinitialized.
+	Fixed this in eglot--after-revert-hook.
+
+	* lisp/progmodes/eglot.el (eglot-client-capabilities): Don't announce
+	ranged request support.
+	(eglot--docver): Rename from eglot--versioned-identifier.
+	(eglot--diagnostics)
+	(eglot--flymake-diagnostics)
+	(eglot-handle-notification)
+	(eglot--signal-textDocument/didOpen)
+	(eglot--report-to-flymake)
+	(eglot--apply-text-edits)
+	(eglot--VersionedTextDocumentIdentifier): Use eglot--docver.
+	(eglot--send-changes-hook): Rename from eglot--document-changed-hook.
+	(eglot--after-change): Don't run eglot--send-changes-hook here.
+	(eglot--signal-textDocument/didChange): Run it here.
+	(eglot--semtok-state): Rename from eglot--semtok-cache.
+	(eglot--semtok-inflight): Delete.
+	(eglot--handle-request semanticTokens/refresh): Nullify.
+	(eglot-semantic-tokens-mode): Tweak.
+	(eglot--semtok-after-send-changes): New hook.
+	(eglot--semtok-request)
+	(eglot--semtok-font-lock): Rewrite.
+	(eglot--after-revert-hook): Reinitialize semtok state.
+
+2025-11-28  Michael Albinus  <michael.albinus@gmx.de>
+
+	Sync with Tramp 2.8.0.5
+
+	* doc/misc/tramp.texi (Remote processes): Improve description
+	where direct asyn processes won't work.
+
+	* lisp/net/tramp-cache.el (with-tramp-saved-connection-properties):
+	Adapt `tramp-verbose' less aggressive.
+
+	* lisp/net/tramp-container.el (tramp-kubernetes--context-namespace):
+	Use `string-join'.
+
+	* lisp/net/tramp-message.el (tramp-get-debug-file-name):
+	Modify debug file name.
+	(tramp-debug-message): Simplify.
+
+	* lisp/net/tramp-sh.el (tramp-actions-before-shell)
+	(tramp-actions-copy-out-of-band):
+	Add `tramp-keyboard-interactive-authentication-prompt-regexp'.
+
+	* lisp/net/tramp.el (tramp-encoding-shell): Fix docstring.
+	(tramp-keyboard-interactive-authentication-prompt-regexp): New defcustom.
+	(tramp-action-ignore-message): New defun.
+
+	* test/lisp/net/tramp-tests.el (tramp-test10-write-region)
+	(tramp-test10-write-region-file-precious-flag)
+	(tramp-test10-write-region-other-file-name-handler)
+	(tramp-test27-load, tramp-test32-shell-command)
+	(tramp-test32-shell-command-dont-erase-buffer)
+	(tramp-test34-connection-local-variables)
+	(tramp-test36-vc-registered, tramp-test39-make-lock-file-name)
+	(tramp-test39-detect-external-change)
+	(tramp-test45-asynchronous-requests): Adapt tests.
+
+2025-11-28  Yuan Fu  <casouri@gmail.com>
+
+	Remove the cached values in tree-sitter modes (bug#79363)
+
+	The cached values are not needed anymore since Emacs now caches
+	the compiled queries.
+
+	* lisp/progmodes/cmake-ts-mode.el:
+	(cmake-ts-mode--indent-rules-cached): Remove.
+	(cmake-ts-mode--indent-rules): Return values directly.
+	(cmake-ts-mode--font-lock-settings-cached): Remove.
+	(cmake-ts-mode--font-lock-settings): Return values directly.
+	* lisp/progmodes/php-ts-mode.el:
+	(php-ts-mode--font-lock-settings-cached): Remove.
+	(php-ts-mode--font-lock-settings): Return values directly.
+	(php-ts-mode--custom-html-font-lock-settings-cached): Remove.
+	(php-ts-mode--custom-html-font-lock-settings): Return values directly.
+	* lisp/textmodes/mhtml-ts-mode.el:
+	(mhtml-ts-mode--treesit-font-lock-settings-cached): Remove.
+	(mhtml-ts-mode--treesit-font-lock-settings): Return values directly.
+	(mhtml-ts-mode--treesit-indent-rules-cached): Remove.
+	(mhtml-ts-mode--treesit-indent-rules): Return values directly.
+	* lisp/progmodes/cmake-ts-mode.el:
+	(cmake-ts-mode--indent-rules-cached): Remove
+	(cmake-ts-mode--indent-rules): Return values directly.
+	(cmake-ts-mode--font-lock-settings-cached): Remove.
+	(cmake-ts-mode--font-lock-settings): Return values directly.
+	* lisp/progmodes/csharp-mode.el:
+	(csharp-ts-mode--font-lock-settings-cached): Remove.
+	(csharp-ts-mode--font-lock-settings): Return values directly.
+
+2025-11-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port better to GNUstep with Nix gcc
+
+	Problem reported by David Caldwell (bug#79879).
+	* configure.ac: When configuring for GNUstep and the
+	Objective C compiler does not support even C99 features,
+	use the first flag of -std=gnu23, -std=gnu17, -std=gnu11, -std=gnu99
+	that works, instead of insisting on -std=c99 which (a) is too
+	strict and (b) can override another -std= option in an
+	undesirable way.
+
+2025-11-28  Juri Linkov  <juri@linkov.net>
+
+	* lisp/cus-start.el: Make 'treesit-extra-load-path' customizable.
+
+	* lisp/treesit.el (treesit-auto-install-grammar): Add the value 'ask-dir'.
+	(treesit-ensure-installed): When 'treesit-auto-install-grammar' is
+	'ask' or 'ask-dir', ask for the directory to install the grammar library
+	using the first writable directory of 'treesit-extra-load-path' as default.
+	Also add the provided directory to 'treesit-extra-load-path' afterwards.
+
+	* src/treesit.c (treesit-extra-load-path): In the docstring
+	mention the fact that the first directory is special (bug#79862).
+
+2025-11-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix recently-introduced ash bug
+
+	Problem reported by John Paul Adrian Glaubitz (bug#79876).
+	* src/data.c (Fash): Don’t assume stdc_leading_zeros, which
+	returns an unsigned integer of unspecified width, returns
+	a value narrower than EMACS_INT.  Also, don’t munge the code to
+	worry about stdc_leading_zeros (0); unlike GCC’s __builtin_clz,
+	stdc_leading_zeros works fine on 0.  And use a temporary to
+	avoid a cast.
+
+2025-11-27  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Support completion-eager-display in completing-read-multiple
+
+	Make completing-read-multiple do eager display of *Completions*
+	when the table requests it.
+
+	As a side-effect of the implementation, we now check again if
+	eager-display is enabled if we have to retry doing eager-display
+	due to being interrupted by user input.  This is mildly nicer
+	since it gives the completion table a little more control: for
+	example, maybe the table only wants to do eager-display if the
+	minibuffer is empty; this change makes that work better.
+
+	* lisp/minibuffer.el (completions--start-eager-display)
+	(completing-read-default): Move the code for checking whether to
+	do eager-display into completions--start-eager-display.
+	* lisp/emacs-lisp/crm.el (completing-read-multiple): Call
+	completions--start-eager-display (bug#79858).
+
+2025-11-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(display-buffer-overriding-action): Try and discourage abuse
+
+	* lisp/window.el (display-buffer-overriding-action): Document
+	the intended use in the deluded hope to reduce the current abuse.
+
+2025-11-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve the fix for 'd' command in 'query-replace'
+
+	* lisp/misearch.el (coding-system--for-buffer-diff): Move
+	definition from here...
+	* lisp/vc/diff.el (coding-system--for-buffer-diff): ...to here.
+
+2025-11-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc.el (vc--apply-to-other-working-tree): Use y-or-n-p.
+
+2025-11-27  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Fix project-prompt-project-name with (choose a dir)
+
+	* lisp/progmodes/project.el (project-prompt-project-name):
+	Use correct equality check (bug#79894).
+
+2025-11-27  Neal Sidhwaney  <nealsid@users.noreply.github.com>
+
+	Add test cases for 'dolist'
+
+	This patch adds tests for the following scenarios:
+	 - Every element is handled (basic functionality)
+	 - Result specified in SPEC is returned
+	 - Bindings named "tail" are not shadowed by 'dolist'
+	* test/lisp/subr-tests.el (subr-tests--dolist--every-element-is-handled)
+	(subr-tests--dolist--returns-spec-result)
+	(subr-tests--dolist--does-not-shadow-tail-binding): New tests.
+	(Bug#79778)
+
+2025-11-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Work around a bug in GCC 14 i386 C23 alignas
+
+	Problem reported by Helmut Eller (bug#79886).
+	* src/lisp.h (USE_LSB_TAG): Adjust to alignas changes.
+	(alignas): For GCC and Clang, prefer __attribute__ ((__aligned__ (A)))
+	to alignas (A) even if the compiler claims to support the latter.
+	This works around a bug in GCC 14 i386 C23 alignas.
+	No need to worry about whether __alignas_is_defined is defined.
+
+2025-11-27  Pranshu Sharma  <pranshu@bauherren.ovh>
+
+	Add new commands 'merge-frames' and 'split-frame'
+
+	* lisp/window-x.el (merge-frames, split-frame): New commands.
+	* etc/NEWS: Announce new commands 'merge-frame' and
+	'split-frame'.
+
+2025-11-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Remove all traces of MSVC support from MS-Windows code
+
+	We dropped support for MSVC long ago, and nowadays only support
+	MinGW for the MS-Windows builds of Emacs.
+	* src/w32term.h:
+	* src/w32fns.c:
+	* src/w32.c:
+	* nt/inc/sys/socket.h:
+	* nt/inc/stdalign.h:
+	* nt/inc/ms-w32.h: Remove MSVC-specific code and preprocessor
+	conditions.
+	* nt/inc/ms-w32.h: Don't redirect Posix functions to MS _FOO
+	equivalents, as MinGW headers do that nowadays better, not
+	necessarily via functions, and do not disable that when __STDC__
+	is defined.
+
+2025-11-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Fix completion error in `C-x RET f ut-8-d TAB`
+
+	The core of the problem is that `completion-pcm--prepare-delim-re`
+	is designed to match a "delimiter" in the pattern but was misused
+	to match a sequence of delimiter chars in the completions.
+
+	* lisp/minibuffer.el (completion-pcm--delim-re): Rename from
+	`completion-pcm--prepare-delim-re` and change its calling convention.
+	(completion-pcm--segments->regex): Use it.
+	(completion-pcm-word-delimiters): Adjust accordingly.
+
+	* test/lisp/minibuffer-tests.el (completion-pcm--test-zerowidth-delim):
+	New test.
+
+2025-11-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port to glibc 2.43+ with GCC 15+
+
+	Port to planned glibc 2.43 (scheduled for February 2026),
+	which will support qualifier-generic standard functions; see:
+	https://sourceware.org/git/?p=glibc.git;a=commit;h=cd748a63ab1a7ae846175c532a3daab341c62690
+	For example, strchr (P, C) will return pointer to const if P is
+	pointer to const.  The idea is to catch dumb programming errors when a
+	program mistakenly uses strchr to convert a pointer to const
+	to an unrestricted pointer.  This feature is required by C23,
+	and will be enabled by default in GCC 15.
+	* src/callint.c (Fcall_interactively):
+	Respect constness of pointer when calling memchr.
+	* src/gtkutil.c (xg_get_font):
+	2nd arg is char *, not const char *.
+	* src/xfaces.c (parse_float_color_comp): Return bool, not double.
+	New arg DST.  All callers changed.  This makes it easier for
+	callers to use char const *.
+	(parse_color_spec): Respect constness of pointer when calling strchr.
+
+2025-11-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2025-11-25  Aaron Jensen  <aaronjensen@gmail.com>
+
+	Fix indentation of keyword argument arrays/hashes in ruby-mode
+
+	* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Check for ':' and
+	'=>' as previous tokens, and handle symbols ending with ':' to
+	properly indent keyword argument arrays and hashes when
+	ruby-bracketed-args-indent is nil.
+
+	* lisp/progmodes/ruby-ts-mode.el (ruby-ts--parent-call-or-bol):
+	Handle arrays/hashes that are children of 'pair' nodes (keyword
+	arguments) to ensure consistent indentation.
+
+	* test/lisp/progmodes/ruby-mode-resources/ruby-bracketed-args-indent.rb:
+	Add test cases for keyword argument arrays and hashes with both
+	symbol-colon and hash-rocket syntax.
+
+	When ruby-bracketed-args-indent is nil, arrays and hashes used as
+	keyword argument values now indent by ruby-indent-level from the
+	line start, matching the documented behavior and fixing inconsistent
+	indentation (bug#74517).
+
+	(https://lists.gnu.org/archive/html/emacs-devel/2025-11/msg00939.html)
+
+2025-11-25  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	* test/lisp/time-stamp-tests.el: More tests of word conversions.
+
+2025-11-25  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Make it easier to enable Abbrev mode by default
+
+	* lisp/cus-start.el: Make 'abbrev-mode' customizable.
+	* doc/emacs/abbrevs.texi (Abbrev Concepts):
+	* etc/NEWS:
+	* src/buffer.c (syms_of_buffer): <abbrev-mode>: Document
+	enabling Abbrev mode by default in all buffers by customizing
+	'abbrev-mode' to a non-nil value.
+
+2025-11-25  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Refine VC-Dir mass mark changes
+
+	* lisp/vc/vc-dir.el (vc-dir-mark-file): Prompt before unmarking
+	all subitems.  Use y-or-n-p and user-error instead of
+	yes-or-no-p and error.
+	(vc-dir-unmark-file): Use y-or-n-p instead of yes-or-no-p.
+	(vc-dir-allow-mass-mark-changes): Update docs.
+
+2025-11-25  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Make diff-revert-and-kill-hunk consider an active region
+
+	* lisp/vc/diff-mode.el (diff-revert-and-kill-hunk): When the
+	region is active, operate on all hunks it overlaps.
+	* doc/emacs/files.texi (Diff Mode):
+	* etc/NEWS: Document the change.
+
+2025-11-25  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Make diff-apply-hunk consider an active region
+
+	* lisp/vc/diff-mode.el (diff-apply-buffer): New 'no-save'
+	meaning for fourth optional argument.  Reserve other non-nil
+	values for this argument.  Use ngettext for one message.
+	(diff-apply-hunk): If the region is active, apply all hunks that
+	the region overlaps, like diff-apply-buffer.
+	* doc/emacs/files.texi (Diff Mode):
+	* etc/NEWS: Document the change to diff-apply-hunk.
+
+2025-11-25  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/emacs-lisp/cond-star.el (pcase*): New dummy definition.
+
+2025-11-25  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: update Version: header.  Add a comment about it
+
+	* lisp/progmodes/cc-defs.el (c-version): Add a comment
+	encouraging maintainers to keep cc-mode.el's Version: header
+	the same.
+
+	* lisp/progmodes/cc-mode.el (top level): Update the Version:
+	  header to 5.35.2.
+
+2025-11-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	Add etc/NEWS style rules
+
+	* CONTRIBUTE (Documenting your changes):
+	Refer to admin/notes/documentation.
+
+	* admin/notes/documentation: Add etc/NEWS style rules.  (Bug#79851)
+
+2025-11-25  Po Lu  <luangruo@yahoo.com>
+
+	Fix mouse dragging on touch screens
+
+	* lisp/mouse.el (mouse-position-for-drag-line): New function;
+	return position of active touch screen tool if a sequence is
+	being translated into mouse movement events, and the last mouse
+	position otherwise.
+	(mouse-drag-line): Invoke `mouse-position-for-drag-line' rather
+	than reading the mouse position manually.
+
+	* lisp/touch-screen.el (touch-screen-current-tool): New 10th
+	field holding the frame-relative last attested position of this
+	tool.
+	(touch-screen-relative-xy): Clarify doc string.
+	(touch-screen-handle-point-update): Update the said field with
+	POSN's position relative to its frame.
+	(touch-screen-handle-touch): Initialize the 10th field of new
+	tool lists with such a position.
+	(touch-screen-last-drag-position): New function.
+
+2025-11-24  Philip Kaludercic  <philipk@posteo.net>
+
+	Only search for package descriptors in package root
+
+	See the following thread for a background on this change:
+	https://mail.gnu.org/archive/html/emacs-devel/2025-08/msg00332.html.
+	This change reverts b81f937e.
+
+	* lisp/emacs-lisp/package.el (package-dir-info): Do not
+	recursively try to find all Lisp files that might have package
+	metadata.  (Bug#79742)
+
+2025-11-24  Philip Kaludercic  <philipk@posteo.net>
+
+	Replace underscores in bind-and* with fresh symbols
+
+	* lisp/emacs-lisp/cond-star.el (cond*-convert-condition): Bind
+	unused values to fresh symbols, to avoid the compiler warning
+	that a symbol starting with an underscore is accessed later on.
+	This mirrors the behaviour of `if-let*' and family.
+
+2025-11-24  Juri Linkov  <juri@linkov.net>
+
+	Fix query-replace-regexp for using '^' with calculated replacement '\,'
+
+	* lisp/replace.el (replace--push-stack): Add new args
+	'next-replacement' and 'match-again' and push them to the stack.
+	(perform-replace): Restore the previous already calculated values
+	of 'next-replacement' and 'match-again' from the stack for the
+	'backup' ('^') key (bug#79811).
+
+	* test/lisp/replace-tests.el (query-replace-tests): Add tests.
+
+2025-11-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Don't apply EditorConfig files to themselves
+
+	* lisp/international/mule.el (auto-coding-alist): Add entry for
+	`.editorconfig` files.
+
+2025-11-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Persist Log View mode marks across buffer revert
+
+	* lisp/vc/log-view.el (vc-exec-after): Autoload.
+	(log-view--restore-marks): New function.
+	(log-view-mode): Add it to revert-buffer-restore-functions.
+
+2025-11-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	editorconfig-core-handle.el: Fix silent misparse
+
+	See https://github.com/editorconfig/editorconfig-emacs/issues/380
+
+	* lisp/editorconfig-core-handle.el (editorconfig-core-handle--parse-file):
+	Fix regexp to not inadvertently match LF.  Remove an O(N²) complexity.
+	Use `line-number-at-pos`.
+
+	* lisp/editorconfig.el (editorconfig--get-coding-system): Don't let
+	errors propagate.
+
+2025-11-24  Robert Pluim  <rpluim@gmail.com>
+
+	* doc/misc/efaq.texi (Spell-checkers): Update ispell URL.
+
+	(Bug#79872)
+
+	Reported by Geoff Kuenning <geoff@cs.hmc.edu>
+
+2025-11-24  Po Lu  <luangruo@yahoo.com>
+
+	Support `toolkit-theme-set-functions' on Android and execute hooks safely
+
+	* java/org/gnu/emacs/EmacsNative.java (setEmacsParams): New arg
+	UIMODE.
+	(sendConfigurationChanged): New args DETAIL and UI_MODE.
+
+	* java/org/gnu/emacs/EmacsNoninteractive.java (main1): Provide
+	an undefined UI mode.
+
+	* java/org/gnu/emacs/EmacsService.java (EmacsService): New field
+	uiMode.
+	(onCreate): Initialize this field at start-up and provide the
+	same to setEmacsParams.
+	(onConfigurationChanged): If the UI mode has been altered,
+	generate a configuration changed event to match.
+
+	* src/android.c (android_ui_mode): New variable.
+	(setEmacsParams): New argument UI_MODE.  Initialize the same
+	from this variable.
+
+	* src/androidgui.h (enum android_configuration_changed): New
+	enum.
+	(struct android_configuration_changed_event): New field
+	`DETAIL'.  Convert fields providing specifics into a union of
+	display density information and a UI mode integer.
+
+	* src/androidterm.c (handle_one_android_event): Handle both
+	manners of configuration change events.
+	(android_term_init): Initialize Vtoolkit_theme from UI mode
+	provided at start-up.
+
+	* src/frame.c (syms_of_frame): Always define Vtoolkit_theme.
+	Define Qtoolkit_theme_set_functions.
+
+	* src/gtkutil.c (xg_update_dark_mode_for_all_displays):
+
+	* src/w32term.c (w32_read_socket): Generate special toolkit
+	theme events, rather than executing hooks directly within the
+	read_socket callback.
+
+	* src/keyboard.c (kbd_buffer_get_event)
+	<TOOLKIT_THEME_CHANGED_EVENT>: Run Qtoolkit_theme_set_functions
+	and set Vtoolkit_theme from event->ie.arg.
+
+	* src/termhooks.h (enum event_kind): New event
+	TOOLKIT_THEME_CHANGED_EVENT.
+
+2025-11-23  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New commands to rewind decentralized VCS branches
+
+	* lisp/vc/vc.el (vc--remove-revisions-from-end): New function.
+	(vc-uncommit-revisions-from-end, vc-delete-revisions-from-end):
+	* lisp/vc/log-view.el (log-view-uncommit-revisions-from-end)
+	(log-view-delete-revisions-from-end): New commands (bug#79408).
+	(log-view-mode-map): Bind them.
+	* doc/emacs/maintaining.texi (VC Change Log):
+	* doc/emacs/vc1-xtra.texi (VC Auto-Reverting):
+	* etc/NEWS: Document them.
+
+2025-11-23  Ulf Jasper  <ulf.jasper@web.de>
+
+	Add 'newsticker--treeview-handle-url' (Bug#79849)
+
+	* lisp/net/newst-treeview.el (newsticker--treeview-url-keymap)
+	(newsticker--treeview-handle-url): Add 'newsticker--treeview-handle-url'
+	to replace 'newsticker-handle-url' in newsticker-treeview (Bug#79849).
+
+2025-11-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'd' command in 'query-replace' in buffers not visiting files
+
+	* lisp/vc/diff.el (diff-file-local-copy): Use proper coding-system
+	when writing a local copy of a non-file visiting buffer.
+
+	* lisp/misearch.el (coding-system--for-buffer-diff): New variable.
+	(multi-file-replace-as-diff): Bind it to 'utf-8-emacs'.
+	(multi-file-diff-no-select): Use proper coding-system when reading
+	output of Diff.  (Bug#79761)
+
+2025-11-22  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-resynch-window: Restore always using vc-revert-buffer-internal
+
+	* lisp/vc/vc-dispatcher.el (auto-revert-buffers): Delete.
+	(vc-resynch-window): Always call vc-revert-buffer-internal.
+	Calling auto-revert-buffers will not necessarily revert the
+	current buffer, but we want it to happen synchronously.
+
+2025-11-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/ldefs-boot.el: Update generated presumably by lisp/Makefile.in (?)
+
+2025-11-22  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Default split-window-preferred-direction to 'longest'
+
+	* lisp/window.el (split-window-preferred-direction): Change
+	default value to 'longest'.
+
+2025-11-22  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git-revision-published-p: Resolve REV
+
+	* lisp/vc/vc-git.el (vc-git-revision-published-p): Resolve REV
+	before using it, using vc-git--rev-parse.
+
+2025-11-22  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New command alias vc-restore
+
+	* lisp/vc/vc.el (vc-restore): New alias.
+	* etc/NEWS: Announce it.
+
+2025-11-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(loaddefs-generate--make-autoload): Fix bug#79852
+
+	As JD Smith <jdtsmith@gmail.com> said we had 3 paths:
+
+	1. macro has `autoload-macro expand` and is already loaded: expand
+	2. macro has `autoload-macro expand` but is /not/ yet loaded: shortcut
+	3. macro does not have `autoload-macro expand`: shortcut
+
+	and the co-existence of 1 and 2 is a problem because it means
+	that same macro is sometimes handled one way and sometimes
+	another, with different results.
+	Remove number 2 by removing from the shortcut all the remaining
+	macros that have `autoload-macro expand`.
+
+	The immediate effect is that `make autoloads` now (auto)loads three
+	more files:
+
+	    [...]
+	    loaddefs-gen: loading file frameset (for cl-defun)
+	    Loading frameset...
+	      INFO     Scraping 1547 files for loaddefs...10%
+	      INFO     Scraping 1547 files for loaddefs...20%
+	    loaddefs-gen: loading file semantic/analyze (for define-overloadable-function)
+	    Loading semantic/analyze...
+	      INFO     Scraping 1547 files for loaddefs...30%
+	      INFO     Scraping 1547 files for loaddefs...40%
+	      INFO     Scraping 1547 files for loaddefs...50%
+	      INFO     Scraping 1547 files for loaddefs...60%
+	      INFO     Scraping 1547 files for loaddefs...70%
+	    loaddefs-gen: loading file tramp-adb (for tramp--with-startup)
+	    Loading tramp-adb...
+	      INFO     Scraping 1547 files for loaddefs...80%
+	    loaddefs-gen: loading file grep (for define-compilation-mode)
+	    Loading grep...
+	    [...]
+
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs--defining-macros):
+	Remove macros that are marked `autoload-macro expand`, even if they are
+	not predefined.
+	(loaddefs-generate--make-autoload): Simplify accordingly.
+
+2025-11-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(loaddefs--defining-macros): Weed out a few more entries
+
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs--defining-macros):
+	Remove `define-skeleton`, `define-derived-mode`, and
+	`define-generic-mode` since their `autoload-macro expand` property is
+	now preloaded.
+
+2025-11-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	: Update ldefs-boot.el
+
+2025-11-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	loaddefs-gen: Weed out some elements from the shortcut path
+
+	The predefined macros marked as `autoload-macro expand` can't
+	get to the shortcul path, so simplify it accordingly.
+	Mark a few more macros from the shortcut path as `autoload-macro expand`
+	but don't remove them yet from the shortcut path (need to update
+	`ldefs-boot.el`).
+
+	* lisp/progmodes/compile.el (define-compilation-mode):
+	* lisp/emacs-lisp/generic.el (define-generic-mode):
+	* lisp/emacs-lisp/derived.el (define-derived-mode):
+	* lisp/cedet/mode-local.el (define-overloadable-function):
+	* lisp/skeleton.el (define-skeleton): Mark as `autoload-macro expand`
+	so as to make the "shortcut" path in `loaddefs-gen.el` redundant.
+
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs--defining-macros):
+	Remove the easy-mmode.el macros since they are already marked as
+	`autoload-macro expand` and they are always defined, so we never check
+	them against that list.
+	(loaddefs-generate--make-autoload): Remove handling of the
+	`easy-mmode.el` macros as well as `defun` and `defmacro` from the
+	shortcut path since we can never get there with them anyway.
+
+2025-11-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt etc/NEWS
+
+	* etc/NEWS: Shrink Zone entry.
+	Presentational fixes and improvements.
+
+2025-11-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	e262ed18f94 ; * admin/notes/spelling: Copy note on possessive from CO...
+
+2025-11-22  Reuben Thomas  <rrt@sc3d.org>
+
+	Fix ispell’s handling of comment-end when adding local words
+
+	* lisp/textmodes/ispell.el (ispell-add-per-file-word-list): Deal
+	with `comment-end' in a way that works for comments that don’t
+	nest.
+
+	We proceed as follows: when `comment-end' is non-empty, we only
+	ever insert one start and one end comment, the first time we add
+	a local word.  This works with both C-style (which don’t nest)
+	and Rust-style comments (which do).
+
+	If we’re using line comments (i.e. comments that only have a
+	`comment-start'), then continue to insert one on each line.
+
+	* test/lisp/textmodes/ispell-tests/ispell-tests.el
+	(ispell/ispell-add-per-file-word-list/nxml): Adjust test.
+
+	Bug#79871
+
+2025-11-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix documentation of 'alpha-background' frame parameter
+
+	* doc/lispref/frames.texi (Font and Color Parameters): Fix
+	documentation of values of 'alpha-background'.  Suggested by Jacob
+	S. Gordon <jacob.as.gordon@gmail.com>.  (Bug#79861)
+
+2025-11-22  john muhl  <jm@pub.pink>
+
+	Fix non-interactive use of 'lua-start-process'
+
+	* lisp/progmodes/lua-mode.el (lua-process-init-code): Add newline.
+	(lua-start-process): Use 'process-send-string' to avoid starting
+	two processes.  Flatten 'switches' argument since rest arguments
+	get added to a list.  Replace 'switch-to-buffer' with
+	'pop-to-buffer' so that the process window behavior can be
+	customized with 'display-buffer-alist'.  Expand docstring and
+	update it to match the code.  (Bug#79853)
+
+2025-11-22  Protesilaos Stavrou  <info@protesilaos.com>
+
+	Make Flymake fringe indicators use dedicated faces
+
+	* lisp/progmodes/flymake.el (flymake-error-bitmap)
+	(flymake-warning-bitmap, flymake-note-bitmap): Define new faces.
+	(flymake-error-fringe, flymake-warning-fringe)
+	(flymake-note-fringe): Use the new faces by default.
+	(Bug#79785)
+
+2025-11-22  Ahmed Khanzada  <me@enzu.ru>
+
+	Add `toolkit-theme' and 'toolkit-theme-set-functions'
+
+	* etc/NEWS: Document `toolkit-theme' and
+	'toolkit-theme-set-functions'
+	* lisp/frame.el: Add 'toolkit-theme-set-functions'
+	* src/frame.c: Add `toolkit-theme' Elisp variable
+	* src/gtkutil.c: (xg_update_dark_mode_for_all_displays): Set
+	`toolkit-theme' and call 'toolkit-theme-set-functions'
+	* src/w32fns.c: (w32_applytheme): Send WM_EMACS_SET_TOOLKIT_THEME
+	message to Lisp thread.
+	* src/w32term.h: Declare WM_EMACS_SET_TOOLKIT_THEME
+	* src/w32term.c: (w32_read_socket): Receive
+	WM_EMACS_SET_TOOLKIT_THEME message and set `toolkit-theme' and call
+	'toolkit-theme-set-functions'
+
+2025-11-22  Pip Cet  <pipcet@protonmail.com>
+
+	The --script option now enforces lexical binding (bug#79760)
+
+	* etc/NEWS: Document the change.
+	* lisp/startup.el (command-line--load-script): Set 'lexical-binding';
+	if we delete the first line, insert a new line to preserve line
+	numbers.
+	(command-line--eval-script): Set 'lexical-binding'.
+
+2025-11-22  RadioNoiseE  <rne.kou@icloud.com>  (tiny change)
+
+	Fix XML indentation for CDATA section content
+
+	* lisp/nxml/nxml-mode.el (nxml-merge-indent-context-type):
+	Handle 'cdata-section' type to prevent it from returning 'mixed'.
+	* lisp/nxml/nxml-mode.el (nxml-compute-indent-in-delimited-token):
+	Preserve existing indentation for CDATA section content.
+	(bug#79817)
+
+2025-11-22  Ana  <ana@kigoth.pink>
+
+	csharp-mode : Fix typos and remove duplicated declaration
+
+	* lisp/progmodes/csharp-mode.el (csharp-vsemi-unknown): Rename
+	to 'csharp-vsemi-unknown-p'.  The code was calling a function that
+	does not exist due to this typo.
+	(c-class-decl-kwds): Remove duplicated declaration for csharp.
+	(csharp-ts-mode--font-lock-settings): Remove duplicated declaration
+	of 'escape-sequence'.
+
+2025-11-22  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix thinko in 'window_set_parent_and_normal_sizes'
+
+	* src/window.c (window_set_parent_and_normal_sizes): When
+	assigning normal sizes in a combination, take the direction from
+	its parent's 'horizontal' slot and not from that of the first
+	window in the combination.
+
+2025-11-21  Po Lu  <luangruo@yahoo.com>
+
+	Disable C23 for Android builds
+
+	* configure.ac (ac_cv_prog_cc_c23): Define to no when
+	configuring for Android.
+
+2025-11-21  Po Lu  <luangruo@yahoo.com>
+
+	* lib/strnlen.c (strnlen): Fix syntax error in Gnulib module.
+
+2025-11-20  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix '(vc-revert-file (vc-git-root)'
+
+	* lisp/vc/vc-git.el (vc-git--file-list-is-rootdir):
+	Merge into vc-git-command.
+	(vc-git-command): When operating on the repository root, first
+	bind default-directory to that root.  When operating on the
+	repository root with 'git checkout', pass "." as FILE-OR-LIST.
+
+2025-11-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	A few more functions are not pure
+
+	Assuming ATTRIBUTE_PURE means that the function must return,
+	a few more functions that should not be declared with ATTRIBUTE_PURE.
+	The GCC manual (and even the C23 standard, with [[reproducible]])
+	is not clear about this, and it’s better to be safe.
+	* src/bignum.h (mpz_get_d_rounded):
+	* src/lisp.h (bignum_to_double):
+	No longer pure, as it does not return if memory is exhausted.
+	* src/fns.c (Fproper_list_p): No longer pure, as it does not
+	return if the user quits.
+	* src/gnutls.c (Fgnutls_errorp): No longer pure, as it does not
+	return if it runs into an eassert failure in XSYMBOL_WITH_POS via EQ.
+	* src/lisp.h (bignum_to_intmax, bignum_to_uintmax, bignum_bufsize):
+	No longer pure, as it does not return if it runs into an
+	eassert failure in XBIGNUM via xbignum_val.
+
+2025-11-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Prefer C23 support if available
+
+	This merges in changes that were made to Autoconf master
+	in April 2024.  It causes ‘configure’ to prefer the C compiler to
+	enable C23 features if possible; otherwise, ‘configure’
+	behaves as before, using C11 if available and C99 if not.
+	* admin/merge-gnulib (GNULIB_MODULES): Add std-gnu23.
+	(AVOIDED_MODULES): Add (i.e., start avoiding) std-gnu11.
+	* m4/std-gnu11.m4: Remove.
+	* m4/std-gnu23.m4: Add.
+
+2025-11-20  Juri Linkov  <juri@linkov.net>
+
+	Show the diff buffer with replacements by typing 'd' in 'query-replace'
+
+	* doc/emacs/search.texi (Query Replace): Mention new key 'd'.
+
+	* lisp/replace.el (query-replace-help): Mention the key 'd'.
+	(query-replace-map): Bind the key 'd' to 'diff'.
+	(perform-replace): When 'def' is equal to 'diff',
+	call 'multi-file-replace-as-diff' to show the diff buffer
+	with replacements (bug#79761).
+
+2025-11-20  Juri Linkov  <juri@linkov.net>
+
+	Support buffers in FILES arg of multi-file-replace-as-diff (bug#79761)
+
+	* lisp/misearch.el (multi-file-replace-as-diff): Allow providing
+	a list of buffers in the argument FILES.  Add autoload cookie.
+	(replace-regexp-as-diff): Provide the current buffer to
+	'multi-file-replace-as-diff' when 'buffer-file-name' is nil.
+
+2025-11-20  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-exec-after: Drop passing zero timeout to accept-process-output
+
+	This reverts this change:
+
+	    Author:     Sean Whitton <spwhitton@spwhitton.name>
+	    AuthorDate: Thu Oct 30 20:45:31 2025 +0000
+	    Commit:     Sean Whitton <spwhitton@spwhitton.name>
+	    CommitDate: Fri Nov 7 15:40:25 2025 +0000
+
+	      vc-exec-after: Pass zero timeout to accept-process-output
+
+	      * lisp/vc/vc-dispatcher.el (vc-exec-after): Pass zero timeout to
+	      accept-process-output.
+	      Fix due to Spencer Baugh <sbaugh@janestreet.com>.
+
+	See thread starting at
+	<https://lists.gnu.org/archive/html/emacs-devel/2025-11/msg00263.html>
+
+2025-11-20  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	Use documentation mark-up face for 'tag_name' node in document block.
+
+	Embedded documentation mark-up should be used for 'tag_name' in
+	documentation blocks (thanks to Protesilaos Stavrou).
+
+	* lisp/progmodes/c-ts-common.el
+	(c-ts-mode-doxygen-comment-font-lock-settings):
+	* lisp/progmodes/js.el (js--treesit-font-lock-settings):
+	* lisp/progmodes/php-ts-mode.el
+	(php-ts-mode--phpdoc-font-lock-settings): Replace 'font-lock-constant-face'
+	with 'font-lock-doc-markup-face' (bug#79856).
+
+2025-11-20  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Add modification hooks to remove the hidden blocks
+
+	bug#79865
+
+	* lisp/progmodes/hideshow.el (hs--discard-overlay-after-change):
+	New function.
+	(hs-make-overlay): Use the new function.
+
+2025-11-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2025-11-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix more mis-declarations of non-const functions
+
+	Problem reported by Helmut Eller in:
+	https://lists.gnu.org/r/emacs-devel/2025-11/msg00809.html
+	* src/data.c (Fsymbol_with_pos_p, Fnatnump):
+	* src/fns.c (Fproper_list_p):
+	* src/gnutls.c (Fgnutls_errorp):
+	Now pure, not const.
+
+2025-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Editorconfig: Cherrypick from commit fbd078ad6478 from upstream
+
+	* lisp/editorconfig-core-handle.el (editorconfig-core-handle--parse-file):
+	Bump limits beyond the spec's minimum.
+	Cherrypick from commit fbd078ad6478 from upstream.
+	* lisp/editorconfig-fnmatch.el (editorconfig-fnmatch--do-translate):
+	Hoist `push` out of the `cl-case`.
+
+2025-11-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix mis-declarations of non-const functions
+
+	Problem for mpz_get_d_rounded reported by Helmut Eller in:
+	https://lists.gnu.org/r/emacs-devel/2025-11/msg00795.html
+	* lib-src/make-docfile.c (DEFUN_pure): New constant.
+	(write_globals, scan_c_stream): Support "attributes: pure".
+	* src/bignum.h (mpz_get_d_rounded):
+	* src/data.c (Fsymbolp, Fmodule_function_p, Fintegerp, Fnumberp):
+	* src/lisp.h (bignum_to_double, bignum_to_intmax)
+	(bignum_to_uintmax, bignum_bufsize):
+	Now pure, not const, since they depend on current state.
+	For example, Fsymbolp now inspects symbols_with_pos_enabled,
+	and the bignum functions inspect bignum contents in memory.
+	* src/data.c (Feq):
+	* src/xfaces.c (Fface_attribute_relative_p):
+	No longer const, since they might abort when debugging.
+	* src/pdumper.h (pdumper_object_p, pdumper_cold_object_p)
+	(pdumper_find_object_type, pdumper_object_p_precise):
+	These are not const functions.  But there is no need to declare
+	them to be pure, either, as they’re inline so the compiler can
+	figure it out.
+
+2025-11-19  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Fix implicit usage of the current window-width in vtable.el
+
+	Previously, many functions in vtable.el called 'vtable--cache',
+	which computed 'vtable--cache-key' based on the current selected
+	window and frame; this could cause vtable functions to fail or
+	misbehave if they were not called from the selected window and
+	frame that 'vtable-insert' was last called in.
+
+	Now, the vtable cache is stored with the text of the vtable, so
+	that functions which need to interact with some vtable text can
+	do so reliably without having to use the same selected window
+	and frame.
+
+	Also, 'vtable-update-object' has always required TABLE to be
+	present at point in the current buffer; now its docstring states
+	this.
+
+	* lisp/emacs-lisp/vtable.el (vtable--current-cache)
+	(vtable--cache-widths, vtable--cache-lines): Add.
+	(vtable-insert): Save cache in 'vtable-cache.
+	(vtable--ensure-cache, vtable--recompute-cache): Inline into
+	'vtable-insert'.
+	(vtable--widths, vtable--cache): Delete.
+	(vtable-update-object): Use 'vtable--current-cache' and
+	update docstring.  (Bug#69837)
+	(vtable-remove-object, vtable-insert-object): Use
+	'vtable--current-cache' and save cache in 'vtable-cache'.
+	(vtable--sort, vtable--alter-column-width)
+	(vtable-previous-column, vtable-next-column): Use
+	'vtable--current-cache'.
+
+2025-11-19  10sr  <8.slashes@gmail.com>
+
+	Editorconfig: Fix for `spaces_in_middle_key` test
+
+	* lisp/editorconfig-core-handle.el (editorconfig-core-handle--parse-file):
+	fix for `spaces_in_middle_key` test.
+
+	Cherrypick of commit 72b8847275cb from upstream.
+
+2025-11-19  Ron Parker  <rdparker@gmail.com>  (tiny change)
+
+	Editorconfig: Fix parsing section lines with trailing comments (#363)
+
+
+	* lisp/editorconfig-core-handle.el (editorconfig-core-handle--parse-file):
+	Fix parsing section lines with trailing comments.
+
+	Cherrypick of commit 183cfa105c2e from upstream.
+
+2025-11-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Fix `editorconfig-display-current-properties`
+
+	In Emacs-30, `editorconfig-display-current-properties` was
+	broken in that it displayed only the properties set by
+	`editorconfig-apply` but not those set in the "normal" way,
+	i.e. by `hack-local-variables`.  Fix that along with a few
+	docstrings that had misleading old info.
+
+	* lisp/editorconfig-tools.el (editorconfig-apply)
+	(editorconfig-mode-apply): Fix docstring and declare obsolete.
+
+	* lisp/editorconfig.el (editorconfig-properties-hash):
+	(editorconfig-call-get-properties-function): Remove elements of
+	docstring that aren't true any more.
+	(editorconfig-call-get-properties-function):
+	Set `editorconfig-properties-hash`.
+
+2025-11-19  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix 'make_lispy_position' for left margin clicks (Bug#79846)
+
+	* src/keyboard.c (make_lispy_position): When calculating a
+	position in the left margin skip any scroll bar on the left of
+	the associated window (Bug#79846).
+
+2025-11-19  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Fix regressions. (Bug#79857)
+
+	* lisp/progmodes/hideshow.el (hs-block-positions): Exit the
+	function if 'hs-forward-sexp' fails.
+	(hs-hide-level-recursive): Fix infloop.
+	* test/lisp/progmodes/hideshow-tests.el (hideshow-hide-level-1):
+	(hideshow-hide-level-2): Update tests.
+
+2025-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(loaddefs-generate--emacs-batch): Fix bug#79821 again
+
+	Hopefully, this one is for good.
+	Use `file-truename` on all the input file/dir names to try and
+	make sure we don't get bitten any more by symlinks or driver
+	letter capitalization.
+
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate): Revert last change.
+	(loaddefs-generate--excluded-files): Remove test that's not needed any
+	more now that we use all relative names.
+	(loaddefs-generate--emacs-batch): Apply truename to all input files/dirs.
+
+2025-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(lisp-indent-function): Auto-load macros to get the indent info
+
+	Rather than preload the `lisp-indent-function` property for
+	autoloaded macros, auto-load them to fetch their property.
+	In terms of cost, this slightly reduces the heap size at
+	startup, while tending to increase the heap size while editing
+	ELisp code since more packages will be (auto)loaded.
+
+	The benefit is elsewhere: by loading the definition the macro we
+	will also load other (non-autoloaded) definitions, so we get
+	better behavior for things like `ert.el` and `inline.el` where
+	only some of the macros are autoloaded, because there's a good
+	chance that we'll end up loading them to indent the autoloaded
+	macro, after which indentation of the other macros will be
+	performed correctly (bug#68818).
+
+	* lisp/emacs-lisp/byte-run.el (byte-run--dont-autoload): New function.
+	(macro-declarations-alist): Use it to override `byte-run--set-indent`.
+
+	* lisp/emacs-lisp/lisp-mode.el (lisp-indent-function): Auto-load macros
+	if needed to get the indent info.
+
+2025-11-18  Anatolii Smolianinov  <zarkonesmall@gmail.com>  (tiny change)
+
+	Eglot: use symbol at point as default in eglot-rename (bug#79757)
+
+	* lisp/progmodes/eglot.el (eglot-rename): Tweak.
+
+2025-11-18  Juri Linkov  <juri@linkov.net>
+
+	Display daemon startup warnings on the first client frame (bug#79783)
+
+	* lisp/emacs-lisp/warnings.el (display-warning): For warnings/errors
+	on the initial daemon frame use 'after-make-frame-functions'
+	to postpone their display until the first client frame is created.
+	(warning--display-buffer): New internal function refactored out of
+	'display-warning'.
+
+2025-11-18  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Update to Transient v0.11.0-10-g6637364e
+
+2025-11-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix MinGW build broken by integration of 'stdio-consolesafe'
+
+	* src/conf_post.h: Avoid redirecting '*printf' functions if
+	'OMIT_CONSOLESAFE' is defined to 1.
+	* nt/cmdproxy.c:
+	* nt/ddeclient.c: Define 'OMIT_CONSOLESAFE' to 1 to avoid
+	redirecting '*printf functions' to stdio-consolesafe replacements.
+	* nt/Makefile.in (LIBS_ADDPM): Add -lgnu to link 'addpm' against
+	Gnulib.  (Bug#79855)
+
+2025-11-18  Sean Whitton  <spwhitton@spwhitton.name>
+
+	diff-apply-hunk: Avoid display-buffer-overriding-action
+
+	* lisp/vc/diff-mode.el (diff-apply-hunk): Use ACTION argument to
+	display-buffer instead of display-buffer-overriding-action.
+
+2025-11-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/emacs-lisp/smie.el (smie-indent-basic): Add safety predicate
+
+2025-11-17  Juri Linkov  <juri@linkov.net>
+
+	Improve hs-indicator-mouse-toggle-hiding for non-selected windows
+
+	* lisp/progmodes/hideshow.el (hs-indicator-mouse-toggle-hiding):
+	Use 'mouse-set-point' to select the clicked window when it was not selected.
+
+2025-11-17  Juri Linkov  <juri@linkov.net>
+
+	New hideshow option 'hs-cycle-filter' for visibility-cycling with 'TAB'
+
+	* doc/emacs/programs.texi (Hideshow): Add 'hs-cycle-filter' and
+	remove duplicate 'hs-toggle-hiding'.
+
+	* lisp/progmodes/hideshow.el (hs-cycle-filter): New defcustom (bug#79585).
+	(hs-minor-mode-map): Bind 'TAB' to 'hs-toggle-hiding' using the filter.
+
+2025-11-17  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Simplify code. (Bug#79585)
+
+	* lisp/progmodes/hideshow.el (hs-get-first-block): New function.
+	(hs--add-indicators, hs-hide-block): Use the new function and
+	simplify.
+
+2025-11-16  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
+
+	ntlm.el: Add Package-Requires and fix two docstrings
+
+	* lisp/net/ntlm.el (Package-Requires): Add emacs 27.1.
+	* lisp/net/ntlm.el (ntlm-build-auth-response, ntlm-string-xor):
+	Fix docstrings to satisfy `checkdoc'.
+
+2025-11-16  Juri Linkov  <juri@linkov.net>
+
+	* lisp/outline.el: Small fixes.
+
+	(outline-font-lock-keywords, outline-minor-mode-highlight-buffer):
+	Fall back to eol when there is no newline at the end of outline at eob.
+	(outline-after-change-functions): Remove the temporarily added variable.
+	(outline--fix-buttons): Remove its last use.
+
+2025-11-16  João Távora  <joaotavora@gmail.com>
+
+	Eglot: rework semtok feature again
+
+	This time, I bit the bullet and made eglot--semtok-cache a list
+	of responses.  This is motivated by "range" request which happen
+	in for multiple regions asynchronously.  They must all be
+	(eventually) sent and cannot stomp on each others' cache.
+
+	Figuring out when to delete outdated entries from
+	eglot--semtok-cache is also tricky.  It must be done only once
+	we're certain an outdated entry cannot be reused for a "delta"
+	request.
+
+	* lisp/progmodes/eglot.el (eglot--semtok-cache): Reword docstring.
+	(eglot--semtok-apply-delta-edits): Tweak variable name.
+	(eglot--semtok-request): Rework again.
+	(eglot--semtok-font-lock): Rework.
+	(eglot--semtok-font-lock-1): DATA no longer optional.
+
+2025-11-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix last change in keyboard.c
+
+	* src/keyboard.c (adjust_point_for_property): Handle 'display'
+	property on the same text as 'invisible' property the same as the
+	overlay with a 'display' property.  (Bug#79787)
+
+2025-11-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix cursor motion across invisible text with an overlay
+
+	* src/keyboard.c (adjust_point_for_property): Handle the case
+	where invisible text has an overlay over it with a replacing
+	'display' property, which leaves some "trace" of the invisible
+	text on display.  (Bug#79787)
+
+2025-11-16  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Make ellipsis a little noticeable in TTY frames
+
+	bug#79585
+
+	* lisp/progmodes/hideshow.el (hs-ellipsis): Use 'shadow' face.
+	(hs--get-ellipsis): Rework.
+	(hs-already-hidden-p): Fix regression.
+
+2025-11-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Workaround for MSVCRT stdio on MS-Windows for CJK locales
+
+	MSVCRT implementation of stdio functions which output
+	characters one by one fails for CJK double-byte encodings.
+	Gnulib provides replacement functions which work around
+	those bugs.  This change makes Emacs and lib-src programs
+	use the replacements when Emacs is linked against MSVCRT.
+	* src/conf_post.h (fwrite, fprintf, printf, vfprintf, vprintf)
+	[WINDOWSNT]: Redirect to Gnulib replacements when Emacs is linked
+	against MSVCRT (as opposed to UCRT).  Suggested by Bruno Haible
+	<bruno@clisp.org>.
+
+2025-11-16  João Távora  <joaotavora@gmail.com>
+
+	Eglot: rework semtok feature again
+
+	This version was tested with the clangd, rust-analyzer and lean servers.
+	Each server is slightly different.
+
+	The main change is to recognize that that eglot--semtok-request is a
+	promise to get some data for BEG to END and a promise to flush it.  The
+	eglot--semtok-inflight variable is overhauled so that it more precisely
+	encodes this information.
+
+	The lean server insists on many workspace/semanticTokens/refresh waiting
+	for a textDocument/semanticTokens/full request from our part, but we
+	don't give in.  The spec doesn't actually say what types of requests the
+	clients should issue.  It eventualy gives up.  The only thing we do on
+	this request is to flush everything we know.  After this flush, the
+	font-lock machinery will know what to do.
+
+	* lisp/progmodes/eglot.el (eglot--async-request): Return id.
+	(eglot--semtok-inflight): Redesign variable.
+	(eglot-handle-request): Just flush.
+	(eglot--semtok-request): Rewrite.
+	(eglot--semtok-font-lock): Tweak.
+
+2025-11-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix processing sub-process exit when keyboard input is pending
+
+	* src/process.c (wait_reading_process_output): Process status
+	changes of sub-processes when called with read_kbd zero and some
+	"keyboard input" is available, but no output from any sub-process.
+	(Bug#79777)
+
+2025-11-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid extra newline in user-error logged in *Messages*
+
+	* src/xdisp.c (reset_message_log_need_newline): New function.
+	* src/lisp.h: Add prototype of 'reset_message_log_need_newline'.
+	* src/print.c (print_error_message): Call
+	'reset_message_log_need_newline' to prevent message3 from
+	outputting a newline after "user-error:".  (Bug#79840)
+
+2025-11-15  Paul Nelson  <ultrono@gmail.com>
+
+	Improve foldout-exit-fold with negative arg (bug#77370)
+
+	* lisp/foldout.el (foldout-exit-fold): When called with a
+	negative prefix argument (so that the exited fold is not
+	hidden), preserve the position of point and do not recenter.
+
+2025-11-15  Eli Zaretskii  <eliz@gnu.org>
+
+	: Update ldefs-boot.el.
+
+2025-11-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	9b3eb06c76e Indent jsx_text properly with modern grammars
+	1c87be8ac95 ; * lisp/gnus/gnus.el (gnus-summary-line-format): Reindent.
+
+2025-11-15  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	csharp-mode.el: fontify variables assigned from awaited tasks
+
+	* lisp/progmodes/csharp-mode.el (csharp-ts-mode--font-lock-settings):
+	Add missing selector.  (Bug#79825)
+
+2025-11-15  Marc Herbert  <marc.herbert@intel.com>  (tiny change)
+
+	* lisp/gnus/gnus.el (gnus-summary-line-format): Doc fix (bug#79820).
+
+2025-11-15  Protesilaos Stavrou  <info@protesilaos.com>
+
+	Make ibuffer.el use dedicated faces
+
+	* lisp/ibuffer.el (ibuffer-marked, ibuffer-deletion)
+	(ibuffer-title, ibuffer-filter-group-name): Define the faces.
+	(ibuffer-marked-face, ibuffer-deletion-face, ibuffer-title-face)
+	(ibuffer-filter-group-name-face): Make the new faces the default
+	values.  (Bug#79786)
+
+2025-11-15  Jackson Ray Hamilton  <jackson@jacksonrayhamilton.com>
+
+	Indent jsx_text properly with modern grammars
+
+	* lisp/progmodes/js.el:
+	* lisp/progmodes/typescript-ts-mode.el: Indent jsx_text from correct
+	column when a modern grammar is installed; previously was over-indented.
+
+2025-11-14  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix bug in eglot--semtok-font-lock
+
+	The entry condition to eglot--semtok-font-lock-1, which checks
+	if the region to refontify is contained in the recorded region
+	in eglot--semtok-cache was blatantly wrong.  It used 'beg'
+	twice!
+
+	* lisp/progmodes/eglot.el (eglot--semtok-font-lock): Fix bug.
+
+2025-11-14  João Távora  <joaotavora@gmail.com>
+
+	Eglot: invalidate local semtok cache at server's bidding
+
+	When the server sends workspace/semanticTokens/refresh, calling
+	font-lock-flush isn't enough.  It will trigger a new
+	eglot--semtok-font-lock call, but we can't assume anything about
+	the validity of eglot--semtok-cache.
+
+	Clangd seems to send workspace/semanticTokens/refresh when
+	complicated enough changes happen in an LSP document.  If the
+	buffer-local eglot--semtok-cache isn't flushed we'll likely
+	request a delta, and clangd may still supply it, but it won't
+	apply correctly to the outdated local state.
+
+	* lisp/progmodes/eglot.el (eglot--semtok-cache)
+	(eglot--semtok-inflight): Move up here.
+	(eglot-handle-request): Flush the eglot--semtok-cache.
+
+2025-11-14  João Távora  <joaotavora@gmail.com>
+
+	Eglot: janitorial cleanup
+
+	* lisp/progmodes/eglot.el (eglot--lsp-position-to-point): Use
+	eglot--widening.
+	(eglot--lsp-position-to-point): Use eglot--widening.
+	(eglot-range-region): New util.
+	(eglot-format)
+	(eglot--code-action-params)
+	(eglot--update-hints-1)
+	(eglot--semtok-request): Use eglot-range-region.
+	(eglot--after-change): Add comment.
+
+	eglot-range-region is an idea by Lua Viana Reis <me@lua.blog.br>
+
+2025-11-14  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Autoload match*, bind*, bind-and* dummy macros
+
+	* lisp/emacs-lisp/cond-star.el (match*, bind*, bind-and*):
+	Autoload, for the sake of syntax highlighting.
+
+2025-11-14  Sean Whitton  <spwhitton@spwhitton.name>
+
+	diff-apply-hunk: Don't display BUF in the selected window
+
+	* lisp/vc/diff-mode.el (diff-apply-hunk): Don't display BUF in
+	the selected window.
+
+2025-11-14  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Do eager display of *Completions* while idle
+
+	Don't block user input while rendering the *Completions* buffer
+	due to eager-display.  This allows eager-display to be used with
+	larger and slower completion tables without interfering with the
+	user.  Like in eager-update, we use while-no-input and
+	non-essential to ensure that eager-display happens without
+	blocking the user.
+
+	To support this, we remove the ability to set eager-display to a
+	function.  The only user was tmm.el, which nows sets
+	eager-display to t and adds a completion-setup-hook instead.
+	(This also fixes a bug in tmm where dismissing and redisplaying
+	the *Completions* buffer would not have the special help text)
+
+	* lisp/minibuffer.el (completion-eager-display--timer)
+	(completions--eager-display, completions--start-eager-display):
+	Add. (bug#79819)
+	(completing-read-default): Call
+	completions--start-eager-display, stop supporting functionp
+	eager-display.
+	* lisp/tmm.el (tmm-add-prompt): Delete.
+	(tmm--completion-setup-hook): Add.
+	(tmm-add-prompt): Add completion-setup-hook, set eager-display
+	to t.
+	(tmm-goto-completions): Call minibuffer-completion-help instead
+	of tmm-add-prompt.
+
+2025-11-14  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Update Header Commentary. (Bug#79829)
+
+	* lisp/progmodes/hideshow.el: Document how to migrate from
+	'hs-special-modes-alist'.
+
+2025-11-13  João Távora  <joaotavora@gmail.com>
+
+	Eglot: add two semtok tests
+
+	The tests are pretty basic, I don't expect them to catch
+	anything else than giant bugs.
+
+	* test/lisp/progmodes/eglot-tests.el (eglot-test-semtok-basic)
+	(eglot-test-semtok-refontify): New tests.
+	(eglot--semtok-faces, eglot--semtok-wait): New helpers.
+
+2025-11-13  João Távora  <joaotavora@gmail.com>
+
+	Eglot: tweak some semtok functions to be more debug-friendly
+
+	* lisp/progmodes/eglot.el (eglot--semtok-request): Return value
+	records return reason.
+	(eglot--semtok-font-lock-1): Return number of painted tokens and
+	exit locus.
+	(eglot--semtok-decode-token): Rename
+	from eglot--semtok-token-faces.  Rework.
+	(eglot--semtok-font-lock-1): Use eglot--semtok-decode-token.
+
+2025-11-13  João Távora  <joaotavora@gmail.com>
+
+	Eglot: tidy overlay cleanup code
+
+	And turn off semtok when tearing down eglot--managed-mode.
+
+	* lisp/progmodes/eglot.el (eglot--delete-overlays): New helper.
+	(eglot--managed-mode): Turn off minor modes and cleanup here.
+	(eglot--managed-mode-off): Not here.
+	(eglot-highlight-eldoc-function)
+	(eglot-code-action-suggestion): Use eglot--overlay prop.
+	(eglot-inlay-hints-mode): Use eglot--delete-overlays.
+
+2025-11-13  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Fix indicator mouse clicks on TTY
+
+	* lisp/progmodes/hideshow.el (hs-make-overlay)
+	(hs--make-indicators-overlays): Rework (bug#79585).
+
+2025-11-13  Sean Whitton  <spwhitton@spwhitton.name>
+
+	read_key_sequence: Additional check for fix_current_buffer
+
+	* src/keyboard.c (read_key_sequence): If we were interrupted
+	while initializing the terminal, also check for a change of
+	current buffer (bug#79513).
+
+2025-11-13  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New dummy defmacro for bind*
+
+	* lisp/emacs-lisp/cond-star.el (bind*): New macro, like match*
+	and bind-and*.
+
+2025-11-13  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC revert commands: Facilities to entirely delete revisions
+
+	* lisp/vc/vc.el (vc-revision-revert, vc-revision-cherry-pick):
+	Rename to ...
+	(vc-revert-or-delete-revision, vc-cherry-pick):
+	... these (bug#79408).  All uses changed.
+	* lisp/vc/log-view.el (log-view-revision-revert)
+	(log-view-revision-cherry-pick): Rename to ...
+	(log-view-revert-or-delete-revisions, log-view-cherry-pick):
+	... these.  All uses changed.
+	* lisp/vc/log-view.el (log-view-revert-or-delete-revisions):
+	* lisp/vc/vc.el (vc-revert-or-delete-revision): New INTERACTIVE
+	and DELETE parameters, and prefix argument.  Offer to entirely
+	delete REV in certain circumstances (bug#79408).
+	* lisp/vc/log-view.el (log-view--pick-or-revert):
+	* lisp/vc/vc.el (vc--pick-or-revert): New INTERACTIVE and DELETE
+	parameters.  All uses changes.
+	* lisp/vc/log-view.el (log-view-revert-revisions)
+	(log-view-delete-revisions):
+	* lisp/vc/vc.el (vc-revert-revision, vc-delete-revision): New
+	commands (bug#79408).
+	* doc/emacs/maintaining.texi (VC Change Log, VC Undo)
+	(Copying Between Branches):
+	* etc/NEWS: Document the changes.
+
+2025-11-13  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Revised bindings for diff-revert-and-kill-hunk
+
+	* lisp/vc/diff-mode.el (diff-mode-shared-map): Bind
+	diff-revert-and-kill-hunk to 'u'.
+	(diff-mode-map): Replace binding for diff-revert-and-kill-hunk
+	with 'C-c M-u'.
+	* doc/emacs/files.texi (Diff Mode):
+	* etc/NEWS: Document the change.
+
+2025-11-13  Robert Pluim  <rpluim@gmail.com>
+
+	Support unqualified keycap emoji
+
+	* admin/unidata/emoji-zwj.awk: Add U+20E3 as a trigger codepoint
+	so that U+0023 U+20E3 and similar are displayed using the emoji
+	font.
+
+2025-11-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/replace.el (replace--push-stack, perform-replace): Use markers
+
+	Don't use integers to store match data for "long term".
+	Otherwise, buffer edits that occur between two steps
+	(e.g. via process filters of post-command-hooks) makes it invalid,
+	leading to very confusing behavior, e.g. after `C-M-% ... y`
+	the right (next) match is highlighted yet if a process-filter or
+	post-command-hook runs, the next `y` may replace something else
+	than what was highlighted.
+
+2025-11-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	etc/NEWS.28: Mention `read-symbol-shorthands` to improve `C-h v` info
+
+	lisp/emacs-lisp/bytecomp.el (define-widget): Add `funarg-positions`
+
+2025-11-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(loaddefs-generate--emacs-batch): Fix bug#79821
+
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--emacs-batch):
+	Expand file names before changing directory, in case they're relative.
+
+2025-11-12  João Távora  <joaotavora@gmail.com>
+
+	Eglot: document semantic tokens (semtok) feature (bug#79374)
+
+	Also clarify how to turn off semantic tokens and inlay hints, since I
+	suspect that will be a theme.
+
+	* doc/misc/eglot.texi (Eglot Features): Add semantic tokens.  (Eglot
+	Commands): Document eglot-semantic-tokens-mode.  (Eglot and Buffers):
+	Provide example on how to turn off semtok and inlay hints.
+
+	* etc/EGLOT-NEWS (Changes to upcoming Eglot): Announce semantic
+	tokens support
+
+2025-11-12  João Távora  <joaotavora@gmail.com>
+
+	Eglot: don't use eglot--semtok-idle-timer (bug#79374)
+
+	Don't have evidence for the usefulness of this technique yet.
+
+	* lisp/progmodes/eglot.el (eglot--semtok-idle-timer): Delete.
+	(eglot--semtok-request): Simplify.
+
+2025-11-12  João Távora  <joaotavora@gmail.com>
+
+	Eglot: rework semtok defcustoms and face calculation (bug#79374)
+
+	* lisp/progmodes/eglot.el (eglot-semantic-tokens-faces)
+	(eglot-semantic-tokens-modifier-faces): Delete.
+	(eglot--semtok-types, eglot--semtok-modifiers): Rename from
+	eglot-semantic-tokens-faces and
+	eglot-semantic-tokens-modifier-faces.
+	(eglot-client-capabilities): Tweak.
+	(eglot--lsp-interface-alist): Add SemanticTokensLegend.
+	(eglot--connect): Don't initialize a server.
+	(eglot--semtok-define-things): New helper.
+	(eglot-lsp-server): Just one slot needed.
+	(eglot--semtok-token-faces): Rework.
+
+2025-11-12  João Távora  <joaotavora@gmail.com>
+
+	Eglot: debounce consecutive semtok full/delta requests (bug#79374)
+
+	Many back-to-back calls for 'eglot--semtok-request' and small
+	regions occur even on trivial fast edits.  Even though it's
+	cheap and harmless to send many delta rquests, it's nicer to
+	just send just one.
+
+	The debouncing from jsonrpc-async-request isn't enough.  When a response
+	to a semtok request is received, it's important to remember which
+	regions to flush.  Font-lock logic will then do its magic and coalesce
+	those regions into one before invoking eglot--semtok-font-lock, and
+	eglot--semtok-font-lock-1 will have up-to-date data to work with.
+
+	* lisp/progmodes/eglot.el (eglot--semtok-inflight): New variable.
+	(eglot--semtok-request): Use it.
+
+2025-11-12  João Távora  <joaotavora@gmail.com>
+
+	Eglot: rework semtok again to use only font-lock (bug#79374)
+
+	Stefan's idea to use ONLY font-lock instead of jit-lock seems more
+	promising and less buggy.  I did have to add this slightly odd
+	eglot--semtok-font-lock-2 kludge.  Other than that, it seems fine.
+
+	* lisp/progmodes/eglot.el (eglot-semantic-tokens-mode): Now use
+	ONLY font-lock.
+	(eglot--semtok-request): Rework, don't call painting function
+	here.
+	(eglot--semtok-font-lock): Rename from eglot--semtok-jit-lock and
+	use a single arg.  Maybe call eglot--semtok-font-lock-2.  Return
+	nil or risk crashing Emacs.
+	(eglot--semtok-font-lock-1): Rework slightly.
+	(eglot--semtok-font-lock-2): New helper.
+	(eglot-region-range): Delete.
+
+2025-11-12  João Távora  <joaotavora@gmail.com>
+
+	Eglot: rework semtok to use only jit-lock (bug#79374)
+
+	Kept the general structure but clarified the code paths.
+
+	Simplify many things.  Instead of font-lock-add-keywords, use
+	jit-lock-register exclusively.  Works, but slightly problematic,
+	since when editing the buffer the existing enriched face
+	information is first removed, then re-added.  Will try other
+	approaches.
+
+	* lisp/progmodes/eglot.el (eglot-lsp-server): Tweak doc.
+	(eglot--semtok-request-full-on-idle): Delete.  Integrated into caller.
+	(eglot--semtok-jit-lock): Rename from eglot--semtok-propertize.  Rework.
+	(eglot--semtok-jit-lock-1): Extract from old eglot--semtok-propertize.
+	(eglot-semantic-tokens-mode): Use new eglot--semtok-jit-lock name.
+	(eglot--semtok-put-cache)
+	(eglot--semtok-ingest-range-response)
+	(eglot--semtok-ingest-delta-response)
+	(eglot--semtok-ingest-full-response): Delete helpers.
+	(eglot--semtok-apply-delta-edits): Rework with more cl-loopy idioms.
+	(eglot--semtok-flush-region): Delete.
+	(eglot--semtok-request): Now takes a region as argument.  Rework extensively.
+	(eglot-connect-hook): Don't put
+	eglot--semtok-initialize here.
+	(eglot--connect): Rather here.
+	(eglot--semtok-token-faces): New helper.
+	(eglot--semtok-font-lock): Delete.
+	(eglot--semtok-initialize): Rework.
+	(eglot-semantic-tokens-mode): Simplify.
+
+2025-11-12  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix bug on server-intiated semtok refresh (bug#79374)
+
+	src/emacs -Q src/cm.c \
+	   --eval '(trace-function (quote eglot--semtok-propertize))' \
+	   --eval '(trace-function (quote eglot--semtok-request))' \
+	   --eval '(trace-function (quote font-lock-flush))' -f eglot
+
+	More trace-values will show that too many full requests are being
+	sent.
+
+	* lisp/progmodes/eglot.el
+	(eglot-handle-request): Don't bump eglot--versioned-identifier,
+	since that confuses semtok bootstrap in a new file with clangd.
+
+2025-11-12  João Távora  <joaotavora@gmail.com>
+
+	Eglot: rework semtok code (bug#79374)
+
+	* lisp/progmodes/eglot.el (eglot-semantic-tokens-faces)
+	(eglot-semantic-tokens-modifier-faces): Move up to defcustom section.
+	(eglot--semtok-request-full-on-idle, eglot-handle-request)
+	(eglot--semtok-build-face-map, eglot--semtok-initialize)
+	(eglot-semantic-tokens-mode): Move into semantic tokens section.
+	(eglot--semtok-font-lock): Rename from
+	eglot--semtok-fontify-tokens.
+	(eglot-semantic-tokens-mode): Use eglot--semtok-font-lock.
+	(eglot--semtok-ingest-delta-response): Rename from
+	eglot--semtok-ingest-full/delta-response
+	(eglot--semtok-request): Use new function.
+
+2025-11-12  Lua Viana Reis  <me@lua.blog.br>
+	    João Távora  <joaotavora@gmail.com>
+
+	Eglot: add semantic token (semtok) support (bug#79374)
+
+	* lisp/progmodes/eglot.el (eglot-semantic-tokens-faces)
+	(eglot-semantic-tokens-modifier-faces): New defcustom..
+	(eglot-ignored-server-capabilities): Tweak.
+	(eglot-client-capabilities): Advertise semtok support.
+	(eglot-lsp-server): Tweak.
+	(eglot-region-range): New helper.
+	(eglot-connect-hook): Add eglot--semtok-initialize.
+	(eglot--maybe-activate-editing-mode): Activate
+	eglot-semantic-tokens-mode.
+	(eglot--semtok-idle-timer, eglot--semtok-cache)
+	(eglot--semtok-put-cache, eglot--semtok-ingest-range-response)
+	(eglot--semtok-ingest-full-response)
+	(eglot--semtok-apply-delta-edits)
+	(eglot--semtok-ingest-full/delta-response)
+	(eglot--semtok-flush-region, eglot--semtok-request)
+	(eglot--semtok-propertize, eglot--semtok-fontify-tokens)
+	(eglot--semtok-request-full-on-idle): New helpers.
+	(eglot-handle-request workspace/semanticTokens/refresh): New
+	request handler.
+	(eglot--semtok-build-face-map, eglot--semtok-initialize): New
+	helpers.
+	(eglot-semantic-tokens-mode): New minor mode.
+	(desktop): Mention eglot-semantic-tokens-mode.
+	(command-modes tweak): Add eglot-semantic-tokens-mode.
+
+2025-11-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-do-async-command: Print how long command took to run
+
+	* lisp/vc/vc-dispatcher.el (vc-do-async-command): Print how long
+	the command took to run.
+
+2025-11-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-do-command: Restore using a pipe in the async case
+
+	* lisp/vc/vc-dispatcher.el (vc-do-command): Restore using a pipe
+	in the async case.  This was unintentionally changed when adding
+	support for discarding output.
+
+2025-11-11  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	ca4af1768d6 Fix crash on Android 2.2
+
+2025-11-11  Po Lu  <luangruo@yahoo.com>
+
+	Fix crash on Android 2.2
+
+	* src/android-asset.h (AAssetManager_open): Initialize desc and
+	asset to NULL, lest `desc' be accessed uninitialized if C_NAME
+	does not exist in the directory tree.
+
+2025-11-11  Michael Albinus  <michael.albinus@gmx.de>
+
+	Extend Tramp direct async processes for further methods
+
+	* lisp/net/tramp-container.el (tramp-methods) <distrobox>:
+	* lisp/net/tramp-sh.el (tramp-methods) <sg>: Add `tramp-direct-async'.
+	(tramp-expand-script): Fix typo in script name.
+	(tramp-maybe-send-script): Adapt docstring.
+
+2025-11-11  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Fix indicators for multiple block in the same line
+
+	bug#79810
+
+	* lisp/progmodes/hideshow.el (hs-hideable-region-p): Simplify.
+	(hs-block-positions): Change return value.
+	(hs--add-indicators): Go to the next line only if we have
+	successfully created the overlays.
+	(hs-hide-block-at-point, hs-hide-block): Update code.
+
+2025-11-10  Juri Linkov  <juri@linkov.net>
+
+	Improve hideshow support for heex-ts-mode and yaml-ts-mode
+
+	* lisp/progmodes/heex-ts-mode.el (heex-ts--thing-settings): Add 'defun' thing.
+	(heex-ts-mode): Use it in 'hs-treesit-things'.
+
+	* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode): Set 'hs-treesit-things'
+	and 'hs-adjust-block-end-function'.
+
+2025-11-10  Juri Linkov  <juri@linkov.net>
+
+	Improve hideshow support for elixir-ts-mode and heex-ts-mode
+
+	* lisp/progmodes/elixir-ts-mode.el (elixir-ts--thing-settings):
+	Add 'defun' thing.
+	(elixir-ts-mode): Set 'hs-treesit-things'.
+	* lisp/progmodes/heex-ts-mode.el (heex-ts-mode):
+	Set 'hs-treesit-things'.  Use bos/eos instead of bol/eol.
+
+2025-11-10  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-do-command: Support discarding standard error
+
+	* lisp/vc/vc-dispatcher.el (vc-do-command): Support discarding
+	standard error.
+	* lisp/vc/vc-hg.el (vc-hg-dir-status-files): Discard standard
+	error of 'hg status' to avoid parsing mistakes.
+	(vc-hg-command): Update docstring given new meaning of first
+	argument to vc-do-command.
+	* test/lisp/vc/vc-tests/vc-test-misc.el (vc-test-do-command-1)
+	(vc-test-do-command-2, vc-test-do-command-3)
+	(vc-test-do-command-4, vc-test-do-command-5)
+	(vc-test-do-command-6, vc-test-do-command-7): New tests.
+
+2025-11-10  João Távora  <joaotavora@gmail.com>
+
+	Flymake: fix compatibility to older emacsen (bug#79769)
+
+	* lisp/progmodes/flymake.el (flymake-diagnostics-buffer-mode-map):
+	Don't use keymap-set.
+	(Package-Requires): Require project 0.11.1
+	(Version): Bump to 1.4.3.
+
+2025-11-10  Spencer Baugh  <sbaugh@janestreet.com>
+	    João Távora  <joaotavora@gmail.com>
+
+	Eglot: consider invisibility in eldoc one-liners (bug#79779)
+
+	Since we keep the invisible characters of all the
+	server-supplied markdown, we risk that the first lines are
+	entirely invisible.  This defeats the :echo calculation in
+	eglot-hover-eldoc-function.
+
+	Fallout of bug#79552.
+
+	* lisp/progmodes/eglot.el (eglot-hover-eldoc-function): Fix.
+
+2025-11-10  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	* lisp/progmodes/grep.el (grep-menu-map): Add "Edit Grep Buffer" (bug#79793).
+
+2025-11-10  Po Lu  <luangruo@yahoo.com>
+
+	Port Android build system to Autoconf < 2.70
+
+	* m4/ndk-build.m4 (ndk_INIT): Don't suppose that $ac_aux_dir
+	will be terminated with a trailing slash on Autoconf 2.69 and
+	earlier.
+
+2025-11-10  Michael R. Mauger  <michael@mauger.com>
+
+	Zone multi-window and -frame support
+
+	* lisp/play/zone.el: Multi-window and -frame support.
+	(zone): New group.
+	(zone-buffer-name): New	constant.
+	(zone-add-program, zone-remove-program): New functions.
+
+	* : User configuration
+	(zone-all-frames, zone-all-windows-in-frame)
+	(zone-delete-other-windows): New boolean options.
+	(zone-time-elapsed-while-zoning): New var.
+	(zone-start-hook, zone-finish-hook): New hooks.
+
+	* : Preserve frame configuration
+	(zone-frame-configuration-alist): New Alist of cursor type and
+	window configuration per frame.
+	(zone--save-frame-configuration)
+	(zone--restore-frame-configuration)
+	(zone--restore-all-frame-configuration): New internal functions to
+	restore windows and frames.
+
+	* : Rewrite/modularization of zone logic
+	(zone): Refactor function.
+	(zone--buffer-empty-p, zone--buffer-encrypted-p): New functions.
+	(zone--choose-window-and-buffer): New function.
+	(zone-ignored-buffers, zone--buffer-zoneable-p): New var and function.
+	(zone--build-zone-buffer): New function to create zone buffer.
+	(zone--prepare-frames): New function to configure multi-frames and -windows.
+	(zone--apologize-seconds, zone--apologize-for-failing): New var
+	and function when zone fails.
+
+2025-11-09  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/flymake.el (flymake-start): Use 'when-let*' (bug#79796).
+
+	This fixes the case when 'flymake-autoresize-margins' is nil, but
+	'flymake--suitably-fringed-p' returns nil and still resizes margins.
+
+2025-11-09  Juri Linkov  <juri@linkov.net>
+
+	* lisp/vc/diff-mode.el (diff-changed-unspecified): Restore old colors.
+
+	Restore yellow colors previously used in the 'diff-changed' face.
+	Copy color values from 'smerge-base'.  This will distinguish them
+	from grey 'diff-file-header' and 'diff-hunk-header' in context diffs.
+
+2025-11-09  Juri Linkov  <juri@linkov.net>
+
+	* lisp/simple.el (minibuffer-default-add-shell-commands): Fix old bug.
+
+	Don't treat the first element of the list of commands as a file name.
+
+2025-11-09  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/w32fns.c (Fw32_system_idle_time): New function.
+
+2025-11-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	Improve handling of Tramp internal shell scripts
+
+	* doc/misc/tramp.texi (New operations): Mention tramp-expand-script.
+
+	* lisp/net/tramp-sh.el (tramp-uudecode)
+	(tramp-readlink-file-truename, tramp-perl-file-truename)
+	(tramp-perl-file-name-all-completions)
+	(tramp-shell-file-name-all-completions)
+	(tramp-perl-file-attributes)
+	(tramp-perl-directory-files-and-attributes, tramp-perl-id)
+	(tramp-python-id, tramp-perl-encode, tramp-perl-decode)
+	(tramp-awk-encode, tramp-awk-decode)
+	(tramp-bundle-read-file-names): Indent script for better readability.
+	(tramp-perl-file-name-all-completions)
+	(tramp-shell-file-name-all-completions)
+	(tramp-ls-file-attributes, tramp-bundle-read-file-names):
+	Adapt docstring.
+	(tramp-shell-print-quoted-string): New defconst.
+	(tramp-shell-file-name-all-completions): Use "%b" format specifier.
+	(tramp-bundle-read-file-names):  Use "%k" format specifier.
+	(tramp-sh-handle-file-name-all-completions): Don't send
+	`tramp-bundle-read-file-names'.
+	(tramp-expand-script): Adapt docstring.  Apply always
+	`format-spec'.  Handle also "%b" and "%k" format specifiers.
+
+2025-11-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-do-command: Error when BUFFER is nil, untabify
+
+	This function is shortly to gain support for separating standard
+	output and standard error from the child.  Commit untabifying it
+	first to make the diff adding the new features more readable.
+	This will include documented support for BUFFER nil, meaning to
+	discard output.
+
+	* lisp/vc/vc-dispatcher.el (vc-do-command): Untabify the source
+	in preparation for work on this function.  If BUFFER is nil,
+	signal an error, in keeping with the current docstring.
+	Use ensure-list.  Use equal not string= for string comparison.
+
+2025-11-09  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Rework previous changes
+
+	* lisp/progmodes/hideshow.el (hs-grok-mode-type): Improve 'hs--set-variable'.
+	* lisp/progmodes/python.el (python-base-mode, python-ts-mode):
+	Provide backward-compatibility for older versions.
+
+2025-11-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a crash in 'merge_face_ref'
+
+	* src/xfaces.c (get_lface_attributes): Avoid crashes if F is NULL.
+	This happens when 'face_inheritance_cycle' is for some reason
+	called for the default attributes of a face (which are applicable
+	to future frames).  We avoid the crashes by not consulting face
+	remapping in that case, since face remapping is buffer-local, and
+	therefore cannot possibly affect face defaults.  (Bug#79790)
+
+2025-11-08  Wilson Snyder  <wsnyder@wsnyder.org>
+
+	verilog-mode: Make recent change backward-compatible and update from package upstream.
+
+	* lisp/progmodes/verilog-mode.el (verilog-mode): Support Emacs 31.1
+	'hs-forward-sexp-func in backward-compatible way.
+	(verilog-submit-bug-report) Remove key binding.
+
+2025-11-08  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Rework previous changes
+
+	* lisp/progmodes/hideshow.el: Set default values of buffer-local variables.
+	(hs-inside-comment-p): Restore.
+	(hs--set-variable): Rename from 'hs--get-mode-value'.
+	(hs-grok-mode-type): Rework.
+	* lisp/nxml/nxml-mode.el:
+	* lisp/progmodes/f90.el:
+	* lisp/progmodes/fortran.el:
+	* lisp/progmodes/icon.el:
+	* lisp/progmodes/lua-mode.el:
+	* lisp/progmodes/python.el:
+	* lisp/progmodes/verilog-mode.el:
+	* lisp/progmodes/vhdl-mode.el:
+	* lisp/textmodes/mhtml-mode.el:
+	* lisp/textmodes/sgml-mode.el:
+	* lisp/treesit.el (treesit-major-mode-setup): Rename
+	'hs-forward-sexp-func' to 'hs-forward-sexp-function',
+	'hs-adjust-block-beginning' to 'hs-adjust-block-beginning-function',
+	'hs-find-block-beginning-func' to 'hs-find-block-beginning-function',
+	'hs-find-next-block-func' to 'hs-find-next-block-function',
+	'hs-looking-at-block-start-p-func' to 'hs-looking-at-block-start-predicate',
+	'hs-inside-comment-p-func' to 'hs-inside-comment-predicate'.
+
+2025-11-08  Steven Allen  <steven@stebalien.com>
+
+	Lookup cached basic-auth credentials with the correct key
+
+	Credentials cached in 'url-basic-auth-storage' are keyed by
+	"server:port", but were being looked up by just "server" in
+	'url-basic-auth'.
+	* lisp/url/url-auth.el (url-basic-auth): Lookup cached basic auth
+	credentials by "server:port".  (Bug#79486)
+
+	* test/lisp/url/url-auth-tests.el (url-auth-test-auth-retrieve-cache):
+	Check the digest auth test-cases cache retrieval test cases against the
+	basic auth logic.
+
+2025-11-08  Alexander Kuleshov  <kuleshovmail@gmail.com>
+
+	* lisp/progmodes/ld-script.el: Add 'PT_TLS' to 'ld-script-keywords'.
+
+2025-11-08  David Fussner  <dfussner@googlemail.com>
+
+	Fix package-vc to install multiple info manuals
+
+	* lisp/emacs-lisp/package-vc.el (package-vc--build-documentation):
+	  Take the name of the .info file from the name of the source file,
+	  instead of from the name of the package.
+
+2025-11-08  Philip Kaludercic  <philipk@posteo.net>
+
+	Fix error messages when building docs for VC packages
+
+	* lisp/emacs-lisp/package-vc.el (package-vc--build-documentation):
+	Use the buffer name of the output buffer instead of the buffer
+	name of the current buffer.
+
+2025-11-08  Philip Kaludercic  <philipk@posteo.net>
+
+	Allow 'package-upgrade-all' to upgrade built-in packages
+
+	* lisp/emacs-lisp/package.el (package-upgrade-all): Respect
+	'package-install-upgrade-built-in'.  (Bug#79718)
+
+2025-11-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	a71ba898db8 ; Update the MinGW URLs in w32 FAQ and nt/INSTALL
+	e0ffcc655e5 No more color emoji issue on OpenBSD 7.8 and later (bug#7...
+
+2025-11-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Adapt vc-test-misc to MS-Windows
+
+	* test/lisp/vc/vc-tests/vc-test-misc.el (vc-test-exec-after-1)
+	(vc-test-exec-after-2, vc-test-exec-after-3)
+	(vc-test-exec-after-4, vc-test-exec-after-5): Fix shell commands
+	for MS-Windows: use "&" instead of ";" and don't use fractional
+	times for 'sleep', as some Windows ports of 'sleep' don't support
+	that.
+
+2025-11-08  Lester Longley  <lester@ieee.org>  (tiny change)
+
+	Fix 'bind*' in 'cond*'
+
+	* lisp/emacs-lisp/cond-star.el (cond*-non-exit-clause-substance):
+	Fix 'bind*' to match the documentation.  (Bug#79247)
+
+2025-11-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate): Fix bug#79694
+
+2025-11-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(diff-refine-threshold): New custom var (bug#79546)
+
+	Avoid getting stuck waiting for `diff` to refine big hunks.
+
+	* lisp/vc/diff-mode.el (diff-refine-threshold): New custom var.
+	(diff--refine-hunk): Add arg `skip-if-large` and use that new var if
+	the arg says so.
+	(diff-refine-hunk): Add arg `skip-if-large`.
+	(diff-auto-refine-mode, diff-next/prevhunk, diff--font-lock-refined):
+	Use it.
+
+2025-11-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New tests for vc-exec-after
+
+	* test/lisp/vc/vc-tests/vc-test-misc.el
+	(vc-test--exec-after-wait): New macro.
+	(vc-test-exec-after-1, vc-test-exec-after-2)
+	(vc-test-exec-after-3, vc-test-exec-after-4)
+	(vc-test-exec-after-5): New tests.
+
+2025-11-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-exec-after: Pass zero timeout to accept-process-output
+
+	* lisp/vc/vc-dispatcher.el (vc-exec-after): Pass zero timeout to
+	accept-process-output.
+	Fix due to Spencer Baugh <sbaugh@janestreet.com>.
+
+2025-11-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Replace recursive calls of vc-exec-after
+
+	* lisp/vc/vc-dispatcher.el (vc-exec-after): Refactor so as to no
+	longer repeatedly add and remove the sentinel.  Don't have two
+	different ways to set mode-line-process.  Don't call
+	accept-process-output from the sentinel, because Emacs always
+	reads all available process output before calling sentinels.
+
+2025-11-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Merge vc--process-sentinel into vc-exec-after
+
+	* lisp/vc/vc-dispatcher.el (vc--process-sentinel, vc-exec-after):
+	Merge vc--process-sentinel into vc-exec-after.  Tidy up.  This
+	should not involve any functional changes; those are to follow.
+
+2025-11-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	server-eval-at: End request in trailing space
+
+	This is for consistency with how emacsclient behaves.
+
+	* lisp/server.el (server--process-filter-1): Improve assertion.
+	(server-eval-at): End request with trailing space.
+
+2025-11-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-start-logentry: Disable log-edit-hook when finishing immediately
+
+	* lisp/vc/vc-dispatcher.el (log-edit-hook): Declare.
+	(vc-start-logentry): Bind log-edit-hook to nil when finishing
+	the log edit immediately with a caller-supplied message.
+
+2025-11-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Don't discard empty string arguments from emacsclient
+
+	* lisp/server.el (server--process-filter-1): Don't discard empty
+	string arguments from emacsclient.
+	(server-eval-args-left):
+	* doc/emacs/misc.texi (emacsclient Options):
+	* etc/NEWS: Document the change.
+
+2025-11-07  Protesilaos Stavrou  <info@protesilaos.com>
+
+	Update modus-themes to version 5.1.0
+
+	* doc/misc/modus-themes.org (Build on top of the Modus themes):
+	Bump the version number.
+	(Acknowledgements): Include more names in the Acknowledgements
+	section.
+	* etc/themes/modus-themes.el (modus-themes--activate)
+	(modus-themes-get-all-known-themes, modus-themes-known-p)
+	(modus-themes--list-enabled-themes)
+	(modus-themes-get-current-theme)
+	(modus-themes--get-theme-palette-subr)
+	(modus-themes-get-theme-palette, modus-themes-faces)
+	(modus-themes-theme)
+	(modus-themes--with-colors-resolve-palette-sort)
+	(modus-themes-with-colors-subr, modus-themes-with-colors):
+	Ensure that the modus-themes-with-colors macro works the way it
+	did before, namely, 'let' binding the current theme's palette.
+
+2025-11-07  Po Lu  <luangruo@yahoo.com>
+
+	* configure.ac Remove patch for bugs in nproc that have been remediated.
+
+2025-11-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2025-11-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+	* admin/merge-gnulib (GNULIB_MODULES): Add stdio-windows.
+	Also, sort and remove duplicates.
+
+2025-11-06  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* test/src/comp-tests.el (setcarcdr): Don't mutate literals.
+
+2025-11-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fixes to echo area messages when creating Log Edit mode buffers
+
+	* lisp/vc/log-edit.el (log-edit): Don't emit a message when
+	MODE.
+	* lisp/vc/vc-dispatcher.el (vc-start-logentry): Use '\\<>' to
+	simplify the code slightly.
+
+2025-11-06  Robert Pluim  <rpluim@gmail.com>
+
+	Improve error message for invalid key syntax
+
+	* lisp/keymap.el: (keymap--compile-check, define-keymap--compile):
+	Mention 'key-valid-p' rather than 'kbd'.
+
+2025-11-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	project-compile: Ignore compile-command from vc-compilation-mode
+
+	* lisp/progmodes/project.el (project-compile): Ignore
+	compile-command from vc-compilation-mode (bug#79658).
+	* lisp/vc/vc-dispatcher.el (vc-compilation-mode-hook): New
+	variable.
+	(vc-compilation-mode): Promote to its own derived mode.  Don't
+	use define-derived-mode in order to preserve the BACKEND
+	argument to this function.  Don't give it its own major mode
+	map, et cetera, for now.
+
+2025-11-06  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	No more color emoji issue on OpenBSD 7.8 and later (bug#79768)
+
+	Since version OpenBSD 7.8, its FreeType library supports color
+	emoji out of the box.  See
+	https://cvsweb.openbsd.org/xenocara/lib/freetype/include/freetype/config/ftoption.h?rev=1.32&content-type=text/x-cvsweb-markup.
+
+2025-11-06  Andrea Corallo  <acorallo@gnu.org>
+
+	* Fix native compiler for circular objects (bug#75135)
+
+	* lisp/emacs-lisp/comp.el (comp--ssa-rename-insn): Fix circular objects.
+
+2025-11-06  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Rework previous changes
+
+	* doc/emacs/programs.texi (Hideshow):
+	* etc/NEWS: Fix doc.
+	* lisp/progmodes/hideshow.el: Update Commentary Header.
+	(hs-modes-alist): Remove.
+	(hs--get-mode-value, hs-grok-mode-type): Rework.
+	* lisp/treesit.el (treesit-major-mode-setup):
+	* lisp/emacs-lisp/lisp-mode.el:
+	* lisp/nxml/nxml-mode.el:
+	* lisp/progmodes/cc-mode.el:
+	* lisp/progmodes/f90.el:
+	* lisp/progmodes/fortran.el:
+	* lisp/progmodes/hideshow.el:
+	* lisp/progmodes/icon.el:
+	* lisp/progmodes/js.el:
+	* lisp/progmodes/lua-mode.el:
+	* lisp/progmodes/python.el:
+	* lisp/progmodes/verilog-mode.el:
+	* lisp/progmodes/vhdl-mode.el:
+	* lisp/textmodes/bibtex.el:
+	* lisp/textmodes/mhtml-mode.el:
+	* lisp/textmodes/sgml-mode.el:
+	* lisp/treesit.el: Fix and rework previous changes.
+
+2025-11-06  Juri Linkov  <juri@linkov.net>
+
+	Don't move point when clicking on hideshow fringe/margin indicator
+
+	* lisp/progmodes/hideshow.el (hs-indicator-mouse-toggle-hidding):
+	Enclose in 'hs-life-goes-on' (bug#79585).
+	Suggested by Elijah Gabe Pérez <eg642616@gmail.com>.
+
+2025-11-06  Eli Zaretskii  <eliz@gnu.org>
+
+	A better fix for recent changes in Gnulib's acl_entries.c
+
+	See https://lists.gnu.org/archive/html/emacs-devel/2025-11/msg00145.html
+	for the related discussions.
+	* nt/mingw-cfg.site (ac_cv_func_acl_entries): Set to "yes" to
+	disable compilation of lib/acl_entries.c on MinGW.
+
+	* lib/acl_entries.c (acl_entries): Revert last change, as it is no
+	longer needed.
+
+2025-11-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(loaddefs-generate--emacs-batch): Chdir to `lisp-directory`
+
+	Chdir once and for all at the beginning to simplify the code.
+	Eliminate some redundant `expand-file-name`s and fix a broken use
+	of `expand-file-name` where we passed a list as second arg.
+
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate): Rename DIR to
+	DIRS, to clarify that it can be a list.  Use `ensure-list`.
+	Don't pass DIR(S) directly to `expand-file-name`.
+	Remove redundant `expand-file-name`.
+	(loaddefs-generate--excluded-files): Add sanity checks.
+	Return relative file names since `loaddefs-generate` will make them
+	absolute anyway.  Simplify.
+	(loaddefs-generate--emacs-batch): Chdir to `lisp-directory` and
+	simplify the rest accordingly.
+
+2025-11-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(load-history, lisp-directory): Don't `file-truename`
+
+	This fixes problems in some cases of out-f-tree builds
+	(bug#79694, bug#62099, bug#64806).
+
+	The use of true names in `load-history` dates back to to commits
+	33d74677e739 and 6bb6da3ec173 by Alan Mackenzie <acm@muc.de> in
+	May 24 2006, but that was reverted by Paul Eggert's commit
+	dff4f9c759f5 on Sep 18 2019.
+
+	* lisp/startup.el (command-line): Don't `file-truename` `lisp-directory`.
+	* src/lread.c (syms_of_lread) <load-history>: Adjust docstring,
+	to reflect the fact that the files there aren't "true names".
+
+	* doc/lispref/loading.texi (Hooks for Loading): Adjust accordingly.
+	Also massage the text to reflect the fact that nowadays features are
+	more common than file names as arguments to `with-eval-after-load`.
+
+2025-11-05  Juri Linkov  <juri@linkov.net>
+
+	* lisp/image.el (image-supported-file-p): Fix autoload cookie (bug#79764).
+
+	* lisp/emacs-lisp/icons.el (icons--create):
+	* lisp/mail/rmailmm.el (rmail-mime-set-bulk-data):
+	Remove unnecessary '(fboundp 'image-supported-file-p)'.
+
+2025-11-05  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Unify constants that are equal-including-properties in compiler
+
+	This results in a healthy reduction of .elc file size (> 300 KiB saved)
+	as well as less memory use.
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-get-constant):
+	Use 'equal-including-properties' as equivalence relation for all
+	constants, not just strings.
+	* etc/NEWS: Mention it.  Strictly speaking it's not an incompatible
+	change because it doesn't break any earlier promises, but for people
+	having code that made incorrect assumptions, this provides a useful
+	explanation.
+
+2025-11-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Further document cond*'s bind-and*, document cond-let* discussion
+
+	* doc/lispref/control.texi (Conditionals): Pointer to cond*'s
+	bind-and* clauses for Lisp programmers looking for a cond-let*.
+	(cond* Macro): Document bind-and* clauses.
+	* lisp/subr.el: Comment summarizing recent discussion, for
+	future Emacs developers wondering about cond-let*.
+
+2025-11-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Unbreak MinGW build broken by Gnulib merge
+
+	* lib/acl_entries.c (acl_entries): Make it no-op for MinGW, as it
+	was before.  Without this, acl_entries doesn't compile on MinGW.
+
+	* nt/gnulib-cfg.mk (OMIT_GNULIB_MODULE_issymlink)
+	(OMIT_GNULIB_MODULE_issymlinkat): Disable these Gnulib modules.
+
+2025-11-05  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Add option to auto-refresh the lossage buffer. (Bug#79732)
+
+	* lisp/help.el (view-lossage-auto-refresh): New user option.
+	(help--lossage-update): New variable.
+	(help--lossage-make-recent-keys, help--refresh-lossage-buffer):
+	New functions.
+	(view-lossage): Rework.
+	* doc/emacs/help.texi (Misc Help):
+	* etc/NEWS: Document change.
+
+2025-11-05  Juri Linkov  <juri@linkov.net>
+
+	* test/lisp/emacs-lisp/map-ynp-tests.el: Use 'eval-expression-debug-on-error'.
+
+	(test-map-ynp-kmacro): Bind 'eval-expression-debug-on-error' to nil
+	instead of silencing 'backtrace-print'.
+
+2025-11-05  Po Lu  <luangruo@yahoo.com>
+
+	Fix compilation on Android SDK 20 and earlier
+
+	* configure.ac (gl_PREREQ_NPROC): Disable ac_cv_header_mntent_h
+	if on Android and setmntent is not declared.
+
+2025-11-05  Po Lu  <luangruo@yahoo.com>
+
+	Fix the Android port
+
+	* configure.ac (gl_cv_onwards_func_tzalloc): Don't disable on
+	Android SDK 35.
+
+	* src/conf_post.h (tzalloc): Don't override Gnulib-selected
+	identifier on Android SDK 35.
+
+2025-11-05  Po Lu  <luangruo@yahoo.com>
+
+	Fix the MS-DOS port and reading of symlink targets
+
+	* doc/misc/eglot.texi (Eglot Features): Add comma after @xref.
+
+	* msdos/sed2v2.inp (GNULIB_ISSYMLINK): Define to 1.
+
+	* msdos/sedlibmk.inp (HAVE_RANDOM_H): Undefine, in line with its
+	deletion from gnulib.mk.
+	(GL_GNULIB_STRINGEQ): Define to 1.
+
+	* src/msdos.c (careadlinkat): NULL terminate at the end of the
+	data written, not one character beyond the same.
+
+2025-11-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Simplify tzfree use
+
+	* src/timefns.c (Fdecode_time, Fencode_time)
+	(Fcurrent_time_string): Do not bother to preserve errno around
+	tzfree calls, as Gnulib now does that for us.
+
+2025-11-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+	* admin/merge-gnulib (GNULIB_MODULES): Add stringeq.
+	With current Gnulib it is already present as in indirect dependency;
+	listing it here because Emacs now depends on it directly.
+	* lib-src/ebrowse.c, lib-src/etags.c:
+	(streq): Remove, as Gnulib defines this now.
+	* lib/fseterr.c, lib/fseterr.h, lib/issymlink.c, lib/issymlink.h:
+	* lib/issymlinkat.c, lib/stdio-consolesafe.c, lib/string.c:
+	* m4/fseterr.m4, m4/gettext_h.m4, m4/stringeq.m4:
+	New files from Gnulib.
+	* src/conf_post.h (tzfree) [__ANDROID_API__ >= 35]: Remove.
+
+2025-11-04  Philip Kaludercic  <pkal@posteo.net>
+
+	Add support for 'bind-and*' patterns to 'cond*'
+
+	* lisp/emacs-lisp/cond-star.el (cond*): Document 'bind-and*'.
+	(bind-and*): Add a stub to raise an error if 'bind-and*' is used
+	outside of 'cond*'.
+	(cond*-convert-condition): Implement a new type of condition.
+
+2025-11-04  Juri Linkov  <juri@linkov.net>
+
+	Use 'read-char-choice' in 'ask-user-about-lock' (bug#79664)
+
+	* lisp/userlock.el (ask-user-about-lock): Use 'read-char-choice'
+	instead of 'read-char'.
+
+	* lisp/subr.el (read-char-choice-with-read-key): Add fallback
+	cond-branch to show a message with required keys.
+
+2025-11-04  Juri Linkov  <juri@linkov.net>
+
+	* test/lisp/emacs-lisp/map-ynp-tests.el: Silence backtrace.
+
+	(test-map-ynp-kmacro): Ignore 'backtrace-print' that prints
+	unrequested backtrace (bug#67836).
+
+2025-11-04  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Rewrite 'hs-special-modes-alist'
+
+	Rewrite the format in 'hs-special-modes-alist' to make easier to
+	exclude some values, add support for settings inheritance
+	according to current major mode and parents, and support string
+	hiding for lisp modes.
+
+	Bug#79671
+
+	* lisp/progmodes/hideshow.el (hs-modes-alist): New variable.
+	(hs-special-modes-alist): Mark as obsolete.
+	(hs-forward-sexp-func, hs-adjust-block-beginning)
+	(hs-find-block-beginning-func, hs-find-next-block-func)
+	(hs-looking-at-block-start-p-func): Set default values to nil.
+	(hs-inside-comment-p): Remove function.
+	(hs-adjust-block-end, hs-treesit-things): New buffer-local
+	variables.
+	(hs-block-positions): Minor updates.
+	(hs--get-mode-value): New function.
+	(hs-grok-mode-type): Rewrite.
+	* lisp/progmodes/f90.el (hs-special-modes-alist):
+	* lisp/progmodes/fortran.el (hs-special-modes-alist):
+	* lisp/progmodes/icon.el (icon-mode):
+	* lisp/progmodes/lua-mode.el (lua-mode):
+	* lisp/progmodes/python.el (python-base-mode):
+	* lisp/progmodes/verilog-mode.el (verilog-mode):
+	* lisp/progmodes/vhdl-mode.el (vhdl-hs-minor-mode): Rewrite
+	settings.
+	* lisp/progmodes/python.el (python-ts-hs-adjust-block-end-fn):
+	New function.
+	* lisp/treesit.el (treesit-hs-block-end)
+	(treesit-hs-find-block-beginning, treesit-hs-find-next-block)
+	(treesit-hs-looking-at-block-start-p): Minor updates.
+	* doc/emacs/programs.texi (Hideshow):
+	* etc/NEWS: Document changes.
+
+2025-11-04  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Improved examples for documentation of 'eq'
+
+	* doc/lispref/objects.texi (Equality Predicates):
+	Remove incorrect and/or misleading examples, add new ones,
+	and display them more compactly to save space.
+
+2025-11-04  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix thinko in 'delete-other-frames'
+
+	* lisp/frame.el (delete-other-frames): In second round make sure
+	the candidate frame has not been deleted in the first round to
+	avoid that 'frame-terminal' and friends throw an error.
+
+2025-11-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix compilation errors in xsettings.c
+
+	* src/xsettings.c (store_config_changed_event, dpyinfo_valid)
+	(store_font_name_changed, store_tool_bar_style_changed): Tweak
+	preprocessor conditions to satisfy all builds without warnings.
+
+2025-11-03  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Don't assume that literal constants are eq-unique in tests
+
+	* test/lisp/emacs-lisp/cl-lib-tests.el (cl-test-ldiff):
+	* test/lisp/emacs-lisp/seq-tests.el (test-seq-union):
+	These tests relied on literal constants being unique in the sense of
+	'eq', and would fail if they stop being that (already the case for
+	strings).
+
+2025-11-03  Yuan Fu  <casouri@gmail.com>
+
+	Change tree-sitter query predicate names (bug#79687)
+
+	Latest tree-sitter library throws a syntax error if the
+	predicate names in a query don't end with question mark.  So we
+	made the following change:
+
+	:equal changed to :eq?
+	:match changed to :match?
+	:pred changed to :pred?
+
+	Old names are transparently converted to new names when
+	expanding patterns.
+
+	:match predicate can now take the regexp and the node in any
+	order: it'll figure out which is which automatically. This way
+	it works with current Emacs convention (regexp first), as well
+	as tree-sitter's match convention (regexp second).
+
+	* doc/lispref/parsing.texi (Pattern Matching): Update manuel to
+	use new predicate names.
+	* src/treesit.c:
+	(Ftreesit_pattern_expand):
+	(Ftreesit_query_expand):
+	(treesit_predicate_match):
+	(treesit_eval_predicates):
+	(syms_of_treesit): Use new predicate names.
+	* test/src/treesit-tests.el (treesit-query-api): Update test.
+
+2025-11-02  Yuan Fu  <casouri@gmail.com>
+
+	Fix fontification for var in java-ts-mode (bug#79626)
+
+	* lisp/progmodes/java-ts-mode.el:
+	(java-ts-mode--font-lock-settings): Add font-lock rule for "var".
+
+2025-11-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix PGTK build without HSETTINGS, broken by recent changes
+
+	* src/xsettings.c (store_tool_bar_style_changed): Compile only
+	under HAVE_GSETTINGS.
+	(xg_get_system_dark_mode): Compile only under HAVE_GSETTINGS.
+	* src/gtkutil.c (xg_set_gtk_theme_dark_mode)
+	(xg_update_dark_mode_for_all_displays, xg_set_initial_dark_mode):
+	Only compile when HAVE_GSETTINGS is defined.
+	(xg_create_frame_widgets): Call 'xg_set_initial_dark_mode' only
+	under HAVE_GSETTINGS.
+	(xg_create_frame_outer_widgets): Remove unused code.  Call
+	'xg_set_initial_dark_mode' only under HAVE_GSETTINGS.
+	* src/pgtkselect.c (pgtk_reply_selection_request): Remove unused
+	variable.
+
+2025-11-02  Martin Rudalics  <rudalics@gmx.at>
+
+	Handle resizing of fullscreen frames more consistently (Bug#79704)
+
+	* src/frame.c (adjust_frame_size): Honor new option
+	'alter-fullscreen-frames'.
+	(syms_of_frame) <alter-fullscreen-frames>: New option to
+	maintain consistent state when attempting to resize fullscreen
+	frames.  Default to 'inhibit' for NS builds because these
+	resized the frame while leaving the 'fullscreen' parameter alone
+	(Bug#79704).
+	(syms_of_frame) <Qinhibit>: Define symbol.
+	* lisp/cus-start.el (standard): Add customization options for
+	'alter-fullscreen-frames'
+	* doc/lispref/frames.texi (Frame Size): Describe new option
+	'alter-fullscreen-frames'.
+	* etc/NEWS: Call out new option 'alter-fullscreen-frames'.
+
+2025-11-02  Juri Linkov  <juri@linkov.net>
+
+	* lisp/simple.el (previous-line-or-history-element): Fix off-by-one error.
+
+	(bug#79746)
+
+2025-11-02  Ahmed Khanzada  <me@enzu.ru>
+
+	Automatically toggle between dark and light mode PGTK widgets
+
+	* src/gtkutil.h: Declare 'xg_set_gtk_theme_dark_mode',
+	'xg_update_dark_mode_for_all_displays',
+	'xg_set_initial_dark_mode'.
+	* src/gtkutil.c (xg_set_gtk_theme_dark_mode): Toggle PGTK dark mode.
+	(xg_update_dark_mode_for_all_displays): Toggle PGTK dark mode for all
+	displays.
+	(xg_set_initial_dark_mode): Determine PGTK dark mode preference and set.
+	(xg_create_frame_widgets): Set PGTK dark mode preference for widgets.
+	(xg_create_frame_outer_widgets): Set PGTK dark mode preference for outer
+	widgets.
+	* src/xsettings.h: Declare 'xg_get_system_dark_mode'.
+	* src/xsettings.c (something_changed_gsettingsCB): Update PGTK dark mode
+	setting.
+	(xg_get_system_dark_mode): Determine PGTK dark mode preference.
+	GSETTINGS_COLOR_SCHEME: Defined and set to "color-scheme".
+	* etc/NEWS: Document automatic dark mode toggling.
+	(Bug#79689)
+
+2025-11-01  Philip Kaludercic  <pkal@posteo.net>
+
+	Fix markup toggling in rcirc
+
+	(rcirc-markup-attributes): Delete markup codes straight after
+	processing it, to correctly handle toggling codes.  E.g. when
+	processing the message "one ^Btwo^B three", we previously
+	recognised the first interval "^Btwo^B" and moved over the ^B.
+	Searching for the next range to markup, we would now falsely
+	recognise "^B three" to be another markup range, instead of it
+	being the negative toggle.  By removing the processed codes, we
+	avoid this issue.  This reverts the functionality removed in
+	946ceca2, and therefore also re-adds the check to make an
+	exception to removing a ^O as that code can terminate multiple
+	markup sequences.  (Bug#57383)
+
+2025-11-01  Philip Kaludercic  <pkal@posteo.net>
+
+	Check if 'hash-table-contains-p' is available in map.el
+
+	* lisp/emacs-lisp/map.el (map-contains-key): Hide old
+	implementation prior to f60fc128 behind a `fboundp', as the
+	package is distributed on ELPA and should be backwards
+	compatible to Emacs 26.  (Bug#79711)
+
+2025-11-01  Spencer Baugh  <sbaugh@janestreet.com>
+
+	* test/lisp/emacs-lisp/map-ynp-tests.el: New file (bug#67836).
+
+2025-11-01  Juri Linkov  <juri@linkov.net>
+
+	'map-y-or-n-p' now uses the minibuffer to read a char (bug#79664)
+
+	* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Use the 'read-key'
+	branch only when the variable 'y-or-n-p-use-read-key' is non-nil.
+	Add a new cond-branch to read from the minibuffer.
+	Add a special case when def is nil in a kmacro in batch mode (bug#67836).
+
+	* test/lisp/files-tests.el (files-tests--with-buffer-offer-save):
+	Let-bind 'y-or-n-p-use-read-key' to t.
+
+2025-11-01  Juri Linkov  <juri@linkov.net>
+
+	'read-multiple-choice' now uses the minibuffer to read a char (bug#79664)
+
+	* doc/lispref/commands.texi (Reading One Event): Mention
+	'read-char-choice-use-read-key'.
+
+	* lisp/emacs-lisp/rmc.el (rmc--show-help): Show non-selected
+	resized Help window at bottom.  Inhibit useless message.
+	Remove unnecessary call to 'pop-to-buffer'.
+	(read-multiple-choice): Call 'read-multiple-choice--from-minibuffer'
+	when 'read-char-choice-use-read-key' is nil.
+	(read-multiple-choice--from-minibuffer): New function.
+
+	* test/lisp/emacs-lisp/rmc-tests.el (test-rmc--with-minibuffer-setup):
+	New macro.
+	(test-read-multiple-choice, test-read-multiple-choice-help):
+	Test both values of 'read-char-choice-use-read-key'.
+
+2025-11-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	0974418f2a8 Improve and correct documentation of 'font-lock-keywords-...
+
+2025-11-01  Gautier Ponsinet  <gautier@gautierponsinet.xyz>
+
+	Fix a typo in newst-backend.el
+
+	* lisp/net/newst-backend.el (newsticker--parse-text-container): Fix a
+	typo in the docstring.  (Bug#79747)
+
+2025-11-01  Protesilaos Stavrou  <info@protesilaos.com>
+
+	Update to modus-themes version 5.0.0
+
+	The release notes: <https://protesilaos.com/codelog/2025-11-01-emacs-modus-themes-5-0-0/>.
+
+2025-11-01  Po Lu  <luangruo@yahoo.com>
+
+	Restore compatibility with Texinfo 4.13
+
+	* doc/emacs/vc1-xtra.texi (Other Working Trees): Remove
+	@indentedblock; after reading the node twice I could not
+	understand why the paragraphs so formatted must have been thus.
+
+	* doc/misc/cl.texi (Derived types): Rename node to Derived
+	Types, and insert the same into the menu.
+
+2025-10-31  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New *-revisions-from-end VC backend API functions (bug#79408)
+
+	* lisp/vc/vc-git.el (vc-git-delete-revisions-from-end)
+	(vc-git-uncommit-revisions-from-end):
+	* lisp/vc/vc-hg.el (vc-hg--assert-rev-on-current-branch)
+	(vc-hg--reset-back-to, vc-hg-delete-revisions-from-end)
+	(vc-hg-uncommit-revisions-from-end): New functions.
+	* lisp/vc/vc.el: Specify delete-revisions-from-end and
+	uncommit-revisions-from-end backend API functions (bug#79408).
+
+2025-10-31  David Ponce  <da_vid@orange.fr>
+
+	lisp/emacs-lisp/cl-*.el: Minor changes accumulated during new API design
+
+	* lisp/emacs-lisp/cl-macs.el (cl-deftype): Support dispatch on
+	types that take arguments, as long as they can be used without arguments.
+
+	* lisp/emacs-lisp/cl-generic.el (cl--generic-derived-mode-specializers):
+	Rename from `cl--generic-derived-specializers` to clarify it's about
+	derived modes and not derived types.
+	(cl--generic-derived-mode-generalizer): Adjust accordingly and rename
+	from `cl--generic-derived-generalizer` for the same reason.
+	Ignore additional args in the tagcode function.
+	(cl-generic-generalizers) <derived-mode>: Adjust accordingly.
+
+	* lisp/emacs-lisp/macroexp.el (macroexp--dynamic-variable-p): Simplify.
+
+2025-10-31  David Ponce  <da_vid@orange.fr>
+
+	cl-extra.el: Use the new API to speed up dispatch on derived types
+
+	* lisp/emacs-lisp/cl-extra.el (cl--types-of-memo): Delete var.
+	(cl--derived-type-specializers-memo): New var.
+	(cl-types-of): Delete function.
+	(cl--derived-type-specializers): New function.
+	(cl--derived-type-dispatch-list): Delete var.
+	(cl--derived-type-generalizer): Use the `:need-specializers` API instead.
+	(cl--derived-type-generalizers): Don't fill
+	`cl--derived-type-dispatch-list` any more.
+
+	* lisp/emacs-lisp/cl-preloaded.el (cl--derived-type-list): Delete var.
+	(cl--define-derived-type): Don't add type to `cl--derived-type-list`.
+
+	* test/lisp/emacs-lisp/cl-extra-tests.el (cl-types-test): Adjust.
+
+2025-10-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cl-generic-define-generalizer): Add new API
+
+	Sometimes, the computation of the tag (or the computations of
+	the list of specializers corresponding to a tag) can be sped up
+	if we know the set of specializers we're looking for.
+
+	So we add a new API for both the TAGCODE-FUNCTION and SPECIALIZERS-FUNCTION
+	that lets them receive the set of specializers they need to consider (or any
+	information they can precompute from that), i.e. the set of specializers
+	handled by the same generalizer currently used by the generic function
+	for the the specific argument on which we're currently dispatching.
+
+	* lisp/emacs-lisp/cl-generic.el (cl-generic-define-generalizer):
+	Document new API.
+	(cl--generic-collect-specializers, cl--generic-filter-specializers)
+	(cl--generic--tagcode-with-specializers): New helper functions.
+	(cl--generic-get-dispatcher): Use them to support new API.
+
+2025-10-31  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid infinite recursion in 'face_inheritance_cycle'
+
+	* src/xfaces.c (face_inheritance_cycle)
+	(Finternal_set_lisp_face_attribute): Prevent infinite recursion if
+	a face is defined to inherit from itself (whaaat? how??!).
+
+2025-10-31  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix a bug in Fcombine_windows
+
+	* src/window.c (window_set_parent_and_normal_sizes): New function.
+	(Fcombine_windows): Improve doc-string.  Use wset_... functions.
+	Call window_set_parent_and_normal_sizes to fix a bug where it
+	failed to assign new normal sizes.
+	(Funcombine_window): Call window_set_parent_and_normal_sizes.
+
+2025-10-31  Yuan Fu  <casouri@gmail.com>
+
+	Revert "Use cached compiled tree-sitter queries for range settings"
+
+	This reverts commit e28ec7627148e523e215ee672b3dda40f1a6ad44.
+
+	* lisp/treesit.el (treesit-range-rules): Use treesit-query-compile.
+
+2025-10-30  Steven Allen  <steven@stebalien.com>
+
+	More reliably check if a frame is the daemon's initial frame
+
+	Frames created when Emacs is running as a daemon may not have the
+	"client" frame parameter set, e.g., when:
+
+	1. Created from the user's init file.
+	2. Created via "emacsclient -e" (e.g., "emacsclient -e '(make-frame)'").
+
+	The "client" parameter simply indicates that the frame was created by
+	emacsclient directly (or recursively from another emacsclient frame).
+
+	Instead, this commit checks if (a) Emacs is running as a daemon and (b)
+	the target frame is the "terminal frame".  When run as a daemon, Emacs's
+	terminal frame is always the daemon's initial frame.
+
+	* lisp/desktop.el (desktop-clear):
+	(desktop-restoring-frameset-p):
+	* lisp/display-fill-column-indicator.el
+	(display-fill-column-indicator--turn-on):
+	* lisp/frame.el (frame-notice-user-settings):
+	* lisp/obsolete/linum.el (linum-on):
+	* lisp/progmodes/flymake.el (flymake-start):
+	* lisp/tab-bar.el (tab-bar--update-tab-bar-lines): Fix the "is this the
+	initial daemon-frame" checks.  (Bug#79686)
+
+2025-10-30  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Optimize PCM regex to not contain adjacent wildcards
+
+	When multiple wildcards occur in a PCM pattern,
+	completion-pcm--pattern->regex previously would generate one
+	instance of [^z-a]* for each of those wildcards, even if the
+	wildcards were adjacent and could therefore be matched by a
+	single [^z-a]*.  This can make regex matching performance much
+	worse.  For example, with a minibuffer containing "*/" with
+	point at the start, completion-pcm-all-completions would take
+	several seconds to match in project-find-file in the Emacs repo.
+
+	Now, we run completion-pcm--pattern->segments on the pattern
+	first, which adds additional structure to the pattern, including
+	consolidating adjacent regexes into a single sublist.  Then
+	completion-pcm--segments->regex generates a single regex
+	wildcard for each of those pattern wildcards.  As a consequence,
+	we need to update the callers of completion-pcm--pattern->regex
+	which pass non-nil GROUP.  This provides a substantial
+	performance improvement in various edge cases.
+
+	* lisp/minibuffer.el (completion-pcm--pattern->segments)
+	(completion-pcm--segments->regex): Add.  (bug#79693)
+	(completion-pcm--pattern->regex)
+	(completion-pcm--merge-completions): Call pattern->segments and
+	segments->regex.
+	(completion-pcm--pattern-point-idx): Delete.
+	(completion-pcm--segments-point-idx): Add.
+	(completion-pcm--hilit-commonality): Call
+	completion-pcm--segments-point-idx to find the submatch
+	containing point.
+	* test/lisp/minibuffer-tests.el (completion-pcm-test-5): Add
+	more tests of highlighting the first difference.
+	(completion-pcm-test-pattern->regex): Add tests showing the
+	regex form of PCM patterns.
+
+2025-10-30  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* lisp/emacs-lisp/range.el (range-add-list): Don't mutate argument.
+
+	It's clear from the doc strings that this function isn't meant
+	to mutate its arguments.
+
+2025-10-30  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Faster constant pool string searching
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-get-constant):
+	No reason not to use 'assoc' to search for strings as well.
+	Previously we kept searching even after having found the string!
+
+2025-10-30  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Define compiler macros for /=, atom and nlistp
+
+	Calls to these functions were previously rewritten in terms of other
+	functions both in the optimiser and during codegen, for no good reason.
+
+	This also resulted in poor diagnostics: wrong-arity calls to 'atom' and
+	'nlistp' produced doubled but slightly-different warnings, and no
+	warnings at all for '/='.
+
+	Using compiler macros fixes the problems.  The generated code is the same.
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-negated)
+	(byte-compile-negation-optimizer): Replace with...
+	(bytecomp--define-negated): ...this compiler macro defining macro.
+
+2025-10-30  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Fix numeric comparison bug when optimisation is disabled
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-cmp):
+	Don't assume that N-ary comparisons have been normalised, which is done
+	in the optimiser.  Reported by Pip Cet.
+
+2025-10-30  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Remove unused byte-compile-eval-before-compile
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-eval-before-compile):
+	This function has been unused since 2012 (e703069f9c).
+
+2025-10-30  Protesilaos Stavrou  <info@protesilaos.com>
+
+	Make 'link' not inherit 'button' in modus-themes.el (bug#79672)
+
+	* etc/themes/modus-themes.el (modus-themes-faces): Apply the
+	  font attributes directly.
+
+2025-10-30  Yuan Fu  <casouri@gmail.com>
+
+	Skip unknown language for code block in markdown-ts-mode (bug#79670)
+
+	* lisp/textmodes/markdown-ts-mode.el:
+	(markdown-ts--convert-code-block-language): Return nil if the
+	langauge doesn't have a corresponding major mode in
+	markdown-ts-code-block-source-mode-map.
+
+2025-10-30  Yuan Fu  <casouri@gmail.com>
+
+	Tree-sitter range language function can return nil (bug#79670)
+
+	* lisp/treesit.el (treesit-query-range-by-language): Allow
+	LANGUAGE-FN to return nil.
+	(treesit-range-rules): Update docstring.
+
+2025-10-30  Yuan Fu  <casouri@gmail.com>
+
+	Use cached compiled tree-sitter queries for range settings
+
+	* lisp/treesit.el (treesit-range-rules): Use
+	treesit--compile-query-with-cache.
+
+2025-10-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/custom.el (custom-set-minor-mode): Load the mode more lazily
+
+2025-10-29  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt `tramp-test49-external-backend-function'
+
+	* test/lisp/net/tramp-tests.el (tramp-test49-external-backend-function):
+	Extend test.
+
+2025-10-29  Michael R. Mauger  <michael@mauger.com>
+
+	lisp/comint.el: Fix `comint-write-input-ring' context
+
+	(comint-write-input-ring): Use `comint-input-ring-separator' in the
+	context of the caller, not the output buffer
+
+2025-10-28  F. Jason Park  <jp@neverwas.me>
+
+	Fix regression involving erc-channel-user accessors
+
+	* etc/ERC-NEWS: New section for ERC 5.6.2 and new entry mentioning
+	slight change in `erc-channel-user' accessor behavior.
+	* lisp/erc/erc-common.el (erc-channel-user): Change type for status slot
+	to natnum from integer.
+	* lisp/erc/erc.el (erc-channel-user-signal-if-status-unknown): New
+	variable.
+	(erc--define-channel-user-status-compat-getter): Only use fallback in
+	Non-ERC buffers because "obviously" a status flag is unusable if the
+	server doesn't advertise it or, rather, advertises nonsupport via its
+	absence.  This regression was introduced in ERC 5.6.
+	(erc-channel-begin-receiving-names): Sharp-quote function name.
+	(erc--get-prefix-flag): Mention in doc that a return value of nil can
+	also mean the status flag is not supported by the server.
+	* test/lisp/erc/erc-tests.el (erc--parsed-prefix): Show that it returns
+	nil in a non-ERC buffer.
+	(erc-tests--make-combinations)
+	(erc-tests--with-channel-user-status-accessors): New functions.
+	(erc-channel-user/status-accessors/solo/default)
+	(erc-channel-user/status-accessors/solo/ov)
+	(erc-channel-user/status-accessors/multi/default)
+	(erc-channel-user/status-accessors/multi/ov): New tests.
+	(Bug#67220)
+
+2025-10-28  F. Jason Park  <jp@neverwas.me>
+
+	Change ERC version to 5.6.2-git
+
+	* doc/misc/erc.texi: Change ERCVER to 5.6.2.
+	* lisp/erc/erc.el (erc-version): Change working version to 5.6.2-git.
+	Do the same for the package Version header and the
+	`customize-package-emacs-version-alist' mapping.
+
+2025-10-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New delete-revision VC backend API function (bug#79408)
+
+	* lisp/vc/vc-git.el (vc-git--assert-revision-on-branch): New
+	function, factored out.
+	(vc-git-revision-published-p): Use it.
+	(vc-git-delete-revision):
+	* lisp/vc/vc-hg.el (vc-hg-delete-revision): New functions.
+	* lisp/vc/vc.el: Specify delete-revision backend API function
+	(bug#79408).
+
+2025-10-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-log-incoming, vc-log-outgoing: Pass nil UPSTREAM-LOCATION
+
+	This should have been updated along with the recent change to
+	make the UPSTREAM-LOCATION argument to the incoming-revision
+	backend API function optional.
+
+	* lisp/vc/vc.el (vc-log-incoming, vc-log-outgoing): Pass nil,
+	not the empty string, as the default UPSTREAM-LOCATION.
+
+2025-10-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid face inheritance cycles
+
+	* src/xfaces.c (face_inheritance_cycle): New function.
+	(Finternal_set_lisp_face_attribute): Signal an error if the
+	':inherit' attribute of a face is modified in a way that will
+	cause it to inherit from itself.  (Bug#79672)
+
+	* test/src/xfaces-tests.el (xfaces-test-circular-inheritance): New
+	test.
+
+	* etc/NEWS: Announce the incompatible change.
+
+2025-10-26  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New revision-published-p VC backend API function (bug#79408)
+
+	* lisp/vc/vc-git.el (vc-git-revision-published-p): New function.
+	(vc-git--assert-allowed-rewrite): Use it.
+	* lisp/vc/vc-hg.el (vc-hg-revision-published-p): New function.
+	* lisp/vc/vc.el: Specify revision-published-p backend API
+	function (bug#79408).
+
+2025-10-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cl-defstruct): Use `define-inline`
+
+	* lisp/emacs-lisp/inline.el (define-inline): Add `noinline` declaration.
+	* doc/lispref/functions.texi (Inline Functions): Mention it.
+
+	* lisp/emacs-lisp/cl-macs.el (cl--do-arglist): Avoid %s for lists in
+	format string.
+	(cl-dolist, cl-dotimes): Remove obsolete optimization.
+	(cl-defstruct): Use `define-inline` instead of `cl-defsubst` for accessors.
+
+2025-10-26  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix tramp-add-external-operation
+
+	* lisp/net/tramp.el (tramp-add-external-operation): Check
+	`default-directory' if `(car args)' is a relative file name, or nil.
+
+2025-10-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	elisp-scope.el: Require `cl-lib`
+
+	* lisp/emacs-lisp/elisp-scope.el: Require `cl-lib`.
+	[ We could instead replace the `cl-case`s with `pcase`.  ]
+	(elisp-scope-cl-lambda-rest, elisp-scope-cl-lambda-key): Simplify.
+
+2025-10-25  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve and correct documentation of 'font-lock-keywords-only'
+
+	* lisp/font-lock.el (font-lock-keywords-only):
+	* doc/lispref/modes.texi (Syntactic Font Lock): Improve
+	documentation of 'font-lock-keywords-only'.  (Bug#79692)
+
+2025-10-25  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): Fix mistake
+
+2025-10-25  Stephen Berman  <stephen.berman@gmx.net>
+
+	Fix Tramp support of GVFS built without FUSE
+
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Add check for
+	running process "gvsd", since GVFS may be built without FUSE.
+
+2025-10-25  Amin Bandali  <bandali@gnu.org>
+
+	Recompute calendar-holidays when its components are set (bug#79629)
+
+	* lisp/calendar/holidays.el (holidays--set-calendar-holidays):
+	New function for recomputing the 'calendar-holidays' user option
+	for use as the :set function of the following user options,
+	using 'custom-reevaluate-setting' to avoid overwriting the
+	user's customization of 'calendar-holidays'.
+	(holiday-general-holidays, holiday-oriental-holidays)
+	(holiday-local-holidays, holiday-other-holidays)
+	(holiday-hebrew-holidays, holiday-christian-holidays)
+	(holiday-islamic-holidays, holiday-bahai-holidays)
+	(holiday-solar-holidays): Use 'holidays--set-calendar-holidays'
+	as the :set function to recompute 'calendar-holidays' as needed.
+
+2025-10-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc-git.el (vc-git-branches): Use 'git for-each-ref'.
+
+2025-10-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Make UPSTREAM-LOCATION argument to incoming-revision optional
+
+	Using an empty string to mean the location from which vc-update
+	would pull was inherited from the old incoming/outgoing
+	functions, but we have opportunity to simplify things for this
+	new one.
+
+	* lisp/vc/vc-bzr.el (vc-bzr-incoming-revision):
+	* lisp/vc/vc-git.el (vc-git-incoming-revision):
+	* lisp/vc/vc-hg.el (vc-hg-incoming-revision):
+	* lisp/vc/vc.el (vc-diff-incoming, vc-diff-outgoing)
+	(vc-diff-outgoing-base, vc--incoming-revision): Make
+	UPSTREAM-LOCATION parameter optional.  Use nil, rather than an
+	empty string, to mean the default.
+
+2025-10-24  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Fix peephole optimiser bug for symbolp
+
+	* lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode):
+	Don't sink 'symbolp' past 'unbind'; it's unsafe.
+
+2025-10-24  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Move some constants into the peephole optimiser
+
+	* lisp/emacs-lisp/byte-opt.el (byte-tagref-ops, byte-conditional-ops)
+	(byte-after-unbind-ops, byte-compile-side-effect-and-error-free-ops)
+	(byte-compile-side-effect-free-ops):
+	Move into the constant pool...
+	* lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): ...here,
+	bringing comments up to date.
+
+2025-10-24  Yuan Fu  <casouri@gmail.com>
+
+	Remove cached font-lock settings in java-ts-mode
+
+	After the changes made in bug#79363, we don't need the cache anymore.
+
+	* lisp/progmodes/java-ts-mode.el:
+	(java-ts-mode--font-lock-settings-cached): Remove variable.
+	(java-ts-mode--font-lock-settings): Remove use of the variable.
+
+2025-10-24  Yuan Fu  <casouri@gmail.com>
+
+	Fix field access fontification in java-ts-mode (bug#79625)
+
+	* lisp/progmodes/java-ts-mode.el (java-ts-mode--font-lock-settings):
+	Remove the field_access rule.
+
+2025-10-24  Yuan Fu  <casouri@gmail.com>
+
+	Fix treesit-admin.el after recent treesit.el change
+
+	* admin/tree-sitter/treesit-admin.el:
+	(treesit-admin--verify-major-mode-queries):
+	(treesit-admin--validate-mode-lang):
+	(treesit-admin--mode-languages): Use
+	treesit-font-lock-setting-language.
+
+2025-10-23  João Távora  <joaotavora@gmail.com>
+
+	Prevent shorthand inheritance when loading .elc files (bug#79485)
+
+	Loading .elc files doesn't go through 'load-with-code-conversion' as
+	usual, but since these files are still 'read', we must still take care
+	to bind read-symbol-shorthands to nil around that.  The process is
+	simpler than in 'load-with-code-conversion' because .elc files cannot
+	have read-symbol-shorthands cookies, so the binding is always to nil.
+	If we don't do this, the symbols in the .elc will be subject to
+	shorthand manipulation if there's an active binding in the recursive
+	load stack.
+
+	* src/lread.c (readevalloop): Bind read-symbol-shorthands to nil.
+	(syms_of_lread): Add Qread_symbol_shorthands.
+
+2025-10-23  João Távora  <joaotavora@gmail.com>
+
+	Eglot: release version 1.19
+
+	* lisp/progmodes/eglot.el (Version): Bump to 1.19.
+	(Package-Requires): Require Flymake 1.4.2
+
+	* etc/EGLOT-NEWS: Announce new version.
+
+2025-10-23  João Távora  <joaotavora@gmail.com>
+
+	Flymake: bump package version to 1.4.2
+
+	* lisp/progmodes/flymake.el (Version): Bump to 1.4.2.
+
+2025-10-23  João Távora  <joaotavora@gmail.com>
+
+	Eglot: don't send JSONRPC params in 'shutdown' request (bug#79653)
+
+	See also bug#66144.
+	Github-reference: https://github.com/joaotavora/eglot/discussions/1540
+
+	* lisp/progmodes/eglot.el (eglot-shutdown): Pass :jsonrpc-omit
+	(Package-Requires): Require jsonrpc 1.0.26.
+
+	* etc/EGLOT-NEWS: Announce bugfix.
+
+2025-10-23  João Távora  <joaotavora@gmail.com>
+
+	Jsonrpc: support requests and notifications without params (bug#79653)
+
+	See also bug#66144.
+	Github-reference: https://github.com/joaotavora/eglot/discussions/1540
+
+	* lisp/jsonrpc.el (jsonrpc-async-request): Fix docstring.
+	(jsonrpc--async-request-1): Handle :jsonrpc-omit
+	(jsonrpc-notify): Handle jsonrpc-omit.
+	(jsonrpc-request): Tweak doc.
+	(Version): Bump to 1.0.26.
+
+2025-10-23  Juri Linkov  <juri@linkov.net>
+
+	* doc/lispref/display.texi (Display Margins): Remove obsolete remark.
+
+	Text and images in the margin were made mouse-sensitive long ago.
+	https://lists.gnu.org/archive/html/emacs-devel/2025-10/msg00596.html
+
+2025-10-23  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Sink calls to byte-compile-warning-enabled-p
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile--check-arity-bytecode)
+	(byte-compile-warn-about-unresolved-functions, byte-compile-form)
+	(byte-compile-free-vars-warn):
+	Delay checking whether a warning is enabled until we are about to emit
+	such a warning, since most warnings are enabled most of the time but
+	finding something to warn about is rare.
+
+2025-10-23  Martin Rudalics  <rudalics@gmx.at>
+
+	Revert recent additions of 'split-frame' and 'merge-frames'
+
+	* lisp/window-x.el (merge-frames, split-frame): Remove.
+	* doc/lispref/windows.texi (Changing Window Layouts): Remove
+	sections on 'split-frame' and 'merge-frames'.
+	* etc/NEWS: Remove announcement of 'split-frame' and
+	'merge-frames'.
+
+2025-10-23  Martin Rudalics  <rudalics@gmx.at>
+
+	Document and announce 'split-frame' and 'merge-frames'
+
+	* lisp/window-x.el (merge-frames): Rewrite doc-string.  Error out
+	when FRAME1 and FRAME2 are not distinct frames.
+	(split-frame): Rewrite doc-string.  Use 'user-error' instead of
+	'error'.
+	* doc/lispref/windows.texi (Changing Window Layouts): Document
+	'split-frame' and 'merge-frames'.
+	* etc/NEWS: Announce 'split-frame' and 'merge-frames'.
+
+2025-10-23  Pranshu Sharma  <pranshu@bauherren.ovh>
+
+	New commands to split and merge frames
+
+	* lisp/window-x.el (merge-frames, split-frame): New commands.
+
+2025-10-23  Stephen Gildea  <stepheng+git-config-global@gildea.com>
+
+	time-stamp-format-* tests: reduce repetitiveness
+
+	* test/lisp/time-stamp-tests.el (time-stamp-test): New macro.
+	Use it to coalesce the repetitive lines of the various
+	time-stamp-format-* tests, reducing the line count of the
+	time-stamp-string formatting tests by 30%.
+
+2025-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/comint.el (comint--mark-yanked-as-output): Use `letrec`
+
+2025-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(custom-initialize-after-file): New function
+
+	Some global minor modes require initialization.  Those that are preloaded
+	currently abuse `custom-initialize-delay` for that, but it's suboptimal
+	and doesn't help those that aren't preloaded.
+	So introduce a new function to fill that need.
+	While at it, make `define-globalized-minor-mode` use it
+	automatically when useful.
+
+	* lisp/custom.el (custom-initialize-after-file-load): New function.
+	* lisp/tooltip.el (tooltip-mode):
+	* lisp/paren.el (show-paren-mode):
+	* lisp/rfn-eshadow.el (file-name-shadow-mode):
+	* lisp/epa-hook.el (auto-encryption-mode):
+	* lisp/minibuffer.el (minibuffer-regexp-mode, minibuffer-nonselected-mode):
+	* lisp/electric.el (electric-indent-mode): Use it instead of
+	`custom-initialize-delay` since the value does not depend on the
+	runtime context.
+	(electric-quote-mode): Don't use `custom-initialize-delay` since
+	the default value is nil anyway.
+
+	* lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
+	Automatically add `:initialize` if needed.
+	* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): Remove `:initialize`,
+	now provided automatically.
+
+	* doc/lispref/customize.texi (Variable Definitions):
+	* doc/lispref/modes.texi (Defining Minor Modes): Document and Suggest
+	`custom-initialize-after-file-load` instead of `custom-initialize-delay`.
+
+2025-10-22  Alan Mackenzie  <acm@muc.de>
+
+	Allow renaming of frames to F<num> on text terminals
+
+	This fixes bug#79649.  Creating duplicate names F<num> is
+	prevented, ensuring that select-frame-by-name is still
+	effective on text terminals.
+
+	* src/frame.c (frame_get, frame_next_F_name): New functions.
+	(make_terminal_frame): Use frame_next_F_name.
+	(set_term_frame_name): In place of disallowing F<num>, check
+	that the requested F<num> doesn't already exist.
+
+	* etc/NEWS (Frames): Add an entry for this amendment.
+
+2025-10-22  F. Jason Park  <jp@neverwas.me>
+
+	Release ERC 5.6.1
+
+	* lisp/erc/erc.el: Change "Version" header from 5.6.1-git to 5.6.1.  A
+	`customize-package-emacs-version-alist' mapping to Emacs 31.1 was
+	already added at some point during the course of development for this
+	release.  The ERCVER variable in doc/misc/erc.texi was updated when
+	moving to the "-git" suffixed version.
+	(erc-version): Change version from 5.6.1-git to 5.6.1.
+
+2025-10-21  Stephen Berman  <stephen.berman@gmx.net>
+
+	Improve Dired handling of file names with newlines (bug#79528)
+
+	* doc/emacs/dired.texi (Dired Enter): Update documentation of
+	Dired's display and handling of file names that contain newlines.
+	Document new user option 'dired-auto-toggle-b-switch'.
+
+	* etc/NEWS: Announce new warning and new user option.
+
+	* lisp/dired.el (dired-auto-toggle-b-switch): New user option.
+	(dired-internal-noselect): Pop up a warning if the Dired listing
+	displays a literal newline.
+	(dired-switches-escape-p): Take the 'ls' switch
+	'--quoting-style=escape' into account.
+	(dired-mode): Add 'dired--toggle-b-switch' to 'post-command-hook'.
+	(dired-move-to-end-of-filename): When the Dired listing includes a
+	file name containing a newline, this can result in no change in
+	the 'dired-filename' text property on the last file name, so in
+	this case take the position just before the final newline as the
+	end of the last file name to prevent a wrong-type-argument error.
+	(dired--filename-with-newline-p, dired--remove-b-switch)
+	(dired--toggle-b-switch, dired--set-auto-toggle-b-switch)
+	(dired--display-filename-with-newline-warning): New functions.
+
+2025-10-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(easy-mmode--less-selective-first): Enable test
+
+	*  test/lisp/emacs-lisp/easy-mmode-tests.el
+	(easy-mmode--less-selective-first): Enable test since it now succeeds.
+
+2025-10-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(define-globalized-minor-mode): Remove `MODE-mode-name` hack (bug#79624)
+
+	Stop trying to detect when a globalized mode enabled its
+	minor mode "too early".  This reverts the core of commit 876daebc8594
+	since the problem it tried to circumvent has been made almost impossible
+	by commit 17e26cf57e18.
+
+	* lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
+	Remove the `MODE-mode-name` variable, don't remember in which major
+	mode we enabled the minor mode, and don't disable the minor mode
+	before (re)enabling it.
+
+2025-10-21  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Use 'any' and 'all' to simplify parts of the byte-compiler
+
+	* lisp/emacs-lisp/byte-opt.el (byte-opt--nary-comparison)
+	(byte-optimize-constant-args, byte-optimize-member)
+	(byte-optimize-append):
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-warnings)
+	(byte-compile-out-toplevel):
+	* lisp/emacs-lisp/cconv.el (cconv-convert):
+	Replace various hand-written 'any' and 'all' expressions with
+	calls to the new functions, for readability and speed.
+
+2025-10-21  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* lisp/emacs-lisp/shortdoc.el: Add take-while, drop-while, any, all.
+
+2025-10-21  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Disable one tab-bar-test case on macOS
+
+	The test works when run interactively and in batch mode started from
+	a terminal, but not from M-x compile.
+
+	* test/lisp/tab-bar-tests.el (tab-bar-tests-quit-restore-window):
+	Disable on macOS when TERM=dumb.
+
+2025-10-21  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Define new keymap for all the commands.
+
+	bug#79569
+
+	* lisp/progmodes/hideshow.el (hs-prefix-map): New keymap.
+	(hs-minor-mode-map): Use the new keymap.
+
+2025-10-21  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Update the indicators properly after showing/hiding
+
+	bug#79616
+
+	* lisp/progmodes/hideshow.el (hs-discard-overlays)
+	(hs-make-overlay, hs-show-block): Rework
+	'hs--refresh-indicators' calls.
+	(hs--refresh-indicators): Rework code, add new function
+	arguments.
+	(hs-minor-mode): Properly remove the indicators after turning
+	off the mode.
+
+2025-10-21  Yuan Fu  <casouri@gmail.com>
+
+	Cache compiled tree-sitter queries (bug#79363)
+
+	This way major modes can compute font-lock settings and
+	indentation rules dynamically when the major mode is enabled.
+	We don't want to compute it at package load time because the
+	grammar might not be installed at that point.  (Grammar might
+	be (semi)auto-installed when the major mode is enabled.)
+
+	This commit adds treesit--query-cache and changes
+	treesit-font-lock-rules to not compile the query.  Instead, the
+	queries are compiled in
+	treesit-validate-and-compile-font-lock-rules.
+
+	Go-ts-mode is modified to use this new framework.
+
+	* lisp/progmodes/go-ts-mode.el (go-ts-mode--iota-query-supported-p):
+	(go-ts-mode--method-elem-supported-p):
+	(go-ts-mode--font-lock-settings-cached): Removed.
+	(go-ts-mode--font-lock-settings): Simply return the result of
+	treesit-font-lock-rules rather than saving to
+	go-ts-mode--font-lock-settings-cached.  Use
+	treesit-query-with-optional for computed queries.
+	* lisp/treesit.el (treesit--query-cache): New variable.
+	(treesit-font-lock-settings): Add new field language.
+	(treesit-font-lock-setting-language): New function.
+	(treesit-query-with-optional): New function.
+	(treesit-font-lock-recompute-features): Don't compile query and
+	store language (because we can't derive from compiled query anymore).
+	(treesit-replace-font-lock-feature-settings): Use the new
+	language field.
+	(treesit-validate-and-compile-font-lock-rules): Renamed from
+	treesit-validate-font-lock-rules, add logic to compile queries.
+	(treesit-major-mode-setup): Use treesit-validate-and-compile-font-lock-rules.
+
+2025-10-20  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Add new option for control how the block should be hidden.
+
+	bug#79585
+
+	* doc/emacs/programs.texi (Hideshow):
+	* etc/NEWS: Document changes.
+
+	* lisp/progmodes/hideshow.el (hs-hide-behavior): New user option.
+	(hs-life-goes-on): Add 'save-excursion' and 'save-match-data'.
+	(hs-hide-block): Rework.
+
+2025-10-20  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Don't feed the stack overflow detector bad data
+
+	* src/lisp.h (record_in_backtrace): Don't record the argument address as
+	stack_top because most of the time it won't be on the C stack at all.
+	* src/eval.c (eval_sub): Do it here instead using an address guaranteed
+	to be on the C stack and we are just in the Lisp interpreter anyway.
+
+2025-10-20  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-test--with-temp-change: Use write-region
+
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-test--with-temp-change):
+	Use write-region (bug#79657).
+
+2025-10-20  Michael Albinus  <michael.albinus@gmx.de>
+
+	Revert "* test/lisp/net/tramp-resources/foo.tar.gz: Remove."
+
+	This reverts commit e5cd797988a5b2fddaf1c850d797674a299bc574.
+
+2025-10-20  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/lisp/net/tramp-resources/foo.tar.gz: Remove.
+
+2025-10-20  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp cleanup
+
+	* doc/misc/tramp.texi (Configuration): Extend example.
+
+	* lisp/net/tramp.el (tramp-skeleton-write-region):
+	* lisp/net/tramp-cache.el (tramp-flush-file-upper-properties):
+	* lisp/net/tramp-sh.el (tramp-sh-handle-insert-directory):
+	Use `when-let*'	consequently.
+
+	* lisp/net/tramp-cmds.el (tramp-file-name-with-method):
+	Add :initialize and :set functions.
+	(tramp-set-file-name-with-method): New defun.
+	(with-tramp-file-name-with-method): Filter out enabled methods.
+
+	* lisp/net/tramp-compat.el: Add TODO.
+
+	* test/lisp/net/tramp-archive-tests.el
+	(tramp-archive-test-cascaded-file-archive): Use "foo.zip".
+
+	* test/lisp/net/tramp-tests.el (tramp--test-instrument-test-case-p):
+	Extend check.
+	(tramp-test48-session-timeout): Adapt test.
+
+	* test/lisp/net/tramp-archive-resources/foo.zip: Renamed from outer.zip.
+
+2025-10-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid unnecessary y-or-n-p questions in client frames
+
+	* lisp/server.el (server-visit-files): Don't consider the file as
+	having disappeared if it never existed when visited previously.
+	Doc fix.  (Bug#79609)
+
+2025-10-20  João Távora  <joaotavora@gmail.com>
+
+	Eglot: expand on eglot-workspace-configuration sections (bug#79655)
+
+	* doc/misc/eglot.texi (Project-specific configuration): Clarify section.
+
+2025-10-20  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Add any and all (bug#79611)
+
+	* lisp/subr.el (all, any): New.
+	* test/lisp/subr-tests.el (subr-all, subr-any): New tests.
+	* doc/lispref/lists.texi (List Elements): Document.
+	* etc/NEWS: Announce.
+
+2025-10-20  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Add drop-while and take-while (bug#79611)
+
+	* lisp/subr.el (internal--effect-free-fun-arg-p)
+	(drop-while, take-while): New.
+	* test/lisp/subr-tests.el (subr-drop-while, subr-take-while): New tests.
+	* doc/lispref/lists.texi (List Elements): Document.
+	* etc/NEWS: Announce.
+
+2025-10-19  João Távora  <joaotavora@gmail.com>
+
+	Flymake: fix daemon-mode + and window client fringe usage (bug#77313)
+
+	To make Flymake's margin/fringe decision correct, four cases
+	must be tested. (1) A daemon that starts flymake-mode on a
+	buffer and then connecting a graphical client.  Here fringes
+	must be used. (2) Like 1, but with a tty client.  Here margins
+	must be used automatically.  (3) A non-daemonic start of a
+	graphical emacs. (4) A non-daemonic start of a tty emacs.
+
+	The code was failing case 1.  1 and 2 are the trickiest to get
+	right and currently can't be gotten right unless the margin
+	auto-resize is done at buffer annotation time.
+
+	Additionally, fix bugs in 'flymake-start's buffer visibility logic.
+	Refactor duplicate code in 'flymake--highlight-line' and fix docstrings.
+
+	* lisp/progmodes/flymake.el (flymake-autoresize-margins): Fix
+	focstring.
+	(flymake--bs-display): Rename from flymake--indicator-overlay-spec.
+	Fix docstring. Return just the display spec.
+	(flymake--suitably-fringed-p): New helper, instead of duplication.
+	(flymake--resize-margins): Cut up into two functions.
+	(flymake--restore-margins): Dedicated to restoring functions.
+	(flymake--highlight-line): Simplify logic when
+	flymake-indicator-type is 'auto'.
+	(flymake-start): Fix visibility logic to account for daemon mode.
+	Maybe resize margins here.
+	(flymake-mode): Call restore margins.
+
+2025-10-19  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/compile.el (compilation--set-up-margin): Fix.
+
+	Call 'set-window-margins' only on the compilation buffer where the
+	hook 'window-buffer-change-functions' is set buffer-locally (bug#79640).
+
+2025-10-19  Juri Linkov  <juri@linkov.net>
+
+	New value 'auto' of user option 'flymake-indicator-type' used by default
+
+	* lisp/progmodes/flymake.el (flymake-indicator-type):
+	Change the default value from 'fringes' to 'auto'.
+	(flymake--resize-margins): Use margins when
+	'flymake-indicator-type' is 'auto', but fringes are no available.
+	(flymake--highlight-line): Use display condition '(when CONDITION . SPEC)'
+	that checks for 'window-fringes' at display time and switches
+	between fringes and margins (bug#77313).
+
+2025-10-19  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git-registered: Be quieter when Git is not installed
+
+	* lisp/vc/vc-git.el (vc-git-registered): If Git is not
+	installed, don't echo a message about it.
+
+2025-10-19  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-rename-file: Make it work regardless of default-directory
+
+	* lisp/vc/vc.el (vc-rename-file): Make it work regardless of
+	default-directory; now the only influence of default-directory
+	should be resolving OLD and NEW if they are relative file names.
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-test--rename-file): Test
+	the influence of default-directory on vc-rename-file.
+
+2025-10-19  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Disable -Wclobbered for GCC in exec_byte_code (bug#79610)
+
+	* src/bytecode.c (exec_byte_code):
+	Disable the -Wclobbered warning for GCC locally as the old work-around
+	doesn't appear to be effective for variables with explicitly assigned
+	registers.  This also allows us to remove that work-around which
+	improves the code somewhat.
+
+2025-10-19  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	exec_byte_code: use fixed registers for top and pc (bug#79610)
+
+	GCC seems to have difficulty allocating important global interpreter
+	variables in registers; telling it which ones to use for 'top' and 'pc'
+	makes a big difference and seems to ease pressure enough for it to
+	deal with other variables as well.
+
+	We do it for AMD64 and ARM64.  Clang doesn't seem to need these directives.
+	It does result in -Wclobbered warnings that seem difficult to silence.
+
+	* src/bytecode.c (BC_REG_TOP, BC_REG_PC): New.
+	(exec_byte_code): Use them.
+
+2025-10-19  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	exec_byte_code: reduce use of semi-global 'op' (bug#79610)
+
+	* src/bytecode.c (exec_byte_code):
+	Re-type op from int to ptrdiff_t, which avoids some useless conversions.
+	Reduce its use by using local variables for intra-block use,
+	and another variable (arg) where it doesn't need to be alive across
+	instruction dispatch.  We also eliminate it where performance doesn't
+	matter by re-fetching it from the instruction stream.
+
+	All this should help the register allocator.
+
+2025-10-19  Lockywolf  <for_emacs_1@lockywolf.net>
+
+	Fix ispell-tests on emacs CI
+
+	* test/lisp/textmodes/ispell-resources/fake-aspell-new.bash
+	Error with a broken dictionary.
+
+	* test/lisp/textmodes/ispell-tests/ispell-tests-common.el
+	(ispell-tests--constants/nonexistent-dictionary): Add.
+	(ispell-tests--some-valid-dictionary): Give fallback dictionary.
+
+	* test/lisp/textmodes/ispell-tests/ispell-tests.el
+	(ispell/ispell-accept-buffer-local-defs/received-file): Use
+	proper broken dictionary.
+
+2025-10-19  LdBeth  <andpuke@foxmail.com>
+
+	Fix a recent regression in Newsticker
+
+	* lisp/net/newst-backend.el (newsticker--parse-text-container):
+	New function.
+	(newsticker--parse-atom-1.0): Use it.  (Bug#79617)
+
+2025-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(eval-and-compile): Preserve the surrounding lexical context
+
+	Implement a better fix for bug#79634.
+
+	* lisp/emacs-lisp/byte-run.el (eval-and-compile):
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-initial-macro-environment)
+	<eval-and-compile>: Preserve the surrounding lexical context (the part
+	available during macroexpansion, i.e. which vars are dynbound).
+
+	* lisp/emacs-lisp/rx.el (<pcase> rx): Remove workaround.
+
+	* test/lisp/emacs-lisp/macroexp-tests.el
+	(macroexp--dynbound-eval-and-compile): New test.
+
+2025-10-18  Helmut Eller  <eller.helmut@gmail.com>
+
+	Add a test for puthash
+
+	It's actually for a bug on the feature/igc branch.
+
+	* test/src/fns-tests.el (ft-puthash-weak): New test
+	(ft--puthash-weak): New helper.
+
+2025-10-18  Juri Linkov  <juri@linkov.net>
+
+	* lisp/minibuffer.el (completion--insert-strings): Use the correct frame.
+
+	Provide the 'frame-height' call with the frame of the window where
+	the *Completions* buffer is displayed for the case when the minibuffer
+	window uses a dedicated frame (bug#79635).
+
+2025-10-18  Alan Mackenzie  <acm@muc.de>
+
+	Fix coding error in byte-run--strip-vector/record
+
+	* lisp/emacs-lisp/byte-run.el (byte-run--strip-vector/record):
+	Replace a symbol with position by its bare symbol, rather
+	than returning it unchanged.
+
+2025-10-18  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-do-command: Don't print a spurious newline
+
+	* lisp/vc/vc-dispatcher.el (vc-do-command): Don't print a
+	spurious newline.  Don't omit the format string with 'message'.
+	(Bug#79650)
+
+2025-10-18  Alcor  <alcor@tilde.club>  (tiny change)
+
+	Rcirc: Fix invalid face error message when applying IRC color
+
+	* lisp/net/rcirc.el (rcirc-color-attributes): Fix invalid face.
+	(Bug#79561)
+
+2025-10-18  Lockywolf  <for_emacs_1@lockywolf.net>
+
+	Fix detecting a working hunspell on systems without a dictionary
+
+	Fixes bug#79477 and bug#79514
+
+	* test/lisp/textmodes/ispell-tests/ispell-hunspell-tests.el
+	(ispell-tests-hunspell--hunspell-working): Implement checker.
+	(ispell/hunspell/ispell-word/russian/check-only): Add skip-check.
+	(ispell/hunspell/ispell-word/english/check-only): Add skip-check.
+	(ispell/hunspell/ispell-word/language-switch/check-only): Add
+	skip-check.
+	(ispell/hunspell/ispell-word/russian/check-only/wrong-language): Add
+	skip-check.
+	(ispell/hunspell/ispell-word/multilang): Add skip-check.
+	* test/lisp/textmodes/ispell-tests/ispell-tests-common.el
+	(fake-aspell-path): Improve checking that an engine works.
+	(ispell-tests--letopt): Make restoring variables more robust,
+	rename to a local name.  Add debug spec.
+	(ispell-tests--with-ispell-global-dictionary): Rename to a local name
+	Add debug spec.
+	(ispell-tests--some-valid-dictionary): Add a selector for a safe
+	dictionary.
+	(ispell/ispell-accept-buffer-local-defs/received-file): Add.
+	(ispell-tests--constants/english/correct-list): Add.
+	(ispell-tests--constants/english/correct-one): Add.
+	(ispell-tests--constants/english/wrong): Add.
+	(ispell-tests--constants/russian/correct): Add.
+	(ispell-tests--constants/russian/wrong): Add.
+	(ispell-tests--constants/completion): Add.
+	* test/lisp/textmodes/ispell-tests/ispell-tests.el
+	(ispell/ispell-buffer-local-words/ispell-buffer-session-localwords):
+	reverse letopt and with-ispell-dictionary.
+	(ispell/ispell-buffer-local-words/ispell-words-keyword):
+	reverse letopt and with-ispell-dictionary.
+	(ispell/ispell-complete-word-interior-frag/simple):
+	reverse letopt and with-ispell-dictionary.
+	(ispell/ispell-complete-word/ispell-completion-at-point):
+	reverse letopt and with-ispell-dictionary.
+	(ispell/ispell-init-process/works-with-home):
+	reverse letopt and with-ispell-dictionary.
+	(ispell/ispell-kill-ispell):
+	reverse letopt and with-ispell-dictionary.
+	* test/lisp/textmodes/ispell-resources/fake-aspell-new.bash:
+	Add comments on unused function.  Replace echo with printf.
+
+2025-10-18  Eli Zaretskii  <eliz@gnu.org>
+
+	: Update ldefs-boot.el.
+
+2025-10-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	53aac6aecd2 ; Improve documentation of commands that split current wi...
+
+2025-10-18  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Respect keymaps in buffer text for clicks on displayed strings
+
+	When clicking on a string displayed by a display property, also
+	look at the text properties of the underlying buffer text for
+	keymaps, not just the displayed string.  The displayed string
+	takes precedence over the buffer text, but it doesn't replace
+	it.
+
+	Also, we should use the buffer's local map even for clicks on
+	the mode line.  (Otherwise, what's the point of the <mode-line>
+	event?)
+
+	* src/keymap.c (Fcurrent_active_maps): Consider displayed
+	string, then buffer text, then fall back to local
+	map.  (Bug#79505)
+
+	* test/src/keymap-tests.el
+	(keymap-test-keymaps-for-non-buffer-positions): Add more tests.
+
+2025-10-18  Augusto Stoffel  <arstoffel@gmail.com>
+
+	Fix an error when bookmark handler is a lambda
+
+	* lisp/bookmark.el (bookmark-type-from-full-record): Ensure
+	handler is a symbol before calling 'symbol-function'.
+	(Bug#79618)
+
+2025-10-18  Lin Sun  <sunlin7@hotmail.com>
+
+	Remove directory of deleted package from `load-path'
+
+	* lisp/emacs-lisp/package.el (package--delete-directory): Remove
+	the directory of the to-be-deleted package `load-path'.  Doc
+	fix.  (Bug#79597)
+
+2025-10-18  Martin Rudalics  <rudalics@gmx.at>
+
+	Add functions 'combine-windows' and 'uncombine-window'
+
+	* src/window.c (make_parent_window, Fcombine_windows)
+	(Funcombine_window): New functions.
+	(Fsplit_window_internal): Use make_parent_window.
+	* doc/lispref/windows.texi (Recombining Windows): Describe new
+	functions 'combine-windows' and 'uncombine-window'.
+	(Window Configurations): Explain "window clones".
+	* etc/NEWS: Mention new functions 'combine-windows' and
+	'uncombine-window'.
+
+2025-10-18  john muhl  <jm@pub.pink>
+
+	New 'lua-mode' inferior process command & options
+
+	* lisp/progmodes/lua-mode.el (lua-process-buffer-name)
+	(lua-process-history-file, lua-process-startfile): New options.
+	(lua-start-process): Use new options.
+	(lua-send-file): New command.
+	(lua--repl-buffer-p): Remove unused internal variable.  (Bug#79573)
+
+2025-10-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/emacs-lisp/rx.el (<pcase> rx): Workaround for bug#79634
+
+2025-10-17  Przemysław Alexander Kamiński  <alexander@kaminski.se>
+	    Rudolf Adamkovič  <rudolf@adamkovic.org>
+
+	Release NS objects (bug#79023)
+
+	* src/nsterm.m (ns_free_frame_resources): Release the NSView.
+	([EmacsView dealloc]): Release the EmacsLayer and menu.
+	([EmacsWindow dealloc]): Fix the toolbar release.
+
+2025-10-17  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Replace recent fix for vc-auto-revert-mode autoload problem
+
+	* lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
+	Wrap references to MODE-variable in bound-and-true-p.
+	* lisp/vc/vc-hooks.el (auto-revert-mode): Restore to compilation
+	declaration only.
+
+2025-10-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Support Tree-sitter version 0.26 and later
+
+	* src/treesit.c (init_treesit_functions)
+	[TREE_SITTER_LANGUAGE_VERSION >= 15]: Define prototype for, and
+	load 'ts_language_abi_version' instead of the deprecated (and
+	removed in tree-sitter 0.26) 'ts_language_version'.
+	(ts_language_abi_version) [TREE_SITTER_LANGUAGE_VERSION >= 15]:
+	Define on WINDOWSNT, instead of 'ts_language_version'.
+	(treesit_language_abi_version): New compatibility function.
+	(treesit_load_language, Ftreesit_language_abi_version): Use
+	'treesit_language_abi_version' instead of 'ts_language_version'.
+	(Bug#79627)
+
+2025-10-17  Martin Rudalics  <rudalics@gmx.at>
+
+	Clarify buffer-local behavior of 'window-buffer-change-functions'
+
+	* doc/lispref/windows.texi (Window Hooks): Explain how to
+	discern calls for 'window-buffer-change-functions' where a
+	buffer was removed from the window from those where a buffer is
+	now shown in that window.
+
+2025-10-17  Helmut Eller  <eller.helmut@gmail.com>
+
+	Add some tests for weak hashtables
+
+	Also add ft- as shorthand for fns-tests-.
+
+	* test/src/fns-tests.el (ft-hash-table-weakness, ft-weak-key-removal)
+	(ft-weak-value-removal, ft-weak-and-removal, ft-weak-or-removal): New
+	tests.
+	(ft--test-weak-removal, ft--gc, ft--check-entries, ft--check-entry)
+	(ft--hash-table-entries, ft--populate-hashtable, ft--component-num)
+	(ft--parse-component, ft--dead-component, ft--format-component)
+	(ft--init-rng, ft--nentries): New helpers.
+
+2025-10-17  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	Manual pages: use a showcase time-stamp-pattern
+
+	* doc/man/ebrowse.1:
+	* doc/man/emacs.1.in:
+	* doc/man/emacsclient.1:
+	* doc/man/etags.1:  Loosen the time-stamp-pattern used so that
+	it is not specific to each file.  These files now provide
+	readable examples that will work with most man pages.
+
+2025-10-16  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	time-stamp: padding composed characters
+
+	* lisp/time-stamp.el (time-stamp-string-preprocess): Use
+	'string-width' instead of 'length' to calculate needed padding.
+
+	Thanks to Stefan Monnier for the suggestion.
+
+2025-10-16  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Return case common to all completions in try-completion
+
+	When completion-ignore-case is non-nil, if all completions share
+	a common prefix ignoring case, try-completion has always
+	returned that.  Now, if all completions also share a common
+	prefix including case, try-completion includes that common
+	prefix in its return value (bug#79377).
+
+	* lisp/minibuffer.el (completion-pcm--merge-completions): Always
+	use return value from try-completion, which may change case.
+	* src/minibuf.c (Ftry_completion): Return the common prefix
+	which changes case.
+	* test/lisp/minibuffer-tests.el (completion-pcm-bug4219)
+	(completion-substring-test-5): New tests.
+
+2025-10-16  Juri Linkov  <juri@linkov.net>
+
+	Improve color contrast of refine-related diff faces on dark backgrounds
+
+	* lisp/vc/diff-mode.el (diff-refine-removed, diff-refine-added):
+	* lisp/vc/ediff-init.el (ediff-fine-diff-A, ediff-fine-diff-B):
+	* lisp/vc/smerge-mode.el (smerge-refined-removed, smerge-refined-added):
+	Lower the dominant component of RGB colors from "aa" to "88" (bug#79633).
+
+2025-10-16  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el: Small fixes in navigation functions.
+
+	(treesit-up-list): Better handle multi-language buffers.
+	(treesit-hs-find-next-block): Fix off-by-one error.
+
+2025-10-16  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Update VC-Dir contents upon revert-buffer
+
+	* lisp/vc/vc-hooks.el (vc-after-revert): New function.
+	(after-revert-hook): Add it.
+
+2025-10-16  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-auto-revert-mode: Fix an autoload problem
+
+	* lisp/vc/vc-hooks.el (auto-revert-mode): Replace compiler
+	declaration for this variable with a full defvar-local.
+
+2025-10-16  Sean Whitton  <spwhitton@spwhitton.name>
+
+	autorevert: Use defvar-local for the -mode variables
+
+	* lisp/autorevert.el (auto-revert-mode, auto-revert-tail-mode):
+	Use defvar-local not defvar.  New comment explaining why these
+	duplicate definitions of the variables are present.
+
+2025-10-16  Martin Rudalics  <rudalics@gmx.at>
+
+	In 'minibuffer--nonselected-check' consult 'completion-reference-buffer'
+
+	* lisp/minibuffer.el (minibuffer--nonselected-check): Don't
+	highlight when the selected window's buffer has
+	'completion-reference-buffer' set.
+
+2025-10-16  Juri Linkov  <juri@linkov.net>
+
+	Check if treesit-major-mode-remap-alist is bound in ts-modes autoload forms
+
+	* lisp/progmodes/c-ts-mode.el:
+	* lisp/progmodes/cmake-ts-mode.el:
+	* lisp/progmodes/csharp-mode.el:
+	* lisp/progmodes/dockerfile-ts-mode.el:
+	* lisp/progmodes/elixir-ts-mode.el:
+	* lisp/progmodes/go-ts-mode.el:
+	* lisp/progmodes/heex-ts-mode.el:
+	* lisp/progmodes/java-ts-mode.el:
+	* lisp/progmodes/js.el:
+	* lisp/progmodes/json-ts-mode.el:
+	* lisp/progmodes/lua-ts-mode.el:
+	* lisp/progmodes/php-ts-mode.el:
+	* lisp/progmodes/python.el:
+	* lisp/progmodes/ruby-ts-mode.el:
+	* lisp/progmodes/rust-ts-mode.el:
+	* lisp/progmodes/sh-script.el:
+	* lisp/progmodes/typescript-ts-mode.el:
+	* lisp/textmodes/css-mode.el:
+	* lisp/textmodes/markdown-ts-mode.el:
+	* lisp/textmodes/mhtml-ts-mode.el:
+	* lisp/textmodes/toml-ts-mode.el:
+	* lisp/textmodes/yaml-ts-mode.el: In autoload forms replace
+	'(treesit-available-p)' with (boundp 'treesit-major-mode-remap-alist).
+	Calling 'treesit-available-p' in loaddefs.el is too early
+	since the tree-sitter library might not be loaded yet.
+	Checking if 'treesit-major-mode-remap-alist' is bound is
+	equivalent to checking if Emacs is compiled with tree-sitter support.
+	(bug#79622)
+
+2025-10-16  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	time-stamp: padding with mixed uni- and multibyte
+
+	* lisp/time-stamp.el (time-stamp-string-preprocess): Use
+	'length' instead of 'format' to calculate string padding,
+	so that we consistently count characters, not bytes.
+
+2025-10-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(remote-shell-program): Simplify
+
+	* lisp/files.el (remote-shell-program): Don't bother looking
+	for the full file name of the `ssh` executable, since all users
+	end up looking it up in `load-path` anyway.
+
+2025-10-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	doc/emacs/display.texi (Semantic Font Lock): Simplify
+
+2025-10-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(easy-mmode--less-selective-first): Uncomment the test
+
+	* test/lisp/emacs-lisp/easy-mmode-tests.el (easy-mmode--less-selective-first):
+	Mark it as failing, instead.
+
+2025-10-15  Juri Linkov  <juri@linkov.net>
+
+	* lisp/minibuffer.el: Fix recent change of scrolling truncated completions
+
+	(completion--lazy-insert-strings-on-scroll): Don't move to the last
+	completion candidate since this is what happens when scrolling without
+	truncated completions buffer (bug#79506).
+
+2025-10-15  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New tests for multiple globalized minor modes
+
+	* test/lisp/emacs-lisp/easy-mmode-tests.el
+	(easy-mmode-test-mode): Mark permanent-local.
+	(easy-mmode--test-two-globalized-modes): New function.
+	(easy-mmode--more-selective-first)
+	(easy-mmode--less-selective-first): New tests.
+
+2025-10-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(xdg-mime-apps): Restore corner case and simplify
+
+	* lisp/xdg.el (xdg-mime-apps): Return nil if that's what the table
+	holds, like we did before commit f60fc1287d49.
+	Consolidate the three (assoc type xdg-mime-table) and shrink the
+	scope of `files`.
+
+2025-10-15  Michael Albinus  <michael.albinus@gmx.de>
+
+	Add support for su-rs and sudo-rs programs
+
+	* doc/misc/tramp.texi (Inline methods): Add "surs" and "sudors" methods.
+
+	* etc/NEWS: Add optional "surs" and "sudors" Tramp methods.
+	Presentational fixes and improvements.
+
+	* lisp/net/tramp-cmds.el (tramp-file-name-with-method): Add "surs"
+	and "sudors" to :type.  Adapt :version.
+
+	* lisp/net/tramp-sh.el (tramp-enable-surs-method)
+	(tramp-enable-sudors-method): New defuns
+	(tramp-sh-handle-expand-file-name): Add "surs" and "sudors" in check.
+
+	* lisp/net/tramp.el (tramp-methods): Adapt docstring.
+
+	* lisp/comint.el (comint-password-prompt-regexp):
+	* test/lisp/comint-tests.el (comint-testsuite-password-strings):
+	Add su-rs and sudo-rs password prompts.
+
+2025-10-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(font-lock-defaults): Clarify the use of SYNTAX-ALIST (bug#79586)
+
+	* doc/lispref/modes.texi (Font Lock Basics):
+	* lisp/font-core.el (font-lock-defaults): Document when
+	SYNTAX-ALIST is used and how it interacts with syntactic fontification.
+
+2025-10-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(rx): Remove the `rx--pcase-expand` middle man
+
+	* lisp/emacs-lisp/rx.el (rx): Remove the `rx--pcase-expand` middle man,
+	now that `loaddefs-gen.el` expands the `pcase-defmacro` for us.
+
+2025-10-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(define-minor-mode): Update `global-minor-modes` if init-value is non-nil
+
+	When a global minor mode is enabled by init-value rather than by
+	calling the major mode function, we failed to register it in
+	`global-minor-modes` (bug#79518).
+
+	* lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Register
+	ourselves in `global-minor-modes` at top-level for global modes
+	with a non-nil init-value.
+	Also in the `modefun`, simply the code with `not` and `add-to-list`
+	and consolidate the local/global paths to update `*-minor-modes`.
+
+	* lisp/simple.el (global-minor-modes): Move to...
+	* lisp/subr.el (global-minor-modes): ...here so it's defined early enough
+	for `auto-compression-mode` to register itself.
+
+2025-10-14  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Tramp customization
+
+	Do not use the ;;;###tramp-autoload cookie for defcustoms.  This
+	damages the customisation when Tramp is autoloaded.  Reported by
+	Joel Reicher <joel.reicher@gmail.com>.
+
+	* lisp/net/tramp-cache.el (tramp-verbose): Declare.
+	(tramp-connection-properties):
+	* lisp/net/tramp-message.el (tramp-verbose):
+	Remove ;;;###tramp-autoload cookie.
+
+2025-10-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Extend Tree-sitter support on MS-Windows to v0.26.x
+
+	* lisp/term/w32-nt.el (dynamic-library-alist): Support Tree-sitter
+	DLLs for versions upto 0.26.x.
+
+2025-10-13  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Update to Transient v0.10.1-8-g188ec9a1
+
+2025-10-13  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc-dir.el (vc-dir-resynch-file): Use file-in-directory-p.
+
+	For better compatibility with MS-Windows.
+
+2025-10-13  Martin Rudalics  <rudalics@gmx.at>
+
+	Rewrite 'minibuffer-nonselected-mode' to use 'window-state-change-functions'
+
+	* lisp/minibuffer.el (minibuffer-nonselected): Rewrite
+	doc-string.
+	(minibuffer--nonselected-overlay): Define it global.  Rewrite
+	doc-string.
+	(minibuffer--nonselected-check): Rewrite by comparing the active
+	minibuffer window with the selected window.
+	(minibuffer--nonselected-setup): Globally add
+	'minibuffer--nonselected-check' to list of functions called by
+	'window-state-change-functions'.
+	(minibuffer--nonselected-exit): Remove
+	'minibuffer--nonselected-check' from list of functions called by
+	'window-state-change-functions' when exiting last recursive
+	minibuffer.
+	(minibuffer-nonselected-mode): Globally add/remove
+	'minibuffer--nonselected-setup' to/from list of functions called
+	by 'minibuffer-setup-hook' and 'minibuffer--nonselected-exit'
+	to/from list of functions called by 'minibuffer-exit-hook' when
+	activating/deactivating 'minibuffer-nonselected-mode'.  Rewrite
+	doc-string.
+
+2025-10-12  Eshel Yaron  <me@eshelyaron.com>
+
+	Merge branch 'feature/elisp-fontify-semantically'
+
+2025-10-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix squashfs archives embedded in another archive
+
+	* lisp/arc-mode.el (archive-delete-local): Delete the directory
+	recursively.
+	(archive-squashfs-summarize): Make a local copy of a file if
+	squashfs archive is included in another archive.  (Bug#79582)
+
+2025-10-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(read-only-keymap-*): Be more careful with the namespace
+
+	* lisp/keymap.el (keymap-read-only-bind): Rename from
+	`read-only-keymap-bind`.  Improve docstring.
+	(keymap--read-only-filter): Rename from `read-only-keymap-filter`.
+	* lisp/net/goto-addr.el (goto-address-highlight-keymap):
+	* lisp/progmodes/bug-reference.el (bug-reference-map):
+	* lisp/net/browse-url.el (browse-url-button-map):
+	* lisp/ansi-osc.el (ansi-osc-hyperlink-map): Adjust accordingly.
+
+2025-10-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix regression in Tramp file name completion
+
+	* lisp/net/tramp.el (tramp-make-tramp-file-name): Do not use the
+	hop for the "archive" method.
+
+2025-10-12  Martin Rudalics  <rudalics@gmx.at>
+
+	Make buffer-local decorations show up on new window-system frames (Bug#79606)
+
+	* lisp/frame.el (make-frame): On window-system frames apply
+	buffer-local values for fringes, scroll bars and margins of root
+	and minibuffer window after the new frame was made (Bug#79606).
+
+2025-10-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Update MS-Windows manifest for Emacs
+
+	* nt/emacs-x64.manifest:
+	* nt/emacs-x86.manifest: supportedOS GUID for Windows 11 is the
+	same as for Windows 10.  See
+	https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests#trustinfo
+
+2025-10-11  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/hideshow.el: Small improvements (bug#79585).
+
+	(hs-allow-nesting): Turn defvar into defcustom.
+	(hs-indicator-hide): Use BLACK DOWN-POINTING SMALL TRIANGLE
+	as a counterpart for the BLACK RIGHT-POINTING SMALL TRIANGLE.
+
+2025-10-11  Michael Albinus  <michael.albinus@gmx.de>
+
+	Make cascaded archives working in tramp-archive.el work, again
+
+	* lisp/net/tramp-archive.el (tramp-archive-file-name-handler):
+	Move bindings of `tramp-methods' and `tramp-gvfs-methods' up.
+	(tramp-archive-file-name-handler): Do not use
+	`tramp-archive-run-real-handler' for testing existence of
+	`archive'.  (Bug#79582)
+
+	* test/lisp/net/tramp-archive-tests.el
+	(tramp-archive-test-file-archive-hexlified): Move down.
+	(tramp-archive-test-cascaded-file-archive)
+	(tramp-archive-test-cascaded-archive, tramp-archive-test-cascaded):
+	New defvars.
+	(tramp-archive--test-deftest-cascaded): New defmacro.
+	(tramp-archive-test01-file-name-syntax)
+	(tramp-archive-test05-expand-file-name): Adapt tests.
+	(tramp-archive-test01-file-name-syntax-cascaded)
+	(tramp-archive-test05-expand-file-name-cascaded)
+	(tramp-archive-test06-directory-file-name-cascaded)
+	(tramp-archive-test07-file-exists-p-cascaded)
+	(tramp-archive-test08-file-local-copy-cascaded)
+	(tramp-archive-test09-insert-file-contents-cascaded)
+	(tramp-archive-test11-copy-file-cascaded)
+	(tramp-archive-test15-copy-directory-cascaded)
+	(tramp-archive-test16-directory-files-cascaded)
+	(tramp-archive-test17-insert-directory-cascaded)
+	(tramp-archive-test18-file-attributes-cascaded)
+	(tramp-archive-test19-directory-files-and-attributes-cascaded)
+	(tramp-archive-test20-file-modes-cascaded)
+	(tramp-archive-test21-file-links-cascaded)
+	(tramp-archive-test26-file-name-completion-cascaded)
+	(tramp-archive-test40-make-nearby-temp-file-cascaded)
+	(tramp-archive-test43-file-system-info-cascaded)
+	(tramp-archive-test44-user-group-ids-cascaded): New tests.
+
+	* test/lisp/net/tramp-archive-resources/outer.zip: New test file.
+
+2025-10-11  Eshel Yaron  <me@eshelyaron.com>
+
+	Document 'elisp-fontify-semantically' in the Emacs manual
+
+	* doc/emacs/display.texi (Semantic Font Lock): New node.
+	* doc/emacs/emacs.texi: Update menu.
+	* etc/NEWS: Update relevant entry.
+	* lisp/emacs-lisp/elisp-scope.el: Expand commentary.
+	* doc/misc/elisp-semantic-highlighting.org: Delete it.
+
+2025-10-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix MS-Windows tray notifications from different Emacs frames
+
+	* src/w32fns.c (EMACS_TRAY_NOTIFICATION_ID_INIT): Rename from
+	EMACS_TRAY_NOTIFICATION_ID; all users adjusted.
+	(last_tray_notification_id): New static variable.
+	(add_tray_notification): Advance 'last_tray_notification_id' for
+	each new notification; wrap around to the fixed initial value when
+	reached the maximum.  This allows Lisp programs track notifications
+	and remove them from the same frame from which they were created.
+	(Fw32_notification_notify, Fw32_notification_close): Doc fixes.
+
+	* doc/lispref/os.texi (Desktop Notifications): Update the
+	documentation of 'w32-notification-notify' and
+	'w32-notification-close'.
+
+	Bug#79400
+
+2025-10-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	1895ba3ba3b ; Document %i format
+	85db0ac0d6e ; * doc/lispref/nonascii.texi (Explicit Encoding): Fix a ...
+	c119a3600ed ; * doc/lispref/tips.texi (Documentation Tips): Document ...
+
+	Also fix trailing whitespace in test files.
+
+2025-10-11  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow: Fix cursor when using end-of-line indicators.
+
+	bug#79580
+
+	* lisp/progmodes/hideshow.el (hs--make-indicators-overlays): Add
+	'cursor' property to the EOL indicator, so it will not conflict
+	with flymake EOL indicators.
+
+2025-10-11  Pooya Moradi  <pvonmoradi@gmail.com>  (tiny change)
+
+	Eglot: Add LSP server for TOML.
+
+	* lisp/progmodes/eglot.el (eglot-server-programs): Add LSP server
+	for TOML.  (Bug#79605)
+
+2025-10-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix last change
+
+	At least on MS-Windows, the last change caused the
+	process-tests/fd-setsize-no-crash/make-process test to hang.
+	* src/process.c (wait_reading_process_output) [WINDOWSNT]: Do
+	not stop monitoring the process descriptor when zero bytes are
+	read.  The EOF indication from subprocesses on MS-Windows is
+	detected via an error condition (see w32.c), while zero-size
+	reads are not to be taken as such.  (Bug#79436)
+
+2025-10-11  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Stop monitoring fds after receiving EOF
+
+	When a subprocess closes its stdout/stderr pipe, that causes
+	pselect to always indicate that fd is readable, and read to
+	always return with EOF on that fd.  Therefore when we receive an
+	EOF we need to stop monitoring the fd.  Otherwise Emacs will
+	spin at 100% CPU, repeatedly reading that same EOF off the fd.
+
+	* src/process.c (wait_reading_process_output): When
+	'read_process_output' returns EOF indication, stop monitoring
+	the descriptor.  (Bug#79436)
+
+2025-10-11  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Allow creating a pipe process without a buffer
+
+	Previously, even passing :buffer nil to make-pipe-process would
+	create a buffer.  Now, if you explicitly call (make-pipe-process
+	:buffer nil), it will create a pipe process without a buffer,
+	just like all the other process creation functions.
+
+	* src/process.c (Fmake_pipe_process): Check for explicit :buffer
+	nil and don't make a buffer. (bug#79596)
+	* doc/lispref/processes.texi (Asynchronous Processes): Update.
+	* test/src/process-tests.el
+	(process-test-make-pipe-process-no-buffer): Add test.
+
+2025-10-11  Sahil Kang  <sahil.kang@asilaycomputing.com>  (tiny change)
+
+	* src/pdumper.c (dump_queue_dequeue): Avoid -Wgnu-folding-constant.
+
+	Fixes bug#79581
+
+2025-10-11  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Do not erase the output buffer upon empty async shell command
+
+	* lisp/simple.el (shell-command): Test if an asynchronous
+	shell command is not empty before creating or erasing the
+	output buffer.  (Bug#79560)
+
+2025-10-10  Arash Esbati  <arash@gnu.org>
+
+	Replace obsolete floatfig package with floatflt
+
+	* doc/misc/reftex.texi (Builtin Label Environments): Mention the
+	floatflt LaTeX package instead of the obsolete floatfig.
+
+	* lisp/textmodes/reftex-vars.el (reftex-label-alist-builtin):
+	Replace obsolete floatfig entry with floatflt.  Add entry for
+	"floatingtable".
+	Fix type indicator for "tabwindow".
+	(reftex-default-label-alist-entries): Use floatflt as well.
+
+2025-10-09  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/flymake.el: Improve flymake--resize-margins.
+
+	(flymake--resize-margins): Move checking for a non-displayable
+	character to the loop over all supported symbols.
+	(flymake-margin-indicators-string): Mention the character name
+	in the docstring.
+
+2025-10-09  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Treat a completion boundary change as completion
+
+	In completion--do-completion, check if completion-try-completion
+	moved point out of the old completion boundaries.  If that
+	happened, then we did non-trivial completion even if the string
+	is otherwise unchanged.
+
+	For example,
+	~/src/emacs/trunk/lisp|/progmodes/project.el
+	hitting TAB moves us to:
+	~/src/emacs/trunk/lisp/|progmodes/project.el
+	then hitting TAB again moves us to
+	~/src/emacs/trunk/lisp/progmodes/|project.el
+
+	Both of these completions are successful, but we previously ran
+	code for completion failure (the t branch of the cond in
+	completion--do-completion) in the second case.  In particular,
+	we would always run minibuffer-completion-help, ignoring the
+	specific value of completion-auto-help which controls whether or
+	not to run minibuffer-completion-help.  Now we correctly run
+	code for successful completion for both cases.
+
+	We also always have checked that we're in the same boundaries
+	before doing completion cycling; that check is now more
+	accurate (bug#79238).
+
+	* lisp/minibuffer.el (completion--in-boundaries-p): Add.
+	(completion--do-completion): Check completion--in-boundaries-p.
+
+2025-10-09  Juri Linkov  <juri@linkov.net>
+
+	* lisp/xdg.el (xdg-mime-apps): Fix recent regression.
+
+	After the change that introduced 'hash-table-contains-p'
+	it's necessary to keep setting 'files' to the hash value.
+
+2025-10-09  Juri Linkov  <juri@linkov.net>
+
+	Use shorter margin indicators in flymake-mode (bug#76254)
+
+	* lisp/progmodes/flymake.el (flymake-margin-indicators-string):
+	Replace two-character error indicator "!!" with one character "‼".
+	Update the docstring.
+	(flymake--resize-margins): Use "!!" when "‼" is not displayable.
+	Calculate the margin width depending on the indicator string width.
+
+2025-10-09  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/w32console.c: Fix last change (bug#79298).
+
+2025-10-09  Arash Esbati  <arash@gnu.org>
+
+	Remove setting of reference format
+
+	* lisp/textmodes/reftex-vars.el (reftex-label-alist-builtin):
+	Don't set the reference format for ?f and ?t type indicators in
+	entries of subfig.
+
+2025-10-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix text-terminal output with UTF-8 encoding on MS-Windows
+
+	* src/w32console.c (w32con_write_glyphs)
+	(w32con_write_glyphs_with_face): Support UTF-8 encoded text
+	better, by counting characters and using display columns, not
+	bytes, to move the cursor after writing the text.  (Bug#79298)
+
+2025-10-09  Roi Martin  <jroi.martin@gmail.com>
+
+	Fix font lock in csharp-ts-mode
+
+	Fix font lock in csharp-ts-mode when the tree-sitter grammar is
+	automatically installed (Bug#79363).
+	* lisp/progmodes/csharp-mode.el (csharp-ts-mode--font-lock-settings):
+	Evaluate the rules only after the tree-sitter grammar is installed.
+	(csharp-ts-mode): Call the new `csharp-ts-mode--font-lock-settings'
+	function.
+
+2025-10-09  Roi Martin  <jroi.martin@gmail.com>
+
+	Fix font lock in java-ts-mode
+
+	Fix font lock in java-ts-mode when the tree-sitter grammar is
+	automatically installed (Bug#79363).
+	* lisp/progmodes/java-ts-mode.el (java-ts-mode--font-lock-settings):
+	Evaluate the rules only after the tree-sitter grammar is installed.
+	(java-ts-mode): Call the new `java-ts-mode--font-lock-settings'
+	function.
+
+2025-10-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	modes.texi: Declare official support for a standard "abuse"
+
+	* doc/lispref/modes.texi (Search-based Fontification):
+	Explicitly mention the "abuse" of matchers that perform the
+	highlighting instead of matching.
+
+2025-10-08  LdBeth  <andpuke@foxmail.com>
+
+	newsticker.el: fix escaping of XML strings
+
+	* lisp/net/newst-backend.el (newsticker--unxml): XML-escape
+	the parsed string in case it contains characters that could
+	confuse the HTML parser.  (Bug#79600)
+
+2025-10-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix another inconsistency in auth-source.el
+
+	* lisp/auth-source.el (auth-source-backends): Filter out backends
+	with type `ignore'.
+	(auth-source-search-spec): Use `_' in `and-let*'
+
+2025-10-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-dir-resynch-file: Be more defensive about default-directory
+
+	* lisp/vc/vc-dir.el (vc-dir-resynch-file): Use both
+	expand-file-name and buffer-local-toplevel-value on
+	default-directory before using the value.
+
+2025-10-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	define-globalized-minor-mode: Fix multiple globalized modes
+
+	* lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
+	Suppress MODE-set-explicitly function when enabling the mode
+	ourselves.
+
+2025-10-08  Michael Heerdegen  <michael_heerdegen@web.de>
+	    Elijah Gabe Pérez  <eg642616@gmail.com>
+
+	Fix a regression introduced by Bug#79294 fix
+
+	* lisp/progmodes/hideshow.el (hs-hide-block-at-point): Try to restore
+	old semantics.  Do nothing when no block positions are found.
+
+2025-10-07  Elijah Gabe Pérez  <eg642616@gmail.com>
+
+	(hs-hideable-region-p): Optimize the optimization
+
+	* lisp/progmodes/hideshow.el (hs-hideable-region-p): Simplify
+
+2025-10-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Merge from origin/emacs-30
+
+	c7ab3700675 ; * doc/lispref/control.texi (Conditionals): Grammar fix.
+	f3c29c1415e ; * doc/lispref/control.texi (Conditionals): Document SYM...
+	da47fa2f23b if-let*/when-let*/and-let*: Don't recommend (VALUEFORM) form
+
+2025-10-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Merge from origin/emacs-30
+
+	cd400326b2f ; Improve documentation of 'string-glyph-split'
+
+2025-10-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	if-let*/when-let*/and-let*: Don't recommend (VALUEFORM) form
+
+	* doc/lispref/control.texi (Conditionals):
+	* lisp/subr.el (if-let*): Document '(_ VALUEFORM)' instead of
+	'(VALUEFORM)'.
+
+2025-10-07  Ilya Chernyshov  <ichernyshovvv@gmail.com>  (tiny change)
+
+	decoded-time-add: Use 'floor'
+
+	* lisp/calendar/time-date.el (decoded-time-add): Use 'floor' to
+	count new year field value.
+
+2025-10-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	defvar-keymap: New ':prefix t' abbreviation
+
+	* lisp/keymap.el (defvar-keymap): New ':prefix t' abbreviation.
+	* lisp/emacs-lisp/helper.el (Helper-help-map):
+	* lisp/vc/pcvs.el (cvs-mode-diff-map):
+	* lisp/vc/vc-hooks.el (vc-prefix-map):
+	* lisp/vcursor.el (vcursor-map): Use it.
+	* doc/lispref/keymaps.texi (Creating Keymaps):
+	* etc/NEWS: Document it.
+
+2025-10-06  Michael Albinus  <michael.albinus@gmx.de>
+
+	Don't call dbus-launch in dbus-tests.el
+
+	* test/lisp/net/dbus-tests.el (dbus-test02-register-service-own-bus):
+	Adapt test.  Don't use dbus-launch, call dbus-daemon directly.
+	See <1117059@bugs.debian.org>.
+	See <https://lists.debian.org/debian-devel/2016/08/msg00554.html>.
+
+	* test/lisp/net/dbus-resources/session.conf.in: New file.  It is
+	copied from <https://salsa.debian.org/debian/flatpak/-/blob/debian/
+	trixie/tests/session.conf.in>.
+
+2025-10-06  Eshel Yaron  <me@eshelyaron.com>
+
+	Add documentation about ELisp semantic highlighting
+
+2025-10-06  Eshel Yaron  <me@eshelyaron.com>
+
+	elisp-scope.el: Unify and generalize local function/macro handling
+
+	* lisp/emacs-lisp/elisp-scope.el
+	(elisp-scope-local-definitions): New variable.  Replaces...
+	(elisp-scope-flet-alist, elisp-scope-macrolet-alist): these.
+	Removed, no longer used.
+	(elisp-scope-1, elisp-scope--handle-quoted): Update.
+	(elisp-scope-with-local-definition): New macro.
+	(elisp-scope-flet, elisp-scope-labels, elisp-scope-named-let)
+	(elisp-scope-cl-macrolet): Use it.
+
+2025-10-06  Martin Rudalics  <rudalics@gmx.at>
+
+	Run buffer-local window change functions in their buffers now
+
+	The buffer-local-versions of 'window-buffer-change-functions',
+	'window-size-change-functions',
+	'window-selection-change-functions' and
+	'window-state-change-functions' are now run with the respective
+	buffer temporarily current.  Also, the local version of
+	'window-buffer-change-functions' is run for the buffer removed
+	from the window too.
+
+	* src/window.c (run_window_change_functions_locally)
+	(run_window_change_functions_globally): New functions replacing
+	'run_window_change_functions_1'.
+	(run_window_change_functions): Run the buffer local versions of
+	these hooks in their respective buffers.  Run
+	'window-buffer-change-functions' for the buffer removed from the
+	window too.
+	(Vwindow_buffer_change_functions, Vwindow_size_change_functions)
+	(Vwindow_selection_change_functions)
+	(Vwindow_state_change_functions): Mention that the buffer-local
+	versions are run with their buffer temporarily current.
+	* doc/lispref/windows.texi (Window Hooks): Mention that
+	buffer-local-versions of window change functions are run with
+	their buffer temporarily current.  Also say that
+	'window-buffer-change-functions' will be run for removed buffer
+	too.
+	* etc/NEWS: Advertise changes for the buffer-local versions of
+	window change functions.
+
+2025-10-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix rare breakage of 'revert-buffer' in 'archive-mode'
+
+	* lisp/arc-mode.el (archive--mode-revert): Avoid deletion of
+	some region of the reverted buffer by 'archive-desummarize'.
+	(Bug#79574)
+
+2025-10-05  Michael Albinus  <michael.albinus@gmx.de>
+
+	Add fallback backend in auth-sources
+
+	* etc/NEWS: Describe effect of auth-sources being nil.
+
+	* lisp/auth-source.el (auth-sources): Add const nil.
+	(auth-source-ignored-keys): New defconst.
+	(auth-source-backends, auth-source-keys)
+	(auth-source-search-keys, auth-source-returned-keys)
+	(auth-source-search-spec): New macros.
+	(auth-source-file-name-p, auth-source-search)
+	(auth-source-specmatchp, auth-source-netrc-create)
+	(auth-source-secrets-search, auth-source-secrets-create)
+	(auth-source-macos-keychain-search)
+	(auth-source-plstore-search, auth-source-plstore-create): Use them
+	(auth-source-read-passwd-search, auth-source-read-passwd-create):
+	New defuns.
+
+	* test/lisp/auth-source-tests.el
+	(auth-source-backend-parse-plstore-string)
+	(auth-source-backend-parse-json-string)
+	(auth-source-backend-parse-fallback)
+	(auth-source-test-read-passwd-create-secret): New tests.
+
+2025-10-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC: Use symbolic names for the working revision
+
+	* lisp/vc/vc-hg.el (vc-hg-diff): When OLDVERS is ".", behave the
+	same as if OLDVERS was the actual working revision.
+	(vc-hg-previous-revision): Return ".~1" for input ".", ".~3" for
+	input ".^^" et cetera.
+	Also, when passed non-symbolic revisions, use "REV~1" instead of
+	"REV^" for MS-Windows compatibility.
+	(vc-hg-working-revision-symbol):
+	* lisp/vc/vc-git.el (vc-git-working-revision-symbol):
+	* lisp/vc/vc-hooks.el (vc-symbolic-working-revision): New
+	functions.
+	(vc-default-mode-line-string):
+	* lisp/vc/ediff-vers.el (ediff-vc-merge-internal):
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-test--checkin-patch):
+	* lisp/vc/vc.el (vc-diff-build-argument-list-internal)
+	(vc-diff-outgoing, vc-revision-other-window, vc-default-revert):
+	Call vc-symbolic-working-revision.
+	(vc-buffer-revision): Specify that this should always be a
+	revision number/hash, not a symbolic name.
+	* lisp/vc/vc-git.el (vc-git-previous-revision): Return "HEAD~1"
+	for input "HEAD", "HEAD~3" for input "HEAD^^" et cetera.
+
+2025-10-04  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC: New commands for cherry-picking (bug#79408)
+
+	* lisp/vc/diff-mode.el (diff-buffer-file-names): New function.
+	* lisp/vc/log-view.el (vc--pick-or-revert)
+	(vc--prompt-other-working-tree): Autoload.
+	(vc-parent-buffer-name, vc-log-short-style)
+	(vc-print-log-internal): Declare.
+	(log-view--pick-or-revert): New function.
+	(log-view-revision-cherry-pick, log-view-revision-revert): New
+	commands.
+	(log-view-mode-map, log-view-mode-menu): Bind them.
+	* lisp/vc/vc-dispatcher.el (vc-start-logentry): If
+	get-file-buffer returns nil, use the current buffer as the
+	parent buffer.
+	* lisp/vc/vc.el (diff-buffer-file-names, diff-reverse-direction):
+	Declare.
+	(vc--pick-or-revert): New function.
+	(vc-revision-cherry-pick, vc-revision-revert): New commands.
+	* lisp/vc/vc-hooks.el (vc-menu-map): Bind them.
+	* doc/emacs/maintaining.texi (VC Change Log, VC Undo)
+	(Copying Between Branches):
+	* etc/NEWS: Document the new commands.
+
+2025-10-04  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Improve log-view-copy-revision-as-kill
+
+	* lisp/vc/log-view.el (log-view-copy-revision-as-kill): Signal
+	user-error if there is no revision at point.
+	* doc/emacs/maintaining.texi (VC Change Log):
+	* etc/NEWS: Shorten docs for the new command.
+
+2025-10-04  Timo Myyrä  <timo.myyra@bittivirhe.fi>
+
+	New command log-view-copy-revision-as-kill
+
+	* lisp/vc/log-view.el (log-view-copy-revision-as-kill): New
+	command.
+	(log-view-mode-map): Bind it.
+	* doc/emacs/maintaining.texi (VC Change Log):
+	* etc/NEWS: Document it.
+
+2025-10-04  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	hideshow.el: Minor optimizations
+
+	* lisp/progmodes/hideshow.el (hs-hideable-region-p): New
+	function.
+	(hs--make-indicators-overlays, hs--add-indicators)
+	(hs-hide-block-at-point, hs-hide-all, hs-hide-block)
+	(hs-hide-initial-comment-block): Use it.  (Bug#79533)
+
+2025-10-04  Augusto Stoffel  <arstoffel@gmail.com>
+
+	Add 'auto-mode-alist' entry for Containerfile
+
+	* lisp/progmodes/dockerfile-ts-mode.el: Also match Containerfile
+	and Containerfile.* in the 'auto-mode-alist' entry.  (Bug#79524)
+
+2025-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(editorconfig-indentation-alist): Pare down
+
+	* lisp/editorconfig.el (editorconfig-indentation-alist): Remove entries
+	of the form `(MODE-mode MODE-basic-offset)`, `(MODE-mode
+	MODE-indent-level)`, or `(MODE-mode MODE-indent-offset)` since they are
+	covered by the fallback guessing code.
+	(editorconfig--default-indent-size-function): Remove "-block-offset"
+	from the guessing code since it's used only by `octave-mode`.
+
+2025-10-03  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New command log-view-unmark-all-entries
+
+	* lisp/vc/log-view.el (log-view-unmark-all-entries): New
+	command.
+	(log-view-mode-map): Bind it.
+	* doc/emacs/maintaining.texi (VC Change Log):
+	* etc/NEWS: Document it.
+
+2025-10-03  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Merge from origin/emacs-30
+
+	0aa44112b68 ; * doc/emacs/maintaining.texi (VC Change Log): Missing a...
+
+2025-10-03  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Merge from origin/emacs-30
+
+	6a8fda1f339 Fix process name matching in 'tramp-process-running-p'
+	217fd4f09ea ; * doc/lispref/modes.texi (Defining Minor Modes): Fix la...
+
+2025-10-03  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc--prompt-other-working-tree: Better handle no other working trees
+
+	* lisp/vc/vc.el (vc--prompt-other-working-tree): If there are no
+	other working trees but ALLOW-EMPTY is non-nil, it is not an
+	error.
+
+2025-10-03  Spencer Baugh  <sbaugh@janestreet.com>
+	    João Távora  <joaotavora@gmail.com>
+
+	Eglot: make markup invisible instead of deleting it (bug#79552)
+
+	We use gfm-view-mode to render Markdown before we hand over the string
+	to ElDoc (which usually put it in a 'special' mode "*eldoc*" buffer).
+	'gfm-view-mode' adds keymap text properties to make links clickable.  It
+	also makes some of the markup invisible with a special 'invisible'
+	property value which is specific to 'gfm-view-mode'.  We used to delete
+	the latter, therefore breaking the link-clicking.  Simply resetting the
+	regions with non-nil 'invisible' to 't' instead of deleting them fixes
+	this.  See also https://github.com/joaotavora/eglot/discussions/1238
+
+	* lisp/progmodes/eglot.el: Make invisible markup invisible
+	instead of deleting it.
+
+	* etc/EGLOT-NEWS: Mention bugfix.
+
+2025-10-02  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Log View marking: Fix lambda lists
+
+	* lisp/vc/log-view.el (log-view-mark-entry)
+	(log-view-unmark-entry): Mark ARG as a required argument, as it
+	in fact is.
+	(log-view-toggle-mark-entry): Call them properly.
+
+2025-10-02  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/term/w32-nt.el (dynamic-library-alist): Add libxml2-16.dll.
+
+	Reported by Andy Moreton <andrewjmoreton@gmail.com>.
+
+2025-10-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'restart-emacs' on MS-Windows
+
+	* src/w32.c (w32_reexec_emacs): Reset undocumented bits in
+	STARTUPINFO flags.  Suggested by yhr0x43 <yhr0x43@gmail.com>.
+	(Bug#79554)
+
+2025-10-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New command vc-kill-other-working-tree-buffers
+
+	* lisp/vc/vc.el (vc-kill-other-working-tree-buffers): New
+	command.
+	* lisp/vc/vc-hooks.el (vc-prefix-map): Bind it.
+	* doc/emacs/vc1-xtra.texi (Other Working Trees):
+	* etc/NEWS: Document it.
+
+2025-10-01  Renato Ferreira  <renatofdds@gmail.com>  (tiny change)
+
+	Fix process name matching in 'tramp-process-running-p'
+
+	* lisp/net/tramp.el (tramp-process-running-p): Use 'compare-strings'
+	for matching PROCESS-NAME with process command.  (Bug#79545)
+
+2025-10-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-add-working-tree: Finish by starting Dired
+
+	There won't be any uncommitted changes in the new working tree
+	yet, so vc-dir is unlikely to be useful.
+
+	* lisp/vc/vc.el (vc-add-working-tree): Finish by calling 'dired'
+	not 'vc-dir'.
+	* test/lisp/vc/vc-tests/vc-tests.el
+	(vc-test--other-working-trees): Delete stubbing out 'vc-dir'.
+
+2025-10-01  Juri Linkov  <juri@linkov.net>
+
+	* lisp/hl-line.el (global-hl-line-buffers): Skip internal buffers (bug#79547).
+
+2025-10-01  Eshel Yaron  <me@eshelyaron.com>
+
+	(elisp-scope-get-symbol-type-property): Revise inheritance handling.
+
+2025-09-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-test--checkin-patch: Use atomic change groups
+
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-test--with-temp-change):
+	New macro.
+	(vc-test--checkin-patch): Use it.
+
+2025-09-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC: Allow deleting or moving current working tree
+
+	* lisp/progmodes/project.el (project-prompter)
+	(project-prompt-project-dir, project-prompt-project-name):
+	* lisp/vc/vc.el (vc--prompt-other-working-tree): New ALLOW-EMPTY
+	optional argument.
+	(delete-working-tree, move-working-tree): Specify that callers
+	must ensure DIRECTORY is not the current working tree.
+	(vc-delete-working-tree, vc-move-working-tree): Pass ALLOW-EMPTY
+	non-nil to vc--prompt-other-working-tree.  Bind
+	'default-directory' to another working tree when operating on
+	the current working tree.
+	(vc-delete-working-tree): Extra prompt when asked to delete the
+	current working tree.  When deleting the current working tree,
+	call 'bury-buffer' one or more times at the end.
+
+2025-09-30  Stephen Berman  <stephen.berman@gmx.net>
+
+	Fix debug specs in minibuffer-tests.el macros (bug#79499)
+
+	* test/lisp/minibuffer-tests.el (with-minibuffer-setup)
+	(completing-read-with-minibuffer-setup): Prevent instrumenting
+	functions that call these macros from erroring due to an invalid
+	debug specification in the 'declare' form.  Use 't' as the debug
+	spec since it is the most general and adequate here.
+
+2025-09-29  Juri Linkov  <juri@linkov.net>
+
+	New value 'window' of 'global-hl-line-sticky-flag'
+
+	* etc/NEWS: Rename 'global-hl-line-modes' to 'global-hl-line-buffers'
+	(bug#79481).  Mention new default value of 'global-hl-line-buffers'
+	(bug#64993).  Mention new value 'window' of 'global-hl-line-sticky-flag'
+	that is more useful than the value 'all' now removed from NEWS (bug#64993).
+
+	* lisp/hl-line.el (hl-line-nonselected): New face.
+	(global-hl-line-sticky-flag): Add the value 'window'.
+	(global-hl-line-buffers): Change the default value to exclude
+	the minibuffer and 'cursor-face-highlight-mode'.
+	(global-hl-line-mode): Handle the value 'window' of
+	'global-hl-line-sticky-flag'.
+	(global-hl-line-window-redisplay): New function.
+
+2025-09-29  Juri Linkov  <juri@linkov.net>
+
+	Fix completions truncated on scrolling (bug#79506)
+
+	* lisp/simple.el (completion-setup-function):
+	Add 'completion--lazy-insert-strings-on-scroll'
+	to buffer-local hook 'window-scroll-functions'.
+
+	* lisp/minibuffer.el (completion--lazy-insert-strings-on-scroll):
+	New function.
+	(completion--in-region-1): Remove calls to the function
+	'completion--lazy-insert-strings' that now are handled
+	by the scroll hook.
+
+2025-09-29  Robert Pluim  <rpluim@gmail.com>
+
+	Fix macOS build with SDK version 26
+
+	* configure.ac: Use gl_CHECK_FUNCS_ANDROID_MACOS to check for
+	'posix_spawn_file_actions_addchdir', since it checks which
+	version of macOS is being used for the build, rather than what
+	is available in the SDK.  (Bug#79489)
+
+2025-09-29  Eshel Yaron  <me@eshelyaron.com>
+
+	Add optional semantic highlighting for Emacs Lisp.
+
+	* lisp/emacs-lisp/scope.el: New file.
+
+	* lisp/progmodes/elisp-mode.el (elisp): New 'defgroup'.
+	(elisp-add-help-echo, elisp-fontify-semantically)
+	(elisp-fontify-symbol-precedence-function): New options.
+	(elisp-symbol-at-mouse, elisp-free-variable, elisp-condition)
+	(elisp-major-mode-name, elisp-face, elisp-symbol-type)
+	(elisp-symbol-type-definition, elisp-function-reference)
+	(elisp-non-local-exit, elisp-unknown-call, elisp-macro-call)
+	(elisp-special-form, elisp-throw-tag, elisp-feature)
+	(elisp-rx, elisp-theme, elisp-binding-variable)
+	(elisp-bound-variable, elisp-shadowing-variable)
+	(elisp-shadowed-variable, elisp-variable-at-point)
+	(elisp-warning-type, elisp-declaration, elisp-thing)
+	(elisp-slot, elisp-widget-type, elisp-type, elisp-group)
+	(elisp-nnoo-backend, elisp-ampersand, elisp-constant)
+	(elisp-defun, elisp-defmacro, elisp-defvar, elisp-defface)
+	(elisp-icon, elisp-deficon, elisp-oclosure)
+	(elisp-defoclosure, elisp-coding, elisp-defcoding)
+	(elisp-charset, elisp-defcharset, elisp-completion-category)
+	(elisp-completion-category-definition): New faces.
+	(elisp-local-references, elisp-highlight-variable)
+	(elisp-unhighlight-variable, elisp-cursor-sensor)
+	(elisp--function-help-echo, elisp--help-echo-1)
+	(elisp--help-echo, elisp--annotate-symbol-with-help-echo)
+	(elisp-extend-region-to-whole-defuns, elisp-fontify-symbol)
+	(elisp-fontify-region-semantically, elisp-fontify-region):
+	New functions.
+	(emacs-lisp-mode): Set 'font-lock-extra-managed-props',
+	'font-lock-fontify-region-function' and
+	'font-lock-extend-region-functions'.
+
+	* etc/NEWS: Announce new feature.
+
+2025-09-29  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'mm-copy-to-buffer' when original text is multibyte
+
+	* lisp/gnus/mm-decode.el (mm-copy-to-buffer): Always return a
+	unibyte buffer.  If the original text was multibyte, encode it
+	while inserting it into the copy buffer.  (Bug#79376)
+
+2025-09-29  Liu Hui  <liuhui1610@gmail.com>
+
+	Fix etags-regen-mode for remote projects (bug#79358)
+
+	* lisp/progmodes/etags-regen.el
+	(etags-regen--process-file-region): New function.
+	(etags-regen--tags-generate, etags-regen--append-tags): Use the
+	new helper function to run the program, and use relative file
+	name if TAGS file is in the project root.
+	(etags-regen--update-file): Use relative file name if possible.
+
+2025-09-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Make textsec descriptive texts more user-friendly
+
+	* lisp/international/textsec.el (textsec-domain-suspicious-p)
+	(textsec-local-address-suspicious-p, textsec-name-suspicious-p)
+	(textsec-suspicious-nonspacing-p): Clarify descriptive texts.
+
+2025-09-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Detect suspicious email addresses in Rmail and Sendmail
+
+	* lisp/mail/rmail.el (rmail-detect-suspicious-headers): New user
+	option.
+	(rmail-check-suspicious-from): New function, highlights suspicious
+	"From" addresses.
+	(rmail-show-message-1): Call 'rmail-check-suspicious-from' if
+	'rmail-detect-suspicious-headers' is non-nil.
+	* lisp/mail/sendmail.el (mail-send): Detect suspicious addresses
+	before sending.
+
+	* etc/NEWS: Announce the new features.
+
+2025-09-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "Fix bug#79518 with 'windmove-mode' in "C-h m" display"
+
+	This reverts commit bf750adc4e637d871d551bab5b5c6ff9240797ed.
+	It caused windmove to be loaded unconditionally.
+	The correct "fix" for bug#79518 is to load the package or
+	to toggle the mode.
+
+2025-09-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	peg.el: Fix bug#79502 a bit more
+
+	* lisp/progmodes/peg.el (peg--detect-cycles): Accept args.
+	(peg--detect-cycles) <funcall>: New method.
+
+2025-09-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	peg.el: Fix bug#79502
+
+	* lisp/progmodes/peg.el (peg--merge-error): Provide a default method.
+	(peg--merge-error) <call>: Handle calls with arguments.
+	(peg--merge-error) <any, not>: Remove methods, now redundant with the
+	default method.
+	(peg--merge-error) <guard>: Delegate to the default method if we can't
+	do better.
+
+2025-09-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC prepare-patch: New :patch-start & :patch-end plist entries
+
+	* lisp/vc/vc.el (prepare-patch): Specify :patch-start and
+	:patch-end plist entries.
+	* lisp/vc/vc-git.el (vc-git-prepare-patch): Use -n1 to avoid
+	passing a revision range to git-format-patch, which is a bit
+	simpler.  Catch search-failed errors and signal an error with a
+	more helpful message.  Properly handle Subject: header by
+	looking for continuation lines.  Return :patch-start and
+	:patch-end entries in the plist.
+	* lisp/vc/vc-hg.el (vc-hg-prepare-patch): Always pass --git to
+	'hg export' for consistency.  Catch search-failed errors and
+	signal an error with a more helpful message.  Return a
+	:patch-start entry in the plist.
+
+2025-09-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-test--checkin-patch: Restore alternative revert code path
+
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-test--checkin-patch):
+	For the last stage of the test, restore alternative code path
+	for Git, though this time limited to when running the test on
+	MS-Windows.  Cf. subthread starting from
+	<https://lists.gnu.org/archive/html/emacs-devel/2025-09/msg00785.html>.
+
+2025-09-27  Paul Eggert  <eggert@cs.ucla.edu>
+	    Spencer Baugh  <sbaugh@janestreet.com>
+
+	Use up-to-date time in wait_reading_process_output
+
+	In “Avoid duplicate calls to current_timespec” (2015-07-05)
+	we started caching current_timespec results in NOW.
+	However, this was buggy: we updated NOW only when the timeout was
+	nonzero, but the timeout can be set temporarily to zero in several
+	places in wait_reading_process_output (such as when checking for
+	process status changes), which would cause us to never update NOW
+	and therefore never detect that a timeout happened.
+
+	Also, this caching was wrong even in principle: since we call
+	Lisp code from wait_reading_process_output, substantial amounts
+	of time can pass, and we can be left using an outdated NOW and
+	incorrectly not time out.  Also, nowadays we can use
+	monotonic_coarse_timespec which is fast, and which is better
+	anyway because it’s immune to manual clock changes.
+
+	* src/process.c (wait_reading_process_output):
+	Stop caching the current realtime.
+	Instead, use the coarse monotonic clock without caching.
+
+2025-09-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Prefer coarse timestamps when using X sync
+
+	They are good enough for this purpose, and are cheaper to get.
+	* src/timefns.c (monotonic_coarse_timespec): New function.
+	* src/xterm.c [HAVE_XSYNC && !USE_GTK && HAVE_CLOCK_GETTIME]:
+	(x_sync_current_monotonic_time): Use it.
+	(CLOCK_MONOTONIC): Remove; no longer uneeded here.
+
+2025-09-27  Juri Linkov  <juri@linkov.net>
+
+	Improve documentation and customization of 'derived-mode' in buffer predicate
+
+	* doc/lispref/buffers.texi (Buffer List):
+	* lisp/subr.el (buffer-match-p):
+	Document that 'derived-mode' can be a list (bug#79481).
+
+	* lisp/wid-edit.el (buffer-predicate): Support a list for 'derived-mode'.
+
+2025-09-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Document coding system issues with system-*-locale
+
+2025-09-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	6d35c807e5f ; Improve documentation of globalized minor modes
+	704fab0452a ; Improve documentation of handling errors
+	307f465f7b9 ; * doc/lispref/text.texi (Suspicious Text): Fix suspicio...
+	6bedbafc7ad ; * doc/lispref/text.texi (Suspicious Text): Indexing fix.
+
+2025-09-27  Martin Rudalics  <rudalics@gmx.at>
+
+	Restore mouse line dragging in character increments (Bug#79351)
+
+	* lisp/mouse.el (mouse-drag-line): Restore dragging in character
+	increments and make it the default (Bug#79351).
+	* etc/NEWS: Mention restored behavior of mouse line dragging.
+
+2025-09-26  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-test--checkin-patch: Use {author} not {user}
+
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-test--checkin-patch):
+	Use Mercurial template '{author}' not '{user}' for
+	compatibility.
+
+2025-09-26  Jakub Ječmínek  <kuba@kubajecminek.cz>
+
+	nnmbox-read-mbox: fix Xref header parsing
+
+	* lisp/gnus/nnmbox.el (nnmbox-read-mbox): Use the 'mail-fetch-field'
+	function instead of a broken regexp which matched Date-like headers.
+
+	(Bug#79167)
+
+2025-09-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix bug#79518 with 'windmove-mode' in "C-h m" display
+
+	* lisp/windmove.el (windmove-mode): Make sure "C-h m" mentions it.
+
+2025-09-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix dunnet when played on terminals which don't support UTF-8
+
+	* lisp/play/dunnet.el (dun-rooms, dun-endgame-question, dun-help)
+	(dun-physobj-desc, dun-endgame-questions): Don't use non-ASCII
+	characters.  (Bug#79520)
+
+2025-09-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(dabbrev-completion): Try and fix the test regressions
+
+	* lisp/dabbrev.el (dabbrev-completion): Revert this part of last
+	change, but additionally set `dabbrev--last-abbrev-location` so we know
+	what the vars were reset for.
+	(dabbrev-capf): Be more careful about when and how to reset the vars.
+	(dabbrev--abbrev-at-point): Don't set `dabbrev--last-abbrev-location`,
+	so it doesn't mess with the marker we set it to in
+	`dabbrev-capf` or `dabbrev-completion`.
+
+2025-09-25  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	(electric-indent-actions): Add missing NEWS
+
+	* lisp/electric.el (electric-indent-actions): Fix docstring.
+
+2025-09-25  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git--checkin: Ignore 'git apply --3way' exiting 1
+
+	This is expected to happen in some cases.
+
+	* lisp/vc/vc-git.el (vc-git--with-apply-temp): New OKSTATUS
+	parameter.
+	(vc-git--checkin): Use it to ignore 'git apply --3way' exiting
+	1.
+
+2025-09-25  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git--checkin: Avoid passing --ours to git-apply
+
+	* lisp/vc/vc-git.el (vc-git--with-apply-temp): New BUFFER param.
+	(vc-git--checkin): Avoid passing --ours to git-apply.
+
+2025-09-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt tramp-tests.el
+
+	* test/lisp/net/tramp-tests.el
+	(tramp-test26-interactive-file-name-completion): Adapt test.
+
+2025-09-25  Juri Linkov  <juri@linkov.net>
+
+	* lisp/minibuffer.el (minibuffer--nonselected-check): Simplify condition.
+
+2025-09-25  Yuan Fu  <casouri@gmail.com>
+
+	Fix infloop in python-ts-mode string fontification (bug#79457)
+
+	* lisp/progmodes/python.el (python--treesit-fontify-string):
+	Make sure there's no infloop.
+
+2025-09-24  Alcor  <alcor@tilde.club>  (tiny change)
+
+	(dabbrev-capf): Improve last fix for bug#61274
+
+
+	* lisp/dabbrev.el (dabbrev-completion): Don't call
+	`dabbrev--reset-global-variables` any more.
+	(dabbrev-capf): Call it here, unconditionally, instead.
+
+2025-09-24  Juri Linkov  <juri@linkov.net>
+
+	* lisp/minibuffer.el (minibuffer--nonselected-check): Fix condition.
+
+	To detect the completions buffer check for the buffer-local value of
+	'completion-reference-buffer' in the newly selected window.
+
+2025-09-24  Daniel Mendler  <mail@daniel-mendler.de>
+
+	Improve minibuffer-nonselected-mode
+
+	Use private names.  Use hashed function symbols.  Do not restrict the
+	overlay to the miniwindow, since the minibuffer can be displayed by
+	other windows, for example by packages using child frames or by
+	vertico-buffer-mode (bug#79490).
+
+	* lisp/minibuffer.el (minibuffer-nonselected-setup): Rename to
+	minibuffer--nonselected-setup.  Use hashed function symbols.
+	Add docstring.
+	(minibuffer-nonselected-check): Rename to
+	minibuffer--nonselected-check. Use hashed function symbols.
+	Do not restrict overlay to miniwindow.
+	(minibuffer-nonselected-overlay): Rename to
+	minibuffer--nonselected-overlay.
+	(minibuffer-nonselected-mode): Use hashed function symbol for
+	custom-initialize-delay.
+
+2025-09-24  Juri Linkov  <juri@linkov.net>
+
+	* lisp/hl-line.el: Rename global-hl-line-modes to global-hl-line-buffers.
+
+	(global-hl-line-buffers): Rename from recently added 'global-hl-line-modes',
+	use :type 'buffer-predicate' and change the default value to a condition
+	to not match completion-list-mode.
+	(global-hl-line-highlight): Use 'buffer-match-p' instead of
+	'easy-mmode--globalized-predicate-p' (bug#79481).
+
+2025-09-24  Juri Linkov  <juri@linkov.net>
+
+	* lisp/wid-edit.el (buffer-predicate): Implement complete specification.
+
+	Support all conditions of 'buffer-match-p' in the Customization UI,
+	including recursive 'not', 'or' and 'and' (bug#79481).
+
+2025-09-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC: New cherry-pick-comment API function
+
+	* lisp/vc/vc-git.el (vc-git-cherry-pick-comment):
+	* lisp/vc/vc-hg.el (vc-hg-cherry-pick-comment):
+	* lisp/vc/vc.el (vc-default-cherry-pick-comment):
+	New functions (bug#79408).
+
+2025-09-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git--checkin: Apply PATCH-STRING to working tree
+
+	* lisp/vc/vc-git.el
+	(vc-git--with-apply-temp-to-staging): Rename ...
+	(vc-git--with-apply-temp): ... to this.  New ARGS parameter.
+	All uses changes.
+	(vc-git--checkin): In POST function, apply PATCH-STRING to the
+	working tree with 'git apply --3way --ours'.
+	* lisp/vc/vc-hg.el (vc-hg--checkin): Document what the call to
+	'hg update' is for.
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-test--checkin-patch):
+	Delete completed FIXME and workaround.
+
+2025-09-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git--checkin: Restore dropping stash of staged changes
+
+	* lisp/vc/vc-git.el (vc-git--checkin): Restore dropping stash of
+	staged changes after applying it.  This was accidentally lost
+	when factoring out vc-git--with-apply-temp-to-staging.
+
+2025-09-24  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/window.el (display-buffer-alist): Fix :key-type (bug#79496).
+
+2025-09-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(electric-indent-actions): Fix corner case and refine setup
+
+	* lisp/electric.el (electric-indent--activate-indent-actions):
+	Rename from `electric-indent-toggle-indent-actions`.  Adjust callers.
+	Make its result less dependent on the input state.  Support `yank` and
+	`before-save` at the same time.
+	(electric-indent-actions): Use it instead if `electric-indent-mode`.
+
+2025-09-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/electric.el (electric-indent-actions): Fix bootstrap
+
+2025-09-23  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Add electric-indent actions to reindent (bug#79371)
+
+	* lisp/electric.el (electric-indent-actions)
+	(electric-indent-function): New user options.
+	(electric-indent-should-reindent-p, electric-indent--yank-advice)
+	(electric-indent-save-hook): New functions.
+	(electric-indent-post-self-insert-function): Use them.
+
+2025-09-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(electric-indent-functions-without-reindent): Pare down
+
+	* lisp/electric.el (electric-indent-functions-without-reindent):
+	Remove obsolete entries: Haskell modes, python-mode, and
+	coffer-mode already disable electric reindentation on their
+	side, so we don't need those entries any more.
+
+	* lisp/org/org.el (org-mode): Don't rely on
+	`electric-indent-functions-without-reindent'.
+
+2025-09-23  Yuan Fu  <casouri@gmail.com>
+
+	Fix python-ts-mode font-lock breakage by grammar change (bug#79457)
+
+	* lisp/progmodes/python.el (python--treesit-fontify-string): Use
+	new algorithm.
+
+2025-09-22  Roi Martin  <jroi.martin@gmail.com>
+
+	Fix font lock in php-ts-mode
+
+	Fix font lock in php-ts-mode when the tree-sitter grammars are
+	automatically installed.  Also, update php-ts-mode to call the new
+	`mhtml-ts-mode--treesit-font-lock-settings' function.
+
+	* lisp/progmodes/php-ts-mode.el (php-ts-mode--keywords)
+	(php-ts-mode--operators): Generate the lists after the tree-sitter
+	grammars are installed.
+	(php-ts-mode--font-lock-settings, php-ts-mode--font-lock-settings-cached)
+	(php-ts-mode--custom-html-font-lock-settings)
+	(php-ts-mode--custom-html-font-lock-settings-cached): Evaluate the rules
+	after the tree-sitter grammars are installed.  Also, add cache for the
+	rules.
+	(php-ts-mode): Call the new
+	`php-ts-mode--custom-html-font-lock-settings' function.  (Bug#79363)
+
+2025-09-22  Stephen Berman  <stephen.berman@gmx.net>
+
+	Navigate *Completions* buffer based on 'completions-format'
+
+	This patch makes 'next-completion' and 'previous-completion' work
+	in the vertical completions format analogously to how they work in
+	the default horizontal format (bug#78959).  It also fixes wrapping
+	in the vertical format and confines navigation (including
+	wrapping) in column-wise movement in the vertical format to the
+	current line, analogously to how navigation (including wrapping)
+	in line-wise movement in the horizontal format is confined to the
+	current column.
+
+	* doc/emacs/mini.texi (Completion): Fix several typos and improve
+	wording is several places.
+	(Completion Commands): Document navigation of the *Completions*
+	buffer in the vertical format.  Document the difference between
+	format-sensitive movement and strictly column-wise or line-wise
+	movement.  Document 'minibuffer-complete-and-exit' and update the
+	documentation of 'minibuffer-completion-auto-choose' and
+	'minibuffer-choose-completion'.  Document the use of a numeric
+	prefix argument with the navigation commands.
+	(Completion Options): Rearrange and improve documentation of
+	'completions-sort', 'completions-format' and
+	'completion-auto-wrap', updating the latter to document the new
+	behavior.
+
+	* lisp/minibuffer.el (minibuffer-visible-completions-map): Rebind
+	"<left>" to 'minibuffer-previous-column-completion' and "<right>"
+	to 'minibuffer-next-column-completion'.
+	(minibuffer-next-completion): Add check for whether completions
+	format is vertical to decide whether to call
+	'next-line-completion' and replace calling 'next-completion' by
+	'next-column-completion'.
+	(minibuffer-next-column-completion)
+	(minibuffer-previous-column-completion): New commands.
+
+	* lisp/simple.el (completion-list-mode-map): Rebind "<left>" to
+	'previous-column-completion' and "<right>" to 'next-column-completion'.
+	(last-completion): Add handling for vertical completions format.
+	(completion--move-to-candidate-end): Always move point to the
+	position immediately after the last character of the completion
+	candidate.  This unifies the behavior, simplifies the
+	implementation and facilitates implementing the improved
+	navigation of the *Completions* buffer.
+	(previous-column-completion, next-column-completion): New
+	commands, replacing the previous definitions of
+	'previous-completion' and 'next-completion' to reflect their
+	column-wise operation.  Confine navigation (including wrapping) in
+	vertical format to the current line.
+	(previous-line-completion, next-line-completion): Implement
+	line-wise navigation (including wrapping) through all completions
+	in vertical format, not just those in the current column as in
+	horiztonal format.  Update doc strings.
+	(next-completion, previous-completion): Redefine to call
+	'{next,previous}-line-completion' when completions format is
+	vertical and '{next,previous}-column-completion' otherwise.
+
+	* test/lisp/minibuffer-tests.el
+	(completions-format-navigation--tests): New function providing a
+	template to define tests of the navigation and wrapping behavior
+	with specified numbers of completion candidates.
+	(completions-format-navigation-test-{2,3,4,5,10,15,16}): New tests.
+
+2025-09-22  Philipp Stephani  <p.stephani2@gmail.com>
+
+	Fix minor incorrect statement about shorthands.
+
+	* doc/lispref/symbols.texi (Shorthands): Make documentation match
+	reality.  See symbol_char_span in src/lread.c.
+
+2025-09-22  Andrea Corallo  <acorallo@gnu.org>
+
+	Revert "* Clean-up some compilation warnings in vc-hooks.el"
+
+	This reverts commit dd622e06e7db8362ecdb69ecbd42b2fb01a5168b as
+	functions are autoloaded.
+
+2025-09-22  Andrea Corallo  <acorallo@gnu.org>
+
+	Make native lisp code reflect EQ C implementation
+
+		* src/comp.c (ABI_VERSION): Bump new version
+		(comp_t): add 'eq'.
+		(helper_link_table): add 'slow_eq'.
+		(emit_slow_eq): New function.
+		(emit_EQ): Rework to reflect EQ implementation.
+		(declare_runtime_imported_funcs): Import 'slow_eq'.
+		(Fcomp__init_ctxt): Register emitter 'emit_eq' for op code Qeq.
+
+	This and the previous 2 commits increase elisp-benchmarks performance by
+	3.6% on my test machine. Also a (small) reduction in eln size comes with
+	it.
+
+2025-09-22  Andrea Corallo  <acorallo@gnu.org>
+
+	* Make sure the compiler optimizes for symbols_with_pos_enabled 0 in EQ
+
+	* src/lisp.h (EQ): Make use '__builtin_expect'.
+
+2025-09-22  Pip Cet  <pipcet@protonmail.com>
+
+	Change EQ to move slow code path into a separate function
+
+	    * src/data.c (slow_eq): New function.
+	    * src/lisp.h (EQ): Call it.
+
+2025-09-22  Juri Linkov  <juri@linkov.net>
+
+	* lisp/keymap.el (read-only-keymap-bind): The remaining fix.
+
+	Replace 'browse-url-keymap-filter' with 'read-only-keymap-filter'.
+
+2025-09-22  Po Lu  <luangruo@yahoo.com>
+
+	Fix bootstrap and prevent browse-url from preloading numerous files
+
+	* lisp/keymap.el (read-only-keymap-filter)
+	(read-only-keymap-bind): New functions, removed from
+	browse-url.el.
+
+	* lisp/net/browse-url.el (browse-url-keymap-filter)
+	(browse-url-keymap-bind): Move to keymap.el.  All callers
+	changed.
+
+2025-09-21  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC checkin-patch: Support extracting commit metadata from patches
+
+	* lisp/vc/vc-git.el (vc-git--mailinfo): New function.
+	(vc-git-checkin-patch): Use it to extract authorship, date and
+	log message information from patches.
+	(vc-git--call): New INFILE argument.  All uses changed.
+	* lisp/vc/vc-hg.el (vc-hg--checkin): When COMMENT is nil, take
+	authorship, date and log message information from the patch.
+	* lisp/vc/vc.el (checkin-patch): Specify to use authorship, date
+	and comment information in PATCH-STRING (bug#79408).
+	(prepare-patch): Specify that patch should include authorship
+	identity, date and log message information for REV if supported.
+	(diff-bounds-of-hunk): Declare.
+	(vc-default-checkin-patch): Warn if it looks like we will ignore
+	patch authorship information.
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-hg-command)
+	(vc-git--out-str): Declare.
+	(vc-test--checkin-patch): New function.
+	(vc-test-git08-checkin-patch, vc-test-hg08-checkin-patch): New
+	tests.
+
+2025-09-21  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc-git.el (vc-git--checkin): Validate parameters.
+
+2025-09-21  Juri Linkov  <juri@linkov.net>
+
+	Support 'RET' for visiting URLs in read-only buffers (bug#74792)
+
+	* lisp/net/browse-url.el (browse-url-keymap-filter)
+	(browse-url-keymap-bind): New functions.
+	(browse-url-button-map): Bind "C-c RET" to 'browse-url-button-open'
+	and rebind "RET" with the filter 'browse-url-keymap-bind'.
+
+	* lisp/ansi-osc.el (ansi-osc-hyperlink-map):
+	* lisp/net/goto-addr.el (goto-address-highlight-keymap):
+	* lisp/progmodes/bug-reference.el (bug-reference-map):
+	Bind "RET" with the filter 'browse-url-keymap-bind'.
+
+2025-09-21  Roi Martin  <jroi.martin@gmail.com>
+
+	Suffix tree-sitter cache variables with "-cached"
+
+	* lisp/progmodes/cmake-ts-mode.el (cmake-ts-mode--indent-rules)
+	(cmake-ts-mode--indent-rules-cached, cmake-ts-mode--font-lock-settings)
+	(cmake-ts-mode--font-lock-settings-cached):
+	* lisp/progmodes/go-ts-mode.el (go-ts-mode--font-lock-settings)
+	(go-ts-mode--font-lock-settings-cached):
+	* lisp/progmodes/js.el (js--treesit-indent-rules)
+	(js--treesit-indent-rules-cached, js--treesit-font-lock-settings)
+	(js--treesit-font-lock-settings-cached): Suffix tree-sitter cache
+	variables with "-cached" (bug#79363).
+
+2025-09-21  Roi Martin  <jroi.martin@gmail.com>
+
+	Fix font lock and cache indent rules in mhtml-ts-mode
+
+	Fix font lock in mhtml-ts-mode when the required tree-sitter grammars
+	are automatically installed (bug#79363).  Also, cache tree-sitter indent
+	rules.
+	* lisp/textmodes/mhtml-ts-mode.el
+	(mhtml-ts-mode--treesit-font-lock-settings): Evaluate the rules only
+	after the tree-sitter grammars are installed.
+	(mhtml-ts-mode--treesit-indent-rules): Cache indent rules.
+	(mhtml-ts-mode): Call the new
+	`mhtml-ts-mode--treesit-font-lock-settings' function.
+
+2025-09-21  Steven Allen  <steven@stebalien.com>
+
+	Fix minibuffer-nonselected-mode when using recursive minibuffers
+
+	* lisp/minibuffer.el (minibuffer-nonselected-setup): Use
+	window-buffer-change-functions in addition to
+	window-selection-change-functions to detect changes from one recursive
+	minibuffer to another within the same minibuffer-window.
+	(minibuffer-nonselected-check): Ensure that the target minibuffer is
+	current before checking/deleting the overlay (bug#79472).
+
+2025-09-20  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/js.el: Obsolete 'js--treesit-sexp-nodes'.
+
+	(js--treesit-sexp-nodes): Set the default value to nil and make obsolete.
+	(js--treesit-thing-settings): Instead of using
+	'js--treesit-sexp-nodes', define a list of named and anonymous nodes
+	that don't match the 'sexp' thing (bug#79465).
+
+2025-09-20  Masatake YAMATO  <yamato@redhat.com>
+
+	(register-preview-info): sort registers in preview buffer
+
+	* lisp/register.el (register-preview): Sort alist returned
+	from `register-of-type-alist'.  (Bug#79474)
+
+2025-09-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	159ad91d0df ; Add Richard Stallman to admin/MAINTAINERS.
+
+2025-09-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid signaling errors in 'dabbrev-capf'
+
+	* lisp/dabbrev.el (dabbrev-capf): Call
+	'dabbrev--reset-global-variables' if necessary.  (Bug#61274)
+
+2025-09-20  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Add hideable indicators for hideshow. (Bug#79294)
+
+	* doc/emacs/programs.texi (Hideshow): Update documentation.
+	* etc/NEWS: Announce changes.
+	* lisp/progmodes/hideshow.el (hs-show-indicators)
+	(hs-indicator-type, hs-indicator-maximum-buffer-size): New user
+	options.
+	(hs-indicator-hide, hs-indicator-show): New icons.
+	(hs-block-positions, hs--make-indicators-overlays)
+	(hs-indicator-mouse-toggle-hidding, hs--add-indicators)
+	(hs--refresh-indicators): New functions.
+	(hs-hide-block-at-point): Use hs-block-positions.
+	(hs-inside-comment-p): Use 'get-char-property' instead of
+	'hs-overlay-at'.
+	(hs-minor-mode): Rework.
+
+2025-09-20  Janneke Nieuwenhuizen  <janneke@gnu.org>
+
+	Fix 'shell-resync-dirs' for multi-line prompt.
+
+	* lisp/shell.el (shell-eval-command): Instead of always taking the last
+	element from the shell-dirtrack-query command, first try selecting the
+	last directory.  (Bug#79441)
+
+2025-09-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'accept-process-output'
+
+	* doc/lispref/processes.texi (Accepting Output):
+	* src/process.c (Faccept_process_output): Document better the
+	meaning of the timeout of 'accept-process-output' a,d the fact
+	that it doesn't always return as soon as some output is available.
+	See https://lists.gnu.org/archive/html/emacs-devel/2025-08/msg00750.html
+	for more details.
+
+2025-09-20  Stephen Berman  <stephen.berman@gmx.net>
+
+	Prevent displaying an ungrammatical string in *Help*
+
+	* lisp/help-fns.el (help-fns-function-description-header): If a
+	function type symbol begins with a vowel, precede it with the
+	article "an" instead of "a".  To date this only prevents
+	displaying "a interpreted-function", and it's susceptible to
+	future false positives (bug#79469).
+
+2025-09-20  Po Lu  <luangruo@yahoo.com>
+
+	Fix reference leak in displaying successive dashes of distinct styles on Android
+
+	* src/android.c (android_set_dashes): Always release local
+	reference to dash array even when it was returned by
+	GetObjectField.
+
+2025-09-19  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: Don't indent a construct in a class after a template
+
+	This fixes bug#79438.
+
+	* lisp/progmodes/cc-align.el (c-lineup-class-field-cont): New
+	function.
+
+	* lisp/progmodes/cc-vars.el (c-offsets-alist): Change the
+	entry for class-field-cont from + to
+	c-lineup-class-field-cont.
+
+	* doc/misc/cc-mode.texi (Misc Line-Up): Add a new entry for
+	c-lineup-class-field-cont.
+
+2025-09-19  Juri Linkov  <juri@linkov.net>
+
+	New mode 'minibuffer-nonselected-mode'
+
+	* lisp/minibuffer.el (minibuffer-nonselected): New face.
+	(minibuffer-nonselected-overlay): New buffer-local variable.
+	(minibuffer-nonselected-check, minibuffer-nonselected-setup):
+	New functions.
+	(minibuffer-nonselected-mode): New command (bug#49844).
+
+2025-09-18  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* src/bytecode.c (exec_byte_code): Better quitcounter reset value.
+
+	This value forces a quit check at the next backward branch, to avoid
+	rare situations being hard to interrupt.
+	Suggested by Pip Cet.
+
+2025-09-18  Juri Linkov  <juri@linkov.net>
+
+	* lisp/textmodes/mhtml-ts-mode.el: Fix for recent changes in js-ts-mode.
+
+	(mhtml-ts-mode--treesit-font-lock-settings): Replace variable
+	'js--treesit-font-lock-settings' with the function call.
+	(mhtml-ts-mode--treesit-indent-rules): Replace variable
+	'js--treesit-indent-rules' with the function call (bug#79363).
+
+2025-09-18  Mattias Engdegård  <mattiase@acm.org>
+
+	Don't save quitcounter across longjmp in exec_byte_code
+
+	* src/bytecode.c (exec_byte_code): Reset quitcounter to 1 after longjmp;
+	the exact value isn't important.  This may reduce register pressure a
+	tiny bit or at least remove a useless stack slot.
+
+2025-09-18  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix failed tests on emba
+
+	* test/lisp/autorevert-tests.el (auto-revert-test05-global-notify)
+	(auto-revert-test07-auto-revert-several-buffers): Adapt tests.
+
+	* test/src/comp-resources/comp-test-funcs.el (foo): Define error symbol.
+
+2025-09-18  Andrea Corallo  <acorallo@gnu.org>
+
+	* Clean-up some compilation warnings in vc-hooks.el
+
+	* lisp/vc/vc-hooks.el(vc-diff-outgoing-base)
+	(vc-root-diff-outgoing-base, vc-apply-to-other-working-tree)
+	(vc-apply-root-to-other-working-tree): Declare.
+
+2025-09-18  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Refactor vc-git checkin functions
+
+	* lisp/vc/vc-git.el (vc-git-patch-string): Delete.  All uses
+	changed.
+	(vc-git--checkin): Rename vc-git-checkin to this.
+	(vc-git-checkin-patch, vc-git-checkin): New wrapper functions.
+
+2025-09-18  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc--prompt-other-working-tree: Fail when no other working trees
+
+	* lisp/vc/vc.el (vc--prompt-other-working-tree): When there are
+	no other working trees, signal an error.
+
+2025-09-18  Leo C. Stein  <leo.stein@gmail.com>  (tiny change)
+
+	Skip over possible blank lines returned by kpsewhich
+
+	* lisp/ffap.el (ffap-latex-mode): Starting with TeXlive 2025, the
+	kpsewhich utility may return blank lines before the first valid
+	path for `ffap'.  The old behavior of `ffap-latex-mode' was to
+	simply return the first line of output from kpsewhich (if the
+	output was nonempty).  The fix simply skips all \r and \n chars.
+	(Bug#79397)
+
+2025-09-18  Roi Martin  <jroi.martin@gmail.com>
+
+	Fix font lock and indentation in js-ts-mode
+
+	Fix font lock and indentation in js-ts-mode when the tree-sitter grammar
+	is automatically installed (Bug#79363).
+	* lisp/progmodes/js.el (js--treesit-indent-rules)
+	(js--treesit-font-lock-settings): Evaluate the rules only after the
+	tree-sitter grammar is installed.
+	(js-ts-mode): Call the new `js--treesit-indent-rules' and
+	`js--treesit-font-lock-settings' functions.
+
+2025-09-17  Eric Frederickson  <ericfrederickson68@gmail.com>
+
+	* doc/misc/eshell.texi (Scripts): Improve wording for 'eshell-batch-file'.
+
+2025-09-17  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/net/tramp.el (tramp-cache): Require at bottom.
+
+2025-09-17  Juri Linkov  <juri@linkov.net>
+
+	* lisp/hl-line.el: Various fixes (bug#64993).
+
+	(hl-line-face): Move 'global-hl-line-overlay' updates
+	to the loop over buffers since it's a buffer-local variable.
+	(global-hl-line-maybe-unhighlight): Remove obsolete overlays
+	from 'global-hl-line-overlays'.
+
+2025-09-17  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Turn some checking macros into functions in the GC marker code
+
+	This rids us of a bunch of unhygienic macros with free variables and
+	makes the marking code actually readable again.  Even better, it is all
+	processed by the compiler even when the checks are disabled.
+
+	* src/alloc.c (CHECK_ALLOCATED, CHECK_LIVE, CHECK_ALLOCATED_AND_LIVE)
+	(CHECK_ALLOCATED_AND_LIVE_SYMBOL): Transform macros into...
+	(check_live, check_allocated_and_live, check_allocated_and_live_symbol)
+	(check_allocated_and_live_vectorlike): ...functions.  Callers adapted.
+
+2025-09-17  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	Fixes for csharp-ts-mode fontification (bug#79406)
+
+	- hightlight reserved keywords agressively, dont allow misuse as
+	  variables etc (the compiler will fail!)
+	- highlight lambda-valued variables as funtions.
+	- improve semantics of function/class annotations using attributes
+	  (maps closer to using-something than declaring it). also: rename to
+	  "attribute". "property" has a different, defined meaning in C#.
+	- better highlight variable-use in different scenarios (function-calls,
+	  if-statements, assignment-expressions, property-use, anonymous object
+	  initializers).
+	- better highlight for property-use (anonymous object initializers).
+	- highlight field-declaration using font-lock-variable-face.
+	- fontify attributes using new face csharp-ts-mode-attribute-face
+	  (defaults to font-lock-property-use-face).
+	- remove extensive use of "override" making evalutation hard-to-reason about.
+
+	* lisp/progmodes/csharp-mode.el (csharp-ts-mode--indent-rules):
+	Update indent rules.
+	(csharp-ts-mode-faces): New group.
+	(csharp-ts-mode-attribute-face): New face.
+	(csharp-ts-mode--font-lock-settings): Rule updates.
+	(csharp-ts-mode): Change property feature to attribute
+
+2025-09-16  Juri Linkov  <juri@linkov.net>
+
+	New mode 'mouse-shift-adjust-mode' for S-<mouse-1>
+
+	* lisp/mouse.el (mouse-shift-adjust-mode-map): New variable.
+	(mouse-shift-adjust-mode): New minor mode (bug#79453).
+	(mouse-shift-adjust-point): New variable.
+	(mouse-drag-region-shift-adjust): New command.
+	(mouse-drag-track, mouse-set-region): Use 'mouse-shift-adjust-point'
+	to take into account the already existing region boundary.
+
+2025-09-16  Juri Linkov  <juri@linkov.net>
+
+	* lisp/hl-line.el (global-hl-line-sticky-flag): New value 'all'.
+
+	(global-hl-line-mode): Use 'global-hl-line-highlight-all'
+	for 'post-command-hook' when the value of
+	'global-hl-line-sticky-flag' is 'all' (bug#64993).
+
+2025-09-16  Juri Linkov  <juri@linkov.net>
+
+	Context menu related fixes (bug#64980)
+
+	* etc/PROBLEMS: Suggest how to keep context menus open on Lucid.
+
+	* lisp/mouse.el (context-menu-mode-map): Bind [mouse-3] to
+	'ignore' instead of 'nil' to not fallback to the default binding.
+	(mouse--drag-start-event): Remove unused variable.
+	(mouse-undouble-last-event): Remove unused function.
+
+2025-09-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Revert "Fix generation of defvars defined by easy-mmode and company in loaddefs.el"
+
+	This reverts commit e9800cabffa73018a83108de2bb4e1686f1e8385.
+	AFAICT that commit had no effect but it re-introduces some magic constants
+	in the code that we'd like to eliminate.
+	We presume it was a misunderstanding, trying to fix
+	a transient problem which a bootstrap would have fixed.
+	See https://lists.gnu.org/archive/html/emacs-devel/2025-08/msg00716.html
+	and https://lists.gnu.org/archive/html/emacs-devel/2025-09/msg00109.html
+
+2025-09-16  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New commands to apply changes to other working trees
+
+	* lisp/vc/diff-mode.el (diff-apply-buffer): New TEST argument.
+	* lisp/vc/vc.el (diff-apply-buffer): Declare.
+	(vc-no-confirm-moving-changes): New user option.
+	(vc-apply-to-other-working-tree)
+	(vc-apply-root-to-other-working-tree): New commands.
+	* lisp/vc/vc-hooks.el (vc-prefix-map): Bind them.
+	* doc/emacs/vc1-xtra.texi (Other Working Trees):
+	* etc/NEWS: Document them.
+
+2025-09-16  Dmitry Gutov  <dmitry@gutov.dev>
+
+	ruby-syntax-propertize: Add exception for /=
+
+	* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize):
+	Create an exception for assign-division operator not to be
+	recognized as regexp start (bug#79454).
+
+	* test/lisp/progmodes/ruby-mode-resources/ruby.rb: Add example.
+
+2025-09-15  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	Fix tree-sitter ABI version incompatibility in php-ts-mode
+
+	* lisp/progmodes/php-ts-mode.el (php-ts-mode--language-source-alist):
+	For ABI version < 15 add the recommended version "v0.23.12" (full hash
+	"f7cf7348737d8cff1b13407a0bfedce02ee7b046").
+
+2025-09-15  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp code cleanup
+
+	* lisp/net/tramp.el (tramp-use-absolute-autoload-file-names)
+	(tramp-skeleton-file-name-all-completions)
+	(tramp-parse-auth-sources, tramp-parse-file, tramp-parse-netrc):
+	* lisp/net/tramp-cache.el (tramp-parse-connection-properties):
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-parse-device-names):
+	* lisp/net/tramp-sh.el (tramp-sh-handle-insert-directory):
+	Use `seq-uniq'.
+
+	* lisp/net/tramp.el (tramp-register-foreign-file-name-handler):
+	* lisp/net/tramp-fuse.el (tramp-fuse-handle-directory-files):
+	Use `seq-union'.
+
+	* test/lisp/net/tramp-archive-tests.el
+	(tramp-archive-test17-insert-directory):
+	* test/lisp/net/tramp-tests.el (tramp-test17-insert-directory):
+	Use `seq-union'.
+	(tramp-test42-utf8): Use `seq-uniq' and `tramp-compat-seq-keep'.
+
+2025-09-15  Michael Albinus  <michael.albinus@gmx.de>
+
+	Improve check for netrc tokens
+
+	* doc/misc/auth.texi (Help for users): Mention also "#" inside tokens.
+
+	* lisp/auth-source.el (auth-source-netrc-create): Better check for
+	token format.
+
+	* test/lisp/auth-source-tests.el (auth-source-backend-parse-json):
+	New test.
+	(auth-source-test-netrc-create-secret): Extend test.
+
+2025-09-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix incorrect timezones for London and Paris
+
+	Also, replace obsolete city name "Bangalore" with "Delhi",
+	and improve doc strings.
+	* lisp/time.el (zoneinfo-style-world-list)
+	(legacy-style-world-list): Evidently "Bangalore" was chosen for
+	Asia/Kolkata to avoid confusion about "Calcutta" vs "Kolkata".
+	However, it has similar confusion with "Bengaluru".
+	Use "Delhi" instead, as Delhi is larger, its name has not changed
+	for some time, and proposals to change its name have so far failed.
+	See: Sharma MS. Vijay Goel wants Delhi renamed as Dilli, but historians
+	say it will only spell trouble. Times of India. 2019-07-25.
+	(zoneinfo-style-world-list): Update doc string. “Posix-style” was
+	ambiguous as TZDB-style strings are specified only by POSIX.1-2024,
+	so use “TZDB-style” instead. Say “AREA/LOCATION” to be consistent.
+	If AREA/LOCATION is unsupported, Emacs signals an error on NetBSD
+	so don’t imply that some other timezone will be used.
+	(legacy-style-world-list): Remove ("GMT0BST" "London") and ("CET-1CDT"
+	"Paris"). These are wrong because neither London nor Paris follow
+	US DST rules.  Instead, use ("GMT0BST,M3.5.0/1,M10.5.0" "London")
+	and ("CET-1CEST,M3.5.0,M10.5.0/3" "Paris") if they work, and omit
+	London and Paris entries otherwise.
+
+2025-09-14  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/net/shr.el (shr-tag-sub): Handle BOB (bug#79448).
+
+2025-09-14  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* lisp/calc/calc.el (calc): Ony substitute binding of
+	calc-help-prefix after calc-ext has been loaded.
+
+2025-09-14  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Use linear arrays in ispell test to work with old bash
+
+	* test/lisp/textmodes/ispell-resources/fake-aspell-new.bash:
+	Avoid using associative arrays since they are not available
+	in old bash versions that come with some systems (bug#79177).
+
+2025-09-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix gdb-mi startup when asking user about debuginfod
+
+	* lisp/progmodes/gdb-mi.el (gdb-init-1): Delay processing of GDB
+	responses while waiting for the user to answer the question about
+	enabling debuginfod.  (Bug#79403)
+
+2025-09-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'ucs-normalize' tests following Unciode 17.0 import
+
+	* lisp/international/ucs-normalize.el
+	(ucs-normalize-composition-exclusions): Doc fix.
+
+	* test/lisp/international/ucs-normalize-tests.el
+	(ucs-normalize-tests--failing-lines-part1): Update to _really_
+	match Unicode 17.0.
+
+	* admin/notes/unicode: Update instructions.
+
+2025-09-13  James Thomas  <jimjoe@gmx.net>
+
+	(eww-switch-to-buffer): Prefer seq- functions to cl-
+
+	* lisp/net/eww.el (eww-switch-to-buffer): Don't reverse the list
+	of buffers since it doesn't do what we want any way (bug#79084).
+
+2025-09-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'define-globalized-minor-mode' when :variable is used
+
+	* lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
+	Fix a typo (bug#79412).
+
+2025-09-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix Unicode-related tests
+
+	* test/lisp/international/mule-tests.el
+	(mule-cmds-tests--ucs-names-missing-names): Update no-name regions
+	of codepoints to Unicode 17.0.
+
+	* lisp/international/mule-cmds.el (ucs-names): Fix comments.
+
+	* admin/notes/unicode: Update instructions.
+
+2025-09-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	47454566772 ; * lisp/dired-x.el (dired-find-subdir): Doc fix (bug#794...
+	0832e5fec56 ; * lisp/vc/vc.el (vc-print-root-log): Improve docstring ...
+	2fafcdbf6ac ; Minor copyedits in src/editfns.c
+
+2025-09-13  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	Add support for PHP 8.5 in 'php-ts-mode.el'
+
+	* lisp/progmodes/php-ts-mode.el: Doc string update.
+	(php-ts-mode--language-source-alist): PHP grammar update.
+	(php-ts-mode-find-sibling-rules): Doc string fix.
+	(php-ts-mode--parent-html-heuristic): Handled the case where there
+	is no HTML between two blocks of PHP code.
+	(php-ts-mode--array-element-heuristic): Fix typo.
+	(php-ts-mode--pipe-heuristic): New function that handle PHP's new
+	pipe operator.
+	(php-ts-mode--indent-styles): Removed commented code.  More
+	accurate indentation of ‘member_call_expression’.  Use of new
+	function to handle pipe operator indentation.  New rule for
+	indenting ‘property_hook_list’.
+	(php-ts-mode--test-yield-from-p): New predicate to check whether
+	the 'yield from' keyword is supported by the PHP grammar.
+	(php-ts-mode--test-pipe-p): New predicate to check whether the
+	‘pipe’ operator is supported by the PHP grammar.
+	(php-ts-mode--keywords): Use the new predicate
+	'php-ts-mode--test-yield-from-p'.  Now it is a var instead of a
+	const.
+	(php-ts-mode--operators): Use the new predicate
+	'php-ts-mode--test-pipe-p'.  Now it is a var instead of a const.
+	(php-ts-mode--font-lock-settings): New rules for
+	'nullsafe_member_access_expression', 'callable' primitive type.
+	New rule for the 'php_end_tag' if supported by the grammar.
+	More precise rules for 'scoped_call_expression' and
+	'member_call_expression'.
+	(php-ts-mode--inferior-php-process): Removed this unnecessary
+	variable.
+	(inferior-php-ts-mode-startup): Removed the use of
+	'php-ts-mode--inferior-php-process'.
+	(php-ts-mode-inferior--write-history): Removed the use of
+	'php-ts-mode--inferior-php-process'.
+	(Bug#79339)
+
+2025-09-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'kill-region' when buffer has been changed outside of Emacs
+
+	* lisp/subr.el (read-char-choice): Let-bind 'last-command' to
+	prevent it from being overwritten by 'recursive-edit'.
+	(Bug#79388)
+
+2025-09-13  Alcor  <alcor@tilde.club>
+
+	Fix parsing single-digit color codes in rcirc
+
+	* lisp/net/rcirc.el (rcirc-color-attributes)
+	(rcirc-remove-markup-codes): Handle single-digit color codes correctly.
+
+2025-09-13  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Allow disabling of reloading files on doc read failure
+
+	Reloading a byte-compiled file when we fail to fetch some
+	docstring in it is not guaranteed to work and can cause
+	subtle bugs which are worse than simply not having a
+	docstring.  Add 'documentation-dynamic-reload' variable to
+	allow disabling this behavior.  See the discussion in
+	https://lists.gnu.org/archive/html/emacs-devel/2025-08/msg00304.html
+	for more details.
+	* src/doc.c (syms_of_doc): Add 'documentation-dynamic-reload'.
+	(Fdocumentation, Fdocumentation_property): Check value of
+	'documentation-dynamic-reload'.
+
+2025-09-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/comint.el (comint-password-prompt-regexp): Join two entries.
+
+2025-09-13  Andre A. Gomes  <andremegafone@gmail.com>
+
+	Make comint understand SSH proxy password phrases
+
+	* lisp/comint.el (comint-password-prompt-regexp):
+	* test/lisp/comint-tests.el (comint-testsuite-password-strings):
+	Add SSH proxy password phrase.  (Bug#79424)
+
+2025-09-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Delete obsolete log-edit-beginning-of-line
+
+	* lisp/vc/log-edit.el (message): No longer require.
+	(log-edit-beginning-of-line): Delete.  No longer required now
+	that Log Edit buffers use fields for headers.  (In combination
+	with the new fields, this binding led to C-a behaving strangely
+	for summaries with colons in them.)
+	(log-edit-mode-map): Unbind it.
+
+2025-09-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix last change
+
+	* test/lisp/textmodes/ispell-tests/ispell-aspell-tests.el:
+	* test/lisp/textmodes/ispell-tests/ispell-hunspell-tests.el:
+	* test/lisp/textmodes/ispell-tests/ispell-international-ispell-tests.el:
+	* test/lisp/textmodes/ispell-tests/ispell-tests.el: Fix load argument.
+
+2025-09-12  Lockywolf  <for_emacs_1@lockywolf.net>
+
+	Add tests to ispell.el interactive functions
+
+	* lisp/textmodes/ispell.el (ispell-accept-output): Fix variable init.
+
+	* test/lisp/textmodes/ispell-resources/fake-aspell-new.bash:
+	Update mock aspell to be able to serve all tests.
+
+	* test/lisp/textmodes/ispell-tests/ispell-aspell-tests.el:
+	(ispell/aspell/ispell-word/english/correct): Implement.
+	(ispell/aspell/ispell-word/english/incorrect): Implement.
+	(ispell/aspell/ispell-word/english/wrong-language): Implement.
+
+	* test/lisp/textmodes/ispell-tests/ispell-hunspell-tests.el
+	Fix byte compilation errors.
+
+	* test/lisp/textmodes/ispell-international-ispell-tests.el
+	Fix byte compilation errors.
+
+	* test/lisp/textmodes/ispell-tests/ispell-tests-common.el
+	(with-ispell-global-dictionary): Implement a macro to
+	set and restore ispell.el's global dictionary.
+
+	* test/lisp/textmodes/ispell-tests/ispell-tests.el:
+	(ispell/ispell-buffer-local-words/ispell-words-keyword): Fix CI run.
+	(ispell/ispell-accept-buffer-local-defs/simple): Fix skip condition.
+	(ispell/ispell--run-on-word/default): Fix skip condition.
+	(ispell/ispell-word/default/check-only/correct): Fix global variable.
+	(ispell/ispell-word/default/check-only/correct/add-init): Fix
+	global variable.
+	(ispell/ispell-word/default/check-only/incorrect): Fix skip condition.
+	(ispell/ispell-region/incorrect): Fix postcondition.
+	(ispell/ispell-call-process/simple): Fix emacs path.
+	(ispell/ispell-call-process/simple-writable): Fix emacs path.
+	(ispell/ispell-call-process-region/cat-empty): Fix emacs path.
+	(ispell/ispell-call-process-region/cat-random): Fix emacs path.
+	(ispell/ispell-kill-ispell): Implement.
+	(ispell/ispell/buffer): Implement.
+	(ispell/ispell/region): Implement.
+	(ispell/ispell-change-dictionary): Implement.
+	(ispell/ispell-comments-and-strings/correct): Implement.
+	(ispell/ispell-comments-and-strings/incorrect): Implement.
+	(ispell/ispell-comment-or-string-at-point): Implement.
+	(ispell/ispell-pdict-save): Implement.
+	(ispell/ispell-pdict-save/force): Implement.
+	(ispell/ispell-pdict-save/modified): Implement.
+	(ispell/ispell-pdict-save/unmodified): Implement.
+	(ispell/ispell-lookup-words/simple): Implement.
+	(ispell/ispell-complete-word/ispell-completion-at-point): Implement.
+	(ispell/ispell-complete-word-interior-frag/simple): Implement.
+	(ispell/ispell-minor-mode/simple): Implement.
+	(ispell/ispell-message/correct): Implement.
+	(ispell/ispell-message/incorrect): Implement.
+
+2025-09-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Add new scripts to the default fontset
+
+	* lisp/international/fontset.el (setup-default-fontset): Add 4
+	scripts new in Unicode 17.0.
+
+2025-09-12  Liu Hui  <liuhui1610@gmail.com>
+
+	Tramp: Refactor environment variable filtering to a separate function
+
+	* lisp/net/tramp.el (tramp-local-environment-variable-p):
+	New function.  (Bug#79413)
+	(tramp-handle-make-process):
+	* lisp/net/tramp-sh.el (tramp-sh-handle-make-process)
+	(tramp-sh-handle-process-file):
+	* lisp/net/tramp-androidsu.el
+	(tramp-androidsu-handle-make-process):
+	Use `tramp-local-environment-variable-p'.
+
+2025-09-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	Introduc auth-source-ignore-non-existing-file
+
+	* lisp/auth-source.el (auth-source-ignore-non-existing-file):
+	Rename it from `auth-source-ignore-empty-file'.
+	(auth-source-backends-parser-file): Use it.
+
+	* doc/misc/auth.texi (Help for users):
+	* etc/NEWS:
+	* test/lisp/auth-source-tests.el (auth-source-validate-backend)
+	(auth-source-test-netrc-create-secret):
+	Use `auth-source-ignore-non-existing-file'.
+
+2025-09-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	Minor edits in tramp-tests.el
+
+	* test/lisp/net/tramp-tests.el (tramp-test16-file-expand-wildcards)
+	(tramp-test26-interactive-file-name-completion):
+	Prefer #'string-lessp over 'string<.
+	(tramp--test-ange-ftp-p, tramp-test47-read-password)
+	(tramp-test47-read-otp-password): Use function read syntax.
+
+2025-09-11  Philip Kaludercic  <pkal@posteo.net>
+
+	Update timeout to 2f3ebb53
+
+	See https://github.com/karthink/timeout/commit/f3ebb5.
+
+2025-09-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Update to Unicode 17.0
+
+	* test/manual/BidiCharacterTest.txt:
+	* admin/unidata/BidiBrackets.txt:
+	* admin/unidata/BidiMirroring.txt:
+	* admin/unidata/Blocks.txt:
+	* admin/unidata/IVD_Sequences.txt:
+	* admin/unidata/IdnaMappingTable.txt:
+	* admin/unidata/NormalizationTest.txt:
+	* admin/unidata/PropertyValueAliases.txt:
+	* admin/unidata/ScriptExtensions.txt:
+	* admin/unidata/Scripts.txt:
+	* admin/unidata/SpecialCasing.txt:
+	* admin/unidata/UnicodeData.txt:
+	* admin/unidata/confusables.txt:
+	* admin/unidata/emoji-data.txt:
+	* admin/unidata/emoji-sequences.txt:
+	* admin/unidata/emoji-test.txt:
+	* admin/unidata/emoji-variation-sequences.txt:
+	* admin/unidata/emoji-zwj-sequences.txt: Import from Unicode 17.0.
+
+	* etc/NEWS:
+	* test/lisp/international/ucs-normalize-tests.el
+	(ucs-normalize-tests--failing-lines-part1)
+	(ucs-normalize-tests--failing-lines-part2):
+	* lisp/international/mule-cmds.el (ucs-names):
+	* lisp/international/fontset.el (script-representative-chars)
+	(otf-script-alist):
+	* lisp/international/characters.el:
+	* admin/unidata/blocks.awk: Update for Unicode 17.0.
+
+2025-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Rearrange tramp.el in order to avoid bootstrap problems
+
+	* lisp/net/tramp.el (tramp-compat, tramp-message)
+	(tramp-integration, trampver): Require them later.
+	(top): Use `eval-and-compile' modifying `macro-declarations-alist'.
+	(tramp-register-file-name-handlers): Don't fail during bootstrap
+	before `tramp-loaddefs.el' is built.
+
+2025-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(scheme-mode-variables): Fix bug#79282
+
+	* lisp/progmodes/scheme.el (scheme-mode-variables): Re-install
+	`lisp-font-lock-syntactic-face-function` mistakenly removed
+	in commit 0a5cfeeecb9e.
+
+2025-09-10  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Make bytecomp-tests cease warn and error to stdout
+
+	They were caused by compilation errors going to 'display-warning'
+	which prints a duplicate of the message to stdout when running
+	noninteractively.
+
+	* test/lisp/emacs-lisp/bytecomp-tests.el
+	(bytecomp-tests--log-warning-for-byte-compile)
+	(bytecomp-tests--with-warnings): New.  Wrap around compilation calls in
+	this file.
+
+2025-09-10  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Remove unused and broken source inline code path
+
+	* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand): We can
+	assume that non-compiled functions are from another file at this point
+	and remove an unused code branch which didn't actually work with
+	interpreted function objects anyway.
+
+2025-09-10  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Better 'project-buffer' completion category defaults in Emacs <= 30
+
+	* lisp/progmodes/project.el: Fall back to adding 'project-buffer'
+	to 'completion-category-defaults' if 'define-completion-category'
+	is not available (bug#79409).
+
+2025-09-09  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Ignore keymaps at point for positions outside the buffer
+
+	Correct a few edge cases where we used the keymaps at point when
+	looking up keymaps for an event position which is outside the
+	current buffer.  Namely:
+
+	- Clicking on a part of the mode line which is after the end of
+	  mode-line-format produces an event with non-nil posn-area but
+	  nil posn-string.
+
+	- Even if posn-string doesn't have a local keymap, we should
+	  still ignore the keymaps at point if posn-string is non-nil.
+
+	* src/keymap.c (Fcurrent_active_maps): Ignore keymaps at point
+	for more positions outside the buffer.  (bug#76620)
+
+2025-09-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Allow use of \N{...} earlier to help fix bug#79353
+
+	* lisp/emacs-lisp/shorthands.el (hack-read-symbol-shorthands):
+	Avoid inf-loops during bootstrap.
+	E.g. this can occur while loading `uni-special-lowercase.el` where
+	`hack-local-variables--find-variables` uses `downcase` which triggers
+	loading `uni-special-lowercase.el`, ...
+
+	* lisp/international/mule-cmds.el (ucs-names): Explicitly require
+	`charprop`.
+
+	* src/Makefile.in ($(lispsource)/loaddefs.el): Depend on `charprop`.
+
+2025-09-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	Ignore non-existing or empty files in auth-sources
+
+	* doc/misc/auth.texi: Replace @code{"..."} by @t{"..."}.
+	(Help for users): Describe property lists format.  Explain, that
+	empty files in auth-sources are ignored when
+	auth-source-ignore-empty-file is non-nil.
+	(Help for developers): Add auth-source-creation-defaults to vindex.
+
+	* etc/NEWS: Introduce auth-source-ignore-empty-file.
+	Presentational fixes and improvements.
+
+	* lisp/auth-source.el (auth-source-ignore-empty-file): New defcustom.
+	(auth-source-backends-parser-file): Use it.  (Bug#9113)
+
+	* test/lisp/auth-source-tests.el (auth-source-validate-backend):
+	Let-bind `auth-source-ignore-empty-file'.
+	(auth-source-test-searches): Set file suffix.
+	(auth-source-test-netrc-create-secret): Adapt test.
+
+2025-09-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	Merge from origin/emacs-30
+
+	56cdb65e540 ; * doc/emacs/mini.texi (Minibuffer History): Fix typo.
+	e65ebdf3290 ; Improve documentation of isearch ion minibuffer
+	6544372764d * doc/misc/tramp.texi (Password handling): Fix default of...
+	96d90403417 Fix auth-source.el doc
+
+2025-09-09  Lockywolf  <for_emacs_1@lockywolf.net>
+
+	Add convenience path/to/component target to tests/Makefile.in
+
+	* test/Makefile.in (subdir_template): Add convenience targets.
+
+	* test/README: Mention this.
+
+2025-09-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cl--make-usage-args): Try and fix bug#79353
+
+	* lisp/emacs-lisp/cl-macs.el (cl--make-usage-args): Don't depend on
+	`cl-extra` when `take` does the job.
+
+2025-09-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Make C-x v w w work in Log View mode, to change working directory
+
+	* lisp/vc/diff-mode.el (diff-find-matching-buffer): Rename ...
+	* lisp/progmodes/project.el
+	(project-change-to-matching-directory): ... to here.  All uses
+	changed.
+	* lisp/vc/log-view.el (project-change-to-matching-directory):
+	Declare.
+	(log-view-mode): Use it.
+	* doc/emacs/vc1-xtra.texi (Other Working Trees): Document the
+	change.
+
+2025-09-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-next-action: Fix a cache invalidation problem
+
+	* lisp/vc/vc.el (vc-next-action): Use vc-registered, not
+	vc-backend, to see which files are already registered.
+
+2025-09-07  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	csharp-mode: indentation fixes (bug#79398)
+
+	* lisp/progmodes/csharp-mode.el (csharp-ts-mode--indent-rules):
+	Adjust rules to fix the following incorrect behaviours:
+	- in multiline expressions/method call chains;
+	- in object initialization expressions;
+	- in array creation expressions.
+
+2025-09-07  Roi Martin  <jroi.martin@gmail.com>
+
+	Fix grammar installation in elixir-ts-mode and heex-ts-mode
+
+	Fix tree-sitter grammar installation issues in elixir-ts-mode and
+	heex-ts-mode (Bug#79363).
+	* lisp/progmodes/elixir-ts-mode.el (elixir-ts--font-lock-settings):
+	Check that tree-sitter is available.
+	(elixir-ts-mode): If the user answers "no" to installing the heex
+	tree-sitter grammar, do not ask again.  Group heex settings.
+	* lisp/progmodes/heex-ts-mode.el (heex-ts-mode): Ensure that elixir
+	tree-sitter grammar is installed.
+
+2025-09-07  Roi Martin  <jroi.martin@gmail.com>
+
+	Fix font lock in go-ts-mode
+
+	Fix font lock in go-ts-mode when the tree-sitter grammar is
+	automatically installed (Bug#79363).
+	* lisp/progmodes/go-ts-mode.el (go-ts-mode--font-lock-settings):
+	Evaluate the rules only after the tree-sitter grammar is installed.
+	(go-ts-mode): Call the new `go-ts-mode--font-lock-settings' function.
+
+2025-09-07  Roi Martin  <jroi.martin@gmail.com>
+
+	Fix font lock and indentation in cmake-ts-mode
+
+	Fix font lock and indentation in cmake-ts-mode when the tree-sitter
+	grammar is automatically installed (Bug#79363).
+	* lisp/progmodes/cmake-ts-mode.el (cmake-ts-mode--indent-rules)
+	(cmake-ts-mode--font-lock-settings): Evaluate the rules only after the
+	tree-sitter grammar is installed.
+	(cmake-ts-mode): Call the new `cmake-ts-mode--indent-rules' and
+	`cmake-ts-mode--font-lock-settings' functions.
+
+2025-09-07  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* lisp/emacs-lisp/cl-lib.el (cl-copy-list): Not error-free, bug#79396
+
+2025-09-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/misc/tramp.texi (Password handling): Fix default of auth-sources.
+
+2025-09-07  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Less expensive jsonrpc logging (bug#79361)
+
+	Remove the oldest 1/4 of the jsonrpc events buffer when reaching the
+	size limit instead of just a few lines.  This reduces the cost of adding
+	a log entry from O(buffer-size) to O(1).
+
+	Also make messages forwarded to the events buffer, such as ones sent to
+	stderr from the server process, obey the same limit.
+
+	* lisp/jsonrpc.el (jsonrpc--limit-buffer-size): New.
+	(jsonrpc--log-event, jsonrpc--forwarding-buffer): Use it.
+
+2025-09-07  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Avoid unnecessary text decoding in jsonrpc for speed (bug#79361)
+
+	The built-in JSON parser works on undecoded (unibyte) input; decoding
+	received data is just a waste and does take time even when all-ASCII.
+
+	* lisp/jsonrpc.el (initialize-instance): Use unibyte process buffer and
+	binary coding for process I/O, implying unibyte strings being passed to
+	the filter function.
+	(jsonrpc-connection-send): More efficient message generation.
+	(jsonrpc--json-read): Compatibility code for the old elisp json parser.
+	(jsonrpc--process-filter): Faster header-matching regexp.
+
+2025-09-07  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Harmonise doc strings for {re-,posix-,}search-{forward,backward}
+
+	The doc strings for re-search-forward and re-search-backward have been
+	improved (bug#25193, bug#31584) but the corresponding posix- and
+	non-regexp search functions still have the original text, despite
+	describing the exact same mechanism.
+
+	There is no reason for them to differ, so we make them all use the
+	updated version which also is more readable.  Any future doc string
+	improvements should be made to all of them in the same way for
+	consistency.
+
+	* src/search.c (Fsearch_backward, Fsearch_forward)
+	(Fposix_search_backward, Fposix_search_forward):
+	Use text from Fre_search_forward and Fre_search_backward.
+
+2025-09-07  Lockywolf  <for_emacs_1@lockywolf.net>
+
+	ispell.el: Add 56 tests (bug#79177)
+
+	* test/lisp/textmodes/ispell-tests/ispell-tests.el:
+	* test/lisp/textmodes/ispell-tests/ispell-aspell-tests.el:
+	* test/lisp/textmodes/ispell-tests/ispell-international-ispell-tests.el:
+	* test/lisp/textmodes/ispell-tests/ispell-hunspell-tests.el: New files.
+	* test/lisp/textmodes/ispell-resources/fake-aspell.bash: Add a mock
+	`aspell' for use in ispell.el test, with old version.
+	* test/lisp/textmodes/ispell-resources/fake-aspell-new.bash: Add a mock
+	`aspell' for use in ispell.el test, with recent version.
+
+2025-09-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix auth-source.el doc
+
+	* doc/misc/auth.texi (Help for users): Change variables to user
+	options where appropriate.  Use setopt for them.  Add Tramp link.
+	Fix example.  (Bug#9113)
+
+	* lisp/auth-source.el (auth-sources): Add :link.
+
+2025-09-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	* admin/notes/jargon: Add RSN.
+
+2025-09-07  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project--read-project-buffer: Fix creating new buffer
+
+	* lisp/progmodes/project.el (project--read-project-buffer):
+	Fix the case of entering new buffer name (bug#77312).
+
+2025-09-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-deduce-backend: Respect vc-buffer-overriding-fileset
+
+	* lisp/vc/vc.el (vc-deduce-backend): Respect
+	vc-buffer-overriding-fileset, if set.
+
+2025-09-06  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Fix nil value of 'elisp-flymake-byte-compile-executable'
+
+	* lisp/progmodes/elisp-mode.el
+	(elisp-flymake-byte-compile--executable): Properly check for
+	nil, and simplify code.  (Bug#79380)
+
+2025-09-06  Brian Leung  <leungbk@posteo.net>
+
+	Eglot: Really fix neocmakelsp invocation
+
+	* lisp/progmodes/eglot.el (eglot-server-programs): Remove an
+	incorrect extra layer of parentheses.  (Bug#79394)
+
+2025-09-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix log-view--mark-unmark interactive arguments
+
+	* lisp/vc/log-view.el (log-view--mark-unmark): New BEG and END
+	arguments.  Don't call region-beginning and region-end here.
+	(log-view-mark-entry, log-view-unmark-entry): Pass BEG and END
+	to log-view--mark-unmark, non-nil when the region is active.
+
+2025-09-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	aad5b676d1c ; * lisp/emacs-lisp/ring.el (ring-convert-sequence-to-rin...
+	ddd63891a48 ; * doc/misc/flymake.texi (Troubleshooting): Fix typo (bu...
+	8dcb8020466 ; vc-hooks.el: Standardize terminology in header.
+
+2025-09-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid assertion violations when starting client network process
+
+	* src/process.c (deactivate_process): Clear the callback info of
+	descriptors we are closing.  (Bug#79367)
+
+2025-09-06  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	'nxml-mode': add schema for .NET SLNX files.
+
+	SLNX is a new XML-based file-format for .NET based solutions, replacing
+	the older proprietary SLN file-format.
+
+	Unlike SLN-files, it is merge-friendly and expected to become the new
+	de-facto standard for working with .NET projects.  This commit adds
+	support for SLNX-schema to 'nxml-mode'.
+
+	The schme provided has been synthesized using the official XSD-schema
+	definition:
+	https://github.com/microsoft/vs-solutionpersistence/blob/main/src/Microsoft.VisualStudio.SolutionPersistence/Serializer/Xml/Slnx.xsd
+
+	This schema was then converted to RNG using XSDtoRNG.xsl:
+	https://github.com/epiasini/XSDtoRNG
+
+	The RNG schema was then converted to RNC using the trang CLI-tool:
+	https://relaxng.org/jclark/trang.html
+
+	* etc/schema/dotnet-slnx.rnc: New file.
+	* etc/schema/schemas.xml: Add Slnx schema.
+
+	* lisp/files.el (auto-mode-alist): Add association for SLNX files.
+	(Bug#79379)
+
+2025-09-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix command keys in doc string of 'inferior-python-mode'
+
+	* lisp/progmodes/python.el (inferior-python-mode): Mention the
+	correct mode-map in the doc string.  (Bug#79386)
+
+2025-09-06  Gustav Hållberg  <emacs@askgustav.com>  (tiny change)
+
+	"M-x lldb": bugfix source code location without column
+
+	* lisp/progmodes/gud.el (gud-lldb-marker-filter): Fix problem
+	where the source code location ends up at the last character of
+	the previous line if no (or zero) column is reported by lldb.
+	(Bug#79360)
+
+2025-09-06  Liu Hui  <liuhui1610@gmail.com>
+
+	Fix duplicate inputs in 'comint-read-input-ring'
+
+	* lisp/comint.el (comint-read-input-ring): Fix the index of
+	the last input in the ring.  (Bug#79329)
+
+2025-09-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(redisplay_internal): Fix `follow-mode` (bug#79306)
+
+	* src/xdisp.c (redisplay_internal): Don't increment `redisplay_counter`
+	if we ail out before starting an actual redisplay.
+
+2025-09-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Log View marking commands: respect numeric prefixes & active regions
+
+	* lisp/vc/log-view.el (log-view--mark-unmark)
+	(log-view--mark-entry, log-view--unmark-entry): New functions.
+	(log-view-mark-entry, log-view-unmark-entry): Call them.
+	Newly respect numeric prefix arguments and active regions.
+
+2025-09-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-dir-mark-unmark: When region active, don't do any y/n prompting
+
+	* lisp/vc/vc-dir.el (vc-dir-mark-unmark): When region active,
+	bind vc-dir-allow-mass-mark-changes to nil.
+
+2025-09-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-dir-mark-unmark: When region active, don't do any y/n prompting
+
+	* lisp/vc/vc-dir.el (vc-dir-mark-unmark): When region active,
+	bind vc-dir-allow-mass-mark-changes to nil.
+
+2025-09-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Make 'm' and 'u' in Log View mode more standard
+
+	* lisp/vc/log-view.el (log-view-mark-entry)
+	(log-view-unmark-entry): New commands.
+	(log-view-toggle-mark-entry): Rewrite in terms of them.
+	(log-view-mode-map): Unbind log-view-toggle-mark-entry.
+	Bind the two new commands.
+	* etc/NEWS: Document the change.
+
+2025-09-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix locking to threads of the client network process
+
+	* src/process.c (server_accept_connection): Make the client
+	process be locked to the same thread as the parent server process,
+	or unlocked if the server process was unlocked.  (Bug#79367)
+
+2025-09-05  F. Jason Park  <jp@neverwas.me>
+
+	Make function erc-scrolltobottom-mode idempotent
+
+	* lisp/erc/erc-goodies.el (erc-scrolltobottom-mode)
+	(erc-scrolltobottom-enable): Always remove hook functions whose
+	membership hinges on the value of `erc-scrolltobottom-all'.  In ERC 5.6,
+	an init file's `setopt' form containing an `erc-modules' assignment
+	before an `erc-scrolltobottom-all' one would result in conflicting sets
+	of hook members come `erc-open'.  Having such option-dependent branching
+	in module setup, while difficult to maintain, is a long held ERC
+	practice, as seen in functions like `erc-nickserv-identify-mode'.
+	Making all new modules "local" may be the most manageable solution
+	because existing global modules can't be made to require prior
+	deactivation.
+
+2025-09-05  F. Jason Park  <jp@neverwas.me>
+
+	Don't touch window configuration in erc-fill prompt hook
+
+	* lisp/erc/erc-fill.el (erc-fill--wrap-indent-prompt): While computing
+	the prompt indentation's text size, don't bother saving and restoring
+	the window configuration because unwanted scrolls are now believed to be
+	unlikely because of other changes.
+
+2025-09-04  Po Lu  <luangruo@yahoo.com>
+
+	Fix crash when the same XI device appears in multiple hierarchy events
+
+	* src/xterm.c (xi_disable_devices): Move `out' label into the
+	outermost loop.  (bug#79343)
+
+2025-09-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/eshell/em-glob.el (eshell-glob-translate-alist): Don't quote lambda
+
+2025-09-03  Eshel Yaron  <me@eshelyaron.com>
+
+	Support completion category inheritance
+
+	* lisp/minibuffer.el (define-completion-category): New function.
+	(completion-category-get): New function, implements completion
+	category property lookup with (multiple) inheritance.
+	(completion-metadata-get, completion--styles)
+	(completion--cycle-threshold): Use it.
+	(completion-category-defaults): Mention it in docstring.
+	Remove entry for 'project-buffer' category, and instead...
+	* lisp/progmodes/project.el: ...have 'project-buffer' inherit
+	from 'buffer'.
+	* test/lisp/minibuffer-tests.el
+	(completion-category-inheritance): New test.
+	* etc/NEWS: Announce support for category inheritance.
+
+2025-09-03  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Update to Transient v0.10.0-8-g5efa5c6e
+
+2025-09-03  João Távora  <joaotavora@gmail.com>
+
+	Eglot: really fix bug#79259
+
+	The previous change actually introduced a bug in a closely
+	related but distinct place.  We need to address the off-by-one
+	in the 'substring' call, not the 'add-face-text-property'.
+
+	* lisp/progmodes/eglot.el (eglot--sig-info): Fixup.
+
+2025-09-03  Juri Linkov  <juri@linkov.net>
+
+	Make 'isearch-mode' more idempotent (bug#79368).
+
+	* lisp/isearch.el (isearch-mode): Don't override
+	'isearch--saved-local-map' when 'overriding-terminal-local-map'
+	was already set to 'isearch-mode-map' in a previous call.
+	(with-isearch-suspended): Don't call the function 'isearch-mode'
+	when the variable 'isearch-mode' is already non-nil.
+
+2025-09-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(macroexp--obsolete-warning): Prefer `%s`
+
+	* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning): `instead`
+	can be a list.
+	* lisp/dom.el (dom-text, dom-texts): Fix obsolescence declaration.
+
+2025-09-02  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Allow any thread to run native compilations
+
+	* lisp/emacs-lisp/comp-run.el (comp--run-async-workers): Don't
+	lock the native compilation process to a thread (bug#79228).
+
+2025-09-02  Sean Whitton  <spwhitton@spwhitton.name>
+
+	fileloop-next-file: Convert file-error to warnings
+
+	* lisp/fileloop.el (fileloop-next-file): Catch file-error and
+	convert to a delayed warning (bug#79356).
+
+2025-09-02  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Add 'elisp-flymake-byte-compile-executable' defcustom
+
+	The correct Emacs executable to use for
+	'elisp-flymake-byte-compile' is not necessarily the running
+	Emacs.  For example, when editing trunk with Emacs 30,
+	various Lisp changes will cause spurious flymake warnings.
+	Add 'elisp-flymake-byte-compile-executable' to allow
+	customizing this.
+	* lisp/progmodes/elisp-mode.el
+	(elisp-flymake-byte-compile-executable)
+	(elisp-flymake-byte-compile--executable): Add.  (Bug#79342)
+	(elisp-flymake-byte-compile): Invoke
+	'elisp-flymake-byte-compile--executable'.
+
+	* etc/NEWS: Announce the change.
+
+2025-09-02  Michael Albinus  <michael.albinus@gmx.de>
+
+	Extend tramp-test26-interactive-file-name-completion
+
+	* lisp/net/tramp.el (tramp-get-completion-methods):
+	Use `tramp-compat-seq-keep'.
+
+	* test/lisp/net/tramp-tests.el (completions-max-height): Declare.
+	(tramp-test26-interactive-file-name-completion): Extend test.
+
+2025-09-01  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Revert "Avoid duplicating strings in pcm--merge-completions"
+
+	Revert "Avoid duplicating strings in pcm--merge-completions",
+	commit b511c38bba5354ff21c697e4d27279bf73e4d3cf.  It broke
+	existing behavior, now covered by tests adding in this commit.
+
+	* lisp/minibuffer.el (completion-pcm--merge-completions):
+	* test/lisp/minibuffer-tests.el (completion-pcm-test-anydelim):
+	(completion-pcm-bug4219):
+
+2025-09-01  Philip Kaludercic  <pkal@posteo.net>
+
+	Add new library 'timeout'
+
+	* lisp/emacs-lisp/timeout.el: Add the file.
+	* etc/NEWS: Mention the library.
+
+	See https://mail.gnu.org/archive/html/emacs-devel/2025-07/msg00520.html.
+
+2025-09-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New project-find-matching-buffer-function for diff-mode
+
+	* lisp/vc/diff-mode.el (project-root): Declare.
+	(diff-find-matching-buffer): New function.
+	(diff-mode): Use it.
+	* doc/emacs/vc1-xtra.texi (Other Working Trees): Document
+	'C-x v w w' in diff-mode buffers.
+
+2025-09-01  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* src/data.c (Fash): Speed up when argument and result are fixnums.
+
+	* lisp/emacs-lisp/bytecomp.el (featurep): Safer comp-time evaluation
+
+2025-09-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Rename arg REMOTE-LOCATION -> UPSTREAM-LOCATION
+
+	* lisp/vc/vc-bzr.el (vc-bzr-log-incoming)
+	(vc-bzr-incoming-revision, vc-bzr-log-outgoing):
+	* lisp/vc/vc-git.el (vc-git-incoming-revision):
+	* lisp/vc/vc-hg.el (vc-hg-incoming-revision):
+	* lisp/vc/vc.el (vc-root-diff-incoming, vc-diff-incoming)
+	(vc-root-diff-outgoing, vc-diff-outgoing)
+	(vc-root-diff-outgoing-base, vc-diff-outgoing-base)
+	(vc-incoming-outgoing-internal, vc-remote-location-history)
+	(vc--incoming-revision, vc-log-incoming, vc-default-log-incoming)
+	(vc-log-outgoing, vc-default-log-outgoing): Rename arguments
+	REMOTE-LOCATION -> UPSTREAM-LOCATION.  Adjust strings.
+	(vc--maybe-read-remote-location): Rename ...
+	(vc--maybe-read-upstream-location): ... to this.
+
+2025-09-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC outgoing commands for Git: Don't unconditionally fetch
+
+	* lisp/vc/vc-bzr.el (vc-bzr-incoming-revision):
+	* lisp/vc/vc-hg.el (vc-hg-incoming-revision):
+	* lisp/vc/vc.el (vc-diff-incoming, vc--incoming-revision): New
+	REFRESH optional argument.
+	(vc-default-log-incoming): Pass it.
+	* lisp/vc/vc-git.el (vc-git-incoming-revision): New REFRESH
+	optional argument.  When nil, use cached info (bug#62940).
+
+2025-09-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(completion-file-name-table): Refine last fix
+
+	* lisp/minibuffer.el (completion-file-name-table): Don't
+	hardcode Tramp knowledge here.
+
+2025-08-31  Juri Linkov  <juri@linkov.net>
+
+	New user option 'tab-line-define-keys'
+
+	* lisp/tab-line.el (tab-line-define-keys): New defcustom.
+	(tab-line--define-keys, tab-line--undefine-keys):
+	New functions that explicitly bind commands from
+	'tab-line-mode-map' to 'ctl-x-map'.
+	(tab-line-mode-map): Leave this keymap empty by default
+	to avoid breaking 'ctl-x-map' (bug#79323).
+	(global-tab-line-mode): Call either 'tab-line--define-keys'
+	or 'tab-line--undefine-keys'.
+
+2025-08-31  Juri Linkov  <juri@linkov.net>
+
+	* doc/emacs/modes.texi (Choosing Modes): Document 'treesit-enabled-modes'.
+
+2025-08-31  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-revert: Fix calling vc-buffer-sync (bug#79319)
+
+	* lisp/vc/vc.el (vc-revert): Don't call vc-buffer-sync on a
+	non-file-visiting buffer (bug#79319).  Don't try to use memq to
+	compare strings.
+
+2025-08-31  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc.el (vc-revert): Tighten up save-some-buffers predicate.
+
+2025-08-31  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Allow entering the debugger on error in emacsclient connections
+
+	* lisp/server.el (server--process-filter-1): Use
+	'condition-case-unless-debug'.  (Bug#65897)
+
+2025-08-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix EOL decoding in files extracted from ZIP archives
+
+	* lisp/arc-mode.el (archive-set-buffer-as-visiting-file): Don't
+	lose EOL conversion determined by 'decode-coding-region' from the
+	extracted file's data.  (Bug#79316)
+
+2025-08-30  Jeremy Bryant  <jb@jeremybryant.net>
+
+	* lisp/saveplace.el (save-places-to-alist): Add doc string.
+
+	Replace previous comment and simplify wording by refering to
+	the function 'save-place-to-alist' being called on all
+	buffers.  (Bug#79340)
+
+2025-08-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	3d2a8186793 * doc/misc/efaq-w32.texi (UTF-8 encoding): New section (b...
+	ec50d775acf ; * doc/misc/flymake.texi (Finding diagnostics): Fix a ty...
+	293e258a1b2 * doc/emacs/screen.texi (Mode Line): Fix reference.
+	8eb192c23df ; * admin/make-tarball.txt: Update the "Web pages" sectio...
+
+2025-08-30  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Document and test 'let-alist' support for indexing
+
+	* etc/NEWS: Announce 'let-alist' support for indexing.
+	* test/lisp/emacs-lisp/let-alist-tests.el (let-alist-numbers):
+	Add a test for 'let-alist's support for indexing.
+	* doc/lispref/lists.texi (Association Lists): Document indexing
+	with 'let-alist'.  (Bug#66509)
+
+2025-08-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix "C-u C-h C-n"
+
+	* lisp/help.el (view-emacs-news): Widen the buffer before
+	re-narrowing it again to a different version.  (Bug#79324)
+
+2025-08-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New commands for outgoing diffs including uncommitted changes
+
+	* lisp/vc/vc.el (vc-root-diff-outgoing-base)
+	(vc-diff-outgoing-base): New commands (bug#62940).
+	* lisp/vc/vc-hooks.el (vc-prefix-map): Bind them.
+	* doc/emacs/vc1-xtra.texi (Outgoing Base Diffs):
+	* etc/NEWS: Document them.
+	* doc/emacs/emacs.texi (Outgoing Base Diffs): New node.
+
+2025-08-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Document C-x v M D and C-x v M L in the manual
+
+	* doc/emacs/emacs.texi (Merge Bases):
+	* doc/emacs/vc1-xtra.texi (Merge Bases): New node.
+
+2025-08-30  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix likely off-by-1 in LabelOffsetSupport feature (bug#79259)
+
+	This feature was tweaked and last tested with a 2019 edition of
+	the 'ccls' LSP.  The spec does not clearly specify this number
+	to be 0-indexed, but it would make sense that it would be so.
+	So there's not need to 1+ - correct the numbers at all before
+	using them in substring.  This would fix the Haskell server use
+	of this feature (which is bug#79259)
+
+	* lisp/progmodes/eglot.el (eglot--sig-info): Fix likely off-by-1.
+
+2025-08-30  Steven Allen  <steven@stebalien.com>
+
+	Eglot: escape literal % characters in URIs
+
+	Escape literal % characters in Eglot URIs
+
+	Otherwise, a literal % in a file-name will be interpreted (by the
+	language server) as if it were a part of a percent-encoded sequence.
+
+	See Bug#78984 for context on why `url-path-allowed-chars' cannot be
+	changed to escape literal % characters.
+
+	* lisp/progmodes/eglot.el (eglot--uri-path-allowed-chars): Escape %,
+	remove the redundant variable definition.
+	* test/lisp/progmodes/eglot-tests.el (eglot-test-path-to-uri-escape):
+	test it.
+
+2025-08-30  Sergio Pastor Pérez  <sergio.pastorperez@gmail.com>  (tiny change)
+
+	bug#79241: Fix incorrect handling of overlays in `vertical-motion'
+
+	* src/indent.c (vertical-motion): If iterator is inside an overlay,
+	reset it to the beginning of line before trying to reach goal
+	column.  This prevents point from being stuck at the beginning
+	of overlay strings during upward motions.
+
+2025-08-30  Jens Schmidt  <jschmidt4gnu@vodafonemail.de>
+
+	Add edebug-bounce-to-previous-value
+
+	Command edebug-bounce-to-previous-value uses the previous value
+	observed while single-stepping or evaluating an expression to
+	bounce point in the outside current buffer to the buffer
+	position corresponding to that value.
+
+	* lisp/emacs-lisp/edebug.el (edebug-previous-value): Add
+	variable.
+	(edebug-compute-previous-result, edebug-eval-expression): Update
+	it.
+	(edebug-bounce-to-previous-value): Add command.
+	(edebug-mode-map): Add keybinding for the new command, replacing
+	the binding of "P" to edebug-view-outside.
+	(edebug-mode-menus): Add menu entry for the new command.
+	* doc/lispref/edebug.texi (Edebug Views): Add documentation.
+	* test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el
+	(edebug-test-code-bounce-point): Add test code.
+	* test/lisp/emacs-lisp/edebug-tests.el
+	(edebug-tests-bounce-outside-buffer)
+	(edebug-tests-bounce-outside-point)
+	(edebug-tests-bounce-outside-mark)
+	(edebug-tests-bounce-record-outside-environment)
+	(edebug-tests-should-have-bounced-to): Add infrastructure to
+	test bounces.
+	(edebug-tests-check-keymap): Update tests to new key bindings.
+	(edebug-tests-bounce-point)
+	(edebug-tests-bounce-to-previous-value)
+	(edebug-tests-bounce-to-previous-non-position): Add tests.
+	(edebug-tests-evaluation-of-current-buffer-bug-19611): Clean up
+	side effects.  (Bug#79288)
+
+2025-08-30  Eli Zaretskii  <eliz@gnu.org>
+
+	* doc/misc/efaq-w32.texi (UTF-8 encoding): New section (bug#79296).
+
+2025-08-30  john muhl  <jm@pub.pink>
+
+	Fontify all comment delimiters in 'lua-ts-mode'
+
+	* lisp/progmodes/lua-ts-mode.el (lua-ts--comment-font-lock):
+	Apply 'font-lock-comment-delimiter-face' to the entire span of
+	initial dashes.  In particular, this improves the appearance of
+	LuaCATS and EmmyLua style annotations which use "---".
+	* test/lisp/progmodes/lua-ts-mode-resources/font-lock.lua:
+	Add tests.  (Bug#79258)
+
+2025-08-30  Sean Devlin  <spd@toadstyle.org>
+
+	Fix recursive load when 'calc-always-load-extensions' is set
+
+	* lisp/calc/calc.el (calc-create-buffer): Call 'calc-load-everything'.
+	(calc-always-load-extensions): Delete erroneous stanza.  (Bug#79157)
+
+2025-08-30  Sean Devlin  <spd@toadstyle.org>
+
+	Add user option to inhibit Calc startup message (bug#79143)
+
+	* doc/misc/calc.texi (Customizing Calc): Document the new option.
+	* etc/NEWS: Document the new option.
+	* lisp/calc/calc.el (calc-inhibit-startup-message): New option to
+	inhibit Calc’s startup message.
+	(calc): Respect the option in Calc’s startup code.
+	* test/lisp/calc/calc-tests.el (ert): Require ert-x for
+	'ert-with-message-capture'.
+	(calc-inhibit-startup-message): Test the new user option.
+
+2025-08-29  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit-x.el (treesit-generic-mode-font-lock-map): Extend.
+
+	Add more font-lock mappings based on existing settings in ts-modes.
+
+2025-08-29  Juri Linkov  <juri@linkov.net>
+
+	* lisp/textmodes/markdown-ts-mode.el: Fix embed settings.
+
+	(markdown-ts--range-settings): Move embed settings
+	for html/toml/yaml to 'markdown-ts-setup'.
+	(markdown-ts-setup): Append range rules to 'treesit-range-settings'
+	only when grammars for html/toml/yaml are installed.
+
+2025-08-29  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/python.el: Use 'treesit-major-mode-remap-alist'.
+
+	(python-ts-mode): Don't duplicate 'auto-mode-alist' and
+	'interpreter-mode-alist' settings in Emacs 31 (bug#79180).
+	Add ts-mode mapping to 'treesit-major-mode-remap-alist'.
+
+2025-08-29  Michael Albinus  <michael.albinus@gmx.de>
+
+	`Fix read-directory-name' for Tramp files
+
+	* lisp/minibuffer.el (completion-file-name-table): Improve bypass
+	for directory checking.  (Bug#79236)
+
+	* lisp/net/tramp.el (tramp-user-regexp): Exclude "[" and "]".
+	(tramp-completion-make-tramp-file-name): Handle port for IPv6 hosts.
+	(tramp-completion-handle-file-directory-p)
+	(tramp-completion-handle-file-exists-p): Simplify.
+	(tramp-completion-handle-file-name-completion): Ignore PREDICATE.
+	(tramp-completion-dissect-file-name): Handle ports.
+	(tramp-parse-default-user-host): Suppress '(nil nil) result.
+	(tramp-parse-file): Delete duplicates.
+	(tramp-parse-shosts-group): Accept also IPv6 addresses.
+	(tramp-handle-file-directory-p): Return t for filenames
+	"/method:foo:".
+	(tramp-parse-auth-sources, tramp-parse-netrc):
+	* lisp/net/tramp-cache.el (tramp-parse-connection-properties):
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-parse-device-names):
+	Use `tramp-compat-seq-keep'.
+
+	* test/lisp/net/tramp-tests.el (edebug-mode): Declare.
+	(tramp--test-message): Write also trace value.
+	(tramp-test26-file-name-completion):
+	(tramp-test26-interactive-file-name-completion): Extend tests.
+
+2025-08-29  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Fix org-habit bug related to string mutation
+
+	* lisp/org/org-habit.el (org-habit-build-graph): Rewrite without using
+	string mutation (using vectors instead), fixing a bug where
+	org-habit-completed-glyph and org-habit-today-glyph wouldn't display
+	properly if in the U+0080..00FF range, discovered by the more restricted
+	string mutation.
+
+	Reported by Daniel Mendler in
+	 https://lists.gnu.org/archive/html/emacs-orgmode/2025-08/msg00224.html
+
+2025-08-29  john muhl  <jm@pub.pink>
+
+	Make 'lua-prefix-key' option a 'key-sequence'
+
+	This fixes a failure in 'test-custom-opts' caused by both strings
+	and integers being used for 'lua-prefix-key'.
+
+	* lisp/progmodes/lua-mode.el (lua-prefix-key): Convert option to
+	'key-sequence' type.
+	(lua-mode-map, lua-prefix-key-update-bindings, lua-set-prefix-key)
+	(lua--customize-set-prefix-key): Adjust to the change of type for
+	'lua-prefix-key'.
+	(lua-prefix-mode-map): Use 'defvar-keymap'.  (Bug#79335)
+
+2025-08-28  Robert Pluim  <rpluim@gmail.com>
+
+	Prefer tls to ssl in nnimap and smtpmail code
+
+	* lisp/gnus/nnimap.el (nnimap-open-connection): Use 'tls.
+	(nnimap-open-connection-1): Check 'tls before 'ssl.
+	* lisp/mail/smtpmail.el (smtpmail-stream-type): Add 'ssl to
+	allowed values, state 'tls is preferred.
+
+2025-08-28  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Pass dired default filenames via defaults argument
+
+	Rather than using minibuffer-with-setup-hook, just pass the list
+	of default file names as a regular argument to read-file-name.
+	This allows read-file-name to run abbreviate-file-name on the
+	defaults as it normally does, instead of the defaults appearing
+	in expanded form.
+
+	dired-dwim-target-defaults changes slightly to return the
+	correct default at the start of the list.
+
+	* lisp/dired-aux.el (dired-do-create-files)
+	(dired-compare-directories): Pass default file names as an
+	argument. (bug#79293)
+	(dired-dwim-target-defaults): Return the correct default at the
+	start of the list.
+
+2025-08-28  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-bar.el (frameset-session-filter-tabs): New function.
+
+	Push new function to 'frameset-session-filter-alist'
+	with 'tabs' key (bug#79291).
+
+2025-08-28  Dmitry Gutov  <dmitry@gutov.dev>
+
+	ruby-flymake-simple: Refine further
+
+	* lisp/progmodes/ruby-mode.el (ruby-flymake-simple):
+	Relax regexp but limit allowed characters (bug#79257).
+
+2025-08-27  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Make RET choose the selected completion
+
+	Previously, one could select a completion via M-<up>/M-<down>,
+	but then RET would not actually select the chosen completion.
+	With the addition of completion-auto-deselect, this is not
+	actually necessary: we can reasonably assume that when a
+	completion is selected, the user wants to use that, since their
+	last action must have been to select it.  So, just choose the
+	selected completion on RET.  This lets us default
+	minibuffer-completion-auto-choose to nil.
+
+	For minibuffers with require-match completion, this can be done
+	by changing the existing command bound to RET.  For minibuffers
+	with nil require-match completion, RET was previously bound to
+	exit-minibuffer, and changing exit-minibuffer to have this logic
+	is risky.  We handle that case by adding a new
+	minibuffer-completion-exit which wraps exit-minibuffer and bind
+	RET to it.
+
+	* lisp/minibuffer.el (minibuffer-insert-completion-if-selected)
+	(minibuffer-completion-exit, completion--selected-candidate):
+	Add.
+	(minibuffer-complete-and-exit): Call
+	minibuffer-choose-completion. (bug#77253)
+	(minibuffer-local-completion-map): Bind RET to
+	minibuffer-completion-exit, overriding exit-minibuffer.
+	(completion-in-region-mode-map): Bind RET to
+	minibuffer-choose-completion when there's a selected candidate.
+	(minibuffer-completion-auto-choose): Default to nil.
+	(minibuffer-visible-completions--filter)
+	(minibuffer-visible-completions-map): Delete RET binding, no
+	longer necessary.
+	* lisp/simple.el (completion-setup-function): Update completion
+	help text to show more correct bindings.
+	* test/lisp/minibuffer-tests.el (completions-header-format-test)
+	(minibuffer-next-completion): Set
+	minibuffer-completion-auto-choose=t explicitly.
+	(with-minibuffer-setup, minibuffer-completion-RET-prefix)
+	(completion-in-region-next-completion): Add new tests.
+	* etc/NEWS: Announce.
+
+2025-08-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/emacs/screen.texi (Mode Line): Fix reference.
+
+2025-08-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	Extend info-xref-test-emacs-manuals, fix info reference
+
+	* doc/lispref/loading.texi (Autoload): Fix reference.
+
+	* test/lisp/info-xref-tests.el (info-xref-test-emacs-manuals):
+	Print output buffer.
+
+2025-08-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix last change in 'next_element_from_display_vector'
+
+	* src/xdisp.c (next_element_from_display_vector): Only switch the
+	iterator from unibyte to multibyte, never in the other direction,
+	and not if the original character came from a unibyte buffer.
+	(Bug#79317)
+
+2025-08-26  F. Jason Park  <jp@neverwas.me>
+
+	Remove scrolltobottom dependency from erc-fill module
+
+	This mostly reverts 9668b4f97c2fc6bfff83258861d455a6d02516a8
+	"Make erc-fill-wrap depend on scrolltobottom".
+
+	* etc/ERC-NEWS: Mention removal of formal dependency.
+	* lisp/erc/erc-fill.el (erc-fill--wrap-scrolltobottom-exempt-p): Remove
+	unused variable.
+	(erc-fill--wrap-ensure-dependencies): Remove unused dependency check.
+	(erc-fill-wrap-mode): Remove scrolltobottom dependency from doc string.
+	* test/lisp/erc/erc-fill-tests.el (erc-fill-tests--wrap-populate):
+	Remove unused binding from var list.
+	* test/lisp/erc/resources/erc-scenarios-common.el
+	(erc-scenarios-common--make-bindings): Remove unused binding.
+
+2025-08-26  F. Jason Park  <jp@neverwas.me>
+
+	Prefer window-text-pixel-size in erc-fill
+
+	* lisp/erc/erc-fill.el (erc-fill--wrap-measure): Using
+	`buffer-text-pixel-size' for measuring text size in the selected window
+	can end up triggering a scroll, which then requires imperfect countering
+	by the scrolltobottom module, especially with regard to the option
+	`erc-scrolltobottom-all'.  Thanks to Alcor for reporting and helping
+	with this bug, which was introduced along with fill-wrap in ERC 5.6.
+
+2025-08-26  john muhl  <jm@pub.pink>
+
+	Fix 'ruby-flymake-simple' for Ruby 3.4 (Bug#79257)
+
+	* lisp/progmodes/ruby-mode.el (ruby-flymake-simple): Update
+	regular expression to handle new versions of Ruby including the
+	location of the executable in the output.
+
+2025-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix use of display-table for mode-line display
+
+	* src/xdisp.c (next_element_from_display_vector): Fix handling
+	non-ASCII characters in display-table cells corresponding to
+	ASCII characters.  (Bug#79311)
+
+2025-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix assertion violations caused by recent redisplay changes
+
+	* src/xdisp.c (push_it): Don't rest the string_from_prefix_prop_p
+	flag.  (Bug#79304)
+
+2025-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+	Attempt to fix assertion violations in bug#79304
+
+	The following changes make the changes for bug#79275 less
+	radical, closer to their previous shape, while still fixing
+	that bug.
+	* src/xdisp.c (push_prefix_prop, get_it_property): Restore
+	original code that determined the object and position on it.
+	(get_line_prefix_it_property): Take FROM_BUFFER from the actual
+	object of the prefix property.
+
+2025-08-25  Andre A. Gomes  <andremegafone@gmail.com>
+
+	Pass remote name explicitly in bug-reference-try-setup-from-vc.
+
+	* lisp/progmodes/bug-reference.el (bug-reference-setup-from-vc-alist):
+	Add comment explaining the meaning of the nil argument when calling
+	vc-call-backend.  Even though "origin" and nil are equivalent when using
+	the git backend, it is more intelligible to see "upstream" and "origin"
+	passed explicitly (bug#79276).
+
+2025-08-25  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/lua-ts-mode.el: Simplify non-ts/ts mode mapping.
+
+	(lua-ts-mode-maybe): Remove since lua-mode is added to core.
+
+2025-08-25  Po Lu  <luangruo@yahoo.com>
+
+	Merge remote-tracking branch 'savannah/master' into master-android-1
+
+2025-08-25  john muhl  <jm@pub.pink>
+
+	* etc/NEWS: Mention 'lua-mode' merge.
+
+2025-08-25  john muhl  <jm@pub.pink>
+
+	Add warn to 'lua-mode' builtins
+
+	* lisp/progmodes/lua-mode.el (lua--builtins): Include warn.
+
+2025-08-25  john muhl  <jm@pub.pink>
+
+	Remove trivial cl-* stuff from 'lua-mode'
+
+	* lisp/progmodes/lua-mode.el (lua-process-buffer, lua--signum):
+	Replace 'cl-assert'.
+	(lua-accumulate-indentation-info): Replace 'cl-dolist' with
+	'dolist'.
+
+2025-08-25  john muhl  <jm@pub.pink>
+
+	Replace big regexps w/ rx expressions in 'lua-mode'
+
+	* lisp/progmodes/lua-mode.el (lua-block-regexp)
+	(lua-indentation-modifier-regexp, lua-cont-eol-regexp)
+	(lua-cont-bol-regexp): Use rx.
+
+2025-08-25  john muhl  <jm@pub.pink>
+
+	Remove unnecessary 'progn' in 'lua-mode'
+
+	* lisp/progmodes/lua-mode.el (lua-accumulate-indentation-info)
+	(lua--goto-line-beginning-rightmost-closer): Delete.
+
+2025-08-25  john muhl  <jm@pub.pink>
+
+	Replace 1-armed 'if' with 'when' in 'lua-mode'
+
+	* lisp/progmodes/lua-mode.el (lua--customize-set-prefix-key)
+	(lua-electric-match, lua-prefix-key-update-bindings)
+	(lua-indent-line, lua-find-matching-token-word)
+	(lua-goto-matching-block-token, lua-last-token-continues-p)
+	(lua-is-continuing-statement-p)
+	(lua--goto-line-beginning-rightmost-closer, lua-start-process)
+	(lua-prompt-line): Replace.
+
+2025-08-25  john muhl  <jm@pub.pink>
+
+	Prefer 'defvar-local' in 'lua-mode'
+
+	* lisp/progmodes/lua-mode.el (lua-default-command-switches)
+	(lua-electric-flag, lua--repl-buffer-p): Replace
+	'make-variable-buffer-local' with 'defvar-local'.
+
+2025-08-25  john muhl  <jm@pub.pink>
+
+	Remove unnecessary 'setq' from 'lua-mode'
+
+	* lisp/progmodes/lua-mode.el (lua--rx-bindings): Combine variable
+	definition and assignment.
+
+2025-08-25  john muhl  <jm@pub.pink>
+
+	Cleanup whitespace in 'lua-mode'
+
+2025-08-25  john muhl  <jm@pub.pink>
+
+	Cleanup defcustoms in 'lua-mode'
+
+	* lisp/progmodes/lua-mode.el (lua-mode-hook): Add options.
+	(lua-indent-level, lua-comment-start, lua-comment-start-skip)
+	(lua-default-application, lua-default-command-switches)
+	(lua-always-show, lua-documentation-function)
+	(lua-documentation-url, lua-prefix-key, lua-prompt-regexp)
+	(lua-indent-string-contents)
+	(lua-indent-nested-block-content-align)
+	(lua-indent-close-paren-align, lua-jump-on-traceback)
+	(lua-mode-hook, lua-mode, lua-luacheck-program): Delete group,
+	add version.
+
+2025-08-25  john muhl  <jm@pub.pink>
+
+	Remove unnecessary code from 'lua-mode'
+
+	* lisp/progmodes/lua-mode.el (lua-traceback-line-re)
+	(lua-start-process): compile.el has Lua support now.
+
+2025-08-25  john muhl  <jm@pub.pink>
+
+	Remove advice from 'lua-mode'
+
+	* lisp/progmodes/lua-mode.el (lua--compilation-find-file)
+	(compilation-find-file, lua--compilation-goto-locus)
+	(compilation-goto-locus): Delete.
+
+2025-08-25  john muhl  <jm@pub.pink>
+
+	Use easy-menu in 'lua-mode'
+
+	* lisp/progmodes/lua-mode.el (lua-mode-menu): Delete.
+	(lua-mode-map): Use 'easy-menu-define'.
+
+2025-08-25  john muhl  <jm@pub.pink>
+
+	Remove obsolete code from 'lua-mode'
+
+	* lisp/progmodes/lua-mode.el: Remove Emacs<27 compatibility code.
+	(lua-emacs-menu): Remove XEmacs compatibility code.
+
+2025-08-25  Juergen Hoetzel  <juergen@hoetzel.info>
+
+	* lisp/progmodes/lua-mode.el: Import lua-mode.
+
+2025-08-24  F. Jason Park  <jp@neverwas.me>
+
+	Don't set bufbar cursor-type in erc-mode buffers
+
+	* lisp/erc/erc-status-sidebar.el (erc-status-sidebar-get-window): Set
+	`cursor-type' in `erc-status-sidebar-mode' buffer instead.  This bug was
+	introduced along with the bufbar module for bug#63595 in ERC 5.6.  It's
+	a regression because it also affects the status-sidebar module.
+
+2025-08-24  F. Jason Park  <jp@neverwas.me>
+
+	Use existing X-Debbugs-CC header in erc-bug
+
+	* lisp/erc/erc.el (erc-bug): On Emacs 30 and later, search for and
+	ideally use an existing "X-Debbugs-CC" header instead of inserting a new
+	one at the top.  Section 4.5 Obsolete Header Fields of RFC 5322 says,
+	"except for destination address fields (described in section 4.5.3), the
+	interpretation of multiple occurrences of fields is unspecified."
+	Anecdotal fiddling suggests the Savannah servers aren't confused by the
+	second "empty" header field, so this change is probably just cosmetic.
+
+2025-08-24  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el (treesit-enabled-modes): Use 'add-to-list'.
+
+	Using 'add-to-list' instead of 'cons' in :set avoids
+	adding duplicate entries to 'major-mode-remap-alist'.
+
+2025-08-24  Mattias Engdegård  <mattiase@acm.org>
+
+	Disallow string data resizing (bug#79784)
+
+	Only allow string mutation that is certain not to require string data to
+	be resized and reallocated: writing bytes into a unibyte string, and
+	changing ASCII to ASCII in a multibyte string.
+
+	This ensures that mutation will never transform a unibyte string to
+	multibyte, that the size of a string in bytes never changes, and that
+	the byte offsets of characters remain the same.  Most importantly, it
+	removes a long-standing obstacle to reform of string representation and
+	allow for future performance improvements.
+
+	* src/data.c (Faset): Disallow resizing string mutation.
+	* src/fns.c (clear_string_char_byte_cache):
+	* src/alloc.c (resize_string_data):  Remove.
+	* test/src/data-tests.el (data-aset-string): New test.
+	* test/lisp/subr-tests.el (subr--subst-char-in-string):
+	Skip error cases.
+	* test/src/alloc-tests.el (aset-nbytes-change):
+	Remove test that is no longer relevant.
+	* doc/lispref/strings.texi (Modifying Strings):
+	* doc/lispref/sequences.texi (Array Functions):
+	* doc/lispref/text.texi (Substitution):  Update manual.
+	* etc/NEWS: Announce.
+
+2025-08-24  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* lisp/emacs-lisp/bytecomp.el (mutating-fns): cl-fill and cl-replace
+
+2025-08-24  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Have project-switch-to-buffer use a distinct completion category
+
+	* etc/NEWS: Mention the change.
+
+	* lisp/minibuffer.el (completion-category-defaults):
+	Add an entry for it.
+
+	* lisp/progmodes/project.el (project--buffers-completion-table):
+	Return category 'project-buffer'.
+
+2025-08-24  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Follow-up to previous changes in project--read-project-buffer
+
+	* lisp/progmodes/project.el (project--buffers-completion-table):
+	New function, use it to implement the no-internal/internal
+	fallback logic from 'internal-complete-buffer', apply the
+	category and cycle-sort-function (bug#77312).
+	(project--read-project-buffer): Use it.  Skip 'read-buffer' in
+	favor of 'completing-read'.  But make sure to honor
+	read-buffer-completion-ignore-case and use format-prompt when
+	the function is available.  Unify two execution paths.
+
+2025-08-24  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Add NEWS entry for project-switch-buffer change from bug#77312
+
+2025-08-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	b3ed4876b63 ; Improve documentation of Edebug
+	fdad3417dcf ; Fix typo in 'cursor-type' widget
+
+2025-08-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve and clarify documentation of 'dired-click-to-select-mode'
+
+	* lisp/dired.el (dired-click-to-select-mode)
+	(dired-post-do-command):
+	* doc/emacs/dired.texi (Marks vs Flags): Improve documentation of
+	'dired-click-to-select-mode'.
+
+2025-08-23  Jeremy Bryant  <jb@jeremybryant.net>
+
+	* doc/lispref/control.texi (cond* Macro): Update bind* entry
+
+	Update manual to match docstring of (bind*) clause, including
+	the qualifier `all subsequent clauses'.  (Bug#79246)
+
+2025-08-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Use better temporary file names under 'file-precious-flag'
+
+	* lisp/files.el (basic-save-buffer-2): Use a more meaningful
+	temporary file name under 'file-precious-flag'.  (Bug#79252)
+
+	* etc/NEWS: Announce the change in behavior.
+
+2025-08-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Rmail can fetch email from several inboxes with different passwords
+
+	* lisp/mail/rmail.el (rmail--remote-password-host)
+	(rmail--remote-password-user): New variables.
+	(rmail-get-remote-password): Use them to ask for the password
+	whenever we need to fetch email from an inbox whose user or host
+	are different from the last ones.  (Bug#79214)
+
+2025-08-23  Spencer Baugh  <sbaugh@janestreet.com>
+
+	flymake: stop trying to automatically fall back to margins
+
+	The code to automatically fallback to margins is not correct: it
+	relies implicitly on the buffer being displayed in a window
+	while flymake-mode is running.  If the buffer is created while
+	not displayed, we will always automatically fallback to margins,
+	which is incorrect.
+	Avoid the regression by simply disabling this code.  I'll try
+	again to fall back automatically in the future.  (Bug#79244)
+
+	* doc/misc/flymake.texi (Customizable variables): Remove section
+	about automatic fallback to margins.
+	* etc/NEWS: Un-announce removed feature.
+	* lisp/progmodes/flymake.el (flymake-indicator-type)
+	(flymake-mode): Stop automatically falling back to
+	margins. (bug#77313)
+
+2025-08-23  Michael Albinus  <michael.albinus@gmx.de>
+
+	Minor fixes for file notifications on MS Windows
+
+	* lisp/filenotify.el (file-notify-rm-all-watches): Clear hash.
+
+	* test/lisp/filenotify-tests.el (file-notify--test-event-test):
+	Fix check.
+	(file-notify-test09-watched-file-in-watched-dir): Adapt test.
+
+2025-08-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix line-prefix display when there's a 'display' string at BOL
+
+	* src/xdisp.c (push_it): Reset the 'string_from_prefix_prop_p' flag.
+	(try_window_id): Disable this optimization if the last unchanged
+	at-beg row begins with a display or overlay string and there;s a
+	line/wrap-prefix property on the row.
+	(push_prefix_prop): Accept an additional argument FROM_BUFFER to
+	indicate that the prefix property was found on buffer text
+	underlying a display or overlay property, and set up the position
+	to pop to accordingly.  Reset the 'string_from_display_prop_p' flag
+	of the iterator after pushing IT to set up for iterating the
+	prefix string.
+	(get_it_property): Use it->string, not it->object, as indication
+	that prefix property is on a string.
+	(get_line_prefix_it_property): Accept an additional argument:
+	pointer to a flag indicating that the prefix property was found on
+	buffer text underlying a display or overlay property.  Callers
+	adjusted.
+	(handle_line_prefix): Use the FROM_BUFFER flag to correctly handle
+	prefix properties on buffer text at the same position as a display
+	string.  (Bug#79275)
+
+2025-08-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	Minor tramp.texi changes
+
+	* doc/misc/tramp.texi (File name syntax): Describe port for IPv6 address.
+	(Traces and Profiles): Fix default value of tramp-debug-buffer-limit.
+
+2025-08-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	Skip eglot-test-rust-completion-exit-function on emba
+
+2025-08-21  Steven Allen  <steven@stebalien.com>
+
+	Fix 'submit-emacs-patch' MIME type
+
+	* lisp/mail/emacsbug.el (submit-emacs-patch): Use the correct
+	MIME type for patches.  Otherwise, `mm-inline-media-tests' won't
+	recognize and fontify the patch.  (Bug#79287)
+
+2025-08-21  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	project: Improve pruning of zombie projects.
+
+	* etc/NEWS: Update 'project-prune-zombie-projects' entry.
+	* lisp/progmodes/project.el (project-prune-zombie-projects):
+	Change default value (bug#77566).
+	(project--ensure-read-project-list, project--write-project-list)
+	(project-prompt-project-dir, project-prompt-project-name):
+	Rework for use 'project-prune-zombie-projects' value.
+	(project-forget-zombie-projects): Move code...
+	(project--delete-zombie-projects): ... to this new function.
+
+2025-08-21  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Add minibuffer--completions-visible and use it
+
+	At various places, instead of just checking that there's any
+	window displaying a buffer named *Completions*, we should
+	additionally check that that *Completions* buffer is actually
+	for the current completion session.
+	minibuffer--completions-visible does that.
+
+	* lisp/comint.el (comint-complete-input-ring)
+	(comint-dynamic-list-completions): Call
+	minibuffer--completions-visible.
+	* lisp/minibuffer.el (minibuffer--completions-visible):
+	Add. (bug#77253)
+	(completion--do-completion, completions--post-command-update)
+	(completions--after-change, minibuffer-hide-completions)
+	(minibuffer-visible-completions)
+	(minibuffer-visible-completions--always-bind)
+	(minibuffer-visible-completions--filter)
+	(with-minibuffer-completions-window, minibuffer-complete-history)
+	(minibuffer-complete-defaults): Call
+	minibuffer--completions-visible.
+	* lisp/pcomplete.el (pcomplete-show-completions): Call
+	minibuffer--completions-visible.
+	* lisp/simple.el (switch-to-completions): Call
+	minibuffer--completions-visible.
+	* test/lisp/minibuffer-tests.el (completion-auto-help-test)
+	(completion-auto-select-test): Call
+	minibuffer--completions-visible.
+
+2025-08-21  Steven Allen  <steven@stebalien.com>
+
+	rust-ts-mode: handle invalid rust syntax without signaling
+
+	Don't signal an error when encountering invalid rust syntax.  Without
+	this patch, invalid rust code would prevent a chunk of the buffer from
+	being highlighted (bug#79272).
+
+	* lisp/progmodes/rust-ts-mode.el (rust-ts-mode--fontify-scope):
+	(rust-ts-mode--fontify-pattern): Avoid calling `string-match-p' on nil
+	when a node is missing a parent.
+	* test/lisp/progmodes/rust-ts-mode-resources/font-lock-no-parent.rs:
+	Rust file that reproduces the issue.
+	* test/lisp/progmodes/rust-ts-mode-tests.el: Test case to reproduce the
+	issue.
+
+2025-08-21  Rahguzar  <rahguzar@mailbox.org>
+
+	Correctly document the format of tabulated-list-groups
+
+	* lisp/emacs-lisp/tabulated-list.el (tabulated-list-groups):
+	Correct format in doc string (bug#79220).
+
+	* doc/lispref/modes.texi (Tabulated List Mode):
+	Correct format in manual.
+
+2025-08-21  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Speed up JSON parsing by not maintaining line and column (bug#79192)
+
+	We use the current parsing position instead.  The line and column in the
+	error weren't used (nor very accurate to begin with) and the user can
+	easily compute them when needed.  The line number calculation is kept
+	just in case but deprecated, for removal in Emacs 32.
+
+	* src/json.c (struct json_parser, json_parser_init): Update parser state.
+	(json_signal_error): New position computation.
+	(json_skip_whitespace_internal): Remove.
+	(is_json_whitespace): New.
+	(json_skip_whitespace, json_skip_whitespace_if_possible)
+	(json_parse_unicode, json_parse_string, json_parse_number)
+	(json_parse_value): Simplify and rewrite for efficiency.
+	(count_chars, count_newlines)
+	(string_byte_to_pos, string_byte_to_line)
+	(buffer_byte_to_pos, buffer_byte_to_line): New.
+	(Fjson_parse_string, Fjson_parse_buffer): Adapt to new parser state.
+	* test/src/json-tests.el (json-tests--parse-string-error-pos)
+	(json-tests--parse-buffer-error-pos, json-parse-error-position): New.
+	* etc/NEWS: Note deprecation of line and column.
+
+2025-08-21  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Free tar-mode helper buffers after use in package.el (bug#79280)
+
+	The auxiliary buffer used by tar-mode is normally destroyed when the
+	parent buffer is, but package.el uses tar-mode in temporary buffers
+	which inhibit kill-buffer-hook and this made package installation leave
+	orphaned buffers behind.
+
+	* lisp/emacs-lisp/package.el (package-untar-buffer)
+	(package-install-file): Switch away from tar-mode before the buffer is
+	killed, triggering a tar-data buffer purge.
+
+2025-08-21  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Eliminate some gratuitous string mutation
+
+	* lisp/play/zone.el (zone-replace-char):
+	* lisp/international/quail.el (quail-get-translations):
+	* lisp/hippie-exp.el (he-capitalize-first): Clarify the code by removing
+	mutation that is probably not resizing but just in case.
+
+2025-08-21  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Avoid duplicating strings in pcm--merge-completions
+
+	Make completion-pcm--merge-completions operate only on the text
+	matched by the wildcards, instead of also the text in between
+	the wildcards.  This improves performance and simplifies the
+	code by removing the need for the previous mutable variable
+	"fixed".
+
+	* lisp/minibuffer.el (completion-pcm--merge-completions):
+	Operate only on text matched by wildcards. (bug#79265)
+
+2025-08-21  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Treat point more consistently in PCM completion
+
+	Properly fix bug#38458, which is fundamentally an issue with
+	completion-ignore-case, by checking if the completions are
+	unique ignoring case.  When the completions are unique, the
+	normal code to delete a wildcard naturally causes point to be
+	moved to the end of the minibuffer, which is the correct
+	behavior.
+
+	Now that the bug is fixed properly, remove a hack which
+	previously was used to "fix" it, which made point behave
+	inconsistently if it was in the middle of the minibuffer versus
+	at the end of the minibuffer.
+
+	* lisp/minibuffer.el (completion-pcm--merge-completions):
+	Respect completion-ignore-case when checking for completion
+	uniqueness. (bug#79265)
+	(completion-pcm--string->pattern)
+	(completion-pcm--optimize-pattern): Allow point at the end of
+	the pattern.
+	* test/lisp/minibuffer-tests.el (completion-table-test-quoting)
+	(completion-test--pcm-bug38458, completion-pcm-test-8): Update
+	tests for more correct behavior.
+
+2025-08-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update comments re GCC bugs 117423 and 119085
+
+2025-08-20  Michael Albinus  <michael.albinus@gmx.de>
+
+	Change default of tramp-debug-buffer-limit
+
+	* lisp/net/tramp-message.el (tramp-debug-buffer-limit): Change
+	default to 100MB.  Suggested by Francesco Potortì
+	<pot@potorti.it>.
+
+2025-08-20  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Rename some incoming & outgoing diff commands
+
+	* lisp/vc/vc.el (vc-fileset-diff-incoming)
+	(vc-fileset-diff-outgoing): Rename to ...
+	(vc-diff-incoming, vc-diff-outgoing): ... these.
+	All uses changed.
+
+2025-08-19  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Signal end-of-file with more correct data
+
+	end_of_file_error previously always signaled end-of-file with
+	load-true-file-name if that was non-nil (and a string).
+	However, this might be the wrong thing to do; for example, if a
+	file being loaded calls read on a buffer.
+
+	* src/lread.c (end_of_file_error): <source>: New argument; check
+	it to determine what data to signal with.  (bug#68546)
+	(read_char_escape, read_char_literal, read_string_literal)
+	(skip_space_and_comments, read0): Pass source to
+	end_of_file_error.
+
+2025-08-19  Philipp Stephani  <p.stephani2@gmail.com>
+
+	Clarify that sequence/map functions don't alter their argument
+
+	* lisp/emacs-lisp/seq.el (seq-sort, seq-sort-by, seq-reverse)
+	(seq-concatenate, seq-into-sequence, seq-into, seq-filter, seq-remove)
+	(seq-remove-at-position, seq-reduce, seq-find, seq-uniq, seq-mapcat)
+	(seq-partition, seq-union, seq-intersection, seq-difference)
+	(seq-group-by, seq-split, seq-keep):
+	* lisp/emacs-lisp/map.el (map-filter, map-remove, map-merge)
+	(map-merge-with): Clarify that these functions don't modify their
+	sequence/map arguments.
+
+2025-08-18  Philipp Stephani  <p.stephani2@gmail.com>
+
+	Catch all non-local exits when running ERT tests.
+
+	See discussion in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=76447.
+
+	* lisp/emacs-lisp/ert.el (ert--run-test-internal): Catch all non-local
+	exits in 'handler-bind'.
+
+2025-08-18  Juri Linkov  <juri@linkov.net>
+
+	Silence byte-compile warnings when treesit is not available
+
+	* lisp/progmodes/c-ts-mode.el:
+	* lisp/progmodes/cmake-ts-mode.el:
+	* lisp/progmodes/csharp-mode.el:
+	* lisp/progmodes/dockerfile-ts-mode.el:
+	* lisp/progmodes/elixir-ts-mode.el:
+	* lisp/progmodes/go-ts-mode.el:
+	* lisp/progmodes/heex-ts-mode.el:
+	* lisp/progmodes/java-ts-mode.el:
+	* lisp/progmodes/js.el:
+	* lisp/progmodes/json-ts-mode.el:
+	* lisp/progmodes/lua-ts-mode.el:
+	* lisp/progmodes/php-ts-mode.el:
+	* lisp/progmodes/ruby-ts-mode.el:
+	* lisp/progmodes/rust-ts-mode.el:
+	* lisp/progmodes/sh-script.el:
+	* lisp/progmodes/typescript-ts-mode.el:
+	* lisp/textmodes/css-mode.el:
+	* lisp/textmodes/markdown-ts-mode.el:
+	* lisp/textmodes/mhtml-ts-mode.el:
+	* lisp/textmodes/toml-ts-mode.el:
+	* lisp/textmodes/yaml-ts-mode.el:
+	Declare 'treesit-major-mode-remap-alist' and
+	'treesit-language-available-p' to silence warnings
+	that are false alarms.  Also improve docstrings.
+
+2025-08-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Reject invalid error symbols (Bug#76447)
+
+	* src/eval.c (signal_or_quit): Signal an error if 'signal' gets called
+	with an invalid error symbol.
+
+2025-08-17  JD Smith  <93749+jdtsmith@users.noreply.github.com>
+
+	Adapt tramp to new autoload-macro expand
+
+	Bug #78995.
+
+	* lisp/net/tramp-compat.el (tramp-loaddefs): suppress error on requiring
+	tramp-loaddef.
+	* lisp/net/tramp.el (tramp--with-startup): declare autoload-macro
+	expand, and suppress warnings about this declare form on older versions
+	of Emacs.
+
+2025-08-17  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC: New commands for incoming and outgoing fileset diffs
+
+	* lisp/vc/vc.el (vc-fileset-diff-incoming)
+	(vc-fileset-diff-outgoing): New commands.
+	(vc-root-diff-incoming): Refactor to call
+	vc-fileset-diff-incoming.
+	(vc-root-diff-outgoing): Refactor to call
+	vc-fileset-diff-outgoing.
+	* lisp/vc/vc-hooks.el (vc-incoming-prefix-map)
+	(vc-outgoing-prefix-map): Bind the new commands.
+	* doc/emacs/maintaining.texi (VC Change Log):
+	* etc/NEWS: Document the new commands.
+
+2025-08-17  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Delete duplicate bindings of default-directory
+
+	* lisp/vc/vc.el (vc-root-version-diff, vc-diff-mergebase)
+	(vc-root-diff-incoming, vc-root-diff-outgoing, vc-root-diff):
+	Delete duplicate bindings of default-directory.
+	vc--with-backend-in-rootdir already establishes bindings.
+
+2025-08-17  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc--maybe-read-remote-location: Don't return a list
+
+	* lisp/vc/vc.el (vc--maybe-read-remote-location): Return an atom.
+	(vc-root-diff-incoming, vc-root-diff-outgoing, vc-log-incoming)
+	(vc-log-outgoing): Wrap call to 'vc--maybe-read-remote-location'
+	in a call to 'list'.
+
+2025-08-17  Michael Albinus  <michael.albinus@gmx.de>
+
+	Suppress Tramp session timeout if buffer is modified
+
+	* doc/misc/tramp.texi (Predefined connection information): A session
+	timeout is suppressed if there is a modified buffer, or a buffer
+	under auto-revert.
+	(Traces and Profiles): Tramp messages are written to the *Messages*
+	buffer when level is less than or equal to 3.
+
+	* lisp/net/tramp-sh.el (tramp-timeout-session): Do not timeout
+	when buffer is modified, or in auto-revert mode.
+
+	* test/lisp/net/tramp-tests.el (tramp-test48-session-timeout):
+	Extend test.
+
+2025-08-16  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-hg-checkin-patch: Fix on MS-Windows, make 'hg import' async
+
+	* lisp/vc/vc-hg.el (vc-hg--checkin): New function to do the work
+	of vc-hg-checkin and vc-hg-checkin-patch.
+	(vc-hg-checkin): Replace body with call to vc-hg--checkin.
+	(vc-hg-checkin-patch): Likewise.  As compared with the old
+	implementation, this change (i) fixes encoding issues when
+	checking in patches on MS-Windows; and (ii) when
+	vc-async-checkin is non-nil, runs 'hg import' asynchronously
+	instead of running 'hg update' asynchronously (bug#79235).
+
+2025-08-16  Eli Zaretskii  <eliz@gnu.org>
+
+	vc-hg-known-other-working-trees: Fix on MS-Windows
+
+	* lisp/vc/vc-hg.el (vc-hg-known-other-working-trees): Use
+	expand-file-name to convert paths from .hg/sharedpath files.
+
+2025-08-16  João Távora  <joaotavora@gmail.com>
+
+	Flymake: improve previous fix (bug#78862)
+
+	The previous fix for this bug is an acceptable approach, but
+	more care must be taken when clearing a flymake--state object's
+	diagnostics.  Refactor this behaviour into a helper.
+
+	* lisp/progmodes/flymake.el (flymake--clear-state): New helper.
+	(flymake--publish-diagnostics, flymake-start): Use it.
+
+2025-08-16  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-test--with-author-identity: Handle Mercurial
+
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-hg-global-switches):
+	Declare.
+	(vc-test--with-author-identity): Handle Mercurial.
+
+2025-08-16  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc-hg.el (vc-hg-checkin): Fix on MS-Windows (bug#79024).
+
+2025-08-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	Merge from origin/emacs-30
+
+	964741d40e0 * lisp/net/tramp-sh.el (tramp-get-remote-touch): Simplify.
+	6a018a2d7e4 Improve use of "touch" in Tramp
+
+2025-08-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	Merge from origin/emacs-30
+
+	f8a206937c9 executable-interpret: Handle remote file names
+	c17168ebed9 ; * admin/make-tarball.txt: Fix typo and add details.
+
+2025-08-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	Merge from origin/emacs-30
+
+	636f166cfc8 ; * make-dist: Include ELisp hierarchy diagram in tarball...
+
+2025-08-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	Merge from origin/emacs-30
+
+	8960e3af819 Update files for Emacs 30.2
+	ebeca61755e * admin/admin.el (set-version): Fix handling of official ...
+
+2025-08-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	Merge from origin/emacs-30
+
+	49d64bfb1a4 ; * etc/NEWS: Update for Emacs 30.2.
+	4b90b6e7ce9 ; * lisp/emacs-lisp/cl-generic.el (cl-defgeneric): Doc fi...
+
+2025-08-16  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	whitespace-mode: New style to prettify page delimiters characters.
+
+	This new style for 'whitespace-style' displays the page
+	delimiter characters "^L" as pretty horizontal lines.  (Bug#77544)
+
+	This also add a new minor mode to toggle these visualization.
+
+	* lisp/whitespace.el (whitespace-style): Add page-delimiters
+	option.
+	(whitespace-page-delimiter): New face.
+	(whitespace--page-delimiters-keyword): New variable.
+	(whitespace-page-delimiters-mode): New minor mode.
+	(whitespace-style-face-p, whitespace-color-on): Rework for
+	display the page-delimiters.
+
+2025-08-16  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Add support for updating *Completions* as you type
+
+	Add support for updating the *Completions* buffer as you type,
+	controlled by a new completion metadata symbol 'eager-update'
+	and a new defcustom 'completion-eager-update'.
+
+	You can configure a completion category to update *Completions*
+	as you type by setting 'completion-category-overrides'
+	appropriately; or set 'completion-eager-update' to t to always
+	update *Completions* as you type.
+
+	This is similar to the recently added 'completion-eager-display'.
+
+	* lisp/minibuffer.el (completion-eager-update): Add new
+	defcustom defaulting to 'auto.  (Bug#77649)
+	(completion--eager-update-p, completions--background-update)
+	(completions--post-command-update): Add.
+	(completions--after-change): Call
+	'completions--post-command-update' via 'post-command-hook'.
+	(minibuffer-completion-help): Check 'completion-eager-update'
+	and install 'completions--after-change'.
+	(completion-help-at-point): Call 'completion--eager-update-p'
+	if ONLY-IF-EAGER is non-nil.
+	* etc/NEWS: Announce completion-eager-update.  Reword the
+	announcement of 'completion-eager-display' for consistency.
+
+2025-08-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/net/tramp-sh.el (tramp-get-remote-touch): Simplify.
+
+2025-08-16  Toru TSUNEYOSHI  <t_tuneyosi@hotmail.com>
+
+	Improve use of "touch" in Tramp
+
+	* lisp/net/tramp-sh.el (tramp-get-remote-touch): Set connection
+	property "touch-h".
+	(tramp-sh-handle-set-file-times): Use it.
+
+2025-08-16  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Handle 'lexical-binding' cookie in nnrss output
+
+	* lisp/gnus/nnrss.el (nnrss-save-server-data)
+	(nnrss-save-group-data): Add a 'lexical-binding' cookie.
+	* lisp/gnus/nnrss.el (nnrss-read-server-data)
+	(nnrss-read-group-data): Allow missing 'lexical-binding' cookie.
+	(Bug#79199)
+
+2025-08-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	Sync with Tramp 2.7.4-pre
+
+	* doc/misc/trampver.texi:
+	* lisp/net/trampver.el (tramp-version): Adapt Tramp versions.
+
+	* lisp/net/tramp-cmds.el (tramp-cleanup-connection):
+	Use read syntax #' for `tramp-timeout-session',
+
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
+	* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
+	Set "connected" property in time.
+
+	* lisp/net/tramp-sh.el (tramp-timeout-session):
+	Add ;;;###tramp-autoload cookie.
+
+	* lisp/net/tramp.el (tramp-barf-if-file-missing): Do not raise an
+	error when not connected.  (Bug#78572)
+	(tramp-file-name-handler): Do not force the backtrace.
+	(tramp-connectable-p): Check also, whether initial handshake is finished.
+	(tramp-skeleton-directory-files)
+	(tramp-skeleton-directory-files-and-attributes)
+	(tramp-skeleton-set-file-modes-times-uid-gid): Rearrange sending
+	`file-missing' error.
+	(tramp-handle-access-file, tramp-handle-unlock-file):
+	Use `tramp-connectable-p'.
+	(tramp-skeleton-file-name-all-completions): Filter out "" hits.
+	(Bug#79173)
+
+	* test/lisp/net/tramp-tests.el (project-mode-line-format)
+	(project-mode-line): Declare.
+	(tramp-test48-session-timeout): New test.
+	(tramp-test49-auto-load, tramp-test49-delay-load)
+	(tramp-test49-recursive-load, tramp-test49-remote-load-path)
+	(tramp-test50-without-remote-files, tramp-test51-unload): Rename.
+
+2025-08-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Make sure 'make-process' locks the process to the current thread
+
+	* src/process.c (set_proc_thread): New function.
+	(Fset_process_thread, create_process): Use it.
+
+2025-08-16  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Zero fd_callback_info when deleting an fd
+
+	.waiting_thread and .thread could be left set to non-NULL values
+	in a deleted fd_callback_info entry.  These would never be
+	cleared by e.g. clear_waiting_thread_info since that only clears
+	fd_callback_info entries up to max_desc.  Clear fd_callback_info
+	entirely when deleting an entry.
+
+	* src/process.c (clear_fd_callback_data): Add.
+	(delete_write_fd, delete_keyboard_wait_descriptor): Call
+	clear_fd_callback_data. (bug#79201)
+	(delete_read_fd): Remove duplicated clearing code.
+	(deactivate_process): Remove duplicate recompute_max_desc.
+
+2025-08-16  john muhl  <jm@pub.pink>
+
+	(diff--font-lock-prettify): Fix fringe width test
+
+	* lisp/vc/diff-mode.el (diff--font-lock-prettify):
+	Use 'window-fringes' instead of the 'left-fringe' frame parameter
+	since the former returns an integer on both GUI and TTY frames.
+
+2025-08-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Reject non-nil non-number REPEAT in 'run-with-timer'
+
+	* lisp/emacs-lisp/timer.el (run-at-time, run-with-timer): Reject
+	non-nil REPEAT if it is not a non-negative number.  (Bug#79227)
+	Doc fixes.
+
+	* test/lisp/emacs-lisp/timer-tests.el (timer-test-repeat-arg): New
+	test.
+
+2025-08-15  Matthew Tromp  <matthewktromp@gmail.com>
+
+	Delete overlays from Flymake backends that no longer exist
+
+	Fix for bug#78862: previously, when starting eglot, existing flymake
+	diagnostics in the buffer would persist until flymake was completely
+	restarted (like by running 'flymake-mode' twice).  This change adds
+	logic to 'flymake-start' to delete all diagnostics and their overlays
+	from any backend that is no longer in 'flymake-diagnostic-functions'.
+	* lisp/progmodes/flymake.el (flymake-start): Remove overlays from
+	backends that no longer exist.
+
+2025-08-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Update description of buffer-in-register
+
+	* doc/lispref/text.texi (Registers): Update register-in-buffer
+	form.  (Bug#79243)
+
+2025-08-14  Juri Linkov  <juri@linkov.net>
+
+	New user option 'treesit-enabled-modes' (bug#79180)
+
+	* lisp/treesit.el (treesit-enabled-modes): New user option.
+	* src/treesit.c (treesit-major-mode-remap-alist): New variable.
+
+	* lisp/progmodes/c-ts-mode.el:
+	* lisp/progmodes/csharp-mode.el:
+	* lisp/progmodes/java-ts-mode.el:
+	* lisp/progmodes/js.el:
+	* lisp/progmodes/json-ts-mode.el:
+	* lisp/progmodes/ruby-ts-mode.el:
+	* lisp/progmodes/sh-script.el:
+	* lisp/textmodes/css-mode.el:
+	* lisp/textmodes/mhtml-ts-mode.el:
+	* lisp/textmodes/toml-ts-mode.el:
+	Add ts-mode mapping to 'treesit-major-mode-remap-alist'
+	for ts-modes that already have the corresponding non-ts mode
+	association in 'auto-mode-alist'.
+
+	* lisp/progmodes/cmake-ts-mode.el (cmake-ts-mode-maybe):
+	* lisp/progmodes/dockerfile-ts-mode.el (dockerfile-ts-mode-maybe):
+	* lisp/progmodes/elixir-ts-mode.el (elixir-ts-mode-maybe):
+	* lisp/progmodes/go-ts-mode.el (go-ts-mode-maybe)
+	(go-mod-ts-mode-maybe, go-work-ts-mode-maybe):
+	* lisp/progmodes/heex-ts-mode.el (heex-ts-mode-maybe):
+	* lisp/progmodes/lua-ts-mode.el (lua-ts-mode-maybe):
+	* lisp/progmodes/php-ts-mode.el (php-ts-mode-maybe):
+	* lisp/progmodes/rust-ts-mode.el (rust-ts-mode-maybe):
+	* lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode-maybe)
+	(tsx-ts-mode-maybe):
+	* lisp/textmodes/markdown-ts-mode.el (markdown-ts-mode-maybe):
+	* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode-maybe):
+	Add a wrapper function to 'auto-mode-alist'
+	for ts-modes that have no corresponding non-ts mode.
+	Also add a mapping to 'treesit-major-mode-remap-alist'
+	for the case when a non-ts mode is installed from an external
+	source to be able to customize it with 'treesit-enabled-modes'.
+
+2025-08-14  Zhengyi Fu  <i@fuzy.me>  (tiny change)
+
+	executable-interpret: Handle remote file names
+
+	* lisp/progmodes/executable.el (executable-interpret): Use
+	`file-local-name' to get the local file name component from
+	`buffer-file-name'.  (Bug#79233)
+
+2025-08-14  Elijah Gabe Pérez  <eg642616@gmail.com>
+
+	Fix lua-ts-mode-tests.el
+
+	* test/lisp/progmodes/lua-ts-mode-tests.el
+	(lua-ts-test-auto-close-block-comments): Skip when needed.
+
+2025-08-14  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git-modify-change-comment: Bind c-s-f-w for command arguments too
+
+	* lisp/vc/vc-git.el (vc-git-modify-change-comment): Bind
+	coding-system-for-write to locale-coding-system around the call
+	to vc-git-command on MS-Windows.  The temporary file name could
+	contain non-ASCII, e.g. the user's username.
+
+2025-08-14  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-buffer-sync-fileset: Reorder some checks for speed (bug#79137)
+
+	* lisp/vc/vc.el (vc-buffer-sync-fileset): Check whether a
+	buffer's file is in one of our directories before checking
+	whether it exists on disk.  This should mean far fewer system
+	calls overall (bug#79137).
+
+2025-08-14  Po Lu  <luangruo@yahoo.com>
+
+	Fix generation of defvars defined by easy-mmode and company in loaddefs.el
+
+	* lisp/emacs-lisp/loaddefs-gen.el
+	(loaddefs-generate--make-autoload): Restore previously existing
+	conditions for recursing on macroexpansions when processing
+	easy-mmode and related macros.
+
+2025-08-14  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-hg-checkin-patch: Fix several issues
+
+	* lisp/vc/vc-hg.el (vc-hg-checkin-patch): Use
+	make-nearby-temp-file.  Protect the async process with
+	vc-wait-for-process-before-save.  Don't call vc-checkin-hook
+	here, instead return a (async . #<process>) list so that
+	vc-finish-logentry does it.
+
+2025-08-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Bump Emacs version to 30.2.50
+
+	* README:
+	* configure.ac:
+	* exec/configure.ac:
+	* java/AndroidManifest.xml.in (Version-code):
+	* nt/README.W32:
+	* msdos/sed2v2.inp: Bump Emacs version to 30.2.50.
+
+	* etc/NEWS: Add headers for Emacs 30.2.
+
+2025-08-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Update files for Emacs 30.2
+
+	* ChangeLog.5:
+	* etc/AUTHORS:
+	* etc/HISTORY: Update for Emacs 30.2.
+
+	* admin/admin.el (set-version): Fix handling of official releases.
+
+2025-08-14  Eli Zaretskii  <eliz@gnu.org>
+
+	* admin/admin.el (set-version): Fix handling of official releases.
+
+2025-08-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	Limit size of Tramp debug buffer
+
+	* doc/misc/tramp.texi (Traces and Profiles): Add
+	tramp-debug-buffer-limit to index.  Describe it.
+
+	* lisp/net/tramp-message.el (tramp-debug-buffer-limit): New defcustom.
+	(tramp-debug-message): Use it.  (Bug#79182)
+
+2025-08-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix file notification problem on Windows.
+
+	* src/inotify.c (inotify_callback): Set event.frame_or_window to Qnil.
+
+	* src/keyboard.c (make_lispy_event): Make a better check for the
+	HAVE_W32NOTIFY case when creating a Qfile_notify event.
+
+2025-08-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-test--other-working-trees: Export env vars so Git finds an author
+
+	* test/lisp/vc/vc-tests/vc-tests.el
+	(vc-test--with-author-identity): New macro, factored out of
+	vc-test--version-diff.
+	(vc-test--version-diff, vc-test--other-working-trees): Use it.
+
+2025-08-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc-hg.el (vc-hg-checkin): Pass '-A' to 'hg commit'.
+
+2025-08-12  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-bar.el: Revert caching in 'tab-bar-format-align-right'.
+
+	(tab-bar--align-right-cache): Remove variable.
+	(tab-bar-format-align-right): Remove uses of
+	'tab-bar--align-right-cache' (bug#79141).
+
+2025-08-12  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	tab-line: Allow to hide excluded buffers in the tab line. (Bug#79159)
+
+	* etc/NEWS: Announce changes.
+	* lisp/tab-line.el (tab-line-tabs-window-buffers-filter-function):
+	New user option.
+	(tab-line-tabs-non-excluded): New function.
+	(tab-line-tabs-window-buffers): Update.
+
+2025-08-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-buffer-sync-fileset: Optimization when NOT-ESSENTIAL is non-nil
+
+	* lisp/vc/vc.el (vc-buffer-sync-fileset): When NOT-ESSENTIAL is
+	non-nil, use string-prefix-p instead of file-in-directory-p
+	(bug#79137).
+
+2025-08-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-test--other-working-trees: Fix a skip condition
+
+	* test/lisp/vc/vc-tests/vc-tests.el
+	(vc-test--other-working-trees): For Git, don't try moving the
+	first working tree unless we have Git>=2.29.
+
+2025-08-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-do-command: In batch mode, print the output of failed commands
+
+	* lisp/vc/vc-dispatcher.el (vc-do-command): In batch mode, when
+	the command fails, print its output.
+
+2025-08-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-test-git07-other-working-trees: Widen scope of skip on Git<=2.17
+
+	* test/lisp/vc/vc-tests/vc-tests.el
+	(vc-test--other-working-trees): Delete condition to skip
+	'move-working-tree' tests on Git<=2.17.
+	(vc-test-git07-other-working-trees): Skip this whole test on
+	Git<=2.17 (discussion in bug#79024).
+
+2025-08-12  Po Lu  <luangruo@yahoo.com>
+
+	Fix build without tree-sitter
+
+	* lisp/textmodes/mhtml-ts-mode.el
+	(mhtml-ts-mode--range-settings): Don't invoke
+	`treesit-language-available-p' unless bound.
+
+2025-08-11  Dr.Sc.KAWAMOTO,Takuji  <kawamoto.takuji@gmail.com>  (tiny change)
+
+	Fix NS frame position update after resize/move
+
+	Fixes bug#74074, bug#79164.
+
+	* src/nsterm.m ([EmacsView windowDidEndLiveResize:]):
+	([EmacsView updateFramePosition]): New functions.
+	([EmacsView windowDidMove:]): Move contents of this function into
+	updateFramePosition and call it.
+
+2025-08-10  JD Smith  <93749+jdtsmith@users.noreply.github.com>
+
+	Do not include interactive args in autoload files
+
+	(Bug#78995)
+
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload):
+	Do not include `interactive' ARG-DESCRIPTOR in generated autoload forms
+	for function-defining macros, but only modes.
+
+2025-08-10  JD Smith  <93749+jdtsmith@users.noreply.github.com>
+
+	Implement new autoload macro expansion declare form
+
+	Currently, a hard-coded set of macros is automatically expanded
+	during generation of autoloads.  To allow user macros to request
+	such expansion, this implements a new declare form
+	`autoload-macro' (Bug#78995), with supported value `expand'.
+	For example, macros which wrap `define-minor-mode', can declare
+	`(autoload-macro expand)' to request that ;;;###autoload-adorned
+	calls to the macro are expanded during generation, such that an
+	autoload for the resulting function is created.
+
+	* lisp/emacs-lisp/byte-run.el (byte-run--set-autoload-macro):
+	Handle autoload-macro declare forms.
+	(macro-declarations-alist) Add handler for 'autoload-macro
+	declare forms.
+	(defmacro, defun):
+	* lisp/emacs-lisp/cl-generic.el (cl-defgeneric, cl-defun)
+	(cl-iter-defun, cl-defmacro, cl-defstruct):
+	* lisp/emacs-lisp/easy-mmode.el
+	(define-minor-mode, define-globalized-minor-mode, iter-defun):
+	* lisp/emacs-lisp/inline.el (define-inline):
+	* lisp/emacs-lisp/pcase.el (pcase-defmacro):
+	Declare (autoload-macro expand) to request expansion of the
+	macro during autoload generation.
+
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload):
+	Handle the `autoload-macro=expand' property for macros.  Load
+	the ;;;###autoload-containing file if an unknown symbol is
+	encountered in the car of the following form, to give packages a
+	chance to define their macros and request expansion.  Factor
+	list of special function-defining macros out as a constant
+	variable: `loaddefs--defining-macros'.
+
+	* doc/lispref/functions.texi (Declare Form):
+	* doc/lispref/loading.texi (Autoload): Document `autoload-macro'.
+
+2025-08-10  Juri Linkov  <juri@linkov.net>
+
+	* lisp/man.el (man): Use active region for the default value.
+
+	While reading a manual name, provide text from the selected region
+	as another default value for the second 'M-n' in the minibuffer.
+	Also replace spaces with dashes in the name.
+
+2025-08-10  Juri Linkov  <juri@linkov.net>
+
+	Allow code outside Isearch delete overlays in 'isearch-opened-overlays'
+
+	* lisp/isearch.el (isearch-open-necessary-overlays)
+	(isearch-close-unnecessary-overlays): Use 'overlay-buffer'
+	to check if overlays in 'isearch-opened-overlays' are still
+	not deleted (bug#79115).
+	(with-isearch-suspended): Call 'isearch-clean-overlays'
+	after 'isearch-done'.  Otherwise 'isearch-mode' called later
+	just resets 'isearch-opened-overlays' to nil, causing "overlay leak".
+
+2025-08-10  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	'php-ts-mode' depends on 'mhtml-ts-mode' instead of JS,CSS and HTML
+
+	The direct dependence on 'js-ts-mode', 'css-ts-mode' and
+	html-ts-mode has now been replaced by 'mhtml-ts-mode'.
+	Additional benefits are:
+	1. Imenu now exposes symbols for all of all languages,
+	2. navigation now works correctly for all languages,
+	3. outline works for all languages.
+
+	Additional new features are:
+	1. indentation of PHP in mixed buffers with HTML now works much
+	better and allows three different behaviors, an option allows you to
+	choose the behavior.
+	2. a new feature shows where PHP ini files are both locally and
+	remotely, if the buffer is associated with a remote PHP file.
+
+	* etc/NEWS: Mention the rationale for those changes, the new command,
+	and the new options.
+	* admin/tree-sitter/treesit-admin.el (treesit-admin--builtin-modes):
+	Added 'mhtml-ts-mode'.
+	(treesit-admin--builtin-features): Added 'mhtml-ts-mode'.
+	* lisp/textmodes/mhtml-ts-mode.el (mhtml-ts-mode--range-settings):
+	New variable that store range settings.
+	(mhtml-ts-mode--treesit-aggregated-outline-predicate): New variable
+	that stores outline predicates.
+	(mhtml-ts-mode): Use those two new variables.
+	* lisp/progmodes/php-ts-mode.el: Update doc string.  Removed old
+	dependecies.
+	(php-ts-mode--language-source-alist): Updated parsers version.
+	(php-ts-mode-install-parsers): Removed old dependencies, now relies
+	on mhtml-ts-mode-install-parsers'.  Update doc string.
+	(php-ts-mode-js-css-indent-offset): Update doc string.
+	(php-ts-mode-css-fontify-colors): Removed option, now relies on
+	'php-ts-mode-css-fontify-colors'.
+	(php-ts-mode-html-indent-offset): New user option.
+	(php-ts-mode-html-relative-indent): New user option.
+	(php-ts-mode-php-default-executable): Assume "php" instead of
+	"/usr/bin/php" if 'executable-find' fails.
+	(php-ts-mode-php-config): Fix tag.
+	(php-ts-mode-find-sibling-rules): New user option with the rules
+	for finding siblings of a file.
+	(php-ts-mode-phpdoc-highlight-errors): New user option, if non-nil
+	highlight unkown PHPDOC nodes.
+	(php-ts-mode--indent-style-setter): Indentation fix.
+	(php-ts-mode-indent-style): Indentation fix.
+	(php-ts-mode-flymake-php): Indentation fix.
+	(php-ts-mode--executable): Indentation fix.
+	(php-ts-mode-show-ini): New command that show the locations of PHP
+	ini files.
+	(php-ts-mode--get-indent-style): Indentation fix.
+	(php-ts-mode--set-indent-property): Indentation fix.
+	(php-ts-mode-set-style): Indentation fix.
+	(php-ts-mode--get-parser-ranges): Indentation fix.
+	(php-ts-mode--possibly-braceless-keyword-re): Removed no longer used
+	constant.
+	(php-ts-mode--open-statement-group-heuristic): Removed no longer used
+	function.
+	(php-ts-mode--else-heuristic): Indentation fix.
+	(php-ts-mode--first-sibling): Indentation fix.
+	(php-ts-mode--js-css-tag-bol): Function removed, now using
+	'mhtml-ts-mode--js-css-tag-bol'.
+	(php-ts-mode--parent-html-bol): Removed no longer used
+	function.
+	(php-ts-mode--parent-html-heuristic): Now more reliably handles the
+	mixed indentation of PHP and HTML. The new option
+	'php-ts-mode-html-relative-indent' changes the behavior of the
+	function. When 'php-ts-mode-html-relative-indent' is 't' the new
+	option 'php-ts-mode-html-indent-offset' controls the offset of PHP
+	code relative to HTML tags.
+	(php-ts-mode--array-element-heuristic): Indentation fix.
+	(php-ts-mode--anchor-prev-sibling): Indentation fix..
+	(php-ts-mode--indent-styles): The indentation rules for 'program' and
+	text_interpolation' are now common to all indentation styles, thanks
+	to the new version of 'php-ts-mode-arent-html-heuristic'.  New rules
+	for 'namespace_use_clause', 'use_declaration', 'use_list',
+	'attribute_group' and 'string_content'.
+	(php-ts-mode--prettify-symbols-alist): New variable to support
+	'prettify-symbols-alist'.
+	(php-ts-mode--test-visibility-modifier-operation-clause-p): Rename ...
+	(php-ts-mode--test-visibility-modifier-operation-p): ... to this more
+	correct name.
+	(php-ts-mode--test-property-hook-clause-p): Rename ...
+	(php-ts-mode--test-property-hook-p): ... to this more correct name.
+	(php-ts-mode--test-relative-name-p): New function to test if
+	'relative_name' is supported by the PHP parser.
+	(php-ts-mode--font-lock-settings): Use the new function for highlight
+	'relative_name'.  Highlight 'error_suppression_expression'.
+	Refactoring using the renamed functions.  Indentation fix.
+	(php-ts-mode--custom-html-font-lock-settings): Replace the rules with
+	'mhtml-ts-mode--treesit-font-lock-settings'.  Fix docs string.
+	(php-ts-mode--phpdoc-font-lock-settings): Added support for "array" and
+	"list" array_type.  New "phpdoc-error" feature to highlight unknown
+	nodes via new 'php-ts-mode--phpdoc-fontify-error' function.
+	(php-ts-mode--colorize-css-value): Removed function no longer used, now
+	highlighting is handled directly by 'mhtml-ts-mode'.
+	(php-ts-mode--phpdoc-fontify-error): New function used by
+	'php-ts-mode--phpdoc-font-lock-settings'.
+	(php-ts-mode--parent-object): Indentation fix.
+	(php-ts-mode--defun-name-separator): Indentation fix.
+	(php-ts-mode--defun-object-name): Indentation fix.
+	(php-ts-mode--defun-name): The function now also returns the defun name
+	of 'mhtml-ts-mode'.
+	(php-ts-mode--treesit-defun-type-regexp): New regexp for
+	'treesit-defun-type-regexp' support.
+	(php-ts-mode--indent-defun): Indentation fix.
+	(php-ts-mode--defun-valid-p): Fix indentation
+	(php-ts-mode--comment-indent-new-line): Indentation fix.
+	(php-ts-mode--comment-current-plist): New local variable that stores
+	the state of the PHP comment style.
+	(php-ts-mode--comment-setup): The function now handles changing, for
+	different languages, comment styles, using
+	"php-ts-mode--comment-current-plist" to store and retrieve the comment
+	style for the PHP language.
+	(php-ts-mode-comment-setup): Now store the PHP comment style in
+	'php-ts-mode--comment-current-plist'.
+	(php-ts-mode-menu): Indentation fix.
+	(php-ts-mode): Replace dependency from JS, CSS and HTML width
+	'mhtml-ts-mode'.  Navigation, Imenu and Outline now support PHP, HTML,
+	Javascript and CSS.  Added support for 'prettify-symbol-mode'.
+	Added support for 'electric-layout-rules'.
+	(php-ts-mode-run-php-webserver, php-ts-mode--webserver-read-args)
+	(php-ts-mode--webserver-read-args, inferior-php-ts-mode, run-php)
+	(inferior-php-ts-mode-startup, php-ts-mode-inferior--write-history)
+	(php-ts-mode-send-region): Indentation fixes.
+	* lisp/treesit.el (treesit-range-rules): Check if treesit is available
+	before compiling a query.
+	(treesit-ensure-installed): Check if treesit is available before trying
+	to ensure if a grammar library is installed.
+
+	(Bug#78994)
+
+2025-08-10  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix some 'git worktree' compatibility issues
+
+	* lisp/vc/vc-git.el (vc-git-delete-working-tree): Reimplement to
+	avoid requiring 'git worktree remove'.
+	(vc-git-move-working-tree): Use 'git worktree move' if 'git
+	worktree repair' is not available.  Give a more informative
+	error message if we don't even have that.
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-git--program-version):
+	Declare.
+	(vc-test--other-working-trees): Skip vc-move-working-tree tests
+	with Git old enough to lack 'git worktree move'.
+
+2025-08-10  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New command vc-working-tree-switch-project (bug#79024)
+
+	* lisp/vc/vc.el (vc-working-tree-switch-project): New command.
+	* lisp/vc/vc-hooks.el (vc-prefix-map): Bind it to C-x v w s.
+	* doc/emacs/vc1-xtra.texi (Other Working Trees):
+	* etc/NEWS: Document it.
+
+2025-08-10  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New project-find-matching-buffer-function for VC-Dir
+
+	* lisp/vc/vc-dir.el (vc-dir-find-matching-buffer): New function.
+	(vc-dir-mode): Use it as project-find-matching-buffer-function.
+
+2025-08-09  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Allow thread's buffer to be killed, by default
+
+	* src/thread.c (Fmake_thread): Add new argument (bug#76969).
+	(thread_set_error): New function, extracted from thread-signal.
+	(Fthread_buffer_disposition): Add getter.
+	(Fthread_set_buffer_disposition): And setter.
+	(thread_check_current_buffer): Check the values of threads'
+	buffer_disposition.
+	(thread_all_before_buffer_killed): New function.
+	(init_threads): Set buffer_disposition to nil for the main thread.
+	(syms_of_threads): Add new symbols and define the error.
+
+	* src/thread.h (thread_state): New field buffer_disposition.
+	(thread_all_before_buffer_killed): Declare.
+
+	* src/buffer.c (Fkill_buffer): Call thread_check_current_buffer
+	one more time after all hooks and after that call
+	thread_all_before_buffer_killed.
+
+	* src/comp.c (ABI_VERSION): Increase the value.
+
+	* test/src/thread-tests.el (thread-buffer-disposition-t)
+	(thread-buffer-disposition-nil)
+	(thread-buffer-disposition-silently)
+	(thread-set-buffer-disposition)
+	(thread-set-buffer-disposition-main-thread): New tests.
+
+	* doc/lispref/threads.texi (Basic Thread Functions): Document
+	buffer-disposition in make-thread and its getter and setter.
+
+	* etc/NEWS: Add entry.
+
+2025-08-09  Mark A. Hershberger  <mah@nichework.com>
+
+	Initialize native-tab-width in cases where there is no language mode
+
+	org-src-font-lock-fontify-block creates an uninitialized
+	native-tab-width variable and then, when there is no language set on a
+	block, ends up using it.  This triggers an error.
+
+2025-08-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	f2d3659cf50 Handle remote file names in cmuscheme.el
+	d1ab95b175e * lisp/vc/vc.el (vc-register): Fix interactive spec (bug#...
+	f58b738042e ; windows installer: set x64 registry keys (tiny change)
+
+2025-08-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "`php-ts-mode' depends on `mhtml-ts-mode' instead of JS,CSS and HTML"
+
+	This reverts commit e1fd7b5d89ec7f2df40fa01bf4041c0d1df147b4.
+	It fails the build without treew-sitter.
+
+2025-08-09  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	`php-ts-mode' depends on `mhtml-ts-mode' instead of JS,CSS and HTML
+
+	The direct dependence on js-ts-mode, css-ts-mode and html-ts-mode
+	has now been replaced by 'mhtml-ts-mode'.
+	Additional benefits are:
+	1. Imenu now exposes symbols for all of all languages,
+	2. navigation now works correctly for all languages,
+	3. outline works for all languages.
+
+	Additional new features are:
+	1. indentation of PHP in mixed buffers with HTML now works much
+	better and allows three different behaviors, an option allows you to
+	choose the behavior.
+	2. a new feature shows where PHP ini files are both locally and
+	remotely, if the buffer is associated with a remote PHP file.
+
+	* etc/NEWS: Mention the rationale for those changes, the new command,
+	and the new options.
+	* lisp/textmodes/mhtml-ts-mode.el (mhtml-ts-mode--range-settings): New
+	variable that store range settings.
+	(mhtml-ts-mode--treesit-aggregated-outline-predicate): New variable
+	that store outline predicates.
+	(mhtml-ts-mode): Use those two new variables.
+	* lisp/progmodes/php-ts-mode.el: Update doc string.  Removed old
+	dependencies.
+	(php-ts-mode--language-source-alist): Updated parsers version.
+	(php-ts-mode-install-parsers): Removed old dependencies, now relies
+	on (mhtml-ts-mode-install-parsers).  Update doc string.
+	(php-ts-mode-js-css-indent-offset): Update doc string.
+	(php-ts-mode-css-fontify-colors): Removed option, now relies on
+	'php-ts-mode-css-fontify-colors'.
+	(php-ts-mode-html-indent-offset): New user option.
+	(php-ts-mode-html-relative-indent): New user option.
+	(php-ts-mode-php-default-executable): Assume \"php\" instead of
+	\"/usr/bin/php\" if 'executable-find' fails.
+	(php-ts-mode-php-config): Fix tag.
+	(php-ts-mode-find-sibling-rules): New user option with the rules for
+	finding siblings of a file.
+	(php-ts-mode-phpdoc-highlight-errors): New user option, if non-nil
+	highlight unkown PHPDOC nodes.
+	(php-ts-mode--indent-style-setter): Indentation fix.
+	(php-ts-mode-indent-style): Indentation fix.
+	(php-ts-mode-flymake-php): Indentation fix.
+	(php-ts-mode--executable): Indentation fix.
+	(php-ts-mode-show-ini): New command that show the locations of PHP
+	ini files.
+	(php-ts-mode--get-indent-style): Indentation fix.
+	(php-ts-mode--set-indent-property): Indentation fix.
+	(php-ts-mode-set-style): Indentation fix.
+	(php-ts-mode--get-parser-ranges): Indentation fix.
+	(php-ts-mode--possibly-braceless-keyword-re): Removed no longer
+	used constant.
+	(php-ts-mode--open-statement-group-heuristic): Removed no longer
+	used function.
+	(php-ts-mode--else-heuristic): Indentation fix.
+	(php-ts-mode--first-sibling): Indentation fix.
+	(php-ts-mode--js-css-tag-bol): Function removed, now using
+	'mhtml-ts-mode--js-css-tag-bol'.
+	(php-ts-mode--parent-html-bol): Removed no longer used
+	function.
+	(php-ts-mode--parent-html-heuristic): Now more reliably handles
+	the mixed indentation of PHP and HTML. The new option
+	'php-ts-mode-html-relative-indent' changes the behavior of the
+	function. When 'php-ts-mode-html-relative-indent' is 't' the new
+	option 'php-ts-mode-html-indent-offset' controls the offset of PHP
+	code relative to HTML tags.
+	(php-ts-mode--array-element-heuristic): Indentation fix.
+	(php-ts-mode--anchor-prev-sibling): Indentation fix..
+	(php-ts-mode--indent-styles): The indentation rules for 'program'
+	and 'text_interpolation' are now common to all indentation styles,
+	thanks to the new version of 'php-ts-mode-arent-html-heuristic'.
+	New rules for 'namespace_use_clause', 'use_declaration',
+	'use_list', 'attribute_group' and 'string_content'.
+	(php-ts-mode--prettify-symbols-alist): New variable to support
+	'prettify-symbols-alist'.
+	(php-ts-mode--test-visibility-modifier-operation-clause-p): Rename ...
+	(php-ts-mode--test-visibility-modifier-operation-p): ... to this more
+	correct name.
+	(php-ts-mode--test-property-hook-clause-p): Rename ...
+	(php-ts-mode--test-property-hook-p): ... to this more correct name.
+	(php-ts-mode--test-relative-name-p): New function to test if
+	'relative_name' is supported by the PHP parser.
+	(php-ts-mode--font-lock-settings): Use the new function for highlight
+	'relative_name'. Highlight 'error_suppression_expression'.
+	Refactoring using the renamed functions.  Indentation fix.
+	(php-ts-mode--custom-html-font-lock-settings): Replace the rules with
+	'mhtml-ts-mode--treesit-font-lock-settings'.  Fix docs string.
+	(php-ts-mode--phpdoc-font-lock-settings): Added support for "array"
+	and "list" array_type.  New "phpdoc-error" feature to highlight
+	unknown nodes via new 'php-ts-mode--phpdoc-fontify-error' function.
+	(php-ts-mode--colorize-css-value): Removed function no longer used,
+	now highlighting is handled directly by 'mhtml-ts-mode'.
+	(php-ts-mode--phpdoc-fontify-error): New function used by
+	'php-ts-mode--phpdoc-font-lock-settings'.
+	(php-ts-mode--parent-object): Indentation fix.
+	(php-ts-mode--defun-name-separator): Indentation fix.
+	(php-ts-mode--defun-object-name): Indentation fix.
+	(php-ts-mode--defun-name): The function now also returns the defun
+	name of 'mhtml-ts-mode'.
+	(php-ts-mode--treesit-defun-type-regexp): New regexp for
+	'treesit-defun-type-regexp' support.
+	(php-ts-mode--indent-defun): Indentation fix.
+	(php-ts-mode--defun-valid-p): Fix indentation.
+	(php-ts-mode--comment-indent-new-line): Indentation fix.
+	(php-ts-mode--comment-current-plist): New local variable that stores
+	the state of the PHP comment style.
+	(php-ts-mode--comment-setup): The function now handles changing, for
+	different languages, comment styles, using
+	"php-ts-mode--comment-current-plist" to store and retrieve the comment
+	style for the PHP language.
+	(php-ts-mode-comment-setup): Now store the PHP comment style in
+	'php-ts-mode--comment-current-plist'.
+	(php-ts-mode-menu): Indentation fix.
+	(php-ts-mode): Replace dependency from JS, CSS and HTML width
+	'mhtml-ts-mode'.  Navigation, Imenu and Outline now support PHP, HTML,
+	Javascript and CSS.  Added support for 'prettify-symbol-mode'.
+	Added support for 'electric-layout-rules'.
+	(php-ts-mode-run-php-webserver, php-ts-mode--webserver-read-args)
+	(php-ts-mode--webserver-read-args, inferior-php-ts-mode, run-php)
+	(inferior-php-ts-mode-startup, php-ts-mode-inferior--write-history)
+	(php-ts-mode-send-region): Indentation fixes.
+
+	(Bug#78994)
+
+2025-08-09  Peder O. Klingenberg  <peder@klingenberg.no>
+
+	Emulate dynamic binding of 'url-max-redirections'
+
+	* lisp/url/url-http.el (url-http): Make 'url-max-redirections'
+	buffer-local in request buffers, to make dynamic binding over
+	'url-retrieve' work as expected.
+
+	(Bug#79186)
+
+2025-08-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "Stop subprocesses from using inherited or default PAGER"
+
+	This reverts commit 7811a7d38bb7cb303dc66efa02eb95e75a03f39d.
+	Users set PAGER and don't expect Emacs to override that.  See
+	https://lists.gnu.org/archive/html/emacs-devel/2025-07/msg00309.html.
+
+2025-08-09  Zach Shaftel  <zach@shaf.tel>
+
+	Improve Vprint_variable_mapping
+
+	* src/print.c (print_create_variable_mapping): Fix a typo,
+	`unreadeable-function' to `unreadable-function'. Add `symbols-bare'
+	as an override for `print-symbols-bare'.  (Bug#79161)
+
+2025-08-09  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Variable to control overshoot and backup for TTY cursor  motion
+
+	* src/term.c (syms_of_term): New variable.
+	* src/cm.c (calccost): Control overshooting with new variable.
+	* etc/NEWS: Document new variable.
+	* lisp/term/rxvt.el (terminal-init-rxvt): Force no TAB+BS for
+	rxvt.  (Bug#78474)
+
+2025-08-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	Rename variables *-in-progress-p to *-in-progress
+
+	* doc/lispref/backups.texi (Reverting): Fix variable names
+	revert-buffer-in-progress and auto-revert-buffer-in-progress.
+
+	* etc/NEWS: Fix variable names revert-buffer-in-progress and
+	auto-revert-buffer-in-progress.
+	Presentational fixes and improvements.
+
+	* lisp/autorevert.el (auto-revert-buffer-in-progress): Rename.
+	(auto-revert-handler, auto-revert-buffer): Use renamed variables.
+
+	* lisp/dired-x.el (dired-omit-expunge):
+	Use `auto-revert-buffer-in-progress'.
+
+	* lisp/files.el (revert-buffer-in-progress): Rename.
+	(revert-buffer-in-progress-p): Declare obsolete.
+	(after-find-file, revert-buffer):
+	* lisp/saveplace.el (save-place-find-file-hook)
+	(save-place-dired-hook):
+	* lisp/vc/vc-git.el (vc-git-command, vc-git--out-ok):
+	* lisp/vc/vc.el (vc-diff-internal):
+	Use `revert-buffer-in-progress'.
+
+	* lisp/net/tramp-sh.el (tramp-sh-handle-vc-registered): Suppress warning.
+
+2025-08-09  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Add multi-character pairs to lua-ts-mode and texinfo-mode
+
+	* etc/NEWS: Add entry for lua-ts-mode changes.
+	* lisp/progmodes/lua-ts-mode.el
+	(lua-ts-auto-close-block-comments): New user option.
+	(lua-ts-mode): Add '--[[ ]]' pairs to 'electric-pair-pairs' only
+	if 'lua-ts-auto-close-block-comments' is non-nil.
+	* lisp/textmodes/texinfo.el (texinfo-mode): Add "`` ''" pairs to
+	'electric-pair-pairs'.
+	* test/lisp/progmodes/lua-ts-mode-tests.el
+	(lua-ts-test-auto-close-block-comments): Add new test.
+	(Bug#79047)
+
+2025-08-09  mattiasdrp  <mattias@kojin.tech>
+
+	Autoinsert: Allow condition to be a function
+
+	Currently a condition can only be a regexp or a major-mode symbol but
+	there's no real reason to not allow any predicate as a condition.
+	* doc/misc/autotype.texi: Document the new condition type in
+	'auto-insert-alist'.
+	* etc/NEWS: Announce the new condition type in 'auto-insert-alist'.
+	* lisp/autoinsert.el (auto-insert-alist): Add the new condition type to
+	the variable documentation.
+	(auto-insert): Change the way the condition is matched to allow for
+	custom predicates.
+	* test/lisp/autoinsert-tests.el
+	(autoinsert-tests-auto-insert-lambda/-nil): Add two tests for
+	lambdas (nil and t cases)
+	(autoinsert-tests-auto-insert-predicate/-nil): Add two tests for named
+	predicates (nil and t cases) (Bug#79178)
+
+2025-08-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-move-working-tree: Improve updating VC-Dir buffers
+
+	* lisp/vc/vc.el (vc-move-working-tree): Check entries in
+	vc-dir-buffers for liveness.  Don't hardcode "*vc-dir*"; instead
+	call uniquify-buffer-base-name.  Call uniquify-rename-buffer,
+	not rename-buffer, so that the buffer is not marked unmanaged.
+
+2025-08-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	define-globalized-minor-mode: Use unique MODE-major-mode (bug#79198)
+
+	* lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode)
+	<MODE-set-explicitly>: Make this an internal variable using '--'.
+	<MODE-major-mode>: Make this an internal variable using '--'.
+	Use the name of the global mode not the local mode (bug#79198).
+
+2025-08-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC: Do move new working trees to the beginning of the project list
+
+	* lisp/vc/vc.el (vc-add-working-tree, vc-move-working-tree):
+	Have project-remember-project move the new working trees to the
+	front of the list of projects.  Suggested by Dmitry Gutov
+	<dmitry@gutov.dev>.
+
+2025-08-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(js-json-mode): Set `editorconfig-indent-size-vars`
+
+	* lisp/progmodes/js.el (js-json-mode): Now that we don't inherit
+	from `js-mode` any more, we can't rely on the heuristic to find
+	the indentation var, so we need to.set
+	`editorconfig-indent-size-vars` explicitly.
+
+2025-08-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	Rework autorevert-tests.el
+
+	* lisp/autorevert.el (auto-revert-handler): Rearrange timer handling.
+
+	* test/lisp/autorevert-tests.el (ert-temp-file-prefix): Don't set it.
+	(auto-revert--test-rootdir, auto-revert--test-monitors): New defvars.
+	Replace globally `temporary-file-directory' by
+	`auto-revert--test-rootdir'.
+	(auto-revert--wait-for-revert): Rewrite.
+	(auto-revert--test-library, auto-revert--test-monitor)
+	(auto-revert--skip-unless-proper-library-and-monitor): New defuns.
+	(with-auto-revert-test): Let-bind `ert-temp-file-prefix'.  Call
+	`file-notify-rm-all-watches'.
+	(auto-revert-test--write-region, auto-revert-test--write-file):
+	New defuns.
+	(auto-revert-testNN-*): Rework.
+
+2025-08-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	Rework filenotify-tests.el
+
+	* test/lisp/filenotify-tests.el (ert-temp-file-suffix): Set it.
+	(with-file-notify-test): Don't set :suffix.
+	(file-notify-testNN-*): Rework.
+
+2025-08-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC other working trees: avoid reordering project--list
+
+	* lisp/progmodes/project.el (project--remember-dir)
+	(project-remember-project): New STABLE argument.
+	* lisp/vc/vc.el (vc-add-working-tree)
+	(vc--prompt-other-working-tree, vc-move-working-tree): Use it.
+
+2025-08-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "Autoinsert: Allow condition to be a function"
+
+	This reverts commit 738a7bb4949fdc93b0b637ac4c65423c928f0924.
+	It caused regressions in autoinsert-tests, and causes
+	conceptual problems due to its design.  (Bug#79178)
+
+2025-08-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	Add auto-revert-buffer-in-progress-p
+
+	* doc/lispref/backups.texi (Reverting):
+	Add auto-revert-buffer-in-progress-p.
+
+	* etc/NEWS: Mention auto-revert-buffer-in-progress-p.
+
+	* lisp/autorevert.el (auto-revert-buffer-in-progress-p):
+	New autoloaded variable.
+	(auto-revert-buffer): Let-bind it.  (Bug#79145)
+
+	* lisp/dired-x.el (dired-omit-expunge): Suppress messages when in
+	auto-revert.
+
+2025-08-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-move-working-tree: Also update VC-Dir buffers
+
+	* lisp/vc/vc.el (vc-move-working-tree): Also update VC-Dir
+	buffers to follow the working tree move.
+
+2025-08-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-buffer-sync-fileset: Bind 'non-essential' (bug#79137)
+
+	* lisp/vc/vc.el (vc-buffer-sync-fileset):
+	Bind 'non-essential' (bug#79137).
+
+2025-08-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Generalize finding project matching files to other major modes
+
+	* lisp/progmodes/project.el
+	(project-find-matching-buffer-function): New variable.
+	(project-find-matching-file): Delete.
+	(dired-current-directory): Declare.
+	(project-find-matching-file-or-directory): New function.  Like
+	the old 'project-find-matching-file', but also handle Dired
+	buffers (bug#79126).  When matching file/directory does not
+	exist, try going up in the directory tree until we find
+	something that does.
+	(project-find-matching-buffer): New command.
+	* lisp/vc/vc.el (vc-switch-working-tree): Use it (bug#79126).
+	* etc/NEWS: Announce new command and new variable.
+
+2025-08-08  Tassilo Horn  <tsdh@gnu.org>
+
+	doc-view: inhibit keybinding message if window is not selected
+
+	* lisp/doc-view.el (doc-view-initiate-display): Only echo key-binding
+	message when the document buffer is shown in the selected
+	window (bug#79145).
+
+2025-08-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(help-function-arglist): Fix bug#79128
+
+	* lisp/help.el (help-function-arglist): Fix use of `documentation`,
+	to obey the `function-documentation` property.
+
+	* test/lisp/help-tests.el (help-tests--use-docstring-arglist-79128):
+	New test.
+
+2025-08-07  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Fix some tests on OpenBSD
+
+	* test/lisp/eshell/em-script-tests.el
+	(em-script-test/batch-file/shebang): "env -S" is not supported.
+	* test/src/fns-tests.el (fns-tests-random): 'random' is
+	non-deterministic on OpenBSD.  (Bug#79190)
+
+2025-08-07  mattiasdrp  <mattias@kojin.tech>
+
+	Autoinsert: Allow condition to be a function
+
+	Currently a condition can only be a regexp or a major-mode symbol
+	but there's no real reason to not allow any predicate as a
+	condition.
+	* doc/misc/autotype.texi: Document the new condition type in
+	'auto-insert-alist'.
+	* etc/NEWS: Announce the new condition type in 'auto-insert-alist'.
+	* lisp/autoinsert.el (auto-insert-alist): Add the new condition
+	type to the variable documentation.
+	(auto-insert): Change the way the condition is matched to allow for
+	custom predicates.  (Bug#79178)
+
+2025-08-07  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Use variables to store marking state
+
+	Bug#78967.
+
+	(calendar-mode): Init new variables with user options.
+	* lisp/calendar/calendar.el (calendar-generate-window)
+	(calendar-unmark):
+	* lisp/calendar/diary-lib.el (diary-mark-entries)
+	(diary-redraw-calendar):
+	* lisp/calendar/holidays.el (calendar-mark-holidays): Use new
+	variables.
+	* etc/NEWS: Document the change.
+
+2025-08-07  binarydigitz01  <binarydigitz01@proton.me>  (tiny change)
+
+	Do interactive tagging in arc-mode.el (bug#79166).
+
+2025-08-07  Jeremy Bryant  <jb@jeremybryant.net>
+
+	New debugger-trap function to break to GDB
+
+	* src/eval.c: new primitive debugger-trap
+	* src/.gdbinit: set breakpoint to Fdebugger_trap
+	* etc/DEBUG: document it.
+	Remove suggestion to use Fredraw_display.
+
+	This do-nothing primitive gives control to GDB, and for debugging
+	convenience a breakpoint is set by default in .gdbinit.
+
+2025-08-07  kobarity  <kobarity@gmail.com>
+
+	Fix Python PDB tracking for remote inferior Python
+
+	* lisp/progmodes/python.el (python-shell-local-prefix): New
+	constant.
+	(python-shell--convert-file-name-to-send): New function to
+	add/remove prefix.
+	(python-shell-send-string, python-shell-send-file): Changed to
+	use 'python-shell--convert-file-name-to-send'.
+	(python-pdbtrack-set-tracked-buffer): Changed to add/remove
+	prefix.
+	* test/lisp/progmodes/python-tests.el
+	(python-shell--convert-file-name-to-send-1): New test.
+	(Bug#79036)
+
+2025-08-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Tramp completion
+
+	* lisp/net/tramp.el (tramp-skeleton-file-name-all-completions):
+	Filter out "" hits.  (Bug#79173)
+
+2025-08-06  Michael Albinus  <michael.albinus@gmx.de>
+
+	Add set-file-times implementation for Tramp smb method
+
+	* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
+	Don't use UTC in all cases.
+
+	* lisp/net/tramp-smb.el (tramp-smb-handle-set-file-times): New defun.
+	(tramp-smb-file-name-handler-alist): Use it.
+
+	* test/lisp/net/tramp-tests.el (tramp-test22-file-times): Adapt test.
+
+2025-08-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc-hg.el (vc-hg-print-log): Revise log-outgoing revset.
+
+2025-08-06  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	external-completion: specify a required Emacs version
+
+	* lisp/external-completion.el: Require 26.1 (picked out of thin air).
+	(external-completion-table): Undo use of the hash-table-contains-p,
+	recently introduced.
+
+2025-08-06  Paul Nelson  <ultrono@gmail.com>
+
+	Allow numbered buffer selection for project-shell
+
+	* lisp/progmodes/project.el (project-shell, project-eshell):
+	When a numeric prefix is supplied, the command switches to or
+	creates a session buffer whose name has that number as a suffix.
+	For instance, C-2 yields "*name-of-project-shell<2>*".  As
+	before, a plain universal argument C-u creates a new session
+	with an automatically generated numeric suffix.  This change
+	makes the behavior of the project-shell commands consistent with
+	how M-x eshell handles numeric prefixes.
+	* etc/NEWS: Announce the change. (bug#76500)
+
+2025-08-05  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp allows now external implementations for functions
+
+	* doc/misc/tramp.texi (Frequently Asked Questions): Mention tramp-hlo.
+	(New operations): New node.
+	(Top, Files directories and localnames):  Add it to @menu.
+
+	* etc/NEWS: Mention Tramp's feature to add function implementations.
+	Presentational fixes and improvements.
+
+	* lisp/net/tramp.el (tramp-file-name-for-operation-external): New defvar.
+	(tramp-file-name-for-operation): Use `memq'.  Handle external
+	operations.  Raise `remote-file-error' error in case of.
+	(tramp-add-external-operation, tramp-remove-external-operation):
+	New defuns.
+
+	* test/lisp/net/tramp-archive-tests.el (tramp-archive-test50-auto-load)
+	(tramp-archive-test50-delay-load)
+	(tramp-archive-test51-without-remote-files): Rename.
+
+	* test/lisp/net/tramp-tests.el (tramp--test-operation)
+	(tramp--handler-for-test-operation): New defuns.
+	(tramp-test49-external-backend-function): New test.
+	(tramp-test50-auto-load, tramp-test50-delay-load)
+	(tramp-test50-recursive-load, tramp-test50-remote-load-path)
+	(tramp-test51-without-remote-files, tramp-test52-unload): Rename.
+
+2025-08-05  Martin Rudalics  <rudalics@gmx.at>
+
+	Handle inhibiting implied resizing for frames without initial tool bar
+
+	* src/xfns.c (x_set_tool_bar_lines, x_change_tool_bar_height)
+	* src/pgtkfns.c (x_change_tool_bar_height)
+	(pgtk_set_tool_bar_lines): Set f->tool_bar_resized to true so
+	inhibiting implied resizing works for frames without initial
+	tool bar too.  See the thread
+	https://lists.gnu.org/archive/html/emacs-devel/2025-08/msg00034.html.
+
+2025-08-05  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-line.el: Improve docstrings.
+
+	(tab-line-tab-face-functions, tab-line-tab-modified-p)
+	(tab-line-tab-face-modified): Explain possible values of BUFFER-P.
+
+2025-08-05  Dmitry Gutov  <dmitry@gutov.dev>
+
+	vc-annotate-warp-revision: Fix going through renames
+
+	* lisp/vc/vc-annotate.el (vc-annotate--file-name-change):
+	New function (bug#26345).
+	(vc-annotate-warp-revision): Use it here.
+
+	Co-Authored-By: Jakub Ječmínek <kuba@kubajecminek.cz>
+
+2025-08-04  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc--prompt-other-working-tree: Remember all the working trees
+
+	* lisp/vc/vc.el (vc--prompt-other-working-tree): Call
+	'project-remember-project' on all the known working trees.
+
+2025-08-04  Sean Whitton  <spwhitton@spwhitton.name>
+
+	project-prompter: New PREDICATE and REQUIRE-KNOWN arguments
+
+	* lisp/progmodes/project.el (project-prompter)
+	(project-prompt-project-dir, project-prompt-project-name): New
+	PREDICATE and REQUIRE-KNOWN optional arguments.
+	* lisp/vc/vc.el (project-prompter): Declare.
+	(vc--prompt-other-working-tree): New function.
+	(vc-switch-working-tree, vc-delete-working-tree)
+	(vc-move-working-tree): Use it to prompt for the other working
+	tree in a way that respects 'project-prompter' (bug#79024).
+	* etc/NEWS: Announce all three optional arguments.  Rework
+	description of new optional argument to 'project-current'.
+
+2025-08-04  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Fix vc-git worktrees and vc-tests for directories with symlinks
+
+	* lisp/vc/vc-git.el (vc-git-known-other-working-trees):
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-test--other-working-trees):
+	Tolerate directories with symlinks in them, such as the standard
+	temporary dirs on MacOS.  'git worktree list' outputs expanded names.
+
+2025-08-04  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* lisp/vc/vc-git.el (vc-git--worktrees): Don't pass -z to older Git.
+
+	The -z option for 'git worktree list --porcelain' appeared in 2.36.
+
+2025-08-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port better to Linux with 1 MiB pages
+
+	* src/lisp.h: Include <sys-limits.h>.
+	(MAX_RW_COUNT): Remove, as it is the same thing as sys-limits.h’s
+	SYS_BUFSIZE_MAX.  All uses replaced by SYS_BUFSIZE_MAX.
+
+2025-08-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+	* lib/sys-limits.h: New file.
+
+2025-08-02  Daniel Mendler  <mail@daniel-mendler.de>
+
+	(completing-read-multiple): Set missing buffer-local variables
+
+	* lisp/emacs-lisp/crm.el (completing-read-multiple): Set missing
+	buffer-local variables `minibuffer--require-match` and
+	`minibuffer--original-buffer`, which are set by `completing-read` in
+	the minibuffer setup hook.  (bug#79110)
+
+2025-08-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	477335a10ba ; Fix documentation of 'find-file-noselect'
+	9e3720bbb11 * doc/misc/gnus.texi (Category Syntax): Update gnus-agent...
+	456f44a7b3c ; Improve documentation of change hooks
+	f20d5e63bc0 ; * lisp/image.el (image-supported-file-p): Doc fix (bug#...
+	8ec2ddebdd4 ; Update documentation of GC in ELisp manual
+	57a9798c22a Prefer "tls" to "ssl" in documentation
+
+2025-08-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid lexbind warnings in kkc.el
+
+	* lisp/international/kkc.el (kkc-lookup-key): Suppress warnings
+	about lexical-binding cookies.
+	(kkc-save-init-file): Write the lexical-binding cookie when saving
+	the KKC init file.  (Bug#79136)
+
+2025-08-02  James Thomas  <jimjoe@gmx.net>
+
+	Add 'other-window-backward' for a default binding (bug#78803)
+
+	This moves in the opposite direction to 'other-window' by
+	default, and is consistent with its repeat map.
+	* lisp/window.el (other-window-backward): New function bound to
+	'C-x O'.
+	(ctl-x-map): Update definition.
+	* doc/emacs/windows.texi (Other Window): Update docs.
+	* etc/NEWS: Annouce the new command.
+
+2025-08-02  Jakub Ječmínek  <kuba@kubajecminek.cz>
+
+	Improve region deletion handling in python.el
+
+	* lisp/progmodes/python.el (python-indent-dedent-line-backspace):
+	Delete the text in the region if Transient Mark mode is enabled,
+	the mark is active, and prefix arg is 1.  (Bug#48695)
+
+	* test/lisp/progmodes/python-tests.el
+	(python-indent-dedent-line-backspace-4): Add new test.
+
+2025-08-02  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Fix mode-line string width in diary view
+
+	Bug#78957
+
+	* lisp/calendar/calendar.el (calendar-in-read-only-buffer):
+	Select the buffer window because, for example,
+	`calendar-set-mode-line' needs it.
+
+2025-08-02  Steven Allen  <steven@stebalien.com>
+
+	url: %-encode literal % characters when building query strings
+
+	When building a query string via `url-build-query-string',
+	%-encode literal % characters appearing in both the keys and
+	the values.
+	* lisp/url/url-util.el (url--query-key-value-preserved-chars):
+	Define a new constant based on `url-query-key-value-allowed-chars'
+	specifying the characters that should be preserved when %-encoding
+	query-string keys and values.
+	(url-build-query-string): Use the new constant (fixes Bug#78984).
+
+	* test/lisp/url/url-util-tests.el (url-util-tests): Add a test.
+
+2025-08-02  Antero Mejr  <mail@antr.me>
+
+	Fix index error when checking edited bug reports
+
+	* lisp/mail/emacsbug.el (report-emacs-bug-check-org): Improve regex
+	check.  (Bug#79080)
+
+2025-08-02  Daniel Mendler  <mail@daniel-mendler.de>
+
+	ibuffer-update-title-and-summary: Fix out of range error
+
+	When `ibuffer-use-header-line' is set to `title' and the buffer
+	list contains no buffers due to a filter,
+	`ibuffer-update-title-and-summary' would error with an
+	"Args out of range: 0, 0" error.
+	* lisp/ibuffer.el (ibuffer-update-title-and-summary): Check if
+	buffer is empty to prevent out of range error.  (Bug#79152)
+
+2025-08-01  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Update to Transient v0.9.4-8-g6bc543d5
+
+2025-07-31  Rudolf Adamkovič  <rudolf@adamkovic.org>
+
+	NS: Correct the accessibility role of Emacs windows (bug#77062)
+
+	Make the accessibility role of Emacs windows to be "standard
+	window" (AXWindow) instead of "text field" (AXTextField).  This matches
+	other applications on NS, as can be verified with any accessibility
+	inspector.  All widely used NS ports, such as Emacs Plus, have this
+	patch already applied. As for practical impact, this change makes Emacs,
+	for example, work with tiling window managers, such as Yabai, where many
+	users report problems with Emacs specifically, and are instructed to
+	simply avoid the official NS port of GNU Emacs due to this problem.
+
+	* src/nsterm.m: ([EmacsWindow accessibilityAttributeValue:]): Make the
+	accessibility role of Emacs windows to be "standard window" (AXWindow)
+	instead of "text field" (AXTextField).
+
+2025-07-31  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-line.el (tab-line-cache-key-default): Adapt to new feature.
+
+	Take into account 'tab-line-close-modified-button-show' similarly
+	to the case when 'tab-line-tab-face-modified' is a member of
+	'tab-line-tab-face-functions' (bug#79046).
+
+2025-07-31  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	tab-line: Add close button for modified tabs (bug#79046)
+
+	* etc/NEWS: Announce changes.
+	* etc/images/tabs/close-modified.xpm: New image.
+	* etc/images/tabs/README (Files): Add button icon name to README.
+	* lisp/tab-line.el (tab-line-close-modified-button-show): New
+	user option.
+	(tab-line-close-modified): Define new icon.
+	(tab-line-close-modified-button): New variable.
+	(tab-line-tab-modified-p): New function.
+	(tab-line-tab-name-format-default): Rework.
+	(tab-line-tab-face-modified): Use 'tab-line-tab-modified-p'.
+
+2025-07-31  Robert Pluim  <rpluim@gmail.com>
+
+	* lisp/emacs-lisp/shortdoc.el (sequence): Add 'seq-doseq'.
+
+2025-07-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+	GCC union bugs to be fixed in GCC 15.2
+
+	Thanks to Martin Jambor for the GCC fixes; see:
+	https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117423#c27
+	https://gcc.gnu.org/bugzilla/show_bug.cgi?id=119085#c12
+	Also, thanks to Sam James for letting me know.
+	* configure.ac (emacs_cv_gcc_union_bugs_CFLAGS):
+	Rename from emacs_cv_gcc_bug_119085_CFLAGS.  All uses changed.
+	Assume the GCC union bugs will be fixed in GCC 15.2.
+
+2025-07-30  Robert Pluim  <rpluim@gmail.com>
+
+	Add support for AUTH=PLAIN to imap.el
+
+	* lisp/net/imap.el (imap-authenticators): Add 'plain' to the
+	list.
+	(imap-authenticator-alist): Add 'imap-plain-p' and
+	'imap-plain-auth'.
+	(imap-plain-p): New function, detects AUTH=PLAIN support.
+	(imap-plain-auth): Perform the AUTH=PLAIN authentication.
+
+	* doc/misc/gnus.texi (Mail Source Specifiers): Add 'plain'.
+	(Conformity): Add reference to RFC 4616.
+
+	* etc/NEWS: Announce the support.
+
+2025-07-30  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Refactor reader to use readbuf_t in more places
+
+	Simplify the code by using the already existing dynamic string buffer
+	type.  This is a refactoring; performance isn't measurably affected.
+
+	* src/lread.c (grow_read_buffer): Dissolve into...
+	(readbuf_grow): ...here, simplifying the code.
+	(add_char_to_buffer): Check for growth before adding char, not after.
+	(read_integer, read_string_literal): Use readbuf_t.
+
+2025-07-30  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	Move keyboard input functions from lread.c to keyboard.c
+
+	These have nothing to do with the Lisp reader at all.
+
+	Suggested by Lynn Winebarger (bug#79035).
+
+	* src/lread.c (read_filtered_event, Fread_char, Fread_event)
+	(Fread_char_exclusive, Qascii_character): Move...
+	* src/keyboard.c: ...here.
+	* test/src/lread-tests.el (test-inhibit-interaction): Move...
+	* test/src/keyboard-tests.el (keyboard-inhibit-interaction): ...here.
+
+2025-07-30  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix problem in tramp-smb.el
+
+	* lisp/net/tramp-smb.el (tramp-smb-handle-file-attributes):
+	Use `directory-file-name'.
+
+	* test/lisp/net/tramp-tests.el (tramp-test18-file-attributes)
+	(tramp-test19-directory-files-and-attributes): Extend tests.
+
+2025-07-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2025-07-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Disable Gnulib’s non-Gregorian calendars
+
+	Prepare for the next Gnulib merge by disabling the optional
+	support for non-Gregorian calendars recently added to Gnulib’s
+	nstrftime module.  This would be tricky to integrate with Emacs,
+	as Emacs has its own (much fancier) calendar system, one that at
+	least for the Persian calendar sometimes disagrees with Gnulib’s,
+	and it’s likely not worth the trouble of reconciling the conflicts.
+	* src/conf_post.h (SUPPORT_NON_GREG_CALENDARS_IN_STRFTIME):
+	New macro, defined to false.
+	* admin/merge-gnulib (GNULIB_MODULES): nstrftime → nstrftime-limited.
+	(AVOIDED_MODULES): Add localcharset.
+	Near the end, also remove the files lib/calendar-ethiopian.h,
+	lib/calendar-persian.h, lib/calendar-thai.h, lib/calendars.h.
+
+2025-07-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(define-globalized-minor-mode): Remove left-over code
+
+	* lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
+	Delete the code managing `<MODE>-buffers`, since it's not used any more.
+	Prefer `%S` over `%S` to print arbitrary sexps.
+	(define-minor-mode): Make sure we use the same test to distinguish
+	old-style and new-style.
+
+2025-07-29  Juri Linkov  <juri@linkov.net>
+
+	Minor image-convert file types related changes (bug#79109)
+
+	* lisp/files.el (auto-mode-alist): Add ".avif" to the list of
+	image file types supported by 'image-convert'.
+	Remove duplicate entry for ".webp" that was added at the top
+	in the list of natively supported image types.
+
+	* lisp/image.el (imagemagick-enabled-types): Add AVIF and
+	WEBP (the latest for the case when native libs are not installed).
+
+	* lisp/image/image-converter.el (image-converter--converters):
+	Add "-layers merge" to the imagemagick convert command line.
+
+2025-07-28  Harald Jörg  <haj@posteo.de>
+
+	cperl-mode.el: Support syntax of Perl version 5.42
+
+	* lisp/progmodes/cperl-mode.el (cperl--sub-name-generated-rx):
+	Simplify captures to account for the :writer attribute.  Parsing
+	is done later.
+	(cperl-imenu-sub-keywords): Remove attributes which generate subs
+	(cperl-imenu--create-perl-index): Analyze field declarations for
+	autogenerated methods
+	(cperl-init-faces): Add "all" and "any" to the list of functions
+	(cperl-short-docs): Add short docs for "all" and "any"
+
+	* test/lisp/progmodes/cperl-mode-tests.el
+	(cperl-test-autogenerated-reader-rx):
+	Adjust for modified rx form due to ":writer" support
+	(cperl-test-imenu-index): Add tests for autogenerated writer
+	accessors (in grammar.pl)
+
+	* test/lisp/progmodes/cperl-mode-resources/grammar.pl: Add code samples
+	for ":writer"
+
+	* etc/NEWS: Announce that CPerl mode supports Perl 5.42.
+
+2025-07-28  F. Jason Park  <jp@neverwas.me>
+
+	Use function-valued variable for ERC query predicate
+
+	* lisp/erc/erc-notify.el (erc-querypoll-mode, erc-querypoll-enable)
+	(erc-querypoll-disable): Override `erc-query-table-synced-predicate'
+	when mode is active.
+	(erc--queries-current-p): Remove method.
+	(erc--querypoll-active-p): New function.
+	* lisp/erc/erc-speedbar.el (erc-speedbar-buttons)
+	(erc-speedbar-insert-target): Call function-valued variable
+	`erc--query-table-synced-predicate' instead of its now default value
+	`erc--queries-current-p' directly.
+	* lisp/erc/erc.el (erc--query-table-synced-predicate): New variable.
+	(erc--queries-current-p, erc--query-participant-present-p): Convert
+	former from method to normal function and rename to latter.  Original
+	was added as part of bug#70928.
+
+2025-07-28  F. Jason Park  <jp@neverwas.me>
+
+	Redo erc-nicks track integration tests as scenarios
+
+	* test/lisp/erc/erc-nicks-tests.el (erc-nicks-tests--track-faces):
+	Remove unused function.
+	(erc-nicks-track-faces/prioritize, erc-nicks-track-faces/defer)
+	(erc-nicks-track-faces/nil, erc-nicks-track-faces/t): Remove tests.
+	* test/lisp/erc/erc-scenarios-nicks-track.el: New file.
+	* test/lisp/erc/resources/nicks/track-prioritize.eld: New file.
+	* test/lisp/erc/resources/nicks/track-t.eld: New file.  (Bug#76188)
+
+2025-07-28  F. Jason Park  <jp@neverwas.me>
+
+	Cancel ERC autojoin timer in the server buffer
+
+	* lisp/erc/erc-join.el (erc-autojoin-channels-delayed): Only cancel
+	`erc--autojoin-timer' in the server buffer in which it's local.  After
+	Emacs 28 brought commit fc66ec33226aeed0b745356363ed952c8ff1f7fd "Prefer
+	defvar-local in erc", customizing `erc-autojoin-timing' to `ident' led
+	to ERC emitting redundant JOINs before `erc-autojoin--join' was factored
+	out.  Additionally, don't bother binding options around the call to
+	`erc-autojoin-channels' to shape its behavior, preferring instead to
+	call the internal workhorse function directly.  Ever since bug#5521
+	introduced those options, the logic in `erc-autojoin-channels' has
+	ignored `erc-autojoin-delay' anyway, so long as `erc-autojoin-timing'
+	isn't `ident'.  This change may break third party advice.
+	(erc-autojoin-after-ident): Restore code to cancel timer.  It was
+	erroneously deleted in 959fbcf34b5dd04e1b4bf87c0b73afd784a41f7f "favor
+	network identities in erc-join".
+	* test/lisp/erc/erc-join-tests.el: Require erc-tests-common atop file so
+	tests can take advantage of common utilities.
+	(erc-autojoin-channels--connect): Replace with a function and three
+	separate tests.
+	(erc-join-tests--autojoin-channels-connect): New function.
+	(erc-autojoin-channels/server, erc-autojoin-channels/network)
+	(erc-autojoin-channels/nomatch): New tests.
+	(erc-autojoin-channels--delay): Replace with a function and three
+	separate tests.  Remove guard to skip test on Solaris.
+	(erc-join-tests--autojoin-channels-ident): New function.
+	(erc-autojoin-channels-delayed/server)
+	(erc-autojoin-channels-delayed/network)
+	(erc-autojoin-channels-delayed/nomatch): New tests.
+	(erc-autojoin-channels--ident): Replace with function and two separate
+	tests.
+	(erc-join-tests--autojoin-after-ident): New function.
+	(erc-autojoin-after-ident/server)
+	(erc-autojoin-after-ident/network): New tests.
+	(erc-join-tests--autojoin-add--common)
+	(erc-join-tests--autojoin-add): Rename former to latter.
+	(erc-autojoin-add--network)
+	(erc-autojoin-add--network-extended-syntax)
+	(erc-autojoin-add--network-id): Adjust arguments to fixture.
+	(erc-autojoin-add--server): Use common utils.
+	(erc-join-tests--autojoin-remove--common)
+	(erc-join-tests--autojoin-remove): Rename former to latter.
+	(erc-autojoin-remove--network)
+	(erc-autojoin-remove--network-id): Adjust args for fixture.
+	(erc-autojoin-remove--server): Use common utils.
+	* test/lisp/erc/erc-scenarios-join-timing.el: New file.
+	* test/lisp/erc/resources/erc-scenarios-common.el
+	(erc-scenarios-common--run-in-term): In subprocess, don't use failure
+	tally as exit status unless body form succeeds.
+	* test/lisp/erc/resources/erc-tests-common.el
+	(erc-tests-common-init-server-proc): Use `make-process' instead of
+	`start-process'.
+	(erc-tests-common-make-server-buf): Use `erc-server-current-nick' to
+	create the `erc-networks--id' as a `erc-networks--id-qualifying'
+	instance, which is more realistic than a "fixed" variant.
+	* test/lisp/erc/resources/join/timing/connect-both.eld: New file.
+	* test/lisp/erc/resources/join/timing/ident-both.eld: New file.
+	(Bug#79017)
+
+2025-07-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* doc/emacs/vc1-xtra.texi (Other Working Trees): Extended example.
+
+2025-07-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git-modify-change-comment: Error out for merge commits
+
+	* lisp/vc/vc-git.el (vc-git-modify-change-comment): Don't try to
+	modify merge commit comments.
+
+2025-07-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-test--other-working-trees: Stub out 'vc-dir'
+
+	* test/lisp/vc/vc-tests/vc-tests.el
+	(vc-test--other-working-trees): Stub out 'vc-dir' when adding
+	the second working tree.
+
+2025-07-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp: Fix thinko in local process environment
+
+	* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Do not set "TERM",
+	"PROMPT_COMMAND" and "PS1".
+
+	* lisp/net/tramp.el (with-tramp-local-environment): Do not override
+	`process-environment'.  Set "TERM", "PROMPT_COMMAND", "PS1" and
+	"INSIDE_EMACS".  (Bug#79103)
+
+	* lisp/net/trampver.el (tramp-inside-emacs): Remove duplicate entries.
+
+2025-07-27  Juri Linkov  <juri@linkov.net>
+
+	* lisp/window.el (window--quit-restore-select-window): Use 'select-frame'.
+
+	Replace 'select-frame-set-input-focus' with the
+	less obtrusive 'select-frame' (bug#79098).
+
+2025-07-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Better default PATH on MS-Windows
+
+	* src/emacs.c (default_PATH): Use a more-reasonable default
+	for MS-Windows and DOS.  Problem reported by Eli Zaretskii in:
+	https://lists.gnu.org/r/emacs-devel/2025-07/msg00384.html
+
+2025-07-27  Madhu  <enometh@net.meer>
+
+	(cl-nsubstitute): Fix regression in commit 8c8ff13e
+
+	lisp/emacs-lisp/cl-seq.el (cl-nsubstitute): restore a variable names that
+	were incorrectly replaced in commit 8c8ff13e, so nsubstitute on a string
+	returns a string instead of a vector.
+
+2025-07-27  Mattias Engdegård  <mattias.engdegard@gmail.com>
+
+	* .mailmap: update my entry
+
+2025-07-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-tests: Fix two problems with other working tree tests
+
+	* test/lisp/vc/vc-tests/vc-tests.el (project, cl-lib): Require.
+	(vc-test--other-working-trees): Bind project-list-file to a
+	writeable file name.
+	(vc-test-hg07-other-working-trees): Use vc-hg-global-switches to
+	enable the share extension.
+
+2025-07-27  Baptiste Strazzulla  <baptiste.strazzulla@protonmail.com>
+
+	Add a new user option to hide the header of old newsticker feeds
+
+	* lisp/net/newst-plainview.el (newsticker-hide-old-feed-header):
+	Define that new user option
+	(newsticker-mode-map): Add the new bindings related to that new
+	user option.
+	(newsticker-buffer-update): Hide the old feeds if the new user
+	option is true.
+	(newsticker-hide-old-feed-header): Define a function to hide the
+	old feeds.
+	(newsticker-show-old-feed-header): Define a function to restore
+	them.
+	(newsticker--old-feed-p): Define a function to check if a feed is
+	old.
+	(newsticker--buffer-do-insert-text): Set age of feed to old if
+	applicable.
+	(newsticker--buffer-set-invisibility): Update the function to
+	account for the fact that there are two lines (not just one) to
+	hide feeds.
+
+	* etc/NEWS: Announce the new user option
+	'newsticker-hide-old-feed-header' to hide old feeds.  (Bug#78305)
+
+2025-07-27  Po Lu  <luangruo@yahoo.com>
+
+	Update Android frame param handlers
+
+	* src/androidfns.c (android_frame_parm_handlers): Add
+	gui_set_borders_respect_alpha_background for consistency with X.
+
+2025-07-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	bytecomp.el: Rework the message when the macro is not recognized
+
+	The "Macro %s unrecognized, won't work in file" message
+	happened only for macros defined to `nil`, and the code handling
+	"unrecognized" code was split with the function part is
+	`byte-compile-file-form-defmumble` and the macro part in
+	`byte-compile-file-form-defalias`, so straighten it out
+	and simplify a bit.
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-defmumble):
+	Don't modify `byte-compile-*-environment` here.
+	(byte-compile-file-form-defalias): Do it here instead.
+	Use `macroexp-quote`.  Merge the two "unrecognized macro" warnings.
+
+2025-07-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Add readlink, realpath startup comments
+
+	This does not change behavior.
+	* src/emacs.c (follow_if_symlink): New static function, as a
+	vehicle for commentary explaining the deal with readlink and realpath.
+	(find_emacs_executable): Use it.
+
+2025-07-26  Roland Winkler  <winkler@gnu.org>
+
+	bibtex.el - improve last change e6c1ec71b72
+
+	        * lisp/textmodes/bibtex.el: Use defvar to silence byte compiler
+	        * lisp/textmodes/bibtex.el (bibtex-generate-url-list-init):
+	        Use setq-local.
+
+2025-07-26  Paul Nelson  <ultrono@gmail.com>
+
+	Add post-save actions for Rmail attachments
+
+	* lisp/mail/rmailmm.el (rmail-mime-save-action): New user
+	option.
+	(rmail-mime-save): Use it.
+	* doc/emacs/rmail.texi (Rmail Display): Document it (bug#78971).
+
+2025-07-26  Garklein  <garklein97@gmail.com>
+
+	Add frame parameter which allows border transparency
+
+	The new 'borders-respect-alpha-background' frame parameter, when
+	set to 't', will make window dividers and internal borders
+	respect the 'alpha-background' frame parameter. This allows
+	transparent gaps between windows.
+	* doc/lispref/frames.texi (Font and Color Parameters):
+	Document the change.
+	* src/frame.c (frame_parm_table, syms_of_frame)
+	(gui_set_borders_respect_alpha_background):
+	* src/frame.h (struct frame): Add frame parameter.
+	* src/androidfns.c (x_create_frame, android_create_tip_frame)
+	(android_frame_parm_handlers):
+	* src/haikufns.c (haiku_create_frame, haiku_create_tip_frame)
+	(haiku_frame_parm_handlers):
+	* src/nsfns.m (ns_frame_parm_handlers, x_create_frame):
+	* src/w32fns.c (x_create_frame, w32_create_tip_frame)
+	(w32_frame_parm_handlers): Add dummy parameters for backends
+	that don't support opacity.
+	* src/pgtkfns.c (pgtk_frame_parm_handlers, x_create_frame)
+	(pgtk_create_tip_frame):
+	* src/pgtkterm.c (pgtk_draw_window_divider):
+	* src/xfns.c (x_create_frame, x_create_tip_frame)
+	(x_frame_parm_handlers)
+	* src/xterm.c (x_draw_window_divider)
+	(x_clear_under_internal_border): Implement parameter on backends
+	that support opacity.
+
+2025-07-26  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-do-command: Fix last part of 'full-command'
+
+	* lisp/vc/vc-dispatcher.el (vc-do-command): Don't append " ." to
+	'full-command' when FILES is nil because the command we actually
+	run doesn't have "." as a final argument in that case.
+
+2025-07-26  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc.el (vc-dir-status-files): Fix filtering on VC status.
+
+2025-07-26  Alan Third  <alan@idiocy.org>
+
+	Fix last commit
+
+	* src/nsterm.m (ns_draw_fringe_bitmap): Rename clearRect to bmpRect
+	where missed previously.
+
+2025-07-26  Alan Third  <alan@idiocy.org>
+
+	Fix incorrectly nested ns_focus/ns_unfocus calls
+
+	* src/nsterm.m (ns_draw_fringe_bitmap): Move the call to ns_focus out of
+	the if for overlay_p and rename the rect from clearRect to bmpRect to
+	make it's purpose clearer.
+
+2025-07-26  Alan Third  <alan@idiocy.org>
+
+	Simplify NS fringe vectors (bug#73563)
+
+	* src/nsterm.m (ns_define_fringe_bitmap): Replace the fringe bitmap
+	"tracing" method to a true tracing method.  This should make the
+	resulting vector simpler and therefore faster to draw.
+
+2025-07-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	a44e9139c2f loaddefs-generate--rubric: Note about committing ldefs-bo...
+	e4908623f23 ; Fix documentation of 'other-window'
+	5f3cbd62b1c ; * lisp/international/quail.el (quail-insert-kbd-layout)...
+	47deb38f214 ; face-font-family-alternatives, fixed-pitch: Comments.
+	dd29b0ab66d Fix Eshell call to 'string-suffix-p' when checking for tr...
+	cbfc095ed42 * etc/PROBLEMS: Describe how to work around screen reader...
+	8f00d36b63d (gnus)Scoring Tips: New tip regarding header continuation...
+
+2025-07-26  Michael Albinus  <michael.albinus@gmx.de>
+
+	Rework filenotify-tests.el
+
+	* lisp/filenotify.el (file-notify--rm-descriptor):
+	Use `insert-special-event'.
+
+	* lisp/net/tramp-sh.el (tramp-bundle-read-file-names): Fix docstring.
+	(tramp-sh-gio-monitor-process-filter): Extend error strings.
+
+	* test/infra/Dockerfile.emba (emacs-base): Install python3.
+
+	* test/lisp/filenotify-tests.el (auto-revert-buffer-list): Declare.
+	(file-notify--test-rootdir): New defvar.  Replace all uses of
+	`temporary-file-directory' by it.
+	(file-notify--test-cleanup): Set `auto-revert-buffer-list' to nil.
+	(file-notify--test-monitor): Check also for `process-live-p'.
+	Skip test, if the monitor cannot be determined.
+	(file-notify--deftest-remote): Do not call
+	`tramp-cleanup-connection', this is done in
+	`file-notify--test-cleanup' already.
+	(with-file-notify-test): New defmacro.  Use it in (almost) all tests.
+	(file-notify--test-make-temp-name): Do not create
+	`file-notify--test-tmpdir'.
+	(file-notify--test-event-handler): Use `directory-file-name '.
+	(auto-revert-debug): Set it to nil.
+	(file-notify-test<nn>-*): Rewrite, using `with-file-notify-test'
+	and `ert-with-temp-file'.
+
+	* test/lisp/net/tramp-tests.el (tramp-test46-file-notifications):
+	Tag it :unstable.
+
+2025-07-26  Alvaro Ramirez  <me@xenodium.com>
+
+	Enabled macOS dictation post NSTextInputClient migration in v30
+
+	* src/nsterm.m (selectedRange): Implement to fix dictation.
+	* etc/NEWS: Announce regression fix.
+	* etc/PROBLEMS: Help users recover from rejected permission.
+
+2025-07-26  Rahguzar  <rahguzar@mailbox.org>
+
+	* lisp/url/url-queue.el: Better compatibility with 'url-retrieve'
+
+	(url-queue): New slots to hold request related variables.
+	(url-queue-retrieve): Capture the request related variables.
+	(url-queue-start-retrieve): Let bind the request related
+	variables.  (Bug#78928)
+
+	* etc/NEWS: Announce changes.
+
+2025-07-26  Peder O. Klingenberg  <peder@klingenberg.no>
+
+	Emulate more dynamic bindings in request buffers
+
+	Many variables were copied from the dynamic environment to the request
+	buffer, which allowed them to influence the handling of requests and
+	responses.  But some were not, notably some of the mime-related
+	variables, and the user-agent and privacy variables.  This made them
+	unreliable when dynamically bound around a call to `url-retrieve'; they
+	would have the desired effect when reusing an existing connection, but
+	not when url-http opened a new connection.  In the case of reused
+	connections, the request construction happens in the dynamic scope of
+	`url-http', but in the case where a fresh connection is needed, request
+	construction happens outside that dynamic scope.
+
+	This commit adds the remaining variables used in request construction to
+	the set of buffer local variables mirroring the dynamic values from
+	url-http, and adds a comment describing the mechanism used and how avoid
+	the pitfall of inconsistent handling of dynamic bindings.
+
+	* lisp/url/url-http.el (url-http-extensions-header): New internal-ish
+	variable.
+	(url-http-create-request): Use the new variable instead of the global
+	one.
+	(url-http-idle-sentinel): Debug-log when the connection closes.
+	(url-http): Set up more buffer-local variants of dynamic variables in
+	the buffer used for the request, and add comment describing why this
+	copying is needed.
+
+	(Bug#61916)
+
+2025-07-26  Baptiste Strazzulla  <baptiste.strazzulla@protonmail.com>
+
+	Simplify code in 'newsticker--buffer-do-insert-text'
+
+	* lisp/net/newst-plainview.el (newsticker--buffer-do-insert-text): Use
+	the already defined 'age' variable.  (Bug#78305)
+
+2025-07-26  Yue Yi  <include_yy@qq.com>
+
+	Fix 'sqlite-mode-delete' with NULL field values
+
+	* lisp/sqlite-mode.el (sqlite-mode-delete): Support NULL field
+	values (bug#79011).
+
+2025-07-26  Jim Porter  <jporterbugs@gmail.com>
+
+	Improve performance when computing the "readable" form of a page in EWW
+
+	The previous version made a lot of string copies, but only needed the
+	word count of each DOM node.  In this version, we just sum up the word
+	counts in all the existing nodes, which results in a significant
+	performance improvement (bug#78902).
+
+	* lisp/net/eww.el (eww--string-count-words, eww--dom-count-words): New
+	functions...
+	(eww--walk-readability, eww-readable-dom): Use them.
+
+2025-07-26  Jim Porter  <jporterbugs@gmail.com>
+
+	Add new function 'dom-inner-text'
+
+	This replaces 'dom-text' and 'dom-texts', and is both more correct and
+	more efficient than them.
+
+	* lisp/dom.el (dom-text, dom-texts): Make obsolete in favor of...
+	(dom-inner-text--1, dom-inner-text): ... these new functions.  Update
+	callers.
+
+	* doc/lispref/text.texi (Document Object Model): Update documentation to
+	refer to 'dom-inner-text'.
+
+	* etc/NEWS: Announce this change.
+
+2025-07-25  Mattias Engdegård  <mattiase@acm.org>
+
+	Check for end-of-file when reading character escapes (bug#79097)
+
+	* src/lread.c (read_char_escape): Add check.
+	* test/src/lread-tests.el (lread-char-escape-eof): New test.
+
+2025-07-25  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC: New support for other working trees
+
+	* lisp/vc/vc-git.el (vc-git--read-start-point): New function,
+	factored out of vc-git-create-tag.
+	(vc-git-create-tag): Use it.
+	(vc-git--worktrees, vc-git-known-other-working-trees)
+	(vc-git-add-working-tree, vc-git-delete-working-tree)
+	(vc-git-move-working-tree):
+	* lisp/vc/vc-hg.el (vc-hg-known-other-working-trees)
+	(vc-hg-add-working-tree, vc-hg--shared-p)
+	(vc-hg-delete-working-tree, vc-hg-move-working-tree): New
+	functions.
+	* lisp/vc/vc.el: Define API for known-other-working-tree,
+	add-working-tree, delete-working-tree and move-working-tree
+	backend functions.
+	(vc-dir-status-files): New function.
+	(project-current-directory-override): Declare.
+	(dired-rename-subdir): Autoload.
+	(vc-add-working-tree, vc-switch-working-tree)
+	(vc-delete-working-tree, vc-move-working-tree): New commands.
+	* lisp/vc/vc-hooks.el (vc-prefix-map): Bind them under C-x v.
+
+	* doc/emacs/vc1-xtra.texi (Other Working Trees): New node.
+	* etc/NEWS: Announce the new commands.
+
+	* test/lisp/vc/vc-tests/vc-tests.el
+	(vc-test--other-working-trees): New function.
+	(vc-test-git07-other-working-trees)
+	(vc-test-hg07-other-working-trees): New tests.
+
+	* lisp/ldefs-boot.el: Regenerate.
+
+2025-07-25  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-test--version-diff: Bind vc-async-checkin
+
+	* test/lisp/vc/vc-tests/vc-tests.el (vc-test--version-diff):
+	Bind vc-async-checkin to disable async checkins during test.
+
+2025-07-25  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Bind vc-rename-file to C-x v R
+
+	* lisp/vc/vc-hooks.el (vc-prefix-map): Bind vc-rename-file to
+	C-x v R.
+	* doc/emacs/files.texi (Copying and Naming):
+	* doc/emacs/vc1-xtra.texi (VC Delete/Rename, Revision Tags):
+	* etc/NEWS (bindings): Document the new binding.
+
+2025-07-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Streamline init_callproc a bit
+
+	* src/callproc.c (init_callproc): Don’t bother testing for the
+	existence of ../src/ and NEWS if installation-directory is
+	non-nil, because in that case we will test for ../etc/NEWS anyway.
+	Simplify by using AUTO_STR.
+
+2025-07-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Refactor to allow nameless auto strings
+
+	* src/lisp.h (AUTO_STR, AUTO_STR_WITH_LEN): New macros.
+	Long ago this sort of thing would have been a no-no
+	because we needed to GCPRO the strings.
+	However, GCPRO went away a decade ago.
+
+2025-07-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Diagnose load-path only if interactive
+
+	* lisp/startup.el (command-line): Warn about dubious
+	user-emacs-directory and load-path only if interactive, as that’s
+	where warning helps and the warnings just complicate batch usage
+	(e.g., -Q).
+
+2025-07-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+	PATH defaults now act more like GNU and POSIX
+
+	When PATH is unset or empty, use the system default,
+	to be consistent with GNU/Linux and with POSIX.
+	If there is no system default do not default to "."
+	as that can be dangerous.
+	* src/callproc.c (init_callproc_1, init_callproc):
+	Default PATH to the null pointer, not the empty string.
+	* src/emacs.c (default_PATH): New function.
+	(find_emacs_executable, decode_env_path): Be consistent with POSIX
+	and with glibc about what to do when PATH is unset or empty.
+
+2025-07-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Treat ‘.../emacs’ like ‘emacs’ in realpath startup
+
+	* src/emacs.c (find_emacs_executable): If the executable name
+	contains a slash, use the same optimization for symlink resolution
+	that we already use when the executable name has no slash.
+
+2025-07-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Prefer readlink to lstat in find_emacs_executable
+
+	* src/emacs.c (find_emacs_executable): Prefer readlink to lstat
+	when testing whether a file is a symlink.  This avoids EOVERFLOW
+	issues.
+
+2025-07-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix minor memory leak in find_emacs_executable
+
+	* src/emacs.c (find_emacs_executable): Free candidate if unused.
+
+2025-07-24  Robert Pluim  <rpluim@gmail.com>
+
+	Use macro to reduce repetition in TLS tests
+
+	* test/lisp/net/network-stream-tests.el (with-tls-params): New
+	macro, abstracts most of the boiler plate for TLS tests.
+	(connect-to-tls-ipv4-wait, connect-to-tls-ipv4-nowait)
+	(connect-to-tls-ipv6-nowait, open-network-stream-tls-wait)
+	(open-network-stream-tls-nowait, open-network-stream-tls)
+	(open-network-stream-tls-nocert)
+	(open-gnutls-stream-new-api-default)
+	(open-gnutls-stream-new-api-wait)
+	open-gnutls-stream-old-api-wait)
+	(open-gnutls-stream-new-api-nowait)
+	(open-gnutls-stream-old-api-nowait): Use it.
+
+2025-07-24  Michael Albinus  <michael.albinus@gmx.de>
+
+	Disable setting connection-local variables in tramp-smb.el
+
+	* lisp/net/tramp-smb.el: Disable setting connection-local
+	variables.  (Bug#78886)
+
+2025-07-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Don’t read before BEG in insert-file-contents
+
+	* src/fileio.c (Finsert_file_contents): Don’t sample bytes before BEG.
+	Give up optimizing if the file size shrinks to less than BEG.
+
+2025-07-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Simplify file end finding in insert-file-contents
+
+	* src/fileio.c (Finsert_file_contents): Don’t give up finding the
+	file’s end merely because SEEK_END fails.  Try a small test read
+	anyway.  This might work in non-POSIX file systems where SEEK_END
+	is not allowed, and trying is easy and simplifies the code.
+
+2025-07-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+	GCC bug 119085 fixed in GCC 16
+
+	* configure.ac (emacs_cv_gcc_bug_119085_CFLAGS):
+	Assume the bug is fixed starting in GCC 16.
+
+2025-07-23  Juri Linkov  <juri@linkov.net>
+
+	* lisp/repeat.el (repeat-mode): Use 'called-interactively-p'.
+
+	This logic is copied from 'define-minor-mode' that displays a message
+	about mode activation only when called interactively (bug#79081).
+
+2025-07-23  Michael Albinus  <michael.albinus@gmx.de>
+
+	Add consistent environment for local process calls in Tramp
+
+	* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
+	* lisp/net/tramp-androidsu.el (tramp-androidsu-maybe-open-connection):
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-file-notify-add-watch):
+	* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
+	(tramp-maybe-open-connection):
+	* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory)
+	(tramp-smb-handle-file-acl)
+	(tramp-smb-handle-file-notify-add-watch)
+	(tramp-smb-handle-set-file-acl, tramp-smb-maybe-open-connection):
+	* lisp/net/tramp-sudoedit.el (tramp-sudoedit-send-command):
+	Use `tramp-start-process'.  Do not call	`tramp-post-process-creation'.
+
+	* lisp/net/tramp.el (with-tramp-local-environment): New defmacro.
+	(tramp-start-process): New defun.
+	(tramp-call-process, tramp-call-process-region)
+	(tramp-process-lines): Use `with-tramp-local-environment'.
+
+2025-07-23  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	NS: Fix build with NSTRACE_ENABLED
+
+	* src/nsterm.h (NSTRACE_MSG_NO_DASHES): Use
+	nstrace_enabled_global.
+	* src/nsterm.m: ([EmacsView performDragOperation:]): Don't use
+	an NSString.
+
+2025-07-23  Jim Porter  <jporterbugs@gmail.com>
+
+	Handle Eshell prompts where stickiness properties are 't'
+
+	Previously, this signaled an error, breaking the prompt (bug#79059).
+
+	* lisp/eshell/em-prompt.el (eshell--append-text-property): Don't append
+	to non-list property values.
+
+	* test/lisp/eshell/em-prompt-tests.el
+	(em-prompt-test/field-properties/merge-stickiness): Adapt test.
+
+2025-07-23  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	NS: Use different window collection behavior for tooltips (bug#73037)
+
+	* src/nsterm.m ([EmacsView updateCollectionBehavior]):
+	Use NSWindowCollectionBehaviorFullScreenAuxiliary for non-native
+	tooltips which are not child frames.
+
+2025-07-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	Add function exec-suffixes
+
+	* doc/lispref/processes.texi (Subprocess Creation):
+	Add function exec-suffixes.
+
+	* etc/NEWS: New function 'exec-suffixes'.
+	Presentational fixes and improvements.
+
+	* lisp/files-x.el (exec-suffixes): New defun.  (Bug#78886)
+
+	* lisp/files.el (executable-find): Use function `exec-suffixes'.
+
+	* lisp/net/tramp-integration.el
+	(tramp-connection-local-default-system-variables): Add also
+	`exec-suffixes'.
+
+	* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection): Use
+	default values of `path-separator', `null-device' and
+	`exec-suffixes'.
+	(tramp-smb-connection-local-default-system-variables):
+	New defconst.  Add it to connection-local profiles.
+
+2025-07-22  Mattias Engdegård  <mattiase@acm.org>
+
+	* lisp/custom.el (defcustom): Remove empty doc string.
+
+	It is no longer needed because (lambda () "hello") has no doc string.
+
+2025-07-22  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc-git.el (vc-git-diff): Don't pass --textconv.
+
+	This reverts this change:
+
+	    Author:     Sean Whitton <spwhitton@spwhitton.name>
+	    AuthorDate: Mon Jul 21 09:26:59 2025 +0100
+
+	      * lisp/vc/vc-git.el (vc-git-diff): Pass --textconv (bug#79050).
+
+2025-07-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	insert-file-contents respect END better
+
+	This fixes some longstanding bugs, along with bugs recently
+	introduced as part of fixes for Bug#77315.
+	* src/fileio.c (Finsert_file_contents): Arrange for END_OFFSET
+	to never be less than BEG_OFFSET, to simplify the code.
+	Do not go past END_OFFSET when sampling or optimizing reading.
+	Avoid a few unnecessary lseeks.
+
+2025-07-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	insert-file-contents shrinking Solaris file fix
+
+	This is related to recent fixes for Bug#77315.
+	* src/fileio.c (Finsert_file_contents): Defend against
+	a file shrinking to be smaller than its initial offset.
+	This can happen only on platforms like Solaris where
+	the initial offset can be positive.
+
+2025-07-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Refactor insert-file-contents overlap check
+
+	* src/fileio.c (Finsert_file_contents):
+	Simplify and clarify file overlap check.
+
+2025-07-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	insert-file-contents refactor xlseek
+
+	* src/fileio.c (xlseek): New arg WHENCE.  All uses changed.
+	This generalizes xlseek and should simplify future changes.
+
+2025-07-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Say why quit is captured in insert-file-contents
+
+	* src/fileio.c (Finsert_file_contents): Add comment.
+
+2025-07-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	insert-file-contents read size increase
+
+	This increases the max read size from 0.25 to 1 MiB, which is a
+	bit better for Emacs in my measurements.  The old value was taken
+	from coreutils, but was for a different purpose.
+	* src/fileio.c (INSERT_READ_SIZE_MAX): New constant, replacing
+	IO_BUFSIZE.  All uses changed.
+	(Finsert_file_contents): Do not use a read buffer that is larger
+	than INSERT_READ_SIZE_MAX.
+
+2025-07-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix insert-file-contents infloop with unlucky END
+
+	This partially reverts 55f41ca3aa8fe487d10730708a7396137a2c9d18,
+	which was a partial fix for Bug#77315.
+	* src/fileio.c (Finsert_file_contents): Go back to accepting
+	partial reads when doing the optimized way when code conversion is
+	not needed.  This avoids an unlikely bug when END happens to lie
+	at a buffer boundary, causing an infloop.  For consistency, do the
+	same when doing code conversion (though there’s no bug in then),
+	as there’s not a real need for emacs_full_read there either.
+
+2025-07-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Refactor by coalescing MAX_RW_COUNT definitions
+
+	* src/emacs.c (read_full):
+	Simplify by assuming MAX_RW_COUNT is defined.
+	* src/lisp.h (MAX_RW_COUNT): Move here from src/sysdep.c.
+	* src/pdumper.c (dump_read_all):
+	Use MAX_RW_COUNT rather than defining our own equivalent.
+
+2025-07-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	insert-file-contents from seekable non-regular
+
+	* src/fileio.c (Finsert_file_contents): Be more conservative
+	when reading from seekable non-regular files when END is given.
+	The code assumed that in this case, reads would succeed or fail
+	quickly so there was no need to call internal_condition_case_1.
+	However, in some cases, e.g., /dev/random, it could take a while.
+	This fixes a glitch introduced in commit
+	cb4579ed6ba45c81ee7ec627bf197e1def121f24 dated 2022-06-11.
+
+2025-07-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	insert-file-contents beware buffer relocation
+
+	This fixes a potential (albeit quite unlikely) bug
+	introduced during recent fixes to Bug#77315.
+	* src/fileio.c (union read_non_regular.s.inserted):
+	Bring back this member.
+	(read_non_regular, Finsert_file_contents): Work in the unlikely
+	case when internal_condition_case_1 relocates the buffer before
+	calling read_non_regular.
+
+2025-07-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	insert-file-contents 1 KiB seek fix
+
+	This improves on recent fixes to Bug#77315.
+	When sampling the first 1 KiB and last 3 KiB, do not seek before
+	BEG if given.  Instead, sample starting at BEG, to be consistent
+	with the non-optimized version.
+	* src/fileio.c (xlseek): Return POS, for convenience.
+	(Finsert_file_contents): Sample the first 1 KiB correctly when BEG.
+	In a CURPOS local, keep track of the input file offset, or for
+	nonseekable files the number of bytes read, while this value is
+	important.  This lets us avoid some unnecessary seeks.  Report an
+	error earlier if the file is not seekable and BEG is nonzero,
+	to save work and simplify the code.  When sampling, discard less
+	data, as this is simpler and there’s little point to discarding it.
+
+2025-07-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	insert-file-contents seek refactoring
+
+	* src/fileio.c (xlseek): New function.
+	(Finsert_file_contents): Use it instead of doing things by hand.
+	(write_region): Match diagnostic wording to xlseek’s.
+
+2025-07-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix insert-file-contents optimization glitch
+
+	This improves on recent fixes to Bug#77315.
+	* src/fileio.c (Finsert_file_contents): When optimizing
+	do not seek to 0 if the initial file offset is positive,
+	as that causes the optimized code to behave differently
+	from the nonoptimized.
+
+2025-07-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	insert-file-contents SEEK_END optimization
+
+	This improves on recent fixes to Bug#77315.
+	* src/fileio.c (Finsert_file_contents):
+	Do not give up on seeking merely because SEEK_END fails.
+	On some files (/proc/cpuinfo, say) SEEK_END can fail
+	even though SEEK_SET and SEEK_CUR succeed, and the
+	code still works in this case.
+
+2025-07-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	insert-file-contents st_size cleanup
+
+	* src/fileio.c (Finsert_file_contents): Store st_size,
+	not file_size_hint, into current_buffer->modtime_size,
+	since modtime_size is compared to a later st_size, not
+	to the actual file size.  Simplify buffer overflow detection
+	from file size, since this occurred only on regular files.
+
+2025-07-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'quit-window'
+
+	* lisp/window.el (quit-window): Mention 'quit-window-kill-buffer'.
+	(quit-window): Doc fix.
+
+	* doc/lispref/windows.texi (Quitting Windows):
+	* etc/NEWS: Improve documentation of 'quit-window-kill-buffer'.
+
+2025-07-21  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc-git.el (vc-git-diff): Pass --textconv (bug#79050).
+
+2025-07-21  Steven Allen  <steven@stebalien.com>
+
+	Add an example for the :authorizable `dbus-call-method' keyword
+
+	This was requested in bug#71969 over a year ago.
+
+	* doc/misc/dbus.texi (Synchronous Methods): Add example for
+	`dbus-call-method' with authorization.  (Bug#79062)
+
+2025-07-21  Michael Albinus  <michael.albinus@gmx.de>
+
+	Handle an error of file-notify-add-watch in autorevert.el
+
+	* lisp/autorevert.el (auto-revert-notify-add-watch):
+	Disable `auto-revert-use-notify' in the buffer when
+	`file-notify-add-watch' fails.
+
+2025-07-20  Jim Porter  <jporterbugs@gmail.com>
+
+	Disable track-changes while reloading pages in EWW
+
+	This makes sure 'eww--track-changes' doesn't interfere with the initial
+	rendering process.  Previously, this caused problems like <textareas>
+	consuming the rest of the page when reloading the document.
+
+	* lisp/net/eww.el (eww--change-tracker-id): New variable.
+	(eww-display-document): Temporarily unregister our change tracker.
+
+	* test/lisp/net/eww-tests.el (eww-test/tag/textarea/reload): New test.
+
+2025-07-20  Jim Porter  <jporterbugs@gmail.com>
+
+	Fix EWW <textarea> properties when it's on the same line as other text
+
+	* lisp/net/eww.el (eww-tag-textarea): Set 'start' after ensuring
+	preceding newline.
+
+	* test/lisp/net/eww-tests.el (eww-test/tag/textarea/starts-on-new-line):
+	New test.
+
+2025-07-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve error message for "C-u M-! something &"
+
+	* lisp/simple.el (shell-command): User-friendlier error message
+	when async shell command is invoked with a prefix argument.
+
+2025-07-20  Roland Winkler  <winkler@gnu.org>
+
+	Define setfunction for bibtex-generate-url-list (bug#78798)
+
+	        * lisp/textmodes/bibtex.el
+	        (bibtex-generate-url-list-init): New function.
+
+	        * lisp/textmodes/bibtex.el (bibtex-generate-url-list)
+	        (bibtex-font-lock-url-regexp): Use it.
+
+2025-07-20  Jim Porter  <jporterbugs@gmail.com>
+
+	Make sure we always set the ':readable' state when displaying EWW page
+
+	* lisp/net/eww.el (eww-display-html): Always set ':readable'.
+	* test/lisp/net/eww-tests.el (eww-test/readable/reload-resets-readable):
+	New test.
+
+2025-07-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/vc: Try and avoid quoting lambdas
+
+	* lisp/vc/pcvs.el (cvs-menu, cvs-minor-mode-map):
+	* lisp/vc/vc-hg.el (vc-hg--extract-headers):
+	* lisp/vc/vc-git.el (vc-git-show-stash): Don't quote lambdas.
+
+2025-07-19  Alvaro Ramirez  <me@xenodium.com>
+
+	Fix send-to on non-macOS platforms and macOS crash on "emacs -nw"
+
+	* lisp/send-to.el: Both fixes included.
+
+2025-07-19  Mattias Engdegård  <mattiase@acm.org>
+
+	Speed up unintern, and fix symbol shorthand edge case (bug#79035)
+
+	Don't do a full lookup if the argument is a symbol, and only compute the
+	hash index once.  Fix a bug that occurred when there is another symbol
+	whose shorthand is equal to the true name of the symbol being removed.
+
+	* src/lread.c (Funintern): Rewrite for speed and correctness.
+	(oblookup_last_bucket_number, oblookup): Remove now unused variable.
+	* test/src/lread-tests.el (lread-unintern): New test.
+
+2025-07-19  Mattias Engdegård  <mattiase@acm.org>
+
+	Remove the variable load-convert-to-unibyte
+
+	It has been ineffective since 2002.
+	Suggested by Lynn Winebarger.
+
+	* src/lread.c (Fload, readevalloop_1, readevalloop, Feval_buffer)
+	(Feval_region, syms_of_lread): Remove the variable and its propagation.
+	* etc/NEWS: Announce.
+
+2025-07-19  Michael Albinus  <michael.albinus@gmx.de>
+
+	Update Tramp manual
+
+	* doc/misc/tramp.texi (Frequently Asked Questions): Add new items
+	for Tramp speed up.
+
+2025-07-19  Alvaro Ramirez  <me@xenodium.com>
+
+	Add "Send to..." context menu item to mouse.el
+
+	* lisp/send-to.el: New package implements sending files/region.
+
+	* lisp/mouse.el (context-menu-send-to): Add "Send to..." context menu.
+
+	* lisp/term/ns-win.el (ns-send-items): Expose native macOS send API.
+
+	* src/nsfns.m (ns-send-items): Implement native macOS sending.
+
+	* etc/NEWS: Announce the new feature.
+
+2025-07-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	3b2bfdfef63 ; Fix last change (bug#79042)
+	740138b113a ; Fix last change
+	e675d5ba64b ; Update doc strings of Dired functions due to 'marked' v...
+	a05be41af71 ; * lisp/battery.el (battery-bsd-apm): Explain a FIXME (b...
+	fe3ac1575a0 Fix :box attribute of faces in Leuven themes.
+	86e32aed4a3 ; define-globalized-minor-mode: Fix capitalization.
+
+2025-07-19  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Include shorter bindings in diff-mode docstring
+
+	* lisp/vc/diff-mode.el (diff-read-only-map): New keymap,
+	factored out of code modifying minor-mode-map-alist.
+	(diff-mode): Include bindings from diff-read-only-map in
+	docstring (bug#34080).
+
+2025-07-19  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Saner defaults for `calendar-read-sexp' (Bug#78964)
+
+	* lisp/calendar/cal-bahai.el (calendar-bahai-read-date):
+	* lisp/calendar/cal-china.el (calendar-chinese-goto-date):
+	* lisp/calendar/cal-coptic.el (calendar-coptic-read-date):
+	* lisp/calendar/cal-french.el (calendar-french-goto-date):
+	* lisp/calendar/cal-hebrew.el (calendar-hebrew-read-date):
+	* lisp/calendar/cal-islam.el (calendar-islamic-read-date):
+	* lisp/calendar/cal-iso.el (calendar-iso-read-date):
+	* lisp/calendar/cal-julian.el (calendar-julian-goto-date)
+	(calendar-astro-goto-day-number):
+	* lisp/calendar/cal-mayan.el (calendar-mayan-read-haab-date)
+	(calendar-mayan-read-tzolkin-date):
+	* lisp/calendar/cal-persia.el (calendar-persian-read-date):
+	* lisp/calendar/diary-lib.el (diary-insert-cyclic-entry): Use
+	first day as default.
+	* lisp/calendar/cal-hebrew.el (calendar-hebrew-list-yahrzeits):
+	Set the default of end-year as start-year plus ten years.
+
+2025-07-19  git@toki.la  <git@toki.la>  (tiny change)
+
+	Fix for 'windmove-do-window-select' if other-window is 'no-select
+
+	If the variable 'windmove-create-window' is set to a function
+	that returns 'no-select', 'windmove-do-window-select' is intended
+	to ignore the final window selection.  However, because
+	'other-window' is passed to 'window-minibuffer-p' before checking
+	if 'other-window' is 'no-select', 'window-minibuffer-p' will
+	instead throw a type error, and the '(eq other-window 'no-select)'
+	case will never be reached.  This patch moves this case up a line
+	to avoid this.
+	* lisp/windmove.el (windmove-do-window-select): Check for
+	'no-select' value earlier.  (Bug#78997)
+
+2025-07-19  Jim Porter  <jporterbugs@gmail.com>
+
+	Improve wording of messages and documentation for 'eww-readable'
+
+	* lisp/net/eww.el (eww-readable, eww-mode): Improve wording; avoid using
+	the word "content".
+
+	* doc/misc/eww.texi (Basics): Improve wording.
+
+2025-07-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	GCC bug 117423 has a fix
+
+	Document the change in dependency.  As we still need to work
+	around GCC bug 119085, there is no functional change in ‘configure’.
+	* configure.ac (emacs_cv_gcc_bug_119085_CFLAGS):
+	Rename from emacs_cv_gcc_bug_117423_CFLAGS.  All uses changed.
+
+2025-07-18  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC: Tighten up switching branches
+
+	* lisp/vc/vc.el: Require backend 'create-tag' functions to
+	prompt for the starting point of the branch.
+	(vc-retrieve-tag, vc-switch-branch): Accept empty NAME only when
+	not switching branches: it doesn't make sense to switch to the
+	current branch.  Plain 'C-x v r' can still be used to check out
+	the latest revisions on the current branch.
+
+2025-07-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	outline.el: Don't silence buffer text modification
+
+	It's important not to hide buffer text modifications from
+	`after/after-change-functions` since it can break other packages'
+	assumptions.
+
+	* lisp/outline.el (outline--insert-button): Don't silence
+	buffer text modification.
+	(outline--fix-up-all-buttons): Save buffer's modified state instead.
+
+2025-07-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	outline.el: Use jit-lock to maintain the buttons
+
+	* lisp/outline.el (outline-minor-mode): Use jit-lock instead of
+	`after-change-functions`.
+	(outline-flag-region): Run `outline--fix-buttons` since jit-lock
+	won't be triggered.
+	(outline--fix-up-all-buttons): Make the args mandatory.
+	(outline--fix-buttons): Rename from `outline--fix-buttons-after-change`.
+	Fix the END calculation.  Return the affected bounds, for jit-lock.
+
+2025-07-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	outline.el: Remove buttons properly, including the "  "
+
+	In Xref, enabling+disabling `outline-minor-mode` left two spaces
+	in front of every heading (a.k.a "group") line.
+
+	* lisp/outline.el (outline--remove-buttons): New function.
+	(outline-minor-mode, outline--fix-buttons-after-change): Use it.
+	(outline-after-change-functions): Improve docstring.
+
+2025-07-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/outline.el (outline-minor-mode-cycle-filter): Don't quote lambda
+
+2025-07-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	comp.el: Fix minor corner-case annoyances
+
+	* lisp/emacs-lisp/comp.el (comp--native-compile): Avoid `%s`
+	on objects that may not have names.
+	* src/data.c (Ffset): Don't compute trampoline for no-op `fset`.
+
+2025-07-17  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	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.
+
+2025-07-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Don’t optimize insert-file-contents for GNU
+
+	* src/fileio.c (Finsert_file_contents):
+	Remove a microoptimization for GNU/Linux and Android.
+
+2025-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Avoid syscall in dir-locals--all-files
+
+	* lisp/files.el (dir-locals--all-files):
+	Omit an unnecessary call to file-directory-p.
+
+2025-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-16  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Merge from origin/emacs-30
+
+	24db9b79623 ; * lisp/vc/diff-mode.el (diff-mode): Scare-quote 'normal'.
+	756e7e52439 ; * lisp/window.el (window-state-put): Fix a typo (bug#79...
+	0fb20adf8e7 ; define-globalized-minor-mode: Fix info node link in doc...
+
+2025-07-16  Sean Whitton  <spwhitton@spwhitton.name>
+
+	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.
+
+2025-07-16  Sean Whitton  <spwhitton@spwhitton.name>
+
+	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).
+
+2025-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	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.
+
+2025-07-15  Michael Albinus  <michael.albinus@gmx.de>
+
+	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.
+
+2025-07-15  Eli Zaretskii  <eliz@gnu.org>
+
+	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)
+
+2025-07-15  Jonas Bernoulli  <jonas@bernoul.li>
+
+	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".
+
+2025-07-15  Sean Whitton  <spwhitton@spwhitton.name>
+
+	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.
+
+2025-07-14  Pengji Zhang  <me@pengjiz.com>
+
+	Move some RefTeX 'setq's to major mode definition
+
+	Move two 'setq' expressions from the RefTeX label selection loop
+	to the body of the major mode definition, so to make it easier
+	to adjust the settings of the buffer via the mode hook.
+
+	* lisp/textmodes/reftex-ref.el (reftex-offer-label-menu): Move
+	two 'setq' expressions from here...
+	* lisp/textmodes/reftex-sel.el (reftex-select-label-mode): ...to
+	here.  (bug#77335)
+
+2025-07-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(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.
+
+2025-07-14  Paul Nelson  <ultrono@gmail.com>
+
+	Improve prettification of (La)TeX symbols
+
+	* lisp/textmodes/tex-mode.el (tex--prettify-symbols-alist): Remove
+	entry for "\\newline", which resulted in an invisible display.
+	Prettify "\\ " with OPEN BOX instead of BOTTOM SQUARE BRACKET.
+	(tex--prettify-symbols-compose-p): Skip composition when the
+	control backslash is itself escaped (bug#78752).
+
+2025-07-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/textmodes/tex-mode.el (tex--prettify-symbols-alist): Use \
+
+	This is the "standard" way to avoid those indentation problems
+	without relying on funny numbers.
+
+2025-07-14  Po Lu  <luangruo@yahoo.com>
+
+	Fix the Android port
+
+	* src/fileio.c (emacs_full_read): Retype FD param to `emacs_fd'.
+	(Fcopy_file): Label newsize MAYBE_UNUSED.
+
+2025-07-14  Juri Linkov  <juri@linkov.net>
+
+	* src/xdisp.c (tab-bar-truncate): New variable (bug#78953).
+
+	(tab_bar_height): Use it.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	fileio.c comment spelling fix
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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).
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	insert-file-contents END enforcement
+
+	* src/fileio.c (Finsert_file_contents): When matching text
+	at buffer start, don’t go past END if specified.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	insert-file-contents end offset infinity
+
+	* src/fileio.c (Finsert_file_contents): Simplify end_offset
+	calculation by defaulting to effectively infinity.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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".
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-07-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	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.
+
+2025-07-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Work around GCC bug 121030
+
+	* configure.ac: Disable -Wanalyzer-use-of-uninitialized-value.
+
+2025-07-13  Alan Mackenzie  <acm@muc.de>
+
+	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.
+
+2025-07-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	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.
+
+2025-07-13  Sean Whitton  <spwhitton@spwhitton.name>
+
+	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.
+
+2025-07-13  Sean Whitton  <spwhitton@spwhitton.name>
+
+	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.
+
+2025-07-13  Drew Adams  <drew.adams@oracle.com>
+
+	Allow duplicate menu entries in Imenu
+
+	* lisp/imenu.el (imenu-allow-duplicate-menu-items): New user
+	option.
+	(imenu--create-keymap): Allow duplicate imenu items if
+	'imenu-allow-duplicate-menu-items' is non-nil.
+
+	* etc/NEWS: Announce the change.
+	(Bug#78935)
+
+2025-07-12  Stephen Berman  <stephen.berman@gmx.net>
+
+	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).
+
+2025-07-12  Pip Cet  <pipcet@protonmail.com>
+
+	Avoid crashes when profiling multi-threaded Lisp (bug#76970)
+
+	* src/eval.c (backtrace_p): Check 'current_thread' before
+	dereferencing it.
+
+2025-07-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	6dd8266bc4a ; * doc/emacs/custom.texi (Init File): Mention "M-x custo...
+	723cb4da47a ; Fix indexing in Emacs user manual
+
+2025-07-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	ebb65d41630 ; Fix typos
+
+2025-07-12  Liu Hui  <liuhui1610@gmail.com>
+
+	Add option 'ffap-prefer-remote-file' (bug#78925)
+
+	This option only affects absolute filenames that are found by
+	ffap-file-at-point in buffers with remote default directory.
+
+	The handling of relative filenames in above buffers remains
+	unchanged: ffap-file-at-point returns the relative filename,
+	which can be converted to a remote absolute filename by
+	subsequent callers (e.g. ffap) using expand-file-name.
+
+	* lisp/ffap.el (ffap-prefer-remote-file): New user option.
+	(ffap-file-exists-string): Add an optional argument to allow the
+	check of existence of absolute filename on the remote host.
+	(ffap-file-at-point): Always find remote files in remote context
+	if the new option is non-nil.
+	* test/lisp/ffap-tests.el (ffap-test-remote): Add a test.
+	* etc/NEWS: Announce the change.
+
+2025-07-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "Add option 'ffap-prefer-remote-file' (bug#78925)"
+
+	This reverts commit ae46edff68e8d5729207ed849df83ecb039e11bb.
+	I mistakenly installed the wrong version of the patch for
+	bug#78925.
+
+2025-07-12  Liu Hui  <liuhui1610@gmail.com>
+
+	Add option 'ffap-prefer-remote-file' (bug#78925)
+
+	This option only affects absolute filenames that are found by
+	ffap-file-at-point in buffers with remote default directory.
+
+	The handling of relative filenames in above buffers remains
+	unchanged: ffap-file-at-point returns the relative filename,
+	which can be converted to a remote absolute filename by
+	subsequent callers (e.g. ffap) using expand-file-name.
+
+	* lisp/ffap.el (ffap-prefer-remote-file): New user option.
+	(ffap-file-exists-string): Add an optional argument to allow the
+	check of existence of absolute filename on the remote host.
+	(ffap-file-at-point): Always find remote files in remote context
+	if the new option is non-nil.
+	* test/lisp/ffap-tests.el (ffap-test-remote): Add a test.
+	* etc/NEWS: Announce the change.
+
+2025-07-12  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	New command 'mode-line-invisible-mode'
+
+	This new command allows hide the mode line in the current
+	buffer.  (Bug#78881)
+
+	* doc/emacs/display.texi (Optional Mode Line): Document feature.
+	* etc/NEWS: Announce changes.
+	* lisp/simple.el (mode-line-invisible--buf-state): New buffer
+	local variable.
+	(mode-line-invisible-mode): New minor mode.
+
+2025-07-12  Xiyue Deng  <manphiz@gmail.com>
+
+	Add public interfaces for accessing builtin package info (Bug#78844)
+
+	* lisp/emacs-lisp/package.el (package-builtin-packages)
+	(package-builtin-package-version): New functions.
+	* doc/lispref/package.texi: Add a section 'Package Information' with
+	documentation for the new functions.
+	* etc/NEWS: Add entry for 'package-versioned-builtin-packages' and
+	'package-builtin-package-version'.
+
+2025-07-11  Mattias Engdegård  <mattiase@acm.org>
+
+	* src/fns.c (Flength): Fix char table length off-by-one bug.
+
+2025-07-11  Sean Whitton  <spwhitton@spwhitton.name>
+
+	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.
+
+2025-07-11  Sean Whitton  <spwhitton@spwhitton.name>
+
+	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.
+
+2025-07-11  Sean Whitton  <spwhitton@spwhitton.name>
+
+	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>.
+
+2025-07-10  Alan Third  <alan@idiocy.org>
+
+	Update documentation and NEWS with SVG changes (bug#77841)
+
+	* doc/lispref/display.texi (SVG Images):
+	* etc/NEWS: Document changes to SVG foreground color handling.
+
+2025-07-10  Alan Third  <alan@idiocy.org>
+
+	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.
+
+2025-07-10  Alan Third  <alan@idiocy.org>
+
+	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.
+
+2025-07-10  Alan Third  <alan@idiocy.org>
+
+	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.
+
+2025-07-10  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix browse-url-tests-delete-temp-file
+
+	* test/lisp/net/browse-url-tests.el (browse-url-tests-delete-temp-file):
+	Fix test.
+
+2025-07-10  Michael Albinus  <michael.albinus@gmx.de>
+
+	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)
+
+2025-07-10  Michael Albinus  <michael.albinus@gmx.de>
+
+	* admin/notes/jargon: Add TIL.
+
+2025-07-10  Mattias Engdegård  <mattiase@acm.org>
+
+	Unintern Qget_file_char and Qget_emacs_mule_file_char
+
+	These symbols are used in the reader as special constants and can't be
+	passed from Lisp (Emacs would crash).
+
+	* src/lread.c (syms_of_lread): Unintern.
+	(init_source): Use BASE_EQ.
+
+2025-07-10  Mattias Engdegård  <mattiase@acm.org>
+
+	Speed up low-level parts of the reader and refactor
+
+	Inspect the given 'readcharfun' source once, before using it, instead of
+	for each character read.  This moves a bunch of branches away from the
+	critical path, with separate functions for different source types.
+	Replace some preprocessor macros with functions.
+
+	* src/lread.c (READCHAR, UNREAD, READCHAR_REPORT_MULTIBYTE)
+	(FROM_FILE_P): Remove; use corresponding functions instead.
+	All callers adapted.
+	(source_t): New struct that takes the place of the `readcharfun` and
+	`readbyte` arguments in many places.
+	(init_source)
+	(source_buffer_get, source_buffer_unget)
+	(source_marker_get, source_marker_unget)
+	(source_string_get, source_string_unget)
+	(source_file_get, source_file_unget)
+	(source_function_get, source_function_unget)
+	(from_file_p, unreadbyte_from_file):
+	New.
+	(readbyte_from_stdio): Replace `readbyte_from_file`.
+	(readchar, unreadchar): Rewrite.
+	(lisp_file_lexical_cookie, readevalloop, read_internal_start):
+	Create a source_t for use during reading.  All signatures and functions
+	called adapted.
+	(read_char_escape): Remove check for an error that can no longer occur.
+
+2025-07-10  Juri Linkov  <juri@linkov.net>
+
+	Cache only the last string in 'tab-bar-format-align-right' (bug#78953)
+
+	* lisp/tab-bar.el (tab-bar--align-right-cache):
+	Rename from 'tab-bar--align-right-hash'.
+	(tab-bar-format-align-right): Use it to store
+	the string in the car, and the width in the cdr.
+
+2025-07-10  Yuan Fu  <casouri@gmail.com>
+
+	Eldoc: Run eldoc-display-functions with original buffer (bug#78530)
+
+	Also bump eldoc version so Eglot can require the new version
+	later.
+
+	* lisp/emacs-lisp/eldoc.el (eldoc--invoke-strategy): Run the
+	hook with the original buffer as the current buffer. This way
+	we're certain that the buffer-local value of
+	'eldoc-display-functions' is used.
+	(eldoc-display-functions): Update docstring.
+
+2025-07-09  Andrea Corallo  <acorallo@gnu.org>
+
+	Nativecomp don't materialize non-materializable objects (bug#78606)
+
+	The native compiler should not try to generate in rendered code
+	immediate floats produced by the constrain on the '=' operator.
+
+	* test/src/comp-tests.el (comp-test-78606-1): Add test.
+	* test/src/comp-resources/comp-test-funcs.el (comp-test-78606-1-f): New
+	function.
+	* src/comp.c (emit_mvar_rval): Check if an immediate is materializable.
+	* lisp/emacs-lisp/comp.el (comp-ctxt): Add 'non-materializable-objs-h'
+	slot.
+	(comp--fwprop-insn): Update call.
+	* lisp/emacs-lisp/comp-cstr.el (comp-cstr-=): Add parameter.
+
+2025-07-09  Pip Cet  <pipcet@protonmail.com>
+
+	Call eieio--class-* accessors only on eieio classes (bug#78786)
+
+	* lisp/emacs-lisp/eieio-core.el (eieio-oref, eieio-oref-default):
+	(eieio-oset, eieio-oset-default): Don't look for class slots except in
+	eieio classes.
+	* test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
+	(eieio-test-defstruct-slot-value): New test.
+
+2025-07-09  Pip Cet  <pipcet@protonmail.com>
+
+	Fix crashes when "emacsclient -nw" frames are suspended (bug#78980)
+
+	* src/frame.c (frame_redisplay_p): Start loop with 'f', not its parent
+	frame.  Simplify return expression.
+
+2025-07-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	print_error_message: Handle user-error to the echo area specially
+
+	* src/print.c (print_error_message): For a user-error that is to
+	be printed to the echo area, use message3 in order to preserve
+	fontification.
+
+2025-07-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc.el (vc-find-revision-no-save): Call read-only-mode.
+
+2025-07-09  Stephen Berman  <stephen.berman@gmx.net>
+
+	Amend last change to 'kill-this-buffer'
+
+	* lisp/menu-bar.el (kill-this-buffer): Take using window tool bar
+	into account (bug#78809).
+
+2025-07-09  Martin Rudalics  <rudalics@gmx.at>
+
+	Handle invalid frame_or_window slots in tty input events (Bug#78966)
+
+	* src/frame.c (make_terminal_frame): Initialize terminal's
+	top_frame slot if it has not been set up yet (Bug#78966).
+	* src/keyboard.c (kbd_buffer_get_event): Do not assume that the
+	event's frame_or_window slot always produces a valid frame
+	(Bug#78966).
+	(tty_read_avail_input): Try to make sure that the input event we
+	create has a valid frame_or_window slot (Bug#78966).  Add assertion
+	to that purpose.
+
+2025-07-09  Juri Linkov  <juri@linkov.net>
+
+	Handle multiple mouse events in display-buffer-override-next-command
+
+	* lisp/window.el (display-buffer-override-next-command):
+	Use 'mouse-event-p' to wait for more following mouse events.
+
+	* lisp/frame.el (other-frame-prefix):
+	* lisp/tab-bar.el (other-tab-prefix):
+	* lisp/windmove.el (windmove-display-in-direction):
+	* lisp/window.el (other-window-prefix, same-window-prefix):
+	Update the docstring to explain the behavior in regard
+	to multiple consecutive mouse events (bug#78945).
+
+2025-07-09  Yuan Fu  <casouri@gmail.com>
+
+	Ditch the async range update in tree-sitter (bug#78402)
+
+	Right now in treesit-outline-search -> treesit-navigate-thing, a
+	freshly created tree-sitter node becomes outdated within the
+	function.  I'm not sure _exactly_ how it happend, but it might
+	look like this: we first get a node from, say, html parser, then
+	get another node from, say, liquid parser.  Creating the node
+	from liquid parser causes a reparse which updated the range of
+	the html parser, which rendered the html node outdated.
+
+	There're several problems with the current design, let's start
+	with the most obvious one: we add
+	treesit--font-lock-mark-ranges-to-fontify as a notifier of the
+	primar parser in treesit-major-mode-setup.  Now, if a ts major
+	mode inherits another major mode, treesit-major-mode-setup will
+	be called twice, once in the parent mode and once in the child
+	node, and two parsers will have the notifier.  But
+	treesit--font-lock-mark-ranges-to-fontify is designed to run
+	only once.
+
+	I believe this bug, together with some mysterious async
+	execution order, led to the problems we saw in the bug report.
+	My solution is to just make everything synchronous.
+
+	So I added treesit-parser-changed-regions, and modified
+	treesit--font-lock-mark-ranges-to-fontify to use it.  Now we
+	don't need to add the notifier to the primary parser anymore.
+
+	I also applied the tree-sitter-outline change we discussed in
+	the bug report.  (Change to treesit-outline-search, and remove
+	treesit--after-change.)
+
+	* lisp/treesit.el:
+	(treesit--font-lock-mark-ranges-to-fontify): Remove the unused
+	PARSER arg.
+	(treesit--pre-redisplay): Make use of
+	treesit-parser-changed-regions.
+	(treesit-outline-search): Call treesit--pre-redisplay in the
+	beginning.
+	(treesit--after-change): Remove function.
+	(treesit-major-mode-setup): Don't add notifier to primary parser.
+
+2025-07-09  Yuan Fu  <casouri@gmail.com>
+
+	Add a synchronous way to get parser change ranges (bug#78402)
+
+	This commit only adds the new function, the fix for the bug is
+	in the next commit.
+
+	* doc/lispref/parsing.texi (Using Parser): Add docs.
+	* lisp/treesit.el (treesit): Add shortdoc.
+	* src/treesit.c (treesit_get_affected_ranges): New function
+	extracted from treesit_call_after_change_functions.
+	(treesit_call_after_change_functions): Extract out.
+	(treesit_ensure_parsed): Return affected regions.
+	(Ftreesit_parser_changed_regions): New function that returns the
+	affected regions.
+
+2025-07-09  Juri Linkov  <juri@linkov.net>
+
+	Cache 'string-pixel-width' in 'tab-bar-format-align-right' (bug#78953)
+
+	* lisp/tab-bar.el (tab-bar--align-right-hash): New internal variable.
+	(tab-bar-format-align-right): Use memoization for 'string-pixel-width'.
+
+2025-07-09  Juri Linkov  <juri@linkov.net>
+
+	Fix tab-bar-format-align-right to not call tab-bar-format-global twice
+
+	* lisp/tab-bar.el (tab-bar-format-align-right): Add optional arg 'rest'
+	to handle it specially in 'tab-bar-format-list'.  Use the value from 'rest'
+	instead of calling format functions twice by 'tab-bar-format-list'.
+	(tab-bar-format-list): When 'format-list' contains the item
+	'tab-bar-format-align-right', collect the rest of formatted items
+	and call 'tab-bar-format-align-right' explicitly with the collected
+	list (bug#78953).
+
+2025-07-09  Jim Porter  <jporterbugs@gmail.com>
+
+	Add NEWS entry for abbreviating Git revisions in 'vc-annotate'
+
+	* etc/NEWS: Document new cases where 'vc-annotate' abbreviates Git
+	revisions (bug#78900).
+
+2025-07-07  Mattias Engdegård  <mattiase@acm.org>
+
+	Cheaper char counting when reading symbols
+
+	* src/lread.c (read0): Strength reduction.
+
+2025-07-07  Mattias Engdegård  <mattiase@acm.org>
+
+	Refactor buffering code in the Lisp reader
+
+	Abstract the buffering in the reader with a struct and plain functions
+	instead of rather unhygienic preprocessor macros.
+
+	* src/lread.c (READ_AND_BUFFER, INVALID_SYNTAX_WITH_BUFFER):
+	Removed, replaced with...
+	(readbuf_t, readbuf_grow, add_char_to_buffer, read_and_buffer)
+	(invalid_syntax_with_buffer): ...these new functions and struct.
+	(read0): Use new code instead of old preprocessor macros.
+
+2025-07-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc.el (with-vc-properties): Fix macro variable capture.
+
+2025-07-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Resolve FIXME regarding running vc-checkin-hook
+
+	Running vc-checkin-hook needs to be delayed in the case of an
+	async checkin.  As a quick fix we had been relying on the
+	backend checkin functions to run the hook in the async case.
+	This restores handling running the hook in generic code even for
+	the async case.
+
+	* lisp/vc/vc.el (vc-checkin): Always pass vc-checkin-hook to
+	vc-start-logentry.  Return the result of calling the backend
+	'checkin-patch' or 'checkin' function to vc-finish-logentry.
+	* lisp/vc/vc-dispatcher.el (vc-finish-logentry): If the log
+	operation returns a cons of the form (async . #<process ...>),
+	use vc-exec-after to delay vc-resynch-buffer and hooks until the
+	async process completes.  Approach suggested by Dmitry Gutov.
+	* lisp/vc/vc-git.el (vc-git-checkin):
+	* lisp/vc/vc-hg.el (vc-hg-checkin): For an async checkin, return
+	a cons (async . #<process ...>) containing the async checkin
+	process.  No longer run vc-checkin-hook.
+
+	* lisp/vc/vc.el (with-vc-properties): Return the result of
+	evaluating FORM.
+	* lisp/vc/vc-dispatcher.el (vc-exec-after): Change to PROC's
+	buffer before calling vc-set-mode-line-busy-indicator.
+
+2025-07-07  Mattias Engdegård  <mattiase@acm.org>
+
+	Read non-ASCII chars from unibyte string sources as raw bytes
+
+	Previously, latin-1 was incorrectly assumed (bug#70988).
+
+	* src/lread.c (readchar): Convert to raw byte.
+	* test/src/lread-tests.el (lread-unibyte-string-source): New test.
+
+2025-07-07  Mattias Engdegård  <mattiase@acm.org>
+
+	Print non-ASCII chars in unibyte symbols as raw bytes
+
+	Previously, latin-1 was incorrectly assumed (bug#70988).
+
+	* src/print.c (print_object): Call the correct function.
+	* test/src/print-tests.el (print-unibyte-symbols): New test.
+
+2025-07-07  Mattias Engdegård  <mattiase@acm.org>
+
+	Read characters from functions as multibyte
+
+	Previously, latin-1 was incorrectly assumed (bug#70988).
+
+	* src/lread.c (readchar): Set multibyte flag.
+	* test/src/lread-tests.el (lread-function-source): New test.
+
+2025-07-07  Mattias Engdegård  <mattiase@acm.org>
+
+	Turn compiler macro defalias messages into warnings
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-defalias):
+	Turn messages into warnings to make them more visible to the user and
+	provide a source location (bug#78792).
+
+2025-07-07  Jim Porter  <jporterbugs@gmail.com>
+
+	Use short revisions by default when navigating to revisions
+
+	* lisp/vc/vc-annotate.el (vc-annotate-revision-previous-to-line)
+	(vc-annotate-show-diff-revision-at-line-internal)
+	(vc-annotate-warp-revision): Let-bind 'vc-use-short-revision'
+	around calls to 'previous-revision' and 'next-revision'.
+
+	* lisp/vc/vc-git.el (vc-git-previous-revision, vc-git-next-revision):
+	Handle 'vc-use-short-revision' option (bug#78900).
+
+2025-07-07  Jim Porter  <jporterbugs@gmail.com>
+
+	Show "readable" status in the EWW mode line
+
+	* lisp/net/eww.el (eww-display-html): Check whether a readable form of
+	the document exists; if not, don't set ':readable' to t.
+	(eww-readable): Check whether a readable form of the document exists; if
+	not, warn the user and don't add to history.
+	(eww-readable-dom): Return nil if no readable form exists.
+	(eww-mode): Check the ':readable' property of 'eww-data' to show
+	"readable" state in the mode line.
+
+	* test/lisp/net/eww-tests.el
+	(eww-test/readable/default-readable/non-readable-page): New test
+	(bug#78958).
+
+2025-07-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(Ftranspose_regions): Fix bug#76124
+
+	* src/editfns.c (Ftranspose_regions): Be careful that ELisp code could
+	move the gap from under our feet.
+
+	* test/src/editfns-tests.el (editfns-tests--bug76124): New test.
+
+2025-07-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/mpc.el (mpc-describe-song): Don't quote lambdas
+
+2025-07-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Log Edit: Don't auto-fill within the headers
+
+	* lisp/vc/log-edit.el (log-edit-do-auto-fill): New function.
+	(log-edit-mode): Set normal-auto-fill-function to it.
+
+2025-07-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-checkin: Check whether the fileset or patches have changed
+
+	* lisp/vc/vc-dispatcher.el (vc-finish-logentry): Delay popping
+	to vc-parent-buffer until after calling the log operation.
+	That way if the log operation exits early, the current buffer
+	remains *vc-log*.
+	(vc-dir-marked-files, dired-get-marked-files): Declare.
+	(vc-dispatcher--explicit-marks-p): New function.
+	* lisp/vc/vc.el (vc-checkin): Check the user isn't likely to be
+	surprised by what is included in the checkin.  Specifically,
+	check whether the fileset or patches implied by vc-parent-buffer
+	are unchanged.
+	* doc/emacs/maintaining.texi (VC With A Merging VCS): Explain
+	how the fileset or patch string is fixed once *vc-log* pops up.
+
+2025-07-06  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt filenotify-tests.el for Emba
+
+	* test/infra/gitlab-ci.yml (.filenotify-gio-template): Enable also
+	for scheduled jobs.
+
+	* test/lisp/filenotify-tests.el (file-notify--test-cleanup):
+	Fix docstring.
+	(file-notify--deftest-remote): Use `file-notify--test-cleanup'.
+	(file-notify-test03-events, file-notify-test05-file-validity)
+	(file-notify-test06-dir-validity)
+	(file-notify-test07-many-events)
+	(file-notify-test09-watched-file-in-watched-dir): Adapt tests.
+	(file-notify-test03-events-remote)
+	(file-notify-test04-autorevert-remote)
+	(file-notify-test07-many-events-remote)
+	(file-notify-test09-watched-file-in-watched-dir-remote): Do not
+	tag as :unstable.
+
+2025-07-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/help-mode.el (help-mode-context-menu): Don't quote lambda
+
+2025-07-05  Michael Albinus  <michael.albinus@gmx.de>
+
+	Add file notification handler for Tramp's "smb" method.
+
+	* etc/NEWS: Mention new file notification handler for Tramp "smb".
+
+	* lisp/filenotify.el (file-notify--expand-file-name): Fix the
+	remote case.
+	(file-notify-callback): Extend for "smb-notify".
+	(file-notify--call-handler): Fix debug message.
+
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-file-notify-add-watch):
+	* lisp/net/tramp-sh.el (tramp-sh-gio-monitor-process-filter):
+	Use connection property "file-monitor".
+
+	* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
+	Use `tramp-smb-handle-file-notify-add-watch'.
+	(tramp-smb-handle-delete-directory): Do not error if there is a
+	pending deletion of a directory under file-watch.
+	(tramp-smb-handle-file-notify-add-watch)
+	(tramp-smb-notify-process-filter): New defuns.
+	(tramp-smb-send-command): New optional argument NOOUTPUT.
+	(tramp-smb-wait-for-output): Improve debug message.
+
+	* lisp/net/tramp.el (tramp-directory-watched): New defun.
+	(tramp-accept-process-output, tramp-wait-for-regexp):
+	Improve debug message.
+
+	* test/lisp/filenotify-tests.el (top): Filter also for
+	"smb-notify".  Set some other Tramp related variables.
+	(file-notify--test-wait-for-events)
+	(file-notify--test-with-actions-check)
+	(file-notify--test-with-actions): Add debug message.
+	(file-notify--test-cleanup, file-notify--deftest-remote):
+	Keep Tramp debugs buffer.
+	(file-notify--test-monitor): Check for "smb-notify".
+	(file-notify--deftest-remote): Call `file-notify-rm-all-watches'.
+	(file-notify--test-make-temp-name): Use a better name for parent
+	directory.
+	(file-notify--test-event-handler): Use `string-match-p'.
+	(file-notify--test-with-actions): Check also for the `stopped'
+	event as limit.
+	(file-notify-test03-events, file-notify-test04-autorevert)
+	(file-notify-test05-file-validity)
+	(file-notify-test07-many-events, file-notify-test08-backup)
+	(file-notify-test09-watched-file-in-watched-dir): Adapt tests for
+	"smb-notify".
+	(file-notify-test12-unmount): Skip for "smb-notify".
+
+2025-07-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(eieio--validate-slot-value): Don't break on struct objects
+
+	Nowadays `eieio-oset` applies to more than just EIEIO objects.
+	The old code tended to work OK but only because `eieio--class-slots`
+	is usually compiled/inlined without checks.
+
+	* lisp/emacs-lisp/eieio-core.el (eieio--validate-slot-value):
+	Don't assume CLASS is an EIEIO class.
+
+2025-07-05  Mattias Engdegård  <mattiase@acm.org>
+
+	Make elint obsolete (bug#78685)
+
+	It never was very useful to begin with, produces lots of false positives,
+	and the byte-compiler has long eclipsed it in warning quality.
+
+	* lisp/emacs-lisp/elint.el: Move this file...
+	* lisp/obsolete/elint.el: ...here, and declare obsolete.
+	(elint-file, elint-directory, elint-current-buffer, elint-defun):
+	Declare obsolete.
+	(elint--file): Split from elint-file to avoid warning.
+	* lisp/progmodes/elisp-mode.el (emacs-lisp-mode-menu):
+	Remove elint menu entries.
+	* etc/NEWS: Announce
+
+2025-07-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "New command 'mode-line-invisible-mode'"
+
+	This reverts commit 7e56ffd51bc5a00919f6a6af99fe9d329331a126.
+	It caused failure to bootstrap.  (Bug#78881)
+
+2025-07-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	3f7787c9794 ; * lisp/replace.el (query-replace-help): Fix help text (...
+	b10596a6303 ; * lisp/emacs-lisp/warnings.el (warning-display-at-botto...
+	060f964906b Handle ts_node_type return NULL (bug#78938)
+	5bdacbe460a Improve documentation of 'warning-display-at-bottom'
+	30dae2ad239 Handle the case when ts_node_type returns NULL (bug#78938)
+	985ad1da76d ; * lisp/emacs-lisp/bytecomp.el (compilation-safety): Doc...
+	de18407f513 ; * doc/lispref/functions.texi (Mapping Functions): Fix w...
+
+2025-07-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	e51ff3ee664 ; * doc/lispref/threads.texi (Condition Variables): Fix w...
+
+2025-07-05  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Fix ffap-in-project to check file existence
+
+	* lisp/ffap.el (ffap-in-project): Check file existence before
+	returning non-nil. (bug#78929)
+
+2025-07-05  Roi Martin  <jroi.martin@gmail.com>
+
+	Update NEWS with info about `fill-region-as-paragraph-function'
+
+	* etc/NEWS: Add an entry for `fill-region-as-paragraph-function'.
+	Document that `fill-region-as-paragraph-semlf' is a valid
+	`fill-region-as-paragraph-function' value.  (Bug#78949)
+
+2025-07-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Don't call vc-buffer-sync-fileset when committing a patch
+
+	* lisp/vc/vc-dispatcher.el (vc-finish-logentry): Move call to
+	vc-buffer-sync-fileset from here ...
+	* lisp/vc/vc.el (vc-checkin): ... to here, and conditionalize so
+	as not to call when committing a patch.  Also fix comment.
+
+2025-07-05  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	New command 'mode-line-invisible-mode'
+
+	This new command allows hide the mode line in the current
+	buffer.  (Bug#78881)
+
+	* doc/emacs/display.texi (Optional Mode Line): Document feature.
+	* etc/NEWS: Announce changes.
+	* lisp/bindings.el (mode-line-invisible--buf-state): New buffer
+	local variable.
+	(mode-line-invisible-mode): New minor mode.
+
+2025-07-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'ediff-before-setup-hook'
+
+	* lisp/vc/ediff-util.el
+	(ediff-clone-buffer-for-region-comparison): Wrap body in
+	'save-window-excursion', to make sure original window
+	configuration is restored after quitting 'ediff-regions-linewise'.
+	Suggested by Aaron Zeng <azeng@janestreet.com>.  (Bug#78897)
+
+2025-07-05  Antero Mejr  <mail@antr.me>
+
+	Check for text about Org-mode when submitting emacs bugs
+
+	* lisp/mail/emacsbug.el (report-emacs-bug-hook): Add regex check for
+	references to Org, and warn user if matches are found.  (Bug#78823)
+
+2025-07-04  Arash Esbati  <arash@gnu.org>
+
+	Consider constant TeX master/main file
+
+	* lisp/international/latexenc.el
+	(latexenc-find-file-coding-system): Search for "Local Variables"
+	as a comment.
+	Consider the case where `TeX-master' or `tex-main-file' is
+	globally set to a string as well.  (AUCTeX bug#78841)
+
+2025-07-04  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-find-revision-no-save: Finish entering read-only-mode
+
+	* lisp/vc/vc.el (vc-find-revision-no-save): After setting
+	buffer-read-only to non-nil, also run read-only-mode-hook,
+	and if view-read-only is non-nil, call view-mode-enter.
+
+2025-07-04  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC: New incoming & outgoing diff commands (bug#62940)
+
+	* lisp/vc/vc-hooks.el (vc-incoming-prefix-map)
+	(vc-outgoing-prefix-map): New keymaps.
+	(vc-use-incoming-outgoing-prefixes): New user option.
+	* lisp/vc/vc.el (vc-root-diff-incoming, vc-root-diff-outgoing):
+	New commands (bug#62940).
+	* doc/emacs/maintaining.texi (VC Change Log):
+	* etc/NEWS: Document the new commands and option.
+
+2025-07-04  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New history variable for VC remote locations
+
+	* lisp/vc/vc.el (vc-remote-location-history): New variable.
+	(vc--maybe-read-remote-location): Use it.
+
+2025-07-04  Steven Allen  <steven@stebalien.com>
+
+	Retain the <base> tag when making a page in EWW document readable
+
+	The base tag is necessary to correctly resolve relative links.
+
+	* lisp/net/eww.el (eww-readable-dom): Retain the base tag in addition to
+	the title/link tags.  (Bug#78948)
+	* test/lisp/net/eww-tests.el (eww-test--wordy-page): Add a base tag.
+	(eww-test/readable/default-readable): Test that the base tag is retained.
+
+2025-07-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/dired.el (dired-mode-immediate-menu): Don't quote `lambda`
+
+	lisp/dired-x.el (dired-omit-lines): Don't quote `lambda`
+
+2025-07-03  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Factor out some common code from VC incoming/outgoing functions
+
+	* lisp/vc/vc.el (vc--maybe-read-remote-location)
+	(vc--incoming-revision): New functions, factored out.
+	(vc-log-incoming, vc-default-log-incoming, vc-log-outgoing)
+	(vc-default-log-outgoing): Use them.
+
+2025-07-03  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC: Make incoming-revision backend function responsible for fetching
+
+	* lisp/vc/vc-hg.el (vc-hg-incoming-revision): Pull the incoming
+	revision if we don't have it.
+	(vc-hg-mergebase): Don't invoke 'hg pull'.
+	* lisp/vc/vc.el: Document that the incoming-revision backend
+	function, for distributed VCS, should fetch the incoming
+	revision into local storage.
+
+2025-07-03  Juri Linkov  <juri@linkov.net>
+
+	Don't ignore mouse release event in display-buffer-override-next-command
+
+	* lisp/window.el (display-buffer-override-next-command):
+	Don't exit on mouse down event, thus waiting for the incoming
+	mouse up event (bug#78945).
+
+2025-07-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid segfaults due to C-g when a thread does GC
+
+	* src/keyboard.c (handle_interrupt): Don't forcibly switch threads
+	if a non-main thread was in GC when the signal handler was called.
+
+2025-07-02  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project--read-project-buffer: Re-apply category 'buffer' to completion
+
+	* lisp/progmodes/project.el
+	(project--completion-table-with-category): New function.
+	(project--file-completion-table): Extract from here.
+	(project--read-project-buffer): Use it (bug#78931).
+
+2025-07-02  Dmitry Gutov  <dmitry@gutov.dev>
+
+	uniquify-get-unique-names: Return a list with propertized strings
+
+	* lisp/uniquify.el (uniquify-get-unique-names): Return a list of
+	strings, and add text property 'uniquify-orig-buffer' to each,
+	pointing at the corresponding buffers (bug#77312).
+
+	* lisp/progmodes/project.el (project--read-project-buffer):
+	Look up that property's values here and build the alist.
+
+2025-07-02  Jim Porter  <jporterbugs@gmail.com>
+
+	Ensure <style> and <template> HTML tags are never "readable" in EWW
+
+	This helps fix EWW readable mode on some web pages that use these tags,
+	like the FSF blog.
+
+	* lisp/net/eww.el (eww--walk-readability): Check for <style> and
+	<template> tags.
+
+2025-07-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cus-edit.el: Don't quote lambdas and improve macro declaration
+
+	* lisp/cus-edit.el (custom-reset-extended-menu): Don't quote lambdas.
+	(custom-dirlocals-with-buffer): Add indent and debug info.
+
+2025-07-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(load-path-filter): Loading can happen in the middle of completion
+
+	* lisp/startup.el (load-path-filter-cache-directory-files):
+	Don't get confused by the context's `completion-regexp-list`.
+
+2025-07-01  Philip Kaludercic  <philipk@posteo.net>
+
+	Expand DIR arg on `package-vc-install-from-checkout'
+
+	Expand the directory name passed to the
+	'package-vc-install-from-checkout' function so that paths like
+	"/path/to/pkg/./" are converted to "/path/to/pkg/".  This
+	ensures that the package name defaults to "pkg" instead of ".".
+	* lisp/emacs-lisp/package-vc.el
+	(package-vc-install-from-checkout): Expand the provided
+	directory name.  (Bug#78855)
+
+	Co-developed-by: Roi Martin <jroi.martin@gmail.com>
+
+2025-07-01  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Update to Transient v0.9.3-8-gecd64f17
+
+2025-07-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC-Hg: Use generic log-incoming & log-outgoing
+
+	* lisp/vc/vc-hg.el (vc-hg-print-log): Implement string LIMIT for
+	this backend.  Use a DAG range when 'vc-log-view-type' is
+	'log-outgoing'.  Document differences between -rN:M and -rN::M.
+	(vc-hg-log-view-mode): Treat 'log-incoming' and 'log-outgoing'
+	values for 'vc-log-view-type' as short logs too.
+	(vc-hg-log-incoming, vc-hg-log-outgoing): Delete.
+
+2025-07-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-hg-mergebase: Try a pull if first attempt fails
+
+	* lisp/vc/vc-hg.el (vc-hg-mergebase): If the first attempt
+	fails, execute a pull, then try again.
+	(vc-hg-incoming-revision): Use 'hg identify' not 'hg incoming'.
+
+2025-07-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Revert "admin/gitmerge.el (gitmerge-resolve): Use `replace-region-contents`"
+
+	This reverts commit 17d976e22e9b0ba10dcbe1655a93bc4d165d7097
+	because the change is not worth the risk.
+
+2025-07-01  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
+
+	EUDC: Fix checkdoc errors
+
+	* lisp/net/eudc.el (eudc--plist-member)
+	(eudc-format-inline-expansion-result): Fix checkdoc errors.
+
+2025-07-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	expand.el: Simplify by always using a list in `expand-list`
+
+	The old code set `expand-list` to a vector of "marks" but also
+	supported it being set by third party code to a list.
+	The code to build and use the vector was a internally using
+	a list, so we cut the middle man and just always use a list so
+	it doesn't matter whether we set it or a third party code did.
+
+	* lisp/expand.el (expand-add-abbrevs): Use `mapc` instead of recursion.
+	(expand-add-abbrev): Add dummy `rest` arg so we can `apply` it blindly
+	in `expand-add-abbrevs`.
+	(expand-abbrev-hook): `expand-list` is never set to a vector any more.
+	(expand-do-expansion): Set `expand-list` to a list rather than a vector.
+	(expand-abbrev-from-expand): Use `abbrev-symbol`.
+	(expand-build-list, expand-build-marks): Delete functions, not used
+	any more.
+
+2025-06-30  Roi Martin  <jroi.martin@gmail.com>
+
+	Update `fill-region-as-paragraph-semlf' to follow fill.el protocols
+
+	Update the `fill-region-as-paragraph-semlf' function to follow the
+	`fill-region-as-paragraph-function' protocol.  This allows us to
+	reimplement the `fill-paragraph-semlf' function using `fill-paragraph'
+	and `fill-region-as-paragraph-function'.
+	* lisp/textmodes/fill.el (fill-region-as-paragraph-semlf): Make this
+	function compatible with `fill-region-as-paragraph-function'.  Avoid
+	narrowing.
+	(fill-paragraph-semlf): Reimplement using `fill-paragraph' and
+	`fill-region-as-paragraph-function'.
+	* test/lisp/textmodes/fill-tests.el (fill-test-semlf-fill-region): Add
+	test.
+	(fill-test-fill-paragraph-semlf-fill-paragraph-function): Remove test.
+	(fill-test-fill-paragraph-semlf, fill-test-semlf)
+	(fill-test-fill-paragraph-semlf-justify, fill-test-semlf-justify)
+	(fill-test-fill-paragraph-semlf-sentence-end-double-space)
+	(fill-test-semlf-sentence-end-double-space)
+	(fill-test-fill-paragraph-semlf-fill-column, fill-test-semlf-fill-column)
+	(fill-test-fill-paragraph-semlf-punctuation-marks)
+	(fill-test-semlf-punctuation-marks, fill-test-fill-paragraph-semlf-twice)
+	(fill-test-semlf-twice, fill-test-fill-paragraph-semlf-fill-prefix)
+	(fill-test-semlf-fill-prefix)
+	(fill-test-fill-paragraph-semlf-indented-block)
+	(fill-test-semlf-indented-block, fill-test-fill-paragraph-semlf-revert)
+	(fill-test-semlf-revert, fill-test-fill-paragraph-semlf-emacs-lisp-mode)
+	(fill-test-semlf-emacs-lisp-mode, fill-test-fill-paragraph-semlf-c-mode)
+	(fill-test-semlf-c-mode, fill-test-fill-paragraph-semlf-org-mode)
+	(fill-test-semlf-org-mode, fill-test-fill-paragraph-semlf-markdown-mode)
+	(fill-test-semlf-markdown-mode): User shorter function names consistent
+	with erts file names.
+	* test/lisp/textmodes/fill-resources/semlf-fill-region.erts: Add test
+	data.
+	* test/lisp/textmodes/fill-resources/semlf-fill-paragraph-function.erts:
+	Delete file.
+	* test/lisp/textmodes/fill-resources/semlf-emacs-lisp-mode.erts: Remove
+	newlines around indented block.
+	* doc/lispref/text.texi (Filling): Highlight that
+	`fill-region-as-paragraph-function' changes the behavior of
+	`fill-paragraph'.
+
+2025-06-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/autoinsert.el (auto-insert-alist): Don't quote `lambda`
+
+	admin/gitmerge.el (gitmerge-resolve): Use `replace-region-contents`
+
+2025-06-29  Juri Linkov  <juri@linkov.net>
+
+	Better fix for ignoring 'tab-bar-lines' in daemon's initial frame
+
+	* lisp/tab-bar.el (tab-bar--update-tab-bar-lines):
+	Revert '(not (daemonp))' to update 'default-frame-alist'
+	even in daemon mode (bug#78896).
+
+	* lisp/frame.el (frame-notice-user-settings): For daemon's
+	initial frame don't modify the frame parameter 'tab-bar-lines'.
+
+2025-06-29  Juri Linkov  <juri@linkov.net>
+
+	Display SVG images inline in Gnus
+
+	* lisp/gnus/mm-decode.el (mm-inline-media-tests): Add "image/svg+xml".
+
+2025-06-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC: Fix several START-REVISION versus LIMIT issues
+
+	* lisp/vc/vc-git.el (vc-git-print-log): When LIMIT and
+	START-REVISION are both supplied, use START-REVISION as the
+	newest commit, and LIMIT as a base (problem was introduced in
+	the commit adding 'vc-diff-mergebase' and 'vc-log-mergebase').
+	* lisp/vc/vc.el (vc-default-log-incoming)
+	(vc-default-log-outgoing): Fix order of START-REVISION and LIMIT
+	arguments passed to 'print-log' backend function.
+	(vc-log-mergebase): Fix order of START-REVISION and LIMIT
+	arguments passed to 'vc-print-log-internal'.
+
+2025-06-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2025-06-29  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt Tramp versions
+
+	* doc/misc/trampver.texi:
+	* lisp/net/trampver.el (tramp-version): Adapt Tramp versions.
+
+2025-06-29  Roi Martin  <jroi.martin@gmail.com>
+
+	Add variable `fill-region-as-paragraph-function'
+
+	Add the variable `fill-region-as-paragraph-function' to provide
+	a way to override how functions like `fill-region' fill text.
+	* doc/lispref/text.texi (Filling): Document
+	`fill-region-as-paragraph-function' variable.
+	* doc/emacs/text.texi (Fill Commands): Reference
+	`fill-region-as-paragraph-function' variable.
+	* lisp/textmodes/fill.el (fill-region-as-paragraph-function):
+	Add variable.
+	(fill-region-as-paragraph): Convert into
+	`fill-region-as-paragraph-function' wrapper.
+	(fill-region-as-paragraph-default): Rename old
+	`fill-region-as-paragraph' function.
+	(fill-region-as-paragraph-semlf): Update calls to
+	`fill-region-as-paragraph-default'.
+	(fill-region): Add reference to `fill-region-as-paragraph-function'
+	in doc string.
+	* test/lisp/textmodes/fill-tests.el (fill-test-fill-region): Add
+	test case for the `fill-region' function.
+	* test/lisp/textmodes/fill-resources/fill-region.erts: Add test
+	data.  (Bug#78816)
+
+2025-06-29  Zach Shaftel  <zach@shaf.tel>
+
+	Add new gv place definitions
+
+	* lisp/emacs-lisp/gv.el (char-table-extra-slot, char-table-parent)
+	(default-toplevel-value, marker-insertion-type, process-plist)
+	(process-query-on-exit-flag, process-thread, lookup-key)
+	(window-prev-buffers, window-next-buffers, window-new-normal, font-get)
+	(charset-plist, get-charset-property): Add gv-setters.
+	(terminal-parameter): Fix the return value.  (Bug#78291)
+
+2025-06-28  Po Lu  <luangruo@yahoo.com>
+
+	Properly invalidate XRender surfaces when only EmacsFrame is resized
+
+	* src/xterm.c (handle_one_xevent): Drop XRender surfaces when
+	the frame widget is resized, rather than when the toplevel is.
+	(bug#77988)
+
+2025-06-28  Po Lu  <luangruo@yahoo.com>
+
+	Fix the DJGPP port
+
+	* msdos/sedlibmk.inp (NEXT_AS_FIRST_DIRECTIVE_STDCKDINT_H)
+	(NEXT_STDCKDINT_H): Define to presumably unused values.
+
+2025-06-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	6299eb0fe54 bug#78901: [PATCH] js-ts-mode: Fix auto-mode-alist regexp
+	982938363ad Merge branch 'emacs-30' of git.sv.gnu.org:/srv/git/emacs ...
+	e68ad70af6d Fix 'insert-directory' in Turkish language-environment
+	f805f513732 Fix job control in remote shell
+	039ad15373d ; * doc/emacs/package.texi (Package Statuses): Clarify "n...
+
+2025-06-28  Pip Cet  <pipcet@protonmail.com>
+
+	Avoid extra output in Vprin1_to_string_buffer (bug#78842)
+
+	print_error_message can throw after producing some output, so use
+	unwind-protect to ensure prin1-to-string-buffer is cleared.
+
+	* src/print.c (erase_prin1_to_string_buffer): New.
+	(Ferror_message_string): Use it to catch errors thrown in
+	'print_error_message'.
+	* test/src/print-tests.el (error-message-string-circular): Expand
+	test.
+
+2025-06-28  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Avoid flicker when marking diary entries (bug#78861)
+
+	* lisp/calendar/calendar.el (calendar-generate-window): Remove
+	historical and not really understood `sit-for' calls.
+
+2025-06-28  Protesilaos Stavrou  <info@protesilaos.com>
+
+	Define dedicated faces for the package.el mode line
+
+	* lisp/emacs-lisp/package.el
+	(package-menu--set-mode-line-format): Apply the faces.
+	(package-mode-line-total, package-mode-line-installed)
+	(package-mode-line-to-upgrade, package-mode-line-new): Define
+	the faces.  (Bug#78867)
+
+2025-06-28  Rahguzar  <rahguzar@mailbox.org>
+
+	* lisp/pcmpl-rpm.el: Generate completions for dnf5
+
+	(pcmpl-rpm-dnf-cache-file): Remove now unused variable.
+	(pcmpl-rpm--dnf-packages): Use dnf repoquery.
+	(pcomplete/dnf): Adjust regexps to allow for help format of
+	dnf5.  New regexps works for both dnf4 and dnf5.  Add
+	aliases for better subcommand completion.  Better support
+	for dnf repoquery command.  (Bug#78661)
+
+2025-06-28  Maxim Cournoyer  <maxim@guixotic.coop>
+
+	bug#78845: [PATCH 2/2] doc: Document desktop notifications for Gnus
+
+	* doc/misc/gnus.texi (Notifications): Add section.
+
+2025-06-28  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-dir-update: Update 'backend' VC properties
+
+	* lisp/vc/vc-dir.el (vc-dir-update): Update 'backend' VC file
+	properties from ENTRIES.  This resolves some issues relating to
+	cache invalidation.
+	* lisp/vc/vc-hooks.el (vc-backend): Improve docstring.
+
+2025-06-28  Maxim Cournoyer  <maxim@guixotic.coop>
+
+	bug#78845: [PATCH 1/2] doc: Update Texinfo menus.
+
+	Generated from Emacs via M-x texinfo-all-menus-update, and dropping
+	changes made due to limitations of the tool.
+
+2025-06-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "function-put: signal error with non-symbol"
+
+	This reverts commit a4ec9ca12969018cdf15b8cc713b3ba054326f99.
+	It caused unnecessary errors, see bug#78593.
+
+2025-06-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix setting viper-d-com in viper
+
+	* lisp/emulation/viper-cmd.el (viper-put-back, viper-Put-back):
+	Move setting the marker to after the call to
+	'viper-set-destructive-command'.  Suggested by Michael Scott
+	<scott@cs.rochester.edu>.  (Bug#78220)
+
+2025-06-28  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Add tool bar icons to package menu. (Bug#78601)
+
+	* etc/images/package-menu/README:
+	* etc/images/package-menu/delete.xpm:
+	* etc/images/package-menu/execute.xpm:
+	* etc/images/package-menu/info.xpm:
+	* etc/images/package-menu/install.xpm:
+	* etc/images/package-menu/unmark.xpm:
+	* etc/images/package-menu/upgrade.xpm:
+	* etc/images/package-menu/url.xpm:
+	* etc/images/package-menu/delete.pbm:
+	* etc/images/package-menu/execute.pbm:
+	* etc/images/package-menu/info.pbm:
+	* etc/images/package-menu/install.pbm:
+	* etc/images/package-menu/unmark.pbm:
+	* etc/images/package-menu/upgrade.pbm:
+	* etc/images/package-menu/url.pbm: New files.
+	* lisp/emacs-lisp/package.el (package-menu--tool-bar-map): New
+	variable.
+	(package-menu-mode): Set tool bar.
+	* lisp/term/pgtk-win.el (x-gtk-stock-map):
+	* lisp/term/x-win.el (x-gtk-stock-map): Add new icons to alist.
+
+2025-06-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port varargs macros better to C99
+
+	C99 prohibits passing zero args to macro’s ‘...’.
+	* lib-src/seccomp-filter.c (RULE0): New macro, which is like RULE
+	except with zero args.  All zero-arg uses of RULE changed to RULE0.
+	* src/comp.c (compile_function, Fcomp__init_ctxt, syms_of_comp):
+	Change ‘CALLN (Fmake_hash_table)’ to ‘Fmake_hash_table (0, NULL)’,
+	since CALLN requires at least two args in C99.
+
+2025-06-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2025-06-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(peg-parse): Fix bug#78884
+
+	* lisp/progmodes/peg.el (peg-parse): Be more careful when
+	testing if a symbol is the name of an existing rule.  Improve docstring.
+
+	test/lisp/progmodes/peg-tests.el (peg-tests--peg-parse): New test.
+
+2025-06-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(Finsert_file_contents): Refine commit d07af40d8826
+
+	* src/fileio.c (Finsert_file_contents): Inhibit ask-supersession
+	only if we're VISITing in a non-narrowed buffer (bug#78866).
+
+	* test/src/fileio-tests.el (ert--tests-dir): New var.
+	(fileio-tests--insert-file-contents-supersession): New test.
+
+2025-06-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cus-start.el: Reliably distinguish preload from nonpreload
+
+	`dump-mode` can be nil even if we're about to dump (this is
+	done in the Android build), so don't rely on it to distinguish
+	if `cus-start` is loaded from `loadup.el` vs loaded during
+	a "normal run".
+
+	* lisp/loadup.el (cus-start): Bind `cus-start--preload`.
+	* lisp/cus-start.el: <top-level>: Test it rather than `dump-mode`.
+
+2025-06-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-annotate: Fix ever-lengthening buffer names
+
+	* lisp/vc/vc-annotate.el (vc-annotate): Rewrite code to generate
+	the buffer name so that when switching from annotating one
+	revision to annotating another, we don't embed the old name of
+	the vc-annotate buffer directly into its new one (bug#78890).
+
+2025-06-27  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-bar.el: Ignore daemon's initial frame (bug#78896).
+
+	(tab-bar--update-tab-bar-lines): Don't set the frame parameter
+	'tab-bar-lines' in daemon's initial frame because it messes up the
+	frames when 'format-mode-line' called from 'tab-bar-format-global'
+	on daemon's initial frame forces focus switch to daemon's initial
+	frame.  Also don't set 'default-frame-alist' in daemon mode because
+	'frame-notice-user-settings' copies the frame parameter 'tab-bar-lines'
+	from 'default-frame-alist' to daemon's initial frame.  Here updating
+	'default-frame-alist' is not much needed anyway since the frame
+	parameter 'tab-bar-lines' for new frames is set in 'make_terminal_frame'
+	and 'x-create-frame'.  'default-frame-alist' might be need only
+	to handle non-default 'tab-bar-show', but this can be handled by
+	'toggle-frame-tab-bar' called from 'server-after-make-frame-hook'.
+	(toggle-frame-tab-bar): Document a useful case of calling it
+	from 'server-after-make-frame-hook'.
+
+2025-06-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	'C-u C-x .' clears the fill prefix
+
+	* lisp/textmodes/fill.el (set-fill-prefix): When called
+	interactively with a prefix argument, clear the fill prefix,
+	just like how 'C-u C-x C-n' clears the goal column.
+	* doc/emacs/text.texi (Fill Prefix):
+	* etc/NEWS: Document the change.
+
+2025-06-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New user option vc-dir-save-some-buffers-on-revert
+
+	* lisp/vc/vc-dir.el (vc-dir-save-some-buffers-on-revert):
+	New user option.
+	(vc-dir-refresh): Use it.
+	* etc/NEWS: Document it.
+
+2025-06-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/vc/smerge-mode.el (smerge--refine-highlight-change): Fix misalignment
+
+2025-06-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix *Help* text when a command is bound to a single key
+
+	* lisp/help-fns.el (help-fns--key-bindings): Don't insert
+	redundant period.  (Bug#78905)
+
+2025-06-26  Jim Porter  <jporterbugs@gmail.com>
+
+	When making a readable page in EWW, include the <title> and similar tags
+
+	* lisp/net/eww.el (eww--walk-readability, eww-readable-dom): New
+	functions.
+	(eww-display-html): Call 'eww-readable-dom'.
+	(eww-readable): Call 'eww-readable-dom'.  Don't copy over 'eww-data'
+	properties that our new readable page can handle on its own.
+	(eww-score-readability): Rewrite in terms of 'eww--walk-readability'.
+	Make obsolete.
+	(eww-highest-readability): Make obsolete.
+
+	* test/lisp/net/eww-tests.el (eww-test--lots-of-words)
+	(eww-test--wordy-page): New variables...
+	(eww-test/readable/toggle-display): ... use them.
+	(eww-test/readable/default-readable): Make sure that the readable page
+	includes the <title> and <link> tags (bug#77299).
+
+2025-06-25  James Cherti  <contact@jamescherti.com>  (tiny change)
+
+	Fix yaml-ts-mode comment-start-skip to improve commenting/uncommenting
+
+	* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode): Fix 'comment-start-skip'
+	value to resolve an issue when commenting/uncommenting using the
+	'comment-or-uncomment-region' function.  The previous 'comment-start-skip'
+	value left some "-" uncommented after commenting and uncommenting
+	multiple YAML indented blocks (bug#78892).
+
+2025-06-25  Juri Linkov  <juri@linkov.net>
+
+	Add alternative "ruby-lsp" to eglot-server-programs.
+
+	* lisp/progmodes/eglot.el (eglot-server-programs):
+	Add "ruby-lsp" to eglot-alternatives for ruby-mode and ruby-ts-mode.
+	https://shopify.github.io/ruby-lsp/editors.html#emacs-eglot
+
+2025-06-25  Juri Linkov  <juri@linkov.net>
+
+	Improve treesit settings for python-ts-mode (bug#73404).
+
+	* lisp/progmodes/python.el (python--thing-settings):
+	For the 'sexp' thing use all nodes except top-level
+	grouping nodes, comments and parens.  Add the 'list' thing.
+	(python-ts-mode): Use setq-local for treesit-thing-settings.
+	Modify 'forward-sexp-function' and 'treesit-sexp-thing'
+	after calling 'treesit-major-mode-setup'.
+
+2025-06-25  Juri Linkov  <juri@linkov.net>
+
+	Fix usage of 'treesit-defun-type-regexp' in treesit-tests.
+
+	* test/src/treesit-tests.el (treesit--ert-test-defun-navigation):
+	Replace 'treesit-defun-type-regexp' with
+	'(or treesit-defun-type-regexp 'defun)' that fixes the tests
+	for ts-modes that set up the 'defun' thing instead of
+	'treesit-defun-type-regexp'.
+
+2025-06-25  Po Lu  <luangruo@yahoo.com>
+
+	Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/emacs
+
+2025-06-25  Po Lu  <luangruo@yahoo.com>
+
+	Attempt to fix initialization of startup variables on Android
+
+	* lisp/cus-start.el (standard): Revert last change if (featurep
+	'android), as Android systems perform dumping during the
+	initialization of the first user session.
+
+2025-06-25  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Improve discoverability of using dumb-emacs-ansi terminal type
+
+	* doc/emacs/misc.texi (Interactive Shell, Shell Options):
+	* lisp/comint.el (comint-terminfo-terminal): Mention setting
+	comint-terminfo-terminal to "dumb-emacs-ansi" when the system's
+	terminfo database contains a definition for that terminal type.
+
+2025-06-25  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Allow automatically delete non-existent projects. (Bug#77566)
+
+	* etc/NEWS: Announce changes.
+	* lisp/progmodes/project.el (project-prune-zombie-projects): New
+	user option.
+	(project-prune-zombies-default): New function.
+	(project-forget-zombie-projects): Rework.
+	(project--ensure-read-project-list, project-prompt-project-dir)
+	(project-prompt-project-name): Call
+	'project-forget-zombie-projects' but inhibit its message.
+
+2025-06-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cus-start.el: Fix bug#78637
+
+	* lisp/cus-start.el <toplevel>: Test `dump-mode` rather than
+	`after-init-time` for `custom-delayed-init-variables`.
+
+2025-06-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Load site-start.el before early-init.el
+
+	* lisp/startup.el (command-line): Load site-start.el before
+	early-init.el.
+	(site-run-file):
+	* doc/lispref/os.texi (Startup Summary, Init File):
+	* etc/NEWS: Document the change.
+
+2025-06-23  Andrea Corallo  <acorallo@gnu.org>
+
+	* Make native comp use lexbinding for sync compilations (bug#78818)
+
+	* lisp/emacs-lisp/comp.el (comp--final): Use lexical-binding in the temp file.
+
+2025-06-23  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Tramp scripts
+
+	* lisp/net/tramp-sh.el (tramp-shell-file-name-all-completions)
+	(tramp-bundle-read-file-names): Fix scripts.
+
+2025-06-23  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: Remove workarounds for missing "\_<", "\_>" in XEmacs
+
+	Also start using `symbols' as the PAREN argument to regexp-opt.
+
+	lisp/progmodes/cc-defs.el (c-make-keywords-re): Simplify,
+	remove the redundant `appendable' value of the ADORN parameter,
+	use the `symbols' value of the PAREN argument to regexp.
+	(c-emacs-features): Test that "\_<" and "\_>" work in regexps
+	before allowing CC Mode to start.
+
+	lisp/progmodes/cc-engine.el (c-looking-at-decl-block): When
+	GOTO-START is set, leave point at the _last_ Java annotation,
+	if any.  Clarify this in the doc string.
+	(c-guess-basic-syntax CASE 5G): Replace a not needed t
+	GOTO-START argument to c-looking-at-decl-block with nil.
+
+	lisp/progmodes/cc-langs.el (c-make-mode-syntax-table): Make the
+	syntax of ?@ in Java Mode symbol for processing annotations.
+	(c-opt-identifier-concat-key, c-opt-identifier-prefix-key)
+	(c-opt-after-id-concat-key, c-identifier-key)
+	(c-cpp-message-directives-re, c-cpp-include-key, c-pack-key)
+	(c-brace-stack-thing-key, c-brace-stack-no-semi-key): Replace
+	the `appendable' value of the ADORN argument to
+	c-make-keywords-re with t.
+	(c-annotation-re): New lang const and lang var.
+	(c-keywords-obarray): Replace an explicit (apply 'nconc (mapcar
+	... )) with c--mapcan, now that the obscure bug with mapcan in
+	Emacs has been resolved.
+
+	lisp/progmodes/cc-align.el (c-lineup-gnu-DEFUN-intro-cont)
+	(c-lineup-java-throws, c-snug-do-while)
+	lisp/progmodes/cc-awk.el (c-awk-pre-exp-alphanum-kwd-re)
+	(c-awk-after-if-for-while-condition-p)
+	(c-awk-after-function-decl-param-list)
+	(c-awk-after-continue-token)
+	(c-awk-after-rbrace-or-statement-semicolon)
+	(awk-font-lock-keywords)
+	lisp/progmodes/cc-cmds.el (c-defun-name-1)
+	lisp/progmodes/cc-engine.el (c-beginning-of-statement-1)
+	(c-forward-<>-arglist, c-forward-label, c-skip-conditional)
+	(c-looking-at-c++-lambda-expression, c-add-stmt-syntax)
+	(c-guess-basic-syntax CASE 11, CASE 12, CASE 13, CASE 15)
+	(CASE 5C.3, CASE 5D.4, CASE 7D)
+	lisp/progmodes/cc-fonts.el (c-cpp-matchers)
+	(c-basic-matchers-before, c-font-lock-declarations)
+	(c-font-lock-c++-modules, c-simple-decl-matchers)
+	(c-complex-decl-matchers, c-basic-matchers-after)
+	lisp/progmodes/cc-langs.el (c-paragraph-start)
+	(c-stmt-block-only-keywords-regexp)
+	(c-type-decl-prefix-keywords-key, c-type-decl-prefix-key)
+	(c-type-decl-suffix-key, c-known-type-key)
+	(c-enum-clause-introduction-re)
+	lisp/progmodes/cc-menus.el (cc-imenu-c++-generic-expression)
+	lisp/progmodes/cc-vars.el (c-make-noise-macro-regexps)
+	(c-make-macro-with-semi-re): Replace explicit "\<" and "\>"
+	with "\_<" and "\_>".  Replace explicit specification of
+	non-'_' character after word end with "\_>".  Replace
+	concatenation of "\<" and "\>" with regexps with (regexp-opt
+	... 'symbols).  Use (regexp-opt ... 'symbols) in general.
+
+2025-06-23  Stephen Berman  <stephen.berman@gmx.net>
+
+	Optionally suppress recentf open file messages (bug#78666)
+
+	* etc/NEWS: Announce new user option.
+
+	* lisp/recentf.el (recentf-suppress-open-file-help): New defcustom.
+	(recentf-dialog-goto-first): Use it; otherwise, make calling
+	'widget-move' suppress message only for interactive recentf use.
+	(recentf-forward, recentf-backward): New commands, wrappers around
+	'widget-{forward, backward}' using 'recentf-suppress-open-file-help'.
+	(recentf-dialog): Use them in locally remapped key bindings.
+
+	* lisp/wid-edit.el (widget-forward, widget-backward): Add optional
+	argument to suppress :help-echo message and pass it to 'widget-move'.
+
+2025-06-23  Peter Oliver  <git@mavit.org.uk>
+
+	Link to Tree-sitter parser sources from compatibility report
+
+	* admin/tree-sitter/treesit-admin.el
+	(treesit-admin--generate-compatibility-report): Add a link to the source
+	URL (bug#78848).
+
+2025-06-23  Peter Oliver  <git@mavit.org.uk>
+
+	Show also tagged versions on Tree-sitter compatibility report
+
+	* admin/tree-sitter/compat-template.html: Accommodate two tables.
+	* admin/tree-sitter/treesit-admin.el
+	(treesit-admin--find-latest-compatible-revision): Pass through new arg
+	REVISION-TYPE.
+	(treesit-admin--last-compatible-grammar-for-modes): Optionally iterate
+	over tagged rather than all commits.
+	(treesit-admin--generate-compatibility-report): Generate a second table,
+	showing only tagged commits (bug#78848).
+
+2025-06-23  Peter Oliver  <git@mavit.org.uk>
+
+	New function treesit--language-git-version-tags
+
+	* lisp/treesit.el (treesit--language-git-version-tags): New function to
+	  list version tags for a Tree-sitter parser Git repository (bug#78848).
+
+2025-06-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(smerge-refine-shadow-cursor): New variable and face (bug#78806)
+
+	* lisp/vc/smerge-mode.el (smerge-refine-shadow-cursor): New variable
+	and face.
+	(smerge-refine-regions): Add `cursor-sensor-functions` property
+	to the covering overlays.
+	(smerge--refine-at-right-margin-p, smerge--refine-shadow-cursor):
+	New functions.
+	(smerge--refine-other-pos): New function, extracted from
+	`smerge-refine-exchange-point`.
+	(smerge-refine-exchange-point): Use it.
+	(smerge--refine-highlight-change): Add thin
+	highlighted space for insertion/deletion positions.
+
+	* lisp/emacs-lisp/cursor-sensor.el (cursor-sensor--detect):
+	Run functions for `moved` events.  Demote errors.
+	(cursor-sensor-mode): Adjust docstring accordingly.
+
+	* doc/lispref/text.texi (Special Properties) <cursor-sensor-functions>:
+	Mention the new `moved` direction.
+
+2025-06-22  Jim Porter  <jporterbugs@gmail.com>
+
+	When navigating to anchor targets in EWW, retain 'eww-data' properties
+
+	Previously, navigating to an in-page anchor target would clear
+	'eww-data', removing many important properties like the original source
+	and the DOM.  Among other things, this prevented enabling/disabling
+	readable mode.
+
+	* lisp/net/eww.el (eww-follow-link): Copy previous 'eww-data'.
+
+2025-06-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp: Cache also `file-executable-p' in `file-name-all-completions'
+
+	* lisp/net/tramp-archive.el (tramp-archive-autoload-file-name-regexp):
+	Fix comment.
+
+	* lisp/net/tramp-sh.el (tramp-perl-file-name-all-completions):
+	Cache also `file-executable-p'.  Suggested by <mail@knazarov.com>.
+	(tramp-shell-file-name-all-completions): New script.
+	(tramp-bundle-read-file-names): Fix for special characters.  Cache
+	also `file-executable-p'.
+	(tramp-sh-handle-file-name-all-completions): Unify different cases.
+
+	* lisp/net/tramp.el (with-tramp-suspended-timers, without-remote-files):
+	Fix debug spec.
+
+2025-06-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'c-ts-mode' indentation when the style is defined as a function
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode, c++-ts-mode): Handle the
+	case where 'c-ts-mode-indent-style' is a function.  (Bug#78814)
+
+2025-06-22  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Pretiffy package-menu (Bug#78794)
+
+	Add package-menu mode-line which displays information about:
+	total number of packages installed, total number of packages
+	from all the packages archive, total number of packages to
+	upgrade and total number of new packages available.
+	Highlight packages marked for installation or deletion.
+	* lisp/emacs-lisp/package.el (package-menu-mode): Add package-menu
+	mode-line format to 'mode-line-misc-info'.
+	(package-mark-install-line, package-mark-delete-line): New faces.
+	(package-menu--overlay-line, package-menu--remove-overlay)
+	(package-menu--set-mode-line-format): New functions.
+	(package-menu-mark-delete, package-menu-mark-install)
+	(package-menu-mark-unmark, package-menu-backup-unmark)
+	(package-menu-mark-obsolete-for-deletion): Tweak for set/unset the
+	overlays.
+	(package-menu-mode-line-format, package-menu-mode-line-info): New
+	buffer-local variables.
+	(list-packages): Add 'package-menu--set-mode-line-format' to
+	'package--post-download-archives-hook'.
+
+	* etc/NEWS: Announce changes.
+
+2025-06-21  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/infra/gitlab-ci.yml (test-eglot): Fix EMACS_EXTRAOPT.
+
+2025-06-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	a2bfce5d2a7 ; Fix customization and doc strings in pp.el
+
+2025-06-21  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Avoid rebuilding a static alist inside a loop
+
+	* lisp/calendar/diary-lib.el (diary-mark-entries-1): Build
+	months-alist outside of the loop.  (Bug#78779)
+
+2025-06-21  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Support strings for electric pairs (bug#78053)
+
+	This add support for insert string pairs in 'electric-pairs-mode'.
+	* lisp/elec-pair.el (electric-pair-pairs)
+	(electric-pair-text-pairs): Add new defcustom types.
+	(electric-pair-syntax-info)
+	(electric-pair-post-self-insert-function): Add support for
+	strings.
+
+	* etc/NEWS: Announce changes.
+
+	* test/lisp/electric-tests.el: Add new tests.
+
+2025-06-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix setting custom 'c++-ts-mode' indent style
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode-set-style): Fix a typo.
+	(Bug#78814)
+
+2025-06-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid segfault when profiling Lisp programs with threads
+
+	* src/eval.c (backtrace_top): Don't segfault if current_thread is
+	NULL.  (Bug#76970)
+
+2025-06-21  Zach Shaftel  <zach@shaf.tel>
+
+	Fix byte-compilation of defalias with a constant macro cons pair
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-defalias):
+	Quote the function name in '(macro . function-name), since we eval
+	it later.
+	* test/lisp/emacs-lisp/bytecomp-tests.el
+	(test-eager-load-macro-expand-defalias): New test.
+	(Bug#78792)
+
+2025-06-21  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	python-ts-mode: Improve fontification
+
+	python--treesit-settings: Fontification based on selectors & code-conventions
+
+	- Constructor: Fontified as type, not function-call.
+	- Typed default parameters
+	- Fontify kwargs in function calls as property-use. Differentiate from
+	  variable-use (passed in arguments)
+
+2025-06-21  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Fix bold or underline of underscores (bug#78839)
+
+	* lisp/man.el (Man-fontify-manpage): Fix the "_\b_" case.
+
+2025-06-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'split-string' when TRIM is used
+
+	* lisp/subr.el (split-string): Support the case where STRING
+	begins with a match for SEPARATORS, and a match for SEPARATORS
+	also matches TRIM.  Doc fix.  (Bug#78690)
+
+	* test/lisp/subr-tests.el (subr-test-split-string): New test.
+
+2025-06-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(peg--merge-error) <guard>: Add missing method
+
+	Also clarify that the package requires at least Emacs-25.
+
+	* lisp/progmodes/peg.el (peg--merge-error) <guard>: Add missing method.
+
+2025-06-20  Juri Linkov  <juri@linkov.net>
+
+	Use keyword :commit with full hashes for treesit-language-source-alist.
+
+	* lisp/treesit.el (treesit-language-source-alist):
+	Document the format that uses keywords.
+	(treesit--install-language-grammar-1): Remove args
+	'revision', 'source-dir', 'cc', 'c++', 'commit'.
+	Use 'args' to process the keywords, and use the remaining
+	list as the previous list of arguments.
+	(treesit--install-language-grammar-1): Let-bind
+	'treesit--install-language-grammar-full-clone' and
+	'treesit--install-language-grammar-blobless' to t
+	when 'commit' is non-nil (bug#78542).
+
+	* lisp/progmodes/c-ts-mode.el:
+	* lisp/progmodes/cmake-ts-mode.el:
+	* lisp/progmodes/csharp-mode.el:
+	* lisp/progmodes/dockerfile-ts-mode.el:
+	* lisp/progmodes/elixir-ts-mode.el:
+	* lisp/progmodes/go-ts-mode.el:
+	* lisp/progmodes/heex-ts-mode.el:
+	* lisp/progmodes/java-ts-mode.el:
+	* lisp/progmodes/js.el:
+	* lisp/progmodes/json-ts-mode.el:
+	* lisp/progmodes/php-ts-mode.el:
+	* lisp/progmodes/python.el:
+	* lisp/progmodes/ruby-ts-mode.el:
+	* lisp/progmodes/rust-ts-mode.el:
+	* lisp/progmodes/sh-script.el:
+	* lisp/progmodes/typescript-ts-mode.el:
+	* lisp/textmodes/css-mode.el:
+	* lisp/textmodes/html-ts-mode.el:
+	* lisp/textmodes/markdown-ts-mode.el:
+	* lisp/textmodes/toml-ts-mode.el:
+	* lisp/textmodes/yaml-ts-mode.el:
+	Use the keyword :commit with full hashes instead of tags
+	in 'treesit-language-source-alist'.
+
+	* lisp/treesit-x.el (define-treesit-generic-mode):
+	Simplify the keyword :copy-queries.
+	(gitattributes-generic-ts-mode, liquid-generic-ts-mode):
+	Add keywords :commit and :copy-queries to :source.
+
+	* admin/tree-sitter/treesit-admin.el
+	(treesit-admin--unversioned-treesit-language-source-alist):
+	Handle :revision and :commit as well.
+	(treesit-admin--find-latest-compatible-revision):
+	Process the keywords in the recipe.
+
+2025-06-20  Michael Albinus  <michael.albinus@gmx.de>
+
+	Improve eglot tests on emba
+
+	* test/infra/gitlab-ci.yml (test-eglot): Use packages company and
+	yasnippet.
+
+	* test/lisp/progmodes/eglot-tests.el (eglot--call-with-timeout):
+	Skip on emba in case of timeout.  (Bug#78730)
+
+2025-06-20  Pip Cet  <pipcet@protonmail.com>
+
+	Revert "Avoid excessively large backtraces in ert-tests (bug#71988)"
+
+	This reverts commit 0264ab11181b1d49d8f07186599396d503f24d1f.
+
+2025-06-20  Robert Pluim  <rpluim@gmail.com>
+
+	Make tls tests use random port
+
+	* test/lisp/net/network-stream-tests.el (server-process-filter):
+	Remove 'message' call.
+	(make-tls-server): Try random ports until we find one that's
+	unused and use it.  Adjust all callers.
+
+2025-06-20  Robert Pluim  <rpluim@gmail.com>
+
+	Fix echo-server-with-dns for really broken systems
+
+	*test/lisp/net/network-stream-tests.el
+	(network-test--resolve-system-name): Check to see if we get any
+	address result at all (looking at you macOS).
+
+2025-06-20  Robert Pluim  <rpluim@gmail.com>
+
+	Fix echo-server-with-dns test
+
+	This test wasn't being run because the check for DNS was
+	inverted.
+
+	* test/lisp/net/network-stream-tests.el (echo-server-with-dns):
+	Use 'skip-when' instead of 'ert-skip'.
+
+2025-06-20  Pip Cet  <pipcet@protonmail.com>
+
+	Avoid excessively large backtraces in ert-tests (bug#71988)
+
+	* test/lisp/emacs-lisp/ert-tests.el (ert-test-run-tests-batch-expensive):
+	Temporarily make `cl-print-object' not print out vectors while running
+	the test.
+
+2025-06-20  Martin Rudalics  <rudalics@gmx.at>
+
+	Have 'split-window' forget previous window height (Bug#78835)
+
+	* lisp/window.el (split-window): When WINDOW has a
+	'quit-restore' parameter that specifies a previous height to
+	restore, remove that when splitting vertically.  It does more
+	harm than good now (Bug#78835).
+
+2025-06-20  Pip Cet  <pipcet@protonmail.com>
+
+	Make cl-random behave consistently for unusual arguments (bug#75105)
+
+	The old behavior was for (cl-random -1.0e+INF) to return NaN in about
+	one in eight million calls, and -1.0e+INF otherwise.  Other unusual
+	arguments were handled inconsistently as well.
+
+	* lisp/emacs-lisp/cl-extra.el (cl-random): Handle positive finite
+	arguments consistently, error for nonpositive or infinite arguments.
+	* test/lisp/emacs-lisp/cl-extra-tests.el (cl-extra-test-random): New
+	test.
+
+2025-06-19  Peter Oliver  <git@mavit.org.uk>
+
+	Eliminate redundant variable treesit-admin--builtin-language-sources
+
+	Nowadays, each mode populates treesit-language-source-alist when the
+	mode is required; we do not need to duplicate the information.
+
+	* admin/tree-sitter/treesit-admin.el
+	(treesit-admin--builtin-language-sources)
+	(treesit-admin-verify-major-mode-queries)
+	(treesit-admin--generate-compatibility-report): Eliminate variable
+	treesit-admin--builtin-language-sources.
+	(treesit-admin--generate-compatibility-report): bash-ts-mode is “clever”
+	and switches back to sh-mode if it thinks the current buffer does not
+	contain a Bash script (bug#78747).
+	(treesit-admin--builtin-modes): Add missing modes.
+	(treesit-admin--builtin-features): New variable, telling us which
+	features to require to populate treesit-language-source-alist.
+	(treesit-admin--populated-treesit-language-source-alist): New function,
+	to add everything we know to treesit-language-source-alist.
+	(treesit-admin--unversioned-treesit-language-source-alist): Return a
+	copy of treesit-language-source-alist with the version requirements
+	removed.
+	* test/infra/Dockerfile.emba: Make use of
+	treesit-admin--populated-treesit-language-source-alist (bug#78748).
+
+2025-06-19  Juri Linkov  <juri@linkov.net>
+
+	Fix repeat-echo-message-string for keys with hints (bug#78797).
+
+	* lisp/repeat.el (repeat-echo-message-string): For one character
+	use it to format hints.  For multi-key sequence first print it,
+	then use the last character to format hints in parenthesis.
+
+	* test/lisp/repeat-tests.el (repeat-tests-another-repeat-map): Add hints.
+	(repeat-tests-hints): Add test.
+
+2025-06-19  shipmints  <shipmints@gmail.com>
+
+	* admin/MAINTAINERS: Added myself as the vtable.el maintainer.
+
+2025-06-18  Michael Albinus  <michael.albinus@gmx.de>
+
+	Show test name in ERT progress bar
+
+	* lisp/emacs-lisp/ert.el
+	(ert--results-progress-bar-button-help-echo): New defun.
+	(ert--results-progress-bar-button): Use it.
+
+2025-06-18  shipmints  <shipmints@gmail.com>
+
+	Make savehist timer actually repeat
+
+	* lisp/savehist.el (savehist--manage-timer): Correct the
+	arguments to 'run-with-timer'.  Suggestion from Stéphane Marks
+	<shipmints@gmail.com>.  (Bug#78820)
+
+2025-06-18  Pip Cet  <pipcet@protonmail.com>
+
+	Remove eieio's ...-list-p predicate (bug#78782)
+
+	There seem to be no remaining callers of this function, which has not
+	been working for a while.
+
+	* lisp/emacs-lisp/eieio-core.el (eieio-backward-compatibility): Don't
+	mention "-list-p" predicate.
+	(eieio-defclass-autoload): Don't autoload predicate.
+	(eieio-defclass-internal): Remove code to generate list-p predicate.
+
+2025-06-18  Yuan Fu  <casouri@gmail.com>
+
+	Use treesit-thing-settings in python-ts-mode
+
+	* lisp/progmodes/python.el (python--thing-settings): New variable.
+	(python-ts-mode): Setup treesit-thing-settings.
+
+2025-06-18  Yuan Fu  <casouri@gmail.com>
+
+	Remove obsolete tree-sitter type-regexp vars
+
+	* lisp/treesit.el (treesit-text-type-regexp):
+	(treesit-sexp-type-regexp):
+	(treesit-sentence-type-regexp): Remove variables.
+
+2025-06-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	process-attributes uses CLOCK_BOOTTIME for uptime
+
+	* src/sysdep.c (get_host_uptime) [GNU_LINUX || CYGWIN || __ANDROID__]:
+	New function, replacing get_host_boot_time.
+	Use CLOCK_BOOTTIME instead of inspecting /proc/stat.
+	All callers changed.  This should be an even better way to fix Bug#63496.
+
+2025-06-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	process-attributes uses /proc/stat for boot time
+
+	With a Linux kernel, use /proc/stat rather than get_boot_time
+	to get boot time, since when Emacs is running in a container
+	we want the underlying host boot time, not the container boot time.
+	This should be a better way to fix Bug#63496.
+	* src/sysdep.c: Do not include boot-time.h.
+	(get_host_boot_time) [GNU_LINUX || CYGWIN || __ANDROID__]:
+	New function.
+	(system_process_attributes) [GNU_LINUX || CYGWIN || __ANDROID__]:
+	Use it instead of get_boot_time.
+
+2025-06-17  Mattias Engdegård  <mattiase@acm.org>
+
+	Fix function arity check for noncompiled callees (bug#78685)
+
+	This fixes a regression from Emacs 29, and is the second attempt after
+	the later reverted 8b0f5b0597.
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-fdefinition):
+	Make it work for functions that aren't compiled.
+	* test/lisp/emacs-lisp/bytecomp-tests.el (bytecomp-tests--f):
+	(bytecomp-tests--warn-arity-noncompiled-callee): Add test.
+
+2025-06-17  Mattias Engdegård  <mattiase@acm.org>
+
+	* doc/lispref/functions.texi (Closures): Rewrite outdated text.
+
+2025-06-17  Stephen Berman  <stephen.berman@gmx.net>
+
+	Fix regression in 'kill-this-buffer' (bug#78809)
+
+	This restores the ability to use 'kill-this-buffer' when a
+	keyboard event pops up the Global Menu.  Instead of raising an
+	error if the command was not called by a mouse event, an error is
+	now raised if it was not called from a menu or a tool bar.
+
+	* lisp/menu-bar.el (kill-this-buffer): Remove optional EVENT from
+	argument list and "e" code from interactive spec.  Adjust doc
+	string.  Use 'last-command-event' to determine if command was
+	called from a menu or a tool bar.  Use 'event--posn-at-point' in
+	test for frame.
+
+	* lisp/net/eudc-hotlist.el (eudc-hotlist-quit-edit):
+	* lisp/net/eudc.el (eudc-display-records, eudc-query-form):
+	* lisp/vc/pcvs.el (cvs-mode-map): Replace uses of
+	'kill-this-buffer' by 'kill-current-buffer'.
+
+2025-06-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Prevent redisplay slowdown with non-zero vscroll
+
+	* src/xdisp.c (try_scrolling): Don't loop when the
+	partially-visible cursor line is at the top of the window.  This
+	looping are pointless, and just makes redisplay slow for no reason.
+	(Bug#78766)
+
+2025-06-17  Andrea Corallo  <acorallo@gnu.org>
+
+	Make nativecomp don't error when encountering undeclared types (bug#6573)
+
+	* test/src/comp-resources/comp-test-funcs.el (comp-test-76573-1-f): New
+	function.
+	* lisp/emacs-lisp/comp-cstr.el (comp-supertypes): Don't error if 'type'
+	is unknown.
+
+2025-06-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	register.el: Fix use of `cl-find-class`
+
+	`declare-function` doesn't cut it because the function can get
+	called without having loaded `cl-extra` beforehand.
+	Use `cl--find-class` instead, since that one gets inlined.
+
+	* lisp/register.el: Require `cl-macs`.
+	(register--get-method-type): Use `cl--find-class`.
+	(cl-find-class): Don't declare.
+
+2025-06-16  James Thomas  <jimjoe@gmx.net>
+
+	Add repeat map for tab-bar-history (bug#78804)
+
+	Add repeat map similar to that of winner-mode (to which
+	tab-bar-history is an alternative).
+
+	* lisp/tab-bar.el (tab-bar-history-repeat-map): Make the change.
+
+2025-06-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	process-attributes now uses get_boot_time
+
+	I noticed this issue while looking into Bug#63496.
+	GNU Emacs does not infer the boot time consistently on GNU/Linux
+	and similar platforms: android_notifications_notify_1 and
+	get_boot_sec use Gnulib’s boot-time module, but process-attributes
+	has idiosyncratic code that evidently predates that module.
+	The idiosyncratic code returns an unstable etime, which is a minor bug.
+	Simplify process-attributes by just using Gnulib.
+	This returns a stable etime.
+	It may also fix Bug#63496; if not, we can fix Gnulib later.
+	* src/sysdep.c: Include <boot-time.h>.
+	(get_up_time) [GNU_LINUX || CYGWIN || __ANDROID__]: Remove.
+	(system_process_attributes) [GNU_LINUX || CYGWIN || __ANDROID__]:
+	Use get_boot_time instead of get_up_time.
+
+2025-06-15  Mattias Engdegård  <mattiase@acm.org>
+
+	* src/bytecode.c (exec_byte_code): Remove superfluous condition
+
+	Bytecode should never be able to set anything to Qunbound because that
+	value is not accessible from Lisp.  Found by Pip Cet.
+
+2025-06-15  Mattias Engdegård  <mattiase@acm.org>
+
+	* src/fns.c (mapcar1): Less lax type checking
+
+	Previously, mapcar etc would crash or return nonsense when passed a
+	record.  Found by Pip Cet.
+
+2025-06-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	df3fb94f091 Insert missing step to make use of directory tracking OSC...
+	1bed2949583 * lisp/keymap.el (keymap-set): Refer to 'key-description'...
+	941158fc133 Support new tree-sitter grammar filename format (bug#78754)
+	888f846d377 Fix crash when evaluating "(signal nil 5)" (bug#78738)
+	51b9e92ab8e Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
+	c0a913ea4f3 ; * doc/lispref/modes.texi (Font Lock Basics): Remove old...
+	37de076017a Adapt emba integration (don't merge)
+
+2025-06-14  Steven Allen  <steven@stebalien.com>
+
+	Improve documentation of the internal Lisp_Process->status field
+
+	Contrary to the existing documentation here, the value of this
+	field cannot be the symbols open or closed.  Furthermore, this
+	field is never set to "stop" for network connections.
+	* src/process.h (Lisp_Process): Improve/fix documentation of the
+	'status' field.  (Bug#78784)
+
+2025-06-14  Zach Shaftel  <zach@shaf.tel>
+
+	Fix segfault in profiler-cpu-log and profiler-memory-log (bug#78763)
+
+	* src/profiler.c (export_log): Check if a log has been allocated first,
+	and return nil if it hasn't.
+	(Fprofiler_cpu_log, Fprofiler_memory_log): Doc fix.
+	* test/src/profiler-tests.el (profiler-tests-cpu-profiler)
+	(profiler-tests-memory-profiler): New tests.
+
+2025-06-14  Steven Allen  <steven@stebalien.com>
+
+	mailcap: Treat .ics files as text/calendar
+
+	This ensures iCalendar attachments are always displayed correctly
+	(via `gnus-icalendar-mm-inline'), even when they have an incorrect
+	MIME type (looking at you Google Calendar).
+	* lisp/net/mailcap.el (mailcap-mime-extensions): Add a mapping from ".ics"
+	to "text/calendar".  (Bug#78764)
+
+2025-06-14  Jacob S. Gordon  <jacob.as.gordon@gmail.com>
+
+	world-clock: Add user option to control order of entries
+
+	* lisp/time.el (world-clock-sort-order): Add user option.
+	(world-clock--sort-entries): Add auxiliary sorting function.
+	(world-clock-display): Sort entries based on the new user option.
+	(Bug#78678)
+
+2025-06-14  Jacob S. Gordon  <jacob.as.gordon@gmail.com>
+
+	calc: Allow strings with character codes above Latin-1
+
+	The current behavior of the functions 'calc-display-strings',
+	'strings', and 'bstrings' is to skip any vector containing
+	integers outside the Latin-1 range (0x00-0xFF).  We introduce a
+	custom variable 'calc-string-maximum-character' to replace this
+	hard-coded maximum, and to allow vectors containing higher
+	character codes to be displayed as strings.  The default value
+	of 0xFF preserves the existing behavior.
+
+	* lisp/calc/calc.el (calc-string-maximum-character): Add custom
+	variable 'calc-string-maximum-character'.
+	* lisp/calc/calccomp.el (math-vector-is-string): Replace hard-coded
+	maximum with 'calc-string-maximum-character', and the 'natnump'
+	assertion with 'characterp'.  The latter guards against the
+	maximum being larger than '(max-char)', but not on invalid types of
+	the maximum such as strings.
+
+	* test/lisp/calc/calc-tests.el (calc-math-vector-is-string): Add
+	tests for 'math-vector-is-string' using different values of
+	'calc-string-maximum-character'.
+
+	* doc/misc/calc.texi (Quick Calculator, Strings, Customizing Calc):
+	Add variable definition for 'calc-string-maximum-character' and
+	reference thereof when discussing 'calc-display-strings'.
+	Generalize a comment about string display and availability of 8-bit
+	fonts.
+	(Bug#78528)
+
+2025-06-14  Roi Martin  <jroi.martin@gmail.com>
+
+	Add semantic linefeed support for paragraph filling
+
+	* lisp/textmodes/fill.el (fill-region-as-paragraph-semlf): Add function
+	to fill a region using semantic linefeeds as if it were a single
+	paragraph.
+	(fill-paragraph-semlf): Add function to fill paragraph using semantic
+	linefeeds.
+	* test/lisp/textmodes/fill-tests.el
+	(fill-test-fill-region-as-paragraph-semlf)
+	(fill-test-fill-paragraph-semlf)
+	(fill-test-fill-paragraph-semlf-fill-paragraph-function)
+	(fill-test-fill-paragraph-semlf-justify)
+	(fill-test-fill-paragraph-semlf-sentence-end-double-space)
+	(fill-test-fill-paragraph-semlf-fill-column)
+	(fill-test-fill-paragraph-semlf-punctuation-marks)
+	(fill-test-fill-paragraph-semlf-twice)
+	(fill-test-fill-paragraph-semlf-fill-prefix)
+	(fill-test-fill-paragraph-semlf-indented-block)
+	(fill-test-fill-paragraph-semlf-revert)
+	(fill-test-fill-paragraph-semlf-emacs-lisp-mode)
+	(fill-test-fill-paragraph-semlf-c-mode)
+	(fill-test-fill-paragraph-semlf-org-mode)
+	(fill-test-fill-paragraph-semlf-markdown-mode): Add tests.
+	* test/lisp/textmodes/fill-resources/semlf-c-mode.erts:
+	* test/lisp/textmodes/fill-resources/semlf-emacs-lisp-mode.erts:
+	* test/lisp/textmodes/fill-resources/semlf-fill-column.erts:
+	* test/lisp/textmodes/fill-resources/semlf-fill-paragraph-function.erts:
+	* test/lisp/textmodes/fill-resources/semlf-fill-prefix.erts:
+	* test/lisp/textmodes/fill-resources/semlf-fill-region-as-paragraph.erts:
+	* test/lisp/textmodes/fill-resources/semlf-indented-block.erts:
+	* test/lisp/textmodes/fill-resources/semlf-justify.erts:
+	* test/lisp/textmodes/fill-resources/semlf-markdown-mode.erts:
+	* test/lisp/textmodes/fill-resources/semlf-org-mode.erts:
+	* test/lisp/textmodes/fill-resources/semlf-punctuation-marks.erts:
+	* test/lisp/textmodes/fill-resources/semlf-revert.erts:
+	* test/lisp/textmodes/fill-resources/semlf-sentence-end-double-space.erts:
+	* test/lisp/textmodes/fill-resources/semlf-twice.erts:
+	* test/lisp/textmodes/fill-resources/semlf.erts: Add test data.  (Bug#78561)
+
+2025-06-14  Philip Kaludercic  <philipk@posteo.net>
+
+	* doc/misc/rcirc.texi: Rephrase recent addition
+
+	https://lists.gnu.org/archive/html/emacs-devel/2025-06/msg00184.html
+
+2025-06-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Support 'C-g C-g C-g' "urgent quit" feature on MS-Windows
+
+	* src/w32fns.c (post_character_message): Support triple-C-g.
+	(Bug#78737)
+
+2025-06-13  Dmitry Gutov  <dmitry@gutov.dev>
+
+	New user option: vc-allow-async-diff
+
+	Centralize the control for whether 'vc-diff' is asynchronous
+	across the backends, while also allowing 'vc-BACKEND-diff' to be
+	called asynchronously when needed.  Previously in bug#21969.
+
+	* lisp/vc/vc.el (vc-allow-async-diff): New user option.
+
+	* lisp/vc/vc.el (vc-version-diff, vc-diff, vc-diff-mergebase)
+	(vc-root-diff): Obey it.
+
+	* lisp/vc/log-view.el (log-view-diff-common): Same.
+
+	* lisp/vc/vc-annotate.el
+	(vc-annotate-show-diff-revision-at-line-internal): Same.
+
+	* lisp/vc/vc-git.el (vc-git-diff): Follow the ASYNC argument.
+
+	* lisp/vc/vc-hg.el (vc-hg-diff): Same.
+
+	* lisp/vc/vc-rcs.el (vc-rcs-diff): Same.
+
+2025-06-12  Juri Linkov  <juri@linkov.net>
+
+	Add 'treesit-sexp-thing' to use instead of 'treesit-sexp-type-regexp'.
+
+	* lisp/treesit.el (treesit-sexp-thing): New variable to use
+	instead of 'treesit-sexp-type-regexp'.
+	(treesit-sexp-thing-down-list): Rename from 'treesit-sexp-type-down-list'.
+	(treesit-sexp-thing-up-list): Rename from 'treesit-sexp-type-up-list'.
+	(treesit-forward-sexp, treesit--forward-list-with-default)
+	(treesit-down-list, treesit-up-list): Update references to the
+	above variables.
+	(treesit-cycle-sexp-thing): Rename from 'treesit-cycle-sexp-type'.
+
+	* lisp/progmodes/elixir-ts-mode.el (elixir-ts-mode): Update same variables.
+
+	* lisp/progmodes/heex-ts-mode.el (heex-ts-mode): Set these variables
+	instead of calling the function that sets them.
+
+	* lisp/progmodes/python.el (python-ts-mode): Check if variables
+	'treesit-sentence-type-regexp' and 'treesit-sexp-type-regexp' are bound.
+
+	https://lists.gnu.org/archive/html/emacs-devel/2025-06/msg00182.html
+
+2025-06-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-finish-logentry: Fix syncing buffers: include whole fileset
+
+	* lisp/vc/vc-dispatcher.el (log-edit-vc-backend)
+	(vc-buffer-sync-fileset): Declare.
+	(vc-finish-logentry): Call vc-buffer-sync-fileset instead of
+	just vc-buffer-sync.
+
+2025-06-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	log-edit-diff-fileset: Pass NOT-ESSENTIAL non-nil to vc-diff
+
+	* lisp/vc/log-edit.el (log-edit-diff-fileset): Pass
+	NOT-ESSENTIAL non-nil to vc-diff.
+
+2025-06-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Replace vc-async-checkin-backends with a backend properties function
+
+	* lisp/vc/vc-git.el (vc-git-async-checkins):
+	* lisp/vc/vc-hg.el (vc-hg-async-checkins):
+	* lisp/vc/vc.el (vc-default-async-checkins): New functions.
+	(vc-checkin): Use them.
+	(vc-async-checkin-backends): Delete.
+
+2025-06-12  Stephane Zermatten  <szermatt@gmx.net>
+
+	Handle OSC sequences in term (bug#78263)
+
+	Handlers can be registered to term-osc-handler, which by defaults,
+	supports OSC 0, 2, 7 and 8, using handlers defined in ansi-osc.
+	Unknown OSC sequences are ignored.
+
+	* lisp/term.el (term-emulate-terminal): Handle OSC sequences.
+	(term-osc-handler): New configuration variable.
+	(term-control-seq-regexp): Extended regexp.
+	(term--osc-max-bytes): New private constant.
+	* lisp/ansi-osc.el (ansi-osc-handler): Handle OSC 0 like OSC 2.
+	* test/lisp/term-tests.el (term-ignore-osc, term-handle-osc)
+	(term-call-ansi-osc-handlers): New tests.
+
+2025-06-12  Paul Nelson  <ultrono@gmail.com>
+
+	Add simpler binds for calendar month/year navigation
+
+	* lisp/calendar/calendar.el (calendar-mode-map): Add keybindings
+	'{' and '}' for month navigation, '[' and ']' for year
+	navigation (bug#78753).
+	* doc/emacs/calendar.texi (Calendar Unit Motion): Document
+	them.
+
+2025-06-11  Michael Albinus  <michael.albinus@gmx.de>
+
+	Make file-notify--call-handler more robust
+
+	* lisp/filenotify.el (file-notify--call-handler): Make it more
+	robust.  (Bug#78712)
+
+2025-06-11  Robert Pluim  <rpluim@gmail.com>
+
+	Normalize URL path correctly for http
+
+	* lisp/url/url-http.el (url-http-create-request): Prepend "/" if
+	it's missing from the filename.  (Bug#78640)
+
+2025-06-11  Alan Mackenzie  <acm@muc.de>
+
+	Amend CC Mode so that the test suite in XEmacs runs error free
+
+	* lisp/progmodes/cc-awk.el (awk-font-lock-keywords):
+	Reformulate this using backquote and ,@.  Only include the
+	entry for _" in Emacs.
+
+	* lisp/progmodes/cc-defs.el (c--mapcan, c--set-difference)
+	c--intersection, c--macroexpand-all, c--delete-duplicates): No
+	longer use the existence of cl-lib.el as the criterion for
+	what to expand to.
+	(c-min-property-position): Use c-next-single-property-change
+	rather than next-single-property-change.  This now works in
+	XEmacs.
+
+	* lisp/progmodes/cc-engine.el
+	(c-invalidate-sws-region-after-del)
+	(c-invalidate-sws-region-after-ins, c-forward-sws)
+	(c-backward-sws, c-find-decl-spots): Replace
+	next/previous-single-property-change by
+	c-next/previous-single-property-change to ensure functionality
+	in XEmacs.
+	(c-forward-sws, c-backward-sws): Handle NO-BREAKING-SPACE as
+	whitespace.  This corrects the error in hardspace.c in the test
+	suite.
+
+	* lisp/progmodes/cc-fonts.el (c-font-lock-ml-strings): Refactor
+	some nested `if's into a cond form.  Don't fontify multiline
+	string delimiters in XEmacs, in keeping with its string
+	conventions.
+
+	* lisp/progmodes/cc-langs.el (c-populate-syntax-table): Set the
+	syntax of NO-BREAKING-SPACE to whitespace rather than
+	punctuation.
+
+	* lisp/progmodes/cc-mode.el (c-before-change): Use
+	c-previous-single-property-change rather than
+	previous-single-property-change to ensure functionality in
+	XEmacs.
+
+2025-06-11  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-next-action: Leave files unregistered if user aborts the checkin
+
+	* lisp/vc/vc.el (vc-only-files-state-and-model):
+	Don't call vc-register.
+	(vc-checkin): New REGISTER parameter.
+	Call vc-register when it's non-nil.
+	(vc-next-action): Pass new REGISTER parameter to vc-checkin.
+
+2025-06-11  Juri Linkov  <juri@linkov.net>
+
+	* test/lisp/repeat-tests.el: Add a command for global continue.
+
+	(repeat-tests-call-g): New command (bug#78742).
+	Put 'repeat-continue' with t on this symbol.
+	(repeat-tests-global-map): Bind it to 'C-M-g'.
+	(repeat-tests-continue-another): Add 'C-M-g' that should continue.
+
+2025-06-11  Paul Nelson  <ultrono@gmail.com>
+
+	Improve repeat-continue property handling
+
+	* lisp/repeat.el (repeat-get-map-sym): Support 'repeat-continue'
+	property value of t to continue any active repeat map (suggested
+	by Karthik Chikmagalur <karthikchikmagalur@gmail.com>).
+	Simplify logic so that repeat-continue does not interfere with
+	repeat-map activation.
+	(repeat-check-map): Allow commands with 'repeat-continue'
+	property value of t to continue without checking the key.
+	(repeat-mode): Update and tweak docstring.
+	* lisp/bind-key.el (bind-keys-form): Update handling of
+	':continue-only' keyword: only add keymap to 'repeat-continue'
+	if current value is a list.
+	(bind-keys): Update documentation, mirroring bind-keys-form.
+	* lisp/keymap.el (defvar-keymap): Update handling of ':continue'
+	keyword: only add keymap to 'repeat-continue' if current value
+	is a list.
+	* test/lisp/repeat-tests.el (repeat-tests-continue)
+	(repeat-tests-continue-another): Enable previously commented
+	tests that now work correctly.
+	* etc/NEWS: Update announcement of 'repeat-continue' (bug#78742).
+
+2025-06-11  Jim Porter  <jporterbugs@gmail.com>
+
+	Clean up text properties in 'visual-wrap-prefix-mode'
+
+	Before refontifying a region, remove any text properties we care about
+	so that we don't end up with stray properties.  Additionally, make sure
+	to remove all the properties when deactivating the mode.
+
+	* lisp/emacs-lisp/subr-x.el (add-remove--display-text-property): New
+	function, extracted from...
+	(add-display-text-property): ... here.
+	(remove-display-text-property): New function.
+
+	* lisp/visual-wrap.el (visual-wrap--remove-properties): New function...
+	(visual-wrap-prefix-function, visual-wrap-prefix-mode): ... call it.
+
+	* test/lisp/emacs-lisp/subr-x-tests.el
+	(subr-x-test-remove-display-text-property): New test.
+
+	* test/lisp/visual-wrap-tests.el
+	(visual-wrap-tests/wrap-prefix-stickiness, visual-wrap-tests/cleanup):
+	New tests.
+
+	* doc/lispref/display.texi (Display Property): Document
+	'remove-display-text-property'.
+
+	* etc/NEWS: Announce 'remove-display-text-property' (bug#76018).
+
+2025-06-11  Jim Porter  <jporterbugs@gmail.com>
+
+	Improve documentation for display property functions
+
+	Specifically, use the term "display specification" more consistently to
+	distinguish from "display property", which is the full value of the
+	'display' text property.
+
+	* src/xdisp.c (find_display_property): Rename PROP to SPEC.
+	(Fget_display_property): Rename PROP to SPEC and improve docstring.
+
+	* lisp/emacs-lisp/subr-x.el (add-display-text-property): Rename PROP to
+	SPEC and improve docstring.
+
+	* doc/lispref/display.texi (Display Property): Reword documentation to
+	more-consistently refer to display specifications.
+
+2025-06-11  Jim Porter  <jporterbugs@gmail.com>
+
+	Don't delete in-place when replacing a display property
+
+	When calling 'add-display-text-property' on a region of text that
+	already contains PROP, we first delete the old display specification
+	from the region.  If the region's 'display' property is a list of
+	display specifications, we need to avoid destructively modifying the
+	list; other regions of text could be using the same list object.  (For a
+	'display' property that's a vector or a single display spec, this
+	doesn't matter since we first make a new list in the code.)
+
+	In addition, be more careful when working with a display property like
+	((margin ...) ...).  This is a single display specification, not a list
+	of display specs.
+
+	* lisp/emacs-lisp/subr-x.el (add-display-text-property): Don't delete
+	in-place for list values.  Handle (margin ...) display specification
+	type correctly.
+
+	* test/lisp/emacs-lisp/subr-x-tests.el
+	(subr-x-test-add-display-text-property): Update test.
+
+2025-06-11  Protesilaos Stavrou  <info@protesilaos.com>
+
+	Update modus-themes to their version 4.8.0
+
+	* doc/misc/modus-themes.org (Preview theme colors):(Get a single color from the palette with ~modus-themes-get-color-value~):
+	(DIY Do not extend the region background, Note on SHR fonts): Fix some typos.
+	(Full support for packages or face groups): Include tmr in the
+	list of supported packages.
+	(Acknowledgements): Mention more people who have contributed to
+	the project in some capacity.
+
+	* etc/themes/modus-operandi-deuteranopia-theme.el:
+	* etc/themes/modus-operandi-theme.el:
+	* etc/themes/modus-operandi-tinted-theme.el:
+	* etc/themes/modus-operandi-tritanopia-theme.el:
+	* etc/themes/modus-vivendi-deuteranopia-theme.el:
+	* etc/themes/modus-vivendi-theme.el:
+	* etc/themes/modus-vivendi-tinted-theme.el:
+	* etc/themes/modus-vivendi-tritanopia-theme.el: Make small changes to the palette of each theme.
+
+	* etc/themes/modus-themes.el
+	(modus-themes-after-load-theme-hook): Reword the doc string
+	(modus-themes--rotate, modus-themes--rotate-p)
+	(modus-themes--next-in-rotation, modus-themes-rotate): Make
+	rotation optionally move in the opposite direction.
+	(modus-themes-faces): Tweak some faces.
+
+	Release notes: <https://protesilaos.com/codelog/2025-06-11-emacs-modus-themes-4-8-0/>.
+
+2025-06-11  Po Lu  <luangruo@yahoo.com>
+
+	* configure.ac: Detect Android API 36.
+
+2025-06-11  Po Lu  <luangruo@yahoo.com>
+
+	Port to Android API 36
+
+	* java/AndroidManifest.xml.in: Update targetSdkVersion to 36.
+
+	* java/INSTALL: Document revised compilation dependencies.
+
+	* java/org/gnu/emacs/EmacsActivity.java (interceptBackGesture):
+	New function.
+	(onCreate): Invoke the same to register back gesture callbacks
+	on Android 16 or better.
+
+	* java/org/gnu/emacs/EmacsWindow.java (onBackInvoked): New
+	function.
+
+	* src/keyboard.c (lispy_function_keys): Amend with new symbols
+	introduced in Android API 36.
+
+2025-06-10  Pip Cet  <pipcet@protonmail.com>
+
+	Print a message when failing to recover a file
+
+	* lisp/files.el (recover-session-finish): Call 'message' rather than
+	evaluating a string and a variable without using the result.
+
+2025-06-10  Juri Linkov  <juri@linkov.net>
+
+	* test/lisp/repeat-tests.el: Add a command to continue but not activate.
+
+	(repeat-tests-call-e): New command.
+	(repeat-tests-global-map): Bind it to 'C-M-e'.
+	(repeat-tests-another-repeat-map, repeat-tests-repeat-map):
+	Add 'repeat-tests-call-e' to :continue.
+	(repeat-tests-continue, repeat-tests-continue-another):
+	Add 'C-M-e' that should continue but not activate.
+
+2025-06-10  Yuan Fu  <casouri@gmail.com>
+
+	Add tree-sitter version of prog-fill-reindent-defun (bug#78703)
+
+	Add a tree-sitter version of prog-fill-reindent-defun that
+	indents the defun that encloses point, rather than the sibling
+	defun after point when there is one.
+
+	* lisp/progmodes/prog-mode.el:
+	(prog-fill-reindent-defun): Turns into a wrapper function.
+	(prog-fill-reindent-defun-function): New variable.
+	(prog-fill-reindent-defun-default): Old prog-fill-reindent-defun
+	becomes this function.
+	* lisp/treesit.el (treesit-fill-reindent-defun): New function.
+	(treesit-major-mode-setup): Setup
+	prog-fill-reindent-defun-function.
+
+2025-06-10  Yuan Fu  <casouri@gmail.com>
+
+	Extract out prog--text-at-point-p from prog-fill-reindent-defun
+
+	* lisp/progmodes/prog-mode.el (prog--text-at-point-p): New function.
+	(prog-fill-reindent-defun): Use new function.
+
+2025-06-10  Yuan Fu  <casouri@gmail.com>
+
+	Add new tactic to treesit-navigate-thing (bug#78703)
+
+	* doc/emacs/programs.texi (Moving by Defuns):
+	* doc/lispref/parsing.texi (User-defined Things): Describe the
+	new tactic.
+	* lisp/treesit.el (treesit-navigate-thing): Add new tactic.
+
+2025-06-09  Philip Kaludercic  <philipk@posteo.net>
+
+	Support checking auth-source for NickServ password for rcirc
+
+	* doc/misc/rcirc.texi: Mention new feature.
+	* etc/NEWS: Mention new feature.
+	* lisp/net/rcirc.el (rcirc-authinfo): Update type and documentation.
+	(rcirc-authenticate): Handle a special type to indicate that the
+	password is stored via auth-source.
+
+2025-06-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Prompt just once when deleting multiple files with C-x v v
+
+	* lisp/vc/vc.el (vc-delete-file): Accept lists of files in
+	addition to single files.
+	(vc-next-action): Call vc-delete-file once for all the files.
+
+2025-06-09  Philip Kaludercic  <philipk@posteo.net>
+
+	Require CertFP files for rcirc to exist
+
+	* lisp/net/rcirc.el (rcirc-authinfo): Adjust the types for the
+	key and certificate file from 'string' to 'file'.
+
+2025-06-09  Mattias Engdegård  <mattiase@acm.org>
+
+	Revert "Fix function arity check for noncompiled callees (bug#78685)"
+
+	This reverts commit 8b0f5b05976a99e82e54d6c602d47a8668ccd9d5.
+
+	This change wasn't quite right; the solution requires greater care.
+
+2025-06-09  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode-menu): Add 'bound-and-true-p'.
+
+	Use 'bound-and-true-p' for the case when 'subword-mode' is not loaded.
+
+2025-06-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	More language server on emba
+
+	* test/infra/Dockerfile.emba (emacs-eglot): Install also
+	typescript-language-server and vscode-json-languageserver.
+
+2025-06-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	Improve emba integration
+
+	* admin/notes/emba: Mention generated compatibility-report.html.
+
+	* test/infra/Dockerfile.emba (emacs-base): Install man-db.
+	(emacs-inotify): Don't install clangd.
+	(emacs-eglot): Derive from debian:trixie.  Install rust-analyzer.
+
+	* test/infra/gitlab-ci.yml (.job-template): Make actions in
+	after_script more robust.
+
+2025-06-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-next-action: On mixed state sets, treat missing files as removed
+
+	* lisp/vc/vc.el (vc-only-files-state-and-model, vc-next-action):
+	Add the 'missing' state to the set of compatible states for
+	mixed state actions.  This means you can commit removals of
+	files without first moving them to the 'removed' state.
+
+2025-06-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-next-action: Offer to delete missing files
+
+	* lisp/vc/vc.el (vc-next-action): Call vc-delete-file on a set
+	of missing files, to move them to the 'removed' state, instead
+	of just erroring out.
+
+2025-06-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'ffap-string-at-point' under 'ffap-file-name-with-spaces'
+
+	* lisp/ffap.el (ffap-file-name-with-spaces): Doc fix.
+	(ffap-string-at-point): Don't reject '~foo/' and 'd:/bar' file
+	names when 'ffap-file-name-with-spaces' is non-nil.
+
+	* test/lisp/ffap-tests.el (ffap-test-with-spaces): Add tests, and
+	fix expected results to not strip Windows drive letters.
+
+2025-06-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'save-some-buffers' when file name has embedded '%'
+
+	* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Don't assume the
+	prompt will never include the '%' character.  (Bug#78715)
+
+2025-06-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git: Properly track unstaged deletions
+
+	* lisp/vc/vc-git.el (vc-git--git-status-to-vc-state)
+	(vc-git-after-dir-status-stage): Return/set 'missing' VC state,
+	not 'removed' state, for unstaged deletions.
+	(vc-git-dir-status-goto-stage): Add 'ls-files-missing' stage.
+
+2025-06-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Inline sole call to vc-git--state-code
+
+	* lisp/vc/vc-git.el (vc-git--state-code): Delete.
+	(vc-git-after-dir-status-stage): Inline it here.
+
+2025-06-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	e4ba279b014 ; * doc/emacs/misc.texi (Network Security): Fix typo.
+	8fdb2d19b49 ; * lisp/treesit.el (treesit-beginning-of-defun): Doc fix...
+
+2025-06-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	cd57a05542b ; * etc/PROBLEMS: Improve the item about 'C-S-u' in PGTK ...
+
+2025-06-07  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Add option for not highlight parens inside comments or strings
+
+	* lisp/paren.el (show-paren-not-in-comments-or-strings):
+	New user option.  (Bug#78396)
+	(show-paren-function): Enclose code in 'catch' function.
+	* etc/NEWS: Announce changes.
+	* doc/emacs/programs.texi (Matching): Document new option.
+
+2025-06-07  JD Smith  <jdtsmith@gmail.com>
+
+	Fix vertical-motion when an image is at EOL under word-wrap
+
+	* src/xdisp.c (move_it_in_display_line_to): Fix return value under
+	word-wrap when a screen line ends with an image that "just fits".
+	(Bug#67604)
+
+2025-06-07  shipmints  <shipmints@gmail.com>
+
+	Add optional inherit argument to 'face-all-attributes' (bug#77945)
+
+	* lisp/faces.el (face-all-attributes): Add 'inherit' argument
+	and pass to 'face-attribute'.
+
+2025-06-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid whitespace-mode breaking standard-display-unicode-special-glyphs
+
+	* lisp/whitespace.el (whitespace-display-char-on): Copy from
+	'standard-display-table' if 'buffer-display-table' is nil.  This
+	avoids overwriting display-table customizations by features that
+	modify 'standard-display-table' for global effects.  (Bug#78522)
+
+2025-06-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Teach checkdoc about (:this that) in cl-defun
+
+	* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
+	Support more complex keyword args.  (Bug#78543)
+
+2025-06-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix semantic-utest-ia tests
+
+	* test/lisp/cedet/semantic-utest-ia.el (semantic-ia-utest): Clean
+	up better, to avoid affecting the next test.
+
+2025-06-07  Lin Sun  <sunlin7@hotmail.com>
+
+	* lisp/cedet/semantic.el: Turn off semantic-mode in all buffers (bug#76815),
+
+2025-06-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New revert-files VC backend function for faster mass reverts
+
+	* lisp/vc/vc-git.el (vc-git-revert-files):
+	* lisp/vc/vc-hg.el (vc-hg-revert-files):
+	* lisp/vc/vc.el (vc-revert-files): New functions.
+	(vc-revert-files): Incorporate vc-revert's calls to message here
+	so that the messages are displayed more consistently.
+	(vc-next-action, vc-default-checkin-patch, vc-revert): Use
+	vc-revert-files instead of vc-revert-file.
+
+2025-06-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix apparent thinko in vc-next-action
+
+	* lisp/vc/vc.el (vc-next-action): Pass an argument to
+	buffer-modified-p because the loop does not set the current
+	buffer before calling that function.
+
+2025-06-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC: Deprecate log-incoming and log-outgoing backend functions
+
+	* lisp/vc/vc-git.el (vc-git-incoming-revision):
+	Inline vc-git--fetch-incoming.
+	(vc-git--fetch-incoming, vc-git-log-incoming)
+	(vc-git-log-outgoing): Delete.
+	* lisp/vc/vc-hg.el (vc-hg-mergebase):
+	* lisp/vc/vc.el (vc-default-log-incoming)
+	(vc-default-log-outgoing): New functions.
+	* lisp/vc/vc.el:
+	* etc/NEWS: Document the deprecation.
+
+2025-06-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc.el: Update specification of print-log backend function.
+
+2025-06-06  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project-switch-to-buffer: Don't disambiguate too much
+
+	* lisp/progmodes/project.el (project--read-project-buffer):
+	Use the new function from 'uniquify' to generate buffer names that
+	are just unique to the current project, not globally (bug#77312).
+
+2025-06-06  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Add uniquify-get-unique-names (bug#77312)
+
+	This new function provides an interface to uniquify.el which doesn't
+	change the actual names of the buffers.  This is useful for any commands
+	which deal with a subset of all buffers; for example, project.el.
+
+	* lisp/uniquify.el (uniquify-rationalize--generic): Add.
+	(uniquify-rationalize, uniquify-rationalize-a-list)
+	(uniquify-rationalize-conflicting-sublist): Explicitly pass
+	RENAME-BUFFER-FN and GET-BUFFER-FN.
+	(uniquify--stateless-curname, uniquify-get-unique-names): Add.
+
+2025-06-05  Mattias Engdegård  <mattiase@acm.org>
+
+	Fix function arity check for noncompiled callees (bug#78685)
+
+	This is a regression from Emacs 29.
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-fdefinition):
+	Make it work for functions that aren't compiled.
+	* test/lisp/emacs-lisp/bytecomp-tests.el (bytecomp-tests--f):
+	(bytecomp-tests--warn-arity-noncompiled-callee): Add test.
+
+2025-06-05  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Tramp connection property
+
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
+	* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
+	Set "connected" property in time.
+
+2025-06-05  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>
+
+	* lisp/subr.el (play-sound): Update docstring (bug#78694).
+
+2025-06-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Delay running vc-checkin-hook for an async checkin
+
+	* lisp/vc/vc-git.el (vc-git-checkin):
+	* lisp/vc/vc-hg.el (vc-hg-checkin, vc-hg-checkin-patch): Run
+	vc-checkin-hook using vc-run-delayed.
+	* lisp/vc/vc.el (vc-checkin): Don't pass vc-checkin-hook to
+	vc-start-logentry when doing an async checkin.  That runs the
+	hook too early.
+
+2025-06-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of treesit "thing"
+
+	* src/treesit.c (syms_of_treesit):
+	* lisp/treesit.el (treesit-cycle-sexp-type):
+	(treesit-thing-at, treesit-thing-at-point): Doc fixes.
+
+	* doc/lispref/parsing.texi (User-defined Things): Improve
+	documentation of treesit "thing" and related functions; add
+	cross-references and indexing.
+
+2025-06-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cl-deftype): Silence spurious warnings in `xcb-types.el`
+
+	* lisp/emacs-lisp/cl-macs.el (cl-deftype): Don't warn if the predicate
+	doesn't use its argument, e.g. when the type is equivalent to `t`.
+
+2025-06-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(outline--hidden-headings-paths): Fix slow saves (bug#78665)
+
+	* lisp/outline.el: Prefer #' to quote function names.
+	(outline--end-of-previous): New function, extracted from
+	`outline-end-of-subtree`.
+	(outline-end-of-subtree): Use it.
+	(outline--hidden-headings-paths): Distinguish headings where just the
+	entry is hidden from those where a whole subtree is hidden (bug#78673).
+	(outline--hidden-headings-restore-paths): Adjust accordingly and don't
+	delegate to functions like `outline-hide-subtree` so as to avoid
+	an O(N²) behavior.
+
+2025-06-04  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-line.el: Use 'tab-line-event-start' in remaining functions.
+
+	(tab-line-switch-to-prev-tab, tab-line-switch-to-next-tab):
+	Use 'tab-line-event-start' instead of 'event-start'
+	like in all other functions.
+
+2025-06-04  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Update to Transient v0.9.1-7-gd7d2c1c2
+
+2025-06-04  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Factor out vc--with-backend-in-rootdir
+
+	* lisp/vc/vc.el (vc--with-backend-in-rootdir): New macro.
+	(vc-root-version-diff, vc-diff-mergebase, vc-root-diff)
+	(vc-print-root-log, vc-log-mergebase): Use it.
+	(vc-log-incoming, vc-log-outgoing): Use it here too in order to
+	prompt for a directory if current buffer is not VCS-controlled.
+
+2025-06-04  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	Better command subst fontification in bash-ts-mode (bug#78567)
+
+	* lisp/progmodes/sh-script.el (sh-mode--treesit-settings):
+	fontify command-substition command only.  Don't include
+	enclosing brackets.
+
+2025-06-04  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-line.el: Remove unnecessary checks for nil event.
+
+	(tab-line-hscroll-right, tab-line-hscroll-left)
+	(tab-line-switch-to-prev-tab, tab-line-switch-to-next-tab)
+	(tab-line-close-tab, tab-line-close-other-tabs):
+	Remove '(consp event)' to use the window returned by
+	'(posn-window (tab-line-event-start event))' even in case
+	when 'event' is nil.
+
+2025-06-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/progmodes/sh-script.el (sh-popup-occur-buffer): Remove unused var
+
+2025-06-03  Thierry Volpiatto  <thievol@posteo.net>
+
+	(lisp-imenu-generic-expression): Add `oclosure-define`
+
+	* lisp/emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression):
+	Add `oclosure-define` alongside the other type definition forms.
+
+2025-06-03  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-line.el: Use 'consp' on mouse events instead of 'listp'.
+
+	(tab-line-hscroll-right, tab-line-hscroll-left, tab-line-new-tab)
+	(tab-line-switch-to-prev-tab, tab-line-switch-to-next-tab)
+	(tab-line-close-tab, tab-line-close-other-tabs):
+	Replace '(listp event)' with '(consp event)' that allows
+	calling the functions non-interactively with nil event arguments.
+
+2025-06-03  Juri Linkov  <juri@linkov.net>
+
+	Restore c-ts-common-comment-setup in js-ts-mode and typescript-ts-mode.
+
+	* lisp/progmodes/js.el (js-ts-mode):
+	* lisp/progmodes/typescript-ts-mode.el (typescript-ts-base-mode):
+	Add 'c-ts-common-comment-setup' back removed in 8bccccedb65a
+	since it does more than setting comment variables (bug#78680).
+
+2025-06-03  Michael Albinus  <michael.albinus@gmx.de>
+
+	Add ansible password prompts to `comint-password-prompt-regexp'
+
+	* lisp/comint.el (comint-password-prompt-regexp):
+	* test/lisp/comint-tests.el (comint-testsuite-password-strings):
+	Add ansible password prompts. (Bug#78442)
+
+2025-06-02  Alan Third  <alan@idiocy.org>
+
+	Fix NS port screen geometry report (bug#76051)
+
+	* src/nsfns.m (Fns_display_monitor_attributes_list): Fix the arithmetic
+	to calculate the origin of the visible frame.
+
+2025-06-02  shipmints  <shipmints@gmail.com>
+
+	Fix ns_make_monitor_attribute_list (bug#76691)
+
+	This is the NS implementation for 'display-monitor-attributes-list'.
+	Change implementation from IORegistry to direct introspection
+	of NSScreen.
+
+	* src/nsfns.m (ns_make_monitor_attribute_list): Use localizedName
+	selector on NSScreen.  For anonymous displays, synthesize names
+	of the form ("%dx%d@%d,%d" width height x y).
+	(ns_get_name_from_ioreg) (ns_screen_name): Removed.
+
+2025-06-02  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp: Do not raise an error when not connected  (Bug#78572)
+
+	* lisp/net/tramp-cmds.el (tramp-cleanup-connection):
+	Use read syntax #' for `tramp-timeout-session',
+
+	* lisp/net/tramp.el (tramp-barf-if-file-missing): Do not raise an error
+	when not connected.  (Bug#78572)
+	(tramp-file-name-handler): Do not force the backtrace.
+	(tramp-connectable-p): Check also, whether initial handshake is finished.
+	(tramp-skeleton-directory-files)
+	(tramp-skeleton-directory-files-and-attributes)
+	(tramp-skeleton-set-file-modes-times-uid-gid): Rearrange sending
+	`file-missing' error.
+	(tramp-handle-access-file, tramp-handle-unlock-file):
+	Use `tramp-connectable-p'.
+
+	* test/lisp/net/tramp-tests.el (project-mode-line-format)
+	(project-mode-line): Declare.
+	(tramp-test48-session-timeout): New test.
+	(tramp-test49-auto-load, tramp-test49-delay-load)
+	(tramp-test49-recursive-load, tramp-test49-remote-load-path)
+	(tramp-test50-without-remote-files, tramp-test51-unload): Rename.
+
+2025-06-02  Collin Funk  <collin.funk1@gmail.com>
+
+	Pacify Clang's -Wformat-signedness.
+
+	* configure.ac: Enable -Wno-format-signedness if Clang is being used.
+
+2025-06-02  Yuan Fu  <casouri@gmail.com>
+
+	Fix typescript-ts-mode tenary indentation (bug#77901)
+
+	Fixes indentation for nested ternary expressions:
+
+	const a = cond1 ? 1 :
+	  cond2 ? 2 :
+	  cond3 ? 3 :
+	  cond 4: 5;
+
+	instead of
+
+	const a = cond1 ? 1 :
+	  cond2 ? 2 :
+	    cond3 ? 3 :
+	      cond 4: 5;
+
+	* lisp/progmodes/typescript-ts-mode.el:
+	(typescript-ts--standalone-parent-p): New function.
+	(typescript-ts-mode):
+	(tsx-ts-mode): Use new function.
+
+2025-06-01  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	Fontificatiomn improvements for typescrip-ts-mode.el (bug#78594)
+
+	- Fontify type-names for static function calls directly on types.
+	- Special-case "document" and "console" and constants/builtins.
+	- Fontify variable-use in string-interpolation expressions.
+	- Fontify variable-use in function-calls.
+	- Fontify variable-use in member-access expressions.
+	- Fontify variable-use in JSX-expressions.
+	- Fontify variable-use when using explicit nullability override.
+
+	* lisp/progmodes/typescript-ts-mode.el:
+	(tsx-ts-mode--font-lock-compatibility-bb1f97b):
+	(typescript-ts-mode--font-lock-settings): Improve font-lock settings.
+
+2025-06-01  Thierry Volpiatto  <thievol@posteo.net>
+
+	bovine/el.el: Tell CEDET how to parse `oclosure-define`
+
+	* lisp/cedet/semantic/bovine/el.el (oclosure-define): Add parser.
+
+2025-06-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc-bzr.el (vc-bzr-incoming-revision): New function.
+
+2025-06-01  Stephen Gildea  <stepheng+git-config-global@gildea.com>
+
+	time-stamp-tests: Hygienic macros
+
+	* test/lisp/time-stamp-tests.el (with-time-stamp-test-time,
+	time-stamp-should-warn, formatz-should-equal): Use cl-with-gensyms.
+
+2025-06-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New incoming-revision VC backend action
+
+	* lisp/vc/vc.el: New incoming-revision backend action (bug#62940).
+	* lisp/vc/vc-git.el (vc-git--fetch-incoming): New function,
+	factored out of vc-git-log-incoming.
+	(vc-git-log-incoming): Use it.
+	(vc-git-incoming-revision):
+	* lisp/vc/vc-hg.el (vc-hg-incoming-revision): New functions.
+
+2025-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(load-path-filter-cache-directory-files): Filter only for `must-suffix`
+
+	Most loads set the `must-suffix` (e.g. `require and
+	`autoload-do-load`), but some don't (e.g. `load-library`).
+	This results in two separate entries in
+	`load-path-filter--cache` with two hash-tables.  The entry for
+	`must-suffix=nil` is larger and much less often used than the
+	other, so just skip filtering when `must-suffix=nil`.
+	Reduces the memory size of the cache from ~1MB to ~400kB in my
+	test case.
+
+	* lisp/startup.el (load-path-filter-cache-directory-files):
+	Don't use a filtering cache when `must-suffix` is nil.
+
+2025-05-31  Matthew Tromp  <matthewktromp@gmail.com>  (tiny change)
+
+	Add additional keybindings for flymake diagnostics modes
+
+	This adds keybindings for C-o and C-m, and changes the bindings
+	for n and m, in `flymake-diagnostics-buffer-mode' and
+	`flymake-project-diagnostics-mode' buffers.
+
+	Previously, `flymake-project-diagnostics-mode' did not use the
+	keybindings for `flymake-diagnostics-buffer-mode'. RET and SPC
+	were never bound in `flymake-project-diagnostics-mode' buffers.
+	This seems to have been an oversight: since the filename and
+	message are buttons which call `flymake-goto-diagnostic',
+	pressing RET still brought users to the diagnostic at point
+	most of the time.  This change adds a
+	`flymake-project-diagnostics-mode-map' which inherits from
+	`flymake-diagnostics-buffer-mode-map'.
+
+	C-o and C-m now show and jump to the diagnostic currently at point,
+	similar to how `compilation-mode' works.
+
+	n and p now show the diagnostic newly under point after moving up or
+	down a line, which is also intended to make behavior more similar to
+	`compilation-mode'.
+
+	In order that other next-error buffers do not interfere with
+	navigation in the diagnostics buffers, this change introduces and
+	uses new functions, `next-error-this-buffer-no-select' and
+	`previous-error-this-buffer-no-select'. If we instead used
+	`next-error-no-select' and `previous-error-no-select', then a user
+	who runs `flymake-show-diagnostics-buffer', then e.g. `compile',
+	then returns to the diagnostics buffer and presses 'n', would be
+	navigated to the next error in the compilation buffer.
+
+	* lisp/progmodes/flymake.el (flymake-diagnostics-buffer-mode-map): Add
+	bindings.
+	(flymake-project-diagnostics-mode-map): Inherit bindings from
+	`flymake-diagnostics-buffer-mode'
+	* lisp/simple.el (next-error-this-buffer-no-select):
+	(previous-error-this-buffer-no-select): Add new commands.
+	(Bug#78619)
+
+2025-05-31  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Tramp bug#78508
+
+	* lisp/net/tramp-container.el (tramp-methods) <docker, dockercp, podman>
+	<podmancp, apptainer, nspawn>:
+	* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync>
+	<ssh, sshx, sudo>:
+	* lisp/net/tramp-sshfs.el (tramp-methods) <sshfs>: Set TERM environment.
+	(Bug#78508)
+
+	* lisp/net/tramp-sh.el (tramp-find-executable): Handle superlong PATH.
+	(tramp-set-remote-path): Simplify command.
+	(tramp-timeout-session): Add ;;;###tramp-autoload cookie.
+
+	* lisp/net/tramp-smb.el (tramp-smb-errors): Add string.
+	(tramp-smb-winexe-program): Adapt docstring.
+	(tramp-smb-handle-copy-directory, tramp-smb-handle-file-acl)
+	(tramp-smb-handle-set-file-acl, tramp-smb-maybe-open-connection):
+	Simplify argument handling.
+	(tramp-smb-handle-process-file): Flush " process-exit-status" property.
+	(tramp-smb-call-winexe): Set $winsize.Width to 102 only.
+
+	* lisp/net/tramp.el (tramp-process-sentinel): Adapt docstring.
+	Set " process-exit-status" property.
+
+	* test/lisp/net/tramp-tests.el (tramp--test-enabled):
+	Make it more robust.
+	(tramp-test18-file-attributes)
+	(tramp-test26-interactive-file-name-completion)
+	(tramp-test26-file-name-completion-boundaries)
+	(tramp-test35-remote-path): Adapt tests.
+
+2025-05-31  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	9dc6c21b414 ; * lisp/subr.el (setq-local): Doc fix (bug#78644).
+	1bb88a86cb3 Revert "; * lisp/subr.el (setq-local): Doc fix (bug#78644)."
+	cb9556d669c ; * lisp/subr.el (setq-local): Doc fix (bug#78644).
+	8881dca81c9 ; * doc/lispref/searching.texi (Char Classes): Add speedu...
+	4507b6a9c75 Fix bug in 'todo-jump-to-category' (bug#78608)
+
+2025-05-31  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	1d2ae31b8bc typescript-ts-mode: Improve function body indentation (bu...
+	421ecbcf6b4 ; * CONTRIBUTE: Explain the line-width preferences.
+
+2025-05-31  Matthias Meulien  <orontee@gmail.com>
+
+	ansi-osc.el: Use marker (bug#78184)
+
+	* lisp/ansi-osc.el (ansi-osc-apply-on-region)
+	(ansi-osc-filter-region): Use marker to properly handle
+	unfinished escape sequence.
+
+	* test/lisp/ansi-osc-tests.el (ansi-osc-tests--strings)
+	(ansi-osc-tests-apply-region-no-handlers)
+	(ansi-osc-tests-apply-region-no-handlers-multiple-calls)
+	(ansi-osc-tests-filter-region)
+	(ansi-osc-tests-filter-region-with-multiple-calls): Cover
+	bug#78184.
+
+2025-05-31  Eli Zaretskii  <eliz@gnu.org>
+
+	Remove unused user options in sh-script.el
+
+	* lisp/progmodes/sh-script.el (sh-indent-comment)
+	(sh-first-lines-indent, sh-indent-for-else): Remove variables that
+	are no longer obeyed.
+	(sh-var-list): Likewise.  (Bug#78592)
+
+2025-05-31  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Restore & obsolete vc-finish-logentry-hook
+
+	* lisp/vc/vc-dispatcher.el (vc-finish-logentry-hook): Declare,
+	document and mark obsolete.
+	(vc-finish-logentry): Call vc-finish-logentry-hook again.
+
+2025-05-31  Jim Porter  <jporterbugs@gmail.com>
+
+	Add more "safe" display specs to 'visual-wrap-prefix-mode'
+
+	* lisp/visual-wrap.el (visual-wrap--safe-display-specs): Add
+	'space-width' and 'min-width'.
+	(visual-wrap--display-property-safe-p): Use 'member' instead of 'memq'
+	to more-closely match the behavior of other code that works with display
+	properties.
+
+2025-05-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-finish-logentry: Don't run vc-finish-logentry-hook
+
+	* lisp/vc/vc-dispatcher.el (vc-finish-logentry): Don't run
+	undocumented, undeclared 'vc-finish-logentry-hook'.  There is
+	already 'vc-log-after-operation-hook'; it is not clear we need
+	both.
+
+2025-05-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Gather variable binding tests in data-tests.el
+
+	* test/lisp/emacs-lisp/lisp-tests.el (c-e-x, c-e-l):
+	Move to data-tests.el.
+	(core-elisp-tests-2-window-configurations): Rename ...
+	(core-elisp-tests-1-window-configurations): ... to this.
+	(core-elisp-tests-3-backquote): Rename ...
+	(core-elisp-tests-2-backquote): ... to this.
+	(core-elisp-tests-1-defvar-in-let)
+	(core-elisp-tests-4-toplevel-values): Move and rename ...
+	* test/src/data-tests.el (binding-test-defvar-in-let)
+	(binding-test-toplevel-values): ... to these.
+	(c-e-x, c-e-l): Moved from data-tests.el.
+
+2025-05-30  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix bug in `tramp-find-executable'
+
+	* lisp/net/tramp-sh.el (tramp-find-executable): Use "command -v",
+	preserving non-standard PATH search.  Bug#78633)
+
+2025-05-29  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project-remember-project: Support calling it interactively
+
+	* lisp/progmodes/project.el (project-remember-project):
+	Support interactive invocation (bug#78099) and react with
+	appropriate messages when called so, depending on the blacklist.
+
+2025-05-29  Juri Linkov  <juri@linkov.net>
+
+	Use 'outline-heading-end-regexp' consistently.
+
+	* lisp/outline.el (outline-font-lock-keywords):
+	For non-nil 'outline-search-function' also search for
+	'outline-heading-end-regexp' afterwards like there is
+	'outline-heading-end-regexp' at the end of the regexp counterpart.
+	(outline-minor-mode-highlight-buffer): Use 'outline-heading-end-regexp'
+	like in 'outline-font-lock-keywords' instead of "$".
+	For non-nil 'outline-search-function' also use
+	'outline-heading-end-regexp' the same way.
+
+	* lisp/help.el (describe-bindings): Remove unnecessary
+	buffer-local 'outline-heading-end-regexp'.
+
+2025-05-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New user option vc-dir-hide-up-to-date-on-revert
+
+	* lisp/vc/vc-dir.el (vc-dir-hide-up-to-date-on-revert):
+	New defcustom.
+	(vc-dir-revert-buffer-function): Use it.
+	* etc/NEWS: Document it.
+
+2025-05-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Factor out vc-async-checkin-backends
+
+	This allows third party backends to indicate they support async
+	checkins.
+
+	* lisp/vc/vc.el (vc-async-checkin-backends): New variable.
+	(vc-checkin): Use it.
+
+2025-05-29  Martin Rudalics  <rudalics@gmx.at>
+
+	Have 'delete-frame' delete initial daemon frame only if FORCE is non-nil
+
+	* src/frame.c (delete_frame): Delete initial daemon frame only
+	if FORCE is non-nil (Bug#78583).
+	(Fdelete_frame): Rewrite doc-string to mention that it can
+	delete an initial daemon frame if and only if FORCE is non-nil.
+	* etc/NEWS:
+	* doc/lispref/frames.texi (Deleting Frames): Mention that
+	'delete-frame' can delete an initial daemon frame if and only if
+	FORCE is non-nil.
+
+2025-05-28  Pip Cet  <pipcet@protonmail.com>
+
+	Fix unsafe SDATA usage in print.c (bug#78590)
+
+	* src/print.c (print_string_1): Renamed from 'print_string', with an
+	extra argument to disable nonascii escaping.
+	(print_string): New function.
+	(print_object): Use 'print_string_1', not 'strout'.
+
+2025-05-28  Juri Linkov  <juri@linkov.net>
+
+	* lisp/isearch.el (search-within-boundaries): Optimize (bug#78520).
+
+	For non-subregexp case, search for the first match and continue
+	from its position.  This avoids unnecessary scan for all text properties
+	until the first match.  When nothing is found, skip the entire body.
+
+2025-05-28  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Do child frame shortcut only on Cocoa (bug#78616)
+
+	* src/nsterm.m ([EmacsWindow constrainFrameRect:toScreen:]):
+	Return early for child frames only on Cocoa.
+
+2025-05-27  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-line.el: Make tab closing commands work without mouse.
+
+	(tab-line--current-tab): New function.
+	(tab-line-close-tab, tab-line-close-other-tabs): Use it
+	when the 'event' arg doesn't originate from mouse.
+	Suggested by pinmacs <pinmacs@cas.cat>.
+
+2025-05-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix exact matching of Ada tags by 'M-.'
+
+	* lisp/progmodes/etags.el (tag-exact-match-p): Support Ada tags
+	that have "/x" qualifiers appended to them.  (Bug#78489)
+
+2025-05-27  Martin Rudalics  <rudalics@gmx.at>
+
+	Have 'delete-other-frames' only delete frames on same terminal (Bug#78583)
+
+	* lisp/frame.el (delete-other-frames): Only delete frames on
+	same terminal as FRAME's (Bug#78583).
+
+2025-05-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/infra/gitlab-ci.yml (.job-template): Fix config.log name.
+
+2025-05-26  Jim Porter  <jporterbugs@gmail.com>
+
+	Don't add visual-wrap-prefix properties to unsafe multi-line display specs
+
+	This makes sure we don't interfere with other display specs, e.g. for
+	images displayed in 'image-mode' (bug#73600).
+
+	* lisp/visual-wrap.el (visual-wrap--safe-display-specs): New variable.
+	(visual-wrap--display-property-safe-p): New function.
+	(visual-wrap--apply-to-line): Use 'pos-eol'; we don't want to respect
+	field boundaries here.
+	(visual-wrap-prefix-function): Check for unsafe display properties at
+	the end of the line and skip past them if present.
+
+	* test/lisp/visual-wrap-tests.el: New test file.
+
+2025-05-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix DST time calculations on MS-Windows
+
+	* src/w32.c (w32_fix_tzset): New function.
+	* src/timefns.c (emacs_localtime_rz, tzlookup):
+	* src/w32.c (sys_localtime): Call 'w32_fix_tzset'.
+	(Bug#11281)
+
+2025-05-26  Xiyue Deng  <manphiz@gmail.com>
+
+	Make xoauth2 auth fail when a smtp server replies 334 (Bug#78366)
+
+	* lisp/mail/smtpmail.el (smtpmail-try-auth-method): Throw error 535
+	when receiving a "334 server challenge" reply.
+
+2025-05-25  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-line.el (tab-line-close-other-tabs): New command.
+
+	(tab-line-tab-context-menu): Bind 'tab-line-close-other-tabs'
+	to the menu item "Close other tabs".
+	Suggested by pinmacs <pinmacs@cas.cat>.
+
+2025-05-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt Emba files
+
+	* test/infra/Dockerfile.emba:
+	* test/infra/gitlab-ci.yml: Add me as maintainer.  Format.
+
+	* test/infra/Makefile.in (tree-sitter-files): Format.
+
+2025-05-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix detection of Dired with files whose name ends in a colon
+
+	* lisp/dired.el (dired-build-subdir-alist): Use a more general
+	regexp to detect file entries whose names end in a colon, when
+	various non-default 'ls' switches are used.  (Bug#78493)
+
+2025-05-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	df9636f8927 ; * doc/misc/use-package.texi (Hooks): Fix typo (bug#77609).
+	36afdd2f6f9 Fix documentation of use-package's ':hook' keyword
+	d0c90bc9bfe * test/infra/gitlab-ci.yml (.job-template): Make it more ...
+	b8f24cbdbb0 ; * lisp/emacs-lisp/find-func.el (find-function): Doc fix.
+	e0c6f3e7656 Fix todo-mode item insertion bug (bug#78506)
+	328b316764f Add support for Pyrefly LSP for Python
+
+2025-05-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	661fa578d51 Adapt Tramp version in customize-package-emacs-version-alist
+	0045a56d558 ; * ChangeLog.5: Delete entry for minor change.
+	1136aed6dc5 ; Update ChangeLog and AUTHORS for Emacs 30.2
+
+2025-05-24  Roi Martin  <jroi.martin@gmail.com>
+
+	Add baseline pass/fail tests for `ert-test-erts-file'
+
+	* test/lisp/emacs-lisp/ert-tests.el (ert-test-erts-pass)
+	(ert-test-erts-fail): Add tests to verify that the
+	`ert-test-erts-file' function can detect both passing a failing
+	test cases.
+	* test/lisp/emacs-lisp/ert-resources/erts-fail.erts:
+	* test/lisp/emacs-lisp/ert-resources/erts-pass.erts:
+	Add test data.  (Bug#78552)
+
+2025-05-24  Lin Sun  <sunlin7@hotmail.com>
+
+	Speed up loading modules
+
+	* src/lread.c (get-load-suffixes): Don't try loading modules with
+	suffixes from 'jka-compr-load-suffixes', since loading of
+	compressed shared libraries is not supported (so attempt to look
+	for them is just waste of cycles).  (Bug#78416.)
+
+2025-05-24  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Add load-path-filter-function and use it to optimize loading
+
+	When there are many directories on load-path, the part of load which
+	searches load-path can become very slow.  By filtering load-path up
+	front to only contain directories which are likely to contain the
+	searched-for file, load becomes much faster.
+
+	This can be set in early-init.el for maximum effect.
+
+	* lisp/startup.el (load-path-filter--cache)
+	(load-path-filter-cache-directory-files): Add.
+	* src/lread.c (Fload): Call load-path-filter-function.
+	(syms_of_lread): Add load-path-filter-function.
+
+2025-05-23  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/infra/Dockerfile.emba (emacs-tree-sitter): Cosmetic change.
+
+2025-05-23  Vincent Belaïche  <vincent.belaiche@sourceforge.net>
+
+	Minor fix.
+
+	* lisp/ses.el (ses--align): fix /Unused lexical variable 'half'/ warning.
+
+2025-05-23  Vincent Belaïche  <vincent.belaiche@sourceforge.net>
+
+	More SES printer functions.
+
+	* lisp/ses.el (ses-standard-printer-functions): add 'ses-left' &
+	'ses-left-span' to the list.
+	(ses--align): New helper function, takes most of the code
+	previously in 'ses-center'
+	(ses-center): Use 'ses--align'.
+	(ses--span):  New helper function, takes most of the code
+	previously in 'ses-center-span.
+	(ses-center-span): Use 'ses--span'.'
+	(ses-left): New function.
+	(ses-left-span): New function.
+
+2025-05-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(perform-replace): Make it work with F-keys in TTYs (bug#78113)
+
+	* lisp/replace.el (perform-replace): Use `read-key`.
+	* test/lisp/replace-tests.el (replace-tests-with-undo): Adjust accordingly.
+
+2025-05-22  Mattias Engdegård  <mattiase@acm.org>
+
+	Check diagnostic types in compile-tests
+
+	* test/lisp/progmodes/compile-tests.el
+	(compile-tests--test-regexps-data, compile--test-error-line)
+	(compile-test-functions): Check the types (error, warning or info) for
+	most patterns.  Use names instead of numbers in the reference.
+
+2025-05-22  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	Support Rust compiler messages in compile mode (bug#70794).
+
+	* etc/compilation.txt: Add examples of Rust compiler error, warning and
+	note messages.
+	* lisp/progmodes/compile.el
+	(compilation-error-regexp-alist-alist): Add Rust regexps for error,
+	warning and note messages.
+	* test/lisp/progmodes/compile-tests.el
+	(compile-tests--test-regexps-data): Add new test cases.
+	(compile-test-error-regexps): Increase expected errors.
+
+2025-05-22  Yuan Fu  <casouri@gmail.com>
+
+	Eglot: always call ElDoc callbacks in correct buffer (bug#78530)
+
+	Some minor modes adds their own eldoc display function to
+	'eldoc-display-functions' hook buffer-locally.  So when eldoc
+	uses 'eldoc-display-functions' to display docs, it should use
+	the buffer-local value of the hook.
+
+	But that's not always the case. In 'eldoc--invoke-strategy', the
+	code that runs 'eldoc-display-functions' hook is wrapped in a
+	callback function that eventually gets passed to each
+	documentation function in 'eldoc-documentation-functions'. So
+	now it's the documentation functions' responsibility to call the
+	eldoc callback in the original buffer.
+
+	All the eglot documentation functions indeed do that, using
+	'eglot--when-buffer-window' to switch to the original buffer
+	when calling the eldoc callback. But
+	'eglot-code-action-suggestion' is the exception, the callback is
+	called outside of the 'eglot--when-buffer-window' form.
+
+	This patch fixes that.
+
+	This bug was originally reported on eldoc-box [1]. The user
+	found that eldoc-box's display function are rarely called, even
+	though the minor mode is turned on. This patch fixes the issue.
+
+	[1] https://github.com/casouri/eldoc-box/issues/126#issuecomment-2896611278
+
+	* lisp/progmodes/eglot.el (eglot-code-action-suggestion): Move
+	the funcall form into the eglot--when-buffer-window form.
+
+2025-05-21  Lin Sun  <sunlin7@hotmail.com>
+
+	* lisp/emacs-lisp/find-func.el: Fix Eager macro-expansion failure
+
+	Bug#78446
+
+2025-05-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
+2025-05-21  Juri Linkov  <juri@linkov.net>
+
+	* 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'.
+
+2025-05-20  Juri Linkov  <juri@linkov.net>
+
+	* 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>.
+
+2025-05-19  Elijah Gabe Pérez  <eg642616@gmail.com>
+
+	lisp/progmodes/hideshow.el (hs--get-ellipsis): Simplify
+
+	Mostly using `truncate-string-ellipsis`.
+
+2025-05-19  Spencer Baugh  <sbaugh@janestreet.com>
+
+	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.
+
+2025-05-19  Martin Rudalics  <rudalics@gmx.at>
+
+	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).
+
+2025-05-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	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`.
+
+2025-05-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	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`.
+
+2025-05-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/net/eww.el: Remove redundant `:group` arguments
+
+2025-05-18  Michael Albinus  <michael.albinus@gmx.de>
+
+	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.
+
+2025-05-18  Sean Whitton  <spwhitton@spwhitton.name>
+
+	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.
+
+2025-05-18  Stephen Berman  <stephen.berman@gmx.net>
+
+	Amend Electric Pair mode documentation
+
+	* doc/emacs/programs.texi (Matching): Restore to the documentation
+	of Electric Pair mode the description of the use of a prefix
+	argument, which was overwritten by merging changes from the
+	emacs-30 branch, and clarify the usage.
+
+2025-05-18  Eli Zaretskii  <eliz@gnu.org>
+
+	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>.
+
+2025-05-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	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.
+
+2025-05-18  Po Lu  <luangruo@yahoo.com>
+
+	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)
+
+2025-05-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(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.
+
+2025-05-17  Eli Zaretskii  <eliz@gnu.org>
+
+	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)
+
+2025-05-17  Mattias Engdegård  <mattiase@acm.org>
+
+	* 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.
+
+2025-05-17  Mattias Engdegård  <mattiase@acm.org>
+
+	* 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.
+
+2025-05-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	299d3a44012 Fix saving abbrevs by 'abbrev-edit-save-buffer'
+	399d05332ed ; Remove confusing text from ELisp manual
+	feecb1fbc60 ; * doc/emacs/cmdargs.texi (General Variables): More accu...
+	18e1aabbeaa ; Improve documentation of the -L command-line option
+	c80fbe3f235 typescript-ts-mode: align ternary-chain branches (bug#78187)
+	16bfbc6fe31 ; Tramp test fixes
+	f0ac271da38 ; Time Stamps doc: Clearer customize recipe
+	49c06df224a ; * doc/lispref/variables.texi (Default Value): Update.
+	cbea5997c07 ; * lisp/mh-e/mh-e.el: Commentary: link to The MH-E Manual
+	0bf956235e3 Improve Tramp test
+	eaf01d034c0 * lisp/autorevert.el (auto-revert-remote-files): Adapt do...
+	e32bb816adb ; Improve documentation of ls-lisp.el
+	2d5f2434706 ; * lisp/emacs-lisp/comp.el (native-compile-prune-cache):...
+	bb735331650 Improve Electric Pair mode documentation (bug#78021)
+
+2025-05-17  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	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.
+
+2025-05-17  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Fix `eww-switch-to-buffer' when resorting to `eww'
+
+	* lisp/net/eww.el (eww-switch-to-buffer): Do not bind
+	`completion-extra-properties' before calling `eww'.
+	(bug#78372)
+
+2025-05-17  Richard Lawrence  <rwl@recursewithless.net>
+
+	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)
+
+2025-05-17  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	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
+
+2025-05-17  Eli Zaretskii  <eliz@gnu.org>
+
+	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)
+
+2025-05-16  Juri Linkov  <juri@linkov.net>
+
+	* 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).
+
+2025-05-15  Dmitry Gutov  <dmitry@gutov.dev>
+
+	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).
+
+2025-05-15  Sean Whitton  <spwhitton@spwhitton.name>
+
+	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.
+
+2025-05-15  Sean Whitton  <spwhitton@spwhitton.name>
+
+	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.
+
+2025-05-14  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	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.
+
+2025-05-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	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.
+
+2025-05-14  Juri Linkov  <juri@linkov.net>
+
+	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'.
+
+2025-05-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/emacs-lisp/cl-preloaded.el (cl--define-derived-type): Fix corner case
+
+2025-05-14  David Ponce  <da_vid@orange.fr>
+
+	lisp/emacs-lisp/cl-macs.el (cl--define-derived-type): Fix thinko
+
+2025-05-13  Eli Zaretskii  <eliz@gnu.org>
+
+	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)
+
+2025-05-13  Eli Zaretskii  <eliz@gnu.org>
+
+	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)
+
+2025-05-13  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: Fix cc-fonts.el errors for XEmacs.
+
+	* lisp/progmodes/cc-fonts.el (c-font-lock-cpp-messages): Use
+	c-put-font-lock-face rather than c-put-font-lock-string-face
+	since we don't have the double quote marks here that the latter
+	function corrects for.
+	(c-complex-decl-matchers): Replace cl-delete-duplicates with
+	the macro c--delete-duplicates.
+
+2025-05-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/README: Tests in *-tests/ directories are also performed.
+
+2025-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	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.
+
+2025-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(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>.
+
+2025-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	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.
+
+2025-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/comint.el (comint-delchar-or-maybe-eof): Obey global C-d binding
+
+	Fixes bug#78262.
+
+2025-05-12  Juri Linkov  <juri@linkov.net>
+
+	* 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'.
+
+2025-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	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.
+
+2025-05-12  Jens Schmidt  <jschmidt4gnu@vodafonemail.de>
+
+	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)
+
+2025-05-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	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.
+
+2025-05-12  Eli Zaretskii  <eliz@gnu.org>
+
+	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.
+
+2025-05-12  Sean Whitton  <spwhitton@spwhitton.name>
+	    Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	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.
+
+2025-05-11  Eli Zaretskii  <eliz@gnu.org>
+
+	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)
+
+2025-05-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Add test for file time-stamp granularity on MS-Windows
+
+	* test/src/fileio-tests.el
+	(fileio-tests-w32-time-stamp-granularity): New test.
+
+2025-05-11  Eli Zaretskii  <eliz@gnu.org>
+
+	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.
+
+2025-05-11  João Távora  <joaotavora@gmail.com>
+
+	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.
+
+2025-05-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix call hierarchy navigation again (bug#78367, bug#78250)
+
+	* lisp/progmodes/eglot.el (eglot--hierarchy-label): Fix again.
+
+2025-05-11  Sean Whitton  <spwhitton@spwhitton.name>
+
+	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.
+
+2025-05-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/emacs-lisp/cl-macs.el (cl--define-derived-type): Fix partial bootstrap
+
+2025-05-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	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.
+
+2025-05-10  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	0d493864cee Fix indentation of XML comments
+	1a2c29b5317 Improve Tramp's make-process handling for Solaris
+	a7dffc2ea38 Document 'time-stamp-time-zone' in Emacs Manual
+	0b4eb525b69 Make treesit--simple-indent-eval more permissive (bug#78065)
+	ed7b55f6bf1 Adapt Tramp tests
+	b172a1478c1 ; * doc/lispref/tips.texi (Library Headers): Fix wording ...
+	81629b2b2ba ; * lisp/gnus/mail-source.el (mail-sources): Fix a typo (...
+
+2025-05-10  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	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)
+
+2025-05-10  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Fall back `eww-switch-to-buffer' to `eww'
+
+	* lisp/net/eww.el (eww-switch-to-buffer): When no EWW buffers
+	exist, call `eww' instead.
+	(eww-list-buffers): Do not pop to *eww buffers* when there is no
+	EWW buffers.  (Bug#77967)
+
+2025-05-09  Vincent Belaïche  <vincent.belaiche@biosency.com>
+
+	ix bugs when a SES buffer has named cells, and another don't.
+
+	* lisp/ses.el (ses-list-named-cells): Give a message when the list is empty.
+	(ses--unbind-cell-name): Do not throw error in a SES buffer w/o
+	any named cell for gethash from 'ses--named-cell-hashmap' being
+	'nil'.
+
+2025-05-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Create new test/lisp/vc/vc-tests/ for vc.el tests
+
+	* test/lisp/vc/vc-tests.el: Move ...
+	* test/lisp/vc/vc-tests/vc-tests.el: ... to here.
+	* test/lisp/vc/vc-misc-tests.el: Move ...
+	* test/lisp/vc/vc-tests/vc-test-misc.el: ... to here.
+
+2025-05-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New vc-async-checkin user option
+
+	* lisp/vc/vc.el (vc-async-checkin): New option.
+	(vc-checkin): Don't use with-vc-properties on or display
+	messages around asynchronous checkins.
+	* lisp/vc/vc-git.el (vc-git-checkin):
+	* lisp/vc/vc-hg.el (vc-hg-checkin, vc-hg-checkin-patch): Perform
+	an async checkin operation when vc-async-checkin is non-nil.
+	* doc/emacs/vc1-xtra.texi (General VC Options):
+	* etc/NEWS: Document the new option.
+
+	* lisp/vc/vc-dispatcher.el (vc-wait-for-process-before-save):
+	New function.
+	(vc-set-async-update): If the current buffer visits a file, call
+	vc-refresh-state.
+	* lisp/vc/vc-hg.el (vc-wait-for-process-before-save): Autoload.
+	(vc-hg--async-command, vc-hg--async-buffer, vc-hg--command-1):
+	New utilities, partially factored out of vc-hg-command.
+	(vc-hg-merge-branch): Use vc-hg--async-command, thereby newly
+	respecting vc-hg-global-switches.
+
+2025-05-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-exec-after: New PROC argument
+
+	* lisp/vc/vc-dispatcher.el (vc-exec-after): New PROC argument.
+	* lisp/vc/vc-hg.el (vc-exec-after): Update declaration.
+
+2025-05-09  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix infinite looping in 'next-frame' and associates (Bug#77985)
+
+	* src/frame.c (next_frame): Rewrite to avoid infinite looping if
+	FRAME itself does not qualify as candidate frame (Bug#77985).
+	(Fnext_frame, Fprevious_frame): Adjust do-strings.
+	* lisp/frame.el (other-frame): Adjust doc-string.
+	(frame-list-1): New function.
+	(make-frame-names-alist): Rewrite using 'frame-list-1' instead
+	of 'next-frame' (Bug#77985).
+	(delete-other-frames): Rewrite using 'frame-list' instead of
+	'next-frame'.
+	* doc/lispref/frames.texi (Finding All Frames): Minor
+	clarifications for 'frame-list' and 'next-frame'.
+
+2025-05-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2025-05-08  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix navigation in eglot-hierarchy-mode (bug#78250)
+
+	* lisp/progmodes/eglot.el (eglot--hierarchy-label):  Take PARENT-URI. Rework.
+	(eglot--hierarchy-2): Rework.
+
+2025-05-08  João Távora  <joaotavora@gmail.com>
+
+	Flymake: tweak 'fancy' eol diagnostic display
+
+	When calculating the face for boxdraw chars, protect against
+	diagnostics with an empty first line.  Also don't inherit from
+	:default, which seems to mess up the background color when using
+	hl-line-mode.
+
+	* lisp/progmodes/flymake.el (flymake--eol-draw-fancy): Tweak
+
+2025-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cl-types: Improve error messages
+
+	* lisp/emacs-lisp/cl-extra.el (cl--derived-type-generalizers):
+	Check that the type is valid and fully defined.
+
+	* lisp/emacs-lisp/cl-lib.el (cl-generic-generalizers) <derived-type>:
+	Don't delegate to another method just because the type is invalid.
+
+	* lisp/emacs-lisp/cl-preloaded.el (cl--define-derived-type):
+	Minor simplification, and improvement to an error message.
+
+2025-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/bs.el (bs--goto-current-buffer): Fix thinko in last commit
+
+2025-05-08  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Recenter for the calendar (bug#78205)
+
+	* lisp/calendar/cal-move.el (calendar-recenter-last-op): New
+	variable to track last recenter operation.
+	(calendar-recenter): New command to recenter the calendar.
+	* lisp/calendar/calendar.el (calendar-mode-map): Keybinding for
+	this command.
+	* doc/emacs/calendar.texi (Scroll Calendar): Document this
+	command.
+	* etc/NEWS: Announce this command.
+
+2025-05-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+	The following changes were made by hand,
+	so that admin/merge-gnulib could succeed
+	instead of failing because the diff didn’t match.
+	* admin/gnulib-patches/lib/getloadavg.c.diff:
+	Remove, as it is no longer needed now that recent
+	Gnulib has been merged.
+	* admin/merge-gnulib (GNULIB_TOOL_FLAGS):
+	Remove the --local-dir="$src"admin/gnulib-patches option,
+	as it is no longer needed either.
+
+2025-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cl-lib.el (cl-generic-generalizers): Fix partial bootstrap
+
+	* lisp/emacs-lisp/cl-lib.el (cl-generic-generalizers): Tweak the
+	bootstrap hack to avoid a problem when dumping `bootstrap-emacs` when
+	`cl-lib.el` has already been compiled.
+
+	* lisp/emacs-lisp/cl-macs.el (list): Move out of `static-if` test.
+
+2025-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cl-deftype): Precompute the predicate function
+
+	Always define a `cl-deftype-satisfies` predicate (if possible), so
+	we only need `cl-typep` to "interpret" a type specifier when we use
+	a compound type but never for the atomic types (e.g. never
+	in `cl-types-of`).
+
+	* lisp/emacs-lisp/cl-macs.el (cl-typep): Test `cl-deftype-satisfies` first.
+	Don't handle `real` here any more.
+	(base-char, character, command, keyword, natnum, real): Define with
+	`c-deftype`.
+	(cl-deftype): Precompute the predicate for the atomic derived type,
+	if applicable.
+
+	* lisp/emacs-lisp/cl-preloaded.el (cl--define-derived-type):
+	Add argument for the precomputed predicate function.
+
+	* lisp/emacs-lisp/cl-extra.el (cl-types-of): Use `cl-deftype-satisfies`
+	instead of `cl-type-p`.
+
+2025-05-07  James Cherti  <contact@jamescherti.com>  (tiny change)
+
+	Mark !%:.^~, as punctuation rather than symbol constituents
+
+	In Bash, the characters !%:.^~, are not valid in variable names. In sh,
+	they are not permitted in either function or variable names. Treating
+	them as punctuation is convenient, as they are rarely used in function
+	names and never in variable names. Even among commands, their usage is
+	uncommon. The only character among these that is commonly seen in
+	command names is '.', although it is rarely used in function names.
+
+	Marking these characters as punctuation, rather than symbol
+	constituents, enhances the accuracy of symbol detection.
+
+	* lisp/progmodes/sh-script.el: Mark !%:.^~, as punctuation in the
+	  sh-mode-syntax-table syntax table.
+
+2025-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Merge branch 'cl-types'
+
+2025-05-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve support of UTF-8 encoded file names in ZIP archives
+
+	* lisp/arc-mode.el (archive-zip-summarize): Support the 0x7075
+	UPath Unicode Path Extra Field extension of ZIP format.
+	(Bug#78290)
+
+2025-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/register.el (register-read-with-preview-traditional): Use PRED
+
+2025-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cl-deftype): Don't set `cl-deftype-handler` directly
+
+	In order to make it easier to change that in the future, let
+	`cl--define-derived-type` take care of storing the derived
+	type's function into `cl-deftype-handler`.
+
+	* lisp/emacs-lisp/cl-preloaded.el (cl--define-derived-type):
+	Change calling convention.  Set `cl-deftype-handler`.
+	* lisp/emacs-lisp/cl-macs.el (cl-deftype): Don't set `cl-deftype-handler`,
+	instead pass the function to `cl--define-derived-type`.
+
+2025-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/emacs-lisp/cl-types.el: Delete file
+
+2025-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cl-types: The big renaming to "derived types"
+
+	`cl-defstruct` also defines a type and is also in CL, so
+	"cl-type" is not precise enough to talk about those types
+	defined with `cl-deftype`.  Use the term "derived type" to be
+	more clear, as is done in the HyperSpec.
+
+	* doc/misc/cl.texi (Derived types): Move `cl-deftype` to this
+	new subsection.  Document the use of derived types as method specializers.
+
+	* lisp/emacs-lisp/cl-extra.el (cl--types-of-memo): Rename from
+	`cl--type-unique`.
+	(cl--derived-type-dispatch-list): Rename from `cl--type-dispatch-list`.
+	(cl--derived-type-generalizer): Rename from `cl--type-generalizer`.
+	(cl--derived-type-generalizers): Rename from `cl--type-generalizers`.
+
+	* lisp/emacs-lisp/cl-lib.el (cl-generic-generalizers) <derived-types>:
+	Rename from <cl-types-of>.  Catch but don't hide errors when a derived
+	type cannot be used as an atomic type specifier.
+
+	* lisp/emacs-lisp/cl-preloaded.el (cl--derived-type-list): Rename from
+	`cl--type-list`.
+	(cl-derived-type-class): Rename from `cl-type-class`.
+	(cl--derived-type-class-make): Rename from `cl--type-class-make`.
+	(cl--define-derived-type): Rename from `cl--type-deftype`.
+
+2025-05-07  David Ponce  <da_vid@orange.fr>
+
+	(cl-types-of): Fix two plain bugs
+
+	* lisp/emacs-lisp/cl-extra.el (cl-types-of): Fix error handling.
+	Don't mutate `found` since it's stored as key in the hash-table.
+
+2025-05-07  Juri Linkov  <juri@linkov.net>
+
+	Update the default value of 'diff-outline-regexp'.
+
+	* lisp/vc/diff-mode.el (diff-outline-regexp): Change the default value
+	to match the diff command name in recursive diff.  Move after
+	'diff-hunk-header-re' variable definition used in the new value.
+	(diff-setup-buffer-type): Change setq of 'diff-outline-regexp'
+	to buffer-local (bug#78269).
+
+2025-05-07  Juri Linkov  <juri@linkov.net>
+
+	Don't ignore errors in diff-syntax-fontify-hunk.
+
+	* lisp/nxml/nxml-mode.el (nxml-extend-region):
+	Protect against error "Invalid search bound (wrong side of point)".
+
+	* lisp/vc/diff-mode.el (diff-syntax-fontify-hunk):
+	Use 'with-demoted-errors' instead of 'ignore-errors'.
+
+2025-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cl-generic-generalizers): Fix typo in last change
+
+2025-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cl-generic-generalizers): Skip types that need arguments
+
+	* lisp/emacs-lisp/cl-lib.el (cl-generic-generalizers) "cl-types-of":
+	make sure the atomic derived type is valid.
+
+2025-05-06  Po Lu  <luangruo@yahoo.com>
+
+	Fix compilation on Android 35 and on Termux
+
+	* configure.ac (gl_cv_onwards_func_tzalloc): Define to "future
+	OS version" on Android API 35 and later.
+	Detect posix_spawn* by means of gl_CHECK_FUNCS_ANDROID.
+
+	* src/conf_post.h (tzalloc, tzfree): Define to non-conflicting
+	names on Android 35 and later.
+
+2025-05-06  Elijah Gabe Pérez  <eg642616@gmail.com>
+	    João Távora  <joaotavora@gmail.com>
+
+	Eglot: bind mouse-1 to margin and mode-line code actions
+
+	* lisp/progmodes/eglot.el (eglot-mode-line-action-suggestion):
+	advertise mouse-1.
+	(eglot-diagnostics-map): Bind left-margin mouse-1
+	(eglot-code-action-suggestion): Advertise mouse 1.  Simplify.
+
+2025-05-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cl-types: Integrate into CL-Lib
+
+	* lisp/emacs-lisp/cl-extra.el (cl--type-unique, cl-types-of)
+	(cl--type-dispatch-list, cl--type-generalizer): Move to `cl-extra.el`.
+	(cl--type-generalizers): New function extracted from "cl-types-of"
+	method of `cl-generic-generalizers`.
+
+	* lisp/emacs-lisp/cl-lib.el (cl-generic-generalizers): New method to
+	dispatch on derived types.  Use `cl--type-generalizers`.
+
+	* lisp/emacs-lisp/cl-macs.el (cl-deftype): Move from `cl-types.el`
+	and rename from `cl-deftype2`.
+	(extended-char): Tweak definition to fix bootstrapping issues.
+
+	* lisp/emacs-lisp/cl-preloaded.el (cl--type-list, cl-type-class)
+	(cl--type-deftype): Move from `cl-types.el`.
+
+	* lisp/emacs-lisp/oclosure.el (oclosure): Don't abuse `cl-deftype` to
+	register the predicate function.
+
+	* test/lisp/emacs-lisp/cl-extra-tests.el: Move tests from
+	`cl-type-tests.el`.
+
+2025-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cl-types: Simplify a bit further
+
+	Mostly, get rid of `cl--type-flag` and rely only on the presence/absence
+	of the type on `cl--types-list` to "flag" erroring-types.
+	Also, don't try and catch errors during dispatch.
+
+	* lisp/emacs-lisp/cl-types.el (cl--type-dispatch-list): Move to the
+	relevant section.
+	(cl--type-parents): Inline into sole caller.
+	(cl--type-deftype): Add `arglist` argument.
+	Don't signal an error if the type already existed but wasn't in
+	`cl--type-list` since that's normal and we can fix it.
+	Don't touch `cl--type-flag` any more.
+	Don't add to `cl--type-list` if it can't be used without arguments.
+	(cl-deftype2): Adjust call accordingly.
+	(cl--type-error): Inline into sole caller.
+	(cl-types-of): Be more careful to preserve ordering of types
+	before passing them to `merge-ordered-lists`.
+	Add `types` argument for use by dispatch.
+	Don't bother skipping the `root-type` since that's a built-in type,
+	so it should never happen anyway.
+	Don't catch errors if called from dispatch.
+	Don't bother with `cl--type-flag`.
+	(cl--type-generalizer): Use new arg of `cl-types-of` instead of
+	let-binding `cl--type-list`, in case `cl-types-of` ends up (auto)loading
+	a file or some such thing which needs to use/modify `cl--type-list`.
+	(cl--type-undefine): Move to end of file.
+
+	* test/lisp/emacs-lisp/cl-types-tests.el (cl-types-test): Remove DAG
+	test since we don't detect such errors any more.
+	Relax ordering test when the order is not guaranteed
+	by parent-relationships.
+
+2025-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(comment-setup-function): Make it usable with `add-function`
+
+	* lisp/newcomment.el (comment-setup-function): Give it a non-nil default.
+	(comment-normalize-vars): Call it unconditionally.
+
+2025-05-05  Juri Linkov  <juri@linkov.net>
+
+	New variable 'comment-setup-function' for multi-language modes.
+
+	* lisp/newcomment.el (comment-setup-function): New variable.
+	(comment-normalize-vars): Call non-nil 'comment-setup-function'.
+
+	* lisp/textmodes/mhtml-ts-mode.el
+	(mhtml-ts-mode--comment-current-lang): New internal variable.
+	(mhtml-ts-mode--comment-setup): New function.
+	(mhtml-ts-mode): Set 'comment-setup-function' to
+	'mhtml-ts-mode--comment-setup' instead of using
+	'c-ts-common-comment-setup' only for JavaScript.
+
+	https://lists.gnu.org/archive/html/emacs-devel/2025-05/msg00025.html
+
+2025-05-05  Juri Linkov  <juri@linkov.net>
+
+	* lisp/vc/diff-mode.el (diff-syntax-fontify-hunk): Add 'ignore-errors'.
+
+2025-05-05  Juri Linkov  <juri@linkov.net>
+
+	* lisp/outline.el (outline-minor-mode-highlight-buffer): Adjust match data.
+
+	After a successful call to 'outline-search-function'
+	set the end of the match data to the end of the line
+	that is equivalent to adding ".*" in the regexp.
+	This accompanies the recent change in 'outline-font-lock-keywords'.
+
+2025-05-05  David Ponce  <da_vid@orange.fr>
+
+	cl-types.el: Speed up deftype and dispatch
+
+	* lisp/emacs-lisp/cl-types.el (cl--type-list): Doc string.
+	(cl--type-dispatch-list): New variable.
+	(cl--type-parents): Make it a plain defun.
+	(cl--type-children, cl--type-dag): Remove.
+	(cl--type-undefine): Remove duplicate test for `cl--type-p'.  Use
+	`cl--class-children'.  Clear `cl--type-flag' instead of
+	`cl--type-error'.  Also remove type from the dispatch list.
+	(cl--type-deftype): Doc string.  Remove useless safeguard of
+	data on error.  Fix some error messages.  Clear `cl--type-flag'
+	when a type is (re)defined.  Just push new types on
+	`cl--type-list'.
+	(cl--type-error): Set `cl--type-flag' to the symbol `error' and
+	remove type in error from the dispatch list.
+	(cl-types-of): Doc string.  Remove useless check for
+	`cl-type-class-p'.  Skip types which we are sure will not match.
+	Simplify creation of the DAG.
+	(cl--type-generalizer): In the tagcode-function, check only types
+	that can be dispatched.
+	(cl-generic-generalizers): Populate the dispatch list.
+
+2025-05-05  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	Fix test-regressions in python-ts-mode
+
+	* lisp/progmodes/python.el (python--treesit-settings): Use more
+	specific selectors for constants.
+
+	* test/lisp/progmodes/python-tests.el
+	(python-ts-mode-nested-types-face-1)
+	(python-ts-mode-union-types-face-1)
+	(python-ts-mode-union-types-face-2): None is now a constant.
+
+2025-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	whitespace.el: Collaborate better with `combine-after-change-calls`
+
+	* lisp/whitespace.el: Remove redundant `:group` arguments.
+	Prefer #' to quote function names.
+	(whitespace-buffer-changed): Delete function.
+	(whitespace-color-on): Don't touch `before-change-functions`.
+	(whitespace--update-bob-eob): Set `whitespace-buffer-changed` here, instead.
+	(whitespace-post-command-hook): Apply De Morgan.
+	(whitespace--empty-at-bob-matcher, whitespace-post-command-hook)
+	(whitespace--update-bob-eob): Use `point-min` and `point-max`.
+
+2025-05-05  Po Lu  <luangruo@yahoo.com>
+
+	Synchronize Android and Haiku terminal frontends with X
+
+	* src/androidterm.c (handle_one_android_event):
+
+	* src/haikuterm.c (haiku_read_socket): Port recent changes to
+	handle_one_xevent.
+
+2025-05-04  Juri Linkov  <juri@linkov.net>
+
+	Avoid duplication in defining tree-sitter grammar sources.
+
+	* lisp/progmodes/php-ts-mode.el: Require 'html-ts-mode'.
+	(php-ts-mode--language-source-alist): Remove duplicate source info
+	for html, css, javascript, jsdoc.
+	(php-ts-mode-install-parsers): Install pre-defined grammars.
+	(php-ts-mode): Move 'require' to the top.
+
+	* lisp/textmodes/mhtml-ts-mode.el
+	(mhtml-ts-mode--language-source-alist): Remove variable
+	since 'treesit-language-source-alist' is pre-filled by
+	requiring 'html-ts-mode', 'css-mode', 'js'.
+	(mhtml-ts-mode-install-parsers): Install pre-defined grammars.
+
+	* test/infra/Dockerfile.emba: Remove 'mhtml-ts-mode'
+	that doesn't define own grammars.
+
+2025-05-04  Juri Linkov  <juri@linkov.net>
+
+	* lisp/textmodes/markdown-ts-mode.el: Improve.
+
+	(markdown-ts-list-marker): Inherit from 'shadow' like in non-ts mode.
+	(markdown-ts-block-quote): Inherit from 'italic' like in non-ts mode.
+	(markdown-ts--treesit-settings): Use 'shadow' for parens in
+	'markdown-inline' only under 'inline_link' and 'image'.
+	Use @markdown-ts-block-quote for 'block_quote'.
+	Override with 'append' for links.
+	(markdown-ts--range-settings): Use global html parser for 'html_tag'
+	since its ranges are interconnected.
+	(markdown-ts-setup): Create the 'html' parser.
+
+2025-05-04  João Távora  <joaotavora@gmail.com>
+
+	Eglot: allow other keys in window/logMessage (bug#77948)
+
+	* lisp/progmodes/eglot.el (eglot-handle-notification window/logMessage): Fix.
+
+2025-05-04  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Fix support of 'mouse-highlight' on X (bug#78218)
+
+	* src/xterm.c (handle_one_xevent): Fix comparison with tool-bar
+	and tab-bar window.
+
+2025-05-04  Yuan Fu  <casouri@gmail.com>
+
+	Add line-column tracking for tree-sitter
+
+	Add line-column tracking for tree-sitter parsers.  Copied from
+	comments in treesit.c:
+
+	   Technically we had to send tree-sitter the line and column
+	   position of each edit.  But in practice we just send it dummy
+	   values, because tree-sitter doesn't use it for parsing and
+	   mostly just carries the line and column positions around and
+	   return it when e.g. reporting node positions[1].  This has
+	   been working fine until we encountered grammars that actually
+	   utilizes the line and column information for
+	   parsing (Haskell)[2].
+
+	   [1] https://github.com/tree-sitter/tree-sitter/issues/445
+	   [2] https://github.com/tree-sitter/tree-sitter/issues/4001
+
+	   So now we have to keep track of line and column positions and
+	   pass valid values to tree-sitter.  (It adds quite some
+	   complexity, but only linearly; one can ignore all the linecol
+	   stuff when trying to understand treesit code and then come
+	   back to it later.)  Eli convinced me to disable tracking by
+	   default, and only enable it for languages that needs it.  So
+	   the buffer starts out not tracking linecol.  And when a
+	   parser is created, if the language is in
+	   treesit-languages-require-line-column-tracking, we enable
+	   tracking in the buffer, and enable tracking for the parser.
+	   To simplify things, once a buffer starts tracking linecol, it
+	   never disables tracking, even if parsers that need tracking
+	   are all deleted; and for parsers, tracking is determined at
+	   creation time, if it starts out tracking/non-tracking, it
+	   stays that way, regardless of later changes to
+	   treesit-languages-require-line-column-tracking.
+
+	   To make calculating line/column positons fast, we store
+	   linecol caches for begv, point, and zv in the
+	   buffer (buf->ts_linecol_cache_xxx); and in the parser object,
+	   we store linecol cache for visible beg/end of that parser.
+
+	   In buffer editing functions, we need the linecol for
+	   start/old_end/new_end, those can be calculated by scanning
+	   newlines (treesit_linecol_of_pos) from the buffer point
+	   cache, which should be always near the point.  And we usually
+	   set the calculated linecol of new_end back to the buffer
+	   point cache.
+
+	   We also need to calculate linecol for the visible_beg/end for
+	   each parser, and linecol for the buffer's begv/zv, these
+	   positions are usually far from point, so we have caches for
+	   all of them (in either the parser object or the buffer).
+	   These positions are far from point, so it's inefficient to
+	   scan newlines from point to there to get up-to-date linecol
+	   for them; but in the same time, because they're far and
+	   outside the changed region, we can calculate their change in
+	   line and column number by simply counting how much newlines
+	   are added/removed in the changed
+	   region (compute_new_linecol_by_change).
+
+	* doc/lispref/parsing.texi (Using Parser): Mention line-column
+	tracking in manual.
+	* etc/NEWS: Add news.
+	* lisp/treesit.el:
+	(treesit-languages-need-line-column-tracking): New variable.
+	* src/buffer.c: Include treesit.h (for TREESIT_EMPTY_LINECOL).
+	(Fget_buffer_create):
+	(Fmake_indirect_buffer): Initialize new buffer fields.
+	(Fbuffer_swap_text): Add new buffer fields.
+	* src/buffer.h (ts_linecol): New struct.
+	(buffer): New buffer fields.
+	(BUF_TS_LINECOL_BEGV):
+	(BUF_TS_LINECOL_POINT):
+	(BUF_TS_LINECOL_ZV):
+	(SET_BUF_TS_LINECOL_BEGV):
+	(SET_BUF_TS_LINECOL_POINT):
+	(SET_BUF_TS_LINECOL_ZV): New inline functions.
+	* src/casefiddle.c (casify_region): Record linecol info.
+	* src/editfns.c (Fsubst_char_in_region):
+	(Ftranslate_region_internal):
+	(Ftranspose_regions): Record linecol info.
+	* src/insdel.c (insert_1_both):
+	(insert_from_string_1):
+	(insert_from_gap_1):
+	(insert_from_buffer):
+	(replace_range):
+	(del_range_2): Record linecol info.
+	* src/treesit.c (TREESIT_BOB_LINECOL):
+	(TREESIT_EMPTY_LINECOL):
+	(TREESIT_TS_POINT_1_0): New constants.
+	(treesit_debug_print_linecol):
+	(treesit_buf_tracks_linecol_p):
+	(restore_restriction_and_selective_display):
+	(treesit_count_lines):
+	(treesit_debug_validate_linecol):
+	(treesit_linecol_of_pos):
+	(treesit_make_ts_point):
+	(Ftreesit_tracking_line_column_p):
+	(Ftreesit_parser_tracking_line_column_p): New functions.
+	(treesit_tree_edit_1): Accept real TSPoint and pass to
+	tree-sitter.
+	(compute_new_linecol_by_change): New function.
+	(treesit_record_change_1): Rename from treesit_record_change,
+	handle linecol if tracking is enabled.
+	(treesit_linecol_maybe): New function.
+	(treesit_record_change): New wrapper around
+	treesit_record_change_1 that handles some boilerplate and sets
+	buffer state.
+	(treesit_sync_visible_region): Handle linecol if tracking is
+	enabled.
+	(make_treesit_parser): Setup parser's linecol cache if tracking
+	is enabled.
+	(Ftreesit_parser_create): Enable tracking if the parser's
+	language requires it.
+	(Ftreesit__linecol_at):
+	(Ftreesit__linecol_cache_set):
+	(Ftreesit__linecol_cache): New functions for debugging and
+	testing.
+	(syms_of_treesit): New variable
+	Vtreesit_languages_require_line_column_tracking.
+	* src/treesit.h (Lisp_TS_Parser): New fields.
+	(TREESIT_BOB_LINECOL):
+	(TREESIT_EMPTY_LINECOL): New constants.
+	* test/src/treesit-tests.el (treesit-linecol-basic):
+	(treesit-linecol-search-back-across-newline):
+	(treesit-linecol-col-same-line):
+	(treesit-linecol-enable-disable): New tests.
+	* src/lisp.h: Declare display_count_lines.
+	* src/xdisp.c (display_count_lines): Remove static keyword.
+
+2025-05-04  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Fix support of 'mouse-highlight' on NS (bug#78218)
+
+	* src/nsterm.m: ([EmacsView keyDown:]): Add missing '!' in
+	if-condition.  Check tab_bar_window as other window systems do.
+
+2025-05-03  Philip Kaludercic  <philipk@posteo.net>
+
+	Preserve directory structure of local packages
+
+	* lisp/emacs-lisp/package.el (package-unpack): Re-create the
+	directory structure of the source directory and copy the files
+	in the right place.
+	(package-dir-info): Try to find package info in files closer to
+	the specified package source root.
+
+	(Bug#78017)
+
+2025-05-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid warnings about 'lexical-binding' in 'eval-buffer'
+
+	* src/lread.c (Feval_buffer): Don't emit a lexbind warning if the
+	buffer already has a local value of 'lexical-binding'.  Doc fix.
+	(Bug#77883)
+
+2025-05-03  Michael Albinus  <michael.albinus@gmx.de>
+
+	Merge from origin/emacs-30
+
+	28a276efe87 Fix quoted local file name parts in Tramp
+
+	# Conflicts:
+	#	lisp/net/tramp.el
+
+2025-05-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix support of 'mouse-highlight' on MS-Windows console
+
+	* src/w32inevt.c (w32_console_read_socket): Support numerical
+	value of 'mouse-highlight'.  (Bug#78218)
+
+2025-05-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	1f998d11a58 ; * doc/misc/ert.texi (erts files): Improve indexing.
+	52183c9596c ; * lisp/battery.el (battery-status-function): Doc fix.
+	dc3e79a80ee ; * etc/DEBUG: Grammar fix.
+	7d02ffe87b4 ; * lisp/international/mule.el (define-coding-system): Do...
+
+2025-05-03  Matthew Tromp  <matthewktromp@gmail.com>  (tiny change)
+
+	Add `next-error' support for flymake diagnostics buffers
+
+	This adds `next-error' support for flymake diagnostics buffers.
+	Buffers created with `flymake-show-buffer-diagnostics' and
+	`flymake-show-project-diagnostics' are now next-error enabled,
+	and `next-error' and `previous-error' will navigate through
+	their listed diagnostics.
+	* lisp/progmodes/flymake.el (flymake-current-diagnostic-line)
+	(flymake--diagnostics-next-error): Add.
+	(flymake-show-diagnostic, flymake-show-buffer-diagnostics)
+	(flymake-show-project-diagnostics): Set next-error-last-buffer.
+	(flymake--tabulated-setup): Set next-error-function.
+	(Bug#77809)
+
+2025-05-03  Roi Martin  <jroi.martin@gmail.com>
+
+	Fix 'Skip' behavior in erts files (bug#76839)
+
+	* lisp/emacs-lisp/ert.el (ert-test--erts-test): Fix 'Skip'
+	behavior in erts files, so only the test case where it is
+	specified is skipped.
+	* test/lisp/emacs-lisp/ert-tests.el (ert-test-erts-skip-one)
+	(ert-test-erts-skip-last): Add test cases.
+
+2025-05-03  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Improve native--compile-skip-on-battery-p
+
+	* lisp/emacs-lisp/comp-run.el
+	(native--compile-skip-on-battery-p): Look at %L, %b and %B
+	format characters.  Add commentary.
+
+2025-05-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(decode_coding): Avoid nested *-change-functions (bug#78042)
+
+	* src/coding.c (decode_coding): Avoid nested *-change-functions (bug#78042).
+
+	* test/src/editfns-tests.el (sanity-check-change-functions-before)
+	(sanity-check-change-functions-after): Record notifications in
+	`sanity-check-change-functions-op`.
+	(sanity-check-change-functions-with-op): Don't rely on
+	`sanity-check-change-functions-op` always holding only the `op`.
+	(sanity-check-change-functions-errors): Include the sequence of
+	notifications in the error info.
+	(editfns-tests--before/after-change-functions): Add tests for (bug#78042).
+
+2025-05-02  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Fix completion boundaries for TRAMP file names
+
+	Previously, we assumed (roughly) that substitute-in-file-name
+	always returns a suffix of the original string.  But
+	substitute-in-file-name on "/ssh:user@host:/~/" returns
+	"/ssh:user@host:~/", preserving the TRAMP magic prefix.  Weaken
+	the assertion in completion--sifn-boundaries to allow this; the
+	new assertion is more clear about the property we care about,
+	anyway.
+
+	* lisp/minibuffer.el (completion--sifn-boundaries): Weaken
+	assertion slightly.
+
+	* test/lisp/net/tramp-tests.el (tramp--test-emacs31-p)
+	(tramp--split-on-boundary)
+	(tramp-test51-file-name-completion-boundaries): Add.
+
+2025-05-02  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Move documentation of this-command buffer display condition entry
+
+	* doc/lispref/buffers.texi (Buffer List): Document this-command
+	buffer display condition entry.
+	* doc/lispref/windows.texi (Choosing Window): Give an example of
+	using this-command buffer display condition entry in
+	display-buffer-alist.
+	(Buffer Display Action Alists):
+	* lisp/window.el (display-buffer): Delete documentation of
+	this-command buffer display condition entry from these locations
+	because it is not a buffer display action alist entry.
+	* lisp/subr.el (buffer-match-p): Update cross reference.
+
+2025-05-02  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New user option native-comp-async-on-battery-power
+
+	* lisp/emacs-lisp/comp-run.el
+	(native-comp-async-on-battery-power): New option.
+	(battery-status-function): Declare.
+	(native--compile-skip-on-battery-p): New function.
+	(comp--run-async-workers): Call it.
+	* etc/NEWS: Announce the new option.
+
+2025-05-01  Juri Linkov  <juri@linkov.net>
+
+	Embed html, yaml and toml in markdown-ts-mode.
+
+	* lisp/textmodes/markdown-ts-mode.el (markdown-ts--treesit-settings):
+	Use @italic on the whole 'block_quote'.
+	(markdown-ts-outline-predicate): New function.
+	(markdown-ts--range-settings): Embed 'yaml' in host 'markdown',
+	embed 'toml' in host 'markdown', embed 'html' in host 'markdown-inline',
+	and use local 'html_block'.
+	(markdown-ts-setup): Append html/yaml/toml to treesit-font-lock-settings
+	and treesit-font-lock-feature-list when their grammars are ready.
+	(markdown-ts-mode): Set comment-start/comment-end.
+	Set treesit-outline-predicate to 'markdown-ts-outline-predicate'.
+
+	* lisp/textmodes/toml-ts-mode.el
+	(toml-ts-mode--font-lock-feature-list): New variable.
+	(toml-ts-mode): Use it.
+
+	* lisp/textmodes/yaml-ts-mode.el
+	(yaml-ts-mode--font-lock-feature-list): New variable.
+	(yaml-ts-mode): Use it.
+	(yaml-ts-mode--outline-nodes): New variable.
+	(yaml-ts-mode--outline-predicate): Use it.
+
+	* lisp/treesit-x.el (liquid-generic-ts-mode):
+	Use 'treesit-ready-p' on optional 'yaml' grammar.
+	Merge 'yaml-ts-mode--font-lock-feature-list'.
+
+2025-05-01  Juri Linkov  <juri@linkov.net>
+
+	Improve elixir-ts--thing-settings.
+
+	* lisp/progmodes/elixir-ts-mode.el (elixir-ts--thing-settings):
+	Add extra grouping "keywords" to named sexp nodes.
+	Add "," to anonymous sexp nodes.  Use bos/eos.
+
+	* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
+	Use bos/eos for anonymous sexp nodes for better disambiguation.
+
+	* test/lisp/progmodes/heex-ts-mode-tests.el
+	(heex-ts-mode-test-indentation): Skip the test when 'elixir' is
+	missing since 'heex-ts-mode' depends on the 'elixir' grammar.
+
+2025-05-01  Juri Linkov  <juri@linkov.net>
+
+	Avoid adding duplicate items to 'treesit-language-source-alist'.
+
+	* lisp/textmodes/mhtml-ts-mode.el:
+	* lisp/progmodes/php-ts-mode.el:
+	Use 'add-to-list' on items in language-source-alist
+	that should check for duplicate items.
+
+	* test/infra/Dockerfile.emba: Move multi-language mhtml-ts-mode and
+	php-ts-mode to the end to give their dependent grammars a lower priority.
+
+	* test/lisp/progmodes/js-tests.el (js-ts-mode-test-indentation):
+	Skip the test when 'jsdoc' is missing since 'js-ts-mode' depends
+	on the 'jsdoc' grammar.
+
+2025-05-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	register.el (register--jumpable-p): Fix bug#78186
+
+	While `register--get-method-type` worked fine for `register-val-insert`
+	it always returns nil for `register-val-jump-to` because it presumed the
+	method took a single argument.  Make it work for multi-arg generic functions.
+
+	* lisp/register.el (register--get-method-type): Add `other-args-type` arg.
+	(register--jumpable-p): Use it.
+
+2025-05-01  Alan Mackenzie  <acm@muc.de>
+
+	Implement C23 features:
+
+	Improve the handling of #error and #warning in C and C++ Modes.
+
+	* lisp/progmodes/cc-engine.el (c-looking-at-c++-attribute)
+	(c-enclosing-c++-attribute, c-forward-sws, c-backward-sws):
+	Handle attributes in C as they have been handled in C++.
+	(c-forward-align-clause-throw-if-invalid): New macro.
+	(c-forward-type): Handle alignas, alignof, and _BitInt, putting
+	a catch block around most of the function to catch invalid uses
+	of these new keywords.
+	(c-in-id-arglist): New function.
+	(c-forward-decl-or-cast-1): Recognize a "maybe" type identifier
+	as a type in arglists when there is no parameter identifier
+	associated with it.
+
+	* lisp/progmodes/cc-fonts.el (c-font-lock-cpp-messages): New
+	function.
+	(c-cpp-matchers): Move the handling of "invalid" comment
+	delimiters outside of the block handling CPP directives.
+	Remove the inline handling of #error and #warning, using the
+	new function c-font-lock-cpp-messages instead.
+	(c-get-fontification-context): Handle alignof, alignas,
+	_BitInt.
+	(c-font-lock-declarations): Adapt fontification of K&R
+	parameters to the C23 nameless parameter scheme.
+
+	* lisp/progmodes/cc-langs.el (c-has-quoted-numbers)
+	(c-stmt-boundary-skip-chars)
+	(c-recognize-post-brace-list-type-p, c-modifier-kwds)
+	(c-constant-kwds): Handle C the same as the existing C++
+	handling.
+	(c-cpp-message-directives-re, noncontinued-line-end)
+	(c-cpp-messages-re, c-cpp-message-match-no): New
+	c-lang-consts/vars.
+	(c-cpp-include-directives): New directive embed.
+	(c-cpp-expr-directives): New directives elifdef, elifndef.
+	(c-primitive-type-kwds): New types, _Decimal*, bool, char*_t,
+	nullptr_t.
+	(c-typeof-kwds): New keyword typeof_unqual.
+	(c-type-with-paren-kwds, c-type-with-paren-key): New
+	c-lang-const/vars.
+	(c-type-modifier-with-parens-kwds)
+	(c-type-modifier-with-parens-key, c-type-internal-paren-kwds)
+	(c-type-internal-paren-key): New c-lang-const/vars.
+	(c-type-modifier-prefix-kwds, c-type-start-kwds): Amend with
+	the above new c-lang-consts.
+	(c-no-type-with-equals-kwds, c-no-type-with-equals-key): New
+	c-lang-const/vars.
+	(c-modifier-kwds): Add constexpr, auto, and thread_local to the
+	C value.
+	(c-paren-nontype-kwds): Add static_assert to the C value.
+	(c-constant-kwds): Add nullptr to the C value.
+	(c-regular-keywords-regexp): Include c-type-with-paren-kwds.
+	(c-recognize-nameless-type-decls): New c-lang-const/var.
+
+	* lisp/progmodes/cc-mode.el (c-leave-cc-mode-mode): Also clear
+	c-digit-separator properties.
+
+2025-05-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New this-command buffer display action alist entry
+
+	* lisp/subr.el (buffer-match-p): New this-command cons cell
+	condition to implement new this-command buffer display action
+	alist entry (bug#78082).
+	* lisp/window.el (display-buffer):
+	* doc/lispref/windows.texi (Buffer Display Action Alists):
+	* etc/NEWS: Document the new buffer display action alist entry.
+
+2025-05-01  Michael Albinus  <michael.albinus@gmx.de>
+
+	Improve treesitter tests on emba
+
+	* test/infra/Dockerfile.emba (emacs-tree-sitter): Print language
+	versions.
+
+	* test/infra/gitlab-ci.yml (.job-template): Pass ${http_proxy},
+	${https_proxy} and ${no_proxy} to the docker call.
+	(.tree-sitter-template): Add some dependencies.
+
+2025-05-01  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	Fix compilation-mode matches for csharp-mode (bug#78128)
+
+	* lisp/progmodes/csharp-mode.el:
+	(csharp-compilation-re-dotnet-error):
+	(csharp-compilation-re-dotnet-warning): Ignore leading whitespace.
+
+2025-05-01  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	Improve python-ts-mode fontification (bug#78129)
+
+	Fontification based on selectors & code-conventions:
+
+	- Lambda parameters: variable declarations
+	- For in statements: variable declarations
+	- Import statements: variable declerations
+	- Constants: All upper case alphanumerical identifiers
+	- Types: CamelCase alphanumerical identifiers
+	- Enums: Enum-values as constants.
+
+	* lisp/progmodes/python.el:
+	(python--treesit-settings): Improve queries.
+
+2025-05-01  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	Improve csharp-ts-mode fontification (bug#78130)
+
+	Improves:
+	- fontification of generic types with namespace-prefixes
+	- function-call parameters
+	- variable use in string interpolation
+	- implicitly typed parameters in lambda-expressions
+	- index-expressions
+	- variables used in return-statements
+	- variables used in binary expressions
+
+	* lisp/progmodes/csharp-mode.el:
+	(csharp-ts-mode--font-lock-settings): Improve queries.
+
+2025-05-01  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Replace cl-remove-if with seq-remove in minibuffer.el
+
+	* lisp/minibuffer.el (completion--file-name-table): Replace
+	cl-remove-if with seq-remove. (bug#78149)
+
+2025-04-30  João Távora  <joaotavora@gmail.com>
+
+	Eglot: tweak previous change (clear Flymake 'Wait' state)
+
+	When we don't have anything to give to Flymake, we still want to
+	signal we're alive so the mode-line doesn't show a confusing
+	'Wait'.
+
+	* lisp/progmodes/eglot.el (eglot--report-to-flymake): Clear 'Wait'
+	state.
+
+2025-04-30  Philip Kaludercic  <philipk@posteo.net>
+
+	Allow selecting what to copy when installing a local package
+
+	* lisp/emacs-lisp/package.el (package-unpack, package-dir-info):
+	Check the marked files if in a Dired buffer, and otherwise
+	fallback on the previous behaviour or if there was no selection.
+	(package-install-from-buffer): Document the feature.
+	* etc/NEWS: Mention the change.
+
+	(Bug#78017)
+
+2025-04-30  Philip Kaludercic  <philipk@posteo.net>
+
+	Improve detection of VC package revisions
+
+	* lisp/emacs-lisp/package-vc.el (package-vc-commit): If the
+	package specification lists a :lisp-dir, use that to search for
+	Lisp files.
+
+2025-04-30  Philip Kaludercic  <philipk@posteo.net>
+
+	Avoid using symbolic links when installing local VC packages
+
+	* lisp/emacs-lisp/package-vc.el (package-vc--main-file): Use
+	`expand-file-name' to support :lisp-dir entries outside of the
+	elpa directory.
+	(package-vc--unpack-1): Same as above.
+	(package-vc-install-from-checkout): Instead of creating a
+	symlink to the requested directory, create an empty directory
+	and use autoload indirections, analogously to checkouts with
+	Lisp code in a subdirectory.
+
+	(Bug#78017)
+
+2025-04-30  Philip Kaludercic  <philipk@posteo.net>
+
+	Do a deep-copy when installing a package from a local package
+
+	* lisp/emacs-lisp/package.el (package-unpack, package-dir-info):
+	Call 'directory-files-recursively' with appropriate arguments.
+
+	(Bug#78017)
+
+2025-04-30  Alan Mackenzie  <acm@muc.de>
+
+	Fix typo in bug#19867 correction (CC Mode indentation bugs)
+
+	* lisp/progmodes/cc-align.el (c-lineup-item-after-paren-at-boi):
+	Replace an erroneous skip-syntax-backward with
+	skip-chars-backward.
+
+2025-04-30  Juri Linkov  <juri@linkov.net>
+
+	Fix the match data in elisp-outline-search.
+
+	* lisp/progmodes/elisp-mode.el (elisp-outline-search):
+	Add 'save-match-data' since 'syntax-ppss' garbles the match data.
+
+2025-04-30  Juri Linkov  <juri@linkov.net>
+
+	* test/infra/Dockerfile.emba: Avoid duplication of tree-sitter data.
+
+	Require ts-mode files in order to add their tree-sitter grammar sources
+	to 'treesit-language-source-alist'.
+
+2025-04-30  Juri Linkov  <juri@linkov.net>
+
+	Add python tree-sitter grammar data to 'treesit-language-source-alist'.
+
+	* lisp/progmodes/python.el (python-ts-mode):
+	Use 'treesit-ensure-installed' when it's fboundp.
+
+2025-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Merge branch 'cleanup-register-preview'
+
+2025-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(register-type, register--type): Delete functions
+
+	Automatically figure out which regval can be used for insertion
+	and jump based on the presence of a matching method.
+
+	* lisp/register.el (register-type, register--type): Delete functions.
+	(register--get-method-type, register--jumpable-p)
+	(register--insertable-p): New functions.
+	(jump-to-register, insert-register): Use them.
+	* lisp/frameset.el (register--type): Delete method.
+
+2025-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(register-preview-1): Delete function
+
+	* lisp/register.el (register-preview): Add `pred` arg.
+	(register-preview-1): Delete function.
+	(register-read-with-preview-fancy): Use `register-preview` instead.
+
+2025-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(register-command-info): Delete function
+
+	* lisp/register.el (register-command-info): Delete function.
+	(register-read-with-preview-fancy): Don't use it any more.
+	(jump-to-register, increment-register, view-register)
+	(insert-register, append-to-register, prepend-to-register):
+	Pass a `pred` arg instead.
+
+2025-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(register-type): Change arg to be the "regval"
+
+	* lisp/register.el (register-type): Change arg to be the "regval".
+	(register-read-with-preview-fancy): Adjust call accordingly
+
+2025-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(register-read-with-preview): Add optional `pred` arg
+
+	* lisp/register.el (register--read-with-preview-function):
+	Improve docstring..
+	(register--type) <(eql nil)>: New method.
+	(register-of-type-alist, register-preview-1)
+	(register--preview-get-defaults): Replace `types` arg with `pred` arg.
+	(register-read-with-preview, register-read-with-preview-traditional):
+	Add `pred` arg.
+	(register-read-with-preview-fancy): Add `pred` arg.
+	Use it instead of the `types` info returned by `register-command-info`,
+	when provided.
+
+2025-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(register-preview-info): Delete struct type
+
+	* lisp/register.el (register-preview-info): Delete struct type.
+	(register-command-info): Return a list of types, instead.
+	(register-read-with-preview-fancy): Adjust accordingly.
+
+2025-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(register-preview-info): Delete slot `act`
+
+	* lisp/register.el (register-preview-info): Delete slot `act`.
+	(register-command-info): Delete arg `:act`.
+	(register--preview-get-defaults): Rename from
+	`register--preview-get-defaults` and rewrite with, different args.
+	(register-read-with-preview-fancy): Use it instead of `act`.
+
+2025-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(register-preview-info): Delete slot `smatch`
+
+	Use the `types` slot to carry that info instead.
+
+	Replace the list of types `(all)` with `(t)` since `t` is the
+	usual name of the "supertype of all types".
+	Use the type `null` to represent the fact that empty registers
+	can be used.  Allow an empty list of types to stand for
+	`(t null)`, i.e. any register even empty ones.
+
+	* lisp/register.el (register-preview-info): Delete slot `smatch`.
+	(register-command-info): Delete arg `:smatch`.  Adjust `:types` instead.
+	Fix the `copy-rectangle-to-register` case, which disallowed using
+	an empty register.
+	(register-of-type-alist): Adjust handling of `types` accordingly.
+	(register-preview-1): Simplify.
+	(register-read-with-preview-fancy): Use types instead of `smatch`.
+	Use it also in place of `act`.
+
+2025-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(register-preview-info): Delete `msg` slot
+
+	* lisp/register.el (register-preview-info): Remove `msg` slot.
+	(register-command-info): Delete `:msg` args.
+	(register-read-with-preview-fancy): Compute `msg` from the `prompt`.
+
+2025-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(register-preview-info): Delete `noconfirm` slot
+
+	* lisp/register.el (register-preview-info): Remove `noconfirm` slot.
+	(register-command-info): Delete `:noconfirm` args.
+	(register-read-with-preview-fancy): Hardcode the `noconfirm` setting
+	because it was always exactly the same anyway.
+
+2025-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(register-preview-function): Use a single default again
+
+	* lisp/register.el (register-preview-function): Revert to Emacs<30 value.
+	(register-use-preview, register-preview, register-preview-1):
+	Don't touch it.
+	(register-preview-default): Merge it with `register-preview-default-1`.
+	(register--preview-function): Delete function.
+
+2025-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(register-read-with-preview-fancy): Fix handling of control chars
+
+	The code assumed that the string returned by `register-preview-function`
+	has the register name as the first char.  This was an
+	incompatible change which broke packages that set this var,
+	such as `calculator.el` and others.
+	Remove this assumption by recording the register names in the
+	preview buffer on a new `register--name` text property.
+	While at it, fix a few other problems where control chars were
+	not pretty printed.
+
+	* lisp/register.el (register-preview-1): Remember the raw
+	register name in the `register--name` text property.
+	(register-preview-forward-line): Use the
+	`register--name` text property.
+	(register--find-preview): New function.
+	(register-read-with-preview-fancy): Use it.
+	If the last command inserted more than one char, only keep the first of
+	the new chars.
+	Make sure control chars are pretty printed in the minibuffer.
+	including minibuffer messages.
+
+2025-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	register.el: Fix some inconsistencies in the code
+
+	* lisp/frameset.el (register-val-jump-to): Fix `:cleanup-frames`.
+	The code did not obey its documented behavior and matched
+	against the wrong symbols.
+
+	* lisp/register.el (register-command-info) <append-to-register>,
+	<prepend-to-register>: Remove `number` from the `:types` argument
+	since those operations fail on numbers.
+
+2025-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/register.el: Minor cosmetics
+
+	Remove redundant `:group` arguments.
+	Prefer #' to quote function names.
+	Fix some markup on symbol names in docstrings.
+
+2025-04-30  Werner Lemberg  <wl@gnu.org>
+
+	Improve support for Avestan, Old Turkic, and Chakma
+
+	* lisp/international/fontset.el (script-representative-chars,
+	  setup-default-fontset): Add support for Avestan, Old Turkic, and Chakma.
+
+2025-04-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	cc5b1a01a2c ; * doc/misc/efaq-w32.texi (Location of init file): Fix a...
+	6c2aaedfceb Fix compilation errors in emacsclient.c with MinGW GCC 15
+	d56e5ba97ee ; * etc/DEBUG: Add link to GCC bug #78685.
+	80cbd1e31cc ; Fix key notation in Introduction to Emacs Lisp
+	1224e5fd961 ; * lisp/files.el (revert-buffer-restore-functions): Doc ...
+	79e7eeb3296 ; Improve documentation of 'format-time-string'
+	2838b64fc8b ; * lisp/textmodes/text-mode.el (text-mode-variant): Fix ...
+	9adb05422ea ; Improve obsolescence of 'text-mode-variant'
+	4858d818488 ; * lisp/files.el (revert-buffer-restore-functions): Doc ...
+	2a8e223b8d7 ; Mention early-init file in Emacs FAQ for Windows
+	14c707b42d9 ; Isearch: Fix key bindings in docstrings
+
+2025-04-30  Sean Whitton  <spwhitton@spwhitton.name>
+
+	cperl-mode-map: Don't bind C-j
+
+	* lisp/progmodes/cperl-mode.el (cperl-mode-map): Don't bind C-j.
+	The default global mode bindings will DTRT depending on whether
+	or not electric-indent-mode is on.
+
+2025-04-30  Robert Pluim  <rpluim@gmail.com>
+
+	Fix custom type of 'flymake-show-diagnostics-at-end-of-line'
+
+	*
+	lisp/progmodes/flymake.el (flymake-show-diagnostics-at-end-of-line):
+	Add 'fancy' value to custom type.
+
+	* etc/NEWS: "variable" -> "user option".
+
+	(Bug#78148)
+
+2025-04-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	register.el: Remove bogus deftypes and fix associated methods
+
+	* lisp/register.el (frame-register, kmacro-register): Remove bogus deftypes.
+	(register--type) <oclosure>: Fix kmacro method and generalize it to
+	any OClosure.
+	(register--type) <frameset-register>: Fix method and move it to ...
+	* lisp/frameset.el (register--type) <frameset-register>: ... here,
+	where `frameset-register` is defined.
+
+2025-04-29  Juri Linkov  <juri@linkov.net>
+
+	Use 'file-equal-p' in 'multi-isearch-read-files' (bug#77678).
+
+	* lisp/misearch.el (multi-isearch-read-files): Replace 'string-equal'
+	with 'file-equal-p' that should handle abbreviated file names as well.
+
+2025-04-29  Juri Linkov  <juri@linkov.net>
+
+	Ignore parens in strings for outline headings in emacs-lisp-mode.
+
+	* lisp/outline.el (outline-font-lock-keywords): For non-nil
+	outline-search-function return a lambda that calls the function,
+	then sets the match data to the end of the line that is equivalent
+	to adding ".*" in the regexp.  Then search functions don't need to
+	match ".*" themselves.
+
+	* lisp/progmodes/elisp-mode.el (elisp-outline-search):
+	New function to skip leading parens in strings when searching
+	for outline headings.
+	(emacs-lisp-mode): Set buffer-local 'outline-search-function' to
+	'elisp-outline-search'.
+	https://lists.gnu.org/archive/html/emacs-devel/2025-04/msg00934.html
+
+2025-04-29  Juri Linkov  <juri@linkov.net>
+
+	Fix invalid search bound in 'search-within-boundaries'.
+
+	* lisp/isearch.el (search-within-boundaries): Don't go over BOUND.
+
+	* test/lisp/isearch-tests.el (isearch--test-search-within-boundaries):
+	Test with the BOUND arg as well (bug#78116).
+
+2025-04-29  Juri Linkov  <juri@linkov.net>
+
+	Respect point when changing direction after isearch scrolling.
+
+	* lisp/isearch.el (isearch-repeat): Don't go to isearch-other-end
+	on changing direction after scrolling (bug#78074).
+
+2025-04-29  David Ponce  <da_vid@orange.fr>
+
+	(cl-types-of): Speed up by caching more of its work
+
+	* lisp/emacs-lisp/cl-types.el (cl--type-parents): Make it a proper function.
+	(cl--type-children): Use `cl--class-children` and make it a `defsubst`.
+	(cl--type-dag): η-reduce and make it a `defsubst`.
+	(cl--type-undefine): Also reset `cl--type-error`.
+	(cl--type-deftype): Modify `cl--type-list` atomically so we never need
+	to restore it upon error.  Don't test bogus parent here.
+	(cl-deftype2): Test bogus parent here instead.  Also, better preserve
+	the declarations for the lambda.
+	(cl-types-of): Do less uncached work.
+
+2025-04-29  João Távora  <joaotavora@gmail.com>
+
+	Flymake: promptly delete eol overlay if source overlay changed
+
+	In the vast majority of cases, changing the source overlay
+	invalidates the content of the end-of-line overlay, so best to
+	delete it asap.
+
+	* lisp/progmodes/flymake.el (flymake--delete-overlay): Use
+	'flymake--eol-ov'
+	(flymake--highlight-line): Use some overlay modification hooks.
+
+2025-04-29  João Távora  <joaotavora@gmail.com>
+
+	Eglot: improve diagnostic-reporting performance
+
+	After a change in the buffer has occured, it is often the case
+	that Flymake is quicker to ask for diagnostics than the server
+	is to supply them to us.  If we're still stuck with old outdated
+	diagnostics, don't forward them to Flymake, even if it eagerly
+	asks us for them.
+
+	* etc/EGLOT-NEWS (Changes in upcoming Eglot): Announce changes.
+
+	* lisp/progmodes/eglot.el
+	(eglot--diagnostics): Rework.
+	(eglot--report-to-flymake): Also take version.
+	(eglot-handle-notification textDocument/publishDiagnostics)
+	(eglot--managed-mode)
+	(eglot-flymake-backend): Tweak call to eglot--report-to-flymake.
+
+2025-04-29  Yuan Fu  <casouri@gmail.com>
+
+	Update tree-sitter subroutine in Fsubst_char_in_region
+
+	Some explanation: Fsubst_char_in_region used to have a branch,
+	one branch path calls replace_range, one branch path modifies
+	the buffer directly.  replace_range already calls
+	treesit_record_change within it, so we needed to make sure we
+	only call treesit_record_change in the other branch path.
+
+	After I added the call to treesit_record_change, some changes
+	are made to Fsubst_char_in_region, and the branch was removed.
+	So no wonder Stefan had the confusion and wrote the FIXME note.
+
+	Now that the branch is gone, we can indeed call
+	treesit_record_change in the end like signal_after_change.
+
+	* src/editfns.c (Fsubst_char_in_region): Move to end.
+
+2025-04-29  Po Lu  <luangruo@yahoo.com>
+
+	* lisp/progmodes/grep.el (grep-hello-file): Fix another typo.
+
+	* lisp/progmodes/grep.el (grep-hello-file): Fix typos.
+
+2025-04-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New log-edit-maybe-show-diff option for log-edit-hook
+
+	* lisp/vc/log-edit.el (log-edit-maybe-show-diff): New function.
+	(log-edit-hook): Add it as an option.
+	(log-edit-diff-function):
+	* etc/NEWS: Document it.
+
+2025-04-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	log-edit-diff-function leaves the diff-mode buffer's window selected
+
+	This reverts the following two changesets:
+
+	    Author:     Sean Whitton <spwhitton@spwhitton.name>
+	    AuthorDate: Tue Oct 29 09:40:02 2024 +0800
+
+	      Fix window selection after log-edit-show-diff
+
+	    Author:     Sean Whitton <spwhitton@spwhitton.name>
+	    AuthorDate: Tue Apr 8 20:36:42 2025 +0800
+
+	      Fix window selection after log-edit-show-diff, again
+
+	This also replaces the following changeset:
+
+	    Author:     Sean Whitton <spwhitton@spwhitton.name>
+	    AuthorDate: Tue Oct 29 12:52:20 2024 +0800
+
+	      * lisp/vc/log-edit.el (log-edit-diff-function): Document.
+
+	* lisp/vc/log-edit.el (log-edit-diff-function): Document that
+	the function *should* leave the window selected when it returns.
+	(log-edit-diff-fileset):
+	* lisp/vc/vc.el (vc-modify-change-comment):
+	Don't use save-selected-window (bug#77946).
+	(vc-diff-patch-string):
+	Call pop-to-buffer, not display-buffer (bug#77946).
+
+2025-04-29  Po Lu  <luangruo@yahoo.com>
+
+	Port Grep argument autodetection to Android
+
+	* lisp/progmodes/grep.el (grep-hello-file): On Android, copy
+	sample text to a real directory.
+
+2025-04-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/emacs-lisp/cl-types.el: New file
+
+	* test/lisp/emacs-lisp/cl-types-tests.el: Also, new file.
+
+2025-04-28  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Improve env var handling in read-file-name
+
+	Fix various bugs, including bug#77718, by rewriting the way file
+	name completion handles environment variable expansion.  Instead
+	of using completion-table-with-quoting to manipulate the string
+	being completed on, simply make the completion table itself
+	understand substitute-in-file-name.
+
+	Tests are updated: partial-completion now preserves unexpanded
+	environment variables.  However, partial-completion no longer
+	works across environment variables containing delimiters; that's
+	an acceptable sacrifice.
+
+	* lisp/minibuffer.el (completion--sifn-boundaries): Add.
+	(completion--file-name-table): Rewrite to use
+	substitute-in-file-name explicitly. (bug#77718)
+	* test/lisp/minibuffer-tests.el (completion-table-test-quoting):
+	Update.
+
+2025-04-28  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Don't escape "." in `prin1' when followed by a letter
+
+	Among other users, let-alist widely uses symbols which start with a ".".
+	Make those symbols print more nicely by tweaking the escaping rules in
+	print_object to not escape a leading "." followed by a letter.  This is
+	a conservative change to avoid constraining future lexer changes.
+
+	This is a followup to 637dde4aba921435f78d0de769ad74c4f3230aa6, which
+	removed some unnecessary escaping of "." and "?" when printing symbols
+	in prin1.  (Actually, if we always escaped "?" (which was the case
+	before 637dde4aba92) then "." only ever needs to be escaped when
+	string_to_number returns non-nil.  So 637dde4aba92 could have just
+	dropped the escaping of "." with no other changes, if it didn't also
+	remove escaping of "?")
+
+	* src/print.c (print_object): Don't escape "." as the first
+	character in a symbol if followed by a letter. (bug#77656).
+	* test/src/print-tests.el (test-dots): Update for new behavior.
+
+2025-04-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(Custom-dirlocals-mode): Let `define-derived-mode` do its job
+
+	* lisp/cus-edit.el (Custom-dirlocals-mode-map): Rename from
+	`custom-dirlocals-map`.
+	(Custom-dirlocals-menu): Adjust accordingly.
+	(Custom-dirlocals-mode): Let `define-derived-mode` do its job.
+	Use `run-mode-hooks`.
+
+2025-04-28  Sebastián Monía  <sebastian@sebasmonia.com>
+
+	url-parse.el: correct code for Windows paths (bug#76982)
+
+	* lisp/url/url-parse.el (url-recreate-url): Handle empty filenames
+	without errors.
+
+	* test/lisp/url/url-parse-tests.el
+	(url-generic-parse-url/ms-windows-file-uri-hanlding): Add one
+	more test for the scenario above.
+
+2025-04-28  Tim Landscheidt  <tim@tim-landscheidt.de>
+
+	Fix ruby lint output regexps
+
+	* doc/misc/flymake.texi (An annotated example backend):
+	Fix regexp.
+
+	* lisp/progmodes/ruby-mode.el (ruby-flymake-simple)
+	(ruby-flymake-rubocop): Fix regexp
+	(https://lists.gnu.org/archive/html/emacs-devel/2025-04/msg00851.html).
+
+2025-04-27  Dmitry Gutov  <dmitry@gutov.dev>
+
+	* doc/emacs/maintaining.texi (VC-Aware Project Backend):
+
+	* doc/emacs/maintaining.texi (VC-Aware Project Backend):
+	New node (bug#77974).
+	(Projects): Use "backend" instead of "back-end".
+
+2025-04-27  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	aa1b55d5210 Fix the Android build
+
+2025-04-27  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	b5967dda32d ; * doc/misc/ert.texi (Introduction): Be more Lisp-specific.
+	be4819bd578 Include additional version metadata during Windows install
+
+2025-04-27  João Távora  <joaotavora@gmail.com>
+
+	Flymake: Experimental 'fancy' flymake-show-diagnostics-at-end-of-line
+
+	* doc/misc/flymake.texi (Customizable variables): Describe new
+	flymake-show-diagnostics-at-end-of-line.
+
+	* etc/NEWS: Mention 'flymake-show-diagnostics-at-end-of-line'.
+
+	* lisp/progmodes/flymake.el
+	(flymake-show-diagnostics-at-end-of-line): Update docstring.
+
+	* lisp/progmodes/flymake.el (flymake--eol-overlay-summary):
+	Rework.  Move to separate section.
+	(flymake--update-eol-overlays): Rework.  Use 'display'.  Move to
+	separate section.
+	(flymake--eol-draw-fancy-1, flymake--eol-draw-fancy): New helpers.
+	(flymake-end-of-line-diagnostics-face): Remove box.
+
+2025-04-27  Michael Shields  <shields@msrl.com>
+
+	Fix use-package :custom-face to set face-defface-spec (bug#77928)
+
+	By default, `face-set-spec' sets the override face spec, so face
+	attributes are combined with defaults rather than replacing them.
+	This was a behavior change that was an apparently unintended
+	consequence of commit 6b344a9.
+
+	Also set the `face-modified' property, which causes Customize to
+	flag the face as changed outside Customize.
+
+	* doc/misc/use-package.texi (Faces): Document the behavior.
+	* lisp/use-package/use-package-core.el (use-package-handler/:custom-face):
+	(use-package): Improve docstring to reflect implementation.
+	* test/lisp/use-package/use-package-tests.el
+	(use-package-test/:custom-face-1): (use-package-test/:custom-face-2):
+	(use-package-test/:custom-face-3): (use-package-test/:custom-face-4):
+	Add tests.
+
+2025-04-27  Adam Sjøgren  <asjo@koldfront.dk>
+
+	Improve documentation of 'insert-kbd-macro'
+
+	* lisp/macros.el (insert-kbd-macro): Update documentation
+	of what happens when no macro name is supplied.
+
+	* doc/emacs/kmacro.texi (Save Keyboard Macro): Document
+	saving 'last-kbd-macro'.  (Bug#77317)
+
+2025-04-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Mark vc-dav.el as obsolete (bug#77626)
+
+	* lisp/vc/vc-dav.el: Move from here ...
+	* lisp/obsolete/vc-dav.el: ... to here (bug#77626).
+	Add Obsolete-since header.
+	* etc/NEWS: Announce the obsoletion.
+
+2025-04-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Improve syncing VC buffers before generating diffs
+
+	* lisp/vc/vc.el (vc-maybe-buffer-sync): Delete.  Correct
+	handling of indirect buffers is now implicitly achieved by
+	vc-buffer-sync-fileset.
+	(vc-buffer-sync-fileset): Make NOT-ESSENTIAL argument optional,
+	new MISSING-IN-DIRS optional argument.  Rewrite to handle
+	directories named in the fileset, not only files.
+	(vc-ediff): Replace call to vc-maybe-buffer-sync with a call to
+	vc-buffer-sync-fileset.
+	(vc-root-diff): Similarly replace call to vc-maybe-buffer-sync.
+	This means the user is prompted to save additional buffers, that
+	they likely want to save before generating the diffs.
+	* test/lisp/vc/vc-misc-tests.el: New file.
+
+2025-04-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-diff: Delete redundant call to vc-maybe-buffer-sync
+
+	This call is redundant with the subsequent call to
+	vc-buffer-sync-fileset.  I believe this call to
+	vc-maybe-buffer-sync was reintroduced by accident -- the
+	changeset adding the call to vc-buffer-sync-fileset deleted a
+	call to vc-sync-fileset in the same place.
+
+	* lisp/vc/vc.el (vc-diff): Delete redundant call to
+	vc-maybe-buffer-sync.
+	* lisp/files.el (find-buffer-visiting): Note in docstring that
+	this function only ever returns base buffers.
+
+2025-04-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Rename vc-buffer-sync's argument to NOT-ESSENTIAL
+
+	* lisp/vc/vc-dispatcher.el (vc-buffer-sync):
+	* lisp/vc/vc.el (vc-maybe-buffer-sync, vc-diff)
+	(vc-buffer-sync-fileset, vc-ediff, vc-root-diff):
+	Rename argument from NOT-URGENT to NOT-ESSENTIAL.
+
+2025-04-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	1f520db97bd * doc/emacs/files.texi (Time Stamp Customization): Typo.
+	d824b66c242 ; * doc/emacs/search.texi (Isearch Yank): Improve flow.
+	62b284f9153 ; * etc/DEBUG: Say that debugging code compiled w/ -Og ca...
+	49ea1f64c77 ; Improve documentation of 'modifier-bar-mode'
+	a975232c0fd ; * doc/emacs/programs.texi (Matching): Fix wording (bug#...
+	29142dab316 ; * doc/misc/efaq-w32.texi (MinGW-w64): Fix punctuation (...
+	4cd4a801d86 ; * java/res/README: Note origin of emacs_wrench.png.
+
+2025-04-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'kill-ring-deindent-mode'
+
+	* lisp/indent-aux.el
+	(kill-ring-deindent-buffer-substring-function): Fix deindenting
+	for modes which set 'indent-tab-mode' to nil.  (Bug#77981)
+
+2025-04-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid signaling errors in 'cursor-face-highlight-mode'
+
+	* lisp/simple.el (redisplay--update-cursor-face-highlight): Don't
+	go beyond the accessible portion of the buffer.  (Bug#77747)
+
+2025-04-26  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Reuse calendar temporary faces
+
+	* lisp/calendar/calendar.el (calendar-make-temp-face): Reuse
+	temporary face produced by calendar.  (Bug#78036)
+
+2025-04-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix thai-pattachote input method
+
+	* lisp/leim/quail/thai.el (thai-pattachote): Add missing
+	characters instead of duplicate ones.  Suggested by Robert
+	Nikander <robert.nikander@icloud.com>.  (Bug#77998)
+
+2025-04-26  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	csharp-mode.el: Improve fontification of string-interpolation exprs
+
+	* lisp/progmodes/csharp-mode.el
+	(csharp-ts-mode--font-lock-settings): Remove too wide selector,
+	causing non-string content to be fonitified as strings.  Add
+	additional eselectors to highlight variables inside
+	interpolation-expressions too.  (Bug#78008)
+
+2025-04-26  Paul Nelson  <ultrono@gmail.com>
+
+	Add "forward history" support for some debuggers
+
+	* lisp/progmodes/gud.el (gud-query-cmdline): Add an optional
+	default-list parameter to allow passing a list of "forward
+	history" suggestions to the minibuffer.
+	(perldb, pdb, guiler): Use buffer file name to suggest a default
+	debugging command via "forward history".
+
+	* doc/emacs/building.texi (Starting GUD): Document the new
+	feature.
+
+	(Bug#77989)
+
+2025-04-26  Paul Nelson  <ultrono@gmail.com>
+
+	Don't consider "Grep finished" lines as matches for file names
+
+	* lisp/progmodes/grep.el
+	(grep-compilation-transform-finished-rules): New variable
+	containing rules to prevent "Grep finished" lines from being
+	misinterpreted as matches for file names.
+	(grep-mode): Add these rules to
+	'compilation-transform-file-match-alist' (bug#77732).
+
+2025-04-26  Sean Whitton  <spwhitton@spwhitton.name>
+
+	log-edit-insert-message-template: Reorder headers
+
+	* lisp/vc/log-edit.el (log-edit-insert-message-template): Put
+	Author before Summary when both are to be inserted.
+
+2025-04-26  Liu Hui  <liuhui1610@gmail.com>
+
+	Fix filename completion in Python shell (bug#77853)
+
+	'comint-filename-completion' may complete the filename at
+	wrong locations.  Users who want proper filename completion
+	should use specialized completion backends (e.g. Jedi).
+	* lisp/progmodes/python.el (inferior-python-mode): Remove
+	'comint-filename-completion' in 'comint-dynamic-complete-functions'.
+
+2025-04-26  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Improve help-fns-edit-variable for Lisp editing
+
+	Before d50c82f3e98e ("Simplify
+	'help-enable-variable-value-editing' using 'string-edit'"),
+	'help-fns-edit-variable' would open a buffer in 'emacs-lisp-mode'
+	and would not allow exiting that buffer with an invalid Lisp
+	expression.  Restore that functionality by enhancing 'string-edit'
+	to allow choosing a major mode and allow passing a function to
+	validate the buffer contents before returning.
+	* lisp/help-fns.el (help-fns-edit-variable): Call 'string-edit',
+	passing 'emacs-lisp-mode' and 'read'.
+	* lisp/textmodes/string-edit.el (string-edit--read): Add.
+	(string-edit): Add :major-mode and :read arguments and avoid
+	passive voice.
+	(read-string-from-buffer): Avoid passive voice in docs.
+	(string-edit-mode-map, string-edit-minor-mode-map)
+	(string-edit-mode, string-edit-minor-mode): Move 'string-edit'
+	keybindings to a minor mode.
+	(string-edit-done): Call 'string-edit--read' before exiting.
+	(Bug#77834)
+
+2025-04-26  Pengji Zhang  <me@pengjiz.com>
+
+	Make lighter for collapsed minor modes customizable (bug#77361)
+
+	* lisp/bindings.el (mode-line-collapse-minor-modes-to): New
+	option for the collapsed lighter of minor modes.
+	(mode-line-collapse-minor-modes): Mention that the collapsed
+	lighter can be customized.
+	(mode-line--minor-modes): Use the new option.
+
+2025-04-26  Daniel Semyonov  <daniel@dsemy.com>
+
+	nnfeed: Pass through list request failure reports
+
+	* lisp/gnus/nnfeed.el (nnfeed-request-list): Report the same
+	message reported by the inheriting backend on failure.
+	(Bug#74857)
+
+2025-04-26  Randy Taylor  <dev@rjt.dev>
+
+	Fix 'yaml-ts-mode' filling of comments (Bug#77095)
+
+	* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode--fill-paragraph):
+	Handle comment filling differently than block_scalars.
+	(yaml-ts-mode): Set 'comment-start-skip'.
+
+2025-04-26  kobarity  <kobarity@gmail.com>
+
+	Add cache to Python block navigation functions
+
+	* lisp/progmodes/python.el (python-nav-cache)
+	(python-nav-cache-tick): New variables.
+	(python-nav-cache-get, python-nav-cache-set)
+	(python-nav-with-cache): New functions.
+	(python-nav-beginning-of-block, python-nav-end-of-block): New
+	wrapper functions.
+	(python-nav--beginning-of-block): Renamed from
+	'python-nav-beginning-of-block'.
+	(python-nav--end-of-block): Renamed from
+	'python-nav-end-of-block'.  (Bug#77620)
+
+2025-04-26  kobarity  <kobarity@gmail.com>
+
+	Performance optimization of 'python-info-statement-ends-block-p'
+
+	* lisp/progmodes/python.el (python-info-statement-ends-block-p):
+	Add a comparison of the indentation of the next statement with
+	the indentation of the current statement.  (Bug#77620)
+
+2025-04-26  kobarity  <kobarity@gmail.com>
+
+	Fix Python block end predicates (bug#77941)
+
+	* lisp/progmodes/python.el (python-info-statement-ends-block-p)
+	(python-info-end-of-block-p): Add consideration of comments.
+	* test/lisp/progmodes/python-tests.el
+	(python-info-statement-ends-block-p-3)
+	(python-info-end-of-block-p-3): New tests.
+
+2025-04-26  Jonas Bernoulli  <jonas@bernoul.li>
+
+	mode-line-modes-delimiters: New option
+
+2025-04-26  Michael Albinus  <michael.albinus@gmx.de>
+
+	* etc/NEWS: Presentational fixes and improvements.
+
+2025-04-26  Yuan Fu  <casouri@gmail.com>
+
+	Add multivar indent style in typescript-ts-mode (bug#77803)
+
+	* lisp/progmodes/typescript-ts-mode.el:
+	(typescript-ts-mode-multivar-indent-style): New option.
+	(typescript-ts-mode--indent-rules): Support both styles.
+
+2025-04-25  Roi Martin  <jroi.martin@gmail.com>
+
+	* Fix missing lexical-binding cookie warning on async compilation (bug#77918)
+
+	* lisp/emacs-lisp/comp-run.el (comp--run-async-workers): Fix missing
+	lexical-binding cookie warning on async compilation.
+
+2025-04-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/auth-source.el (authinfo--keywords): Avoid obsolete font-lock face vars
+
+2025-04-25  Sean Whitton  <spwhitton@spwhitton.name>
+
+	comment-indent: Handle BOL already within a multiline comment
+
+	* lisp/newcomment.el (comment-indent): Newly handle the case
+	that BOL is already within a multiline comment (bug#78003).
+	Thanks to Stefan Monnier for review and reworking the control
+	flow.
+
+2025-04-24  Jens Schmidt  <jschmidt4gnu@vodafonemail.de>
+
+	Detect more types of split zip archives
+
+	* lisp/arc-mode.el (archive-find-type): Detect more types of
+	split zip archives.
+	* test/lisp/arc-mode-tests.el (arc-mode-test-make-file)
+	(arc-mode-test-make-archive): Factor out functions from ...
+	(arc-mode-test-zip-ensure-ext): ... this test.
+	(define-arc-mode-test-on-type): Add macro to test function
+	`archive-find-type' and use the macro to test detection of
+	various archive types.  (Bug 77898)
+
+2025-04-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Allow to disable 'lexical-binding'
+
+	* lisp/progmodes/elisp-mode.el (elisp-enable-lexical-binding):
+	Optionally, allow to disable 'lexical-binding'.
+
+2025-04-24  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Create major mode for `customize-dirlocals` (bug#77228)
+
+	* lisp/cus-edit.el (Custom-dirlocals-mode): New major mode.
+	(custom-dirlocals-with-buffer): Move settings to
+	`Custom-dirlocals-mode'.
+
+2025-04-23  Juri Linkov  <juri@linkov.net>
+
+	Add the keyword ':copy-queries' to 'treesit-language-source-alist'.
+
+	* lisp/treesit-x.el (define-treesit-generic-mode): Add keyword
+	':copy-queries t' to the end of 'source'.
+
+	* lisp/treesit.el (treesit-language-source-alist):
+	Document the keyword ':copy-queries'.
+	(treesit--install-language-grammar-1): Add &rest args.
+	Process the keyword args.  Call 'treesit--copy-queries'
+	when :copy-queries is non-nil.
+	(treesit--copy-queries): Add arg 'source-dir'.  Copy queries
+	from source-dir as well.  Copy only the file "highlights.scm".
+
+2025-04-23  Cecilio Pardo  <cpardo@imayhem.com>
+
+	w32: change the way text is measured when using DirectWrite
+
+	Now the glyph outline is inspected directly to get its real size,
+	as the direct measuring functions give generic values for some
+	fonts.
+	* src/w32dwrite.c (data structures): Added data structures from
+	header files that are not present in the 32bit MinGW build
+	environment.
+	(text_extents_internal): Call GetGlyphRunOutline to get exact
+	glyph vertical bounds.  Add new parameter to make this optional
+	if case that information is not required.
+	(w32_dwrite_text_extents, w32_initialize_direct_write)
+	(w32_dwrite_draw): New parameter for 'text_extents_internal'.
+	(Bug#77171)
+
+2025-04-23  João Távora  <joaotavora@gmail.com>
+
+	Eglot: require bug-fixed Flymake 1.4.1 (bug#77856)
+
+	* lisp/progmodes/eglot.el (Package-Requires) Require Flymake 1.4.1.
+
+2025-04-23  João Távora  <joaotavora@gmail.com>
+
+	Flymake: more concise flymake--tabulated-list-format-base
+
+	* lisp/progmodes/flymake.el (flymake--tabulated-list-format-base): Tweak
+
+2025-04-23  João Távora  <joaotavora@gmail.com>
+
+	Flymake: fix flymake-make-diagnostic for numeric code (bug#77856)
+
+	* lisp/progmodes/flymake.el (flymake-make-diagnostic): Tighten up
+	type requirements.
+	(Version): Bump to 1.4.1
+
+2025-04-23  Juri Linkov  <juri@linkov.net>
+
+	* lisp/desktop.el: Fix the recent cleanup.
+
+	(desktop-read): Use 'file-name-directory' on the file name
+	returned by 'locate-file'.
+
+2025-04-22  Juri Linkov  <juri@linkov.net>
+
+	Replace some 'treesit-query-compile' with 'treesit-query-valid-p'.
+
+	* admin/tree-sitter/treesit-admin.el
+	(treesit-admin--verify-major-mode-queries)
+	(treesit-admin--validate-mode-lang):
+	* lisp/progmodes/csharp-mode.el
+	(csharp-ts-mode--test-this-expression)
+	(csharp-ts-mode--test-interpolated-string-text)
+	(csharp-ts-mode--test-string-content)
+	(csharp-ts-mode--test-type-constraint)
+	(csharp-ts-mode--test-type-of-expression)
+	(csharp-ts-mode--test-typeof-expression)
+	(csharp-ts-mode--test-name-equals)
+	(csharp-ts-mode--test-if-directive)
+	(csharp-ts-mode--test-method-declaration-type-field):
+	* lisp/progmodes/php-ts-mode.el
+	(php-ts-mode--test-namespace-name-as-prefix-p)
+	(php-ts-mode--test-namespace-aliasing-clause-p)
+	(php-ts-mode--test-namespace-use-group-clause-p)
+	(php-ts-mode--test-visibility-modifier-operation-clause-p)
+	(php-ts-mode--test-property-hook-clause-p):
+	* lisp/progmodes/typescript-ts-mode.el
+	(tsx-ts-mode--font-lock-compatibility-bb1f97b):
+	Use the newer equivalent 'treesit-query-valid-p'
+	instead of 'treesit-query-compile' with 'ignore-errors'.
+
+2025-04-22  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el (treesit-show-paren-data--categorize): Add docstring.
+
+	(bug#77906)
+
+2025-04-22  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit-x.el: Quote :parent in define-treesit-generic-mode.
+
+	(define-treesit-generic-mode): Support quoted symbol for parent.
+	(liquid-generic-ts-mode): Quote :parent like quoted all other properties.
+
+2025-04-22  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit-x.el: Use 'treesit-ensure-installed'.
+
+	(define-treesit-generic-mode): Append new item
+	to 'treesit-language-source-alist' instead of prepending.
+	(treesit-generic-mode-setup): Remove 'source' arg.
+	Use 'treesit-ensure-installed'.
+	(liquid-generic-ts-mode): Use 'treesit-ensure-installed'.
+	(alpinejs-generic-ts-setup): Run setup hook.
+	(treesit-generic-mode-font-lock-map): Add more mappings.
+
+2025-04-22  Juri Linkov  <juri@linkov.net>
+
+	Fix all issues for the case when tree-sitter is disabled.
+
+	* lisp/treesit.el (treesit-declare-unavailable-functions):
+	Declare 'treesit-language-abi-version' and 'treesit-library-abi-version'.
+
+	* lisp/progmodes/elixir-ts-mode.el (elixir-ts--range-rules):
+	* lisp/progmodes/heex-ts-mode.el (heex-ts--range-rules):
+	* lisp/progmodes/rust-ts-mode.el (treesit-language-source-alist):
+	Guard with 'treesit-available-p'.
+
+2025-04-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	desktop.el: Janitorial cleanup
+
+	* lisp/desktop.el: Remove redundant `:group` arguments.
+	Prefer #' to quote function names.
+	(desktop-var-serdes-funs): Improve docstring markup.
+	(desktop-clear, desktop-create-buffer): Use lexical-binding.
+	(desktop--v2s): Avoid (ab)use of ,@ which doesn't splice a list.
+	(desktop-outvar): Strength-reduce `eval` => `symbol-value`.
+	(desktop-create-buffer): Don't assume point-min==1.
+	(desktop-buffer): Belatedly mark as obsolete.
+	(desktop-read): Use `locate-file`.
+
+2025-04-22  Po Lu  <luangruo@yahoo.com>
+
+	* src/androidfns.c (Fx_display_grayscale_p): Fix value on color displays.
+
+2025-04-22  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Delete unused block-comment-start and block-comment-end
+
+	* lisp/newcomment.el (block-comment-start)
+	(block-comment-end): Delete.
+	(comment-indent):
+	* lisp/cedet/semantic/doc.el
+	(semantic-doc-snarf-comment-for-tag):
+	Remove use of the now-deleted variables.
+
+2025-04-22  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Revert addition of electric-block-comment-mode & follow-up commits
+
+	As presently under discussion in bug#77823, the intended new
+	functionality is not really about comments at all.
+	Remove it for now to allow us to redesign from a clean slate,
+	and to deal with the regression reported in bug#77823.
+
+	This reverts the following three changesets:
+
+	Author:     Elías Gabriel Pérez <eg642616@gmail.com>
+	AuthorDate: Mon Mar 17 12:56:52 2025 -0600
+
+	  New minor mode: `electric-block-comment-mode'
+
+	Author:     Elías Gabriel Pérez <eg642616@gmail.com>
+	AuthorDate: Mon Mar 31 17:58:16 2025 -0600
+
+	  Add block-comment-start and block-comment-end to supported modes
+
+	Author:     Elías Gabriel Pérez <eg642616@gmail.com>
+	AuthorDate: Sun Apr 13 12:26:08 2025 -0600
+
+	  Add block-comment variables to cc-mode
+
+2025-04-22  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Realloc less often in adjust_glyph_matrix (bug#77961)
+
+	* src/dispnew.c (adjust_glyph_matrix): Only xnrealloc when the
+	glyph matrix got wider or taller.
+
+2025-04-22  Juri Linkov  <juri@linkov.net>
+
+	Fix tree-sitter ABI version incompatibility in rust-ts-mode
+
+	* lisp/progmodes/rust-ts-mode.el (treesit-language-source-alist):
+	For ABI version 15 add the recommended version "v0.24.0".
+
+2025-04-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	Make `man' more portable
+
+	* lisp/man.el (Man-init-defvars): Use [:cntrl:].  Character ranges
+	with octal numbers aren't portable enough.  (Bug#77944)
+
+2025-04-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(text-clone--maintain): Don't modify the buf from the after-change hook
+
+	* lisp/subr.el (text-clone--pending-overlays): New var.
+	(text-clone--maintain-overlays): New function, extracted from
+	`text-clone--maintain`.
+	(text-clone--maintain): Use it.
+
+2025-04-21  Po Lu  <luangruo@yahoo.com>
+
+	Render lib/getloadavg.c patches more permanent
+
+	* admin/gnulib-patches/lib/getloadavg.c.diff: New file.
+
+	* admin/merge-gnulib (GNULIB_TOOL_FLAGS): Set --local-dir to
+	admin/gnulib-patches.
+
+	* lib/gnulib.mk.in: Update from Gnulib.
+
+2025-04-20  João Távora  <joaotavora@gmail.com>
+
+	Eglot: use richer diagnostic-making capability of Flymake 1.4.0
+
+	* lisp/progmodes/eglot.el (Package-Requires): Require Flymake
+	1.4.0.
+	(eglot-handle-notification): Tweak.
+
+2025-04-20  João Távora  <joaotavora@gmail.com>
+
+	Flymake: bump package version to 1.4.0
+
+	* lisp/progmodes/flymake.el (Version): Bump to 1.4.0.
+
+	* etc/NEWS: Add entries for recent Flymake improvements.
+
+2025-04-20  João Távora  <joaotavora@gmail.com>
+
+	Flymake: rework, simplify and address problems of recent change (bug#75841)
+
+	Various problems were addressed:
+
+	- Unbreak Flymake for Emacs 26.3.  Due to use of some Elisp constructs,
+	  the change completely broke compatibility to Emacs < 29.1.  That
+	  violated Flymake's status as a :core package as highlighted in its
+	  description, which has implications for packages depending on it (such
+	  as Eglot);
+
+	- No new two commands are needed (they weren't documented in the manual
+	  anyway).  The new functionality was integrated in the existing
+	  flymake-show-buffer-diagnostics;
+
+	- Some helper functions aren't needed at all (they weren't marked
+	  internal anyway);
+
+	- The new hook called only when a particular function is called
+	  non-interactively in a particular way is not useful.  A case for the
+	  usefulness (if any) of this hook must be made separately.  Such a hook
+	  should be documented in the manual;
+
+	- Added missing recentering after revealing diagnostic in buffer;
+
+	- The menu entry "List all problems" was never intended to direct the
+	  user the user to any particular problem at point;
+
+	- The useful new functionality is called out in the manual and NEWS.
+
+	* lisp/progmodes/flymake.el (flymake--indicator-overlay-spec):
+	Use flymake-show-buffer-diagnostics-at-mouse.
+	(flymake-mode-map): Recover old definition.
+	(flymake-after-show-buffer-diagnostics-hook): Remove hook.
+	(flymake-show-buffer-diagnostics): Rework.
+	(flymake-show-diagnostic, flymake-goto-diagnostic): Rework
+	docstring.
+	(flymake-show-buffer-diagnostics-at-event-position)
+	(flymake-show-buffer-diagnostics-at-event-line): Delete undocumented commands.
+	(flymake-diagnostics-at-mouse-event)
+	(flymake-pulse-momentary-highlight-region): Delete non-helpful
+	helper.
+
+	* doc/misc/flymake.texi (listing diagnostics): Mention new
+	  functionality.
+
+2025-04-20  João Távora  <joaotavora@gmail.com>
+
+	Flymake: address some compatibility problems with older Emacsen
+
+	Can't use with-supressed-warnings, introduced in Emacs 27.1.  Also can't
+	use multi-arg setq-local, probably introduced around the same time.
+
+	This commit by itself still doesn't allow Flymake to be loaded in Emacs
+	< 29.  That fix will come in a later commit.
+
+	* lisp/progmodes/flymake.el (flymake--mode-line-counter-map):
+	Use with-no-warnings.
+
+	* lisp/progmodes/flymake.el (flymake--resize-margins): Use setq,
+	setq-local not needed.
+
+2025-04-20  João Távora  <joaotavora@gmail.com>
+
+	Flymake: dynamically resize and layout diagnostic listings
+
+	Since 'origin' and 'code' are new separate optional attributes of each
+	diagnostic, it becomes important to not waste space in these listings
+	when these are absent.  When a specific column isn't used by any line,
+	omit it.  Also spare just enough horizontal space to hold the largest
+	element in each column.
+
+	* lisp/progmodes/flymake.el
+	(flymake--tabulated-setup): New helper.
+	(flymake-diagnostics-buffer-mode)
+	(flymake-project-diagnostics-mode): Use flymake--setup-tabulated-listing.
+	(flymake--fit-diagnostics-window): New helper.
+	(flymake--tabulated-list-format-base): Rename from
+	flymake--diagnostics-base-tabulated-list-format.
+	(flymake--tabulated-setup-1): Rename and rework from
+	flymake--tabulated-entries-1.
+	(flymake--diagnostics-buffer-entries): Remove.
+	(flymake-diagnostics-buffer-mode)
+	(flymake-project-diagnostics-mode): Simplify.
+	(flymake--project-diagnostics-entries): Remove.
+
+2025-04-20  João Távora  <joaotavora@gmail.com>
+
+	Flymake: new flymake-diagnostic-format-alist (bug#77439, bug#77480)
+
+	* lisp/progmodes/flymake.el (flymake-diagnostic-text): Overhaul.
+	(flymake-diagnostic-format-alist): New defcustom.
+	(flymake--diagnostic-format): New util.
+	(flymake--eol-overlay-summary)
+	(flymake--highlight-line)
+	(flymake-eldoc-function): Use flymake--diagnostic-format.
+	(flymake--tabulated-diagnostic-origin): New helper.
+	(flymake--tabulated-entries-1): Use flymake--tabulated-diagnostic-origin.
+	(flymake--diagnostics-base-tabulated-list-format): "Backend" -> "Origin"
+
+	* doc/misc/flymake.texi (Customizable variable): Mention new variable.
+
+2025-04-20  João Távora  <joaotavora@gmail.com>
+
+	Flymake: more powerful flymake-make-diagnostic and rework manual
+
+	Flymake backends may now explicitly specify an origin and a code for a
+	diagnostic in addition to the textual description.  This change lays
+	groundwork for richer diagnostic listings and user options for
+	summarizing diagnostics, addressing bug#77439 and bug#77480.
+
+	* doc/misc/flymake.texi (Flymake API): Rename from "Extending
+	Flymake".  Rework.
+	(Inspecting diagnostics): New section.
+
+	* lisp/progmodes/flymake.el (flymake--diag): Add origin, code and
+	message.  Remove text.
+	(flymake-make-diagnostic): Support new origin, code and message.
+	(flymake-diagnostic-text): Rework.
+
+2025-04-20  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el (treesit-show-paren-data--categorize): Fix off-by-one error.
+
+	(bug#77906)
+
+2025-04-20  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el (treesit-cycle-sexp-type): Add optional arg 'interactive'.
+
+	Display the message only for interactive usage.
+
+2025-04-20  Juri Linkov  <juri@linkov.net>
+
+	Fix indentation test failure for elixir-ts--indent-rules
+
+	* lisp/progmodes/elixir-ts-mode.el (elixir-ts--indent-rules):
+	Add query for Elixir embedded in Heex (bug#76788).
+
+	* lisp/progmodes/heex-ts-mode.el (heex-ts-mode): Append
+	treesit-simple-indent-rules to elixir-ts--indent-rules.
+
+2025-04-20  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix emerge.el for remote files
+
+	* lisp/vc/emerge.el (emerge-make-diff-list)
+	(emerge-make-diff3-list): Set proper `default-directory' in order
+	to support remote files.  (Bug#6850, Bug#74352)
+
+	* test/lisp/vc/emerge-tests.el: New file.
+
+2025-04-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(savehist-minibuffer-hook): Exclude uninterned history vars
+
+	* lisp/savehist.el (savehist--reload): Don't bother merging the value
+	of vars that were not changed.
+	(savehist-minibuffer-hook): Exclude uninterned history vars.
+
+2025-04-20  Po Lu  <luangruo@yahoo.com>
+
+	Temporary fix for compilation on Android API levels <= 13
+
+	* lib/getloadavg.c (getloadavg): Don't use sysinfo on Android
+	API levels <= 13.  This will be resolved in Gnulib shortly, with
+	any luck.
+
+2025-04-20  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	Fix indentation of "{" on a new line of a function declaration
+
+	* lisp/progmodes/js.el (js--treesit-switch-body-helper): New
+	anchor helper function for the switch_body.
+	(js--treesit-member-chained-expression-helper): New anchor
+	helper function for chained calls in member_expression.
+	(js--treesit-arrow-function-helper): New anchor helper
+	function for arrow_function.
+	(js--treesit-indent-rules): Fix rule for the indentation of
+	"{" when of a new line of a function declaration.  (Bug#76704)
+	Fix the indentation of the parent of arrow_function, member_expression,
+	switch_body, ternary_expression and sequence_expression.
+
+2025-04-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Omit trailing white space in one line
+
+	* oldXMenu/Recomp.c: Omit trailing spaces in C source code line.
+	This was the only such line found by this command:
+	grep '[	 ]$' $(git ls-files | grep '\.[chmy]$')
+
+2025-04-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Use -Wtrailing-whitespace when warning
+
+	* configure.ac: When enabling GCC warnings, enable GCC 15’s new
+	-Wtrailing-whitespace option if available, as that’s the Emacs style.
+
+2025-04-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify GCC 15 -Wunterminated-string-initialization
+
+	* src/fns.c (hexbuf_digest):
+	* src/json.c (json_out_string):
+	Add ATTRIBUTE_NONSTRING to character arrays that are not strings.
+
+2025-04-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify GCC 15 -Wanalyzer-null-dereference
+
+	* src/emacs.c (find_emacs_executable): Add an eassume.
+	This pacifies -Wanalyzer-null-dereference with gcc (GCC) 15.0.1
+	20250329 (Red Hat 15.0.1-0).
+
+2025-04-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Avoid name clashes with static GnuTLS
+
+	Work around a bug in GnuTLS 3.7.11 and earlier: when built
+	statically, its mistakenly exports symbols hash_lookup and
+	hash_string, which collide with Emacs symbols of the same name,
+	preventing temacs from linking statically.  Problem reported by
+	Greg A. Woods (Bug#77476).
+
+	Because GnuTLS never uses hash_lookup or hash_string this issue
+	ordinarily doesn’t seem to prevent temacs from linking to GnuTLS
+	on GNU/Linux, as it’s linked dynamically and the dynamic linker
+	never needs to resolve references to either symbol.  However, I
+	suppose a clash or bug could occur even with dynamic linking if
+	Emacs later loads a module that uses either symbol.
+
+	Although GnuTLS should be fixed, Emacs should link statically to
+	current and older GnuTLS versions in the meantime, and it should
+	avoid potential problems with dynamic linking.  Renaming the two
+	clashing names is an easy way to do this.  For consistency with
+	the new name for hash_lookup, also rename hash_lookup_with_hash
+	and hash_lookup_get_hash.
+
+	* src/fns.c (hash_find_with_hash): Rename from hash_lookup_with_hash.
+	(hash_find): Rename from hash_lookup.
+	(hash_find_get_hash): Rename from hash_lookup_get_hash.
+	(hash_char_array): Rename from hash_string.
+	All uses changed.
+
+2025-04-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2025-04-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Don’t use Gnulib’s locale-h module
+
+	* admin/merge-gnulib (AVOIDED_MODULES):
+	Add locale-h, as Emacs should’t need this Gnulib module.
+	This change is needed for when we next run admin/merge-gnulib,
+	as some Gnulib dependencies changed recently.
+
+2025-04-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify "statement not reached" in value_cmp
+
+	Problem found by Oracle Developer Studio 12.6.
+	* src/fns.c (value_cmp): Omit unnecessary goto.
+
+2025-04-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix libsrc assumption in src/Makefile.in
+
+	* src/Makefile.in (ETAGS): Don’t assume $(libsrc) = ../lib-src.
+
+2025-04-20  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-user-edit-command: Add trailing space to initial input
+
+	* lisp/vc/vc-dispatcher.el (vc-user-edit-command): Add trailing
+	space to initial input to ease adding additional flags.
+
+2025-04-19  Werner Fink  <werner@suse.de>
+
+	Fix seccomp-filter for newer Linux kernels
+
+	* lib-src/seccomp-filter.c (MAP_DROPPABLE): Define if undefined.
+	(main): Use MAP_DROPPABLE flag.  Allow `tcgetattr' call of glibc
+	on physical terminal devices.  (Bug#77232)
+
+2025-04-19  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>
+
+	Fix 'rfc6068-parse-mailto-url' with 'inhibit-eol-conversion'
+
+	* lisp/mail/rfc6068.el (rfc6068-parse-mailto-url): Fix EOL type to
+	CRLF and never inhibit EOL conversion in decoding.  (Bug#77776)
+
+2025-04-19  shipmints  <shipmints@gmail.com>
+
+	Strip text properties on recentf entries, when saved (bug#77140)
+
+	Text properties are added by common completion frameworks, and
+	serve no purpose when stored in 'recentf-save-file', waste
+	space, and slow loading the file.
+
+	* lisp/recentf.el (recentf-dump-variable): Process string values
+	through 'substring-no-properties'.
+
+2025-04-19  Peter Oliver  <git@mavit.org.uk>
+
+	Provide Open Age Ratings Service metadata
+
+	* etc/emacs.metainfo.xml: Add a <content_rating/> section.
+	(Bug#77492), this and the preceding 2 commits.
+
+2025-04-19  Peter Oliver  <git@mavit.org.uk>
+
+	Tweak AppStream metadata to satisfy `appstream-util validate'
+
+	* etc/emacs.metainfo.xml: `appstream-util validate' suggests that
+	screenshot height and width attributes should match the actual size of
+	the image, and that captions be no longer than 50 chars and do not end
+	in `.'.  Follow those rules.
+
+2025-04-19  Peter Oliver  <git@mavit.org.uk>
+
+	Add AppStream metadata about supported and recommended hardware
+
+	* etc/emacs.metainfo.xml: Note that Emacs is best with a keyboard, but
+	other forms of input are possible.  Also note that Emacs can access the
+	Internet.  A modestly sized display is sufficient.
+
+2025-04-19  Stefan Kangas  <stefankangas@gmail.com>
+
+	xterm.c: Move GTK3-specific variables into narrower scopes
+
+	Avoid declaring GTK3-specific variables in larger-than-necessary scopes,
+	especially under #ifdefs.  Instead, declare them where used.  This improves
+	readability and reduces #ifdef clutter without changing behavior.
+
+	* src/xterm.c: [HAVE_GTK3] (x_update_opaque_region):
+	(XTframe_up_to_date, x_new_focus_frame, handle_one_xevent)
+	(x_ignore_errors_for_next_request, x_stop_ignoring_errors): Clean up
+	variable declarations.
+
+2025-04-19  Michael Albinus  <michael.albinus@gmx.de>
+
+	Merge from origin/emacs-30
+
+	2a45f0bceba * lisp/progmodes/heex-ts-mode.el (heex-ts): Fix :group name.
+	9750333dde9 Fix typescript-ts-mode indentation (bug#77803)
+
+2025-04-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Rename 'treesit-auto-install' to 'treesit-auto-install-grammar'
+
+	* etc/NEWS:
+	* lisp/treesit.el (treesit-auto-install-grammar): Rename from
+	'treesit-auto-install'; all users changed.  Doc fix.
+	(treesit-ensure-installed): Doc fix.
+
+2025-04-19  Yuan Fu  <casouri@gmail.com>
+
+	Merge from savannah/emacs-30
+
+	ef8bfe90b72 Handle offset in treesit--update-ranges-local (bug#77848)
+
+	# Conflicts:
+	#	lisp/treesit.el
+
+2025-04-19  Yuan Fu  <casouri@gmail.com>
+
+	Merge from savannah/emacs-30
+
+	01d4eb3dd42 ; Improve doc string of 'insert-char'
+	93ad8407ed8 * admin/notes/emba: Fix docker build instruction.
+	b901290ae7f * doc/lispref/text.texi (Margins): Grammar fix.
+	16855c89dde Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
+	8792d3431b1 Backport: Fix tree-sitter tests on Emba
+
+	# Conflicts:
+	#	test/infra/Dockerfile.emba
+
+2025-04-19  Yuan Fu  <casouri@gmail.com>
+
+	Merge from savannah/emacs-30
+
+	2b535a9c771 ; Improve documentation of some functions in files-x.el
+	45cf832ac75 Fix deleting the first line of calc trail
+
+2025-04-19  Yuan Fu  <casouri@gmail.com>
+
+	Merge from savannah/emacs-30
+
+	17418125353 lisp/help.el (help-form-show): Improve last change (bug#7...
+
+2025-04-18  Juri Linkov  <juri@linkov.net>
+
+	Fix parens inside links in markdown-ts--treesit-settings.
+
+	* lisp/textmodes/markdown-ts-mode.el (markdown-ts--treesit-settings):
+	Override paren delimiter inside inline link.
+	https://lists.gnu.org/archive/html/emacs-devel/2025-04/msg00655.html
+
+2025-04-18  Juri Linkov  <juri@linkov.net>
+
+	Embed elixir in heex as well as elixir->heex->elixir (bug#76788).
+
+	* lisp/progmodes/elixir-ts-mode.el (elixir-ts--range-rules):
+	Rename to a shorter name from 'elixir-ts--treesit-range-rules'.
+	(elixir-ts--font-lock-feature-list, elixir-ts--thing-settings)
+	(elixir-ts--range-rules): New variables with default values
+	extracted from 'elixir-ts-mode'.
+	(elixir-ts-mode): Use 'elixir-ts--font-lock-feature-list',
+	'elixir-ts--thing-settings', 'elixir-ts--range-rules'
+	and 'heex-ts--range-rules'.
+	Use 'treesit-merge-font-lock-feature-list' to merge
+	'heex-ts--font-lock-feature-list'.
+
+	* lisp/progmodes/heex-ts-mode.el
+	(heex-ts--font-lock-feature-list, heex-ts--range-rules):
+	New variables.
+	(heex-ts-mode): Use 'heex-ts--font-lock-feature-list',
+	'heex-ts--range-rules'.  Merge 'elixir-ts--font-lock-settings',
+	'elixir-ts--font-lock-feature-list', 'elixir-ts--thing-settings'
+	for embedding elixir in heex.  Enable the 'sexp' navigation
+	by default with 'treesit-cycle-sexp-type'.
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode): Append
+	'treesit-range-rules' to possibly already existing list in
+	'treesit-range-settings'.
+
+	* lisp/treesit.el (treesit-language-at-point-default):
+	Optimize to use 'when-let*'.
+
+2025-04-18  Juri Linkov  <juri@linkov.net>
+
+	Lock tree-sitter language grammars to verified versions.
+
+	* admin/notes/tree-sitter/build-module/build.sh:
+	Update org for toml/yaml.
+
+	* admin/tree-sitter/treesit-admin.el
+	(treesit-admin--builtin-language-sources):
+	Add verified versions.
+
+	* lisp/progmodes/c-ts-mode.el:
+	Append language source to treesit-language-source-alist.
+	(c-ts-mode, c++-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/progmodes/cmake-ts-mode.el:
+	Append language source to treesit-language-source-alist.
+	(cmake-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/progmodes/csharp-mode.el:
+	Append language source to treesit-language-source-alist.
+	(csharp-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/progmodes/dockerfile-ts-mode.el:
+	Append language source to treesit-language-source-alist.
+	(dockerfile-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/progmodes/elixir-ts-mode.el:
+	Append language source to treesit-language-source-alist.
+	(elixir-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/progmodes/go-ts-mode.el:
+	Append language source to treesit-language-source-alist.
+	(go-ts-mode, go-mod-ts-mode, go-work-ts-mode):
+	Use treesit-ensure-installed.
+
+	* lisp/progmodes/heex-ts-mode.el:
+	Append language source to treesit-language-source-alist.
+	(heex-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/progmodes/java-ts-mode.el:
+	Append language source to treesit-language-source-alist.
+	(java-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/progmodes/js.el:
+	Append language source to treesit-language-source-alist.
+	(js-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/progmodes/json-ts-mode.el:
+	Append language source to treesit-language-source-alist.
+	(json-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/progmodes/lua-ts-mode.el:
+	Append language source to treesit-language-source-alist.
+	(lua-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/progmodes/php-ts-mode.el
+	(php-ts-mode--language-source-alist):
+	Update versions from comments in ts-modes.
+	Append to treesit-language-source-alist.
+	(php-ts-mode-install-parsers):
+	Use treesit-language-source-alist directly.
+	(php-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/progmodes/ruby-ts-mode.el:
+	Append language source to treesit-language-source-alist.
+	(ruby-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/progmodes/rust-ts-mode.el:
+	Append language source to treesit-language-source-alist.
+	(rust-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/progmodes/sh-script.el:
+	Append language source to treesit-language-source-alist.
+	(bash-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/progmodes/typescript-ts-mode.el:
+	Append language source to treesit-language-source-alist.
+	(typescript-ts-mode, tsx-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/textmodes/css-mode.el:
+	Append language source to treesit-language-source-alist.
+	(css-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/textmodes/html-ts-mode.el:
+	Append language source to treesit-language-source-alist.
+	(html-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/textmodes/markdown-ts-mode.el:
+	Append language source to treesit-language-source-alist.
+	(markdown-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/textmodes/mhtml-ts-mode.el
+	(mhtml-ts-mode--language-source-alist):
+	Append to treesit-language-source-alist.
+	(mhtml-ts-mode-install-parsers):
+	Use treesit-language-source-alist directly.
+	(mhtml-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/textmodes/toml-ts-mode.el:
+	Append language source to treesit-language-source-alist.
+	(toml-ts-mode): Use treesit-ensure-installed.
+
+	* lisp/textmodes/yaml-ts-mode.el:
+	Append language source to treesit-language-source-alist.
+	(yaml-ts-mode): Use treesit-ensure-installed.
+
+	* test/infra/Dockerfile.emba: Add verified versions
+	to treesit-language-source-alist.
+
+2025-04-18  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el (treesit-auto-install): New defcustom.
+
+	(treesit-ensure-installed): New function.
+
+2025-04-18  Robert Pluim  <rpluim@gmail.com>
+
+	Match mail headers case-insensitively when encoding
+
+	* lisp/mail/rfc2047.el (rfc2047-encode-message-header): Bind
+	'case-fold-search' to t when looking up the encoding method,
+	otherwise a header spelled "CC" is encoded using the wrong
+	method.  (Bug#77866)
+
+2025-04-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(tab-bar-tests-quit-restore-window): Try and clarify the skip
+
+	* test/lisp/tab-bar-tests.el (tab-bar-tests-quit-restore-window):
+	Rewrite the `skip-unless` based on the code's history because
+	I found the current code quite confusing.
+
+2025-04-18  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Bind new window layout commands under C-x w
+
+	* lisp/window.el (rotate-windows-repeat-map)
+	(window-layout-rotate-repeat-map, window-layout-flip-repeat-map):
+	New keymaps.
+	(window-prefix-map): Bind new window layout commands.
+	* etc/NEWS: Rewrite entry for the new commands.
+
+2025-04-18  Yuan Fu  <casouri@gmail.com>
+
+	Add guard in treesit-language-at-point-default (bug#77870)
+
+	* lisp/treesit.el (treesit-language-at-point-default): Return
+	nil if there's no parser in the buffer.
+	(treesit-parsers-at): Add docstring for parser order.
+
+2025-04-18  Yuan Fu  <casouri@gmail.com>
+
+	Add missing OFFSET arg to treesit--update-ranges-local (bug#77848)
+
+	* lisp/treesit.el (treesit--update-ranges-local):
+	(treesit--update-range-1): Add missing OFFSET arg.
+
+2025-04-18  Yuan Fu  <casouri@gmail.com>
+
+	Make sure prog-fill-reindent-defun work for strings too
+
+	My previous commit foolishly excluded strings from the
+	condition, now add them back.
+
+	* lisp/progmodes/prog-mode.el (prog-fill-reindent-defun):
+	Include strings.
+
+2025-04-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	pgtk: Make x-display-grayscale-p return Qt
+
+	We already unconditionally claim that `xw-display-color-p`, which,
+	according to the docstring of this function, implies that we handle
+	grayscale too.
+
+	* src/pgtkfns.c (Fx_display_grayscale_p): Return Qt unconditionally.
+
+2025-04-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	* src/pgtkfns.c (Fx_gtk_launch_uri): Improve docstring.
+
+2025-04-17  Juri Linkov  <juri@linkov.net>
+
+	Don't switch to another frame if window is not on the selected frame.
+
+	* lisp/window.el (window--quit-restore-select-window):
+	Add optional arg 'frame'.  Don't switch to another frame
+	if window is not on the selected frame (bug#71386).
+	(quit-restore-window): Provide the 'frame' arg
+	to 'window--quit-restore-select-window' calls.
+	Patch by martin rudalics <rudalics@gmx.at>.
+
+	* test/lisp/tab-bar-tests.el (tab-bar-tests-quit-restore-window):
+	No need to reselect the frame after 'quit-window'.
+
+2025-04-17  Juri Linkov  <juri@linkov.net>
+
+	Adapt tab-bar-tests-quit-restore-window for emba.
+
+	* test/lisp/tab-bar-tests.el (tab-bar-tests-quit-restore-window):
+	Skip unless system-type is 'gnu/linux' and "TERM" is non-nil
+	that is nil on emba.
+
+2025-04-17  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el (treesit-parsers-at): Fix for 'with-host' arg.
+
+	Don't add the primary parser or the first of treesit-parser-list
+	when non-nil 'with-host' is provided since there is no host
+	for the primary parser (bug#76788).
+
+2025-04-17  kobarity  <kobarity@gmail.com>
+
+	Disable echo back instead of setting tty to raw in Inferior Python
+
+	* lisp/progmodes/python.el (python-shell-setup-code): Change the
+	Python setup code.  (Bug#76943)
+
+2025-04-17  Protesilaos Stavrou  <info@protesilaos.com>
+
+	Update modus-themes to their 4.7.0 version
+
+	* doc/misc/modus-themes.org: Update the manual to document how
+	  'modus-themes-list-colors' has changed. Make other minor changes.
+	* etc/themes/modus-operandi-deuteranopia-theme.el:
+	* etc/themes/modus-operandi-theme.el:
+	* etc/themes/modus-operandi-tinted-theme.el:
+	* etc/themes/modus-operandi-tritanopia-theme.el:
+	* etc/themes/modus-vivendi-deuteranopia-theme.el:
+	* etc/themes/modus-vivendi-theme.el:
+	* etc/themes/modus-vivendi-tinted-theme.el:
+	* etc/themes/modus-vivendi-tritanopia-theme.el: Make stylistic refinements.
+	* etc/themes/modus-themes.el: Make refinements to supported
+	  faces, add support for more faces, and the like.
+
+	Release notes: <https://protesilaos.com/codelog/2025-04-17-emacs-modus-themes-4-7-0/>.
+
+2025-04-17  Juri Linkov  <juri@linkov.net>
+
+	Use the first parser from 'treesit-parser-list' to fix tests.
+
+	* lisp/treesit.el (treesit-parsers-at): Add treesit-primary-parser
+	only when it's non-nil.  When the result list is still empty,
+	add the first parser from 'treesit-parser-list'.
+	https://lists.gnu.org/archive/html/emacs-devel/2025-04/msg00627.html
+
+	* test/src/treesit-tests.el (treesit-node-supplemental)
+	(treesit-node-at, treesit-node-check)
+	(treesit-search-subtree-forward-1)
+	(treesit-search-subtree-backward-1): Wrap test body in 'with-temp-buffer'.
+
+2025-04-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Don't override 'revert-buffer-function' globally in 'eww-buffers-mode'
+
+	* lisp/net/eww.el (eww-buffers-mode): Set 'revert-buffer-function'
+	buffer-locally.  (Bug#77854)
+
+2025-04-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete duplicate docstrings in PGTK build
+
+	* src/pgtkfns.c (Fx_export_frames, Fx_create_frame)
+	(Fx_server_max_request_size, Fx_display_screens, Fx_display_mm_height)
+	(Fx_display_mm_width, Fx_display_backing_store, Fx_display_visual_class)
+	(Fx_display_save_under, Fx_open_connection, Fx_close_connection)
+	(Fx_display_list, Fxw_color_defined_p, Fxw_color_values)
+	(Fxw_display_color_p, Fx_display_grayscale_p, Fx_display_pixel_width)
+	(Fx_display_pixel_height, Fx_display_planes, Fx_display_color_cells)
+	(Fx_show_tip, Fx_hide_tip, Fx_file_dialog, Fx_select_font): Replace
+	duplicate docstrings with "SKIP" marker.  See the comment in doc.c.
+	* src/xfns.c (Fx_server_max_request_size, Fx_display_screens)
+	(Fx_display_backing_store, Fx_display_visual_class, Fx_file_dialog):
+	Update docstrings with details about the PGTK build.
+
+2025-04-17  Yuan Fu  <casouri@gmail.com>
+
+	Remove treesit.el dependency from prog-mode.el
+
+	prog-mode.el doens't need treesit.el dependency.  And it
+	shouldn't depend on it.  In principle, treesit.el should
+	integrate into various parts of Emacs through standard hooks and
+	variables.
+
+	* lisp/progmodes/prog-mode.el:
+	(prog-fill-reindent-defun): Remove treesit.el functions.  Use
+	generic functions to check whether the current line has
+	comments, and make the test more comprehensive.
+
+2025-04-17  Yuan Fu  <casouri@gmail.com>
+
+	Fix c-ts-common--fill-paragraph for non-rust modes (bug#77727)
+
+	* lisp/progmodes/c-ts-common.el:
+	(c-ts-common--comment-regexp): Add // and /* to regexp for Rust.
+	(c-ts-common--line-comment-p): Extract out into new function,
+	add a check that the parent node is a comment node.
+	(c-ts-common--fill-paragraph): Extract some code out.
+
+2025-04-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(eieio-backward-compatibility): Set to `warn` (bug#77612)
+
+	* lisp/emacs-lisp/eieio-base.el (make-instance) <eieio-named>:
+	Really skip backward compatibility when `eieio-backward-compatibility`
+	is nil and emit message if it's `warn`.
+	(eieio-persistent-make-instance): Warn when an obsolete name is used.
+
+	* lisp/emacs-lisp/eieio-core.el (eieio-backward-compatibility):
+	Change default to `warn`.
+	(eieio-defclass-internal): Warn when the *-list-p function is called
+	(eieio--slot-name-index): Warn when a initarg is used to access a slot.
+
+	* lisp/emacs-lisp/eieio.el (defclass): Warn when a class-slot is
+	accessed via the obsolete method.
+	(make-instance, clone) <eieio-default-superclass>: Really skip backward
+	compatibility when `eieio-backward-compatibility` is nil and emit
+	message if it's `warn`.
+
+2025-04-17  Po Lu  <luangruo@yahoo.com>
+
+	Prevent unrelocated symbols with position from being dumped
+
+	* src/pdumper.c (dump_builtin_symbol_p): Test BARE_SYMBOL_P
+	\(object) rather than SYMBOLP to avoid depending on the value of
+	symbols_with_pos_enabled or depositing non-relocated references
+	to vectorlikes in the dump file.  Clarify commentary.
+
+2025-04-17  F. Jason Park  <jp@neverwas.me>
+
+	Don't round-trip auto-reconnect probe in ERC
+
+	* lisp/erc/erc-backend.el (erc-server--reconnect-opened)
+	(erc--server-reconnect-opened): Rename former to latter.  Restore
+	original buffer-local value of session connector for Emacs 29 and below.
+	(erc--server-reconnect-timeout-check)
+	(erc--server-reconnect-timeout-scale-function): Change from buffer-local
+	to normal variables, which they should have been originally.
+	(erc--recon-probe-reschedule): Ensure `erc-server-reconnect-timeout' is
+	always non-nil to avoid seeing format specifier in admin message.  Use
+	current buffer when `proc' argument is nil.  Perform cleanup when `proc'
+	and `erc-server-process' differ.
+	(erc-server-delayed-check-reconnect-reuse-process-p): New variable.
+	(erc--recon-probe-sentinel): Run `erc--server-reconnect-opened'
+	immediately because sending a speculative PING doesn't work on all
+	servers and proxies, most crucially on ZNC, which replies with an error
+	only after an extended timeout.
+	(erc--recon-probe-filter): Remove unused function.
+	(erc--recon-probe-check) Rework to not use fixed periodic timer, change
+	second parameter to a Lisp time object.
+	(erc-server-delayed-check-reconnect): Use realistic name when reusing
+	process so that the session's process isn't "*erc-connectivity-check*".
+	Set filter to `ignore'.  Always run `erc--recon-probe-sentinel' when
+	status is `open' or something other than `connect', but don't bother
+	spawning a `erc--recon-probe-check' task as well because any problems
+	creating the process should already be known.  Handle quits during
+	connect functions that perform blocking I/O, such as
+	`socks-open-network-stream'.
+	(erc-schedule-reconnect): Don't bother setting filter to nil.
+	* test/lisp/erc/erc-scenarios-base-auto-recon.el
+	(erc-scenarios-base-auto-recon-unavailable)
+	(erc-scenarios-base-auto-recon-check/no-reuse): Rename former to latter.
+	(erc-scenarios-base-auto-recon-no-proto)
+	(erc-scenarios-base-auto-recon-check/reuse): Rename former to latter and
+	rewrite not to expect a PING.
+	* test/lisp/erc/resources/erc-d/erc-d.el (erc-d--forget-process): New
+	function.
+	(erc-d--process-sentinel): Stop serving when all dialogs have been
+	exhausted.  (Bug#62044)
+
+2025-04-17  João Távora  <joaotavora@gmail.com>
+
+	Eglot: be aware of LSP version of contextual diagnostics
+
+	In certain situations, Eglot has to report to the server parts
+	of the diagnostics that it itself sent us.  The server may use
+	this as context to compute code actions, for example.  Eglot
+	selects diagnostics by asking Flymake, looking for the ones that
+	contain Eglot-specific cookies.
+
+	But when doing so, it is important to also be aware of the LSP
+	document version these each of these diagnostics pertain to,
+	since if a diagonstic in the buffer pertains to an older version
+	of the LSP document (because Flymake fired or the server hasn't
+	pushed a new set), that diagnostics 'eglot-lsp-data' cookie is
+	invalid and possibly harmful.
+
+	An example is when a diagnostic extends all the way to the end
+	of the buffer.  If we attempt to fix by shortening the buffer,
+	an Eldoc-started code actions request may be sent to the server
+	considering the soon-to-be-deleted Flymake diagnostic as
+	context.  But that diagnostic's 'eglot-lsp-data' cookie is no
+	longer valid and when processing that context we try to go past
+	point-max and burp an annoying error.
+
+	Best to check the version of the diagnostic (if we have it) and
+	ignore the ones that don't match the document version.
+
+	* lisp/progmodes/eglot.el (eglot--versioned-identifier): Move up.
+	(eglot--flymake-diagnostics, eglot--diag-to-lsp-diag): New helpers.
+	(eglot-handle-notification): Record LSP doc version in diagnostics.
+	(eglot--code-action-bounds)
+	(eglot--code-action-params): Use eglot--flymake-diagnostics.
+
+2025-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/savehist.el (savehist--reload): Don't accidentally set nil
+
+	Reported by Michael Heerdegen <michael_heerdegen@web.de>.
+
+2025-04-16  Juri Linkov  <juri@linkov.net>
+
+	* lisp/textmodes/markdown-ts-mode.el: More ts-modes for code blocks.
+
+	(markdown-ts--code-block-language-map): Add more aliases.
+	(markdown-ts-code-block-source-mode-map): Add more mappings
+	for existing core ts-modes.
+	(markdown-ts--convert-code-block-language):
+	Check 'lang-string' with 'symbolp'.  Check 'mode' with 'fboundp'.
+
+2025-04-16  Juri Linkov  <juri@linkov.net>
+
+	Change the default navigation sexp-type in 'elixir-ts-mode'.
+
+	* lisp/progmodes/elixir-ts-mode.el (elixir-ts-mode):
+	Call 'treesit-cycle-sexp-type' at the end to enable navigation across
+	nodes defined by the tree-sitter thing 'sexp' by default (bug#76788).
+
+2025-04-16  Juri Linkov  <juri@linkov.net>
+
+	New hook 'outline-after-change-functions' (bug#77256).
+
+	* lisp/outline.el (outline-after-change-functions): New variable.
+	(outline--fix-buttons-after-change):
+	Run hook 'outline-after-change-functions'.
+
+	* lisp/treesit.el (treesit--after-change): Improve docstring.
+	(treesit-major-mode-setup): Simplify to just add
+	'treesit--after-change' to 'outline-after-change-functions' hook.
+
+	* lisp/progmodes/rust-ts-mode.el (rust-ts-mode): Add explicit
+	'treesit-outline-predicate' that is like
+	'treesit-simple-imenu-settings', but also adds "trait_item".
+
+2025-04-16  Juri Linkov  <juri@linkov.net>
+
+	Add 'treesit-language-at-point-default' (bug#77256).
+
+	* lisp/treesit.el (treesit-language-at-point-function):
+	Change the default value from nil to 'treesit-language-at-point-default'.
+	(treesit-language-at): Funcall 'treesit-language-at-point-function'
+	unconditionally.
+	(treesit-language-at-point-default): New function with body from
+	'treesit-language-at'.
+	(treesit-node-at): Simplify by replacing duplicate code
+	with the call to 'treesit-parsers-at'.
+
+2025-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(Freplace_region_contents): Treat point as insert-before marker
+
+	Experience suggests that it's more often useful to keep point
+	at the end of the replacement than it is to keep point at the
+	beginning of the replacement.
+	This also aligns the behavior of `replace-region-contents` with
+	that of `insert`.
+
+	* src/insdel.c (replace_range): Treat PT like an insert-before marker.
+	* src/editfns.c (Freplace_region_contents): Adjust docstring accordingly.
+
+2025-04-16  Juri Linkov  <juri@linkov.net>
+
+	* test/lisp/tab-bar-tests.el (tab-bar-tests-quit-restore-window): Fix.
+
+	Select the created frame because 'quit-window' unexpectedly
+	selects the original frame (https://debbugs.gnu.org/71386#262).
+	Add a comment about the `message' call bound to the original frame.
+	https://lists.gnu.org/archive/html/emacs-devel/2025-04/msg00546.html
+
+2025-04-16  Yuan Fu  <casouri@gmail.com>
+
+	Expand markdown-ts-mode and add code block support for javascript
+
+	- Define new faces and use them in place of font-lock faces
+	- Add more fontification, add a new feature for headings.
+	- Remove fontification for code blocks, so embedeed parser can
+	  fontify them
+	- Add experimental code block support for javascript by using
+	  tree-sitter setup from js-ts-mode.
+	- Correctly setup markdown_inline with range settings.
+
+	* lisp/textmodes/markdown-ts-mode.el:
+	(markdown-ts--code-block-language-map):
+	(markdown-ts-code-block-source-mode-map): New variables.
+	(markdown-ts-faces): New group.
+	(markdown-ts-delimiter):
+	(markdown-ts-heading-1):
+	(markdown-ts-setext-heading):
+	(markdown-ts-heading-2):
+	(markdown-ts-heading-3):
+	(markdown-ts-heading-4):
+	(markdown-ts-heading-5):
+	(markdown-ts-heading-6):
+	(markdown-ts-list-marker):
+	(markdown-ts-block-quote):
+	(markdown-ts-language-keyword): New faces.
+	(markdown-ts--treesit-settings):
+	(markdown-ts--configured-languages): New variables.
+	(markdown-ts--harvest-treesit-configs):
+	(markdown-ts--add-config-for-mode):
+	(markdown-ts--convert-code-block-language): New functions.
+	(markdown-ts--range-settings): New variable.
+	(markdown-ts-setup): Setup range configuration.
+	(markdown-ts-mode): Add heading feature.
+
+2025-04-15  Jared Finder  <jared@finder.org>
+
+	Show drag cursor on all window lines (mode, tab, header)
+
+	* lisp/ruler-mode.el (ruler-mode-map): Remove down-mouse-1
+	binding that conflicts with dragging header line.
+	* src/xdisp.c (note_mode_line_or_margin_highlight): Renamed
+	to...
+	(note_line_or_margin_highlight): ...new name since it applies to
+	any window line (mode, tab, header).  Set drag cursor for window
+	top lines.
+	(note_mouse_highlight): Update call to new name (bug#76084).
+
+2025-04-15  Jens Schmidt  <jschmidt4gnu@vodafonemail.de>
+
+	Better handle errors after sync man invocations
+
+	* lisp/man.el (Man-start-calling): Declare as debuggable.
+	(Man-getpage-in-background): Call `Man-bgproc-sentinel' with a
+	cons (BUFFER . EXIT-STATUS) as PROCESS argument for synchronous calls.
+	(Man-bgproc-sentinel): Use that information to handle those more
+	similarly to asynchronous calls.  Do not employ window selection hacks
+	for synchronous calls.  (Bug#77755)
+
+2025-04-15  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el (treesit-up-list): Signal an error.
+
+	Signal 'scan-error' when called noninteractively (bug#77744).
+
+2025-04-15  Stephen Berman  <stephen.berman@gmx.net>
+
+	Optionally add new empty file to Dired subdirectory
+
+	Suggested by Kasper Gałkowski <kpg@posteo.net> (bug#77668)
+
+	* etc/NEWS: Announce new Dired user option.
+
+	* lisp/dired-aux.el (dired-create-empty-file-in-current-directory):
+	New user option.
+	(dired-create-empty-file): Use it.  Update and clarify doc string.
+
+2025-04-15  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Add block-comment variables to cc-mode.
+
+	* lisp/progmodes/cc-cmds.el (c-indent-new-comment-line):
+	Add block-comment-start and block-comment-end
+	* lisp/progmodes/cc-mode.el (c-basic-common-init):
+	Declare block-comment-start and block-comment-end buffer-local.
+	* lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables): Move
+	block-comment variables ...
+	(lisp-mode): ... to here.  (Bug#77424)
+
+2025-04-15  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix tree-sitter tests on Emba
+
+	* test/infra/Dockerfile.emba: Use tree-sitter-rust v0.23.3 in
+	order to match ABI version of libtree-sitter0.
+
+2025-04-15  Po Lu  <luangruo@yahoo.com>
+
+	Unconditionally define MIPS_NABI on mips64el
+
+	* exec/configure.ac (MIPS_NABI): Always define to 1 on
+	mips64el-*-linux*.
+
+2025-04-15  Visuwesh  <visuweshm@gmail.com>
+
+	Don't warn about lexbind cookies when loading calc settings
+
+	* lisp/calc/calc-mode.el (calc-settings-file-name):
+	* lisp/calc/calc.el (calc-mode): Bind 'warning-inhibit-types' to
+	avoid lexbind cookie missing warning.
+
+2025-04-15  Po Lu  <luangruo@yahoo.com>
+
+	* exec/loader-mips64el.s (rest_of_exec): Deal with assembler bugs.
+
+	* exec/configure.ac (exec_CHECK_MIPS_NABI): Test __LP64__ also.
+
+2025-04-15  Po Lu  <luangruo@yahoo.com>
+
+	Port recent Android changes to mips64el
+
+	* exec/config-mips.m4.in (DADDI2, DADDI3): Disable at-clobbering
+	by assembler macros expressly.
+
+	* exec/loader-mips64el.s: Adapt from loader-mipsel.s.
+
+	* exec/configure.ac (exec_cv_as_daddi): Properly escape reg
+	names.
+
+	* exec/exec.c (struct exec_jump_command, exec_0): Don't define
+	or set `fpu_mode' if __LP64__.
+
+	* exec/exec.h (struct exec_tracee): New field `callno'.
+
+	* exec/trace.c (process_system_call): Always record the current
+	system call number in TRACEE lest it should be required once it
+	has been overwritten upon the syscall's completion.
+	(seccomp_system_call): Likewise.
+	(after_fork): Clear `tracee->callno'.
+
+2025-04-15  Po Lu  <luangruo@yahoo.com>
+
+	Address typos in MIPS executable loader
+
+	* exec/loader-mipsel.s (rest_of_exec): Delete redundant nop.
+	(skip_environ): Correct stack space test.  Don't jump into
+	the label for the sp preserving case's delay slot.
+
+2025-04-15  Po Lu  <luangruo@yahoo.com>
+
+	Avoid performance regressions in unoptimized builds
+
+	* src/alloc.c (lisp_malloc): Declare val register.
+
+2025-04-14  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove unused XMALLOC_BLOCK_INPUT_CHECK debug facility
+
+	The compile-time option XMALLOC_BLOCK_INPUT_CHECK was added in
+	2012 (commit 4d7e6e51dd4acecff) to allow blocking input during
+	malloc-family calls, in case any issues arose from related
+	changes in Emacs 24.3.  However, it has not been referenced on
+	emacs-devel or the bug tracker in over a decade.
+
+	It is clear that we do not need it, as our signal handlers do not
+	allocate memory.  Removing it simplifies the allocation function
+	wrappers and eliminates dead debug code.
+
+	Ref: https://debbugs.gnu.org/12450
+
+	* src/alloc.c [XMALLOC_BLOCK_INPUT_CHECK]
+	(malloc_block_input, malloc_unblock_input): Delete functions.
+	(MALLOC_BLOCK_INPUT, MALLOC_UNBLOCK_INPUT): Delete macros.  Update
+	all callers.
+
+2025-04-14  Po Lu  <luangruo@yahoo.com>
+
+	Port recent changes to mipsel systems
+
+	* exec/exec.c (exec_0): Don't disable AT_EXECFN substitution on
+	MIPS systems.
+
+	* exec/loader-aarch64.s (skip_environ): Correct typo in
+	commentary.
+
+	* exec/loader-mips64el.s: Add a disclaimer that this file is
+	currently inoperable.
+
+	* exec/loader-mipsel.s (__start): Move environment and argument
+	vectors and produce and replace AT_EXECFN.  Clear stack before
+	proceeding to circumvent an oversight in glibc.
+
+2025-04-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Support file:// URIs and readonly DB in 'sqlite-open'
+
+	* src/sqlite.c (Fsqlite_open): Two new optional arguments,
+	READONLY and DISABLE-URI.  Doc fix.
+
+	* etc/NEWS:
+	* doc/lispref/text.texi (Database): Document the new optional
+	arguments to 'sqlite-open'.  (Bug#65274)
+
+2025-04-14  Po Lu  <luangruo@yahoo.com>
+
+	Fix typos in executable loaders
+
+	* exec/loader-aarch64.s (skip_environ, cleanup): Minor thinkos.
+
+	* exec/loader-x86_64.s (skip_environ): Insert missing label.
+
+2025-04-14  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Fix help-customize in describe-symbol buffers
+
+	* lisp/help-fns.el (describe-symbol):
+	Protect help-mode--current-data from being modified inside the
+	help-setup-xref call (bug#77510).
+
+2025-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cl-generic-define-method): Try and fix bug#77464
+
+	* lisp/emacs-lisp/cl-generic.el (cl-generic-define-method): Don't set
+	the function to `dummy`, even temporarily.
+
+2025-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/gnus/gnus-start.el (gnus-dribble-eval-file): Ignore lexbind warning
+
+2025-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(calc-save-modes): Add a `lexical-binding` cookie
+
+	* lisp/calc/calc-mode.el (calc-save-modes): Add a `lexical-binding`
+	cookie when it is safe.  Use `pcase-dolist` and `pp`.
+
+2025-04-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix warning messages about lexbind cookie in subdirs.el
+
+	* lisp/files.el (internal--get-default-lexical-binding): Don't log
+	a warning message when lexbind warning is disabled, and
+	'display-warning' is unavailable or signals an error.
+
+2025-04-13  Po Lu  <luangruo@yahoo.com>
+
+	Replace AT_EXECFN in auxiliary vectors of programs executed on Android
+
+	* exec/exec.c (insert_args, exec_0): On non-MIPS systems, copy
+	NAME and its length to the loader area.  State that MIPS support
+	is not yet available (though it will be pending the availability
+	of a functioning emulator).
+
+	* exec/loader-aarch64.s (_start):
+
+	* exec/loader-armeabi.s (_start):
+
+	* exec/loader-x86.s (_start):
+
+	* exec/loader-x86_64.s (_start): Displace auxv, environ, and
+	argv to create sufficient space for the provided file name, and
+	copy the file name there.  Replace AT_EXECFN to refer to this
+	space.
+
+2025-04-13  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Add variable for control docstring length in elisp eldoc functions
+
+	* etc/NEWS: Announce new variable.
+	* lisp/progmodes/elisp-mode.el (elisp-eldoc-docstring-length-limit):
+	New user option.
+	(elisp-eldoc-funcall-with-docstring): Add "Undocumented" as
+	docstring if the function has no docstring.
+	(elisp-eldoc-var-docstring-with-value): Use
+	`elisp-eldoc-docstring-length-limit'.  (Bug#77628)
+
+2025-04-13  Sebastián Monía  <sebastian@sebasmonia.com>
+
+	Special treatment for file:// URIs on Windows
+
+	* lisp/url/url-parse.el (url-generic-parse-url): Remove prefix /
+	when a file URI's filename starts with a single letter followed
+	by a colon and a slash or backslash.
+	(url-recreate-url): Mirror the change applied when parsing, so
+	the URL is recreated properly on MS-Windows.
+	* test/lisp/url/url-parse-tests.el
+	(url-generic-parse-url/ms-windows-file-uri-hanlding): New test.
+	(Bug#76982)
+
+2025-04-13  Pengji Zhang  <me@pengjiz.com>
+
+	New user option to hide minor mode lighters (bug#77361)
+
+	* lisp/bindings.el (mode-line-collapse-minor-modes): New user
+	option.
+	(mode-line-minor-modes): New variable to hold mode line
+	constructs for minor modes.
+	(mode-line--make-lighter-menu): New helper function to generate
+	the menu for hidden minor modes.
+	(mode-line--minor-modes): New helper function to computer mode
+	line constructs for minor mode lighters.
+	(mode-line-modes): Use the new variable 'mode-line-minor-modes',
+	and adjust the order of elements so the indicator for hidden
+	minor modes is shown towards the end.
+
+	* doc/lispref/modes.texi (Mode Line Basics): Move the paragraph
+	for 'mode-line-compact' from here...
+	* doc/emacs/display.texi (Optional Mode Line): ...to here, and
+	document the new user option.
+	* etc/NEWS: Annouce the new user option.
+
+2025-04-13  Jens Schmidt  <jschmidt4gnu@vodafonemail.de>
+
+	Use a pristine copy of argv to restart Emacs
+
+	argv as left after main has proccessed the command-line can differ
+	both in order and contents of the original command-line arguments,
+	which can lead to surprising results when restarting emacs on the
+	cooked argv through `kill-emacs'.
+
+	Starting from that observation, consistenly use variables
+	'initial_cmdline' on Windows, 'initial_argc', 'initial_argv' on
+	non-Windows, and 'initial_argv0' in all ports.
+
+	* src/lisp.h: Declare 'initial_argv0', limit declaration of
+	'initial_argv' and 'initial_argc' to non-Windows ports.
+	* src/emacs.c: Likewise, but for the definitions.
+	(init_cmdargs): Move initialization of 'initial_argv' and
+	'initial_argc' ...
+	(copy_args) [!WINDOWSNT]: ... to this new function ...
+	(main): ... and call that in 'main', also initializing
+	'initial_argv0' before the command-line processing.
+	* src/emacs.c (Fkill_emacs):
+	* src/pgtkterm.c (pgtk_term_init):
+	* src/sysdep.c (emacs_perror):
+	* src/xterm.c (x_term_init): Use 'initial_argv0' where only that
+	is required.  (Bug#77389)
+
+2025-04-13  Asher Copeland  <ashercopeland@gmail.com>  (tiny change)
+
+	Fix 'backward-delete-char-untabify'
+
+	* lisp/simple.el (backward-delete-char-untabify): Fix
+	behavior when there's an active region.  (Bug#75042)
+
+2025-04-13  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Add block-comment-start and block-comment-end to supported modes
+
+	* lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables):
+	Add block-comment-start and block-comment-end from here...
+	* lisp/newcomment.el (block-comment-start, block-comment-end):...
+	* lisp/nxml/nxml-mode.el (nxml-mode):...
+	* lisp/progmodes/c-ts-common.el (c-ts-common-comment-setup):...
+	* lisp/progmodes/go-ts-mode.el (go-work-ts-mode):...
+	* lisp/progmodes/js.el (js--mode-setup):...
+	* lisp/progmodes/json-ts-mode.el (json-ts-mode):...
+	* lisp/progmodes/lua-ts-mode.el (lua-ts-mode):...
+	* lisp/progmodes/opascal.el (opascal-mode):...
+	* lisp/progmodes/pascal.el (pascal-mode):...
+	* lisp/progmodes/typescript-ts-mode.el (tsx-ts-mode):...
+	* lisp/textmodes/css-mode.el (css-base-mode, scss-mode):...
+	* lisp/textmodes/sgml-mode.el (sgml-mode): ... to here.
+	(Bug#77424)
+
+2025-04-13  Stephane Zermatten  <szermatt@gmx.net>  (tiny change)
+
+	Fix term.el bug with very short multibyte character chunk
+
+	Before this change, a chunk containing only a part
+	of a multibyte character would be discarded and
+	displayed undecoded on the terminal.
+	* lisp/term.el (term-emulate-terminal): Fix handling chunks
+	with part of a multibyte character.  (Bug#77410)
+
+	* test/lisp/term-tests.el (term-decode-partial)
+	(term-undecodable-input): Fix and enhance tests.
+
+2025-04-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Disable clearing echo-area when 'inhibit-message' is non-nil
+
+	* src/xdisp.c (clear_message): Don't clear echo-area if
+	'inhibit-message' is non-nil.
+
+	* etc/NEWS:
+	* doc/lispref/display.texi (Displaying Messages): Document the
+	above change.  (Bug#77257)
+
+2025-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/subr.el (setq-local): Make local after evaluating the new value
+
+	In case the evaluation needs to look at the variable's value,
+	make sure we make it buffer-local afterwards.
+
+2025-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(replace-buffer-contents): Mark as obsolete, again.
+
+	* lisp/subr.el (replace-buffer-contents): Mark as obsolete, again.
+	* src/editfns.c (Freplace_region_contents): Add interactive form.
+
+2025-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	savehist.el: Unbreak tests
+
+	* lisp/savehist.el (savehist-loaded): Fix typo.
+	(savehist--reload): Add compatibility with test case.
+
+2025-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	savehist.el: Handle concurrent access to `savehist-file`
+
+	* lisp/savehist.el (savehist--manage-timer): Minor simplification.
+	(savehist-coding-system): Use `utf-8-emacs-unix` so it works even if
+	some history entries contain chars that aren't in Unicode.
+	(savehist-loaded): Mark it obsolete.
+	(savehist--file-sync-modtime): New var to replace it.
+	(savehist--file-modtime, savehist--merge): New functions.
+	(savehist--reload): New function, extracted from `savehist-mode`.
+	Make it merge the old history and the newly loaded one.
+	Remember the time of sync in `savehist--file-sync-modtime`.
+	(savehist-mode): Use it.
+	(savehist-save): Use it as well, and set `savehist--file-sync-modtime`.
+	(savehist--last-autosave): New var.
+	(savehist-autosave): Use it to skip saves when not enough time has passed.
+
+2025-04-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	d3c39fb522d Fix display of keys in 'help-form' buffers (bug#77118)
+	6509cc20a9e Improve documentation of 'user-emacs-directory'
+	3f060597306 Update remarks on name prefixes in coding conventions
+	e966ff9759a ; * doc/emacs/files.texi (Image Mode): Fix a typo (bug#77...
+	378bea99b1a ; Fix doc strings of a few Dired commands
+	30fb2ac07a7 ; * CONTRIBUTE: Clarify single-line commit should end wit...
+	417d14a95ee ; * admin/MAINTAINERS: Complete the handover of VC
+	bb756b195a7 ; Fix typo in Tramp
+
+2025-04-12  Visuwesh  <visuweshm@gmail.com>
+
+	Limit fontification of "customize" in setopt suggestion
+
+	* lisp/help-fns.el (help-fns--customize-variable): Limit the
+	fontification to newly inserted text to avoid spurious
+	fontification of other instances of the word "customize."
+
+2025-04-12  Spencer Baugh  <sbaugh@janestreet.com>
+
+	flymake: fall back to margins on text terminals
+
+	Previously, flymake-indicator-type defaulted to either fringes
+	or margins.  But fringes should be used on graphical frames, and
+	margins on TTY frames.  So default to fringes instead, and
+	simply fall back to margins automatically on text frames.
+
+	* lisp/progmodes/flymake.el (flymake-indicator-type): Set to
+	fringes.  (bug#77313)
+	(flymake-mode): Fallback to margins if there's no fringes.
+	* doc/misc/flymake.texi (Customizable variables): Mention
+	fallback behavior.
+	* etc/NEWS: Announce fallback behavior.
+
+2025-04-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-do-async-command: Ellipse later lines in multiline arguments
+
+	* lisp/emacs-lisp/cl-print.el (cl-print-expand-ellipsis): Bind
+	inhibit-read-only to t.
+	* lisp/vc/vc-dispatcher.el (require): Require cl-print at
+	compile time.
+	(vc-do-async-command): When printing command arguments that
+	contain multiple lines, use cl-prin1 with cl-print-string-length
+	bound in order to ellipse lines other than the first.
+	Switch the outer quotation marks to single quotation marks.
+
+2025-04-11  Juri Linkov  <juri@linkov.net>
+
+	Rename treesit-toggle-sexp-type to treesit-cycle-sexp-type.
+
+	* lisp/treesit.el (treesit-cycle-sexp-type):
+	Rename from 'treesit-toggle-sexp-type'.  Fix docstring.
+	https://lists.gnu.org/archive/html/emacs-devel/2025-04/msg00291.html
+
+2025-04-11  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New buffer-local vc-buffer-overriding-fileset and vc-buffer-revision
+
+	* lisp/vc/vc.el (vc-buffer-overriding-fileset)
+	(vc-buffer-revision): New variables (bug#77529).
+	(vc-find-revision-save, vc-find-revision-no-save): Set them.
+	(vc-deduce-fileset): Respect vc-buffer-overriding-fileset.
+	(vc-print-log): Use vc-buffer-revision as a default working
+	revision.
+
+	* lisp/vc/vc-annotate.el (vc-annotate-parent-file)
+	(vc-annotate-parent-rev): Delete.
+	(vc-annotate): Respect vc-buffer-overriding-fileset and
+	vc-buffer-revision.  This makes 'C-x v g' work from buffers
+	generated by 'C-x v ~' (bug#5424).
+	Set the two variables in the newly prepared buffer.
+	(vc-annotate-working-revision)
+	(vc-annotate-extract-revision-at-line)
+	(vc-annotate-revision-at-line, vc-annotate-warp-revision)
+	(vc-annotate-goto-line):
+	* lisp/vc/vc-svn.el (vc-svn-annotate-current-time): Use
+	vc-buffer-overriding-fileset instead of vc-annotate-parent-file,
+	vc-buffer-revision instead of vc-annotate-parent-rev.
+	(vc-annotate-parent-rev): Delete declaration.
+
+	* etc/NEWS: Announce the new variables.
+
+2025-04-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Add `lexical-binding` cookie to generated files
+
+	Side-companion to commits bb0f84bc0bf7 and 50947fd51202.
+	While in there, couldn't resist adding a few minor cleanups
+	I had lying around.
+
+	* lisp/savehist.el (savehist-save): Add `lexical-binding:t` cookie.
+
+	* lisp/url/url-cookie.el: Remove redundant `:group` arguments.
+	(url-cookie-write-file): Add `lexical-binding:t` cookie.
+
+	* lisp/abbrev.el: Prefer #' to quote function names.
+	(write-abbrev-file): Add a `lexical-binding:t` cookie.
+	(unexpand-abbrev): Use `replace-region-contents` and 3-args `<=`.
+	(define-abbrev-table): Use `defvar-1`.
+
+	* lisp/filesets.el (filesets-menu-cache-file-save-maybe):
+	Add `lexical-binding:t` cookie.
+	(filesets-ingroup-patterns): Don't quote lambdas.
+	(filesets-spawn-external-viewer): Remove redundant "" arg to `mapconcat`.
+
+	* lisp/recentf.el: Prefer #' to quote function names.
+	(recentf-save-file-header): Add `lexical-binding:t` cookie and change
+	mode to match the actual content.
+
+2025-04-10  Juri Linkov  <juri@linkov.net>
+
+	Fix treesit-forward-sexp/list navigation in the middle of a node.
+
+	* lisp/treesit.el (treesit--forward-list-with-default):
+	Check the thing 'sexp-default' (bug#76791).
+
+	* lisp/progmodes/elixir-ts-mode.el (elixir-ts-mode):
+	* lisp/progmodes/go-ts-mode.el (go-ts-mode):
+	* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
+	* lisp/progmodes/sh-script.el (bash-ts-mode):
+	Add the thing 'sexp-default' to 'treesit-thing-settings'.
+
+2025-04-10  Juri Linkov  <juri@linkov.net>
+
+	Rename treesit-toggle-sexp-mode to treesit-toggle-sexp-type.
+
+	* lisp/treesit.el (treesit-toggle-sexp-type):
+	Rename from 'treesit-toggle-sexp-mode'.  Fix docstring.
+	https://lists.gnu.org/archive/html/emacs-devel/2025-04/msg00273.html
+
+2025-04-10  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix one more case of unnecessary lexbind warnings
+
+	* lisp/filesets.el (filesets-menu-cache-file-load): Bind
+	'warning-inhibit-types' to avoid warning about missing lexbind
+	cookie when loading the file.
+
+2025-04-10  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid warnings about lexbind cookies where they aren't needed
+
+	* lisp/emacs-lisp/warnings.el (warning-inhibit-types): New variable.
+	(display-warning): If TYPE matches 'warning-inhibit-types', don't
+	display the warning, even if it's emitted during startup.
+	* lisp/startup.el (normal-top-level):
+	* lisp/savehist.el (savehist-mode):
+	* lisp/url/url-cookie.el (url-cookie-parse-file):
+	* lisp/recentf.el (recentf-load-list):
+	* lisp/abbrev.el (read-abbrev-file): Bind 'warning-inhibit-types'
+	to avoid warning about missing lexbind cookie when loading files
+	that Emacs itself generates.
+
+2025-04-10  Po Lu  <luangruo@yahoo.com>
+
+	Respond to display configuration updates on Android
+
+	* java/org/gnu/emacs/EmacsNative.java
+	(sendConfigurationChanged): Declare function.
+
+	* java/org/gnu/emacs/EmacsSdk7FontDriver.java (Sdk7FontEntity)
+	(Sdk7FontObject): Do not access `metrics' field deleted from
+	`EmacsService'.
+
+	* java/org/gnu/emacs/EmacsService.java (EmacsService)
+	<metrics, resources>: Delete fields.
+	<dpiX, dpiY, dpiScaled>: New fields.
+	(onCreate): Adjust accordingly.  Record current display metrics
+	for subsequent comparison.
+	(onConfigurationChanged): New function.
+
+	* lisp/dynamic-setting.el (font-setting-change-default-font):
+	Enable on systems where font-get-system-font is not defined if
+	invoked with SET-FONT nil.
+
+	* src/android.c (sendConfigurationChanged): New function.
+
+	* src/androidgui.h (ANDROID_CONFIGURATION_CHANGED): New enumerator.
+	(struct android_configuration_changed): New structure.
+	(union android_event): Add `config' member.
+
+	* src/androidterm.c (handle_one_android_event): Handle
+	ANDROID_CONFIGURATION_CHANGED events.
+	(syms_of_androidterm): Define Qfont_render, and
+	Qdynamic_setting.  Provide the latter.
+
+2025-04-09  Juri Linkov  <juri@linkov.net>
+
+	New command 'treesit-toggle-sexp-mode' (bug#76676).
+
+	* lisp/treesit.el (treesit-forward-sexp): Don't use
+	'treesit-sexp-type-regexp' reserved for list commands
+	to override their default 'list' thing.
+	(treesit-down-list, treesit-up-list): Use
+	'treesit-sexp-type-regexp' instead of 'list'
+	when it's non-nil.
+	(treesit-toggle-sexp-mode): New command.
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode--thing-settings):
+	Improve 'sexp' thing settings to exclude the top-level
+	"translation_unit" that just moves to EOF and also "comment".
+
+	* lisp/progmodes/elixir-ts-mode.el (elixir-ts--sexp-regexp): Remove.
+	(elixir-ts--forward-sexp): Remove to use the default 'sexp' navigation.
+	(elixir-ts--with-parens-0-p, elixir-ts--with-parens-1-p):
+	New internal functions.
+	(elixir-ts-mode): Add 'treesit-thing-settings'
+	instead of 'forward-sexp-function' (bug#76788).
+
+	* lisp/progmodes/heex-ts-mode.el (heex-ts--sexp-regexp): Remove.
+	(heex-ts--forward-sexp): Remove to use the default 'sexp' navigation.
+	(heex-ts--thing-settings): New variable.
+	(heex-ts-mode): Use 'heex-ts--thing-settings'
+	instead of 'forward-sexp-function'.
+
+	* lisp/progmodes/java-ts-mode.el (java-ts-mode):
+	Improve 'sexp' thing to use settings like in c-ts-mode.
+
+	* lisp/progmodes/php-ts-mode.el (php-ts-mode):
+	Improve 'sexp' thing settings to exclude the top-level
+	"program" that just moves to EOF and also "comment".
+
+	* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
+	Improve 'sexp' thing to use settings like in c-ts-mode.
+
+	* lisp/textmodes/css-mode.el (css--treesit-thing-settings):
+	Add 'sexp' thing.  Add "string_value" to 'text' thing.
+
+	* lisp/textmodes/html-ts-mode.el (html-ts-mode--treesit-things-settings):
+	Improve 'sexp' thing to use settings like in c-ts-mode.
+	Add "doctype" to the 'list' thing.
+
+2025-04-09  Juri Linkov  <juri@linkov.net>
+
+	Improve 'treesit-outline-search'.
+
+	* lisp/treesit.el (treesit-outline-search): Remove
+	temporary arg 'recursive'.  Use iteration to visit
+	more ranges until the next outline heading is found.
+
+	* lisp/progmodes/php-ts-mode.el (php-ts-mode):
+	Set 'treesit-outline-predicate' explicitly.
+
+2025-04-09  Juri Linkov  <juri@linkov.net>
+
+	* lisp/subr.el (defvar-local): Change 'indent' to 'defun' (bug#77256).
+
+2025-04-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Rename some of the new window layout commands
+
+	* lisp/window-x.el (rotate-window-layout-counterclockwise):
+	Rename to window-layout-rotate-anticlockwise.
+	(rotate-window-layout-clockwise):
+	Rename to window-layout-rotate-clockwise.
+	(flip-window-layout-horizontally):
+	Rename to window-layout-flip-leftright.
+	(flip-window-layout-vertically):
+	Rename to window-layout-flip-topdown.
+	(transpose-window-layout): Rename to window-layout-transpose.
+
+	* doc/lispref/windows.texi (Changing Window Layouts):
+	* etc/NEWS:
+	* lisp/ldefs-boot.el (rotate-window-layout-counterclockwise)
+	(rotate-window-layout-clockwise, flip-window-layout-horizontally)
+	(flip-window-layout-vertically, transpose-window-layout):
+	Update for the renames.
+
+2025-04-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC-Dir: Offer to register files before checking in
+
+	* lisp/vc/vc.el (vc-only-files-state-and-model): Rewrite
+	checking that all files are in compatible VC states.  In
+	particular, consistently return 'edited' when all files are
+	either added, removed or edited, instead of allowing the return
+	value to depend on the order of the files in VC-Dir, and offer
+	to registered unregistered files if doing so would allow the
+	operation to proceed.
+	(vc-compatible-state): Delete.
+	(vc-next-action): Replace call to vc-compatible-state.
+	Document, in this command's docstring, the new feature
+	implemented in vc-only-files-state-and-model.
+	* etc/NEWS: Announce the new feature.
+
+2025-04-08  João Távora  <joaotavora@gmail.com>
+
+	Eglot: announce support for diagnostic version checks (bug#77588)
+
+	* lisp/progmodes/eglot.el (eglot-client-capabilities): Mention versionSupport.
+
+2025-04-08  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Use relative names where possible in package-quickstart.el
+
+	package-quickstart.el hardcodes many absolute file names, which
+	makes it break if user-emacs-directory moves, or in other
+	situations.  To be slightly more robust to this, use relative
+	file names to packages that are located in the same directory as
+	package-quickstart.el.
+
+	* lisp/emacs-lisp/package.el (package--quickstart-dir,
+	package--quickstart-rel): Add.
+	(package-quickstart-refresh): Use package--quickstart-rel on
+	file names.  (bug#77468)
+
+2025-04-08  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Preserve an explicit * in pcm-try-completion
+
+	An explicitly typed * has different semantics from automatically
+	inserted PCM wildcards, so it should be preserved on try-completion.  We
+	already do this in some cases, but now we do it more.
+
+	This is especially significant for filename completion: removing an
+	explicit * can take us from
+
+	~/src/emacs/trunk/*/minibuf
+
+	to
+
+	~/src/emacs/trunk//minibuf
+
+	The explicit double slash is interpreted by the file name completion
+	table to mean "start completing from the root directory", so deleting
+	the * here substantially changes semantics.
+
+	* lisp/minibuffer.el (completion-pcm--merge-completions): Don't drop
+	important wildcards. (bug#74420)
+	* test/lisp/minibuffer-tests.el (completion-pcm-test-7): Add tests.
+
+2025-04-08  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el (treesit--after-change): New function.
+
+	(treesit-major-mode-setup): Set 'outline-minor-mode-hook'
+	to add 'treesit--after-change' with 'treesit-update-ranges'
+	to 'after-change-functions' (bug#77256).
+
+2025-04-08  Juri Linkov  <juri@linkov.net>
+
+	New function treesit-parsers-at for treesit-language-at (bug#77256).
+
+	* doc/lispref/parsing.texi (Multiple Languages): The variable
+	'treesit-language-at-point-function' is now optional for
+	multi-language major modes.  Add description of 'treesit-parsers-at'.
+
+	* lisp/treesit.el (treesit-language-at-point-function):
+	Change the the docstring to remove the dissuasion against
+	deriving the language from parser ranges.
+	(treesit-language-at): Use the first parser from
+	'treesit-parsers-at' as the default return value when
+	'treesit-language-at-point-function' is nil.  Adapt the docstring.
+	(treesit-node-at): Use 'treesit-parsers-at'.
+	(treesit-parsers-at): New function.
+	(treesit-local-parsers-at): Use 'treesit-parsers-at'
+	with the most part of the body moved to it.
+	(treesit-local-parsers-on): Replace the overlay property
+	'treesit-parser' with 'treesit-parser-local-p' in the docstring.
+	(treesit-up-list, treesit-simple-imenu, treesit-outline-level):
+	Use 'treesit-parsers-at'.
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode): Don't set
+	'treesit-language-at-point-function'.
+
+	* lisp/progmodes/elixir-ts-mode.el (elixir-ts--treesit-language-at-point):
+	Remove.
+	(elixir-ts-mode): Don't set 'treesit-language-at-point-function'.
+
+	* lisp/progmodes/js.el (js--treesit-language-at-point): Remove.
+	(js-ts-mode): Don't set 'treesit-language-at-point-function'.
+
+	* lisp/progmodes/php-ts-mode.el (php-ts-mode--html-language-at-point)
+	(php-ts-mode--language-at-point): Remove.
+	(php-ts-mode): Don't set 'treesit-language-at-point-function'.
+
+	* lisp/textmodes/mhtml-ts-mode.el (mhtml-ts-mode--language-at-point):
+	Remove.
+	(mhtml-ts-mode): Don't set 'treesit-language-at-point-function'.
+	Use 'treesit-language-at' for mode-line lighter.
+
+2025-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(internal--get-default-lexical-binding): Be more failsafe
+
+	* lisp/files.el (internal--get-default-lexical-binding): Try and
+	avoid signaling an error.  Make it easier to suppress the
+	warning for a specific file.
+
+2025-04-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix prettify-symbols-mode with composition rules
+
+	* lisp/progmodes/prog-mode.el
+	(prettify-symbols--composition-displayable-p): Fix a thinko.
+	Patch by Visuwesh <visuweshm@gmail.com>.  (Bug#77627)
+
+2025-04-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix window selection after log-edit-show-diff, again
+
+	In October I installed a change to vc-diff-patch-string and
+	labelled it as "Fix window selection after log-edit-show-diff"
+	but that change only fixed the problem within
+	log-view-modify-change-comment.  This change should fix window
+	selection after C-c C-d in ordinary checkins.
+
+	* lisp/vc/log-edit.el (log-edit-diff-fileset): Use
+	save-selected-window in order to respect the documented
+	requirement that values of log-edit-diff-function leave the Log
+	Edit buffer's window selected when they return.
+
+2025-04-08  João Távora  <joaotavora@gmail.com>
+
+	Eglot: check textDocument/publishDiagnostics version (bug#77588)
+
+	* lisp/progmodes/eglot.el (eglot--versioned-identifier): Move up.
+	(eglot-handle-notification textDocument/publishDiagnostics): Check
+	eglot--versioned-identifier
+
+2025-04-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Factor out vc-only-files-state-and-model
+
+	* lisp/dired-aux.el (vc-compatible-state): Delete declaration.
+	(vc-only-files-state-and-model): Declare.
+	(dired-vc-deduce-fileset): Factor out vc-only-files-state-and-model.
+	* lisp/vc/vc-dir.el (require): Require cl-lib at load time, too.
+	(vc-only-files-state-and-model): Declare.
+	(vc-dir-deduce-fileset): Factor out vc-only-files-state-and-model.
+	* lisp/vc/vc.el (vc-only-files-state-and-model): New function,
+	factored out of dired-vc-deduce-fileset and vc-dir-deduce-fileset.
+
+2025-04-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Update descriptions of VC's capabilities for Git and Mercurial
+
+	* doc/emacs/maintaining.texi (Version Control Systems): Update
+	descriptions of VC's capabilities for Git and Mercurial.
+
+2025-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/files.el (internal--get-default-lexical-binding): Buttonize the M-x
+
+	lisp/files.el (internal--get-default-lexical-binding): Handle nested loads
+
+2025-04-08  Po Lu  <luangruo@yahoo.com>
+
+	Replace some calls to `intern' with DEFSYMs
+
+	* src/filelock.c (lock_file, unlock_file_handle_error): Call
+	constant symbols rather than interning them all the time.
+	(syms_of_filelock): New symbols Qask_user_about_lock,
+	Quserlock__handle_unlock_error, and
+	Quserlock__ask_user_about_supersession_threat.
+
+2025-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(Fload, Feval_buffer): Emit a warning when lexbind is unset (bug#74145)
+
+	This emits a warning at run-time rather than at compile time.
+
+	* src/lread.c (get_lexical_binding): New function.
+	(Fload, Feval_buffer): Use it.
+	(syms_of_lread): New var `internal--get-default-lexical-binding-function`.
+	* lisp/files.el: Set it.
+	(internal--get-default-lexical-binding): New function.
+
+2025-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	eieio: Improve some obsolecence warnings and fix #<CLASS CLASS-XX> names
+
+	* lisp/emacs-lisp/eieio.el (eieio--constructor-macro): Improve message.
+	(eieio-object-name-string): Avoid repeated class name in the output of
+	`eieio-object-name`.
+	(make-instance, clone): Improve message.
+
+	* lisp/emacs-lisp/eieio-core.el (eieio-defclass-autoload): Use the same
+	obsolescence warning as elsewhere.
+
+2025-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(Freplace_region_contents): Fix point preservation (bug#77607)
+
+	* src/editfns.c (Freplace_region_contents): Save excursion around
+	temporary restriction (bug#77607) and remove
+	`record_unwind_protect_excursion` made redundant by commit 40d8650d5177.
+
+2025-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Merge branch 'cedet-object-name'
+
+2025-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	test/eieio: Silence warnings about slots and obsolete name arg
+
+	* test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
+	(eieio-test-method-order-list-3, eieio-test-method-order-list-6)
+	(eieio-test-method-order-list-7, eieio-test-method-order-list-8):
+	Delete obsolete name argument to constructors.
+	(eieio-test-method-order-list-4): Make sure backward compatibility is
+	active when testing the obsolete name arg.
+
+	* test/lisp/jsonrpc-tests.el (jsonrpc--call-with-emacsrpc-fixture):
+	Delete obsolete name argument to constructor.
+
+	* test/lisp/emacs-lisp/eieio-tests/eieio-tests.el (derived-value):
+	Silence unknown slot warning.
+
+2025-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/emacs-lisp/eieio-custom.el: Require `eieio-base` to silence warning
+
+2025-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	eieio: Emit compilation warnings a bit more thoroughly
+
+	We used to warn about unknown slots only in `oref`: add the same check
+	for `oset` and `slot-boundp`.
+	Similarly, we warned about obsolete name args only when calling the
+	constructors: add the same check to `make-instance`.
+
+	* lisp/emacs-lisp/eieio-core.el (eieio--check-slot-name): New function
+	extracted from the compiler-macro of `eieio-oref`.
+	(eieio-oref, eieio-oset): Use it.
+	* lisp/emacs-lisp/eieio.el (slot-boundp): Use it.
+	 (eieio--constructor-macro): Add category to warning.
+	(make-instance): Add compiler-macro to warn about obsolete name.
+
+2025-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(srecode-macro-help): Use `cl--class-docstring`
+
+	* lisp/cedet/srecode/srt-mode.el (srecode-macro-help): Don't
+	rely on `variable-documentation`.
+
+2025-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cedet: Prefer `slot-value` over `eieio-object-name-string`
+
+	* lisp/cedet/srecode/mode.el (srecode-minor-mode-templates-menu):
+	* lisp/cedet/srecode/insert.el (srecode-insert-subtemplate):
+	* lisp/cedet/srecode/compile.el (srecode-dump): Prefer `slot-value`
+	over `eieio-object-name-string` since we know it's an
+	`eieio-named` object.
+
+2025-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cedet: Don't abuse initargs for slot names
+
+	* lisp/cedet/ede/base.el (ede-normalize-file/directory):
+	* lisp/cedet/ede/emacs.el (initialize-instance):
+	* lisp/cedet/ede/generic.el (initialize-instance):
+	* lisp/cedet/ede/linux.el (initialize-instance, project-rescan):
+	* lisp/cedet/srecode/map.el (srecode-map-update-map):
+	* lisp/cedet/srecode/srt-mode.el (srecode-parse-this-macro):
+	* lisp/cedet/ede/simple.el (ede-simple-load):
+	Use slot names rather than initargs with oref/oset/slot-value/...
+
+2025-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cedet: Delete obsolete object name arg to EIEIO constructors
+
+	For classes that don't inherit from `eieio-named`, this argument
+	is ignored anyway.
+
+	* lisp/auth-source-pass.el (auth-source-pass-backend): Delete obsolete
+	object-name argument to `auth-source-backend` constructor.
+
+	* lisp/cedet/ede/config.el (ede-config-get-configuration): Delete obsolete
+	object-name argument to ede-config constructor.
+
+	* lisp/cedet/ede/cpp-root.el (ede-find-target): Delete obsolete
+	object-name argument to `ede-cpp-root-target` constructor.
+
+	* lisp/cedet/ede/locate.el (ede-enable-locate-on-project): Delete obsolete
+	object-name argument to ede-locate constructor.
+
+	* lisp/cedet/ede/project-am.el (project-am-load-makefile): Delete obsolete
+	object-name argument to `project-am-makefile` constructor.
+
+	* lisp/cedet/semantic/complete.el (semantic-complete-read-tag-buffer-deep)
+	(semantic-complete-read-tag-local-members)
+	(semantic-complete-read-tag-project, semantic-complete-read-tag-analyzer):
+	Delete obsolete object-name argument to
+	`semantic-collector-buffer-deep`,
+	`semantic-collector-local-members`,
+	`semantic-collector-project-brutish`, and
+	`semantic-collector-analyze-completions` constructors.
+
+	* lisp/cedet/semantic/db-ebrowse.el (semanticdb-create-database):
+	Delete obsolete object-name argument to
+	`semanticdb-project-database-ebrowse` constructor.
+
+	* lisp/cedet/semantic/db-file.el (semanticdb-create-database): Delete
+	obsolete object-name argument to
+	`semanticdb-project-database-file` constructor.
+
+	* lisp/cedet/semantic/db-typecache.el (semanticdb-get-typecache):
+	Delete obsolete object-name argument to `semanticdb-typecache` constructor.
+
+	* lisp/cedet/semantic/db.el (semanticdb-get-table-index)
+	(semanticdb-create-table):
+	Delete obsolete object-name argument to
+	`semanticdb-default-find-index-class`, new-table-class, and
+	desired-class constructors.
+
+	* lisp/cedet/semantic/bovine/c.el (semantic-analyze-tag-references):
+	* lisp/cedet/semantic/analyze/refs.el
+	(semantic-analyze-tag-references-default): Delete obsolete
+	object-name argument to `semantic-analyze-references` constructor.
+
+	* lisp/cedet/srecode/compile.el (srecode-compile-templates):
+	Delete obsolete object-name argument to `srecode-compile-state` and
+	`srecode-dictionary-compound-variable` constructors.
+
+	* lisp/cedet/srecode/cpp.el (srecode-semantic-apply-tag-to-dict)
+	(srecode-c-apply-templates): Delete obsolete object-name argument to
+	`srecode-semantic-tag` constructors.
+
+	* lisp/cedet/srecode/dictionary.el (srecode-dictionary-add-entries)
+	(srecode-compound-toString): Delete obsolete object-name argument to
+	`srecode-dictionary-compound-variable` and `srecode-field` constructors.
+
+	* lisp/cedet/srecode/insert.el (srecode-insert-method-field):
+	Delete obsolete object-name argument to `srecode-field-value` constructor.
+
+	* lisp/cedet/srecode/semantic.el (srecode-semantic-handle-:tag)
+	(srecode-semantic-insert-tag, srecode-semantic-apply-tag-to-dict-default):
+	Delete obsolete object-name argument to `srecode-semantic-tag` constructors.
+
+	* lisp/cedet/srecode/table.el (srecode-mode-table-new): Delete
+	obsolete object-name argument to `srecode-template-table` constructor.
+
+2025-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cedet: Pass object name via explicit `:object-name` arg
+
+	* lisp/cedet/srecode/insert.el (srecode-parse-input):
+	* lisp/cedet/srecode/compile.el (srecode-compile-one-template-tag)
+	(srecode-compile-inserter): Pass object name via explicit
+	`:object-name` arg to `srecode-template`,
+	`srecode-template-inserter-variable`, and children of `srecode-template`.
+
+	* lisp/cedet/semantic/mru-bookmark.el (semantic-mrub-push):
+	Pass object name via explicit `:object-name` arg to `semantic-bookmark`.
+
+2025-04-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Add bindings for vc-git-stash-delete-at-point, vc-git-stash-delete
+
+	* lisp/vc/vc-git.el (vc-git-stash-map): Bind "D" to
+	vc-git-stash-delete-at-point.
+	(vc-dir-git-mode-map): Bind "z d" to vc-git-stash-delete.
+	* etc/NEWS: Announce the new bindings.
+
+2025-04-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/vc-git.el (vc-git-checkin): Actually pass down TO-STASH.
+
+2025-04-07  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git-checkin: Don't relativize names of temporary files
+
+	* lisp/vc/vc-git.el (vc-git-checkin)
+	(vc-git--stash-staged-changes): Don't relativize names of
+	temporary files passed to 'git apply --cached'.  More generally,
+	these are not files managed by the underlying VCS, so they
+	shouldn't go in the FILE-OR-LIST argument to vc-git-command.
+
+2025-04-06  João Távora  <joaotavora@gmail.com>
+
+	Icomplete: rename some internal helper functions (bug#77546)
+
+	The naming convention for internal functions is
+
+	  <package-name>--foo
+
+	not
+
+	  <package-name-subfunctionality>--foo
+
+	* lisp/icomplete.el (icomplete--adjust-lines-for-column): Rename
+	from icomplete-vertical--adjust-lines-for-column.
+	(icomplete--ensure-visible-lines-inside-buffer): Rename from
+	icomplete-vertical--ensure-visible-lines-inside-buffer.
+	(icomplete--add-indicator-to-selected): Rename from
+	icomplete-vertical--add-indicator-to-selected.
+	(icomplete--render-vertical): Use new internal function names.
+
+2025-04-06  João Távora  <joaotavora@gmail.com>
+
+	Icomplete: check flag before rendering vertical indicators
+
+	(Bug#77546)
+
+	* lisp/icomplete.el (icomplete-vertical--add-indicator-to-selected): Rework.
+	(icomplete--render-vertical): Fix bug.
+
+2025-04-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Teach VC-Dir to automatically add and remove marks on other lines
+
+	* lisp/vc/vc-dir.el (vc-dir-allow-mass-mark-changes): New option.
+	(vc-dir-parent-marked-p): Replace with ...
+	(vc-dir--parent): ... this.
+	(vc-dir-children-marked-p): Replace with ...
+	(vc-dir--children): ... this.
+	(vc-dir-mark-file): Unmark subitems before marking a directory.
+	Offer to unmark a directory before marking a subitem.
+	(vc-dir-unmark-file): For an implicitly marked item, offer to
+	unmark it by marking everything else that's implicitly marked.
+	For an unmarked directory with marked subitems, offer to unmark
+	them all.
+	* etc/NEWS: Document the changes.
+
+2025-04-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix dired-vc-next-action generating inconsistent marks
+
+	* lisp/vc/vc-dir.el (vc-dir-mark-files): Document that
+	directories passed to this function must have trailing slashes.
+	Don't mark both a directory and also items under it (bug#76769).
+	* lisp/dired-aux.el (dired-vc-next-action): Update docstring.
+
+2025-04-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-dir-mark-file: Consistently don't allow marking a subdirectory
+
+	* lisp/vc/vc-dir.el (vc-dir-mark-file): Don't allow marking a
+	subdirectory if its parent is already marked.  This fixes an
+	inconsistency whereby if a subdirectory was already marked then
+	its parent could not be marked, but not vice-versa (bug #76769).
+
+2025-04-06  Alan Mackenzie  <acm@muc.de>
+
+	macroexp--expand-all: Don't call function-get on non-symbols
+
+	* lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Don't call
+	function-get on non-symbols (bug#77550).
+
+2025-04-05  shipmints  <shipmints@gmail.com>
+
+	Add tab-bar test for "effectively dedicated window" (bug#71386)
+
+	* test/lisp/tab-bar-tests.el (tab-bar-tests-quit-restore-window):
+	New test for 'delete-frame' for effectively-dedicated windows.
+
+2025-04-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	99d70ce6c26 Fix Tramp problem with loooongish file names
+
+2025-04-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	ae7f65f3f9c Fix obsolete documentation of desktop library
+	fd5f817882a Improve Tramp's initial warnings
+	1e865a2f288 Explain, how to suppress Tramp warnings
+	a0962074743 printed manuals: xrefs in and out of "Preparing Patches"
+	3f9ac99fc7e Fix Tramp's file-attributes cache
+
+2025-04-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	38fec86281e ; Improve the documentation of 'slice' display spec (bug#...
+	3f05b455f7e ; * src/editfns.c (Fmessage): Mention 'inhibit-message' (...
+
+2025-04-05  James Thomas  <jimjoe@gmx.net>
+
+	* lisp/gnus/nnfeed.el (nnfeed--write-server): Use default print settings.
+
+	Bug#77113
+
+2025-04-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Teach 'current-column' to account for images
+
+	* src/indent.c (check_display_width): Handle 'image' and 'slice'
+	display specs, instead of using the width of the underlying text.
+	Accept 2 additional arguments: WINDOW and SCAN_BYTE.  (Bug#76107)
+
+2025-04-05  Billy Lei  <LeiYiXia29@outlook.com>
+
+	Add input method for languages based on Burmese
+
+	This adds 4 new input methods:
+	 . Burmese
+	 . Burmese Visual
+	 . Shan
+	 . Mon
+	* lisp/leim/quail/burmese.el: New file.  (Bug#77026)
+
+2025-04-05  Pengji Zhang  <me@pengjiz.com>
+
+	Fix mouse highlighting for compact mode lines (bug#77336)
+
+	When 'mode-line-compact' is non-nil, the mode line string is
+	displayed as a whole.  That confuses the computation of ranges
+	of mouse highlighting on the mode line because all the glyphs
+	have the same Lisp object source.  As such, in this commit we
+	instead split the mode line string by sources, and display those
+	elements one by one, so the boundaries of each element could be
+	correctly detected for the purpose of mouse highlighting.
+
+	* src/xdisp.c (display_mode_line): Display mode line elements
+	one by one when 'mode-line-compact' is non-nil.
+	(display_mode_element): Record source element number of the
+	stored string via a text property.
+	(Fformat_mode_line): Initialize 'mode_line_elt_no' to 0.
+	(syms_of_xdisp): New symbol for the text property.
+
+2025-04-05  Paul Nelson  <ultrono@gmail.com>
+
+	Restrict symbol prettification to displayable glyphs
+
+	* lisp/international/mule.el (char-displayable-on-frame-p): New
+	function used to determine whether a character can be
+	meaningfully displayed on a given frame.
+	* doc/lispref/display.texi (Fontsets): Document it.
+	* lisp/progmodes/prog-mode.el
+	(prettify-symbols--composition-displayable-p): New function used
+	to restrict to displayable prettification symbols.  This
+	prevents issues with missing characters appearing as boxes.
+	(prettify-symbols--make-keywords): Use it.  (Bug#77381)
+
+2025-04-05  Paul Nelson  <ultrono@gmail.com>
+
+	Extend prettify-symbols-alist in TeX mode
+
+	* lisp/textmodes/tex-mode.el (tex--prettify-symbols-alist): Add
+	further math symbols, quotes and fractions.  (Bug#77381)
+
+2025-04-05  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Optionally display function docstring in eldoc
+
+	Allow display (optionally) function docstring in eldoc. (Bug#77124)
+	* etc/NEWS: Document changes.
+	* lisp/progmodes/elisp-mode.el
+	(elisp-eldoc-funcall-with-docstring-length): New user option.
+	(elisp-eldoc-funcall-with-docstring): New function.
+
+2025-04-05  Visuwesh  <visuweshm@gmail.com>
+
+	Improve formatting of 'setopt' suggestion in *Help* buffer
+
+	* lisp/help-fns.el (help--recommend-setopt): Remove function,
+	and...
+	(help-fns--customize-variable): ... move the relevant code here
+	to keep related code in the same place.  Change the formatting
+	to also include the :set function if it is set to a named
+	function.  (Bug#77173)
+
+2025-04-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	perl-mode.el: Avoid obsolete font-lock face vars
+
+	* lisp/progmodes/perl-mode.el (perl-mode-abbrev-table): Merge defvar
+	into the definition.
+	(perl-font-lock-keywords-1, perl-font-lock-keywords-2): Avoid obsolete
+	font-lock face vars.
+
+2025-04-05  Po Lu  <luangruo@yahoo.com>
+
+	Disable desktop-restore-frames by default on Android
+
+	* lisp/desktop.el (desktop-restore-frames): Default to nil when
+	\(featurep 'android).
+
+	* doc/emacs/misc.texi (Saving Emacs Sessions): Adjust to match.
+
+2025-04-05  Paul D. Nelson  <ultrono@gmail.com>
+
+	ediff-current-file: New optional startup-hooks arg
+
+	* lisp/vc/ediff.el (ediff-current-file): Add optional
+	startup-hooks argument, so that the user can write wrapper
+	commands with more finely customized behavior (bug#77323).
+
+2025-04-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/emacs-lisp/warnings.el (display-warning): Don't quote lambda
+
+2025-04-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(defclass): Don't duplicate the compiler macro
+
+	* lisp/emacs-lisp/eieio.el (eieio--constructor-macro): New function.
+	(defclass): Use it.
+
+2025-04-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/calc/calc-keypd.el (calc-keypad-vector-menu): Don't quote lambda
+
+2025-04-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Handle `TeX-master` holding a buffer
+
+	Cleanup initialization of the syntax tables, while we're at it.
+
+	* lisp/textmodes/reftex.el (reftex-syntax-table)
+	(reftex-syntax-table-for-bib): Move initialization into the declaration.
+	(reftex--prepare-syntax-tables): Delete function.
+	(reftex-mode): Delete call to it.
+	(reftex-TeX-master-file): Handle the case where `TeX-master` holds
+	a buffer (e.g. because of `reftex-find-duplicate-labels`).
+	Consolidate the two cases where we prompt the user.
+
+2025-04-04  Paul Nelson  <ultrono@gmail.com>
+
+	Add RefTeX support for non-file buffers
+
+	* lisp/textmodes/reftex.el (reftex--get-buffer-identifier)
+	(reftex--get-directory, reftex--abbreviate-name)
+	(reftex--get-basename, reftex--get-truename): New helper
+	functions that handle both files and buffer objects.
+	(reftex--remove-buffer-from-master-index): New helper function.
+	(reftex-tie-multifile-symbols): Support non-file buffers, using
+	the above.
+	(reftex-TeX-master-file): Return current buffer when no file.
+	(reftex-access-scan-info): Remove check requiring file buffers.
+	(reftex-access-parse-file, reftex-check-parse-consistency): Skip
+	for non-file buffers.
+	(reftex-select-external-document): Use new helper function.
+	(reftex-locate-file): Return buffer objects directly.
+	(reftex-get-file-buffer-force): Handle buffer objects and
+	special 'buffer:' strings.
+	* lisp/textmodes/reftex-global.el (reftex-create-tags-file): Add
+	error handling for non-file buffers.  Leave TAGS unsupported in
+	non-file buffers.
+	(reftex-find-duplicate-labels)
+	(reftex-isearch-switch-to-next-file): Use new helper functions
+	that handle both files and buffer objects.
+	(reftex-isearch-switch-to-next-file): Use equal rather than
+	string= to compare strings/buffers.
+	* lisp/textmodes/reftex-index.el (reftex-display-index)
+	(reftex-index-change-entry): Use new helper functions.
+	(reftex-index-visit-phrases-buffer): Add error handling for
+	non-file buffers.  Leave phrases unsupported in non-file
+	buffers.
+	* lisp/textmodes/reftex-parse.el (reftex-do-parse)
+	(reftex-parse-from-file): Add support for non-file buffers.
+	(reftex-all-document-files, reftex-where-am-I)
+	(reftex-notice-new): Use new helper functions.
+	* lisp/textmodes/reftex-ref.el (reftex-label-info-update):
+	Support non-file buffers.
+	(reftex-label-info, reftex-replace-prefix-escapes, reftex-label)
+	(reftex-replace-prefix-escapes, reftex-offer-label-menu): Use
+	new helper functions.
+	* lisp/textmodes/reftex-sel.el (reftex-insert-docstruct): Use
+	new helper function.
+	* lisp/textmodes/reftex-toc.el (reftex-toc)
+	(reftex-recenter-toc-when-idle): Support non-file buffers.
+	* lisp/textmodes/reftex-cite.el (reftex-bib-or-thebib)
+	(reftex-get-bibfile-list): Use new helper functions.
+	* lisp/textmodes/reftex-global.el
+	(reftex-save-all-document-buffers, reftex-ensure-write-access):
+	Ignore non-file buffers.
+	* lisp/textmodes/reftex-parse.el (reftex-all-document-files):
+	For non-file objects, do not apply relative path transformation.
+	* test/lisp/textmodes/reftex-tests.el
+	(reftex-all-used-citation-keys-buffer)
+	(reftex-renumber-simple-labels-buffer): New tests for operations
+	on non-file buffers.
+
+	RefTeX historically assumed that the buffers it operates on
+	visit files.  To handle non-file buffers:
+
+	Modify reftex-TeX-master-file so that it returns the buffer
+	object itself (as suggested by Stefan Monnier).  Modify each
+	caller to handle buffer objects, aided by some helper functions
+	added to reftex.el.  Replace 'string=' by 'equal' in places.
+
+	Use buffer-base-buffer, where appropriate, to handle indirect
+	buffers (file and non-file).
+
+	TAGS files and phrases buffers remain unsupported for non-file
+	buffers.
+
+2025-04-04  Martin Rudalics  <rudalics@gmx.at>
+
+	Don't propertize prompt in 'minibuffer--regexp-propertize' (Bug#77497)
+
+	* lisp/minibuffer.el (minibuffer--regexp-propertize): Skip prompt
+	when propertizing user input (Bug#77497).
+
+2025-04-04  Paul Nelson  <ultrono@gmail.com>
+
+	Add repeat-map for Python indentation commands
+
+	* lisp/progmodes/python.el (python-indent-repeat-map): New
+	keymap for repeating Python indentation commands when using
+	'repeat-mode' (bug#77417).
+
+2025-04-04  Visuwesh  <visuweshm@gmail.com>
+
+	Fix C-x p p for remote directories with no Tramp connection
+
+	* lisp/progmodes/project.el (project-switch-project): Allow
+	Tramp to establish a new connection for remote directories.
+	(Bug#77425)
+
+2025-04-03  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	* doc/emacs/custom.texi (File Variables): Reorganize
+
+	Reorganize the section on file-local variables to tighten the paragraphs
+	describing each syntax: line one and local variables section.
+
+2025-04-03  Juri Linkov  <juri@linkov.net>
+
+	* lisp/window.el (window-deletable-p): Improve tab handling.
+
+	Use frame parameter 'tab-bar-lines' instead of 'tab-bar-mode'.
+	Remove 'window-dedicated-p' (bug#71386).  Doc fix.
+	Add 'frame' arg to 'window-list-1' (bug#59862).
+
+2025-04-03  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-setup-buffer: Fix leaving wrong default-directory
+
+	* lisp/vc/vc-dispatcher.el (vc-setup-buffer): Use run-with-timer
+	to ensure the buffer-local value gets set (bug#77306).
+
+2025-04-03  Laurent Stacul  <laurent.stacul@gmail.com>  (tiny change)
+
+	Fix etags for Ruby module definitions with ::
+
+	Problem: In Ruby we can define a nested module/class the safe
+	way (in the sense, if the parent module does not exist, it will
+	define it:
+
+	  module M
+	    module N
+	    end
+	  end
+
+	If M already exists, we can also write:
+
+	  module M::N; end
+
+	With the later notation, the tag generated by etags will be M::N.
+	When browsing the code, using xref-find-definitions when the point
+	is on N, will not be able to find the definition of N because the
+	implicit tag name is M::N.
+
+	This is the same problem with nested classes or even some rare
+	allowed definitions like explicitely defining a module/class from
+	the global namespace:
+
+	  class ::A; end
+
+	Solution: We need to give an explicit tag name.  To achieve this,
+	on module/class definition we truncate the name to the last found
+	column.
+	* lib-src/etags.c (Ruby_functions): Support "::" in module
+	definitions.
+	* test/manual/etags/README: Update instructions.
+	* test/manual/etags/ruby-src/test1.ru: Add identifiers with "::".
+	* test/manual/etags/CTAGS.good:
+	* test/manual/etags/CTAGS.good_crlf:
+	* test/manual/etags/CTAGS.good_update:
+	* test/manual/etags/ETAGS.good_1:
+	* test/manual/etags/ETAGS.good_2:
+	* test/manual/etags/ETAGS.good_3:
+	* test/manual/etags/ETAGS.good_4:
+	* test/manual/etags/ETAGS.good_5:
+	* test/manual/etags/ETAGS.good_6:
+	* test/manual/etags/ETAGS.good_7: Adapt expected results to the
+	change.  (Bug#77421)
+
+2025-04-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify gcc -Wclobbered in Freplace_region_contents
+
+	* src/editfns.c (Freplace_region_contents): Redo slightly to
+	pacify gcc -Wclobbered, by hoisting the eassume out of SCHARS and
+	into the caller later, where it’ll do more good anyway.
+
+2025-04-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cl-macs.el: Fix minor merge snafu (bug#77348)
+
+	* lisp/emacs-lisp/cl-macs.el (cl-flet, cl-labels): Recover the changes
+	made in commit 476426168106 and accidentally undone by a later merge of
+	commit 63adf9dcf53a.
+
+2025-04-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix display of wide characters in display margins on TTY frames
+
+	* src/xdisp.c (display_line): Remove incomplete glyph sequence of
+	the last multi-column character, if not all of its glyphs fit in
+	the marginal area.  (Bug#77452)
+
+2025-04-02  Eli Zaretskii  <eliz@gnu.org>
+
+	More thorough fix for image slices on mode/header-line
+
+	* src/xdisp.c (note_mode_line_or_margin_highlight): Remove
+	correction of DX and DY due to image slices, as this is now done
+	in 'mode_line_string'.
+	* src/dispnew.c (mode_line_string): Make DX and DY account for
+	image slices.  (Bug#77429)
+
+2025-04-02  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Fix widget relationship in customize-themes
+
+	* lisp/cus-theme.el (customize-themes): The theme button should
+	be a sibling of the checkbox widget, not a child.  (Bug#77096)
+
+2025-04-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(custom--standard-value-p): New function
+
+	* lisp/cus-edit.el (custom-variable-state)
+	(custom-variable-mark-to-reset-standard): Use `custom--standard-value-p`.
+
+	* lisp/custom.el (custom--standard-value-p): New function.
+	(customize-mark-to-save, custom-push-theme, enable-theme): Use it.
+
+	* lisp/help-fns.el (describe-variable): Use `custom--standard-value`.
+	Extracted from `customize-mark-to-save` by with `ignore-errors`
+	replaced by `with-demoted-errors`.
+
+2025-04-01  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Add 'project-customize-dirlocals'
+
+	* etc/NEWS: Add command entry.
+	* lisp/menu-bar.el (menu-bar-project-menu): Add command entry to
+	project menu.
+	* lisp/progmodes/project.el (project-customize-dirlocals):
+	New command.  (Bug#77229)
+
+2025-04-01  Stefan Kangas  <stefankangas@gmail.com>
+
+	function-put: signal error with non-symbol
+
+	* lisp/subr.el (function-get): Signal an error if given a non-symbol
+	for consistency with 'get'.
+	* test/lisp/subr-tests.el (subr-butlast): Test for the above.
+
+2025-04-01  Juri Linkov  <juri@linkov.net>
+
+	New treesit generic mode 'liquid-generic-ts-mode' (bug#77255)
+
+	* lisp/treesit.el (treesit-replace-font-lock-feature-settings):
+	Check the query language in addition to checking the feature.
+	(treesit-font-lock-fontify-region): Use treesit-font-lock-setting-*
+	accessors.
+
+	* lisp/treesit-x.el (treesit-generic-mode-setup): Append new
+	font-lock rules to an existing treesit-font-lock-settings
+	possibly inherited from the parent.
+	(treesit-generic-mode-setup): Use treesit-merge-font-lock-feature-list
+	to merge with an existing feature list inherited from the parent.
+	(liquid-generic-ts-mode): New treesit generic mode.
+	(alpinejs-generic-ts-setup): New treesit generic setup.
+
+2025-04-01  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Move a vc option to a preloaded file
+
+	Since vc-resolve-conflicts is referenced in backend files, which only
+	require vc at runtime, move it to vc-hooks to avoid a void
+	variable error.  (Bug#3860)
+
+	* lisp/vc/vc.el (vc-resolve-conflicts): Move from here...
+	* lisp/vc/vc-hooks.el (vc-resolve-conflicts): ...to here.
+
+2025-04-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix :map property on sliced images on mode line and header line
+
+	* src/xdisp.c (note_mode_line_or_margin_highlight): Fix coordinates
+	for image slices wrt ':map' keyword when the image is on the mode
+	line or header line.  (Bug#77429)
+
+2025-04-01  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	Added a check to see if the 'speedbar-buffer' is still alive
+
+	Fix suggested by Rudi Schlatte <rudi@constantly.at>.
+	* lisp/speedbar.el (speedbar-frame-or-window): Added an additional check
+	to see if 'speedbar-buffer' is still alive (bug#77405).
+
+2025-04-01  Ikumi Keita  <ikumi@ikumi.que.jp>
+
+	Suppress error in non-file buffer
+
+	* lisp/textmodes/reftex.el (reftex--suppress-nonfile-error): New
+	variable.
+	(reftex-TeX-master-file): Don't signal error in non-file buffer.
+	(AUCTeX bug#76615)
+
+2025-03-31  Lin Jian  <me@linj.tech>  (tiny change)
+
+	Fix pkg description file name when pkg name has numbers (Bug#77143)
+
+	* lisp/subr.el (package--description-file): Match end of string and add
+	`snapshot` among the possible version names.
+
+2025-03-31  Earl Hyatt  <okamsn@protonmail.com>
+
+	Fix typo in test of read-only cl-defstruct slot.
+
+	* test/lisp/emacs-lisp/cl-macs-tests.el (mystruct)
+	(cl-lib-struct-accessors): Use ":read-only" instead of ":readonly".
+
+	* test/lisp/emacs-lisp/cl-lib-tests.el (cl-lib-struct-accessors):
+	Test using `setf' on read-only accessor to make sure the correct keyword
+	is used.
+
+2025-03-31  Earl Hyatt  <okamsn@protonmail.com>
+
+	Add cl-with-accessors
+
+	* lisp/emacs-lisp/cl-macs.el (cl-with-accessors): New macro.
+	* doc/misc/cl.texi (Structures): Mention the new macro.
+	* test/lisp/emacs-lisp/cl-macs-tests.el (cl-lib-struct-with-accessors):
+	New Test.
+	* etc/NEWS (New macro 'cl-with-accessors'.): Mention the macro.
+
+	This macro is useful when making repeated use of a structures accessor
+	functions, such as reading from a slot and then writing to a slot.  It
+	is similar to 'with-slots' from EIEIO, but uses accessor functions
+	instead of slot names.
+
+2025-03-31  Juri Linkov  <juri@linkov.net>
+
+	Improve logic of tab handling when quitting windows (bug#71386)
+
+	* lisp/window.el (window-deletable-p): Add tab logic that returns
+	the symbol 'tab' for a set of predefined conditions.
+	(window--delete): Call 'tab-bar-close-tab' when 'window-deletable-p'
+	returns the symbol 'tab'.
+	(quit-restore-window): Remove tab logic and merge it with frame logic.
+
+	* test/lisp/tab-bar-tests.el (tab-bar-tests-close-other-tabs-default)
+	(tab-bar-tests-close-other-tabs-with-arg): Clean up tabs afterwards.
+	(tab-bar-tests-quit-restore-window): New test.
+
+2025-03-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(insert-kbd-macro): Polish
+
+	* lisp/macros.el (insert-kbd-macro): Straighten control flow, use `pp`
+	and `keymap-global-set`.
+
+2025-03-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/macros.el (insert-kbd-macro): Fix anonymous case (bug#77317)
+
+2025-03-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	japan-util.el: Cosmetic changes
+
+	* lisp/language/japan-util.el (<toplevel>): Use `pcase-dolist` and `when`.
+	(japanese-string-conversion): Use `point-min`.
+
+2025-03-31  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix replace-region in japan-util.el
+
+	* lisp/language/japan-util.el (japanese-replace-region): Allow
+	STRING to be a character in addition  to a string.  Un-obsolete
+	it.
+	(japanese-katakana-region, japanese-hiragana-region)
+	(japanese-hankaku-region, japanese-zenkaku-region): Call
+	'japanese-replace-region' instead of 'replace-region-contents'.
+	(Bug#77397)
+
+2025-03-30  Michael Albinus  <michael.albinus@gmx.de>
+
+	Merge from origin/emacs-30
+
+	e6b4c0bcebf lisp/emacs-lisp/cl-macs.el (cl-labels): Fix docstring (bu...
+	7a976d1aaf7 Fix minor issues in documentation of `use-package'
+	99ff59bd66c PHP should be in the PATH, either locally or remotely. (b...
+	26873d5028e Avoid warning when loading 'go-ts-mode'
+	a702f29a00b ; Fix package-version values
+	a1fbc51dc71 ; * lisp/which-key.el (which-key-idle-delay): Fix package...
+
+	# Conflicts:
+	#	lisp/progmodes/php-ts-mode.el
+	#	lisp/which-key.el
+
+2025-03-30  Pip Cet  <pipcet@protonmail.com>
+
+	Respect narrowed buffers when parsing JSON (bug#77325)
+
+	* src/json.c (Fjson_insert): Simplify 'memcpy' argument.
+	(Fjson_parse_buffer): Only read to ZV, not all the way to Z.
+	* test/src/json-tests.el (with-all-gap-positions-in-temp-buffer):
+	New macro.
+	(json-parse-buffer/restricted): New test.
+
+2025-03-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix display of overlay arrow immediately after invisible text
+
+	* src/xdisp.c (overlay_arrow_at_row): Allow the overlay arrow's
+	marker position to be anywhere between the row's start and end
+	charpos.  This keeps the overlay arrow on display even when the
+	preceding text is invisible.  (Bug#54843)
+
+2025-03-30  Yuan Fu  <casouri@gmail.com>
+
+	Tighten the criteria for a defun in typescript-ts-mode (bug#77369)
+
+	* lisp/progmodes/typescript-ts-mode.el:
+	(typescript-ts-mode--defun-predicate): New function.
+	(typescript-ts-base-mode): Use new predicate.
+
+2025-03-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	src/insdel.c (replace_range): Remove comment
+
+	It should have been removed in commit b16afa45bb6a.
+
+2025-03-30  Po Lu  <luangruo@yahoo.com>
+
+	Don't obsolete the _command_ replace-buffer-contents
+
+	* lisp/subr.el (replace-buffer-contents): Don't obsolete
+	function.  Its purpose is to serve as a command and such
+	obsoletion was unnecessary to begin with.
+
+2025-03-29  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	time-stamp source commentary: point to manual section
+
+	* lisp/time-stamp.el: Add an Info link in the commentary,
+	now that the manual has more to say.
+	* doc/emacs/files.texi (Time Stamps for One File): Expand one
+	consistent example.
+
+2025-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Org: Use new `replace-region-contents`
+
+	* lisp/org/org-compat.el (org-replace-buffer-contents): Delete function.
+	(org-replace-region-contents): New function.
+	* lisp/org/org-src.el (org-edit-src-save, org-edit-src-exit): Use it.
+
+2025-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Use `replace-region-contents` to replace insert+delete
+
+	* lisp/minibuffer.el (completion--replace):
+	* lisp/emacs-lisp/cl-lib.el (cl--set-buffer-substring):
+	* lisp/subr.el (replace-string-in-region):
+	Use `replace-region-contents` instead of insert+delete.
+
+	* lisp/help-fns.el (help-fns--signature):
+	Use `replace-region-contents` instead of `cl--set-buffer-substring`.
+
+	* lisp/language/japan-util.el (japanese-replace-region):
+	Rewrite using `replace-region-contents` and mark obsolete.
+	(japanese-katakana-region, japanese-hankaku-region):
+	Use `replace-region-contents` instead.
+
+	* lisp/progmodes/flymake-proc.el (flymake-proc--replace-region):
+	Rewrite using `replace-region-contents` and mark obsolete.
+	(flymake-proc--check-patch-master-file-buffer):
+	Use `replace-region-contents` instead.
+
+2025-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Replace uses of `replace-buffer-contents`
+
+	* lisp/vc/vc.el (vc-diff-restore-buffer):
+	* lisp/progmodes/python.el (python--do-isort):
+	* lisp/progmodes/eglot.el (eglot--apply-text-edits):
+	* lisp/files.el (revert-buffer-insert-file-contents-delicately):
+	* lisp/json.el (json-pretty-print): Use `replace-region-contents`.
+
+2025-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	src/insdel.c (adjust_markers_for_replace): Fix insertion case
+
+	test/src/editfns-tests.el (editfns-tests--insert-via-replace): New test
+
+2025-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(replace-region-contents): Improve and promote (bug#76313)
+
+	Swap the role of `replace-region-contents` and `replace-buffer-contents`,
+	so `replace-region-contents` is the main function, implemented in C,
+	and `replace-buffer-contents` is a mere wrapper (marked as obsolete).
+	Also remove the need to rely on narrowing and on describing the
+	new text as a function.
+	Finally, allow MAX-SECS==0 to require a cheap replacement, and
+	add an INHERIT argument.
+
+	* src/editfns.c: Include `coding.h`.
+	(Freplace_region_contents): Rename from `Freplace_buffer_contents`.
+	Change calling convention to that of `replace-region-contents`.
+	Add more options for the SOURCE argument.  Add INHERIT argument.
+	Skip the costly algorithm if MAX-SECS is 0.
+	* src/insdel.c (replace_range): Allow NEW to be a buffer.
+
+	* lisp/subr.el (replace-buffer-contents): New implementation.
+	* lisp/emacs-lisp/subr-x.el (replace-region-contents): Delete.
+
+	* doc/lispref/text.texi (Replacing): Document new API for
+	`replace-region-contents`.  Remove documentation of
+	`replace-buffer-contents`.
+
+	* test/src/editfns-tests.el (replace-buffer-contents-1)
+	(replace-buffer-contents-2, replace-buffer-contents-bug31837):
+	Use `replace-region-contents`.
+	(editfns--replace-region): Delete.
+	(editfns-tests--replace-region): Use `replace-region-contents`.
+	Adds tests for new types of SOURCE args.
+
+2025-03-29  Rahul Martim Juliato  <rahul.juliato@gmail.com>
+
+	Enhance 'icomplete-vertical-mode' customization options.
+
+	* lisp/icomplete.el (icomplete-vertical-in-buffer-adjust-list):
+	Align in-buffer completion to the original cursor column.
+	(icomplete-vertical-render-prefix-indicator): Add a prefix
+	indicator to completion candidates when enabled.
+	(icomplete-vertical-selected-prefix-indicator): Specify the
+	prefix string for the selected candidate.
+	(icomplete-vertical-unselected-prefix-indicator): Specify the
+	prefix string for unselected candidates.
+	(icomplete-vertical-selected-prefix-indicator-face): Control
+	the appearance of the selected candidate prefix.
+	(icomplete-vertical-unselected-prefix-indicator-face): Control
+	the appearance of unselected candidate prefixes.
+	(Bug#75794)
+
+	* etc/NEWS: Document the new user options and faces.
+
+2025-03-29  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use 'hash-table-contains-p' in a few places
+
+	This replaces open coded versions of the common idiom
+	    (not (eq (gethash key table 'missing) 'missing))
+	with
+	    (hash-table-contains-p key table)
+	in files where we can rely on features in Emacs 31.
+
+	* lisp/emacs-lisp/map.el (map-contains-key):
+	* lisp/external-completion.el (external-completion-table):
+	* lisp/mh-e/mh-utils.el (mh-sub-folders)
+	(mh-remove-from-sub-folders-cache):
+	* lisp/net/ange-ftp.el (ange-ftp-hash-entry-exists-p):
+	* lisp/password-cache.el (password-in-cache-p, password-cache-add):
+	* lisp/pcmpl-x.el (pcmpl-x-tlmgr-action-options):
+	* lisp/xdg.el (xdg-mime-apps): Use 'hash-table-contains-p'.
+
+2025-03-29  Stefan Kangas  <stefankangas@gmail.com>
+
+	New function 'hash-table-contains-p'
+
+	This function tests whether a given key is present in a hash table.
+	Emacs Lisp has long lacked a standard way to do this, leading users to
+	write one of:
+
+	    (not (eq (gethash key table 'missing) 'missing))
+	or
+	    (gethash key table)
+
+	This idiom is error-prone (when 'missing' or 'nil' are valid values),
+	and it obscures intent.  The new function avoids such pitfalls,
+	improves readability, and makes the intent explicit:
+
+	    (hash-table-contains-p key table)
+
+	The name 'hash-table-contains-p' exists in other Lisp dialects (e.g.,
+	SRFI-125), and follows the precedent of 'seq-contains-p'.  Other
+	alternatives considered include `hash-table-has-key-p` and
+	`hash-table-key-exists-p`, but none were clearly better.
+
+	This was previously discussed in 2018, and all comments were positive,
+	but the proposed patch (implementing it in C) was never pushed:
+	https://lists.gnu.org/r/emacs-devel/2018-02/msg00424.html
+
+	* lisp/subr.el (hash-table-contains-p): New function.
+	* lisp/emacs-lisp/shortdoc.el (hash-table):
+	* doc/lispref/hash.texi (Other Hash): Document the new function.
+	* test/lisp/subr-tests.el (hash-table-contains-p): New test.
+
+2025-03-29  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove redundant constant nil argument to gethash
+
+	* lisp/cedet/ede/files.el (ede--directory-project-from-hash):
+	* lisp/emacs-lisp/edebug.el (edebug-unwrap*):
+	* lisp/emacs-lisp/testcover.el (testcover--copy-object1):
+	* lisp/net/zeroconf.el (zeroconf-get-service, zeroconf-resolve-service)
+	(zeroconf-register-service-browser, zeroconf-service-browser-handler)
+	(zeroconf-register-service-resolver):
+	* lisp/url/url-history.el (url-have-visited-url): Remove redundant
+	constant nil argument to gethash.
+
+2025-03-29  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	9a07d64f5c7 ; Minor update in ack.texi
+	b3881ac443f ; Improve type specifier documentation
+	6a3e2b88d26 ; Improve documentation of "function types"
+
+2025-03-29  shipmints  <shipmints@gmail.com>
+
+	'uniquify' user option setters and automatic buffer refresh (bug#77157)
+
+	Use 'customize', 'setopt', or 'uniquify--set-option' instead of
+	'setq' to benefit.
+
+	* lisp/uniquify.el (uniquify--buffer-refresh): New function.
+	(uniquify--set-option): New function.
+	(uniquify-buffer-name-style): Add :initialize and :set forms.
+	(uniquify-ignore-buffers-re): Add :initialize and :set forms.
+	(uniquify-min-dir-content): Add :initialize and :set forms.
+	(uniquify-separator): Add :initialize and :set forms.
+	(uniquify-strip-common-suffix): Add :initialize and :set forms.
+	(uniquify-dirname-transform): Add :initialize and :set forms.
+
+2025-03-29  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	Fix compiler warnings in mhtml-ts-mode.el (bug#77017).
+
+	* lisp/textmodes/mhtml-ts-mode.el:
+	Added variable and function declarations to prevent compiler
+	warnings.
+	(mhtml-ts-mode): Require 'html-ts-mode' after checking that
+	the html parser is available.
+
+2025-03-29  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	New minor mode: `electric-block-comment-mode'
+
+	This minor lets you automatically closing block comments after
+	typing `block-comment-start'.  Thus, typing "/*" in c-mode and
+	its derivatives automatically inserts "*/".  (Bug#77081)
+
+	* etc/NEWS: Add minor-mode item.
+	* lisp/electric.el
+	(electric-block-comment-post-self-insert-function): New function.
+	(electric-block-comment-mode): New minor mode definition.
+
+2025-03-29  Daniel Mendler  <mail@daniel-mendler.de>
+
+	New Eldoc function `eldoc-show-help-at-pt'
+
+	Show `help-at-pt' string via Eldoc as an alternative to the
+	`help-at-pt-display-when-idle' timer.  The help-at-pt timer
+	competes with Eldoc for the echo area, such that the two
+	mechanisms do not work well together.  Therefore when using
+	Eldoc, the setting `eldoc-help-at-pt' may be preferable.
+	* lisp/emacs-lisp/eldoc.el (eldoc-help-at-pt): New customization option.
+	(eldoc-show-help-at-pt): New Eldoc function.
+	(eldoc-documentation-functions): Register the new function.
+	* lisp/help-at-pt.el (help-at-pt-display-when-idle): Mention
+	`eldoc-help-at-pt' in the docstring.
+	* doc/emacs/help.texi: Document `eldoc-help-at-pt'.
+	* etc/NEWS: Announce the change.  (Bug#77169)
+
+2025-03-29  Jens Schmidt  <jschmidt4gnu@vodafonemail.de>
+
+	Improve message handling on server stop
+
+	* lisp/server.el (server-stop): Use a clearer signal message if there is
+	an existing, external Emacs server.
+	(server-start): Use a different warning if one attempts to only
+	stop (and not restart) an external server.
+	(server-unload-function): Silently stop the server if unloading its
+	library.  (Bug#76870)
+
+2025-03-29  Andrés Ramírez  <rrandresf@gmail.com>  (tiny change)
+
+	Add a key binding to Semantic's complete.el
+
+	* lisp/cedet/semantic/complete.el (semantic-complete-key-map): Add
+	a binding for 'switch-to-completions'.  (Bug#77227)
+
+2025-03-29  Konstantin Kharlamov  <Hi-Angel@yandex.ru>
+
+	Add major mode for highlighting npmrc files (Bug#77138)
+
+	* etc/NEWS: mention the new mode.
+	* lisp/textmodes/conf-mode.el (conf-npmrc-mode-syntax-table): New
+	variable.
+	* lisp/textmodes/conf-mode.el (conf-npmrc-mode): New major mode
+	derived from conf-mode for highlighting .npmrc files.
+	* lisp/files.el (auto-mode-alist): Associate the new mode with .npmrc
+	files.
+
+2025-03-29  Po Lu  <luangruo@yahoo.com>
+
+	Do not redundantly dump constant forwarding objects
+
+	* src/pdumper.c (dump_fwd_int, dump_fwd_bool, dump_fwd_obj): Do
+	not redundantly dump constant forwarding descriptors; restrict
+	to dumping the objects being forwarded to.
+	(dump_fwd_buffer_obj): Copy from the dump file into bss rather
+	than load buffer forwarding descriptors from the dump file
+	itself.
+	(dump_fwd_kboard_obj): Delete function.
+	(dump_fwd): Don't return offset of dumped objects.
+	(dump_blv): Adjust correspondingly.
+	(dump_pre_dump_symbol): Improve documentation.  Record offset of
+	forwarding objects in relation to `emacs_basis' rather than the
+	dump file.
+	(dump_symbol): Restore forwarding descriptors to their original
+	values as static variables in Emacs.  This reduces the size of
+	dump files by an insignificant 2kb but facilitates certain kinds
+	of watchpoints on platforms where ASLR cannot be disabled, e.g.,
+	Android.
+
+2025-03-28  Michael Albinus  <michael.albinus@gmx.de>
+
+	tramp-tests cleanup
+
+	* test/lisp/net/tramp-tests.el (tramp-test26-file-name-completion)
+	(tramp-test26-interactive-file-name-completion): Adapt tests.
+
+2025-03-28  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Remove a use of a PUA Unicode character (bug#77328)
+
+	* lisp/progmodes/eglot.el (eglot-code-action-indicator): Use
+	U+1F4A1 ELECTRIC LIGHT BULB instead of a PUA character.
+
+2025-03-28  Po Lu  <luangruo@yahoo.com>
+
+	Miscellaneous corrections
+
+	* src/buffer.h (BUF_PTR_BYTE_POS): Fix comment.
+
+	* src/profiler.c (add_sample): Use BASE_EQ.
+
+2025-03-27  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	MH-E: set default-directory to HOME on entry
+
+	* lisp/mh-e/mh-e.el (mh-default-directory, mh-set-default-directory):
+	New variable (defaults to "~/"), new function to use it.
+	* lisp/mh-e/mh-folder.el (mh-rmail, mh-nmail): Call
+	mh-set-default-directory on entry to MH-E (closes: bug#77263).
+
+2025-03-27  Daniel Colascione  <dancol@dancol.org>
+
+	Help find-function find methods defined inside macros
+
+	* doc/lispref/functions.texi (Finding Definitions): Document the
+	expanded definition-finding extension mechanism.
+	* etc/NEWS: Briefly describe the new feature.
+	* lisp/emacs-lisp/cl-generic.el
+	(cl--generic-find-defgeneric-regexp): Use defconst now that we
+	no longer have purespace.
+	(cl--generic-search-method-make-form-matcher): New function.
+	* lisp/emacs-lisp/find-func.el (find-function-regexp-alist)
+	(find-function-search-for-symbol): Parse out the new
+	factory function.
+	(find-function--search-by-expanding-macros): Try using it when
+	searching for definitions by expanding macros.
+
+2025-03-27  Jimmy Aguilar Mena  <kratsbinovish@gmail.com>
+
+	Add jump action to margin indicators in flymake
+
+	(flymake--indicator-overlay-spec): Receive type instead of prepossessed
+	indicator.
+	(flymake--resize-margins): Update reference call to
+	flymake--indicator-overlay-spec.
+	(flymake-show-buffer-diagnostics-at-event-line):
+	(flymake-diagnostics-at-mouse-event):
+	(flymake-show-buffer-diagnostics-at-event-position): New functions.
+	(flymake-after-show-buffer-diagnostics-hook): New custom with actions
+	when jumping to an error line.
+	(flymake-pulse-momentary-highlight-region):
+	(flymake-show-buffer-diagnostics): Receive new optional argument with
+	current diagnostic information.  Add code to jump and execute the new hook
+	after jumping (bug#75841).
+
+2025-03-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	Handle better changed default-directory in shell-command
+
+	* lisp/simple.el (shell-command): Kill buffer-local values of
+	`shell-file-name' and `shell-command-switch', there could be left
+	connection-local values.  (Bug#76888)
+
+2025-03-27  Cecilio Pardo  <cpardo@imayhem.com>
+
+	w32: fail gracefully when using invalid glyphs on DWrite
+
+	* src/w32dwrite.c (text_extents_internal): Return false instead
+	of crashing with bad glyph indexes.  (Bug#77196)
+
+2025-03-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/help-fns.el (help-fns--signature): Pretty print type
+
+2025-03-27  Yue Yi  <include_yy@qq.com>
+
+	peg.texi: Fix bug#76555 even a bit more
+
+	* doc/lispref/peg.texi (Parsing Expression Grammars):
+	Fix other part of the grammar of `define-peg-ruleset` example.
+
+2025-03-27  Yue Yi  <include_yy@qq.com>
+
+	peg.texi: Fix bug#76555 even a bit more
+
+	* doc/lispref/peg.texi (Parsing Expression Grammars):
+	Fix grammar of `define-peg-ruleset` example.
+
+2025-03-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	PEG: Fix bug#76555
+
+	* doc/lispref/peg.texi (Parsing Expression Grammars):
+	Fix `define-peg-ruleset` example.
+
+	* lisp/progmodes/peg.el (define-peg-rule): Fix indent rule.
+
+2025-03-27  Alan Mackenzie  <acm@muc.de>
+
+	C++ Mode: Fix some indentation bugs.  FIxes bug#19867
+
+	1. Fix closing paren aligning with trailing comment on line
+	with matching open paren.
+	2. Fix indentation of first identifier inside a comma separated
+	list aligning with the type rather than the subsequent
+	identifiers.
+	3. Fix lambda expressions inside a brace list aligning like a
+	single statement.
+
+	* lisp/progmodes/cc-align.el (c-lineup-arglist): Take into
+	account any preceding comments when lining up the arguments in
+	the arglist.
+	(c-lineup-arglist-intro-after-paren): Handle comments properly,
+	and don't line up the closing parenthesis with a trailing
+	comment on the first line.
+	(c-lineup-item-after-paren-at-boi): Also allow a paren to count
+	as being at BOI when it is preceded only by open parens on that
+	line.
+	(c-lineup-runin-statements, c-lineup-ObjC-method-call): Hanle
+	comments better.
+
+	* lisp/progmodes/cc-engine.el (c-forward-comments) Introduce an
+	optional limit parameter.  Use this limit in calls from
+	cc-align.el and cc-mode.el.
+	(c-just-after-func-arglist-p): Handle the presence of a
+	protection keyword such as "public".
+	(c-at-bracelist-p): Renamed from c-inside-bracelist-p, after
+	dropping the accept-in-paren parameter, having removed its
+	functionality.
+	(c-looking-at-statement-block-1): New function, based on the
+	old c-looking-at-statement-block.  Enhanced to handle C++
+	lambda expressions, and to return the symbol `maybe' when the
+	contents of a brace delimited block fail to determine whether
+	it is a statement block.
+	(c-looking-at-statement-block): Enhanced to examine the context
+	of a brace delimited block when the contents are ambiguous.
+	(c-looking-at-c++-lambda-expression): Check the character after
+	point is a < before calling c-forward-<>-arglist.
+	(c-add-stmt-syntax): Make the context more accurate by calling
+	c-looking-at-statement-block.
+	(c-guess-basic-syntax, CASE 5D.5): Replace the syntactic symbol
+	topmost-intro-cont with the new symbol class-field-cont,
+	additionally determining the position of the enclosing brace as
+	an extra anchor point.
+	(c-guess-basic-syntax, CASE 5V): New case for an identifier
+	following a type inside class braces.
+	(c-guess-basic-syntax, CASE 9): Use
+	c-looking-at-statement-block to detect a brace list more
+	accurately.
+
+	* lisp/progmodes/cc-fonts.el (c-get-fontification-context):
+	Rename the call to c-inside-bracelist-p to c-at-bracelist-p.
+
+	* lisp/progmodes/cc-langs.el (c-protection-kwds): Add an entry
+	for java-mode.
+	(c-stmt-block-only-keywords-regexp): Prevent this regexp also
+	matching a character preceding the keyword.
+
+	* lisp/progmodes/cc-mode.el (c-before-change-include-<>)
+	(c-after-change-include-<>): Use the new limit argument to
+	c-forward-comments.
+
+	* lisp/progmodes/cc-styles.el (c-style-alist, "gnu" and "java"
+	styles): Change the offset for arglist-close to
+	c-lineup-arglist-close-under-paren.
+
+	* lisp/progmodes/cc-vars.el (c-offsets-alist): Introduce the
+	new syntactic symbol class-field-cont, giving it default
+	offset +.
+
+	* doc/misc/cc-mode.texi (Syntactic Symbols, Class Symbols):
+	Document the new syntactic symbol class-field-cont.
+
+2025-03-27  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit-x.el: Remove unnecessary treesit-generic-mode.
+
+	(treesit-generic-mode-list): Remove variable.
+	(define-treesit-generic-mode): Remove docstring text about hook
+	that is already added by 'define-derived-mode'.
+	(treesit-generic-mode): Remove command.
+
+2025-03-27  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Don't write to bottom-right cell on ttys with AutoWrap (bug#77233)
+
+	* src/term.c (tty_write_glyphs): Handle case of writing only one
+	character in the last column.
+
+2025-03-26  Stefan Kangas  <stefankangas@gmail.com>
+
+	Signal user-error in info--ensure-not-in-directory-node
+
+	* lisp/info.el (info--ensure-not-in-directory-node): Change from 'error'
+	to 'user-error' to reduce 'debug-on-error' frustration.
+
+2025-03-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix vertical cursor motion with wide images and line numbers
+
+	* src/xdisp.c (produce_image_glyph): When cropping an image that
+	exceeds the window's right edge, account for the screen estate
+	taken by line-number display.  (Bug#77217)
+
+2025-03-26  Martin Rudalics  <rudalics@gmx.at>
+
+	Further amendments of child frame handling and documentation
+
+	* src/frame.c (frame_subsumes_p): New static function
+	(delete_frame): On ttys refuse to delete a frame that could be
+	used as surrogate minibuffer frame by surviving frames.
+	(store_frame_param): Make sure 'minibuffer' parameter does not
+	reference a deleted window.  If on a tty it references a live
+	window, make sure its frame has the same root frame as the frame
+	where the parameter shall be installed.  Also on ttys make sure
+	that storing the 'parent-frame' parameter does not assign a
+	surrogate minibuffer frame a different root frame than that of
+	any of its client frames.  Further on ttys assert that making a
+	child a new root frame gives it the dimensions of the terminal.
+	(Fmouse_position_in_root_frame): Don't use XFRAME before
+	it's clear that FRAME is a frame.
+	* doc/lispref/elisp.texi (Top): Add menu for Child Frames section.
+	* doc/lispref/frames.texi (Buffer Parameters): Mention that
+	value 'child-frame' is not special for 'minibuffer' parameter on
+	text terminals.
+	(Visibility of Frames): Fix description of 'iconify-frame'.
+	(Raising and Lowering): 'minibuffer-auto-raise' is an option.
+	(Child Frames): Major rewrite using subsections.  Explain new
+	and deviant features on text terminals - menu bar access,
+	reparenting, deleting, visibility and minibuffer-only child
+	frames.
+	* etc/NEWS: Remove remark that child frames cannot be
+	arbitrarily reparented on ttys.
+
+2025-03-26  Philipp Stephani  <p.stephani2@gmail.com>
+
+	Use numeric time zone suffix in ERT explainer.
+
+	This is more robust since the time zone name is system-dependent.
+
+	* lisp/emacs-lisp/ert.el (ert--explain-time-equal-p): Use numeric time
+	zone suffix.
+
+	* test/lisp/emacs-lisp/ert-tests.el (ert-test-explain-time-equal-p):
+	Adapt test.
+
+2025-03-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/lisp/gnus/message-tests.el (message-default-buffer-type): New test.
+
+2025-03-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	backtrace.el: Remove redundant `put` and `:group`
+
+	* lisp/emacs-lisp/backtrace.el: Remove redundant `:group` args.
+	Prefer # to quote function arguments.
+	(backtrace-mode): Remove redundant `put`.
+
+2025-03-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	bs.el: Janitorial work; most importantly use `special-mode`
+
+	* lisp/bs.el: Prefer # to quote function arguments.
+	(bs-mode-font-lock-keywords): Use backquote; quote face names; and use
+	a list of faces instead of two applications at the same spot.
+	(bs-sort-buffer-interns-are-last, bs-config--files-and-scratch)
+	(bs-configurations, bs--intern-show-never): Fix ^$-vs-\`\' confusion.
+	(bs-mode-map): Remove bindings made redundant by inheritance.
+	(bs--redisplay): Use `line-number-at-pos`.
+	(bs--goto-current-buffer): Use `regexp-opt`.
+	(bs-mode): Inherit from `special-mode`.
+	(bs--current-buffer, bs--up): Use `point-min`.
+	(bs--create-header-line): Remove redundant arg.
+
+2025-03-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	bookmark.el: Cosmetic changes
+
+	* lisp/bookmark.el: Prefer # to quote function arguments.
+	(bookmark-watch-bookmark-file): Remove redundant `:group`.
+	(bookmark-bmenu-mode): Let `define-derived-mode` take care of
+	`mode-class` property.
+
+2025-03-25  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit-x.el: New file.
+
+	* lisp/treesit.el (treesit--copy-queries): New function.
+	(treesit--install-language-grammar-1): Use it.
+
+	https://lists.gnu.org/archive/html/emacs-devel/2025-03/msg01312.html
+
+2025-03-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/gnus/mm-encode.el (mm-default-buffer-type): Obey the mode hierarchy
+
+2025-03-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/gnus/mm-encode.el (mm-default-buffer-type): Check `major-mode'.
+
+2025-03-25  Philipp Stephani  <p.stephani2@gmail.com>
+
+	Rename 'buffer-too-small' to 'memory-buffer-too-small'.
+
+	This clarifies that the error isn't talking about an editing buffer.
+
+	* src/emacs-module.c (module_memory_buffer_too_small): Rename from
+	'module_buffer_too_small'.
+	(module_copy_string_contents, module_extract_big_integer): Adapt
+	callers.
+	(syms_of_module): Rename symbol 'buffer-too-small' to
+	'memory-buffer-too-small'.
+
+2025-03-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	Use better attachment defaults for *diff* buffers
+
+	* lisp/gnus/mm-encode.el (mm-default-buffer-type): New defun.
+
+	* lisp/gnus/mml.el (mml-attach-buffer): Use it.
+
+2025-03-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/infra/Dockerfile.emba (emacs-tree-sitter): Add gowork grammar.
+
+2025-03-25  James Cherti  <contact@jamescherti.com>  (tiny change)
+
+	outline-move-subtree-down/up: Fix for non-nil outline-blank-line
+
+	* lisp/outline.el (outline-move-subtree-down):
+	Include blank line when outline-blank-line is t
+	(bug#77238).
+
+2025-03-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(built-in-class--make): Take list of types rather than classes
+
+	Consolidate the conversion from types to classes into
+	`built-in-class--make` instead of duplicating it in ever caller.
+
+	* lisp/emacs-lisp/cl-preloaded.el (built-in-class--make): Take list of
+	types rather than classes.
+	(cl--define-built-in-type): Simplify accordingly.
+
+2025-03-25  Po Lu  <luangruo@yahoo.com>
+
+	Fix the DJGPP build
+
+	* msdos/emacs.djl (.bss): Guarantee that lread.o is 8-byte
+	aligned.
+
+	* msdos/sed2v2.inp (ALIGNOF_INT, ALIGNOF_LONG)
+	(ALIGNOF_LONG_LONG): Correct typos.
+
+	* src/term.c (tty_free_frame_resources): Synchronize with
+	non-DOS variant.
+
+2025-03-25  Philipp Stephani  <p.stephani2@gmail.com>
+
+	Mimic behavior of 'aref' when signalling out-of-range errors.
+
+	The convention used by 'aref' and friends is that for
+	'args-out-of-range', the error data is a list (SEQ INDEX).  Use the same
+	convention for the vector-related module functions.
+
+	* src/emacs-module.c (check_vec_index): Use vector and index as error
+	data.
+
+2025-03-25  Philipp Stephani  <p.stephani2@gmail.com>
+
+	Don't use 'args-out-of-range' error for too-small buffers.
+
+	'args-out-of-range' means that some index argument isn't valid for a
+	given sequence/range, which isn't the case here.  Instead, define a new
+	error symbol to mean "user-supplied buffer is too small."  Since we
+	never specified nor tested which error symbol was signalled in this
+	case, changing it shouldn't cause severe breakages.
+
+	* src/emacs-module.c (module_buffer_too_small): New helper function.
+	(module_copy_string_contents, module_extract_big_integer): Use it.
+	(syms_of_module): Define 'buffer-too-small' error symbol.
+
+2025-03-24  Philipp Stephani  <p.stephani2@gmail.com>
+
+	Add an ERT explainer for 'time-equal-p'.
+
+	* lisp/emacs-lisp/ert.el (ert--explain-time-equal-p): New explainer
+	function.
+
+	* test/lisp/emacs-lisp/ert-tests.el (ert-test-explain-time-equal-p): New
+	test.
+
+2025-03-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/loadup.el (max-lisp-eval-depth): Bump up a bit
+
+	This is to accommodate the deep backquoted thingy in `cus-start.el`.
+
+2025-03-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Expose some lambdas currently hidden in quoted data
+
+	* lisp/language/chinese.el ("Chinese-GB", "Chinese-BIG5")
+	("Chinese-CNS", "Chinese-EUC-TW", "Chinese-GBK"):
+	* lisp/isearch.el (isearch-menu-bar-map):
+	* lisp/international/mule-cmds.el (language-info-custom-alist):
+	* lisp/font-lock.el (cpp-font-lock-keywords):
+	* lisp/cus-start.el (<toplevel>): Expose lambda-expressions to the compiler.
+
+2025-03-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(byte-compile-maybe-guarded): Make its code edebuggable
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile--reify-function): Hoist
+	subexpression out of `if`.
+	(byte-compile-variadic-numeric, byte-compile--cond-vars)
+	(byte-compile--cond-switch-prefix, byte-compile-file-form-defalias):
+	Obey `lexical-binding` when evaluating the code we're compiling.
+	(byte-compile--maybe-guarded): New function, extracted from
+	`byte-compile-maybe-guarded`.
+	(byte-compile-maybe-guarded): Use it so we can edebug the code.
+
+2025-03-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(buffer-local-set-state): Optimize away unused data
+
+	* lisp/subr.el (buffer-local-set-state--get): Simplify by making it
+	take only the vars rather than the pairs.
+	(buffer-local-set-state): Adjust accordingly so we don't needlessly keep
+	part of the source code in the compiled code.
+
+2025-03-24  Stefan Kangas  <stefankangas@gmail.com>
+
+	New test for function-get
+
+	* test/lisp/subr-tests.el (subr-tests-function-get): New test.
+
+2025-03-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Merge from origin/emacs-30
+
+	0c32f7521b1 ; * admin/notes/spelling: More precisely qualify saying j...
+	bc51fabc108 Add a choice to 'dired-movement-style' to restore the pre...
+	10d534023a9 ; Fix some markup in doc/lispref/commands.texi.
+	c2c287b3252 Improve docstring of should-error
+
+2025-03-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Merge from origin/emacs-30
+
+	84abd43f42f * lisp/treesit.el (treesit-indent-region): Handle markers...
+
+2025-03-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	log-edit: Don't add rear-nonsticky to font-lock-extra-managed-props
+
+	* lisp/vc/log-edit.el (log-edit-mode): Don't add rear-nonsticky
+	to font-lock-extra-managed-props (bug#77197).  Investigated by
+	Paul D. Nelson <ultrano@gmail.com>.  Fix due to Stefan Monnier.
+
+2025-03-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add basic and low-level tests for hash tables
+
+	* test/src/fns-tests.el (test-hash-table)
+	(test-hash-table-wrong-keywords, test-remhash, test-clrhash)
+	(test-hash-table-p, test-hash-table-count, test-maphash)
+	(test-copy-hash-table): New tests.
+
+2025-03-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve docstring of cl-defstruct accessors
+
+	* lisp/emacs-lisp/cl-macs.el (cl-defstruct): Improve generated
+	docstring by not leaking the internal CL-X argument name, preferring X
+	instead.  Set property 'document-generalized-variable', used below.
+	* lisp/help-fns.el (help-fns--generalized-variable): When function has
+	non-nil property 'document-generalized-variable', document it as a
+	generalized variable.
+
+2025-03-23  Andrea Corallo  <acorallo@gnu.org>
+
+	Fix a nativecomp type propagation bug (bug#74771)
+
+	* lisp/emacs-lisp/comp.el (comp--add-cond-cstrs): Don't emit negated
+	cstr.
+	* test/src/comp-tests.el (comp-tests-type-spec-tests): Add a test.
+
+2025-03-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	checkdoc: Delete redundant check for wide docstrings
+
+	With Emacs 28.1, wide docstrings are now flagged by the byte-compiler.
+	The logic in the byte-compiler for catching these issues is complex
+	and continuously evolving, particularly to avoid incorrectly flagging
+	`substitute-command-keys` substitutions.  Unfortunately, the checkdoc
+	implementation incorrectly flags correct docstrings as overly wide.
+
+	Rather than duplicating the byte-compiler logic in checkdoc, which
+	would introduce unnecessary maintenance overhead, we acknowledge that
+	this check is now redundant and remove it.  Users utilizing the
+	byte-compiler, whether manually or through `flymake`, will continue to
+	be warned about this issue.
+
+	* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
+	Remove check for overly wide docstrings; duplicates byte-compiler
+	logic.
+
+2025-03-23  Po Lu  <luangruo@yahoo.com>
+
+	Patch bug#77128
+
+	* src/pgtkterm.c (pgtk_flash): Destroy `cr_surface_visible_bell'
+	if still present.  (bug#77128)
+
+2025-03-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve documentation of cl-defstruct
+
+	* doc/misc/cl.texi (Structures): Organize more logically, slightly
+	expand, and add more examples.
+
+2025-03-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid rare crashes due to "C-g C-g" on TTY frames
+
+	* src/term.c (tty_send_additional_strings): Don't use SBYTES, as
+	this function could be called in the middle of GC.  (Bug#77205)
+
+2025-03-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid rare segfaults in 'check_matrix_pointers'
+
+	* src/dispnew.c (check_window_matrix_pointers): No-op if the
+	window's frame not ready yet.  (Bug#77200)
+
+2025-03-23  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	Consistent wording in top-level headers in NEWS.19
+
+	* etc/NEWS.19: Put the word "Emacs" in front of each version number.
+	This change lets 'help-fns--first-release' parse the headers, which
+	produces more accurate "probably introduced at" versions from
+	'describe-function' and 'describe-variable'.
+
+2025-03-22  Stefan Kangas  <stefankangas@gmail.com>
+
+	Reduce code duplication in ns_set_appearance
+
+	* src/nsterm.h (ns_set_appearance_1): Declare.
+	* src/nsterm.m (ns_set_appearance_1): Break out new function...
+	(ns_set_appearance): ...here.
+	* src/nsfns.m (Fx_create_frame): Use above new function.
+
+2025-03-22  shipmints  <shipmints@gmail.com>
+
+	Ensure .dir-locals-2.el behavior as documented (bug#75890)
+
+	* lisp/files.el
+	(dir-locals--all-files): New &optional 'base-el-only' argument.
+	(dir-locals--base-file): New function.
+	(dir-locals-find-file): 'locate-dominating-file' only for the base
+	.dir-locals.el.
+
+	* test/lisp/files-tests.el
+	(files-test-dir-locals-2-solo): New test.
+	* test/lisp/files-resources/dir-locals-2-solo: New test support.
+	(files-test-dir-locals-2-paired): New test.
+	* test/lisp/files-resources/dir-locals-and-2: New test support.
+
+2025-03-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid rare segfaults due to crazy creation of new child frames
+
+	* src/dispnew.c (combine_updates, combine_updates_for_frame): Skip
+	frames and child frames that were not yet completely made.
+	(Bug#77046)
+
+2025-03-22  Sora Takai  <SoraTakai@protonmail.com>  (tiny change)
+
+	Make isearch lazy-highlights non-sticky at both ends (bug#77121)
+
+2025-03-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Remove ctags program
+
+	Remove our old ctags and suggest Universal Ctags instead.
+	This fixes a FIXME in lib-src/Makefile.in and speeds up compilation
+	quite a bit on my older CPU when I compile with	--enable-gcc-warnings.
+	It also lessens installation and runtime footprint. (Bug#76322)
+	* .gitignore: Remove lib-src/ctags.
+	* admin/authors.el (authors-renamed-files-alist): Remove ctags.1.
+	* admin/check-man-pages: ctags.1 is no longer a special case.
+	* admin/quick-install-emacs (PUBLIC_LIBSRC_BINARIES): Remove ctags.
+	* cross/Makefile.in (LIBSRC_BINARIES): Remove lib-src/ctags.
+	* doc/man/ctags.1, lib-src/ctags.c: Remove.
+	* java/Makefile.in (CROSS_LIBSRC_BINS): Remove ctags.
+	* lib-src/Makefile.in (INSTALLABLES): Remove ctags${EXEEXT}.
+	(ctags${EXEEXT}): Remove.
+	* lib-src/etags.c (CTAGS): Remove.  All uses replaced by ...
+	(ctags): ... this new static var.
+	(STDIN): Remove macro.  All uses replaced by new STDIN_OPTION constant.
+	(CTAGS_OPTION, STDIN_OPTION): New contants.
+	(longopts): New --ctags option.
+	(ctags_default_C_help): New constant,
+	to override default_C_help at runtime.
+	(default_C_help): Now always the etags version.
+	(C_LANG_NAMES_INDEX): New macro.
+	(print_language_names): Do not assume etags.
+	(PROGRAM_NAME): Remove.  All uses removed.
+	(print_help): Document --ctags if PRINT_UNDOCUMENTED_OPTIONS_HELP.
+	(main): Support new --ctags option, and support all [ce]tags options.
+	* test/manual/etags/Makefile (CTAGS_PROG):
+	Now etags --ctags, since there is no longer a ctags.
+
+2025-03-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix usage of string data pointers in xfaces.c
+
+	* src/xfaces.c (tty_defined_color): Don't use SSDATA pointers
+	across calls to Lisp.  (Bug#77046)
+
+2025-03-22  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Merge from origin/emacs-30
+
+	1364bbc6a5c ; * admin/notes/spelling: Grammar fix
+	dc80a8f0509 ; Add index entry "code completion" to user manual
+	0d9b14ed057 ; * doc/emacs/programs.texi (Program Modes): Add info abo...
+	f224475f578 ; admin/notes/spelling: Notes on abbreviation of "Emacs L...
+	86c354dd0d8 Fix OSX build without pdumper
+	2d12754ee20 ; Add indexing for Eglot in user manual
+	a30b9b640b4 ; Change some instances of cl to cl-lib in docs
+	b681d62436f ; Improve introduction to use-package manual
+	f1acefd86f8 ; Add cross-references to push and pop docstrings
+
+2025-03-22  shipmints  <shipmints@gmail.com>
+
+	'window-state-normalize-buffer-name' option for `uniquify' buffers
+
+	If 'window-state-normalize-buffer-name' is non-nil, 'window-state-get'
+	will normalize stored buffer names, making them easier to restore for
+	users that use 'uniquify' buffer naming.
+	* doc/lispref/windows.texi (Window Configurations): Document
+	'window-state-normalize-buffer-name'.
+	* lisp/window.el (window-state-normalize-buffer-name): New defvar.
+	(window--state-normalize-buffer-name): New function.
+	(window--state-get-1): Call 'window--state-normalize-buffer-name'
+	rather than 'buffer-name'.
+	* etc/NEWS: Announce 'window-state-normalize-buffer-name'.
+	(Bug#76980)
+
+2025-03-22  James Cherti  <contact@jamescherti.com>  (tiny change)
+
+	ElDoc: Add more commands using 'eldoc-add-command-completions'
+
+	Add more commands to 'eldoc-add-command-completions' to fix
+	disappearing ElDoc help in the minibuffer for the following
+	cases:
+	- All modes: Added "comment-indent-new-line".
+	- All modes: Added "delete-char" for handling when the user presses delete.
+	- Python mode: Added "python-indent-dedent-line-backspace" for handling
+	  when the user presses backspace.
+	* lisp/emacs-lisp/eldoc.el (eldoc-remove-command-completions):
+	* lisp/progmodes/python.el (python-base-mode): Add more commands
+	to 'eldoc-add-command-completions'.
+
+2025-03-22  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete now unused constants in nsterm.h
+
+	* src/nsterm.h (NS_DUMPGLYPH_NORMAL, NS_DUMPGLYPH_CURSOR)
+	(NS_DUMPGLYPH_FOREGROUND, NS_DUMPGLYPH_MOUSEFACE): Delete now unused
+	constants.
+
+2025-03-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve 'C-u C-x =' for ligatures of ASCII characters
+
+	* lisp/composite.el (composition-find-pos-glyph): New function.
+	* lisp/descr-text.el (describe-char): Use it to get the font glyph
+	code of "trivial" compositions.
+	(describe-char-display): Accept an additional optional argument
+	and use it as the font glyph code for the character.
+
+2025-03-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp: Improve handling of cyclic symlinks
+
+	* lisp/net/tramp-sh.el (tramp-sh-handle-file-ownership-preserved-p):
+	Add FIXME.
+
+	* lisp/net/tramp.el (tramp-skeleton-file-exists-p)
+	(tramp-handle-file-directory-p): Protect against cyclic symlinks.
+
+	* test/lisp/net/tramp-tests.el (tramp-test18-file-attributes)
+	(tramp-test21-file-links): Adapt tests.
+
+2025-03-22  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix and document frame parameters for text terminals and child frames
+
+	* src/frame.c (Fmake_frame_invisible): In doc-string describe
+	effect on text terminals.  Set FRAME correctly when called with
+	nil value.  Make frame invisible before calling mru_rooted_frame
+	or next_frame.
+	(Ficonify_frame): Make it work for child frames on text
+	terminals
+	(Fmodify_frame_parameters): Make value 'icon' for 'visibility'
+	work for child frames.
+	* src/dispnew.c (frame_ancestors_visible_p): New function.
+	(frames_with_root): If VISIBLE_ONLY is non-nil, return only
+	frames whose ancestors are all visible to avoid that redisplay
+	draws visibly orphaned child frames.
+	* doc/lispref/frames.texi (Frames): Move descriptions of top
+	frame and 'tty-top-frame' here.
+	(Frame Layout): Mention that on text terminals the outer border
+	can be emulated by setting the 'undecorated' frame parameter.
+	(Frame Position, Frame Parameters, Window Frame Parameters)
+	(Position Parameters, Size Parameters): Rewrite sections dealing
+	with the handling of frame parameters in text terminals.
+	(Layout Parameters): Move description of 'undecorated' parameter
+	here.  Clarify semantics of 'menu-bar-lines' parameter.
+	(Frame Interaction Parameters): Move description of 'visibility'
+	parameter here.  Mention which parameters are not implemented on
+	text terminals.
+	(Mouse Dragging Parameters): Describe how these work on text
+	terminals.
+	(Visibility of Frames): Rewrite section.
+	(Raising and Lowering): Describe for text terminals.
+	(Child Frames): Fix description of 'iconify-child-frame' option.
+
+2025-03-22  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make 'eieio-version' obsolete
+
+	EIEIO used to be developed externally as part of CEDET, but that is no
+	longer the case.  It now has the same version as Emacs itself.
+	https://sourceforge.net/p/cedet/git/ci/8aa920380f8178ed2514f06f13c403d80db16752/
+
+	* lisp/emacs-lisp/eieio.el: Change "Version" header to "Old-Version".
+	(eieio-version): Make both the variable and the function obsolete in
+	favor of 'emacs-version'.
+
+2025-03-22  Daniel Colascione  <dancol@dancol.org>
+
+	xref: error -> user-error: reduce debug-on-error annoyance
+
+	* lisp/progmodes/xref.el (xref--next-error-function): Use user-error
+	instead of error.
+
+2025-03-22  Daniel Colascione  <dancol@dancol.org>
+
+	Adapt ediff to nonstandard layouts
+
+	Make ediff cope with having some of its windows (especially the control
+	window) not shown by a custom ediff-window-setup-function.
+	Modernize relevant adjacent code. After this change, one can write a
+	custom ediff-window-setup-function that doesn't show the control window.
+
+	* doc/misc/ediff.texi (Notes on Heavy-duty Customization): Refine
+	language to explain that the window setup function doesn't have to show
+	all windows.
+	* lisp/vc/ediff-util.el (ediff-select-control-window-on-setup):
+	New variable.
+	(ediff-setup, ediff-recenter, ediff-recenter-one-window)
+	(ediff-recenter-ancestor, ediff-toggle-read-only)
+	(ediff-operate-on-windows, ediff-jump-to-difference-at-point)
+	(ediff-default-suspend-function)
+	(ediff-clone-buffer-for-region-comparison)
+	(ediff-clone-buffer-for-window-comparison): Modernize control flow;
+	select only windows that exist.
+	* lisp/vc/ediff-wind.el (ediff-with-live-window): New convenience macro.
+	(ediff-window-setup-function): Explain relaxed contract.
+
+2025-03-21  Spencer Baugh  <sbaugh@catern.com>
+
+	minibuffer.el: Fix warnings and coding style in last change
+
+	* lisp/minibuffer.el: Cut lines to fit into 80 columns.
+	(completion--insert-strings): Simplify `if` to `or`.
+	(completion--insert-horizontal, completion--insert-one-column):
+	Fix warning about used var starting with `_`.  Avoid `apply-partially`.
+
+2025-03-21  Spencer Baugh  <sbaugh@catern.com>
+
+	Lazily highlight and insert candidates in *Completions*
+
+	From profiling, the main bottleneck in completion over large
+	completion sets is display-completion-list, when there are many
+	available candidates.  For example, in my large monorepo, when
+	completing over the 589196 files or the 73897 branches, even
+	with the candidates narrowed down by typing some prefix to
+	complete, TAB (when it shows *Completions*) or ? is slow, mostly
+	in display-completion-list.
+
+	However, rendering all the completion candidates is unnecessary if
+	the *Completions* window is never scrolled to see those candiates.  By
+	eagerly inserting only some candidates and lazily highlighting and
+	inserting the remaining candidates only when necessary, performance is
+	much improved.
+
+	* lisp/minibuffer.el (completion--insert-strings): Insert
+	completions lazily. (bug#74561)
+	(completions--lazy-insert-button): Add.
+	(completion--insert-horizontal, completion--insert-one-column):
+	Throw a continuation when enough lines of completions are
+	inserted.
+	(completion--insert-vertical): Add ignored lines argument.
+	(minibuffer-completion-help): Set completion-lazy-hilit.
+	(with-minibuffer-completions-window): Call
+	completion--lazy-insert-strings.
+	(with-minibuffer-completions-window):
+	* lisp/simple.el (completion-setup-function): Preserve
+	buffer-locals required for lazy completion insertion.
+	(switch-to-completions): Call completion--lazy-insert-strings.
+	* etc/NEWS: Announce.
+
+2025-03-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid infinite loop with images under 'display-line-numbers-mode'
+
+	* src/xdisp.c (move_it_in_display_line_to, display_line): When
+	considering the first glyph on a glyph row, take into
+	consideration the glyphs produced for line-number display.
+	(Bug#77065)
+
+2025-03-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Leave buffer with input-method help unmodified
+
+	* lisp/international/quail.el (quail-help): Leave "*Help*"
+	unmodified.  (Bug#77139)
+
+2025-03-20  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make compilation-filter-hook into a defcustom
+
+	* lisp/progmodes/compile.el (compilation-filter-hook): Make variable
+	into a defcustom.
+
+2025-03-20  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Allow specifying in which major modes to enable 'global-hl-line-mode'
+
+	* lisp/hl-line.el (global-hl-line-modes): New user option.
+	(global-hl-line-highlight): Obey the new variable.  (Bug#77022)
+
+	* etc/NEWS: Document new variable.
+
+2025-03-20  David Ponce  <da_vid@orange.fr>
+
+	Fix `string-pixel-width' with alternate text properties
+
+	Fix possible wrong result of `string-pixel-width' with alternate
+	and default properties.  Create new regression tests.
+	* lisp/emacs-lisp/subr-x.el (string-pixel-width): Like for
+	`face-remapping-alist', use in work buffer the value of
+	`char-property-alias-alist' and `default-text-properties'
+	local to the passed buffer, to correctly compute pixel width.
+	(Bug#77042)
+
+	* test/lisp/misc-tests.el: Add tests for `string-pixel-width'.
+
+2025-03-20  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	MariaDB and Mysql handle escaped aphostrophes in the same way
+
+	* lisp/progmodes/sql.el (sql-mode): MariaDB and Mysql both
+	handle escaped apostrophes in the same way.  (Bug#77088)
+
+2025-03-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve 'gui-get-selection' on MS-Windows
+
+	* lisp/term/w32-win.el (w32--get-selection): Allow UTF8_STRING and
+	TEXT data types as well, since w32select.c handles that correctly.
+
+2025-03-20  Stefan Kangas  <stefankangas@gmail.com>
+
+	Recenter calendar-chinese-year-cache on 2028
+
+	* lisp/calendar/cal-china.el (calendar-chinese-year-cache): Recenter
+	on 2028.
+
+2025-03-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	indent.erts (Code): Don't modify the global state
+
+	* test/lisp/progmodes/java-ts-mode-resources/indent.erts (Code):
+	Use `setq-local` and correspondingly move the remaining
+	assignment after activating the major mode.
+
+2025-03-19  Juri Linkov  <juri@linkov.net>
+
+	* lisp/files.el (save-some-buffers-action-alist): Fix 'view-mode'.
+
+	Use 'view-mode-enter' instead of 'view-buffer' to ignore the 'special'
+	mode-class that prevents some modes from binding 'q' to 'exit-action'
+	that should call 'exit-recursive-edit' (bug#76745).
+
+2025-03-19  shipmints  <shipmints@gmail.com>
+
+	Promote bookmark-handler prop 'bookmark-inhibit to list (bug#65039)
+
+	* lisp/bookmark.el (bookmark-insert):
+	* lisp/shell.el (#'shell-bookmark-jump): The bookmark-handler
+	property 'bookmark-inhibit is now a list.
+
+2025-03-19  Martin Rudalics  <rudalics@gmx.at>
+
+	On tty frames restrict number of menu bar lines (Bug#77015)
+
+	* src/frame.c (set_menu_bar_lines): Make sure tty frames get
+	only 0 or 1 menu bar line (Bug#77015).
+
+2025-03-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/emacs-lisp/smie.el (smie-config-show-indent): Tweak message
+
+2025-03-18  Martin Rudalics  <rudalics@gmx.at>
+
+	Ensure redisplay after re-parenting a tty child frame (Bug#77079)
+
+	* src/frame.c (store_frame_param): When re-parenting a tty child
+	frame, mark it's old and new root frames as garbaged so redisplay
+	will reflect the change immediately (Bug#77079).
+
+2025-03-18  Po Lu  <luangruo@yahoo.com>
+
+	Fix generation of mouse position lists on the tool and tab bars
+
+	* src/keyboard.c (make_lispy_tty_position): Return whether an
+	internal border was hit.
+	(make_lispy_position): Only skip standard window and frame
+	detection process if so, as there are other scenarios where POSN
+	is nil but WINDOW_OR_FRAME is none the less expected to be
+	provided by the conditionals skipped.
+
+2025-03-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use 'help-key' function in more places
+
+	* lisp/dired-aux.el (dired-query):
+	* lisp/emacs-lisp/helper.el (Helper-help-map):
+	* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Use 'help-key'.
+	* lisp/net/tramp-cmds.el (tramp-rename-files):
+	* lisp/which-key.el (which-key--next-page-hint): Prefer 'help-key'
+	when available.
+	* lisp/help.el (help-key): Simplify.
+	* etc/symbol-releases.eld: Add 'help-key'.
+
+2025-03-17  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Make marking conflicted files as resolved upon saving opt-out
+
+	This fixes Bug#3860.
+
+	* lisp/vc/vc.el (vc-resolve-conflicts): New user option.
+	* lisp/vc/vc-bzr.el (vc-bzr-resolve-conflicts): New user option.
+	(vc-bzr-find-file-hook): Use it.
+	* lisp/vc/vc-hg.el (vc-hg-resolve-conflicts): New user option.
+	(vc-hg-find-file-hook): Use it.
+	* lisp/vc/vc-svn.el (vc-svn-resolve-conflicts): New user option.
+	(vc-svn-find-file-hook): Use it.
+	* lisp/vc/vc-git.el (vc-git-resolve-conflicts): Support
+	'default' as an option.  Adjust docstring and version.
+	(vc-git-find-file-hook): Respect vc-resolve-conflicts.
+	* etc/NEWS: Announce the new options.
+
+2025-03-17  Martin Rudalics  <rudalics@gmx.at>
+
+	Implement dragging and resizing of tty child frames
+
+	* lisp/faces.el (face-spec-recalc): Don't set
+	scroll-bar-foreground and scroll-bar-background parameters on
+	ttys.
+	* lisp/mouse.el (mouse-drag-frame-resize)
+	(mouse-drag-frame-move): On ttys call
+	'mouse-position-in-root-frame' to get position of child frame to
+	resize or drag.
+	* lisp/xt-mouse.el (xterm-mouse-event): Handle events on
+	child frame decorations as if they happened on the internal border
+	to find out whether a user wants to drag or resize a child frame.
+	* src/frame.c (frame_internal_border_part): Define for ttys too.
+	(Fmouse_position_in_root_frame): New function.
+	* src/frame.h (internal_border_part): Define for ttys too.
+	* src/keyboard.c (internal_border_parts): Define for ttys too.
+	(frame_border_side): New enum.
+	(make_lispy_position): Handle events on tty child frames.
+	(Fposn_at_x_y): Accept -1 for Y so we can handle a position on
+	the top decoration of a tty child frame.
+	* src/term.c (tty_frame_at): Handle case where X and Y denote a
+	position on a tty child frame's decoration.
+	* src/window.c (Fwindow_at): Handle case where X and Y denote a
+	position on the decoration of a tty child frame which we pretend
+	as belonging to that child frame (and not to its root).
+
+2025-03-17  Martin Rudalics  <rudalics@gmx.at>
+
+	Implement surrogate menu bars for tty child frames
+
+	* lisp/menu-bar.el (popup-menu): When asked to pop up MENU from
+	a tty child frame try to use menu of its root frame.
+	(menu-bar-open): When FRAME is a child frame and
+	'tty-menu-open-use-tmm' is nil, navigate menu bar of its root
+	frame.
+	* src/keymap.c (Fcurrent_active_maps): Accept live window as
+	POSITION argument and use its buffer as current when processing
+	the key sequence.  Needed for tty child frames so the root
+	frame's menu bar can be updated according to the selected
+	window's buffer when navigating the menu bar from keyboard.
+	* src/xdisp.c (prepare_menu_bars): If the selected window's
+	frame is a tty child frame without menu bar, that frame's root
+	frame has a menu bar and 'tty-menu-open-use-tmm' is nil, prepare
+	to update the menu bar of the root frame as surrogate.
+	(update_menu_bar): New argument W denoting the window that
+	should be considered as selected.  For a tty child frame using F
+	as surrogate menu bar frame this specifies the child frame's
+	selected window and its buffer shall be used for updating the
+	menu bar of the root frame instead of the buffer of the root
+	frame's selected window.
+	(redisplay_window): Instead of setting redisplay_menu_p flag
+	always call display_menu_bar right away.  This facilitates to
+	call display_menu_bar for a tty child frame with its root
+	frame as surrogate menu bar frame.
+	(display_tty_menu_item): If the selected frame is a tty child
+	frame, overwrite its root frame's glyph matrix (and not that of
+	the child frame) when displaying a menu item.
+	(Qtty_menu_open_use_tmm): Define symbol.
+
+2025-03-17  Yuan Fu  <casouri@gmail.com>
+
+	Add some keywords to java-ts-mode--keywords (bug#75154)
+
+	* lisp/progmodes/java-ts-mode.el:
+	(java-ts-mode--keywords): Add keywords, remove @interface.
+
+2025-03-17  Yuan Fu  <casouri@gmail.com>
+
+	Move around java-ts-mode font-lock rules (bug#75154)
+
+	* lisp/progmodes/java-ts-mode.el:
+	(java-ts-mode--font-lock-settings): Move constant feature down
+	so it overrides expression and definition.
+
+2025-03-17  Yuan Fu  <casouri@gmail.com>
+
+	Use c-ts-common baseline rule in java-ts-mode (bug#75154)
+
+	Use it for function parameters.
+
+	* lisp/progmodes/java-ts-mode.el:
+	(java-ts-mode--standalone-predicate): New function.
+	(java-ts-mode--indent-rules): Comment out rules for function
+	parameters and statements, and add
+	c-ts-common-baseline-indent-rule as fallback.
+	(java-ts-mode): Setup.
+	(java-ts-mode--first-line-on-multi-line-string): Mark BOL as
+	unused.
+	* test/lisp/progmodes/java-ts-mode-resources/indent.erts:
+	New test.
+
+2025-03-17  Yuan Fu  <casouri@gmail.com>
+
+	Add indentation for multi-line string in java-ts-mode (bug#75154)
+
+	* lisp/progmodes/java-ts-mode.el:
+	(java-ts-mode--first-line-on-multi-line-string): New function.
+	(java-ts-mode--indent-rules): Add rules.
+
+2025-03-17  Yuan Fu  <casouri@gmail.com>
+
+	Add java-ts-mode-method-chaining-indent-offset (bug#75154)
+
+	Default method chaining to indent 8 spaces.
+
+	* lisp/progmodes/java-ts-mode.el:
+	(java-ts-mode-method-chaining-indent-offset): New custom option.
+	(java-ts-mode--indent-rules): Use
+	java-ts-mode-method-chaining-indent-offset.
+
+2025-03-16  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Make sure to initialize glyph::frame to NULL (bug#77039)
+
+	* src/dispnew.c (adjust_glyph_matrix): Clear glyph memory when
+	enlarging window-system window glyph matrices.
+
+2025-03-16  Jens Schmidt  <jschmidt4gnu@vodafonemail.de>
+
+	Correctly unload variable aliases.
+
+	* src/eval.c (Finternal_delete_indirect_variable): Add function.
+	* lisp/loadhist.el (loadhist-unload-element): Use it for variable
+	aliases.
+	* test/src/eval-tests.el (eval-tests--internal-delete-indirect-variable):
+	Test function `internal-delete-indirect-variable'.
+	* test/lisp/loadhist-tests.el (loadhist-test-unload-feature-alias):
+	* test/lisp/loadhist-resources/loadhist--alias.el: Test unloading of
+	features that define variable aliases.  (Bug#76748)
+
+2025-03-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp: Handle symlinks to non-existing targets better
+
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-do-copy-or-rename-file):
+	Don't use the truename.
+
+	* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file): Refactor.  Handle
+	symlinks.  (Bug#76678)
+
+	* lisp/net/tramp-smb.el (tramp-smb-errors): Add string.
+	(tramp-smb-handle-copy-file, tramp-smb-handle-rename-file):
+	Refactor.
+
+	* lisp/net/tramp-sudoedit.el (tramp-sudoedit-do-copy-or-rename-file):
+	Don't use the truename.  Handle symlinks.
+
+	* lisp/net/tramp.el (tramp-barf-if-file-missing): Accept also symlinks.
+	(tramp-skeleton-file-exists-p): Handle non-existing symlink targets.
+	(tramp-skeleton-set-file-modes-times-uid-gid): Fix typo.
+
+	* test/lisp/net/tramp-tests.el (vc-handled-backends):
+	Suppress only if noninteractive.
+	(tramp-test11-copy-file, tramp-test12-rename-file)
+	(tramp-test18-file-attributes, tramp-test21-file-links)
+	(tramp--test-check-files): Adapt tests.
+
+2025-03-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't recommend legacy keymap functions in docstrings
+
+	* lisp/comint.el (comint-prompt-read-only):
+	* lisp/ielm.el (ielm-prompt-read-only):
+	* lisp/international/ogonek.el (ogonek-informacja, ogonek-information):
+	* lisp/mouse-copy.el (mouse-drag-secondary-pasting):
+	* lisp/mouse-drag.el (mouse-drag-throw, mouse-drag-drag): Don't
+	recommend using legacy keymap functions.
+
+2025-03-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use substitute-quotes for checkdoc errors
+
+	* lisp/emacs-lisp/checkdoc.el (checkdoc-create-error): Use
+	substitute-quotes.
+
+2025-03-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use defvar-keymap for some trivial keymaps
+
+	* lisp/bindings.el (mode-line-window-dedicated-keymap)
+	(mode-line-buffer-identification-keymap):
+	* lisp/emulation/cua-rect.el (cua--overlay-keymap, cua--overlay-key):
+	* lisp/mh-e/mh-mime.el (mh-mime-security-button-map):
+	* lisp/mh-e/mh-utils.el (mh-hidden-header-keymap):
+	* lisp/net/eudc-bob.el (eudc-bob-generic-keymap, eudc-bob-image-keymap)
+	(eudc-bob-sound-keymap, eudc-bob-url-keymap, eudc-bob-mail-keymap):
+	* lisp/progmodes/etags-regen.el (etags-regen-mode-map):
+	* lisp/progmodes/octave.el (octave-help-mode-map):
+	* lisp/replace.el (multi-query-replace-map):
+	* lisp/simple.el (process-menu-mode-map, messages-buffer-mode-map):
+	* lisp/startup.el (splash-screen-keymap):
+	* lisp/tab-bar.el (tab-bar-mode-map):
+	* lisp/textmodes/ispell.el (ispell-minor-keymap):
+	* lisp/textmodes/tex-mode.el (latex-mode-map, plain-tex-mode-map):
+	* lisp/tree-widget.el (tree-widget-button-keymap):
+	* lisp/vc/vc-hooks.el (vc-mode-line-map): Use defvar-keymap.
+
+2025-03-16  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	2d5cf228186 Fix clipboard object handle leak on Android 3.1 to 11.0
+	b6b4a080a3a Only disable 'completion-preview-active-mode' when it is on
+
+2025-03-16  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	dcf3916e558 ; Doc fix for legacy keymap functions
+	227db70db98 ; * doc/misc/ede.texi (Top): Improve introduction.
+
+2025-03-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid rare segfaults in 'combine_updates_for_frame'
+
+	* src/xdisp.c (redisplay_internal): Don't add to 'tty_root_frames'
+	frames that are not yet completely made.  (Bug#77046)
+
+2025-03-16  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New project-save-some-buffers command
+
+	* lisp/progmodes/project.el (project-save-some-buffers): New command.
+	(project-prefix-map): Bind it to C-x p C-x s.
+	* etc/NEWS: Announce the new command and binding.
+
+2025-03-16  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-revert: Offer to save modified buffers (bug#55310)
+
+	* lisp/vc/vc.el (vc-revert): Offer to save modified buffers that
+	otherwise prevent proceeding with the revert (bug#55310).
+
+2025-03-15  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Update to Transient v0.8.6-7-g64cb8404
+
+2025-03-15  Juri Linkov  <juri@linkov.net>
+
+	Add the treesit 'list' thing to csharp/go/php/rust-ts-mode (bug#73404)
+
+	* lisp/progmodes/csharp-mode.el (csharp-ts-mode): Add the
+	'list' and 'sentence' things to 'treesit-thing-settings'.
+	Set 'treesit-outline-predicate'.
+
+	* lisp/progmodes/go-ts-mode.el (go-ts-mode):
+	Add 'treesit-thing-settings' with the 'list' and 'sentence' things.
+
+	* lisp/progmodes/php-ts-mode.el (php-ts-mode):
+	Add the 'list' thing to 'treesit-thing-settings'.
+
+	* lisp/progmodes/rust-ts-mode.el (rust-ts-mode):
+	Add 'treesit-thing-settings' with the 'list' thing.
+
+2025-03-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	1a8fbf69e33 Fix 'whitespace-mode' in CJK locales
+	01c03043e6e ; Improve documentation of 'gui-get-selection' use on X
+
+2025-03-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve conversion between half-width and full-width characters
+
+	* lisp/textmodes/text-mode.el (text-mode--get-fullwidth-table):
+	Add conversion of SPC to IDEOGRAPHIC SPACE.  (Bug#71822)
+
+2025-03-15  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/bindings.el (tramp-revert-buffer-with-sudo): Declare.
+
+2025-03-15  Vincenzo Pupillo  <vincenzo.pupillo@unimi.it>
+
+	Add a new command `speedbar-window'.
+
+	Speedbar now can be opened in a window instead of a separate frame. The
+	frame remains the default.
+
+	* doc/emacs/frames.texi: Mention Speedbar window mode.
+	* doc/misc/speedbar.texi: Document 'speedbar-window'.
+	* lisp/speedbar.el
+	(speedbar-prefer-window): New user option. If t, the command `speedbar'
+	open the speedbar in a window.
+	(speedbar-window-dedicated-window): New user option. If t the window is
+	dedicated.
+	(speedbar-window-side):  New user option. The side of 'speedbar-window',
+	defaults to left.
+	(speedbar-window-default-width): New user option. The default size of
+	the 'speedbar-window'.
+	(speedbar-window-max-width): New user option. Limits the width of the
+	'speedbar-window'. The user can resize the window as desired, but this
+	option will be the width of the window when restored.
+	(speedbar--buffer-name): New variable, the buffer name used for both
+	'speedbar-frame-mode' and 'speedbar-window-mode'.
+	(speedbar--window): New variable, the window displaying 'speedbar-window'.
+	(speedbar--window-width): New variable, store the current width of
+	'speedbar-window'.
+	(speedbar-easymenu-definition-trailer): Now it is a function that
+	returns a different trailer for 'speedbar-frame' and 'speedbar-window'.
+	(speedbar): Now it is a function that calls 'speedbar-frame-mode', the
+	default or 'speedbar-window-mode' based on the value of
+	'speedbar-prefer-window'.
+	(speedbar-frame-mode): Before opening a frame, close 'speedbar-window'
+	if it is open.
+	(speedbar-frame-or-window): New function, returns 'frame', 'window'
+	or nil if speedbar is not open.
+	(speedbar-window): New alias for 'speedbar-window-mode'.
+	(speedbar-window-mode): Enable of disable 'speedbar-window'.
+	(speedbar-window--window-live-p): New function, return non-nil if the
+	'speedbar-window' is live.
+	(speedbar-window--buffer-live-p): New function, return non-nil if the
+	'speedbar-buffer' is live.
+	(speedbar-window--live-p): New function, return t if 'speedbar-window'
+	is open.
+	(speedbar-window-current-window): New function, return t if the selected
+	window is speedbar-window.
+	(speedbar-window--close): New function, close the 'speedbar-window'.
+	(speedbar-window--width): New function, return the current width of
+	'speedbar-window'.
+	(speedbar-width): New function, return the 'speedbar' of
+	'speedbar-frame-mode' of 'speedbar-frame-mode'.
+	(speedbar-set-mode-line-format): Use the new 'speedbar-width' function.
+	(speedbar-directory-buttons): Use the new 'speedbar-width' function.
+	(speedbar--speedbar-live-p): New function, returns t if
+	'speedbar-frame-mode' or 'speedbar-window-mode' are open.
+	(speedbar-timer-fn): Now handle 'speedbar-frame-mode' and
+	'speedbar-window-mode'.
+
+2025-03-15  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Fix mouse-posn-property
+
+	* doc/lispref/commands.texi (Click Events): Mention menu-bar.
+	* lisp/mouse.el (mouse-event-areas-with-no-buffer-positions):
+	New defvar including all areas mentioned in the Lisp reference.
+	(mouse-posn-property): Use it.
+
+2025-03-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete pre-Emacs 20 documentation from term.el
+
+	* lisp/term.el: Delete comment titled "Converting process modes to use
+	term mode".  This comment from 1994 is only of historical interest.
+
+2025-03-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Recommend using 'keymap-set' in Commentaries
+
+	* lisp/calendar/timeclock.el, lisp/comint.el, lisp/ehelp.el:
+	* lisp/gnus/gnus-bookmark.el, lisp/gnus/smiley.el, lisp/ido.el:
+	* lisp/isearchb.el, lisp/mail/mailabbrev.el, lisp/net/ange-ftp.el:
+	* lisp/net/goto-addr.el, lisp/play/fortune.el, lisp/saveplace.el:
+	* lisp/shell.el, lisp/term.el, lisp/textmodes/makeinfo.el:
+	* lisp/textmodes/refer.el, lisp/textmodes/remember.el:
+	* lisp/textmodes/table.el, lisp/woman.el: Recommend using
+	'keymap-set' instead of 'define-key' in Commentaries.
+
+2025-03-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Recommend using 'keymap-global-set' in Commentaries
+
+	* lisp/bs.el, lisp/calculator.el, lisp/cedet/data-debug.el:
+	* lisp/help-at-pt.el, lisp/hilit-chg.el, lisp/mail/mspools.el:
+	* lisp/mh-e/mh-e.el, lisp/mouse-copy.el, lisp/mouse-drag.el:
+	* lisp/net/browse-url.el, lisp/net/webjump.el, lisp/printing.el:
+	* lisp/progmodes/cfengine.el, lisp/progmodes/ebnf2ps.el:
+	* lisp/ps-print.el, lisp/repeat.el, lisp/term/wyse50.el:
+	* lisp/term/x-win.el, lisp/vcursor.el, lisp/woman.el:
+	Recommend using 'keymap-global-set' instead of 'global-set-key'.
+
+2025-03-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use defvar-keymap in which-func.el
+
+	* lisp/progmodes/which-func.el (which-func-keymap): Use defvar-keymap.
+	(which-func-maxout): Change :type to natnum.
+	(which-func-format): Use substitute-command-keys.
+
+2025-03-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add :set attribute to winner-dont-bind-my-keys
+
+	* lisp/winner.el (winner--set-dont-bind-my-keys): New function.
+	(winner-dont-bind-my-keys): Allow setting with setopt.
+	(winner-mode-map): Use defvar-keymap.
+	* test/lisp/winner-tests.el: New file.
+
+2025-03-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use defvar-keymap for command-history-mode-map
+
+	* lisp/chistory.el (command-history-mode-map): Use defvar-keymap.
+
+2025-03-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Move pulse.el from lisp/cedet/ to lisp/
+
+	* lisp/cedet/pulse.el: Move from here...
+	* lisp/pulse.el: ...to here.  This library is no longer relevant only
+	to CEDET.  It is used by other built-in libraries, GNU ELPA packages,
+	and very likely third-party libraries too.
+
+2025-03-15  Dmitry Gutov  <dmitry@gutov.dev>
+
+	dired-copy-filename-as-kill: Support project-relative names
+
+	* lisp/dired.el (dired-copy-filename-as-kill): Support new value
+	of ARG, to mean file name relative to project root (bug#76792).
+
+	* doc/emacs/dired.texi (Misc Dired Features): Mention it.
+
+	* etc/NEWS: Same.
+
+2025-03-15  Tomas Nordin  <tomasn@posteo.net>
+
+	Teach diff-apply-hunk to handle hunks with empty context
+
+	* lisp/vc/diff-mode.el (diff-find-source-location):
+	Consider the case when there is no diff context above or below
+	edited lines.  (bug#72556)
+
+	* test/lisp/vc/diff-mode-tests.el: Add tests for undoing hunks
+	from diffs with addtions only in the beginning or end of the
+	source file.
+
+2025-03-14  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make turn-on-flyspell/turn-off-flyspell obsolete
+
+	* lisp/textmodes/flyspell.el (turn-on-flyspell): Make into obsolete
+	function alias for 'flyspell-mode'.
+	(turn-off-flyspell): Declare obsolete.
+	(text-mode-hook): Don't redundantly set :options here.
+	* lisp/textmodes/text-mode.el (text-mode-hook): Prefer 'flyspell-mode'
+	to 'turn-on-flyspell' in :options.  (Bug#76535)
+
+2025-03-14  Michael Albinus  <michael.albinus@gmx.de>
+
+	Improve tramp-*-with-sudo commands
+
+	* doc/emacs/dired.texi (Dired Visiting):
+	Add tramp-dired-find-file-with-sudo.
+
+	* doc/emacs/files.texi (Reverting):
+	Add tramp-revert-buffer-with-sudo.
+
+	* doc/misc/tramp.texi (Ad-hoc multi-hops): Extend wrt
+	`tramp-*-with-sudo' commands.
+
+	* etc/NEWS: Add tramp-dired-find-file-with-sudo.
+	Fix typos.
+
+	* lisp/bindings.el (ctl-x-x-map):
+	* lisp/dired.el (dired-mode-map): Add "@" binding.  (Bug#76974)
+
+	* lisp/net/tramp-cmds.el (dired-get-file-for-visit): Declare.
+	(with-tramp-file-name-with-method): New macro.
+	(tramp-revert-buffer-with-sudo): Autoload.  Preserve position.
+	Use `with-tramp-file-name-with-method'.
+	(tramp-dired-find-file-with-sudo): New command.
+
+2025-03-14  Yue Yi  <include_yy@qq.com>
+
+	Increase FD_SETSIZE on Windows to support more subprocesses
+
+	Earlier versions of Emacs were limited to at most 32 subprocesses or
+	network connections on Windows due to the 64-object limit imposed by
+	WaitForMultipleObjects.  To overcome this, a simple waiting thread
+	pool is implemented, allowing Emacs to efficiently wait on up to
+	2048 objects.
+
+	Each thread in the pool can wait on up to 63 objects, and a total of
+	32 threads are used, together with the main thread, to expand the
+	waiting capability.  This enables Emacs to support approximately 1024
+	subprocesses, which is comparable to the 'pty' method on GNU/Linux
+	when using the default FD_SETSIZE of 1024.
+
+	To minimize overhead, the threads remain active instead of being
+	frequently created and destroyed, reducing unnecessary system
+	resource consumption.  Idle threads can be terminated after a
+	period of inactivity to free up memory.
+
+	* src/w32.h (FD_SETSIZE): Change from 64 to 2048.
+	* src/w32.c (term_ntproc): Call 'free_wait_pool' to free waiting
+	threads.
+	* src/w32proc.c (WFO_ABANDONED, WFO_TIMEOUT, WFO_FAILED)
+	(WFO_MAX_WAIT): New macros.
+	(wait_objects_context, wait_objects_pool, wait_objects_info):
+	New structures for managing the thread pool.
+	(wait_objects_pool, wait_objects_info): New static variables for
+	managing the thread pool.
+	(wait_objects_thread, start_wait_objects, stop_wait_objects)
+	(end_wait_and_return, shrink_wait_pool, free_wait_pool):
+	New functions for waiting and managing the thread pool.
+	(wait_for_objects, msg_wait_for_objects): New functions as
+	replacements for WaitForMultipleObjects and
+	MsgWaitForMultipleObjects.
+	(wait_pid): Use 'wait_for_objects' and new macros.
+	(sys_select): Make some variables static to avoid stack
+	allocation.  Use 'wait_for_objects', 'msg_wait_for_objects', and
+	the new macros.
+
+2025-03-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a recent change in isearch.el
+
+	* lisp/isearch.el (isearch-yank-x-selection): Ignore errors
+	signaled by 'gui-get-primary-selection', to better emulate what
+	'gui-get-selection' was doing.  In particular,
+	'gui-get-primary-selection' can signal an error on MS-Windows.
+
+2025-03-14  Po Lu  <luangruo@yahoo.com>
+
+	Enable yanking non-Latin-1 primary selections in I-Search
+
+	* lisp/isearch.el (isearch-yank-x-selection): Call
+	`gui-get-primary-selection', which accounts for non-Latin-1
+	encodings.
+
+2025-03-14  Ulrich Müller  <ulm@gentoo.org>
+
+	New configure option --with-systemduserunitdir
+
+	* configure.ac (systemduserunitdir): New variable and option.
+	* Makefile.in (systemduserunitdir): New, set by configure.
+	(install-etc, uninstall): Don't install emacs.service when
+	systemduserunitdir is unspecified.
+	* etc/NEWS: Announce the new configure option.  (Bug#76924)
+
+2025-03-14  Yuan Fu  <casouri@gmail.com>
+
+	Merge from origin/emacs-30
+
+	defc55bb6f9 Fix treesit-parser-create behavior regarding indirect buf...
+	20ac26e6751 ; Fix with-delayed-message docstring metavars.
+	04034cd9ce7 Fix 'dired-movement-style' in Dired when subdirs are shown
+	f8443dffc1f ; * lisp/register.el (register-use-preview): Doc fix (bug...
+	f729828bcfb ; Add texinfo reference to GNU Coding Standards.
+	a6abb88fdcc ; * lisp/files.el (executable-find): Doc fix.
+
+	# Conflicts:
+	#	src/treesit.c
+
+2025-03-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix aborts and text corruption in 'replace-buffer-contents'
+
+	* src/insdel.c (replace_range): Fix a thinko.  Fix commentary.
+	(Bug#76997)
+
+2025-03-13  Juri Linkov  <juri@linkov.net>
+
+	Handle narrowed buffers in treesit-forward-sentence (bug#76679)
+
+	* lisp/treesit.el (treesit-forward-sentence): When no more
+	sentences are found, move to the end of the buffer or to
+	the range boundary at the 'treesit-parser' overlay's end.
+
+2025-03-13  Juri Linkov  <juri@linkov.net>
+
+	Support more embedded ranges in treesit-up-list and treesit-outline-level
+
+	* lisp/treesit.el (treesit-up-list, treesit-outline-level):
+	Add a loop to handle all nested parsers.
+
+2025-03-13  Juri Linkov  <juri@linkov.net>
+
+	* lisp/textmodes/css-mode.el (css-ts-mode--outline-predicate): Improve.
+
+	Set separate value that differs from 'css--treesit-simple-imenu-settings'
+	by adding new node "at_rule".
+
+2025-03-13  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Fix error when trying to recommend setopt
+
+	* lisp/help-fns.el (help--recommend-setopt): Don't assume that
+	variable-documentation stores only strings.  (Bug#76994)
+
+2025-03-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Allow control of indicating empty rectangular selections
+
+	* lisp/rect.el (rectangle-indicate-zero-width-rectangle): New user
+	option.
+	(rectangle--highlight-for-redisplay): Use it to decide whether to
+	indicate empty rectangles on display.  (Bug#16403)
+
+	* etc/NEWS: Announce the feature.
+
+2025-03-13  Matthias Meulien  <orontee@gmail.com>
+
+	Turn 'remember-mode' into a minor mode
+
+	* lisp/textmodes/remember.el (remember-initial-major-mode):
+	Major mode for remember buffer.
+	(remember-data-files-regex): Regular expression to filter files.
+	(remember-append-in-data-directory): Handler to append data to
+	files.
+	(remember-mode): Change to a minor mode.
+	(remember-prefix-map): New.  (Bug#75543)
+
+2025-03-13  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Recognize graphic as a type when customizing a face
+
+	* lisp/cus-edit.el (custom-display): Add checkbox for graphic.
+	(Bug#76975)
+
+2025-03-13  john muhl  <jm@pub.pink>
+
+	Simplify and improve indent rules in 'lua-ts-mode'
+
+	* lisp/progmodes/lua-ts-mode.el (c-ts-common): Require it.
+	(lua-ts-mode): Set 'c-ts-common' variables.
+	(lua-ts--simple-indent-rules): Replace custom indent rules for
+	tables, arguments and parameters with
+	'c-ts-common-baseline-indent-rule'.
+	Improve consistency of indentation for IIFEs and nested functions.
+	(lua-ts--variable-declaration-continuation)
+	(lua-ts--variable-declaration-continuation-anchor): Reformat.
+	(lua-ts--comment-first-sibling-matcher)
+	(lua-ts--first-child-matcher, lua-ts--first-real-sibling-anchor)
+	(lua-ts--function-definition-p, lua-ts--g-g-g-parent)
+	(lua-ts--g-g-parent, lua-ts--nested-function-argument-matcher)
+	(lua-ts--nested-function-block-include-matcher)
+	(lua-ts--nested-function-block-matcher)
+	(lua-ts--nested-function-end-argument-matcher)
+	(lua-ts--nested-function-end-matcher)
+	(lua-ts--nested-function-last-function-matcher)
+	(lua-ts--top-level-function-call-matcher): Remove.
+	* test/lisp/progmodes/lua-ts-mode-resources/indent.erts:
+	Update tests.  (Bug#76986)
+
+2025-03-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix loading follow.el
+
+	* lisp/follow.el (follow-mode-prefix-key): Avoid changing
+	follow-mode-map before it is defined.  (Bug#76977)
+	* test/lisp/follow-tests.el: New file.
+
+2025-03-13  Daniel Mendler  <mail@daniel-mendler.de>
+
+	window-tool-bar: Use `static-if' from Compat 30
+
+	* lisp/window-tool-bar.el (window-tool-bar--static-if): Remove macro.
+	(window-tool-bar--ignored-event-types): Use `static-if' from Compat
+	instead.  (Bug#76858)
+
+2025-03-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp: Don't offer non-existing containers in completion
+
+	* doc/misc/tramp.texi (File name completion):
+	Explain "completion-use-cache" property.
+
+	* lisp/net/tramp-cache.el (tramp-get-method-parameter): Declare.
+	(tramp-get-hash-table): Mark connection properties.
+	(tramp-dump-connection-properties): Remove empty lists.
+	(tramp-parse-connection-properties): Take connection property
+	"completion-use-cache" into account.  (Bug#76950)
+
+	* lisp/net/tramp-container.el (tramp-methods) <docker, dockercp, podman>
+	<podmancp, kubernetes, toolbox, distrobox, flatpak, apptainer, nspawn>:
+	Add `tramp-completion-use-cache' argument.
+
+2025-03-12  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	time-stamp: optimize resource use
+
+	* lisp/time-stamp.el (time-stamp-string-preprocess): Replace
+	n-squared string 'concat' with linear list 'push'.
+
+2025-03-12  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	time-stamp: refactor for readability
+
+	* lisp/time-stamp.el (time-stamp-string-preprocess): Move all of the
+	big 'while' loop to the end of the function, to better expose its
+	structure of iterating over the format string.
+
+2025-03-12  Po Lu  <luangruo@yahoo.com>
+
+	Don't warn about Xft >= 2.3.6
+
+	* configure.ac: Don't warn about Xft >= 2.3.6.  Clarify warning
+	message printed on old releases.
+
+2025-03-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	find-function-mode-lower-precedence: Also remove the global bindings
+
+	* lisp/emacs-lisp/find-func.el (find-function-mode): When
+	find-function-mode-lower-precedence is non-nil, apply the
+	bindings in such a way that we can also remove them when the
+	mode is deactivated.  Approach due to Stefan Monnier.
+
+2025-03-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Merge from origin/emacs-30
+
+	20291046053 Correct some outdated docs for hack-local-variables
+
+2025-03-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Merge from origin/emacs-30
+
+	894b0e3a2fe ; Adapt comment in tramp.el
+	cc87717fa07 Add keyword placeholder to tramp.el
+	7d0d61d8549 Rewrite ERT manual introduction
+	b2f124f2a88 ; cperl-mode.el: Don't misinterpret exec_fcn as keyword exec
+	59d1aac49df Document return values of the various read-* functions
+
+2025-03-12  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix capitalization ELisp -> Elisp
+
+	* configure.ac (libgccjit_not_found_err)
+	(libgccjit_dev_not_found_err):
+	* doc/emacs/buffers.texi (List Buffers):
+	* doc/lispref/elisp.texi (Tree-sitter C API):
+	* doc/lispref/functions.texi (What Is a Function):
+	* doc/lispref/parsing.texi (Parsing Program Source)
+	(Tree-sitter C API):
+	* doc/misc/gnus.texi (The Gnus Registry):
+	* etc/DEBUG:
+	* etc/NEWS:
+	* etc/NEWS.25:
+	* etc/NEWS.26:
+	* etc/NEWS.28:
+	* etc/NEWS.30:
+	* etc/TODO:
+	* lib-src/emacsclient.c (print_help_and_exit):
+	* lisp/auth-source.el (auth-source-search):
+	* lisp/cedet/semantic/bovine/el.el (emacs-lisp-mode):
+	* lisp/cedet/semantic/wisent/comp.el
+	(wisent-automaton-lisp-form):
+	* lisp/cedet/srecode/el.el (srecode-semantic-apply-tag-to-dict):
+	* lisp/editorconfig.el
+	(editorconfig-get-local-variables-functions):
+	* lisp/emacs-lisp/bindat.el (bindat-type):
+	* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand):
+	* lisp/emacs-lisp/cconv.el (cconv-make-interpreted-closure):
+	* lisp/emacs-lisp/cl-macs.el (cl--labels-convert):
+	* lisp/emacs-lisp/lisp-mode.el (lisp-fdefs)
+	(lisp-fill-paragraphs-as-doc-string):
+	* lisp/emacs-lisp/macroexp.el (macroexp--fgrep):
+	* lisp/emacs-lisp/oclosure.el (cconv--interactive-helper):
+	* lisp/emacs-lisp/re-builder.el:
+	* lisp/erc/erc-button.el (erc-emacswiki-lisp-url):
+	* lisp/help-fns.el
+	(help-fns--describe-function-or-command-prompt):
+	* lisp/menu-bar.el (menu-bar-search-documentation-menu):
+	* lisp/net/tramp-message.el (tramp-debug-font-lock-keywords):
+	* lisp/org/org-capture.el (org-capture):
+	* lisp/org/org.el (org-category, org-todo):
+	* lisp/org/ox.el (org-export-async-start):
+	* lisp/progmodes/elisp-mode.el (emacs-lisp-mode):
+	* lisp/progmodes/peg.el (peg-translate-exp):
+	* lisp/progmodes/ruby-ts-mode.el:
+	* lisp/woman.el (woman-mode, woman-parse-numeric-arg):
+	* src/chartab.c (map_char_table_for_charset):
+	* src/fns.c (extract_data_from_object):
+	* src/frame.c (do_switch_frame):
+	* src/keyboard.c (make_lispy_event):
+	* test/lisp/emacs-lisp/cl-macs-tests.el (cl-&key-arguments):
+	* test/lisp/emacs-lisp/shortdoc-tests.el
+	(shortdoc-help-fns-examples-function-test):
+	* test/manual/etags/c-src/emacs/src/keyboard.c
+	(make_lispy_event): Fix capitalization ELisp -> Elisp.
+
+2025-03-12  F. Jason Park  <jp@neverwas.me>
+
+	Add erc-compat adapter for xml-escape-string
+
+	* lisp/erc/erc-compat.el (erc-compat--xml-escape-string): New macro to
+	call `xml-escape-string' sans the NO-ERROR argument on Emacs 27.
+	* lisp/erc/erc-desktop-notifications.el (erc-notifications-notify): Use
+	compat macro.
+
+2025-03-12  F. Jason Park  <jp@neverwas.me>
+
+	Suppress log module when inserting date stamps in ERC
+
+	* lisp/erc/erc-log.el (erc-truncate-buffer-on-save): Use
+	`make-obsolete-variable' because `erc-truncate-buffer-on-save' is an
+	option, not a function.  Already mentioned in etc/ERC-NEWS.
+	(erc-logging-enabled): Return nil if `log' appears in the `erc--skip'
+	msg prop.
+	* lisp/erc/erc-stamp.el (erc-stamp--defer-date-insertion-on-post-modify):
+	Add `log' to `erc--skip' msg prop.  This tells the log module to defer
+	advancing the `erc-last-saved-position' marker until after stamps have
+	been inserted, thus ensuring they're included in logs when
+	`erc-log-write-after-insert' is non-nil.
+	* test/lisp/erc/erc-scenarios-log.el
+	(erc-scenarios-log--save-buffer-in-logs/truncate-on-save): Suppress
+	warning for `erc-truncate-buffer-on-save'.
+	(erc-scenarios-log--write-after-insert): New test.  (Bug#76875)
+
+2025-03-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	lisp/emacs-lisp/track-changes.el: Make GNU ELPA release
+
+2025-03-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Unbreak track-changes in Emacs 24
+
+	* lisp/emacs-lisp/track-changes.el (track-changes--after): Don't use
+	'incf', added in Emacs 31; this :core package supports Emacs 24.
+
+2025-03-11  Stefan Kangas  <stefankangas@gmail.com>
+
+	Automatically document when setopt is needed
+
+	* lisp/help-fns.el (help--recommend-setopt): New function to
+	automatically document the need to use `setopt` to set the values of
+	any defcustoms with a `:set` property.
+	(help-fns-describe-variable-functions): Add above new function to
+	hook.
+
+	* lisp/follow.el (follow-mode-prefix-key):
+	* lisp/minibuffer.el (minibuffer-regexp-prompts):
+	* lisp/register.el (register-use-preview):
+	* lisp/savehist.el (savehist-autosave-interval):
+	* lisp/saveplace.el (save-place-autosave-interval):
+	* lisp/tab-bar.el (tab-bar-define-keys):
+	* lisp/textmodes/text-mode.el (text-mode-ispell-word-completion):
+	Delete now redundant text from docstrings.
+
+2025-03-11  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete XEmacs compatibility kludge from follow.el
+
+	* lisp/follow.el (follow-select-if-end-visible): Remove XEmacs
+	compatibility kludge.
+
+2025-03-11  Stefan Kangas  <stefankangas@gmail.com>
+
+	New user option follow-mode-prefix-key
+
+	* lisp/follow.el (Commentary): Document modern keymap functions.
+	(follow-mode-prefix): Make obsolete in favor of...
+	(follow-mode-prefix-key): ...this new user option.  Allow changing the
+	prefix using `setopt`.
+	(follow-mode-submap): New variable.
+	(follow-mode-map): Define using defvar-keymap.
+
+2025-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(Freplace_buffer_contents): Preserve markers more carefully
+
+	Use `replace_range` rather than `delete+insert`.
+
+	* src/insdel.c (replace_range): Allow NEW to specify a chunk
+	of buffer text.
+	* src/editfns.c (Freplace_buffer_contents): Use it.
+	* test/src/editfns-tests.el (replace-buffer-contents-1): Remove
+	incorrect check which happened to succeed because point was not
+	preserved carefully enough.  Make the replacement text share a bit
+	more content to make the test a bit more strict.
+	(editfns-tests--replace-region): Doesn't fail any more.
+
+2025-03-11  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use defvar-keymap for outline-mode-prefix-map
+
+	* lisp/outline.el (outline-mode-prefix-map): Use defvar-keymap.
+
+2025-03-11  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove variable aliases obsolete since Emacs 23.2
+
+	* lisp/dired.el (dired-advertised-find-file):
+	* lisp/simple.el (advertised-undo):
+	* lisp/wid-edit.el (advertised-widget-backward): Remove variable
+	aliases obsolete since Emacs 23.2.  They are replaced by
+	':advertised-binding' properties.
+	* lisp/arc-mode.el (archive-mode-map):
+	* lisp/dired.el (dired-mode-map):
+	* lisp/obsolete/landmark.el (landmark-mode-map):
+	* lisp/play/decipher.el (decipher-mode-map):
+	* lisp/play/gomoku.el (gomoku-mode-map):
+	* lisp/proced.el (proced-mode-map): Don't bind above removed commands.
+
+2025-03-11  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't recommend legacy keymap functions in documentation
+
+	* doc/emacs/mule.texi (Input Methods):
+	* doc/lispintro/emacs-lisp-intro.texi (Miscellaneous):
+	* doc/lispref/text.texi (Clickable Text):
+	* doc/misc/calc.texi (Defining Functions, Defining Simple Commands)
+	(Customizing Calc):
+	* doc/misc/efaq.texi (Matching parentheses, Modifying pull-down menus)
+	(Deleting menus and menu options, Binding keys to commands)
+	(Invalid prefix characters)
+	(Terminal setup code works after Emacs has begun)
+	(Backspace invokes help, Swapping keys, No Escape key)
+	(Binding combinations of modifiers and function keys)
+	(Replying to the sender of a message):
+	* doc/misc/eudc.texi (Installation, Emacs-only Configuration)
+	(External Configuration):
+	* doc/misc/gnus.texi (Group Parameters, Misc Group Stuff)
+	(Summary Buffer, Generic Marking Commands, RSS)
+	(nnmairix tips and tricks, Oort Gnus):
+	* doc/misc/ido.texi (Customization):
+	* doc/misc/mairix-el.texi (Using):
+	* doc/misc/mh-e.texi (HTML, Miscellaneous Commands and Options)
+	(Folders, Composing):
+	* doc/misc/octave-mode.texi (Running Octave from Within Emacs):
+	* doc/misc/reftex.texi (Citations Outside LaTeX):
+	* doc/misc/remember.texi (Quick Start):
+	* doc/misc/sem-user.texi (Smart Jump):
+	* doc/misc/viper.texi (Key Bindings, Vi Macros):
+	* doc/misc/widget.texi (Defining New Widgets):
+	* doc/misc/woman.texi (Word at point): Recommend 'keymap-set',
+	'keymap-global-set', 'keymap-global-unset', 'keymap-local-set', and
+	'key-translate', instead of their legacy equivalents.  (Bug#55647)
+
+2025-03-11  Michael Heerdegen  <michael_heerdegen@web.de>
+
+	Fix overlay-start and overlay-end gv setters
+
+	This fixes Bug#76730.
+
+	* lisp/emacs-lisp/gv.el (overlay-start, overlay-end):
+	Avoid computing the set value twice.
+
+2025-03-11  Juri Linkov  <juri@linkov.net>
+
+	Adapt treesit-outline-search to the recent improvements (bug#76398)
+
+	* lisp/treesit.el (treesit-closest-parser-boundary):
+	Remove temporary function.
+	(treesit-outline-search): Use 'previous/next-single-char-property-change'
+	with 'treesit-parser' property to find the closest parser boundary.
+	(treesit-outline-level): Get the 'treesit-host-parser' overlay
+	and find the parent parser node with 'treesit-node-at'.
+
+2025-03-11  Thierry Volpiatto  <thievol@posteo.net>
+
+	New user variable `exchange-point-and-mark-highlight-region`
+
+	When set to nil, this modifies `exchange-point-and-mark' so that it doesn't
+	activate mark when it is not already active.
+
+	* etc/NEWS: Introduce new variable
+	exchange-point-and-mark-highlight-region.
+
+	* lisp/simple.el
+	(exchange-point-and-mark-highlight-region): New.
+	(exchange-point-and-mark): Use it.
+
+2025-03-11  Sean Whitton  <spwhitton@spwhitton.name>
+
+	diff-apply-buffer: Operate on region, add prefix argument
+
+	* lisp/vc/diff-mode.el (diff-apply-buffer): Interactively,
+	operate on an active region.  Reverse-apply hunks with a prefix
+	argument, like C-u C-c C-a already does.
+
+2025-03-11  Yuan Fu  <casouri@gmail.com>
+
+	Fix c-ts-common-baseline-indent-rule for lists (bug#76908)
+
+	* lisp/progmodes/c-ts-common.el:
+	(c-ts-common-baseline-indent-rule): Use the first non-comment
+	sibling rather than first sibling.
+
+2025-03-11  Yuan Fu  <casouri@gmail.com>
+
+	Make sure treesit-local-parsers-on works when BEG = END (bug#76398)
+
+	(Unrelated to the topic of the bug, but mentioned in the thread.)
+
+	* lisp/treesit.el (treesit-local-parsers-on): Use overlays-at
+	when BEG = END.
+
+2025-03-11  Yuan Fu  <casouri@gmail.com>
+
+	Handle deleted parser in treesit-explore-mode (bug#76398)
+
+	(Unrelated to the topic of the bug, but mentioned in the
+	thread.)
+
+	* lisp/treesit.el (treesit--explorer-refresh-1): New function.
+	(treesit--explorer-refresh): Handle 'treesit-parser-deleted'
+	error.
+
+2025-03-11  Yuan Fu  <casouri@gmail.com>
+
+	Add overlays for non-local tree-sitter parsers too
+
+	* lisp/treesit.el (treesit-local-parsers-at):
+	(treesit-local-parsers-on): Exclude non-local parsers.
+	(treesit--cleanup-local-range-overlays): Don't delete non-local
+	parsers (because those are managed by the major mode).
+	(treesit--update-ranges-non-local): Apply overlay for each ranges.
+	(treesit--update-ranges-local): Ignore
+	overlays with non-local parsers, and set
+	'treesit-parser-local-p' property to t.
+	(treesit--update-range-1): Additionally pass modified-tick to
+	treesit--update-ranges-non-local.
+	(treesit-major-mode-setup): Don't delete non-local parsers.
+
+2025-03-11  Yuan Fu  <casouri@gmail.com>
+
+	Remove parent-node field from tree-sitter parsers
+
+	* src/treesit.c (make_treesit_parser): Remove field.
+	(Ftreesit_parser_parent_node):
+	(Ftreesit_parser_set_parent_node): Remove
+	* src/treesit.h (Lisp_TS_Parser): Remove field.
+
+2025-03-11  Stefan Kangas  <stefankangas@gmail.com>
+
+	Bump python.el package version to 0.30
+
+	* lisp/progmodes/python.el: Bump package version to 0.30.
+
+2025-03-11  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make python.el compatible with Emacs 29.1
+
+	* lisp/progmodes/python.el (python--treesit-fontify-string): Don't
+	call treesit--compute-font-lock-level unless it is
+	fboundp.  (Bug#76873)
+
+2025-03-11  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in some additional Gnus libraries
+
+	* lisp/gnus/gnus-sum.el (gnus-dead-summary-mode-map):
+	* lisp/gnus/gnus.el (gnus-article-mode-map)
+	(gnus-summary-mode-map, gnus-group-mode-map):
+	* lisp/gnus/mm-decode.el (mm-viewer-completion-map): Prefer
+	defvar-keymap.
+	* lisp/gnus/gnus.el (gnus-suppress-keymap): Declare obsolete.
+
+2025-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/emacs-lisp/track-changes.el: Make GNU ELPA release
+
+2025-03-10  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix setting dedicatedness of WINDOW in 'window--display-buffer' (Bug#76911)
+
+	* lisp/window.el (window--display-buffer): Consult WINDOW's
+	'window-side' parameter in order to find out whether it is a
+	side window (Bug#76911).
+
+2025-03-10  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Fix Package name for cond-star
+
+	* lisp/emacs-lisp/cond-star.el: Fix name.  (Bug#76861)
+
+2025-03-10  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-setup-buffer: Don't set current buffer as parent (bug#59457)
+
+	* lisp/vc/vc-dispatcher.el (vc-setup-buffer): Don't set the
+	current buffer as parent (bug#59457).
+
+2025-03-10  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-setup-buffer: Kill local file-local-variables-alist too
+
+	* lisp/vc/vc-dispatcher.el (vc-setup-buffer): Kill
+	file-local-variables-alist variable, too (bug#44698).
+	* lisp/vc/vc.el (vc-log-internal-common): Don't call
+	kill-all-local-variables here, that's vc-setup-buffer's job.
+
+2025-03-10  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix handling of frame position values
+
+	* src/frame.c (tty_child_pos_param): Handle additional position
+	values.  New SIZE argument.
+	(tty_child_frame_rect): Process size before position.
+	(Fmake_terminal_frame): Do not store calculated size/position
+	values in parameters to avoid that a negative absolute position
+	is later interpreted as position relative to bottom/right edge
+	of parent.
+	(Fmodify_frame_parameters): For tty child frames process size
+	before position values so the latter can take a new size into
+	account.
+	* src/frame.h: Adjust declaration of tty_child_pos_param.
+	* src/gtkutil.c (xg_set_geometry): Handle negative frame
+	position specifications.
+	* src/msdos.c (IT_set_frame_parameters): For tty child frames
+	process size before position parameters.
+	* src/xfns.c (x_window): In the non-GTK toolkit variant leave
+	negative position values unchanged - the toolkit should know how
+	to handle them.  Process child frame position parameters
+	separately.  In the non-toolkit variant process child frame
+	parameters separately.
+
+2025-03-10  Po Lu  <luangruo@yahoo.com>
+
+	Reenable mmap-based dump allocation on wide int configurations
+
+	* src/pdumper.c (VM_SUPPORTED): Don't define to 0 when
+	!USE_LSB_TAG if WIDE_EMACS_INT.
+
+2025-03-10  Po Lu  <luangruo@yahoo.com>
+
+	Fix bug#76805
+
+	* src/xterm.c (x_fast_mouse_position): Clear the mouse_moved
+	flag whether or not mouse motion is reported, to avoid repeated
+	polling for mouse movement.  (bug#76806)
+
+2025-03-10  Po Lu  <luangruo@yahoo.com>
+
+	Don't claim that xftfont is being considered for deletion
+
+	* configure.ac: Don't claim that Xft is being considered for
+	deletion or that recent releases are buggy, or imply that
+	HarfBuzz support is exclusive to Cairo.
+
+2025-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(makefile-dependency-regex): Fix bug#76759
+
+	* lisp/progmodes/make-mode.el (makefile-dependency-regex):
+	Decompose the regexp to be more understandable, and then change
+	it so the target part can't accidentally match a TAB.
+
+	* test/lisp/progmodes/make-mode-tests.el (make-mode-tests--bug17400):
+	New test.
+
+2025-03-09  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Provide better completion for customizing frame parameters
+
+	* lisp/frame.el (frame--special-parameters): New const.
+	(frame--complete-parameter-value): New function.
+	(initial-frame-alist, minibuffer-frame-alist): Use them in
+	:type.  (Bug#39143)
+	* lisp/cus-start.el (default-frame-alist): Use them here as well.
+	* src/frame.c (frame_parms): Add comment to try to keep
+	frame--special-parameters updated.
+
+2025-03-09  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make second arg to defvar-local optional
+
+	This change allows declaring a variable both special
+	and buffer-local like so:
+
+	    (defvar-local foo)
+
+	* lisp/subr.el (defvar-local): Make second argument optional.
+	* test/lisp/subr-tests.el (subr-test-defvar-local): New test.
+	* doc/lispref/variables.texi (Creating Buffer-Local): Document above change.
+	* etc/NEWS:
+
+	* lisp/mb-depth.el (minibuffer-depth-overlay):
+	* lisp/minibuf-eldef.el (minibuf-eldef-initial-input)
+	(minibuf-eldef-initial-buffer-length)
+	(minibuf-eldef-showing-default-in-prompt, minibuf-eldef-overlay):
+	* lisp/misc.el (list-dynamic-libraries--loaded-only-p):
+	* lisp/simple.el (minibuffer-history-isearch-message-overlay): Use
+	above new one-argument form of 'defvar-local'.
+
+2025-03-09  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use lisp-data-mode in recentf-save-file
+
+	* lisp/recentf.el (recentf-save-file-header): Add cookie to use
+	lisp-data-mode in recentf-save-file.
+
+2025-03-09  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use .eld for some relevant cache and data files
+
+	* lisp/bookmark.el (bookmark-default-file):
+	* lisp/net/nsm.el (nsm-settings-file):
+	* lisp/progmodes/project.el (project-list-file):
+	* lisp/saveplace.el (save-place-file): Rename files to have the file
+	suffix ".eld".  This change is backwards-compatible.
+
+2025-03-09  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make locate-user-emacs-file accept a list too
+
+	This can be used to migrate to a new name, while also keeping
+	backwards-compatible support for an old name.
+
+	* lisp/files.el (locate-user-emacs-file): Accept a list as the
+	NEW-NAME argument.
+	* test/lisp/files-tests.el (files-test-locate-user-emacs-file): New
+	test for the above.
+
+2025-03-09  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add test for 'locate-user-emacs-file'
+
+	* test/lisp/files-tests.el
+	(files-test-locate-user-emacs-file): New test.
+
+2025-03-09  Po Lu  <luangruo@yahoo.com>
+
+	Re-port to 32-bit systems without alignment primitives
+
+	* configure.ac (ALIGNOF_INT, ALIGNOF_LONG, ALIGNOF_LONG_LONG):
+	New variables.
+	(emacs_cv_alignas_unavailable): Define if alignas and structure
+	alignment primitives are unavailable.  In such an environment,
+	the MSB tagging scheme must be enabled, as must the GNU malloc.
+
+	* msdos/sed2v2.inp: Adjust correspondingly.
+
+	* src/alloc.c (union emacs_align_type): Remove types which
+	contain flexible array members.  The address of a field
+	subsequent to an aggregate with flexible array members cannot
+	validly be taken.
+	(mark_memory) [!USE_LSB_TAG && !WIDE_EMACS_INT]: Strip type bits
+	before scanning memory.
+
+	* src/emacs.c (main):
+
+	* src/eval.c (Fautoload_do_load):
+
+	* src/fns.c (Frequire): Rename a number of illogically named
+	fields.
+
+	* src/lisp.h (ALIGNOF_EMACS_INT): Define to the natural
+	alignment of EMACS_INT.
+	(IDEAL_GCALIGNMENT): New macro.
+	(USE_LSB_TAG): Disable if no alignment specifiers are available,
+	WIDE_EMACS_INT is undefined, and the natural alignment of
+	EMACS_INT falls short of LSB tagging's requirements.
+	(gflags): Rename illogically named fields and don't define them
+	as bitfields, which runs afoul of certain compiler issues.
+	(will_dump_p, will_bootstrap_p, will_dump_with_pdumper_p)
+	(dumped_with_pdumper_p): Adjust accordingly.
+
+	* src/pdumper.c (VM_SUPPORTED): Define to 0 when !USE_LSB_TAG.
+	It is better to read dump files into the heap by hand than to be
+	supplied with an address that is not representable.
+	(_dump_object_start_pseudovector): Rename to
+	dump_object_start_pseudovector, to avoid encroaching on reserved
+	names.
+	(START_DUMP_PVEC): Adjust correspondingly.
+	(dump_mmap_contiguous_vm): Preserve errno around failure
+	cleanup.
+	(dump_bitset_bit_set_p): Work around certain compiler issues.
+	(pdumper_load) [!USE_LSB_TAG]: Reject dump file allocations
+	that are not representable as Lisp_Objects.
+
+	Tested on i386-unknown-solaris2.10, sparc-sun-solaris2.10.
+
+2025-03-09  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Restore find-function-mode-map (bug#76700)
+
+	* lisp/emacs-lisp/find-func.el
+	(find-function-mode-lower-precedence): New option.
+	(find-function-mode-map): Restore.
+	(find-function-mode): Don't unconditionally bind keys into the
+	global map.  Instead respond to the new user option (bug#76700).
+	* etc/NEWS: Mention the new option in existing entry.
+
+2025-03-09  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Allow changing theme settings without reloading it
+
+	* lisp/custom.el (custom--should-apply-setting): Return non-nil
+	for an enabled theme.  Provide docstring.  This allows for users
+	to reevaluate a custom-theme-set-* function and see the settings
+	applied right away.  (Bug#76685)
+	(custom--inhibit-theme-enable): Adapt docstring.
+
+	* etc/NEWS: Announce the new behavior.
+
+2025-03-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	* admin/notes/jargon: Add AFK and OOO.
+
+2025-03-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	35c7837c661 Fix TAGS regeneration with Universal Ctags
+
+2025-03-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	af8017b23f6 Explicitly document read-string return value
+	cf03c2b6093 Improve docstrings of python.el import management
+	01bcc6961a6 ; Improve doc strings of Speedbar
+	bd9c76ab175 Avoid warnings about 'image-scaling-factor' in builds --w...
+
+2025-03-09  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Fix drawing to the bottom-right corner of terminals
+
+	* src/term.c (tty_write_glyphs_1): Renamed from tty_write_glyphs. Don't
+	check if writing the bottom-right corner.
+	(tty_write_glyphs): New function handling case of writing to the
+	bottom-right corner, and otherwise calling tty_write_glyphs_1.
+
+2025-03-09  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Guard against user saving ediff-meta-diff-buffer
+
+	* lisp/vc/ediff-mult.el (ediff-collect-custom-diffs): If the
+	diff buffer is visiting a file, create a new buffer.  (Bug#3348)
+
+	* test/lisp/vc/ediff-mult-tests.el: New test file.
+
+2025-03-09  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	macOS: Don't constrainFrameRect for child frames
+
+	* src/nsterm.m ([EmacsWindow constrainFrameRect:toScreen:]): Don't do
+	anything for child frames.
+
+2025-03-09  Rudolf Adamkovič  <rudolf@adamkovic.org>
+
+	Make sure Comint minibuffer password prompts end with space
+
+	* lisp/comint.el (comint-watch-for-password-prompt): Add a trailing
+	space character to the minibuffer password prompt, if it does not
+	contain one already, per the minibuffer UI conventions.
+
+	Bug#76604
+
+2025-03-09  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Highlight fill-column-indicator when current line is too long
+
+	* lisp/display-fill-column-indicator.el
+	(display-fill-column-indicator-warning): New user option.
+	(display-fill-column-indicator-warning-face): New face.
+	(display-fill-column-indicator-mode): Add post-command-hook
+	if `display-fill-column-indicator-warning' is ON.  (Bug#76494)
+
+2025-03-09  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Action button when point is just after it
+
+	* lisp/cus-edit.el (Custom-newline): If no button at point,
+	check for a button before point.  (Bug#72341)
+
+2025-03-09  Christoph Badura  <bad@bsd.de>
+
+	VC: New hook to strip CVS template lines when committing
+
+	Add a hook function to strip all lines beginning with "CVS:" from the
+	commit message as CVS does.  Do this only if 'log-edit-vc-backend' is
+	'CVS'.  (Bug#72341)
+
+	* lisp/vc/log-edit.el
+	(log-edit-done-strip-cvs-lines): New command.
+	(log-edit-done-hook): Add it as an option.
+
+	* test/lisp/vc/log-edit-tests.el
+	(log-edit-done-strip-cvs-lines-helper): New function.
+	(log-edit-done-strip-cvs-lines-cvs)
+	(log-edit-done-strip-cvs-lines-non-cvs)
+	(log-edit-done-strip-cvs-lines-only-cvs-colon-blank)
+	(log-edit-done-strip-cvs-lines-only-cvs-colon): New test cases.
+
+	* etc/NEWS: Mention log-edit-done-strip-cvs-lines.
+
+2025-03-09  Po Lu  <luangruo@yahoo.com>
+
+	Avoid reserved names in sfnt.c
+
+	* src/sfnt.c (_MIN, _MAX): Rename to INS_MIN and INS_MAX.
+	(sfnt_interpret_run): Adjust accordingly.
+
+2025-03-08  john muhl  <jm@pub.pink>
+
+	Use TS to support 'hs-minor-mode' in 'lua-ts-mode'
+
+	* lisp/progmodes/lua-ts-mode.el (lua-ts-mode): Add list type to
+	'treesit-thing-settings'.
+	* lisp/progmodes/hideshow.el (hs-special-modes-alist):
+	Remove regular expression based implementation.
+	* test/lisp/progmodes/lua-ts-mode-resources/hide-show.lua: New file.
+	* test/lisp/progmodes/lua-ts-mode-tests.el (lua-ts-test-hideshow):
+	Add test.  (Bug#76693)
+
+2025-03-08  Michael Heerdegen  <michael_heerdegen@web.de>
+
+	Correct (debug body) edebug specs
+
+	This fixes Bug#69865.
+
+	* lisp/org/ob-exp.el (org-babel-exp--at-source):
+	* test/lisp/dired-tests.el (dired-test-with-temp-dirs):
+	* test/lisp/emacs-lisp/package-tests.el (with-fake-help-buffer):
+	Fix broken edebug specs (debug body) -> (debug (body)).
+
+2025-03-08  Kévin Le Gouguec  <kevin.legouguec@gmail.com>
+
+	Prevent button.el from clearing help-echo strings
+
+	In order to fix one of the issues discussed in bug#61413, i.e.
+	'buttonize' clobbering the help-echo property set by
+	'icon-string'.
+
+	This is a reasonable interpretation of the button.el
+	docstrings - "if HELP-ECHO, use that as the `help-echo'
+	property"; conversely, if not HELP-ECHO, then do not do
+	anything, preserving existing values for that property.
+
+	* lisp/button.el (button--properties): Only add a help-echo
+	property if HELP-ECHO is non-nil.  Add an additional property
+	for bookkeeping.
+	(unbuttonize-region): Check for that bookkeeping property
+	before clearing help-echo.
+	* test/lisp/button-tests.el (button--preserve-help-echo):
+	Validate these changes.
+
+2025-03-08  Daniel Colascione  <dancol@dancol.org>
+
+	Make windmove repetition more robust
+
+	Munge this-command when we hit a movement barrier so we override only on
+	the very next command instead of at the end of a sequence of movement
+	commands that didn't encounter a barrier.
+
+	* (windmove-do-window-select): Use last-command to remember that we hit
+	a barrier.
+
+2025-03-08  Daniel Colascione  <dancol@dancol.org>
+
+	Fix documentation for windmove commands
+
+	* lisp/windmove.el (windmove-left, windmove-up, windmove-right)
+	(windmove-down): Mention correct variable names and align descriptions.
+
+2025-03-08  Po Lu  <luangruo@yahoo.com>
+
+	Don't lose drag-and-drop data intended for XTerm-like programs
+
+	* src/xselect.c (x_own_selection): If special values exist for
+	drag-and-drop to unsupported programs, retain them till the
+	selection is cleared.
+
+2025-03-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix crash in daemon when "C-x C-c" while a client frame shows tooltip
+
+	* src/frame.c (delete_frame): Ignore tooltip frames when looking
+	for other frames on the same terminal.  (Bug#76842)
+
+2025-03-08  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-log-internal-common: Kill all local variables
+
+	* lisp/vc/vc.el (vc-log-internal-common): Kill all local
+	variables, even permanent-local ones (bug#44698).
+
+2025-03-08  Daniel Colascione  <dancol@dancol.org>
+
+	Let repeated windmove override motion restrictions interactively
+
+	* lisp/windmove.el (windmove-allow-all-windows): document feature
+	(windmove-allow-repeated-command-override): new option
+	(windmove-do-window-select, windmove-left, windmove-up, windmove-right)
+	(windmove-down): pass interactive
+	* etc/NEWS: mention feature
+
+2025-03-08  Daniel Colascione  <dancol@dancol.org>
+
+	Add static-when, static-unless like static-if
+
+	* lisp/subr.el (static-when, static-unless): define
+	* doc/lispref/control.texi (Conditional Compilation): document
+	* etc/NEWS: mention
+
+2025-03-08  João Távora  <joaotavora@gmail.com>
+
+	Eglot: the margin code action indicator is interactive
+
+	* doc/misc/eglot.texi (Customization Variables): Fix.
+
+2025-03-08  João Távora  <joaotavora@gmail.com>
+
+	Revert "Eglot: tests must work on 26.3"
+
+	This reverts commit 331492a148588991af5ce9a24a2020b3d380e03f.
+
+	My bad: gensym wasn't the problem, it's available from 26.1.  Incf
+	was the problem, in the main program file.
+
+	* test/lisp/progmodes/eglot-tests.el (eglot--with-timeout): Back to gensym
+
+2025-03-08  João Távora  <joaotavora@gmail.com>
+
+	Eglot: unbreak from Emacs 26.3 (two-arg setq-local)
+
+	* lisp/progmodes/eglot.el (eglot--hierarchy-1): Use two-arg setq-local
+
+2025-03-08  João Távora  <joaotavora@gmail.com>
+
+	Eglot: tests must work on 26.3
+
+	;; IMPORTANT: Since Eglot is a :core ELPA package, these tests are
+	;; supposed to run on Emacsen down to 26.3.  Do not use bleeding-edge
+	;; functionality not compatible with that Emacs version.
+
+	* test/lisp/progmodes/eglot-tests.el (eglot--call-with-timeout):
+	Back to cl-gensym.
+
+2025-03-08  Stefan Kangas  <stefankangas@gmail.com>
+
+	Expand word list in admin/notes/jargon
+
+	* admin/notes/jargon: Add some more acronyms, remove some rare ones,
+	add section headers "Acronyms" and "Glossary", add entries under
+	"Glossary", sort, fix formatting, realign.
+
+2025-03-08  Stefan Kangas  <stefankangas@gmail.com>
+
+	Support :maintainers in plural in <foo>-pkg.el
+
+	For some reason, MELPA emits the keyword :maintainers, despite it
+	being unsupported and thus leads to the "Maintainer" field being empty
+	in all released Emacs versions.  That said, it seems like a good idea
+	to support the plural form, to be consistent with :authors.
+
+	* lisp/emacs-lisp/package.el (describe-package-1): Support
+	:maintainers in plural, in addition to :maintainer, to be consistent
+	with :authors.
+
+2025-03-08  Daniel Colascione  <dancol@dancol.org>
+
+	Stop term-erase-in-line disturbing markers
+
+	* lisp/term.el (term-erase-in-line): do nothing if there's nothing to
+	do; insert new newlines before deleting old ones.
+
+2025-03-07  dimagid  <dimagidve@gmail.com>
+
+	Add admin/notes/jargon used in emacs-devel
+
+	* admin/notes/jargon: New file.
+	Ref: https://lists.gnu.org/r/emacs-devel/2025-02/msg00950.html
+
+2025-03-07  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Fix tty underline capability check (bug#75024)
+
+	* src/dispextern.h (TTY_CAP_UNDERLINE_STYLED): Fix. Also make this an
+	enum.
+
+2025-03-07  Daniel Colascione  <dancol@dancol.org>
+
+	Revert "Stop moving markers during erase-in-line"
+
+	This reverts commit 6f19715937bbeaec5fb80ee9dad0d14b7712a989.
+
+2025-03-07  Daniel Colascione  <dancol@dancol.org>
+
+	Stop moving markers during erase-in-line
+
+	We shouldn't move a line marker just because we cleared a line next to
+	it.  clear-in-line is defined not to affect line structure.
+
+	* lisp/term.el (term-erase-in-line): use insert-before-markers
+
+2025-03-07  Daniel Colascione  <dancol@dancol.org>
+
+	Make erase-in-line conform to ANSI spec in term
+
+	When handling \e[<N>K escape sequences, we're supposed to erase both to
+	the left _and_ to the right of the cursor when N is two.
+
+	* lisp/term.el (term-erase-in-line): make condition check more correct
+
+2025-03-07  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add type check to package-upgrade
+
+	* lisp/emacs-lisp/package.el (package-upgrade): Add type check.
+
+2025-03-07  Basil L. Contovounesios  <basil@contovou.net>
+
+	Clean up ert-font-lock error messages
+
+	* lisp/emacs-lisp/ert-font-lock.el: Remove redundant requires.
+	(ert-font-lock--parse-macro-args): First return value 'doc' being
+	nil already indicates omission of a docstring, so remove redundant
+	second return value doc-p.  All users updated.  Fix error
+	messages (bug#76372).
+	(ert-font-lock--check-faces): Simplify with ensure-list.
+
+2025-03-07  Tomas Nordin  <tomasn@posteo.net>
+
+	view-search: Start search from beginning or end of line
+
+	* lisp/view.el (view-search): Go to beginning-of-line or end-of-line
+	instead of previous or next line before the search.  (Bug#76167)
+
+2025-03-07  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix using log-edit-mode with git-commit-mode
+
+	* lisp/vc/log-edit.el (log-edit-font-lock-keywords): Avoid incorrect
+	fontification when used with the third-party git-commit-mode (part of
+	Magit).
+
+2025-03-07  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use substitute-command-keys in gnus-score-insert-help
+
+	* lisp/gnus/gnus-score.el (gnus-score-insert-help): Use
+	substitute-command-keys.  Clean up the code a bit.
+
+2025-03-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(python-base-mode-map): Use it!
+
+	Rather than use `copy-keymap` between `python-mode-map` and
+	`python-ts-mode-map`, move the shared bindings to `python-base-mode-map`.
+
+	* lisp/progmodes/python.el (python-base-mode-map): Define it explicitly.
+	Move all the bindings of `python-mode-map` to it.
+	(python-mode-map, python-ts-mode-map): Inherit from it.
+
+2025-03-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* src/eval.c (signal_or_quit): Reduce scope of `debugger_called`
+
+2025-03-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(debug--early): Avoid re-entering the debugger for the same error
+
+	Fixes bug#76787.
+
+	* lisp/emacs-lisp/debug.el (debugger--last-error): Move ...
+	* lisp/emacs-lisp/debug-early.el (debugger--last-error): ... here.
+	(debug--early): Use it.
+
+2025-03-06  Philip Kaludercic  <philipk@posteo.net>
+
+	Prepare cond-start for addition to GNU ELPA
+
+2025-03-06  shipmints  <shipmints@gmail.com>
+
+	mouse-face properties on tab-bar tab captions (bug#76394)
+
+	* etc/NEWS: Announce 'tab-bar' 'mouse-face' support.
+
+	* src/xdisp.c (note_tab_bar_highlight): Handle mouse-face property.
+
+	* lisp/tab-bar.el
+	(tab-bar-tab-highlight): New face.
+	(tab-bar-tab-name-format-mouse-face): New function adds the 'mouse-face'
+	'tab-bar-tab-highlight' to the tab name.
+	(tab-bar-tab-name-format-functions): Add
+	'tab-bar-tab-name-format-mouse-face'.
+
+2025-03-06  Juri Linkov  <juri@linkov.net>
+
+	Improve treesit settings for js/typescript/ruby-ts-mode (bug#73404)
+
+	* lisp/progmodes/js.el (js--treesit-list-nodes):
+	* lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode--list-nodes):
+	Replace leaf "string" with "template_string" and "template_substitution"
+	that can contain more nodes.
+
+	* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
+	Add the 'sentence' thing to treesit-thing-settings.
+
+2025-03-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(debug): Don't `kill-emacs` upon exit when in batch mode
+
+	AFAICT this is a left over code from many years ago before
+	the `debug` special case was added to `condition-case` and
+	at a time where exiting from `debug` did not proceed to handle
+	remaining handlers.
+
+	In the usual case where we indeed want to kill Emacs,
+	`signal_or_quit` does it for us.
+
+	* lisp/emacs-lisp/debug.el (debug): Don't `kill-emacs` upon exit
+	when in batch mode (bug#76786)
+
+2025-03-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(replace_range): Delete argument `markers`
+
+	* src/lisp.h (replace_range):
+	* src/insdel.c (replace_range): Delete argument `markers`, always true.
+	* src/editfns.c (Ftranslate_region_internal):
+	* src/cmds.c (internal_self_insert):
+	* src/search.c (Freplace_match): Adjust callers accordingly.
+
+2025-03-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix images on the mode line under 'mode-line-compact'
+
+	* src/xdisp.c (display_mode_line): When 'mode-line-compact'
+	is in effect, don't remove spaces that have a 'display'
+	property on them.  (Bug#76761)
+
+2025-03-06  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>
+
+	Avoid defining unneeded variables on Cygw32
+
+	lisp/term/w32-win.el contained definitions of variables which
+	were not used on Cygw32.  It is now to split into two files,
+	common part and Windows native build specific part. The latter
+	is a new file, lisp/term/w32-nt.el.
+	* src/image.c (Qlibpng_version, Qlibgif_version)
+	(Qlibjpeg_version): Don't define on Cygw32 build.
+	* src/treesit.c (Qtree_sitter__library_abi): Ditto.
+
+	* lisp/term/w32-win.el (dynamic-library-alist, libpng-version)
+	(libgif-version, libjpeg-version, libgnutls-version)
+	(tree-sitter--library-abi, gui-backend-set-selection)
+	(gui-backend-get-selection, gui-backend-selection-owner-p)
+	(gui-selection-exists-p): Moved to lisp/term/w32-nt.el.
+	* lisp/term/w32-nt.el: New file, separated Windows native build
+	specific part from lisp/term/w32-win.el.
+	* lisp/loadup.el: Load term/w32-nt.el on Windows native build.
+	(Bug#75926)
+
+2025-03-06  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	9065423e709 ; Improve documentation of 2 symbol-related functions
+
+2025-03-06  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	93ac2cb742f Fix some widgets in customize-dirlocals
+	42a4c847e28 Fix register-use-preview behavior with never value
+
+2025-03-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix etags tests due to Copyright years update
+
+	* test/manual/etags/CTAGS.good
+	* test/manual/etags/CTAGS.good_crlf
+	* test/manual/etags/CTAGS.good_update
+	* test/manual/etags/ETAGS.good_1
+	* test/manual/etags/ETAGS.good_2
+	* test/manual/etags/ETAGS.good_3
+	* test/manual/etags/ETAGS.good_4
+	* test/manual/etags/ETAGS.good_5
+	* test/manual/etags/ETAGS.good_6
+	* test/manual/etags/ETAGS.good_7: Update.  (Bug#76744)
+
+2025-03-06  shipmints  <shipmints@gmail.com>
+
+	Add shell-mode bookmark support for local and remote shells (bug#65039)
+
+	* doc/emacs/misc.texi (Shell): Add "Shell Bookmarks" menu item.
+	(Shell Mode): Fix typo.
+	(Shell Bookmarks): New node.
+
+	* etc/NEWS: Announce shell-mode bookmark capability.
+
+	* lisp/bookmark.el:
+	(bookmark-insert): Refuse to insert bookmarks whose handlers have the
+	property 'bookmark-inhibit eq 'insert.
+
+	* lisp/shell.el
+	(shell-mode): Set bookmark-make-record-function.
+	(shell-bookmark-name-function): New defcustom.
+	(shell-bookmark-name-from-default-directory): New defun.
+	(shell-bookmark-name-from-buffer-name): New defun.
+	(shell-bookmark-defaults-function): New defvar.
+	(shell-bookmark-defaults): New defun.
+	(shell-bookmark-make-record): New defun.
+	(shell-bookmark-jump-non-essential): New defvar.
+	(shell-bookmark-jump): New defun with properties: 'bookmark-handler-type
+	"Shell", 'bookmark-inhibit 'insert.
+
+2025-03-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix redisplay of tab bar when its text properties change
+
+	* src/xdisp.c (update_tab_bar): Use 'equal-including-properties'
+	to compare previous with the current tab-bar items.  (Bug#76760)
+
+2025-03-06  Visuwesh  <visuweshm@gmail.com>
+
+	Add new user option to exclude projects from being remembered
+
+	* lisp/progmodes/project.el (project-list-exclude): Add new user
+	option to exclude projects from being remembered.
+	(project-remember-project): Consider the user option above.
+	(project-switch-project): Use 'project-remember-project' instead.
+	* doc/emacs/maintaining.texi (Managing Projects): Mention the new user option.
+	* etc/NEWS: Announce the change.  (Bug#76587)
+
+2025-03-05  Stefan Kangas  <stefankangas@gmail.com>
+
+	Rewrite cl--parsing-keywords using backtick
+
+	* lisp/emacs-lisp/cl-seq.el (cl--parsing-keywords): Rewrite using
+	backtick.
+
+2025-03-05  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove more redundant 'cl-' prefixes
+
+	* lisp/emacs-lisp/cl-seq.el (cl-substitute-if, cl-substitute-if-not)
+	(cl-count, cl-sort): Remove more redundant 'cl-' prefixes from
+	arguments and let-bound variables.
+
+2025-03-05  Stefan Kangas  <stefankangas@gmail.com>
+
+	New user option checkdoc-arguments-missing-flag
+
+	* lisp/emacs-lisp/checkdoc.el
+	(checkdoc-arguments-missing-flag): New user option.
+	(checkdoc-this-string-valid-engine): Use above new option.
+	(checkdoc--argument-missing-flag): Make into obsolete variable alias for
+	above new option.
+
+2025-03-05  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add more tests for cl-seq.el
+
+	* test/lisp/emacs-lisp/cl-seq-tests.el (cl--oddp-safe)
+	(cl-subst-if-test, cl-subst-if-not-test, cl-nsubst-test)
+	(cl-nsubst-if-test, cl-nsubst-if-not-test, cl-sublis-test)
+	(cl-nsublis-test, cl-tree-equal-test): New tests.
+
+2025-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(pp-fill): Fix bug#76715
+
+	* lisp/emacs-lisp/pp.el (pp-fill): Don't break before `.` within symbols.
+	* test/lisp/emacs-lisp/pp-tests.el (pp-tests--bug76715): New test.
+
+2025-03-05  Juri Linkov  <juri@linkov.net>
+
+	Improve treesit settings for java-ts-mode (bug#73404, bug#76493)
+
+	* lisp/progmodes/java-ts-mode.el (java-ts-mode):
+	Add the 'list' thing to 'treesit-thing-settings'.
+	Set 'treesit-outline-predicate'.
+
+2025-03-05  Juri Linkov  <juri@linkov.net>
+
+	Improve treesit settings for typescript/tsx-ts-mode (bug#73404)
+
+	* lisp/progmodes/typescript-ts-mode.el
+	(typescript-ts-mode--font-lock-settings): Add @font-lock-type-face
+	for 'internal_module' with 'identifier'.
+	(typescript-ts-mode--defun-type-regexp): New variable with
+	"internal_module" and "interface_declaration".
+	(typescript-ts-mode--defun-name): New function that uses
+	'js--treesit-defun-name' and adds "internal_module" and
+	"interface_declaration".
+	(typescript-ts-mode--simple-imenu-settings): New variable
+	like in 'js-ts-mode' with "Namespace" and "Interface" sections.
+	(typescript-ts-mode--outline-predicate): New variable.
+	(typescript-ts-base-mode): Set treesit-defun-type-regexp to
+	typescript-ts-mode--defun-type-regexp, treesit-defun-name-function
+	to typescript-ts-mode--defun-name, treesit-simple-imenu-settings
+	to typescript-ts-mode--simple-imenu-settings,
+	treesit-outline-predicate to typescript-ts-mode--outline-predicate.
+	Use js--regexp-opt-symbol for treesit-thing-settings.
+	(tsx-ts-mode): For 'sentence' thing use the same nodes as
+	js--treesit-sentence-nodes.  Use js--regexp-opt-symbol for
+	treesit-thing-settings.
+
+	* lisp/progmodes/js.el (js--treesit-sentence-nodes): Add
+	"jsx_opening_element" and "jsx_closing_element" like in html.
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode--outline-predicate): Add
+	outline headings for C++ "namespace_definition" and "class_specifier".
+
+2025-03-05  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	121371a7064 Move java/incrementing-version-code to AndroidManifest.xm...
+	8099dc6e3ae Provide an Android version code derived from the Emacs ve...
+	59fcb2aa1b2 ; * lisp/register.el (register-use-preview): Doc fix (bug...
+	0383937a701 ; Improve documentation of 'shortdoc'
+
+2025-03-05  Po Lu  <luangruo@yahoo.com>
+
+	Permit executing programs with >1024 args on Android
+
+	* src/android.c (MAXARGS): Delete enumerator.
+	(android_rewrite_spawn_argv): Don't mandate a maximum number of
+	arguments.
+
+2025-03-05  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make byte-compile-cond-use-jump-table obsolete
+
+	This user option was introduced in 2017, with the rationale:
+
+	    "This is a workaround for when `byte-compile-cond-jump-table'
+	    accidentally generates wrong code (hasn't happened so far in my
+	    tests), and should be removed once we're sure there are no issues
+	    with it."  https://lists.gnu.org/r/emacs-devel/2017-02/msg00223.html
+
+	There hasn't been any bugs in this area within the last 6 years, and the
+	few we did see before that were quickly resolved.  Let's declare this
+	variable obsolete now, while keeping its behavior when set to nil.  We
+	can always revert the obsoletion if it turns out to be needed after all.
+
+	* lisp/emacs-lisp/bytecomp.el
+	(byte-compile-cond-use-jump-table): Declare obsolete.
+
+2025-03-05  Stefan Kangas  <stefankangas@gmail.com>
+
+	Clean up 'cl-' prefixes for local variables
+
+	The 'cl-' prefixes used for let-bound variables and argument names is a
+	holdover from the dynbind days.  They are no longer necessary, and make
+	the code hard to read.  This was partially cleaned up in the past; let's
+	finish the job now.
+
+	* lisp/emacs-lisp/cl-extra.el (cl--mapcar-many, cl-map, cl-maplist)
+	(cl-mapc, cl-mapl, cl-mapcan, cl-mapcon, cl-some, cl-every, cl-notany)
+	(cl-notevery, cl--map-keymap-recursively, cl--map-intervals)
+	(cl--map-overlays):
+	* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst)
+	(cl--do-subst):
+	* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause):
+	* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-fill, cl-replace, cl-remove)
+	(cl-remove-if, cl-remove-if-not, cl-delete, cl-delete-if)
+	(cl-delete-if-not, cl-remove-duplicates, cl-delete-duplicates)
+	(cl--delete-duplicates, cl-substitute, cl-substitute-if)
+	(cl-substitute-if-not, cl-nsubstitute, cl-nsubstitute-if)
+	(cl-nsubstitute-if-not, cl-find, cl-find-if, cl-find-if-not)
+	(cl-position, cl--position, cl-position-if, cl-position-if-not)
+	(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
+	(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
+	(cl-member-if-not, cl--adjoin, cl-assoc, cl-assoc-if, cl-assoc-if-not)
+	(cl-rassoc, cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion)
+	(cl-intersection, cl-nintersection, cl-set-difference)
+	(cl-nset-difference, cl-set-exclusive-or, cl-nset-exclusive-or)
+	(cl-subsetp, cl-subst-if, cl-subst-if-not, cl-nsubst, cl-nsubst-if)
+	(cl-nsubst-if-not, cl-sublis, cl--sublis-rec, cl-nsublis)
+	(cl--nsublis-rec, cl-tree-equal, cl--tree-equal-rec): Clean up 'cl-'
+	prefixes for let-bound variables and arguments.
+
+2025-03-04  Stefan Kangas  <stefankangas@gmail.com>
+
+	Avoid rare warning when byte-compiling cl-loaddefs.el
+
+	* lisp/emacs-lisp/cl-extra.el: Add autoloaded declare-function to avoid
+	rare byte-compilation warning.
+	Problem reported by Eli Zaretskii <eliz@gnu.org>.
+
+2025-03-04  Philipp Stephani  <p.stephani2@gmail.com>
+
+	Make Emacs buildable with -std=c11.
+
+	With -std=c11, GCC doesn't recognize 'asm' as a keyword, see
+	https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html and
+	https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html.  Use __asm__
+	instead.
+
+	* src/lisp.h (flush_stack_call_func): Use __asm__ instead of asm.
+
+2025-03-04  Daniel Colascione  <dancol@dancol.org>
+
+	Add ns-click-through option to control activation click handling
+
+	* src/nsterm.m (acceptsFirstMouse):
+	Use ns_click_through variable instead of always returning YES.
+	(syms_of_nsterm): Define ns-click-through variable.
+
+	* lisp/cus-start.el: Add customization definition for ns-click-through.
+
+	* etc/NEWS: Document the new option.
+
+2025-03-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'etc/DOC' for a few functions/variables
+
+	* src/term.c (Ftty_frame_at):
+	* src/menu.c (syms_of_menu) <x-popup-menu-function>:
+	* src/dispnew.c (Fredisplay): Fix "doc:".  The extra blank was
+	preventing 'make-docfile' from recognizing the functions and
+	variables and extracting their documentation to 'etc/DOC'.
+	(Bug#76722)
+
+2025-03-04  Ben Simms  <ben@bensimms.moe>
+
+	Support colored stipples on Cocoa NS (Bug#73384)
+
+	On Cocoa builds of NS Emacs, stipples are now rendered
+	using masked CGImages instead of patterned NSColors so that
+	stipples now render with color.
+	* src/nsimage.m ([EmacsImage stippleMask:]): Use a CGImageMask to
+	store the stipple mask when building for Cocoa.
+	* src/nsterm.m (ns_maybe_dumpglyphs_background): Perform a masked
+	fill to draw stipples when building for Cocoa.
+	(ns_draw_stretch_glyph_string): Perform a masked fill to draw
+	stipples when building for Cocoa.
+
+2025-03-04  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	1b80bc67aad ; * doc/emacs/android.texi (Android Software): Minor mark...
+	dcfbf7d1863 ; * etc/PROBLEMS: Document the same problem here.
+	b09bbf22afd Document requirements respecting XDG MIME databases on An...
+	365a91622e0 ; (completion-preview--try-table): Propagate extra proper...
+
+	# Conflicts:
+	#	lisp/completion-preview.el
+
+2025-03-04  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	7dcf9b71e6f ; Don't document package-x.el
+	a5fd518d524 ; Document spurious warnings on macOS 15
+	625ed68aeaa Fix the use of xref-window-local-history together with Xr...
+	80917727676 completing-read-multiple: Fix support for ":" as separator
+	38cc36a3753 ; Improve docstring of cl-check-type
+
+2025-03-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Revert “Avoid some union buffered_input_event uses”
+
+	Revert my commit 29a9fd4f4ba17822eca0f00c2037da3868bd874e
+	and the following commit 1ec0889e7b786d79351cee3ed4964d82295f059f.
+	This fixes a bug where ‘emacs -nw’ would sometimes freeze when Emacs is
+	configured with ‘--with-pgtk --enable-link-time-optimization
+	--disable-gc-mark-trace’ on GNU/Linux x86-64 (Bug#76729).
+	As it is not yet clear whether this freeze is due to an Emacs bug that
+	I introduced, or due to GCC bug 117423
+	<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117423>,
+	play it safe for now and revert to the previous state.
+
+2025-03-04  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix unwanted revert file prompt after repeated vc-ediff (bug#11605)
+
+	* lisp/vc/ediff-vers.el (vc-find-revision-no-save): Declare.
+	(ediff-vc-internal, ediff-vc-merge-internal): Bind
+	vc-find-revision-no-save instead of calling
+	ediff-delete-version-file (bug#11605).
+	(ediff-delete-version-file): Delete.
+
+2025-03-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(advice--make-nadvice-docstring): Rename
+
+	* lisp/emacs-lisp/nadvice.el (advice--make-nadvice-docstring): Rename
+	from `nadvice--make-docstring`, to stick to the `advice-` namespace.
+	Update all callers.
+
+2025-03-04  Stefan Kangas  <stefankangas@gmail.com>
+
+	Update Makefile and docs for new Spanish refcards
+
+	* etc/refcards/Makefile (PDF_SPANISH, PS_SPANISH): New variables.
+	(PDF_TARGETS): Use above new variables.
+	(spanish, spanish-ps): New targets for Spanish translation.  (Bug#76300)
+	* admin/release-process:
+	* etc/refcards/README: Document new Spanish translation.
+
+2025-03-04  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Add Spanish translation for survival.tex
+
+	* etc/refcards/es-survival.tex: New file.  (Bug#76300)
+
+2025-03-04  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Add Spanish translation for refcard.tex
+
+	* etc/refcards/es-refcard.tex: New file.  (Bug#76300)
+
+2025-03-04  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Add Spanish translation for dired-ref.tex
+
+	* etc/refcards/es-dired-ref.tex: New file.  (Bug#76300)
+
+2025-03-04  Po Lu  <luangruo@yahoo.com>
+
+	Render Android hourglass cursor mechanics more consistent with X
+
+	* src/androidterm.c (android_show_hourglass): Always define the
+	hourglass cursor, but...
+	(android_hide_hourglass): ... restore the invisible cursor
+	subsequently, if need be.
+	(android_toggle_visible_pointer): Do not hide the current cursor
+	if it is an hourglass.
+
+2025-03-04  Po Lu  <luangruo@yahoo.com>
+
+	Circumvent another styling issue in Android 15 QPR1
+
+	* java/org/gnu/emacs/EmacsView.java (popupMenu): On Android 15
+	and later, reload the default theme before displaying popup
+	menus.
+
+2025-03-04  Matthew Bauer  <mjbauer95@gmail.com>
+
+	Replace anonymous lambda timers with named functions
+
+	* lisp/emacs-lisp/eldoc.el (eldoc--update, eldoc-schedule-timer):
+	* lisp/jit-lock.el (jit-lock-context--update)
+	(jit-lock--antiblink-update): New functions broken out from...
+	* lisp/emacs-lisp/eldoc.el (eldoc-schedule-timer):
+	* lisp/jit-lock.el (jit-lock-mode, jit-lock--antiblink-post-command):
+	...here.  Use them as values for timers, to give them readable names
+	in 'M-x list-timers'.  (Bug#71354)
+
+2025-03-04  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't accept strings in package-(install|upgrade)
+
+	* lisp/emacs-lisp/package.el (package-install): Revert recent change to
+	accept string PKG argument.
+	(package-upgrade): No longer accept string NAME argument.  (Bug#72160)
+
+2025-03-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid crashes on MS-Windows on repeated client connections
+
+	* src/w32uniscribe.c (uniscribe_close): Zero out dwrite cache.
+	Suggested by Richard Copley <rcopley@gmail.com>.  (Bug#76121)
+
+2025-03-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix MS-Windows build broken by buffered_input_event changes
+
+	* src/keyboard.c (kbd_buffer_store_selection_event_hold):
+	* src/keyboard.h (kbd_buffer_store_selection_event_hold): Declare
+	and define only for (HAVE_X11 || HAVE_PGTK).
+
+2025-03-03  Juri Linkov  <juri@linkov.net>
+
+	Improve treesit settings for js-ts-mode (bug#73404)
+
+	* lisp/progmodes/js.el (js--treesit-font-lock-settings):
+	Add 'class' alongside 'class_declaration'.
+	(js--treesit-defun-name): Add "variable_declaration"
+	alongside "lexical_declaration".
+	(js--treesit-valid-imenu-entry): Add "variable_declaration"
+	and provide the predicate to 'treesit-node-top-level'.
+	(js--treesit-sentence-nodes): Add "jsx_attribute" like in html-ts-mode
+	instead of jsx elements matched in 'js--treesit-list-nodes'.
+	(js--treesit-list-nodes): Add "jsx_element" and "jsx_self_closing_element"
+	instead of "_jsx_string".
+	(js--treesit-simple-imenu-settings): Move "method_definition" to separate
+	section "Method" from the "Class" section.  Add "variable_declaration"
+	to the "Variable" section.
+	(js-ts-mode--outline-predicate): New variable.
+	(js--treesit-defun-type-regexp): Add bos/eos.
+	(js--treesit-jsdoc-comment-regexp): Add bos/eos.
+	(js-ts-mode): Set treesit-outline-predicate to
+	'js-ts-mode--outline-predicate'.
+
+	* lisp/textmodes/mhtml-ts-mode.el (mhtml-ts-mode--html-defun-name):
+	Remove unused function.
+	(mhtml-ts-mode): Use 'js-ts-mode--outline-predicate' in
+	'treesit-aggregated-outline-predicate'.
+
+	* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode--outline-predicate):
+	Use 'treesit-node-top-level' instead of 'treesit-parent-until'.
+
+2025-03-03  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix fontification outside hunks in Git patches
+
+	* lisp/vc/diff-mode.el (diff-font-lock-keywords): Don't fontify lines in
+	Git patches starting with + or - as added/removed, if they are either
+	before the first hunk, or in the email signature.  (Bug#75884)
+	(diff-buffer-type): Move definition up.
+	(diff--indicator-added-re, diff--indicator-removed-re): New variables.
+	(diff--git-preamble-end, diff--git-footer-start)
+	(diff--indicator-matcher-helper, diff--indicator-added-matcher)
+	(diff--indicator-removed-matcher): New functions.
+	* test/lisp/vc/diff-mode-tests.el (diff-mode-test-git-patch)
+	(diff-mode-test-git-patch/before-first-hunk)
+	(diff-mode-test-git-patch/signature): New tests.
+	* test/lisp/vc/diff-mode-resources/git.patch: New file.
+
+2025-03-03  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve argument type error in load-theme
+
+	* lisp/custom.el (load-theme): Improve error message when passing in a
+	non-symbol THEME argument.
+
+2025-03-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Avoid some union buffered_input_event uses
+
+	Simplify by using separate local vars for struct input_event and
+	struct selection_input_event, rather than a single local var that
+	is the union of the two.  This makes the code easier to follow by
+	the human reader, and should help avoid GCC bug 117423
+	<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117423> and
+	therefore work around Emacs bug 76559 <https://bugs.gnu.org/76559>.
+	* src/androidterm.c (handle_one_android_event):
+	* src/gtkutil.c (xg_widget_key_press_event_cb):
+	* src/pgtkterm.c (evq_flush):
+	* src/xterm.c (handle_one_xevent): Use struct input_event and
+	kbd_buffer_store_event_hold, or struct selection_input_event and
+	kbd_buffer_store_selection_event_hold, rather than union
+	buffered_input_event and union buffered_input_event.
+	* src/keyboard.c (beware_long_paste, maybe_quit_while_no_input):
+	New functions, broken out from kbd_buffer_store_buffered_event.
+	(kbd_buffer_store_event_hold): Define here, with a simplified
+	version of the body of the old kbd_buffer_store_buffered_event,
+	rather than defining in keyboard.h.  Specialize to struct
+	input_event.
+	(kbd_buffer_store_selection_event_hold): New function; it is
+	a simplified version of the old kbd_buffer_store_buffered_event,
+	specialized to struct selection_input_event.
+	(is_ignored_event_kind): Accept enum event_kind instead of
+	union buffered_input_event.  All callers changed.
+	* src/keyboard.h (kbd_buffer_store_event_hold):
+	Remove definition, as keyboard.c now defines it.
+	* src/pgtkterm.c (evq_grow_if_needed): New function.
+	(evq_enqueue, evq_selection_enqueue): Two functions now,
+	not one.  Args are now struct input_event const * or
+	struct selection_input_event const *, not
+	union buffered_input_event *.  All callers changed.
+	This lets us simplify the callers so that they need
+	not use the union.
+
+2025-03-03  Po Lu  <luangruo@yahoo.com>
+
+	Fix styling issues on Android 15 QPR1
+
+	* java/org/gnu/emacs/EmacsView.java (EmacsView): Guarantee that
+	frame views are created with the correct theme.
+
+	* java/res/values-v20/style.xml (EmacsStyle):
+
+	* java/res/values-v29/style.xml (EmacsStyle): Disable a swiping
+	gesture enabled on certain Android systems.
+
+	* java/res/values-v35/style.xml: Rename from `styles'.xml.
+
+2025-03-03  Mattias Engdegård  <mattiase@acm.org>
+
+	* lisp/wid-edit.el (widget-get): Make faster.
+
+2025-03-03  Mattias Engdegård  <mattiase@acm.org>
+
+	Strengthen widget-get/put tests
+
+	* test/lisp/wid-edit-tests.el
+	(widget-test-editable-field-widget-get/put): Test on inherited properties.
+
+2025-03-03  Yuan Fu  <casouri@gmail.com>
+
+	Don't process function range settings in treesit--update-range-1
+
+	This fixes a bug where we call treesit-query-language on a
+	function, which happens before the QUERY in a range setting can
+	be either a function or a query, but we call it with
+	treesit-query-language before knowing whether it's a query or
+	function.
+
+	* lisp/treesit.el:
+	(treesit--update-range-1): Skip function range settings.
+	(treesit-update-ranges): Handle function range settings here.
+
+2025-03-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify GCC in pgtkselect malloc alignment
+
+	This is a better fix for Bug#76414.
+	* src/pgtkselect.c (pgtk_nalloc): New function.
+	(pgtk_get_window_property, lisp_data_to_selection_data): Use it.
+
+2025-03-02  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix invocation of neocmakelsp
+
+	* lisp/progmodes/eglot.el (eglot-server-programs): Fix invocation
+	of neocmakelsp
+
+2025-03-02  Felician Nemeth  <felician.nemeth@gmail.com>
+	    João Távora  <joaotavora@gmail.com>
+
+	Eglot: implement additionalPropertiesSupport for showMessage
+
+	This feature was introduced in LSP v3.16.
+
+	https://microsoft.github.io/language-server-protocol/specifications/lsp/3.18/specification/#window_showMessageRequest
+
+	* lisp/progmodes/eglot.el (eglot-client-capabilities): Set
+	window/showMessage/messageActionItem/additionalPropertiesSupport to t.
+	(eglot-handle-request window/showMessageRequest): Return the whole
+	selected MessageActionItem, not just its title.
+
+2025-03-02  Daniel Colascione  <dancol@dancol.org>
+
+	Add auto-margin enable/disable to term
+
+	* test/lisp/term-tests.el (term-line-wrap-no-auto-margins): add test
+
+	* lisp/term.el (term-auto-margins): new variable
+	(term-mode): documentation
+	(term-termcap-format): mention auto-margins flag
+	(term-emulate-terminal): support it
+	(term-reset-terminal): reset it
+	(term-handle-ansi-escape): notice it
+
+	* etc/e/eterm-color.ti: add auto margin capability
+
+	* etc/e/README: fix build documentation
+
+	* etc/NEWS: mention auto-margins
+
+2025-03-02  Juri Linkov  <juri@linkov.net>
+
+	Adapt recent css-ts-mode changes to mhtml-ts-mode
+
+	* lisp/textmodes/css-mode.el (css--treesit-thing-settings):
+	(css-ts-mode--outline-predicate): New variables.
+	(css-ts-mode): Set treesit-outline-predicate.
+
+	* lisp/textmodes/mhtml-ts-mode.el (mhtml-ts-mode--treesit-thing-settings):
+	Use css--treesit-thing-settings and css--treesit-defun-type-regexp.
+	(mhtml-ts-mode): Use 'css-ts-mode--outline-predicate' for
+	'treesit-aggregated-outline-predicate'.
+
+2025-03-02  Juri Linkov  <juri@linkov.net>
+
+	Improve treesit settings for css-ts-mode (bug#73404)
+
+	* lisp/textmodes/css-mode.el (css--treesit-settings): Add
+	"@supports" and '(at_keyword)' to 'keyword', 'keyframe_block' to
+	'selector', 'keyframes_name' to 'query'.
+	(css--treesit-defun-name): Support "keyframe_block",
+	"keyframes_statement" and "supports_statement" as well.
+	(css--treesit-simple-imenu-settings): Add "keyframes_statement",
+	"keyframe_block", "supports_statement".
+	(css--treesit-defun-type-regexp): Add "keyframe_block".
+	(css-ts-mode): Add 'treesit-thing-settings'.
+
+2025-03-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	Bump python.el package version to 0.29
+
+	* lisp/progmodes/python.el: Bump package version to 0.29.
+
+2025-03-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	Bump python.el requirement to Emacs 29.1
+
+	* lisp/progmodes/python.el: Require Emacs 26.3, flymake 1.0 and
+	project 0.1.  (Bug#75526)
+
+2025-03-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't warn when calling hl-lock-mode from init file
+
+	This was a compatibility kluge introduced in Emacs 22.1, twenty years
+	ago.  It's fair to assume that any former Emacs 21 user have seen this
+	warning already, and will have updated their init file.  So remove it.
+
+	* lisp/hi-lock.el (hi-lock-mode): Don't warn when calling plain
+	hi-lock-mode from init file.
+	(hi-lock-archaic-interface-message-used)
+	(hi-lock-archaic-interface-deduce): Remove associated variables.
+
+2025-03-02  Eli Zaretskii  <eliz@gnu.org>
+
+	New commands to convert ASCII to fullwidth characters and back
+
+	* lisp/textmodes/text-mode.el (text-mode--fullwidth-table): New
+	variable.
+	(text-mode--get-fullwidth-table): New internal function.
+	(fullwidth-region, halfwidth-region, fullwidth-word)
+	(halfwidth-word): New commands.  (Bug#71822)
+
+	* etc/NEWS: Announce new commands.
+
+2025-03-02  Po Lu  <luangruo@yahoo.com>
+
+	Specifically report attempts to exit Emacs during test execution
+
+	* test/infra/android/test-driver.el (ats-in-eval): Fix typo in
+	doc string.
+	(ats-eval-as-printed, ats-eval-serial, ats-eval-do-decode):
+	Render buffer-local.
+	(ats-executing-form): New variable.
+	(ats-process-filter): Bind the same around `eval'.
+	(ats-kill-emacs-function): New function; register it to execute
+	when Emacs exits.
+
+2025-03-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix a vc test for Breezy by setting $HOME
+
+	* test/lisp/vc/vc-tests.el (vc--fix-home-for-bzr): New macro.
+	(vc-test--create-repo, vc-test--register, vc-test--working-revision)
+	(vc-test--checkout-model, vc-test--rename-file)
+	(vc-test--version-diff): Fix test for Breezy by setting HOME to a
+	temporary directory.  (Bug#70195)
+
+2025-03-02  Po Lu  <luangruo@yahoo.com>
+
+	Don't byte compile early-init.el
+
+	* test/infra/android/early-init.el (frame-initialize): Remove
+	redundant debugging printouts.
+
+2025-03-02  Po Lu  <luangruo@yahoo.com>
+
+	Exclude files under `infra' from automatic testing
+
+	* test/Makefile.in (ELFILES): Exclude files within `infra'.
+	Reported by Stefan Kangas <skangas@gmail.com>.
+
+2025-03-02  Po Lu  <luangruo@yahoo.com>
+
+	Run Android tests in the initial frame
+
+	* test/infra/android/early-init.el: New file.
+
+	* test/infra/android/test-controller.el (ats-connect): Upload
+	`early-init.el' to the staging directory and configure that
+	directory as the Emacs instance's initialization directory.
+	(ats-run-test): Always append to the test buffer.  Execute tests
+	within terminal-frame.
+	(ats-run-all-tests): Gracefully respond to errors.
+	(ats-cmd-error): New function.
+	(ats-execute-tests-batch): Accept a number of command line
+	arguments.
+
+2025-03-02  Po Lu  <luangruo@yahoo.com>
+
+	Enable kmacro-call-macro to function in some circumstances
+
+	* lisp/kmacro.el (kmacro-call-macro): Enable to function when
+	the selected frame's terminal is different from that most
+	recently consulted by the event loop.
+
+2025-03-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	Mark echistory.el as obsolete
+
+	* lisp/obsolete/echistory.el: Add Obsolete-since header.
+	* etc/TODO: Delete echistory.
+	* etc/NEWS: Announce above obsoletion.  (Bug#76506)
+
+2025-03-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	Move echistory.el to lisp/obsolete
+
+	* lisp/echistory.el: Move from here...
+	* lisp/obsolete/echistory.el: ...to here.  (Bug#76506)
+
+2025-03-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	Document apply-partially as inefficient
+
+	* doc/lispref/functions.texi (Calling Functions): Document that it is
+	less inefficient than a regular 'lambda'.
+	* lisp/subr.el (apply-partially): Adjust documentation like above and
+	remove compiler macro.
+	Ref: https://lists.gnu.org/r/emacs-devel/2025-03/msg00024.html
+
+2025-03-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	Bump python.el requirement to Emacs 26.3
+
+	* lisp/progmodes/python.el: Require Emacs 26.3, flymake 1.0 and
+	project 0.1.  (Bug#75526)
+
+2025-03-02  Pranshu Sharma  <pranshu@bauherren.ovh>
+
+	Pass buffer as object in gnus-highlight-selected-tree
+
+	* lisp/gnus/gnus-salt.el (gnus-highlight-selected-tree): Correctly
+	pass buffer object instead of string.  (Bug#75557)
+
+2025-03-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make package-install accept a string as well
+
+	* lisp/emacs-lisp/package.el (package-install): Allow passing a string
+	instead of a symbol.  (Bug#72160)
+	(package-upgrade): Improve docstring.
+
+	* test/lisp/emacs-lisp/package-tests.el
+	(package-test-install-single-from-archive/string-type): New test.
+
+2025-03-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve use-package error message on wrong type
+
+	* lisp/use-package/use-package-core.el (use-package): Improve error
+	message when passed the wrong type.  (Bug#72160)
+
+2025-03-02  David Ponce  <da_vid@orange.fr>
+
+	Simplify and speed up widget-get implementation
+
+	* lisp/wid-edit.el (widget-get): Simplify and speed up.
+	Ref: https://lists.gnu.org/r/emacs-devel/2025-03/msg00010.html
+
+2025-03-02  David Ponce  <da_vid@orange.fr>
+
+	Correctly return passed value from widget-put
+
+	* lisp/wid-edit.el (widget-get-indirect): Return passed value to stay
+	consistent with old C implementation.  (Bug#76664)
+
+2025-03-01  Pip Cet  <pipcet@protonmail.com>
+
+	Improve instructions for running with -fsanitize=address (bug#76393)
+
+	* etc/DEBUG (ASAN_OPTIONS): Add 'detect_stack_use_after_return=0'
+	requirement.  Remove obsolete unexec commentary.
+
+2025-03-01  Daniel Colascione  <dancol@dancol.org>
+
+	Make Emacs respond to NS activation clicks
+
+	* src/nsterm.m (acceptsFirstMouse): Opt into receiving mouse events that
+	activate the window. (bug#76629)
+
+2025-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Provide tool-tip display delays on TTY frames
+
+	* lisp/tooltip.el (tooltip-show, tooltip-hide)
+	(tooltip-show-help): Support delayed tool-tip display on TTY
+	frames as well.  (Bug#76653)
+
+	* etc/NEWS: Announce the behavior change.
+
+2025-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	0460177451d ; * lisp/progmodes/java-ts-mode.el (treesit-node-end): De...
+	8481170eb29 Fix 'M-q' in 'makefile-mode'
+	44a770b8713 ; Improve documentation of 'rmail-movemail-program'
+
+	# Conflicts:
+	#	lisp/progmodes/java-ts-mode.el
+
+2025-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	b531bbf73ef Fix go-ts-mode const_spec highlighting (Bug#76330)
+	bd1d6761f4c ; Document what happens when 'display' and 'invisible' pr...
+	526eeedf889 keymaps.texi: Move "Changing Key Bindings" section up
+	7ec6531c7bd keymaps.texi: Move "Key Sequences" section down
+	8b804011275 Improve process-get/process-put docstrings
+	73c646b7771 Merge branch 'emacs-30' of git.sv.gnu.org:/srv/git/emacs ...
+	0af5c574998 Fix recent change in diff-no-select
+	c8cec840d79 Prevent rare freeze on Android 4.2 through 4.4
+
+2025-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	5247da2e3cd * lisp/proced.el (proced-<): Check, that NUM1 and NUM2 ar...
+
+2025-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	6f5c322f597 Recommend secure-hash in md5 docstring
+	1352b184f3f Improve docstring of add-hook and remove-hook
+
+2025-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	62b3d3136fa Fix fns-tests-collate-strings failure with musl
+	840c6824589 ; (completion-preview-complete): Fix bug#76606
+	fa42626a6a8 ; Fix indentation in cl.texi example
+	7ff806da496 ; Fix my last commit
+
+2025-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	f88dc0f2f9d ; Fix documentation of 'buffer-text-pixel-size'
+	734986349fd ; Minor Android documentation improvements
+	a90da899034 ; Fix up emacs-lisp-mode docstring
+	58c7acb5554 ; Fix completion-fail-discreetly docstring typo.
+	02c830ba22b Fix ert-font-lock macro signatures
+	0c6b8643aec Fix a typo in 'window_text_pixel_size'
+	8a8c25eaccd ; Add Rudolf Schlatte to authors.el
+	94c0ea39a5a * doc/misc/efaq.texi (New in Emacs 30): Fix typo.  (Bug#7...
+	0be5f9115ec ; * etc/images/README (Files): Add an entry for last-page...
+	63adf9dcf53 ; Reflow some cl-lib docstrings
+	99253f79703 ; * etc/TODO: New section "Make it easier to contribute".
+
+	# Conflicts:
+	#	lisp/emacs-lisp/cl-macs.el
+
+2025-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	563b6f94511 Constant highlighting no longer captures Java annotations
+	e15dcb2db5c Improve wording of lsh docstring
+	0cc651acddb ; * admin/check-doc-strings: Add note for future developm...
+	3c9b1c3cd18 Don't document deleted xwidget functions
+	9e9b78dda94 ; Improve lsh and ash documented argument names
+
+2025-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	e9c9ed1f468 Minor refactoring in admin/admin.el
+	a8b1726487b ; * admin/make-tarball.txt: Copy edits.
+
+2025-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	8ac894e2246 Release Emacs 30.1
+	bcba098505e ; * ChangeLog.4: Update.
+
+2025-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	2dbf7d0b1b2 Use character position for ranges in treesit_sync_visible...
+
+2025-03-01  Tassilo Horn  <tsdh@gnu.org>
+
+	doc-view: Fix error during revert in editing mode
+
+	When in editing mode in a doc-view buffer and then reverting (which can
+	happen automatically when editing OpenDocument contents), we errored in
+	the advide function doc-view--revert-buffer because the local
+	doc-view--buffer-file-name has been killed when switching to the editing
+	mode.
+
+	Also restore doc-view-minor-mode after reverting during being in the
+	editing mode.
+
+	* lisp/doc-view.el (doc-view--revert-buffer): Check that
+	'doc-view--buffer-file-name' is non-nil.
+	(doc-view-minor-mode): Add re-enabling function to
+	'revert-buffer-restore-functions'.
+
+2025-03-01  Trevor Murphy  <trevor.m.murphy@gmail.com>
+
+	Ignore dedicated windows in 'display-buffer-reuse-mode-window'
+
+	Ignore the dedicated windows unless the dedicated window is
+	already displaying the buffer-to-be-displayed.  In that case,
+	the window may be reused, according to the setting of
+	'inhibit-same-window'.
+	* lisp/window.el (display-buffer-reuse-mode-window): Check
+	'window-dedicated-p' before pushing the candidate window onto
+	the stack.  (Bug#76216)
+
+2025-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Save IELM input history on "C-c C-c"
+
+	* lisp/ielm.el (ielm--write-history-on-interrupt): New function.
+	(inferior-emacs-lisp-mode): Install it as buffer-local value of
+	the 'interrupt-process-functions' hook.  (Bug#76585)
+
+	* etc/NEWS: Announce the behavior change.
+
+2025-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Add a portable test for ffap parsing path-style directory lists
+
+	* test/lisp/ffap-tests.el (ffap-test-path-unix): Renamed from
+	'ffap-test-path'.
+	(ffap-test-path-portable): New test, which should work on all
+	systems.
+
+2025-03-01  Łukasz Stelmach  <stlman@poczta.fm>
+
+	Fix handling of delta values with negative month field
+
+	* lisp/calendar/time-date.el (decoded-time-add): If the new
+	variable is less then zero, the year needs to be decremented
+	by quotient of new and 12 increased by one.
+	* test/lisp/calendar/time-date-tests.el (test-decoded-add):
+	Add applicable test cases.  (Bug#68969)
+
+2025-03-01  Stefan Kangas  <stefankangas@gmail.com>
+
+	grep: Signal error if unable to access directory
+
+	* lisp/progmodes/grep.el (lgrep, rgrep): grep: Signal error if unable to
+	access directory, instead of just trying to use default-directory,
+	because that level of DWIMishness is confusing.  (Bug#71078)
+
+2025-03-01  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make '(setf (process-get ...) VAL)' return VAL
+
+	* lisp/emacs-lisp/gv.el (process-get): Return only the last value
+	when set as a generalized variable.  (Bug#76643)
+
+2025-02-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* test/src/editfns-tests.el (editfns--replace-region): New test
+
+	This test fails, sadly, because `replace-buffer-contents` is not
+	careful enough to something like `replace_range`.
+
+2025-02-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(internal--c-header-file-path): Move to ffap.el
+
+	This function is used so rarely that it's really best not to
+	preload it.
+
+	* lisp/ffap.el (ffap-url-regexp): Precompute.
+	(ffap-c-path): Use `ffap--c-path`.
+	(ffap--gcc-is-clang-p, ffap--c-path): Move and rename from subr.el's
+	* lisp/subr.el (internal--gcc-is-clang-p)
+	(internal--c-header-file-path): Move to ffap.el and rename.
+
+	* lisp/man.el (Man-header-file-path): Default to a new value that
+	delegates to ffap.
+	(Man-header-file-path): Obey that new value.
+
+	* lisp/emacs-lisp/ert-x.el (ert-gcc-is-clang-p): Use `ffap--gcc-is-clang-p`.
+
+	* test/lisp/ffap-tests.el (ffap-tests--c-path)
+	(ffap-tests--c-path/gcc-mocked, ffap-tests--c-path/clang-mocked):
+	Move and rename from `subr-tests.el`.
+	* test/lisp/subr-tests.el (subr-tests-internal--c-header-file-path)
+	(subr-tests-internal--c-header-file-path/gcc-mocked)
+	(subr-tests-internal--c-header-file-path/clang-mocked):
+	Move to `ffap-tests.el` and rename.
+
+2025-02-28  Eshel Yaron  <me@eshelyaron.com>
+
+	(completion-preview-sort-function): Refine ':type'.
+
+	* lisp/completion-preview.el
+	(completion-preview-sort-function): Add some specific sort
+	functions as available choices for this user option.
+
+	Suggested by Robert Pluim <rpluim@gmail.com>.
+
+2025-02-28  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add compiler macro to apply-partially
+
+	* lisp/subr.el (apply-partially): Add compiler macro.
+
+2025-02-28  Stefan Kangas  <stefankangas@gmail.com>
+
+	Lift widget functions from C to Lisp
+
+	In the mid-1990s, these functions were moved from Lisp to C to
+	"improve performance".  However, Moore's Law, and perhaps other
+	improvements too, has made this rationale irrelevant.
+
+	On this machine, with --native-compilation=no, I observed only a
+	slight ~4% performance difference.  For example, displaying a buffer
+	full of widgets (e.g., 'M-x customize RET browse-url RET') takes 4ms
+	here, meaning the performance gap is under 0.1ms.  Even on less
+	powerful machines, this difference would remain imperceptible.  Given
+	this, let's lift these functions back to to Lisp, which offers the
+	usual benefits.
+
+	We already have solid test coverage, but let's add a more focused test
+	for 'widget-get' and 'widget-put' to be thorough.
+
+	* lisp/wid-edit.el (widget-put, widget-get, widget-apply): Move to
+	Lisp from...
+	* src/fns.c (Fwidget_put, Fwidget_get, Fwidget_apply): ...here.
+	(syms_of_fns): Remove defsubrs for the above functions.
+	* test/lisp/wid-edit-tests.el
+	(widget-test-editable-field-widget-get/put): New test.
+
+2025-02-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix the values and documentation of 'printable-chars' table
+
+	* src/character.c (syms_of_character) <printable-chars>: Doc fix.
+
+	* lisp/international/characters.el (printable-chars): Fix values
+	for non-ASCII characters.
+
+	* doc/lispref/nonascii.texi (Character Properties): Add
+	cross-reference for what is a printable character.
+	* doc/lispref/display.texi (Usual Display):
+	* doc/lispref/searching.texi (Char Classes): Add indexing.
+	(Bug#76611)
+
+2025-02-28  Po Lu  <luangruo@yahoo.com>
+
+	Adapt process-tests to Android
+
+	* src/android.c (android_init_thread_events)
+	(android_run_select_thread): Guarantee that the select thread is
+	initialized before returning.
+
+	* test/src/process-tests.el
+	(process-tests/fd-setsize-no-crash/make-process)
+	(process-tests/fd-setsize-no-crash/make-pipe-process)
+	(process-tests/fd-setsize-no-crash/make-network-process)
+	(process-tests/fd-setsize-no-crash/make-serial-process): Skip on
+	Android.
+
+2025-02-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'internal--c-header-file-path'
+
+	* lisp/subr.el (internal--c-header-file-path): Fix for MS-Windows:
+	don't prepend the (usually non-existent) "/usr/include", and run
+	each directory through 'expand-file-name' to remove the many ".."
+	elements and mirror any backslashes.  Invoke "clang" if "gcc" is
+	not available or is actually clang.
+
+	* test/lisp/subr-tests.el
+	(subr-tests-internal--c-header-file-path): Fix for MS-Windows:
+	test the path by looking for stdio.h, and expand all directory
+	names to compare to expected results.
+
+2025-02-28  Po Lu  <luangruo@yahoo.com>
+
+	Fully support Lisp threads on Android
+
+	* src/android.c (struct android_thread_event_queue): New
+	structure.  Move global pselect arguments, mutexes, and
+	semaphores, and pipes here.
+	(struct android_event_queue) <select_mutex, select_thread>:
+	Remove to the above-named struct.
+	(android_init_thread_events, android_finalize_thread_events)
+	(android_get_poll_thread): New functions.
+	(android_run_select_thread): Accept a set of mutexes and
+	thread-local data as the first argument, and operate with them
+	rather than globals.
+	(android_handle_sigusr1): Rename to
+	`android_handle_poll_signal'.  Set thread-specific cancellation
+	indicator.
+	(android_init_events): Properly abort after a fatal condition.
+	Enable interruptible polling on Android 5.1 and later, not 4.2.
+	(android_select): Never check for queries here, but in
+	thread_select, if threads are enabled.  Adapt to per-thread
+	polling threads and only enable interruptible polling on Android
+	5.1 and later.
+	(android_before_select): New function.
+
+	* src/android.h (android_before_select): New declaration.
+
+	* src/thread.c (thread_select): Call `android_before_select'
+	before the global lock is released.
+
+2025-02-28  Eshel Yaron  <me@eshelyaron.com>
+
+	Make 'completion-preview-sort-function' a defcustom
+
+	* lisp/completion-preview.el
+	(completion-preview-sort-function): Define and document it
+	as a user option.
+	* etc/NEWS: Announce.
+
+2025-02-28  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/net/tramp.el (tramp-mode): Set to nil on MS-DOS.
+
+2025-02-28  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove Emacs 23 compat code from ox-publish.el
+
+	* lisp/org/ox-publish.el (org-publish-timestamp-filename): Remove
+	Emacs 23 compat code.
+
+2025-02-28  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't use incf/decf in eldoc.el
+
+	* lisp/emacs-lisp/eldoc.el (eldoc--invoke-strategy): Don't use incf or
+	decf.  This is a :core package and supports Emacs 26.3.  (Bug#76604)
+
+2025-02-28  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add test for apply-partially
+
+	* test/lisp/subr-tests.el (subr-test-apply-partially): New test.
+
+2025-02-28  Yuan Fu  <casouri@gmail.com>
+
+	Support alternative range function for tree-sitter range settings
+
+	Some embedded parser needs to exclude child nodes from the
+	range, like markdown-inline.  So I added this keyword that
+	allows users to customize the range for the embedded parser.
+	This can also be potentially useful for markdown comments in
+	rust, for example, because we want to exclude the comment
+	starters (//) from the embedded markdown parser.
+
+	* lisp/treesit.el (treesit-query-range):
+	(treesit-query-range-by-language): Add new parameter RANGE-FN.
+	(treesit-range-settings): Add new field RANGE-FN.
+	(treesit-range-rules): Add new keyword RANGE-FN.
+	(treesit-range-fn-exclude-children): New function.
+	(treesit--update-ranges-non-local):
+	(treesit--update-ranges-local):
+	(treesit--update-range-1): Support the RANGE-FN field.
+
+2025-02-28  Yuan Fu  <casouri@gmail.com>
+
+	Make treesit-node-at take advantage of the embed-level property
+
+	* lisp/treesit.el (treesit-node-at): Select the local parser
+	with the highest embed-level.
+
+2025-02-28  Yuan Fu  <casouri@gmail.com>
+
+	Rework range facility in treesit.el to support arbitrary nesting
+
+	Make use of the newly added embed-level parser property, we now
+	iterativeLy create/update embedded parsers at each embed level,
+	allowing arbitrary levels of nesting.
+
+	At the beginning, we start with the primary parser.  We query it
+	with each range settings, gets some ranges and their
+	corresponding language. Then we create the first level of
+	embedded parsers using the ranges and language we got.  This is
+	one iteration. For the next iteration/level, we start with the
+	embedded parsers we create/updated in the previous
+	iteration/level, and query each of them with each of the range
+	settings, creating/updating the next level of embedded parsers.
+	And we keep doing this until we don't get more matches from the
+	queries.
+
+	We now also support the :embed keyword in 'treesit-range-rules'
+	to be a function that returns a language.  This allows major
+	modes like markdown and org mode to support code blocks of which
+	the language isn't known ahead of time.
+
+	* lisp/treesit.el (treesit-primary-parser): Move to front.
+	(treesit-query-range-by-language): New function.
+	(treesit-range-rules): Allow :embed to be a function, update docstring.
+	(treesit-local-parsers-on): Update docstring.
+	(treesit--parser-at-level):
+	(treesit--update-ranges-non-local): New functions.
+	(treesit--update-ranges-local): Use the new logic, support
+	:embed being a function.
+	(treesit--update-range-1): New function, has the meat of
+	original treesit-update-ranges.
+	(treesit-update-ranges): Implements the iteration logic using
+	treesit--update-range-1 to do the actual work.
+
+2025-02-28  Yuan Fu  <casouri@gmail.com>
+
+	Enable treesit-query-capture to return grouped captures
+
+	This is needed for creating embedded parsers for embedded code
+	blocks of which language cannot be known ahead of time.  E.g.,
+	markdown and org mode's code block.
+
+	* src/treesit.c (Ftreesit_query_capture): Add parameter GROUPED.
+
+2025-02-28  Yuan Fu  <casouri@gmail.com>
+
+	Add tree-sitter-parser-embed-level and parent-node
+
+	Add parser properties embed-level and parent-node. They'll be
+	help us implement arbitrarily nested embeded parser, and
+	navigation across embedded and host parsers, respectively.
+
+	* src/treesit.c:
+	(Ftreesit_parser_embed_level):
+	(Ftreesit_parser_set_embed_level):
+	(Ftreesit_parser_parent_node):
+	(Ftreesit_parser_set_parent_node): New functions.
+
+2025-02-28  Philipp Stephani  <p.stephani2@gmail.com>
+
+	Don't overwrite non-local exit symbol and data (Bug#65796).
+
+	The previous approach would incorrectly invalidate the returned module
+	values if another non-local exit occurred while dealing with a non-local
+	exit.  See Bug#65796.  Instead, allocate the values from the usual
+	environment storage, and return statically-allocated objects if that
+	fails.
+
+	* src/emacs-module.c (struct emacs_env_private): Turn non-local exit
+	symbol and data into normal Lisp objects.
+	(initialize_environment): Initialize them.
+	(mark_module_environment): Prevent them from being garbage-collected.
+	(module_signal_or_throw, module_non_local_exit_signal_1)
+	(module_non_local_exit_throw_1): Adapt uses.
+	(value_to_lisp): No longer scan for them with module assertions enabled.
+	(module_out_of_memory_signal, module_out_of_memory_data): New
+	statically-allocated module values to return in case of allocation
+	failure.
+	(syms_of_module): Initialize them.
+	(module_non_local_exit_get): Allocate module values normally.  If that
+	fails, return statically-allocated values.
+
+	* doc/lispref/internals.texi (Module Nonlocal): Document new behavior.
+
+2025-02-27  Visuwesh  <visuweshm@gmail.com>
+
+	Recommend 'tab-bar-history-mode' over 'winner-mode'
+
+	* lisp/winner.el (winner-mode):
+	* lisp/tab-bar.el (tab-bar-mode): Update the docstring to
+	suggest 'tab-bar-history-mode' instead of 'winner-mode' when
+	using 'tab-bar-mode' instead.  (Bug#76439)
+
+2025-02-27  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	Fix CSS indentation, added support for CSS 'color_value'.
+
+	* lisp/textmodes/mhtml-ts-mode.el
+	(mhtml-ts-mode--colorize-css-value): Added 'color_value' node, refactoring.
+	(mhtml-ts-mode--treesit-font-lock-settings): Added 'color_value' node.
+	(mhtml-ts-mode--treesit-indent-rules): Removed the old comment and
+	fixed the CSS indentation rule (bug#76597).
+
+2025-02-27  Paul Nelson  <ultrono@gmail.com>
+
+	Document :continue-only in use-package Info manual
+
+	* doc/misc/use-package.texi (Binding to repeat-maps): Document
+	:continue-only (bug#74140).
+
+2025-02-27  Juri Linkov  <juri@linkov.net>
+
+	Improve 'treesit-outline-search'
+
+	* lisp/treesit.el (treesit-outline-search): Add optional arg
+	'recursive' to avoid infinite recursion when it gets stuck.
+
+	* lisp/textmodes/markdown-ts-mode.el (markdown-ts-mode):
+	Set buffer-local 'treesit-outline-predicate' to "section".
+
+2025-02-27  Stephen Berman  <stephen.berman@gmx.net>
+
+	Prevent a todo-mode test from running with 'make check'
+
+	* test/lisp/calendar/todo-mode-tests.el
+	(todo-test-add-and-delete-file): Tag this test as unstable, since
+	it has been reported to fail unreproducibly (bug#58473) or
+	reproducibly only on the ZFS filesystem (bug#76381) and the causes
+	are still unknown.
+
+2025-02-27  Stephen Berman  <stephen.berman@gmx.net>
+
+	Prevent a todo-mode test from running with 'make check'
+
+	* test/lisp/calendar/todo-mode-tests.el
+	(todo-test-add-and-delete-file): Tag this test as unstable, since
+	it has been reported to fail unreproducibly (bug#58473) or
+	reproducibly only on the ZFS filesystem (bug#76381) and the causes
+	are still unknown.
+
+2025-02-27  Stephen Berman  <stephen.berman@gmx.net>
+
+	Prevent a todo-mode test from running with 'make check'
+
+	* test/lisp/calendar/todo-mode-tests.el
+	(todo-test-add-and-delete-file): Tag this test as unstable, since
+	it has been reported to fail unreproducibly (bug#58473) or
+	reproducibly only on the ZFS filesystem (bug#76381) and the causes
+	are still unknown.
+
+2025-02-27  Po Lu  <luangruo@yahoo.com>
+
+	Fix drag-and-drop treatment of reused tooltip frames
+
+	* src/androidfns.c (Fx_show_tip): Set `tip_window' to that of
+	any reused tooltip frame.
+
+	* src/haikufns.c (unwind_create_frame): Return whether the frame
+	was destroyed, as on X.
+	(unwind_create_tip_frame, haiku_create_frame, Fx_show_tip):
+	Synchronize with X.
+	(do_unwind_create_frame): New function.
+	(tip_window): Remove unused variable.
+
+	* src/nsfns.m (tip_window, unwind_create_tip_frame): Remove
+	unused variable `tip_window'.
+
+	* src/pgtkfns.c (pgtk_create_tip_frame): Rename to
+	pgtk_create_tip_frame.
+	(Fx_show_tip): Adjust accordingly.  Set `tip_window' to that of
+	any reused tooltip frame.
+
+	* src/w32fns.c (Fx_show_tip):
+
+	* src/xfns.c (Fx_show_tip): Set `tip_window' to that of any
+	reused tooltip frame.
+
+2025-02-27  Paul Nelson  <ultrono@gmail.com>
+
+	Add :continue-only directive to bind-keys and use-package
+
+	* lisp/bind-key.el (bind-keys-form): Add :continue-only binding.
+	Fix indentation.
+
+	* lisp/use-package/use-package-bind-key.el
+	(use-package-normalize-binder): Add check for :continue-only.
+
+	* test/lisp/repeat-tests.el (repeat-tests-bind-keys):
+	Enable (and correct) test for :continue-only (bug#74140).
+
+2025-02-27  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	* src/dispnew.c (rect_intersect): Fix a typo (bug#76592)
+
+2025-02-26  Eshel Yaron  <me@eshelyaron.com>
+
+	Add 'help-echo' hint to completion preview
+
+	* lisp/completion-preview.el
+	(completion-preview--propertize-for-mouse): New function.
+	* lisp/completion-preview.el (completion-preview--update)
+	(completion-preview--show)
+	(completion-preview-partial-insert)
+	(completion-preview-complete)
+	(completion-preview-next-candidate): Use it to propertize
+	completion preview text with mouse-related properties,
+	including a new 'help-echo' hint.
+
+2025-02-26  Eshel Yaron  <me@eshelyaron.com>
+
+	Simplify 'completion-preview-active-mode' command tagging
+
+	* lisp/completion-preview.el (completion-preview-insert)
+	(completion-preview-insert-word)
+	(completion-preview-insert-sexp)
+	(completion-preview-complete)
+	(completion-preview-prev-candidate)
+	(completion-preview-next-candidate): Use 'interactive' to
+	associate command with 'completion-preview-active-mode'
+	instead of using a bespoke 'completion-predicate' property.
+	(completion-preview-active-p): Declare obsolete.
+
+2025-02-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(define-ibuffer-op): Minor tweak to Shipmints's patch
+
+	* lisp/ibuf-macs.el (define-ibuffer-op): Evaluate `(active-)opstring`
+	args when defining the operation rather than every time the operation
+	is used.  Move the `:autoload-end` marker back to the level of `progn`.
+
+2025-02-26  shipmints  <shipmints@gmail.com>
+
+	Improve 'define-ibuffer-op' macro (bug#76222)
+
+	* lisp/ibuf-macs.el (define-ibuffer-op):
+	Change defun to defalias and place it before the macro-local lets.
+	* lisp/ibuffer.el:
+	(ibuffer-do-toggle-lock): Remove declare-function.
+	(ibuffer-do-toggle-read-only): Remove declare-function.
+	(ibuffer-do-save): Remove declare-function.
+	(ibuffer-do-delete): Remove declare-function.
+	(ibuffer-do-toggle-modified): Remove declare-function.
+	(ibuffer-do-kill-on-deletion-marks): Remove declare-function.
+
+2025-02-26  Po Lu  <luangruo@yahoo.com>
+
+	Port Eshell tests to Android
+
+	* test/infra/android/test-controller.el (ats-run-test): Run
+	tests in a temp buffer.
+
+	* test/lisp/eshell/em-alias-tests.el (ert, em-alias)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/em-basic-tests.el (em-basic)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/em-cmpl-tests.el (em-unix)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/em-dirs-tests.el (em-dirs)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/em-extpipe-tests.el (ert-x)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/em-glob-tests.el (ert, eshell-tests-helpers):
+
+	* test/lisp/eshell/em-hist-tests.el (eshell)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/em-pred-tests.el (em-pred)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/em-prompt-tests.el (em-prompt)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/em-script-tests.el (em-script)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/em-unix-tests.el (ert-x)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/esh-arg-tests.el (eshell)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/esh-cmd-tests.el (eshell)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/esh-ext-tests.el (eshell)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/esh-io-tests.el (eshell)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/esh-mode-tests.el (em-prompt)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/esh-proc-tests.el (em-prompt)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/esh-util-tests.el (esh-util)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/esh-var-tests.el (eshell)
+	(eshell-tests-helpers):
+
+	* test/lisp/eshell/eshell-tests.el (esh-mode)
+	(eshell-tests-helpers): Load `eshell-tests-helpers' from the
+	resource directory.
+
+	* test/lisp/eshell/resources/eshell-tests-helpers.el: Move from
+	`test/lisp/eshell'.
+
+2025-02-26  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Avoid display bugs after editable-field widgets
+
+	* lisp/wid-edit.el (widget-specify-button): Don't add an
+	invisible space before the button to avoid bugs that surface
+	with the widget-field face.  The Widget library is not
+	the one that puts a :box attribute for the button face, and we
+	can't control what library users put after editable-field
+	widgets.
+
+	(widget-specify-field): Rather, add the invisible space here,
+	after the newline.  That way, we protect whatever comes after
+	the editable-field widget.  (Bug#51550)
+
+2025-02-26  Stefan Kangas  <stefankangas@gmail.com>
+
+	Revert "Correctly fill generated ChangeLog entries"
+
+	This reverts commit 7fe90ca77d0c21165cb9d98d5c42d6b6c6275ef3.
+
+2025-02-26  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make define-global-minor-mode alias obsolete
+
+	* lisp/emacs-lisp/easy-mmode.el (define-global-minor-mode): Make alias
+	for old name obsolete, just in time for its 20th anniversary.
+	* test/lisp/emacs-lisp/lisp-mode-tests.el (test-font-lock-keywords):
+	* lisp/progmodes/subword.el (global-subword-mode)
+	(global-superword-mode): Don't use above obsolete name.
+	* lisp/emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression)
+	(lisp-fdefs): Remove syntax highlighting for obsolete name.
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload):
+	Add comment mentioning the obsolete status of above alias.
+	* doc/lispref/loading.texi (Autoload): Don't document obsolete name.
+
+2025-02-26  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't enable minor modes in diff-add-log-current-defuns
+
+	* lisp/vc/diff-mode.el (diff-add-log-current-defuns): Don't run mode
+	hooks when enabling major mode hooks.  That fails if, for example,
+	paredit-mode is on emacs-lisp-mode-hook and it signaled due to
+	unbalanced parens.
+
+2025-02-26  Po Lu  <luangruo@yahoo.com>
+
+	Adapt a number of regression tests to Android
+
+	* test/infra/android/test-controller.el (ats-run-test): Strip
+	text properties from value string.  Inhibit text conversion.
+
+	* test/lisp/emacs-lisp/find-func-tests.el
+	(find-func-tests--locate-symbols):
+
+	* test/lisp/emacs-lisp/rmc-tests.el
+	(test-rmc--add-key-description)
+	(test-rmc--add-key-description/with-attributes)
+	(test-rmc--add-key-description/non-graphical-display)
+	(test-read-multiple-choice, test-read-multiple-choice-help):
+	Skip on Android in some wise or another.
+
+2025-02-26  Po Lu  <luangruo@yahoo.com>
+
+	Enable auto-revert-tests to pass on Android
+
+	* lisp/emacs-lisp/ert-x.el
+	(ert-remote-temporary-file-directory): Define to null-device on
+	Android.
+
+	* test/lisp/autorevert-tests.el
+	(auto-revert-test02-auto-revert-deleted-file): Provide for
+	situations where the watch descriptor is recreated by the
+	polling timer after a file notification is received.
+
+2025-02-26  Po Lu  <luangruo@yahoo.com>
+
+	Guarantee delivery of inotify special events
+
+	* src/inotify.c (inotifyevent_to_event): Always match events
+	that are not encompassed by IN_ALL_EVENTS and which the
+	documentation implies are always delivered to callbacks.
+
+	* test/src/inotify-tests.el (inotify-file-watch-stop-delivery):
+	New test.
+
+2025-02-26  Stefan Kangas  <stefankangas@gmail.com>
+
+	Correctly fill generated ChangeLog entries
+
+	This fixes both 'C-c C-v' in VC and 'magit-generate-changelog'.
+
+	* lisp/vc/add-log.el (change-log-insert-entries): Correctly fill
+	generated ChangeLog entries.
+
+2025-02-26  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer incf to cl-incf in remaining files
+
+	* admin/syncdoc-type-hierarchy.el (syncdoc-make-type-table):
+	* admin/unidata/unidata-gen.el (unidata-gen-table-word-list):
+	* lisp/arc-mode.el (archive--summarize-descs):
+	* lisp/auth-source.el (auth-source-forget+):
+	* lisp/battery.el (battery-linux-proc-acpi, battery-linux-sysfs):
+	* lisp/calendar/parse-time.el (parse-time-tokenize):
+	* lisp/calendar/time-date.el (decoded-time-add)
+	(decoded-time--alter-month, decoded-time--alter-day):
+	* lisp/cedet/semantic/ede-grammar.el (project-compile-target):
+	* lisp/dired.el (dired-insert-set-properties):
+	* lisp/edmacro.el (edmacro-format-keys):
+	* lisp/epa-file.el (epa-file--replace-text):
+	* lisp/eshell/esh-cmd.el (eshell-for-iterate):
+	* lisp/eshell/esh-io.el (eshell-create-handles)
+	(eshell-duplicate-handles, eshell-protect-handles)
+	(eshell-copy-output-handle, eshell-buffered-print):
+	* lisp/font-lock.el (font-lock-fontify-keywords-region):
+	* lisp/help-fns.el:
+	* lisp/ibuf-ext.el (ibuffer-generate-filter-groups)
+	(ibuffer-insert-filter-group-before):
+	* lisp/ibuffer.el (ibuffer-confirm-operation-on, ibuffer-map-lines):
+	* lisp/image/image-dired-external.el (image-dired-thumb-queue-run):
+	* lisp/image/image-dired.el (image-dired-display-thumbs)
+	(image-dired-line-up):
+	* lisp/imenu.el (imenu--split):
+	* lisp/info-xref.el (info-xref-check-node, info-xref-check-all-custom):
+	* lisp/international/quail.el (quail-insert-decode-map):
+	* lisp/international/rfc1843.el (rfc1843-decode):
+	* lisp/mail/ietf-drums-date.el (ietf-drums-date--tokenize-string):
+	* lisp/mail/ietf-drums.el (ietf-drums-token-to-list):
+	* lisp/mail/rfc2047.el (rfc2047-qp-or-base64):
+	* lisp/mail/rfc2231.el (rfc2231-encode-string):
+	* lisp/mail/yenc.el (yenc-decode-region):
+	* lisp/mh-e/mh-e.el (mh-xargs):
+	* lisp/mh-e/mh-folder.el (mh-recenter):
+	* lisp/mh-e/mh-mime.el (mh-mime-part-index):
+	* lisp/mh-e/mh-search.el (mh-search):
+	* lisp/mh-e/mh-thread.el (mh-thread-current-indentation-level):
+	* lisp/mh-e/mh-utils.el (mh-sub-folders-parse):
+	* lisp/minibuffer.el (minibuffer--sort-by-position)
+	(completion-pcm--pattern-point-idx):
+	* lisp/mpc.el (mpc-cmd-find, mpc-cmd-move, mpc-select-extend)
+	(mpc-songs-refresh, mpc-songpointer-score)
+	(mpc-songpointer-refresh-hairy):
+	* lisp/msb.el (msb--mode-menu-cond, msb--most-recently-used-menu)
+	(msb--split-menus-2, msb--make-keymap-menu):
+	* lisp/net/pop3.el (pop3-send-streaming-command):
+	* lisp/net/puny.el
+	(puny-encode-complex, puny-decode-string-internal):
+	* lisp/net/shr-color.el (shr-color-hue-to-rgb):
+	* lisp/net/soap-client.el (soap-encode-xs-complex-type)
+	(soap-decode-xs-complex-type, soap-resolve-references-for-operation)
+	(soap-wsdl-resolve-references):
+	* lisp/play/5x5.el (5x5-made-move, 5x5-down, 5x5-right):
+	* lisp/play/decipher.el (key, decipher-mode-syntax-table)
+	(decipher-add-undo, decipher-complete-alphabet, decipher--analyze)
+	(decipher--digram-counts, decipher--digram-total):
+	* lisp/play/hanoi.el (hanoi-move-ring):
+	* lisp/play/snake.el (snake-reset-game, snake-update-game):
+	* lisp/profiler.el (profiler-calltree-depth, profiler-calltree-build-1)
+	(profiler-calltree-build-unified)
+	(profiler-calltree-compute-percentages):
+	* lisp/registry.el (registry-reindex):
+	* lisp/simple.el (completion-list-candidate-at-point):
+	* lisp/strokes.el (strokes-xpm-to-compressed-string):
+	* lisp/term.el (term-emulate-terminal, term--handle-colors-list):
+	* lisp/treesit.el (treesit-node-index, treesit-indent-region):
+	* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
+	* lisp/url/url-dav.el (url-dav-file-name-completion):
+	* lisp/url/url-queue.el (url-queue-setup-runners)
+	(url-queue-run-queue):
+	* lisp/wdired.el (wdired-finish-edit):
+	* lisp/wid-edit.el (widget-move):
+	* lisp/window-tool-bar.el (window-tool-bar-string):
+	* lisp/winner.el (winner-undo):
+	* lisp/xwidget.el (xwidget-webkit-isearch-forward)
+	(xwidget-webkit-isearch-backward): Prefer incf to cl-incf.
+
+2025-02-26  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer incf to cl-incf in vc/*.el
+
+	* lisp/vc/diff-mode.el (diff-count-matches):
+	(diff-fixup-modifs, diff-add-log-current-defuns):
+	* lisp/vc/vc-hg.el (vc-hg--glob-to-pcre):
+	* lisp/vc/vc-hooks.el (vc-insert-file):
+	* lisp/vc/vc.el (vc-print-log-setup-buttons, vc-prepare-patch):
+	Prefer incf to cl-incf.
+
+2025-02-25  Pip Cet  <pipcet@protonmail.com>
+
+	Handle multibyte mode line spec chars (bug#76517)
+
+	* src/xdisp.c (display_mode_element): Make 'c' an 'int'.  Use
+	'string_char_and_length' to fetch the character from a multibyte
+	string, not 'SREF'.
+
+2025-02-25  Robert Pluim  <rpluim@gmail.com>
+
+	Improve 'send-mail-function' defcustom.
+
+	* lisp/mail/sendmail.el (send-mail-function): Provide better
+	:doc for the available values.
+
+2025-02-25  Po Lu  <luangruo@yahoo.com>
+
+	Respect temporary-file-directory in Android test controller
+
+	* test/infra/android/test-controller.el (ats-exec-script):
+	Respect temporary-file-directory.
+
+2025-02-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix bug in Tramp argument computing
+
+	* lisp/net/tramp-sh.el (tramp-ssh-or-plink-options): Return always
+	a string.  (Bug#76553)
+
+2025-02-25  Po Lu  <luangruo@yahoo.com>
+
+	Implement commands for executing all tests on connected Android devices
+
+	* test/infra/android/test-controller.el (ats-upload-test):
+	Correct minor encoding error.  Transfer solitary files without
+	creating a tar archive, and handle `resources' directories.
+	(ats-list-tests-locally, ats-list-tests): Don't list files in
+	`resources' directories.  Insert test header locally, and
+	redisplay after insertion.
+	(ats-run-all-tests): New function.
+
+2025-02-25  Robert Pluim  <rpluim@gmail.com>
+
+	Remove unneded cl-extra require
+
+	* lisp/international/emoji.el: Remove cl-extra require.
+
+2025-02-25  Robert Pluim  <rpluim@gmail.com>
+
+	Remove wallpaper.el runtime dependency on cl-lib/cl-macs.
+
+	* lisp/image/wallpaper.el: Don't require "cl-macs"
+	unconditionally, instead require "cl-lib", only when compiling.
+
+2025-02-25  Po Lu  <luangruo@yahoo.com>
+
+	Fix a number of ERT tests for execution on Android
+
+	* test/lib-src/emacsclient-tests.el (emacsclient-test-emacs):
+
+	* test/lisp/server-tests.el (server-tests/emacsclient): Don't
+	assume emacsclient is installed as emacsclient.
+
+2025-02-25  shipmints  <shipmints@gmail.com>
+
+	Add tramp-cleanup-bufferless-connections (bug#76417)
+
+	* doc/misc/tramp.texi (Cleanup remote connections): Add
+	'tramp-cleanup-bufferless-connections'.
+
+	* etc/NEWS: Announce 'tramp-cleanup-bufferless-connections'.
+
+	* lisp/net/tramp-cmds.el:
+	(tramp-list-remote-buffer-connections): New function.
+	(tramp-cleanup-bufferless-connections): New command.
+	(tramp-list-remote-buffers): Account for 'buffer-file-name'.
+
+2025-02-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/misc/ert.texi (Helpers for Buffers): Fix wrong name.
+
+2025-02-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix tramp-find-executable
+
+	* lisp/net/tramp-sh.el (tramp-find-executable): Use "command -pv",
+	it isbetter supported in different shells.  (Bug#76521)
+
+2025-02-25  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Improve menu-bar-item-at-x
+
+	* lisp/menu-bar.el (menu-bar-item-at-x): Handle case of duplicate keys
+	in the menu-bar definition.
+
+2025-02-25  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer incf to cl-incf in progmodes/*.el
+
+	* lisp/progmodes/bug-reference.el (bug-reference--overlay-bounds):
+	* lisp/progmodes/c-ts-common.el (c-ts-common-statement-offset):
+	* lisp/progmodes/compile.el (compilation--note-type):
+	* lisp/progmodes/ebrowse.el (ebrowse-files-table)
+	(ebrowse-fill-member-table, ebrowse-find-pattern)
+	(ebrowse-draw-member-short-fn, ebrowse-gather-statistics):
+	* lisp/progmodes/elixir-ts-mode.el
+	(elixir-ts--electric-pair-string-delimiter):
+	* lisp/progmodes/gdb-mi.el (gdb-thread-list-handler-custom):
+	* lisp/progmodes/grep.el (grep-filter):
+	* lisp/progmodes/hideif.el (hif-backward-comment, hif-__COUNTER__)
+	(hif-token-concatenation, hif-find-define):
+	* lisp/progmodes/js.el (js--pstate-is-toplevel-defun)
+	(js-beginning-of-defun, js-end-of-defun, js--pitems-to-imenu)
+	(js--imenu-to-flat, js-ts--syntax-propertize):
+	* lisp/progmodes/tcl.el (tcl--syntax-of-quote):
+	* lisp/progmodes/typescript-ts-mode.el
+	(tsx-ts--syntax-propertize-captures): Prefer incf to cl-incf.
+
+2025-02-25  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make cl-gensym obsolete in favor of built-in gensym
+
+	* lisp/emacs-lisp/cl-macs.el (cl-gensym): Declare function
+	obsolete in favor of gensym, added in Emacs 26.1.  The only reason
+	for its existence is that it allows an integer argument, but
+	that's not really useful, so it's better to remove this complexity.
+	Ref: https://lists.gnu.org/r/emacs-devel/2017-09/msg00313.html
+	* doc/misc/cl.texi (Symbols, Creating Symbols, Efficiency Concerns)
+	(Obsolete Setf Customization): Don't document above obsolete function.
+	* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause):
+	* lisp/emacs-lisp/edebug.el (edebug-make-form-wrapper):
+	* lisp/obsolete/cl.el (cl--function-convert, lexical-let):
+	* lisp/obsolete/thumbs.el (thumbs-temp-file):
+	* lisp/progmodes/eglot.el (eglot--lambda)
+	(eglot--when-live-buffer, eglot--when-buffer-window)
+	(eglot--collecting-xrefs, eglot--glob-parse):
+	* lisp/progmodes/flymake.el (flymake--run-backend):
+	* test/lisp/emacs-lisp/package-tests.el (with-package-test):
+	* test/lisp/progmodes/eglot-tests.el (eglot--guessing-contact):
+	* test/lisp/progmodes/elisp-mode-tests.el
+	(elisp-shorthand-read-buffer, elisp-shorthand-read-from-string): Prefer
+	plain gensym to cl-gensym in files that can depend on Emacs 26.1.
+	* lisp/jsonrpc.el (jsonrpc-lambda, jsonrpc-request): Prefer gensym to
+	cl-gensym only when defined, as this file supports Emacs 25.1
+	* test/lisp/emacs-lisp/cl-macs-tests.el (cl-lib-test-gensym): Simplify
+	test as 'should' no longer uses cl-gensym.
+
+2025-02-25  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use cl-with-gensyms in a few more cases
+
+	* doc/misc/cl.texi (Macro Bindings):
+	* lisp/emacs-lisp/comp.el (comp--with-sp):
+	* lisp/emacs-lisp/subr-x.el (with-buffer-unmodified-if-unchanged):
+	* lisp/eshell/em-extpipe.el (eshell-extpipe--or-with-catch):
+	* lisp/international/mule-cmds.el (with-locale-environment):
+	* lisp/kmacro.el (kmacro-menu--marks-exist-p):
+	* test/lisp/emacs-lisp/cl-extra-tests.el (cl-lib-test-remprop):
+	* test/lisp/emacs-lisp/edebug-tests.el (edebug-tests-deduplicate):
+	* test/lisp/emacs-lisp/ert-tests.el (ert-test-special-operator-p):
+	* test/lisp/kmacro-tests.el (kmacro-tests-should-insert)
+	(kmacro-tests-should-match-message):
+	* test/lisp/replace-tests.el (replace-tests-with-undo): Use
+	cl-with-gensyms instead of bare gensym call.
+
+2025-02-24  João Távora  <joaotavora@gmail.com>
+
+	Eglot: add out-of-box support for neocmakelsp
+
+	* lisp/progmodes/eglot.el (eglot-server-programs): Add
+	neocmakelsp.
+
+2025-02-24  João Távora  <joaotavora@gmail.com>
+
+	Eglot: use eglot-advertise-cancellation in more situations
+
+	The async requests frequently issued by ElDoc are a significant
+	source of request pile-up on the server side (for some servers).
+
+	With this change, Eglot will issue additional LSP
+	$/cancelRequest notifications for in-flight requests of certain
+	kinds in the pre-command hook.
+
+	This required a small change to the 'jsonrpc-async-request'
+	entrypoint.
+
+	This feature is experimental.
+
+	* lisp/jsonrpc.el (jsonrpc-async-request): No longer returns nil.
+
+	* lisp/progmodes/eglot.el (eglot--inflight-async-requests): New variable.
+	(eglot--cancel-inflight-async-requests): New function.
+	(eglot--async-request): New function.
+	(eglot--pre-command-hook): Call eglot--cancel-inflight-async-requests.
+	(eglot-signature-eldoc-function, eglot-hover-eldoc-function)
+	(eglot-highlight-eldoc-function, eglot-code-action-suggestion):
+	Use eglot--async-request.
+
+2025-02-24  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Fix bad fontification of inactive widgets
+
+	* lisp/wid-edit.el (widget-specify-inactive): When a widget is
+	already inactive, still move the overlay to the desired
+	positions.  Improve docstring.  (Bug#69941)
+
+	* doc/misc/widget.texi (default): Document the need to call the
+	:deactivate function when modifying an inactive widget.
+
+	* test/lisp/wid-edit-tests.el
+	(widget-test-modification-of-inactive-widget): New test
+
+2025-02-24  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add Obsolete-since header to hashcash.el
+
+	* lisp/obsolete/hashcash.el: Add Obsolete-since header.  (Bug#76195)
+
+2025-02-24  Stefan Kangas  <stefankangas@gmail.com>
+
+	Move hashcash.el to lisp/obsolete
+
+	* lisp/mail/hashcash.el: Move from here...
+	* lisp/obsolete/hashcash.el: ...to here.  (Bug#76195)
+
+2025-02-24  Stefan Kangas  <stefankangas@gmail.com>
+
+	Drop hashcash support from Gnus and Message mode
+
+	* lisp/gnus/gnus.el (gnus-install-group-spam-parameters): Remove
+	'spam-use-hashcash' option.
+	* lisp/gnus/message.el (message-generate-hashcash): Mark as
+	obsolete, default to nil unconditionally.
+	(message-send-mail, message-setup-1, message-resend): Don't
+	generate hashcash headers.
+	* lisp/gnus/spam.el (hashcash): Don't require.
+	(spam-use-hashcash):
+	(spam-check-hashcash): Mark as obsolete.
+	(spam-install-hooks): Don't install 'spam-use-hashcash' hook.
+	* doc/misc/message.texi (Mail Headers): Don't document above
+	obsoleted variable 'message-generate-hashcash'.
+	* doc/misc/gnus.texi (Hashcash): Delete section.
+	(Anti-spam Hashcash Payments): Delete subsection.
+	(Extending the Spam package): Don't mention Hashcash.  (Bug#76195)
+
+2025-02-24  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make cl-declare obsolete
+
+	* lisp/emacs-lisp/cl-macs.el (cl-declare): Make obsolete.
+	* doc/misc/cl.texi (Declarations): Don't document above obsolete
+	macro.  (Bug#63288)
+
+2025-02-24  Stefan Kangas  <stefankangas@gmail.com>
+
+	Move buffer related functions from ert-x.el to ert.el
+
+	* lisp/emacs-lisp/ert-x.el (ert--text-button)
+	(ert--format-test-buffer-name, ert--test-buffers)
+	(ert--test-buffer-button, ert--test-buffer-button-action)
+	(ert--call-with-test-buffer, ert-with-test-buffer)
+	(ert-with-buffer-selected, ert-kill-all-test-buffers)
+	(ert-call-with-buffer-renamed, ert-buffer-string-reindented): Move
+	from here...
+	* lisp/emacs-lisp/ert.el (ert--text-button)
+	(ert--format-test-buffer-name, ert--test-buffers)
+	(ert--test-buffer-button, ert--test-buffer-button-action)
+	(ert--call-with-test-buffer, ert-with-test-buffer)
+	(ert-kill-all-test-buffers, ert-with-buffer-selected)
+	(ert-call-with-buffer-renamed, ert-with-buffer-renamed): ...to
+	here.
+	* doc/misc/ert.texi (Helpers for Buffers): Break out new section...
+	(Helper Functions): ...from here.
+	* lisp/emacs-lisp/ert-x.el (ert-with-test-buffer-selected): Move
+	obsolete definition to the end of the file.
+
+	* test/lisp/emacs-lisp/ert-x-tests.el
+	(ert--hash-table-to-alist, ert-test-test-buffers)
+	(ert-test-with-buffer-selected/current)
+	(ert-test-with-buffer-selected/selected)
+	(ert-test-with-buffer-selected/nil-buffer)
+	(ert-test-with-buffer-selected/modification-hooks)
+	(ert-test-with-buffer-selected/read-only)
+	(ert-test-with-buffer-selected/return-value)
+	(ert-test-with-test-buffer-selected/modification-hooks)
+	(ert-test-with-test-buffer-selected/read-only)
+	(ert-test-with-test-buffer-selected/return-value)
+	(ert-test-with-test-buffer-selected/buffer-name): Move tests from
+	here...
+	* test/lisp/emacs-lisp/ert-tests.el
+	(ert--hash-table-to-alist, ert-test-test-buffers)
+	(ert-test-with-buffer-selected/current)
+	(ert-test-with-buffer-selected/selected)
+	(ert-test-with-buffer-selected/nil-buffer)
+	(ert-test-with-buffer-selected/modification-hooks)
+	(ert-test-with-buffer-selected/read-only)
+	(ert-test-with-buffer-selected/return-value)
+	(ert-test-with-test-buffer-selected/selected)
+	(ert-test-with-test-buffer-selected/modification-hooks)
+	(ert-test-with-test-buffer-selected/read-only)
+	(ert-test-with-test-buffer-selected/return-value)
+	(ert-test-with-test-buffer-selected/buffer-name): ...to here.
+	* test/lisp/progmodes/hideshow-tests.el (ert-x):
+	* test/lisp/simple-tests.el (ert-x):
+	* test/lisp/whitespace-tests.el (ert-x): Don't require.
+
+2025-02-24  Stefan Kangas  <stefankangas@gmail.com>
+
+	Support selecting buffer in ert-with-test-buffer
+
+	* lisp/emacs-lisp/ert-x.el (ert-with-test-buffer): Add new keyword
+	argument :selected to make the buffer current and selected.
+	(ert-with-test-buffer-selected): Make obsolete and redefine in
+	terms of ert-with-test-buffer.
+
+	* doc/misc/ert.texi (Helper Functions): Document above new
+	:selected keyword argument, and remove documentation of
+	ert-with-test-buffer-selected.
+
+	* test/lisp/emacs-lisp/ert-x-tests.el
+	(ert-test-with-test-buffer-selected/selected)
+	(ert-test-with-test-buffer-selected/modification-hooks)
+	(ert-test-with-test-buffer-selected/read-only)
+	(ert-test-with-test-buffer-selected/return-value)
+	(ert-test-with-test-buffer-selected/buffer-name):
+	* test/lisp/progmodes/hideshow-tests.el
+	(hideshow-tests-with-temp-buffer-selected):
+	* test/lisp/simple-tests.el (kill-whole-line-invisible)
+	(kill-whole-line-read-only, kill-whole-line-after-other-kill)
+	(kill-whole-line-buffer-boundaries)
+	(kill-whole-line-line-boundaries):
+	* test/lisp/whitespace-tests.el
+	(whitespace-tests--with-test-buffer, whitespace-tests--global): Use
+	ert-with-test-buffer instead of ert-with-test-buffer-selected.
+
+2025-02-24  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use cl-with-gensyms in with-sqlite-transaction
+
+	* lisp/sqlite.el (cl-lib): Require at compile-time.
+	(with-sqlite-transaction): Use cl-with-gensyms.
+
+2025-02-24  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer incf to cl-incf in textmodes/*.el
+
+	* lisp/textmodes/css-mode.el (css--rgb-color):
+	* lisp/textmodes/reftex-dcr.el (reftex-view-regexp-match):
+	* lisp/textmodes/reftex-global.el (reftex-find-duplicate-labels)
+	(reftex-renumber-simple-labels, reftex-translate):
+	* lisp/textmodes/reftex-index.el (reftex-index-select-tag)
+	(reftex-index-phrases-info, reftex-query-index-phrase):
+	* lisp/textmodes/reftex-parse.el (reftex-where-am-I)
+	(reftex-what-macro, reftex-nth-arg, reftex-section-number):
+	* lisp/textmodes/reftex-ref.el (reftex-uniquify-label):
+	* lisp/textmodes/reftex-sel.el (reftex-insert-docstruct):
+	* lisp/textmodes/reftex.el (reftex-next-multifile-index)
+	(reftex-compile-variables, reftex-parse-args)
+	(reftex-select-external-document):
+	* lisp/textmodes/rst.el (rst-display-hdr-hierarchy)
+	(rst-toc-insert-children, rst-apply-indented-blocks)
+	(rst-enumerate-region, rst-convert-bullets-to-enumeration):
+	* lisp/textmodes/tex-mode.el (tex-count-words): Prefer incf to cl-incf.
+
+2025-02-24  Robert Pluim  <rpluim@gmail.com>
+
+	* lisp/msb.el (msb-mode-map): Use 'defvar-keymap'.
+
+2025-02-24  Juri Linkov  <juri@linkov.net>
+
+	Better support for nil enable-local-variables in vc-find-revision-no-save
+
+	* lisp/vc/diff-mode.el (diff-syntax-fontify-props):
+	* lisp/vc/vc.el (vc-find-revision-no-save):
+	Use enable-local-variables as is only when it's one of these values:
+	:safe, :all, or nil.  Otherwise, for all remaining values that query,
+	use :safe.  Also use non-nil 'find-file' arg of 'normal-mode'.
+	https://lists.gnu.org/archive/html/emacs-devel/2025-02/msg00897.html
+
+2025-02-24  Robert Pluim  <rpluim@gmail.com>
+
+	Use 'password-colon-equivalents' when matching "Re" variants
+
+	* lisp/mail/mail-utils.el (mail--wrap-re-regexp): Use
+	'password-colon-equivalents'.
+
+2025-02-24  Rudi Schlatte  <rudi@constantly.at>
+
+	Add ".jj" to vc-directory-exclusion-list
+
+	* lisp/vc/vc-hooks.el (vc-directory-exclusion-list): Add ".jj", a
+	directory used by the jujutsu version control system.  (Bug#76524)
+
+2025-02-24  Martin Rudalics  <rudalics@gmx.at>
+
+	Optionally have 'display-buffer' reuse windows of indirect buffers
+
+	* lisp/window.el (window-indirect-buffer-p): New function.
+	(get-buffer-window-list): New argument INDIRECT.
+	(display-buffer-reuse-window): New alist entry 'reuse-indirect'
+	to reuse a window indirectly related to the BUFFER argument.
+	* doc/lispref/windows.texi (Buffers and Windows): Describe new
+	function 'window-indirect-buffer-p' and new argument INDIRECT of
+	'get-buffer-window-list'.
+	(Buffer Display Action Functions): Describe new action alist
+	entry 'reuse-indirect'.
+	* etc/NEWS: Announce new argument for 'get-buffer-window-list' and
+	new 'display-buffer' action alist entry 'reuse-indirect'.
+
+2025-02-24  Martin Rudalics  <rudalics@gmx.at>
+
+	Clarify semantics of 'frame-inhibit-implied-resize'
+
+	* src/frame.c (frame_inhibit_implied_resize):
+	* doc/lispref/frames.texi (Implied Frame Resizing): Clarify
+	semantics of 'frame-inhibit-implied-resize'.
+
+2025-02-24  Yuan Fu  <casouri@gmail.com>
+
+	Fix typescript-ts-mode indentation tests (bug#71998)
+
+	* test/lisp/progmodes/typescript-ts-mode-resources/indent.erts:
+	(JSX indentation): Add quote and remove semi-colon, so the code
+	is valid.
+
+2025-02-24  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Handle case of not knowing a frame when mouse moved
+
+	* lisp/xt-mouse.el (xterm-mouse--handle-mouse-movement): Don't call
+	display--update-for-mouse-movement if we don't have a frame.
+
+2025-02-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use cl-with-gensyms in ert-with-message-capture
+
+	* lisp/emacs-lisp/ert-x.el (ert-with-message-capture): Use
+	cl-with-gensyms.
+
+2025-02-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer incf to cl-incf in gnus/*.el
+
+	* lisp/gnus/gnus-agent.el (gnus-agent-load-local)
+	(gnus-agent-expire-group-1, gnus-agent-update-files-total-fetched-for):
+	* lisp/gnus/gnus-art.el (gnus-article-header-rank):
+	* lisp/gnus/gnus-async.el (gnus-async-wait-for-article):
+	* lisp/gnus/gnus-cache.el (gnus-cache-update-file-total-fetched-for):
+	* lisp/gnus/gnus-registry.el (gnus-registry-import-eld):
+	* lisp/gnus/gnus-salt.el (gnus-pick-line-number, gnus-tree-minimize)
+	(gnus-generate-vertical-tree):
+	* lisp/gnus/gnus-spec.el (gnus-correct-substring):
+	* lisp/gnus/gnus-start.el (gnus-ask-server-for-new-groups, gnus-method-rank):
+	* lisp/gnus/gnus-sum.el (gnus-data-update-list)
+	(gnus-summary-number-of-articles-in-thread, gnus-build-sparse-threads)
+	(gnus-summary-prepare-threads, gnus-invisible-cut-children)
+	(gnus-summary-limit-children, gnus-expunge-thread)
+	(gnus-summary-refer-references, gnus-summary-update-mark)
+	(gnus-summary-hide-all-threads, gnus-summary-save-parts-1):
+	* lisp/gnus/gnus-topic.el (gnus-topic-articles-in-topic)
+	(gnus-topic-prepare-topic, gnus-topic-display-missing-topic)
+	(gnus-topic-update-topic-line):
+	* lisp/gnus/gnus-uu.el (gnus-uu-post-encoded):
+	* lisp/gnus/gnus-win.el (gnus-configure-frame):
+	* lisp/gnus/mail-source.el (mail-source-fetch-directory)
+	(mail-source-fetch-maildir, mail-source-fetch-imap):
+	* lisp/gnus/message.el (message-remove-header)
+	(message-remove-first-header, message-make-caesar-translation-table):
+	* lisp/gnus/mm-encode.el (mm-qp-or-base64):
+	* lisp/gnus/mml.el (mml-compute-boundary, mml-compute-boundary-1):
+	* lisp/gnus/nnatom.el (nnatom--read-links):
+	* lisp/gnus/nnbabyl.el (nnbabyl-retrieve-headers):
+	* lisp/gnus/nndoc.el (nndoc-oe-dbx-dissection, nndoc-dissect-buffer)
+	(nndoc-dissect-mime-parts-sub):
+	* lisp/gnus/nneething.el (nneething-retrieve-headers):
+	* lisp/gnus/nnheader.el (nnheader-generate-fake-message-id)
+	(nnheader-insert-head, nnheader-translate-file-chars):
+	* lisp/gnus/nnimap.el (nnimap-find-wanted-parts-1)
+	(nnimap-retrieve-group-data-early, nnimap-send-command):
+	* lisp/gnus/nnmail.el (nnmail-process-babyl-mail-format)
+	(nnmail-process-unix-mail-format, nnmail-process-mmdf-mail-format)
+	(nnmail-get-new-mail-1):
+	* lisp/gnus/nnmaildir.el (nnmaildir--scan):
+	* lisp/gnus/nnrss.el (nnrss-check-group):
+	* lisp/gnus/nnselect.el (nnselect-request-thread):
+	* lisp/gnus/nnspool.el (nnspool-retrieve-headers):
+	* lisp/gnus/nntp.el (nntp-retrieve-headers)
+	(nntp-finish-retrieve-group-infos, nntp-retrieve-groups)
+	(nntp-retrieve-articles, nntp-retrieve-headers-with-xover):
+	* lisp/gnus/nnvirtual.el (nnvirtual-create-mapping):
+	* lisp/gnus/nnweb.el (nnweb-google-parse-1, nnweb-google-create-mapping)
+	(nnweb-gmane-create-mapping):
+	* lisp/gnus/spam.el (spam-resolve-registrations-routine): Prefer incf to
+	cl-incf.
+
+2025-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(Ftranspose_regions): Fix text-properties for len1==len2
+
+	When `len1_byte == len2_byte`, the code presumed that len1==len2
+	as well in its handling of text-properties.  Fix that case.
+	While at it, try and reduce code duplication by hoisting common
+	code out of `if`s, and throw away the optimization for `len_mid == 0`
+	which only saved 3 trivial function calls.
+
+	* src/editfns.c (Ftranspose_regions): Shuffle the code a bit.
+
+	* test/src/editfns-tests.el (editfns-tests--transpose-equal-but-not):
+	New test.
+
+2025-02-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Mark cdl.el as obsolete
+
+	* lisp/obsolete/cdl.el: Add Obsolete-since header.  It is fully
+	replaceable by shell-command and shell-command-on-region.
+
+2025-02-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Move cdl.el to obsolete/cdl.el
+
+	* lisp/cdl.el: Move from here...
+	* lisp/obsolete/cdl.el: ...to here.
+
+2025-02-23  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Fix DocView's text conversion on tty Emacs
+
+	* lisp/doc-view.el (doc-view-open-text): Defaults to first page
+	should `doc-view-current-page' return nil.  (Bug#72305)
+
+2025-02-23  Joseph Turner  <joseph@breatheoutbreathe.in>
+
+	Upgrade out-of-date VC package dependencies
+
+	* lisp/emacs-lisp/package-vc.el (package-vc-install-dependencies): Pass
+	the specified package version when checking if a package is installed.
+
+	(Bug#73781)
+
+2025-02-23  Martin Rudalics  <rudalics@gmx.at>
+
+	Optionally inhibit implied resizing while frame is made (Bug#76275)
+
+	* src/frame.c (frame_inhibit_resize): Handle new value 'force'
+	for 'frame-inhibit-implied-resize' (Bug#76275).
+	(frame_inhibit_implied_resize): New value 'force' to inhibit
+	implied resizing while a new frame is made.
+	* lisp/cus-start.el (frame-inhibit-implied-resize): Make new
+	value 'force' customizable.
+	* doc/lispref/frames.texi (Implied Frame Resizing): Describe new
+	value 'force' of 'frame-inhibit-implied-resize'.
+	* etc/NEWS: Announce new value 'force' of
+	'frame-inhibit-implied-resize'.
+
+2025-02-23  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp: Improve doc of ad-hoc multi-hop file names
+
+	* doc/misc/tramp.texi (Ad-hoc multi-hops, Frequently Asked Questions):
+	Improve description how ad-hoc multi-hop file names can be made
+	persistent.  (Bug#65039, Bug#76457)
+
+2025-02-23  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Enforce redisplay when deleting a child frame (bug#76406)
+
+	* src/term.c (tty_free_frame_resources): When deleting a child mark its
+	root frame to garbaged.
+	* src/dispnew.c (prepare_desired_root_row): Add a check for GLYPH_DEBUG.
+
+2025-02-23  Martin Rudalics  <rudalics@gmx.at>
+
+	Implement new user option 'quit-window-kill-buffer' (Bug#76248)
+
+	* lisp/window.el (quit-window-kill-buffer): New option.
+	(quit-window): Handle it.
+	* doc/lispref/windows.texi (Quitting Windows): Describe new
+	option 'quit-window-kill-buffer'.
+	* etc/NEWS: Announce new option 'quit-window-kill-buffer'.
+
+2025-02-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Revert “Pacify GCC in pgtkselect malloc alignment”
+
+	Problem reported by the wurfkreuz (Bug#76414).
+	* src/pgtkselect.c: Revert my commit
+	ff65cc9944dc0b37986d512ee8b9817c6913db36 dated Sun Jan 26 22:15:49
+	2025 -0800 for now.  I may come up with a better commit later.
+
+2025-02-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	9c1d13c89a9 ; * admin/authors.el (authors-aliases): Add Vladimir Niki...
+	443df12eddc ; * INSTALL.REPO: Minor copyedits.
+	76b938fc1d2 ; Don't fail image tests if jpeg is supported via imagema...
+	f8ff9592be9 ; Skip autorevert test when notify support is missing
+	230ecb1e273 ; Skip shr-test/zoom-image test if png or libxml support ...
+	cc51bd56987 ; Skip image type test if support is missing
+
+2025-02-23  Michael Heerdegen  <michael_heerdegen@web.de>
+
+	Fix diary not displaying some entries in european style
+
+	* lisp/calendar/calendar.el (diary-european-date-forms): Correctly
+	recognize times using a dot as separator.  (Bug#53702)
+
+2025-02-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Mark kermit.el as obsolete
+
+	While Kermit is still developed, this Emacs support library is
+	essentially unchanged since it was added to Emacs, which seems to have
+	been in 1988.  It is also based on the old pre-Emacs 20 shell mode, so
+	it's not clear if it even works, and much less if it is relevant with
+	Kermit from this century.
+
+	There is also this modern alternative, from 1994, which seems far
+	more complete: https://www.kermitproject.org/archive.html#emacs
+
+	The bug tracker has stayed silent, so if anyone is still using it, they
+	will have to report a bug and ask us to unobsolete it.
+
+	* lisp/obsolete/kermit.el: Add Obsolete-since header.  Add link to
+	alternative library at kermitproject.org.
+
+2025-02-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Move kermit.el to obsolete/kermit.el
+
+	* lisp/kermit.el: Move from here...
+	* lisp/obsolete/kermit.el: ...to here.
+
+2025-02-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer ert-with-temp-directory in tests
+
+	* test/lisp/dired-aux-tests.el (dired-test-bug30624):
+	* test/lisp/emacs-lisp/track-changes-tests.el
+	(track-changes-tests--random):
+	* test/src/buffer-tests.el (test-buffer-chars-modified-ticks):
+	* test/src/fileio-tests.el (fileio-tests--symlink-failure)
+	(fileio-tests--insert-file-interrupt)
+	(fileio-tests--circular-after-insert-file-functions): Prefer
+	ert-with-temp-directory to using make-temp-file directly.
+
+2025-02-23  Thuna  <thuna.cing@gmail.com>
+
+	Fix print-tests
+
+	* test/src/print-tests.el (terpri): Erase the buffer *terpri-test*
+	before individual runs.  (Bug#72334)
+	(print-circle): Allow circular references with number greater than 9.
+
+2025-02-23  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Fix comparison of current values for the key-sequence :type
+
+	* lisp/cus-edit.el (custom-variable-modified-p): Round-trip
+	the option value before comparing it against the widget's value.
+	This mostly fixes comparison against the obsolete key-sequence
+	widget, but could fix other corner cases, when the widget
+	accepts different types as values.  (Bug#76156)
+
+	* test/lisp/cus-edit-tests.el (cus-edit-test-bug76156)
+	(cus-edit-test-bug76156-2): New test options.
+	(cus-edit-test-unedited-option): New test.
+
+2025-02-23  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	Improve fontification of docker-files
+
+	Add support for fontifying the following grammar-elements:
+	- image-declarations (image-name, image-tag & image alias)
+	- strings in more general terms
+	- string-expansion statements
+	- treat path-values as strings
+	- identifiers names for ENV and ARG statements
+	- argument values for ENV and ARG statements
+	* lisp/progmodes/dockerfile-ts-mode.el (dockerfile-ts-mode)
+	(dockerfile-ts-mode--font-lock-settings): Improve fontification.
+	(Bug#76481)
+
+2025-02-22  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer incf to cl-incf in emacs-lisp/*.el
+
+	* lisp/emacs-lisp/backtrace.el (backtrace--print-func-and-args):
+	* lisp/emacs-lisp/bindat.el (bindat--type):
+	* lisp/emacs-lisp/bytecomp.el (byte-recompile-directory):
+	* lisp/emacs-lisp/chart.el (chart-file-count):
+	* lisp/emacs-lisp/cl-extra.el (cl-parse-integer, cl--print-table):
+	* lisp/emacs-lisp/cl-generic.el (cl--defmethod-doc-pos):
+	* lisp/emacs-lisp/cl-indent.el (common-lisp-loop-part-indentation)
+	(common-lisp-indent-function-1, lisp-indent-defmethod):
+	* lisp/emacs-lisp/cl-lib.el (cl--set-substring):
+	* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause):
+	* lisp/emacs-lisp/cl-preloaded.el (cl-struct-define):
+	* lisp/emacs-lisp/cl-print.el (cl-print--cons-tail)
+	(cl-print--vector-contents, cl-print--struct-contents)
+	(cl-print--string-props):
+	* lisp/emacs-lisp/cl-seq.el (cl-substitute):
+	* lisp/emacs-lisp/comp-cstr.el (comp--range-union)
+	(comp--range-intersection):
+	* lisp/emacs-lisp/comp.el (comp-vec-append, comp--gen-counter)
+	(comp--op-case, comp--limplify-lap-inst, comp--limplify-block)
+	(comp--limplify-function, comp--maybe-add-vmvar, comp--fwprop*):
+	* lisp/emacs-lisp/edebug.el (edebug--called-interactively-skip):
+	* lisp/emacs-lisp/eldoc.el (eldoc--invoke-strategy):
+	* lisp/emacs-lisp/elp.el (elp--make-wrapper):
+	* lisp/emacs-lisp/ert-x.el (ert-kill-all-test-buffers):
+	* lisp/emacs-lisp/ert.el (ert--stats-set-test-and-result)
+	(ert-write-junit-test-summary-report):
+	* lisp/emacs-lisp/memory-report.el (memory-report--symbol-plist)
+	(memory-report--object-size-1):
+	* lisp/emacs-lisp/oclosure.el (oclosure--index-table)
+	(oclosure--define-functions):
+	* lisp/emacs-lisp/package.el (package-menu--perform-transaction):
+	* lisp/emacs-lisp/smie.el (smie-set-prec2tab, smie-prec2->grammar)
+	(smie-config--guess, smie-config--guess-1):
+	* lisp/emacs-lisp/syntax.el (syntax-propertize-rules)
+	(syntax-ppss--update-stats):
+	* lisp/emacs-lisp/track-changes.el (track-changes--after): Prefer incf
+	to cl-incf.
+
+2025-02-22  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer incf to cl-incf in tests
+
+	* test/lisp/emacs-lisp/bytecomp-tests.el (bytecomp-reify-function):
+	* test/lisp/emacs-lisp/cl-extra-tests.el (cl-getf):
+	* test/lisp/emacs-lisp/cl-macs-tests.el
+	(cl-macs-loop-for-as-arith-order-side-effects)
+	(cl-macs-loop-for-as-equals-then, cl-macs-loop-do, cl-macs-loop-finally)
+	(cl-macs-loop-in-ref, cl-macs-loop-being-elements-of-ref)
+	(cl-macs-test--symbol-macrolet, cl-the):
+	* test/lisp/emacs-lisp/cl-seq-tests.el (cl-lib-test-remove)
+	(cl-lib-test-remove-if-not):
+	* test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el
+	(edebug-test-code-range):
+	* test/lisp/emacs-lisp/edebug-tests.el (edebug-tests-deduplicate):
+	* test/lisp/emacs-lisp/generator-tests.el (cps-while-incf):
+	(cps-test-iter-cleanup-once-only):
+	* test/lisp/emacs-lisp/hierarchy-tests.el
+	(hierarchy-labelfn-button-if-does-not-button-unless-condition)
+	(hierarchy-labelfn-button-if-does-button-when-condition):
+	* test/lisp/emacs-lisp/let-alist-tests.el (let-alist-evaluate-once):
+	* test/lisp/emacs-lisp/lisp-mode-tests.el
+	(indent-sexp, lisp-indent-region):
+	* test/lisp/emacs-lisp/map-tests.el (test-map-elt-gv)
+	(test-setf-map-with-function):
+	* test/lisp/emacs-lisp/multisession-tests.el (multi-test-sqlite-simple)
+	(multi-test-sqlite-busy, multi-test-files-simple)
+	(multi-test-files-busy):
+	* test/lisp/emacs-lisp/oclosure-tests.el
+	(oclosure-test, oclosure-test-mutate):
+	* test/lisp/emacs-lisp/track-changes-tests.el
+	(track-changes-tests--random):
+	* test/lisp/files-tests.el (files-tests--with-buffer-offer-save):
+	* test/lisp/net/shr-tests.el (shr-test/zoom-image):
+	* test/lisp/replace-tests.el (replace-tests-with-undo):
+	* test/src/buffer-tests.el (test-overlay-randomly):
+	* test/src/data-tests.el (test-bool-vector-bv-from-hex-string):
+	* test/src/fns-tests.el (fns-tests-sort):
+	* test/src/json-tests.el (json-insert/signal, json-insert/throw):
+	* test/src/minibuf-tests.el (minibuf-tests--strings-to-symbol-alist)
+	(minibuf-tests--strings-to-string-alist)
+	(minibuf-tests--strings-to-string-hashtable)
+	(minibuf-tests--strings-to-symbol-hashtable):
+	* test/src/process-tests.el (make-process/file-handler/found): Prefer
+	incf to cl-incf.
+
+2025-02-22  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer decf to cl-decf
+
+	* lisp/auth-source-pass.el (auth-source-pass--find-match-many):
+	* lisp/calendar/time-date.el (decoded-time-add)
+	(decoded-time--alter-month, decoded-time--alter-day):
+	* lisp/dired.el (dired--move-to-next-line):
+	* lisp/dom.el (dom-pp):
+	* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda):
+	* lisp/emacs-lisp/cl-print.el (cl-print-to-string-with-limit):
+	* lisp/emacs-lisp/cl-seq.el (cl-fill, cl-replace, cl-substitute):
+	* lisp/emacs-lisp/comp-cstr.el (comp--range-union)
+	(comp--range-intersection):
+	* lisp/emacs-lisp/comp.el (comp-vec-prepend, comp--emit-narg-prologue):
+	* lisp/emacs-lisp/edebug.el (edebug--strip-instrumentation):
+	* lisp/emacs-lisp/eldoc.el (eldoc--invoke-strategy):
+	* lisp/emacs-lisp/pp.el (pp--format-definition):
+	* lisp/emacs-lisp/smie.el (smie-config--guess-1):
+	* lisp/eshell/esh-io.el (eshell-close-handle, eshell-set-output-handle):
+	* lisp/gnus/gnus-async.el (gnus-async-prefetch-article):
+	* lisp/gnus/gnus-group.el (gnus-group-mark-group)
+	(gnus-group-yank-group):
+	* lisp/gnus/gnus-salt.el (gnus-tree-forward-line):
+	* lisp/gnus/gnus-score.el (gnus-decay-scores):
+	* lisp/gnus/gnus-srvr.el (gnus-browse-toggle-subscription-at-point):
+	* lisp/gnus/gnus-sum.el (gnus-build-sparse-threads, gnus-parent-headers)
+	(gnus-update-marks, gnus-summary-work-articles)
+	(gnus-summary-refer-parent-article, gnus-summary-next-thread)
+	(gnus-read-header, gnus-summary-insert-new-articles):
+	* lisp/gnus/gnus-topic.el (gnus-topic-forward-topic):
+	* lisp/gnus/gnus.el (gnus-short-group-name):
+	* lisp/gnus/message.el (message-remove-first-header)
+	(message-shorten-references, message-insert-screenshot):
+	* lisp/gnus/mm-url.el (mm-url-insert):
+	* lisp/gnus/nnselect.el (nnselect-push-info):
+	* lisp/ibuffer.el (ibuffer-backward-line, ibuffer-forward-line)
+	(ibuffer-map-lines):
+	* lisp/icomplete.el (icomplete--render-vertical):
+	* lisp/image/image-dired-external.el (image-dired-create-thumb-1):
+	* lisp/image/image-dired.el (image-dired-delete-char):
+	* lisp/mail/ietf-drums-date.el (ietf-drums-date--tokenize-string):
+	* lisp/mh-e/mh-utils.el (mh-sub-folders-parse):
+	* lisp/minibuffer.el (minibuffer-completion-help):
+	* lisp/mpc.el (mpc-cmd-move, mpc-songpointer-refresh-hairy):
+	* lisp/net/eww.el (eww-process-text-input):
+	* lisp/net/pop3.el (pop3-wait-for-messages, pop3-uidl-stat)
+	(pop3-uidl-dele):
+	* lisp/net/shr-color.el (shr-color-hue-to-rgb):
+	* lisp/play/5x5.el (5x5-up, 5x5-left):
+	* lisp/play/decipher.el (decipher-read-alphabet, decipher--digram-total)
+	(decipher-analyze-buffer):
+	* lisp/play/hanoi.el (hanoi-insert-ring, hanoi-move-ring):
+	* lisp/profiler.el (profiler-format-number)
+	(profiler-calltree-build-unified):
+	* lisp/progmodes/antlr-mode.el (antlr-next-rule, antlr-indent-line):
+	* lisp/progmodes/c-ts-common.el (c-ts-common-statement-offset):
+	* lisp/progmodes/ebrowse.el
+	(ebrowse-cyclic-display-next/previous-member-list):
+	* lisp/progmodes/hideif.el (hif-backward-comment):
+	* lisp/progmodes/js.el (js-beginning-of-defun, js-end-of-defun)
+	(js-ts--syntax-propertize):
+	* lisp/progmodes/typescript-ts-mode.el
+	(tsx-ts--syntax-propertize-captures):
+	* lisp/rect.el (rectangle--*-char):
+	* lisp/term.el (term-emulate-terminal):
+	* lisp/textmodes/reftex-cite.el (reftex-do-citation):
+	* lisp/textmodes/reftex-index.el (reftex-index-next-phrase):
+	* lisp/textmodes/reftex-parse.el (reftex-init-section-numbers):
+	* lisp/textmodes/reftex-sel.el (reftex-select-unmark):
+	* lisp/textmodes/reftex.el (reftex-silence-toc-markers):
+	* lisp/treesit.el (treesit-navigate-thing):
+	* lisp/vc/diff-mode.el (diff-sanity-check-context-hunk-half,
+	(diff-sanity-check-hunk):
+	* lisp/vc/pcvs-util.el (cvs-first):
+	* lisp/vc/smerge-mode.el (smerge-get-current):
+	* lisp/vc/vc-hg.el (vc-hg--glob-to-pcre):
+	* test/lisp/net/socks-tests.el
+	(socks-tests-perform-hello-world-http-request):
+	* test/src/buffer-tests.el (test-overlay-randomly): Prefer decf to
+	cl-defc in all code where we can.
+
+2025-02-22  Stefan Kangas  <stefankangas@gmail.com>
+
+	New macros incf and decf
+
+	* lisp/emacs-lisp/cl-lib.el (cl-incf, cl-decf): Move macros from here...
+	* lisp/emacs-lisp/gv.el (incf, decf): ...to here.  Make old names into
+	aliases, documented as deprecated.
+	* lisp/obsolete/cl.el: Don't alias incf and decf.
+
+	* test/lisp/emacs-lisp/cl-lib-tests.el (cl-lib-test-incf)
+	(cl-lib-test-decf): Move tests from here...
+	* test/lisp/emacs-lisp/gv-tests.el (gv-incf, gv-decf): ...to here.
+
+	* doc/lispref/numbers.texi (Arithmetic Operations):
+	* lisp/emacs-lisp/shortdoc.el (number): Document incf and decf.
+
+	* doc/lispref/variables.texi (Multisession Variables):
+	* doc/misc/cl.texi (Organization, Modify Macros, Modify Macros)
+	(Modify Macros, Macro Bindings, For Clauses, Property Lists)
+	(Structures, Efficiency Concerns, Obsolete Setf Customization): Delete
+	cl-incf and cl-decf documentation, moving any relevant parts to lispref.
+	Delete some parts that seem to primarily regard implementation details
+	that do not warrant inclusion in lispref.  Update all examples to use
+	incf/decf.
+
+2025-02-22  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Fix last commit to wid-edit.el
+
+	* lisp/wid-edit.el (widget-editable-list-entry-create): Don't
+	use save-excursion when indenting.  Previously, it was needed
+	because we inserted the :entry-format string, but we don't do
+	that anymore.  (Bug#53606)
+
+	https://lists.gnu.org/archive/html/emacs-devel/2025-02/msg00958.html
+
+2025-02-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(help--append-keystrokes-help): Fix bug#76341
+
+	* lisp/help.el (help--append-keystrokes-help): Silence the help message
+	when there is no help key.
+
+2025-02-22  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el (treesit-up-list, treesit-outline-level): Improve.
+
+	Try to get the parent parser host node that contains the
+	embedded parser and continue the search from it (bug#76398).
+
+2025-02-22  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete self-evident explanation from cl.texi
+
+	* doc/misc/cl.texi (Setf Extensions): Delete self-evident
+	explanation.
+
+2025-02-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Make 'text-property-default-nonsticky' buffer-local when set
+
+	* src/textprop.c (syms_of_textprop)
+	<text-property-default-nonsticky>: Make buffer-local when set.
+	(Bug#76445)
+
+	* etc/symbol-releases.eld: Add text-property-default-nonsticky.
+
+	* etc/NEWS:
+	* doc/lispref/text.texi (Sticky Properties): Document the change.
+
+2025-02-22  Stefan Kangas  <stefankangas@gmail.com>
+
+	Expand tests for cl-incf and cl-decf
+
+	* test/lisp/emacs-lisp/cl-lib-tests.el (cl-lib-test-incf)
+	(cl-lib-test-decf): Expand tests.
+
+2025-02-22  Philip Kaludercic  <philipk@posteo.net>
+
+	Fix bug where VC packages were missing summaries
+
+	* lisp/emacs-lisp/package-vc.el
+	(package-vc--generate-description-file): Run the heuristic to
+	determine the package summary if the current description is just
+	the default package summary.  (Bug#76065)
+
+2025-02-22  Lockywolf  <for_emacs-recentf-patch_2023-12-21@lockywolf.net>
+
+	recentf.el: Add verbosity option
+
+	* lisp/recentf.el (recentf-show-messages): New defcustom to
+	control verbosity.
+	(recentf-save-list): Use that to control verbosity.  (Bug#67946)
+
+2025-02-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/net/tramp-sh.el (tramp-find-executable): Fix check.
+
+2025-02-22  shipmints  <shipmints@gmail.com>
+
+	define-ibuffer-op opstring active-opstring functions (bug#76222)
+
+	* lisp/ibuf-macs.el: (define-ibuffer-op): 'opstring' and
+	'active-opstring' can now be strings or functions.
+
+	* etc/NEWS: Announce the change.
+
+2025-02-22  shipmints  <shipmints@gmail.com>
+
+	Inhibit "Wrote" message in saveplace.el when non-interactive
+
+	* lisp/saveplace.el (save-place-alist-to-file): Tell 'write-region'
+	to be quiet when called non-interactively.  This is in harmony with
+	'savehist-save'.  (Bug#76267)
+
+2025-02-22  Visuwesh  <visuweshm@gmail.com>
+
+	Make yank-media auto select the best mime type
+
+	* lisp/yank-media.el (yank-media-preferred-types): Add new
+	variable that holds the list of mime types in order of their
+	preference.
+	(yank-media-autoselect-function): Add new variable and function
+	to choose the most preferred media type.
+	(yank-media): Make 'yank-media' choose the most preferred mime
+	type by default.
+	* doc/emacs/killing.texi (Clipboard):
+	* doc/lispref/frames.texi (Yanking Media): Document the new
+	behaviour, and the new variables.
+	* etc/NEWS: Announce the change.  (Bug#75116)
+
+2025-02-22  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Speed up widget creation (Bug#53606)
+
+	* lisp/wid-edit.el (widget-default-create, widget-checklist-add-item)
+	(widget-radio-add-item, widget-editable-list-entry-create): Don't
+	insert format escapes into the buffer, only to delete them after.
+	This avoids calls to delete-char and makes widget creation about 3
+	times faster.
+
+2025-02-22  Stefan Kangas  <stefankangas@gmail.com>
+
+	* admin/check-doc-strings: Reduce false positives.
+
+2025-02-22  F. Jason Park  <jp@neverwas.me>
+
+	Use .pem extension for client certs in ERC docs
+
+	* doc/misc/erc.texi (Connecting): Change file-name extensions to .pem in
+	all examples, and explain that the key and the cert can be combined into
+	one file.
+	(SASL): Use .pem extension for certs.
+	* lisp/erc/erc.el (erc--warn-once-before-connect): Revise doc.
+	(erc-tls): Use .pem extension for certs.  (Bug#76278)
+
+2025-02-22  F. Jason Park  <jp@neverwas.me>
+
+	Don't kill window buffer in erc--split-line
+
+	* lisp/erc/erc-backend.el (erc--split-line): Restore original window
+	buffer before killing temp buffer.  (Bug#76404)
+
+2025-02-21  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete note on Emacs 19 modes from comint.el
+
+	* lisp/comint.el: Delete note on how to convert pre-Emacs 20 modes to
+	use comint.el.  Emacs 20 was released in 1997, so it's safe to assume
+	that any relevant code has been updated in the last three decades.
+
+2025-02-21  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	Fix identation in csharp-mode.el
+
+	* lisp/progmodes/csharp-mode.el (csharp-ts-mode--indent-rules): Fix
+	indentation for using statements and multiline lambdas.  (Bug#75883)
+	Patch based on bug report by Dino Chiesa <dpchiesa@hotmail.com>.
+
+2025-02-21  Stefan Kangas  <stefankangas@gmail.com>
+
+	New user option checkdoc-allow-quoting-nil-and-t
+
+	* lisp/emacs-lisp/checkdoc.el (checkdoc-allow-quoting-nil-and-t):
+	New user option that allows turning off the warning for having nil
+	and t in quotes.
+	(checkdoc-this-string-valid-engine): Use above new option.
+
+2025-02-21  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in admin/gitmerge.el
+
+	* admin/gitmerge.el (gitmerge-mode-map): Prefer defvar-keymap.
+
+2025-02-21  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in auth-source.el
+
+	* lisp/auth-source.el (read-passwd-map): Prefer defvar-keymap.
+
+2025-02-21  Michael Albinus  <michael.albinus@gmx.de>
+
+	Use a persistent directory as default directory in diff
+
+	* lisp/vc/diff.el (diff-no-select): Use `temporary-file-directory'
+	as default directory.  Set default file permissions temporarily to
+	#o600.  (Bug#69606)
+
+2025-02-21  Juri Linkov  <juri@linkov.net>
+
+	New variable 'treesit-aggregated-outline-predicate' (bug#76398)
+
+	* doc/lispref/modes.texi (Outline Minor Mode):
+	Add 'treesit-aggregated-outline-predicate'.
+
+	* lisp/treesit.el (treesit-aggregated-outline-predicate):
+	New buffer-local variable.
+	(treesit-outline--at-point):
+	Use 'treesit-aggregated-outline-predicate'.
+	(treesit-closest-parser-boundary): New function.
+	(treesit-outline-search): Use 'treesit-aggregated-outline-predicate'
+	and 'treesit-closest-parser-boundary'.
+	(treesit-outline-level): Use 'treesit-aggregated-outline-predicate'.
+	(treesit-major-mode-setup): Add 'treesit-aggregated-outline-predicate'.
+
+	* lisp/textmodes/html-ts-mode.el (html-ts-mode--outline-predicate):
+	Improve.
+
+	* lisp/textmodes/mhtml-ts-mode.el (mhtml-ts-mode):
+	Set 'treesit-aggregated-outline-predicate'.
+
+2025-02-21  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	25ba2536091 Fix reported Haiku build error in emacs-30.1-rc1
+	92e96a11752 ; Delete troff markers from ChangeLog files
+
+2025-02-21  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	3515ff95bce Update files for Emacs 30.1
+	375c3622e2d ; Fix typo introduced in "* ChangeLog.4: Reformat down to...
+
+2025-02-21  Po Lu  <luangruo@yahoo.com>
+
+	* configure.ac (BOBJECTLIST_OWNERSHIP_IS_TEMPLATE_PARAMETER): Correct test.
+
+2025-02-20  Philip Kaludercic  <philipk@posteo.net>
+
+	Have 'submit-emacs-patch' insert maintainers into X-Debbugs-Cc
+
+	* lisp/mail/emacsbug.el (submit-emacs-patch): Go through all files
+	mentioned in the diff and check for maintainers.
+	(submit-emacs-patch-excluded-maintainers): Add constant.  (Bug#69646)
+
+2025-02-20  Mattias Engdegård  <mattiase@acm.org>
+
+	* lisp/subr.el (oddp, evenp): Pure.  % faster than logand.
+
+	* src/fns.c (Fmapconcat): Faster fast-path condition
+
+2025-02-20  Juri Linkov  <juri@linkov.net>
+
+	Remove duplicate information from some completing-read-multiple prompts
+
+	* lisp/info.el (info-finder):
+	* lisp/emacs-lisp/package.el (package-isolate)
+	(package-menu-filter-by-archive, package-menu-filter-by-keyword):
+	Remove mentions of comma separator from the prompts
+	since now 'completing-read-multiple' shows this information
+	by the default format (bug#76028).
+
+2025-02-20  Po Lu  <luangruo@yahoo.com>
+
+	Fix signal when first enabling Custom-mode on non-GUI builds
+
+	* lisp/cus-edit.el (Custom-mode): Define tool-bar-map if not
+	bound and elaborate why this must be arranged.
+
+2025-02-20  Po Lu  <luangruo@yahoo.com>
+
+	Fix set-time-zone-rule on DJGPP
+
+	* lisp/loadup.el ("tooltip"): Load even on MS-DOS.
+
+	* src/timefns.c (tzvalbuf): Don't define on MS-DOS.
+	(emacs_getenv_TZ, emacs_setenv_TZ) [MSDOS]: Call getenv and
+	putenv rather than overwrite existing environment storage to
+	update DJGPP's environment modification counter.
+
+2025-02-20  Po Lu  <luangruo@yahoo.com>
+
+	Port to modern GCC and pdumper on MS-DOS
+
+	* config.bat (mvOk): Protoize.
+	(djgppOk): Include sys/version.h for _DJGPP_MINOR.
+
+	* lisp/loadup.el: If system-type is ms-dos, dump bootstrap-emacs
+	as b-emacs.dmp.
+
+	* msdos/INSTALL: Document new versions of tools that have been
+	verified successfully to compile Emacs.
+
+	* msdos/emacs.djl: New linker script that arranges to link
+	symbols in `.subrs' in a contiguous part of data, as the DJGPP
+	runtime appears to treat any non-data and non-text section as
+	allocatable.
+
+	* msdos/mainmake.v2 (install): Install emacs.dmp alongside
+	emacs.exe.
+
+	* msdos/sed1v2.inp (CFLAGS): Define to -O2 -g3.
+	(LDFLAGS): Provide the said linker script.
+	(HAVE_PDUMPER): Define to yes.
+	(UNEXEC_OBJ, PAXCTL_dumped, PAXCTL_notdumped): Delete.
+	(DUMPING): Set to pdumper.
+	(MAKE_PDUMPER_FINGERPRINT): Don't erase this variable.
+	Don't stubify or set minstack.  Remove native-comp specific
+	directives.  Don't remove temacs prior to copying and replace
+	`pdmp' extension with DOS-conformant `dmp'.
+
+	* msdos/sed2v2.inp (HAVE_UNEXEC): Remove definition.
+	(HAVE_PDUMPER): Define to 1.
+
+	* msdos/sed6.inp (top_srcdir): Define appropriately.
+
+	* msdos/sedlibmk.inp (HAVE_BLKCNT_T): Define to 1.
+
+	* src/emacs.c (load_pdump) [MSDOS]: Use `dmp' suffix.
+
+	* src/pdumper.c (Fdump_emacs_portable) [MSDOS]: Replace ".pdmp"
+	suffixes with ".dmp".
+
+2025-02-19  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in conf-mode.el
+
+	* lisp/textmodes/conf-mode.el (conf-mode-map): Prefer defvar-keymap.
+
+2025-02-19  Michael Albinus  <michael.albinus@gmx.de>
+
+	Simplify Tramp's find-executable
+
+	* lisp/net/tramp-cache.el (with-tramp-saved-connection-property):
+	Fix typo.
+
+	* lisp/net/tramp-compat.el: Add TODO.
+
+	* lisp/net/tramp-sh.el (tramp-find-executable): Simplify, using
+	"type -P ...".
+	(tramp-set-remote-path): Better handling of superlong $PATH.
+	(tramp-get-remote-path): Adapt/use connection properties.
+
+	* test/lisp/net/tramp-tests.el (tramp--test-enabled)
+	(tramp-test03-file-name-host-rules): Don't wrap
+	`tramp-cleanup-connection' with `ignore-errors'.
+
+2025-02-19  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	ded77fefffa Fix remaining Android bugs reported over the past months
+
+2025-02-19  Jared Finder  <jared@finder.org>
+
+	* lisp/subr.el (read-key): Add 'tab-line' (bug#76408).
+
+2025-02-19  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Don't call x-popup-function for non-tty frames
+
+	* src/menu.c (x_popup_menu_1): Don't call x-popup-function for non-tty
+	frames
+	(syms_of_menu): Remove Qx_popup_menu_function because unused, extend doc
+	string of x-popup-menu-function.
+
+2025-02-19  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	e97be722d39 Properly move existing tooltips on Android
+	0cf3d341522 ; * ChangeLog.4: Reformat down to 28 March 2024.
+	ccaa0be8e71 ; * ChangeLog.4: Check in ommitted change.
+	b5410cbea2e ; * ChangeLog.4: Fix log entries down to the 1 May 2024.
+	be7625cae73 ; Fix typos
+	d447cd9fcc0 ; * ChangeLog.4: Update.
+	5dc2a573750 ; * admin/authors.el (authors-ignored-files): Ignore gnus...
+
+2025-02-19  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	Handle nil top frame (bug#76410)
+
+	* src/frame.c (do_switch_frame): Don't assume that top_frame is always a
+	frame, it can be nil.
+
+2025-02-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(json-pretty-print): Rework a bit
+
+	* lisp/json.el (json-pretty-print): Call 'replace-buffer-contents'
+	separately for each json object rather than once at the end, so
+	its work is easier.  Use 'json--print' rather than 'json-encode' so as
+	to avoid creating yet more temp buffers.
+
+2025-02-19  Po Lu  <luangruo@yahoo.com>
+
+	Don't insist on the presence of a mouse in strokes-mode
+
+	* lisp/strokes.el (strokes-mode): Don't test `display-mouse-p',
+	as the presence of a mouse may vary over the course of an Emacs
+	session.
+
+2025-02-19  kobarity  <kobarity@gmail.com>
+
+	Add python-ts-mode to ffap-alist
+
+	* lisp/progmodes/python.el (ffap-alist): Add
+	python-ts-mode.  (Bug#76364)
+
+2025-02-18  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make cl-locally obsolete
+
+	* doc/misc/cl.texi (Declarations): Don't document cl-locally.
+	* lisp/emacs-lisp/cl-macs.el (cl-locally): Make into obsolete
+	function alias for progn.
+
+2025-02-18  Rahul Martim Juliato  <rahul.juliato@gmail.com>
+
+	Add markdown-ts-mode
+
+	* lisp/textmodes/markdown-ts-mode.el: New file.
+	Ref: https://lists.gnu.org/r/emacs-devel/2024-06/msg01061.html
+
+2025-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(lexical-binding): Allow changing the default value (bug#74145)
+
+	* lisp/loadup.el: Preserve (default-toplevel-value 'lexical-binding).
+
+	* src/lread.c (Fload, Feval_buffer): Obey (default-toplevel-value
+	'lexical-binding).
+
+	* doc/lispintro/emacs-lisp-intro.texi (Lexical vs Dynamic Binding
+	Example): Use the lexical dialect also for the dynamic
+	scoping example.
+	* doc/lispref/edebug.texi (Edebug Eval): Remove long-obsolete mention
+	of Edebug support for `lexical-let`.
+
+2025-02-18  Liu Hui  <liuhui1610@gmail.com>
+
+	Disable PyREPL in Python shell
+
+	The new default REPL (PyREPL) in Python 3.13 is incompatible
+	with Python shell and displays a warning message when reverting
+	to the old basic REPL.
+
+	* lisp/progmodes/python.el
+	(python-shell--calculate-process-environment): Use the basic
+	REPL.  (Bug#76205)
+
+2025-02-18  kobarity  <kobarity@gmail.com>
+
+	Improve completion in IPython/Python 3.13
+
+	IPython/Python 3.13 indirectly imports rlcompleter, and the
+	completer is set up to reference rlcompleter.__main__.
+	However, this rlcompleter.__main__ is different from the
+	__main__ in the REPL execution.  Therefore, this completer
+	cannot correctly complete the REPL globals.  To address this
+	issue, we override rlcompleter.__main__ with __main__ only in
+	the case of IPython.
+
+	* lisp/progmodes/python.el (python-shell-completion-native-setup):
+	Modify __PYTHON_EL_native_completion_setup().  (Bug#76205)
+
+2025-02-18  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in tcl.el
+
+	* lisp/progmodes/tcl.el (tcl-mode-map, inferior-tcl-mode-map): Prefer
+	defvar-keymap.
+
+2025-02-18  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in pascal.el
+
+	* lisp/progmodes/pascal.el (pascal-mode-map, pascal-outline-map):
+	Prefer defvar-keymap.
+
+2025-02-18  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in meta-mode.el
+
+	* lisp/progmodes/meta-mode.el (meta-common-mode-map): Prefer
+	defvar-keymap.
+
+2025-02-18  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer plusp to open-coding it in image-dired
+
+	* lisp/image/image-dired.el (image-dired-display-thumbs)
+	(image-dired-forward-image, image-dired-slideshow-start)
+	(image-dired-line-up-interactive): Prefer plusp to open-coding it.
+
+2025-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(replace_range): Delete last arg, always the negation of the first bool
+
+	* src/insdel.c (replace_range): Merge last arg, with `prepare`.
+	Rename `prepare` to `run-mode-hooks`.
+	* src/lisp.h (replace_range): Adjust accordingly.
+	* src/editfns.c (Ftranslate_region_internal):
+	* src/cmds.c (internal_self_insert):
+	* src/search.c (Freplace_match): Adjust callers.
+
+2025-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	src/search.c (Freplace_match): Let `replace_range` call the a-c-f
+
+2025-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* src/editfns.c (Fsubst_char_in_region): Delete left-over code
+
+	This code was missed back in 2000 (commit 1b16afa45bb6).
+
+2025-02-18  Gerd Möllmann  <gerd.moellmann@gmail.com>
+
+	* src/menu.c (x_popup_menu_1): Use calln.
+
+2025-02-18  Po Lu  <luangruo@yahoo.com>
+
+	* src/menu.c (x_popup_menu_1): Fix coding style.
+
+2025-02-18  Po Lu  <luangruo@yahoo.com>
+
+	Don't access overriding-text-conversion-style when unbound
+
+	* lisp/replace.el (perform-replace): Don't access
+	overriding-text-conversion-style when unbound, and also avoid
+	needlessly polluting this symbol with a binding.  (bug#76371)
+
+2025-02-18  Gerd Möllmann  <gerd,moellmann@gmail.com>
+
+	Add x-popup-menu-function
+
+	* src/menu.c (x_popup_menu_1): If non-nil call x-popup-menu-function.
+	(syms_of_menu): DEFSYM x-popup-menu-function, DEFVAR_LISP it.
+
+2025-02-18  Gerd Möllmann  <gerd,moellmann@gmail.com>
+
+	Hide cursor based on tty frame's `cursor-type'
+
+	* src/dispnew.c (terminal_cursor_magic): if selected-frame has
+	`(cursor-type . nil)' parameter.
+
+2025-02-18  john muhl  <jm@pub.pink>
+
+	Add MPD stats viewer to 'mpc' (Bug#76350)
+
+	* lisp/mpc.el (mpc-server-stats): New command.
+	(mpc-mode-menu): Add menu item.
+	(mpc--server-stats-date, mpc--server-stats-duration):
+	New variable.
+	(mpc--server-stats-date, mpc--server-stats-duration):
+	(mpc--server-stats-format): New function.
+	(mpc-song-viewer-value, mpc-song-viewer-tag):
+	(mpc-song-viewer-empty): Remove face.
+	(mpc-table-value, mpc-table-key, mpc-table-empty): New face.
+	(mpc-describe-song): Use new table face names.
+
+2025-02-18  Basil L. Contovounesios  <basil@contovou.net>
+
+	Improve autoconf-mode macro detection
+
+	* doc/lispref/modes.texi (Search-based Fontification): Fix
+	indentation of (MATCHER . FACESPEC) example.
+	* doc/misc/cc-mode.texi (Performance Issues): Index
+	defun-prompt-regexp under variables, not functions.
+
+	* lisp/progmodes/autoconf.el (autoconf--symbol, autoconf--macro):
+	New rx definitions.
+	(autoconf-definition-regexp): Use an optional second capture group
+	to indicate a function rather than variable definition.  Detect
+	AC_DEFINE defining a function-like CPP macro.  Skip more shell
+	syntax such as variable ${} expansion and command `` substitution in
+	AC_DEFINE_UNQUOTED variable.  Match AH_VERBATIM, AM_CONDITIONAL, and
+	AM_MISSING_PROG as defining variables, and AC_DEFUN, AC_DEFUN_ONCE,
+	AU_ALIAS, and AU_DEFUN as defining functions.  Document first
+	capture group in docstring.
+	(autoconf-font-lock-keywords): Use autoconf--macro to match more
+	Autoconf macros, such as those defined in the Autoconf Archive and
+	Gnulib.  Reserve font-lock-function-name-face for function
+	definitions as determined by autoconf-definition-regexp, and use
+	font-lock-variable-name-face for the rest instead.  Use Font Lock
+	face symbols directly in place of their corresponding variable.
+	Fontify M4 changequote primitive only as a standalone symbol.
+	(autoconf-imenu-generic-expression): Add commentary mentioning new
+	submenu possibility.
+	(autoconf-current-defun-function): Update docstring accuracy.
+	Replace line-end-position with pos-eol since there are no fields.
+	(autoconf-mode): Define defun-prompt-regexp in terms of
+	autoconf--macro to support more toplevel macros, such as those
+	defined in Autoheader, M4sh, etc.  Set
+	open-paren-in-column-0-is-defun-start to nil to avoid false
+	positives when an Autoconf quote character is in column zero.
+
+	* test/lisp/progmodes/autoconf-resources/configure.ac: New file.
+	* test/lisp/progmodes/autoconf-tests.el
+	(autoconf-tests-current-defun-function-define)
+	(autoconf-tests-current-defun-function-subst): Replace character
+	motion with search.
+	(autoconf-tests-autoconf-mode-comment-syntax): Ditto.  Test both dnl
+	and # comments.  Use syntax-ppss-context.
+	(autoconf-tests-font-lock): New test.
+
+2025-02-17  Antero Mejr  <mail@antr.me>
+
+	Add file completion for git apply, am to pcomplete
+
+	* lisp/pcmpl-git.el (pcomplete/git): Add an "apply" and "am" clause to
+	complete all files.  (Bug#76356)
+
+2025-02-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer oddp/evenp to open-coding in a few more cases
+
+	* lisp/arc-mode.el (archive-zip-summarize):
+	* lisp/cus-edit.el (setopt):
+	* lisp/isearch.el (isearch-backslash):
+	* lisp/simple.el (blink-paren-post-self-insert-function):
+	* lisp/subr.el (setq-local, buffer-local-set-state):
+	* lisp/term.el (term-within-quotes):
+	* test/src/data-tests.el (test-bool-vector-bv-from-hex-string): Use
+	oddp/evenp instead of open-coding them.
+	Reported by Pip Cet <pipcet@protonmail.com>.
+
+2025-02-17  Richard Stallman  <rms@gnu.org>
+
+	merging with my changes in cond-star.el.
+
+2025-02-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer plusp/minusp to open-coding them in subr.el
+
+	* lisp/subr.el (lsh, nbutlast, number-sequence, add-to-history)
+	(read-char-from-minibuffer, split-string, subst-char-in-string)
+	(forward-whitespace, forward-symbol, forward-same-syntax)
+	(progress-reporter-do-update, version-list-<): Prefer plusp/minusp to
+	open-coding them.
+
+2025-02-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer plusp/minusp to cl-plusp/cl-minusp
+
+	* lisp/dired.el (dired--move-to-next-line):
+	* lisp/emacs-lisp/ert.el (ert-run-tests-batch, ert-face-for-stats):
+	* lisp/emacs-lisp/pp.el (pp--format-definition):
+	* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event--org-timestamp):
+	* lisp/ibuffer.el (ibuffer-compile-format, ibuffer--format-title)
+	(ibuffer--format-summary):
+	* lisp/image-mode.el (image-transform-set-percent):
+	* lisp/international/emoji.el (emoji--list-generate, emoji--read-emoji):
+	* lisp/progmodes/ebrowse.el (ebrowse-set-tree-indentation)
+	(ebrowse-set-member-buffer-column-width)
+	(ebrowse-cyclic-display-next/previous-member-list)
+	(ebrowse-draw-member-short-fn)
+	(ebrowse-switch-member-buffer-to-sibling-class, ebrowse-push-position):
+	* lisp/textmodes/dns-mode.el (dns-mode-reverse-and-expand-ipv6):
+	* test/lisp/emacs-lisp/bytecomp-tests.el
+	(bytecomp-tests--not-writable-directory)
+	(bytecomp-tests--dest-mountpoint)
+	(bytecomp-tests--target-file-no-directory):
+	* test/lisp/emacs-lisp/cl-seq-tests.el (cl-member-if-test)
+	(cl-member-if-not-test, cl-assoc-if-not-test, cl-rassoc-if-test)
+	(cl-rassoc-if-not-test):
+	* test/src/emacs-module-tests.el (mod-test-add-nanosecond/valid):
+	Prefer plusp and minusp to cl-plusp and cl-minusp.
+
+2025-02-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	New functions plusp and minusp
+
+	* lisp/emacs-lisp/cl-lib.el (cl-plusp, cl-minusp): Move from here...
+	* lisp/subr.el (plusp, minusp): ...to here.  Make old names into
+	aliases, documented as deprecated.  Add type declarations.  Change from
+	defsubst to regular functions with compiler macros.
+	* lisp/obsolete/cl.el: Don't alias plusp and minusp.
+
+	* test/lisp/emacs-lisp/cl-lib-tests.el (cl-lib-test-plusp)
+	(cl-lib-test-minusp): Move tests from here...
+	* test/lisp/subr-tests.el (subr-test-plusp, subr-test-minusp):
+	...to here.
+
+	* doc/lispref/numbers.texi (Predicates on Numbers): Document plusp
+	and minusp.
+	* doc/misc/cl.texi (Predicates on Numbers): Delete cl-plusp and
+	cl-minusp.
+	* lisp/emacs-lisp/shortdoc.el (number): Document plusp and minusp
+	instead of cl-plusp and cl-minusp.
+
+2025-02-17  Yuan Fu  <casouri@gmail.com>
+
+	Rename treesit-add-simple-indent-rules
+
+	* lisp/treesit.el (treesit-add-simple-indent-rules): Rename to
+	treesit-simple-indent-add-rules.
+	* etc/NEWS: Update.
+	* test/src/treesit-tests.el:
+	(treesit-test-simple-indent-add-rules): Update accordingly.
+
+2025-02-17  Yuan Fu  <casouri@gmail.com>
+
+	Rename treesit-simple-indent-modify-rules and fix docstring
+
+	* lisp/treesit.el (treesit-simple-indent-modify-rules): Rename
+	and fix docstring.  It should be matcher, not anchor.  Also
+	reword a little bit.
+	* etc/NEWS: Update.
+	* lisp/textmodes/mhtml-ts-mode.el:
+	(mhtml-ts-mode--treesit-indent-rules): Update accordingly.
+
+2025-02-17  Yuan Fu  <casouri@gmail.com>
+
+	Make mhtml-ts-mode--treesit-indent-rules a function
+
+	* lisp/textmodes/mhtml-ts-mode.el:
+	(mhtml-ts-mode--treesit-indent-rules): Turn into a function.
+	(mhtml-ts-mode): Update accordingly.
+
+2025-02-17  Kévin Le Gouguec  <kevin.legouguec@gmail.com>
+
+	Test vc-git-dir-extra-headers directly (bug#76187)
+
+	* test/lisp/vc/vc-git-tests.el (vc-git-test--run): Make sure to
+	log output from failing Git commands.
+	(vc-git-test--dir-headers): Stop bothering with vc-dir
+	internals and just invoke the branch-munging and
+	header-formatting code we mean to test.
+	(vc-git-test-dir-branch-headers): Stop invoking vc-dir; just set
+	default-directory to be able to pass it to the backend function.
+
+2025-02-17  Pip Cet  <pipcet@protonmail.com>
+
+	Fix compilation errors due to insufficient compiler safety (bug#63288)
+
+	The default safety level is 1.  Restoring the default safety level to
+	1 after it was temporarily 0 should reset byte-compile-delete-errors
+	to nil, its default level.  Failing to do that resulted in
+	miscompilation of code in highly-parallel builds.
+
+	* lisp/emacs-lisp/cl-macs.el (cl--do-proclaim): Change
+	'byte-compile-delete-errors' to become t only at 'safety' level 0, not
+	levels 1 or 2.
+
+2025-02-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer '(oddp A)' to '(= 1 (logand A 1))'
+
+	* lisp/calendar/todo-mode.el (todo-padded-string):
+	* lisp/emacs-lisp/gv.el (setf):
+	* lisp/emacs-lisp/macroexp.el (macroexp--expand-all):
+	* lisp/hexl.el (hexl-insert-hex-string):
+	* lisp/play/gamegrid.el (gamegrid-xbm):
+	* lisp/play/hanoi.el (hanoi-internal):
+	* lisp/progmodes/ebnf2ps.el (ebnf-end-of-string):
+	* lisp/progmodes/elisp-mode.el (elisp--highlight-function-argument):
+	* lisp/progmodes/ruby-mode.el (ruby-backward-sexp):
+	* lisp/ps-print.el (ps-print-page-p):
+	(ps-print-sheet-p): Prefer '(oddp A)' to '(= 1 (logand A 1))' and
+	variations thereof.
+
+2025-02-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer '(evenp A)' to '(= 0 (logand A 1))'
+
+	* lisp/calc/calc-arith.el (calcFunc-dint):
+	* lisp/calculator.el (calculator-expt):
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-unfold-bcf):
+	* lisp/emacs-lisp/elint.el (elint-check-defcustom-form):
+	* lisp/ps-print.el (ps-print-page-p):
+	(ps-print-sheet-p): Prefer '(evenp A)' to '(= 0 (logand A 1))' and
+	variations thereof.
+
+2025-02-17  Mattias Engdegård  <mattiase@acm.org>
+
+	Make the rx `eval` form use lexical binding when active
+
+	Previously, it always used dynamic binding.
+
+	* lisp/emacs-lisp/rx.el (rx--expand-eval): Heed `lexical-binding`.
+	* test/lisp/emacs-lisp/rx-tests.el (rx-tests--x, rx-tests--get-x)
+	(rx-eval): Add test case.
+	* etc/NEWS: Announce.
+
+2025-02-17  Gerd Möllmann  <gerd,moellmann@gmail.com>
+
+	Fix child coordinate calculation (bug#76321)
+
+	* src/dispnew.c (rect_intersect): Simplify.
+	(copy_child_glyphs): Compute child coordinates using child_xy.
+
+2025-02-17  Po Lu  <luangruo@yahoo.com>
+
+	Adapt query-replace and lazy highlighting to text conversion
+
+	* lisp/isearch.el (isearch-lazy-highlight-new-loop): Rather call
+	redisplay to guarantee a valid window-start than sit-for, to
+	account for cases where this function is called from an
+	after-change-function bound to a special input event quickly
+	followed by another event that does not modify the buffer.
+
+	* lisp/progmodes/prog-mode.el (treesit-node-at): Declare
+	function before references.
+
+	* lisp/replace.el (perform-replace): When querying, suppress
+	text conversion around the input loop.
+
+2025-02-17  Martin Rudalics  <rudalics@gmx.at>
+
+	When ignoring parameters let 'split-window' split root window (Bug#76317)
+
+	This fixes a behavior introduced by the fix of Bug#73527 that splits the
+	main window when the caller asks for splitting the root window.
+
+	* lisp/window.el (window--make-major-side-window): Bind
+	'ignore-window-parameters' to t so 'split-window' won't mess
+	with the WINDOW argument when it specifies the root window.
+	(split-window): If 'ignore-window-parameters' is non-nil, don't
+	try to split the main window instead of the root window.
+
+2025-02-17  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-revert-file: Support reverting directories
+
+	* lisp/vc/vc.el (vc-revert-file): Support reverting directories
+	by calling vc-responsible-backend instead of vc-backend when
+	FILE is a directory (bug#37310, bug#43464).  Based on an
+	approach by Dmitry Gutov <dmitry@gutov.dev>.
+	(vc-rename-file): Add a FIXME to support reverting directories.
+	* etc/NEWS: Document the new functionality.
+
+2025-02-17  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	Add mhtml-ts-mode.
+
+	New major-mode alternative to mhtml-mode, based on treesitter, for
+	editing files containing html, javascript and css.
+
+	* etc/NEWS: Mention the new mode and new functions.
+	* lisp/textmodes/mhtml-ts-mode.el: New file.
+	* lisp/progmodes/js.el
+	(js--treesit-thing-settings): New variable.
+	(js--treesit-font-lock-feature-list); New variable.
+	(js--treesit-simple-imenu-settings): New variable.
+	(js--treesit-defun-type-regexp): New variable.
+	(js--treesit-jsdoc-comment-regexp): New variable.
+	(js-ts-mode): Use of new variables instead of direct assignment of
+	values.
+	* lisp/textmodes/css-mode.el
+	(css-mode--menu): New variable.
+	(css-mode-map): Use new variable.
+	(css--treesit-font-lock-feature-list): New variable.
+	(css--treesit-simple-imenu-settings): New variable.
+	(css--treesit-defun-type-regexp): New variable.
+	(cs-ts-mode): Use of new variables instead of direct assignment of
+	values.
+	* lisp/textmodes/html-ts-mode.el
+	(html-ts-mode--treesit-things-settings): New variable.
+	(html-ts-mode--treesit-font-lock-feature-list): New variable.
+	(html-ts-mode--treesit-simple-imenu-settings): New variable.
+	(html-ts-mode--treesit-defun-type-regexp): New variable.
+	(html-ts-mode): Use of new variables instead of direct assignment of
+	values.
+	* lisp/treesit.el
+	(treesit-merge-font-lock-feature-list): New fuction.
+	(treesit-replace-font-lock-feature-settings): New fuction.
+	(treesit-modify-indent-rules): New function.
+
+2025-02-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer '(evenp A)' to '(= 0 (% A 2))'
+
+	* lisp/calc/calc-comb.el (math-prime-test):
+	* lisp/calc/calc-keypd.el (calc-keypad-press):
+	* lisp/calc/calc-math.el (math-sqrt):
+	(math-sqrt-raw):
+	* lisp/calc/calc-misc.el (math-iipow):
+	(math-iipow-show):
+	* lisp/calc/calc-stat.el (calcFunc-vmedian):
+	* lisp/calendar/cal-tex.el (cal-tex-cursor-filofax-2week):
+	(cal-tex-cursor-filofax-daily):
+	* lisp/elec-pair.el (electric-pair-post-self-insert-function):
+	* lisp/emacs-lisp/checkdoc.el (checkdoc-in-example-string-p):
+	* lisp/emacs-lisp/eieio.el (defclass):
+	* lisp/emacs-lisp/ert-x.el (ert-propertized-string):
+	* lisp/emacs-lisp/ert.el (ert--significant-plist-keys):
+	(ert--plist-difference-explanation):
+	* lisp/emacs-lisp/helper.el (Helper-help-scroller):
+	* lisp/emacs-lisp/pcase.el (pcase-setq):
+	* lisp/files-x.el (setq-connection-local):
+	* lisp/gnus/gnus-uu.el (gnus-uu-post-encoded):
+	* lisp/gnus/message.el (message-make-in-reply-to):
+	* lisp/gnus/nndiary.el (nndiary-last-occurrence):
+	(nndiary-next-occurrence):
+	* lisp/mail/rfc2047.el (rfc2047-decode-region):
+	* lisp/play/5x5.el (5x5-draw-grid):
+	* lisp/play/gametree.el (gametree-compute-reduced-score):
+	(gametree-insert-new-leaf):
+	(gametree-break-line-here):
+	* lisp/play/zone.el (zone-fret):
+	* lisp/vc/ediff-ptch.el (ediff-get-patch-buffer):
+	* lisp/yank-media.el (yank-media--utf-16-p): Prefer '(evenp A)' to
+	'(= 0 (% A 2))' and variations thereof.
+
+2025-02-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer '(oddp A)' to '(= 1 (% A 2))'
+
+	* lisp/align.el (align-match-tex-pattern):
+	* lisp/calc/calc-funcs.el (math-bernoulli-number):
+	* lisp/cedet/semantic/bovine/el.el (semantic-ctxt-current-assignment):
+	* lisp/comint.el (comint-within-quotes):
+	* lisp/emacs-lisp/chart.el (chart-axis-draw):
+	* lisp/emacs-lisp/cl-extra.el (cl-round):
+	* lisp/emacs-lisp/eieio.el (defclass):
+	* lisp/emacs-lisp/elint.el (elint-check-setq-form):
+	* lisp/emulation/cua-rect.el (cua--rectangle-right-side):
+	* lisp/progmodes/gud.el (gud-gdb-completions-1):
+	* lisp/ps-print.el (ps-end-job):
+	* lisp/ses.el (ses-center):
+	* lisp/vc/ediff-ptch.el (ediff-get-patch-buffer): Prefer '(oddp A)' to
+	'(= 1 (% A 2))' and variations thereof.
+
+2025-02-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer oddp/evenp to free-coding them in tests
+
+	* test/lisp/emacs-lisp/bindat-tests.el (bindat-test--sint):
+	* test/lisp/emacs-lisp/seq-tests.el (test-seq-drop-while)
+	(test-seq-take-while, test-seq-filter, test-seq-remove)
+	(test-seq-count, test-seq-some, test-seq-find, test-seq-every-p)
+	(test-seq-group-by):
+	* test/lisp/eshell/em-pred-tests.el (eshell-with-file-attributes-from-name):
+	* test/lisp/filenotify-tests.el (file-notify-test07-many-events)
+	(file-notify-test09-watched-file-in-watched-dir):
+	* test/src/floatfns-tests.el (bignum-expt, bignum-round):
+	* test/src/undo-tests.el (undo-test4): Prefer oddp/evenp to free-coding
+	them.
+
+2025-02-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer oddp/evenp to cl-oddp/cl-evenp
+
+	* lisp/calc/calc-ext.el (math-oddp):
+	* lisp/calc/calc-misc.el (math-evenp):
+	* lisp/calendar/todo-mode.el
+	(todo-adjusted-category-label-length, todo-insert-category-line)
+	(todo-update-categories-display):
+	* lisp/emacs-lisp/cl-macs.el (cl-defstruct):
+	* lisp/net/gnutls.el (open-gnutls-stream):
+	* lisp/tab-line.el (tab-line-tab-face-inactive-alternating):
+	* test/lisp/auth-source-tests.el
+	(auth-source-test-macos-keychain-search):
+	* test/lisp/emacs-lisp/cl-extra-tests.el (cl-extra-test-notany)
+	(cl-extra-test-notevery):
+	* test/lisp/emacs-lisp/cl-lib-tests.el (cl-lib-adjoin-test):
+	* test/lisp/emacs-lisp/cl-macs-tests.el (cl-macs-loop-collect)
+	(cl-macs-loop-append/nconc, cl-macs-loop-when)
+	(cl-macs-loop-if):
+	* test/lisp/emacs-lisp/cl-seq-tests.el (cl-seq-remove-test)
+	(cl-remove-if-test, cl-remove-if-not-test, cl-seq-delete-test)
+	(cl-delete-if-test, cl-delete-if-not-test)
+	(cl-seq-substitute-if-test, cl-seq-substitute-if-not-test)
+	(cl-find-if-test, cl-find-if-not-test, cl-position-if-test)
+	(cl-seq-count-test, cl-count-if-test, cl-count-if-not-test)
+	(cl-member-if-test, cl-member-if-not-test, cl-assoc-if-test)
+	(cl-assoc-if-not-test, cl-rassoc-if-test)
+	(cl-rassoc-if-not-test):
+	* test/src/treesit-tests.el (treesit-search-forward-predicate):
+	Prefer oddp/evenp to cl-oddp/cl-evenp where possible.
+
+	* lisp/calc/calc-ext.el (cl-lib):
+	* lisp/calc/calc-misc.el (cl-lib): Don't require.
+
+2025-02-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	New functions oddp and evenp
+
+	* lisp/emacs-lisp/cl-lib.el (cl-oddp, cl-evenp): Move from here...
+	* lisp/subr.el (oddp, evenp): ...to here.  Make old names into
+	aliases, documented as deprecated.  Add type declarations.
+	* lisp/obsolete/cl.el: Don't alias oddp and evenp.
+
+	* test/lisp/emacs-lisp/cl-lib-tests.el (cl-lib-test-oddp)
+	(cl-lib-test-evenp): Move tests from here...
+	* test/lisp/subr-tests.el (subr-test-oddp, subr-test-evenp): ...to here.
+	* lisp/emacs-lisp/shortdoc.el (number): Add oddp and evenp.
+	(map): Prefer oddp and evenp to cl-oddp and cl-evenp.
+
+	* doc/lispref/numbers.texi (Predicates on Numbers): Document above new
+	functions oddp and evenp.
+	* doc/misc/cl.texi (Predicates on Numbers): Delete cl-oddp and cl-evenp.
+	(Other Clauses): Prefer oddp to cl-oddp.
+
+2025-02-17  Po Lu  <luangruo@yahoo.com>
+
+	Implement `(- N)' frame position specifications on Haiku
+
+	* src/haikuterm.c (haiku_calc_absolute_position): New function.
+	(haiku_set_offset): Apply offsets configured by the said
+	function.
+
+2025-02-17  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	e3dc0ea2544 Fix crash in frame deletion on Android
+	e34ea5db5f1 * src/pgtkterm.c (pgtk_enumerate_devices): Circumvent bug...
+	48f9d6aafea * lisp/man.el (Man-shell-file-name): Ensure a Bourne shel...
+	7016c13e5e6 ; Update etc/AUTHORS (bug#76319).
+	0bc7b5a389b ; * admin/authors.el (authors-aliases): Add "Elías Gabrie...
+	e9c4f642b9d ; * doc/emacs/package.texi (Package Installation): Add om...
+	8c4294f370f ; Move index entries in user manual
+
+	# Conflicts:
+	#	src/pgtkterm.c
+
+2025-02-17  Po Lu  <luangruo@yahoo.com>
+
+	Synchronize frame placement logic with X
+
+	* src/androidterm.c (android_calc_absolute_position): New
+	function.
+	(android_set_offset): Call android_calc_absolute_position.
+
+	* src/pgtkterm.c (pgtk_calc_absolute_position): Synchronize with
+	X.
+
+2025-02-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add test for zerop
+
+	* test/lisp/subr-tests.el (subr-test-zerop): New test.
+
+2025-02-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove some details on which files are loaded from cl.texi
+
+	* doc/misc/cl.texi (Naming Conventions): Remove section listing
+	functions that do not cause other files than cl-lib.el to be loaded.
+	It lacks practical relevance to the user, and is a hostage to changing
+	implementation details.
+
+2025-02-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Address FIXME in org-element-create
+
+	* lisp/org/org-element-ast.el (org-element-create): Address FIXME.
+
+2025-02-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer cl-evenp/cl-oddp in some places
+
+	* lisp/erc/erc.el (erc-format-message):
+	* lisp/obsolete/thumbs.el (thumbs-emboss-image):
+	* lisp/org/org-capture.el (org-capture-escaped-%):
+	* lisp/org/org-element-ast.el (org-element-create):
+	* lisp/org/org-macro.el (org-macro-extract-arguments):
+	* lisp/org/org-persist.el (org-persist--get-collection):
+	* lisp/org/ox-odt.el (org-odt-get-table-cell-styles):
+	* lisp/org/ox.el (org-export--dispatch-ui):
+	* lisp/progmodes/cperl-mode.el (cperl-forward-re)
+	(cperl-find-pods-heres): Prefer 'cl-evenp/'cl-oddp' to free-coding them
+	in some files that already depend on cl-lib in run-time.
+
+2025-02-16  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Add gtk-redo icon to x-gtk-stock-map to x-win.el
+
+	* lisp/term/x-win.el (x-gtk-stock-map): Add gtk-redo.
+
+2025-02-16  Elías Gabriel Pérez  <eg642616@gmail.com>
+
+	Add gtk-redo icon to x-gtk-stock-map
+
+	* lisp/term/pgtk-win.el (x-gtk-stock-map): Add gtk-redo.  (Bug#76349)
+
+2025-02-16  João Távora  <joaotavora@gmail.com>
+
+	Eglot: Improve fix to bug#66144
+
+	The :exit notification should also take an empty JSON object instead of
+	JSON null as its parameters.
+
+	* lisp/progmodes/eglot.el (eglot-shutdown): Use eglot--{} in
+	:exit notifcation, too.
+
+2025-02-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(set-auto-mode--find-matching-alist-entry): Fix bug#75961
+
+	* lisp/files.el (set-auto-mode--find-matching-alist-entry): Run the
+	MODE found in (REGEXP MODE t) before we replace it with something else.
+
+	* test/lisp/files-tests.el (files-tests--bug75961): New test.
+
+2025-02-15  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp: Don't require PuTTY 0.82 anymore
+
+	* doc/misc/tramp.texi: Revert last change.
+
+	* lisp/net/tramp-cache.el (with-tramp-saved-connection-properties):
+	Adapt `tramp-verbose' when completing host names.
+
+	* lisp/net/tramp-sh.el (tramp-methods) <plink, plinkx, pscp, psftp>:
+	Adapt `tramp-login-args' and `tramp-copy-args' arguments.
+	(tramp-plink-option-exists-p): New defun.
+	(tramp-ssh-or-plink-options): Rename from
+	`tramp-ssh-controlmaster-options'.  Adapt further plink options.
+	(tramp-do-copy-or-rename-file-out-of-band)
+	(tramp-maybe-open-connection): Adapt calls.
+
+	* lisp/net/tramp.el (tramp-file-name-handler): Don't touch
+	`tramp-verbose'.
+
+	* test/lisp/net/tramp-tests.el (top): Set `vc-handled-backends' to nil.
+	(tramp--test-enabled): Rearrange code.
+
+2025-02-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(diff-mode-test-font-lock): Fix spurious test failure
+
+	* test/lisp/vc/diff-mode-tests.el (diff-mode-test-font-lock):
+	Don't nitpick about non-face-affecting overlays.
+
+2025-02-15  David Ponce  <da_vid@orange.fr>
+
+	Fix DOM printing
+
+	Fix DOM printing when an attribute value is not a string, which is
+	often the case in SVG DOM.  Don't print attributes without a
+	value.  Refresh the list of HTML boolean attributes.
+	* lisp/dom.el (dom--html-boolean-attribute-p): New function.
+	(dom-print): Use it.  Convert attribute value to string before to
+	call `url-insert-entities-in-string'.  Don't print attribute
+	without a value.  Compute indentation column outside of loop and
+	call `indent-line-to' to indent line.  (Bug#5928)
+
+	* test/lisp/dom-tests.el (dom-tests-print-svg)
+	(dom-tests-print-html-boolean): New tests.
+
+2025-02-15  Richard Stallman  <rms@gnu.org>
+
+	Change criteria for non-exit cualse: car s to or a bind*.
+
+	* lisp/emacs-lisp/cond-star.el (cond*-non-exit-clause-p):
+	Don't check for keywords; a clause is non-exit if it
+	starts with t or with a bind*.
+
+2025-02-15  Daniel Mendler  <mail@daniel-mendler.de>
+
+	completing-read-multiple: CRM indication and prompt customization
+
+	The `completing-read-multiple' prompt indicates multi
+	completion.  The customization option `crm-prompt' configures
+	the formatting of the prompt.  The variable can be set to "%p"
+	in order to only display the original prompt, to "[%d] %p" to
+	display the separator description and the prompt, or to "[CRM%s]
+	%p" to display a shorter indicator of only the separator string
+	and the prompt.
+	* lisp/emacs-lisp/crm.el (crm-prompt): New user option.
+	(crm-separator): Update value and docstring.
+	(completing-read-multiple): Use `crm-prompt' to format the
+	prompt.
+	* etc/NEWS: Announce the change.
+	(Bug#76028)
+
+2025-02-15  kobarity  <kobarity@gmail.com>
+
+	Fix string end search in python-nav-end-of-statement
+
+	* lisp/progmodes/python.el (python-nav-end-of-statement):
+	Change to look for string delimiter characters and check
+	syntax, instead of looking for string-delimiter syntax.
+	* test/lisp/progmodes/python-tests.el
+	(python-nav-end-of-statement-5): New test.  (Bug#75387)
+
+2025-02-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Prevent buffer overflow in line-numbering code
+
+	* src/xdisp.c (maybe_produce_line_number): Limit the value of
+	'display-line-numbers-width' to what can be shown in the window,
+	and set dimension of the lnum_buf[] accordingly.  (Bug#75969)
+
+2025-02-15  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	58e4bfe3408 Add two missing NULL checks of malloc'd values on Android
+	81ca9c75f11 ; * etc/PROBLEMS: Document how to grant storage permissio...
+	d82d4689794 ; * etc/TODO: Rethink finder-known-keywords.
+	b9b9c33dcbe Fix (Non)GNU ELPA description in manual
+	87a61eba1b8 Move 'package-archives' documentation to emacs manual
+	316e47c5af4 ; * src/fns.c (Fmapconcat): Doc fix (bug#76242).
+	3cfbeb3fca1 ; Fix >72 character long lines in docstring
+	c68886ddb76 ; Change "virus" to "malicious" in lispref
+	6701866be4d Document (Non-)GNU ELPA in emacs manual
+	02851768b72 ; * .mailmap: Add entry for Thuna.  (Bug#76221)
+	2d7a8cbf4c8 Fix author name
+	19314257485 Use c-ts-common's comment setup in go-ts-mode (bug#75978)
+	316893ca387 Add java-language-server to eglot-server-programs
+
+2025-02-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(smerge-refine-exchange-point): Error cleanly outside refinement
+
+	* lisp/vc/smerge-mode.el (smerge-refine-regions): Cover each region
+	with an overlay.
+	(smerge-refine-exchange-point): Use it to detect more reliably that
+	we're not inside a refined region.
+
+2025-02-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(smerge-refine-exchange-point): New command
+
+	* lisp/vc/smerge-mode.el (smerge--refine-highlight-change):
+	Allow empty region and always create an overlay.  Also, remember any
+	adjustment we applied the overlay's boundaries.
+	(smerge-refine-regions): Always create two overlays per hunk and "connect"
+	them via `smerge--refine-other`.
+	(smerge-refine-exchange-point): New command.
+
+2025-02-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/term/xterm.el (xterm--query-name-and-version): Don't quote lambda
+
+2025-02-14  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer `(defsubst A ...)` to `(cl-proclaim (inline A))`
+
+	* lisp/emacs-lisp/cl-macs.el: Remove cl-proclaim...
+	* lisp/emacs-lisp/cl-extra.el (cl-map, cl-notany, cl-notevery)
+	(cl-revappend, cl-nreconc):
+	* lisp/emacs-lisp/cl-lib.el (cl-acons): ...and use defsubst
+	instead.  (Bug#76294)
+
+2025-02-14  Stefan Kangas  <stefankangas@gmail.com>
+
+	Inline important-return-value declarations in cl-lib.el
+
+	These declarations are now properly added to 'cl-lib.el' itself, or to
+	'cl-loaddefs.el'.  This means that they will now correctly show up
+	immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
+	is pulled in by an autoload.  C.f. Bug#76247.
+
+	I did not considered worth reproducing everywhere the list saying which
+	functions among the below belong to these two categories:
+	1. Functions that are side-effect-free except for the behavior of
+	   functions passed as argument.
+	2. Functions that mutate and return a list.
+
+	AFAIU, this is not actionable with our current byte-compiler, i.e. we
+	can't add any extra declarations based on it.  However, if the list
+	should be needed at some point, for example due to improvements in the
+	compiler, this commit will be where to find it.  In the worst case, and
+	with more work, it's also deducible from the source code itself.
+
+	* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
+	from here...
+	* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
+	(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
+	* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
+	* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
+	(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
+	(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
+	(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
+	(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
+	(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
+	(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
+	(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
+	(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
+	(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
+	(cl-nintersection, cl-set-difference, cl-nset-difference)
+	(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
+	(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
+	(cl-nsublis, cl-tree-equal): ...to have them inline here.
+
+2025-02-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Fix some uses of `%s` for non-strings/names
+
+	* lisp/files.el (normal-mode, set-auto-mode--apply-alist):
+	* lisp/gnus/nnimap.el (nnimap-command):
+	* lisp/emacs-lisp/bytecomp.el (bytecomp--check-cus-type):
+	Prefer %S over %s for arbitrary sexps and lists.
+
+2025-02-14  Robert Pluim  <rpluim@gmail.com>
+
+	Correct docstrings describing "Re" alternatives.
+
+	* lisp/mail/mail-utils.el (mail-re-regexps): Use "Re", not "Re:".
+	* lisp/mail/rmail.el (rmail-re-abbrevs): Here also.
+
+2025-02-14  Basil L. Contovounesios  <basil@contovou.net>
+
+	Document cl-n... set operations consistently
+
+	The docstrings of cl-nintersection and cl-nset-difference have been
+	inconsistent with their manual entries since the beginning of
+	emacs.git history (bug#76017).  This patch settles on the weaker and
+	thus backward-compatible requirement that only their first argument
+	be safe to mutate.
+
+	* lisp/emacs-lisp/bytecomp.el: Include only first argument in
+	mutates-arguments property.
+	* lisp/emacs-lisp/cl-seq.el (cl-nintersection, cl-nset-difference):
+	Make docstring consistent with manual in that the second argument is
+	not modified.
+	* test/lisp/emacs-lisp/cl-seq-tests.el (cl-nintersection-test)
+	(cl-nset-difference-test): Simplify.
+	(cl-nset-difference): Pass fresh list as second argument, otherwise
+	destructive modifications to it could go undetected.
+
+2025-02-14  Basil L. Contovounesios  <basil@contovou.net>
+
+	Consolidate some cl-lib tests
+
+	For discussion, see bug#75633#16 and the following thread:
+	https://lists.gnu.org/r/emacs-devel/2025-02/msg00053.html
+
+	* test/lisp/emacs-lisp/cl-extra-tests.el (cl-lib-test-remprop)
+	(cl-lib-test-coerce-to-vector, cl-parse-integer): Move here from
+	cl-lib-tests.el.
+	(cl-extra-test-remprop): Remove duplicate test, folding body...
+	(cl-get): ...into this test.
+	(cl-extra-test-concatenate): Remove duplicate test, folding body...
+	(cl-concatenate): ...into this test.
+	* test/lisp/emacs-lisp/cl-lib-tests.el: Update historic commentary.
+	(cl-lib-test-remprop, cl-lib-test-coerce-to-vector)
+	(cl-parse-integer): Move to cl-extra-tests.el.
+	(cl-lib-test-remove-if-not, cl-lib-test-remove)
+	(cl-lib-test-set-functions, cl-lib-test-string-position)
+	(cl-lib-test-mismatch, cl-nset-difference): Move to cl-seq-tests.el.
+	(cl-lib-test-gensym, cl-lib-keyword-names-versus-values)
+	(cl-lib-empty-keyargs, mystruct, cl-lib-struct-accessors)
+	(cl-lib-struct-constructors, cl-lib-arglist-performance, cl-the)
+	(cl-flet-test, cl-lib-test-typep, cl-lib-symbol-macrolet)
+	(cl-lib-symbol-macrolet-4+5, cl-lib-symbol-macrolet-2)
+	(cl-lib-symbol-macrolet-hide, cl-lib-defstruct-record): Move to
+	cl-macs-tests.el.
+	(cl-lib-test-endp): Remove duplicate test, folding body into
+	cl-seq-endp-test.
+	(cl-lib-set-difference): Remove duplicate test, folding body into
+	cl-set-difference-test.
+	* test/lisp/emacs-lisp/cl-macs-tests.el: Do not require cl-macs and
+	pcase.
+	(mystruct, cl-lib-struct-accessors, cl-lib-struct-constructors)
+	(cl-lib-arglist-performance, cl-lib-defstruct-record)
+	(cl-lib-symbol-macrolet, cl-lib-symbol-macrolet-4+5)
+	(cl-lib-symbol-macrolet-2, cl-lib-symbol-macrolet-hide, cl-flet-test)
+	(cl-lib-keyword-names-versus-values, cl-lib-empty-keyargs)
+	(cl-lib-test-gensym, cl-the, cl-lib-test-typep): Move here from
+	cl-lib-tests.el.
+	(cl-case-error, cl-case-warning): Fix indentation.
+	* test/lisp/emacs-lisp/cl-seq-tests.el: Require cl-lib rather than
+	cl-seq.
+	(cl-seq-endp-test): Absorb body of cl-lib-test-endp.
+	(cl-lib-test-remove, cl-lib-test-remove-if-not)
+	(cl-lib-test-string-position, cl-lib-test-mismatch)
+	(cl-lib-test-set-functions, cl-nset-difference): Move here from
+	cl-lib-tests.el.
+	(cl-set-difference-test): Absorb body of cl-lib-set-difference.
+
+2025-02-14  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt PuTTY integration into Tramp
+
+	* doc/misc/tramp.texi (Inline methods, External methods):
+	PuTTY must be at least version 0.82.
+
+	* lisp/net/tramp-cache.el (with-tramp-saved-connection-property)
+	(with-tramp-saved-connection-properties): Add traces.
+
+	* lisp/net/tramp-sh.el (tramp-methods) <plink, plinkx, pscp, psftp>:
+	Adapt `tramp-login-args' and `tramp-copy-args' arguments.  (Bug#75746)
+
+2025-02-14  Pip Cet  <pipcet@protonmail.com>
+
+	Avoid crashes in lread.c when invalid characters are read
+
+	* src/lread.c (readchar): Don't crash for non-fixnum return values.
+	(read_filtered_event): Don't crash for invalid symbol properties.
+	(Fread_char):
+	(Fread_char_exclusive):
+	(character_name_to_code): Check 'FIXNUMP' before using 'XFIXNUM'.
+	(read_char_escape): Crash on invalid Lisp-supplied data when
+	ENABLE_CHECKING; otherwise, signal an error.
+
+2025-02-14  Po Lu  <luangruo@yahoo.com>
+
+	* lisp/x-dnd.el (x-dnd-do-direct-save): Remove redundant stmts.
+
+2025-02-14  Yuan Fu  <casouri@gmail.com>
+
+	Use a heuristic to support method chaining in c-ts-common
+
+	Test for "." at the beginning of a line to detect chained method.
+
+	* lisp/progmodes/c-ts-common.el:
+	(c-ts-common--standalone-predicate): New function.
+	(c-ts-common--standalone-parent):
+	(c-ts-common--prev-standalone-sibling): Use the new heuristic.
+
+2025-02-14  Yuan Fu  <casouri@gmail.com>
+
+	Allow treesit-simple-indent-standalone-predicate to return anchor
+
+	* lisp/treesit.el:
+	(treesit-simple-indent-standalone-predicate): Allow it to return
+	an anchor instead of t.
+	(treesit-simple-indent-presets): Supports number.
+	* lisp/progmodes/c-ts-common.el:
+	(c-ts-common--standalone-parent):
+	(c-ts-common--prev-standalone-sibling): Supports number.
+
+2025-02-14  Yuan Fu  <casouri@gmail.com>
+
+	Add treesit-simple-indent-standalone-predicate (bug#74386)
+
+	* lisp/treesit.el:
+	(treesit-simple-indent-standalone-predicate): New variable.
+	(treesit-simple-indent-presets): Use the predicate.
+	(treesit-simple-indent-presets): Update docstring.
+	* lisp/progmodes/c-ts-common.el:
+	(c-ts-common--standalone-parent):
+	(c-ts-common--prev-standalone-sibling): Use the predicate if
+	non-nil.  Also, handle method chaining by default.
+	* doc/lispref/modes.texi (Parser-based Indentation): Add
+	documentation.
+
+2025-02-13  Basil L. Contovounesios  <basil@contovou.net>
+
+	Fix uncaught cl-nreconc on constant list
+
+	* test/lisp/emacs-lisp/cl-extra-tests.el (cl-extra-test-isqrt):
+	Expect most specific error type.
+	(cl-extra-test-nreconc): Pass fresh list as first argument to
+	cl-nreconc.  The usual mutates-arguments warning was not emitted,
+	possibly in relation to bug#74920 and cl-nreconc being proclaimed
+	inline.
+	(cl-extra-test-list-length): Simplify using nconc.
+
+2025-02-13  Basil L. Contovounesios  <basil@contovou.net>
+
+	Fix cl-seq-tests.el
+
+	None of the tests using the macro cl-seq--with-side-effects were
+	being evaluated (since bug#24264), and other tests were not robust
+	against destructive operations or optimizations (since bug#24264 and
+	bug#75633).  For further discussion, see:
+	https://lists.gnu.org/r/emacs-devel/2025-02/msg00053.html
+
+	* test/lisp/emacs-lisp/cl-seq-tests.el: Fit first line within 80
+	columns.  Remove empty Commentary section.
+	(cl-union-test-00): Use bug#N reference in place of URL.
+	(cl-seq-test-bug24264): Ditto.  Use nconc in place of append.
+	(cl-seq--test-list, cl-seq--test-list2, cl-seq--with-side-effects):
+	Remove.
+	(cl-seq-tests--relet*): New convenience macro replacing the need for
+	cl-seq--with-side-effects.
+	(cl-seq-fill-test, cl-seq-replace-test, cl-seq-delete-test): Use
+	cl-seq-tests--relet* to actually evaluate tests.  Avoid mutating
+	quoted literals.
+	(cl-seq-nsubstitute-test): Ditto.  Actually call cl-nsubstitute, not
+	cl-substitute.  Avoid comparing mutated argument to itself; compare
+	to its original copy instead.  Avoid calling cl-position on list
+	that is being mutated in :if predicate; use original copy instead.
+	(cl-seq-remove-test, cl-remove-if-not-test, cl-delete-if-not-test)
+	(cl-delete-duplicates-test, cl-seq-remove-duplicates-test)
+	(cl-seq-substitute-test, cl-seq-substitute-if-test)
+	(cl-seq-position-test, cl-count-if-test, cl-count-if-not-test)
+	(cl-member-if-test, cl-member-if-not-test, cl-assoc-if-test)
+	(cl-assoc-if-not-test, cl-rassoc-if-test, cl-subsetp-test):
+	Simplify.
+	(cl-remove-if-test, cl-seq-substitute-if-not-test, cl-find-if-test)
+	(cl-find-if-not-test, cl-position-if-test, cl-member-test)
+	(cl-assoc-test, cl-rassoc-test): Quote function symbols, not
+	lambdas.
+	(cl-delete-if-test): Use cl-seq-tests--relet*.  Check result of
+	cl-delete-if to avoid relying on its side effects, and to pacify
+	byte-compiler warning.
+	(cl-seq-mismatch-test): Avoid 'easy to misread' hidden argument.
+	(cl-seq-search-test): Break long line.
+	(cl-sort-test, cl-stable-sort-test, cl-merge-test): Avoid mutating
+	quoted literals.
+	(cl-intersection-test): Avoid comparing eql-ity of string literals.
+	(cl-nintersection-test, cl-nset-difference-test)
+	(cl-nset-exclusive-or-test): Avoid mutating quoted literals.  Don't
+	compare initial and final values of arguments, since they may have
+	been mutated.
+	(cl-set-difference-test, cl-set-exclusive-or-test): Use fresh
+	arguments to check for absence of mutation.
+
+2025-02-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	Inline side-effect-free declarations in cl-lib.el
+
+	* lisp/emacs-lisp/cl-macs.el: Move side-effect-free declarations from
+	here...
+	* lisp/emacs-lisp/cl-extra.el (cl-gcd, cl-lcm, cl-isqrt, cl-floor)
+	(cl-ceiling, cl-truncate, cl-round, cl-mod, cl-rem, cl-signum)
+	(cl-subseq, cl-list-length, cl-get, cl-getf):
+	* lisp/emacs-lisp/cl-lib.el (cl-plusp, cl-minusp, cl-oddp, cl-evenp)
+	(cl-fifth, cl-sixth, cl-seventh, cl-eighth, cl-ninth, cl-tenth)
+	(cl-ldiff, cl-pairlis):
+	* lisp/emacs-lisp/cl-seq.el (cl-endp): ...to have them inline here.
+
+	* lisp/emacs-lisp/cl-macs.el: Move side-effect-and-error-free
+	declarations from here...
+	* lisp/emacs-lisp/cl-extra.el (cl-equalp, cl-random-state-p):
+	* lisp/emacs-lisp/cl-lib.el (cl-list*, cl-acons): ...to have them inline
+	here.  (Bug#76247)
+
+2025-02-13  Robert Pluim  <rpluim@gmail.com>
+
+	Support non-ascii SMTP user and password strings
+
+	The user and more importantly the password used when
+	authenticating SMTP connections MUST be encoded in utf-8, and
+	'base64-encode-string' requires unibyte strings, so call
+	'encode-coding-string' on them before base64 encoding them in
+	case they are multibyte strings.
+
+	This applies to the CRAM-MD5, LOGIN, and PLAIN auth methods.
+	XOAUTH2 access tokens are specified to contain only characters
+	in the range #x20-#x7E (SPC through ~), so utf-8 encoding is not
+	necessary.
+
+	See RFC 4616 and RFC 4954 (or their later updates).
+
+	* lisp/mail/smtpmail.el (smtpmail-try-auth-method): Encode user
+	and password using utf-8 before base64 encoding.
+
+	(Bug#75628)
+
+2025-02-13  Robert Pluim  <rpluim@gmail.com>
+
+	Teach gnus/message about international Re: variants
+
+	* lisp/mail/mail-utils.el (mail-re-regexps): New defcustom,
+	contains the components used to construct 'rmail-re-abbrevs' and
+	'message-subject-re-regexp'.
+	* lisp/gnus/message.el (message-subject-re-regexp): Derive from
+	'mail-re-regexps'.
+	(message-strip-subject-re): Make the match case-insensitive.
+	* lisp/mail/rmail.el (rmail-re-abbrevs): Derive from
+	'mail-re-regexps'.  Update 'rmail-reply-regexp' when it changes.
+	(rmail-reply-regexp): Set to nil, 'rmail-re-abbrevs' will set
+	it.
+
+	* doc/emacs/rmail.texi (Rmail Reply): Describe
+	'mail-re-regexps'.
+	* doc/misc/message.texi (Message Headers): Describe
+	'mail-re-regexps'.
+
+	(Bug#72442)
+
+2025-02-13  Robert Pluim  <rpluim@gmail.com>
+
+	Use 'const' instead of 'symbol' in 'c-ts-mode-indent-style
+
+	The 'symbol' widget is for when the user is expected to enter a
+	symbol; when using a definite symbol, 'const' is preferred.
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode-indent-style): Use
+	'const' to define the options for a 'choice' widget.
+
+2025-02-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/net/tramp-archive.el (tramp-archive-all-gvfs-methods): Use `cdadr'.
+
+2025-02-13  Björn Bidar  <bjorn.bidar@thaodan.de>
+
+	Bind sieve-refresh-scriptlist to 'g' in sieve-mode
+
+	* lisp/net/sieve.el (sieve-manage-mode-map): Bind
+	`sieve-refersh-scriptlist' to 'g' to refresh buffer.
+	(sieve-refresh-scriptlist): Highlight in docstring that the function
+	updates the current sieve buffer.  (Bug#75956)
+
+	* doc/misc/sieve.texi (Managing Sieve): Document new keybinding and the
+	existing `sieve-refresh-scriptlist` function.
+
+2025-02-13  Björn Bidar  <bjorn.bidar@thaodan.de>
+
+	Add missing documentation strings in sieve.el
+
+	* lisp/net/sieve.el (sieve-activate, sieve-deactivate-all)
+	(sieve-remove, sieve-edit-script, sieve-refersh-scriptlist)
+	(sieve-upload, sieve-upload-and-burry, sieve-upload-and-kill):
+	Add documentation strings.  (Bug#75956)
+
+2025-02-13  Björn Bidar  <bjorn.bidar@thaodan.de>
+
+	Make sieve-manage prompt also for port number
+
+	(sieve-manage): Optionally read port number when called interactively.
+	Add documentation string.  (Bug#75956)
+
+2025-02-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	Avoid cl-caaar etc. compatibility aliases in Tramp
+
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-handler-askquestion):
+	(tramp-gvfs-handler-mounted-unmounted):
+	(tramp-gvfs-connection-mounted-p):
+	* lisp/net/tramp-sh.el (tramp-sh-gio-monitor-process-filter):
+	(tramp-sh-inotifywait-process-filter): Don't use cl-caaar
+	etc. compatibility aliases.  (Bug#76249)
+
+2025-02-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix defcustom :type of gnus-logo-colors
+
+	* lisp/gnus/gnus.el (gnus-logo-colors): Fix defcustom :type.
+
+2025-02-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve read-directory-name docstring
+
+	* lisp/files.el (read-directory-name): Improve docstring to be more
+	similar to that of 'read-file-name', and refer back to it where
+	appropriate.
+
+2025-02-13  Joseph Turner  <joseph@breatheoutbreathe.in>
+
+	Add optional PREDICATE argument to read-directory-name
+
+	* lisp/files.el (read-directory-name): Add optional PREDICATE argument.
+	* doc/lispref/minibuf.texi (Reading File Names): Document above change.
+	(Bug#66224)
+
+2025-02-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	Increase recentf-max-saved-items to 25
+
+	* lisp/recentf.el (recentf-max-saved-items): Increase default to 25.
+
+2025-02-13  Ship Mints  <shipmints@gmail.com>
+
+	project-(remember|forget)-projects-under: Improve docstrings
+
+	* lisp/progmodes/project.el (project-forget-projects-under)
+	(project-remember-projects-under): Clarify docstrings (bug#76234).
+
+2025-02-12  shipmints  <shipmints@gmail.com>
+
+	Change the project-switch-project prompt to include the dir name
+
+	* lisp/progmodes/project.el:
+	(project--switch-project-command): Add new argument DIR.
+	Change the prompt to "Command in `xxx': ..." (bug#76235).
+	(project-switch-project): Pass DIR to the above function.
+
+2025-02-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Consolidate side-effect-free decls in cl-lib
+
+	* lisp/emacs-lisp/cl-macs.el: Consolidate two identical loops with
+	side-effect-free declarations into one.
+
+2025-02-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Avoid cl-caaar etc. compatibility macros in Org
+
+	* lisp/org/ob-core.el (org-babel-process-params):
+	* lisp/org/org-agenda.el (org-agenda-span-to-ndays):
+	* lisp/org/org-capture.el (org-capture-set-target-location):
+	* lisp/org/org.el (org-set-effort): Don't use cl-caaar, cl-caadr,
+	etc. compatibility macros in Org.  We don't need to use them, since Org
+	requires Emacs 26.1.
+
+2025-02-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete comments about obsolete cl--compiler-macro-cXXr
+
+	* lisp/emacs-lisp/cl-macs.el:
+	* lisp/subr.el: Delete obsolete comments about compatibility alias
+	cl--compiler-macro-cXXr.
+
+2025-02-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Declare caar, cadr, etc. as side-effect-free
+
+	* lisp/subr.el (caar, cadr, cdar, cddr, caaar, caadr, cadar, caddr)
+	(cdaar, cdadr, cddar, cdddr, caaaar, caaadr, caadar, caaddr, cadaar)
+	(cadadr, caddar, cadddr, cdaaar, cdaadr, cdadar, cdaddr, cddaar)
+	(cddadr, cdddar, cddddr): Declare side-effect-free.
+	* lisp/emacs-lisp/cl-macs.el: Remove redundant declarations of
+	compatibility aliases for the above functions as side-effect-free.
+
+2025-02-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add compiler macros for cl-oddp and cl-evenp
+
+	* lisp/emacs-lisp/cl-lib.el (cl-oddp, cl-evenp): Add compiler macros.
+
+2025-02-12  Juri Linkov  <juri@linkov.net>
+
+	Fix treesit-outline related settings
+
+	* lisp/treesit.el (treesit-outline-level): Use level 1 by default
+	since treesit-outline--at-point now always returns the current node.
+
+	* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
+	Use 'bos' instead of 'bol'.  Add "singleton_class" to
+	'treesit-outline-predicate'.  Use new condition 'named' in
+	'treesit-outline-predicate' (bug#74963).
+
+2025-02-12  Dmitry Gutov  <dmitry@gutov.dev>
+
+	New command project-find-matching-file
+
+	* lisp/progmodes/project.el (project--read-project-list):
+	Ensure that the directory has a trailing '/' (bug#75983).
+
+2025-02-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix recently introduced test failure
+
+	* test/lisp/progmodes/go-ts-mode-tests.el
+	(go-mod-ts-mode-test-indentation): Fix test.
+
+2025-02-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Mark package-x.el as obsolete
+
+	* lisp/obsolete/package-x.el: Add "Obsolete-since" header.  (Bug#76194)
+	* doc/lispref/package.texi (Package Archives): Don't document package-x.
+
+2025-02-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Move package-x.el to lisp/obsolete
+
+	* lisp/emacs-lisp/package-x.el: Move from here...
+	* lisp/obsolete/package-x.el: ...to here.  (Bug#76194)
+
+2025-02-12  Ship Mints  <shipmints@gmail.com>
+
+	Make reading project--list safer
+
+	* lisp/progmodes/project.el (project--read-project-list):
+	Ensure that each directory has a trailing '/' (bug#75983).
+
+2025-02-12  Martin Rudalics  <rudalics@gmx.at>
+
+	Handle negative frame position values in xterm.c  (Bug#76190)
+
+	* src/xterm.c (x_calc_absolute_position): Always handle negative
+	positions when XNegative or YNegative were set (Bug#76190).
+
+2025-02-12  Tassilo Horn  <tsdh@gnu.org>
+
+	Allow URL-FORMAT as string and function in bug-reference-setup-from-vc-alist
+
+	That's a slight simplification resulting from bug#72735.
+
+	* lisp/progmodes/bug-reference.el (bug-reference-setup-from-vc-alist):
+	Rename URL-FORMAT-FN to URL-FORMAT and mention it may be string or
+	function.
+	* (bug-reference-maybe-setup-from-vc): Handle the new case where
+	bug-url-fmt is just a string rather than a function.
+
+2025-02-12  Siyuan Chen  <chansey97@gmail.com>  (tiny change)
+
+	Fix 'C-x C-c' with cua-prefix-override-inhibit-delay nil
+
+	* lisp/emulation/cua-base.el (cua-cut-handler, cua-copy-handler): New
+	functions to fix cut and paste when 'cua-prefix-override-inhibit-delay'
+	is nil.  (Bug#71230)
+
+2025-02-12  Po Lu  <luangruo@yahoo.com>
+
+	X11 drag-and-drop corrections
+
+	* lisp/x-dnd.el (x-dnd-handle-drag-n-drop-event): Take cdddr of
+	client-message, skipping the selection information.
+	(x-dnd-do-direct-save): Do not erase the local copy of a remote
+	file if it was not in fact copied on behalf of the recipient.
+	(x-dnd-handle-xds-drop): Return proper action.
+
+	* src/xterm.c (x_term_init): Remove unused variable on non-GTK
+	builds.
+
+2025-02-12  Gabriel Santos  <gabrielsantosdesouza@disroot.org>
+
+	Add go-work-ts-mode for Go workspace files
+
+	* lisp/progmodes/eglot.el (eglot-server-programs): Add go-work-ts-mode.
+	* lisp/progmodes/go-ts-mode.el
+	(Commentary): Add the repositories for the grammars.
+	(go-work-ts-mode--indent-rules, go-work-ts-mode--keywords)
+	(go-work-ts-mode--font-lock-settings): New variables.
+	(go-work-ts-mode--directive-matcher, go-work-ts-mode): New functions.
+	(go-mod-ts-mode--directive-matcher): Rename from
+	go-mod-ts-mode--in-directive-p.  Be more specific on the directive
+	location (modules).  Replace mention of nil with function.  Use member
+	instead of pcase to check node types.
+
+	* admin/notes/tree-sitter/build-module/batch.sh
+	* admin/notes/tree-sitter/build-module/build.sh: Add go-work support.
+
+	* test/lisp/progmodes/go-ts-mode-resources/font-lock-package.go:
+	* test/lisp/progmodes/go-ts-mode-resources/indent-mod.erts:
+	* test/lisp/progmodes/go-ts-mode-resources/indent-work.erts:
+	New files for testing indentation and font-locking for Go
+	module and workspace files.
+	* test/lisp/progmodes/go-ts-mode-tests.el: Add tests for Go module and
+	workspace files.  (Bug#74461)
+
+	* etc/NEWS: Announce go-work-ts-mode.
+
+2025-02-12  Gabriel Santos  <gabrielsantosdesouza@disroot.org>
+
+	image-dired: Add extra keybinds for navigation
+
+	* lisp/image/image-dired.el (image-dired-thumbnail-mode-map):
+	Bind previously unused keys for alternative navigation.  (Bug#75410)
+
+2025-02-12  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Print bare symbols for EMACS_GENERATE_DYNVARS
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile--load-dynvars): Remove
+	redundant goto-char.
+	(byte-compile-file): Bind print-symbols-bare around .dynvars file
+	generation.  (Bug#66628)
+
+2025-02-12  Lin Jian  <me@linj.tech>  (tiny change)
+
+	Substitute all emacsclient occurrences in emacsclient.desktop
+
+	After commit "From .desktop files, reuse a frame or start a new
+	Emacs as required" on 2021-06-30, there are two emacsclient
+	occurrences for the Exec key of etc/emacsclient.desktop.
+	Before this change, only the first occurrence is substituted.
+
+	* Makefile.in (install-etc): Substitute all emacsclient
+	occurrences in emacsclient.desktop.  (Bug#68803)
+
+2025-02-12  Lin Jian  <me@linj.tech>  (tiny change)
+
+	Remove an unneeded sed command for emacs.service
+
+	After commit e5348f125ff03ac70713e5b227f9e51f759a587b on
+	2020-12-14, there is no ExecStop in etc/emacs.service.
+	* Makefile.in (install-etc): Remove an unneeded sed command for
+	etc/emacs.service.
+
+2025-02-12  Po Lu  <luangruo@yahoo.com>
+
+	Merge remote-tracking branch 'savannah/master' into master-android-1
+
+2025-02-12  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	ea3a937176f ; Add a utility script for retrieving Android port depend...
+
+2025-02-12  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	19791839cfb ; Don't document a complicated default
+	88bc748f52f Fix minibuffer-next-completion in completing-read-multiple
+	737f249aa2c ; Document 'completing-read-multiple' in the ELisp manual
+	37f25514602 ; * lisp/gnus/nnweb.el (nnweb-type): Doc fix.
+
+2025-02-12  Thuna  <thuna.cing@gmail.com>
+
+	Highlight multiple symbols in single quotes in CL strings
+
+	* lisp/emacs-lisp/lisp-mode.el (lisp-cl-font-lock-keywords-2): When
+	multiple space-delimited symbols are single quoted together (e.g "`foo
+	bar'"), highlight them.  (Bug#59360)
+
+2025-02-12  Thuna  <thuna.cing@gmail.com>
+
+	Fix 'rcirc-buffer-process' not working on channel buffers
+
+	* lisp/net/rcirc.el (rcirc-buffer-process): Look at BUFFER's
+	'rcirc-server-buffer's 'rcirc-process' instead.  Signal an error if it
+	has none.  (Bug#60191)
+
+2025-02-12  Trevor Arjeski  <tmarjeski@gmail.com>
+
+	Fix Gnus logo color customization
+
+	Fix a bug where customizing `gnus-logo-color-style' from use-package's
+	:custom keyword did not set `gnus-logo-colors' before Gnus is launched.
+
+	This patch does the following:
+	- Implements a :set keyword on `gnus-logo-color-style' which will
+	  correctly set `gnus-logo-colors'
+	- Exposes `gnus-logo-colors' using `defcustom' for more fine-grained
+	  customization
+	- Uses :set-after on `gnus-logo-colors' so that it is set after
+	  `gnus-logo-color-style'
+
+	* lisp/gnus/gnus.el (gnus-logo-colors): Convert to defcustom.
+	(gnus-logo-color-style): Add :set property.  (Bug#74554)
+
+2025-02-12  john muhl  <jm@pub.pink>
+
+	Add icons used by 'mpc.el' to 'x-gtk-stock-map'
+
+	* lisp/term/x-win.el (x-gtk-stock-map):
+	* lisp/term/pgtk-win.el (x-gtk-stock-map): Include tool-bar icons
+	used by 'mpc.el'.
+
+2025-02-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: use Eldoc in eglot-hierarchy-mode
+
+	Use it to show details of the thing at point, like the full
+	signature and the locus of the definition.
+
+	* lisp/progmodes/eglot.el: Add optional arg MODE.
+	(eglot--hierarchy-source-major-mode): New defvar.
+	(eglot--hierarchy-1): Adjust.
+	(eglot-hierarchy-mode): Set eldoc stuff.
+	(eglot-hierarchy-center-on-node): Cosmetic fix.
+	(eglot-hierarchy-detail-eldoc-function)
+	(eglot-hierarchy-locus-eldoc-function): New eldoc functions.
+
+2025-02-11  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Remove `smtpmail-address-buffer' temporary buffer
+
+	* lisp/mail/smtpmail.el (smtpmail-address-buffer): Remove variable.
+	(smtpmail-send-it):
+	(smtpmail-deduce-address-list): Replace `smtpmail-address-buffer' with a
+	temporary buffer.  Set `smtpmail-recipient-address-list' only in
+	caller.  (Bug#72128)
+
+2025-02-11  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete redundant lambdas around unary functions
+
+	This is not just stylistic, but also slightly faster.  These are all
+	regular defuns, of course, as this won't work with macros and defsubsts.
+
+	* lisp/calc/calc-nlfit.el (math-nlfit-fit-curve)
+	(calc-fit-hubbert-linear-curve):
+	* lisp/calendar/cal-tex.el (cal-tex-latexify-list):
+	* lisp/calendar/todo-mode.el (todo-sort):
+	* lisp/cedet/semantic/ctxt.el (semantic-ctxt-end-of-symbol-default)
+	(semantic-ctxt-current-symbol-default):
+	* lisp/cedet/semantic/symref.el (semantic-symref-result-get-files):
+	* lisp/cedet/semantic/texi.el (semantic-texi-command-completion-list):
+	* lisp/descr-text.el (describe-char):
+	* lisp/emacs-lisp/eieio-datadebug.el
+	(data-debug-add-specialized-thing):
+	* lisp/emacs-lisp/rmc.el (read-multiple-choice--short-answers):
+	* lisp/eshell/em-pred.el (eshell-modifier-alist):
+	* lisp/gnus/gnus-cache.el (gnus-cache-articles-in-group):
+	* lisp/gnus/gnus-dired.el (gnus-dired-attach):
+	* lisp/help-mode.el (help-package-def):
+	* lisp/ibuf-ext.el (ibuffer-mark-modified-buffers):
+	* lisp/image/image-dired.el:
+	* lisp/international/quail.el (quail-keyseq-translate)
+	(quail-get-translations):
+	* lisp/isearch.el (isearch-pre-command-hook)
+	(search-within-boundaries):
+	* lisp/mail/supercite.el (sc-ask):
+	* lisp/mh-e/mh-e.el (mh-variant-set):
+	* lisp/net/rcirc.el (rcirc-nick-channels, rcirc-channel-nicks):
+	(rcirc-browse-url):
+	* lisp/obsolete/thumbs.el (thumbs-cleanup-thumbsdir):
+	* lisp/org/org-agenda.el (org-agenda-filter-completion-function):
+	* lisp/org/org-table.el (org-table-eval-formula):
+	* lisp/org/org.el (org-set-regexps-and-options):
+	* lisp/org/ox.el (org-export--get-inbuffer-options):
+	* lisp/ses.el (ses-range):
+	* lisp/textmodes/emacs-news-mode.el (emacs-news--buttonize):
+	* lisp/textmodes/ispell.el (ispell-begin-tex-skip-regexp):
+	* lisp/vc/vc-cvs.el (vc-cvs-stay-local-p):
+	* lisp/window.el (window--state-get-1):
+	* test/lisp/emacs-lisp/shortdoc-tests.el (shortdoc-all-groups-work):
+	Delete redundant lambdas around unary functions.  (Bug#66816)
+
+2025-02-11  Juri Linkov  <juri@linkov.net>
+
+	Improve outline-predicate of ts-modes (bug#74448)
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode--outline-predicate):
+	Simplify since 'treesit-outline-search' was fixed in 302274b1862.
+	Use 'treesit-parent-until' to handle the case with "pointer_declarator".
+
+	* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode--outline-predicate):
+	Add "block_sequence_item".
+
+2025-02-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix thinko in previous commit
+
+	* lisp/progmodes/eglot.el (eglot--hierarchy-1): 'roots' is a
+	vector.
+
+2025-02-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: error if no hierarchies available at point
+
+	* lisp/progmodes/eglot.el (eglot--hierarchy-1): Error if no
+	hierarchy at point.
+
+2025-02-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: make better use of :company-docsig
+
+	* lisp/progmodes/eglot.el (eglot-completion-at-point): Make better
+	use of :company-docsig
+
+2025-02-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: cosmetic refactor of eglot-completion-at-point
+
+	* lisp/progmodes/eglot.el (eglot-completion-at-point): rework.
+
+2025-02-11  João Távora  <joaotavora@gmail.com>
+
+	Eglot: mention ocaml-ts-mode in eglot-server-programs
+
+	* lisp/progmodes/eglot.el (eglot-server-programs): Mention
+	ocaml-ts-mode.
+
+2025-02-11  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/bidi.c: Add comments to uses of INT_PROMOTE (bug#75964).
+
+2025-02-11  shipmints  <shipmints@gmail.com>
+
+	Correct project-remember/forget-projects-under message grammar
+
+	* lisp/progmodes/project.el:
+	(project-remember-projects-under): Correct grammar for the singular
+	case.  Rather than "1 projects were found", say "1 project was found".
+	(project-forget-projects-under): Ditto.  (Bug#76016)
+
+2025-02-11  shipmints  <shipmints@gmail.com>
+
+	Eliminate bookmark-maybe-historicize-string duplicates
+
+	* lisp/bookmark.el (bookmark-maybe-historicize-string):
+	Use 'add-to-history' to respect history-delete-duplicates and the
+	'history-length property.  (Bug#76137)
+
+2025-02-11  Stefan Kangas  <stefankangas@gmail.com>
+
+	Update webjump.el example links
+
+	* lisp/net/webjump.el (webjump-sample-sites): Don't recommend some
+	defunct or otherwise non-privacy respecting websites.  Prefer HTTPS to
+	HTTP.
+	(webjump-to-iwin, webjump-state-to-postal-alist): Make obsolete, as this
+	functionality seems to no longer work due to broken links.
+
+2025-02-11  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add new function lm-package-version
+
+	* lisp/emacs-lisp/lisp-mnt.el (lm-package-version): New function.
+	* lisp/emacs-lisp/package.el (package-buffer-info)
+	(package-get-version): Use above new function.
+	(lm-package-version): Declare.
+
+2025-02-11  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't warn for packages without a footer line
+
+	* lisp/emacs-lisp/package.el (package-buffer-info): Don't warn when the
+	terminating comment (i.e., the footer line) is missing.  (Bug#26490)
+
+2025-02-11  Stefan Kangas  <stefankangas@gmail.com>
+
+	Minor simplification in Fdescribe_buffer_bindings
+
+	* src/keymap.c (Fdescribe_buffer_bindings): Minor simplification.
+
+2025-02-11  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer keyword arguments in message-mode menu definition
+
+	* lisp/gnus/message.el (message-mode-menu): Prefer keyword arguments in
+	menu definition.  Reformat for readability and consistency.
+
+2025-02-11  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add test for Bug#76179
+
+	* test/lisp/help-fns-tests.el (help-fns-test-bug76179):
+	New test.  (Bug#76179)
+
+2025-02-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify gcc -Wswitch-enum in bidi.c
+
+	* src/bidi.c (bidi_get_type, bidi_resolve_explicit)
+	(bidi_find_bracket_pairs, bidi_resolve_brackets)
+	(bidi_resolve_neutral): Use ‘switch (INT_PROMOTE (E))’
+	to indicate that it’s intended that we not enumerate all the enum
+	values.
+
+2025-02-10  Stefan Kangas  <stefankangas@gmail.com>
+
+	Set process-adaptive-read-buffering to nil by default
+
+	* src/process.c (syms_of_process) <process-adaptive-read-buffering>:
+	Set the default to nil.  (Bug#75574)
+
+2025-02-10  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/ansi-osc.el (ansi-osc-directory-tracker): Don't check host name.
+
+2025-02-10  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't error on 'C-h f menu-bar-open-mouse RET'
+
+	* lisp/help-fns.el (help-fns--insert-menu-bindings): Fix error when
+	passed 'menu-bar-open-mouse'.  (Bug#76172)
+
+2025-02-10  shipmints  <shipmints@gmail.com>
+
+	ansi-osc-directory-tracker respects remote files
+
+	* etc/NEWS: ansi-osc-directory-tracker supports remote directories.
+
+	* lisp/ansi-osc.el (ansi-osc-directory-tracker):
+	If 'default-directory' is a remote-file form, retain that form
+	when 'default-directory' changes are detected.
+
+2025-02-10  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/misc/ert.texi (Helper Functions): Improve index.  Fix markups.
+
+2025-02-10  Martin Rudalics  <rudalics@gmx.at>
+
+	Implement tab line dragging with mouse (Bug#76084)
+
+	* lisp/mouse.el (mouse-drag-line): Allow tab line dragging if
+	there's a window above.  Consider tab line height when
+	calculating 'position'.  Add 'tab-line' binding to transient
+	map.
+	(mouse-drag-tab-line): Have it drag the tab line only (and not
+	the entire frame) when the tab line is between two windows.
+
+2025-02-10  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix handling of visibility on tty frames (Bug#76031)
+
+	* src/frame.h (FRAME_REDISPLAY_P): Remove.  Use the new function
+	frame_redisplay_p instead.  Extern frame_redisplay_p.
+	* src/frame.c (frame_redisplay_p): New function to replace
+	FRAME_REDISPLAY_P macro.
+	(make_terminal_frame): Don't tinker with frame visibility and
+	don't make the new frame the terminal's top frame.
+	(do_switch_frame): Make sure frame switched to and any of its
+	ancestors are visible.  Don't reset the visibility of other
+	frames.
+	(other_frames): Do not assume tty frames are by default visible.
+	(Fmake_frame_invisible): When making the selected tty frame
+	invisible, explicitly select the next visible frame.
+	* src/dispnew.c (Fredraw_display): Use frame_redisplay_p instead
+	of FRAME_REDISPLAY_P.
+	* src/xdisp.c (clear_garbaged_frames, echo_area_display)
+	(prepare_menu_bars, redisplay_internal, display_and_set_cursor)
+	(gui_clear_cursor): Use frame_redisplay_p instead of
+	FRAME_REDISPLAY_P.
+	* src/keyboard.c (tty_read_avail_input): When storing an event
+	and the selected frame is a child frame whose root is its
+	terminal's top frame, set the frame_or_window slot to the child
+	frame since otherwise the next switch frame event will select
+	the top frame instead.
+
+2025-02-10  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el: Fix treesit-outline.
+
+	(treesit-outline--at-point): New internal function.
+	(treesit-outline-search, treesit-outline-level):
+	Use 'treesit-outline--at-point'.
+
+2025-02-10  Po Lu  <luangruo@yahoo.com>
+
+	Fix compilation on Haiku Nightly hrev58622
+
+	* configure.ac (BOBJECTLIST_OWNERSHIP_IS_TEMPLATE_PARAMETER):
+	Define if BObjectList ownership over its contents is specified
+	as a template parameter.
+
+	* src/haiku_support.cc (class EmacsFontSelectionDialog)
+	[BOBJECTLIST_OWNERSHIP_IS_TEMPLATE_PARAMETER]: Adjust
+	accordingly.
+
+2025-02-09  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't use deprecated unload-hook variables in Gnus
+
+	* lisp/gnus/gnus-registry.el (gnus-registry-unload-hook):
+	* lisp/gnus/spam-stat.el (spam-stat-unload-hook):
+	* lisp/gnus/spam.el (spam-unload-hook): Rename functions from this...
+
+	* lisp/gnus/gnus-registry.el (gnus-registry-unload-function):
+	* lisp/gnus/spam-stat.el (spam-stat-unload-function):
+	* lisp/gnus/spam.el (spam-unload-function): ...to this.  Don't set the
+	corresponding variables, always return nil, update callers, and leave
+	old name as obsolete function aliases.
+	Ref: https://lists.gnu.org/r/emacs-devel/2025-02/msg00294.html
+
+2025-02-09  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix fontification of ATTRIBUTE_NO_SANITIZE_ADDRESS functions
+
+	* .dir-locals.el (c-mode) <c-noise-macro-names>:
+	Add "ATTRIBUTE_NO_SANITIZE_ADDRESS", to fontify functions with this
+	attribute correctly.
+
+2025-02-09  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use unload-function instead of unload-hook in ert
+
+	* lisp/emacs-lisp/ert.el
+	(ert-unload-function): Rename from 'ert--unload-function'.
+	(ert--unload-function): Make into obsolete function alias for the above.
+
+2025-02-09  Juri Linkov  <juri@linkov.net>
+
+	Improve treesit settings for {json,html,toml,yaml}-ts-mode (bug#73404)
+
+	* lisp/progmodes/json-ts-mode.el (json-ts-mode): Add 'list' thing
+	to 'treesit-thing-settings'.
+	(json-ts-mode): Disable outlines.
+
+	* lisp/textmodes/html-ts-mode.el (html-ts-mode--defun-name):
+	Get a grandchild 'tag_name' from 'element' that was already
+	defined by 'treesit-defun-type-regexp'.
+	(html-ts-mode--outline-predicate): New function.
+	(html-ts-mode): Add "comment" to the 'list' thing
+	in 'treesit-thing-settings'.  Use "tag_name" and "attribute"
+	in 'sentence' to conform to sentence navigating arguments
+	in other ts-modes.  Remove unnecessary heading
+	from 'treesit-simple-imenu-settings' and use "element"
+	supported by 'html-ts-mode--defun-name'.
+	Set 'treesit-outline-predicate' to 'html-ts-mode--outline-predicate'.
+
+	* lisp/textmodes/toml-ts-mode.el (toml-ts-mode):
+	Add 'treesit-thing-settings'.
+
+	* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode--defun-name)
+	(yaml-ts-mode--outline-predicate): New functions.
+	(yaml-ts-mode): Set 'treesit-defun-type-regexp',
+	'treesit-defun-name-function', 'treesit-defun-tactic'.
+	Add 'sentence' to 'treesit-thing-settings'.
+	Set 'treesit-simple-imenu-settings' and 'treesit-outline-predicate'.
+	Use 'kill-local-variable' for 'forward-sexp-function'
+	and 'show-paren-data-function' instead of resetting their value.
+
+	* lisp/treesit.el (treesit-outline-search): Check for the thing
+	before the end of the line to support such case when the thing
+	fits on the current line and ends before the end of the line
+	such as e.g. '<h1>...</h1>' in html-ts-mode.
+	(treesit-hs-find-next-block, treesit-hs-inside-comment-p):
+	Use anchors for "\\`comment\\'" (bug#75609).
+
+2025-02-09  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve filling with footnote-mode
+
+	* lisp/mail/footnote.el (footnote-mode): Add regexp for footnotes
+	to sentence-end-base to improve filling.
+
+2025-02-09  Juri Linkov  <juri@linkov.net>
+
+	* lisp/vc/diff-mode.el (diff-mode): Disable view-mode keybindings.
+
+	Put the property 'mode-class' with the value 'special' on the symbol
+	'diff-mode'.  This fixes the case when 'view-read-only' is non-nil
+	by disabling activation of 'view-mode' that overrides single keys
+	from 'diff-mode-shared-map' (bug#75993).
+
+2025-02-09  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	563efd6838c Fix program execution on Android 15 QPR2 Beta
+
+2025-02-08  Sebastián Monía  <code@sebasmonia.com>
+
+	Use vtable in eww-list-bookmarks
+
+	* lisp/net/eww.el (eww-list-bookmarks): Move logic to...
+	(eww--bookmark-prepare, eww--bookmark-format-data) ... these, and use
+	'vtable'.
+	(eww-bookmark-kill, eww-bookmark-yank, eww-bookmark-browse)
+	(eww-next-bookmark, eww-previous-bookmark, eww-buffers-mode-map): Use
+	'vtable-current-object'.
+
+2025-02-08  Philip Kaludercic  <philipk@posteo.net>
+
+	;* doc/misc/dired-x.texi: Remove unnecessary paren  (Bug#76148)
+
+2025-02-08  Philip Kaludercic  <philipk@posteo.net>
+
+	Refresh package list without blocking
+
+	* lisp/emacs-lisp/package.el (package-refresh-contents): Run
+	asynchronously when invoked interactively.
+	* etc/NEWS: Mention the change.
+
+2025-02-08  Andreas Schwab  <schwab@linux-m68k.org>
+
+	Don't try to unregister tracker ID twice
+
+	* lisp/vc/diff-mode.el (diff-minor-mode): Clear
+	diff--track-changes after unregistering.
+
+2025-02-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/misc/ert.texi (Helper Functions): New node.
+
+2025-02-08  João Távora  <joaotavora@gmail.com>
+
+	Eglot: auto-expand first level in type and call hierarchies
+
+	* lisp/progmodes/eglot.el (eglot--hierarchy-2): Use widget-apply-action.
+
+2025-02-08  Felicián Németh  <felician.nemeth@gmail.com>
+
+	Eglot: do not activate unsupported menu items
+
+	* lisp/progmodes/eglot.el (eglot-menu): Do not activate items that
+	the server does not support.
+
+2025-02-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	ed9dd4705c7 ; * admin/authors.el (authors-aliases): Add aliases.
+	223ee56aae7 ; Avoid passive tense in Emacs manual
+	be4cf26c167 Fix gnus-score-find-score-files-function :type
+	143f1096daa Improve documentation of 'file-name-concat'
+
+2025-02-08  shipmints  <shipmints@gmail.com>
+
+	Eliminate savehist duplicated symbols
+
+	* lisp/savehist.el (savehist-save): Do not save symbols
+	duplicated between 'savehist-minibuffer-history-variables'
+	and 'savehist-additional-variables'.  (Bug#76123)
+	* test/lisp/savehist-tests.el: New file.
+
+2025-02-08  Jared Finder  <jared@finder.org>
+
+	Cleanup tool-bar-mode documentation
+
+	* doc/emacs/frames.texi (Tool Bars): Downcase concept index
+	text.
+	* lisp/cus-start.el (standard): Copy custom :tag strings
+	from window-tool-bar-style's, which are more descriptive.
+	(Bug#75844)
+
+2025-02-08  Jared Finder  <jared@finder.org>
+
+	Update window-tool-bar
+
+	Add support for the remaining tool bar item specs, new user
+	option `window-tool-bar-style', and add support for older
+	Emacs versions.
+
+	* doc/emacs/windows.texi (Window Tool Bar): Add documentation
+	for new user option `window-tool-bar-style'.
+	* lisp/window-tool-bar.el
+	(customize-package-emacs-version-alist): Add package-version to
+	Emacs version mapping.
+	(window-tool-bar-string): Do not show spacers after hidden
+	buttons.
+	(window-tool-bar--keymap-entry-to-string): Call new function
+	`window-tool-bar--style'.  Add handling for :visible, :filter,
+	:button, :vert-only, and :help item specs.  Show key bindings.
+	(window-tool-bar--last-command-triggers-refresh-p): Use "cannot"
+	in comment.
+	(window-tool-bar--allow-images): Delete this, it is replaced by
+	new user option `window-tool-bar-style'.
+	(window-tool-bar--use-images): Delete this, it is replaced by
+	new function `window-tool-bar--style'.
+	(window-tool-bar--turn-on): Move earlier in file, no changes.
+	(window-tool-bar-style): New user option supporting all values
+	`tool-bar-style' supports as well as inheriting from
+	tool-bar-style.
+	(window-tool-bar--style): New function to calculate active tool
+	bar style based on `window-tool-bar-style', `tool-bar-style',
+	and frame capabilities.
+	(global-window-tool-bar-mode, window-tool-bar-button)
+	(window-tool-bar-button-hover, window-tool-bar-button-disabled):
+	Retroactively add package-version.
+	(window-tool-bar-button-checked)
+	(window-tool-bar-button-checked-hover): New faces for :button
+	item spec.
+	(window-tool-bar--get-keymap): Call new function
+	`window-tool-bar--style'.  (Bug#75844)
+
+2025-02-08  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	lisp/progmodes/csharp-mode.el: Improve string-interpolation
+
+	Correctly fontify expressions inside string-interpolations.
+	(Bug#75580)
+
+2025-02-08  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/mouse.el (mouse-skip-word): Avoid errors at EOB.  (Bug#75965)
+
+2025-02-08  Björn Bidar  <bjorn.bidar@thaodan.de>
+
+	Add 'nnregistry-request-group' function for 'gnus-refer-article'
+
+	nnregistry doesn't handle any servers or groups; however we have to
+	define the dummy function so Gnus-registry works as refer article
+	method, as the `gnus-check-group-server' function requires it.
+	The latter function is called when referring to articles to check the
+	source group first before actually requesting any articles.
+	* lisp/gnus/nnregistry.el (nnregistry-request-group): New deffoo.
+	(Bug#22414)
+
+2025-02-08  Nicolas Despres  <nicolas.despres@gmail.com>
+
+	Prioritize split along the longest edge by default.
+
+	Currently, `split-window-sensibly' prefers to try to split
+	vertically first, disregarding the actual shape of the frame
+	or the user preferences.  This is a good default when Emacs
+	is taller than wider.  However, when Emacs is in full-screen
+	(landscape screen layout), trying to split vertically may not
+	be what the user expected, since there is plenty of space
+	available on the right.
+
+	Typical scenario: Emacs is in landscape layout, one buffer is
+	open in a window covering the entire frame.  Another buffer is
+	opened in a second window (C-x 4 f). Both splits are feasible
+	but users may prefer the horizontal one.
+
+	This patch preserves the behavior of the `split-height-threshold'
+	and `split-width-threshold' variables.  Splitting continues not
+	to be permitted if the edge length is below the threshold.
+
+	* lisp/window.el (split-window-sensibly): First tried split
+	direction follows user preferences.
+
+	* etc/NEWS: Add an entry for new variable
+	`split-window-preferred-direction'.
+	* doc/emacs/windows.texi: Document new variable.
+
+2025-02-08  F. Jason Park  <jp@neverwas.me>
+
+	More clearly define local module behavior in ERC
+
+	* doc/misc/erc.texi (Modules): Label all local modules as being such.
+	Move `querypoll' to the auxiliary section.  Rework entire "Local
+	Modules" portion.
+	* lisp/erc/erc-goodies.el (erc-keep-place-indicator-mode)
+	(erc-command-indicator-mode): Mention what buffer types they operate in.
+	* lisp/erc/erc-nicks.el (erc-nicks-mode): Mention the mode is enabled in
+	all buffers.
+	* lisp/erc/erc-notify.el (erc-querypoll-mode): Mention which buffers it
+	operates in.
+	* lisp/erc/erc-sasl.el (erc-sasl-mode): Disable completely in target
+	buffers so its mode variable is nil.
+	* lisp/erc/erc-services.el (erc-services-regain-mode): Disable in target
+	buffers.
+	* lisp/erc/erc.el (erc-open): When activating local modules, skip those
+	that have just been enabled by a fellow module.  Do this even though
+	their setup code is meant to be idempotent.
+	* test/lisp/erc/erc-scenarios-base-local-modules.el
+	(erc-scenarios-base-local-modules--toggle-helpers): Revise to assert
+	current behavior.  (Bug#57955)
+
+2025-02-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2025-02-07  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove leading '*' from docstrings in cc-vars.el
+
+	* lisp/progmodes/cc-vars.el (c-make-font-lock-extra-types-blurb):
+	Remove leading '*' from generated docstrings.  (Bug#75793)
+
+2025-02-07  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix bug in eglot--lookup-mode
+
+	When lookup in eglot-server-programs fails, fall back to a
+	half-decent (((foo-mode . "foo")) . nil) return value.  This
+	enables interactive M-x eglot for modes not yet registered in
+	e-s-p.
+
+	* lisp/progmodes/eglot.el (eglot--lookup-mode): Fallback when
+	lookup fails.
+
+2025-02-07  Stefan Kangas  <stefankangas@gmail.com>
+
+	Mark IRIX support in GUD as obsolete
+
+	* lisp/progmodes/gud.el (gud-irix-p, gud-dbx-use-stopformat-p)
+	(gud-irixdbx-marker-filter): Mark as obsolete.  We stopped supporting
+	IRIX in Emacs 26.1 (commit 6bc8689c0428).
+	* lisp/progmodes/gud.el (dbx): Suppress obsoletion warnings.
+
+2025-02-07  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	time-stamp: Better handling of some edge cases
+
+	* lisp/time-stamp.el (time-stamp-count): Require confirmation if large.
+	(time-stamp-once): Correctly handle a start regexp matching 0 chars.
+	* test/lisp/time-stamp-tests.el (time-stamp-custom-start): New test.
+
+2025-02-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	Suppress unneded events in special-event-map
+
+	* src/keyboard.c (keys_of_keyboard): Don't add ns-put-working-text
+	and ns-unput-working-text to Vspecial_event_map unless on NS port.
+
+2025-02-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	Use insert-special-event in Tramp
+
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-monitor-process-filter):
+	* lisp/net/tramp-sh.el (tramp-sh-gio-monitor-process-filter)
+	(tramp-sh-inotifywait-process-filter): Use `insert-special-event'
+	if possible.
+
+2025-02-07  João Távora  <joaotavora@gmail.com>
+
+	Eglot: add support for call and type hierarchies
+
+	* lisp/progmodes/eglot.el (eglot--lsp-interface-alist): Add new
+	interfaces.
+	(eglot-client-capabilities): Advertise support for callHierarchy
+	and typeHierarchy.
+	(eglot-ignored-server-capabilities): Add new providers.
+	(eglot--goto): New helper.
+	(eglot-menu): Add new menu items.
+	(eglot-handle-request window/showDocument): Use eglot--goto.
+	(button, tree-widget): Require them.
+	(eglot--hierarchy-item): New button type.
+	(eglot--hierarchy-interactive, eglot--hierarchy-children)
+	(eglot--hierarchy-label, eglot--hierarchy-1, eglot--hierarchy-2):
+	New internal functions.
+	(eglot--define-hierarchy-command): New macro.
+	(eglot-show-type-hierarchy, eglot-show-call-hierarchy)
+	(eglot-hierarchy-center-on-node): New commands.
+	(eglot--hierarchy-roots, eglot--hierarchy-specs): New local variables.
+	(eglot-hierarchy-label-map): New keymap.
+	(eglot-hierarchy-mode): New major mode.
+
+	* doc/misc/eglot.texi (Eglot Commands, Eglot Features): Describe
+	new feature.
+
+	* etc/EGLOT-NEWS (Changes in upcoming Eglot): Mention new feature.
+
+2025-02-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	New function insert-special-event and special event sleep-event
+
+	* doc/lispref/commands.texi (Misc Events): Add sleep-event.
+	(Special Events): New function insert-special-event.
+
+	* etc/NEWS: New function insert-special-event.  New event 'sleep-event'.
+	Fix typos.
+
+	* src/keyboard.c (Finsert_special_event): New defun.
+	(syms_of_keyboard): Declare Qsleep_event.  Define subroutine
+	Sinsert_special_event.  Add sleep-event to Vspecial_event_map.
+	(Bug#63620)
+	(kbd_buffer_get_event, make_lispy_event)
+	(init_while_no_input_ignore_events, is_ignored_event):
+	* src/termhooks.h (event_kind): Add SLEEP_EVENT.
+
+2025-02-07  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/sh-script.el (bash-ts-mode): Improve treesit settings.
+
+	Add 'list' and 'sentence' things to treesit-thing-settings,
+	and move mistakenly added 'sentence' to 'text' (bug#73404).
+	Set 'treesit-defun-name-function' and 'treesit-simple-imenu-settings'.
+	Reset 'outline-regexp'.
+
+2025-02-07  Po Lu  <luangruo@yahoo.com>
+
+	Prevent crash when requesting storage permissions on Android
+
+	* java/org/gnu/emacs/EmacsService.java (requestStorageAccess30):
+	Handle ActivityNotFoundException.
+
+2025-02-06  Gerd Möllmann  <gerd@gnu.org>
+
+	Use read-key in amp-y-or-n-p (bug#75886)
+
+	* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Use read-key
+	so that C-g in recognized when defined in input-decode-map.
+
+2025-02-06  Antero Mejr  <mail@antr.me>
+
+	Add scheme-mode indentation for SRFI 64, R7RS guard
+
+	* lisp/progmodes/scheme.el: Add properties for SRFI 64 and R7RS guard
+	identifiers.  (Bug#75999)
+
+2025-02-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(font-ccl-encoder-alist): Delete variable, unused
+
+	* src/ccl.c (syms_of_ccl): Remove `font-ccl-encoder-alist`.
+	* lisp/language/ethiopic.el (ccl-encode-ethio-font): Delete CCL program.
+	(font-ccl-encoder-alist): Don't modify it.
+
+2025-02-05  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/dired-x.el (dired-omit-expunge): Escape '%' (bug#75877).
+
+2025-02-05  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Prepare markers for insertions inside of a widget
+
+	Recreating child widgets without recreating the parent widget
+	may lead to situations where the parent widget doesn't cover its
+	children or buttons entirely anymore.  This bug manifests as a
+	faulty fontification of children or buttons, for example.
+	(Bug#69941)
+
+	* lisp/wid-edit.el (widget--prepare-markers-for-inside-insertion)
+	(widget--prepare-markers-for-outside-insertion): New functions.
+	(widget-default-create): Use them.
+
+	* test/lisp/wid-edit-tests.el (widget-test-insertion-at-parent-markers)
+	(widget-test-insertion-at-parent-markers-2): New tests.
+
+2025-02-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "Improve bidi_get_time runtime checking"
+
+	This reverts commit 782ec71053d8535511522f27f28c11682ca0f40b.
+	It makes the code less readable and less future-proof, so a
+	net loss.  (Bug#75964)
+
+2025-02-05  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/autorevert.el (defvar): Fix debug declaration.
+
+2025-02-05  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	Correctly handled the local parser for jsdoc (bug#75456)
+
+	As a result of recent patches to treesitter, local parsers must
+	now be recognized by 'treesit-language-at-point' and have their
+	own indentation rules.
+
+	* lisp/progmodes/js.el
+	(js--treesit-indent-rules): New rule for jsdoc.
+	(js--treesit-language-at-point): New function.
+	(js-ts-mode): Use the new function.
+
+2025-02-05  Yuan Fu  <casouri@gmail.com>
+
+	Make treesit-node-at more readable
+
+	* lisp/treesit.el (treesit-node-at): Make the logic for finding
+	the parser (and the root node) more explicit and
+	straightforward.  Don't use treesit-buffer-root-node; instead,
+	find the parser and use treesit-parser-root-node directly.
+
+2025-02-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Remove no-longer-needed delete_frame UNINIT
+
+	* src/frame.c (delete_frame): Remove a local with UNINIT that is
+	no longer needed now that GCC bug#85563 is fixed, as we don’t
+	need to worry about porting --enable-gcc-warnings to older GCC.
+	This change reverts this part of my commit
+	“Port --enable-gcc-warnings to GCC 8”
+	8c3215e7a47e3caaa005bf573765ed63e0739b89
+	dated Sat Apr 28 16:49:24 2018 -0700.
+
+2025-02-04  kobarity  <kobarity@gmail.com>
+	    Konstantin Kharlamov  <Hi-Angel@yandex.ru>
+	    Stefan Kangas  <stefankangas@gmail.com>
+
+	Make it configurable to highlight Python 2 builtins
+
+	By default, Python 2-only builtins are not highlighted.
+
+	* lisp/progmodes/python.el (python-2-support): New defcustom.
+	(python-font-lock-builtin-types)
+	(python-font-lock-builtins-python3)
+	(python-font-lock-builtins-python2)
+	(python-font-lock-builtins)
+	(python-font-lock-special-attributes)
+	(python-font-lock-builtin-exceptions-python3)
+	(python-font-lock-builtin-exceptions-python2)
+	(python-font-lock-builtin-exceptions): New variables.
+	(python-font-lock-keywords-level-2)
+	(python-font-lock-keywords-maximum-decoration)
+	(python--treesit-builtin-types)
+	(python--treesit-builtins)
+	(python--treesit-special-attributes)
+	(python--treesit-exceptions): Use new variables.
+
+2025-02-04  Stefan Kangas  <stefankangas@gmail.com>
+
+	Avoid overly short timeout in ispell-help
+
+	* lisp/textmodes/ispell.el (ispell-help): Avoid too short timeout by
+	using at least 0.5 seconds.
+
+2025-02-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Improve bidi_get_time runtime checking
+
+	* src/bidi.c (bidi_get_type): Improve runtime checking, by also
+	aborting if the bidi_type_table entry is not a bidi_type_t value.
+
+2025-02-04  Jim Porter  <jporterbugs@gmail.com>
+
+	Improve calculation of indent prefixes when using text scaling
+
+	Previously, the display spec for the "average space" was wrong.  It used
+	a plain number for the width of the specified space, which means "N
+	times the normal character width for the buffer", but we want "N times
+	the normal character width for the *current face*" (bug#76008).
+
+	* lisp/visual-wrap.el (visual-wrap--content-prefix): Specify the width
+	of the "average space" in terms of the average width of the current
+	face.
+
+	* lisp/net/shr.el (shr-indent): As above, and call 'string-pixel-width'
+	without specifying the buffer, to match 'shr-string-pixel-width'.
+
+2025-02-04  João Távora  <joaotavora@gmail.com>
+
+	Eglot: protect against nil jit-lock-context-unfontify-pos
+
+	* lisp/progmodes/eglot.el (eglot-shutdown, eglot--update-hints): Rework.
+
+	Github-reference: https://github.com/joaotavora/eglot/pull/1370
+
+2025-02-04  Gerd Möllmann  <gerd@gnu.org>
+
+	Fix min-width display spec handling (bug#76014)
+
+	* src/xdisp.c (display_min_width): Take into account that the output may
+	already be longer than the specified min-width.
+
+2025-02-04  Gerd Möllmann  <gerd@gnu.org>
+
+	Use read-key in read-multiple-choice (bug#75886)
+
+	* lisp/emacs-lisp/rmc.el (read-multiple-choice--short-answers): Use
+	read-key instead of read-event because read-event doesn't use
+	input-decode-map.
+	* test/lisp/emacs-lisp/rmc-tests.el: Use read-key instead of
+	read-event.
+
+2025-02-04  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix some checks in autorevert.el
+
+	* lisp/autorevert.el (auto-revert-handler): Rework checks.
+	(auto-revert-handler): Don't run `vc-refresh-state' in
+	`auto-revert-tail-mode'.
+
+2025-02-04  Andrew G Cohen  <cohen@andy.bu.edu>
+
+	Don't use obsolete In-Reply-To format in messages (Bug#64454)
+
+	When creating a new message, message-send-mail uses an obsolete format
+	for the In-Reply-To header that includes additional information about
+	the originating message.  This patch changes the default to use the
+	rfc5322 approved format, but allow the obsolete format through a
+	defcustom.
+
+	* lisp/gnus/message.el (message-make-in-reply-to): Return only the
+	message-id of the originating message (the default) unless the new
+	custom variable message-header-use-obsolete-in-reply-to is non-nil.
+	* doc/misc/message.texi: Document the new custom variable
+	message-header-use-obsolete-in-reply-to.
+	* etc/NEWS: Update NEWS.
+
+2025-02-04  Michael Albinus  <michael.albinus@gmx.de>
+
+	Add inhibit-auto-revert macro
+
+	* doc/lispref/backups.texi (Reverting):
+	Add inhibit-auto-revert-buffers and inhibit-auto-revert.
+
+	* etc/NEWS: Add inhibit-auto-revert-buffers and inhibit-auto-revert.
+	Fix typos.
+
+	* lisp/autorevert.el (inhibit-auto-revert-buffers): New variable.
+	(inhibit-auto-revert): New macro.
+	(auto-revert-active-p, auto-revert-handler):
+	Check `inhibit-auto-revert-buffers'.
+
+	* lisp/dired.el (dired--inhibit-auto-revert): Remove.
+	(dired-buffer-stale-p): Don't set it.
+	(dired-map-over-marks, dired-internal-do-deletions):
+	Use `inhibit-auto-revert.
+
+	* test/lisp/autorevert-tests.el
+	(auto-revert-test08-auto-revert-inhibit-auto-revert)
+	(auto-revert-test08-auto-revert-inhibit-auto-revert-remote): New tests.
+
+2025-02-04  João Távora  <joaotavora@gmail.com>
+
+	Eglot: avoid 'null' as params to 'shutdown' request (bug#66144)
+
+	Doing so confuses some servers.  It used to be needed for the
+	gopls server, but according to
+	https://debbugs.gnu.org/cgi/bugreport.cgi?bug=66144#32
+	that has been fixed.
+
+	Thanks to Javier Olaechea <pirata@gmail.com>
+
+	* lisp/progmodes/eglot.el (eglot-shutdown): Use eglot--{}.
+
+2025-02-03  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Fix OpenBSD compilation (bug#76009)
+
+	* configure.ac: Remove a bogus LD_SWITCH_SYSTEM for OpenBSD.
+
+2025-02-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(save-place-abbreviate-file-names): Don't eagerly load alist (bug#75730)
+
+	Change the way we handle `save-place-abbreviate-file-names` such that
+	this preference is applied lazily when we load the alist, rather than
+	eagerly when we define it (which forced the alist to be loaded before we
+	needed it).
+
+	* lisp/saveplace.el (save-place-load-alist-from-file): Use `unless`,
+	`when`, and `with-temp-buffer` to hopefully help readability.
+	Call `save-place--normalize-alist`.
+	(save-place--normalize-alist): New function extracted from the setter
+	of `save-place-abbreviate-file-names`.
+	(save-place-abbreviate-file-names): Use it.
+	(save-place-alist-to-file): Use `with-temp-buffer`.
+
+2025-02-03  Pip Cet  <pipcet@protonmail.com>
+
+	Fix GC-related crashes in styled_format (bug#75754)
+
+	This approach ensures we don't use an SSDATA pointer after GC, and
+	that no Lisp callback code can modify the format string while we're
+	working on it.
+
+	* src/editfns.c (styled_format): Operate on a copy of the format
+	string rather than the original.  Ensure final NUL byte is copied.
+
+2025-02-03  Daniel Mendler  <mail@daniel-mendler.de>
+
+	read-face-name: Build common completion table for CR and CRM
+
+	* lisp/faces.el (read-face-name): Build a common completion
+	table for both `completing-read' and `completing-read-multiple'
+	with completion metadata (bug#74865).
+
+2025-02-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix -nw sessions on MS-Windows
+
+	* src/w32console.c (w32con_clear_end_of_line): Set the space
+	glyphs' frame to NULL.
+	(w32con_write_glyphs): Handle face_id_frame == NULL, when called
+	from 'w32con_clear_end_of_line'.
+	(tty_draw_row_with_mouse_face): Adjust to changes in term.c.
+
+2025-02-03  Ulrich Müller  <ulm@gentoo.org>
+
+	Avoid ln(10) expression in calc units definition
+
+	* lisp/calc/calc-ext.el (calc-init-extensions): Autoload calc-math
+	for math-ln-10.
+	* lisp/calc/calc-units.el (math-standard-units): Use new ln10
+	constant instead of ln(10) in the decibel definition.
+	(math-find-base-units-rec): Allow ln10 in expression.
+	(math-to-standard-rec): Recognize the ln10 constant.  (Bug#75861)
+
+2025-02-03  Gerd Möllmann  <gerd@gnu.org>
+
+	Handle mouse highlighting in the presence of tty child frames
+
+	* src/term.c (tty_draw_row_with_mouse_face): Draw only parts
+	of the highlighted text that are not covered by other frames.
+
+2025-02-02  F. Jason Park  <jp@neverwas.me>
+
+	Run erc-services-regain-mode callback on a timer
+
+	* lisp/erc/erc-services.el (erc-services-regain-timeout-seconds): New
+	variable.
+	(erc-services-regain-mode): Mention CertFP in doc string.
+	(erc--nickname-in-use-make-request): Ensure the 900 RPL_LOGGEDIN
+	callback always runs after `erc-services-regain-timeout-seconds', even
+	when SASL isn't being used.
+	* test/lisp/erc/erc-scenarios-services-misc.el
+	(erc-scenarios-services-misc--regain-command/oftc): New test.
+	* test/lisp/erc/resources/services/regain/taken-regain-oftc.eld: New
+	file.
+
+2025-02-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Announce XINERAM and XRANDR in 'system-configuration-features'
+
+	* configure.ac (emacs_config_features): Add XINERAMA and XRANDR.
+	(Bug#75936)
+
+2025-02-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Improve format-seconds on negative args
+
+	* lisp/calendar/time-date.el (format-seconds):
+	Work better with negative seconds (Bug#75849).
+	* test/lisp/calendar/time-date-tests.el (test-format-seconds): Test it.
+
+2025-02-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Improve malloc Lisp alignment commentary
+
+	Prompted by a private email from Pip Cet.
+
+2025-02-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix mouse pointer inside mouse-face on text with 'pointer' property
+
+	* src/dispnew.c (gui_update_window_end): Don't consider mouse face
+	overwritten.
+	* src/xdisp.c (show_mouse_face): Accept an additional argument;
+	redefine the mouse cursor only if that argument is 'true'.  All
+	callers changed.  (Bug#75931)
+
+2025-02-02  Gerd Möllmann  <gerd@gnu.org>
+
+	Fix hiding tty cursor for overlapping children
+
+	* src/dispnew.c (is_cursor_obscured): If selected frame is in the
+	z-order of the root frame, use that, otherwise use the root frame.
+
+2025-02-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Omit 2 ‘volatile’s in internal_lisp_condition_case
+
+	* src/eval.c (internal_lisp_condition_case): Omit an unnecessary
+	‘volatile’ and an unnecessary pointer-to-volatile local var.
+	Perhaps these were needed in previous versions of Emacs, or to
+	pacify older versions of GCC when using --enable-gcc-warnings,
+	but they are not needed to pacify current GCC.
+
+2025-02-01  shipmints  <shipmints@gmail.com>
+
+	Add missing custom :set to 'savehist-autosave-interval'
+
+	* lisp/savehist.el (savehist-autosave-interval): Correctly
+	reset 'savehist-timer' when 'savehist-autosave-interval' changes
+	via setopt or a Customize command.  (Bug#75834)
+
+2025-02-01  shipmints  <shipmints@gmail.com>
+
+	Add auto save timer to save-place (bug#75837)
+
+	* lisp/saveplace.el (save-place-autosave-interval):
+	New user option 'save-place-autosave-interval' which defaults to nil,
+	and has a custom :set to manage the timer.  Add
+	'save-place--manage-timer' to enable or cancel the timer if the mode is
+	enabled and 'save-place-autosave-interval' is non-nil.  Amend
+	'save-place-mode' to invoke save-place--manage-timer.  Add
+	'save-place--cancel-timer'.  Add 'save-place--autosave'.
+
+2025-02-01  Michael Albinus  <michael.albinus@gmx.de>
+
+	Minor Tramp changes
+
+	* doc/misc/tramp.texi (External methods): Precise remark on rsync speed.
+
+	* lisp/net/tramp-cache.el (tramp-connection-properties): Add link
+	to the Tramp manual in the docstring.
+
+2025-02-01  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Update to Transient v0.8.4-7-gabee7353
+
+2025-02-01  Pip Cet  <pipcet@protonmail.com>
+
+	Use #$ for lambda fixups in native compilation data vectors
+
+	The "#$" syntax is recognized by Fread, which substitutes
+	Vload_file_name in its place.  If Vload_file_name is bound
+	appropriately, no other value can produce an object EQ to the one
+	produced by "#$".
+
+	We use this to check the data vector for entries that we know should
+	have been initialized: if the value is still equal to what we bound
+	Vload_file_name to when it was read, it wasn't initialized, and we
+	abort.
+
+	* lisp/emacs-lisp/comp.el (comp--#$): New defvar.
+	(comp--finalize-container): Use it.
+	* src/comp.c (ABI_VERSION): Bump.
+	(emit_static_object): Ensure 'comp--#$' prints as "#$".
+	(load_static_obj): Ensure '#$' reads as Vcomp__hashdollar.
+	(check_comp_unit_relocs): Adjust assertion.
+	(syms_of_comp): Define 'comp--#$'.
+	* src/pdumper.c (dump_do_dump_relocation): Adjust assertion.
+
+2025-02-01  Konstantin Kharlamov  <Hi-Angel@yandex.ru>
+
+	Avoid infinite questions if TAGS file was removed
+
+	When the visited TAGS file was removed, commands that depend on
+	TAGS, such as auto-completion, may invoke an interactive question
+	whether a user wants to re-read the file.  From that point on,
+	the question will be asked over and over, because the file no
+	longer exists, which results in mtime mismatch and inability to
+	"fix the mismatch" by reading from the file.  Fix that by simply
+	ignoring the mismatch if the file no longer exists.
+	* lisp/progmodes/etags.el (tags-verify-table): Avoid infinite
+	questions if TAGS file was removed.  (Bug#75946)
+
+2025-02-01  Po Lu  <luangruo@yahoo.com>
+
+	Fix compilation warnings on Android
+
+	* src/alloc.c (pointer_align): Only define if
+	!USE_ALIGNED_ALLOC.
+
+2025-02-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	ba271938951 ; * etc/NEWS: Fix wording.
+	fdc6842a44e Remove bookmark fringe marks when deleting all bookmarks
+	3bccd04c5c6 Improve wording in symbols.texi
+	6441b9ea7af Fix typo in Gnus manual
+	87be3aa1491 eglot: Allow omnisharp binary to be capitalized "OmniSharp"
+	5485ea6aef9 Do not set `trusted-content` in major modes
+	d11488fd6fb ; * lisp/subr.el (sit-for): Doc fix.
+
+	# Conflicts:
+	#	etc/NEWS
+
+2025-02-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	d0907a43888 ; * admin/MAINTAINERS: Prefer "website" to "home page".
+
+2025-02-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	6447634f171 ; * admin/MAINTAINERS: Add CC Mode.
+	486d5d524ca Update cc-mode URL to point to nongnu.org
+	17ef46e849d ; * etc/NEWS: Note CVE-2024-53920 further up also.
+	05ee2b741f0 ; * CONTRIBUTE: Suggest to run more tests sometimes.
+	e74efd9a428 * CONTRIBUTE: Recommend running the unit test prior to co...
+	a9cde2463ab Don't signal an error in treesit-node-at
+	5d021a711a9 ; Improve documentation of '.dir-locals.el'
+	84595cbcc78 ; (let-alist): Document double-dot escape syntax. (Bug#75...
+	5617b07a45b ; Prefer HTTPS to HTTP in docs
+	fdd23023c84 ; * admin/MAINTAINERS: Sort external packages alphabetica...
+	74dcfe155a9 ; * etc/NEWS: Remove temporary documentation markers.
+	a87c382caba ; * etc/NEWS: Add missing temporary documentation tags.
+	3c820cd2650 Document insert-directory-program as a user option
+	2c1edf5f62a doc/lispref/modes.texi (Syntactic Font Lock): Update for ...
+
+	# Conflicts:
+	#	etc/NEWS
+
+2025-02-01  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	lisp/progmodes/csharp-mode.el: Fix fontification of typeof (bug#75406).
+
+2025-02-01  Rudolf Adamkovič  <rudolf@adamkovic.org>
+
+	Ispell: Increase help timeout
+
+	* lisp/textmodes/ispell.el (ispell-help-timeout): Increase the timeout
+	from 5 to 30 seconds to allow users, especially new users, read the
+	Ispell help menu comfortably and act confidently (bug#75804).
+
+2025-02-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(defcustom): Improve doc of `:group`
+
+	* lisp/custom.el (defcustom): Mention the use of a default group and
+	the fact that `:group` can be repeated.
+
+2025-02-01  Pengji Zhang  <me@pengjiz.com>
+
+	New user option 'Buffer-menu-human-readable-sizes'
+
+	* lisp/buff-menu.el (Buffer-menu-human-readable-sizes): New user
+	option.
+	(list-buffers--refresh): Use it.
+	* etc/NEWS: Announce the new user option.  (Bug#75825)
+
+2025-02-01  Eli Zaretskii  <eliz@gnu.org>
+
+	* etc/NEWS: Fix punctuation.
+
+2025-02-01  shipmints  <shipmints@gmail.com>
+
+	Add new user option bookmark-bmenu-type-column-width
+
+	* lisp/bookmark.el (bookmark-bmenu-mode):
+	Add new user option bookmark-bmenu-type-column-width, defaulting to 8
+	for backwards compatibility, and use it when creating the tabulated
+	bookmark list.  (Bug#75826)
+
+2025-02-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Rename a recently-added variable (bug#56197)
+
+	* lisp/emacs-lisp/lisp-mode.el
+	(lisp-fill-paragraphs-as-doc-string): Renamed from
+	'lisp-fill-paragraph-as-displayed' and default value reversed.
+	(lisp-fill-paragraph): Adjust to the change.
+	* test/lisp/emacs-lisp/lisp-mode-tests.el
+	(lisp-fill-paragraph-as-displayed): Likewise.
+
+2025-02-01  Stefan Kangas  <stefankangas@gmail.com>
+
+	Revert "Don't use obsolete face variables in lisp-mode.el"
+
+	This reverts commit ba60fa3deaa030eb4815caa8c180ac841709e86a.
+
+2025-02-01  Stefan Kangas  <stefankangas@gmail.com>
+
+	Merge branch 'scratch/no-purespace' into 'master'
+
+2025-02-01  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+	Improve typescript-ts-mode fontification (bug#75824)
+
+	* lisp/progmodes/typescript-ts-mode.el:
+	(typescript-ts-mode--operators): Add syntax-highlighting ??
+	operator.
+	(typescript-ts-mode--font-lock-settings): Add "undefined" as
+	recognized constant.
+
+2025-01-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Don’t use garbage after tty_frame_at returns nil
+
+	* src/term.c (handle_one_term_event): Don’t access possibly
+	uninitialized storage if frame is nil.  This fixes an issue introduced
+	in commit 5eae7f5227c7789dea45cef26fec17c057024670 dated 2025-01-26
+	14:43:51 -0800. Issue caught by --enable-gcc-warnings, which enables
+	-Wanalyzer-use-of-uninitialized-value with gcc (GCC) 14.2.1 20250110
+	(Red Hat 14.2.1-7).
+
+2025-01-31  Pip Cet  <pipcet@protonmail.com>
+
+	Revert "Prefer static switch-case checking in pdumper"
+
+	This reverts commit 6e2e7265a04f63f482db7fbdfd8e2519d8bfe03e.
+
+2025-01-31  Pip Cet  <pipcet@protonmail.com>
+
+	Revert "Pacify -Wanalyzer-use-of-uninitialized-value"
+
+	This reverts commit 1ed769a3cb753a86badba8a2878fa788a6fdc1f8.
+
+2025-01-31  Pip Cet  <pipcet@protonmail.com>
+
+	Revert "; * src/pdumper.c (dump_do_fixup): Pacify GCC.
+
+	This reverts commit a99ba59aa02ef8cfd314737950b6cd8d97015925.
+
+2025-01-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port dest-mountpoint test to suspicious bwrap
+
+	* test/lisp/emacs-lisp/bytecomp-tests.el:
+	(bytecomp-tests--dest-mountpoint): Skip test if bwrap prohibits
+	even ‘true’, which it does on my Ubuntu 24.10 platform.
+
+2025-01-31  João Távora  <joaotavora@gmail.com>
+
+	Eglot: add server menu into main menu
+
+	* lisp/progmodes/eglot.el (eglot-menu): Add separator at end
+	and add in eglot-server menu at load-time.
+	(eglot-server-menu): Rework menu title and description.
+
+2025-01-31  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid stack overflow on MS-Windows due to 'make-temp-name'
+
+	* src/fileio.c (Fexpand_file_name) [DOS_NT]: Use 'SAFE_ALLOCA'
+	instead of 'alloca'.  (Bug#75938)
+
+2025-01-31  Martin Rudalics  <rudalics@gmx.at>
+
+	In 'replace-buffer-in-windows' try to preserve current buffer (Bug#75949)
+
+	* lisp/window.el (replace-buffer-in-windows): Preserve current
+	buffer when 'kill-buffer-quit-windows' is non-nil and a window
+	showing BUFFER shall be quit.  Running 'kill-buffer-hook' relies
+	on it (Bug#75949).
+
+2025-01-31  shipmints  <shipmints@gmail.com>
+
+	Add new variable tab-bar-format-tab-help-text-function
+
+	* lisp/tab-bar.el (tab-bar--format-tab):
+	Add new variable 'tab-bar-format-tab-help-text-function' and a default
+	function 'tab-bar-format-tab-help-text-default'.  'tab-bar--format-tab'
+	respects this new variable when producing a tab's help text, normally
+	shown in the echo area or via tooltips (bug#75950).
+
+2025-01-31  Yuan Fu  <casouri@gmail.com>
+
+	Add treesit-simple-indent-override-rules
+
+	* lisp/treesit.el:
+	(treesit-simple-indent-override-rules): New variable.
+	(treesit-simple-indent): Try
+	treesit-simple-indent-override-rules first.
+	(treesit-add-simple-indent-rules): Mention the new variable.
+	* etc/NEWS: Update news.
+
+2025-01-31  Yuan Fu  <casouri@gmail.com>
+
+	Add treesit-add-simple-indent-rules
+
+	* lisp/treesit.el:
+	(treesit-add-simple-indent-rules): New function.
+	* etc/NEWS: Update NEWS.
+	*
+	test/src/treesit-tests.el:
+	(treesit-test-add-simple-indent-rules): Add a test for the new
+	function.
+
+2025-01-30  shipmints  <shipmints@gmail.com>
+
+	* lisp/tab-bar.el (tab-bar-select-tab): Fix wc-bl/wc-bbl when nil
+
+	Remove the nil-check conditionals around 'wc-bl' and 'wc-bbl' that reset
+	frame parameters 'buffer-list' and 'buried-buffer-list'. This ensures
+	originating nil values correctly propagate (bug#75935).
+
+2025-01-30  shipmints  <shipmints@gmail.com>
+
+	Add new user option tab-bar-define-keys
+
+	* lisp/tab-bar.el (tab-bar-define-keys):
+	Add new defcustom tab-bar-define-keys.  Reorganize key binding functions
+	to accommodate.  Also remove checks for tab-bar-mode enabled in
+	'tab-bar-select-tab-modifiers', as unnecessary and which prevented user
+	changes from being accepted in cases where the user defers enabling
+	tab-bar-mode (bug#75918).
+
+2025-01-30  shipmints  <shipmints@gmail.com>
+
+	Add abnormal hook tab-bar-post-undo-close-tab-functions
+
+	* lisp/tab-bar.el (tab-bar-undo-close-tab):
+	Add new abnormal hook tab-bar-post-undo-close-tab-functions (bug#75919).
+
+2025-01-30  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp cleanup
+
+	* doc/misc/tramp.texi (Predefined connection information):
+	Mention also "androidsu" as special case of "tmpdir".
+	(Remote processes): Signals are not delivered to remote direct
+	async processes.  Say, that there are restrictions for transfer of
+	binary data to remote direct async processes.
+
+	* lisp/net/tramp-compat.el (tramp-compat-temporary-file-directory):
+	Simplify.
+
+2025-01-30  Yuan Fu  <casouri@gmail.com>
+
+	Fix tree-sitter language remapping
+
+	* src/treesit.c (resolve_language_symbol): Move forward.
+	(treesit_ensure_query_compiled): Resolve language remapping
+	here.
+	(Ftreesit_parser_list): Don't resolve language remaping here,
+	because there's no need: parsers now carries the remapped
+	language.
+	(Ftreesit_query_compile): Don't resolve language remapping here,
+	because we resolve language remapping when actually compiling
+	the query.  Also we want the query to carry the unmapped
+	language.
+
+2025-01-30  Yuan Fu  <casouri@gmail.com>
+
+	Add back tree-sitter declare-function for python.el (bug#75526)
+
+	treesit-declare-unavailable-functions is not available for old
+	emacs versions, but python.el is a core package available on
+	ELPA.
+
+	Remove the treesit-declare-unavailable-functions until compat.el
+	releases a new version that contains it.
+
+	* lisp/progmodes/python.el: Remove
+	treesit-declare-unavailable-functions and add back
+	declare-function forms.
+
+2025-01-30  Gerd Möllmann  <gerd@gnu.org>
+
+	Further fixes for cursor positioning (bug#75056)
+
+	* src/dispnew.c (write_matrix): Don't set the cursor here. Parameter to
+	set the cursor or not removed.
+	(combine_updates_for_frame): Call tty_set_cursor here, depending on
+	whether or not the selected frame is related to the updated frame.
+	(update_frame_with_menu): Adapt to change of write_matrix.
+
+2025-01-30  Gerd Möllmann  <gerd@gnu.org>
+
+	Replace two macros with functions in dispnew.c (bug#75056)
+
+	* src/dispnew.c (WINDOW_TO_FRAME_VPOS, WINDOW_TO_FRAME_VPOS): Macros
+	removed.
+	(window_to_frame_vpos, window_to_frame_vpos): Always define, and use
+	them instead of the removed macros.
+
+2025-01-30  Gerd Möllmann  <gerd@gnu.org>
+
+	Don't use selected frame in tty_set_cursor (bug#75056)
+
+	* src/dispnew.c (tty_set_cursor): Add frmae parameter.
+	(write_matrix): Pass to the updated frame to tty_set_cursor.
+
+2025-01-29  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: Don't propertize parens in macros incorrectly
+
+	Parentheses in macros were getting incorrectly propertized with
+	the '(1) (punctuation) syntax-table text property.  This was
+	due to a typo in the patch "CC Mode: Rationalize and optimize
+	cache invalidation (1)" from 2024-10-06.  Correct this.
+
+	* lisp/progmodes/cc-mode.el (c-depropertize-CPP): Move the
+	first c-clear-syntax-table-with-value-trim-caches invocation
+	from inside the enclosing `when' form to after it.
+
+2025-01-29  Juri Linkov  <juri@linkov.net>
+
+	Fix args in treesit-beginning-of-defun and treesit-end-of-defun
+
+	* lisp/treesit.el (treesit-beginning-of-defun): Set arg to 1 when nil.
+	(treesit-end-of-defun): Fix arg names in docstring.
+
+2025-01-29  João Távora  <joaotavora@gmail.com>
+
+	Eglot: don't auto-shutdown when reverting of single managed buffer
+
+	When eglot-autoshutdown is t and the only reason we're
+	considering it is because of a revert (which tears down Eglot's
+	minor mode as if by killing), detect that situation and
+	purposedly cancel the shutdown.
+
+	* lisp/progmodes/eglot.el (eglot--managed-mode): Tweak.
+
+2025-01-29  João Távora  <joaotavora@gmail.com>
+
+	Eglot: in eglot-code-action-indications, make 'margin' interactive
+
+	Didn't know it was possible, thanks to Ergus <spacibba@aol.com> for the
+	tip about binding [left-margin mouse-2] in the keymap.
+
+	The technique adopted in 'eglot-mouse-call' possibly still doesn't work
+	very well if the margin thing we're clicking on is not on the line point
+	is currently on.  But we don't have that problem (yet?) because LSP
+	action suggestions function mostly on a "at point" basis.
+
+	* lisp/progmodes/eglot.el (eglot-code-action-indications): Adjust docstring.
+	(eglot--mouse-call): Don't go anywhere except in text area.
+	(eglot-diagnostics-map): Bind eglot-mouse-actions to left-margin.
+
+2025-01-28  Juri Linkov  <juri@linkov.net>
+
+	Hideshow support for tree-sitter in hs-minor-mode (bug#75609)
+
+	* lisp/progmodes/hideshow.el (hs-inside-comment-p-func):
+	New buffer-local variable.
+	(hs-hide-block-at-point): Check if 'hs-block-end-regexp' is
+	a string or a function.
+	(hs-inside-comment-p): Move body to 'hs-inside-comment-p--default'.
+	Call 'hs-inside-comment-p-func' if it's a function.
+	(hs-inside-comment-p--default): New function with body from
+	'hs-inside-comment-p'.
+	(hs-hide-all): Don't use 'hs-block-start-regexp' when it's not a string.
+	(hs-minor-mode): Don't call 'hs-grok-mode-type' when
+	'hs-inside-comment-p-func' already has a buffer-local value.
+
+	* lisp/treesit.el (treesit-hs-block-end)
+	(treesit-hs-find-block-beginning, treesit-hs-find-next-block)
+	(treesit-hs-looking-at-block-start-p)
+	(treesit-hs-inside-comment-p): New functions.
+	(treesit-major-mode-setup): Set hs-minor-mode buffer-local variables.
+
+2025-01-28  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el: Use default display behavior for treesit-explore.
+
+	(treesit-explorer-switch-parser, treesit-explore):
+	Revert to previous behavior (bug#75079).
+
+2025-01-28  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix two more drawings in windows.texi
+
+	* doc/lispref/windows.texi (Changing Window Layouts): Fix two more
+	drawings.
+
+2025-01-28  Martin Rudalics  <rudalics@gmx.at>
+
+	New variable 'expose-hidden-buffer' (Bug#75828)
+
+	* src/frame.c (make_frame): Handle 'expose-hidden-buffer'.
+	(expose-hidden-buffer): New variable to handle hidden buffers.
+	* src/buffer.c (Fother_buffer): Mention that it does not return
+	a hidden buffer.
+	* lisp/frame.el (make-frame): In doc-string describe handling
+	of hidden buffers.
+	* doc/lispref/frames.texi (Creating Frames): Explain handling
+	of hidden buffers in description of 'make-frame'.
+
+2025-01-28  João Távora  <joaotavora@gmail.com>
+
+	Eglot: allow customizing the mode line (bug#71823)
+
+	* lisp/progmodes/eglot.el (eglot-code-action-indications): Adjust docstring.
+	(eglot--mode-line-props): Tweak.
+	(eglot--mode-line-format): Delete.
+	(eglot-mode-line-format): New defcustom.
+	(eglot-mode-line-menu, eglot-mode-line-session)
+	(eglot-mode-line-error, eglot-mode-line-pending-requests)
+	(eglot-mode-line-progress, eglot-mode-line-action-suggestion): New
+	constants.
+	(mode-line-misc-info): Adjust setting
+
+	* etc/EGLOT-NEWS: Mention new feature.
+
+	* doc/misc/eglot.texi (Customization Variables): Mention new variable.
+
+2025-01-28  João Távora  <joaotavora@gmail.com>
+
+	Eglot: suggest code actions at point
+
+	* lisp/progmodes/eglot.el (eglot-code-action-indicator-face): New face.
+	(eglot-code-action-indications, eglot-code-action-indicator): New defcustoms.
+	(eglot--highlights): Move up here.
+	(eglot--managed-mode): Rework.
+	(eglot--server-menu-map, eglot--main-menu-map): Extract maps into
+	variables (avoids odd mode-line bug).
+	(eglot--mode-line-format): Rework.
+	(eglot--code-action-params): New helper.
+	(eglot-code-actions): Rework.
+	(eglot--read-execute-code-action): Tweak.
+	(eglot-code-action-suggestion): New function.
+
+	* etc/EGLOT-NEWS: Mention new feature.
+
+	* doc/misc/eglot.texi (Eglot Features): Mention new feature.
+	(Customization Variables): Mention new variables.
+
+2025-01-28  João Távora  <joaotavora@gmail.com>
+
+	Eglot: introduce eglot-advertise-cancellation
+
+	Setting this variable to true causes Eglot to send special
+	cancellation notification for certain stale client request.
+
+	This may help some LSP servers avoid doing costly but ultimately useless
+	work on behalf of the client, improving overall performance.
+
+	Request cancellation is described in
+
+	   https://microsoft.github.io/language-server-protocol/
+	      specifications/lsp/3.17/specification/#cancelRequest
+
+	* lisp/jsonrpc.el (jsonrpc-request): Accept function as value for
+	CANCEL-ON-INPUT.
+
+	* lisp/progmodes/eglot.el (eglot--request): Rework.
+
+	* doc/misc/eglot.texi (Customizing Eglot): Mention
+	eglot-advertise-cancellation.
+
+2025-01-28  João Távora  <joaotavora@gmail.com>
+
+	Eglot: restructure and overhaul documentation
+
+	* doc/misc/eglot.texi (Starting Eglot): Tweak.
+	(Using Eglot): Remove link to 'Eglot Variables'.
+	(Eglot Features): Rework.
+	(Eglot and Buffers): Rework.
+	(Eglot Commands): Rework.
+	(Customizing Eglot): New chapter.
+	(Customization Variables): Now contains what 'Eglot Variables'
+	used to contain.
+	(Other Variables): New section.
+	(More Customization): New section.
+	(...elsewhere...): Apply 'fill-paragraph'.
+
+2025-01-28  João Távora  <joaotavora@gmail.com>
+
+	Eglot: symbol highlighting now done in eldoc-documentation-functions
+
+	Even though highlighting the thing at point isn't really producing
+	documentation at point, theory and practice have shown that using
+	eldoc-documentation-functions for this is a feasible way to avoid
+	reimplementing all the idle timer logic for such functionality.
+
+	In fact, we were already using ElDoc for this purpose, but this commit
+	makes it so the new eglot-highlight-eldoc-function is a first class
+	citizen in eldoc-documentation-functions, so users can manipulate it if
+	so desired.
+
+	* lisp/progmodes/eglot.el (eglot--managed-mode): Use
+	eglot-highlight-eldoc-function
+	(eglot-hover-eldoc-function): Don't mix highlighting with hover.
+	(eglot-highlight-eldoc-function): Rename and rework from
+	eglot--highlight-piggyback
+
+2025-01-28  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix previous commit for Changing Window Layouts
+
+	* doc/lispref/windows.texi (Changing Window Layouts): Remove wrong
+	example.  Change some indentations.
+
+2025-01-28  Gerd Möllmann  <gerd@gnu.org>
+
+	Fix frame-visible-p for tty root frames
+
+	* src/frame.c (Fframe_visible_p): Don't unconditionally return t for tty
+	root frames.
+
+2025-01-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Avoid some make_formatted_string mallocs
+
+	* src/alloc.c (make_formatted_string):
+	Grow the local buffer from 64 to MAX_ALLOCA bytes.
+
+2025-01-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Make vmessage a bit safer
+
+	* src/xdisp.c (vmessage): Avoid undefined behavior if
+	FRAME_MESSAGE_BUF_SIZE (f) is zero, or if doprnt generates output
+	containing only encoding errors.  Although it’s not clear whether
+	either is possible, it is better to be safe.  Also, clarify via a
+	new local message_bufsize.
+
+2025-01-28  Pip Cet  <pipcet@protonmail.com>
+
+	Avoid printing NUL characters in 'message' (bug#75900)
+
+	* src/xdisp.c (vmessage): Increase buffer size to fit an extra
+	multibyte character.  On buffer overflow, drop the last multibyte
+	character to determine an accurate byte length.
+
+2025-01-28  Pip Cet  <pipcet@protonmail.com>
+
+	Fix buffer overflows in doprnt (bug#75900)
+
+	* src/doprnt.c (doprnt): Clear rest of buffer on multibyte overflow.
+	Always decrement bufsize when writing a byte.
+
+2025-01-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	doprnt %X support
+
+	* src/doprnt.c (doprnt): Also support %X, since callers
+	now use %X.
+
+2025-01-27  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't use obsolete face variables in lisp-mode.el
+
+	* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-1)
+	(lisp-cl-font-lock-keywords-1, lisp-el-font-lock-keywords-2)
+	(lisp-cl-font-lock-keywords-2): Don't use obsolete face variables.
+
+2025-01-27  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	time-stamp: Don't get confused by newline in file name
+
+	* lisp/time-stamp.el (time-stamp-filtered-buffer-file-name): New helper
+	* test/lisp/time-stamp-tests.el: (time-stamp-custom-file-name): New test
+
+2025-01-27  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	time-stamp-tests: Make macro-defined tests findable
+
+	* test/lisp/time-stamp-tests.el (define-formatz-tests): Use
+	'find-function-update-type-alist' to make defined tests findable.
+	(formatz-find-test-def-function): New test-finding function.
+
+2025-01-27  jared  <jared@electric-egg>
+
+	Fix clicking in child frames with GPM
+
+	* src/term.c (handle_one_term_event): Store child frame
+	coordinates in event.
+
+2025-01-27  Martin Rudalics  <rudalics@gmx.at>
+
+	In Elisp manual document new functions for changing window layouts
+
+	* doc/lispref/windows.texi (Changing Window Layouts): New section
+	to document the new functions for changing window layouts.
+	* doc/lispref/elisp.texi (Top): Add entry for new section.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify -Wanalyzer-use-of-uninitialized-value
+
+	With ‘configure --enable-gcc-warnings’,
+	gcc (GCC) 14.2.1 20250110 (Red Hat 14.2.1-7) on x86-64
+	complained, as it apparently did not want to assume that enum
+	variables have one of the listed values.
+	Work around the problem by using tables rather than
+	switch statements.  This gives up a little static
+	checking but I don’t see any other easy way to pacify
+	GCC without disabling the warnings entirely.
+	* src/pdumper.c (dump_fwd_int, dump_fwd_bool, dump_fwd_obj)
+	(dump_fwd_buffer_obj, dump_fwd_kboard_obj):
+	Last arg is now void const * so that these functions’ addresses
+	can all be put into the same array.
+	(dump_fwd, dump_anonymous_allocate_posix, dump_map_file_posix):
+	Use an array rather than a switch.
+	(mem_prot_posix_table): New static constant table.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix unlikely eassert failure in invalid_radix_integer
+
+	* src/lread.c (invalid_radix_integer):
+	Simplify by using sprintf with a big-enough buffer.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix unlikely eassert failure in xg_set_widget_bg
+
+	* src/gtkutil.c (xg_set_widget_bg): Simplify by using
+	sprintf with a big-enough buffer.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix unlikely eassert failure in pgtk_enumerate_devices
+
+	* src/pgtkterm.c (pgtk_enumerate_devices): Prefer
+	make_formatted_string to snprintf + build_string + eassert, as
+	it’s simpler and won’t crash Emacs if the eassert fails.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Minor format_string tuneup
+
+	* src/comp.c (format_string): Prefer strcpy to doing things by hand
+	in a place where strcpy is easier to read, generates
+	more-efficient code, and similar parts of Emacs do strcpy.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Ignore -fanalyzer-null-argument in pgtkterm.c
+
+	* src/pgtkterm.c: Ignore -Wanalyzer-null-dereference.
+	I don’t have time to look into all the diagnostics,
+	but the ones I checked seemed to be false alarms with
+	gcc -std=gnu23 on x86-64, and we are ignoring this
+	diagnostic in other modules.  This is GCC 14.2.1
+	20250110 (Red Hat 14.2.1-7).
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify -fanalyzer-null-argument on pgtk_term_init
+
+	* src/pgtkterm.c (pgtk_term_init): Use xstrdup, not g_strdup.
+	The value is never freed so the allocator shouldn’t matter.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Protect against GCing of last_mouse_window
+
+	* src/window.c (last_mouse_window): New global var.  All static
+	instances removed, and all their uses replaced with this global
+	var.  This fixes a very unlikely bug where last_mouse_window was
+	GC’ed and a new window created in its place.  It also fixes several
+	places that assumed NIL_IS_ZERO without static_asserting it.
+	(init_window_once): Initialize the new var.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify GCC in pgtkselect malloc alignment
+
+	* src/pgtkselect.c (pgtk_size_for_format): Remove.
+	(pgtk_get_window_property): Third arg is now void **, not unsigned
+	char **.  Omit last arg.  All callers changed.  Simplify
+	allocation to pacify GCC 14.2.1 complaint about malloc size
+	mismatching size of array: there’s no need for an extra byte when
+	converting from ldata to idata.
+	(selection_data_to_lisp_data): Third arg is now void const *,
+	not unsigned char const *.  All callers changed.
+	Omit unnecessary casts.  Make some locals more local.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Avoid undefined behavior with botched pgtk menu
+
+	* src/pgtkmenu.c (pgtk_menu_show): Do not dereference save_wv if
+	null.  Problem found by gcc 20250110 (Red Hat 14.2.1-7)
+	-Wanalyzer-null-dereference.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Use gtk_disable_setlocale
+
+	* src/pgtkterm.c (pgtk_term_init):
+	* src/xterm.c (x_term_init):
+	Use gtk_disable_setlocale rather than fixup_locale.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Avoid unlikely int overflow.
+
+	* src/pgtkterm.c (pgtk_term_init):
+	* src/xterm.c (x_term_init):
+	Use a bool, not an int that keeps incrementing,
+	to record whether initialization has occurred.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Beware large stack growth in pgtk_menu_show
+
+	* src/pgtkmenu.c (pgtk_menu_show): USE_SAFE_ALLOCA instead of alloca.
+	Problem found with --enable-gcc-warnings.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix x-show-tip bignum crash
+
+	* src/pgtkfns.c (compute_tip_xy): Fix crash if user specifies
+	bignums.  Bug found with --enable-gcc-warnings.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Prefer make_formatted_string in svg_load_image
+
+	* src/image.c (svg_load_image): Prefer make_formatted_string to
+	snprintf, as this simplifies the code and does not truncate the
+	resulting string arbitrarily.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Simplify building of color names in image.c
+
+	* src/image.c (make_color_name): New function.
+	(image_background, image_build_heuristic_mask, png_load_body): Use it.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Simplify make_formatted_string API
+
+	From a suggestion by Pip Cet.
+	* src/alloc.c (make_formatted_string): Omit first argument,
+	to simplify the calling convention.  All callers changed.
+	* src/doprnt.c (doprnt): Also support %u.  Update doc.
+
+2025-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix unlikely time zone abbreviation bug
+
+	* src/timefns.c (Fcurrent_time_zone): Fix double-"-" bug when time
+	zone name is not known and time zone offset is -3600 or less.
+	Also, stop assuming that make_formatted_string works with "*"
+	precisions; this might ease future changes.
+
+2025-01-27  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't use obsolete face alias in themes
+
+	* etc/themes/leuven-dark-theme.el:
+	* etc/themes/leuven-theme.el:
+	* etc/themes/manoj-dark-theme.el:
+	* etc/themes/tango-dark-theme.el:
+	* etc/themes/tango-theme.el: Don't use obsolete face alias
+	'smerge-refined-change', preferring instead 'smerge-refined-changed'.
+
+2025-01-27  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't use obsolete variable in semantic/grammar.el
+
+	* lisp/cedet/semantic/grammar.el
+	(semantic-grammar-mode-keywords-2):
+	(semantic-grammar-mode-keywords-3): Don't use obsolete variables.
+
+2025-01-27  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't use obsolete variables in semantic/idle.el
+
+	* lisp/cedet/semantic/idle.el
+	(semantic-idle-symbol-maybe-highlight)
+	(semantic-idle-local-symbol-highlight): Don't use obsolete variable
+	'semantic-idle-symbol-highlight-face'.
+
+2025-01-27  Po Lu  <luangruo@yahoo.com>
+
+	Fix the Android port
+
+	* src/term.c (tty_frame_at) [HAVE_ANDROID]: Always return nil.
+
+	* src/terminal.c (cursor_to, raw_cursor_to) [HAVE_ANDROID]:
+	Don't call root_xy.
+
+2025-01-26  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix compilation warnings in pdumper with !HAVE_NATIVECOMP
+
+	* src/pdumper.c [!HAVE_NATIVECOMP] (cold_op, dump_subr): Fix
+	compilation warnings.
+	Ref: https://lists.gnu.org/r/emacs-devel/2025-01/msg01003.html
+
+2025-01-26  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer static switch-case checking in pdumper
+
+	* src/pdumper.c (dump_fwd, dump_symbol, dump_drain_cold_data)
+	(dump_do_fixup, dump_anonymous_allocate_w32)
+	(dump_anonymous_allocate_posix, dump_map_file_w32, dump_map_file_posix)
+	(dump_do_emacs_relocation): Remove default clauses to allow static
+	checking using -Wswitch.
+
+2025-01-26  Pip Cet  <pipcet@protonmail.com>
+
+	Avoid crashes in Fdocumentation caused by incorrect data types
+
+	Note that this can only change things when function-documentation is
+	defined or overloaded incorrectly.
+
+	* src/doc.c (Fdocumentation): Check that the cdr of a docstring cons
+	is a fixnum.
+
+2025-01-26  Gerd Möllmann  <gerd@gnu.org>
+
+	Display separators on tty menus with display table entries
+
+	* src/xdisp.c (display_tty_menu_separator): Lookup separator char in
+	standard-display-table, make a string, and display that using
+	display_string.
+	* src/xdisp.c (display_tty_menu_separator_char): New function.
+	(display_tty_menu_separator): Use it.
+	* lisp/disp-table.el (display-table): Increase from 12 to 18.
+	(box-double-vertical, box-double-horizontal, box-double-down-right)
+	(box-double-down-left, box-double-up-right, box-double-up-left): New
+	symbols for extra slots.
+	(display-table-slot, set-display-table-slot): Change doc string.
+	(describe-display-table): Describe new slots.
+	(standard-display-unicode-special-glyphs): Define new slots.
+	* src/disptab.h (DISP_TABLE_P): Add enumerators.
+	(DISP_TABLE_EXTRA_SLOTS): Define based on enum box.
+	* src/dispnew.c (produce_box_glyphs): Add new enumerators to switch to
+	make it exhaustive.
+	* src/xdisp.c (display_tty_menu_separator): Use BOX_DOUBLE_HORIZONTAL
+	for '=' if present.
+	* doc/lispref/display.texi: Add documentation.
+	* etc/NEWS: Mention in NEWS.
+
+2025-01-26  Tassilo Horn  <tsdh@gnu.org>
+
+	Use dired--inhibit-auto-revert for fixing bug#71264
+
+	The original fix bound auto-revert-mode to nil which had the side-effect
+	of disabling auto-revert forever in this buffer because
+	auto-revert-handler removes the buffer from auto-revert-buffer-list when
+	it's called but auto-revert-mode is nil.
+
+	* lisp/dired.el (dired-internal-do-deletions): Bind
+	dired--inhibit-auto-revert during deletion (bug#71264).
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Change doc string of frame-visible-p
+
+	* src/frame.c (Fframe_visible_p): Don't say it always returns t for tty
+	frames.
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Replace is_frame_ancestor with frame_ancestor_p
+
+	* src/dispnew.c (is_frame_ancestor): Removed.
+	(frame_z_order_cmp): Use frame_ancestor_p.
+	(copy_child_glyphs): Ditto.
+	* src/dispextern.h: Declaration removed.
+	* src/term.c (mouse_get_xy): Use frame_ancestor_p.
+
+2025-01-25  Juri Linkov  <juri@linkov.net>
+
+	Add 'treesit-forward-comment' with 'forward-comment-function'
+
+	* lisp/treesit.el (treesit-forward-comment): New function.
+	(treesit-major-mode-setup): Set 'forward-comment-function' to
+	'treesit-forward-comment' if the 'comment' thing is defined.
+
+	* src/syntax.c (forward-comment-function): New variable.
+	(Fforward_comment): Call the function from 'forward-comment-function'
+	when it's non-nil (bug#75609).
+
+2025-01-25  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el: Display treesit-explore buffer below selected window.
+
+	(treesit-explorer-switch-parser, treesit-explore):
+	Use display-buffer-below-selected for display-buffer (bug#75079).
+
+2025-01-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(when-let*): Warn if body is empty
+
+	* lisp/subr.el (when-let*): Warn if body is empty.
+	* lisp/textmodes/tex-mode.el (xref-backend-references): Fix use of
+	`when-let*`.
+
+2025-01-25  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	67903f5909d Restore the old behavior of `bookmark-write-file'
+	062da7003f9 ; Improve prompts and error messages in 'info-look'
+	52dc01f1c8b ; * admin/admin.el (set-version): Note about Android.
+	fb282da2a07 Avoid double spaces around abbrevations in Texinfo
+	bc1ab8ac3d8 ; * doc/emacs/custom.texi (Init Rebinding): Fix spacing.
+	b41ef43af19 ; Fix previous change
+	5638b1d6bd4 Ispell: Use "personal dictionary" terminology consistently
+	cc791e7499f ; Check man pages for mistakes less frequently
+	4ed4792e3b9 ; * admin/release-process: Minor copy-edits.
+	4a867c823b7 Add language server "ruff server" for Python
+	9e687c2871f Fix go-ts-mode type declaration indentation (Bug#75785)
+	f751b3afa4f ; Minor improvements for doc strings in map.el
+	cda78edc7d9 ; Fix typos
+	ce50a1d3c18 ; * src/w32.c (w32_memory_info): Fix coding style of last...
+	58d3d4820ad Fix bug in w32_memory_info
+	77386412050 Avoid crashes in redisplay due to problematic font setups
+	0e3687e6006 Improve 'key-valid-p' docstring
+	9878092d2b9 Minor copyedits in internals.texi
+	4726900fdc5 Better document side-effect free and pure C functions
+	04c475a39f2 ; Fix documentation about faces of tool-tip text
+
+	# Conflicts:
+	#	admin/codespell/codespell.exclude
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Fix the mistake that led to the reverts
+
+	* src/terminal.c (raw_cursor_to): Fix reversed arguments.
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Reapply "Multi-tty: selected frame can be a GUI frame"
+
+	This reverts commit d93d822285813b89f2444ef93c5747cbeb67a46b.
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Reapply "Fix mouse position handling for nested tty child frames"
+
+	This reverts commit e2cc52dbcd196f95cc79c6c6d899b9e86e696fe5.
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Reapply "Fix tty-frame-at for nested tty child frames"
+
+	This reverts commit 9ad28959d6895720865c0718bf60f4b7b0b144f3.
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Reapply "Fix cursor positioning of nested tty child frames"
+
+	This reverts commit 65036323fc1cdf18a7812b1c922583e6466972a6.
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Reapply "Simplify absolute (x, y) computation on ttys"
+
+	This reverts commit 13fdcd730ff63bf79caace9a6e46aff5f944b1b7.
+
+2025-01-25  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Delete all overlays that belong to an editable-field
+
+	* lisp/wid-edit.el (widget-specify-field): Store the end overlay
+	that we sometimes create for an editable-field widget.
+	(widget-field-value-delete): Make sure we delete all overlays
+	that belong to the widget.  (Bug#75646)
+
+	* test/lisp/wid-edit-tests.el (widget-test-delete-field-overlays): New
+	test.
+
+2025-01-25  Konstantin Kharlamov  <Hi-Angel@yandex.ru>
+
+	python-mode: add 'exit' and 'quit' to the list of block-enders
+
+	'exit()' and 'quit()' end the current codeflow, there can't be
+	any code past it, similarly to 'return', 'continue', etc.  So
+	when calculating indentation for the line next to 'exit()',
+	'os.exit()', 'os._exit()', 'sys.exit()' and 'quit()', decrease
+	the indentation level.
+	* lisp/progmodes/python.el (python-rx): Add 'exit()', 'os.exit()',
+	'os._exit()', 'sys.exit()', 'quit' to the list of block-enders.
+	(Bug#75729)
+
+2025-01-25  Maxim Cournoyer  <maxim.cournoyer@gmail.com>
+
+	lisp: Introduce a `lisp-fill-paragraph-as-displayed' variable.
+
+	Starting with Emacs 28, filling strings now happens in a
+	narrowed scope, and looses the leading indentation and can cause
+	the string to extend past the fill-column value.  Introduce
+	`lisp-fill-paragraph-as-displayed' as a new variable allowing
+	opting out of this new behavior in specific scenarios (such as
+	when using the Scheme major mode, say).
+
+	* lisp/emacs-lisp/lisp-mode.el
+	(lisp-fill-paragraph-as-displayed): New variable.
+	(lisp-fill-paragraph): Honor it, by avoiding the logic narrow to
+	strings before applying fill-paragraph.
+	* test/lisp/emacs-lisp/lisp-mode-tests.el
+	(lisp-fill-paragraph-respects-fill-column): Test it.
+	(lisp-fill-paragraph-docstring-boundaries): New test, as a
+	safeguard to avoid regressions.
+
+	(Bug#56197)
+
+2025-01-25  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Avoid error with empty search string in Customize
+
+	* lisp/cus-edit.el (custom-buffer-create-internal): Only call
+	customize-apropos if the string is not empty.  (Bug#75714)
+
+2025-01-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Reload <pkg>-loaddefs when replacing built-in packages
+
+	* lisp/emacs-lisp/package.el (package--reload-previously-loaded):
+	Add new optional argument to display a specified warning upon
+	reloading.
+	(package-activate-1): Always reload libraries when loading built-in
+	packages.  This avoids ELPA versions of built-in packages to be
+	mixed with the built-in package autoloads.
+
+	Link: https://yhetil.org/emacs-devel/87y1adrria.fsf@localhost/
+
+2025-01-25  Daniel Mendler  <mail@daniel-mendler.de>
+
+	ibuffer: Display column titles in header line
+
+	If the option `ibuffer-use-header-line' is set to `title',
+	display column titles in the header line.
+	* lisp/ibuffer.el (ibuffer--format-title)
+	(ibuffer--format-summary): New functions extracted from
+	`ibuffer-update-title-and-summary'.
+	(ibuffer-update-title-and-summary): Use them.
+	(ibuffer-update): Do not always override `header-line-format'.
+	(ibuffer-use-header-line): Update docstring and option `:type'.
+	* lisp/ibuf-macs.el (define-ibuffer-sorter): Add "@" to the
+	interactive specification for clicks on the header line.
+
+	* etc/NEWS: Announce the change.
+	(Bug#75497)
+
+2025-01-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	lisp/repeat.el: Don't expose `cl-extra/cl-lib` distinction
+
+2025-01-25  Daniel Mendler  <mail@daniel-mendler.de>
+
+	ibuffer: New defcustom `ibuffer-human-readable-size'
+
+	* lisp/ibuffer.el (ibuffer-human-readable-size): New
+	defcustom.
+	(define-ibuffer-column size): Use it.
+
+	* etc/NEWS: Mention new defcustom.
+	(Bug#75495)
+
+2025-01-25  Vladimir Panteleev  <git@cy.md>
+
+	Quote identifiers in SQL queries in 'sqlite-mode'
+
+	* lisp/sqlite-mode.el: (sqlite-mode-list-tables)
+	(sqlite-mode-list-columns, sqlite--mode--list-data)
+	(sqlite-mode-delete): Quote identifiers (table and column
+	names) in the SQL queries.  Fixes, e.g., opening databases
+	which have a table called "values".  (Bug#75598)
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Revert "Simplify absolute (x, y) computation on ttys"
+
+	This reverts commit 5e132835ad320be1d5c45ffbf83d67d16fc7bf96.
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Revert "Fix cursor positioning of nested tty child frames"
+
+	This reverts commit 8cbb3c7335ff03b6fae4efeae126e91993cb962a.
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Revert "Fix tty-frame-at for nested tty child frames"
+
+	This reverts commit 9693f2a95ad14bf0caa34e60d72722d4dd4d85c9.
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Revert "Fix mouse position handling for nested tty child frames"
+
+	This reverts commit f37559a1ee035d184bc4db6e4f597281d3ac6879.
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Revert "Multi-tty: selected frame can be a GUI frame"
+
+	This reverts commit 57b7c07b3709d9a2b2c70e0c8218a52448368a12.
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Multi-tty: selected frame can be a GUI frame
+
+	* src/dispnew.c (frame_selected_window_frame): New function.
+	(is_cursor_obscured): Use it.
+	(terminal_cursor_magic): Use the frame of the selected window of he root
+	frame.
+	(combine_updates_for_frame): Move Android conditional compilation out.
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Fix mouse position handling for nested tty child frames
+
+	* src/dispnew.c (child_xy): New function.
+	* src/dispextern.h: Declare it.
+	* src/term.c (tty_frame_at): Return child-relative (x, y) in output
+	parameters.
+	(Ftty_frame_at): Return a list (FRAME CHILD-X CHILD-Y).
+	(handle_one_term_event): Adapt use of tty_frame_at.
+	* lisp/xt-mouse.el (xterm-mouse-event): Use new tty-frame-at.
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Fix tty-frame-at for nested tty child frames
+
+	* src/term.c (tty_frame_at): Translate child frame origin to absolute
+	coordinates.
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Fix cursor positioning of nested tty child frames
+
+	* src/terminal.c (cursor_to, raw_cursor_to): Fix translation to root
+	coordinates.
+
+2025-01-25  Gerd Möllmann  <gerd@gnu.org>
+
+	Simplify absolute (x, y) computation on ttys
+
+	* src/dispnew.c (root_xy): New function.
+	(frame_pos_abs): Removed.
+	(frame_rect_abs, abs_cursor_pos): Use root_xy.
+	* src/dispextern.h: Declare root_xy.
+	* src/term.c (mouse_get_xy): Use it.
+
+2025-01-24  Gerd Möllmann  <gerd@gnu.org>
+
+	Disable more redisplay optimizations when child frames are visible
+
+	* src/xdisp.c (redisplay_internal): Disable more optimizations
+	on a tty root frame displaying a child frame.
+	(try_cursor_movement,(try_window_reusing_current_matrix)
+	(try_window_id): Don't use on tty root frames displaying a child frame.
+
+2025-01-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "; * src/dispnew.c (combine_updates_for_frame): Fix whitespace."
+
+	This reverts commit c941b94e51f4e5996718416ac908249cb71da1d9.
+	It was pushed by mistake.
+
+2025-01-24  Gerd Möllmann  <gerd@gnu.org>
+
+	Handle update of invisible tty frames (bug#75056)
+
+	* src/dispnew.c (combine_updates_for_frame): Don't assume root frame is
+	visible.
+
+2025-01-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Support loading dynamic docstrings from Emacs <29
+
+	* src/doc.c (get_doc_string): Take absolute value to be compatible with
+	bytecode from Emacs <29.
+
+2025-01-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't use negative positions for docstrings
+
+	These were used for user-variables (doc starts with a '*'), but we don't
+	use that convention any more.  On my machine, there are no docstrings
+	starting with a '*' in etc/DOC.
+
+	* src/doc.c (Fsnarf_documentation): Never use negative positions.
+	(get_doc_string): Don't use eabs; position must now be positive, and all
+	callers are verified to do that.
+
+2025-01-23  Pip Cet  <pipcet@protonmail.com>
+
+	Fix GC bug causing incorrect 'format' output (Bug#75754)
+
+	This fixes the correctness bug discovered in bug#75754, but not the
+	performance issue or excessive stack usage.
+
+	* src/editfns.c (styled_format): Split 'info' array into two arrays,
+	one of them allocated via SAFE_ALLOCA_LISP for GC protection.
+
+2025-01-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Simplify Fdocumentation and Fdocumentation_property
+
+	* src/doc.c (Fdocumentation, Fdocumentation_property): Simplify;
+	reread_doc_file always returns true so just assume that.
+	(reread_doc_file): Change return type to void.
+
+2025-01-23  João Távora  <joaotavora@gmail.com>
+
+	Eglot: skip Tramp tests except on Emacs 28+
+
+	* test/lisp/progmodes/eglot-tests.el
+	(eglot--call-with-tramp-test): Fix
+
+2025-01-23  Gerd Möllmann  <gerd@gnu.org>
+
+	Handle tty menus overlapping child frames
+
+	* src/dispnew.c (frame_pos_abs, is_frame_ancestor): Make externally
+	visible.
+	* src/dispextern.h: Declare above functions.
+	* src/term.c (mouse_get_xy): Handle mouse movement over child frames.
+
+2025-01-23  Robert Pluim  <rpluim@gmail.com>
+
+	Add shortdoc for map.el functions
+
+	* lisp/emacs-lisp/shortdoc.el (map): New shortdoc group.
+
+2025-01-23  Gerd Möllmann  <gerd@gnu.org>
+
+	Don't forget setting the top frame if not switching root frames
+
+	* src/frame.c (do_switch_frame): Make sure to set top frame in all
+	cases.
+
+2025-01-23  Gerd Möllmann  <gerd@gnu.org>
+
+	Fix setting a tty's top frame when switching frames
+
+	* src/frame.c (do_switch_frame): Compare root frames correctly.
+
+2025-01-23  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	Fix ERT / find-function type integration typos
+
+	* lisp/emacs-lisp/ert.el (ert-test-location, ert-describe-test):
+	Correctly type the test object as 'ert--test'.
+	* lisp/emacs-lisp/find-func.el (find-ert-deftest-regexp): Remove this
+	duplicate, broken customization.
+
+2025-01-23  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	* doc/lispref: new node "Finding Definitions"
+
+	How to use variable 'find-function-regexp-alist',
+	properties 'definition-name' and 'find-function-type-alist',
+	and function 'find-function-update-type-alist' to help Emacs
+	locate the definition of objects defined by macros.
+
+	This material is moved from node "Standard Properties" and expanded.
+
+2025-01-23  F. Jason Park  <jp@neverwas.me>
+
+	Reuse client cert for connectivity probing in ERC
+
+	* lisp/erc/erc-backend.el (erc--server-connect-function)
+	(erc--server-post-dial-function): Rename former to latter because the
+	existing name is better suited for the eventual generalizing of
+	`erc-server-connect' in a future version.
+	(erc-server-connect): Use new name for `erc--server-connect-function',
+	`erc--server-post-dial-function'.
+	(erc--recon-probe-reschedule, erc--recon-probe-sentinel)
+	(erc--recon-probe-filter, erc--recon-probe-check): New functions
+	factored out of `erc-server-delayed-check-reconnect'.
+	(erc-server-delayed-check-reconnect): Refactor, splitting off lambdas
+	into top-level functions for improved tracing.
+	* lisp/erc/erc.el (erc-message-english-recon-probe-hung-up)
+	(erc-message-english-recon-probe-nobody-home): New
+	variables.  (Bug#62044)
+
+	Thanks to Libera.Chat user arjan for reporting this bug, which
+	is new in ERC 5.6 and Emacs 30.1.
+
+2025-01-22  João Távora  <joaotavora@gmail.com>
+
+	Eglot: unbreak a rarely run test
+
+	* test/lisp/progmodes/eglot-tests.el
+	(eglot-test-snippet-completions-with-company): Don't expect fooba to be
+	there, do expect two completions to be candidates.
+
+2025-01-22  João Távora  <joaotavora@gmail.com>
+
+	Eglot: unbreak tests for older Emacsen
+
+	* test/lisp/progmodes/eglot-tests.el (eglot-test-basic-symlink):
+	Use skip-unless
+
+2025-01-22  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix edebug spec of eglot--dbind
+
+	* lisp/progmodes/eglot.el (eglot--dbind): Fix edebug spec.
+
+2025-01-22  João Távora  <joaotavora@gmail.com>
+
+	Eglot: unbreak completion in Emacs 26.3 (at least)
+
+	For reasons yet to be investigated, in some Emacs older versions,
+	callers of the completion table created by eglot-completion-at-point
+	will destroy text properties in the strings returned by the
+	"all-completions" call (destroy here means completely erase).  This
+	completely breaks Eglot completion.
+
+	(eglot-completion-at-point): Copy substrings in all-completions
+	call.
+
+2025-01-22  João Távora  <joaotavora@gmail.com>
+
+	Eglot: abandon compat.el
+
+	After period of months using this to help compatibility to older Emacs
+	versions.  It's not really buying us that much and complicates
+	maintenance, so it gets the axe.
+
+	A common problem is the compatibility alias for require-with-check,
+	which often errors with some "Feature X loaded from Y is now provided by
+	Z".  The tests for Emacs 26.3 were all failing in the Github tracker
+	ever since this (and track-changes.el) were added to Eglot.
+
+	* lisp/progmodes/eglot.el (compat): No longer require.
+	(eglot-alternatives): Reword comment.
+	(eglot-alternatives): Call eglot--executable-find.
+	(eglot--guess-contact): Call eglot--executable-find.
+	(eglot--connect): Check if package-get-version exists.
+	(eglot--format): Check if substitute-quotes exists.
+	(eglot--format-markup): Check if text-property-search exists.
+
+2025-01-22  João Távora  <joaotavora@gmail.com>
+
+	Eglot: abandon track-changes.el
+
+	After a ~10 month period of using track-changes.el as a support library
+	for tracking buffer changes, I've decided to go back to manually using
+	after-change-functions and before-change-functions.
+
+	track-changes.el showed promise:
+
+	- One of the selling points was to turn complicated a-c-functions and
+	  b-c-functions into something easier, but that objectively didn't pan
+	  out, with "virtual" positions, one-shot hooks, and tracker
+	  registrations being abstractions and complications mastered by very
+	  few.
+
+	- The other selling point was the ability to log and detect those parts
+	  of Emacs that cheat the modification hooks and correct them.  As far
+	  as I can tell, only one such cheater -- quail.el -- was identified.
+	  But with little consequence, only an ugly workaround in eglot.el (now
+	  removed).
+
+	- After using Eglot daily for all this time, I didn't notice any
+	  decrease in desynchronization events.
+
+	- I did notice an increase in track-changes.el related bugs, some of
+	  which still baffle me and and hard to reproduce.  A common occurence
+	  is the '(cl-assertion-failed (memq id track-changes--trackers))'
+	  which is hard to track down.
+
+	- The library makes it more complicated to run Eglot on older Emacsen.
+
+	I might yet revisit this matter for the next version but this
+	experience has shown that it didn't bring the advantages I thought it
+	would, so I'm abandoning it until at least 1.19 is out.
+
+	* lisp/progmodes/eglot.el (track-changes): No longer require.
+	(eglot--virtual-pos-to-lsp-position): Delete.
+	(eglot--managed-mode): Simplify.
+	(eglot--track-changes): Delete this variable.
+	(eglot--recent-changes): Reword doc.
+	(eglot--before-change, eglot--after-change): Bring back.
+	(eglot--track-changes-fetch): Delete.
+	(eglot--add-one-shot-hook): Delete.
+	(eglot--track-changes-signal): Delete.
+
+2025-01-22  Stefan Kangas  <stefankangas@gmail.com>
+
+	Minor image_error related cleanups
+
+	* src/image.c (image_create_x_image_and_pixmap_1): Avoid temporary
+	variable by passing the value directly to image_error.
+	(tiff_handler): Prefer image_error to add_to_log for local
+	consistency.
+
+2025-01-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port allows-stdout test to overly-suspicious bwrap
+
+	* test/src/emacs-tests.el (emacs-tests/bwrap/allows-stdout):
+	Skip test if bwrap prohibits even "echo Hi",
+	which it does on my Ubuntu 24.10 platform.
+	This extra check means we no longer need to test
+	separately whether the filter is readable.
+
+2025-01-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Don’t silently truncate connection-lost diagnostic
+
+	* src/xterm.c (x_io_error_quitter): Do not silently truncate
+	the diagnostic when a connection is lost to an X server.
+
+2025-01-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Check for snprintf truncation in pgtkterm
+
+	* src/pgtkterm.c (pgtk_enumerate_devices):
+	Abort if snprintf truncated.
+
+2025-01-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port pdumper to unlikely long sprintf output
+
+	* src/pdumper.c (dump_ptr_referrer): Port to platforms
+	where sprintf %p generates absurdly long output.
+	(dump_vectorlike): Port to hypothetical platforms
+	where %d generates absurdly long output.
+
+2025-01-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	When debugging image.c, abort if silent truncation
+
+	* src/image.c (image_build_heuristic_mask, png_load_body):
+	Abort if snprintf truncated.  (If truncation is not possible
+	here we should use sprintf instead, as that simplifies
+	automatic runtime checking.)
+
+2025-01-22  Pip Cet  <pipcet@protonmail.com>
+
+	Destroy GTK tool bar widget if it was never attached (bug#75636)
+
+	* src/gtkutil.c (xg_free_frame_widgets): Call gtk_widget_destroy on an
+	unpacked toolbar widget.
+
+2025-01-21  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer snprintf to sprintf in image.c
+
+	* src/image.c (image_background, image_build_heuristic_mask)
+	(png_load_body): Prefer snprintf to sprintf.
+
+2025-01-21  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete some duplicate face attributes
+
+	* etc/themes/leuven-dark-theme.el:
+	* etc/themes/leuven-theme.el:
+	* etc/themes/manoj-dark-theme.el: Delete duplicate face attributes.
+
+2025-01-21  Gerd Möllmann  <gerd@gnu.org>
+
+	Improve copying current glyphs when building frame matrix
+
+	* src/dispnew.c (build_frame_matrix_from_leaf_window): Don't make space
+	glyphs. More comments.
+
+2025-01-21  Pip Cet  <pipcet@protonmail.com>
+
+	Handle unknown units provided by the rsvg library (bug#75712)
+
+	* src/image.c (svg_css_length_to_pixels): Restructure so GCC warns
+	about new enum members.  Add case for RSVG_UNIT_CH.  Warn about
+	unknown units discovered at runtime.
+
+2025-01-21  Gerd Möllmann  <gerd@gnu.org>
+
+	Don't use a redisplay optimization in a certain case on ttys
+
+	* src/dispnew.c (is_tty_root_frame_with_visible_child): New function.
+	* src/dispextern.h: Declare it.
+	* src/xdisp.c (redisplay_internal): Don't use optimization 1 for tty root
+	frames with a visible child frame.
+
+2025-01-21  Gerd Möllmann  <gerd@gnu.org>
+
+	Remove a false #ifdef HAVE_WINDOW_SYSTEM
+
+	* src/xdiso.c (update_tab_bar)_ Don't use #ifdef HAVE_WINDOW_SYSTEM for
+	setting the selected frame. That only makes a build without window
+	system misbehave.
+
+2025-01-21  Robert Pluim  <rpluim@gmail.com>
+
+	Signal error when keyword/arg list is malformed
+
+	* src/data.c (syms_of_data): Add Qmalformed_keyword_arg_list
+	error symbol.
+
+	* src/process.c (Fmake_process, Fmake_pipe_process)
+	(Fserial_process_configure, Fmake_serial_process)
+	(Fmake_network_process): Signal Qmalformed_keyword_arg_list when
+	the argument list length is odd.
+	* src/sound.c (parse_sound): Also here..
+	* src/w32fns.c (Fw32_notification_notify): ..and here.
+
+	(Bug#75584)
+
+2025-01-21  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defface's ':slant italic' to obsolete alias ':italic t'
+
+	* etc/themes/manoj-dark-theme.el (manoj-dark):
+	* etc/themes/modus-themes.el (modus-themes-faces):
+	* etc/themes/manoj-dark-theme.el (manoj-dark):
+	* etc/themes/modus-themes.el (modus-themes-faces):
+	* lisp/emacs-lisp/eieio-custom.el (eieio-custom-slot-tag-face):
+	* lisp/gnus/gnus-art.el (gnus-emphasis-italic)
+	(gnus-emphasis-underline-italic, gnus-emphasis-bold-italic)
+	(gnus-emphasis-underline-bold-italic, gnus-signature)
+	(gnus-header-from, gnus-header-subject, gnus-header-newsgroups)
+	(gnus-header-content):
+	* lisp/gnus/gnus-cite.el (gnus-cite-attribution, gnus-cite-1)
+	(gnus-cite-2, gnus-cite-3, gnus-cite-4, gnus-cite-5, gnus-cite-6)
+	(gnus-cite-7, gnus-cite-8, gnus-cite-9, gnus-cite-10, gnus-cite-11):
+	* lisp/gnus/gnus-srvr.el (gnus-server-cloud-host)
+	(gnus-server-closed):
+	* lisp/gnus/gnus.el (gnus-group-mail-1-empty)
+	(gnus-group-mail-2-empty, gnus-summary-low-ticked)
+	(gnus-summary-low-ancient, gnus-summary-low-undownloaded)
+	(gnus-summary-low-unread, gnus-summary-low-read):
+	* lisp/gnus/message.el (message-header-to)
+	(message-header-newsgroups, message-header-other):
+	* lisp/gnus/mm-decode.el (mm-command-output):
+	* lisp/mh-e/mh-e.el (mh-face-data, mh-folder-body):
+	* lisp/net/dictionary.el (dictionary-word-entry-face):
+	* lisp/org/org-faces.el (org-formula, org-agenda-date-today)
+	(org-scheduled, org-scheduled-today):
+	* lisp/proced.el (proced-interruptible-sleep-status-code):
+	* lisp/progmodes/prolog.el (prolog-font-lock-keywords):
+	* lisp/progmodes/verilog-mode.el (verilog-font-lock-translate-off-face)
+	(verilog-font-lock-p1800-face, verilog-font-lock-ams-face)
+	(verilog-font-lock-grouping-keywords-face):
+	* lisp/progmodes/vhdl-mode.el (vhdl-font-lock-attribute-face)
+	(vhdl-font-lock-enumvalue-face, vhdl-font-lock-function-face)
+	(vhdl-font-lock-directive-face):
+	* lisp/transient.el (transient-inapt-suffix):
+	* lisp/vc/ediff-init.el (ediff-even-diff-A, ediff-even-diff-B)
+	(ediff-even-diff-C, ediff-even-diff-Ancestor, ediff-odd-diff-A)
+	(ediff-odd-diff-B, ediff-odd-diff-C, ediff-odd-diff-Ancestor):
+	Prefer defface attribute ':slant italic' to its obsolete alias
+	':italic t'.  See also Bug#73552.
+
+2025-01-21  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defface's ':weight bold' to obsolete alias ':bold t'
+
+	* etc/themes/adwaita-theme.el (adwaita):
+	* etc/themes/manoj-dark-theme.el (manoj-dark):
+	* etc/themes/modus-themes.el (modus-themes-faces):
+	* lisp/gnus/gnus-srvr.el (gnus-server-agent, gnus-server-cloud)
+	(gnus-server-opened, gnus-server-denied, gnus-server-offline):
+	* lisp/gnus/gnus.el (gnus-group-news-1, gnus-group-news-2)
+	(gnus-group-news-3, gnus-group-news-4, gnus-group-news-5)
+	(gnus-group-news-6, gnus-group-news-low, gnus-group-mail-1)
+	(gnus-group-mail-2, gnus-group-mail-3, gnus-group-mail-low-empty)
+	(gnus-group-mail-low, gnus-summary-high-ticked)
+	(gnus-summary-high-ancient, gnus-summary-high-undownloaded)
+	(gnus-summary-high-unread, gnus-summary-high-read):
+	* lisp/gnus/message.el (message-header-to, message-header-cc)
+	(message-header-subject, message-header-newsgroups)
+	(message-header-other, message-header-name, message-header-xheader)
+	(message-separator, message-cited-text-1, message-cited-text-2)
+	(message-cited-text-3, message-cited-text-4, message-mml)
+	(message-signature-separator):
+	* lisp/mh-e/mh-e.el (mh-face-data, mh-folder-cur-msg-number)
+	(mh-speedbar-folder-with-unseen-messages)
+	(mh-speedbar-selected-folder-with-unseen-messages):
+	* lisp/net/dictionary.el (dictionary-button-face):
+	* lisp/org/org-faces.el (org-drawer, org-tag, org-list-dt, org-todo)
+	(org-done, org-headline-todo, org-formula, org-agenda-structure)
+	(org-scheduled, org-scheduled-today, org-scheduled-previously)
+	(org-upcoming-deadline):
+	* lisp/proced.el (proced-uninterruptible-sleep-status-code)
+	(proced-executable, proced-cpu, proced-user, proced-time-colon):
+	* lisp/progmodes/erts-mode.el (erts-mode-specification-name)
+	(erts-mode-specification-value):
+	* lisp/progmodes/prolog.el (prolog-font-lock-keywords):
+	* lisp/progmodes/verilog-mode.el (verilog-font-lock-p1800-face)
+	(verilog-font-lock-ams-face)
+	(verilog-font-lock-grouping-keywords-face):
+	* lisp/progmodes/vhdl-mode.el (vhdl-font-lock-prompt-face)
+	(vhdl-font-lock-attribute-face, vhdl-font-lock-enumvalue-face)
+	(vhdl-font-lock-function-face, vhdl-font-lock-directive-face)
+	(vhdl-font-lock-reserved-words-face): Prefer defface attribute
+	':weight bold' to its obsolete alias ':bold t'.  See also Bug#73552.
+
+2025-01-20  João Távora  <joaotavora@gmail.com>
+
+	Eglot: release version 1.18
+
+	* etc/EGLOT-NEWS: Update.
+
+	* lisp/progmodes/eglot.el (Version): Bump to 1.18
+
+2025-01-20  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix signature's of Eglot's ElDoc functions
+
+	These functions are specified to be passed at least one
+	argument, so our implementation must accept an arbitrary number
+	of arguments.
+
+	* lisp/progmodes/eglot.el (eglot-signature-eldoc-function)
+	(eglot-hover-eldoc-function): Fix signature.
+
+2025-01-20  João Távora  <joaotavora@gmail.com>
+
+	Eglot: add support for insertReplaceEdit (bug#73857)
+
+	* lisp/progmodes/eglot.el (eglot-server-programs): Mention zig-ts-mode.
+	(eglot--lsp-interface-alist): Describe 'InsertReplaceEdit'.
+	(eglot-client-capabilities): Advertise 'insertReplaceSupport'.
+	(eglot-completion-at-point): Consider 'InsertReplaceEdit'.
+	(eglot--apply-text-edits): Consider 'InsertReplaceEdit'.
+
+	* test/lisp/progmodes/eglot-tests.el
+	(eglot-test-zig-insert-replace-completion): New test.
+
+	Special thanks to kcbanner@gmail.com
+
+2025-01-20  João Távora  <joaotavora@gmail.com>
+
+	Eglot: make eglot-test-javascript-basic more robust
+
+	* test/lisp/progmodes/eglot-tests.el
+	(eglot-test-javascript-basic): Mark test expensive and increase timeout.
+
+2025-01-20  João Távora  <joaotavora@gmail.com>
+
+	Eglot: try again to fix try-completion logic
+
+	Emacs partial completion simply doesn't make sense in LSP.
+	Attempts to make it make some sense end up failing for one
+	reason or another.
+
+	This commit restores the original intention of the
+	eglot--dumb-allc and eglot--dumb-tryc functions, which was to be
+	dumb and pop up a *Completions* buffer (or a company tooltip),
+	as soon as there is doubt over what the user wants to do.
+
+	It also fixes tests, including an expensive Rust test that had
+	been broken for a long time.
+
+	* lisp/progmodes/eglot.el (eglot--dumb-allc): Consider point.
+	(eglot--dumb-tryc): Make it suitably dumb again.
+
+	* test/lisp/progmodes/eglot-tests.el
+	(eglot--wait-for-rust-analyzer): Wait longer.
+	(eglot-test-common-prefix-completion): Delete this test.  It's not
+	the intended behavior.
+	(eglot--kill-completions-buffer): New helper.
+	(eglot-test-try-completion-nomatch): Rework test.
+	(eglot-test-try-completion-inside-symbol): Pops *Completions*
+	buffer because mustn't partial complete.
+	(eglot-test-try-completion-inside-symbol-2): Does complete.
+	(eglot-test-rust-completion-exit-function): Fix long-broken test.
+
+2025-01-20  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in bat-mode.el
+
+	* lisp/progmodes/bat-mode.el (bat-mode-map): Prefer defvar-keymap.
+	(bat-menu): Move to top level.
+
+2025-01-20  Tassilo Horn  <tsdh@gnu.org>
+
+	Don't skip or double-process files in dired with auto-revert-mode (bug#75626)
+
+	* lisp/dired.el (dired--inhibit-auto-revert): New variable.
+	(dired-map-over-marks): Make the generated code bind it.
+	(dired-buffer-stale-p): Return nil if dired--inhibit-auto-revert is
+	non-nil.
+
+2025-01-20  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use 'max' macro in clip_to_bounds
+
+	* src/lisp.h (clip_to_bounds): Use 'max' macro.
+
+2025-01-20  Yuan Fu  <casouri@gmail.com>
+
+	Make treesit-language-remap-alist completely transparent (bug#72388)
+
+	* doc/lispref/parsing.texi (Using Parser): Update manual.
+	* src/treesit.c (Ftreesit_parser_create): Use the LANGUAGE
+	argument given as the language for the parser, not the actual
+	language.
+
+2025-01-20  Stefan Kangas  <stefankangas@gmail.com>
+
+	pdumper: Add static_assert for EMACS_RELOC_TYPE_BITS
+
+	* src/pdumper.c: Add static_assert for EMACS_RELOC_TYPE_BITS.
+
+2025-01-20  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove redundant case_Lisp_Int macro
+
+	The case_Lisp_Int macro was originally introduced with different
+	definitions depending on USE_2_TAGS_FOR_INTS.  However, since commit
+	2b5701247845, we have assumed that USE_2_TAGS_FOR_INTS is always
+	defined, and the macro has only a single definition.  As a result, the
+	macro is now unnecessary, and replacing it with standard C case labels
+	improves readability and understanding.
+
+	* src/lisp.h (case_Lisp_Int): Delete macro.
+	* src/alloc.c (process_mark_stack, survives_gc_p):
+	* src/data.c (Fcl_type_of):
+	* src/fns.c (value_cmp, sxhash_obj):
+	* src/pdumper.c (dump_object):
+	* src/print.c (print_object):
+	* src/xfaces.c (face_attr_equal_p): Remove uses of above macro.
+
+2025-01-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port better to AIX 7.3 with -lsqlite3 but not sqlite3.h
+
+	* configure.ac (HAVE_SQLITE): Yes only if sqlite3.h can be
+	included (Bug#75667).
+
+2025-01-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port better to AIX 7.3 with -lz but not zlib.h
+
+	* configure.ac (HAVE_ZLIB, LIBZ):
+	Define only if zlib.h can be included (Bug#75667).
+
+2025-01-19  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove workaround for AIX 3.2 crashes
+
+	Emacs does not support AIX 3.2 since 2008.
+
+	This workaround for AIX 3.2.3 and 3.2.4 (released in 1992) was
+	introduced in 1999 and was only active with #ifdef AIX3_2.  In 2008, the
+	condition was changed to #ifdef AIX when support for these older AIX
+	versions was dropped. I couldn't find any justification for why this
+	workaround was retained (instead of being removed) in the commit message
+	or mailing list archives.
+
+	Given that users of AIX 4.0 (released in 1995) or later have not had
+	this workaround for over a decade (1999-2008), it seems safe to assume
+	that it is no longer necessary.  Removing it will also prevent the
+	incorrect overriding of the LANG variable on those systems.
+
+	* src/emacs.c [AIX] (main): Remove workaround for AIX 3.2.  (Bug#75153)
+
+2025-01-19  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer the 'min'/'max' macros where possible
+
+	* src/composite.c (find_automatic_composition):
+	* src/lisp.h (clip_to_bounds):
+	* src/pgtkfns.c (PATH_MAX_LEN):
+	* src/profiler.c (approximate_median):
+	* src/unexmacosx.c (unexec_write_zero, unexec_copy, unexec_realloc):
+	* src/xdisp.c (get_nearby_bol_pos): Prefer the 'min' and 'max' macros.
+
+2025-01-19  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete duplicate 'min' macro
+
+	* src/gmalloc.c (min): Delete duplicate macro.  We import lisp.h
+	unconditionally, so it is always defined here.
+
+2025-01-19  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make NSM warn for RSA key exchange on medium severity
+
+	* lisp/net/nsm.el (network-security-protocol-checks): Bump rsa-kx
+	severity to medium.
+	(nsm-protocol-check--dhe-kx): Update docstring to describe several more
+	recent attacks, and its removal in TLS 1.3.
+
+2025-01-19  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete unused aliases for calln
+
+	* src/lisp.h (call1, call2, call3, call4)
+	(call5, call6, call7, call8): Delete unused aliases for calln.
+
+2025-01-19  Stefan Kangas  <stefankangas@gmail.com>
+
+	Replace call[1-8] with calln
+
+	Since the introduction of the 'calln' macro, the 'call1', 'call2', ...,
+	'call8' macros are just aliases for the former.  This is slightly
+	misleading and potentially unhelpful.  The number of arguments N can
+	also easily go out-of-synch with the used alias callN.  There is no
+	reason not to replace these aliases with using 'calln' directly.
+
+	To reduce the risk for mistakes, the tool Coccinelle was used to make
+	these changes.  See <https://coccinelle.gitlabpages.inria.fr/website/>.
+
+	* src/alloc.c, src/androidvfs.c, src/androidfns.c, src/buffer.c:
+	* src/callint.c, src/callproc.c, src/casefiddle.c, src/charset.c:
+	* src/chartab.c, src/cmds.c, src/coding.c, src/composite.c:
+	* src/data.c, src/dbusbind.c, src/dired.c, src/doc.c:
+	* src/emacs.c, src/eval.c, src/fileio.c, src/filelock.c:
+	* src/fns.c, src/frame.c, src/gtkutil.c, src/haikufns.c:
+	* src/haikumenu.c, src/image.c, src/insdel.c, src/intervals.c:
+	* src/keyboard.c, src/keymap.c, src/lisp.h, src/lread.c:
+	* src/minibuf.c, src/nsfns.m, src/nsselect.m, src/pgtkfns.c:
+	* src/pgtkselect.c, src/print.c, src/process.c, src/sort.c:
+	* src/syntax.c, src/textconv.c, src/textprop.c, src/undo.c:
+	* src/w32fns.c, src/window.c, src/xfaces.c, src/xfns.c:
+	* src/xmenu.c, src/xselect.c, src/xterm.c:
+	Replace all uses of 'call1', 'call2', ..., 'call8' with 'calln'.
+
+2025-01-19  Stefan Kangas  <stefankangas@gmail.com>
+
+	Document use of calln in C code in internals.texi
+
+	* doc/lispref/internals.texi
+	(Writing Emacs Primitives): Don't recommend `call0`, `call1`, etc.
+	Instead recommend `calln`, which covers all of those use cases.
+
+2025-01-19  Peter Seibel  <peter@gigamonkeys.com>  (tiny change)
+
+	Improved git-add completion
+
+	* lisp/pcmpl-git.el (pcomplete/git)): Complete untracked files.
+	(Bug#75336)
+
+2025-01-19  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Fix keybinding alignment in `tmm-menubar'
+
+	* lisp/tmm.el (tmm--shorten-space-width): New function that
+	reduces the space between the text menu entry and its keybinding
+	to avoid a misalignement.
+	(tmm-add-one-shortcut): Use it.  (Bug#75500)
+
+2025-01-19  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/fileio.c (Finsert_file_contents): Fix last change.
+
+2025-01-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix visiting files in /proc/ directory
+
+	* src/fileio.c (Finsert_file_contents): Treat regular files whose
+	size is reported as zero as if they were special files.  (Bug#75569)
+
+2025-01-19  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Tramp error handling process buffer
+
+	* lisp/net/tramp-cache.el (tramp-list-connections):
+	* lisp/net/tramp-cmds.el (tramp-cleanup-connection): Use connection
+	property " connected" for a check of active connections.
+
+	* lisp/net/tramp.el (tramp-get-buffer): Set connection property
+	" connected".
+
+2025-01-19  Jakub Ječmínek  <kuba@kubajecminek.cz>
+
+	Align files after dired revert (Bug#17219)
+
+	* lisp/dired.el (dired-revert): Add 'dired--align-all-files'
+	function call, to re-align files after reverting.
+
+2025-01-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Prefer EMACS_INT_MAX to TYPE_MAXIMUM (EMACS_INT)
+
+	* src/dispextern.h (GLYPH_CODE_P):
+	Use EMACS_INT_MAX instead of TYPE_MAXIMUM (EMACS_INT),
+	as it’s shorter and is what all the other code uses
+	in this situation.
+
+2025-01-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port recently-added bitfields back to GCC
+
+	* src/lisp.h (hash_table_std_test_t, hash_table_weakness_t):
+	Name these as enum tags as well as typedefs,
+	so that ENUM_BF works for them.
+
+2025-01-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Always define image_compute_scale
+
+	* src/image.c (image_compute_scale): Define even if
+	! (defined HAVE_IMAGEMAGICK || defined HAVE_NATIVE_TRANSFORMS),
+	because it is always used.  Needed in platforms that lack all
+	those image libraries.
+
+2025-01-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port recently-added bitfields to IBM XL C 16.1
+
+	* src/lisp.h (struct Lisp_Hash_Table):
+	Use ENUM_BF for members weakness and frozen_test,
+	since they are enum bitfields.
+
+2025-01-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2025-01-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port to AIX 7.3 ‘find’
+
+	* configure.ac (FIND_DELETE): Port to AIX 7.3 ‘find’,
+	which exits with nonzero status if ‘-exec rm -f {} +’
+	is never invoked.
+
+2025-01-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Simplify cross cleaning
+
+	* cross/Makefile.in (clean, maintainer-clean):
+	Prefer a single ‘find’ to doing ‘find’ in a shell loop.
+
+2025-01-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "Revert "Use @xref more consistently; "See @ref" -> "@xref"""
+
+	This reverts commit 59167e2de8a93341cd235d83e034c00be32403f6.
+	TRT to use reference in Texinfo is to place some punctuation
+	character after a reference.  This is common both to @ref and
+	to @xref.  So this is what should be done to fix the changeset,
+	not to revert it.
+
+2025-01-19  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer 'list (...)' to 'listn (N, ...)'
+
+	* src/androidfns.c (Fandroid_query_battery):
+	* src/buffer.c (make_lispy_itree_node):
+	* src/keyboard.c (init_while_no_input_ignore_events):
+	* src/window.c (Fset_window_configuration):
+	* src/xterm.c (x_dnd_send_unsupported_drop): Prefer 'list (...)' to
+	'listn (N, ...)'.
+	* admin/coccinelle/listn.cocci: New file.
+
+2025-01-19  Pip Cet  <pipcet@protonmail.com>
+
+	Fix a GTK memory leak (Bug#75636)
+
+	* src/gtkutil.c (xg_create_frame_widgets): Don't call g_object_ref.
+
+2025-01-19  Po Lu  <luangruo@yahoo.com>
+
+	Revert "Use @xref more consistently; "See @ref" -> "@xref""
+
+	This reverts commit e54b94c28cdf9699009e7691f7c8ffa5b2c7b741,
+	which prevented building Emacs on a number of my machine(s).
+
+2025-01-19  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use @xref more consistently; "See @ref" -> "@xref"
+
+	* doc/lispref/commands.texi (Using Interactive):
+	* doc/lispref/customize.texi (Type Keywords):
+	* doc/lispref/edebug.texi (Using Edebug, Specification List):
+	* doc/lispref/frames.texi (Frame Layout):
+	* doc/lispref/functions.texi (What Is a Function, Related Topics):
+	* doc/lispref/keymaps.texi (Controlling Active Maps, Key Lookup):
+	* doc/lispref/minibuf.texi (Completion Variables):
+	* doc/lispref/os.texi (Terminal Input):
+	* doc/lispref/text.texi (JSONRPC Overview):
+	* doc/misc/calc.texi (More About Embedded Mode, Customizing Calc):
+	* doc/misc/cc-mode.texi (Movement Commands, Auto-newlines)
+	(Config Basics, Custom Auto-newlines):
+	* doc/misc/gnus.texi (Email Based Diary):
+	* doc/misc/htmlfontify.texi (Interactive, Non-interactive):
+	(Variables):
+	* doc/misc/idlwave.texi (Using the Shell):
+	* doc/misc/srecode.texi (Quick Start, User Templates)
+	(Parts of SRecode, Compound Variable Values, Template Macros):
+	* doc/misc/tramp.texi (Inline methods, FUSE-based methods)
+	(Predefined connection information, Remote shell setup)
+	(Frequently Asked Questions):
+	* doc/misc/transient.texi (Configuration, Technical Introduction):
+	(Binding Suffix and Infix Commands, Transient State):
+	(Prefix Slots, Predicate Slots):
+	* doc/misc/wisent.texi (Example, Compiling a grammar, Conflicts):
+	(Grammar Debugging, Error recovery):
+
+2025-01-18  Stefan Kangas  <stefankangas@gmail.com>
+
+	Initialize full range in parse_menu_item
+
+	* src/keyboard.c (parse_menu_item): Initialize the full range of item,
+	in case future changes makes ITEM_PROPERTY_ENABLE != ITEM_PROPERTY_MAX.
+	Problem reported by Pip Cet <pipcet@protonmail.com>.
+	Ref: https://mail.gnu.org/r/emacs-devel/2025-01/msg00680.html
+
+2025-01-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Remove unnecessary stdalign.in.h
+
+	* lib/stdalign.in.h: Remove.  This file was already removed in
+	commit b429274c5b4b2b511d2d351111dea2d354498e0f (2023-02-04)
+	but was brought back mistakenly by a merge from emacs-29 in
+	commit ecf08f0621c25ad1dfadd96399e204c389ab1695 (2024-01-02).
+	* nt/inc/stdalign.h: Don’t mention removed file in comment.
+
+2025-01-18  Arsen Arsenović  <arsen@aarsen.me>
+
+	ruler-mode: Improve compatibility with text-scale (bug#75168)
+
+	* lisp/ruler-mode.el (ruler-mode-ruler): Use pixelwise line-number
+	display width for alignment with line numbers.
+
+2025-01-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	853719c4c23 ; * lisp/net/eww.el (eww-download): Doc fix (bug#75585)
+	45ec5865aa7 ; * etc/NEWS: Tweak wording of NSM items.
+	b981889e9ee ; cperl-mode-tests.el: Don't run the newest test in perl-...
+	6a864ef8f39 Add smtpmail cross-reference to 'auth-sources'.
+	1fd7957bc72 ; cperl-mode.el: Add a test for Bug#74245
+	8d289670d60 Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
+	b74ac4af940 ; cperl-mode.el: Allow bare $ in a signature (Bug#74245)
+	30e84fc6537 Emphasize the use of :tag for new customization types
+
+	# Conflicts:
+	#	etc/NEWS
+
+2025-01-18  Ahmed Khanzada  <me@enzu.ru>
+
+	New unit-tests for cl-lib (bug#75633).
+
+2025-01-18  Yuan Fu  <casouri@gmail.com>
+
+	Fix treesit.el tests
+
+	* lisp/treesit.el (treesit--imenu-merge-entries):
+	(Ftreesit_parser_set_included_ranges): Warn in the docstring
+	that the function is destructive/owns the argument.
+	* test/src/treesit-tests.el (treesit-range-fixup-after-edit):
+	(treesit-imenu): Fix tests.
+
+2025-01-18  Yuan Fu  <casouri@gmail.com>
+
+	Make sure treesit.el doesn't create parsers by itself (bug#75456)
+
+	Up to this point, functions in
+	treesit.el (font-lock/indentation/etc) creates a parser if one
+	doesn't exist.  This doesn't work well with local parsers,
+	because local parsers are not visible at global level and
+	font-lock or indentation functions might accidentally create a
+	global parser for an embedded language.
+
+	The solution is to not create parsers automatically.  This has
+	the potential of breaking things, but I don't expect any actual
+	breakage: all the major modes create parsers they need in the
+	major mode body, even though previously it isn't technically
+	necessary.
+
+	* lisp/treesit.el (treesit-buffer-root-node):
+	(treesit--update-ranges-local):
+	(treesit-update-ranges):
+	(treesit--guess-primary-parser): Use treesit-parser-list instead
+	of treesit-parser-create.
+
+2025-01-18  Yuan Fu  <casouri@gmail.com>
+
+	Remap language symbol in treesit-query-compile (bug#72388)
+
+	* src/treesit.c (Ftreesit_query_compile): Use remapped language.
+
+2025-01-18  Yuan Fu  <casouri@gmail.com>
+
+	Use treesit-query-first-valid in c-ts-mode
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings):
+	Use treesit-query-first-valid.  Use :default-language keyword.
+	(c-ts-mode--test-virtual-named-p): Remove function.
+
+2025-01-18  Yuan Fu  <casouri@gmail.com>
+
+	Add treesit-query-first-valid
+
+	This should help major modes to support grammar versions.
+
+	* doc/lispref/parsing.texi (Pattern Matching): Mention new function.
+	* lisp/treesit.el (treesit-query-first-valid): New function.
+	(treesit-query-valid-p): New function.
+
+2025-01-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Simplify alloc by assuming MALLOC_IS_LISP_ALIGNED
+
+	Problem reported by Hong Xu <https://bugs.gnu.org/75551#14>.
+	* src/alloc.c (MALLOC_IS_LISP_ALIGNED): static_assert it,
+	since it is true on all current Emacs platforms.
+	All uses simplified to assume it is true.
+	(xmalloc, xzalloc, xrealloc, lisp_malloc): Just use
+	malloc/calloc/realloc.  Since we are using the malloc-gnu
+	and realloc-posix modules, we need not worry about whether
+	these functions return a null pointer for zero-size requests.
+	(xrealloc): Stop worrying about no-longer-existing platforms
+	where realloc (nullptr, ...) did not work.
+	(laligned, lmalloc, lrealloc): Remove.  All uses removed.
+
+2025-01-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Let Gnulib deal with malloc/realloc 0
+
+	Instead of worrying about whether malloc and realloc yield a
+	non-null pointer when given size 0 (the traditional behavior
+	recommended by Doug McIlroy, and the only behavior that makes
+	sense for Emacs), let Gnulib arrange for the traditional behavior.
+	* admin/merge-gnulib (GNULIB_MODULES): Add malloc-gnu (which we
+	were already depending on indirectly) and realloc-posix.
+	* lib/gnulib.mk.in, m4/gnulib-comp.m4:
+	Regenerate by running admin/merge-gnulib.
+
+2025-01-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2025-01-17  Pip Cet  <pipcet@protonmail.com>
+
+	Fix build on Solaris 10 (bug#75451)
+
+	* autogen.sh: Avoid bashism.
+	* configure.ac (AC_PROG_AWK): Use.
+	* src/Makefile.in (AWK): Set.
+	(dmpstruct.h): Use "$(AWK)", not "awk".
+	* src/dired.c (DT_UNKNOWN, DT_DIR, DT_LNK): Define all three constants
+	or none of them.
+
+2025-01-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Turn macros into enums in keyboard.h
+
+	* src/keyboard.h (item_property_idx, menu_item_pane_idx): Turn macros
+	into enums.
+	(ITEM_PROPERTY_MAX): New constant.
+	* src/keyboard.c (parse_menu_item): Use above new constant.
+
+2025-01-17  Pranshu Sharma  <pranshu@bauherren.ovh>
+
+	Do not rotate dedicated windows
+
+	* lisp/window-x.el (rotate-windows): Do not rotate windows
+	dedicated to their buffers.
+
+2025-01-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(hack-one-local-variable): Refine last patch (bug#74964)
+
+	* lisp/files.el (hack-local-variables--inhibit-eval): Rename from
+	`hack-local-variables--inhibit`.
+	(hack-one-local-variable): Skip only those eval forms we're already
+	in the process of evaluating.
+
+2025-01-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make NSM warn for TLS 1.1
+
+	* lisp/net/nsm.el (nsm-protocol-check--version): Warn also for
+	TLS 1.1.  Update docstring.
+
+2025-01-17  João Távora  <joaotavora@gmail.com>
+
+	Flymake: fix bug introduced recently
+
+	Must protect against flymake--state never having been a hash
+	table at all, so that flymake-mode can be safely turned off even
+	if it never turned on in the first place.
+
+	Github-reference: https://github.com/joaotavora/eglot/discussions/1480
+
+	* lisp/progmodes/flymake.el (flymake-mode): Fix bug.
+
+2025-01-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make NSM warn for DH key exchange on medium severity
+
+	* lisp/net/nsm.el (network-security-protocol-checks): Bump dhe-kx
+	severity to medium.
+	(nsm-protocol-check--dhe-kx): Update docstring to describe the so-called
+	Racoon Attack, discovered in 2020.
+
+2025-01-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2025-01-17  Po Lu  <luangruo@yahoo.com>
+
+	Fix the Lisp reference manual for older Texinfo
+
+	* doc/lispref/symbols.texi (Standard Properties): Don't provide
+	empty reference.
+
+	* doc/lispref/variables.texi (Lexical Binding): Don't abuse xref
+	in a standalone sentence.
+
+2025-01-16  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	Property definition-type becomes find-function-type-alist
+
+	lisp/emacs-lisp/find-func.el (find-function-search-for-symbol): Use
+	symbol property 'find-function-type-alist' instead of 'definition-type'
+	(find-function-update-type-alist): New convenience function.
+	* doc/lispref/symbols.texi (Standard Properties): Update example to use
+	'find-function-type-alist' and 'find-function-update-type-alist'
+	* doc/lispref/functions.texi (Defining Functions):
+	* doc/lispref/tips.texi (Coding Conventions):
+	* doc/misc/ert.texi (How to Write Tests):
+	* etc/NEWS: Change reference to 'definition-type' to name
+	'find-function-type-alist' instead
+
+2025-01-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cl-block, cl-return-from): Fix bug#75498
+
+	* lisp/emacs-lisp/cl-macs.el (cl-block, cl-return-from):
+	Change encoding so it obeys variable coping (i.e. lexical scoping when
+	`lexical-binding` is non-nil).
+	(cl--block-wrapper, cl--block-throw): Adjust accordingly.
+
+	* test/lisp/emacs-lisp/cl-macs-tests.el
+	(cl-macs--test-cl-block-lexbind-bug-75498): New test.
+
+2025-01-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(asm-mode): Fix bug#75542
+
+	* lisp/progmodes/asm-mode.el (asm-mode): Be careful not to override
+	changes in the mode map or in `comment-start`.
+	Move the use of `asm-mode-set-comment-hook` back to where it was before
+	commit 0cff4e67f1de.
+	(asm-mode-set-comment-hook): Declare it obsolete.
+
+2025-01-16  Thierry Volpiatto  <thievol@posteo.net>
+
+	Handle correctly DISPLAY-FUNCTION arg in 'bookmark--jump-via'
+
+	This fixes bug #75354 where when jumping to a eww bmk to other
+	window (or frame) the buffer is displayed both in other window
+	and current window.
+	Previously 'bookmark--jump-via' was calling DISPLAY-FUNCTION on the
+	current-buffer from the new buffer created by bookmark handler
+	(e.g. eww) now DISPLAY-FUNCTION is called on the new buffer from
+	the current buffer (winconf is saved when calling handler).
+	In addition to make eww bookmarks displayed properly, this fix as
+	well w3m bookmarks and as a side effect fix the eww quit function
+	which restore properly winconf after quitting (previously leaving
+	two windows open).
+	* lisp/bookmark.el (bookmark--jump-via): Fix it.
+
+2025-01-16  Kierin Bell  <fernseed@fernseed.me>
+
+	Improve usability and documentation of Iroquoian input methods
+
+	* lisp/leim/quail/iroquoian.el: Add variants for Mohawk and Oneida
+	endonyms in comments and docstrings.  Update the 'oneida-postfix' input
+	method to make the most commonly used glottal stop character easiest to
+	input.  Update the 'onondaga-postfix' input method with mnemonic keys
+	for nasals in the Onondaga Nation, New York orthography.  (Bug#75448)
+
+	* etc/NEWS: Add variants for Mohawk and Oneida endonyms to NEWS entry.
+
+2025-01-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix subtle problem with updating 'font_style_table'
+
+	* src/font.c (font_style_to_value): Update the Vfont_* variables
+	to keep them in sync with their slots in 'font_style_table'.
+	(Bug#75521)
+	(syms_of_font): Comment on usage of DEFVAR_LISP_NOPRO.
+
+2025-01-16  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	Update recent find-func change to fix elisp-mode-tests
+
+	* lisp/emacs-lisp/find-func.el (find-function-search-for-symbol):
+	Check that symbol is a symbol before trying to get a property.
+
+2025-01-16  Steven Allen  <steven@stebalien.com>
+
+	Take the tab-line into account when computing the window edges
+
+	window-body-height correctly subtracts the tab-line's height but
+	window-edges did not add this same height to the y-offset.
+
+	See https://github.com/emacs-exwm/exwm/pull/114
+
+	* lisp/window.el (window-edges): Add the tab-line-height to the y-offet
+	of the window body.  (Bug#75576)
+
+2025-01-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2025-01-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix clear-string crash with text properties
+
+	* src/fns.c (Fclear_string): Fix crash by clearing all text
+	properties.  (Bug#75581)
+	* doc/lispref/strings.texi (Modifying Strings): Document the above
+	behavior change.
+	Fix proposed by Andreas Schwab <schwab@linux-m68k.org>.
+
+2025-01-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add clear-string to symbol-releases.eld
+
+	* etc/symbol-releases.eld (clear-string): Add function.
+
+2025-01-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer 'ARRAYELTS (x)' to 'sizeof x / sizeof *x'
+
+	* src/comp.c (emit_limple_insn):
+	* src/msdos.c (dos_set_keyboard, dos_rawgetc):
+	* src/sysdep.c (convert_speed, list_system_processes):
+	* src/w32fns.c (deliver_wm_chars, Fx_file_dialog):
+	* src/w32term.c (record_event, w32_read_socket):
+	Prefer 'ARRAYELTS (x)' to 'sizeof x / sizeof *x'.
+
+	* admin/coccinelle/arrayelts.cocci: New file.
+
+2025-01-14  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use calln instead of calling Ffuncall directly
+
+	* src/bytecode.c (bcall0):
+	* src/comp.c (bcall0):
+	* src/eval.c (apply1):
+	* src/lisp.h (call0):
+	* src/thread.c (invoke_thread_function): Use calln instead of calling
+	Ffuncall directly.
+
+	* admin/coccinelle/calln.cocci: New semantic patch.
+
+2025-01-14  Juri Linkov  <juri@linkov.net>
+
+	Improve repeat-mode to correctly show multi-key sequences as echo
+
+	* lisp/repeat.el (repeat-echo-message-string):
+	Use 'cl--map-keymap-recursively' that iterates over
+	complete key sequences.  Also it returns key vectors,
+	so don't need to use 'vector'.
+
+2025-01-14  Juri Linkov  <juri@linkov.net>
+
+	Fix repeat-mode to keep the same map symbol for repeat-continue
+
+	* lisp/repeat.el (repeat-get-map-sym): New function
+	refactored from 'repeat-get-map'.
+	(repeat-get-map): Move continue-related code to 'repeat-get-map-sym'.
+	(repeat-pre-hook): Use 'repeat-get-map-sym' and 'repeat-get-map'.
+	Set 'repeat-map' to 'map-sym'.
+	(repeat-post-hook): Use 'repeat-get-map-sym'.
+
+	* test/lisp/repeat-tests.el (repeat-tests-continue-another):
+	Improve to invoke double key 'C-M-o C-M-o' that should not switch
+	between maps (bug#74140).
+
+2025-01-14  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-bar.el (tab-bar-select-tab): Fix tab-bar-history-mode.
+
+	Reset the values of 'tab-bar-history-back' and 'tab-bar-history-forward'
+	to nil to not retain a previous tab's history after switching to another
+	tab using window-state.
+
+2025-01-14  João Távora  <joaotavora@gmail.com>
+
+	Flymake: more ambitious cleanup in flymake-mode (bug#69809)
+
+	Further improve flymake-mode idempotency by not nuke existing overlays.
+	This means multiple flymake-mode invocations do the same as just one
+	one, with minimal or no additional side effects.  This is good for
+	people with lots of 'flymake-mode' in hooks.
+
+	The foreign diagnostic importation has been refactored into a separate
+	function and moved to the "really start" section of 'flymake-start'.
+	The duplication problem appears to be avoided by some heuristics in
+	flymake-highlight-line.
+
+	A new test has been added.
+
+	* lisp/progmodes/flymake.el (flymake--import-foreign-diagnostics): New helper
+	  (flymake-start): Use it.
+	  (flymake-mode): Don't nuke overlays here.
+
+	* test/lisp/progmodes/flymake-tests.el (foreign-diagnostics): New
+	  test.
+
+2025-01-14  João Távora  <joaotavora@gmail.com>
+
+	Flymake: improve idempotence of flymake-mode (bug#69809)
+
+	In some circumstances, such as the ones described in the referenced bug
+	report, flymake-mode is activated non-interactively and asynchronously
+	in buffers where it may already be active and in the midst of
+	operations.
+
+	This commit ensures that flymake-mode a bit safer to re-enable in such
+	circumstances and fixes the bug.  It also adds some comments documenting
+	the situation.
+
+	* lisp/progmodes/flymake.el (flymake-mode): Don't smash flymake--state.
+	Add some comments.  No need to check for flymake--state nil.
+	(flymake--project-diagnostics): No need to check for flymake--state nil.
+
+2025-01-14  Martin Rudalics  <rudalics@gmx.at>
+
+	Handle removal of selected tty child frame
+
+	* src/dispextern.h (root_frame):
+	* src/frame.h (root_frame): Move declaration from dispextern.h
+	to frame.h.
+	(SET_FRAME_VISIBLE): Whend making the selected tty child frame
+	invisible, use mru_rooted_frame to find a frame to switch to.
+	* src/dispnew.c (root_frame): Move root_frame to frame.c.
+	* src/frame.c (do_switch_frame): On ttys don't change the
+	top frame when switching from a child frame to another frame
+	with the same root.
+	(root_frame): Move here from dispnew.c.
+	(Fframe_root_frame): New Lisp function.
+	(delete_frame): Whend deleting the selected tty child frame use,
+	mru_rooted_frame to find a frame to switch to.
+	* src/window.c (mru_rooted_frame): New function.
+	* src/window.h (mru_rooted_frame): Declare it.
+	* doc/lispref/frames.texi (Child Frames): Describe new function
+	'frame-root-frame'.
+
+2025-01-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	src/comp.c: New macro CALLNI
+
+	* src/comp.c (CALL0I, CALL1I, CALL2I, CALL4I): Delete macros.
+	(CALLNI): New macro, replacing the above.  All callers updated.
+
+2025-01-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer calln to CALLN where applicable
+
+	* src/callint.c (read_file_name):
+	* src/comp.c (CALL0I, CALL1I, CALL2I, CALL4I, declare_imported_func):
+	* src/data.c (Ffset, notify_variable_watchers):
+	* src/eval.c (Ffuncall_with_delayed_message):
+	* src/keymap.c (Fdescribe_buffer_bindings):
+	* src/minibuf.c (Fread_buffer, Fcompleting_read):
+	* src/pdumper.c (Fdump_emacs_portable):
+	* src/print.c (print_vectorlike_unreadable):
+	* src/treesit.c (treesit_traverse_match_predicate)
+	(treesit_build_sparse_tree): Prefer calln to CALLN.
+
+2025-01-13  Yuan Fu  <casouri@gmail.com>
+
+	Add 'and', 'named', and 'anonymous' predicate for tree-sitter
+
+	* doc/lispref/parsing.texi (User-defined Things): Mention the
+	new predicate.
+	* src/treesit.c (treesit_traverse_validate_predicate): Recognize
+	named, anonymous, and and predicates.
+	(treesit_traverse_match_predicate): Handle named, anonymous, and
+	and predicates.
+
+2025-01-13  Yuan Fu  <casouri@gmail.com>
+
+	Add special indent rule for FOR_EACH_TAIL in c-ts-mode
+
+	* lisp/progmodes/c-ts-mode.el:
+	(c-ts-mode--emacs-macro-rules): New function
+	(c-ts-mode--simple-indent-rules): Add new rule.
+
+2025-01-13  Yuan Fu  <casouri@gmail.com>
+
+	Fix c-ts-mode indentation (bug#75442)
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode--simple-indent-rules):
+	Use standalone-parent instead of parent.
+	* test/lisp/progmodes/c-ts-mode-resources/indent.erts:
+	New test.
+
+2025-01-13  Yuan Fu  <casouri@gmail.com>
+
+	Add newly supported keywords to c-ts-mode (bug#75226)
+
+	For the new keywords, test if the grammar supports them before
+	useing it.
+
+	* lisp/progmodes/c-ts-mode.el:
+	(c-ts-mode--optional-c-keywords): New variable.
+	(c-ts-mode--ms-keywords): New variable.
+	(c-ts-mode--compute-optional-keywords): New function.
+	(c-ts-mode--keywords): Add new optional keywords.
+	(c-ts-mode--c++-operators): New variable.
+	(c-ts-mode--c++-operator-keywords): New variable.
+	(c-ts-mode--font-lock-settings): Use c-ts-mode--c++-operators.
+
+2025-01-13  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	New symbol property 'definition-type' used by 'find-function'.
+
+	* lisp/emacs-lisp/find-func.el (find-function-search-for-symbol):
+	Look for new property 'definition-type' on the symbol.
+	* doc/lispref/symbols.texi (Standard Properties): Add 'Definition-type'.
+	* doc/lispref/functions.texi (Defining Functions):
+	* doc/lispref/tips.texi (Coding Conventions):
+	* doc/misc/ert.texi (How to Write Tests):
+	Add cross reference to new property 'definition-type'.
+	* etc/NEWS: Announce new symbol property 'definition-type'.
+
+	Thanks to Eli Zaretskii for reviewing this change.
+
+2025-01-13  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	Lisp Reference Manual: Index standard symbol properties.
+
+	* doc/lispref/symbols.texi (Standard Properties):
+	* doc/lispref/commands.texi:
+	* doc/lispref/customize.texi (Variable Definitions):
+	* doc/lispref/help.texi:
+	* doc/lispref/keymaps.texi:
+	* doc/lispref/minibuf.texi (Minibuffer History):
+	* doc/lispref/modes.texi (Setting Hooks):
+	* doc/lispref/sequences.texi (Char-Tables):
+	* doc/lispref/text.texi (Undo):
+	* doc/lispref/variables.texi: Each standard symbol property has exactly
+	one index entry, uniformly formatted as "(symbol property)".
+
+2025-01-13  Roland Winkler  <winkler@gnu.org>
+
+	fix for bibtex.el in prior commit
+
+	* lisp/textmodes/bibtex.el (bibtex-string-file-path)
+	(bibtex-file-path): Check for undefined environment variable
+	BIBINPUTS.
+
+2025-01-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use eabs in Fcurrent_time_zone
+
+	* src/timefns.c (Fcurrent_time_zone): Use eabs.
+	* test/src/timefns-tests.el
+	(timefns-tests-current-time-zone): New test.
+
+2025-01-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete obsolete coccinelle files
+
+	These files relates to a 13 year old attempt at a generational GC that
+	was never merged.
+
+	* admin/coccinelle/frame.cocci:
+	* admin/coccinelle/window.cocci: Delete files.
+
+2025-01-12  Roland Winkler  <winkler@gnu.org>
+
+	bibtex-string-file-path and bibtex-file-path are lists of directories
+
+	* lisp/textmodes/bibtex.el (bibtex-string-file-path, bibtex-file-path):
+	These user options are now lists of directories.  For backward compatibility,
+	the old, obsolete format is still supported.
+	(bibtex-string-files-init, bibtex-initialize): Change accordingly.
+	Use file-name-extension and file-name-with-extension.
+	* etc/NEWS: Entry for new format of bibtex-string-file-path and
+	bibtex-file-path.
+
+2025-01-12  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Emphasize the use of :tag for new customization types
+
+	* doc/lispref/customize.texi (Type Keywords): Name important use
+	cases of the :tag keyword.
+	(Defining New Types): Emphasize the use of the :tag keyword when
+	using the lazy widget.  (Bug#74409)
+
+2025-01-12  Juri Linkov  <juri@linkov.net>
+
+	Add treesit-thing-settings to yaml-ts-mode and enable transpose-sexps
+
+	* lisp/treesit.el (treesit-major-mode-setup): Move setting of
+	'transpose-sexps-function' outside of 'treesit-thing-defined-p'
+	since 'treesit-transpose-sexps' doesn't depend on the 'sexp' thing.
+
+	* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode):
+	Add 'treesit-thing-settings' with the 'list' thing,
+	but use it only for list commands, not sexp commands (bug#73404).
+
+2025-01-12  Pranshu Sharma  <pranshu@bauherren.ovh>
+
+	Add new option 'rotate-windows-change-selected'
+
+	* lisp/window-x.el: Fix header information.
+	(rotate-windows-change-selected): New option.
+	(rotate-window-layout-counterclockwise)
+	(rotate-window-layout-clockwise): Fix doc-strings.
+	(rotate-windows): Handle 'rotate-windows-change-selected'.
+
+2025-01-12  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el: Fix 'treesit--explorer-tree-mode-map'.
+
+	(treesit--explorer-tree-mode-map): Move this map
+	before its mode 'treesit--explorer-tree-mode',
+	otherwise the map has no effect.
+
+2025-01-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix mouse-2 clicks on mode line and header line
+
+	* src/keymap.c (Fcurrent_active_maps): For clicks on mode-line and
+	header-line, always override the keymaps at buffer position.
+	(Bug#75219)
+
+2025-01-11  Daniel Colascione  <dancol@dancol.org>
+
+	Align term-mode control character handling
+
+	Terminal emulators generally ignore exotic ASCII control
+	characters like SOH and STX. Make term-mode do the same.
+
+	* lisp/term.el (term-emulate-terminal): ignore ASCII control
+	characters like other terminal emulators do
+
+2025-01-11  Jim Porter  <jporterbugs@gmail.com>
+
+	Make Eshell's "ls" command return a non-zero status on errors
+
+	* lisp/eshell/em-ls.el (eshell/ls): Set exit code when calling 'error-func'.
+
+2025-01-11  Juri Linkov  <juri@linkov.net>
+
+	Improve treesit list navigation support for #if/#endif (bug#73404)
+
+	* lisp/treesit.el (treesit--forward-list-with-default): Improve to
+	better support the case when point is inside an opening/closing node
+	with a name longer than 1 character such as "#if" and "#endif".
+	(treesit-navigate-thing): No need to check for thing 'list'
+	since list commands now use other functions.
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode--thing-settings): Add
+	more preproc nodes such as #if/#endif and #ifdef/#endif and their
+	variants to the 'list' thing.
+
+2025-01-11  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/typescript-ts-mode.el: Fix syntax of tsx tags.
+
+	(tsx-ts--s-p-query): Bind 'jsx_opening_element' and
+	'jsx_closing_element' to @jsx to be able to use the < and > syntax
+	for angle brackets in 'tsx-ts--syntax-propertize-captures' (bug#73978).
+
+2025-01-11  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix handling of 'minibuffer' frame parameter for tty frames
+
+	* src/frame.c (make_terminal_frame): Fix handling of
+	'minibuffer' frame parameter for tty child frames.  Support
+	'minibuffer-only' child frames.
+
+2025-01-11  Daniel Mendler  <mail@daniel-mendler.de>
+
+	ibuffer: Add the "Recency" column
+
+	Define a column which shows how many seconds ago the respective
+	buffer has been displayed.  The time is formatted with the
+	`seconds-to-string' function, with the new arguments READABLE=t
+	and ABBREV=t.
+	* lisp/ibuffer.el (ibuffer-recency-header-map): New keymap.
+	(define-ibuffer-column recency): New column.
+	* etc/NEWS: Mention new `recency' column.  (Bug#73047)
+
+2025-01-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	d66b8d4becb Fix checkbox's child creation
+	26c5fadf474 Document that 'package-vc' doesn't support built-in packages
+	ee61b9a050b ; Fix documentation of completion commands
+	ce43d13593a ; Simplify admin/run-codespell
+	fa1470d0699 ; Remove duplicated word in files.el Commentary
+	dabaea97465 Improve checkdoc-common-verbs-wrong-voice docstring
+	6de2ee5663d Document string-as-{unibyte,multibyte} as obsolete in manual
+	7f76f872ebf Fix go-ts-mode var spec indentation (Bug#75362)
+	01464fc882d Add "text" as a thing in tsx-ts-mode
+	59c57337923 Improve doc string of 'package-delete'
+	313a191d047 ; * admin/MAINTAINERS: Remove Kelvin White.
+	002960ceabf Clarify that 'mac' line ending convention is not used on ...
+	4210e065648 Add language server for Odin
+	ee1034422b0 ; Improve documentation of function-type display
+	1c49edc4080 Modernize "Commentary" section of files.el
+	505c1123e18 * INSTALL: Add advice how to invoke 'make install'.  (Bug...
+	82e16cae9cc Improve the documentation of 'key-valid-p'
+
+	# Conflicts:
+	#	etc/NEWS
+	#	lisp/progmodes/typescript-ts-mode.el
+
+2025-01-11  David Ponce  <da_vid@orange.fr>
+
+	Fix widget buttons when button prefix includes space
+
+	* lisp/wid-edit.el (widget-specify-button): Give the invisible
+	space the same 'face' property as the rest of the button.
+	(Bug#73911)
+
+2025-01-11  Jared Finder  <jared@finder.org>
+
+	Support TTY child frames with GPM mouse
+
+	* lisp/frame.el (x-list-fonts): Delete `frame-at', to move to
+	C implementation.
+	* lisp/xt-mouse.el (xterm-mouse-event): Call new `tty-frame-at'.
+	* src/term.c (tty_frame_at, Ftty_frame_at): New C function,
+	replacing `frame-at' only for TTYs.
+	(term_mouse_position): Use last_mouse_frame when it is set.
+	(handle_one_term_event): Call tty_frame_at to get frame under
+	mouse, store it in last_mouse_frame.  Alter event coordinates
+	based on mouse frame.
+	(syms_of_term): Add tty-frame-at, last_mouse_frame.
+	* src/termhooks.h: Make Gpm_Event parameter const.
+
+2025-01-11  Roland Winkler  <winkler@gnu.org>
+
+	In bibtex.el, fix widgets for customization types (bug#74409)
+
+	* lisp/textmodes/bibtex.el (bibtex-field-list, bibtex-entry-alist)
+	(bibtex-field-alist): Fix widgets for customization types (bug#74409).
+
+2025-01-11  Roland Winkler  <winkler@gnu.org>
+
+	Improve some docstrings in bibtex.el
+
+	* lisp/textmodes/bibtex.el: (bibtex-BibTeX-entry-alist)
+	(bibtex-biblatex-entry-alist, bibtex-BibTeX-field-alist): Improve docstrings.
+	(bibtex-biblatex-entry-alist): Minor fix.
+
+2025-01-10  Robert Pluim  <rpluim@gmail.com>
+
+	Protect Vframe_list updating from interruptions
+
+	* src/frame.c (delete_frame): When deleting the frame from
+	Vframe_list, block input, since input can arrive whilst we're
+	running lisp  (Bug#74902).
+
+2025-01-10  Pranshu Sharma  <pranshu@bauherren.ovh>
+
+	Add new file window-x.el
+
+	* lisp/window-x.el: New file.
+	* etc/NEWS: Mention new commands to modify window layout.
+
+2025-01-10  Martin Rudalics  <rudalics@gmx.at>
+
+	Have 'split-window' optionally resurrect deleted windows
+
+	* src/window.c (Fwindow_old_buffer): Handle deleted window as
+	argument.
+	(make_parent_window): Remove function.
+	(Fsplit_window_internal): New argument REFER for resurrecting
+	deleted windows.  Incorporate functionality of defunct
+	make_parent_window.
+	(Fdelete_window_internal, delete_all_child_windows): Store any
+	deleted window's buffer in the window's old_buffer slot.
+	(window_dead_windows_table): Make it a 'value' type hash table
+	so the sequence number cannot affect its weakness.
+	* lisp/window.el (split-window): New argument REFER.
+	* doc/lispref/windows.texi (Resurrecting Windows): New section.
+	(Splitting Windows): Explain new argument REFER.
+	(Window Hooks): Rewrite description of 'window-old-buffer'.
+	* etc/NEWS: Mention new REFER argument for 'split-window'.
+
+2025-01-10  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/typescript-ts-mode.el: Fix syntax of tsx tags.
+
+	(tsx-ts--syntax-propertize-captures): For tag angle brackets
+	use the same syntax as in 'sgml-make-syntax-table' (bug#73978).
+
+2025-01-10  Juri Linkov  <juri@linkov.net>
+
+	Use the treesit thing 'list' with symbol property 'treesit-thing-symbol'
+
+	* doc/lispref/parsing.texi (User-defined Things): Mention new
+	functions 'treesit-forward-list', 'treesit-down-list',
+	'treesit-up-list', 'treesit-show-paren-data' that use the thing
+	'list' with the symbol property 'treesit-thing-symbol' (bug#73404).
+
+	* lisp/treesit.el: Put the property 'treesit-thing-symbol'
+	on the symbol 'list'.
+	(treesit--forward-list-with-default, treesit-down-list)
+	(treesit-up-list, treesit-navigate-thing)
+	(treesit-show-paren-data--categorize, treesit-major-mode-setup):
+	Replace 'sexp-list' with 'list'.
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode--thing-settings):
+	* lisp/progmodes/js.el (js-ts-mode):
+	* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
+	* lisp/progmodes/typescript-ts-mode.el (typescript-ts-base-mode)
+	(tsx-ts-mode):
+	* lisp/textmodes/html-ts-mode.el (html-ts-mode):
+	Replace 'sexp-list' with 'list'.
+
+	* src/treesit.c (treesit_traverse_validate_predicate)
+	(treesit_traverse_match_predicate): Check if the 'pred'
+	symbol has the property 'Qtreesit_thing_symbol'.
+	(syms_of_treesit): New symbol 'Qtreesit_thing_symbol'.
+
+2025-01-09  Juri Linkov  <juri@linkov.net>
+
+	* lisp/man.el (Man-fit-to-window): Don't update on tty with MANWIDTH.
+
+	Check if 'Man-columns' is non-nil before trying to reformat
+	the manpage buffer.  The value of the varible 'Man-columns'
+	is nil on a non-window system where "MANWIDTH" or "COLUMNS"
+	is defined.  And the return value of the function 'Man-columns'
+	is meaningless in this case anyway.  So no need to react
+	to changes in window width (bug#74924).
+
+2025-01-09  David Ponce  <da_vid@orange.fr>
+
+	Improve UI of customizing icons
+
+	* lisp/cus-edit.el (custom-icon--images-sub-type)
+	(custom-icon--emojis-sub-type, custom-icon--symbols-sub-type)
+	(custom-icon--texts-sub-type, custom-icon--type): New defconst's.
+	(custom-icon-value-create): Use them.  (Bug#73178)
+
+2025-01-09  Eshel Yaron  <me@eshelyaron.com>
+
+	Auto-adapt completion preview background color
+
+	Teach Completion Preview mode to automatically remap its
+	faces such that the background color of the preview overlay
+	matches the background color of the buffer text that is
+	being completed.  Crucially, this resolves an issue where
+	the preview overlay didn't look nice with hl-line-mode on.
+
+	Also see related discussion in bug#71282.
+
+	* lisp/completion-preview.el
+	(completion-preview-adapt-background-color): New option.
+	(completion-preview--bg-color): New function.
+	(completion-preview--face-remap-cookie-jar): New variable.
+	(completion-preview--make-overlay): Use them.
+
+2025-01-09  Martin Rudalics  <rudalics@gmx.at>
+
+	In xt_action_hook don't act on deleted window's scroll bar (Bug#75120)
+
+	* src/xterm.c (xt_action_hook): Make sure window_being_scrolled
+	is live (Bug#75120).
+	* src/pdumper.c (dump_subr): Update pertinent hash of
+	HASH_Lisp_Subr.
+
+2025-01-09  Gabriel Santos  <gabrielsantosdesouza@disroot.org>
+
+	Add button navigation to treesit-explorer (bug#75141)
+
+	* lisp/treesit.el (treesit--explorer-tree-mode-map): Define it
+	as a child of special-mode-map, adding keys for button
+	navigation.
+
+2025-01-09  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve 'gethash' docstring
+
+	* src/fns.c (Fgethash): Improve docstring.  Avoid exposing the C
+	identifier 'dflt' to Lisp by providing a "usage:" string.
+
+2025-01-09  Kierin Bell  <fernseed@fernseed.me>
+
+	Fix documentation of Iroquoian input methods
+
+	* lisp/leim/quail/iroquoian.el: Fix typos in Oneida endonym and in the
+	docstring of `haudenosaunee-postfix' about keys for inputting Onondaga
+	nasals.  (Bug#75448)
+
+	* etc/NEWS: Fix typo in Oneida endonym.
+
+2025-01-08  Arash Esbati  <arash@gnu.org>
+
+	Remove support for supertabular from RefTeX
+
+	* doc/misc/reftex.texi (Builtin Label Environments):
+	* lisp/textmodes/reftex-vars.el (reftex-label-alist-builtin)
+	(reftex-default-label-alist-entries): Delete entries for the
+	supertabular environment.  supertabular is an extension of the
+	normal tabular environment, and therefore doesn't contain a
+	caption and label.  Hence, supporting supertabular in RefTeX is
+	useless.
+
+2025-01-08  Arash Esbati  <arash@gnu.org>
+
+	Replace obsolete subfigure package with subfig
+
+	* doc/misc/reftex.texi (Builtin Label Environments): Mention the
+	subfig LaTeX package instead of the obsolete subfigure.
+
+	* lisp/textmodes/reftex-vars.el (reftex-label-alist-builtin):
+	Replace obsolete subfigure entry with subfig.  Adjust the macro
+	names accordingly and the regexp for matching the context.
+	Unify the descriptions of all entries.
+	(reftex-default-label-alist-entries): Use subfig as well.
+
+2025-01-08  Arsen Arsenović  <arsen@aarsen.me>
+
+	Add keywords var and final to Java Mode
+
+	* lisp/progmodes/cc-langs.el (c-type-modifier-prefix-kwds): Add
+	java entry for final.
+	(c-no-type-kwds): Add java entry for var.
+
+2025-01-08  Richard Stallman  <rms@gnu.org>
+
+	subr.el doc clarifications.
+
+	* subr.el (when-let, when-let*, and-let*): Doc clarifications.
+	Make `when-let* doc string self-contained.
+
+2025-01-08  Richard Stallman  <rms@gnu.org>
+
+	Add autoload cookie and doc fix
+
+	cond-star.el (cond*): Add autoload cookie.
+	Doc fix.
+
+2025-01-08  Pip Cet  <pipcet@protonmail.com>
+
+	Fix store_function_docstring for native subrs (Bug#74966)
+
+	Since native subrs can have either etc/DOC indexes or vector indexes,
+	we use the sign bit of the 'doc' field to distinguish the two cases.
+
+	* src/comp.c (native_function_doc, make_subr): Use one's complement of
+	doc index for native subrs.
+	* src/doc.c (store_function_docstring): Add assertion.
+	* src/lisp.h (struct Lisp_Subr): Document 'doc' sign bit.
+
+2025-01-08  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix define_error docstring for pure space removal
+
+	* src/lisp.h (define_error): Adjust docstring for pure space removal.
+
+2025-01-08  Stefan Kangas  <stefankangas@gmail.com>
+
+	Move define_error declaration and docstring
+
+	* src/lisp.h (define_error): Move declaration to its proper place, make
+	external, and move its docstring...
+	* src/eval.c (define_error): ...to its function definition.
+
+2025-01-08  F. Jason Park  <jp@neverwas.me>
+
+	Improve use of Flyspell's API in erc-spelling
+
+	* etc/ERC-NEWS: Announce deprecation of `erc-spelling-flyspell-verify'
+	and `erc-spelling-unhighlight-word'.  A slight behavioral change not
+	worth mentioning is that, previously, ERC arranged for Flyspell to
+	ignore any word immediately following a forward slash anywhere in the
+	prompt input, even those for which the slash served as mere
+	punctuation (a "stroke"), as in "something/misspelt."  As of this
+	change, Flyspell only unconditionally exempts an initial slash-prepended
+	word, like "tableflip" in "ERC> /tableflip", and checks all others that
+	follow against known slash commands.
+	* lisp/erc/erc-spelling.el: Change top-level assignment of `erc-mode'
+	symbol-property `flyspell-mode-predicate' from
+	`erc-spelling-flyspell-verify' to `erc-spelling--flyspell-input-p'.
+	(erc-spelling-mode, erc-spelling-disable): Remove local member from
+	`flyspell-incorrect-hook'.
+	(erc-spelling-init): Add `erc-spelling--flyspell-check' to
+	`flyspell-incorrect-hook' locally.  Don't bother explicitly setting
+	`flyspell-generic-check-word-predicate' because Flyspell already does
+	that for clients using the `flyspell-mode-predicte' interface.
+	(erc-spelling-flyspell-verify, erc-spelling-unhighlight-word): Mark
+	obsolete.
+	(erc-spelling--flyspell-check, erc-spelling--flyspell-input-p): New
+	functions, essentially the two halves of a reworked and bifurcated
+	`erc-spelling-flyspell-verify'.  Though used as a predicate, the first
+	is not named as such because it performs side effects.
+	* test/lisp/erc/erc-scenarios-spelling.el: New file.
+	* test/lisp/erc/resources/spelling/auto-correct.eld: New file.
+	(Bug#75327)
+
+2025-01-08  F. Jason Park  <jp@neverwas.me>
+
+	Fix regression in erc-nicks involving color pools
+
+	* lisp/erc/erc-nicks.el (erc-nicks-colors): Tweak doc.
+	(erc-nicks--create-pool-function): On graphic displays, set value to
+	`erc-nicks--create-culled-pool', the original default.  This fixes a bug
+	in which ERC mapped all pool members to a primary color, thus excluding
+	the bulk of them.  Thanks to Trevor Arjeski for discovering it.
+	(erc-nicks--create-coerced-pool): Mention the text-terminal-only
+	requirement in doc.
+	(erc-nicks-refresh): Improve doc.
+	* test/lisp/erc/erc-nicks-tests.el (erc-nicks-tests--track-faces):
+	Enable `erc-track-mode' prior to running body.
+
+2025-01-07  Arash Esbati  <arash@gnu.org>
+
+	Update RefTeX manual
+
+	* doc/misc/reftex.texi: (Builtin Label Environments): Mention
+	supported LaTeX packages ctable, minted and listings.
+	(Reference Styles): Update the supported reference styles and the
+	corresponding macros.
+	(Citation Styles): Mention support for biblatex package.
+	(Language Support): Describe usage of non-ASCII characters in the
+	LaTeX \label definition.
+	(Style Files): Mention biblatex.el as well.
+	(Options - Defining Label Environments): Add entry for
+	`reftex-label-regexps' option.
+	Other minor improvements.
+
+2025-01-07  Roland Winkler  <winkler@gnu.org>
+
+	bibtex-braced-string-syntax-table: fix bug #68477
+
+	* lisp/textmodes/bibtex.el (bibtex-braced-string-syntax-table):
+	Give all parentheses the syntax punctuation so that we do not
+	choke because of unbalanced parentheses other than braces (bug
+
+2025-01-07  Juri Linkov  <juri@linkov.net>
+
+	Prefer `%s` format over `%S` for buffers
+
+	This restores the `%s` format` for buffers
+	after fba3c7ff3f68f05d32541440e0a22ec667c0ad66.
+
+	* lisp/gnus/nnimap.el (nnimap-make-process-buffer):
+	* lisp/gnus/nntp.el (nntp-make-process-buffer):
+	* lisp/simple.el (next-error-internal):
+	Prefer more user-readable `%s` format over `%S` for buffers.
+
+2025-01-07  Juri Linkov  <juri@linkov.net>
+
+	Move calendar-month metadata to calendar-read-date (bug#68214)
+
+	* lisp/minibuffer.el (completion-category-defaults): Move the
+	'calendar-month' default value to the metadata in calendar-read-date.
+
+	* lisp/calendar/calendar.el (calendar-read-date): Add
+	display-sort-function moved from completion-category-defaults.
+
+2025-01-07  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve docstring of image-dired-show-all-from-dir
+
+	* lisp/image/image-dired.el (image-dired-show-all-from-dir):
+	Improve docstring.
+
+2025-01-07  Sacha Chua  <sacha@sachachua.com>
+
+	image-dired-show-all-from-dir: Reuse dired's default-directory
+
+	* lisp/image/image-dired.el (image-dired-show-all-from-dir): Delegate
+	figuring out default-directory to dired.  This handles the case where
+	image-dired is called with a cons cell that has a directory in the car
+	and a list of files in the cdr, which dired can handle, and therefore
+	allows image-dired-show-all-from-dir to show an arbitrary list of
+	images.  It also means that image-dired-show-all-from-dir can handle
+	wildcards.
+	Ref: https://lists.gnu.org/r/emacs-devel/2025-01/msg00048.html
+
+2025-01-06  Stefan Kangas  <stefankangas@gmail.com>
+
+	New test for finding C header files
+
+	The assumption here is that if there is a C compiler, there is also a
+	math.h header somewhere.  The test should fail if we can't find that
+	file, and hopefully that will provoke users to create bug reports.
+
+	Let's see how far we can take this idea; we might have to give up and
+	disable the test in some configurations.  But doing that now seems
+	premature, even if we had a list of affected systems (which we don't).
+
+	* lisp/man.el (man--find-header-file): Factor out new function...
+	(Man-view-header-file): ...from here.
+	* test/lisp/man-tests.el (man-tests-find-header-file): New test.
+
+2025-01-06  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix finding C headers with clang
+
+	This fixes following "#include" references in 'M-x man' buffers, and
+	using ffap, both on macOS machines, and on systems where for some reason
+	clang is available but gcc is not.
+
+	* lisp/subr.el (internal--c-header-file-path): Fix finding C
+	headers with clang.
+	(internal--gcc-is-clang-p): New function factored out from...
+	* lisp/emacs-lisp/ert-x.el (ert-gcc-is-clang-p): ...here.
+	* lisp/man.el (Man-header-file-path): Bump :version tag.
+
+	* test/lisp/subr-tests.el
+	(subr-tests-internal--c-header-file-path/clang-mocked): New test.
+
+2025-01-06  Stefan Kangas  <stefankangas@gmail.com>
+
+	New function internal--c-header-file-path
+
+	It is not clear to me where this function properly belongs, so let's put
+	it in subr.el for now.  This avoids code duplication without introducing
+	a dependency between man and ffap.  It can always be moved later.
+
+	* lisp/subr.el (internal--c-header-file-path): New function.
+	* lisp/man.el (Man-header-file-path):
+	* lisp/ffap.el (ffap-c-path): Use above new function.
+
+	* test/lisp/subr-tests.el (ert-x): Require.
+	(subr-tests-internal--c-header-file-path)
+	(subr-tests-internal--c-header-file-path/gcc-mocked): New tests.
+
+2025-01-06  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	time-stamp: lower- and title-case weekday and month names
+
+	* lisp/time-stamp.el (time-stamp-string-preprocess): new formats for
+	lowercase weekday name, lowercase month name, and system name
+	* test/lisp/time-stamp-tests.el: Add new tests.
+	(formatz-generate-tests): Better doc strings for generated test fns.
+
+2025-01-06  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el: Use forward-list-default-function for C-M-n
+
+	(treesit--forward-list-with-default): New internal function
+	with body from 'treesit-forward-sexp-list' (bug#73404).
+	(treesit-forward-sexp-list, treesit-forward-list):
+	Replace body with a call to the shared implementation
+	'treesit--forward-list-with-default' using the
+	corresponding default function as an argument.
+
+2025-01-06  João Távora  <joaotavora@gmail.com>
+
+	Eglot: new eglot--format to fix quote substitution woes (bug#73472)
+
+	* lisp/progmodes/eglot.el (eglot--guess-contact): Use eglot--format.
+	(eglot--format): New helper.
+	(eglot--error, eglot--message, eglot--warn)
+	(eglot--apply-text-edits, eglot-rename): Use eglot--format.
+
+2025-01-06  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve integer file mode options docstrings
+
+	* lisp/eshell/esh-util.el (eshell-private-file-modes)
+	(eshell-private-directory-modes):
+	* lisp/gnus/mail-source.el (mail-source-default-file-modes):
+	* lisp/printing.el (pr-file-modes):
+	* lisp/gnus/mm-decode.el (mm-attachment-file-modes):
+	* lisp/gnus/nnmail.el (nnmail-default-file-modes):
+	* lisp/recentf.el (recentf-save-file-modes):
+	* lisp/vc/ediff-init.el (ediff-temp-file-mode):
+	* lisp/vc/emerge.el (emerge-temp-file-mode): Better document the fact
+	that these are integer and not octal values.
+
+	* lisp/epg.el (epg--start):
+	* lisp/emacs-lisp/package.el (package-import-keyring): Use octal values
+	to make the code more self-documenting.
+
+2025-01-06  Peter Oliver  <git@mavit.org.uk>
+
+	Try harder to stabilize dired-test-bug27243-02
+
+	* test/lisp/dired-tests.el (dired-test-bug27243-02): Don't rely on the
+	expected point, since columns will move if the size of the parent directory
+	changes order of magnitude.  (Bug#72120)
+
+2025-01-06  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve Commentary in man.el
+
+	* lisp/man.el (Commentary): Move "Features" above "Credits and History".
+	The former is more likely to be relevant.
+
+2025-01-05  João Távora  <joaotavora@gmail.com>
+
+	Eglot: fix signature precedence based on provenance (bug#74914)
+
+	* lisp/progmodes/eglot.el (eglot--sig-info): Reverse order of
+	activeParameter and sig-active.
+
+2025-01-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(hack-one-local-variable): Fix bug#74964
+
+	* lisp/files.el (hack-local-variables--inhibit): New var.
+	(hack-one-local-variable): Use it to avoid infinite recursion in a more
+	targeted manner.
+
+2025-01-05  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/net/tramp-sh.el (tramp-get-remote-pipe-buf): Make it more robust.
+
+2025-01-05  viliaapro  <vili.aapro@iki.fi>  (tiny change)
+
+	Fix bug in 'rng-valid' that unnecessarily marks buffer as modified
+
+	* lisp/nxml/rng-valid.el (rng-do-some-validation-1): Use
+	'with-silent-modifications'.  (Bug#75224)
+
+2025-01-05  w08r  <will.08rien@gmail.com>
+
+	Enable extra flags in 'go-ts-mode' test commands
+
+	* lisp/progmodes/go-ts-mode.el (go-ts-mode-test-flags):
+	(go-ts-mode--get-test-flags): New custom variable and function
+	for controlling test behaviour.
+	(go-ts-mode--compile-test): Updated to use new test flags
+	variable for passing extra information to the go test command
+	line.
+	(go-ts-mode-test-this-package): Updated to use new test flags
+	variable for passing extra information to the go test command
+	line.  Removed incorrect use of -run flag.
+
+	* etc/NEWS: Announce the new user option.  (Bug#74786)
+
+2025-01-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Allow to remap 'header-line' face
+
+	* src/xfaces.c (realize_basic_faces): Bind 'face-remapping-alist'
+	to nil while realizing basic faces.
+	(lookup_basic_face): Force realizing a face whose 'inherit'
+	attribute is non-nil.  (Bug#73862)
+
+2025-01-05  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el: Fix treesit-show-paren-data (bug#75198)
+
+	(treesit-show-paren-data--categorize): Use 'treesit-thing-defined-p'
+	to check if the thing exists for the language at POS before calling
+	'treesit-parent-until' that raises an error for an undefined thing.
+	(treesit-thing-defined-p): Add the alias signature to the docstring.
+
+2025-01-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix setup of coding-systems on MS-Windows
+
+	* src/emacs.c (main) [HAVE_PDUMPER] [WINDOWSNT]: Call
+	'w32_init_file_name_codepage' again after loading the pdumper
+	file.
+	* src/w32.c (w32_init_file_name_codepage) [HAVE_PDUMPER]:
+	Reinitialize additional variables.  (Bug#75207)
+
+2025-01-05  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete duplicate note on ancient platforms
+
+	* etc/MACHINES: Delete note on platforms removed in Emacs 23.1 from the
+	introduction, since it is duplicated again at the end of the file.
+
+2025-01-04  Yuan Fu  <casouri@gmail.com>
+
+	Fix tsx-ts-mode syntax propertize function (bug#73978)
+
+	* lisp/progmodes/typescript-ts-mode.el:
+	(tsx-ts--syntax-propertize-captures): Apply punctuation syntax
+	on balanced pairs, instead of using string syntax.
+
+2025-01-04  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el (treesit-transpose-sexps): Improve (bug#60655).
+
+	Use 'treesit-thing-next' and 'treesit-thing-prev' with
+	'treesit-node-named' to transpose named siblings that leaves the right
+	punctuation in anonymous nodes between named siblings.  Fall back
+	to 'transpose-sexps-default-function' inside strings and comments.
+	(treesit-node-named): New helper function.
+
+2025-01-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	6468c3f7a74 Update doc string of 'insert'
+	6d8c3c0cbe4 Use `keymap*-set' over `global-set-key'/`define-key' in e...
+	4b2bb63b7ac Fix documentation and prompt in 'package-isolate'
+	55f43f5b220 ; Fix typo in treesit-explore-mode
+	921f454f508 Update fontification for attribute values in heex-ts-mode
+	ae2589ea7a5 Add expression handling to heex-ts-mode
+	0cacf806391 ; * etc/NEWS: Document change of 'make-cursor-line-fully-...
+	f47a29da5c4 * lisp/man.el (Man-mode): Improve docstring.
+
+	# Conflicts:
+	#	etc/NEWS
+
+2025-01-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	afe776051ec [project-vc]: Make project-buffers more consistent with p...
+	a720458fdd0 (elisp-flymake-byte-compile): Improve UX with `debug-on-e...
+	7acfea19358 ; * doc/lispref/modes.texi (Customizing Keywords): Fix ty...
+	d47a7d6f0fe ; Add missing parameters in keymap doc
+	07e9f27c3e0 ; * doc/misc/calc.texi: Fix makeinfo warnings (bug#75166).
+	43a8f0de5ec Always match underscore variables for elixir-ts-mode
+
+2025-01-04  Jared Finder  <jared@finder.org>
+
+	Don't always enable xterm-mouse-mode (bug#74833)
+
+	Many terminals set the environment variable TERM to "xterm" even when they
+	don't support all functionality in xterm.  This means that enabling
+	xterm-mouse-mode can break critical editing workflows like copy/paste.  This
+	adds checks for the specific terminal Emacs is run in and only enables
+	xterm-mouse-mode on terminals knows to support all critical editing workflows.
+
+	* etc/NEWS: Update announcement
+	* lisp/term/xterm.el (xterm--auto-xt-mouse-allowed-names)
+	(xterm--auto-xt-mouse-allowed-types): New variables to control
+	what terminals automatically enable xterm-mouse-mode.
+	(xterm--report-background-handler, xterm--version-handler): Use
+	xterm--read-string.
+	(xterm--read-string, xterm--query-name-and-version): New
+	function.
+	(xterm--init): Check what terminal is running and if
+	xterm-mouse-mode was manually called.
+	* lisp/xt-mouse.el (xterm-mouse-mode-called): New variable.
+	(xterm-mouse-mode): Set xterm-mouse-mode-called.  Mention
+	automatic call by xterm--init.  Delete outdated comment text.
+
+2025-01-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Update eln-cache when --init-directory is used
+
+	* lisp/startup.el (normal-top-level): Update eln-cache after
+	'user-emacs-directory' is set by --init-directory.  Patch by
+	Jordan Isaacs <jordan@snowytrees.dev>.  (Bug#75022)
+
+2025-01-04  Lin Sun  <sunlin7@hotmail.com>
+
+	* lisp/vc/ediff-util.el: Loop the ediff-session-registry instead of buffers
+
+	This avoids aborting the loop if an error happens in some buffer.
+	(Bug#74881)
+
+2025-01-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix mouse clicks on characters with parenthesis syntax
+
+	* lisp/mouse.el (context-menu-region, mouse-skip-word)
+	(mouse-start-end): Use 'syntax-after' instead of 'char-syntax', to
+	pay attention to 'syntax-table' text properties.  (Bug#74415)
+
+2025-01-04  Filippo Argiolas  <filippo.argiolas@gmail.com>  (tiny change)
+
+	Improve doxygen font-lock rules in c-ts-mode (bug#75012)
+
+	And also c++-ts-mode.
+
+	* lisp/progmodes/c-ts-common.el:
+	(c-ts-mode-doxygen-comment-font-lock-settings): Add rules for type,
+	storageclass and note/warning/error tags.
+
+2025-01-04  Daniel Colascione  <dancol@dancol.org>
+
+	Automatically redraw frames for filtered faces
+
+	Automatically redraw frames when we detect that a window
+	parameter used in a face filter is changed.  (Bug#75291)
+
+	* src/window.c (Fset_window_parameter): redraw window, actually
+	whole frame in this implementation, on face-relevant parameter
+	change
+	(syms_of_window): add window_auto_redraw_on_parameter_change
+	* src/xfaces.c (evaluate_face_filter): record properties
+
+2025-01-03  Stefan Kangas  <stefankangas@gmail.com>
+
+	Extract new function man--maybe-fontify-manpage
+
+	* lisp/man.el (man--maybe-fontify-manpage): Extract function from...
+	(Man-getpage-in-background, Man-update-manpage)
+	(Man-bgproc-filter): ...here.
+
+2025-01-03  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Update to Transient v0.8.3-2-gf0478b29
+
+2025-01-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(mpc-cmd-find): Try and fix bug#41493
+
+	* lisp/mpc.el (mpc--proc-alist-to-alists): Don't presume that we
+	have either `directory` or `file` entries, instead allow both at
+	the same time.
+	(mpc-cmd-find) <Directory>: Don't presume that `directory`
+	entries have no associated data, so throw them away only after
+	having parsed them with `mpc--proc-alist-to-alists`.
+
+2025-01-03  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add more text-based browser alternatives
+
+	* lisp/net/browse-url.el (browse-url-text-browser): Add more
+	alternatives.
+
+2025-01-03  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve temporary file handling in browse-url
+
+	* lisp/net/browse-url.el (browse-url-delete-temp-file): Don't add
+	to kill-buffer-hook on top level.
+	(browse-url--temp-file-setup): New macro to set 'kill-buffer-hook'
+	buffer-locally to above function when creating a temporary file.  Use
+	stricter permissions to protect user privacy on multi-user systems.
+	(browse-url-of-file, browse-url-of-buffer): Use above new macro.
+
+	(browse-url-delete-temp-file): Simplify calling convention by removing
+	unused argument.
+
+2025-01-03  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove gnudoit support from browse-url.el
+
+	* lisp/net/browse-url.el (browse-url-gnudoit-program)
+	(browse-url-gnudoit-args, browse-url-w3-gnudoit): Remove support
+	for gnudoit, obsolete since Emacs 25.1.
+
+2025-01-03  Stefan Kangas  <stefankangas@gmail.com>
+
+	Re-enable caching for 'M-x man' completion on macOS
+
+	On macOS, getting the completion results when you type 'M-x man RET' can
+	take up to several seconds, even on a reasonably modern MacBook Pro,
+	probably due to the lack of man-db and the need to process the output.
+
+	Caching of "man -k ^" completion results was added in 2009 due to
+	perceived slowness on some systems, but was unfortunately effectively
+	disabled again in 2013.  Let's re-enable it on macOS.
+
+	* lisp/man.el (Man-cache-completion-results-flag): New variable
+	set to t by default on macOS, and nil elsewhere.
+	(man): Cache completion results when above new variable is t.
+
+2025-01-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	New defgroup man-faces
+
+	* lisp/man.el: Delete redundant option :group specifiers.
+	(man-imenu-title): New defgroup.
+	(Man-overstrike, Man-underline, Man-reverse): Add faces to above
+	new defgroup.
+
+2025-01-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	Respect 'manual-program' variable
+
+	* lisp/man.el (Man-man-k-flags): Respect 'manual-program'
+	variable.
+
+2025-01-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(describe-variable): Fix bug#73872
+
+	* lisp/help-fns.el (describe-variable): Put a `syntax-table` property
+	on the printed value for better navigation.  Remove `set-syntax-table`
+	since `lisp-data-mode` already did it.
+	(describe-variable): Remove `set-syntax-table`, not needed any more.
+
+	* lisp/help-mode.el (help-mode-syntax-table): `;` shouldn't start a comment.
+	(help-make-xrefs): Use `with-syntax-table`.
+
+2025-01-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+	admin/merge-gnulib now warns if module lists change
+
+	From suggestions by Eli Zaretski and Stefan Kangas in:
+	https://lists.gnu.org/r/emacs-devel/2025-01/msg00036.html
+	https://lists.gnu.org/r/emacs-devel/2025-01/msg00037.html
+	* admin/merge-gnulib: For style consistency,
+	prefer ‘[ EXPR ]’ to ‘test EXPR’ and prefer -e to -f.
+	Fix bug that forgot to clean lib directory if it’s ./lib.
+	Check for lib/gnulib.mk.in, which we used directly, not ‘configure’.
+	(LC_ALL): Set to C.
+	(autogen): New function, to make it clearer to user when
+	commands are operating in some other directory.
+	(get_module_list): New function.
+	(old_modules, new_modules): New vars.
+	If they differ, issue a warning.
+
+2025-01-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Prefer `%S` format over `%s` for non strings
+
+	* lisp/reveal.el (reveal-open-new-overlays, reveal-close-old-overlays):
+	* lisp/gnus/nnimap.el (nnimap-header-parameters)
+	(nnimap-make-process-buffer):
+	* lisp/gnus/nntp.el (nntp-make-process-buffer):
+	* lisp/progmodes/flymake.el (flymake--disable-backend):
+	* lisp/simple.el (next-error-internal):
+	Prefer `%S` format over `%s` for non strings.
+
+2025-01-02  Roland Winkler  <winkler@gnu.org>
+
+	Fix NEWS entries for BibTeX mode.
+
+2025-01-02  Po Lu  <luangruo@yahoo.com>
+
+	Fix volatile Android build
+
+	* exec/Makefile.in (config-mips.m4): Call config.status in
+	builddir.
+
+2025-01-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Adjust nt/gnulib-cfg.mk to recent Gnulib import
+
+	* nt/gnulib-cfg.mk (OMIT_GNULIB_MODULE_dirent-h)
+	(OMIT_GNULIB_MODULE_inttypes-h-incomplete)
+	(OMIT_GNULIB_MODULE_stdio-h, OMIT_GNULIB_MODULE_stdlib-h)
+	(OMIT_GNULIB_MODULE_sys_select-h, OMIT_GNULIB_MODULE_sys_stat-h)
+	(OMIT_GNULIB_MODULE_sys_time-h, OMIT_GNULIB_MODULE_sys_types-h)
+	(OMIT_GNULIB_MODULE_unistd-h): Rename to follow Gnulib renaming
+	the modules from "FOO" to "FOO-h".
+
+2025-01-02  Roland Winkler  <winkler@gnu.org>
+
+	Provide more flexibility for definition of BibTeX entries.
+
+	* lisp/textmodes/bibtex.el (bibtex-aux-opt-alist): Rename from
+	bibtex-user-optional-fields.
+	(bibtex-BibTeX-entry-alist, bibtex-biblatex-entry-alist): Permit
+	aliases that inherit their definition from another entry.
+	(bibtex-BibTeX-aux-entry-alist, bibtex-biblatex-aux-entry-alist)
+	(bibtex-BibTeX-aux-opt-alist, bibtex-biblatex-aux-opt-alist): New
+	user variables.
+	(bibtex-entry-alist): Honor these new variables.
+	(bibtex-field-alist): New function.
+	(bibtex-include-OPTkey): Default changed to nil, declared
+	obsolete.  Use bibtex-aux-opt-alist instead.
+	(bibtex-set-dialect): Use cl-flet and bibtex-field-alist.
+	(bibtex-dialect-select-map): New variable.
+	(bibtex-init-dialect): New function.
+	(bibtex-field-list): Simplify.
+	(bibtex-print-help-message): Bug fix.
+
+2025-01-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	* lisp/progmodes/grep.el (grep-mode-map): Improve docstring.
+
+2025-01-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in grep.el
+
+	* lisp/progmodes/grep.el (grep-mode-map, grep-edit-mode-map):
+	Prefer defvar-keymap.
+
+2025-01-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2025-01-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Adjust to Gnulib’s recent module renaming
+
+	* admin/merge-gnulib (GNULIB_MODULES, AVOIDED_MODULES):
+	Change to match Gnulib’s current module names.
+
+2025-01-01  Wilson Snyder  <wsnyder@wsnyder.org>
+
+	verilog-mode.el update from upstream https://github.com/veripool/verilog-mode
+
+	* lisp/progmodes/verilog-mode.el (verilog-repair-open-comma): Fix AUTOINPUT, etc.
+	adding comma after attribute (#1884).
+	(verilog-do-indent) Imporve ident of delay control assignments (#1883)
+
+2025-01-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix copyright years by hand
+
+	These are dates that admin/update-copyright did not update.
+
+2025-01-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update copyright year to 2025
+
+	Run "TZ=UTC0 admin/update-copyright".
+
+2025-01-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Sync build-aux/update-copyright from Gnulib
+
+	* build-aux/update-copyright: Copy from Gnulib.
+	This should simplify this year's updating.
+
+2024-12-31  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: Fix various minor indentation bugs
+
+	As part of this, introduce a second anchor point to the
+	syntactic symbols brace-list-intro and enum-intro, the position
+	of the opening brace.
+
+	* lisp/progmodes/cc-align.el
+	(c-lineup-item-after-paren-at-boi): New function.
+
+	* lisp/progmodes/cc-engine.el
+	(c-foreign-truncate-lit-pos-cache)
+	(c-foreign-init-lit-pos-cache): Use
+	c-truncate-lit-pos/state-cache in place of an older function.
+	(c-no-bracelist-cache): Update its definition to exclude
+	conses.
+	(c-strip-conses): New function.
+	(c-inside-bracelist-p): Use c-strip-conses.
+	(c-add-stmt-syntax): In the "go out a block" loop, go out of a
+	brace at BOI when there's non-whitespace text after it.
+	Refactor an `if' form containing a cond form into a cond form.
+	Add the new second second anchor point into syntactic contexts
+	with brace-list-intro and enum-intro.  Anchor brace-list-close
+	and enum-close elements on the individual declarations in
+	struct, etc., variable declarations.
+	(c-guess-basic-syntax, CASE 20): Use the new constraint-cont
+	syntactic symbol.
+	(c-guess-basic-syntax, CASE 9B): Anchor brace-list-close and
+	enum-close elements on the individual declarations in struct,
+	etc., variable declarations.
+	(c-guess-basic-syntax, CASEs 9C, 9D): Add the new second anchor
+	point into brace-list-intro and enum-intro syntactic contexts.
+
+	* lisp/progmodes/cc-mode.el (c-locate-first-punctuation-prop):
+	New function.
+	(c-depropertize-CPP): Use c-locate-first-punctuation-prop.
+
+	* lisp/progmodes/cc-vars.el (c-offsets-alist): Amend the
+	entries for constraint-cont, brace-list-intro, and enum-intro,
+	using c-lineup-item-after-paren-at-boi.
+
+	* doc/misc/cc-mode.texi (List Line-Up): Add a description of
+	c-lineup-item-after-paren-at-boi.
+
+2024-12-30  Juri Linkov  <juri@linkov.net>
+
+	Improve treesit-forward-sexp-list, treesit-down-list, treesit-up-list
+
+	* lisp/treesit.el (treesit-forward-sexp-list): Rewrite to support
+	the value of ARG more than 1.  In this case every step moves forward
+	either over the next treesit-based list or over the syntax-based symbol.
+	(treesit-down-list, treesit-up-list): Rewrite to support the fallback
+	to the syntax-based navigation while inside the treesit-based list.
+	Also use a loop for ARG more than 1 (bug#73404).
+
+2024-12-30  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el (treesit-show-paren-data--categorize): Fix it.
+
+	Copy the implementation of treesit-parent-until here, and call
+	its treesit-node-match-p with the argument IGNORE-MISSING set to t
+	that causes it to fail silently instead of raising an error when
+	the predicate 'sexp-list' is not defined in an embedded language.
+	(treesit-major-mode-setup): Set show-paren-data-function to
+	treesit-show-paren-data only when 'sexp-list' thing is defined
+	that is used by treesit-show-paren-data--categorize (bug#75198).
+
+2024-12-30  Yuan Fu  <casouri@gmail.com>
+
+	Make typescript-ts-mode work with latest grammar
+
+	* lisp/progmodes/typescript-ts-mode.el:
+	(tsx-ts-mode--font-lock-compatibility-bb1f97b): Return dummy
+	query when neither query works.  In latest grammar, neither will
+	work, because typescript grammar doesn't include jsx grammar
+	anymore.
+
+2024-12-30  Yuan Fu  <casouri@gmail.com>
+
+	Add verified grammar version comment for tree-sitter modes
+
+	* lisp/progmodes/c-ts-mode.el:
+	* lisp/progmodes/cmake-ts-mode.el:
+	* lisp/progmodes/dockerfile-ts-mode.el:
+	* lisp/progmodes/elixir-ts-mode.el:
+	* lisp/progmodes/go-ts-mode.el:
+	* lisp/progmodes/heex-ts-mode.el:
+	* lisp/progmodes/java-ts-mode.el:
+	* lisp/progmodes/js.el:
+	* lisp/progmodes/json-ts-mode.el:
+	* lisp/progmodes/lua-ts-mode.el:
+	* lisp/progmodes/php-ts-mode.el:
+	* lisp/progmodes/ruby-ts-mode.el:
+	* lisp/progmodes/rust-ts-mode.el:
+	* lisp/textmodes/css-mode.el:
+	* lisp/textmodes/html-ts-mode.el: Add comments.
+
+2024-12-30  Yuan Fu  <casouri@gmail.com>
+
+	Generate compatibility report for multiple Emacs versions
+
+	* admin/tree-sitter/compat-template.html: Update template.
+	* admin/tree-sitter/treesit-admin.el:
+	(treesit-admin--builtin-language-sources): Add sources.
+	(treesit-admin--builtin-modes): New variable.
+	(treesit-admin--verify-major-mode-queries): Don't need to pass
+	LANGS argument anymore.
+	(treesit-admin-verify-major-mode-queries): Move, and use
+	treesit-admin--builtin-modes.
+	(treesit-admin--mode-languages): Set some variables so it gets
+	all the languages.
+	(treesit-admin--find-latest-compatible-revision): Also return
+	commit timestamp.
+	(treesit-admin--generate-compatibility-report): New parameter
+	EMACS-EXECUTABLES.  Support generating report for multiple Emacs
+	versions.
+	* lisp/treesit.el (treesit--language-git-timestamp): New function.
+
+2024-12-30  Yuan Fu  <casouri@gmail.com>
+
+	Add treesit-admin-generate-compatibility-report
+
+	This function can generate a HTML report on latest compatible
+	grammar versions for each major mode.
+
+	* admin/tree-sitter/compat-template.html: Update.
+	* admin/tree-sitter/treesit-admin.el:
+	(treesit-admin--validate-mode-lang): Change so that emacs 30 can
+	also run it.
+	(treesit-admin--find-latest-compatible-revision): Support
+	running checks with a different Emacs executable.
+	(treesit-admin--generate-compatibility-report): New function.
+
+2024-12-30  Yuan Fu  <casouri@gmail.com>
+
+	Add treesit-admin--last-compatible-grammar-for-modes
+
+	This function computes the latest compatible grammar version for
+	each major mode.
+
+	* admin/treesit-admin.el (treesit-admin-file-name): Move.
+	(treesit-admin--compat-template-file-name): New variable.
+	(treesit-admin--mode-languages): New function.
+	(treesit-admin--find-latest-compatible-revision): Return a plist
+	instead.
+	(treesit-admin--last-compatible-grammar-for-modes): New function.
+
+2024-12-30  Yuan Fu  <casouri@gmail.com>
+
+	Add treesit-admin--find-latest-compatible-revision
+
+	This function can find the last grammar revision that is
+	compatible with a major mode.
+
+	* admin/treesit-admin.el (treesit-admin-file-name): New
+	variable.
+	(treesit-admin--validate-mode-lang):
+	(treesit-admin--find-latest-compatible-revision): New functions.
+
+2024-12-30  Yuan Fu  <casouri@gmail.com>
+
+	Refactor treesit-admin--verify-major-mode-queries
+
+	Make treesit-admin--verify-major-mode-queries use
+	treesit--install-language-grammar-1, rathre than the interactive
+	command treesit-install-language-grammar.
+
+	* admin/treesit-admin.el:
+	(treesit-admin--verify-major-mode-queries): Add parameter
+	SOURCE-ALIST.  Use treesit--install-language-grammar-1.
+	(treesit-admin-verify-major-mode-queries): Pass
+	treesit-admin--builtin-language-sources to
+	treesit-admin--verify-major-mode-queries.
+
+	* lisp/treesit.el (treesit-install-language-grammar): Don't
+	return revision of the git repo.
+
+2024-12-30  Yuan Fu  <casouri@gmail.com>
+
+	Refactor treesit--install-language-grammar-1
+
+	Separate treesit--install-language-grammar-1 into two functions,
+	one clones the repository, the other builds and installs the
+	grammar.
+
+	* lisp/treesit.el (treesit--install-language-grammar-1):
+	Refactor out treesit--build-grammar.
+	(treesit--build-grammar): New function.
+	(treesit--language-git-revision): Now takes REPO-DIR as an
+	argument.
+
+2024-12-30  Yuan Fu  <casouri@gmail.com>
+
+	Support COMMIT in treesit-language-source-alist
+
+	* lisp/treesit.el (treesit-language-source-alist): Add COMMIT
+	field.
+	(treesit--install-language-grammar-1): Support COMMIT.
+
+2024-12-30  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el (treesit-show-paren-data--categorize): Improve.
+
+	Instead of using only the immediate parent, try to search more levels
+	using 'treesit-parent-until' (bug#75122).
+
+2024-12-29  Juri Linkov  <juri@linkov.net>
+
+	Treesit support for show-paren-mode (bug#75122)
+
+	* lisp/treesit.el (treesit-show-paren-data--categorize):
+	New internal function.
+	(treesit-show-paren-data): New function.
+	(treesit-major-mode-setup): Set 'show-paren-data-function' to
+	'treesit-show-paren-data'.
+
+2024-12-29  Juri Linkov  <juri@linkov.net>
+
+	Add new variable 'up-list-function' for 'treesit-up-list'
+
+	* lisp/emacs-lisp/lisp.el (up-list-function): New variable (bug#73404).
+	(up-list-default-function): New function.
+	(up-list): Split part to 'up-list-default-function'.
+
+	* lisp/treesit.el (treesit-up-list): New function.
+	(treesit-major-mode-setup): Set 'up-list-function' to
+	'treesit-up-list'.
+
+2024-12-29  Juri Linkov  <juri@linkov.net>
+
+	Add new variable 'down-list-function' for 'treesit-down-list'
+
+	* lisp/emacs-lisp/lisp.el (down-list-default-function): New function.
+	(down-list-function): New variable (bug#73404).
+	(down-list): Move meat to 'down-list-default-function',
+	and call 'down-list-function' when non-nil.  Don't raise an error
+	in strings or comments when 'down-list-function' is non-nil.
+
+	* lisp/treesit.el (treesit--scan-error): New internal function.
+	(treesit-forward-sexp, treesit-forward-list): Use 'treesit--scan-error'.
+	(treesit-down-list): New function.
+	(treesit-major-mode-setup): Set 'down-list-function' to
+	'treesit-down-list'.
+
+2024-12-29  Juri Linkov  <juri@linkov.net>
+
+	Add new variable 'forward-list-function' for 'treesit-forward-list'
+
+	* lisp/emacs-lisp/lisp.el (forward-list-default-function): New function.
+	(forward-list-function): New variable (bug#73404).
+	(forward-list): Move meat to 'forward-list-default-function',
+	and call 'forward-list-function' when non-nil.
+
+	* lisp/treesit.el (treesit-forward-list): Rewrite to not rely on
+	'treesit-forward-sexp'.
+	(treesit-major-mode-setup): Set 'forward-list-function' to
+	'treesit-forward-list'.
+
+2024-12-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(font-lock-set-defaults): Try and fix bug#74281
+
+	* lisp/font-lock.el (font-lock-set-defaults): Set
+	`font-lock--syntax-table-affects-ppss` more carefully, and
+	include ' among the "safe" syntaxes.
+
+2024-12-29  Michael Albinus  <michael.albinus@gmx.de>
+
+	Some minor Tramp changes
+
+	* lisp/net/tramp-sh.el (tramp-sh-handle-process-file): Do proper quoting.
+
+	* lisp/net/tramp.el (tramp-string-empty-or-nil-p):
+	Declare `tramp-suppress-trace' property.
+	(tramp-skeleton-make-symbolic-link): Drop volume letter when flushing.
+
+	* test/lisp/net/tramp-tests.el (tramp-test39-make-lock-file-name):
+	Adapt test.
+	(tramp-test42-utf8): Do not run expensive tests on MS Windows.
+
+2024-12-28  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete firstfile.c and lastfile.c
+
+	With the removal of unexec and purespace, the definitions in these files
+	are no longer used.  Remove them.
+
+	* src/firstfile.c:
+	* src/lastfile.c: Delete unused files.
+	* configure.ac (PRE_ALLOC_OBJ, POST_ALLOC_OBJ, FIRSTFILE_OBJ):
+	Remove variables and dependent code.
+	* msdos/autogen/Makefile.in:
+	* msdos/sed1v2.inp:
+	* src/Makefile.in: Don't use above deleted variables.
+	* src/deps.mk: Remove lastfile.c dependencies.
+
+2024-12-28  Daniel Colascione  <dancol@dancol.org>
+
+	Make browser windows pop up when browsing URLs on Wayland
+
+	When a user invokes browse-url, the browser window viewing the URL
+	should be raised in the user's desktop environment.  On X11, running
+	xdg-open as a subprocess does the job.  However, on Wayland, this
+	approach doesn't work: xdg-open makes the web browser browse a URL all
+	right, but doesn't raise the browser window in the GUI.  Therefore, if
+	the browser window is behind Emacs, browse-url appears to do nothing.
+	Repeated invocations of browse-url cause the browser to load multiple
+	tabs in the background, surprising the user when he gives up in
+	frustration and manually switches to the browser window.
+
+	There's no subprocess we can run to make the right thing happen.
+	Wayland requires that we pass along event activation information to the
+	browser using the xdg_activation_v1 protocol.
+
+	This change adds x-gtk-launch-uri to invoke GTK-native URL-dispatch
+	machinery.  This machinery DTRT on both X11 and Wayland.  We fall back
+	to the default browser machinery if we're not on a GTK frame.
+
+	The logic is more complicated than it has to be because the GTK URI
+	launch mechanism requires that we launch with respect to a specific GTK
+	window, and in some environments (e.g., running emacs -nw in a PGTK
+	Emacs) we don't have a GTK window.  We also want to preserve the effect
+	of customizing browse-url-browser-function, so adding an entry to
+	browse-url-default-handlers that preempts URI open when we happen to be
+	on a GTK frame is the wrong thing to do.
+
+	* lisp/net/browse-url.el (browse-url--browser-defcustom-type):
+	(browse-url--inhibit-pgtk): avoid infinite recursion
+	(browse-url-default-browser): use pgtk launch
+	(x-gtk-launch-uri): new function
+	(browse-url-default-gtk-browser): ues it
+
+	* src/pgtkfns.c (unwind_gerror_ptr): new function
+	(Fx_gtk_launch_uri): new function
+	(syms_of_pgtkfns): register it
+
+	* etc/NEWS: mention the new feature
+
+2024-12-28  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: Minor corrections and tidy ups for cache invalidation
+
+	These cache variables are c-lit-pos-cache-limit,
+	c-semi-near-cache-limit, c-full-near-cache-limit, and
+	c-state-cache-invalid-pos.
+
+	* lisp/progmodes/cc-awk.el
+	(c-awk-set-string-regexp-syntax-table-properties): Invalidate
+	the caches after changing the 'syntax-table property.
+
+	* lisp/progmodes/cc-defs.el (c-put-string-fence-trim-caches):
+	New macro.
+	(c-unmark-<-or->-as-paren): New name for c-unmark-<->-as-paren.
+	(Also renamed throughout CC Mode)
+
+	* lisp/progmodes/cc-engine.el (c-propertize-ml-string-opener):
+	Add missing cache invalidation.
+
+	* lisp/progmodes/cc-mode.el (c-neutralize-CPP-line): Remove
+	syntax-table properties from < and > as needed.
+	(c-put-syn-tab): Add missing cache invalidation.
+
+2024-12-28  Michael Albinus  <michael.albinus@gmx.de>
+
+	Add tramp-archive-local-file-name
+
+	* lisp/net/tramp-archive.el (tramp-archive-file-name-p):
+	Add ;;;###tramp-autoload cookie.
+	(tramp-archive-local-file-name): New defun.
+
+2024-12-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	2ba6387d1d6 ; Fix inaccuracy in ELisp Reference manual
+	8ac6a178804 ; * etc/PROBLEMS: Mention problems with XPM support in GD...
+	624322d5f6a Add missing fontification matches for elixir-ts-mode
+	5bafb11b400 ; Fix copyright year
+	186ea407326 Don't start docstrings with "This function" or similar
+	cb8ce2e68bb Enable indent-tabs-mode in obj-c-mode
+	54f35137096 Fix comment indent in 'lua-ts-mode' and old grammar
+	8b95549e908 * admin/nt/dist-build/build-dep-zips.py: (deps src) handl...
+	8064b2a6798 Document undocumented completion commands
+	c29b798537e ; etc/w32-feature.el (harfbuzz): improve test
+	0e43e35f96e * admin/nt/dist-build/emacs.nsi: (Uninstall) delete only ...
+	b83cd8a8fb0 ; * etc/tutorials/TUTORIAL.ko: Fix the beginning.
+	41caccc488b ; * etc/publicsuffix.txt: Update from upstream.
+	e6fb18406ee ; Fix refcards
+	14e791f9ba2 ; Update acknowledgments for Emacs 30
+	861b7864fc4 ; Fix node name in emacs-lisp-intro.texi
+	77243ba5be8 ; Update version tags of defcustoms
+	fe2ac33bae8 ;* doc/misc/efaq.texi (New in Emacs 30): Mention 'trusted...
+	8fb884f0dc0 ; * etc/NEWS: Fix wording.
+	e281355a5e8 Improve D-Bus and Tramp manual
+
+	# Conflicts:
+	#	doc/emacs/emacs.texi
+	#	etc/NEWS
+	#	lisp/erc/erc-log.el
+	#	lisp/eshell/esh-mode.el
+	#	lisp/which-key.el
+
+2024-12-28  Alan Third  <alan@idiocy.org>
+
+	Make image cache aware of image-scaling-factor (bug#74725)
+
+	* src/dispextern.h (struct image): Add scale so it can be compared in
+	search_image_cache.
+	* src/image.c (search_image_cache): Calculate the scale factor and
+	compare with the cached value.
+	(image_compute_scale): Compute the image's scale factor and optionally
+	store it in the image struct.
+	(compute_image_size): Move scale calculation code into
+	image_compute_scale and use it.
+
+2024-12-28  Lin Sun  <sunlin7@hotmail.com>
+
+	* lisp/vc/ediff-util.el: Remove temp Ediff files on kill-emacs
+
+	(ediff--delete-temp-files-on-kill-emacs): New function.
+	(ediff-setup): Install it in 'kill-emacs-hook'.  (Bug#74881)
+
+2024-12-27  Alex Bochannek  <alex@bochannek.com>
+
+	Add command to clear erc-track's mode-line indicator
+
+	* etc/ERC-NEWS: Mention new command `erc-track-clear'.
+	* lisp/erc/erc-track.el (erc-track-clear): New command to reset buffer
+	activity indicator in ERC's mode-line construct.  (Bug#75014)
+
+2024-12-27  F. Jason Park  <jp@neverwas.me>
+
+	Reuse process in erc-server-delayed-check-reconnect
+
+	* doc/misc/erc.texi (Integrations): Set `erc-server-reconnect-function'
+	to `erc-server-delayed-check-reconnect' in SOCKS example, and add
+	definition for `erc-open-socks-tls-stream'.  Mention possible
+	inaccuracies related to error detection with certain reconnect
+	strategies.
+	* lisp/erc/erc-backend.el (erc-server--reconnect-opened): New function.
+	(erc-server-delayed-check-reconnect): Attempt to reuse process if server
+	sends a complete PONG, and attempt to accommodate connectors that set
+	:nowait to nil.
+	(erc--server-delayed-check-connectors): Remove variable.
+	(erc-server-prefer-check-reconnect): Inline what was the internal
+	variable `erc--server-delayed-check-connectors' because it's no longer
+	used in unit tests.  Add `erc-open-socks-tls-stream' to the set of
+	connector functions thought to be compatible with the "check" reconnect
+	strategy.
+	* test/lisp/erc/erc-scenarios-base-auto-recon.el
+	(erc-scenarios-base-auto-recon-no-proto): Adapt to expect "reuse" behavior.
+	* test/lisp/erc/resources/base/reconnect/ping-pong.eld: Delete unused file.
+	* test/lisp/erc/resources/base/reconnect/unexpected-disconnect.eld:
+	Capture PING cookie to send back to client.
+	* test/lisp/erc/resources/erc-d/resources/proxy-solo.eld: Delete unused
+	file.  (Bug#62044)
+
+2024-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(package--download-and-read-archives): Fix bug#75065
+
+	* lisp/emacs-lisp/package.el (package--download-and-read-archives):
+	Include the error info in the error message.
+	Suggested by Konstantin Kharlamov <Hi-Angel@yandex.ru>.
+	(package-refresh-contents, package-menu--perform-transaction):
+	Use `error-message-string`.
+
+2024-12-27  Stefan Kangas  <stefankangas@gmail.com>
+
+	makeinfo-run-command: Use texi2any when makeinfo doesn't exist
+
+	* lisp/textmodes/makeinfo.el (makeinfo-run-command): Use texi2any when
+	makeinfo does't exist.  (Bug#75123)
+
+2024-12-27  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in two-column.el
+
+	* lisp/textmodes/two-column.el (2C-mode-map, 2C-minor-mode-map):
+	Convert to defvar-keymap.
+
+2024-12-27  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use with-environment-variables in more places
+
+	* lisp/gnus/gnus-search.el (gnus-search-run-search):
+	* lisp/man.el (Man-completion-table):
+	* lisp/progmodes/cperl-mode.el (cperl-pod-to-manpage):
+	* test/src/fileio-tests.el (fileio-tests--relative-HOME):
+	Prefer 'with-environment-variables'.
+
+2024-12-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Don’t include stdlib.h from conf_post.h
+
+	This is brittle, as evinced by the recent problem with lib/stdlib.c.
+	* src/conf_post.h: Move potential inclusion of stdlib.h and
+	redefinitions of malloc, free, realloc, aligned_alloc, and calloc
+	from here ...
+	* src/lisp.h: ... to here.  Do not redefine the symbols
+	if UNEXMACOS_C is defined.
+	* src/unexmacosx.c: Do not undef malloc, realloc, free.
+	(UNEXMACOS_C): New symbol, to prevent lisp.h from defining them.
+
+2024-12-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Let Gnulib deal with MB_CUR_MAX
+
+	Recent Gnulib should work around the Android NDK 16
+	MB_CUR_MAX bug, so Emacs no longer needs to worry about it.
+	* configure.ac (gl_STDLIB_H):
+	Remove, to stop overriding Gnulib.
+	* configure.ac (__ctype_get_mb_cur_max)
+	(emacs_cv_broken_mb_cur_max, REPLACEMENT_MB_CUR_MAX):
+	* src/conf_post.h (MB_CUR_MAX):
+	Remove, as Gnulib does this now.
+
+2024-12-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2024-12-26  Stefan Kangas  <stefankangas@gmail.com>
+
+	Drop support form gnome-moz-remote from browse-url
+
+	* lisp/net/browse-url.el (browse-url-gnome-moz-program)
+	(browse-url-gnome-moz-arguments, browse-url-gnome-moz): Delete
+	functions and variables obsolete since Emacs 25.1.
+
+2024-12-26  Antero Mejr  <mail@antr.me>
+
+	Add scheme-mode indentation rules for SRFI 227 and 253
+
+	* lisp/progmodes/scheme.el: Add properties for SRFI 227 and SRFI 253
+	identifiers.  (Bug#75126)
+
+2024-12-26  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve flag variable names in uniquify
+
+	* lisp/uniquify.el (uniquify-after-kill-buffer-flag)
+	(uniquify-trailing-separator-flag): Rename from
+	'uniquify-after-kill-buffer-p' and 'uniquify-trailing-separator-p', to
+	better adhere to our conventions.  Update all users and leave old names
+	as obsolete variable aliases.
+
+2024-12-26  Charalampos Mitrodimas  <charmitro@posteo.net>
+
+	Fix format specifier warnings in nsterm.m
+
+	Resolve warnings caused by mismatched format specifiers in `NSLog` and
+	`fprintf` calls.
+
+	This was observed when compiled with Clang version
+	19.1.6 (arm64-apple-darwin).
+
+	Warnings fixed:
+	- "format specifies type 'unsigned int' but the argument has type
+	  'IOReturn' (aka 'int')"
+
+	* src/nsterm.m: Cast `IOReturn` (aka `int`) to `unsigned int` for `%x`
+	format specifiers in `NSLog`.  (Bug#74971)
+
+2024-12-26  Visuwesh  <visuweshm@gmail.com>
+
+	Ensure Dired window is selected when reverting buffer
+
+	* lisp/dired.el (dired--make-directory-clickable): Ensure the
+	Dired window is selected.  This prevents erroneously reverting a
+	non-Dired buffer.  (Bug#74700)
+
+2024-12-26  Morgan Willcock  <morgan@ice9.digital>
+
+	Set marker insertion type for Imenu markers
+
+	* lisp/imenu.el (imenu-default-create-index-function)
+	(imenu--generic-function): Configure Imenu markers to advance
+	their position when characters are inserted at the marker
+	position.  (Bug#75072)
+
+2024-12-26  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Consistently add wildcards for completion-pcm-leading-wildcard
+
+	completion-pcm--find-all-completions has two different phases:
+	First we turn the minibuffer text into a regex and matches
+	completion alternatives against it.  If that finds no matches,
+	then we strip some text off the completions and minibuffer text
+	and call ourselves recursively to find completions, then filter
+	the results with the removed text (converted into a regex).
+
+	Because of this, completion-pcm-leading-wildcard had
+	inconsistent behavior: in the second phase, the filter created
+	from the removed text would have a leading wildcard.  That
+	effectively adds wildcards in the middle of the minibuffer text
+	at the start of each "word".  But the first phrase created a
+	regex which had no such wildcards.  Thus, the two phases could
+	get substantially different results.
+
+	We fix this by changing completion-pcm-leading-wildcard to
+	consistently add a leading wildcard for each word.  This was
+	always my intention.
+
+	* lisp/minibuffer.el (completion-pcm--string->pattern): Include
+	a wildcard after each delimter with
+	completion-pcm-leading-wildcard. (bug#74772)
+	* lisp/minibuffer.el (completion-pcm-leading-wildcard): Update
+	docs.
+	* doc/emacs/mini.texi (Completion Styles): Update docs.
+
+2024-12-26  Visuwesh  <visuweshm@gmail.com>
+
+	Show the keybinding next to command in calc's x
+
+	* lisp/calc/calc-ext.el (calc-execute-extended-command): Use
+	M-x's ':affixation-function' to show the keybinding of the calc
+	command next to its name.  (Bug#74829)
+
+2024-12-26  Dmitry Gutov  <dmitry@gutov.dev>
+
+	ruby-ts--s-p-query: Put '_' syntax on ?! method definitions
+
+	* lisp/progmodes/ruby-ts-mode.el (ruby-ts--s-p-query):
+	Put 'symbol' syntax on method definitions ending with [?!].
+	Reported in https://github.com/dgutov/robe/issues/149.
+
+2024-12-26  Dmitry Gutov  <dmitry@gutov.dev>
+
+	ruby-ts-mode: Refine the forward-sexp improvement
+
+	* lisp/progmodes/ruby-ts-mode.el (ruby-ts--sexp-list-p):
+	New function (bug#73404).
+	(ruby-ts-mode): Use it in sexp-list thing definition.
+
+2024-12-25  Juri Linkov  <juri@linkov.net>
+
+	* lisp/treesit.el: Improvements for treesit-explore-mode (bug#75079)
+
+	(treesit-explorer-switch-parser): Don't use completing-read
+	on the single parser.
+	(treesit-explore-mode): Don't save treesit-explore-mode to the desktop.
+
+2024-12-25  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve dictionary-switch-tooltip-mode docstring
+
+	* lisp/net/dictionary.el (dictionary-switch-tooltip-mode): Fix
+	docstring and argument name.
+
+2024-12-25  Nicholas Vollmer  <iarchivedmywholelife@gmail.com>
+
+	Fix checkdoc warnings in dictionary.el
+
+	* lisp/net/dictionary.el (dictionary-tool-bar-map): Add missing period.
+	(dictionary-process-popup-replies)
+	(dictionary-read-definition)
+	(dictionary-display-tooltip): Rename ignored parameters.
+	(dictionary-tooltip-track-mouse): Describe what function does, not just
+	when.
+	(dictionary-switch-tooltip-mode): Reword docstring in terms of ON
+	parameter.  (Bug#68684)
+
+2024-12-24  Yuan Fu  <casouri@gmail.com>
+
+	Add treesit-aggregated-simple-imenu-settings
+
+	Now we support setting up Imenu for multiple languages
+
+	* doc/lispref/modes.texi: Update manual.
+	* lisp/treesit.el:
+	(treesit-aggregated-simple-imenu-settings): New variable.
+	(treesit--imenu-merge-entries): New function.
+	(treesit--generate-simple-imenu): This was previously
+	treesit-simple-imenu.
+	(treesit-simple-imenu): Support
+	treesit-aggregated-simple-imenu-settings.
+	(treesit-major-mode-setup): Recognize
+	treesit-aggregated-simple-imenu-settings.
+	* test/src/treesit-tests.el (treesit-imenu): New test.
+
+2024-12-24  Yuan Fu  <casouri@gmail.com>
+
+	Add treesit-language-display-name
+
+	* lisp/treesit.el:
+	(treesit-language-display-name-alist): New variable.
+	(treesit-language-display-name): New function.
+	* doc/lispref/parsing.texi (Language Grammar): Add to manual.
+	* etc/NEWS: Add to NEWS.
+
+2024-12-24  Juri Linkov  <juri@linkov.net>
+
+	Add treesit thing 'sexp-list' to c++-ts-mode (bug#73404)
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode--thing-settings):
+	Add C++ 'sexp-list' nodes for 'treesit-thing-settings'.
+
+2024-12-24  Juri Linkov  <juri@linkov.net>
+
+	Add treesit thing 'sexp-list' to tsx-ts-mode (bug#73404, bug#73978)
+
+	* lisp/progmodes/typescript-ts-mode.el (tsx-ts-mode):
+	Add 'sexp-list' to 'treesit-thing-settings' with "jsx" things.
+	(typescript-ts-mode--sexp-list-nodes): Remove "jsx" things.
+
+2024-12-24  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/typescript-ts-mode.el: Fix regexp-opt of treesit-thing.
+
+	(typescript-ts-base-mode): Add arg 'symbols' to regexp-opt of 'sexp',
+	'sexp-list', 'sentence', 'text' (bug#73404, bug#74366, bug#74963).
+	(tsx-ts-mode): Add arg 'symbols' to regexp-opt of 'sexp', 'sentence'.
+	This avoids such mismatches as "string_fragment" by "string".
+
+2024-12-24  Yuan Fu  <casouri@gmail.com>
+
+	Include lightweight tags in treesit-admin--verify-major-mode-queries
+
+	* lisp/treesit.el (treesit--language-git-revision): Include
+	lightweight tags as well.
+
+2024-12-24  Yuan Fu  <casouri@gmail.com>
+
+	Fix cmake-ts-mode font-lock queries
+
+	This commit in tree-sitter-cmake removed angle brackets:
+
+	https://github.com/uyha/tree-sitter-cmake/commit/a414a4c83d54388f596269639c175a5b84bfa929
+
+	* lisp/progmodes/cmake-ts-mode.el
+	(cmake-ts-mode--font-lock-settings): Remove angle brackets.
+
+2024-12-24  Yuan Fu  <casouri@gmail.com>
+
+	Create a blobless clone in treesit-admin--verify-major-mode-queries
+
+	* admin/treesit-admin.el (treesit-admin--verify-major-mode-queries):
+	Create a blobless clone.
+	* lisp/treesit.el (treesit--install-language-grammar-blobless):
+	New variable.
+	(treesit--git-clone-repo): Support blobless clone.
+
+2024-12-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Avoid U+FFFD in commit messages
+
+	* build-aux/git-hooks/commit-msg:
+	Also check against U+FFFD REPLACEMENT CHARACTER in commit messages.
+
+2024-12-23  Michael Albinus  <michael.albinus@gmx.de>
+
+	* configure.ac (dbus): Default to ifavailable.  (Bug#75004)
+
+2024-12-23  Martin Rudalics  <rudalics@gmx.at>
+
+	Make 'fit-frame-to-buffer' work around size hints (Bug#74866)
+
+	* lisp/window.el (fit-frame-to-buffer-1): When
+	'frame-resize-pixelwise' is nil, round up requested sizes to avoid
+	that lines get wrapped (Bug#74866).
+	* doc/lispref/windows.texi (Resizing Windows): Mention that with
+	size hints one may have to set 'frame-resize-pixelwise' to make
+	'fit-frame-to-buffer' fit the buffer exactly.
+
+2024-12-22  Arsen Arsenović  <arsen@aarsen.me>
+
+	Java Mode: introduce the keyword `assert'.
+
+	* lisp/progmodes/cc-langs.el (c-simple-stmt-kwds): Put `assert'
+	into the java value.
+
+2024-12-22  Juri Linkov  <juri@linkov.net>
+
+	Add treesit thing 'sexp-list' to typescript-ts-mode (bug#73404)
+
+	* lisp/progmodes/typescript-ts-mode.el (typescript-ts-base-mode):
+	Add 'sexp-list' to 'treesit-thing-settings'.
+	(typescript-ts-mode--sexp-list-nodes): New variable.
+
+2024-12-22  Augusto Stoffel  <arstoffel@gmail.com>
+
+	Handle ':noquery' in 'open-gnutls-stream'
+
+	* lisp/net/gnutls.el (open-gnutls-stream): Extract and use
+	':noquery' keyword.  (Bug#74193).
+
+2024-12-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/lisp/files-tests.el (sh-shell): Move down declaration.
+
+2024-12-22  Antero Mejr  <antero@mailbox.org>
+
+	Allow viewing .dcm images via image-convert
+
+	* lisp/files.el (auto-mode-alist): Support the DICOM .dcm image
+	format.  (Bug#63531)
+
+2024-12-22  Antero Mejr  <antero@mailbox.org>
+
+	Allow viewing .six images via image-convert
+
+	* lisp/files.el (auto-mode-alist): Support the Sixel .six image
+	format.  (Bug#63531)
+	* lisp/image.el (imagemagick-enabled-types): Add SIX.
+
+2024-12-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/vc/smerge-mode.el (smerge-extend): New command (bug#74509)
+
+2024-12-22  Stefan Kangas  <stefankangas@gmail.com>
+
+	Match more gdbinit files in auto-mode-alist
+
+	* lisp/files.el (auto-mode-alist): Match more gdbinit files,
+	including XDG, and MS-Windows.  Avoid false positives.
+	(set-auto-mode--find-matching-alist-entry): Break out function...
+	(set-auto-mode--apply-alist): ...from here.  (Bug#74946)
+	* test/lisp/files-tests.el (files-tests--check-mode): New function.
+	(files-tests-auto-mode-alist): New test.
+
+2024-12-22  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in gud.el
+
+	* lisp/progmodes/gud.el (gud-gdb-repeat-map, gud-sdb-repeat-map)
+	(gud-dbx-repeat-map, gud-xdb-repeat-map, gud-perldb-repeat-map)
+	(gud-pdb-repeat-map, gud-guiler-repeat-map, gud-jdb-repeat-map):
+	Convert to defvar-keymap.
+
+2024-12-21  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-local-file-name): New defun.
+
+2024-12-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cl-flet, cl-labels): Fix bug#74870
+
+	* lisp/emacs-lisp/cl-macs.el (cl-flet, cl-labels): Wrap function
+	bodies in `cl-block`.
+
+	* test/lisp/emacs-lisp/cl-macs-tests.el (cl-macs--test-flet-block): New test.
+
+2024-12-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	5e97079cc75 ; Fix call to 'decode_string_utf_8' in  #ifdef'ed-away code
+	6902673b5b9 ; Improve commentary in calendar.el
+	08b62132dde Add 'lua-ts-mode' to 'interpreter-mode-alist'
+	d8ffcf2fbac Document representation of dates in calendar.el
+	faaa13ec762 Autoload 'shortdoc-help-fns-examples-function'
+
+2024-12-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	8f8da2d7854 ; * ChangeLog.4: Update.
+	49adcf30b01 ; * etc/AUTHORS: Update.
+	1381c6f9591 * Update authors.el
+	5c0f3f5826e ; * etc/NEWS: Mark unmarked entries.
+	8a0c9c234f1 Document 'trusted-content
+	c6ce11b2a48 Mention network-interface-list in network-interface-info ...
+	a7905145f70 ; * lisp/emacs-lisp/re-builder.el (reb-change-syntax): Fi...
+	cde22c02011 Move NEWS items from unreleased 28.3 to released 29.1
+	5686bb5b428 Improve browse-url-android-share docstring
+	92041e15f4a Minor doc fix for url-handler-regexp
+	9fd96e2ab95 Improve reb-change-syntax docstring
+	b9dc337ea74 * lisp/files.el (trusted-content-p): Make `:all` work in ...
+	4b685bc4fcd ; * src/process.c (Fnetwork_interface_list): Fix typo.
+	c14c4895719 ; * lisp/net/nsm.el (nsm-trust-local-network): Fix typo.
+	10f976300d0 ; Add some tree-sitter thing content to the manual
+	55303a6bc0a * lisp/org/ox-texinfo.el (org-texinfo-template): Fix Info...
+	8b6c6cffd1f trusted-content: Adjust the last patch based on prelimina...
+	69b16e5c638 ; * etc/NEWS: Fix typos.
+	5c6dbc65f36 ; * doc/lispref/frames.texi (Multiple Terminals): Add ind...
+	856a58e2827 Update documentation of 'etags' regexps some more
+	4c68846223b Update documentation of 'etags' regexps
+	b5158bd1914 elisp-mode.el: Disable Flymake byte-compile backend in un...
+
+	# Conflicts:
+	#	doc/man/etags.1
+	#	etc/NEWS
+	#	lisp/org/ox-texinfo.el
+
+2024-12-21  Cecilio Pardo  <cpardo@imayhem.com>
+
+	Add support for the ':data' keyword for play-sound in MS-Windows.
+
+	* src/sound.c (parse_sound) [WINDOWSNT]: Check that either :file
+	or :data is present.
+	(do_play_sound): Added parameter to select file or data, and code to
+	play from data.
+	(Fplay_sound_internal): Fixed volume format, and send file or data
+	to 'do_play_sound'.  (Bug#74863)
+	* etc/NEWS: Add entry for this change.
+	* etc/PROBLEMS: Remove entry about missing support for :data.
+
+2024-12-21  JD Smith  <93749+jdtsmith@users.noreply.github.com>
+
+	'seconds-to-string': new optional arguments for readable strings
+
+	* lisp/calendar/time-date.el (seconds-to-string): Accept new
+	optional arguments READABLE, ABBREV, and PRECISION, and format the
+	output string accordingly.  (Bug#71572)
+
+	* doc/lispref/os.texi (Time Calculations):
+	* etc/NEWS: Document the new arguments of 'seconds-to-string'.
+
+2024-12-21  Daniel Mendler  <mail@daniel-mendler.de>
+
+	browse-url-with-browser-kind: Improve browser function selection
+
+	In order to find an appropriate browser function for the given
+	kind, first the browser handler lists are consulted.  If no
+	handler is found, the `browse-url-browser-function',
+	`browse-url-secondary-browser-function`,
+	`browse-url-default-browser' and `eww' are tried in that order
+	until a browser function with a matching kind is found.  This
+	way the user customization of `browse-url-browser-function' and
+	`browse-url-secondary-browser-function` is respected by
+	`browse-url-with-browser-kind'.
+	* lisp/net/browse-url.el (browse-url-with-browser-kind): Try the
+	browser functions in the aforementioned order.  (Bug#74820)
+
+2024-12-21  Fabio Natali  <me@fabionatali.com>
+
+	Ask confirmation before EWW sends region to a search engine
+
+	With 'eww-search-words' (by default bound to 'M-s M-w') a user
+	can type in some search terms and get back the results of a web
+	search from a predefined search engine.  If a region is selected,
+	'eww-search-words' will use that for the web search instead of
+	prompting the user.
+	In its current form, 'eww-search-words' presents a security and
+	usability problem.  It is relatively too easy to mistakenly
+	launch the function and, if a region of text is selected, have
+	potentially sensitive data sent out to a third-party service.
+	This commit changes the search function's default behaviour so
+	that explicit confirmation is required before a region is sent
+	to a search engine.  The behaviour can be adjusted via the
+	newly-introduced 'eww-search-confirm-send-region' variable,
+	which is set to true by default.
+	* lisp/net/eww.el (eww-search-confirm-send-region): Add.
+	(eww-search-words): Update default 'eww-search-words' behaviour
+	so as to ask confirmation before sending the region to a search
+	engine.  (Bug#74218)
+
+2024-12-21  F. Jason Park  <jp@neverwas.me>
+
+	Use smarter default for erc-server-reconnect-function
+
+	* doc/misc/erc.texi (Sample Configuration): Remove customization in
+	`use-package' declaration for `erc-server-reconnect-function' as well as
+	related language in the customization walk-through.  Do this because the
+	new default incorporates `erc-server-delayed-check-reconnect' behavior
+	for compatible connect functions.
+	* etc/ERC-NEWS: Announce new default for `erc-server-reconnect-function'.
+	* lisp/erc/erc-backend.el (erc-server-reconnect-function): Change
+	default to `erc-server-prefer-check-reconnect'.
+	(erc-server-delayed-check-reconnect): Use `process-send-string' instead
+	of `send-string'.
+	(erc--server-delayed-check-connectors): New variable.
+	(erc-server-prefer-check-reconnect): New function.
+	* test/lisp/erc/erc-scenarios-base-auto-recon.el
+	(erc-scenarios-base-auto-recon-unavailable)
+	(erc-scenarios-base-auto-recon-no-proto): Remove unnecessary
+	`erc-server-reconnect-function' binding because the new default
+	incorporates the behavior being tested for.
+	* test/lisp/erc/erc-scenarios-base-buffer-display.el
+	(erc-scenarios-base-buffer-display--reconnect-common):
+	* test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
+	(erc-scenarios-common--base-compat-no-rename-bouncer):
+	* test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-base.el
+	(erc-scenarios-base-netid-bouncer--recon-base):
+	* test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-both.el
+	(erc-scenarios-base-netid-bouncer--recon-both):
+	* test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-id.el
+	(erc-scenarios-base-netid-bouncer--reconnect-id-foo)
+	(erc-scenarios-base-netid-bouncer--reconnect-id-bar):
+	* test/lisp/erc/erc-scenarios-base-reconnect.el
+	(erc-scenarios-base-reconnect-timer)
+	(erc-scenarios-base-cancel-reconnect):
+	* test/lisp/erc/erc-scenarios-services-misc.el
+	(erc-scenarios-services-misc--reconnect-retry-nick):
+	* test/lisp/erc/erc-scenarios-stamp.el
+	(erc-scenarios-stamp--date-mode/reconnect): Explicitly bind
+	`erc-server-reconnect-function' to `erc-server-delayed-reconnect', the
+	former default, which does not do any probing.  (Bug#62044)
+
+2024-12-21  F. Jason Park  <jp@neverwas.me>
+
+	Add command for teaching Imenu about ERC macros
+
+	* lisp/erc/erc-backend.el (define-erc-response-handler): Add
+	`doc-string' to `declare' specification.
+	* test/lisp/erc/resources/erc-tests-common.el
+	(erc-tests-common-add-imenu-expressions): New function for defining and
+	undefining Imenu patterns useful to ERC developers.
+
+2024-12-21  F. Jason Park  <jp@neverwas.me>
+
+	Disable which-func-mode in erc-imenu buffers
+
+	* lisp/erc/erc-imenu.el (erc-imenu-setup): Move after module definition
+	so the variable `erc-imenu-mode' is defined.  Run teardown code when
+	module is deactivated.  Set `which-func-mode' to nil locally.
+	(erc-imenu-mode, erc-imenu-enable, erc-imenu-disable): Manage membership
+	of `erc-imenu--disable-which-func' in `which-function-mode-hook'.
+	(erc-imenu--disable-which-func): New function.  (Bug#74934)
+
+2024-12-21  Po Lu  <luangruo@yahoo.com>
+
+	Fix a number of Android compilation warnings
+
+	* src/dispnew.c (frame_rect_abs, frame_pos_abs, rect_intersect)
+	(copy_child_glyphs, abs_cursor_pos, is_in_matrix)
+	(is_cursor_obscured) [HAVE_ANDROID]: Delete functions.
+
+2024-12-20  João Távora  <joaotavora@gmail.com>
+
+	Eglot: ensure quick typing doesn't undermine completion exit
+
+	Some completion resolution requests in
+	eglot-completion-at-point, specifically those that might be
+	triggered from the :exit function, can't be cancellable, else
+	the completion edit or snippet will never be obtained and the
+	user is left with the nonsensical completion label in the
+	buffer.
+
+	Github-reference: https://github.com/joaotavora/eglot/issues/1474
+
+2024-12-20  Yuan Fu  <casouri@gmail.com>
+
+	Move admin scripts to admin/treesit-admin.el
+
+	* admin/treesit-admin.el: New file.
+	* lisp/treesit.el (treesit--check-manual-coverage):
+	(treesit--builtin-language-sources):
+	(treesit--verify-major-mode-queries):
+	(treesit-verify-major-mode-queries): Move out.
+
+2024-12-20  Martin Rudalics  <rudalics@gmx.at>
+
+	On GTK do not inhibit implied resizing until tool bar was drawn (Bug#74750)
+
+	* src/frame.c (frame_inhibit_resize): Under GTK do not inhibit
+	implied resizing as long as the tool bar has not been drawn yet
+	so the frame gets its intended initial height (Bug#74750).
+	* src/gtkutil.c (update_frame_tool_bar): Set tool_bar_resized
+	slot of frame f to true regardless of whether a tool bar was
+	made or not.  This will make inhibiting implied resizes work
+	again from now on.
+
+2024-12-20  Yuan Fu  <casouri@gmail.com>
+
+	Add known-to-work version for c/c++-ts-mode
+
+	This is done by
+
+	    (treesit--verify-major-mode-queries
+	     '(c-ts-mode c++-ts-mode)
+	     '(c cpp)
+	     "/tmp/tree-sitter-grammars")
+
+	* lisp/progmodes/c-ts-mode.el: Add comments.
+
+2024-12-20  Yuan Fu  <casouri@gmail.com>
+
+	Add automated process to verify tree-sitter queries
+
+	This allows us to inform packagers of the grammar version they
+	want to use when packaging tree-sitter grammars with Emacs.
+
+	* lisp/treesit.el (treesit--builtin-language-sources):
+	New variable.
+	(treesit--verify-major-mode-queries):
+	(treesit-verify-major-mode-queries): New functions.
+
+2024-12-20  Yuan Fu  <casouri@gmail.com>
+
+	Add keyword :reversed to treesit-font-lock-rules
+
+	This keyword will be useful for implementing
+	string-interpolation feature.
+
+	* doc/lispref/modes.texi (Parser-based Font Lock): Document the
+	new keyword.
+	* lisp/treesit.el (treesit-font-lock-settings): Document.
+	(treesit-font-lock-setting-reversed): New function.
+	(treesit-font-lock-rules): Add new keyword.
+	(treesit-font-lock-recompute-features): Handle new keyword.
+
+2024-12-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix the MS-Windows build broken by recent changes
+
+	* src/w32font.c (memq_no_quit):
+	* src/w32uniscribe.c (memq_no_quit): Remove; use the function from
+	fns.c instead.  All callers changed.
+
+2024-12-20  Gerd Möllmann  <gerd@gnu.org>
+
+	Allow xt-mouse-tests to run
+
+	This is basically a workaround for running a test in batch mode
+	which should have a tty frame available but doesn't.
+
+	* src/frame.c (check_tty): Relax check if noninteractive.
+	* lisp/xt-mouse.el (xterm-mouse-event): Don't use frame-at if
+	noninteractive.
+
+2024-12-20  Gerd Möllmann  <gerd@gnu.org>
+
+	Fix tty root frame collection in redisplay_internal
+
+	* src/fns.c (memq_no_quit): New function.
+	* src/lisp.h: Declare it.
+	* src/xdisp.c (redisplay_internal): Use memq_no_quit instead of
+	assq_no_quit.
+
+2024-12-20  Po Lu  <luangruo@yahoo.com>
+
+	Enable adjusting frame sizes on MS-DOS
+
+	* src/dispnew.c (change_frame_size): Do not propagate changes to
+	child frames to root frames and vice versa.
+
+	* src/frame.c (adjust_frame_size): Do not change video modes
+	in resizing a child frame.
+
+2024-12-20  Po Lu  <luangruo@yahoo.com>
+
+	Enable TTY child frames on MS-DOS
+
+	* src/conf_post.h (ENOTSUP): Define to ENOSYS as msdos.h once
+	did.
+	(IFTODT): Copy definition from Gnulib.
+
+	* src/dispnew.c (is_tty_frame): Also test FRAME_MSDOS_P.
+
+	* src/frame.c (tty_child_pos_param, tty_child_size_param):
+	Export functions.
+
+	* src/msdos.c (mouse_get_xy, mouse_moveto, mouse_pressed):
+	Offset mouse positions by those of the selected frame.
+	(it_face_override): New function.
+	(IT_set_face): New argument F.  Load FACE_ID from its face
+	cache.
+	(IT_write_glyphs): Track the frames on which glyphs were
+	generated and apply faces from their individual face caches.
+	(IT_write_glyphs_with_face): New function.
+	(tty_draw_row_with_mouse_face): Reimplement in line with tty.c
+	and eliminate an obsolete optimization.
+	(IT_clear_end_of_line, IT_clear_screen): Load faces from the
+	cache of the provided frame.
+	(IT_set_frame_parameters): Adjust frame geometry and garbage
+	frames after geometry parameters change as a child frame.
+	(BUILD_CHAR_GLYPH): Accept new parameter F.
+	(IT_menu_display): Offset cursor positions by those of the
+	selected frame.
+
+	* src/msdos.h (ENOTSUP): Move to conf_post.h for Gnulib.
+
+	* src/xdisp.c (redisplay_internal): Redisplay MSDOS frames
+	unconditionally as with terminal frames.
+
+2024-12-20  Po Lu  <luangruo@yahoo.com>
+
+	Fix the Android port
+
+	* src/dispnew.c (terminal_cursor_magic)
+	(combine_updates_for_frame): Disable unused code on Android.
+
+	* src/frame.c (tty_child_frame_rect): Define out on Android.
+
+2024-12-19  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in hangul.el
+
+	* lisp/leim/quail/hangul.el (hangul-im-keymap): Convert to
+	defvar-keymap.
+
+2024-12-19  Robert Pluim  <rpluim@gmail.com>
+
+	Add more documentation for TTY child frames
+
+	* doc/lispref/frames.texi (Child Frames): Document that TTY
+	child frames are now supported.
+	* etc/NEWS: Document another limitation of TTY child frames.
+
+2024-12-19  Robert Pluim  <rpluim@gmail.com>
+
+	Fix network test failure when using VPN client
+
+	When using certain VPN clients, the interface info returned by
+	'getifaddrs' does not have the address family filled in for the
+	ifa_netmask component (this is allowed by the standard, since
+	the value is not specified).  The resulting address info causes
+	network tests suite failures.  Fix by copying the address family
+	from the returned interface address.
+
+	* src/process.c (network_interface_list): Copy the interface address
+	sa_family to the netmask address.
+	(Fnetwork_lookup_address_info): Fix test for non-IP addresses to
+	properly account for IPv6.
+
+	* test/src/process-tests.el (process-tests-check-bug-74907): New
+	test, checks that 'network-interface-list' output is as
+	expected.
+
+	(Bug#74907)
+
+2024-12-19  Gerd Möllmann  <gerd@gnu.org>
+
+	NEWS entry for the removal of `redisplay-dont-pause'
+
+	NEWS entry for tty child frames
+
+2024-12-19  Gerd Möllmann  <gerd@gnu.org>
+
+	Remove remaining references to redisplay-dont-pause
+
+	* src/pgtkfns.c (Fpgtk_print_frames_dialog): Remove reference to
+	Qredisplay_dont_pause.
+	* src/pgtkterm.c (pgtk_cr_export_frames): Remove reference to
+	Qredisplay_dont_pause.
+	* src/xfns.c (Fx_print_frames_dialog): Remove reference to
+	Qredisplay_dont_pause.
+	* src/xterm.c (x_cr_export_frames): Remove reference to
+	Qredisplay_dont_pause.
+
+2024-12-19  Gerd Möllmann  <gerd@gnu.org>
+
+	Remove an unused parameter of combine_updates
+
+	* src/dispnew.c (combine_updates): Remove unused parameter inhibit_scrolling.
+	* src/xdisp.c (redisplay_internal): Adjust caller.
+	* src/dispextern.h: Change function prototype.
+
+2024-12-19  Gerd Möllmann  <gerd@gnu.org>
+
+	Don't pause display for pending input
+
+	* src/dispnew.c: Remove display_completed, redisplay_dont_pause,
+	redisplay-dont-pause was declared obsolete in Emacs 24.  Remove anything
+	checking pending input, change function signatures accordingly, and so
+	on.
+
+	* src/keyboard.c (read_char): Don't use redisplay_dont_pause.
+	* src/minibuf.c (read_minibuf): Use new function signatures.
+	* src/xdisp.c: Don't check display_completed. Use new API.
+
+	* lisp/subr.el (redisplay-dont-pause): Remove declaration.
+
+2024-12-19  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix display of obsolete variables in *Help*
+
+	* doc/lispref/variables.texi (Variable Aliases):
+	Mention `substitute-command-keys' in `make-obsolete-variable'.
+
+	* lisp/font-lock.el: Revert last change.
+
+	* lisp/help-fns.el (help-fns--var-obsolete):
+	Apply `substitute-command-keys'.
+
+	* lisp/emacs-lisp/byte-run.el (make-obsolete-variable):
+	Adapt docstring.
+
+2024-12-19  Gerd Möllmann  <gerd@gnu.org>
+
+	Merge branch 'scratch/tty-child-frames'
+
+	Add support for child frames on tty
+
+	The redisplay part is complete.  The frame-handling part supports
+	use-cases like Posframe, Corfu, and child frames acting like tooltips.
+	Other use-cases of child frames are not currently supported.  In
+	particular, trying to create minibuffer-only child frames on ttys will
+	signal an error.
+
+	* src/xfaces.c (free_frame_faces): Change formatting slightly.
+
+	* src/xdisp.c (redisplay_trace, move_tracxe): Print to stderr because
+	stdout screws up terminal display.
+	(init_iterator): Remove a #ifdef HAVE_WINDOW_SYSTEM.
+	(clear_garbaged_frames): Return a bool telling if we cleared matrix.
+	(echo_area_display): Use combine_updates on tty frames.
+	(redisplay_internal): Changes for redisplay of tty child windows.
+	(deep_copy_glyph_row): Take a frame parameter.
+	(display_tty_menu_item): Changes because of function signature changes.
+
+	* src/w32term.c (w32_read_socket): Don't use FRAME_OBSCRURED_P,
+	which has been removed.
+
+	* src/w32inevt.c (do_mouse_event): Workaround for mouse events on
+	child frafmes.
+
+	* src/w32console.c (w32con_write_glyphs, w32con_update_end):
+	Use glyphs' frame for faces.
+
+	* src/treesit.c (treesit_load_language): Pacify a warning.
+
+	* src/w32console.c (w32con_clear_end_of_line): Set glyph's frame.
+
+	* src/terminal.c (cursor_to, raw_cursor_to): Handle case that
+	frame is a child frame.
+
+	* src/termhooks.h: Declare formerly static functions.
+
+	* src/term.c (tty_hide_cursor, tty_show_cursor): Make externally
+	visible.
+	(tty_write_glyphs): Determine faces based on a glyph's frame.
+	(tty_write_glyphs_with_face): Take a struct face argument instead
+	of a face id.  Callers changed.
+	(tty_insert_glyphs): Use faces, not face ids.
+	(append_glyph, append_composite_glyph, append_glyphless_glyph):
+	Set glyph's frame.
+	(turn_on_face, turn_off_face): Take face argument instead of face
+	id.  Callers adapted.
+	(Fresume_tty): Act on root frame.
+	(tty_draw_row_with_mouse_face): Handle child frames.
+	(restore_desired_matrix): Make sure glyphs' is live.
+	(set_tty_hooks): Set terminal's frame_raise_lower_hook.
+	(tty_frame_geometry, Ftty_frame_geometry, Ftty_frame_edges)
+	(Ftty_frame_list_z_order, Ftty_frame_restack)
+	(tty_display_dimension, Ftty_display_pixel_width)
+	(Ftty_display_pixel_height): New functions.
+	(syms_of_term): Defsubr new Lisp functions.
+
+	* src/minibuf.c (read_minibuf): Use combine_updates for tty
+	frames.
+
+	* src/frame.h (struct frame): Always define parent_frame.  Change
+	'visible' to be a boolean.  Always define 'undecorated' and
+	'no_accept_focus'.  Add 'z_order'.
+	(FRAME_OBSCURED_P): Removed.
+	(FRAME_PARENT_FRAME): Make it a function.
+	(SET_FRAME_VISIBLE): Take a bool parameter, not an int.
+	(FRAME_INTERNAL_BORDER_WIDTH): Don't special-base HAVE_WINDOW_SYSTEM.
+
+	* src/frame.c (decode_tty_frame): New function.
+	(set_menu_bar_lines): Set menu bar lines and height to 0 for tty
+	child frames.  Compute min height differently.
+	(adjust_frame_size): Set FrameCols/Rows only for root tty frames.
+	Mark tty root frame garbaged if child frame is adjusted.  Run some
+	code even if not HAVE_WINDOW_SYSTEM.
+	(make_frame): Run some code even if not HAVE_WINDOW_SYSTEM.
+	(make_terminal_frame): Implement child frame creation.
+	(tty_child_pos_param, tty_child_size_param)
+	(tty_child_frame_rect): New functions.
+	(Fmake_terminal_frame): Parts rewritten for child frames.
+	(do_switch_frame): Add child frame support.
+	(Fframe_ancestor_p): Define if not HAVE_WINDOW_SYSTEM.
+	(Fmake_frame_visible, Fmake_frame_invisible)
+	(Fframe_visible_p, Fraise_frame):
+	Handle tty frames differently.
+	(store_frame_param): Signal error if trying to re-parent a tty
+	child frame.
+	(Fframe_parameters): Report some additional tty frame parameters.
+	(Fmodify_frame_parameters): Handle tty child frames.
+	(Fset_frame_position): Ditto.
+	(frame_parms): Define index for additional frame parameters.
+	(handle_frame_param): New function.
+	(gui_set_frame_parameters_1): Use handle_frame_param.
+
+	* src/disptab.h (DISP_TABLE_EXTRA_SLOTS): Change to 12.
+	(enum box): New enumeration.
+
+	* src/dispnew.c (check_rows): New function, #if 0.
+	(frame_matrix_frame): Variable removed.
+	(line_hash_code): Take glyph's frame into account.
+	(build_frame_matrix_from_leaf_window): Do not copy glyphs from
+	rows that aren't enabled.
+	(fill_up_glyph_row_with_spaces): Add frame parameter, uses
+	changed.
+	(fill_up_glyph_row_area_with_spaces): Add frame parameter.  Set
+	glyph's frame to it.
+	(fill_up_frame_row_with_spaces): Ditto.
+	(set_frame_matrix_frame): Function removed.
+	(make_current): Change signature.  Callers changed.
+	(mirrored_line_dance): Take a frame argument, not a matrix.
+	(redraw_frame): Don't clear_frame a child frame.
+	(struct rect): New.
+	(rect_intersect, frame_pos_abs, frame_rect_abs, root_frame)
+	(max_child_z_order, is_frame_ancestor, frames_with_root)
+	(frames_with_parent, frame_z_order_cmp, Fframe__z_order_lessp)
+	(frames_in_reverse_z_order, tty_raise_lower_frame, is_tty_frame)
+	(is_tty_child_frame, is_tty_root_frame, first_enabled_row)
+	(make_matrix_current, prepare_desired_root_row)
+	(make_glyph_space, neutralize_wide_char, produce_box_glyphs)
+	(produce_box_sides, produce_box_line, copy_child_glyphs)
+	(update_window_frame, update_initial_frame, flush_terminal)
+	(abs_cursor_pos, is_in_matrix, is_cursor_obscured)
+	(terminal_cursor_magic, combine_updates_for_frame)
+	(combine_updates): New functions.
+	(update_frame): Rewritten.
+	(Fdisplay__update_for_mouse_movement): Take a MOUSE_FRAME param.
+	(syms_of_display): New symbol frame--z-order--lessp, tty-non-selected-cursor.
+	New subr Sframe__z_order_lessp.  Provide tty-child-frames.
+
+	* src/dispextern.h (struct glyph): Add member 'frame'.
+	(CHAR_GLYPH_SPACE_P): Add FRAME parameter.  All uses changed.
+	(GLYPH_EQUAL_P): Compare glyphs' frame.
+	(SET_CHAR_GLYPH): Add parameter FRAME.
+	(SET_CHAR_GLYPH_FROM_GLYPH): Ditto.
+
+	* src/chartab.c (Fmake_char_table): Allow more than 10 display
+	table slots.
+
+	* lisp/xt-mouse.el (xterm-mouse--handle-mouse-movement): Use new
+	terminal parameter xterm-mouse-frame.
+	(xterm-mouse-position-function): Ditto.
+	(xterm-mouse-event): Determine frame under mouse and compute
+	frame-relative coordinates.  Set terminal parameter
+	xterm-mouse-frame.
+
+	* lisp/tty-tip.el: New file implementing tooltip for ttys.
+
+	* lisp/paren.el (show-paren-function): Don't check if
+	display-graphics-p when using child frames.
+
+	* lisp/frame.el (frame-at): New function.
+	(tty-frame-geometry, tty-frame-edges, tty-frame-restack)
+	(tty-display-pixel-height, tty-frame-list-z-order)
+	(tty-display-pixel-width): Declare C function.
+	(frame-geometry): Use tty-frame-geometry.
+	(frame-edges): Use tty-frame-edges.
+	(frame-list-z-order): Use tty-frame-list-z-order.
+	(frame-restack): Use tty-frame-restack.
+	(display-pixel-height): Use tty-display-pixel-height.
+	(display-pixel-width): Use tty-display-pixel-width.
+
+	* lisp/disp-table.el (display-table): Increase size to 12.
+	(box-horizontal, box-vertical, box-down-right, box-down-left)
+	(box-up-right, box-up-left): New display table slot names for
+	box-drawing characters.
+	(display-table-slot, set-display-table-slot): Extend doc string.
+	(describe-display-table): Display new display table slots.
+	(standard-display-unicode-special-glyphs): New function setting
+	up Unicode characters for display table entries.
+
+	* .gitignore: Don't ignore patch files, they are useful to see in
+	Magit status buffer when applying patches (git am).
+
+2024-12-19  Juri Linkov  <juri@linkov.net>
+
+	Add treesit thing 'sexp-list' to some ts-modes (bug#73404)
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode--thing-settings):
+	* lisp/progmodes/js.el (js-ts-mode):
+	* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
+	* lisp/textmodes/html-ts-mode.el (html-ts-mode):
+	Add 'sexp-list' to treesit-thing-settings.
+	* lisp/progmodes/js.el (js--treesit-sexp-list-nodes): New variable.
+
+2024-12-19  Juri Linkov  <juri@linkov.net>
+
+	New treesit thing 'sexp-list' (bug#73404)
+
+	* lisp/treesit.el (treesit-forward-list): New command.
+	(treesit-forward-sexp): Check the thing 'text' only when
+	'treesit-sexp-type-regexp' is nil.
+	(treesit-forward-sexp-list): New function.
+	(treesit-navigate-thing): Don't try moving to parent
+	when thing is 'sexp-list'.
+	(treesit-major-mode-setup): Set 'forward-sexp-function' to
+	'treesit-forward-sexp-list' when the 'sexp-list' thing is defined.
+
+2024-12-19  Stefan Kangas  <stefankangas@gmail.com>
+
+	Increase goto-address-fontify-maximum-size
+
+	The new value is ~4 times larger, and should be more than fine on any
+	reasonably modern machine.  Alternatively, the default could be set to
+	t, as requested here:
+	https://lists.gnu.org/r/bug-gnu-emacs/2003-05/msg00114.html
+
+	* lisp/net/goto-addr.el (goto-address-fontify-maximum-size): Increase
+	default value from 30000 to 128 KiB.
+
+2024-12-19  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in goto-addr.el
+
+	* lisp/net/goto-addr.el (goto-address-highlight-keymap): Convert to
+	defvar-keymap.
+
+2024-12-19  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in filecache.el
+
+	* lisp/filecache.el (file-cache-completions-keymap): Convert to
+	defvar-keymap.
+
+2024-12-19  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete support for the Conkeror web browser
+
+	The last release of Conkeror was in 2017.  The project has been actively
+	recommending people not to use it since 2019 due to security concerns,
+	and it was removed from Debian in the same year.  Emacs's browse-url
+	support for Conkeror has been obsolete since in Emacs 28.1.
+
+	* lisp/net/browse-url.el (browse-url-conkeror-new-window-is-buffer):
+	(browse-url-conkeror-program, browse-url-conkeror-arguments): Delete
+	variables.
+	(browse-url-conkeror): Delete function.
+
+2024-12-18  Andrea Corallo  <acorallo@gnu.org>
+
+	* Make again `comp--finalize-container' compilable
+
+	* lisp/emacs-lisp/comp.el (comp--finalize-container): Don't emit
+	'--lambda-fixup' immediate in data relocations.
+
+2024-12-18  Andrea Corallo  <acorallo@gnu.org>
+
+	Use '--lambda-fixup' as native compiler fixup symbol for lambdas
+
+	* src/comp.c (check_comp_unit_relocs, syms_of_comp): Rename
+	'Qlambda_fixup' to 'Q__lambda_fixup'.
+	* src/pdumper.c (dump_do_dump_relocation): Likewise.
+
+2024-12-18  Andrea Corallo  <acorallo@gnu.org>
+
+	* Revert "Remove check_comp_unit_relocs"
+
+	This reverts commit 81fc23b5d6a60ca4f3d269ab2c88eb9a850bac4c as the
+	check is still useful but needs to be updated for the new reloc layout.
+
+	* src/comp.c (check_comp_unit_relocs): Re-add.
+	(load_comp_unit): Make use of.
+
+2024-12-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid MinGW compilation warning in lib/
+
+	* nt/mingw-cfg.site (ac_cv_func_malloc_0_nonnull)
+	(gl_cv_malloc_ptrdiff, gl_cv_func_malloc_posix):
+	* nt/gnulib-cfg.mk (OMIT_GNULIB_MODULE_malloc-gnu): Set to avoid
+	compiling lib/malloc.c, which is not needed and causes a
+	compilation warning.
+
+2024-12-18  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix string used in recent obsolete variables spec
+
+	* lisp/font-lock.el (font-lock-comment-face)
+	(font-lock-comment-delimiter-face, font-lock-string-face)
+	(font-lock-doc-face, font-lock-doc-markup-face)
+	(font-lock-keyword-face, font-lock-builtin-face)
+	(font-lock-function-name-face, font-lock-variable-name-face)
+	(font-lock-type-face, font-lock-constant-face)
+	(font-lock-warning-face, font-lock-negation-char-face)
+	(font-lock-preprocessor-face): Don't quote the apostrophe in the
+	CURRENT-NAME argument of `make-obsolete-variable', it isn't
+	expanded by `substitute-command-keys'.
+
+2024-12-18  Stefan Kangas  <stefankangas@gmail.com>
+
+	New user option browse-url-transform-alist
+
+	* lisp/net/browse-url.el (browse-url-transform-alist): New user option.
+	(browse-url): Transform URL before loading if above new option is set.
+
+2024-12-18  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make font-lock face variables obsolete
+
+	Using these variables as "another mechanism for changing face
+	appearance" never really worked, since mode authors were free to use the
+	face instead of the variable (i.e. quoting the symbol).  This means that
+	when users customized the variables, it would change its appearance only
+	in some cases, which is a rather surprising interface.
+
+	Indeed, it turns out that some modes have not always been consistent,
+	and mixed using the variable and the face, increasing the confusion even
+	further.  Thus, the only thing users could rely on to always work was to
+	leave the variables at their default value, and to customize the face.
+
+	We now recommend customizing the face, and are obsoleting these
+	variables.  This will lead to some minor code-churn, but it is believed
+	that it will be ultimately worth it.  To fix existing Lisp code, you
+	should typically only need to quote the symbol, as this commit shows.
+
+	It might be the case that we will have to keep the obsolete variables,
+	that have been with us since Emacs 19, around for a longer time-period
+	than normal, to allow package authors to adapt.
+
+	* lisp/font-lock.el (font-lock-comment-face)
+	(font-lock-comment-delimiter-face, font-lock-string-face)
+	(font-lock-doc-face, font-lock-doc-markup-face, font-lock-keyword-face)
+	(font-lock-builtin-face, font-lock-function-name-face)
+	(font-lock-variable-name-face, font-lock-type-face)
+	(font-lock-constant-face, font-lock-warning-face)
+	(font-lock-negation-char-face, font-lock-preprocessor-face): Make face
+	variables obsolete in favor of customizing the faces directly
+	instead.  (Bug#71469)
+
+	* doc/lispref/modes.texi (Faces for Font Lock): Don't document above
+	obsolete variables.
+
+	* lisp/cedet/data-debug.el (data-debug-insert-hash-table)
+	(data-debug-insert-widget-properties, data-debug-insert-string)
+	(data-debug-insert-number):
+	* lisp/emacs-lisp/lisp-mode.el (elisp--font-lock-backslash)
+	(lisp-font-lock-syntactic-face-function):
+	* lisp/emacs-lisp/package.el (describe-package-1):
+	* lisp/generic-x.el (rc-generic-mode, rul-generic-mode):
+	* lisp/org/org-table.el (org-table-edit-formulas):
+	* lisp/progmodes/cc-fonts.el (c-font-lock-invalid-single-quotes)
+	(c-maybe-font-lock-wrong-style-comments, c-font-lock-declarators)
+	(c-font-lock-c++-lambda-captures, c-font-lock-c++-modules):
+	* lisp/progmodes/cperl-mode.el (cperl-find-sub-attrs)
+	(cperl-look-at-leading-count, cperl-process-here-doc)
+	(cperl-find-pods-heres):
+	* lisp/progmodes/gdb-mi.el (gdb-init-1, gdb-update, gdb-running)
+	(gdb-starting, gdb-stopped, gdb-internals)
+	(gdb-breakpoints--add-breakpoint-row, gdb-locals-handler-custom)
+	(gdb-registers-handler-custom, gdb-get-source-file):
+	* lisp/progmodes/js.el (js--font-lock-keywords-1)
+	(js--font-lock-keywords-2, js-font-lock-syntactic-face-function):
+	* lisp/progmodes/lua-ts-mode.el (lua-ts--comment-font-lock):
+	* lisp/progmodes/meta-mode.el (meta-indent-in-string-p):
+	* lisp/progmodes/prolog.el (prolog-font-lock-keywords):
+	* lisp/progmodes/python.el (python-font-lock-syntactic-face-function):
+	* lisp/progmodes/ruby-ts-mode.el (ruby-ts--comment-font-lock):
+	* lisp/progmodes/sh-script.el (sh-font-lock-syntactic-face-function):
+	* lisp/textmodes/tex-mode.el (doctex-font-lock-syntactic-face-function):
+	* test/lisp/faces-tests.el (faces--test-color-at-point):
+	* test/lisp/progmodes/cperl-mode-tests.el (cperl-test-extra-delimiters)
+	(cperl-test-bug-47112, cperl-test-bug-65834, cperl-test-bug-66145)
+	(cperl-test-bug-66161, cperl-test-bug-69604):
+	* test/lisp/progmodes/python-tests.el
+	(python-ts-mode-compound-keywords-face)
+	(python-ts-mode-named-assignment-face-1)
+	(python-ts-mode-assignment-face-2, python-ts-mode-nested-types-face-1)
+	(python-ts-mode-union-types-face-1, python-ts-mode-union-types-face-2)
+	(python-ts-mode-types-face-1, python-ts-mode-types-face-2)
+	(python-ts-mode-types-face-3, python-ts-mode-isinstance-type-face-1)
+	(python-ts-mode-isinstance-type-face-2)
+	(python-ts-mode-isinstance-type-face-3)
+	(python-ts-mode-superclass-type-face, python-ts-mode-class-patterns-face)
+	(python-ts-mode-dotted-decorator-face-1)
+	(python-ts-mode-dotted-decorator-face-2)
+	(python-ts-mode-builtin-call-face)
+	(python-ts-mode-interpolation-nested-string)
+	(python-ts-mode-level-fontification-wo-interpolation)
+	(python-ts-mode-disabled-string-interpolation)
+	(python-ts-mode-interpolation-doc-string):
+	* test/lisp/progmodes/ruby-mode-tests.el
+	(ruby-heredoc-font-lock, ruby-heredoc-highlights-interpolations)
+	(ruby-exit!-font-lock, ruby-regexp-interpolation-is-highlighted)
+	(ruby-recognize-symbols-starting-with-at-character)
+	(ruby-hash-character-not-interpolation)
+	(ruby-interpolation-suppresses-quotes-inside)
+	(ruby-interpolation-suppresses-one-double-quote)
+	(ruby-interpolation-inside-percent-literal)
+	(ruby-interpolation-inside-percent-literal-with-paren)
+	(ruby-interpolation-inside-another-interpolation)
+	(ruby-interpolation-inside-double-quoted-percent-literals)
+	(ruby-no-interpolation-in-single-quoted-literals):
+	Don't use above obsolete variables.
+	* lisp/progmodes/cc-fonts.el (font-lock-constant-face): Don't
+	declare now-unused variable.
+
+2024-12-18  Po Lu  <luangruo@yahoo.com>
+
+	Fix the DJGPP build
+
+	* msdos/sedlibmk.inp (LIB_SELINUX, USE_SELINUX_SELINUX_H):
+	Define to 0.
+
+	* src/conf_post.h (_GL_DIT_NOTDIR, ENOTSUP) [MSDOS]: Define to
+	appropriate values.
+
+2024-12-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+	* admin/merge-gnulib (AVOIDED_MODULES): Avoid gnulib-i18n.
+	* lib/stdlib.c, m4/selinux-selinux-h.m4:
+	New files, taken from Gnulib.
+
+2024-12-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/mail/sendmail.el (mail-citation-prefix-regexp): Fix bug#24081
+
+2024-12-17  Vincenzo Pupillo  <vincenzo.pupillo@unimi.it>
+
+	Fix treesit-font-lock-level in python-ts-mode
+
+	Now that 'treesit-font-lock-level' can be a number or a list, it
+	should be handled using 'treesit--compute-font-lock-level'.
+
+	* lisp/progmodes/python.el (python--treesit-fontify-string):
+	Apply 'treesit--compute-font-lock-level' to
+	'treesit-font-lock-level'.
+
+2024-12-17  Juri Linkov  <juri@linkov.net>
+
+	Rename the property 'repeat-continue-only' to 'repeat-continue'
+
+	* doc/lispref/keymaps.texi (Creating Keymaps):
+	* lisp/keymap.el (defvar-keymap):
+	* lisp/repeat.el (repeat-get-map, describe-repeat-maps):
+	* test/lisp/repeat-tests.el (repeat-tests-another-repeat-map)
+	(repeat-tests-repeat-map): Replace 'repeat-continue-only'
+	with 'repeat-continue' (bug#74140).
+
+2024-12-17  Juri Linkov  <juri@linkov.net>
+
+	Display commands with repeat-continue-only in describe-repeat-maps
+
+	* lisp/repeat.el (describe-repeat-maps): Display commands with the
+	property 'repeat-continue-only' used to continue the currently
+	active repeat-map (bug#74140).  Also use 'cl--map-keymap-recursively'
+	instead of 'map-keymap' to find more deep keybindings.
+
+2024-12-17  Juri Linkov  <juri@linkov.net>
+
+	Improve support of property repeat-continue-only in repeat-mode (bug#74140)
+
+	* lisp/repeat.el (repeat-get-map): Add optional arg 'rep-map'.
+	Move the check for 'repeat-continue-only' from 'repeat-pre-hook'.
+	Improve its logic to check if the current map 'repeat-in-progress'
+	exists in the list from the 'repeat-continue-only' property.
+	(repeat-post-hook): Set 'repeat-in-progress' to the symbol
+	from the property 'repeat-map'.
+
+	* test/lisp/repeat-tests.el (repeat-tests-another-repeat-map):
+	Add new keymap to test multiple parallel repeat-maps.
+	(repeat-tests-continue-another): New test that uses commands
+	from 'repeat-tests-another-repeat-map' shared with
+	'repeat-tests-repeat-map'.
+
+2024-12-17  Gerd Möllmann  <gerd@gnu.org>
+
+	Remove check_comp_unit_relocs
+
+	* src/comp.c (check_comp_unit_relocs): Removed.
+	(load_comp_unit): Remove use.
+
+2024-12-17  Juri Linkov  <juri@linkov.net>
+
+	* lisp/minibuffer.el: Mention `eager-display' in more docstrings.
+
+	(completion-category-defaults, completion-category-overrides):
+	Add `eager-display' to the docstring.
+
+2024-12-17  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't use obsolete lisp-complete-symbol in ses.el
+
+	* lisp/ses.el (ses-mode-edit-map): Replace obsolete function
+	lisp-complete-symbol with completion-at-point.
+
+2024-12-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	unintern: Drop support for obsolete calling convention
+
+	* lisp/subr.el (unintern):
+	* src/lread.c (Funintern): Drop support for old calling convention,
+	obsolete since 23.3.
+	* test/lisp/progmodes/elisp-mode-tests.el
+	(elisp-shorthand-escape): Don't use obsolete calling convention.
+
+2024-12-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	all-completions: Drop support for obsolete calling convention
+
+	* src/minibuf.c (Fall_completions):
+	* lisp/subr.el (all-completions): Drop support for old calling
+	convention, obsolete since 23.1.
+	* src/minibuf.c (Finternal_complete_buffer): Update caller.
+
+2024-12-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	* lisp/dired.el (dired-summary): Use substitute-command-keys.
+
+2024-12-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	Ignore some more Python tooling directories when grepping
+
+	* lisp/progmodes/python.el (python-base-mode): Add Pytest and Rope
+	cache directories to 'grep-find-ignored-directories'.
+
+2024-12-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make VC exclude Repo directories
+
+	* lisp/vc/vc-hooks.el (vc-directory-exclusion-list): Also ignore
+	".repo" directory created by Repo.
+	Ref: https://android.googlesource.com/tools/repo
+
+2024-12-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve heuristic for Python walrus operator
+
+	* lisp/progmodes/python.el (python-base-mode): Improve heuristic for
+	Python walrus operator in 'electric-layout-mode'.
+
+2024-12-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use substitute-command-keys in map-y-or-n-p
+
+	* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Use
+	substitute-command-keys.
+
+2024-12-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	Bind inhibit-read-only to t in substitute-command-keys
+
+	* lisp/help.el (substitute-command-keys): Bind inhibit-read-only to t,
+	to allow modifying strings that are intended for the minibuffer, and
+	therefore already use minibuffer-prompt-properties.
+
+2024-12-16  Daniel Mendler  <mail@daniel-mendler.de>
+
+	Use `completion-table-with-metadata' (bug#74865)
+
+	Prefer `completion-table-with-metadata' over explicit completion
+	table lambdas for clarity.  Furthermore prefer it over
+	`completion-extra-properties' to avoid problems with recursive
+	minibuffers and recursive completion sessions, since the
+	completion metadata applies only to the outer completion session.
+
+	* lisp/bookmark.el (bookmark-completing-read):
+	* lisp/faces.el (read-face-name):
+	* lisp/international/emoji.el (emoji--read-emoji):
+	* lisp/net/dictionary.el (dictionary-completing-read-dictionary):
+	* lisp/net/rcirc.el (rcirc-completion-at-point):
+	* lisp/net/eww.el (eww-read-alternate-url):
+	* lisp/simple.el (read-from-kill-ring): Use it.
+	* lisp/calendar/calendar.el (calendar-read-date): Use
+	`completion-table-with-metadata' and `completion-table-case-fold'.
+	* lisp/proced.el (proced--read-signal): New function.
+	(proced-send-signal): Use it.
+
+2024-12-16  Juri Linkov  <juri@linkov.net>
+
+	* lisp/comint.el (comint-complete-input-ring): New command (bug#74694).
+
+	(comint-mode-map): Bind 'comint-complete-input-ring' to 'C-x <up>'.
+
+2024-12-16  Ship Mints  <shipmints@gmail.com>
+
+	Support pixelwise frame cloning (Bug#74750)
+
+	* lisp/frame.el (clone-frame): Honor 'frame-resize-pixelwise'
+	when cloning a frame's geometry via the 'text-pixels' feature of
+	'make-frame' (Bug#74750).  Correctly specify source frame in
+	'display-graphic-p' test for tty selection behavior.
+
+2024-12-16  john muhl  <jm@pub.pink>
+
+	Add Qutebrowser to list of choices in customize
+
+	* lisp/net/browse-url.el (browse-url--browser-defcustom-type):
+	Include 'browse-url-qutebrowser' so that it appears in the Choice
+	menus of 'browse-url-browser-function' and
+	'browse-url-secondary-browser-function'.  (Bug#74904)
+
+2024-12-16  Martin Rudalics  <rudalics@gmx.at>
+
+	Don't inhibit resizing when making a new frame (Bug#74750)
+
+	* src/frame.h (struct frame): Remove inhibit_horizontal_resize
+	and inhibit_vertical_resize slots.
+	* src/frame.c (frame_inhibit_resize, make_frame)
+	(Fframe_after_make_frame, gui_figure_window_size): Remove all
+	operations on frame's inhibit_horizontal_resize and
+	inhibit_vertical_resize slots (Bug#74750).
+
+2024-12-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	Invert preprocessor condition to fix 'C-x 4 a'
+
+	Typing 'C-x 4 a' in the main function now correctly adds 'main' to the
+	generated ChangeLog, whereas before it added 'andreid_emacs_init'.
+	Inverting the preprocessor condition seems like an easier fix than
+	changing the add-change-log-entry-other-window heuristic.
+
+	* src/emacs.c (main): Invert preprocessor condition to appease the
+	'add-change-log-entry-other-window' heuristic.
+
+2024-12-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in info.el
+
+	* lisp/info.el (Info-mode-line-node-keymap, Info-link-keymap):
+	Convert to defvar-keymap.
+
+2024-12-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Move pure+side-effect-free declarations to byte-opt.el
+
+	* src/json.c (syms_of_json): Move pure and side-effect-free declarations
+	for json-serialize and json-parse-string from here...
+	* lisp/emacs-lisp/byte-opt.el (side-effect-free-fns, pure-fns):
+	...to here.
+
+2024-12-15  Daniel Mendler  <mail@daniel-mendler.de>
+
+	completion-eager-display: Use buffer content instead of INITIAL-INPUT
+
+	* lisp/minibuffer.el (completing-read-default): Use the
+	minibuffer content instead of handling INITIAL-INPUT directly.
+
+2024-12-15  Vitaliy Chepelev  <vitalij@gmx.com>  (tiny change)
+
+	image-dired: Don't croak on file names with regexp characters
+
+	* lisp/image/image-dired-dired.el (image-dired-mark-tagged-files):
+	* lisp/image/image-dired-tags.el (image-dired-get-comment)
+	(image-dired-write-comments, image-dired-list-tags)
+	(image-dired-remove-tag, image-dired-write-tags): Quote file name
+	for search-forward-regexp.  (Bug#73445)
+
+2024-12-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't define SYSTEM_PURESIZE_EXTRA
+
+	* nt/inc/ms-w32.h: Don't define SYSTEM_PURESIZE_EXTRA.
+
+2024-12-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove some more references to pure space
+
+	* lisp/auth-source.el (read-passwd-map):
+	* lisp/emacs-lisp/eldoc.el (eldoc-message-commands)
+	(eldoc-last-data): Remove some references to pure space.
+
+2024-12-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve purify-flag docstring
+
+	* src/alloc.c (syms_of_alloc): Improve purify-flag docstring.
+
+2024-12-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't document removed SITELOAD_PURESIZE_EXTRA
+
+	* doc/lispref/internals.texi (Building Emacs): Don't document removed
+	constant SITELOAD_PURESIZE_EXTRA.
+
+2024-12-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove another purecopy call in files.el
+
+	* lisp/files.el (save-some-buffers-action-alist): Don't call purecopy.
+
+2024-12-15  kobarity  <kobarity@gmail.com>
+
+	Fix hangs caused by unbalanced braces in Python f-strings
+
+	* lisp/progmodes/python.el (python--font-lock-f-strings):
+	Temporarily bind forward-sexp-function to nil when calling
+	'up-list'.  (Bug#74738)
+
+2024-12-14  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	time-stamp: fix search end, more compatibility suggestions
+
+	* lisp/time-stamp.el (time-stamp): Use a marker for the
+	search end limit so we don't insert past it.
+	(time-stamp-conv-warn): Include a second suggested conversion
+	that might be what was intended.
+	Include a link to variable 'time-stamp-format'.
+	* test/lisp/time-stamp-tests.el: more tests
+
+2024-12-14  Pip Cet  <pipcet@protonmail.com>
+
+	Fix a typo which caused test failures
+
+	* lisp/progmodes/python.el (interpreter-mode-alist):
+	* lisp/progmodes/vera-mode.el (interpreter-mode-alist): Fix typo.
+
+2024-12-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	6942599dbb2 ; * etc/PROBLEMS: Document problem with menu-bar backgrou...
+	488801baf7d * lisp/time-stamp.el: Limit field width to two digits.
+	34bedcd58d7 ; * lisp/progmodes/executable.el: Remove stale comment (b...
+	327d3e56f6e ; * etc/TODO: Add an item for improving defgroups.
+	7ae9ccae0ca ; * lisp/net/rcirc.el (rcirc-next-active-buffer): Doc fix...
+	3e51be94ae6 ; Fix :version tag in browse-url
+	dffd4a50c64 Revert "Attempt to install package first when upgrading"
+	fbcb357b9db Fix 'gnus-select-method' custom type
+	6fd5e02cb9b Fix typo in maps.texi
+	872a7336dc0 ; * etc/DEBUG: Mention "handle SIGINT" on MS-Windows.
+	b4bcbabf95c * doc/misc/tramp.texi (FUSE-based methods): Fix sshfs ref...
+	f8da72b41cd Improve gnus.texi indexing
+	4a090bd7eab ; * lisp/net/eww.el (eww-browse-with-external-browser): F...
+	59fa0b1dd6e ; Improve doc strings in compile.el
+	3d8e49c41a6 Attempt to install package first when upgrading
+
+	# Conflicts:
+	#	lisp/net/browse-url.el
+	#	lisp/net/eww.el
+
+2024-12-14  Richard Lawrence  <rwl@recursewithless.net>
+
+	Check for presuppositions in `calendar-date-is-valid-p'
+
+	Do not signal an error in `calendar-date-is-valid-p' if passed a
+	value which is not a three-element list of integers.  Signaling
+	an error makes the function unusable as a predicate for valid
+	date values. (Bug#74848)
+	* lisp/calendar/calendar.el (calendar-date-is-valid-p): Add the
+	check that input is a 3-element list.
+	* test/lisp/calendar/calendar-tests.el: New file with tests.
+
+2024-12-14  Daniel Mendler  <mail@daniel-mendler.de>
+
+	New customization variable `completion-eager-display'
+
+	The customization option can be set to t or nil, to respectively
+	always or never show the *Completions* buffer eagerly at the
+	beginning of a completion session.  Furthermore the option can
+	be set to the value auto.  In this case the *Completions* buffer
+	will only be shown if requested by the completion table.
+	Completion tables can use the `eager-display' completion
+	metadata to do so.  (Bug#74616, Bug#74617)
+
+	* lisp/minibuffer.el (completion-eager-display): New
+	customization variable.
+	(completion-metadata): Update docstring, document the
+	new `eager-display' completion metadata.
+	(completion-extra-properties): Update docstring, document the
+	new `:eager-display' completion metadata.
+	(completion-category-overrides): Add `eager-display' to the
+	custom type specification.
+	(completing-read-default): Handle the `completion-eager-display'
+	customization variable and the `eager-display' completion
+	metadata.
+	(completion-table-with-metadata): New function to create
+	a completion table with metadata.
+	(minibuffer-complete-defaults, minibuffer-complete-history):
+	Use it.
+	* lisp/ffap.el (ffap-menu-ask): Add `ffap-menu' completion
+	category and `eager-display' completion metadata.  Use
+	`completion-table-with-metadata'.
+	* lisp/imenu.el (imenu-eager-completion-buffer): Correct
+	docstring, which had been inverted.
+	(imenu--completion-buffer): Add `eager-display' completion
+	metadata.  Use `completion-table-with-metadata'.
+	* lisp/tmm.el (tmm-prompt): Add `tmm' completion category and
+	`eager-display' completion metadata.  Use
+	`completion-table-with-metadata'.  Add keymap setup.
+	(tmm-add-prompt): Remove keymap setup.
+	(tmm-goto-completions): Call `tmm-add-prompt' to ensure that a
+	*Completions* buffer is shown.
+	(tmm--completion-table): Remove unused internal function.
+	* etc/NEWS: Announce the change.
+
+2024-12-14  Lin Sun  <sunlin7@hotmail.com>
+
+	Restore 'imenu-create-index-function' on exiting semantic
+
+	* lisp/cedet/semantic.el: Restore the
+	'imenu-create-index-function' on exiting.
+	* lisp/cedet/semantic/bovine/make.el:
+	* lisp/cedet/semantic/bovine/scm.el:
+	* lisp/cedet/semantic/html.el:
+	* lisp/cedet/semantic/texi.el:
+	* lisp/cedet/semantic/wisent/java-tags.el:
+	* lisp/cedet/semantic/wisent/javascript.el:
+	* lisp/cedet/semantic/wisent/python.el:
+	* lisp/cedet/srecode/template.el:
+	Store the original 'imenu-create-index-function' before
+	changing it.  (Bug#74803)
+
+2024-12-14  Daniel Mendler  <mail@daniel-mendler.de>
+
+	Add `browse-url-qutebrowser'
+
+	The browser launcher supports the NEW-WINDOW argument and
+	`browse-url-qutebrowser-new-window-is-tab' to open tabs.
+	Furthermore opening new URLs is sped up via Unix socket IPC if
+	available.
+	* lisp/net/browse-url.el (browse-url-qutebrowser-send): Function
+	to send command to Qutebrowser via IPC.
+	(browse-url-qutebrowser): New browser launcher.  Use
+	`browse-url-qutebrowser-send'.
+	(browse-url-qutebrowser-program, browse-url-qutebrowser-arguments)
+	(browse-url-qutebrowser-new-window-is-tab): New customizables.
+	(browse-url-mozilla-new-window-is-tab)
+	(browse-url-firefox-new-window-is-tab)
+	(browse-url-epiphany-new-window-is-tab): Improve docstrings.
+
+	* etc/NEWS: Announce the change.
+	(Bug#74781)
+
+2024-12-14  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix xt-mouse-tests.el in interactive mode
+
+	* test/lisp/xt-mouse-tests.el (with-xterm-mouse-mode): Run only
+	when noninteractive.
+
+2024-12-14  Jared Finder  <jared@finder.org>
+
+	Fix for xt-mouse-tests.el broken in prior commit
+
+	xt-mouse-tests not turning on xterm-mouse-mode if it was already
+	on did not work with xterm-mouse-mode being set to t by default.
+	It turns out that xt-mouse-tests already does not report proper
+	results when called inside a running Emacs session so the code
+	path is not useful anyways.
+
+	* test/lisp/xt-mouse-tests.el (with-xterm-mouse-mode): Always
+	turn on xterm-mouse-mode, even if it is already on.
+
+2024-12-14  Gerd Möllmann  <gerd@gnu.org>
+
+	Improve menu separator display on ttys slightly (bug#74854)
+
+	* src/xdisp.c (display_tty_menu_separator): New function displaying
+	separators with '-', '=', or ' '.
+	(display_tty_menu_item): Use it.
+
+2024-12-13  kobarity  <kobarity@gmail.com>
+
+	Fix font-lock of Python f-strings
+
+	* lisp/progmodes/python.el (python--font-lock-f-strings): Bind
+	'parse-sexp-ignore-comments' to nil so that we can look for
+	closing braces even if a hash is used in the format specifier.
+	* test/lisp/progmodes/python-tests.el
+	(python-font-lock-f-string-1): New test.  (Bug#74738)
+
+2024-12-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/help-fns.el (help-fns-short-filename): Skip relative file names
+
+2024-12-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/org/ox-texinfo.el (org-texinfo-template): Fix direntry format
+
+	Apparently I was confused and `* FILE.  DESCRIPTION` is not
+	a valid format, so always use the longer form.
+
+2024-12-13  Eli Zaretskii  <eliz@gnu.org>
+
+	* nt/inc/netinet/tcp.h: New (empty) file.
+
+2024-12-13  Eric Marsden  <eric.marsden@risk-engineering.org>
+
+	Add support for TCP_NODELAY on network streams
+
+	* src/process.c (socket_options): add entry for TCP_NODELAY.
+	* lisp/emacs-lisp/bytecomp.el: add :nodelay to valid keywords
+	  for make-network-process compiler-macro.
+	* doc/lispref/processes.texi: document :nodelay keyword argument
+	  to set-network-process-option and make-network-process.
+
+	(Bug#74793)
+
+2024-12-13  Yuan Fu  <casouri@gmail.com>
+
+	Apply string syntax only to string in jsx (bug#73978)
+
+	The current code applies string syntax to too many things.  This
+	patch makes tsx-ts-mode (and friends) only apply string syntax
+	to actual text in tsx/jsx.
+
+	* lisp/progmodes/typescript-ts-mode.el:
+	(tsx-ts--s-p-query): Only capture jsx_text.
+	(tsx-ts--syntax-propertize-captures): handle the case when the
+	text is one character long.
+
+2024-12-13  Yuan Fu  <casouri@gmail.com>
+
+	Declare tree-sitter functions with a new macro
+
+	* lisp/progmodes/c-ts-mode.el:
+	* lisp/progmodes/cmake-ts-mode.el:
+	* lisp/progmodes/csharp-mode.el:
+	* lisp/progmodes/dockerfile-ts-mode.el:
+	* lisp/progmodes/elixir-ts-mode.el:
+	* lisp/progmodes/go-ts-mode.el:
+	* lisp/progmodes/heex-ts-mode.el:
+	* lisp/progmodes/java-ts-mode.el:
+	* lisp/progmodes/json-ts-mode.el:
+	* lisp/progmodes/lua-ts-mode.el:
+	* lisp/progmodes/php-ts-mode.el:
+	* lisp/progmodes/ruby-ts-mode.el:
+	* lisp/progmodes/rust-ts-mode.el:
+	* lisp/progmodes/js.el:
+	* lisp/progmodes/python.el:
+	* lisp/progmodes/sh-script.el:
+	* lisp/progmodes/c-ts-common.el:
+	* lisp/progmodes/prog-mode.el:
+	* lisp/progmodes/typescript-ts-mode.el: Use new macro.
+	* lisp/treesit.el (treesit-declare-unavailable-functions): New
+	macro.
+
+2024-12-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in perl-mode.el
+
+	* lisp/progmodes/perl-mode.el (perl-mode-map): Convert to
+	defvar-keymap.
+
+2024-12-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in f90.el
+
+	* lisp/progmodes/f90.el (f90-mode-map): Convert to defvar-keymap.
+	(f90-menu): Move definition to top level.
+
+2024-12-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in dired.el
+
+	* lisp/dired.el (dired-mouse-drag-files-map)
+	(dired-click-to-select-map): Convert to defvar-keymap.
+
+2024-12-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't use obsolete mode delhpi-mode
+
+	* lisp/files.el (auto-mode-alist): Prefer opascal-mode to obsolete
+	delphi-mode.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't use obsolete filter-buffer-substring-functions in Org
+
+	This patch was also installed in Org mode, here:
+	https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=b9637ef142
+
+	* lisp/org/org-agenda.el (org-agenda-mode):
+	* lisp/org/org-indent.el (org-indent-mode): Don't use obsolete
+	filter-buffer-substring-functions.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Mark pure-bytes-used as obsolete
+
+	* lisp/subr.el (pure-bytes-used): Mark variable as obsolete.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete variable pure-space-overflow
+
+	* lisp/startup.el (pure-space-overflow): Make variable obsolete.
+	* lisp/loadup.el (pure-space-overflow): Do not set.  Remove call to
+	`garbage-collect', as that is done by `dump-emacs-portable'.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make 'purecopy' an obsolete function alias for 'identity'
+
+	* lisp/subr.el (purecopy): New obsolete function alias for 'identity'.
+	* src/alloc.c (purecopy): Remove function.
+	(Fpurecopy): Remove DEFUN.
+	(syms_of_alloc): Remove defsubr for above DEFUN.
+	* lisp/loadup.el (purify-flag): Don't set to hash table.
+
+	* doc/lispref/spellfile:
+	* doc/lispref/keymaps.texi (Tool Bar):
+	* lisp/emacs-lisp/byte-opt.el (side-effect-free-fns): Delete
+	references to 'purecopy'
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete obsolete comment about using purespace
+
+	* src/alloc.c (Fmake_byte_code): Delete obsolete comment.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete workaround for purespace in cl-generic
+
+	* lisp/emacs-lisp/cl-generic.el (cl-generic-define-method): Delete
+	purespace workaround.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove unused function my_heap_start
+
+	* src/alloc.c (my_heap_start) [DOUG_LEA_MALLOC && GNU_LINUX]:
+	Remove unused function.  Update callers.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove check for working malloc_set_state
+
+	This check was added to 'malloc_initialize_hook' in order to "insulate
+	Emacs better from configuration screwups" (commit b4788b9394f3).  With
+	unexec gone, we no longer use 'malloc_set_state', and thus don't need
+	this check.
+
+	Note that this patch removes the last uses of the deprecated glibc
+	functions 'malloc_set_state' and 'malloc_get_state' from our code.
+
+	* src/alloc.c (malloc_initialize_hook) [DOUG_LEA_MALLOC]:
+	Remove check for working 'malloc_set_state'.
+	(alloc_unexec_pre) [DOUG_LEA_MALLOC]: Delete unused function.
+	(alloc_unexec_post) [DOUG_LEA_MALLOC]: Delete function.
+	(malloc_state_ptr) [DOUG_LEA_MALLOC]: Delete variable.
+	* configure.ac (emacs_cv_var_doug_lea_malloc): Don't check for
+	malloc_set_state and malloc_get_state.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove purespace fix from cl-preloaded.el
+
+	* lisp/emacs-lisp/cl-preloaded.el (cl-struct-define): Remove fix for
+	purespace.  This effectively reverts Stefan Monnier's commit
+	e785c74d3a88.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete remaining calls to purecopy
+
+	* lisp/button.el (default-button):
+	* lisp/calendar/holidays.el (holiday-solar-holidays)
+	(holiday-bahai-holidays, holiday-islamic-holidays)
+	(holiday-christian-holidays, holiday-hebrew-holidays)
+	(holiday-oriental-holidays, holiday-general-holidays):
+	* lisp/comint.el (comint-file-name-prefix):
+	* lisp/composite.el (unicode-category-table):
+	* lisp/cus-face.el (custom-declare-face):
+	* lisp/custom.el (custom-add-load, custom-add-package-version)
+	(custom-add-version, custom-add-link, custom-declare-group)
+	(custom-declare-variable):
+	* lisp/dired.el (dired-listing-switches):
+	* lisp/epa-hook.el (epa-file-name-regexp):
+	* lisp/faces.el (x-font-regexp, x-font-regexp-head)
+	(x-font-regexp-slant, x-font-regexp-weight, )
+	(set-face-attribute, set-face-documentation, face-x-resources)
+	(face-font-registry-alternatives, face-font-family-alternatives)
+	(term-file-prefix):
+	* lisp/find-file.el (ff-special-constructs):
+	* lisp/format.el (format-alist):
+	* lisp/help.el (help-for-help):
+	* lisp/image-file.el (image-file-name-extensions):
+	* lisp/info.el:
+	* lisp/isearch.el (isearch-help-for-help-internal)
+	(search-whitespace-regexp):
+	* lisp/jka-cmpr-hook.el (jka-compr-load-suffixes)
+	(jka-compr-mode-alist-additions)
+	(jka-compr-compression-info-list, jka-compr-build-file-regexp):
+	* lisp/language/ethiopic.el (font-ccl-encoder-alist):
+	* lisp/language/korea-util.el (default-korean-keyboard):
+	* lisp/language/tibetan.el (tibetan-precomposition-rule-regexp)
+	(tibetan-precomposed-regexp):
+	* lisp/locate.el (locate-ls-subdir-switches):
+	* lisp/lpr.el (lpr-command):
+	* lisp/mail/rmail.el (rmail-secondary-file-regexp)
+	(rmail-secondary-file-directory, rmail-highlighted-headers)
+	(rmail-ignored-headers, rmail-spool-directory, rmail-file-name):
+	* lisp/mail/sendmail.el (mail-default-directory)
+	(mail-signature-file, mail-citation-prefix-regexp)
+	(mail-personal-alias-file, mail-header-separator):
+	* lisp/menu-bar.el (yank-menu):
+	* lisp/net/eudc.el (eudc-tools-menu):
+	* lisp/newcomment.el (comment-padding, comment-end):
+	* lisp/obsolete/autoload.el (autoload-generate-file-autoloads):
+	* lisp/progmodes/hideshow.el (hs-special-modes-alist):
+	* lisp/ps-print.el (ps-page-dimensions-database):
+	* lisp/rfn-eshadow.el (file-name-shadow-tty-properties):
+	* lisp/shell.el (shell-dumb-shell-regexp):
+	* lisp/simple.el (overwrite-mode-binary, overwrite-mode-textual)
+	(mark-inactive, shell-command-switch)
+	(next-error-overlay-arrow-position):
+	* lisp/subr.el (package--builtin-versions, eval-after-load):
+	* lisp/tab-bar.el ([tab-bar]):
+	* lisp/term/pgtk-win.el (x-gtk-stock-map):
+	* lisp/term/x-win.el (x-gtk-stock-map):
+	* lisp/tool-bar.el ([tool-bar]):
+	* lisp/widget.el (define-widget): Remove calls to purecopy.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't call purecopy in mouse.el
+
+	* lisp/mouse.el (context-menu-entry, mouse-buffer-menu-mode-groups)
+	(x-fixed-font-alist): Remove calls to purecopy.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't call purecopy in emacs-lisp/*.el
+
+	* lisp/emacs-lisp/byte-run.el (define-obsolete-face-alias)
+	(make-obsolete-variable, make-obsolete):
+	* lisp/emacs-lisp/cl-extra.el (cl-type-definition):
+	* lisp/emacs-lisp/cl-preloaded.el (cl-assertion-failed):
+	* lisp/emacs-lisp/cl-print.el (help-byte-code):
+	* lisp/emacs-lisp/derived.el (define-derived-mode):
+	* lisp/emacs-lisp/easy-mmode.el (define-minor-mode):
+	* lisp/emacs-lisp/eldoc.el (eldoc-minor-mode-string):
+	* lisp/emacs-lisp/gv.el (make-obsolete-generalized-variable):
+	* lisp/emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression):
+	* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--parse-file):
+	* lisp/emacs-lisp/warnings.el (warning-type-format):
+	Remove calls to purecopy.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't call purecopy in dnd.el
+
+	* lisp/dnd.el (dnd-protocol-alist):
+	* lisp/pgtk-dnd.el (pgtk-dnd-types-alist, pgtk-dnd-known-types):
+	* lisp/x-dnd.el (x-dnd-types-alist, x-dnd-known-types):
+	Remove calls to purecopy.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't call purecopy in vc/*.el
+
+	* lisp/vc/diff.el (diff-command, diff-switches):
+	* lisp/vc/ediff-hook.el (menu-bar-ediff-misc-menu)
+	(menu-bar-epatch-menu, menu-bar-ediff-merge-menu)
+	(menu-bar-ediff-menu):
+	* lisp/vc/pcvs-defs.el (cvs-global-menu):
+	* lisp/vc/vc-hooks.el (vc-menu-entry)
+	(vc-directory-exclusion-list):
+	* lisp/vc/vc-rcs.el (vc-rcs-master-templates):
+	* lisp/vc/vc-sccs.el (vc-sccs-master-templates):
+	* lisp/vc/vc-src.el (vc-src-master-templates): Remove calls to purecopy.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't call purecopy in help-mode.el
+
+	* lisp/help-mode.el (help-function, help-variable, help-type)
+	(help-face, help-coding-system, help-input-method)
+	(help-character-set, help-symbol, help-back, help-forward)
+	(help-info-variable, help-info, help-man)
+	(help-customization-group, help-url, help-customize-variable)
+	(help-customize-face, help-function-def, help-function-cmacro)
+	(help-variable-def, help-face-def, help-package)
+	(help-package-def, help-theme-def, help-theme-edit)
+	(help-dir-local-var-def, help-news, help-back-label)
+	(help-forward-label, help-xref-symbol-regexp)
+	(help-xref-info-regexp, help-xref-man-regexp)
+	(help-xref-customization-group-regexp, help-xref-url-regexp):
+	Remove calls to purecopy.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't call purecopy in textmodes/*.el
+
+	* lisp/textmodes/bibtex.el (bibtex-url, bibtex-search-crossref):
+	* lisp/textmodes/fill.el (adaptive-fill-regexp)
+	(adaptive-fill-first-line-regexp):
+	* lisp/textmodes/ispell.el (ispell-menu-map)
+	(ispell-skip-region-alist, ispell-tex-skip-alists):
+	* lisp/textmodes/rst.el (auto-mode-alist):
+	* lisp/textmodes/texinfo.el (texinfo-open-quote):
+	* lisp/textmodes/tex-mode.el (tex-directory, tex-run-command)
+	(latex-run-command, slitex-run-command, tex-start-options)
+	(tex-start-commands, tex-bibtex-command, tex-dvi-print-command)
+	(tex-alt-dvi-print-command, tex-dvi-view-command)
+	(tex-show-queue-command, tex-open-quote, tex-close-quote):
+	* lisp/textmodes/texinfo.el (texinfo-open-quote)
+	(texinfo-close-quote): Remove calls to purecopy.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't call purecopy in progmodes/*.el
+
+	* lisp/progmodes/compile.el (compile-command):
+	* lisp/progmodes/etags.el (tags-compression-info-list):
+	* lisp/progmodes/grep.el (grep-program, find-program, xargs-program):
+	* lisp/progmodes/js.el (interpreter-mode-alist):
+	* lisp/progmodes/python.el (interpreter-mode-alist):
+	* lisp/progmodes/ruby-mode.el (auto-mode-alist, interpreter-mode-alist):
+	* lisp/progmodes/vera-mode.el: Remove calls to purecopy.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't call purecopy in bindings.el
+
+	* lisp/bindings.el (mode-line-input-method-map)
+	(mode-line-coding-system-map, mode-line-mule-info, mode-line-client)
+	(mode-line-modified, mode-line-remote)
+	(mode-line-window-dedicated-keymap, propertized-buffer-identification)
+	(completion-ignored-extensions): Remove calls to purecopy.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't call purecopy in common-win.el
+
+	* lisp/term/common-win.el: Remove calls to purecopy.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't call purecopy in international/*.el
+
+	* lisp/international/fontset.el (font-encoding-alist,)
+	(x-pixel-size-width-font-regexp, vertical-centering-font-regexp)
+	(face-font-rescale-alist, standard-fontset-spec):
+	* lisp/international/latexenc.el (latex-inputenc-coding-alist):
+	* lisp/international/mule-cmds.el (help-xref-mule-regexp-template)
+	(set-language-info-internal, set-language-info-alist)
+	(register-input-method, locale-language-names)
+	(locale-charset-language-names, locale-preferred-coding-systems)
+	(define-char-code-property):
+	* lisp/international/mule-conf.el (file-coding-system-alist):
+	* lisp/international/mule-diag.el (sort-listed-character-sets):
+	* lisp/international/mule.el (define-charset, load-with-code-conversion)
+	(put-charset-property, define-coding-system)
+	(ctext-non-standard-encodings-alist)
+	(ctext-non-standard-encodings-regexp, auto-coding-alist)
+	(auto-coding-regexp-alist):
+	* lisp/international/quail.el (quail-keyboard-layout-button):
+	(quail-keyboard-customize-button): Remove calls to purecopy.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove purecopy calls from files.el
+
+	* lisp/files.el (null-device, file-name-invalid-regexp)
+	(locate-dominating-stop-dir-regexp, auto-mode-alist)
+	(interpreter-mode-alist, inhibit-local-variables-regexps)
+	(auto-mode-interpreter-regexp, magic-fallback-mode-alist)
+	(save-some-buffers-action-alist, list-directory-brief-switches)
+	(list-directory-verbose-switches, insert-directory-program)
+	(directory-free-space-program, directory-free-space-args)
+	(directory-listing-before-filename-regexp)
+	(file-name-handler-alist): Remove all purecopy calls.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Avoid compiler warning in process_mark_stack
+
+	* src/alloc.c (process_mark_stack): Only declare and assign to 'po' if
+	it's needed.
+	Problem reported by: Stefan Kangas <stefankangas@gmail.com>.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Update pdumper hashes
+
+	* src/pdumper.c (dump_symbol, dump_hash_table): Update hashes.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make bindings--define-key obsolete
+
+	It used to be like 'define-key', but was used for making pure copies of
+	as much of a menu's data as possible.  With purespace now gone, it can
+	be replaced by 'define-key'.
+
+	* lisp/bindings.el (bindings--define-key): Make into obsolete
+	alias for 'define-key'.  Update all callers.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Purecopy removal: Lisp code
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-cond-jump-table): Don't
+	request our hash tables be purecopied.  Adjust comment.
+	* lisp/progmodes/elisp-mode.el (elisp--local-variables-completion-table):
+	Use 'defconst' rather than 'defvar' now the purespace problem is gone
+	* lisp/rfn-eshadow.el (file-name-shadow-properties): Remove obsolete
+	comment.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Unexec removal: Build system
+
+	* configure.ac (CYGWIN_OBJ): Remove comment.
+	* src/Makefile.in (PAXCTL, SETFATTR, PAXCTL_dumped, PAXCTL_notdumped):
+	Remove definitions.
+	(emacs$(EXEEXT), temacs$(EXEEXT), bootstrap-emacs$(EXEEXT)):
+	* src/deps.mk: Remove 'unexec'-specific code.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Unexec removal: Documentation adjustments
+
+	* doc/lispref/internals.texi (Building Emacs):
+	* doc/lispref/os.texi (Command-Line Arguments): Remove documentation for
+	'unexec'-specific code and arguments.
+	* etc/PROBLEMS: Remove unexec-specific problems.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Don't recognize "bootstrap" option for --temacs
+
+	This option only makes sense for unexec dumping.
+
+	* src/emacs.c (main): Recognize "pbootstrap" only, not "bootstrap".
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Pure storage removal: Documentation
+
+	* etc/NEWS: Document removal of unexec dumper.
+	* etc/PROBLEMS: Remove pure space problems.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Pure storage removal: Bump nativecomp ABI
+
+	Use "9" as MPS builds use "7" and "8".
+
+	* src/comp.c (ABI_VERSION): Bump.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Pure storage removal: Remove documentation
+
+	As pure storage is now gone, it no longer needs to be documented.
+
+	* doc/lispref/elisp.texi (Top):
+	* doc/lispref/internals.texi (GNU Emacs Internals): Remove "Pure
+	Storage" section.
+	(Building Emacs, Garbage Collection, Writing Emacs Primitives):
+	* doc/lispref/symbols.texi (Standard Properties): Remove references to
+	pure storage.
+	* src/alloc.c (Fgarbage_collect): Remove docstring text referring to
+	pure storage.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Pure storage removal: Adjust nativecomp code
+
+	* lisp/emacs-lisp/comp.el (comp-curr-allocation-class, comp-ctxt)
+	(comp--emit-for-top-level, comp--emit-lambda-for-top-level)
+	(comp--finalize-relocs): Remove 'd-impure' allocation class.
+	* src/comp.c (PURE_RELOC_SYM, DATA_RELOC_IMPURE_SYM)
+	(TEXT_DATA_RELOC_IMPURE_SYM): Remove definitions.
+	(comp_t): Remove 'pure_ptr', 'check_impure', 'data_relocs_impure',
+	'd_impure_idx'.
+	(helper_link_table): Remove 'pure_write_error'.
+	(obj_to_reloc): Adjust to removal of 'data_relocs_impure'.
+	(emit_PURE_P): Remove function.
+	(declare_imported_data, declare_runtime_imported_funcs)
+	(emit_ctxt_code): Adjust to removed fields.
+	(define_setcar_setcdr): Don't call 'CHECK_IMPURE'.
+	(define_CHECK_IMPURE): Remove function.
+	(Fcomp__compile_ctxt_to_file0, check_comp_unit_relocs, load_comp_unit)
+	(Fcomp__register_lambda): Adjust to removed allocation class 'd-impure'.
+	(syms_of_comp): Don't define 'd-impure'.
+	* src/comp.h (struct Lisp_Native_Comp_Unit): Drop support for allocation
+	class 'd-impure'.
+	* src/lisp.h (allocate_native_comp_unit):
+	* src/pdumper.c (dump_do_dump_relocation): Adjust to struct change.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Pure storage removal: Remove docstring hack
+
+	This should no longer be needed.
+
+	* src/eval.c (Fautoload): Don't try to work around pure storage bug.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Pure storage removal: Remove purecopy hash table flag
+
+	* lisp/emacs-lisp/comp.el (comp--jump-table-optimizable): Adjust
+	comment.
+	* src/category.c (hash_get_category_set):
+	* src/emacs-module.c (syms_of_module):
+	* src/fns.c (make_hash_table): Remove 'purecopy' flag and update
+	docstring.
+	(Fmake_hash_table): Ignore ':purecopy' argument.
+	* src/frame.c (make_frame):
+	* src/image.c (xpm_make_color_table_h):
+	* src/lisp.h (struct Lisp_Hash_Table): Drop 'purecopy' flag.
+	* src/pdumper.c (dump_hash_table): Don't dump 'purecopy' flag.
+	* src/print.c (print_object): Don't print 'purecopy' flag
+
+	* src/json.c (json_parse_object):
+	* src/lread.c (readevalloop, read_internal_start):
+	* src/pgtkterm.c (syms_of_pgtkterm):
+	* src/profiler.c (export_log):
+	* src/xfaces.c (syms_of_xfaces):
+	* src/xterm.c (syms_of_xterm): Adjust calls to 'make_hash_table'.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Pure storage removal: Remove support for pinned objects
+
+	* src/alloc.c (symbol_block_pinned): Remove variable.
+	(init_symbol): Don't initialize 'pinned flag'.
+	(pinned_objects): Remove variable.
+	(mark_pinned_objects, mark_pinned_symbols): Remove functions.
+	(garbage_collect): Don't call 'mark_pinned_objects',
+	'mark_pinned_symbols'.
+	* src/lisp.h (struct Lisp_Symbol): Remove 'pinned' flag.
+	* src/pdumper.c (dump_symbol): Remove 'pinned' flag from dump.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Pure storage removal: Replace calls to removed functions
+
+	* src/alloc.c (string_bytes, pin_string, valid_lisp_object_p)
+	(process_mark_stack, survives_gc_p, syms_of_alloc):
+	* src/androidterm.c (android_term_init): Replace call to
+	'build_pure_c_string'.
+	* src/buffer.c (init_buffer_once, syms_of_buffer):
+	* src/bytecode.c (exec_byte_code):
+	* src/callint.c (syms_of_callint):
+	* src/callproc.c (syms_of_callproc):
+	* src/category.c (Fdefine_category):
+	* src/coding.c (syms_of_coding):
+	* src/comp.c (Fcomp__compile_ctxt_to_file0)
+	(maybe_defer_native_compilation, syms_of_comp):
+	* src/data.c (Fsetcar, Fsetcdr, Fdefalias, Faset, syms_of_data):
+	* src/dbusbind.c (syms_of_dbusbind):
+	* src/doc.c (Fsnarf_documentation):
+	* src/emacs-module.c (syms_of_module):
+	* src/eval.c (Finternal__define_uninitialized_variable)
+	(Fdefconst_1, define_error, syms_of_eval):
+	* src/fileio.c (syms_of_fileio):
+	* src/fns.c (Ffillarray, Fclear_string, check_mutable_hash_table):
+	* src/fontset.c (syms_of_fontset):
+	* src/frame.c (make_initial_frame):
+	* src/haikufns.c (syms_of_haikufns):
+	* src/intervals.c (create_root_interval):
+	* src/keyboard.c (syms_of_keyboard):
+	* src/keymap.c (Fmake_sparse_keymap, Fset_keymap_parent)
+	(store_in_keymap, syms_of_keymap):
+	* src/lisp.h:
+	* src/lread.c (Fload, read0, intern_c_string_1, define_symbol)
+	(Fintern, defsubr, syms_of_lread):
+	* src/pdumper.c (Fdump_emacs_portable):
+	* src/pgtkfns.c (syms_of_pgtkfns):
+	* src/pgtkterm.c (syms_of_pgtkterm):
+	* src/process.c (syms_of_process):
+	* src/search.c (syms_of_search):
+	* src/sqlite.c (syms_of_sqlite):
+	* src/syntax.c (syms_of_syntax):
+	* src/treesit.c (syms_of_treesit):
+	* src/w32fns.c (syms_of_w32fns):
+	* src/xdisp.c (syms_of_xdisp):
+	* src/xfaces.c (syms_of_xfaces):
+	* src/xfns.c (syms_of_xfns):
+	* src/xftfont.c (syms_of_xftfont):
+	* src/xterm.c (syms_of_xterm): Remove calls to 'PURE_P', 'CHECK_IMPURE',
+	'Fpurecopy', and replace calls to 'build_pure_c_string', 'pure_list',
+	'pure_listn', etc., by impure equivalents.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Pure storage removal: Main part
+
+	* src/alloc.c (pure, PUREBEG, purebeg, pure_size)
+	(pure_bytes_used_before_overflow, pure_bytes_used_lisp)
+	(pure_bytes_used_non_lisp): Remove definitions.
+	(init_strings): Make empty strings impure.
+	(cons_listn): Drop 'cons' argument.
+	(pure_listn): Remove function.
+	(init_vectors): Allocate zero vector manually to avoid freelist issues.
+	(pure_alloc, check_pure_size, find_string_data_in_pure)
+	(make_pure_string, make_pure_c_string, pure_cons, make_pure_float)
+	(make_pure_bignum, make_pure_vector, purecopy_hash_table): Remove
+	functions.
+	(purecopy): Reduce to hash consing our argument.
+	(init_alloc_once_for_pdumper): Adjust to lack of pure space.
+	(pure-bytes-used): Adjust docstring to mark as obsolete.
+	(purify-flag): Keep for hash consing, but adjust docstring.
+	* src/bytecode.c:
+	* src/comp.c: Don't include "puresize.h".
+	* src/conf_post.h (SYSTEM_PURESIZE_EXTRA): Remove definition.
+	* src/data.c (pure_write_error): Remove function.
+	* src/deps.mk: Remove puresize.h dependency throughout.
+	* src/emacs.c:
+	* src/fns.c:
+	* src/intervals.c:
+	* src/keymap.c: Don't include "puresize.h".
+	* src/lisp.h (struct Lisp_Hash_Table): Adjust comment.
+	(pure_listn, pure_list, build_pure_c_string): Remove.
+	* src/w32heap.c (FREEABLE_P): Don't do use 'dumped_data'.
+	(malloc_before_dump, realloc_before_dump, free_before_dump): Remove
+	functions.
+	* src/w32heap.h: Adjust prototype.
+	* lisp/loadup.el:
+	* lisp/startup.el: Remove purespace code.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Pure storage removal: Delete puresize.h
+
+	* src/puresize.h: Delete file.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Unexec removal: Adjust and simplify W32-specific code
+
+	* src/emacs.c (main): Unconditionally call 'init_heap' without an
+	argument.  Adjust comment.
+	* src/w32heap.c (dumped_data, DUMPED_HEAP_SIZE): Remove definitions.
+	(heap): Remove variable.
+	(dumped_data_commit): Remove function.
+	(init_heap): Drop unexec-specific code.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Unexec removal: Remove HYBRID_MALLOC support
+
+	* src/gmalloc.c (gdefault_morecore): Remove HYBRID_MALLOC code.
+	(allocated_via_gmalloc, hybrid_malloc, hybrid_calloc, hybrid_free_1)
+	(hybrid_free, hybrid_aligned_alloc, hybrid_realloc): Remove functions.
+
+	* msdos/sed1v2.inp:
+	* msdos/sedlibmk.inp:
+	* src/alloc.c (GC_MALLOC_CHECK, USE_ALIGNED_ALLOC)
+	(refill_memory_reserve, aligned_alloc):
+	* src/emacs.c (main):
+	* src/lastfile.c (my_edata):
+	* src/lisp.h:
+	* src/ralloc.c:
+	* src/sysdep.c (get_current_dir_name_or_unreachable):
+	* src/xdisp.c (decode_mode_spec): Remove HYBRID_MALLOC conditions.
+
+	* configure.ac (hybrid_malloc, HYBRID_MALLOC): Remove variables and
+	dependent code.
+	* src/conf_post.h (hybrid_malloc, hybrid_calloc, hybrid_free)
+	(hybrid_aligned_alloc, hybrid_realloc): Remove conditional prototypes.
+	* src/Makefile.in (HYBRID_MALLOC): Remove variable.
+	(base_obj): Remove sheap.o
+	(LIBEGNU_ARCHIVE):
+	* lib/Makefile.in (libgnu_a_OBJECTS): Remove libegnu.a support.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Unexec removal: Main part
+
+	* configure.ac: Remove unexec-specific parts.
+	(EMACS_CONFIG_FEATURES): Always report that we do not have the UNEXEC
+	feature.
+	(AC_ECHO): No longer display a line about the unexec feature.
+	* lisp/loadup.el:
+	* lisp/startup.el: Remove unexec-specific code.
+	* src/Makefile.in (base_obj): Drop 'UNEXEC_OBJ'.
+	* src/alloc.c (staticvec): Never initialize this variable.
+	(BLOCK_ALIGN): Always allow large blocks.
+	(mmap_lisp_allowed_p): Remove unexec-specific code.
+	* src/buffer.c (init_buffer):
+	* src/conf_post.h (ADDRESS_SANITIZER):
+	* src/emacs.c (load_pdump, main): Remove unexec-specific code.
+	(Fdump_emacs): Remove function.
+	(syms_of_emacs): Remove 'Fdump_emacs'.
+	* src/lastfile.c: Remove unexec-specific code.
+	* src/lisp.h (gflags): Remove unexec-specific flags.
+	(will_dump_p, will_bootstrap_p, will_dump_with_unexec_p)
+	(dumped_with_unexec_p, definitely_will_not_unexec_p): Remove or adjust
+	predicates.
+	(SUBR_SECTION_ATTRIBUTE): Remove unexec-specific definition.
+	* src/pdumper.c (Fdump_emacs_portable): Remove unexec-specific warning.
+	* src/process.c (init_process_emacs): Remove !unexec condition
+	* src/sysdep.c (maybe_disable_address_randomization): Adjust comment.
+	(init_signals):
+	* src/timefns.c (init_timefns): Remove unexec-specific code.
+	* src/w32heap.c (report_temacs_memory_usage): Remove function.
+	* src/w32heap.h: Adjust comment.
+	* src/w32image.c (globals_of_w32image): Remove unexec-specific code.
+
+2024-12-12  Pip Cet  <pipcet@protonmail.com>
+
+	Unexec removal: Remove obsolete files
+
+	* src/sheap.c, src/sheap.h, src/unexec.h, src/unexaix.c, src/unexcoff.c:
+	* src/unexcw.c, src/unexelf.c, src/unexhp9k800.c, src/unexmacosx.c:
+	* src/unexsol.c, src/unexw32.c: Remove files.
+
+2024-12-12  Jared Finder  <jared@finder.org>
+
+	Enable xterm-mouse-mode by default in xterm
+
+	* lisp/xt-mouse.el (xterm-mouse-mode): Change default value of
+	xterm-mouse-mode to t.
+	* lisp/term/xterm.el (xterm--init): Enable xterm-mouse-mode if
+	the default value is still set.
+	* etc/NEWS: Document new behavior.
+
+2024-12-12  Diancheng Wang  <diancheng_wang@163.com>
+
+	Turn off current source line indicator when gdb buffer is killed
+
+	* lisp/progmodes/gud.el (gud-hide-current-line-indicator):
+	Turn off current-line indicator.  (Bug#74642)
+
+2024-12-12  Daniel Mendler  <mail@daniel-mendler.de>
+
+	eww: Use browse-url-with-browser-kind in eww-browse-with-external-browser
+
+	Guarantee that an external browser is used by EWW if
+	`browse-url-secondary-browser-function' is set to
+	`eww-browse-url'.
+	* lisp/net/eww.el (eww-browse-with-external-browser): Use
+	`browse-url-secondary-browser-function' only if it is an
+	external browser, otherwise fall back to
+	`browse-url-with-browser-kind'.
+	(eww-follow-link): Use `eww-browse-with-external-browser' if the
+	EXTERNAL prefix argument is non-nil.  Improve docstring.
+	* lisp/net/browse-url.el (browse-url-secondary-browser-function):
+	Update docstring.  (Bug#74730)
+
+2024-12-12  Visuwesh  <visuweshm@gmail.com>
+
+	Revert Dired buffer when clicking on basename of directory
+
+	* lisp/dired.el (dired--make-directory-clickable): Make clicking
+	on basename of the directory revert the Dired buffer.
+	* etc/NEWS: Announce the change.  (Bug#74700)
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add nntps and snews to browse-url heuristic
+
+	* lisp/net/browse-url.el (browse-url-button-regexp): Support "nntps" and
+	"snews" schemes.
+
+2024-12-12  Stefan Kangas  <stefankangas@gmail.com>
+
+	Shorten browse-url-default-scheme docstring
+
+	* lisp/net/browse-url.el (browse-url-default-scheme): Shorten
+	docstring by removing self-evident information.  Reflow.
+
+2024-12-12  Gerd Möllmann  <gerd@gnu.org>
+
+	Signal errors for unimplemented features
+
+	* src/frame.c (make_terminal_frame): Error for minibuffer-only frames.
+	* src/term.c (Ftty_frame_restack): Signal error.
+
+2024-12-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	minibuffer.el: Avoid accumulating adjustments in the metadata (bug#74718)
+
+	* lisp/minibuffer.el (completion--nth-completion): Remember the
+	adjustments applied, in an ad-hoc `completion--adjusted-metadata` entry.
+
+2024-12-11  Pengji Zhang  <me@pengjiz.com>
+
+	Rework history Isearch for Eshell
+
+	This is to make history Isearch for Eshell similar to that of
+	'comint-mode', by hooking into Isearch properly instead of
+	defining new commands to emulate Isearch (bug#74287).
+
+	* lisp/eshell/em-hist.el (eshell-history-isearch): New user
+	option.
+	(eshell-goto-history, eshell--isearch-setup)
+	(eshell-history-isearch-end, eshell-history-isearch-search)
+	(eshell-history-isearch-message, eshell-history-isearch-wrap)
+	(eshell-history-isearch-push-state): New functions.
+	(eshell-isearch-backward-regexp, eshell-isearch-forward-regexp):
+	New commands.
+	(eshell--history-isearch-message-overlay)
+	(eshell--stored-incomplete-input, eshell--force-history-isearch):
+	New internal variables.
+	(eshell-hist-mode-map): Bind 'M-r' to
+	'eshell-isearch-backward-regexp' and free 'M-s' binding for
+	normal in-buffer search commands.
+	(eshell-isearch-backward, eshell-isearch-forward): Use the new
+	way to start searching.
+	(eshell-hist-initialize): Use the new Isearch setup function.
+	(eshell-previous-matching-input): Use 'eshell-goto-history'.
+	Also inhibit messages when searching.
+	(eshell-isearch-map, eshell-isearch-repeat-backward)
+	(eshell-isearch-abort, eshell-isearch-delete-char)
+	(eshell-isearch-return, eshell-isearch-cancel)
+	(eshell-isearch-repeat-forward, eshell-test-imatch)
+	(eshell-return-to-prompt, eshell-prepare-for-search): Remove.
+	These are for the old history Isearch implementation.
+
+	* doc/misc/eshell.texi (History): Document changes.
+
+	* etc/NEWS: Annouce changes.
+
+2024-12-11  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/infra/Dockerfile.emba (emacs-tree-sitter): Add jsdoc grammar.
+
+2024-12-11  Robert Pluim  <rpluim@gmail.com>
+
+	Fix browse-url-kde :version tags
+
+	* lisp/net/browse-url.el (browse-url-kde-program,
+	browse-url-kde-args): Update :version to 31.1.  (Bug#74775)
+
+2024-12-11  Pengji Zhang  <me@pengjiz.com>
+
+	Do not call custom-reevaluate-setting in comint.el (bug#74287)
+
+	* lisp/comint.el (comint--force-history-isearch): New internal variable.
+	(comint-history-isearch-backward, comint-history-isearch-backward-regexp):
+	Set comint--force-history-isearch to t.
+	(comint-history-isearch-setup): Check comint--force-history-isearch.
+	(comint-history-isearch-end): Set comint--force-history-isearch back to nil
+	instead of calling custom-reevaluate-setting.
+
+2024-12-11  Yuan Fu  <casouri@gmail.com>
+
+	Make c-ts-mode tests pass even for older tree-sitter libraries
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode--for-loop-indent-rule):
+	Use child index instead of field name.
+
+2024-12-11  Björn Bidar  <bjorn.bidar@thaodan.de>
+
+	Update browse-url-kde variables
+
+	* lisp/net/browse-url.el (browse-url-kde-program, browse-url-kde-args):
+	Update defaults to more modern alternative to kfmclient.  Kfmclient is
+	only installed when Konqueror is installed, which isn't the default
+	file-manager since KDE4.  In contrast, it is more likely that kde-open
+	is installed as it is required by Plasma, and it exists since
+	KDE4.  (Bug#74775)
+
+2024-12-10  Daniel Mendler  <mail@daniel-mendler.de>
+
+	Update project-recompile's docstring
+
+	* lisp/progmodes/project.el (project-recompile):
+	Update the docstring accordingly (bug#74631).
+
+2024-12-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Use builtin-expect directly
+
+	* admin/merge-gnulib (GNULIB_MODULES): Add builtin-expect,
+	since src/lisp.h now uses __builtin_expect directly,
+	which we should no longer rely on it being pulled in as
+	a dependency of some other Gnulib module that we use.
+
+2024-12-10  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	time-stamp: properly abbreviate instead of truncating names
+
+	* lisp/time-stamp.el (time-stamp-string-preprocess): Stop
+	truncating month and weekday name strings; it didn't
+	internationalize well.  Some historical conversions, previously
+	accepted quietly, now warn.
+	(time-stamp-format): Recommend the simpler formats implemented in 2019.
+	* test/lisp/time-stamp-tests.el: Update tests and comments to match.
+	Revert commit 83e4559664 (2022-07-01), which was working around the
+	former confusion between truncation and abbreviation.
+
+2024-12-10  Robert Pluim  <rpluim@gmail.com>
+
+	Move ns-specific event setup to term/ns-win.el (Bug#74619)
+
+	* lisp/term/ns-win.el (ns-setup-special-keys): New function,
+	contains event setup code previously in term/common-win.el.
+	Call it at top-level.
+	* lisp/term/common-win.el (x-setup-function-keys): Call
+	'ns-setup-special-keys'.
+
+2024-12-10  Daniel Mendler  <mail@daniel-mendler.de>
+
+	project-recompile: Autoload and run in project root
+
+	* lisp/progmodes/project.el (project-recompile): Autoload and
+	use project root as `default-directory' (bug#74631).
+
+2024-12-10  Dmitry Gutov  <dmitry@gutov.dev>
+
+	apropos-library: Don't list generic functions as features
+
+	* lisp/apropos.el (apropos-library):
+	Remove the separate 'cl-defmethod' case (bug#74727).
+
+2024-12-09  Gerd Möllmann  <gerd@gnu.org>
+
+	Support menu separator types in tty menus (bug#74740)
+
+	* src/xdisp.c (display_tty_menu_item): Display "--" for all menu
+	separator types.
+
+2024-12-09  Pip Cet  <pipcet@protonmail.com>
+
+	Fix occasional crash in lwlib due to uninitialized data
+
+	Crash observed on cfarm's cfarm210 machine, which is a Solaris 10 zone
+	on an M3000 server.
+
+	* lwlib/xlwmenu.c (XlwMenuInitialize): Initialize menu.font.
+
+2024-12-09  Jim Porter  <jporterbugs@gmail.com>
+
+	Fix usage reporting for Eshell commands
+
+	* lisp/eshell/esh-cmd.el (eshell-exec-lisp): Call
+	'elisp-get-fnsym-args-string'; the old function was renamed to this.
+
+2024-12-09  Jim Porter  <jporterbugs@gmail.com>
+
+	Return non-zero exit status when Eshell's "which" fails to find a command
+
+	* lisp/eshell/esh-cmd.el (eshell/which): Set exit status to 1 if we
+	couldn't find any of the commands (bug#74739).
+
+2024-12-09  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make setting tex-dvi-view-command to an sexp obsolete
+
+	This is more in line with how we generally handle user options for
+	commands to call.  Later, we can get rid of the 'eval' call.
+
+	* lisp/textmodes/tex-mode.el (tex-view): Warn if tex-dvi-view-command is
+	set to an sexp instead of a string; say that this use is obsolete.
+	(tex-dvi-view-command): Change the default value to a string.  Update
+	docstring to reflect the above obsoletion.
+
+2024-12-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix calling processes inside ffap
+
+	* lisp/ffap.el (ffap--url-file-handler): Handle also
+	`unhandled-file-name-directory'.  (Bug#74208)
+
+2024-12-08  Gerd Möllmann  <gerd@gnu.org>
+
+	* lisp/tty-tip.el (tty-tip--create-frame): Use tooltip-hide-delay
+
+2024-12-08  Yuan Fu  <casouri@gmail.com>
+
+	Allow treesit--font-lock-level-setter to be an alist
+
+	* lisp/treesit.el (treesit-font-lock-level): Allow the
+	value to be an alist mapping major modes to font lock levels.
+	(treesit--font-lock-level-setter): Rewrite.
+	(treesit--compute-font-lock-level): New function.
+	(treesit-font-lock-recompute-features): Use new function.
+
+	* doc/lispref/modes.texi (Parser-based Font Lock): Minor fix.
+
+2024-12-08  Gerd Möllmann  <gerd@gnu.org>
+
+	Prevent too early hiding of tty tips
+
+	* lisp/tty-tip.el (tty-tip--show-timer): Renamed from
+	tty-tip--timeout-id.
+	(tty-tip--hide-timer): New variable.
+	(tty-tip--delete-frame): Cancel hide timer if set.
+	(tty-tip--create-frame): Use run-with-timer instead of run-at-time
+	for consistency.
+
+2024-12-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	4f2a21cc2a3 Don't restrict 'lua-ts-send-file' to 'lua-ts-mode'
+
+2024-12-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	3cf177442cc ; * lisp/help-at-pt.el (display-local-help): Fix last cha...
+	02c53b9aab0 ; * lisp/help-at-pt.el (display-local-help): Doc fix.
+	130c2a13dc7 ; * doc/emacs/building.texi (Compilation Mode): Fix last ...
+	df7f02a7954 Add tags to 'compilation-transform-file-match-alist' cust...
+	7c50e4cc8cc Improve 'compilation-transform-file-match-alist' document...
+	a73d08bb67a Improve 'compilation-hidden-output' docstring
+	d50293b0f10 ; Improve documentation of 'epa-mail-verify'
+
+2024-12-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	7b8d12e95de Fix the latest dabbrev-expand test fix
+
+2024-12-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	f65de1019dc Fix the version of librsvg API change
+	43c4a06ffcc ; Fix grammar in Emacs user manual
+	6bca138d60e Fix latest test for dabbrev-expand
+
+2024-12-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/lisp/wdired-tests.el (wdired-test-bug34915): Fix for *BSD.
+
+	(Bug#74721)
+
+2024-12-07  Vincenzo Pupillo  <vincenzo.pupillo@unimi.it>
+
+	Remove unnecessary function call from 'php-ts-mode'
+
+	* lisp/progmodes/php-ts-mode.el (php-ts-mode): Remove
+	unnecessary function call 'treesit-font-lock-recompute-features'.
+	(Bug#74688)
+
+2024-12-07  Daniel Mendler  <mail@daniel-mendler.de>
+
+	progmodes/js: Use 'completing-read' instead of 'ido-completing-read'
+
+	* lisp/progmodes/js.el (js--read-symbol): Don't use Ido.
+	(Bug#74615)
+
+2024-12-07  Pengji Zhang  <me@pengjiz.com>
+
+	Allow lambdas for 'flymake-cc-command'
+
+	* lisp/progmodes/flymake-cc.el (flymake-cc-command): Use
+	customization type 'function' instead of 'symbol' to allow
+	other callable objects in addition to named functions, and
+	update the doc string accordingly.
+	(flymake-cc): Use 'functionp' to check if 'flymake-cc-command'
+	is callable.  (Bug#74378)
+
+2024-12-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Update info-lookup's support for 'latex-mode'
+
+	* lisp/info-look.el (latex-mode): Update URLs of LaTeX manuals and
+	the corresponding names of the index nodes.
+
+2024-12-06  Michael Albinus  <michael.albinus@gmx.de>
+
+	Better handling of "%" in Tramp user or host names
+
+	* lisp/net/tramp.el (tramp-format-spec): New defun.
+	(tramp-dissect-file-name, tramp-compute-multi-hops)
+	(tramp-expand-args):
+	* lisp/net/tramp-cmds.el (tramp-default-rename-file): Use it.
+
+2024-12-05  Juri Linkov  <juri@linkov.net>
+
+	* lisp/emacs-lisp/lisp-mode.el (lisp-fdefs): Fix font-lock (bug#74307).
+
+	Move '(not "\\")' inside the group to not exclude the last character
+	for "\\<>" and similar constructs.
+
+2024-12-05  Yuan Fu  <casouri@gmail.com>
+
+	Validate font-lock rules when setting up tree-sitter major mode
+
+	When tree-sitter grammar make breaking changes, major modes
+	breaks completely: no highlighting is shown.  This new function
+	will run in treesit-major-mode-setup, validate each
+	font-lock features, and disable the ones that are not compatible
+	with the new grammar, so that the rest of the features still
+	work.  It also displays a warning explaining the situation,
+	which looks like this:
+
+	    Warning (treesit-font-lock-rules-mismatch): Emacs cannot
+	    compile every font-lock rules because a mismatch between the
+	    grammar and the rules.  This is most likely due to a
+	    mismatch between the font-lock rules defined by the major
+	    mode and the tree-sitter grammar.
+
+	    This error can be fixed by either downgrading the
+	    grammar (tree-sitter-c) on your system, or upgrading the
+	    major mode package.  The following are the temporarily
+	    disabled features:
+
+	    - `preprocessor' for c.
+
+	* lisp/treesit.el (treesit-validate-font-lock-rules): New function.
+	(treesit-major-mode-setup): Validate font-lock rules.
+
+2024-12-05  Yuan Fu  <casouri@gmail.com>
+
+	Make treesit-query-compile compile compiled-query eagerly
+
+	* src/treesit.c (treesit_ensure_query_compiled_signal): Extrat
+	out into a function.
+	(Ftreesit_query_compile): If EAGER is non-nil and QUERY is a
+	lazily compiled query, compile it eagerily.
+
+2024-12-05  Yuan Fu  <casouri@gmail.com>
+
+	Make tree-sitter-explorer support selecting local parser
+
+	Now treesit-explore-mode will prompt the user to select a parser
+	to explore, rather than a language.  It'll also include the
+	local parsers at point for selection.
+
+	* lisp/treesit.el (treesit--explorer-language): Change to
+	treesit--explorer-parser.
+	(treesit--explorer--nodes-to-highlight):
+	(treesit--explorer-refresh): Change to use parser.
+	(treesit--explorer-generate-parser-alist): New function.
+	(treesit-explorer-switch-parser): New command.
+	(treesit-explore-mode): Use switch-parser to setup.
+	* doc/lispref/parsing.texi (Language Grammar): Mention
+	treesit-explorer-switch-parser.
+
+2024-12-04  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-line.el (tab-line-tabs-fixed-window-buffers): More optimizations.
+
+	Use :size arg of 'make-hash-table' as a hint how many buffers
+	the table will have.  Add ':in-place t' to 'sort'.
+
+2024-12-04  Juri Linkov  <juri@linkov.net>
+
+	Remove obsolete 'display-comint-buffer-action' (bug#74361)
+
+	* lisp/window.el (display-comint-buffer-action):
+	(display-tex-shell-buffer-action):
+	Remove obsolete defcustoms.
+
+	* lisp/cmuscheme.el (run-scheme, switch-to-scheme):
+	* lisp/shell.el (shell):
+	* lisp/eshell/eshell.el (eshell):
+	* lisp/progmodes/inf-lisp.el (inferior-lisp):
+	* lisp/progmodes/project.el (project-shell, project-eshell):
+	* lisp/progmodes/sh-script.el (sh-show-shell):
+	Replace 'display-comint-buffer-action' with a list of
+	'display-buffer--same-window-action' and '(category . comint)'.
+
+	* lisp/org/ol-eshell.el (org-eshell-open): Add '(category . comint)'.
+
+	* lisp/textmodes/tex-mode.el (tex-display-shell)
+	(tex-recenter-output-buffer):
+	Replace 'display-tex-shell-buffer-action' with a list of
+	'display-buffer-in-previous-window' and '(category . tex-shell)'.
+
+2024-12-03  Juri Linkov  <juri@linkov.net>
+
+	Add new keyword :continue-only to defvar-keymap for repeat-mode (bug#74140)
+
+	* doc/lispref/keymaps.texi (Creating Keymaps): Add :continue-only
+	to :repeat part of defvar-keymap.
+
+	* lisp/keymap.el (defvar-keymap): Add support for new :repeat
+	keyword :continue-only.
+
+	* lisp/repeat.el (repeat-post-hook): The property 'repeat-continue-only'
+	is handled as a list of repeat-maps.
+
+	* test/lisp/repeat-tests.el (repeat-tests-repeat-map): Use new
+	:repeat keyword :continue-only.
+
+2024-12-03  Robert Pluim  <rpluim@gmail.com>
+
+	Improve docstrings of functions for moving to message headers
+
+	* lisp/gnus/message.el (message-goto-to, message-goto-from,
+	message-goto-subject, message-goto-cc, message-goto-bcc,
+	message-goto-fcc, message-goto-reply-to,
+	message-goto-newsgroups, message-goto-distribution,
+	message-goto-followup-to, message-goto-mail-followup-to,
+	message-goto-keywords, message-goto-summary): Mention that these
+	will insert an empty header if the header is not found.
+	(message-position-on-field): Explain that this inserts an empty
+	header if the header is missing, and that insertion is done
+	after the headers mentioned in AFTERS.
+
+2024-12-03  Tomas Volf  <~@wolfsden.cz>  (tiny change)
+
+	Actually remove the Mail-Followup-To header iff empty
+
+	* lisp/gnus/message.el (message-send-mail): Pass a fixed string
+	instead of regexp to 'message-remove-header' (Bug#74658).
+
+2024-12-03  Andrea Corallo  <acorallo@gnu.org>
+
+	* lisp/progmodes/c-ts-mode.el (treesit-node-match-p): Declare.
+
+2024-12-03  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project-try-vc--search: Fix inside recursive submodule setup
+
+	* lisp/progmodes/project.el (project-try-vc--search): Loop when
+	looking for submodule parent repository (bug#74614).
+
+2024-12-02  Andrea Corallo  <acorallo@gnu.org>
+
+	* Declare few treesit-* function to clean-up wanrnings
+
+	* lisp/progmodes/c-ts-common.el (treesit-parser-language)
+	(treesit-node-match-p, treesit-node-child, treesit-node-eq)
+	(treesit-parser-root-node, treesit-node-parser): Declare.
+
+2024-12-02  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix password prompt in comint
+
+	* lisp/comint.el (comint-password-prompt-regexp): Don't use "'s"
+	as keyword.  Add default OpenSSH format.  Adapt :version.
+	(comint-watch-for-password-prompt): Adapt prompt composition.
+	(Bug#74626)
+
+2024-12-02  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Do not use libjpeg quantization (bug#74476)
+
+	* src/image.c (jpeg_load_body): Remove libjpeg quantization.
+
+2024-12-02  Yuan Fu  <casouri@gmail.com>
+
+	Standardize and promote c-ts-mode's custom matcher and anchor
+
+	Specifically, standalone-parent and prev-sibling.  The c-ts-mode
+	custom version skips labels and proproc directives.
+
+	* lisp/progmodes/c-ts-mode.el:
+	(c-ts-mode--standalone-parent-skip-preproc): Rename to
+	c-ts-mode--standalone-parent, and make it skip labels too.
+	(c-ts-mode--preproc-indent-rules): Rename standalone-parent and
+	prev-sibling.
+	(c-ts-mode--label-indent-rules): Use custom standalone-parent
+	and prev-sibling.
+
+2024-12-02  Yuan Fu  <casouri@gmail.com>
+
+	Remove unused functions in c-ts-mode
+
+	Remove functions that became unused due to the previous change.
+
+	* lisp/progmodes/c-ts-mode.el:
+	(c-ts-mode--standalone-grandparent):
+	(c-ts-mode--else-heuristic):
+	(c-ts-mode--first-sibling):
+	(c-ts-mode--parent-is-not-top-compound):
+	(c-ts-mode--indent-styles):
+	(c-ts-mode--top-level-label-matcher): Remove functions.
+	(c-ts-mode--simple-indent-rules): Move two label rules into
+	c-ts-mode--label-indent-rules.
+	(c-ts-mode--label-indent-rules): Add rules
+
+2024-12-02  Yuan Fu  <casouri@gmail.com>
+
+	Add more c-ts-mode indent tests
+
+	* test/lisp/progmodes/c-ts-mode-resources/indent-bsd.erts: Fix
+	label test.
+	* test/lisp/progmodes/c-ts-mode-resources/indent.erts: Add some
+	test, make other tests harder.
+
+2024-12-02  Yuan Fu  <casouri@gmail.com>
+
+	Use new baseline indent rule in c-ts-mode
+
+	Rework the indent rules in c-ts-mode using
+	c-ts-common-baseline-indent-rule.  Also reworked internal
+	functions for setting indent styles to make it simpler and (more
+	importantly) more readable.  Now there's a single function,
+	c-ts-mode--simple-indent-rules, that returns a value that can go
+	straight to treesit-simple-indent-rules.
+
+	* lisp/progmodes/c-ts-mode.el:
+	(c-ts-mode--indent-style-setter): Simplify.
+	(c-ts-mode--get-indent-style): Remove function.
+	(c-ts-mode--prompt-for-style): Use a hard-coded list of styles.
+	This is a tiny downgrade from the computed lists but is
+	acceptable.
+	(c-ts-mode-set-style): Use c-ts-mode--simple-indent-rules.
+	(c-ts-mode--standalone-grandparent): Docstring change.
+	(c-ts-mode--for-loop-indent-rule): New function.
+	(c-ts-mode--preproc-indent-rules): New variable.  Copied from
+	old indent rules and added some new rule.
+	(c-ts-mode--macro-heuristic-rules):
+	(c-ts-mode--simple-indent-rules):
+	(c-ts-mode--parenthesized-expression-indent-rule):
+	(c-ts-mode--label-indent-rules): New functions.
+	(c-ts-mode):
+	(c++-ts-mode): Use c-ts-mode--simple-indent-rules.
+
+2024-12-02  Yuan Fu  <casouri@gmail.com>
+
+	Add baseline tree-sitter indent rule for C-like languages
+
+	I found a really good baseline indent rule that handles a wide
+	range of situations very well.  Now major modes can just start
+	with this rule and add exceptions on top.
+
+	This is worth mentioning in the manual, but that'll be a large
+	change, and doesn't have to be included in this commit.
+
+	* lisp/progmodes/c-ts-common.el:
+
+	(c-ts-common-list-indent-style): New variable.
+	(c-ts-common--standalone-parent):
+	(c-ts-common--prev-standalone-sibling):
+	(c-ts-common-parent-ignore-preproc):
+	(c-ts-common-baseline-indent-rule): New function.
+
+	* lisp/treesit.el (treesit--indent-prev-line-node): New function.
+	(treesit-simple-indent-presets): Add new preset.
+
+2024-12-02  Yuan Fu  <casouri@gmail.com>
+
+	Add treesit-explore command
+
+	* lisp/treesit.el (treesit-explore): New function.
+	* doc/lispref/parsing.texi (Language Grammar): Advertize this
+	command instead of the minor mode.
+
+2024-12-02  Yuan Fu  <casouri@gmail.com>
+
+	Allow treesit-simple-indent's rule to be a single function
+
+	* lisp/treesit.el (treesit-simple-indent-rules): Allow the rule
+	to be a single function.  Also replace cl-loop with dolist plus
+	catch-throw.
+	(treesit--indent-rules-optimize): Handle the case when a rule is
+	a function.
+	* doc/lispref/modes.texi (Parser-based Indentation): Update
+	manuel.
+
+2024-12-02  Yuan Fu  <casouri@gmail.com>
+
+	Refactor treesit--indent-1
+
+	* lisp/treesit.el (treesit--indent-largest-node-at): New
+	function.
+	(treesit--indent-1): Extract code out into the new function.
+
+2024-12-02  Jørgen Kvalsvik  <j@lambda.is>
+
+	Improve c-ts-mode compound indents (bug#74507)
+
+	Properly indent the body of compound expressions, even when then
+	compound expression is not at the beginning of line and the
+	parent is not an if/for/while/etc., and matches the behavior of
+	c-mode.
+
+	This fixes a problem that is common with macros and in testing
+	frameworks. For example, you expect this to indent:
+
+	TEST_CASE(1) {
+	    assert (...);
+	}
+
+	If the compound statement is the function body itself, don't
+	apply this new rule and instead guide by the parent and first
+	sibling.
+
+	I'm sure there are subtle interactions that aren't handled
+	properly by checking for "function_definition" rather than
+	something more general, but it does fix the test case and the
+	check can be improved as more cases are found.
+
+	* lisp/progmodes/c-ts-mode.el:
+	(c-ts-mode--parent-is-not-top-compound): New function.
+	(c-ts-mode--indent-styles): Use it.
+	* test/lisp/progmodes/c-ts-mode-resources/indent.erts: New
+	compound statement test.
+
+2024-12-02  Yuan Fu  <casouri@gmail.com>
+
+	Merge from emacs-30
+
+	cf4f1387a65 ; Update tree-sitter manual
+	3c7687c1dd1 Allow passing nil to treesit-node-match-p (bug#74612)
+	748b19e56e8 Update to version 2.58 of librsvg API (bug#74606)
+	4c67f636c08 Fix decoding of non-ASCII email attachments
+	bd8a6f70fb9 Prevent "Selecting deleted buffer" error with dabbrev-expand
+	0a753603a53 ; (dictionary-search-interface): Fix bug#74511.
+
+2024-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(asm-mode): Support file-local `asm-comment-char` (bug#74447)
+
+	* lisp/progmodes/asm-mode.el (asm-mode): Move comment settings
+	to `:after-hook`.
+
+2024-12-01  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode manual: Better document lines starting with a label
+
+	* doc/misc/cc-mode.texi (Syntactic Analysis): Document analysis
+	of lines starting with labels, and their non-use as anchor
+	positions.
+
+2024-12-01  F. Jason Park  <jp@neverwas.me>
+
+	Reserve erc-normalize-port for equality comparisons
+
+	* etc/ERC-NEWS: Add entry explaining changes to entry point 'erc-tls'
+	and library functions `erc-normalize-port' and `erc-compute-port'.
+	* lisp/erc/erc.el (erc-normalize-port): Map "ircu" to 6665 instead of
+	6667, and add related IANA service mappings.  Return 0 for unknown
+	nonempty strings.
+	(erc-open): Pass `erc-session-port' through `erc-string-to-port' before
+	handing it to `erc-server-connect'.  This prevents the network machinery
+	from ever seeing a numeric string, like "6667".
+	(erc-select-read-args): Since `erc-compute-port' no longer relies on
+	`erc-normalize-port', ensure its input is a number.  Use
+	`erc-port-equal' instead of `eql'.
+	(erc-tls): Respect a configured non-nil `erc-port' option when the user
+	does not provide a :port keyword argument from Lisp code.
+	(erc-determine-parameters): Use `erc-compute-port' for initializing
+	`erc-session-port'.
+	(erc-compute-port): Don't pass the result through `erc-normalize-port',
+	which can convert it to an unintuitive form.
+	(erc--url-default-connect-function): Use `erc-compute-port' instead of
+	`erc-normalize-port'.
+	(erc-handle-irc-url): Use `erc-port-equal' for comparison.
+	* test/lisp/erc/erc-scenarios-auth-source.el
+	(erc-scenarios-common--auth-source): Allow tests to convey the automatic
+	port number to `erc-open' via `erc-port'.
+	(erc-scenarios-base-auth-source-server--dialed): Use `erc-port' option
+	instead of passing a :port parameter to entry-point command.
+	* test/lisp/erc/erc-tests.el (erc-normalize-port): New test.
+	(Bug#74516)
+
+2024-12-01  Trevor Arjeski  <tmarjeski@gmail.com>  (tiny change)
+
+	Allow querying auth-source with port as string in ERC
+
+	* lisp/erc/erc.el (erc--auth-source-determine-params-defaults): Allow
+	arbitrary strings for `ers-session-port'.  Previously, if a port/service
+	was any string other than "irc", the auth-source query would fail for a
+	seemingly unknown reason.  Restricting the value to "irc" is unnecessary
+	since "irc" is already added to the list of ports, and
+	`make-network-process' already consults /etc/services for well-known
+	service names, like "ircs-u", etc.  This change allows a user to (setopt
+	erc-port "1234"), intentionally or accidentally, while still being able
+	to use .authinfo for password management.  (Bug#74516)
+
+2024-12-01  F. Jason Park  <jp@neverwas.me>
+
+	Clear buffer-undo-list after sending input in ERC
+
+	* lisp/erc/erc.el (erc-insert-line): Assume `erc-insert-marker' points
+	somewhere.
+	(erc-send-current-line): Set `buffer-undo-list' to nil because it should
+	only record editing changes in the prompt area, which has just been
+	cleared.  ERC did this via `erc-display-prompt' prior to 5.6, but it now
+	leaves the prompt alone by default.
+	* test/lisp/erc/erc-tests.el (erc-update-undo-list): New test.
+	(Bug#74518)
+
+2024-12-01  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: Optimize scanning of heavily nested brace blocks
+
+	This should have fixed bug#74357.
+
+	* lisp/progmodes/cc-engine.el (c-laomib-cache): Change the
+	size of this cache from 4 to 50.
+	(c-laomib-get-cache, c-laomib-put-cache): Use assq, memq, and
+	ntake or butlast, rather than looping through the cache with a
+	cdr loop.  No longer attempt to preserve the "largest" cache
+	element.
+	(c-looking-at-or-maybe-in-bracelist): Extend the range covered
+	by a c-laomib-cache element, rather than adding a second
+	element to the cache.
+	(c-no-bracelist-cache): A new cache for the use of
+	c-inside-bracelist-p, based on the c-parse-state cache.
+	(c-inside-bracelist-p): Use the new cache to call
+	c-looking-at-or-maybe-in-bracelist less often.
+
+	* lisp/progmodes/cc-mode.el (c-basic-common-init): Initialize
+	c-no-bracelist-cache.
+	(c-before-change): Invalidate c-no-bracelist-cache.
+
+2024-12-01  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Fix last change in tutorial.el
+
+	* lisp/tutorial.el (tutorial--point-after-chkeys): Make it
+	permanent-local.  (Bug#74636)
+
+2024-11-30  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Fix exiting Emacs after saving a tutorial
+
+	* lisp/tutorial.el (tutorial--lang)
+	(tutorial--point-before-chkeys): Add both variables as
+	permanent-local, so that saving the tutorial to some file
+	doesn't kill these buffer-local variables.  Otherwise, trying to
+	exit Emacs after saving the tutorial will signal an error,
+	because 'tutorial--lang' is nil.  (Bug#74364)
+
+2024-11-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	afb34a3b239 ; Improve documentation of ':box' face attribute
+	b38eb6da1d1 Fix docstring of c-ts-mode-indent-style
+	9fdb764898d Support PHP 8.4 and more reliable indentation (bug#74525)
+	bda0bce9e43 Don't inadvertently reset frame scroll bar sizes (Bug#74435)
+	3f99cdaf26d Mention special variables in lexical binding documentation
+	0ef0f18f163 Allow to go back to using 'ruby-mode' after loading 'ruby...
+	fc17e8727d4 Delete obsolete section in admin/notes/repo
+	3e396b2c5bb Improve documentation for 'while-let'
+	50b91ed458d Remove mention of treesit-defun-prefer-top-level (bug#74474)
+	03ae07291e8 Fix NS non-native fullscreen on initial frame load (bug#5...
+	8261d7224d3 Fix user options for listing and marking diary files
+
+	# Conflicts:
+	#	lisp/progmodes/c-ts-mode.el
+
+2024-11-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	d9531793206 Make 'jsonrpc-default-request-timeout' a defcustom
+	5339c6f69ee ; Improve example of display-buffer-alist category in ELi...
+	e14007ad631 Update MS-Windows build instructions
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-11-30  altermo  <107814000+altermo@users.noreply.github.com>  (tiny change)
+
+	Add more error-checking to Fmap_charset_chars
+
+	* src/charset.c (Fmap_charset_chars): Signal an error if FROM_CODE
+	or TO_CODE is non-nil and not a fixnum.  (Bug#74555)
+
+2024-11-30  James Cherti  <contact@jamescherti.com>  (tiny change)
+
+	Support hyphen in Bash function names
+
+	* lisp/progmodes/sh-script.el (sh-imenu-generic-expression): Add
+	hyphen to function-name regexp.
+
+2024-11-29  Daniel Mendler  <mail@daniel-mendler.de>
+
+	New function `completion-list-candidate-at-point'
+
+	Replace `completions--start-of-candidate-at' with the new
+	function `completion-list-candidate-at-point' which returns the
+	candidate string and the candidate bounds as a list in the
+	format (STR BEG END).
+
+	* lisp/simple.el (completions--start-of-candidate-at): Remove.
+	(completion-list-candidate-at-point): New function.
+	(choose-completion): Use it.
+	* lisp/minibuffer.el (minibuffer-completion-help): Use it.
+
+2024-11-29  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/c-ts-mode.el: Improve logic of outlines (bug#74448).
+
+	(c-ts-mode--outline-predicate): Instead of checking only for
+	function_declarator nodes at the beginning of line (like in
+	GNU coding style) handle other coding styles that start the
+	function line with either storage class (e.g. static) or type.
+	Suggested by Filippo Argiolas <filippo.argiolas@gmail.com>
+
+2024-11-28  Michael Albinus  <michael.albinus@gmx.de>
+
+	Extend Tramp tests
+
+	* test/lisp/net/tramp-tests.el (tramp-test47-read-password)
+	(tramp-test47-read-otp-password, tramp-test47-read-fingerprint):
+	Use `tramp-default-remote-shell' and
+	`tramp-connection-properties'.  Cleanup at the end.
+	(tramp-test47-read-security-key): New test.
+
+2024-11-28  Andrea Corallo  <acorallo@gnu.org>
+
+	* src/lisp.h (EQ): Improve generated code.
+
+	Outside compilation 'symbols_with_pos_enabled' is always false, so ask
+	the compiler to organize the most likely execution path in a sequential
+	fashion in order to favor run-time performance.
+
+2024-11-27  Juri Linkov  <juri@linkov.net>
+
+	Add command symbol property 'repeat-continue-only' for 'repeat-mode'
+
+	* lisp/repeat.el: (repeat-post-hook): Ignore commands
+	with 'repeat-continue-only' symbol property
+	when repeat was not in progress (bug#74140).
+
+	* test/lisp/repeat-tests.el (repeat-tests-continue-only): New test.
+	(repeat-tests-bind-keys): Prepare for :continue-only.
+
+2024-11-27  Juri Linkov  <juri@linkov.net>
+
+	* test/lisp/repeat-tests.el: Improve using new key mnemonics (bug#74140).
+
+	(repeat-tests-repeat-map): Use :repeat keywords with :enter and :exit
+	for 'defvar-keymap'.
+	(with-repeat-mode): Add new arg 'map' to defmacro.
+	(repeat-tests-check-key, repeat-tests-exit-key)
+	(repeat-tests-keep-prefix): Use new key mnemonics.
+	(repeat-tests-exit-command): New test.
+	(repeat-tests-bind-keys): New test for 'bind-keys' from 'use-package'.
+
+2024-11-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/subr.el (when-let): Reimplement so as to avoid bug#74530.
+
+2024-11-27  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Make Xref commands follow 'display-buffer' customizations
+
+	* lisp/progmodes/xref.el (xref--show-pos-in-buf): Append
+	'(category . xref-jump)' to display-buffer action argument, when
+	the target window or frame is not made explicit by the command.
+	(xref--switch-to-buffer): New function (bug#74361).
+	Do the switch through 'pop-to-buffer' and use the new category.
+	(xref-go-back, xref-go-forward, xref-pop-to-location): Use it.
+	* etc/NEWS: Describe the change.
+
+2024-11-26  Dmitry Gutov  <dmitry@gutov.dev>
+
+	* lisp/files.el (major-mode-remap-alist): Add :tag annotations to :type.
+
+2024-11-26  Michael Albinus  <michael.albinus@gmx.de>
+
+	Support fingerprint readers in Tramp
+
+	* doc/misc/tramp.texi (Frequently Asked Questions): Speak about
+	fingerprint readers.
+
+	* lisp/net/tramp-sh.el (tramp-actions-before-shell):
+	Use `tramp-fingerprint-prompt-regexp'.
+
+	* lisp/net/tramp.el (tramp-wrong-passwd-regexp): Add fingerprint
+	messages.
+	(tramp-fingerprint-prompt-regexp, tramp-use-fingerprint):
+	New defcustoms.
+	(tramp-action-fingerprint, tramp-action-show-message): New defuns.
+	(tramp-action-show-and-confirm-message): Start check at (point-min).
+
+	* test/lisp/net/tramp-tests.el (tramp-test47-read-fingerprint):
+	New test.
+
+2024-11-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(undo-delta): Handle `apply` elements (bug#74523)
+
+	* lisp/simple.el (undo-delta): Handle `apply` elements.
+
+	* test/lisp/simple-tests.el (simple-tests--undo-apply): New test.
+	(simple-tests--undo-equiv-table): Adjust test so it's not influenced by
+	previous operation.
+
+2024-11-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	Extend Tramp FAQ
+
+	* doc/misc/tramp.texi (Frequently Asked Questions): Improve index.
+	Recommend `small-temporary-file-directory' for ssh sockets.
+
+2024-11-24  Aaron Jensen  <aaronjensen@gmail.com>
+
+	Silence warning message in NS (bug#59790)
+
+	* src/nsterm.m ([EmacsWindow createToolbar:]): Disable toolbar when
+	fullscreen.
+
+2024-11-24  Aaron Jensen  <aaronjensen@gmail.com>
+
+	Remove NS non-native fullscreen pause (bug#28443)
+
+	* src/nsterm.m (ns_fullscreen_hook): Remove timer workaround
+
+2024-11-24  Jim Porter  <jporterbugs@gmail.com>
+
+	Remove 'eshell-escape-arg'
+
+	Eshell no longer needs this function, since all command parsing is
+	performed first, with special syntax annotated with text properties as
+	needed, as opposed to marking literal text with a property (bug#54486).
+
+	* lisp/eshell/em-pred.el (eshell-modifier-alist): Make "q" modifier
+	obsolete.
+	(eshell-modifier-help-string): Remove mention of "q".
+
+	* lisp/eshell/esh-arg.el (eshell-escape-arg): Make obsolete.
+	(eshell-parse-backslash, eshell-parse-literal-quote)
+	(eshell-parse-double-quote): Don't call 'eshell-escape-arg'.
+
+	* lisp/eshell/esh-var.el (eshell-parse-variable): Don't call
+	'eshell-escape-arg'.
+
+	* test/lisp/eshell/em-extpipe-tests.el (em-extpipe-test-2)
+	(em-extpipe-test-9, em-extpipe-test-11): Remove 'eshell-escape-arg'.
+
+	* test/lisp/eshell/em-pred-tests.el (em-pred-test/modifier-quote):
+	Remove test.
+
+	* test/lisp/eshell/esh-var-tests.el
+	(esh-var-test/quoted-interp-var-indices)
+	(esh-var-test/quote-interp-var-indices-subcommand): Remove workaround in
+	tests.
+
+	* doc/misc/eshell.texi (Argument Modifiers): Remove documentation of
+	obsolete "q" modifier.
+
+2024-11-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(dir-locals-collect-variables): Don't autoload if not needed (bug#74349)
+
+	While dir-local settings for `c-mode` may require (auto)loading `cc-mode.el`
+	to get all the `safe-local-variable` properties, they may not.  So before
+	(auto)loading that file, make sure we don't already have all the
+	`safe-local-variable` properties we need.
+
+	* lisp/files.el (dir-locals--load-mode-if-needed): New function.
+	(hack-one-local-variable): Don't inf-loop if `eval` calls a major mode.
+	(dir-locals-collect-variables): Use `dir-locals--load-mode-if-needed`.
+
+2024-11-24  john muhl  <jm@pub.pink>
+
+	Avoid loading 'rx' at runtime in 'lua-ts-mode'
+
+	* lisp/progmodes/lua-ts-mode.el (lua-ts-inferior-lua):
+	Replace 'rx-to-string' and substitution with 'rx' and 'literal'.
+	(Bug#74499)
+
+2024-11-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Improve marking if-let and when-let obsolete
+
+	* lisp/subr.el (if-let): Use a declaration instead of
+	make-obsolete.
+	(when-let): Use a declaration instead of make-obsolete.  Use
+	with-suppressed-warnings to avoid generating two warnings.
+
+2024-11-23  Eshel Yaron  <me@eshelyaron.com>
+
+	Give Completion Preview bindings higher precedence
+
+	* lisp/completion-preview.el
+	(completion-preview-active-mode): add keymap to
+	'minor-mode-overriding-map-alist' so it takes precedence
+	over other minor mode maps that bind TAB, such as
+	'eshell-cmpl-mode' in Eshell.  (bug#74404)
+
+2024-11-23  Christophe Troestler  <Christophe.Troestler@umons.ac.be>
+
+	Rust ts: fontify as type the possible suffix of number literals
+
+	* lisp/progmodes/rust-ts-mode.el
+	(rust-ts-mode--fontify-number-literal): Perform the improved
+	fontification of numbers.  (Bug#73877)
+	* test/lisp/progmodes/rust-ts-mode-tests.el:
+	* test/lisp/progmodes/rust-ts-mode-resources/font-lock.rs:
+	* test/lisp/progmodes/rust-ts-mode-resources/font-lock-number.rs:
+	Add tests for the new optional fontification of the possible type
+	suffix of numbers.
+
+2024-11-23  Michael Albinus  <michael.albinus@gmx.de>
+
+	Improve robustness of auth-source-pass.el
+
+	* lisp/auth-source-pass.el (auth-source-pass--read-entry):
+	Ensure, that `epa-file-handler' is active.  (Bug#67937)
+
+2024-11-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	74a972cace6 Skip proced refine tests on Darwin
+	c50ce03afc1 ; Fix recent additions to the manuals
+	c818c5bbafd ; * lisp/term/w32-win.el (tree-sitter--library-abi): Decl...
+	b71d3b2f52f ; Better clarify function types in C-h f (bug#73626)
+	59b3eae481d ; Introduce type specifiers to the elisp manual (bug#73626)
+	83fc3cf53a4 Future-proof loading tree-sitter library on MS-Windows
+	3eb30186825 ; Improve documentation of 'category' in display-buffer a...
+	4d80c4f4858 ; More accurate documentation of 'set-mark-command'
+	70dd5705e11 Fix overriding 'c-ts-mode' by 'c-mode'
+	331610aef05 ; Improve vc-dir help-echo
+	9c484d51012 ; Avoid assertion violations in "temacs -Q"
+	8dc9dfdc381 lisp/progmodes/c-ts-mode.el: Demote loading c-ts-mode as ...
+	426bce8a675 ; In PROBLEMS mention issue with .Xresources on Gnome des...
+
+2024-11-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	fc52cb8d741 ; etc/NEWS: Fix example indentation.
+	81816800628 Improve the documentation of major-mode remapping
+	0856360d80c ; Fix typo in recent change
+	d4f81f716ae Improve 'which-key-special-keys' docstring
+	926d47ab2ca Don't error in Proced tests if %CPU is a NaN
+
+2024-11-22  Eshel Yaron  <me@eshelyaron.com>
+
+	New option 'flyspell-delay-use-timer'
+
+	* lisp/textmodes/flyspell.el (flyspell-delay-use-timer):
+	New user option.
+	(flyspell--timer): New variable.
+	(flyspell-check-word-p): Use them.
+	(flyspell-post-command-hook): Disable timer.
+	(flyspell-word): Pass non-nil SECONDS argument to
+	'accept-process-output' to avoid blocking when called from a
+	timer, in which case quitting is inhibited.
+	* etc/NEWS: Announce new option.  (bug#74437)
+
+2024-11-21  Sean Devlin  <spd@toadstyle.org>
+
+	Use prefix argument in 'package-install-selected-packages'
+
+	* lisp/emacs-lisp/package.el (package-install-selected-packages):
+	When invoked with a prefix argument, skip user confirmation when
+	installing packages.
+	* etc/NEWS: Announce the prefix argument usage.  (Bug#73932)
+
+2024-11-21  Sean Devlin  <spd@toadstyle.org>
+
+	Add noconfirm to 'package-autoremove'
+
+	* lisp/emacs-lisp/package.el (package-autoremove):
+	Add optional argument NOCONFIRM to skip user confirmation when removing
+	packages.
+	* etc/NEWS: Announce the new argument.  (Bug#73932)
+
+2024-11-20  Gerd Möllmann  <gerd@gnu.org>
+
+	Consider all windows for redisplay if frames have been cleared
+
+	* src/xdisp.c (clear_garbaged_frames): Return true if any tty frame's
+	current matrix has been cleared.
+	(redisplay_internal): Consider all windows if clear_garbaged_frames
+	returns true.
+
+2024-11-20  Gerd Möllmann  <gerd@gnu.org>
+
+	* src/xdisp.c (redisplay_internal): Use assq_no_quit.
+
+2024-11-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/cus-face.el: Provide completion for font families
+	(bug#74362).
+
+	* lisp/cus-edit.el (custom-face--font-cache-timeout): New var.
+	(custom-face--font-completion): New function.
+	* lisp/cus-face.el (custom-face-attributes): Use it.
+
+2024-11-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	man.el: Guess flags for `man -k` to fix bug#73656
+
+	* lisp/man.el (Man-man-k-flags): New var.
+	(Man-completion-table): Use it.
+
+2024-11-17  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp: Be more conservative in removing temporary files
+
+	* test/lisp/net/tramp-tests.el (Commentary): Extend.
+	(tramp--test-enabled): Exclude also old FUSE mount points from
+	deletion.
+
+2024-11-16  Andrea Corallo  <acorallo@gnu.org>
+
+	* src/pdumper.c (dump_interval_node): Fix itree_node struct hash.
+
+2024-11-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix font-lock in 'lisp-mode'
+
+	* lisp/emacs-lisp/lisp-mode.el (lisp-fdefs): Fix regexps for
+	"\\<>" and similar constructs.  (Bug#74307)
+
+2024-11-16  Trevor Murphy  <trevor.m.murphy@gmail.com>
+
+	Add new `header-line-active' and `header-line-inactive' faces
+
+	This is all intended to parallel the 'mode-line-active' and
+	'mode-line-inactive' distinction.
+	* doc/emacs/display.texi (Standard Faces): Document the new faces.
+
+	* lisp/faces.el (header-line-active, header-line-inactive): New
+	faces.
+
+	* src/dispextern.h (CURRENT_HEADER_LINE_ACTIVE_FACE_ID_3)
+	(CURRENT_HEADER_LINE_ACTIVE_FACE_ID): New macros based on mode
+	line equivalents.
+	(face_id): New face IDs.
+	* src/xdisp.c (window_box_height, pos_visible_p, init_iterator)
+	(window_text_pixel_size, display_mode_lines, display_mode_line)
+	(format-mode-line): Replace all uses of HEADER_LINE_FACE_ID with
+	either a new macro or the new face IDs.
+	* src/xfaces.c (syms_of_xfaces): New lisp symbols.
+	(lookup_basic_face, realize_basic_faces): Map new face IDs to
+	their lisp symbols.  (Bug#73862)
+
+2024-11-16  Gerd Möllmann  <gerd@gnu.org>
+
+	Revert "Don't pause display for pending input"
+
+	This reverts commit f62d70f52f4f6b7ed158d618bf790df21f171172.
+
+2024-11-16  Gerd Möllmann  <gerd@gnu.org>
+
+	Revert "Remove an unused parameter"
+
+	This reverts commit 627cbf05b53756883a789ff45727acf23f5066a4.
+
+2024-11-16  Gerd Möllmann  <gerd@gnu.org>
+
+	Remove an unused parameter
+
+	* src/dispnew.c (combine_updates): Remove unused parameter inhibit_scrolling.
+	* src/xdisp.c (redisplay_internal): Adjust caller.
+	* src/dispextern.h: Change function prototype.
+
+2024-11-16  Gerd Möllmann  <gerd@gnu.org>
+
+	Merge branch 'master' into scratch/tty-child-frames
+
+2024-11-16  Gerd Möllmann  <gerd@gnu.org>
+
+	Don't pause display for pending input
+
+	* src/dispnew.c: Remove display_completed, redisplay_dont_pause,
+	redisplay-dont-pause was declared obsolete in Emacs 24.  Remove anything
+	checking pending input, change function signatures accordingly, and so
+	on.
+
+	* src/keyboard.c (read_char): Don't use redisplay_dont_pause.
+	* src/minibuf.c (read_minibuf): Use new function signatures.
+	* src/xdisp.c: Don't check display_completed. Use new API.
+
+	* lisp/subr.el (redisplay-dont-pause): Remove declaration.
+
+2024-11-15  Bruno Boal  <egomet@bboal.com>  (tiny change)
+
+	Fix customization type of erc-spelling-dictionaries
+
+	* lisp/erc/erc-spelling.el (erc-spelling-dictionaries): Update :type
+	specification to reflect shape expected by `erc-spelling-init', and
+	improve description in doc string.  (Bug#74363)
+
+2024-11-15  F. Jason Park  <jp@neverwas.me>
+
+	Use helper to get erc-networks--id symbol as string
+
+	* lisp/erc/erc-networks.el (erc-networks--id-string): New function.
+	(erc-networks--construct-target-buffer-name)
+	(erc-networks--ensure-unique-server-buffer-name)
+	(erc-networks--rename-server-buffer): Use it.
+	* lisp/erc/erc-nicks.el (erc-nicks-list-faces): Use it.
+	* lisp/erc/erc-status-sidebar.el (erc-status-sidebar-pad-hierarchy): Use it.
+	* lisp/erc/erc.el (erc-generate-new-buffer-name)
+	(erc-log-irc-protocol)
+	(erc--auth-source-determine-params-defaults)
+	(erc-format-target-and/or-network): Use it.
+	* test/lisp/erc/erc-networks-tests.el (erc-networks--id-string): New test.
+
+2024-11-15  Michael Albinus  <michael.albinus@gmx.de>
+
+	Merge from origin/emacs-30
+
+	c29c54410ea * lisp/subr.el (read-number): Document collision with 'fo...
+	68337106f91 ; Fix TRAMP manual indexing
+	8f6ff233ef1 ; TRAMP manual spelling and grammar fixes
+
+2024-11-15  Michael Albinus  <michael.albinus@gmx.de>
+
+	Remove Tramp temp files if advised during tests
+
+	* lisp/net/tramp-fuse.el (tramp-fuse-name-prefix): New defconst.
+	(tramp-fuse-mount-point): Use it.
+
+	* test/lisp/net/tramp-tests.el (tramp-test-name-prefix): New defconst.
+	(tramp--test-make-temp-name, tramp-test40-make-nearby-temp-file)
+	(tramp-test47-read-password, tramp-test47-read-otp-password):
+	Use it.
+	(tramp--test-enabled-checked): Move down.
+	(tramp--test-enabled): Delete all Tramp temp files when
+	environment variable $TRAMP_TEST_CLEANUP_TEMP_FILES is set.
+	(tramp-test02-file-name-dissect-separate):
+	Adapt `tramp-crypt-directories' according to syntax.
+	(tramp-test47-read-password):
+	Let-bind `tramp-connection-properties' instead of modifying
+	`tramp-methods'.
+
+2024-11-15  Gerd Möllmann  <gerd@gnu.org>
+
+	Respect redisplay_dont_pause in combined update
+
+	* src/dispnew.c (combine_updates): Respect redisplay_dont_pause. This is
+	important for echo_area_display which binds that variable.
+
+2024-11-15  Roland Winkler  <winkler@gnu.org>
+
+	New user option bibtex-entry-ask-for-key
+
+2024-11-14  Jim Porter  <jporterbugs@gmail.com>
+
+	Don't clobber stickiness text properties when printing Eshell prompt
+
+	* lisp/eshell/em-prompt.el (eshell--append-text-property): New
+	function...
+	(eshell-emit-prompt): ... use it.
+
+	* test/lisp/eshell/em-prompt-tests.el
+	(em-prompt-test/field-properties/merge-stickiness): New test.
+	(em-prompt-test/field-properties, em-prompt-test/after-failure): Reorder
+	stickiness values (bug#74230).
+
+2024-11-14  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix errors in Tramp's password cache expiration
+
+	* doc/misc/tramp.texi (Password handling): Mention expiration of
+	cached passwords when a session timeout happens.
+
+	* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection): Rename
+	file property "process-attributes" to connection property
+	" process-attributes".
+
+	* lisp/net/tramp.el (tramp-read-passwd):
+	* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
+	* lisp/net/tramp-sudoedit.el (tramp-sudoedit-send-command):
+	Rename connection property "password-vector" to "pw-vector".
+
+	* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
+	Use connection property "hop-vector".
+
+	* lisp/net/tramp.el (tramp-get-process-attributes)
+	(tramp-handle-list-system-processes): Rename file property
+	"process-attributes" to connection property " process-attributes".
+	(tramp-compute-multi-hops): Check for
+	`tramp-sh-file-name-handler-p', it works only for this.
+	(tramp-action-password, tramp-process-actions): Use connection
+	property "hop-vector".
+	(tramp-read-passwd, tramp-clear-passwd): Rewrite.  (Bug#74105)
+
+2024-11-14  Cecilio Pardo  <cpardo@imayhem.com>
+
+	Fix drag-n-drop on MS-Windows
+
+	* src/w32fns.c (struct w32_drop_target): New member 'ref_count'.
+	(w32_drop_target_AddRef): Increment reference count.
+	(w32_drop_target_Release): Decrement reference count, and free the
+	target only if the reference count is zero.
+	(w32_createwindow): Initialize reference count.  (Bug#74312)
+
+2024-11-14  Michael Albinus  <michael.albinus@gmx.de>
+
+	Merge from origin/emacs-30
+
+	f69f54c454e Improve font-locking and indentation in 'php-ts-mode'
+	27aacbd172f Fix some 'lua-ts-mode' options (Bug#74235)
+	a0613372a7b ; Update the xwidgets-on-NS text due to fixing bug#60703
+	d5928325045 Improve comment indenting in 'lua-ts-mode'
+	6bc44ccf287 Update 'xref-num-matches-found' when reverting *xref* buffer
+	8afcfed825a * lisp/files.el (require-with-check): Fix last fix (bug#7...
+	3496234c8ed lisp/files.el (require-with-check): Fix bug#74091.
+	90c97d3fac9 Fix handling of permanent-local variables in 'kill-all-lo...
+	c96e5760907 Precise password cache in Tramp
+	3954e8d9bbe Fix picture-mode with full-width characters
+	7dabfe9465c Fix movement to the left in picture-mode
+
+	# Conflicts:
+	#	lisp/net/tramp.el
+
+2024-11-14  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Preserve selected candidate across *Completions* update
+
+	When *Completions* is updated and point was on some completion
+	candidate, move point to the same candidate after the update.
+
+	Also, a selected completion in *Completions* is now always
+	highlighted, even if it was selected by the user or other code
+	moving point rather than by minibuffer-next-completion, because
+	cursor-face-highlight-nonselected-window is now set in
+	completion-setup-function.
+
+	Other completion UIs (e.g. ido, vertico, etc) effectively have
+	this behavior: whenever they update the list of completions,
+	they preserve whatever candidate is selected.  This matters a
+	lot when completions are auto-updated, but is still useful
+	without auto-updating.  Including this behavior is a step
+	towards supporting auto-updating in the default completion UI.
+
+	* lisp/minibuffer.el (minibuffer-completion-help): Preserve the
+	selected completion candidate across updates. (bug#74019)
+	(minibuffer-hide-completions): Move point to BOB.
+	(minibuffer-next-completion): Don't set
+	cursor-face-highlight-nonselected-window.
+	* lisp/simple.el (completions--start-of-candidate-at)
+	(choose-completion): Extract the current-completion-finding code
+	into a separate function.
+	(completion-setup-function): Set
+	cursor-face-highlight-nonselected-window.
+	* etc/NEWS: Announce new behavior.
+
+2024-11-14  john muhl  <jm@pub.pink>
+
+	Add song viewer to 'mpc' (Bug#74200)
+
+	* lisp/mpc.el (mpc-describe-song): New command.
+	(mpc-mode-map): Bind "d" to 'mpc-describe-song'.
+	(mpc-mode-menu): Add menu item.
+	(mpc-secs-to-time): Ensure secs argument is an integer.
+	(mpc-song-viewer-empty, mpc-song-viewer-tag):
+	(mpc-song-viewer-value): New face.
+	(mpc-song-viewer-tags): New option.
+
+2024-11-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete commented out help--describe-vector implementation
+
+	This was an attempt at lifting 'help--describe-vector' to Lisp that
+	turned out to be prohibitively slow.  It is still there in the Git log
+	if we need to refer back to it.  Currently, it is just dead weight, so
+	delete it.
+
+	* lisp/help.el: Delete commented out code.
+
+2024-11-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add docstring to gnus-group-toggle-subscription
+
+	* lisp/gnus/gnus-group.el (gnus-group-toggle-subscription): Add
+	docstring.
+
+2024-11-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp: Rework handling of temporary connection properties
+
+	* doc/misc/tramp.texi (Ad-hoc multi-hops): Precise use of parallel
+	multi-hops.
+
+	* lisp/net/tramp-cache.el:
+	* lisp/net/tramp.el:
+	* lisp/net/tramp-adb.el:
+	* lisp/net/tramp-androidsu.el:
+	* lisp/net/tramp-cmds.el:
+	* lisp/net/tramp-crypt.el:
+	* lisp/net/tramp-gvfs.el:
+	* lisp/net/tramp-sh.el:
+	* lisp/net/tramp-smb.el: Rename connection properties "process-name",
+	"process-buffer" and "first-password-request" to " process-name",
+	" process-buffer" and " first-password-request, repectively".
+
+	* lisp/net/tramp-cache.el (tramp-dump-connection-properties):
+	Don't dump properties starting with a space.
+
+2024-11-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(with-peg-rules): Build proper `peg-function`s
+
+	* lisp/progmodes/peg.el (with-peg-rules): Use the new (FUNC EXP)
+	feature in `cl-labels`.
+
+2024-11-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(cl-labels): Add support for (FUNC EXP) bindings (bug#59786)
+
+	Allow `cl-labels` to use the same (FUNC EXP) bindings as were already added
+	to `cl-flet` in Emacs-25.  The Info doc (mistakenly) already documented this
+	new feature.
+
+	* lisp/emacs-lisp/cl-macs.el (cl--self-tco-on-form): New function.
+	(cl-labels): Use it to add support for (FUNC EXP) bindings.
+
+	* test/lisp/emacs-lisp/cl-macs-tests.el (cl-macs--labels): Add test for
+	tail-recursive (FUNC EXP) bindings.
+
+2024-11-12  Gerd Möllmann  <gerd@gnu.org>
+
+	Fix a FIXME In redisplay_internal
+
+	* src/xdisp.c (redisplay_internal): Compare root frames before
+	setting the frame garbaged.
+
+2024-11-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix Cygw32 build
+
+	* src/pdumper.c (dump_mm_heap_cb_release): Avoid NULL pointer
+	dereference.
+	* src/w32dwrite.c (INITGUID) [CYGWIN]: Don't define for Cygwin.
+	* src/w32menu.c (w32_popup_dialog): Fix Cygw32 build.  (Bug#74312)
+
+2024-11-11  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/w32fns.c (process_dropfiles): Fix cygw32 build (bug#74312).
+
+2024-11-10  Gerd Möllmann  <gerd@gnu.org>
+
+	Change interface of prepare_desired_root_row
+
+	* src/dispnew.c (prepare_desired_root_row): Return NULL if we can't
+	prepare the row.
+	(produce_box_line, copy_child_glyphs): Callers changed accordingly.
+
+2024-11-10  Gerd Möllmann  <gerd@gnu.org>
+
+	Another case of copying from non-enabled glyphs (bug#74274)
+
+	* src/dispnew.c (build_frame_matrix_from_leaf_window): If current window
+	row is not enabled, don't copy from it.
+
+2024-11-10  Jim Porter  <jporterbugs@gmail.com>
+
+	When using Eshell's "du" implementation, deduplicate hard links
+
+	* lisp/eshell/em-unix.el (eshell-du-sum-directory): Take SEEN-FILES.
+	(eshell/du): Create 'seen-files' hash table.
+
+2024-11-10  Jim Porter  <jporterbugs@gmail.com>
+
+	Don't use dynamically-bound variables for Eshell's "du" command
+
+	* lisp/eshell/em-unix.el (block-size, by-bytes, dereference-links)
+	(grand-total, human-readable, max-depth, only-one-filesystem, show-all)
+	(eshell-du-size-string): Remove.
+	(eshell-du-sum-directory): Accept key arguments for adjusting behavior.
+	(eshell/du): Use 'block-size' of 1 instead of 'by-bytes', and define a
+	print function.
+
+2024-11-10  Jim Porter  <jporterbugs@gmail.com>
+
+	Use the Lisp implemention of "du" in Eshell when querying remote dirs
+
+	* lisp/eshell/em-unix.el (eshell/du): If all directories are local, use
+	the external "du" instead.
+
+2024-11-10  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't pcomplete 'find -newerxy' flag
+
+	* lisp/pcmpl-gnu.el (pcomplete/find): Remove -newerxy flag.
+	This flag is not used verbatim like that, and we already complete
+	the "-newer" flag, which should be all that users need.
+	Problem reported by Juri Linkov <juri@linkov.net>.
+
+2024-11-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	dbcd9d782c9 Fix documentation and error message of adding local varia...
+	94bf7ad797b Document the 'display-line-numbers-disable' property
+	b1be0f2ba6b Document issues with 'use-package's ':custom' and byte co...
+	775970a7831 ; * src/ftcrfont.c (ftcrhbfont_end_hb_font): Improve comm...
+	9149aa89ee8 Fix display of compositions when font style changes (Cair...
+	3bf00777be1 ; * src/xdisp.c (face_before_or_after_it_pos): Fix thinko...
+
+2024-11-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	3231af3727b Improve 'open-network-stream' documentation.
+	fb55431c44e ; Fix typos in case-conversion descriptions
+	83f095d1fd4 ; Fix typo and indexing in the ELisp manual
+	37b1799c9e5 ; Instrument proced-tests.el further
+	03fa832b4dc Improve Tramp documentation on direct async processes
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-11-09  Ola Nilsson  <ola.nilsson@gmail.com>
+
+	Add functions supported by GNU Make 4.3.
+
+	* lisp/progmodes/make-mode.el (makefile-gnumake-functions-alist):
+	Add missing GNU Make functions, according to The GNU Make Manual
+	0.75 for GNU Make, and reorder the list of functions.  (Bug#74207)
+
+2024-11-09  David Ponce  <da_vid@orange.fr>
+
+	Fix 'string-pixel-width' to not reset 'display-line-numbers'
+
+	* lisp/emacs-lisp/subr-x.el (string-pixel-width): Use the
+	'display-line-numbers-disable' property instead of setting the
+	variable 'display-line-numbers', to avoid global effects.
+	(Bug#73005)
+
+2024-11-09  Joseph Turner  <joseph@breatheoutbreathe.in>
+
+	Replace vtable--color-blend with color-blend
+
+	* lisp/emacs-lisp/vtable.el (vtable--face-color): Use `color-blend'.
+	(vtable--color-blend): Remove unused function.
+
+2024-11-09  Joseph Turner  <joseph@breatheoutbreathe.in>
+
+	Add color-blend to blend two RGB lists
+
+	* lisp/color.el (color-blend): Blend two RGB lists.
+	* test/lisp/color-tests.el (color-tests-blend): Test color-blend.
+	* etc/NEWS: Announce color-blend.
+
+2024-11-09  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Fix tmm "previous menu" shortcut
+
+	* lisp/tmm.el (tmm-clear-self-insert-and-exit): New function to
+	clear the minibuffer content then call `self-insert-and-exit'.
+	(tmm-define-keys): Use it.
+	(tmm-goto-completions): Explain why.  (Bug#74166)
+
+2024-11-09  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	`tmm-shortcut-inside-entry' docstring fix (bug#74111)
+
+	* lisp/tmm.el (tmm-shortcut-inside-entry): Doc fix.
+
+2024-11-09  Joost Kremers  <joostkremers@fastmail.com>
+
+	Update vtable documentation
+
+	* doc/misc/vtable.texi: Document creation of empty vtables.
+	* etc/NEWS: Announce empty vtables.  (Bug#73775)
+
+2024-11-09  Joost Kremers  <joostkremers@fastmail.com>
+
+	vtable: allow resetting column alignment when table data changes
+
+	* lisp/emacs-lisp/vtable.el (vtable--compute-columns): If a column
+	was not created with an explicit 'align' property, allow changing
+	this property when the column data changes from numeric to
+	non-numeric (or vice versa).  This makes it possible to add data to
+	an empty table, because in a table without data all columns are
+	assumed to be numeric and right-aligned.  (Bug#73775)
+
+2024-11-09  Joost Kremers  <joostkremers@fastmail.com>
+
+	Enable inserting new objects into empty vtable
+
+	* lisp/emacs-lisp/vtable.el (vtable-insert-object): If the vtable
+	is empty, add the new object and recreate + redisplay the table.
+	(Bug#73775)
+
+2024-11-09  Joost Kremers  <joostkremers@fastmail.com>
+
+	Allow empty vtable
+
+	* lisp/emacs-lisp/vtable.el (vtable--compute-widths): Set default
+	width for columns that have no explicit width and no data.
+	(Bug#73775)
+
+2024-11-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Add dark color scheme to emacs.metainfo.xml
+
+	* etc/emacs.metainfo.xml: Add dark color scheme.  Patch by Peter
+	Oliver <p.d.oliver@mavit.org.uk> (bug#74123).
+
+2024-11-09  Peter Oliver  <git@mavit.org.uk>
+
+	Add more fields to AppStream metadata in emacs.metainfo.xml
+
+	* etc/emacs.metainfo.xml: Populate the vcs-browser and contribute URLs,
+	as well as the branding color.  (Bug#74123)
+
+2024-11-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp: Support different proxies for the same destination
+
+	* doc/misc/tramp.texi (Ad-hoc multi-hops): New subsection "Using
+	different proxies for the same destination".
+
+	* etc/NEWS: Tramp supports different proxies for the same
+	destination host name in parallel.
+	Fix typos.
+
+	* lisp/net/tramp-cmds.el (tramp-cleanup-connection): Fix docstring.
+
+	* lisp/net/tramp.el (tramp-make-tramp-file-name): Don't call
+	`tramp-add-hops' during file name completion.
+	(tramp-handle-file-name-as-directory)
+	(tramp-handle-file-name-directory): Use `tramp-cache-undefined'
+	for an empty `tramp-default-proxies-alist'.
+	(tramp-add-hops): Extend.  Remove existing entries with same
+	target and different proxy, if needed.  (Bug#74219)
+
+2024-11-09  Ethan Kong  <ek.ethan.kong@gmail.com>
+
+	Fix 'internal_equal' so that it uses at most one hash table
+
+	The old implementation passed the hash table by value in
+	recursive tests, which would cause each recursive level to
+	initialize its own hash table, causing excess memory usage.
+	* src/fns.c (internal_equal): Delegate to 'internal_equal_1'.
+	(internal_equal_1): New function; body from old 'internal_equal'.
+	Pass the hash table argument by reference instead of by value.
+	(Bug#73883)
+
+2024-11-09  Gerd Möllmann  <gerd@gnu.org>
+
+	Don't copy from non-enabled current glyphs (bug#74274)
+
+	* src/dispnew.c (prepare_desired_root_row): Check if current row is
+	enabled.
+
+2024-11-08  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	time-stamp: minor adjustments to %P and modifier characters
+
+	* lisp/time-stamp.el (time-stamp-string-preprocess): %P variations;
+	allow (and ignore) "*", "E", and "O" as modifier characters.
+	(time-stamp-inserts-lines): safe-local-variable only if booleanp
+
+2024-11-08  Philip Kaludercic  <philipk@posteo.net>
+
+	Do not suggest packages outside of 'fundamental-mode'
+
+	* lisp/emacs-lisp/package.el (package--autosuggest-find-candidates):
+	Check 'major-mode' before computing suggestions.
+
+2024-11-08  Philip Kaludercic  <philipk@posteo.net>
+
+	Merge branch 'master' into feature/package-autosuggest
+
+2024-11-08  Stefan Kangas  <stefankangas@gmail.com>
+
+	Update special attributes for Python 3.13
+
+	* lisp/progmodes/python.el (python-font-lock-keywords-level-2)
+	(python--treesit-special-attributes): Update special attributes,
+	making it current for Python 3.13.
+
+2024-11-07  Jim Porter  <jporterbugs@gmail.com>
+
+	Always print the expanded directory name for Eshell's "pwd" command
+
+	* lisp/eshell/em-dirs.el (eshell-pwd-convert-function): Default to
+	'expand-file-name' on all systems.
+
+	* etc/NEWS: Announce this change.
+
+2024-11-07  Robert Pluim  <rpluim@gmail.com>
+
+	Ensure `move-frame-functions' trigger on macOS frame resize
+
+	* src/nsterm.m ([EmacsView windowWillResize:toSize:]): Call
+	windowDidMove to ensure that MOVE_FRAME_EVENT events are
+	generated when a frame is resized.  (Bug#74074)
+
+2024-11-07  Daniel Watson  <ozzloy@each.do>  (tiny change)
+
+	When submitting files in EWW, only send the file's basename
+
+	* lisp/net/eww.el (eww-submit): Send the basename, not the full
+	filename (bug#65973).
+
+2024-11-07  Ulf Jasper  <ulf.jasper@web.de>
+
+	* lisp/net/newst-plainview.el: Fix Bug#74198
+
+	* lisp/net/newst-plainview.el
+	(newsticker--do-mark-item-at-point-as-read): Save feed cache immediately
+	when item state is changed. (Bug#74198)
+
+2024-11-07  Philip Kaludercic  <philipk@posteo.net>
+
+	Demote errors when failing to install package suggestions
+
+	* lisp/emacs-lisp/package.el
+	(package--autosuggest-install-and-enable): Wrap
+	'package-install' and following code in a 'with-demoted-errors'.
+
+2024-11-07  Philip Kaludercic  <philipk@posteo.net>
+
+	Drop comments indicating origin of package sugggestions
+
+	* admin/scrape-elpa.el (scrape-elpa): Do it.
+	* etc/package-autosuggest.eld: Regenerate file.
+
+2024-11-07  Philip Kaludercic  <philipk@posteo.net>
+
+	Distinguish between suggested packages and major modes
+
+	* admin/scrape-elpa.el (scrape-elpa): Infer package names from
+	autoloads file.
+	* etc/package-autosuggest.eld: Recompute database.
+	* lisp/emacs-lisp/package.el (package-autosuggest-database):
+	Update documentation to clarify how the major mode can be
+	explicitly indicated.
+	(package--suggestion-applies-p): Handle the optional fourth
+	element.
+
+2024-11-07  Philip Kaludercic  <philipk@posteo.net>
+
+	Update 'package-autosuggest' database
+
+	* admin/scrape-elpa.el (scrape-elpa): Detect 'add-to-list'
+	expressions that are "hidden" under a 'progn'.
+	* etc/package-autosuggest.eld: Re-generate database with more
+	packages (after having run "make autoloads") and with the above
+	improvement.
+
+2024-11-07  Kierin Bell  <fernseed@fernseed.me>
+
+	Enable guidance for Northern Iroquoian input methods
+
+	* lisp/leim/quail/iroquoian.el: Set GUIDANCE argument of
+	'quail-define-package' forms to non-nil.  (Bug#74170)
+
+2024-11-07  Philip Kaludercic  <philipk@posteo.net>
+
+	Do not enable 'package-autosuggest-mode' by default
+
+	As the feature is intrusive and can slow down startup time it is
+	safer to disable the feature by default.
+
+	* doc/emacs/package.texi (Package Installation): Explicitly
+	mention the minor mode in the manual.
+	* etc/NEWS: Document it here as well.
+	* lisp/emacs-lisp/package.el (package-autosuggest-mode): Change
+	default value to nil and autoload it.
+
+2024-11-07  Philip Kaludercic  <philipk@posteo.net>
+
+	* etc/NEWS: Mention 'package-autosuggest'
+
+	* doc/emacs/package.texi: Document 'package-autosuggest'
+
+2024-11-07  Kierin Bell  <fernseed@fernseed.me>
+
+	New input methods for Northern Iroquoian languages
+
+	* lisp/leim/quail/iroquoian.el: New file.  (Bug#74170)
+
+	* etc/NEWS: Announce the new input methods.
+
+2024-11-07  Gerd Möllmann  <gerd@gnu.org>
+
+	Fix hiding tips from pre-command-hook
+
+	* lisp/tty-tip.el (tty-tip-mode): Put #'tty-tip--hide on the
+	pre-command-hook.
+
+2024-11-06  Stefan Kangas  <stefankangas@gmail.com>
+
+	* etc/symbol-releases.eld: Add version=, version<, version<=.
+
+2024-11-06  Philip Kaludercic  <philipk@posteo.net>
+
+	Add command to scrape ELPA for package suggestions
+
+	* admin/scrape-elpa.el (scrape-elpa): Add new command.
+	* etc/package-autosuggest.eld: Generate file using 'scrape-elpa'.
+
+2024-11-06  Philip Kaludercic  <philipk@posteo.net>
+
+	Update mode line after rejecting a suggestion
+
+	* lisp/emacs-lisp/package.el (package-autosuggest): Call
+	'force-mode-line-update' if it would make sense.
+
+2024-11-06  Philip Kaludercic  <philipk@posteo.net>
+
+	Create separate 'package-autosuggest-style' user option
+
+	* lisp/emacs-lisp/package.el (package-autosuggest-mode): Extract
+	part of the logic into a separate user option.
+	(package--autosuggest-suggested, package--suggestion-applies-p)
+	(package--autosugest-line-format)
+	(package--autosuggest-after-change-mode): Respect the change.
+
+2024-11-06  Philip Kaludercic  <philipk@posteo.net>
+
+	Ensure a valid value for 'package-autosuggest-mode'
+
+	* lisp/emacs-lisp/package.el (package-autosuggest-mode): If
+	'define-minor-mode' sets the value of the variable to t, then we
+	will override this to the default value.
+
+2024-11-06  Philip Kaludercic  <philipk@posteo.net>
+
+	Improve package-autosuggest documentation
+
+	* lisp/emacs-lisp/package.el (package-autosuggest-database)
+	(package-autosuggest-mode, package--autosuggest-suggested)
+	(package--suggestion-applies-p)
+	(package--autosuggest-find-candidates)
+	(package--autosuggest-install-and-enable)
+	(package--autosuggest-after-change-mode, package-autosuggest):
+	Elaborate docstrings.
+
+2024-11-06  Gerd Möllmann  <gerd@gnu.org>
+
+	Revert "Mark atimer allocation as ambiguous root"
+
+	This reverts commit c42b90b21a4efb3c5a8ebc6e3bd6be2908d1f2ac.
+
+2024-11-06  Ulf Jasper  <ulf.jasper@web.de>
+
+	* lisp/net/newst-plainview.el (newsticker--buffer-do-insert-text): Bug#74197
+
+	Use "[logo: <feed name>]" instead of "<feed name>" for the string
+	holding the logo image.
+
+2024-11-06  Philip Kaludercic  <philipk@posteo.net>
+
+	* lisp/emacs-lisp/package.el (package-autosuggest): New command
+
+2024-11-06  Philip Kaludercic  <philipk@posteo.net>
+
+	Improve prompting of autosuggested packages
+
+	* lisp/emacs-lisp/package.el (package--autosuggest-suggested):
+	Move declaration up.
+	(package--suggestion-applies-p): Respect
+	'package--autosuggest-suggested', avoiding to suggest packages
+	multiple times.
+	(package--autosugest-line-format)
+	(package--autosuggest-after-change-mode): Simplify due to
+	'package--suggestion-applies-p' respecting
+	'package--autosuggest-suggested'.
+	(package-autosuggest): Replace CRM prompt with a yes-or-no-p, so
+	that 'use-dialog-box' can take effect.
+
+2024-11-06  Mattias Engdegård  <mattiase@acm.org>
+
+	* lisp/term/w32-win.el (w32--textual-mime-types): Escape literal `+`
+
+2024-11-06  Mattias Engdegård  <mattiase@acm.org>
+
+	Fix wrong value of `when` and `unless` with empty body (bug#74215)
+
+	Reported by Brennan Vincent.
+
+	* lisp/subr.el (when, unless): Return nil when the body is empty.
+	* test/lisp/subr-tests.el (subr-test-when): Add test cases.
+
+2024-11-06  Jeff Walsh  <fejfighter@gmail.com>
+
+	Mark atimer allocation as ambiguous root
+
+	* src/atimer.c (start_atimer): Time could be passed a lisp object for
+	data, we should allocate this as an ambiguous root
+
+2024-11-06  Gerd Möllmann  <gerd@gnu.org>
+
+	Remove tip in pre-command-hook
+
+	* lisp/tty-tip.el (tty-tip-mode): install pre-command-hook that deleted
+	the tip frame.
+
+2024-11-06  Gerd Möllmann  <gerd@gnu.org>
+
+	Let tty tips disappear automatically
+
+	* lisp/tty-tip.el (tty-tip--create-frame): Delete tip frame after
+	x-show-tooltip-timeout seconds.
+
+2024-11-06  Gerd Möllmann  <gerd@gnu.org>
+
+	Add tty-tip.el, not tooltips, but very close
+
+2024-11-06  Philip Kaludercic  <philipk@posteo.net>
+
+	Allow suggesting to install packages
+
+	* etc/package-autosuggest.eld: Add a manual sketch of the database
+	* lisp/emacs-lisp/package.el (package-autosuggest-database)
+	(package-autosuggest-mode, package--suggestion-applies-p)
+	(package--autosuggest-find-candidates)
+	(package--autosuggest-install-and-enable)
+	(package--autosuggest-suggested, package--autosugest-line-format)
+	(package-autosuggest-face, mode-line-misc-info)
+	(package--autosuggest-after-change-mode, package-autosuggest):
+	Implement the feature.
+
+2024-11-05  Gerd Möllmann  <gerd@gnu.org>
+
+	* src/dispnew.c (neutralize_wide_char): Don't use used[0]
+
+2024-11-05  Michael Albinus  <michael.albinus@gmx.de>
+
+	Several Tramp cleanups
+
+	* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
+	Move setting of sentinel up.
+
+	* lisp/net/tramp-cache.el (tramp-get-connection-property)
+	(tramp-set-connection-property): Don't raise a debug message for
+	the `tramp-cache-version' key.
+
+	* lisp/net/tramp.el (tramp-convert-file-attributes): Don't cache
+	"file-attributes-ID-FORMAT".
+
+	* test/lisp/net/tramp-tests.el (tramp--test-enabled): Cleanup also
+	`tramp-compat-temporary-file-directory'.
+	(tramp-test32-shell-command): Use `async-shell-command-width' of 512.
+	(tramp-test36-vc-registered): Remove double let* entry.
+
+2024-11-05  Cecilio Pardo  <cpardo@imayhem.com>
+
+	Support :transform-smoothing on images (MS-Windows) (bug#57166)
+
+	* src/dispextern.h (struct image): Add field 'smoothing' for
+	NTGUI.
+	* src/image.c (image_set_transform): Assign the 'smoothing'
+	field of the image struct.
+	* src/w32gdiplus.h: Add references to more GDI+ functions.
+	* src/w32image.c (gdiplus_init): Add references to more GDI+
+	functions.
+	* src/w32term.c (w32_draw_image_foreground): If the image is
+	marked for smoothing and GDI+ is available, draw it with GDI+
+	bilinear interpolation.
+	* etc/NEWS: New entry for this change.
+
+2024-11-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Make 'yank-media' on MS-Windows require native image APIs
+
+	* src/w32select.c (convert_dibv5_to_png) [!HAVE_NATIVE_IMAGE_API]:
+	Fail if GDI+ cannot be used.  Patch by Cecilio Pardo
+	<cpardo@imayhem.com>.  (Bug#71909)
+
+	* etc/NEWS: Mention this dependency.
+
+2024-11-05  Gerd Möllmann  <gerd@gnu.org>
+
+	TTY menus: handle saved state referencing dead frames
+
+	* src/term.c (restore_desired_matrix): If a tty menu saves a current
+	matrix that contains glyphs from a child frame, handle the case that
+	that child frame dies before the saved state is restored.
+
+2024-11-05  Gerd Möllmann  <gerd@gnu.org>
+
+	Don't copy non-enabled rows from child
+
+	* src/dispnew.c (copy_child_glyphs): Check if child row is enabled.
+
+2024-11-05  Gerd Möllmann  <gerd@gnu.org>
+
+	* src/frame.c (make_terminal_frame): Check parent is live.
+
+2024-11-05  Stefan Kangas  <stefankangas@gmail.com>
+
+	pcomplete/find: Support new GNU find expressions
+
+	* lisp/pcmpl-gnu.el (pcomplete/find): Add expressions from new GNU find:
+	"-newerxy" (4.3.3) and "-files0-from" (4.9.0).  This list is now
+	complete as of GNU findutils 4.10.0, released on 2024-06-01.
+
+2024-11-04  Jim Porter  <jporterbugs@gmail.com>
+
+	Add support for range objects in Eshell "for" loops
+
+	* lisp/eshell/esh-cmd.el (eshell-for-iterate): Add support for
+	'eshell-range' objects.
+
+	* test/lisp/eshell/esh-cmd-tests.el (esh-cmd-test/for-loop-range): New
+	test.
+
+	* doc/misc/eshell.texi (Control Flow): Update documentation.
+
+	* etc/NEWS: Announce this change.
+
+2024-11-04  Jim Porter  <jporterbugs@gmail.com>
+
+	Move more of Eshell range handling to the parser phase
+
+	* lisp/eshell/esh-util.el (eshell-range): New struct.
+	(eshell--range-string-p, eshell--string-to-range): New functions.
+
+	* lisp/eshell/esh-arg.el (eshell-parse-integer)
+	(eshell-parse-range-token): New functions...
+	(eshell-parse-argument-hook): ... add them.
+	(eshell--after-range-token-regexp): New defsubst.
+	(eshell-concat-1): Don't remove the 'number' property; we use that when
+	handling range arguments.
+	(eshell--range-token): New constant.
+	(eshell-unmark-range-token): New function.
+
+	* lisp/eshell/esh-var.el (eshell-parse-index): Update implementation to
+	use parsed range argument.
+
+	* test/lisp/eshell/esh-var-tests.el (esh-var-test/interp-var-indices):
+	Test range index using variables.
+
+2024-11-04  Jim Porter  <jporterbugs@gmail.com>
+
+	Add QUOTED argument to 'eshell-stringify'
+
+	This will make it easier to reconstitute numbers that we converted to
+	strings.
+
+	* lisp/eshell/esh-util.el (eshell--numeric-string-p): New function.
+	(eshell-stringify, eshell-stringify-list): Add QUOTED argument.
+	(eshell-convert, eshell-list-to-string): Stringify as quoted.
+
+	* lisp/eshell/esh-arg.el (eshell--numberlike-p): Remove.
+	(eshell-concat-1): Pass along QUOTED.
+
+	* lisp/eshell/esh-cmd.el (eshell-lisp-command): Use
+	'eshell--numeric-string-p'.
+
+	* lisp/eshell/esh-var.el (eshell-parse-variable):
+	* lisp/eshell/em-cmpl.el (eshell-complete-parse-arguments): Stringify as
+	quoted.
+
+2024-11-03  Jim Porter  <jporterbugs@gmail.com>
+
+	Improve handling of Eshell "for" loops
+
+	This fixes some errors with more-complex string forms, and also allows
+	iterating over sequences other than just lists.
+
+	* lisp/eshell/esh-cmd.el (eshell-for-iterate): New function...
+	(eshell-rewrite-for-command): ... use it.
+
+	* test/lisp/eshell/esh-cmd-tests.el (esh-cmd-test/for-loop): Test
+	multiple values.
+	(esh-cmd-test/for-loop-string, esh-cmd-test/for-loop-vector): New tests.
+	(esh-cmd-test/for-loop-mixed-args): Rename.
+
+	* test/lisp/eshell/esh-proc-tests.el
+	(esh-proc-test/sentinel/change-buffer): Make sure all the processes get
+	cleaned up.
+
+2024-11-03  Stefan Kangas  <stefankangas@gmail.com>
+
+	Mark IDLWAVE as obsolete
+
+	* lisp/obsolete/idlw-complete-structtag.el:
+	* lisp/obsolete/idlw-help.el:
+	* lisp/obsolete/idlw-shell.el:
+	* lisp/obsolete/idlw-toolbar.el:
+	* lisp/obsolete/idlwave.el: Mark as obsolete.  (Bug#71157)
+
+	* lisp/files.el (auto-mode-alist): Remove IDLWAVE entry.
+	* doc/emacs/programs.texi (Program Modes): Remove IDLWAVE from
+	list of supported languages.
+
+2024-11-03  Stefan Kangas  <stefankangas@gmail.com>
+
+	Move IDLWAVE to lisp/obsolete
+
+	* lisp/progmodes/idlw-complete-structtag.el:
+	* lisp/progmodes/idlw-help.el:
+	* lisp/progmodes/idlw-shell.el:
+	* lisp/progmodes/idlw-toolbar.el:
+	* lisp/progmodes/idlwave.el: Move from here...
+	* lisp/obsolete/idlw-complete-structtag.el
+	* lisp/obsolete/idlw-help.el
+	* lisp/obsolete/idlw-shell.el
+	* lisp/obsolete/idlw-toolbar.el
+	* lisp/obsolete/idlwave.el: ...to here.  (Bug#71157)
+
+2024-11-03  Andrea Corallo  <acorallo@gnu.org>
+
+	* Remove warning introduced by 8e7f5f97db6
+
+	* lisp/term/w32-win.el (w32--get-clipboard-data-media): Declare.
+
+2024-11-03  Cecilio Pardo  <cpardo@imayhem.com>
+
+	Add support for 'yank-media' on MS-Windows
+
+	Adds the capacity to handle types different from strings to the
+	clipboard management functions on MS-Windows, and some logic
+	required to convert media types names and content to be what
+	yank-media and the modes that use it expect (bug#71909).
+	* lisp/term/w32-win.el (w32--selection-target-translations): New
+	variable that holds the name translations for media types.
+	(w32--translate-selection-target): New function, translate the
+	name of a media type.
+	(w32--translate-reverse-selection-target): New function, reverse
+	translation.
+	(w32--get-selection): Modified to translate target names when
+	asked for targets, and retrieve media types when asked for them.
+	(w32--mime-type-textual-p): New function, checks if a MIME type
+	is textual.
+	* lisp/textmodes/sgml-mode.el (html-mode--image-yank-handler):
+	Fixed the image save mechanism, that added line feed characters
+	on MS-Windows, breaking binary formats.
+	* src/w32image.c (gdiplus_init): Modified to fetch more
+	functions fromm gdiplus.
+	(get_encoder_clsid): Renamed to 'w32_gdip_get_encoder_clsid'
+	and made nonstatic.
+	(gdiplus_startup): Renamed to 'w32_gdiplus_startup' and
+	made nonstatic.
+	* src/w32select.c (stdfmt_name): Made global, was static
+	function.
+	(convert_dibv5_to_png): New function to convert DIBV5 clipboard
+	format to PNG.
+	(get_clipboard_format_name): New function get the name of a
+	format given its index.
+	(Fw32__get_clipboard_data_media): New function, retrieves and
+	converts media content.
+	(syms_of_w32select): Export new lisp functions.
+	* src/w32gdiplus.h: New file, for definitions in w32image.c
+	* doc/lispref/frames.texi: Updated with MS-Windows support.
+	* etc/NEWS: Added entry about new feature.
+
+2024-11-03  Thanos Apollo  <public@thanosapollo.org>
+
+	Add greek-polytonic input method
+
+2024-11-03  Thanos Apollo  <public@thanosapollo.org>
+
+	Improve greek input method
+
+	* lisp/leim/quail/greek.el ("greek"): Add sequences for DIALYTIKA
+	TONOS (U+0385) and add proper bindings for double angle quotation
+	marks.  (Bug#73909)
+
+2024-11-03  Stefan Kangas  <stefankangas@gmail.com>
+
+	* etc/symbol-releases.eld: Add 'set-transient-map'.
+
+2024-11-03  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove Emacs 24.4 compat code from which-key
+
+	* lisp/which-key.el (which-key--show-page): Remove Emacs 24.4
+	compatibility code.
+
+2024-11-02  Stephen Gildea  <stepheng+emacs@gildea.com>
+
+	Expand manual section on Time Stamps
+
+	* doc/emacs/files.texi (Time Stamps): Add examples of enabling
+	time stamping with add-hook and setting time-stamp-pattern as a
+	file-local variable.
+
+2024-11-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix color-lightening and darkening calculations
+
+	* lisp/color.el (color-lighten-hsl): Fix calculations (bug#74055).
+
+	* test/lisp/color-tests.el (color-tests-lighten-hsl)
+	(color-tests-lighten-name, color-tests-darken-hsl)
+	(color-tests-darken-name): Adjust test results.
+
+2024-11-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "Fix color-lighten-hsl logic"
+
+	This reverts commit 656c2dd66e77a5fbeb99d358017e8327401fae05.
+	That commit was mistaken, see bug#74055.
+
+2024-11-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	f7b85fe986e Improve documentation of letter-case conversions
+
+2024-11-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	e6a8492fabc Fix c-ts-common-comment-indent-new-line (bug#73900)
+
+	# Conflicts:
+	#	lisp/progmodes/c-ts-common.el
+
+2024-11-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	98796f95fa5 Work on proced-tests.el
+	8a4d13e370c ; * doc/lispref/frames.texi (Yanking Media): Add index en...
+	0aae02a3741 * lisp/files.el (require-with-check): Be a bit more lenie...
+	cc6a11f4832 (with-peg-rules): Fix references to rulesets (bug#74018)
+	70f084db2ff ; * etc/NEWS: Fix typo (bug#74066).
+	9e1abf11fc1 Tweak doc w.r.t to "void function" (bug#73886)
+	7a8ca202c5e Fix flakey proced refine tests (Bug#73441)
+	55a8cec013e Another 'void' update
+
+2024-11-02  Sebastián Monía  <sebastian.monia@sebasmonia.com>
+
+	More lax doctype check in EWW (bug#73133)
+
+	The regexp to match doctype tags was simplified and will match
+	more legacy entries; also correct binding of 'case-fold-search'.
+	* lisp/net/eww.el (eww--html buffer-list): Update function.
+
+2024-11-02  Daniel Pettersson  <daniel@dpettersson.net>
+
+	Fix inconsistency in bitmap overlay drawing for macOS
+
+	* src/nsterm.m (ns_draw_fringe_bitmap): Respect 'overlay_p',
+	by not clearing fringe if set, as its done in xterm.  (Bug#71763)
+
+2024-11-01  Stefan Kangas  <stefankangas@gmail.com>
+
+	Don't start docstrings with "This function"
+
+	* lisp/calculator.el (calculator-add-operators):
+	* lisp/erc/erc-log.el (erc-generate-log-file-name-with-date)
+	(erc-generate-log-file-name-short):
+	* lisp/eshell/esh-mode.el (eshell-begin-on-new-line):
+	* lisp/progmodes/hideif.el (hif-merge-ifdef-region):
+	* lisp/tab-bar.el (tab-bar--event-to-item):
+	* lisp/textmodes/artist.el (artist-no-rb-unset-point2)
+	(artist-no-rb-unset-points):
+	* lisp/which-key.el (which-key--hide-popup): Don't start function
+	docstrings with "This function".
+
+2024-11-01  Stefan Kangas  <stefankangas@gmail.com>
+
+	Mark unused reftex variable as obsolete
+
+	* lisp/textmodes/reftex-vars.el
+	(reftex-toc-split-windows-horizontally-fraction): Mark unused variable
+	as obsolete in favor of 'reftex-toc-split-windows-fraction'.
+
+2024-11-01  Jim Porter  <jporterbugs@gmail.com>
+
+	Improve evaluation of conditional Eshell forms
+
+	This simplifies the logic for building these forms and also fixes an
+	issue where a subcommand in a "&&" or "||" conditional had its output
+	suppressed.
+
+	* lisp/eshell/esh-cmd.el (eshell-structure-basic-command): Make
+	obsolete.
+	(eshell-silence-test-command): New function...
+	(eshell-rewrite-while-command, eshell-rewrite-if-command): ... use it,
+	and make the command form ourselves.
+	(eshell-parse-pipeline): Use 'and' and 'or' to make the conditional
+	command sequence.
+	(eshell-command-success): New macro.
+	(eshell-do-eval): Add support for 'and' and 'or' forms.
+
+	* test/lisp/eshell/esh-cmd-tests.el (esh-cmd-test/and-operator/output)
+	(esh-cmd-test/or-operator/output): New tests.
+
+2024-11-01  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	New `tmm-menubar' shortcut display style
+
+	Bug#74111
+	* lisp/tmm.el (tmm-shortcut-inside-entry): New user option to
+	control if the shortcut character is highlighted inside the menu
+	entry's string.
+	(tmm-add-one-shortcut): Compute the new shortcut style.
+	(tmm-add-prompt, tmm-completion-prompt): Adapt the completion
+	prompt according to the shortcut display style.
+	(tmm-prompt): Adapt the prompt regexp.
+	(tmm-shortcut): Simplify default case and make it work with this
+	change.
+	* etc/NEWS: Announce the option.
+
+2024-11-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "Remove undefined variable from c-ts-common.el"
+
+	This reverts commit 9ff155183ca560fc9005027a65c53544afb772a1.
+	This problem was already fixed on the release branch m and
+	the fix will merged soon.  (Bug#74149)
+
+2024-11-01  Jim Porter  <jporterbugs@gmail.com>
+
+	Improve correctness of Eshell globs when using escape characters
+
+	This new implementation opts *in* to treating characters as glob
+	characters, rather than opting out.  This reduces the need to coordinate
+	with other parts of Eshell and should be harder to break (bug#74033).
+
+	* lisp/eshell/em-glob.el (eshell-parse-glob-chars): Return the
+	propertized globbing character directly.
+	(eshell--propertize-glob, eshell--glob-char-p)
+	(eshell--contains-glob-char-p, eshell--all-glob-chars-p): New functions.
+	(eshell-glob-p): Make obsolete.
+	(eshell-glob-regexp, eshell-glob-convert-1, eshell-glob-convert): Check
+	for 'eshell-glob-char' property.
+	(eshell-extended-glob): Remove text properties when returning no match.
+	(eshell--glob-anything): New constant.
+	(eshell-glob-entries): Propertize "*" to treat it as a glob.
+
+	* lisp/eshell/em-ls.el (eshell-ls--expand-wildcards): New function...
+	(eshell-ls--insert-directory): ... use it.
+
+	* test/lisp/eshell/em-glob-tests.el: Use 'eshell--propertize-glob' in
+	tests.
+	(em-glob-test/convert/literal-characters)
+	(em-glob-test/convert/mixed-literal-characters): New tests.
+
+	* lisp/eshell/em-glob.el (eshell-expand-glob): Rename from
+	'eshell-extended-glob'.  Update callers.
+	(eshell-extended-glob): New function to expand a GLOB that hasn't been
+	propertized yet, for use outside of Eshell command forms.
+	(eshell-parse-glob-chars): Return the propertized globbing character
+	directly.
+	(eshell-parse-glob-string, eshell--glob-char-p)
+	(eshell--contains-glob-char-p, eshell--all-glob-chars-p): New functions.
+	(eshell-glob-regexp, eshell-glob-convert-1, eshell-glob-convert): Check
+	for 'eshell-glob-char' property.
+	(eshell-glob-p): Make obsolete.
+	(eshell--glob-anything): New constant...
+	(eshell-glob-entries): ... use it.
+
+	* lisp/eshell/em-ls.el (eshell-ls--expand-wildcards): New function...
+	(eshell-ls--insert-directory): ... use it.
+
+	* test/lisp/eshell/em-glob-tests.el: Use 'eshell-parse-glob-string in
+	tests.
+	(em-glob-test/convert/literal-characters)
+	(em-glob-test/convert/mixed-literal-characters): New tests.
+
+2024-11-01  Jim Porter  <jporterbugs@gmail.com>
+
+	Fix and improve behavior of 'eshell/clear'
+
+	* lisp/eshell/esh-mode.el (eshell-clear): New function.
+	(eshell/clear): Fix incorrect behavior, and do the right thing when
+	'eshell-scroll-show-maximum-output' is nil.
+	(eshell/clear-scrollback): Call 'eshell/clear'.
+
+	* test/lisp/eshell/esh-mode-tests.el
+	(esh-mode-test/clear/eshell-command)
+	(esh-mode-test/clear/eshell-command/erase)
+	(esh-mode-test/clear/emacs-command)
+	(esh-mode-test/clear/emacs-command/erase): New tests.
+
+	* etc/NEWS: Mention the new 'eshell-command' (bug#73722).
+
+2024-11-01  Steven Allen  <steven@stebalien.com>
+
+	Remove undefined variable from c-ts-common.el
+
+	This variable came from code copied from c-indent-new-comment-line.
+	It's a parameter meant to be used by c-context-line-break, not a
+	global variable.
+
+	* lisp/progmodes/c-ts-common.el (c-ts-common-comment-indent-new-line):
+	Remove reference to undefined variable.  (Bug#74149)
+
+2024-11-01  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project-tests: Add test assertion for bug#73801
+
+	* test/lisp/progmodes/project-tests.el
+	(project-vc-extra-root-markers-supports-wildcards): End with a
+	check that we didn't cache a wrong value for parent (bug#73801).
+
+2024-10-31  Gerd Möllmann  <gerd@gnu.org>
+
+	Fix mouse-position for xterm-mouse-mode
+
+	* lisp/xt-mouse.el (xterm-mouse-position-function): Return the frame
+	recorded in the terminal parameter xterm-mouse-frame.
+
+2024-10-31  Jim Porter  <jporterbugs@gmail.com>
+
+	Don't remove trailing slash in Eshell "pwd" for remote root directories
+
+	* lisp/eshell/em-dirs.el (eshell/pwd): Check if 'file-local-name' of the
+	directory is the root dir.
+
+2024-10-31  Cecilio Pardo  <cpardo@imayhem.com>
+
+	Fix 'yank-media' to allow yanking SVG data
+
+	* lisp/net/mailcap.el (mailcap-mime-type-to-extension): Return
+	"svg" for mime type 'image/svg+xml'.  Org-mode uses this.
+	* lisp/yank-media.el (yank-media--find-matching-media): If svg is
+	supported, don't filter out 'image/svg+xml'.  (Bug#74044)
+
+2024-10-31  Augusto Stoffel  <arstoffel@gmail.com>
+
+	shr.el: Define rendering rule for math tag
+
+	* lisp/net/shr.el (shr-tag-math): New function, see bug#73641.
+
+2024-10-31  Stephen Berman  <stephen.berman@gmx.net>
+
+	Fix bugs in dabbrev-expand (bug#74090)
+
+	* lisp/dabbrev.el (dabbrev-expand): Use the buffer where the
+	expansion was found when setting the internal variables used to
+	determine the next expansion or a replacement expansion.
+
+	* test/lisp/dabbrev-tests.el (ert-x): Require for
+	'ert-with-temp-directory', 'ert-resource-directory' and
+	'ert-resource-file'.
+	(with-dabbrev-test): New macro.
+	(dabbrev-expand-test-same-buffer-{1,2,3,4})
+	(dabbrev-expand-test-other-buffer-{1,2,3,4})
+	(dabbrev-expand-test-minibuffer-{1,2,3,4}): New tests.
+
+	* test/lisp/dabbrev-resources/dabbrev-expand.el:
+	* test/lisp/dabbrev-resources/INSTALL_BEGIN: New test resources.
+
+2024-10-30  Juri Linkov  <juri@linkov.net>
+
+	Call tab-bar-tab-post-open-functions during tabs initialization
+
+	* lisp/tab-bar.el (tab-bar-tabs): Run the hook
+	'tab-bar-tab-post-open-functions' after creating the first tab
+	in the selected frame's tab-bar list of tabs (bug#74087).
+	Suggested by Ship Mints <shipmints@gmail.com>.
+
+2024-10-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Prevent 'string-pixel-width' from deactivating the region
+
+	* lisp/emacs-lisp/subr-x.el (work-buffer--release)
+	(string-pixel-width): Bind 'deactivate-mark' around buffer
+	modifications, to avoid deactivating the region as side effect of
+	calling this function.  (Bug#74091)
+
+2024-10-30  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp: Use `when-let*', `if-let*' and `and-let*' consequently
+
+	* lisp/net/tramp-adb.el:
+	* lisp/net/tramp-androidsu.el:
+	* lisp/net/tramp-cache.el:
+	* lisp/net/tramp-cmds.el:
+	* lisp/net/tramp-compat.el:
+	* lisp/net/tramp-container.el:
+	* lisp/net/tramp-crypt.el:
+	* lisp/net/tramp-ftp.el:
+	* lisp/net/tramp-fuse.el:
+	* lisp/net/tramp-gvfs.el:
+	* lisp/net/tramp-integration.el:
+	* lisp/net/tramp-message.el:
+	* lisp/net/tramp-rclone.el:
+	* lisp/net/tramp-sh.el:
+	* lisp/net/tramp-smb.el:
+	* lisp/net/tramp-sshfs.el:
+	* lisp/net/tramp-sudoedit.el:
+	* lisp/net/tramp.el:
+	* test/lisp/net/tramp-tests.el:
+	Use `when-let*', `if-let*' and `and-let*' consequently.  (Bug#73441)
+
+2024-10-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Improve prompting for git stashes
+
+	* lisp/vc/vc-git.el (vc-git-stash-read): New DEFAULT-MOST-RECENT
+	optional argument.  Use format-prompt.  Signal user-error
+	immediately if there are no stashes.  Rewrite docstring.
+	(vc-git-stash-show, vc-git-stash-apply, vc-git-stash-pop)
+	(vc-git-stash-delete): Drop trailing ": " from prompts.
+	(vc-git-stash-pop): Pass non-nil DEFAULT-MOST-RECENT to
+	vc-git-stash-read.
+
+2024-10-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	VC Git: Use vc-deduce-fileset to determine what to stash
+
+	* lisp/vc/vc-git.el (vc-git--deduce-files-for-stash): New function.
+	(vc-git-stash, vc-git-stash-snapshot): Use it to determine what
+	to stash.  Update and expand docstrings.
+	(vc-git-stash-snapshot): No longer unconditionally snapshot all
+	uncommitted changes across the whole working tree.
+
+2024-10-29  Yuan Fu  <casouri@gmail.com>
+
+	Fix c-ts-common-comment-indent-new-line (bug#73900)
+
+	* lisp/progmodes/c-ts-common.el:
+	(c-ts-common-comment-indent-new-line): Delete trailing
+	whitespace before inserting newline.  The insert-line-break
+	function is the same as in c-indent-new-comment-line.
+
+2024-10-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	* lisp/vc/log-edit.el (log-edit-diff-function): Document.
+
+2024-10-29  Yuan Fu  <casouri@gmail.com>
+
+	Fix the call to treesit-thing-defined-p
+
+	* lisp/treesit.el (treesit-defun-at-point): Add the necessary
+	2nd argument.
+
+2024-10-29  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project--completing-read-strict: Move some common processing here
+
+	* lisp/progmodes/project.el (project--completing-read-strict):
+	Add new optional argument, COMMON-PARENT-DIRECTORY.  Move the
+	absolute->relative processing of MB-DEFAULT and the contents of
+	HIST here.
+	(project--read-file-cpd-relative): From here.  So that
+	'project--read-file-absolute' can also benefit from those
+	conversions.
+	(project--read-file-absolute): Pass the new argument.
+	(project-read-file-name-function): Update value tags.
+
+2024-10-29  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project--read-file-cpd-relative: Move out the 'included-cpd' logic
+
+	* lisp/progmodes/project.el (project-find-dir):
+	Use 'project-files-relative-names'.  Include "./" here rather than
+	(project--read-file-cpd-relative): ...doing it here.
+
+2024-10-29  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix window selection after log-edit-show-diff
+
+	* lisp/vc/vc.el (vc-diff-patch-string): Use display-buffer, not
+	pop-to-buffer, for consistency with log-edit-diff-fileset.
+	(vc-modify-change-comment): Use save-selected-window around
+	vc-diff-internal to avoid leaving the *vc-diff* window selected,
+	for consistency with log-edit-diff-fileset.
+
+2024-10-28  Alan Mackenzie  <acm@muc.de>
+
+	elisp-mode-tests.el: Add test for the added fix
+
+	* test/lisp/progmodes/elisp-mode-tests.el
+	(elisp-completes-functions-after-empty-let-bindings):
+	New test (bug#73880).
+
+2024-10-28  Dmitry Gutov  <dmitry@gutov.dev>
+
+	elisp: Fix completion at funpos after empty let bindings form
+
+	* lisp/progmodes/elisp-mode.el (elisp-completion-at-point): Use
+	'skip-syntax-backward' instead of 'backward-list' since the latter
+	also skips over other syntax, such as empty parens (bug#73880).
+
+2024-10-28  Alan Mackenzie  <acm@muc.de>
+
+	Call PF correctly from pcase--edebug-match-pat-args
+
+	Also correct a doc string and insert commentary.  This fixes
+	bug#74052.
+
+	* lisp/emacs-lisp/edebug.el
+	(edebug--match-&-spec-op <&interpose>): Correct and complete
+	the doc string, which now says MUST call exactly once, and
+	documents the return values of FUN, PF and
+	edebug--match-&-spec-op.  Also remove an unneeded `(...)
+	construct.
+
+	* lisp/emacs-lisp/pcase.el (pcase--edebug-match-pat-args): Call
+	PF also for the main cases handled.
+
+2024-10-28  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: Add/remove defun buffer locally to post-command-hook
+
+	Also remove no longer existing hook.
+
+	* lisp/progmodes/cc-mode.el (c-leave-cc-mode-mode): remove-hook
+	c-post-command buffer locally.  Delete removal of non-existent
+	c-post-gc-hook.
+	(c-basic-common-init): add-hook c-post-command buffer locally.
+
+2024-10-28  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Fix C-c C-d and C-c C-w during log-view-modify-change-comment
+
+	* lisp/vc/vc-dispatcher.el (log-edit-diff-fileset)
+	(log-edit-diff-patch): Declare.
+	(vc-log-edit, vc-start-logentry): New optional argument
+	DIFF-FUNCTION to specify log-edit-diff-function in the generated
+	Log Edit buffer.
+	* lisp/vc/vc.el (vc-modify-change-comment): Pass the new
+	DIFF-FUNCTION argument to vc-start-logentry.
+
+2024-10-28  Eli Zaretskii  <eliz@gnu.org>
+
+	More workarounds for GDB bug 32313
+
+	* src/eval.c (backtrace_args): Same treatment as
+	backtrace_function.
+
+	cherry-picked from commit b7b55df.
+
+2024-10-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Remove unneeded workaround from w32console.c
+
+	* src/w32console.c (w32con_write_glyphs): Remove unneeded test.
+	(w32con_clear_end_of_line): Fill in the glyph.frame member.
+
+2024-10-28  Eli Zaretskii  <eliz@gnu.org>
+
+	More workarounds for GDB bug 32313
+
+	* src/eval.c (backtrace_args): Same treatment as
+	backtrace_function.
+
+2024-10-28  Gerd Möllmann  <gerd@gnu.org>
+
+	Don't work around a corner case once observed
+
+	* src/term.c (tty_write_glyphs): Refactor a bit. Don't check for null
+	glyph frame.
+
+2024-10-28  Jim Porter  <jporterbugs@gmail.com>
+
+	Fix definitions of Eshell "xtra" functions
+
+	* lisp/eshell/em-xtra.el (eshell-parse-command): Remove unnecessary
+	autoload.
+	(eshell/substitute): Pass the correct number of arguments to
+	'cl-substitute'.
+	(eshell/count, eshell/union, eshell/mismatch, eshell/intersection)
+	(eshell/set-difference, eshell/set-exclusive-or): Use named arguments
+	for the required arguments (bug#73738).
+
+2024-10-28  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project-try-vc: Fix the "sometimes wrong cache" issue
+
+	* lisp/progmodes/project.el (project-try-vc--search):
+	Extract from 'project-try-vc'.
+	(project-try-vc): Use it.
+	(project-try-vc--search): Call itself recursively directly, to
+	avoid creating invalid cache entry (bug#73801).
+
+2024-10-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Work around GDB bug 32313 when debugging Emacs internals
+
+	Problem reported by Eli Zaretskii in:
+	https://lists.gnu.org/r/emacs-devel/2024-10/msg00653.html
+	* src/eval.c (backtrace_function_body): Rename from
+	backtrace_function, and make it static.
+	(GDB_FUNCPTR): New macro.
+	(backtrace_function): New function pointer, for GDB only.
+
+2024-10-27  Protesilaos Stavrou  <info@protesilaos.com>
+
+	Update modus-themes to their version 4.6.0
+
+	* doc/misc/modus-themes.org
+	(Differences between loading and enabling)
+	(Option for which themes to toggle)
+	(Option for which themes to rotate, DIY Palette override presets)
+	(DIY Add padding to the mode line)
+	(DIY Remap face with local value): Fix typos.
+	(DIY Add support for solaire-mode): Fix some symbols.
+	(Full support for packages or face groups)
+	(Indirectly covered packages): Add newly supported packages.
+	(DIY Add support for combobulate):,
+	(DIY Add support for engrave-faces, DIY Add support for howm)
+	(DIY Add support for meow-mode): Document how to style those
+	packages.
+	(Acknowledgements): Update names of people who have in one way
+	or another contributed to the project.
+
+	* etc/themes/modus-operandi-deuteranopia-theme.el:
+	* etc/themes/modus-operandi-theme.el:
+	* etc/themes/modus-operandi-tinted-theme.el:
+	* etc/themes/modus-operandi-tritanopia-theme.el:
+	* etc/themes/modus-vivendi-deuteranopia-theme.el:
+	* etc/themes/modus-vivendi-theme.el:
+	* etc/themes/modus-vivendi-tinted-theme.el:
+	* etc/themes/modus-vivendi-tritanopia-theme.el:
+	* etc/themes/modus-themes.el: Make refinements to supported
+	faces, add support for more faces, and tweak palette entries.
+
+	Release notes: <https://protesilaos.com/codelog/2024-10-27-modus-themes-4.6.0/>.
+
+2024-10-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	c78b4d2b31d Fix doc string of 'wdired-use-dired-vertical-movement'
+	b0aaee93fde Update the documentation of void functions
+	299a1f24075 ; * lisp/vc/log-edit.el (log-edit-diff-function): Grammar...
+	67a27ff53bf ; Fix typos
+
+2024-10-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	dd52839dd9d * lisp/editorconfig.el (editorconfig--get-indentation): F...
+
+2024-10-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	e0f964c16df ; * etc/AUTHORS: Update.
+	eb18f7288b3 ; * ChangeLog.4: Update.
+	8e37b537160 Skip *.dylib files in 'loaddefs-generate'
+	0d8d5f10ffc Highlight namespace name in "use" clause.
+	d3e98487d08 ; * lisp/loadup.el: Improve file abstract
+	1a91d37a21c ; * doc/lispref/control.texi (Conditionals): Fix markup.
+
+2024-10-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	transient.el: Replace use of obsolete if-let and when-let
+
+	* lisp/transient.el (transient--expand-define-args)
+	(transient--parse-suffix, transient-get-suffix)
+	(transient--make-transient-map, transient--init-suffix)
+	(transient--init-suffix-key, transient--suspend-override)
+	(transient--wrap-command, transient--call-pre-command)
+	(transient--setup-recursion, transient--invalid)
+	(transient-init-value, transient-default-value)
+	(transient-infix-read, transient-prompt, transient--show)
+	(transient--insert-group, transient-format-key)
+	(transient-format-description, transient-format-value)
+	(transient--maybe-pad-keys, transient-command-summary-or-name)
+	(transient-show-help):
+	Replace use of if-let and when-let, obsolete for Emacs 31.x.
+
+2024-10-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Allow escape from 'read-key'
+
+	* lisp/emacs-lisp/backtrace.el (backtrace-mode-map): Add a binding
+	for 'abort-recursive-edit'.  (Bug#73584)
+
+2024-10-27  Mats Lidell  <mats.lidell@lidells.se>
+
+	Accept texi2any for version identification
+
+	* lisp/info.el (Info-file-supports-index-cookies): Accept texi2any
+	for version identification.  (Bug#74042)
+
+2024-10-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git-resolve-conflicts: Extend unstage-maybe to similar operations
+
+	* lisp/vc/vc-git.el (vc-git-resolve-when-done): When
+	vc-git-resolve-conflicts is unstage-maybe, don't clear the
+	staging area during a rebase, am, revert or cherry-pick.
+	(vc-git-resolve-conflicts): Update docstring in light of changes
+	to vc-git-resolve-when-done.
+	(vc-git--cmds-in-progress): Detect reverts and cherry-pick
+	operations in progress.
+
+2024-10-27  Sean Whitton  <spwhitton@spwhitton.name>
+
+	lisp/org: Backport org-mode.git fix for if-let/when-let obsolescence
+
+	Backporting this acked by Org maintainer Ihor Radchenko.
+
+	* lisp/org/ob-R.el (org-babel-R-associate-session):
+	* lisp/org/ob-clojure.el (ob-clojure-nbb-command)
+	(ob-clojure-cli-command):
+	* lisp/org/ob-core.el (org-babel-execute-src-block):
+	* lisp/org/ob-exp.el (org-babel-exp-code):
+	* lisp/org/ob-julia.el (org-babel-julia-associate-session):
+	* lisp/org/ob-python.el
+	(org-babel-python--python-util-comint-end-of-output-p):
+	* lisp/org/ol.el (org-insert-link):
+	* lisp/org/org-attach.el (org-attach):
+	* lisp/org/org-clock.el (org-clock-select-task):
+	* lisp/org/org-compat.el (fboundp):
+	* lisp/org/org-element-ast.el (org-element-property-raw)
+	(org-element-put-property, org-element-copy):
+	* lisp/org/org-element.el (org-element-timestamp-interpreter)
+	(org-element--cache-key):
+	* lisp/org/org-goto.el (org-goto-location):
+	* lisp/org/org-lint.el
+	(org-lint-suspicious-language-in-src-block)
+	(org-lint-export-option-keywords):
+	* lisp/org/org-macs.el (org-mks):
+	* lisp/org/org-persist.el: (org-persist-write:elisp):
+	* lisp/org/org-table.el (org-table-fedit-finish):
+	* lisp/org/org.el (org-entry-get-with-inheritance):
+	* lisp/org/ox-html.el (org-html--reference)
+	(org-html--build-mathjax-config, org-html-example-block):
+	* lisp/org/ox-latex.el (org-latex-table-row):
+	* lisp/org/ox.el (org-export--prune-tree)
+	(org-export--blindly-expand-include):
+	Replace use of if-let and when-let, obsolete in Emacs 31.0.50.
+
+2024-10-27  Dmitry Gutov  <dmitry@gutov.dev>
+
+	vc-git-log-edit-toggle-amend: Honor vc-allow-rewriting-published-history
+
+	* etc/NEWS: Update the entry for
+	vc-allow-rewriting-published-history.
+
+	* lisp/vc/vc-git.el (vc-git-log-edit-toggle-amend):
+	Add a check against published history (bug#64055).
+
+2024-10-26  Jim Porter  <jporterbugs@gmail.com>
+
+	Fix Eshell incompatibility with "[" command when eshell-pred is disabled
+
+	* lisp/eshell/em-pred.el (eshell-pred-initialize): Ensure that
+	'eshell-parse-arg-modifier' is called before 'eshell-parse-glob-chars'.
+
+	* lisp/eshell/em-glob.el (eshell-glob-initialize): Use a number for hook
+	depth to be clearer.
+	(eshell-parse-glob-chars): Simplify; since eshell-pred's hook now runs
+	first, the extra code is no longer necessary.
+
+	* test/lisp/eshell/em-glob-tests.el
+	(em-glob-test/test-command-without-pred): New test.
+
+2024-10-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix bootstrap on MS-Windows
+
+	* src/w32uniscribe.c (syms_of_w32uniscribe): Don't call
+	'syms_of_w32dwrite' here...
+	* src/emacs.c (main): ...call it here.  Reported by Andy Moreton
+	<andrewjmoreton@gmail.com>.
+
+2024-10-26  Earl Hyatt  <okamsn@protonmail.com>
+
+	Add delete-selection-local-mode.
+
+	* lisp/delsel.el (delete-selection-local-mode): Add local version of
+	'delete-selection-mode'.  The local mode sets the value of the variable
+	'delete-selection-mode' to maintain compatibility with packages and
+	features that consider the existing mode.
+
+	* doc/emacs/mark.texi (Using Region): Describe
+	'delete-selection-local-mode'.
+
+	* etc/NEWS: Describe 'delete-selection-local-mode'.
+
+2024-10-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Temporary fix for mouse events on child frames
+
+	* src/w32inevt.c (do_mouse_event): Ignore mouse events when the
+	selected frame is a child frame.
+
+2024-10-26  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/w32console.c (w32con_update_end): Fix cursor display.
+
+2024-10-26  Eyal Soha  <eyalsoha@gmail.com>  (tiny change)
+
+	Improve Tramp VC cache
+
+	* lisp/net/tramp-sh.el (tramp-vc-file-name-handler):
+	Add `file-directory-p', which is used in
+	`vc-find-root'.  (Bug#74026)
+
+2024-10-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix dimensions of child frames on w32 console
+
+	* src/w32inevt.c (maybe_generate_resize_event): Don't generate
+	resize events for child frames.
+
+2024-10-26  Alan Mackenzie  <acm@muc.de>
+
+	* lisp/progmodes/cc-langs.el (c-cpp-matchers): Remove an unneeded let*.
+
+2024-10-26  Eli Zaretskii  <eliz@gnu.org>
+
+	More fixes for w32 console build
+
+	* src/w32term.c (w32_read_socket): Don't use FRAME_OBSCURED_P,
+	which was removed.
+	* src/frame.h (struct frame): Move !HAVE_NTGUI to its original
+	place.
+	* src/treesit.c (treesit_load_language): Shut up GCC warning.
+
+2024-10-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Adapt w32 console to tty-child-frame changes
+
+	* src/w32console.c (w32con_write_glyphs): Use the glyph's frame,
+	not the root frame, to resolve faces from face IDs.
+
+2024-10-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	cond*: Add support for Pcase patterns
+
+	* lisp/emacs-lisp/cond-star.el (cond*): Adjust docstring.
+	(match*): Prefer `_VAR` syntax.
+	(cond*-convert-condition): Add support for `pcase*`.
+	* doc/lispref/control.texi (cond* Macro): Document `pcase*`.
+	* test/lisp/emacs-lisp/cond-star-tests.el: New file.
+
+2024-10-25  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: correct handling of properties on #include <...>
+
+	In C, Pike, and IDL Modes, deleting and reinserting such a <
+	could create havoc with the category/syntax-table properties on
+	the < and >.  Also the contents of <...> should only get paren
+	properties when the #include is present and correct.
+
+	* lisp/progmodes/cc-fonts.el (c-cpp-matchers): Replace the
+	c-make-font-lock-search-function which put properties on the
+	<...> with a simple matcher.
+
+	* lisp/progmodes/cc-langs.el
+	(c-get-state-before-change-functions)
+	(c-before-font-lock-functions): Add respectively
+	c-before-change-include-<> and c-after-change-include-<> in the
+	C, Pike and IDL entries of these variables.
+
+	* lisp/progmodes/cc-mode.el (c-before-change-include-<>)
+	(c-after-change-include-<>): New functions.
+
+2024-10-25  Cecilio Pardo  <cpardo@imayhem.com>
+
+	Implement drawing text with DirectWrite on MS-Windows.
+
+	This adds support for color fonts.
+	* configure.ac: Add src/w32drite to W32_OBJ.
+	* src/w32dwrite.c: New file.
+	(w32-initialize-direct-write): New function, initialize the
+	DirectWrite library if it is available, and required global
+	variables.
+	(w32_use_direct_write): New function, check if DirectWrite
+	is available and activated by the user.
+	(w32_dwrite_encode_char): New function, replacement for HarfBuzz's
+	'encode_char'.
+	(w32_dwrite_text_extents): New function, replacement for w32font
+	text_extents.
+	(w32_dwrite_draw): New function, replacement for w32font draw.
+	(w32_dwrite_free_cached_face): New function, used in the font
+	deletion process to also delete DirectWrite data.
+	(verify_hr): New function, verify COM method results.
+	(release_com): New function, release a COM object.
+	(w32-dwrite-available): New function, returns true if DirectWrite
+	is available.
+	(w32-dwrite-reinit): New function, reinitialize DirectWrite,
+	optionally setting some rendering parameters.
+	* src/w32font.c (w32font_text_extents): If DirectWrite is enabled,
+	call 'w32_dwrite_text_extents'.
+	(w32font_draw): If DirectWrite is enabled, call 'w32_dwrite_draw'.
+	* src/w32uniscribe.c: (w32hb_encode_char): If DirectWrite is enabled,
+	call 'w32_dwrite_encode_char'.
+	(syms_of_w32uniscribe_for_pdumper): Initialize DirectWrite.
+	(uniscribe_close): Free DirectWrite data for the font.
+
+	Bug#73730
+
+2024-10-25  Cecilio Pardo  <cpardo@imayhem.com>
+
+	Improve drag and drop on MS-Windows (bug#3468)
+
+	Add support for 'dnd-scroll-margin' and 'dnd-indicate-insertion-point'
+	by calling 'dnd-handle-movement' when dragging the mouse.
+
+	* lisp/term/w32-win.el (w32-drag-n-drop): Call 'dnd-handle-movement'
+	when applicable.
+	* src/w32fns.c (w32_handle_drag_movement): New function, sends a
+	WM_EMACS_DRAGOVER message.
+	(w32_drop_target_DragEnter): Call 'w32_handle_drag_movement'.
+	(w32_drop_target_DragOver): Call 'w32_handle_drag_movement'.
+	* src/w32term.c: (w32_read_socket): Handle WM_EMACS_DRAGOVER,
+	sending a drag-n-drop event.
+	* src/w32term.h: Define new WM_EMACS_DRAGOVER message.
+
+2024-10-25  Sean Whitton  <spwhitton@spwhitton.name>
+
+	save-buffers-kill-emacs: Adjust confirmation prompt when restarting
+
+	* lisp/files.el (save-buffers-kill-emacs): When restarting, ask
+	"Really restart Emacs?".
+
+2024-10-25  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-modify-change-comment: Revert Log View buffer
+
+	* lisp/vc/vc.el (vc-modify-change-comment): Revert the Log View
+	buffer after modifying the change comment.
+
+2024-10-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix error message in charset.c
+
+	* src/charset.c (Fdefine_charset_internal): Don't reference
+	uninitialized value in error message.  (Bug#73985)
+
+2024-10-24  Aleksandr Vityazev  <avityazev@disroot.org>
+
+	vc-clone: Make interactive; call vc-guess-url-backend
+
+	* lisp/vc/vc.el (vc-clone): Make interactive.  Call
+	vc-guess-url-backend.  Always return DIRECTORY if it names a
+	directory.  New optional argument OPEN-DIR.
+	(vc--remotes-history): New defvar.
+	* etc/NEWS: Announce these changes.
+
+2024-10-24  Aleksandr Vityazev  <avityazev@disroot.org>
+
+	Move package-vc-heuristic-alist and related to vc.el
+
+	* lisp/emacs-lisp/package-vc.el (package-vc--backend-type)
+	(package-vc-heuristic-alist, package-vc--guess-backend): Rename
+	to vc-cloneable-backends-custom-type, vc-clone-heuristic-alist
+	and vc-guess-url-backend respectively, and move to
+	lisp/vc/vc.el.  Make package-vc-heuristic-alist an obsolete
+	alias.
+	(package-vc--clone, package-vc--read-package-name)
+	(package-vc-install, package-vc-checkout): Use
+	vc-guess-url-backend.
+	* lisp/vc/vc.el (vc-cloneable-backends-custom-type)
+	(vc-clone-heuristic-alist, vc-guess-url-backend): New defconst,
+	defcustom and defun, respectively: renamed and moved here from
+	lisp/emacs-lisp/package-vc.el.
+
+2024-10-24  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/misc/tramp.texi (Bug Reports): Explain bisecting.
+
+2024-10-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Mark if-let and when-let obsolete
+
+	* lisp/subr.el (if-let*, when-let*, if-let, when-let): Mark
+	if-let and when-let obsolete (bug#73853 and elsewhere).  Move
+	docstring text around so that if-let* and when-let* descriptions
+	no longer refer to if-let and when-let.
+
+	* etc/NEWS: Announce the change.
+
+	* admin/admin.el (reminder-for-release-blocking-bugs):
+	* doc/misc/erc.texi (display-buffer):
+	* lisp/ansi-color.el (ansi-color-apply)
+	(ansi-color--face-vec-face):
+	* lisp/ansi-osc.el (ansi-osc-apply-on-region)
+	(ansi-osc-hyperlink):
+	* lisp/arc-mode.el (archive-goto-file)
+	(archive-next-file-displayer):
+	* lisp/auth-source-pass.el (auth-source-pass-search)
+	(auth-source-pass--parse-data)
+	(auth-source-pass--find-match-many):
+	* lisp/autorevert.el (auto-revert-notify-rm-watch):
+	* lisp/buff-menu.el (Buffer-menu-unmark-all-buffers)
+	(Buffer-menu-group-by-root):
+	* lisp/calendar/parse-time.el (parse-iso8601-time-string):
+	* lisp/cedet/pulse.el (pulse-tick):
+	* lisp/comint.el (comint--fontify-input-ppss-flush-indirect)
+	(comint--intersect-regions):
+	* lisp/completion-preview.el (completion-preview--try-table)
+	(completion-preview--capf-wrapper, completion-preview--update):
+	* lisp/cus-edit.el (setopt--set)
+	(custom-dirlocals-maybe-update-cons, custom-dirlocals-validate):
+	* lisp/custom.el (load-theme):
+	* lisp/descr-text.el (describe-char):
+	* lisp/desktop.el (desktop--emacs-pid-running-p):
+	* lisp/dired-x.el (menu):
+	* lisp/dired.el (dired-font-lock-keywords)
+	(dired-insert-directory, dired--insert-disk-space, dired-mode):
+	* lisp/dnd.el (dnd-handle-multiple-urls):
+	* lisp/dom.el (dom-remove-attribute):
+	* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
+	* lisp/emacs-lisp/bytecomp.el (bytecomp--custom-declare):
+	* lisp/emacs-lisp/comp-common.el (comp-function-type-spec):
+	* lisp/emacs-lisp/comp-cstr.el (comp--all-classes)
+	(comp-cstr-set-range-for-arithm, comp--cstr-union-1-no-mem)
+	(comp-cstr-intersection-no-mem, comp-cstr-fixnum-p)
+	(comp-cstr-type-p):
+	* lisp/emacs-lisp/comp-run.el (comp-subr-trampoline-install)
+	(native--compile-async):
+	* lisp/emacs-lisp/comp.el (comp--get-function-cstr)
+	(comp--function-pure-p, comp--intern-func-in-ctxt)
+	(comp--addr-to-bb-name, comp--emit-assume, comp--maybe-add-vmvar)
+	(comp--add-call-cstr, comp--compute-dominator-tree)
+	(comp--dom-tree-walker, comp--ssa-rename)
+	(comp--function-call-maybe-fold, comp--fwprop-call)
+	(comp--call-optim-func):
+	* lisp/emacs-lisp/edebug.el (edebug-global-prefix)
+	(edebug-remove-instrumentation):
+	* lisp/emacs-lisp/eieio.el (initialize-instance):
+	* lisp/emacs-lisp/ert-x.el (ert-resource-directory):
+	* lisp/emacs-lisp/ert.el (ert--expand-should-1)
+	(ert-test-location, ert-write-junit-test-report)
+	(ert-test--erts-test):
+	* lisp/emacs-lisp/icons.el (icon-complete-spec, icon-string)
+	(icons--create):
+	* lisp/emacs-lisp/lisp-mode.el (lisp--local-defform-body-p):
+	* lisp/emacs-lisp/loaddefs-gen.el
+	(loaddefs-generate--make-autoload)
+	(loaddefs-generate--parse-file):
+	* lisp/emacs-lisp/multisession.el
+	(multisession-edit-mode--revert, multisession-edit-value):
+	* lisp/emacs-lisp/package-vc.el (package-vc--read-archive-data)
+	(package-vc--version, package-vc--clone):
+	* lisp/emacs-lisp/package.el (package--reload-previously-loaded):
+	* lisp/emacs-lisp/pp.el (pp--insert-lisp):
+	* lisp/emacs-lisp/subr-x.el (add-display-text-property):
+	* lisp/emacs-lisp/tabulated-list.el (tabulated-list-print):
+	* lisp/emacs-lisp/timer.el (run-at-time):
+	* lisp/emacs-lisp/vtable.el (vtable-goto-table)
+	(vtable-goto-column, vtable-update-object, vtable--insert-line)
+	(vtable--compute-widths, vtable--make-keymap):
+	* lisp/emacs-lisp/warnings.el (display-warning):
+	* lisp/epa-file.el (epa-file-insert-file-contents):
+	* lisp/epa.el (epa-show-key):
+	* lisp/erc/erc-backend.el (erc--split-line, erc--conceal-prompt)
+	(PRIVMSG, erc--get-isupport-entry):
+	* lisp/erc/erc-button.el (erc-button-add-nickname-buttons)
+	(erc--button-next):
+	* lisp/erc/erc-common.el (erc--find-group):
+	* lisp/erc/erc-fill.el (erc-fill, erc-fill-static)
+	(erc-fill--wrap-escape-hidden-speaker)
+	(erc-fill--wrap-unmerge-on-date-stamp)
+	(erc-fill--wrap-massage-initial-message-post-clear)
+	(erc-fill-wrap, erc-fill--wrap-rejigger-region):
+	* lisp/erc/erc-goodies.el (erc--scrolltobottom-all)
+	(erc--keep-place-indicator-on-window-buffer-change)
+	(keep-place-indicator, erc--keep-place-indicator-adjust-on-clear)
+	(erc-keep-place-move, erc--command-indicator-display):
+	* lisp/erc/erc-ibuffer.el (erc-members):
+	* lisp/erc/erc-join.el (erc-join--remove-requested-channel)
+	(erc-autojoin--join):
+	* lisp/erc/erc-networks.el
+	(erc-networks--id-qualifying-init-parts, erc-networks--id-reload)
+	(erc-networks--id-ensure-comparable)
+	(erc-networks--reclaim-orphaned-target-buffers)
+	(erc-networks--server-select):
+	* lisp/erc/erc-nicks.el (erc-nicks-invert)
+	(erc-nicks--redirect-face-widget-link, erc-nicks--highlight)
+	(erc-nicks--highlight-button)
+	(erc-nicks--list-faces-help-button-action, erc-nicks-list-faces)
+	(erc-nicks-refresh, erc-nicks--colors-from-faces)
+	(erc-nicks--track-prioritize)
+	(erc-nicks--remember-face-for-track):
+	* lisp/erc/erc-notify.el (querypoll, erc--querypoll-get-next)
+	(erc--querypoll-on-352, erc--querypoll-send):
+	* lisp/erc/erc-sasl.el (erc-sasl--read-password):
+	* lisp/erc/erc-services.el
+	(erc-services-issue-ghost-and-retry-nick):
+	* lisp/erc/erc-speedbar.el (erc-speedbar--ensure, nickbar)
+	(erc-speedbar-toggle-nicknames-window-lock)
+	(erc-speedbar--compose-nicks-face):
+	* lisp/erc/erc-stamp.el (erc-stamp--recover-on-reconnect)
+	(erc-stamp-prefix-log-filter, erc--conceal-prompt)
+	(erc--insert-timestamp-left, erc-insert-timestamp-right)
+	(erc-stamp--defer-date-insertion-on-post-modify)
+	(erc-insert-timestamp-left-and-right)
+	(erc-stamp--redo-right-stamp-post-clear)
+	(erc-stamp--reset-on-clear, erc-stamp--dedupe-date-stamps):
+	* lisp/erc/erc-status-sidebar.el (bufbar)
+	(erc-status-sidebar-prefer-target-as-name)
+	(erc-status-sidebar-default-allsort, erc-status-sidebar-click):
+	* lisp/erc/erc-track.el (erc-track--shortened-names-get)
+	(erc-track--setup, erc-track--select-mode-line-face)
+	(erc-track-modified-channels, erc-track--collect-faces-in)
+	(erc-track--switch-buffer, erc-track--replace-killed-buffer):
+	* lisp/erc/erc-truncate.el (erc-truncate--setup)
+	(erc-truncate-buffer):
+	* lisp/erc/erc.el (erc--ensure-query-member)
+	(erc--ensure-query-members, erc--remove-channel-users-but)
+	(erc--cusr-change-status, erc--find-mode, erc--update-modules)
+	(erc-log-irc-protocol, erc--refresh-prompt)
+	(erc--restore-important-text-props)
+	(erc--order-text-properties-from-hash, erc-send-input-line)
+	(erc-cmd-IGNORE, erc--unignore-user, erc-cmd-QUERY)
+	(erc-cmd-BANLIST, erc--speakerize-nick)
+	(erc--format-speaker-input-message, erc-channel-receive-names)
+	(erc-send-current-line, erc-format-target-and/or-network)
+	(erc-kill-buffer-function, erc-restore-text-properties)
+	(erc--get-eq-comparable-cmd):
+	* lisp/eshell/em-alias.el (eshell-maybe-replace-by-alias--which)
+	(eshell-maybe-replace-by-alias):
+	* lisp/eshell/em-glob.el (eshell-glob-convert):
+	* lisp/eshell/em-pred.el (eshell-pred-user-or-group)
+	(eshell-pred-file-time, eshell-pred-file-type)
+	(eshell-pred-file-mode, eshell-pred-file-links)
+	(eshell-pred-file-size):
+	* lisp/eshell/em-prompt.el (eshell-forward-paragraph)
+	(eshell-next-prompt):
+	* lisp/eshell/esh-arg.el (eshell-resolve-current-argument):
+	* lisp/eshell/esh-cmd.el (eshell-do-eval, eshell/which)
+	(eshell-plain-command--which, eshell-plain-command):
+	* lisp/eshell/esh-io.el (eshell-duplicate-handles)
+	(eshell-protect-handles, eshell-get-target, eshell-close-target):
+	* lisp/eshell/esh-proc.el (eshell-sentinel):
+	* lisp/eshell/esh-var.el (eshell-parse-variable-ref)
+	(eshell-get-variable, eshell-set-variable):
+	* lisp/faces.el (face-at-point):
+	* lisp/ffap.el (ffap-in-project):
+	* lisp/filenotify.el (file-notify--rm-descriptor):
+	* lisp/files-x.el (read-dir-locals-file)
+	(connection-local-update-profile-variables)
+	(connection-local-value):
+	* lisp/files.el (file-remote-p, abbreviate-file-name)
+	(set-auto-mode, hack-local-variables)
+	(revert-buffer-restore-read-only):
+	* lisp/find-dired.el (find-dired-sort-by-filename):
+	* lisp/font-lock.el (font-lock--filter-keywords):
+	* lisp/gnus/gnus-art.el (article-emojize-symbols):
+	* lisp/gnus/gnus-int.el (gnus-close-server):
+	* lisp/gnus/gnus-search.el (gnus-search-transform)
+	(gnus-search-indexed-parse-output, gnus-search-server-to-engine):
+	* lisp/gnus/gnus-sum.el (gnus-collect-urls, gnus-shorten-url):
+	* lisp/gnus/gnus.el (gnus-check-backend-function):
+	* lisp/gnus/message.el (message-send-mail):
+	* lisp/gnus/mml.el (mml-generate-mime, mml-insert-mime-headers):
+	* lisp/gnus/nnatom.el (nnatom--read-feed, nnatom--read-article)
+	(nnatom--read-article-or-group-authors, nnatom--read-publish)
+	(nnatom--read-update, nnatom--read-links):
+	* lisp/gnus/nnfeed.el (nnfeed--read-server, nnfeed--write-server)
+	(nnfeed--parse-feed, nnfeed--group-data, nnfeed-retrieve-article)
+	(nnfeed-retrieve-headers, nnfeed--print-part)
+	(nnfeed-request-article, nnfeed-request-group)
+	(nnfeed-request-list, nnfeed--group-description)
+	(nnfeed-request-group-description)
+	(nnfeed-request-list-newsgroups, nnfeed-request-rename-group):
+	* lisp/gnus/nnmh.el (nnmh-update-gnus-unreads):
+	* lisp/help-fns.el (help-find-source)
+	(help-fns--insert-menu-bindings, help-fns--mention-first-release)
+	(help-fns--mention-shortdoc-groups)
+	(help-fns--customize-variable-version)
+	(help-fns--face-custom-version-info, describe-mode):
+	* lisp/help-mode.el (help-make-xrefs):
+	* lisp/help.el (help-key-description, help--describe-command):
+	* lisp/hfy-cmap.el (htmlfontify-load-rgb-file):
+	* lisp/ibuf-ext.el (ibuffer-jump-to-filter-group)
+	(ibuffer-kill-filter-group, ibuffer-kill-line)
+	(ibuffer-save-filter-groups, ibuffer-save-filters, filename)
+	(basename, file-extension, ibuffer-diff-buffer-with-file-1)
+	(ibuffer-mark-by-file-name-regexp)
+	(ibuffer-mark-by-content-regexp):
+	* lisp/ibuf-macs.el (ibuffer-aif, ibuffer-awhen):
+	* lisp/ibuffer.el (ibuffer-mouse-toggle-mark)
+	(ibuffer-toggle-marks, ibuffer-mark-interactive)
+	(ibuffer-compile-format, process, ibuffer-map-lines):
+	* lisp/image.el (image--compute-map)
+	(image--compute-original-map):
+	* lisp/image/exif.el (exif-parse-buffer):
+	* lisp/image/image-converter.el (image-convert-p, image-convert)
+	(image-converter--find-converter):
+	* lisp/image/image-dired-util.el
+	(image-dired-file-name-at-point):
+	* lisp/image/image-dired.el (image-dired-track-original-file)
+	(image-dired--on-file-in-dired-buffer)
+	(image-dired--with-thumbnail-buffer)
+	(image-dired-jump-original-dired-buffer)
+	(image-dired--slideshow-step, image-dired-display-image):
+	* lisp/image/wallpaper.el (wallpaper--init-action-kill)
+	(wallpaper--find-setter, wallpaper--find-command)
+	(wallpaper--find-command-args, wallpaper--x-monitor-name):
+	* lisp/info-look.el (info-lookup-interactive-arguments)
+	(info-complete)::(:mode):
+	* lisp/info.el (info-pop-to-buffer, Info-read-node-name-1):
+	* lisp/international/emoji.el (emoji--adjust-displayable-1)
+	(emoji--add-recent):
+	* lisp/jsonrpc.el (jsonrpc--call-deferred)
+	(jsonrpc--process-sentinel, jsonrpc--remove):
+	* lisp/keymap.el (keymap-local-lookup):
+	* lisp/mail/emacsbug.el (report-emacs-bug-hook)
+	(submit-emacs-patch):
+	* lisp/mail/ietf-drums.el (ietf-drums-parse-addresses):
+	* lisp/mail/mailclient.el (mailclient-send-it):
+	* lisp/mail/rfc6068.el (rfc6068-parse-mailto-url):
+	* lisp/mail/undigest.el (rmail-digest-parse-mixed-mime):
+	* lisp/minibuffer.el (completion-metadata-get)
+	(completions--after-change)
+	(minibuffer-visible-completions--filter):
+	* lisp/net/browse-url.el (browse-url-url-at-point)
+	(browse-url-file-url, browse-url-emacs):
+	* lisp/net/dbus.el (dbus-byte-array-to-string)
+	(dbus-monitor-goto-serial):
+	* lisp/net/dictionary.el (dictionary-search):
+	* lisp/net/eww.el (eww--download-directory)
+	(eww-auto-rename-buffer, eww-open-in-new-buffer, eww-submit)
+	(eww-follow-link, eww-read-alternate-url)
+	(eww-copy-alternate-url):
+	* lisp/net/goto-addr.el (goto-address-at-point):
+	* lisp/net/mailcap.el (mailcap-mime-info):
+	* lisp/net/rcirc.el (rcirc, rcirc-connect, rcirc-send-string)
+	(rcirc-kill-buffer-hook, rcirc-print, rcirc-when)
+	(rcirc-color-attributes, rcirc-handler-NICK)
+	(rcirc-handler-TAGMSG, rcirc-handler-BATCH):
+	* lisp/net/shr.el (shr-descend, shr-adaptive-fill-function)
+	(shr-correct-dom-case, shr-tag-a):
+	* lisp/net/sieve.el (sieve-manage-quit):
+	* lisp/outline.el (outline-cycle-buffer):
+	* lisp/pcmpl-git.el (pcmpl-git--tracked-file-predicate):
+	* lisp/proced.el (proced-auto-update-timer):
+	* lisp/progmodes/bug-reference.el
+	(bug-reference-try-setup-from-vc):
+	* lisp/progmodes/c-ts-common.el (c-ts-common--fill-paragraph):
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode--preproc-offset)
+	(c-ts-mode--anchor-prev-sibling, c-ts-mode-indent-defun):
+	* lisp/progmodes/compile.el (compilation-error-properties)
+	(compilation-find-file-1):
+	* lisp/progmodes/eglot.el (eglot--check-object)
+	(eglot--read-server, eglot-upgrade-eglot)
+	(eglot-handle-notification, eglot--CompletionParams)
+	(eglot-completion-at-point, eglot--sig-info)
+	(eglot-register-capability):
+	* lisp/progmodes/elisp-mode.el
+	(emacs-lisp-native-compile-and-load)
+	(elisp-eldoc-var-docstring-with-value):
+	* lisp/progmodes/erts-mode.el (erts-mode--goto-start-of-test):
+	* lisp/progmodes/flymake.el (flymake--update-eol-overlays)
+	(flymake-eldoc-function):
+	* lisp/progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom)
+	(gdb-frame-handler):
+	* lisp/progmodes/go-ts-mode.el (go-ts-mode-docstring)
+	(go-ts-mode--comment-on-previous-line-p)
+	(go-ts-mode--get-test-regexp-at-point)
+	(go-ts-mode-test-this-file):
+	* lisp/progmodes/grep.el (lgrep, rgrep-default-command)
+	(grep-file-at-point):
+	* lisp/progmodes/perl-mode.el (perl--end-of-format-p):
+	* lisp/progmodes/php-ts-mode.el
+	(php-ts-mode--anchor-prev-sibling, php-ts-mode--indent-defun):
+	* lisp/progmodes/project.el (project--other-place-command)
+	(project--find-default-from, project--transplant-file-name)
+	(project-prefixed-buffer-name, project--remove-from-project-list)
+	(project-prompt-project-name, project-remember-projects-under)
+	(project--switch-project-command)
+	(project-uniquify-dirname-transform, project-mode-line-format):
+	* lisp/progmodes/python.el
+	(python-font-lock-keywords-maximum-decoration)
+	(python--treesit-fontify-union-types)
+	(python-shell-get-process-name, python-shell-restart)
+	(python-shell-completion-at-point, python-ffap-module-path)
+	(python-util-comint-end-of-output-p, python--import-sources)
+	(python-add-import, python-remove-import, python-fix-imports):
+	* lisp/progmodes/xref.el (xref--add-log-current-defun):
+	* lisp/repeat.el (repeat-echo-message-string):
+	* lisp/saveplace.el (save-place-dired-hook):
+	* lisp/server.el (server-save-buffers-kill-terminal):
+	* lisp/shadowfile.el (shadow-make-fullname)
+	(shadow-contract-file-name, shadow-define-literal-group):
+	* lisp/shell.el (shell-highlight-undef-mode):
+	* lisp/simple.el (command-completion-using-modes-p)
+	(command-execute, file-user-uid, file-group-gid)
+	(first-completion, last-completion, switch-to-completions):
+	* lisp/startup.el (startup--load-user-init-file):
+	* lisp/tab-line.el (tab-line-tabs-buffer-group-by-project):
+	* lisp/tar-mode.el (tar-goto-file, tar-next-file-displayer):
+	* lisp/term/android-win.el (android-encode-select-string)
+	(gui-backend-set-selection):
+	* lisp/term/haiku-win.el (haiku-dnd-convert-string)
+	(haiku-select-encode-xstring, haiku-select-encode-utf-8-string):
+	* lisp/textmodes/emacs-news-mode.el (emacs-news--buttonize):
+	* lisp/textmodes/ispell.el (ispell-completion-at-point):
+	* lisp/textmodes/sgml-mode.el (sgml-validate)
+	(html-mode--complete-at-point):
+	* lisp/textmodes/tex-mode.el (tex-recenter-output-buffer)
+	(xref-backend-references):
+	* lisp/thingatpt.el (thing-at-point-file-at-point)
+	(thing-at-point-face-at-point):
+	* lisp/thread.el (thread-list--get-status):
+	* lisp/time.el (world-clock-copy-time-as-kill, world-clock):
+	* lisp/touch-screen.el (touch-screen-handle-touch):
+	* lisp/treesit.el (treesit-language-at, treesit-node-at)
+	(treesit-node-on, treesit-buffer-root-node)
+	(treesit-node-field-name, treesit-local-parsers-at)
+	(treesit-local-parsers-on, treesit--cleanup-local-range-overlays)
+	(treesit-font-lock-recompute-features)
+	(treesit-font-lock-fontify-region, treesit-transpose-sexps)
+	(treesit-add-log-current-defun, treesit-major-mode-setup)
+	(treesit--explorer-refresh, treesit-install-language-grammar):
+	* lisp/url/url.el (url-retrieve-synchronously):
+	* lisp/vc/smerge-mode.el (smerge-diff):
+	* lisp/vc/vc-dir.el (vc-dir):
+	* lisp/vc/vc-dispatcher.el (vc-do-async-command):
+	* lisp/vc/vc-git.el (vc-git-dir--branch-headers)
+	(vc-git-dir--stash-headers, vc-git--log-edit-summary-check)
+	(vc-git-stash-list):
+	* lisp/vc/vc.el (vc-responsible-backend, vc-buffer-sync-fileset)
+	(vc-clone):
+	* lisp/visual-wrap.el (visual-wrap--apply-to-line):
+	* lisp/wid-edit.el (widget-text)
+	(widget-editable-list-insert-before):
+	* lisp/window-tool-bar.el
+	(window-tool-bar--keymap-entry-to-string):
+	* lisp/window.el (display-buffer, display-buffer-full-frame)
+	(window-point-context-set, window-point-context-use)
+	(window-point-context-use-default-function):
+	* lisp/xdg.el (xdg-current-desktop):
+	* lisp/xwidget.el (xwidget-webkit-callback):
+	* lisp/yank-media.el (yank-media--get-selection)
+	(yank-media-types):
+	* test/lisp/comint-tests.el
+	(comint-tests/test-password-function):
+	* test/lisp/completion-preview-tests.el
+	(completion-preview-tests--capf):
+	* test/lisp/cus-edit-tests.el (with-cus-edit-test):
+	* test/lisp/erc/erc-scenarios-base-local-modules.el
+	(-phony-sblm-):
+	* test/lisp/erc/erc-scenarios-stamp.el
+	(erc-scenarios-stamp--on-post-modify):
+	* test/lisp/erc/erc-services-tests.el
+	(erc-services-tests--asp-parse-entry):
+	* test/lisp/erc/erc-tests.el (erc-modules--internal-property)
+	(erc--find-mode, erc-tests--update-modules):
+	* test/lisp/erc/resources/erc-d/erc-d-i.el
+	(erc-d-i--parse-message):
+	* test/lisp/erc/resources/erc-d/erc-d-t.el
+	(erc-d-t-kill-related-buffers, erc-d-t-with-cleanup):
+	* test/lisp/erc/resources/erc-d/erc-d-tests.el
+	(erc-d-i--parse-message--irc-parser-tests):
+	* test/lisp/erc/resources/erc-d/erc-d-u.el
+	(erc-d-u--read-exchange-slowly):
+	* test/lisp/erc/resources/erc-d/erc-d.el (erc-d--expire)
+	(erc-d--finalize-done, erc-d--command-handle-all):
+	* test/lisp/erc/resources/erc-scenarios-common.el
+	(erc-scenarios-common-with-cleanup):
+	* test/lisp/erc/resources/erc-tests-common.el
+	(erc-tests--common-display-message)
+	(erc-tests-common-create-subprocess):
+	* test/lisp/ibuffer-tests.el (ibuffer-test-Bug25058):
+	* test/lisp/international/mule-tests.el
+	(mule-cmds-tests--ucs-names-missing-names):
+	* test/lisp/progmodes/python-tests.el
+	(python-tests-get-shell-interpreter)
+	(python-tests--get-interpreter-info):
+	* test/lisp/progmodes/ruby-ts-mode-tests.el
+	(ruby-ts-resource-file):
+	* test/lisp/replace-tests.el (replace-tests-with-undo):
+	* test/src/emacs-tests.el (emacs-tests--seccomp-debug):
+	* test/src/process-tests.el (process-tests--emacs-command)
+	(process-tests--emacs-binary, process-tests--dump-file):
+	* test/src/treesit-tests.el (treesit--ert-test-defun-navigation):
+	Replace use of the now-obsolete if-let and when-let.
+
+2024-10-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Merge from origin/emacs-30
+
+	eae798486a9 Update special conditionals documentation
+
+2024-10-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Merge from origin/emacs-30
+
+	f5451b6a066 ; Improve comment from last change
+	09e05f7ee4d Document and-let* vs. when-let* usage convention
+	b7a375f5c49 Fix error when splicing Eshell globs and a glob expands t...
+	2289e162268 * etc/package-keyring.gpg: Update expiration and add new key
+	48024096fea Avoid crashes when scrolling images under winner-mode
+	c35d6ba9f07 ; * doc/lispref/display.texi (Fontsets): Clarify wording.
+	88a1a32fc57 ; * doc/lispref/display.texi (Fontsets): Fix typo.
+	6be47058cd7 ; Add indexing for 'use-default-font-for-symbols'
+	681f70ea04a * src/lread.c (READ_AND_BUFFER): Reject negative chars (b...
+	ac4151e0023 * test/Makefile.in: Do not show emacs-module-tests.log by...
+	4e0cb960dbd Fix 'php-ts-mode': better indentation and font locking
+
+2024-10-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-allow-rewriting-published-history: Use nil->ask->t
+
+	* lisp/vc/vc.el (vc-allow-rewriting-published-history): Use
+	increasingly permissive values nil->ask->t rather than
+	nil->t->no-ask.  Recommend `ask' or nil.
+	* lisp/vc/vc-git.el (vc-git--assert-allowed-rewrite): Update
+	accordingly.
+
+2024-10-23  Dmitry Gutov  <dmitry@gutov.dev>
+
+	project-prompter: Update the docstring for the recent change
+
+	* lisp/progmodes/project.el (project-prompter):
+	Update the docstring too (bug#70833).
+
+2024-10-23  Alan Coopersmith  <alan.coopersmith@oracle.com>  (tiny change)
+
+	configure.ac: Fix FIONREAD check with gcc-14 on Solaris
+
+	Before this fix, it would fail to build with gcc-14 with the error:
+	conftest.c: In function 'main':
+	conftest.c:265:11: error: implicit declaration of function 'ioctl'
+	 [-Wimplicit-function-declaration]
+	  265 | int foo = ioctl (0, FIONREAD, &foo);
+	      |           ^~~~~
+
+	Solaris documents ioctl() as being defined in <unistd.h>.
+
+	* configure.ac: Fix FIONREAD check with gcc-14 on Solaris.
+	Ref:
+	https://lists.gnu.org/r/emacs-devel/2024-10/msg00195.html
+
+2024-10-23  Gerd Möllmann  <gerd@gnu.org>
+
+	Handle obscured cursor differently
+
+	This also fixes an error made when porting this to savannah.
+
+	* src/dispnew.c (abs_cursor_pos, (is_cursor_obscured)
+	(terminal_cursor_magic): Port correctly and fix.
+
+2024-10-23  Gerd Möllmann  <gerd@gnu.org>
+
+	Deal with wide characters
+
+	* src/dispnew.c (make_glyph_space): New function.
+	(neutralize_wide_char): New function.
+	(produce_box_sides, copy_child_glyphs): Call neutralize_wide_char.
+
+2024-10-23  Gerd Möllmann  <gerd@gnu.org>
+
+	Fix copy/paste error
+
+	* src/dispnew.c (produce_box_glyphs): DonÄt set multibyte_p twice, set
+	padding_p.
+
+2024-10-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix UB in line_hash_code
+
+	* src/dispnew.c (line_hash_code): Avoid undefined behavior on
+	integer overflow.
+
+2024-10-23  Gerd Möllmann  <gerd@gnu.org>
+
+	Some cleanup of frame_parm_table
+
+	* src/frame.c (frame_parms): Use built-in symbols for all entries.
+	(syms_of_frame): Check that entries are valid built-in symbols.
+
+2024-10-23  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-git-modify-change-comment: Check for other autosquashing
+
+	* lisp/vc/vc-git.el (vc-git-modify-change-comment): Check that a
+	rebase with --autosquash won't make any other changes and give
+	the user a chance to abort.
+
+2024-10-23  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Support modifying VC change comments for Git
+
+	* lisp/vc/vc.el (vc-allow-rewriting-published-history): New option.
+	* lisp/vc/vc-git.el (vc-git--assert-allowed-rewrite)
+	(vc-git-modify-change-comment): New functions (bug#64055).
+
+	(vc-git--current-branch): Factor out of vc-git-dir--branch-headers.
+	(vc-git--log-edit-extract-headers): Factor out of vc-git-checkin.
+
+	* etc/NEWS: Announce the new support and option.
+
+2024-10-22  Andrea Corallo  <acorallo@gnu.org>
+
+	Add 'native-compile-directory' (bug#73303)
+
+	* lisp/emacs-lisp/comp.el (native-compile-directory): New function.
+	* etc/NEWS (native-compile-directory): Add to NEWS.
+
+2024-10-22  Andrea Corallo  <acorallo@gnu.org>
+
+	* Rework 'comp-lookup-eln'
+
+	* lisp/emacs-lisp/comp.el (comp-lookup-eln): Rework to use
+	'comp-eln-load-path-eff'.
+
+2024-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/vc/smerge-mode.el (global-map): Mitigate bug#73544
+
+2024-10-22  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/term.c (tty_display_dimension): Avoid warnings.
+
+	Fix commenting conventions.
+
+2024-10-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix compilation warnings
+
+	* src/frame.c (tty_child_size_param):
+	* src/frame.h (MOUSE_HL_INFO): Avoid NULL dereference warnings.
+
+2024-10-22  Sebastián Monía  <sebastian@sebasmonia.com>
+
+	Add customization to let EWW guess content-type if needed
+
+	* lisp/net/eww.el (eww-guess-content-type-functions): New user option.
+	(eww--guess-content-type, eww--html-if-doctype): New functions.
+	(eww-render): Call 'eww--guess-content-type' (bug#73133).
+
+2024-10-22  Gerd Möllmann  <gerd@gnu.org>
+
+	Don't ignore .patch files
+
+	This is VERY bad for magit users like me.
+
+2024-10-22  Gerd Möllmann  <gerd@gnu.org>
+
+	Comment
+
+	Comment
+
+2024-10-22  Gerd Möllmann  <gerd@gnu.org>
+
+	Don't set internal_last_event_frame to nil
+
+	* src/frame.c (do_switch_frame): Do not set internal_last_event_frame to
+	nil on ttys.
+
+2024-10-22  Gerd Möllmann  <gerd@gnu.org>
+
+	Minor refactoring
+
+2024-10-22  Gerd Möllmann  <gerd@gnu.org>
+
+	Accept frame param width/height of 0
+
+	* src/frame.c (tty_child_size_param): Accept values of 0.
+
+2024-10-22  Gerd Möllmann  <gerd@gnu.org>
+
+	Don't check for child frame support
+
+	* lisp/paren.el (show-paren-function): Don't check with
+	display-graphics-p or featurep.
+
+2024-10-22  Gerd Möllmann  <gerd@gnu.org>
+
+	Set top terminal frame also to children
+
+	* src/frame.c (make_terminal_frame): Don't check for being root when
+	setting top_frame.
+
+2024-10-22  Gerd Möllmann  <gerd@gnu.org>
+
+	Check for tty-child-frames feature in show-paren
+
+	* lisp/paren.el (show-paren-function): Don't rely on display-graphic-p,
+	also check tty-child-frames feature.
+
+2024-10-22  Gerd Möllmann  <gerd@gnu.org>
+
+	Initial child frames based on master
+
+	This is based on a diff from 2024-10-15 which still applied.
+	Since then, I've inadvertantly modified the igc branch so that
+	it is no longer possible to get a clean diff of what has changed
+	since I created the branch.
+
+2024-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs
+
+2024-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/files.el (require-with-check): Provide more info in the error message
+
+	Rather than only show the "new" file to be loaded, show also the
+	name of the currently loaded file, to clarify the conflict.
+
+2024-10-21  Jim Porter  <jporterbugs@gmail.com>
+
+	Fix a race condition when running Eshell startup scripts
+
+	Previously, these scripts could run before all the Eshell modules had
+	fully-initialized.
+
+	* lisp/eshell/esh-mode.el (eshell-after-initialize-hook): New hook...
+	(eshell-mode): ... run it.
+
+	* lisp/eshell/em-script.el (eshell-run-startup-scripts): New function...
+	(eshell-script-initialize): ... add it to
+	'eshell-after-initialize-hook'.
+
+	* etc/NEWS: Announce 'eshell-after-initialize-hook'.
+
+2024-10-21  Stephen Berman  <stephen.berman@gmx.net>
+
+	Let 'tex-view' show PDFs made without a DVI (bug#73854)
+
+	* lisp/textmodes/tex-mode.el (tex-print-file): Update doc string
+	to mention 'tex-compile'.
+	(tex-compile-commands): Add entries for 'evince' and 'mupdf'.
+	(tex-compile): Set 'tex-print-file'.
+
+2024-10-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "; Fix last change."
+
+	This reverts commit 75fa0cc1ae2b53fe169fdcfef52bee6719eb38a7.
+	The large part of it was committed by accident.
+
+2024-10-21  Jim Porter  <jporterbugs@gmail.com>
+
+	Make all the entries in 'eshell-parse-argument-hook' named functions
+
+	* lisp/eshell/esh-arg.el (eshell-parse-number, eshell-parse-non-special)
+	(eshell-parse-whitespace, eshell-parse-comment): New functions...
+	(eshell-parse-argument-hook): ... use them.
+
+2024-10-21  Jim Porter  <jporterbugs@gmail.com>
+
+	Be more careful about applying spliced arguments
+
+	Previously, this could 'nonc' to a list that shouldn't be modified.
+
+	* lisp/eshell/esh-cmd.el (eshell-rewrite-named-command): Use 'append'
+	instead of 'nconc'.
+
+	* test/lisp/eshell/esh-var-tests.el (esh-var-test/interp-var-splice):
+	(esh-var-test/quoted-interp-var-splice): New tests.
+
+2024-10-20  Sebastián Monía  <code@sebasmonia.com>
+
+	Use vtable in eww-list-buffers and add function eww-buffer-list
+
+	* lisp/net/eww.el (eww-buffer-list): New function.
+	(eww-list-buffers): Move logic to...
+	(eww--list-buffers-display-table, eww--list-buffers-get-data):
+	... these, and use 'vtable'.
+	(eww-buffer-select, eww-buffer-show, eww-buffer-kill)
+	(eww-buffers-mode-map): Use 'vtable-current-object'.
+	(eww-buffers-mode): Set 'revert-buffer-function'
+
+2024-10-20  Mattias Engdegård  <mattiase@acm.org>
+
+	Revert "Preserve source position of macro calls in macro expansions"
+
+	This reverts commit 2114a955c23c213168f012f5e480edae46561fd2.
+	No agreement on this (bug#73725).
+
+2024-10-20  Alan Mackenzie  <acm@muc.de>
+
+	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 (sub-macroexp--posify-form)
+	(macroexp--posify-form): New functions.
+	(macroexp-preserve-posification): New macro.
+	(macroexp-macroexpand): Use the new macro to preserve a calling
+	form's position.
+	(macroexpand-all): Add a new parameter `keep-pos' which
+	instructs the function to preserve an invoking form's position.
+
+	* lisp/emacs-lisp/byte-opt.el (byte-optimize-form): Use the new
+	macro to preserve source positions.
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): Call
+	macroexpand-all with the new argument `keep-pos' non-nil.
+
+2024-10-20  Michael Albinus  <michael.albinus@gmx.de>
+
+	Minor changes of last commit
+
+	* lisp/autorevert.el (auto-revert--last-time): Init with 0 (Epoch).
+	(auto-revert-notify-handler): Simplify.
+
+2024-10-20  Lin Sun  <sunlin7@hotmail.com>
+
+	Enhance the auto-revert to avoid revert a buffer in short time
+
+	* lisp/autorevert.el (auto-revert--last-time): New defvar.
+	(auto-revert-handler, auto-revert-notify-handler): Use it.
+	* test/lisp/autorevert-tests.el (with-auto-revert-test): Set
+	`auto-revert--lockout-interval' correctly.
+
+2024-10-20  Jim Porter  <jporterbugs@gmail.com>
+
+	Fix 'min-width' calculation in 'visual-wrap-prefix-mode'
+
+	* lisp/visual-wrap.el (visual-wrap--content-prefix): Remove 'min-width'
+	before computing the pixel width to avoid miscalculation (bug#73882).
+
+2024-10-20  john muhl  <jm@pub.pink>
+
+	Add ability to crossfade between songs in 'mpc'
+
+	* lisp/mpc.el (mpc-cmd-crossfade):
+	(mpc-toggle-crossfade): New function.
+	(mpc-crossfade-time): New option.
+	(mpc-mode-menu): Add menu item to toggle crossfade.  (Bug#73891)
+
+2024-10-19  Jim Porter  <jporterbugs@gmail.com>
+
+	Lazily convert numeric strings to Lisp numbers in Eshell
+
+	This should reduce the number of issues with Eshell converting strings
+	to numbers too aggressively and losing information (e.g. "001" -> 1)
+	while still allowing almost all of the beneficial uses, like summing a
+	list of numeric strings with '+'.
+
+	* lisp/eshell/esh-util.el (eshell--do-mark-numeric-string): New
+	function.
+	(eshell-convert-to-number): Make obsolete in favor of...
+	(eshell-mark-numeric-string): ... this.  Update callers.
+
+	* lisp/eshell/esh-arg.el (eshell--numberlike-p): New function...
+	(eshell-concat-1): ... use it.
+
+	* test/lisp/eshell/esh-util-tests.el:  Reimplement type conversion tests
+	to use 'eshell-convertible-to-number-p' instead.
+
+	* test/lisp/eshell/esh-var-tests.el
+	(esh-var-test/interp-var-splice-concat, esh-var-test/interp-concat-cmd)
+	(esh-var-test/interp-convert-var-split-indices)
+	(esh-var-test/interp-convert-quoted-var-split-indices)
+	(esh-var-test/interp-convert-cmd-multiline)
+	(esh-var-test/interp-convert-cmd-split-indices): Adjust tests to check
+	the new behavior.
+
+	* doc/misc/eshell.texi (Type Conversion): New section.
+	(Expansion): Clarify concatenation behavior.
+
+2024-10-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	902029b1410 * lisp/auth-source.el (read-passwd): Remove entry from `p...
+	a61bf742257 New FAQ about Ctrl keys on xterm
+	f353fcc8506 Autoload 'message-narrow-to-headers-or-head' in mml.el
+
+2024-10-19  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Fix tmm menu layout (Bug#73734)
+
+	* lisp/tmm.el (tmm-mb-map): Remove unused and unset keymap
+	variable.
+	* lisp/tmm.el (tmm-get-keymap): Fix menu layout to avoid
+	confusion between the tmm-shortcut and the keybinding of the
+	previous column.
+
+2024-10-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix etags tagging by multiline regexps
+
+	* lib-src/etags.c (regex_tag_multiline): Fix off-by-one error in
+	determining the end of the tag matched by a multiline regexp.
+	(Bug#73771)
+
+	* test/manual/etags/ETAGS.good_4:
+	* test/manual/etags/ETAGS.good_5:
+	* test/manual/etags/ETAGS.good_6: Adjust test results to the above
+	change.
+
+2024-10-19  Álvaro Ramírez  <me@xenodium.com>
+
+	Hide default-directory absolute file name in dired-hide-details-mode
+
+	* lisp/dired.el (dired-hide-details-hide-absolute-location):
+	New user option.
+	(dired-insert-directory, dired-build-subdir-alist): Use it to
+	hide absolute file name of the directory.
+	(dired-hide-details-mode): Update doc string.
+	* test/lisp/dired-tests.el
+	(dired-test-hide-absolute-location-enabled)
+	(dired-test-hide-absolute-location-disabled): New tests
+
+	* etc/NEWS: Announce the new feature.
+
+	Bug#72272
+
+2024-10-19  Morgan Willcock  <morgan@ice9.digital>
+
+	Rewrite Speedbar expansion for all descendants (bug#73533)
+
+	Rewrite 'speedbar-expand-line-descendants' to avoid getting into
+	an infinite loop by reaching max-lisp-eval-depth.  The new
+	method avoids querying and displaying information for every
+	movement, instead using a single message to indicate that
+	expansion is in progress, and so is significantly faster.  The
+	narrowing per item introduced by the fix for bug#35014 is
+	removed because it prevented expanded descendant items when the
+	top-level item was already expanded.
+	* lisp/speedbar.el (speedbar--get-line-indent-level): New
+	function to return the indentation level of the current line.
+	(speedbar-expand-line-descendants): Use simpler line motion and
+	no recursion.  Output messages indicating when expansion is in
+	progress and when it is completed.  Fix expansion of descendants
+	where the top-level item was already expanded.
+
+2024-10-19  Morgan Willcock  <morgan@ice9.digital>
+
+	Add Speedbar tests (bug#73533)
+
+	Add Speedbar tests which test the operation of
+	'speedbar-expand-line-descendants'.
+	* test/lisp/speedbar-tests.el (speedbar-tests-container)
+	(eieio-speedbar-object-children, speedbar-tests-item)
+	(speedbar-tests--make-object, speedbar-tests--setup-strings)
+	(speedbar-tests--object-hierarchy, speedbar-tests--base-items)
+	(speedbar-tests--clean-up, speedbar-tests--initialize)
+	(speedbar-tests--object-name-expanded)
+	(speedbar-tests--object-name-function)
+	(speedbar-tests--objects-as-strings)
+	(speedbar-tests--state-test)
+	(speedbar-tests--expand-descendants-single)
+	(speedbar-tests--expand-descendants-nested)
+	(speedbar-tests--expand-descendants-nested-wide)
+	(speedbar-tests--expand-descendants-of-first)
+	(speedbar-tests--expand-descendants-of-first-expanded)
+	(speedbar-tests--expand-descendants-of-last)
+	(speedbar-tests--expand-descendants-of-last-expanded)
+	(speedbar-tests--expand-descendants-of-middle)
+	(speedbar-tests--expand-descendants-of-middle-expanded):
+	New tests, test 'speedbar-expand-line-descendants'.
+
+2024-10-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix skeleton-related errors in sgml-mode.el
+
+	* lisp/textmodes/sgml-mode.el (sgml-mode-facemenu-add-face-function)
+	(sgml-attributes): Require 'skeleton before using its symbols.
+	(Bug#53710)
+
+2024-10-19  F. Jason Park  <jp@neverwas.me>
+
+	Don't autoload erc-modules
+
+	* doc/misc/erc.texi (Modules): Recommend using `describe-variable'
+	instead of `customize-option' because the latter needs the symbol to be
+	loaded.
+	* lisp/erc/erc.el (erc-modules): Remove autoload cookie because it
+	caused customizations for this option to load the main library.  This
+	reverts the thrust of bb894845 "Teach customize-option about
+	erc-modules", which was added in ERC 5.6 and Emacs 30.  The motivation
+	for the original offending change was to allow new users to run M-x
+	customize-option RET erc-modules RET immediately after startup instead
+	of M-x customize-group RET, followed by an I-search.  (Bug#73812)
+
+2024-10-19  F. Jason Park  <jp@neverwas.me>
+
+	Move experimental module querypoll to erc-notify
+
+	* etc/ERC-NEWS: Announce migration of misplaced `querypoll' module from
+	erc-goodies.el to erc-notify.el.
+	* lisp/erc/erc-goodies.el: Move all definitions associated with
+	experimental module `querypoll' to erc-notify.
+	* lisp/erc/erc-notify.el (erc--querypoll-ring)
+	(erc--querypoll-timer, erc-querypoll-exclude-regexp)
+	(erc-querypoll-mode, erc-querypoll-enable, erc-querypoll-disable)
+	(erc--queries-current-p, erc-querypoll-period-params)
+	(erc--querypoll-compute-period, erc--querypoll-target-in-chan-p)
+	(erc--querypoll-get-length, erc--querypoll-get-next)
+	(erc--querypoll-subscribe, erc--querypoll-on-352)
+	(erc--querypoll-send): Move here from erc-goodies.
+	* test/lisp/erc/erc-goodies-tests.el (erc--querypoll-compute-period)
+	(erc--querypoll-target-in-chan-p, erc--querypoll-get-length)
+	(erc--querypoll-get-next): Move to new file erc-notify-tests.el.
+	* test/lisp/erc/erc-notify-tests.el: New file.  The `querypoll' module
+	was first introduced as part of bug#70928 in ERC 5.6.
+
+2024-10-19  F. Jason Park  <jp@neverwas.me>
+
+	Fix trailing args bug in erc-d-i--parse-message
+
+	* test/lisp/erc/resources/erc-d/erc-d-i.el: Require `subr-x'.
+	(erc-d-i--parse-message): Populate `contents' slot when lone trailing
+	arg lacks a preceding colon.
+	* test/lisp/erc/resources/erc-d/erc-d-tests.el (erc-d-i--parse-message):
+	Fix expected result.
+	(erc-d-i--parse-message/privmsg): New test.
+
+2024-10-19  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Fix the regression in dired-backup-diff's diff-goto-source behavior
+
+	* lisp/vc/diff-mode.el (diff-find-source-location): Undo part of
+	the previous change, so that 'reverse' does not affect whether the
+	"other file" is used (bug#62731).
+	(diff-apply-hunk): Make that choice here.
+
+2024-10-18  john muhl  <jm@pub.pink>
+
+	Fix naming of buffers for tags ending in Y in 'mpc'
+
+	* lisp/mpc.el (mpc-tagbrowser-buf): Use 'mpc-tagbrowser-tag-name'
+	to ensure buffers corresponding to tags that end in Y are
+	correctly pluralized; e.g. the tag "Directory" should create a
+	buffer named "*MPC Directories*" not "*MPC Directorys".
+
+2024-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(symbol-file): Fix `C-h v pcase` where `cl-struct` lacks file info
+
+	* lisp/subr.el (symbol-file): Return an actual (and absolute) file name
+	for the autoload case, as is done for other cases.
+
+2024-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(help-fns-short-filename): Fix bug#73766
+
+	* lisp/help-fns.el (help-fns--radix-trees): New var.
+	(help-fns--filename, help-fns--radix-tree): New functions.
+	(help-fns-short-filename): Use them.
+
+2024-10-18  Michael Albinus  <michael.albinus@gmx.de>
+
+	* admin/notes/git-workflow: Use emacs-30 in examples.
+
+2024-10-18  Michael Albinus  <michael.albinus@gmx.de>
+
+	Merge from origin/emacs-30
+
+	7dbbd58d6c9 Locate password icon in global-mode-string
+	19049efd30f ; Fix last documentation change
+	2c640e63a8a Explain tty-color-mode frame parameter more.
+	e5d600006e2 ; * src/doc.c (Ftext_quoting_style): Make doc string agre...
+	90c6880a922 (track-changes--after): Fix problem found in bug#73041
+
+2024-10-18  Michael Albinus  <michael.albinus@gmx.de>
+
+	Merge from origin/emacs-30
+
+	78e6328fafd ; (select-safe-coding-system-interactively): Say "safely ...
+	c5eba443ae7 ; * lisp/icomplete.el (icomplete-in-buffer): Doc fix (bug...
+	569186c36e3 ; * doc/lispref/display.texi (Face Attributes): Fix typo ...
+	d5723fc4f03 * lisp/progmodes/c-ts-mode.el (treesit-node-eq): Declare ...
+	0085e48f917 * admin/notes/emba: Docker builds do not run in a worktree.
+	3d30905b022 * lisp/calc/calc-ext.el (math-approx-sqrt-e): Doc fix (bu...
+	94d0e9c4018 : Revert a mistaken change
+	4d90a1d8209 ; * doc/emacs/search.texi (Word Search): Spelling fixes.
+	c154047c46a Fix c-ts-mode--anchor-prev-sibling (bug#73661)
+	b87fda63dd4 Fix formatting of long keyboard macros by 'list-keyboard-...
+	ae75ea62324 ; * src/fileio.c (Ffile_newer_than_file_p): Fix wording (...
+	b1203978685 Merge branch 'emacs-30' of git.sv.gnu.org:/srv/git/emacs ...
+	de54d922b5c * doc/emacs/mini.texi (Passwords): Mention password visib...
+	0f8f0773183 ; * doc/emacs/search.texi (Word Search): Document 'dictio...
+	fb155bcfb6f ; * lisp/emacs-lisp/chart.el (chart-bar-quickie): Doc fix.
+	6dbe4e99ac4 ; * lisp/emacs-lisp/chart.el (chart-bar-quickie): Improve...
+	d664227f81a ; More accurate documentation of 'file-newer-than-file-p'
+	e49b479f869 Fix c-ts-mode indentation for initializer lists (bug#73661)
+	f520008744b Avoid segfaults in Rmail-MIME
+	6a5c2edd84f Eglot: use :immediate t when resolving completions (bug#7...
+	cd36e070c24 Eglot: minor changes to doc and docstrings
+	1ea0d9b891b Revert "Set treesit-primary-parser for tree-sitter modes"
+	52746ceb625 Remove duplicate indent rules in elixir-ts-mode
+	ed57faafc74 Set treesit-primary-parser for tree-sitter modes
+	37a6c859b04 ; * lisp/emacs-lisp/cl-macs.el (cl-once-only): Fix capita...
+	2d4d6dc43a4 Delete XIE X extension from TODO
+	b68b9f291cc ; * lisp/progmodes/csharp-mode.el (treesit-query-compile)...
+	688201ef18d ; * lisp/window.el (switch-to-prev-buffer-skip-regexp): D...
+	ba44fc9a447 Restore comment/string check for 'electric-layout-mode'
+	5a462948e13 Update Arni Magnusson's email address
+	6b1271b169a Fix python-ts-mode-map docstring
+	aaaafddc945 Normalize "Commentary" section in eudc.el
+	d656be9794d Expand email abbrevs in X-Debbugs-Cc header.
+	e9dcf0c57dd Fix 'list-tags' when invoked from a non-file buffer
+	51ef05f684c count-windows: Fix reference to walk-windows
+	5eaf0c784bf * lisp/info-look.el (mapc): Add use-package manual's index.
+	705a5a1a9e6 ; * ChangeLog.4: Fix attribution of one change.
+	bf26ff0dc8d Update csharp-ts-mode font-lock (bug#73369)
+	4c866abab96 ; * doc/lispref/variables.texi (Creating Buffer-Local): F...
+	d42d7d474fe ; * lisp/doc-view.el (doc-view-svg-face): Copy-edit docst...
+	f46f476bb8f ; * admin/MAINTAINERS: Take VC subsystem, add note about ...
+	d68e6d2689d ; rcirc-update-activity-string: Justify some existing beh...
+	e6a37869c8d Fix inconsistency in value of rcirc-activity-string
+	108b3179bd4 Revert "; Minor clarification in variables.texi"
+	44156c21407 ; Minor clarification in variables.texi
+	63058e1153a Tag interactive commands in 'lua-ts-mode'
+	84bea20eba2 ; * lisp/info-look.el: Add two more links.
+	96b87ad5363 Mention LSP acronym in eglot defgroup docstring
+	9c904e8ceae Change :group of 'eglot' defgroup to 'tools'
+	fd1a1b07805 Remove out-of-date documentation from python.el
+	11e3e0cadd4 Fix executing commands in Eshell using "env" with no loca...
+	c0ef8a9a1b3 Fix a typo in the calendar manual
+	36ff7138feb ; Fix a thinko in sieve-manage.el
+	7abecbcd633 ; * nt/INSTALL: Update MinGW notes URL.  (Bug#73528)
+	e2b01d164cd ; Fix last changes in php-ts-mode.el
+	e8830015b07 Require ert-x for use by 'ert-font-lock-deftest-file'
+	a1841b4d8e7 ; * admin/authors.el (authors-aliases): Don't ignore "one...
+	69d8f9d1b70 Fix php-ts-mode font-lock for latest PHP grammar (bug#73516)
+	68f53e43488 eieio.texi: Fix bug#73505
+	53c887fdf6d ; cperl-mode.el: Fix an invalid face specification
+	f5cd5585f46 ; Recommend GNU Find for 'find-dired'
+	65e589698e6 ; * lisp/filesets.el (filesets-homepage): Fix URL.
+	1f243a97806 Delete duplicated line in Viper refcard
+
+2024-10-18  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Replace my recent change to vc-start-logentry
+
+	* lisp/vc/vc-dispatcher.el (vc-start-logentry): Restore previous
+	logic for determining the parent buffer from before my recent
+	change to this function.  If the attempt to determine the parent
+	buffer fails, signal an error immediately.
+	(vc-dispatcher-browsing): Consider derived modes of
+	log-view-mode, too, as indicating that we are in a directory
+	browser.
+
+2024-10-18  Visuwesh  <visuweshm@gmail.com>
+
+	Make djvused emit UTF-8 encoded text
+
+	* lisp/doc-view.el (doc-view--djvu-outline): Pass -u to djvused
+	to make it emit UTF-8 encoded text rather than using octal
+	escapes for non-ASCII string.  (bug#73846)
+
+2024-10-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/emacs-lisp/track-changes.el (track-changes--backtrace):  Fix prefix
+
+2024-10-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	mpc.el: Misc tweaks.
+
+	* lisp/mpc.el: Require `cl-lib` at run-time.
+	Don't require `subr-x` any more.
+	(mpc-status-callbacks): Improve docstring.
+	(mpc-cover-image-find): Avoid `and-let*`.
+	(mpc-cover-image-p): Use `member-ignore-case` to recover the
+	behavior before last patch.
+	(mpc-cover-image-find, mpc-cover-image-p): Move to later in the
+	file to avoid compiler warning.
+	(mpc-format, mpc-notifications-title, mpc-notifications-body):
+	Tweak docstring.
+	(mpc--notifications-format): Create only one temp buffer and use
+	the faster `cl-some` since we know the arg is a list.
+	(mpc-notifications-notify): Prefer `when-let*` since all the other
+	`*-let` we use are also of the `let*`family.
+
+2024-10-17  john muhl  <jm@pub.pink>
+
+	Add notifications support to 'mpc' (Bug#73538)
+
+	* lisp/mpc.el (mpc-notifications, mpc-notifications-title)
+	(mpc-notifications-body): New option.
+	(mpc--notifications-id): New variable.
+	(mpc-notifications-notify, mpc-cover-image-find)
+	(mpc-cover-image-p, mpc--notifications-format): New function.
+	(mpc-format): Use 'mpc-cover-find' and expand docstring to
+	include details about the FORMAT-SPEC.
+	(mpc-status-callbacks): Add file callback for
+	notifications.
+
+2024-10-17  Sean Whitton  <spwhitton@spwhitton.name>
+
+	log-view-modify-change-comment: Prepend Summary header
+
+	* lisp/vc/log-view.el (log-edit): Require.
+	(log-view-modify-change-comment): When log-edit-hook would
+	insert an empty Summary header, prepend one to the old comment.
+
+2024-10-17  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New get-change-comment VC backend action
+
+	This gets us closer to using log-view-modify-change-comment with modern
+	VCS.  What remains is implementing the modify-change-comment backend
+	action for those VCS.
+
+	* lisp/vc/vc.el: New get-change-comment backend action.
+	(vc-modify-change-comment): Pass the backend to vc-start-logentry.
+	* lisp/vc/log-view.el (log-view-extract-comment): Use new
+	get-change-comment action.
+	* lisp/vc/vc-git.el (vc-git-get-change-comment): Factor out of
+	vc-git-log-edit-toggle-amend.
+
+2024-10-17  Sean Whitton  <spwhitton@spwhitton.name>
+
+	vc-start-logentry: Use current buffer as parent buffer more often
+
+	* lisp/vc/vc-dispatcher.el (vc-start-logentry): When determining
+	the parent buffer, if get-file-buffer returns nil, use the
+	current buffer.  Also, if the first file is a directory, don't
+	try to call get-file-buffer, just use the current buffer.
+
+2024-10-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve coverage of scripts by the default fontset
+
+	* lisp/international/fontset.el (setup-default-fontset): Add
+	missing "simple" scripts.
+
+2024-10-17  Sean Whitton  <spwhitton@spwhitton.name>
+
+	More consistently propertize Log Edit headers as fields
+
+	* lisp/vc/log-edit.el (log-edit--make-header-line): Factor out
+	of log-edit-insert-message-template.
+	(log-edit-set-header): Call log-edit--make-header-line so that
+	the Log Edit header is propertized as a field.
+
+2024-10-17  Jim Porter  <jporterbugs@gmail.com>
+
+	Add support for chaining conditionals in Eshell
+
+	* lisp/eshell/esh-cmd.el (eshell-structure-basic-command): Check for the
+	presence of the conditional.  Allow any number of BODY forms.
+	(eshell-rewrite-if-command): Add support for 'else' keyword and chained
+	conditionals.
+
+	* test/lisp/eshell/esh-cmd-tests.el (esh-cmd-test/if-else-statement):
+	Test 'else' keyword.
+	(esh-cmd-test/if-else-statement-chain): New test.
+
+	* doc/misc/eshell.texi (Control Flow): Document this change.
+
+	* etc/NEWS: Announce this change.
+
+2024-10-17  Jim Porter  <jporterbugs@gmail.com>
+
+	Improve correctness of Eshell sub-forms
+
+	This makes sure that we treat Eshell sub-forms (whether Lisp or command
+	forms) as values when appropriate, or as regular invocations.  This
+	requires a bit more explicit work, but helps to resolve some of the
+	surprising differences between Lisp and command forms in complex Eshell
+	statements.
+
+	* lisp/eshell/esh-cmd.el (eshell-subcommand-arg-values): Make obsolete.
+	(eshell-parse-lisp-argument): Don't add 'eshell-command-to-value' here.
+	(eshell-rewrite-sexp-command): Don't check for 'eshell-command-to-value
+	here'; instead check for 'eshell-lisp-command'.
+	(eshell-structure-basic-command): Check for 'eshell-lisp-command'.
+	(eshell-term-as-value): New function...
+	(eshell-rewrite-named-command, eshell-rewrite-for-command): ... call it.
+
+	* lisp/eshell/esh-arg.el (eshell-parse-special-reference):
+	* lisp/eshell/esh-io.el (eshell-strip-redirections):
+	* lisp/eshell/esh-var.el (eshell-prepare-indices): Call
+	'eshell-term-as-value'.
+
+	* test/lisp/eshell/esh-arg-tests.el
+	(esh-arg-test/special-reference/command-form):
+	* test/lisp/eshell/esh-cmd-tests.el (esh-cmd-test/for-loop-lisp-body)
+	(esh-cmd-test/while-loop-lisp-body)
+	(esh-cmd-test/if-else-statement-lisp-body): New tests.
+
+	* test/lisp/eshell/esh-var-tests.el
+	(esh-var-test/interp-var-indices-subcommand): Add another command to
+	test.
+
+	* doc/misc/eshell.texi (Control Flow): Update documentation.
+
+2024-10-17  Jim Porter  <jporterbugs@gmail.com>
+
+	Simplify creation of Eshell command forms
+
+	Previously, Eshell over-aggressively converted subcommands, which forced
+	control flow commands to undo that change.
+
+	* lisp/eshell/esh-cmd.el (eshell-pre-rewrite-command-hook): Remove
+	'eshell-subcommand-arg-values' call from here...
+	(eshell-rewrite-named-command): ... and put it here.
+	(eshell-invokify-arg): Make obsolete.
+	(eshell-structure-basic-command): Handle subcommand test forms.
+	(eshell-rewrite-for-command, eshell-rewrite-while-command)
+	(eshell-rewrite-if-command): Don't call 'eshell-invokify-arg'; it's not
+	necessary.
+
+2024-10-16  Dmitry Gutov  <dmitry@gutov.dev>
+
+	New helper function project-read-project
+
+	* lisp/progmodes/project.el (project-read-project): New helper.
+
+2024-10-16  Michael R. Mauger  <michael@mauger.com>
+
+	Add suffixes individually and use minor mode directly
+
+	  * lisp/jka-cmpr-hook.el (jka-compr-install): Add jka-compr
+	  suffixes individually with add-to-list rather than append.
+	  * (with-auto-compression-mode): Use auto-compression-mode minor mode.
+
+2024-10-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	Use debian:bookworm for tests on emba
+
+	* test/infra/Dockerfile.emba (emacs-base): Derive from debian:bookworm.
+	(emacs-eglot, emacs-tree-sitter): Derive from emacs-base.
+	(emacs-native-comp): Install libgccjit-12-dev.
+
+2024-10-16  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: Fix dodgy lisp `let' form.
+
+	* lisp/progmodes/cc-engine.el (c-forward-sws): Move a `setq'
+	form from out of a let binding.  This form could have been
+	affected by the byte compiler bug bug#67116 before this was
+	fixed.
+
+2024-10-15  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: Rationalize and optimize cache invalidation (2).
+
+	Replace separate syntax-table text property changes and cache
+	invalidation with macros which do both together.  Correct a bug
+	in the invocation of XEmacs's map-extents.
+
+	* lisp/progmodes/cc-defs.el (c-put-syntax-table-trim-caches)
+	(c-clear-syntax-table-trim-caches)
+	(c-clear-syntax-table-properties-trim-caches)
+	(c-clear-syntax-table-with-value-trim-caches)
+	(c-clear-syntax-table-with-value-on-char-trim-caches)
+	(c-put-syntax-table-properties-on-char-trim-caches): New
+	macros.
+	(c-clear-char-properties, c-clear-char-property-with-value)
+	(c-clear-char-property-with-value-on-char): Correct the
+	invocation of XEmacs's map-extents by returning nil from the
+	mapping function to prevent premature exit from map-extents.
+	(c-clear-char-property-with-value-function)
+	(c-clear-char-property-with-value)
+	(c-clear-char-property-with-value-on-char-function)
+	(c-clear-char-property-with-value-on-char)
+	(c-put-char-properties-on-char): Enhance to return the position
+	of the first changed char property (or nil).
+
+	* lisp/progmodes/cc-awk.el
+	(c-awk-set-string-regexp-syntax-table-properties)
+	(c-awk-set-syntax-table-properties)
+	* lisp/progmodes/cc-engine.el
+	(c-depropertize-ml-string-delims)
+	(c-after-change-unmark-ml-strings, c-propertize-ml-string-id)
+	(c-propertize-ml-string-opener, c-depropertize-ml-string)
+	(c-depropertize-ml-strings-in-region)
+	* lisp/progmodes/cc-mode.el (c-depropertize-CPP)
+	(c-neutralize-CPP-line, c-put-syn-tab, c-clear-syn-tab)
+	(c-parse-quotes-before-change, c-parse-quotes-after-change)
+	(c-before-change-fix-comment-escapes)
+	(c-after-change-fix-comment-escapes): Use the new macros from
+	cc-defs.el.
+
+	* lisp/progmodes/cc-mode.el
+	(c-trim-cache-first-punctuation-prop): Remove.
+	(c-depropertize-CPP): Remove calls to the above function.
+
+2024-10-15  Andrea Corallo  <acorallo@gnu.org>
+
+	* lisp/emacs-lisp/comp-cstr.el (comp-cstr-type-p): Add assertion.
+
+2024-10-15  Andrea Corallo  <acorallo@gnu.org>
+
+	Fix comp branch-optim pass (bug#73270)
+
+	* test/src/comp-tests.el (comp-test-73270-1): Define new test.
+	* test/src/comp-resources/comp-test-funcs.el (comp-test-73270-base)
+	(comp-test-73270-child1, comp-test-73270-child2)
+	(comp-test-73270-child3, comp-test-73270-child4)
+	(comp-test-73270-1-f): Define.
+	* lisp/emacs-lisp/comp-cstr.el (comp-cstr-type-p): Fix it for nil cstrs.
+
+2024-10-15  Andrea Corallo  <acorallo@gnu.org>
+
+	* lisp/emacs-lisp/comp.el (comp--type-check-optim-block): Improve log msg.
+
+2024-10-15  Dan Christensen  <jdc@uwo.ca>  (tiny change)
+
+	Report correct unread count for nnimap groups
+
+	* lisp/gnus/nnimap.el (nnimap-request-group): Use '(1 . 0) range
+	as default, and calculate the actual range the same way as other
+	backends.  (Bug@72949)
+
+2024-10-15  Yuan Fu  <casouri@gmail.com>
+
+	Set treesit-primary-parser for tree-sitter modes
+
+	I debated whether to do this, since technically speaking it's
+	not needed for single-language modes.  But ultimately it's
+	better to be explicit and set a good example with builtin modes.
+
+	* lisp/progmodes/cmake-ts-mode.el (cmake-ts-mode):
+	* lisp/progmodes/csharp-mode.el (csharp-ts-mode):
+	* lisp/progmodes/dockerfile-ts-mode.el (dockerfile-ts-mode):
+	* lisp/progmodes/go-ts-mode.el (go-ts-mode):
+	(go-mod-ts-mode):
+	* lisp/progmodes/heex-ts-mode.el (heex-ts-mode):
+	* lisp/progmodes/json-ts-mode.el (json-ts-mode):
+	* lisp/progmodes/lua-ts-mode.el (lua-ts-mode):
+	* lisp/progmodes/python.el (python-ts-mode):
+	* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
+	* lisp/progmodes/rust-ts-mode.el (rust-ts-mode):
+	* lisp/progmodes/sh-script.el:
+	* lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode):
+	(tsx-ts-mode):
+	* lisp/textmodes/css-mode.el (css-ts-mode):
+	* lisp/textmodes/html-ts-mode.el (html-ts-mode):
+	* lisp/textmodes/toml-ts-mode.el (toml-ts-mode):
+	* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode): Set
+	treesit-primary-parser.
+
+2024-10-14  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: Correct and simplify quoted number regexps
+
+	C++ Mode now gives correct fontification when \' is inserted
+	between the adjacent apostrophes in the number 0xde'adb''eef.
+
+	* lisp/progmodes/cc-mode.el (c-maybe-quoted-number-head):
+	Simplify and correct.
+	(c-maybe-quoted-number-tail, c-maybe-quoted-number): Simplify.
+
+2024-10-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	Describe how to add an ELPA package to Tramp
+
+	* doc/misc/tramp.texi: Use @dots{} where appropriate.
+	(External packages): Rename subsection "Timers, process filters,
+	process sentinels, redisplay".
+	(Extension packages): New node.
+	(Top, Files directories and localnames): Add it to @menu.
+
+2024-10-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt gitlab-ci.yml
+
+	* test/infra/gitlab-ci.yml (variables): Set GIT_DEPTH: 0.
+	(.job-template): Remove cache:policy.
+	(.build-template): Add needs and cache:policy.
+	(.test-template): Add cache:policy.
+	(.tree-sitter-template): Add files in changes.
+
+2024-10-13  Stephen Berman  <stephen.berman@gmx.net>
+
+	Prevent void-variable error in python-mode (bug#73773)
+
+	* lisp/progmodes/python.el: Define 'subword-mode' before its use
+	in 'python-mode-map' so invoking menu-bar-open in a python-mode
+	buffer does not cause a void-variable error when subword-mode is
+	not loaded, menu-bar-mode is disabled and debug-on-error is enabled.
+
+2024-10-13  Stephen Berman  <stephen.berman@gmx.net>
+
+	Fix case problem with 'sql-magic-go' (bug#73499)
+
+	* lisp/progmodes/sql.el (sql-electric-stuff): Use :initialize and
+	:set arguments to control presence of 'sql-magic-go' in
+	'post-self-insert-hook'.
+	(sql-interactive-mode-map): Remove key bindings for 'sql-magic-go'.
+	(sql-magic-go): Reimplement as a non-interactive function
+	restricted to 'sql-interactive-mode' and instead of using
+	'self-insert-command' check value of 'last-command-event'.
+
+2024-10-13  Alex Bochannek  <alex@bochannek.com>
+
+	vc-src-working-revision: Call string-trim-right on command output
+
+	* lisp/vc/vc-src.el (vc-src-working-revision): Call string-trim-right on
+	command output (bug#73763).
+
+2024-10-13  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix bug when splitting a frame's root window (Bug#73627)
+
+	* lisp/window.el (split-window): Split main window of WINDOW's
+	frame when that frame has side windows (Bug#73627).
+
+2024-10-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve face font selection on MS-Windows
+
+	* lisp/net/dictionary.el (dictionary-word-definition-face):
+	Special-case w32.
+	* lisp/faces.el (face-font-family-alternatives): Add a few modern
+	font families.
+
+2024-10-12  Pengji Zhang  <me@pengjiz.com>
+
+	Improve tests for flow-fill
+
+	* test/lisp/mail/flow-fill-tests.el
+	(fill-flow-tests-fill-flowed-decode): Remove debug message.
+	(fill-flow-tests-fill-flowed-encode): Actually test function
+	`fill-flowed-encode', which requires `use-hard-newline' to be
+	non-nil.  Also adjust test input to check behavior of the
+	function under different cases.  (Bug#72870)
+
+2024-10-12  Pengji Zhang  <me@pengjiz.com>
+
+	Flow fill texts after the last hard newline
+
+	* lisp/mail/flow-fill.el (fill-flowed-encode): Use `(point-max)'
+	as `end' if there are no remaining hard newlines in buffer.
+	This ensures that the last paragraph will always be encoded,
+	even without a trailing hard newline.  (Bug#72870)
+
+2024-10-12  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/progmodes/compile.el (recompile): Autoload (bug#73697).
+
+2024-10-12  Diancheng Wang  <diancheng_wang@163.com>
+
+	Stop highlighting current line when debuggee is running
+
+	* lisp/progmodes/gud.el (gud-hide-current-line-indicator): New
+	function.
+	(gud-sentinel):
+	* lisp/progmodes/gdb-mi.el (gdb-starting): Use it.  (Bug#73687)
+
+2024-10-12  Paul Nelson  <ultrono@gmail.com>
+
+	Add foldout command for widening to current fold
+
+	* lisp/foldout.el (foldout-widen-to-current-fold): New command.
+	* doc/emacs/text.texi (Foldout): Document it.
+	* etc/NEWS: Announce it.  (Bug#73286)
+
+2024-10-12  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Correctly update image properties
+
+	* lisp/image-mode.el (image--update-properties): New function to
+	update image properties.
+	(image-toggle-display-image): Use it.  (Bug#73617)
+
+2024-10-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	0f8f0773183 ; * doc/emacs/search.texi (Word Search): Document 'dictio...
+	fb155bcfb6f ; * lisp/emacs-lisp/chart.el (chart-bar-quickie): Doc fix.
+	6dbe4e99ac4 ; * lisp/emacs-lisp/chart.el (chart-bar-quickie): Improve...
+	d664227f81a ; More accurate documentation of 'file-newer-than-file-p'
+	e49b479f869 Fix c-ts-mode indentation for initializer lists (bug#73661)
+	f520008744b Avoid segfaults in Rmail-MIME
+	6a5c2edd84f Eglot: use :immediate t when resolving completions (bug#7...
+	cd36e070c24 Eglot: minor changes to doc and docstrings
+	1ea0d9b891b Revert "Set treesit-primary-parser for tree-sitter modes"
+	52746ceb625 Remove duplicate indent rules in elixir-ts-mode
+	ed57faafc74 Set treesit-primary-parser for tree-sitter modes
+	37a6c859b04 ; * lisp/emacs-lisp/cl-macs.el (cl-once-only): Fix capita...
+	2d4d6dc43a4 Delete XIE X extension from TODO
+
+2024-10-12  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Properly operate on current fileset revision in vc-hg-print-log
+
+	* lisp/vc/vc-hg.el (vc-hg-print-log): If start-revision is nil,
+	reliably log the working revision. (bug#73604)
+
+2024-10-12  F. Jason Park  <jp@neverwas.me>
+
+	Use erc-compat analog for window-no-other-p
+
+	* lisp/erc/erc-compat.el (erc-compat--window-no-other-p): New function.
+	* lisp/erc/erc-speedbar.el (erc-speedbar-toggle-nicknames-window-lock):
+	Use compat adapter for `window-no-other-p'.
+
+2024-10-12  F. Jason Park  <jp@neverwas.me>
+
+	Add baseline test coverage for erc-match
+
+	* lisp/erc/erc-match.el (erc-pal-highlight-type)
+	(erc-fool-highlight-type, erc-dangerous-host-highlight-type): Clarify
+	some areas in doc strings.
+	* test/lisp/erc/erc-match-tests.el: Require `erc-test-common' library.
+	(erc-match-tests--assert-face-absent)
+	(erc-match-tests--assert-face-present)
+	(erc-match-tests--assert-speaker-highlighted)
+	(erc-match-tests--assert-speaker-only-highlighted)
+	(erc-match-tests--perform)
+	(erc-match-tests--hl-type-nick): New functions.
+	(erc-match-message/pal/nick, erc-match-message/fool/nick)
+	(erc-match-message/dangerous-host/nick): New tests.
+	(erc-match-tests--hl-type-message): New function.
+	(erc-match-message/pal/message)
+	(erc-match-message/fool/message)
+	(erc-match-message/dangerous-host/message): New tests.
+	(erc-match-tests--hl-type-all): New function.
+	(erc-match-message/pal/all, erc-match-message/fool/all)
+	(erc-match-message/dangerous-host/all): New tests.
+	(erc-match-tests--hl-type-nick-or-keyword): New function.
+	(erc-match-message/current-nick/nick-or-keyword): New test.
+	(erc-match-tests--hl-type-keyword): New function.
+	(erc-match-message/keyword/keyword): New test.
+	(erc-match-tests--log-matches): New function.
+	(erc-log-matches): New test.
+	* test/lisp/erc/resources/erc-tests-common.el: Require `erc-d-i'.
+	(erc-tests-common-add-cmem, erc-tests-common-parse-line)
+	(erc-tests-common-simulate-line)
+	(erc-tests-common-simulate-privmsg): New functions.
+
+2024-10-12  F. Jason Park  <jp@neverwas.me>
+
+	Crystallize erc-nicks-track-faces behavior
+
+	* etc/ERC-NEWS: Mention changes to `erc-track-faces-normal-list' and
+	`erc-track-faces-priority-list'.  Also mention new choice variant for
+	option `erc-nicks-track-faces', although that's arguably just a bug fix
+	because it makes good on previously unrealized behavior implied by the
+	doc strings.
+	* lisp/erc/erc-nicks.el (erc-nicks-skip-faces): Remove faces applied by
+	the `match' module, namely, `erc-current-nick-face', `erc-pal-face', and
+	`erc-fool-face'.  That module runs its hooks after `button' on
+	`erc-insert-modify-hook', and because `nicks' piggybacks on `button', it
+	can never encounter those faces while assaying.
+	(erc-nicks-track-faces): Update doc, and introduce new `t' value choice.
+	(erc-nicks-mode, erc-nicks-disable): Update removals from
+	`erc-track--alt-normals-function' to reflect recent renamings.
+	(erc-nicks--reject-uninterned-faces): Use helper.
+	(erc-nicks--oursp, erc-nicks--ours-p): Rename former to latter to
+	respect project style guidelines regarding predicates.
+	(erc-nicks-track-normal-max-rank): New variable.
+	(erc-nicks--check-normals, erc-nicks--assess-track-faces): Rename former
+	to latter, and change purpose to checking for "normals" membership,
+	ranks position, and incumbent face ownership.  Remove unused CONTENDERS
+	parameter.  Additionally, change behavior to consider replacing the
+	current mode-line face when it's not `nicks' owned if it's explicitly
+	ranked lower than `erc-default-face'.
+	(erc-nicks--track-prioritize, erc-nicks--track-always): New
+	complementary functions implementing the t and `prioritize' variants of
+	`erc-nicks-track-faces'.  Both make use of the factored-out
+	`erc-nicks--check-normals' logic.
+	(erc-nicks--setup-track-integration): Add `erc-nicks--track-always' to
+	`erc-track--alt-normals-function' when `erc-track-normal-faces' is t.
+	* lisp/erc/erc-track.el (erc-track--massage-nick-button-faces): Change
+	type of symbol property `erc-track--obsolete-faces' for options
+	`erc-track-faces-priority-list' and friends from a boolean to an alist.
+	(erc-track-faces-priority-list): Add new face for buttonized speakers.
+	(erc-track-faces-normal-list): Add new face for buttonized speakers.
+	Also add `erc-notice-face'.
+	(erc-track--priority-faces): New local variable to cache ranked faces
+	and complement `erc-track--normal-faces'.
+	(erc-track--setup): Initialize new `erc-track--priority-faces' variable,
+	and refactor.
+	(erc-track--alt-normals-function): Doc.
+	(erc-track--select-mode-line-face): Update expected type of `ranks'
+	parameter.
+	(erc-track-modified-channels): Fix wrong-type bug occurring when
+	`erc-track-ignore-normal-contenders-p' and
+	`erc-track-priority-faces-only' are both non-nil.  Also fix subtle
+	compatibility oversight regarding an empty face list returned by
+	`erc-track--collect-faces-in'.
+	* test/lisp/erc/erc-nicks-tests.el: Load helpers and fixtures library.
+	(erc-nicks-tests--track-faces): New function.
+	(erc-nicks-track-faces/prioritize, erc-nicks-track-faces/defer)
+	(erc-nicks-track-faces/nil, erc-nicks-track-faces/t): New tests.
+	* test/lisp/erc/erc-track-tests.el
+	(erc-track-tests--select-mode-line-face): Update expected type of mocked
+	parameter.
+	(erc-track-tests--modified-channels/baseline): New function.
+	(erc-track-modified-channels/baseline)
+	(erc-track-modified-channels/baseline/mention)
+	(erc-track-modified-channels/baseline/ignore)
+	(erc-track-modified-channels/baseline/mention/ignore)
+	(erc-track-modified-channels/priority-only-all/baseline)
+	(erc-track-modified-channels/priority-only-all/sans-notice): New tests.
+	* test/lisp/erc/resources/erc-tests-common.el
+	(erc-tests-common-track-modified-channels)
+	(erc-tests-common-track-modified-channels-sans-setup): New functions.
+	(Bug67767)
+
+2024-10-12  F. Jason Park  <jp@neverwas.me>
+
+	Don't create directory in erc-truncate compat check
+
+	* lisp/erc/erc-log.el (erc-log--check-writable-nocreate-p): New variable.
+	(erc-logging-enabled): Use `erc-log--save-in-progress-p' flag to
+	conditionally avoid creating a directory when checking if the location
+	is writable.
+	(erc-log--call-when-logging-enabled-sans-module)
+	(erc-log--check-legacy-implicit-enabling-by-truncate): Rename former to
+	latter, and guard against creating a ~/log directory just to see if it's
+	writable when calling `erc-logging-enabled'.
+	(erc-truncate-mode): Explain legacy "implicit logging" behavior in doc
+	string.
+	* lisp/erc/erc-truncate.el (erc-truncate--warn-about-logging): Make more
+	concise, and defer to `erc-truncate-mode' doc string for particulars.
+	* lisp/erc/erc.el (erc-directory-writable-p): Add comment to rename on
+	next non-patch release.
+
+2024-10-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/help-fns.el (help--load-prefixes): Fix bug#72787
+
+2024-10-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+	gnus-sum: fix missing space after prompt
+
+	* lisp/gnus/gnus-sum.el (gnus-summary-limit-exclude-marks)
+	(gnus-summary-limit-to-marks): Add space after prompt.
+
+2024-10-11  Robert Pluim  <rpluim@gmail.com>
+
+	Remove buttons when disabling 'button-mode'
+
+	* lisp/button.el (button-mode): Remove all buttons when disabling.
+	* doc/lispref/display.texi (Button Buffer Commands): Document
+	the change.  (Bug#73175)
+
+2024-10-11  Robert Pluim  <rpluim@gmail.com>
+
+	Add unbuttonize-region
+
+	* doc/lispref/display.texi (Making Buttons): Document it.
+	* lisp/button.el (unbuttonize-region): New function, removes all
+	buttons in the specified region.
+
+2024-10-11  Michael Albinus  <michael.albinus@gmx.de>
+
+	Make url-http thread-safe (Bug#73199)
+
+	* lisp/url/url-http.el (url-http-open-connections): Adapt docstring.
+	(current-thread, thread-live-p): Declare.
+	(url-http-mark-connection-as-busy)
+	(url-http-mark-connection-as-free)
+	(url-http-find-free-connection): Use extended hash key.  (Bug#73199)
+
+2024-10-11  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix how 'no-other-window' window parameter is ignored (Bug#73706)
+
+	* lisp/window.el (window-no-other-p): New function.
+	(window-in-direction, get-lru-window, get-mru-window)
+	(get-largest-window, other-window, window-at-x-y)
+	(delete-window-choose-selected, delete-window): Use it to check
+	whether 'ignore-window-parameters' should inhibit processing the
+	'no-other-window' parameter (Bug#73706).
+	* lisp/erc/erc-speedbar.el
+	(erc-speedbar-toggle-nicknames-window-lock): Use
+	'window-no-other-p'.
+	* doc/lispref/windows.texi (Windows and Frames)
+	(Deleting Windows, Cyclic Window Ordering): Describe new
+	function 'window-no-other-p' and use it in description of
+	functions that call it.
+	(Window Parameters): Add cross references for 'no-other-window'
+	parameter.
+
+2024-10-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+	shr: handle anonymous documents with an empty base
+
+	* lisp/net/shr.el (shr-parse-base): Make sure local is non-nil.
+
+2024-10-10  Alan Mackenzie  <acm@muc.de>
+
+	Add an edebug spec for macroexp--with-extended-form-stack
+
+	* lisp/emacs-lisp/macroexp.el
+	  (macroexp--with-extended-form-stack): Add the edebug spec
+	  (sexp body).
+
+2024-10-10  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp: Don't redisplay in `sit-for'
+
+	* lisp/net/tramp.el (tramp-wait-for-regexp):
+	* lisp/net/tramp-message.el (tramp-error-with-buffer, tramp-user-error):
+	Don't redisplay in `sit-for'.  (Bug#73718)
+
+2024-10-10  Visuwesh  <visuweshm@gmail.com>
+
+	Add imenu support for ODF files in doc-view
+
+	* lisp/doc-view.el (doc-view--outline): Pass the right file to
+	doc-view--pdf-outline.
+	* doc/emacs/misc.texi (DocView Navigation): Mention support for
+	Open Format Document (ODF) files too.
+	* etc/NEWS: Announce the change.  (bug#73719)
+
+2024-10-10  Wilson Snyder  <wsnyder@wsnyder.org>
+
+	verilog-mode.el: Fix AUTOWIRE etc. range simplification with subtraction of negative number.
+
+	* lisp/progmodes/verilog-mode.el (verilog-simplify-range-expression):
+	Fix AUTOWIRE etc. range simplification with subtraction of negative
+	number (#1879).
+
+2024-10-10  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Make revision completion in vc-diff and vc-root-diff more predictable
+
+	* lisp/vc/vc.el (vc-root-version-diff):
+	Don't try calling 'vc-deduce-fileset', instead construct a fileset
+	suitable for the root directory right away.  This way the revision
+	completion for the root diff doesn't depend on the current buffer,
+	or the file at point (bug#73232).
+	(vc-diff-build-argument-list-internal): No special case when
+	invoked on a directory, or when the current file is not "dirty".
+	Make REV1-DEFAULT a string value.
+
+	* etc/NEWS: Mention the change.
+
+2024-10-09  Dmitry Gutov  <dmitry@gutov.dev>
+
+	help-setup-xref: Fix the previous changes
+
+	* lisp/help-mode.el (help-setup-xref): Instead of killing all
+	local variables directly, call the current major mode function, to
+	preserve its own locals while dropping the rest (bug#73637).
+
+2024-10-08  Visuwesh  <visuweshm@gmail.com>
+
+	Make imenu index generation for PDFs more reliable
+
+	Do away with parsing the output of "mutool show FILE outline"
+	since the URI reported in its output may not include the page
+	number of the heading, and instead may contained "nameddest"
+	elements which cannot be resolved using "mutool".  Instead, use
+	a MuPDF JS script to generate the PDF outline allowing to
+	resolve such URIs.
+
+	* lisp/doc-view.el (doc-view--outline-rx): Remove as no longer
+	needed.
+	(doc-view--outline): Reflect that outline can be generated for
+	non-PDF files too.
+	(doc-view--mutool-pdf-outline-script): Add new variable to hold
+	the JS script used to generate the outline.
+	(doc-view--pdf-outline): Use the script.  (bug#73638)
+
+2024-10-08  Cecilio Pardo  <cpardo@imayhem.com>
+
+	Implement drag-n-drop for w32 with support for files and text
+
+	Implement drag-n-drop with IDropTarget for MS-Windows. This
+	allows for dropping files or text.
+	* lisp/term/w32-win.el (w32-drag-n-drop): Change to handle
+	files or strings.
+	* src/w32fns.c (process_dropfiles): New function to convert
+	DROPFILES struct to array of strings.
+	(w32_process_dnd_data): New function to process drop data.
+	(w32_try_get_data): Extract data from IDataObject.
+	(w32_createwindow): Assign an IDropTarget to each new frame.
+	(w32_name_of_message): New message.
+	(w32_msg_pump): Changed CoInitialize to OleInitialize, needed
+	by the drag-n-drop functions.
+	(w32_wnd_proc): New struct w32_drop_target, and
+	w32_drop_target_* functions to implement the IDropTarget
+	interface.
+	* src/w32term.c (w32_read_socket): Handle WM_EMACS_DROP and
+	remove WM_EMACS_DROPFILES.
+	* src/w32term.h: New message WM_EMACS_DROP.
+	(Bug#3468)
+
+	* etc/NEWS: Announce the new feature.
+
+2024-10-08  Eli Zaretskii  <eliz@gnu.org>
+
+	New command-line options for 'etags'
+
+	This adds '--no-fallback-lang' and '--no-empty-file-entries'
+	options, and their opposites '--fallback-lang' and
+	'--empty-file-entries'.
+	* lib-src/etags.c (fallback_lang, empty_files): New toggles.
+	(main): Initialize them to 'true'.
+	(longopts) [!CTAGS]: Add the '--(no-)fallback-lang' and
+	'--(no-)empty-file-entries' options.
+	(find_entries): If 'fallback_lang' is false, don't attempt Fortran
+	and C/C++ fallbacks.
+	(print_help): Add help for new options.
+	(main): If 'empty_files' is false, don't output file entries for
+	files that have no tags.  (Bug#73484)
+
+	* doc/emacs/maintaining.texi (Create Tags Table):
+	* etc/NEWS:
+	* doc/man/etags.1: Document the new options.
+
+	* test/manual/etags/Makefile (check): Add test for new options.
+	* test/manual/etags/ETAGS.good_7: New file.
+
+2024-10-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/misc/tramp.texi (Customizing Methods): Add incus-tramp.
+
+2024-10-08  Dmitry Gutov  <dmitry@gutov.dev>
+
+	poject--vc-list-files: Check that the current Emacs is 31+
+
+	* lisp/progmodes/project.el (project--vc-list-files):
+	Check that the current Emacs is 31+, to avoid breakage on remote
+	hosts with older Git (bug#73320).
+
+2024-10-08  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Detect Git version on remote hosts separately from the local one
+
+	* lisp/vc/vc-git.el (vc-git--program-version): Detect Git version
+	on remote hosts separately from the local one (buf#73320).
+	(vc-git-connection-default-profile): Set up collection-local
+	profile.  And use it for the 'vc-git' :application.
+	(vc-git--program-version): Operate on the connection-local value
+	of 'vc-git--program-version'.
+
+2024-10-08  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Support file creation and deletion in diff-apply-hunk
+
+	* lisp/vc/diff-mode.el (diff-find-file-name): Allow entering
+	non-existing file name when the corresponding hunk is of type
+	"create file" (bug#62731).  Default to file name with deleted
+	prefix if diff-buffer-type is Git or Hg.  Make sure not to add
+	such input to diff-remembered-files-alist, it would be hard to
+	change otherwise in case of typo.
+	(diff-setup-buffer-type):
+	Match against the diff header common to 'hg diff' output.
+	(diff-find-source-location): Look at the other source when the
+	buffer is applied in reverse.
+	(diff-apply-hunk): Delect file deletion and pass a different
+	argument to 'diff-find-source-location' in such case.  Bind
+	diff-vc-backend to nil to avoid older revision buffer being
+	returned.  In the end, offer to delete the file if the hunk was of
+	corresponding type and matched the existing contents.
+
+	* etc/NEWS: Mention the new capability.
+
+2024-10-08  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Support calling 'project-current' with custom prompt
+
+	* lisp/progmodes/project.el (project-current): Treat being passed
+	a string in the MAYBE-CURRENT argument specially (bug#70833).
+	(project-prompt-project-dir, project-prompt-project-name):
+	Handle it.
+
+	* etc/NEWS: Mention that change.
+
+2024-10-07  Eli Zaretskii  <eliz@gnu.org>
+
+	* lib-src/etags.c (C_entries): Fix assertion violation.
+
+2024-10-06  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Add a shortcut to go up in the menu hierarchy.
+
+	* lisp/tmm.el (tmm-prompt): Add a shortcut to go up in the menu
+	hierarchy (bug#73498).
+	(tmm-completion-prompt): Document it in help message.
+	(tmm-define-keys): Add the shortcut in the keymap.
+	* etc/NEWS: Document the change.
+
+2024-10-06  Juri Linkov  <juri@linkov.net>
+
+	* lisp/vc/diff-mode.el (diff-apply-buffer): Add more failures.
+
+	Add 'failures' as an argument to the 'message' call.
+
+2024-10-06  Dmitry Gutov  <dmitry@gutov.dev>
+
+	help-setup-xref: Simplify further
+
+	* lisp/help-mode.el (help-setup-xref): Simplify, given that the
+	vars are marked 'permanent-local' already (bug#73637).
+
+2024-10-06  Daniel Colascione  <dancol@dancol.org>
+
+	Simplify xref regular expression with rx
+
+	* lisp/progmodes/xref.el (xref--regexp-to-extended): switch to rx
+	regular expression for legibility
+
+2024-10-06  Dmitry Gutov  <dmitry@gutov.dev>
+
+	help-setup-xref: Keep the local values only of some variables
+
+	* lisp/help-mode.el (help-setup-xref): Kill all local variables,
+	saving ones that are known to need to be preserved (bug#73637).
+
+2024-10-05  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: Remove search limit to fontify first decl in xdisp.c
+
+	An unneeded 10,000 character search limit prevents the full
+	fontification of the first declaration of xdisp.c, since the
+	introductory commentary is longer than that.
+
+	* lisp/progmodes/cc-engine.el (c-find-decl-spots): Remove the
+	10,000 char limit.
+
+2024-10-05  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove redundant face specs in manoj-dark theme
+
+	* etc/themes/manoj-dark-theme.el (manoj-dark): Remove redundant face
+	specs.  ':bold t' duplicates ':weight bold', and ':italic t' duplicates
+	':slant italic'.
+
+2024-10-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	b68b9f291cc ; * lisp/progmodes/csharp-mode.el (treesit-query-compile)...
+	688201ef18d ; * lisp/window.el (switch-to-prev-buffer-skip-regexp): D...
+	ba44fc9a447 Restore comment/string check for 'electric-layout-mode'
+	5a462948e13 Update Arni Magnusson's email address
+	6b1271b169a Fix python-ts-mode-map docstring
+	aaaafddc945 Normalize "Commentary" section in eudc.el
+	d656be9794d Expand email abbrevs in X-Debbugs-Cc header.
+	e9dcf0c57dd Fix 'list-tags' when invoked from a non-file buffer
+	51ef05f684c count-windows: Fix reference to walk-windows
+	5eaf0c784bf * lisp/info-look.el (mapc): Add use-package manual's index.
+	705a5a1a9e6 ; * ChangeLog.4: Fix attribution of one change.
+	bf26ff0dc8d Update csharp-ts-mode font-lock (bug#73369)
+	4c866abab96 ; * doc/lispref/variables.texi (Creating Buffer-Local): F...
+	d42d7d474fe ; * lisp/doc-view.el (doc-view-svg-face): Copy-edit docst...
+	f46f476bb8f ; * admin/MAINTAINERS: Take VC subsystem, add note about ...
+	d68e6d2689d ; rcirc-update-activity-string: Justify some existing beh...
+	e6a37869c8d Fix inconsistency in value of rcirc-activity-string
+	108b3179bd4 Revert "; Minor clarification in variables.texi"
+	44156c21407 ; Minor clarification in variables.texi
+	63058e1153a Tag interactive commands in 'lua-ts-mode'
+	84bea20eba2 ; * lisp/info-look.el: Add two more links.
+	96b87ad5363 Mention LSP acronym in eglot defgroup docstring
+	9c904e8ceae Change :group of 'eglot' defgroup to 'tools'
+	fd1a1b07805 Remove out-of-date documentation from python.el
+	11e3e0cadd4 Fix executing commands in Eshell using "env" with no loca...
+	c0ef8a9a1b3 Fix a typo in the calendar manual
+	36ff7138feb ; Fix a thinko in sieve-manage.el
+	7abecbcd633 ; * nt/INSTALL: Update MinGW notes URL.  (Bug#73528)
+
+	# Conflicts:
+	#	admin/MAINTAINERS
+
+2024-10-05  Barra Ó Catháin  <barra@ocathain.ie>
+
+	Add file/buffer-to-register (Bug#73308)
+
+	* doc/emacs/regs.texi (File and Buffer Registers): Update
+	documentation to refer to 'file-to-register' and
+	'buffer-to-register'.
+	* etc/NEWS: Announce the new commands.
+	* lisp/bindings.el (ctl-x-r-map): Map new commands into the
+	register keymap.
+	* lisp/register.el (register-command-info): Register new commands.
+	(jump-to-register): Remove docstring line referring to using
+	set-register instead of new commands.
+	(file-to-register): Add function for storing files in registers.
+	(buffer-to-register): Add function for storing buffers in
+	registers.
+	(register-buffer-to-file-query): Add function for converting
+	buffer registers to file-query registers on killing a buffer.
+
+2024-10-05  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-keymap in python.el
+
+	It's okay to use defvar-keymap here since the 'compat' package backports
+	it for all versions of Emacs that we support (24.4 or later).
+
+	* lisp/progmodes/python.el (python-mode-map): Prefer defvar-keymap.
+	(python-menu): Move to toplevel.
+
+2024-10-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	icomplete-completions: Revise computation of prospects-len
+
+	* lisp/icomplete.el (icomplete-completions): Revise computation of
+	prospects-len (i) to avoid calling string-width on the entire
+	buffer-string, which could be slow; and (ii) to better handle minibuffer
+	prompts with embedded newlines (bug#72826).
+
+2024-10-05  Sean Whitton  <spwhitton@spwhitton.name>
+
+	work-buffer--release: Bind inhibit-read-only
+
+	* lisp/emacs-lisp/subr-x.el (work-buffer--release): Bind
+	inhibit-read-only while erasing the buffer.
+
+2024-10-05  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use python-mode for SCons build files
+
+	SCons is a build system whose associated files are Python scripts.
+	Ref: https://www.scons.org/doc/0.96/HTML/scons-user/x325.html
+
+	* lisp/progmodes/python.el (python--auto-mode-alist-regexp):
+	Use 'python-mode' for SCons build files.
+
+2024-10-04  Stefan Kangas  <stefankangas@gmail.com>
+
+	Also use "Python Module Index" for info lookup
+
+	* lisp/info-look.el (:mode): Also search Python module index.
+
+2024-10-04  Stefan Kangas  <stefankangas@gmail.com>
+
+	Future-proof searching for Python info manual
+
+	* lisp/info-look.el (:mode): Python is released annually (PEP 602), so
+	search for minor version based on the current year.
+
+2024-10-04  Stefan Kangas  <stefankangas@gmail.com>
+
+	python: Better support := in electric-layout-mode
+
+	* lisp/progmodes/python.el (python-base-mode): Use heuristic to better
+	support the Python walrus operator := in electric-layout-rules.
+
+2024-10-04  Stefan Kangas  <stefankangas@gmail.com>
+
+	* lisp/info-look.el (:mode): Support IELM.
+
+2024-10-04  Stefan Kangas  <stefankangas@gmail.com>
+
+	Shorten info-lookup-mode docstring
+
+	* lisp/info-look.el (info-lookup-mode): Shorten variable docstring by
+	removing information that is auto-generated by 'describe-variable'.
+
+2024-10-04  Stefan Kangas  <stefankangas@gmail.com>
+
+	Expose lambdas in info-look.el to byte-compiler
+
+	* lisp/info-look.el (:mode): Expose lambdas to byte-compiler.
+
+2024-10-04  Sean Whitton  <spwhitton@spwhitton.name>
+
+	find-function-mode: Define keys at a low precedence level
+
+	* lisp/emacs-lisp/find-func.el (find-function-mode-map): Delete.
+	(find-function-mode): Define keys at the precedence level of
+	the global map for compatibility with the historical behavior of
+	find-function-setup-keys.
+
+2024-10-04  Mattias Engdegård  <mattiase@acm.org>
+
+	* lisp/net/sieve-mode.el (sieve-tagged-arguments): Face name typo.
+
+2024-10-04  Visuwesh  <visuweshm@gmail.com>
+
+	Add imenu index function for DjVu files in doc-view
+
+	* lisp/doc-view.el (doc-view-pdfdraw-program): Prefer mutool
+	over other names.
+	(doc-view-imenu-enabled): Tweak the default value to check for
+	'djvused', and make it obsolete.
+	(doc-view--djvu-outline, doc-view--parse-djvu-outline): Add new
+	functions to return imenu index for a Djvu file.
+	(doc-view--outline): Add new function to create the imenu index
+	depending on the file type.
+	(doc-view--outline): Document new possible variable value.
+	(doc-view-imenu-index): Use the above function instead.
+	(doc-view-imenu-setup): Try to create the imenu index
+	unconditionally.
+	* doc/emacs/misc.texi (DocView Navigation): Mention index
+	creation using 'djvused' too.
+	* etc/NEWS: Announce the change.  (Bug#73530)
+
+2024-10-04  Daniel Colascione  <dancol@dancol.org>
+
+	Fix term.el tests; refine previous change
+
+	Fix the term.el tests by making them match the new expected output.
+
+	* test/lisp/term-tests.el: defvar - defconst
+	(ansi-test-strings): remove unwanted text properties from
+	expectations
+
+	* lisp/term.el:
+	(term--handle-colors-list): further shrink common-case face list
+
+2024-10-04  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New minor mode find-function-mode replaces find-function-setup-keys
+
+	* lisp/emacs-lisp/find-func.el (find-function-mode-map):
+	(find-function-mode): New minor mode.
+	(find-function-setup-keys): Replace with stub function that just
+	enables the new minor mode.  Mark as obsolete.
+	* etc/NEWS: Announce the change.
+
+2024-10-04  Theodor Thornhill  <theo@thornhill.no>
+
+	Add sentence and sexp movement to python-ts-mode
+
+	* lisp/progmodes/python.el (python-ts-mode): Add relevant node
+	types.  (Bug#60856)
+
+2024-10-04  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix two warnings in smerge.el
+
+	* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower): Fix warnings.
+
+2024-10-04  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defcustom :local specifier
+
+	* lisp/dirtrack.el (dirtrack-list):
+	* lisp/emacs-lisp/lisp.el (defun-prompt-regexp):
+	* lisp/emulation/viper-init.el
+	(viper-related-files-and-buffers-ring):
+	* lisp/emulation/viper-util.el (viper-syntax-preference):
+	* lisp/erc/erc.el (erc-ignore-list):
+	* lisp/files.el (buffer-offer-save, backup-by-copying-when-mismatch):
+	* lisp/find-file.el (ff-pre-find-hook, ff-pre-load-hook)
+	(ff-post-load-hook, ff-not-found-hook, ff-file-created-hook)
+	(ff-case-fold-search, ff-always-in-other-window)
+	(ff-ignore-include, ff-quiet-mode, ff-other-file-alist)
+	(ff-search-directories):
+	* lisp/mh-e/mh-e.el (mh-scan-prog):
+	* lisp/newcomment.el (comment-column):
+	* lisp/obsolete/rlogin.el (rlogin-directory-tracking-mode):
+	* lisp/play/decipher.el (decipher-ignore-spaces):
+	* lisp/plstore.el (plstore-encrypt-to):
+	* lisp/proced.el (proced-format, proced-filter, proced-sort)
+	(proced-descend, proced-auto-update-flag, proced-tree-flag):
+	* lisp/progmodes/fortran.el (fortran-line-length):
+	* lisp/shell.el (shell-history-file-name):
+	* lisp/simple.el (goal-column, fill-prefix):
+	* lisp/vc/ediff-init.el (ediff-use-faces)
+	(ediff-highlight-all-diffs, ediff-autostore-merges):
+	* lisp/vc/ediff-merg.el (ediff-show-clashes-only)
+	(ediff-skip-merge-regions-that-differ-from-default): Prefer defcustom
+	:local specifier to using 'make-variable-buffer-local' directly.
+
+2024-10-03  Dmitry Gutov  <dmitry@gutov.dev>
+
+	help-setup-xref: Clean up xref backend before non-Lisp uses
+
+	* lisp/help-mode.el (help-setup-xref): Kill more local variables,
+	previously set in help-fns--setup-xref-backend (bug#69462).
+
+2024-10-03  Dmitry Gutov  <dmitry@gutov.dev>
+
+	xref-location-marker: Use find-file-noselect to ensure uptodateness
+
+	* lisp/progmodes/xref.el (xref-location-marker):
+	Always call 'find-file-noselect' rather than 'get-file-buffer' to
+	go through the visited-file-modtime verification every time.
+
+2024-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	track-changes.el: Improve error tracing to help debugging
+
+	Add a new `trace` setting for `track-changes-record-errors` to
+	record more information in order to try and help find the root
+	cause of errors.
+
+	* lisp/emacs-lisp/track-changes.el (track-changes--trace): New var.
+	(track-changes-record-errors): Document new `trace` setting.
+	(track-change--backtrace, track-changes--trace): New functions.
+	(track-changes--recover-from-error): Use them.
+	(track-changes--error-log): Document new format.
+	(track-changes-register, track-changes-unregister)
+	(track-changes-fetch, track-changes--before, track-changes--after):
+	Call `track-changes--trace`.
+
+2024-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* doc/misc/eieio.texi (Writing Methods): Typo
+
+2024-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(key-translate-select): Minor tweaks
+
+	* lisp/keymap.el (key-translate-select): Rename from
+	`key-select-translation` so as to stick to the `key-translate-` prefix.
+	Silence compilation warning.
+
+2024-10-03  Hugo Heagren  <hugo@heagren.com>
+
+	Add commands to interactively set/unset keyboard translations
+
+	* lisp/keymap.el (key-translate): Add an interactive form, prompting for
+	keys to translate, and update docstring to reflect this.
+	(key-translate-selection-function): New custom option.
+	(key-select-translation): New function, default value of above option.
+	(key-translate-remove): New command, for removing entries from
+	`keyboard-translate-table'.
+
+2024-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(help--symbol-completion-table): Try and fix bug#73473
+
+	* lisp/help-fns.el (help--symbol-completion-table): Be more
+	careful with `help-enable-completion-autoload` so we don't load
+	a package in cases where we already know it won't impact the result.
+
+2024-10-03  Andrea Corallo  <acorallo@gnu.org>
+
+	* Fix few warnings in lisp/shell.el
+
+	* lisp/shell.el (shell-highlight-undef-defined-face)
+	(shell-highlight-undef-undefined-face)
+	(shell-highlight-undef-alias-face): Unquote :inherit argument.
+
+2024-10-03  Andrea Corallo  <acorallo@gnu.org>
+
+	* src/comp.c (compile_function, Fcomp__compile_ctxt_to_file0): Use DOHASH.
+
+	* etc/TODO (Native compiler improvements): Add entry.
+
+2024-10-03  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New M-~ entry in save-some-buffers-action-alist
+
+	* lisp/files.el (save-some-buffers-action-alist): New M-~ entry.
+	(save-some-buffers):
+	* doc/emacs/files.texi (Save Commands):
+	* etc/NEWS: Document the new M-~ binding during C-x s.
+
+2024-10-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid assertion violations due to wrong 'min-width' property
+
+	* src/xdisp.c (display_min_width): Ignore 'min-width' display
+	specs which produce stretch glyphs wider than the window when
+	lines are truncated.  (Bug#73600)
+
+2024-10-03  Daniel Colascione  <dancol@dancol.org>
+
+	Track nil colors in term
+
+	Teach term the difference between an unset foreground or
+	background color and a color that happens to match an existing
+	color.  This way, when we insert text after a color
+	reset:(e.g. from an SGR0), we insert it without :foreground or
+	:background (whichever we've reset) face properties, allowing
+	that inserted text to inherit the colors of the underlying face.
+
+	This way, if we change, e.g., the background color of a buffer,
+	the background color of already-inserted text from the term
+	child changes along with that of the buffer instead of being
+	"locked" to whatever the background color of the buffer was at
+	the time the text was inserted.
+
+	This change aligns term.el with other terminal emulators.
+
+	* lisp/term.el (term-ansi-current-color):
+	(term--color-as-hex): track nil fg, bg colors
+
+2024-10-03  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Make xref-find-references work in Help buffers outside of projects
+
+	* lisp/help-fns.el (xref-backend-references):
+	New context-dependent override.  Don't call project-current and
+	use elisp-load-path-roots directly (bug#69462).
+	(help-fns--setup-xref-backend): No need to set
+	project-vc-external-roots-function then.
+
+2024-10-03  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Use Emacs Lisp xref backend in Lisp Help buffers
+
+	* lisp/help-fns.el (help-fns--setup-xref-backend):
+	New function (bug#69462).
+	(describe-function, describe-variable): Use it here.
+
+	* lisp/emacs-lisp/cl-extra.el (cl-describe-type): And here.
+
+	* lisp/progmodes/elisp-mode.el (xref-backend-definitions):
+	Only infer namespace in emacs-lisp-mode (use 'any' otherwise).
+
+2024-10-02  Daniel Colascione  <dancol@dancol.org>
+
+	Process focus-in events immediately on NS
+
+	* src/nsterm.m ([EmacsView windowDidBecomeKey]): kick the main
+	event loop when we get a focus-in event so it gets processed
+	immediately (Bug#73559).
+
+2024-10-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defcustom :local specifier in textmodes
+
+	* lisp/textmodes/fill.el (default-justification):
+	* lisp/textmodes/ispell.el (ispell-local-dictionary)
+	(ispell-skip-html):
+	* lisp/textmodes/less-css-mode.el (less-css-output-file-name)
+	(less-css-input-file-name):
+	* lisp/textmodes/refer.el (refer-bib-directory, refer-bib-files)
+	(refer-cache-bib-files):
+	* lisp/textmodes/two-column.el (2C-separator, 2C-window-width):
+	Prefer defcustom :local specifier to using 'make-variable-buffer-local'
+	directly.
+
+2024-10-02  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New function shell-command-do-open
+
+	* lisp/dired-aux.el (shell-command-do-open): Factor out of
+	dired-do-open.
+	(dired-do-open): Call shell-command-do-open.
+	* etc/NEWS: Announce the new function.
+
+2024-10-02  Sean Whitton  <spwhitton@spwhitton.name>
+
+	Move error check from vc-next-action to diff-vc-deduce-fileset
+
+	* lisp/vc/diff-mode.el (diff-vc-deduce-fileset): Signal
+	user-error when the buffer is narrowed.
+	* lisp/vc/vc.el (vc-next-action): Remove code signalling a
+	user-error when the buffer is narrowed.
+
+2024-10-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	Warn about bad defcustom :local keyword at compile time
+
+	* lisp/emacs-lisp/bytecomp.el (bytecomp--custom-declare): Warn about
+	invalid values for the defcustom :local keyword.
+	* test/lisp/emacs-lisp/bytecomp-tests.el
+	(bytecomp-test-defcustom-local): New test.
+
+2024-10-02  Stefan Kangas  <stefankangas@gmail.com>
+
+	New value 'permanent-only' for defcustom :local keyword
+
+	* lisp/custom.el (custom-declare-variable): Make the :local keyword
+	accept the symbol 'permanent-local', meaning that the variable is
+	permanent but not marked as automatically buffer-local.
+	(defcustom):
+	* doc/lispref/customize.texi (Variable Definitions): Document the
+	above change.
+
+	* test/lisp/custom-tests.el
+	(custom-tests-defcustom-:local-keyword): New test.
+
+2024-10-01  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defcustom :local specifier in semantic
+
+	* lisp/cedet/semantic/db-find.el (semanticdb-find-default-throttle):
+	* lisp/cedet/semantic/imenu.el (semantic-imenu-summary-function)
+	(semantic-imenu-bucketize-file, semantic-imenu-buckets-to-submenu)
+	(semantic-imenu-expand-type-members)
+	(semantic-imenu-bucketize-type-members)
+	(semantic-imenu-sort-bucket-function):
+	* lisp/cedet/semantic/senator.el (senator-highlight-found):
+	* lisp/cedet/semantic/symref.el (semantic-symref-tool): Prefer defcustom
+	:local specifier to using 'make-variable-buffer-local' directly.
+
+2024-10-01  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defcustom :local specifier in allout
+
+	* lisp/allout-widgets.el (allout-widgets-track-decoration):
+	* lisp/allout.el (allout-inhibit-auto-fill)
+	(allout-inhibit-auto-fill-on-headline, allout-use-hanging-indents)
+	(allout-reindent-bodies, allout-show-bodies, allout-header-prefix)
+	(allout-primary-bullet, allout-plain-bullets-string)
+	(allout-distinctive-bullets-string, allout-old-style-prefixes)
+	(allout-stylish-prefixes, allout-numbered-bullet)
+	(allout-presentation-padding, allout-encrypt-unencrypted-on-saves)
+	(allout-enable-file-variable-adjustment): Prefer defcustom :local
+	specifier to using 'make-variable-buffer-local' directly.
+
+2024-10-01  john muhl  <jm@pub.pink>
+
+	Use defvar-keymap in lua-ts-mode
+
+	* lisp/progmodes/lua-ts-mode.el (lua-ts-mode-map): Replace
+	'defvar' with 'defvar-keymap'.  (Bug#73585)
+
+2024-10-01  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix warning in dictionary.el
+
+	* lisp/net/dictionary.el (dictionary-word-entry-face): Fix face
+	attribute.
+
+2024-10-01  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer defvar-local where possible
+
+	* lisp/editorconfig.el (editorconfig-properties-hash):
+	* lisp/emacs-lisp/comp-run.el (comp-last-scanned-async-output):
+	* lisp/info-look.el (info-lookup-mode):
+	* lisp/mh-e/mh-folder.el (mh-generate-sequence-font-lock):
+	* lisp/net/tramp.el (tramp-temp-buffer-file-name):
+	* lisp/obsolete/iswitchb.el (iswitchb-eoinput):
+	* lisp/obsolete/longlines.el (longlines-wrap-beg, longlines-wrap-end)
+	(longlines-wrap-point, longlines-showing, longlines-decoded):
+	* lisp/obsolete/tpu-edt.el (tpu-newline-and-indent-p)
+	(tpu-newline-and-indent-string, tpu-saved-delete-func)
+	(tpu-buffer-local-map, tpu-mark-flag):
+	* lisp/progmodes/python.el (python-check-custom-command):
+	* lisp/textmodes/reftex.el (reftex-docstruct-symbol)
+	(reftex-isearch-minor-mode): Prefer defvar-local where possible, and
+	the package does not support Emacs 24.3 or earlier.
+
+2024-10-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/emacs-lisp/package.el (package-isolate): Use `package-activate-all`
+
+	`package-initialize` is used to initialize the whole machinery needed
+	to list/download/install/remove packages, whereas here we only need to use
+	the installed packages.
+
+2024-10-01  Andrea Corallo  <acorallo@gnu.org>
+
+	* Don't iterate over an hash table while modifyiong it in comp.
+
+	* lisp/emacs-lisp/comp.el: Don't iterate over the hash values directly
+	as 'comp--add-cond-cstrs-target-block' can modify the hash content.
+
+2024-10-01  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New command diff-delete-other-hunks
+
+	* lisp/vc/diff-mode.el (diff-delete-other-hunks): New
+	command (bug#73387).
+	(diff-mode-map): Bind the new command to C-c RET n.
+	(diff-mode-menu): New entry for the new command.
+	(vc-next-action): Stop, and warn, if the user attempts to commit
+	a patch from a narrowed buffer (bug#73387).
+	* doc/emacs/files.texi (Diff Mode):
+	* etc/NEWS: Document the new command.
+
+2024-09-30  Stefan Kangas  <stefankangas@gmail.com>
+
+	cond-star: Fix copyright
+
+	* lisp/emacs-lisp/cond-star.el: Fix copyright year and license
+	statement.
+
+2024-09-30  Jeremy Bryant  <jb@jeremybryant.net>
+
+	cond-star: Fix trivial typos, checkdoc fixes, etc.
+
+	* lisp/emacs-lisp/cond-star.el (cond*):
+	Add header and footer as per checkdoc fixes.
+
+	(match*, cond*-non-exit-clause-substance)
+	(cond*-convert-clause, cond*-convert-condition)
+	(cond*-match, cond*-subpat)
+	(cond*-used-within, cond-star):
+	Fix typos in comments, and apply checkdoc fixes.  (Bug#72546)
+
+2024-09-30  oscar  <oscar@win10-64-vm>
+
+	Fix redirection of read when _FORTIFY_SOURCE is defined
+
+	When _FORTIFY_SOURCE is defined mingw-w64 provides an inline definition
+	of read in io.h.  This makes our previous redirection to sys_read
+	ineffective.  The prototype of sys_read is now required because we don't
+	touch the prototype of read.
+
+	* nt/inc/ms-w32.h (read): Move the redirection after io.h.  Add prototype
+	for sys_read (Bug#73444)
+
+2024-09-30  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete some libraries obsolete since Emacs 24.4/24.5
+
+	* lisp/obsolete/cc-compat.el:
+	* lisp/obsolete/info-edit.el:
+	* lisp/obsolete/meese.el:
+	* lisp/obsolete/otodo-mode.el:
+	* lisp/obsolete/rcompile.el:
+	* lisp/obsolete/sup-mouse.el:
+	* lisp/obsolete/terminal.el:
+	* lisp/obsolete/vi.el:
+	* lisp/obsolete/vip.el:
+	* lisp/obsolete/ws-mode.el:
+	* lisp/obsolete/yow.el: Delete libraries obsolete since Emacs 24.4 and
+	24.5.  (Bug#73257)
+
+	* doc/misc/vip.texi:
+	* etc/refcards/vipcard.tex: Delete vip.el documentation.
+
+	* doc/emacs/ack.texi (Acknowledgments):
+	* doc/misc/Makefile.in (INFO_COMMON):
+	* etc/refcards/Makefile (PDF_ENGLISH, survival.dvi):
+	* etc/refcards/README:
+	* lisp/info.el (Info-url-alist):
+	(Info-file-list-for-emacs): Delete references to above libraries.
+
+2024-09-30  F. Jason Park  <jp@neverwas.me>
+
+	Remove erc-fill binding for cycling visual movement
+
+	* etc/ERC-NEWS: Announce removal of troublesome key binding first
+	introduced in ERC 5.6 as part of the `erc-fill-wrap' module.
+	* lisp/erc/erc-fill.el (erc-fill-wrap-mode-map): Remove key binding for
+	`erc-fill-wrap-cycle-visual-movement'.
+	* test/lisp/erc/erc-fill-tests.el (erc-fill-wrap-visual-keys--body)
+	(erc-fill-wrap-visual-keys--prompt): Replace "C-c a" key simulations.
+	(Bug#73553)
+
+2024-09-30  F. Jason Park  <jp@neverwas.me>
+
+	Skip indentation when gathering faces in erc-track
+
+	* lisp/erc/erc-nicks.el (erc-nicks-mode, erc-nicks-enable)
+	(erc-nicks-disable): Use correct name for `track' module hook.
+	(erc-nicks--check-normals): Remove falsity from doc string.
+	* lisp/erc/erc-track.el (erc-make-mode-line-buffer-name): Don't error
+	when optional COUNT is nil.
+	(erc-track-modified-channels): Use new name for preferred face-finding
+	function.
+	(erc-track--get-faces-in-current-message, erc-track--collect-faces-in):
+	Rename former to latter to better reflect expanded utility, which now
+	includes spanning gaps, including newlines and indentation that may be
+	lacking in face-related properties.
+	* test/lisp/erc/erc-track-tests.el (erc-track--collect-faces-in): New
+	test.  (Bug#73443)
+
+2024-09-30  F. Jason Park  <jp@neverwas.me>
+
+	Make erc-keep-place-indicator aware of erc-truncate
+
+	* etc/ERC-NEWS: Entry mentioning `erc-keep-place-indicator-truncation'.
+	* lisp/erc/erc-goodies.el (erc-keep-place-indicator-truncation): New
+	option.  Something like this should have accompanied the module's
+	introduction.
+	(erc-keep-place-indicator-mode, erc-keep-place-indicator-enable)
+	(erc-keep-place-indicator-disable): Arrange to take necessary measures
+	to avoid losing the indicator on `erc--clear-function'.  This module was
+	first introduced by bug#59943.
+	(erc--keep-place-move-hook): New variable.
+	(erc--keep-place-indicator-adjust-on-clear): New function.
+	(erc-keep-place-move): Try to ensure the overlay resides at the
+	beginning of a message.  Run hook `erc--keep-place-move-hook'.
+	* test/lisp/erc/erc-scenarios-keep-place-indicator-trunc.el: New file.
+	* test/lisp/erc/erc-scenarios-keep-place-indicator.el
+	(erc-scenarios-keep-place-indicator--follow): Fix missing test
+	description.  (Bug#72736)
+
+2024-09-30  F. Jason Park  <jp@neverwas.me>
+
+	Redo ERC truncation and /CLEAR hook mechanism
+
+	* etc/ERC-NEWS: Mention option `erc-truncate-padding-size'.
+	* lisp/erc/erc-fill.el (erc-fill-wrap-mode, erc-fill-wrap-enable)
+	(erc-fill-wrap-disable): Manage membership in the `erc--clear-function'
+	advice stack for own function that massages a buffer's oldest inserted
+	message, post truncation.
+	(erc-fill--wrap-massage-initial-message-post-clear): New function.
+	* lisp/erc/erc-log.el (erc-log-mode, erc-log-enable): Don't add
+	`erc-save-buffer-in-logs' to `erc--pre-clear-functions'.  Use local
+	advice around common interface variable instead, as noted below.
+	(erc-log-disable): Likewise, don't remove `erc-save-buffer-in-logs' from
+	`erc--pre-clear-functions'.
+	(erc-log-setup-logging): Add `erc-log--save-on-clear' to
+	`erc--clear-function'.
+	(erc-log-disable-logging): Remove `erc-log--save-on-clear' to
+	`erc-clear-function'.
+	(erc-save-buffer-in-logs): Abort when `erc--insert-marker' is non-nil.
+	(erc-log--save-on-clear): New function, a thin wrapper around
+	`erc-save-buffer-in-logs', adapting it to the `erc--clear-function'
+	advice interface.
+	* lisp/erc/erc-stamp.el (erc-stamp-mode, erc-stamp-enable): Don't
+	add `erc-stamp--reset-on-clear' to `erc--pre-clear-functions'.
+	(erc-stamp-disable): Don't remove `erc-stamp--reset-on-clear' from
+	`erc--pre-clear-functions'.
+	(erc-stamp--find-insertion-point): Account for initial position being
+	`bobp'.
+	(erc-stamp--defer-date-insertion-on-post-modify): Accommodate the rare
+	non-list `erc-insert-post-hook' when shadowing.
+	(erc-stamp--setup): Add and remove `erc-stamp--reset-on-clear' to and
+	from `erc--clear-function' advice stack.
+	(erc-stamp--redo-right-stamp-post-clear): New function.
+	(erc-stamp--update-saved-position): Remove unused function.  This was
+	originally added along with `erc-stamp--reset-on-clear' as part of
+	bug#60936.
+	(erc-stamp--reset-on-clear): Expect end of truncation boundary to be at
+	`erc-insert-marker'.  Rework to use new `erc--clear-function' interface
+	and run on `erc-timer-hook' instead of `erc-insert-done-hook'.
+	* lisp/erc/erc-truncate.el (erc-truncate-padding-size): New option to
+	help tamp down on disruptions when reading scroll back caused by overly
+	frequent truncation.
+	(erc-truncate-enable, erc-truncate-disable): Add and remove
+	`erc-truncate--setup' to and from `erc-mode-hook', and run it when
+	needed.
+	(erc-truncate--buffer-size): New variable.
+	(erc-truncate--setup): New function.
+	(erc-truncate-buffer-to-size): Guard execution with
+	`erc-truncate--padding-size' and `erc--inhibit-clear-p'.  Reflow for
+	readability, removing obsolete comments.  Call hooks with marker instead
+	of buffer position, as per the new `erc--clear-function' interface.
+	(erc-truncate-buffer): Defer execution to `erc-timer-hook' when running
+	post-insertion via a response handler.
+	(erc-truncate--inhibit-when-local-and-interactive): New function.
+	* lisp/erc/erc.el (erc-mode): Add `erc--skip-past-headroom-on-clear'
+	to `erc--clear-function' in all ERC buffers.
+	(erc--with-spliced-insertion): Account for marker being `bobp'.
+	(erc--insert-before-markers-transplanting-hidden): Make more robust by
+	accommodating initial `point' possibly being `bobp'.
+	(erc--clear-function): New variable, a function-valued local-advice
+	interface to replace `erc--pre-clear-functions'.
+	(erc--pre-clear-functions): Remove unused variable.
+	(erc--skip-past-headroom-on-clear): New function.
+	(erc--inhibit-clear-p): New variable.
+	(erc-cmd-CLEAR): Call hooks with markers instead of position.  Signal
+	`user-error' when `erc--inhbiit-clear-p' is non-nil.
+	* test/lisp/erc/erc-scenarios-log.el (erc-scenarios-log--clear-stamp)
+	(erc-scenarios-log--cmd-clear/date-stamps): Rename former to latter,
+	update assertions, and use common helper.
+	(erc-scenarios-log--cmd-clear/left-stamps): New test.
+	(erc-scenarios-log--truncate): Move body to function of the same name,
+	and update assertions.
+	(erc-scenarios-log--truncate/left-stamps): New test.  (Bug#72736)
+
+2024-09-30  F. Jason Park  <jp@neverwas.me>
+
+	Fix overlooked case in erc--get-inserted-msg-beg-at
+
+	* lisp/erc/erc.el (erc--get-inserted-msg-beg-at): Account for the start
+	of a props header being `bobp' when searching backwards.
+	(erc--get-inserted-msg-prop): Add optional `point' parameter.
+	* test/lisp/erc/erc-goodies-tests.el
+	(erc--get-inserted-msg-beg/truncated/readonly): New test.
+	* test/lisp/erc/erc-tests.el (erc--get-inserted-msg-beg/truncated): New
+	test.
+	* test/lisp/erc/resources/erc-tests-common.el
+	(erc-tests-common-assert-get-inserted-msg/truncated): New test helper.
+	(Bug#72736)
+
+2024-09-30  F. Jason Park  <jp@neverwas.me>
+
+	Improve inconsistent handling of ban lists in ERC
+
+	* etc/ERC-NEWS: Mention new function `erc-sync-banlist' in new section
+	for ERC 5.6.1.
+	* lisp/erc/erc-backend.el (erc-server-MODE): Don't call
+	`erc-banlist-update'.
+	* lisp/erc/erc-fill.el (erc--determine-fill-column-function): New
+	method for `fill' and `fill-wrap' modules.
+	* lisp/erc/erc-pcomplete.el (pcomplete/erc-mode/BANLIST)
+	(pcomplete/erc-mode/BL)
+	(pcomplete/erc-mode/MASSUNBAN, pcomplete/erc-mode/MUB):
+	New functions.
+	* lisp/erc/erc.el: Map ERC 5.6.1 to Emacs 31.1 in
+	`customize-package-emacs-version-alist'.
+	(erc-channel-banlist): Deprecate practice of using the symbol property
+	`received-from-server' of as a state flag because it's error-prone and
+	bleeds into other connections.
+	(erc--channel-banlist-synchronized-p): New variable to indicate
+	whether the ban list has been initialized.  The presence of a local
+	binding for `erc-channel-banlist' could probably be used for the same
+	purpose but would surely require rewriting `erc-cmd-BANLIST' and
+	`erc-cmd-MASSUNBAN'.
+	(erc-sync-banlist): New function, announced in ERC-NEWS.
+	(erc--wrap-banlist-cmd): New function.
+	(erc-banlist-fill-padding): New variable.
+	(erc--determine-fill-column-function): New generic function.
+	(erc-cmd-BANLIST): Move forward declaration of `erc-fill-column' from
+	top level into function body.  Always reset `received-from-server' to
+	nil.  Improve column calculations.
+	(erc-cmd-MASSUNBAN): Always reset `received-from-server' to nil.
+	(erc-banlist-finished): Deprecate function unused since 2003.
+	(erc--banlist-update): New function.
+	(erc-banlist-update): Deprecate function because its logic is faulty
+	and it doesn't handle mixed mode letters, like "MODE #foobar
+	+mb *@127.0.0.1".  See https://modern.ircdocs.horse/#mode-message.  It
+	also depends on an obsolete convention regarding the symbol property
+	`received-from-server' of `erc-channel-banlist'.  Basically, this
+	function used to run upon receipt of any "MODE" command from the
+	server.  However, actual updates to the variable `erc-channel-banlist'
+	only happened if `received-from-server' was t, which could only be the
+	case after the user issued a /MASSUNBAN.  And that behavior was
+	determined to be a bug.  This mode framework stuff was introduced as
+	part of bug#67220 for ERC 5.6.
+	(erc--handle-channel-mode): New function, a method for standard
+	channel-mode letter "b".
+	* test/lisp/erc/erc-tests.el (erc--channel-modes)
+	(erc--channel-modes/graphic-p): Assert contents of
+	`erc-channel-banlist' updated on "MODE".  (Bug#72736)
+
+2024-09-30  F. Jason Park  <jp@neverwas.me>
+
+	Bind current erc-response around all handlers
+
+	* lisp/erc/erc-backend.el (erc--parsed-response): New variable to be
+	the internal version of the ancient `erc-message-parsed', which is
+	only available during `erc-display-message', and therefore of somewhat
+	limited utility.
+	(erc-call-hooks): Bind `erc--parsed-response' to the parsed
+	`erc-response' object for the duration of its handling.  Bind
+	`erc--msg-prop-overrides' around all hooks to allow response handlers
+	to influence inserted msg props for any `erc-display-message' calls.
+	(Bug#72736)
+
+2024-09-30  F. Jason Park  <jp@neverwas.me>
+
+	Store one string per user in erc--spkr msg prop
+
+	* lisp/erc/erc.el (erc--msg-props): Mention that the `erc--spkr'
+	msg-prop value is taken from the `nickname' slot of the user's
+	`erc-server-users' entry.
+	(erc--speakerize-nick): Avoid using the provided NICK parameter for
+	the `erc--spkr' property.  Instead, use the version from the
+	`nickname' slot of its `erc-server-users' item, which is itself an
+	`erc-server-user' object.  These text props were originally introduced
+	in ERC 5.6 as part of bug#67677.
+	* test/lisp/erc/erc-tests.el (erc--refresh-prompt)
+	(erc--check-prompt-input-functions, erc-send-current-line)
+	(erc--check-prompt-input-for-multiline-blanks)
+	(erc-send-whitespace-lines): Use more convenient helper utility to
+	create fake server buffer where possible.
+	(erc--speakerize-nick): New test.
+	* test/lisp/erc/resources/erc-tests-common.el
+	(erc-tests-common-make-server-buf): Don't use ERT temp buffer's name
+	for dialed server, etc., because it contains unwanted chars.
+	(erc-tests-common-with-process-input-spy): Defer to each test to set
+	up its own prompt, etc.  (Bug#72736)
+
+2024-09-29  Stefan Kangas  <stefankangas@gmail.com>
+
+	Try "python" before "python3" in python-mode
+
+	Prefer whatever version of Python that "python" might point to; use
+	"python3" if it doesn't exist.  On recent versions of typical GNU/Linux
+	distributions, "python" either does not exist or it points to Python 3.
+	In (presumed rare) cases where "python" points to Python 2 instead,
+	users are now expected to manually customize these variables if they
+	want to use Python 3.
+
+	* lisp/progmodes/python.el (python-interpreter)
+	(python-shell-interpreter): Prefer "python" to "python3".
+
+	Ref:
+	https://lists.gnu.org/r/emacs-devel/2024-09/msg00885.html
+
+2024-09-29  Mattias Engdegård  <mattiase@acm.org>
+
+	Cease accepting the :reverse-video face attribute (bug#73552)
+
+	It was an old alias for :inverse-video that hasn't worked very well for
+	many years.
+
+	* src/xfaces.c (merge_face_ref, Finternal_set_lisp_face_attribute)
+	(Finternal_set_lisp_face_attribute_from_resource)
+	(Finternal_get_lisp_face_attribute)
+	(Finternal_lisp_face_attribute_values, syms_of_xfaces):
+	Stop recognising :reverse-video.
+	* etc/NEWS: Announce.
+
+2024-09-29  Mattias Engdegård  <mattiase@acm.org>
+
+	* lisp/custom.el (custom-fix-face-spec): Fix :reverse-video case
+
+	The :reverse-video keyword is no longer used but we might just as well
+	fix the code that is supposed to migrate away from it (bug#73552).
+
+2024-09-29  Mattias Engdegård  <mattiase@acm.org>
+
+	Stop using :reverse-video in make-mode
+
+	* lisp/progmodes/make-mode.el (makefile-space, makefile-makepp-perl):
+	Stop using a long obsolete attribute keyword.
+
+2024-09-29  Mattias Engdegård  <mattiase@acm.org>
+
+	Warn about :reverse-video in defface
+
+	This attribute keyword has been non-working in defface for 14 years,
+	thus warning about it is both safe and decent.
+
+	* lisp/emacs-lisp/bytecomp.el (bytecomp--check-cus-face-spec):
+	Warn and suggest :inverse-video to be used instead.
+	* test/lisp/emacs-lisp/bytecomp-tests.el (bytecomp-test-defface-spec):
+	Add a test case.
+	* etc/NEWS: Notify the user.
+
+2024-09-29  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Use directory-name-p in vc-git--file-list-is-rootdir
+
+	* lisp/vc/vc-git.el (vc-git--file-list-is-rootdir):
+	Use directory-name-p.
+
+2024-09-29  Sean Allred  <allred.sean@gmail.com>
+
+	project--vc-list-files: Use '--sparse' with 'git ls-files'
+
+	When dealing with exceptionally large Git repositories, the
+	performance of `project-find-file` can suffer dramatically as
+	the list of files is collected for completion.  This adds insult
+	to injury when you consider cases where the developer has
+	configured the repository to use a sparse checkout where the
+	vast majority of these files are not even present on disk and
+	are not valid candidates for completion.
+
+	* lisp/progmodes/project.el (project--vc-list-files):
+	Pass 'sparse' to 'git ls-files' when Git is recent enough.
+	Filter out file names that end with '/' (bug#73320).
+
+2024-09-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	e2b01d164cd ; Fix last changes in php-ts-mode.el
+
+2024-09-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	e8830015b07 Require ert-x for use by 'ert-font-lock-deftest-file'
+	a1841b4d8e7 ; * admin/authors.el (authors-aliases): Don't ignore "one...
+	69d8f9d1b70 Fix php-ts-mode font-lock for latest PHP grammar (bug#73516)
+	68f53e43488 eieio.texi: Fix bug#73505
+	53c887fdf6d ; cperl-mode.el: Fix an invalid face specification
+	f5cd5585f46 ; Recommend GNU Find for 'find-dired'
+	65e589698e6 ; * lisp/filesets.el (filesets-homepage): Fix URL.
+	1f243a97806 Delete duplicated line in Viper refcard
+	d63bff4d88f Fix Tramp shortdoc integration
+	759b18a33c0 * lisp/imenu.el (imenu-flatten): More limitations in docs...
+	794bb2a2e31 remember-data-file: Don't unconditionally call set-visite...
+	7766ba84199 Align columns in which-key with wide characters properly
+	bd25a98b4e7 bibtex-mode: fix patch bibtex validation for non-file buf...
+	4729065ee78 Document 'buttonize-region' in manual
+	f189457e5aa ; * lisp/yank-media.el (yank-media-handler): Fix docstrin...
+	2b53e11a087 Use black-on-white by default for doc-view-svg-face.
+	32d0c8f6af5 etags-regen-file-extensions: Enable for more extensions
+	8f265b49e3d ; Fix last change
+	c8ed48b9901 ; Improve documentation of 'append'
+	c1f2501f55d Update and improve UI of sql-read-product (bug#73412)
+	4f5fc519f09 Insert correct commit data into VC package descriptions
+	98177d4b3d1 Document reporting security issues in user manual
+	b986e2018a4 * BUGS: Minor copy edit.
+
+2024-09-28  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	* etc/images/kitchen-sink.xpm: New file.
+
+2024-09-28  shynur  <one.last.kiss@outlook.com>
+
+	Enable 'sh-mode' for files created by Bash 'fc' command
+
+	* lisp/files.el (auto-mode-alist): Recognize bash-fc.XXXX files.
+	(Bug#73380)
+
+2024-09-28  Visuwesh  <visuweshm@gmail.com>
+
+	Add buffer-local register commands to DocView
+
+	* lisp/doc-view.el (doc-view-register-alist): New defvar to keep
+	track of buffer-local register-alist.
+	(doc-view-page-to-register, doc-view-jump-to-register): Add new
+	commands to set and jump to buffer-local registers.
+	(register-val-insert, register-val-describe)
+	(register-val-jump-to): Register defmethod to save and restore
+	doc-view registers.
+	(doc-view-mode-map): Bind the new commands.
+	* doc/emacs/misc.texi (DocView Navigation): Document the new
+	commands.  (Bug#73293)
+	* etc/NEWS: Announce the change.
+
+2024-09-27  Mattias Engdegård  <mattiase@acm.org>
+
+	Warn about bad face specs in `defface` at compile time
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile--custom-declare-face):
+	Byte-compile `defface` forms, or the byte-compile handler won't
+	be called.
+	(bytecomp--check-cus-face-spec): New.
+	(bytecomp--custom-declare): Call it.
+	* test/lisp/emacs-lisp/bytecomp-tests.el (bytecomp-test-defface-spec):
+	New tests.
+
+2024-09-27  Mattias Engdegård  <mattiase@acm.org>
+
+	* lisp/custom.el (defface): Add missing attributes to doc string.
+
+2024-09-27  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: Parse C++ lambda functions more correctly
+
+	This fixes bug#72695.
+
+	* lisp/progmodes/cc-align.el (c-lineup-topmost-intro-cont): Do
+	not indent further a line following a closing brace of a
+	requires clause.
+
+	* lisp/progmodes/cc-engine.el (c-forward-keyword-clause):
+	Separate the handling of "any-paren-kwds" into
+	"type-paren-kwds" and "nontype-paren-kwds", simplifying the
+	handling of the latter.
+	(c-forward-primary-expression): Recognize (...) followed by {
+	as a primary expression.
+	(c-looking-at-or-maybe-in-bracelist): No longer recognize an
+	enum list as a brace list.  Remove the handling of enum lists.
+	(c-looking-at-c++-lambda-expression)
+	(c-backward-over-lambda-expression): New functions.
+	(c-c++-vsemi-p): Don't recognize the end of requires clauses as
+	virtual semicolons.
+	(c-guess-basic-syntax): CASE 5U - new cond arm to recognize
+	being after a requires clause.  These lines now get syntax
+	topmost-intro-cont rather than topmost-intro, and their anchor
+	positions are now on the topmost-intro line rather than the
+	previous topmost-intro-cont.
+	Throughout the file: simplify handling of
+	c-fun-name-substitute-key, where there is no need to check for
+	a following _ character, and introduce c-requires-clause-key
+	for greater accuracy in parsing, even though both of these are
+	just "requires".
+
+	* lisp/progmodes/cc-fonts.el (c-get-fontification-context):
+	Tidy up the handling of c-fun-name-substitue-key, as in
+	cc-engine.el.
+
+	* lisp/progmodes/cc-langs.el (c-lambda-spec-kwds)
+	(c-lambda-spec-key): New lang vars.
+	(c-fun-name-substitute-key): Now an adorned expression.
+	(c-requires-clause-kwds, c-requires-clause-key): New lang vars.
+
+2024-09-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/mail/emacsbug.el (submit-emacs-patch): Insert empty X-Debbugs-Cc
+
+	(Bug##57877)
+
+2024-09-27  Stefan Kangas  <stefankangas@gmail.com>
+
+	Bind "J" to bookmark-jump in bookmark-bmenu-mode
+
+	* lisp/bookmark.el (bookmark-bmenu-mode-map): Bind "J" to bookmark-jump.
+
+2024-09-27  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer python3 for python-interpreter
+
+	* lisp/progmodes/python.el (python-interpreter): Prefer "python3" when
+	it exists, to be consistent with python-shell-interpreter.
+
+2024-09-27  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Move to start of current header in diff-{file,hunk}-prev
+
+	If point was after a file or hunk header, the diff-file-prev and
+	diff-hunk-prev commands would move to the start of that header.
+	But if point was *within* the header, they would not move, and
+	would report "No previous file" or "No previous hunk".  This
+	differs from the behavior of most other movement commands,
+	e.g. backward-sexp or backward-sentence.
+
+	This commit fixes diff-file-prev and diff-hunk-prev, as well as
+	other easy-mmode-define-navigation BASE-prev commands.  Now
+	these commands move to the start of the containing "thing" just
+	like other movement commands.
+
+	* lisp/emacs-lisp/easy-mmode.el (easy-mmode--prev):
+	Move to start of current match first. (bug#73172)
+	* etc/NEWS: Document the behavior change.
+
+2024-09-27  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Move easy-mmode-define-navigation logic to helper functions
+
+	The functions defined by easy-mmode-define-navigation are useful
+	even if the easy-mmode-define-navigation macro is not used.
+	Let's take a step towards exposing them by moving them out as
+	helpers.
+
+	This also makes the macro much easier to modify and work on.
+
+	* lisp/emacs-lisp/easy-mmode.el (easy-mmode--prev)
+	(easy-mmode--next): Add (bug#73172).
+	(easy-mmode-define-navigation): Use easy-mmode--prev and
+	easy-mmode--next.
+
+2024-09-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(pcase-tests-quote-optimization): Fix warning
+
+	* test/lisp/emacs-lisp/pcase-tests.el (pcase-tests-quote-optimization):
+	Fix confusing code.
+
+2024-09-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/emacs-lisp/pcase.el (pcase--expand-\`): Improve warning message
+
+	And also move the warning "out of the way" so it doesn't
+	confuse optimizations.
+
+2024-09-26  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add Python "*.pth" files to auto-mode-alist
+
+	* lisp/progmodes/python.el (python--auto-mode-alist-regexp): New
+	variable.
+	(auto-mode-alist, python-ts-mode): Use above new variable.
+
+2024-09-26  Andrea Corallo  <acorallo@gnu.org>
+
+	* Clean-up unused condition-case
+
+	* lisp/emacs-lisp/comp.el (comp--native-compile): Remove unused
+	condition-case.
+
+2024-09-26  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New command diff-revert-and-kill-hunk
+
+	* lisp/vc/diff-mode.el (diff-revert-and-kill-hunk): New
+	command (bug#73407).
+	(diff-ask-before-revert-and-kill-hunk): New user option.
+	(diff-apply-buffer): New optional BEG, END and REVERSE
+	arguments.  Return nil if buffers were saved, or the number of
+	failed applications.
+	(diff-mode-map): Bind the new command to C-c M-r.
+	(diff-mode-menu): New entry for the new command.
+	* doc/emacs/files.texi (Diff Mode):
+	* etc/NEWS: Document the change.
+
+2024-09-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "; Recommend GNU Find for 'find-dired'"
+
+	This reverts commit 5f8c2d5bf9638c38fdba7eb840d3bc7b252bb687.
+	It was committed by mistake on this branch.
+
+2024-09-26  Stefan Kangas  <stefankangas@gmail.com>
+
+	Deprecate 'Homepage' header in favor of 'URL'
+
+	* doc/lispref/tips.texi (Library Headers): Document the 'Homepage'
+	header as deprecated in favor of 'URL'.
+
+2024-09-25  Alan Mackenzie  <acm@muc.de>
+
+	* etc/NEWS: Describe the change to enum handling in CC Mode
+
+2024-09-25  Robert Pluim  <rpluim@gmail.com>
+
+	Test 'network-lookup-address-info' argument type checking
+
+	* test/src/process-tests.el (lookup-hints-values): Pass in
+	non-string values, which should result in type errors.
+
+2024-09-25  Juri Linkov  <juri@linkov.net>
+
+	* lisp/hi-lock.el (hi-lock-revert-buffer-rehighlight): Fix lighter.
+
+	Add '(car pattern)' as the LIGHTER argument of 'highlight-regexp'.
+	This fixes the case when in a file buffer with fundamental-mode:
+	`C-s M-s ' the M-s h r RET`, revert the buffer with 'C-x x g',
+	get the prompt for unhighlight with 'M-s h u'.  This showed
+	a raw regexp instead of the human-readable lighter (bug#57534).
+
+2024-09-24  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: Separate indentation of enums from that of brace lists
+
+	This will allow enums to be indented as in the GNU coding
+	standards without affecting brace lists.
+
+	* lisp/progmodes/cc-align.el
+	(c-lineup-arglist-intro-after-paren)
+	(c-lineup-arglist-close-under-paren)
+	(c-lineup-whitesmith-in-block)
+	(c-lineup-after-whitesmith-blocks): Amend doc strings to
+	indicate they can be used for enum-* syntactic symbols too.
+
+	* lisp/progmodes/cc-engine.el (c-looking-at-decl-block)
+	(c-backward-typed-enum-colon, c-backward-over-enum-header):
+	Rename c-after-brace-list-key to c-after-enum-list-key and
+	c-brace-list-key to c-enum-list-key.
+	(c-at-enum-brace): New function.
+	(c-inside-bracelist-p): Don't check for enums any more.
+	(c-add-stmt-syntax): New cond arm for enums.
+	(c-guess-continued-construct CASE B.6) New code for enum-open.
+	(c-guess-basic-syntax CASE 5A.3, CASE 7B, CASE 9, CASE 9B)
+	(CASE 9C, CASE 9D): Use the new function c-at-enum-brace, and
+	use enum-* syntactic symbols rather than brace-list-* ones
+	where appropriate.
+	(c-used-syntactic-symbols): New dynamic variable.
+	(c-evaluate-offset): Add handling for a different syntactic
+	symbol as the cdr of a c-offsets-alist element.
+
+	* lisp/progmodes/cc-fonts.el (c-get-fontification-context):
+	Add a call to c-at-enum-brace since c-inside-bracelist-p no
+	longer handles enums.
+	(c-font-lock-enum-body, c-font-lock-enum-tail): Condense calls
+	to c-backward-over-enum-header to c-at-enum-brace.
+	(c-basic-matchers-after): Replace a c-brace-list-decl-kwds with
+	c-enum-list-kwds.
+
+	* lisp/progmodes/cc-langs.el (c-enum-list-kwds)
+	(c-enum-list-key): New names for c-brace-list-decl-kwds and
+	c-brace-list-key.
+	(c-after-enum-list-kwds, c-after-enum-list-key): New names for
+	c-after-brace-list-decl-kwds and c-after-brace-list-key.
+	(c-enum-list-key, c-after-enum-list-key): Add code to
+	use a value of an old name, should a derived mode still use
+	that.
+	(c-defun-type-name-decl-kwds, c-typedef-decl-kwds)
+	(c-typeless-decl-kwds, c-prefix-spec-kwds)
+	(c-brace-id-list-kwds, c-enum-clause-introduction-re): Use
+	c-enum-list-kwds rather than c-brace-list-decl-kwds.
+
+	* lisp/progmodes/cc-styles.el (c-read-offset): Add "a
+	syntactic symbol" into an error message text.
+
+	* lisp/progmodes/cc-vars.el (c-valid-offset): Allow for a
+	syntactic symbol as the parameter.
+	(c-offsets-alist): Add new syntactic symbols enum-open,
+	enum-close, enum-intro, and enum-entry.
+
+	* doc/misc/cc-mode.texi (Syntactic Symbols): Add a note that
+	anchor points are briefly documented in cc-vars.el.  Correct
+	the suffix "-block-intro" to "-intro".  Remove "an enum or"
+	from the descriptions of the brace-list-* syntactic symbols.
+	Add in new descriptions for the enum-* syntactic symbols.
+	(Brace List Symbols): Remove references to enums.  Add a note
+	that enums are no longer brace-lists.
+	(Enum Symbols): A new subsection documenting the new enum-*
+	syntactic symbols.
+	(c-offsets-alist): Document the new possibility, syntactic
+	symbol, for the cdr of an alist entry.
+	(Brace/Paren Line-Up, List Line-Up): Note that the new enum
+	syntactic symbols can be handled by these lineup functions.
+
+2024-09-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Declare nested backquotes unsupported in Pcase patterns (bug#72328)
+
+	The current behavior is inconsistent with that of the normal backquote
+	macro, so to avoid surprises, warn about the use of nested backquotes.
+
+	* lisp/emacs-lisp/pcase.el (pcase--expand-\`): Warn about nested backquotes.
+
+	* lisp/emacs-lisp/testcover.el (testcover-analyze-coverage)
+	(testcover-analyze-coverage-wrapped-form): Avoid nested backquotes
+
+2024-09-24  Sean Whitton  <spwhitton@spwhitton.name>
+
+	diff-apply-buffer: Improve failure message
+
+	* lisp/vc/diff-mode.el (diff-apply-buffer): Say "hunk", not
+	"hunks", when there was only one failed hunk.
+
+2024-09-23  Michael Albinus  <michael.albinus@gmx.de>
+
+	Extend tramp-otp-password-prompt-regexp
+
+	* lisp/net/tramp.el (tramp-otp-password-prompt-regexp): Add TACC
+	HPC prompt.
+
+2024-09-23  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/misc/tramp.texi (Frequently Asked Questions): Improve indices.
+
+2024-09-22  Cecilio Pardo  <cpardo@imayhem.com>
+
+	Fix multi-file drag-and-drop on MS-Windows
+
+	Pass all dropped files to 'dnd-handle-multiple-urls' in
+	one call instead on doing multiple calls (Bug#73258).
+	* lisp/term/w32-win.el (w32-dropped-file-to-url): New function to
+	convert file name to a url for dnd.
+	(w32-handle-dropped-file): Changed to use 'w32-dropped-file-to-url'.
+	(w32-drag-n-drop): Changed to pass all files to
+	'dnd-handle-multiple-urls'/
+
+2024-09-22  Eshel Yaron  <me@eshelyaron.com>
+
+	Teach Electric Pair mode about prefix arguments
+
+	* lisp/elec-pair.el (electric-pair--insert): New arg TIMES.
+	(electric-pair-inhibit-if-helps-balance)
+	(electric-pair-post-self-insert-function)
+	(electric-pair-open-newline-between-pairs-psif)
+	(electric-pair-skip-if-helps-balance): Respect prefix arg.
+	(electric-pair-delete-pair): Delete ARG chars, not just 1.
+	* test/lisp/electric-tests.el (autowrapping-multi-1)
+	(autowrapping-multi-2): New tests.
+	* doc/emacs/programs.texi (Matching): Mention prefix arg
+	support in Electric Pair mode documentation.
+	* etc/NEWS: Announce it.  (Bug#72437)
+
+2024-09-21  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: fix minor errors in the fontification of enums.
+
+	1: Fix the typing of a space on the { line in an enum
+	specification which is the first item in a buffer.  This
+	defontified the enum's identifiers.
+	2: Fix the typing of a space on the line of the enum's last
+	identifier.  This defontified that identifier for
+	jit-lock-context-time.
+
+	* lisp/progmodes/cc-engine.el (c-forward-declarator): Cease
+	rejecting the identifier if there are no further tokens before
+	LIMIT.
+
+	* lisp/progmodes/cc-mode.el (c-fl-decl-start): Accept a
+	backward search as succeeding if it hits point-min.
+
+2024-09-21  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Don't activate midnight-mode when loading 'midnight'
+
+	* lisp/midnight.el (midnight-mode): Call 'midnight-delay-set' again
+	when the mode is activated.
+	(midnight-delay-set): Only start the timer if the mode is turned
+	on.  (Bug#73291)
+	* etc/NEWS: Document the change in behaviour.
+
+2024-09-21  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete redundant declarations of 'electric' variables
+
+	* lisp/progmodes/js.el (electric-layout-rules):
+	* lisp/progmodes/octave.el (electric-layout-rules):
+	* lisp/progmodes/python.el (electric-indent-inhibit):
+	* lisp/textmodes/rst.el (electric-indent-inhibit): Delete redundant
+	declarations; 'electric' is preloaded since Emacs 24.4.
+
+2024-09-21  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add Python keywords "aiter" and "anext"
+
+	* lisp/progmodes/python.el (python-font-lock-keywords-level-2)
+	(python--treesit-builtins): Add "aiter" and "anext" keywords,
+	introduced in Python 3.10.
+
+2024-09-21  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add all exceptions up to Python 3.13 as keywords
+
+	* lisp/progmodes/python.el
+	(python-font-lock-keywords-maximum-decoration)
+	(python--treesit-exceptions): Add all built-in exceptions in Python 3.13
+	as keywords.  Missing from the list was "BaseExceptionGroup",
+	"EncodingWarning", "ModuleNotFoundError", and "PythonFinalizationError".
+
+2024-09-21  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add subword-mode toggle to python-mode menu
+
+	* lisp/progmodes/python.el (python-mode-map): Add subword-mode
+	toggle to menu.
+
+2024-09-21  Stefan Kangas  <stefankangas@gmail.com>
+
+	Support electric-layout-mode in python-base-mode
+
+	* lisp/progmodes/python.el (python-base-mode): Add support for
+	'electric-layout-mode'.
+
+2024-09-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix merging of NEWS from emacs-30.
+
+2024-09-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	ecfebb5abb8 ; Always set 'emoji--insert-buffer'
+	35e356f958a Fix font-lock of last character before EOB under 'whitesp...
+	01ebe6de895 Fix 'whitespace-mode' with 'missing-newline-at-eof'
+
+2024-09-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	b7f6cde419f Disable xwidgets with recent webkitgtk versions (Bug#66068)
+	a6dafbc2bc5 ; * lisp/editorconfig.el (editorconfig-indentation-alist)...
+	0834106a620 Fix treesit--merge-ranges (bug#73324)
+	76c6b4d2799 Fix midnight-mode documentation
+	f7782522207 ; Fix my email address
+	db22efca8d4 editorconfig.el: Fix too naive sync from upstream
+	0f12d6dd23c ; * etc/NEWS: Announce 'doc-view-mpdf--use-svg'.
+	29d50e245f8 * lisp/progmodes/eglot.el (eglot--signal-textDocument/did...
+
+	# Conflicts:
+	#	etc/NEWS
+	#	lisp/treesit.el
+
+2024-09-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	4b9a8fd6074 etags-regen-file-extensions: Add .pm
+	956f14ae5e9 * src/treesit.c (treesit_debug_print_parser_list): Fix co...
+	300d05ecb4c Type-check argument to network-lookup-address-info
+	0f0f21b7f27 ; Improve doc strings of options related to numbered backups
+	f0daa2f2153 Conservative heuristic for tree-sitter parser ranges (bug...
+	035024b4e5a ; Fix treesit.c printing
+	8771310a10d ; * admin/notes/unicode: Need to run textsec-tests (bug#7...
+	4c6f45fa8ee Re-enable GC mark trace buffer by default
+	c6077015894 ; * src/haiku_support.cc: Correct last change.
+	ae22ad7f624 ; Add even more tests for previous commit
+	460b9d705ab Fix treesit_sync_visible_region's range fixup code (bug#7...
+	81347c1aaf2 ; * etc/PROBLEMS: Fix last change (bug#73207).
+	a82b7f3e823 Document unavailability of frame geometry on Wayland
+
+2024-09-21  Paul Nelson  <ultrono@gmail.com>
+
+	Add option for delete-pair to mark end of region
+
+	* lisp/emacs-lisp/lisp.el (delete-pair-push-mark): New user option.
+	(delete-pair): Use it.  (Bug#73284)
+
+	* etc/NEWS: Announce the new user option.
+
+2024-09-21  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	Add user option to enable Doxygen syntax highlighting (bug#72814)
+
+	Both 'c-ts-mode' and 'java-ts-mode' have a new user option,
+	'c-ts-mode-enable-doxygen' and 'java-ts-mode-enable-doxygen'
+	(defaults to nil) which allow to enable syntax highlighting
+	of comment blocks based on the Doxygen grammar.
+
+	* lisp/progmodes/c-ts-mode.el: Add the 'c-ts-mode-enable-doxygen'
+	user option variable to disable doxygen grammar.
+	Notifies the user if doxygen grammar is not available.
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode, c++-ts-mode): Use the
+	new 'c-ts-mode-enable-doxygen' option.
+	* lisp/progmodes/java-ts-mode.el: Add the
+	'java-ts-mode-enable-doxygen' user option variable to disable
+	doxygen grammar.  Notifies the user if doxygen grammar is not
+	available.
+	* lisp/progmodes/java-ts-mode.el (java-ts-mode): Use the new
+	'java-ts-mode-enable-doxygen' option.
+
+	* etc/NEWS: Document the change.
+
+2024-09-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'regexp-replace' in WDired
+
+	* src/search.c (Freplace_match): Remove the test that
+	search_regs.num_regs != num_regs.  It is deemed unnecessary now,
+	and could produce false positives.  (Bug#73018)
+
+2024-09-21  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/infra/gitlab-ci.yml (.tree-sitter-template): Add treesit.el.
+
+2024-09-21  Michael Albinus  <michael.albinus@gmx.de>
+
+	Use (sit-for 0) in Tramp
+
+	* lisp/net/tramp.el (tramp-wait-for-regexp): Use (sit-for 0) in
+	order to avoid performace regression.
+
+2024-09-21  Yuan Fu  <casouri@gmail.com>
+
+	Add accessors for treesit-font-lock-settings
+
+	Since each SETTING in treesit-font-lock-settings is considered an opaque
+	object, provide accessor functions for each field.
+
+	* lisp/treesit.el:
+	(treesit-font-lock-settings): Update docstring.
+	(treesit-font-lock-setting-query):
+	(treesit-font-lock-setting-enable):
+	(treesit-font-lock-setting-feature):
+	(treesit-font-lock-setting-override): New functions.
+	(treesit--font-lock-setting-feature): Remove function.
+	(treesit--font-lock-setting-enable): Rename to
+	treesit--font-lock-setting-clone-enable to avoid confusion with
+	treesit-font-lock-setting-enable.
+	(treesit-add-font-lock-rules): Use renamed function.
+	(treesit-font-lock-fontify-region): Add a comment.
+	* doc/lispref/modes.texi (Parser-based Font Lock): Update manual.
+
+2024-09-21  David Fussner  <dfussner@googlemail.com>
+
+	Fix regexps for TeX xref backend
+
+	* lisp/textmodes/tex-mode.el (tex-thingatpt-exclude-chars): Remove
+	variable.
+	(tex-thingatpt--beginning-of-symbol, tex-thingatpt--end-of-symbol):
+	Use hard-coded characters instead of variable.  (Bug#53749)
+
+2024-09-20  Po Lu  <luangruo@yahoo.com>
+
+	Remove obsolete workaround
+
+	* src/fontset.c (fontset_find_font): Don't refuse to cache
+	font objects whose registries do not agree with the font
+	specs.  (bug#73363)
+
+2024-09-20  Mattias Engdegård  <mattiase@acm.org>
+
+	Speed up tall rectangular selections (bug#72830)
+
+	Instead of setting the highlight overlay on every line in the selection,
+	only do so on the window-height worth of lines closest to point because
+	the rest aren't likely to be visible.
+
+	This makes a massive difference for tall rectangular selections which
+	previously were so slow as to be unusable.
+
+	(Tall selections are still slow if `select-active-regions` is non-nil,
+	but that is something that users can actually do something about.)
+
+	* lisp/rect.el (rectangle--highlight-for-redisplay)
+	(rectangle--unhighlight-for-redisplay):
+	Replace call to `apply-on-rectangle`, which operates on every line,
+	with a loop over an approximate screenful.
+	Extend the `rectangle` overlay list structure with a value for point,
+	because `exchange-point-and-mark` must trigger a recomputation of
+	highlight overlays despite the selection not actually changing.
+
+2024-09-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix M-TAB completion of variables in 'cond'
+
+	* lisp/progmodes/elisp-mode.el (elisp-completion-at-point): Add
+	special support for 'cond, 'cond*', and 'bind*'.  (Bug#73330)
+
+2024-09-19  Juri Linkov  <juri@linkov.net>
+
+	* lisp/dired-aux.el (dired-do-open): Optimize (bug#73004).
+
+	Detect system-type only once, then iterate over files
+	for every system type separately.
+
+2024-09-19  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Support numeric indexing in let-alist
+
+	let-alist is very useful.  But sometimes an alist contains a list in
+	the middle, which contains yet more alists.  Previously, this was
+	somewhat painful to deal with, and required something like:
+
+	(let-alist alist
+	  (let-alist (nth 0 .a)
+	    (let-alist (nth 3 .b)
+	       .c)))
+
+	Now, the following works:
+
+	(let-alist alist
+	  .a.0.b.3.c)
+
+	* lisp/emacs-lisp/let-alist.el (let-alist--access-sexp): Properly
+	parse numbers to handle lists.  (Bug#66509)
+	(let-alist--list-to-sexp): Use nth to handle numbers.
+	(let-alist): Update docs.
+
+2024-09-18  Juri Linkov  <juri@linkov.net>
+
+	Additional fix for kill-region-dwim (bug#69097)
+
+	* lisp/simple.el (kill-region): Restore the original logic of
+	raising the error unless both 'beg' and 'end' are non-nil
+	since 'end' is always non-nil.
+
+2024-09-18  Juri Linkov  <juri@linkov.net>
+
+	More fixes for kill-region-dwim (bug#69097)
+
+	* lisp/simple.el (kill-region-dwim): Move the default nil
+	to the top of choices.
+	(kill-region): Set the FORCE argument of 'mark' to non-nil
+	if kill-region-dwim is non-nil.  That allows everyone to use
+	non-nil kill-region-dwim even if mark-even-if-inactive is nil.
+	Don't check 'last-command' if kill-region-dwim is non-nil.
+	That allows everyone to type C-w twice in a row to delete
+	two previous words.
+
+2024-09-18  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Make `dired-do-open' work on more *nix systems
+
+	* lisp/dired-aux.el (dired-do-open): Make `dired-do-open' work
+	on more *nix systems (bug#73004).
+
+2024-09-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	yes-or-no-p now uses blankp rather than SYNTAX
+
+	* src/fns.c: Do not include syntax.h; no longer needed.
+	(Fyes_or_no_p): Use blankp rather than SYNTAX to check whether the
+	prompt ends in nonspace.  That way, the test doesn’t depend on the
+	current buffer.
+
+2024-09-18  Po Lu  <luangruo@yahoo.com>
+
+	Fix layout of preferences activity on Android 35
+
+	* java/org/gnu/emacs/EmacsPreferencesActivity.java (onCreate):
+	Align list view to system windows.
+
+2024-09-18  F. Jason Park  <jp@neverwas.me>
+
+	Only conditionally resolve hosts in nsm-should-check
+
+	Libraries like `socks' need to run `nsm-verify-connection' without
+	performing DNS lookups.  This change allows them to achieve this by
+	binding `nsm-trust-local-network' to nil around calls to that function.
+
+	* lisp/net/nsm.el (nsm-should-check): Rework in a functionally
+	equivalent way, except forgo calling both `network-lookup-address-info'
+	and `network-interface-list' unless the various conditions regarding
+	`nsm-trust-local-network' are first satisfied.  Replace `mapc' with
+	`dolist' to align with modern sensibilities.   (Bug#53941)
+
+2024-09-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Use c-ctype.h in lib-src
+
+	This fixes some unlikely bugs and removes the temptation
+	of using ctype.h.  Although some uses were correct,
+	many weren't.
+	* lib-src/ebrowse.c: Include c-ctype.h, not ctype.h.
+	* lib-src/emacsclient.c: Include c-ctype.h, not ctype.h.
+	* lib-src/update-game-score.c: Include c-ctype.h, not ctype.h.
+	All uses changed.
+
+2024-09-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix some #! misparsing in check_interpreter
+
+	* exec/exec.c: Do not include ctype.h, as the kernel
+	does not care about the locale.
+	(check_interpreter): Treat only spaces and tabs as white space.
+	Do not inspect more bytes than were read.
+	Although the resulting code does not exactly match what
+	the Android kernel does, it’s closer than what it was before.
+
+2024-09-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix misuse of toupper in sfnt_parse_style
+
+	* src/sfntfont.c: Include c-ctype.h, not ctype.h.
+	(sfnt_parse_style): Upcase just initial ASCII letters;
+	that’s good enough here.
+
+2024-09-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix yes-or-no-p with multibyte spaces
+
+	Problem reported by Thomas Klausner (Bug#73307).
+	Emacs shouldn’t use ctype.h, as it doesn’t work for multibyte
+	chars and it doesn’t work with Emacs’s locale model anyway.
+	* src/fns.c: Include syntax.h, not ctype.h.
+	(Fyes_or_no_p): Check the character category with SYNTAX, not
+	with isspace, which assumes the current locale and works only
+	with single-byte characters.
+
+2024-09-17  Eshel Yaron  <me@eshelyaron.com>
+
+	New user option 'completion-preview-ignore-case'
+
+	Completion Preview mode implicitly assumed that
+	'completion-ignore-case' is nil, and while it can also work
+	with 'completion-ignore-case' non-nil, the results are a bit
+	different than what you get with 'completion-at-point'.  Add
+	an option that controls case sensitivity explicitly and
+	specifically for Completion Preview mode, and clarify the
+	behavior when case differences are ignored.  (Bug#73234)
+
+	* lisp/completion-preview.el
+	(completion-preview-ignore-case): New user option.
+
+2024-09-17  Robert Pluim  <rpluim@gmail.com>
+
+	Fix idna-mapping-table following Unicode 16 changes
+
+	The latest version of UTS #46 in Unicode 16 has changed the way it
+	indicates which codepoints are invalid in domain names, causing
+	'idna-mapping-table' to contain incorrect information, which then breaks
+	'textsec-domain-suspicious-p' and our test suite.  (Bug#73312)
+
+	* admin/unidata/unidata-gen.el (unidata-gen-idna-mapping): Check the
+	IDNA validity field in "IdnaMappingTable.txt" in addition to checking
+	the status field, as the latter can now be 'valid' for disallowed
+	codepoints.
+
+2024-09-17  Dmitry Gutov  <dmitry@gutov.dev>
+
+	Rename project-{find-file-in-root,root-find-file}
+
+	* lisp/progmodes/project.el (project-root-find-file):
+	Rename from 'project-find-file-in-root' (bug#73044).
+
+2024-09-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2024-09-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Remove unnecessary #include
+
+	* src/sysdep.c: Don’t include utimens.h; hasn’t been
+	needed for a while.
+
+2024-09-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add make-directory to symbol-releases.eld
+
+	This avoids saying (incorrectly) that it was introduced in Emacs 23.1.
+
+	* etc/symbol-releases.eld: Add 'make-directory'.
+
+2024-09-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove some XEmacs compat code from cperl-mode.el
+
+	The 'initialize-new-tags-table' function is unconditionally available
+	after 'etags' has been loaded, which is done further up.
+
+	* lisp/progmodes/cperl-mode.el (cperl-write-tags): Remove XEmacs compat
+	code.
+
+2024-09-15  Daniel Martín  <mardani29@yahoo.es>
+
+	;; Fix typo in Grep Edit mode manual description (bug#73274).
+
+2024-09-15  Mattias Engdegård  <mattiase@acm.org>
+
+	* lisp/simple.el (kill-region-dwim): Rectify choice label.
+
+2024-09-15  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	709ce2aff14 Port to Haiku R1/beta5
+	21efdd5ef31 Fix c++-ts-mode font-lock for latest c++ grammar (bug#73191)
+	ffc00eac53d ; Set Transient's version and add admin/MAINTAINERS entry
+	3822a5e5d12 * admin/update-copyright: Print reminder to do manual upd...
+	43b678d3d26 * admin/notes/years: Update.
+	38de992a5a3 * etc/TODO: New item "support indentation guides".
+
+	# Conflicts:
+	#	admin/notes/years
+	#	doc/misc/transient.texi
+	#	lisp/progmodes/c-ts-mode.el
+	#	lisp/transient.el
+
+2024-09-14  Philip Kaludercic  <philipk@posteo.net>
+
+	Allow 'kill-region' to kill the last word when there is no region
+
+	* etc/NEWS: Document the new user option.
+	* lisp/simple.el (kill-region-dwim): New option.
+	(kill-region): Respect 'kill-region-dwim'.  (Bug#69097)
+
+2024-09-14  David Fussner  <dfussner@googlemail.com>
+
+	Update the etags/ctags test files
+
+	* test/manual/etags/ETAGS.good_1:
+	* test/manual/etags/ETAGS.good_2:
+	* test/manual/etags/ETAGS.good_3:
+	* test/manual/etags/ETAGS.good_4:
+	* test/manual/etags/ETAGS.good_5:
+	* test/manual/etags/ETAGS.good_6:
+	* test/manual/etags/CTAGS.good: Update expected results from TeX
+	files.  (Bug#53749)
+
+2024-09-14  David Fussner  <dfussner@googlemail.com>
+
+	Provide a modified xref backend for TeX buffers
+
+	In addition to providing a new `xref' backend, the patch also improves
+	the general handling of expl3 syntax.  Expl3 is the next-generation
+	LaTeX specification, and has for some time been available by default in
+	the LaTeX kernel.  The new syntax co-exists in many files with the
+	standard LaTeX2e syntax, so we try at least minimally to separate the
+	way modes handle the two specifications, both to reduce
+	visually-disturbing interference between them and also to improve the
+	`xref' backend.  (Bug#53749)
+
+	* lib-src/etags.c (TeX_commands): Improve parsing of commands in TeX
+	buffers.
+	(TEX_defenv): Expand list of commands to tag by default in TeX buffers.
+	(TeX_help):
+	* doc/emacs/maintaining.texi (Tag Syntax): Document new tagged commands.
+	(Identifier Search): Add note about semantic-symref-filepattern-alist,
+	auto-mode-alist, and xref-find-references.
+
+	* lisp/textmodes/tex-mode.el (tex-font-lock-suscript): Test for
+	underscore in expl3 files and regions, disable subscript face there.
+	(tex-common-initialization): Set up xref backend for in-tree TeX modes.
+	Detect expl3 files, and in others set up a list of expl3 regions.
+	(tex-expl-buffer-parse): New function called in previous.
+	(tex-expl-buffer-p): New variable to hold the result of previous.
+	(tex-expl-region-set): New function added to
+	'syntax-propertize-extend-region-functions' hook.
+	(tex-expl-region-list): New variable to hold the result of previous.
+	(tex--xref-backend): New function to identify the xref backend.
+	(tex--thing-at-point, tex-thingatpt--beginning-of-symbol)
+	(tex-thingatpt--end-of-symbol, tex--bounds-of-symbol-at-point):
+	New functions to return 'thing-at-point' for xref backend.
+	(tex-thingatpt-exclude-chars): New variable to do the same.
+	(xref-backend-identifier-at-point): New TeX backend method to provide
+	symbols for processing by xref.
+	(xref-backend-identifier-completion-table)
+	(xref-backend-identifier-completion-ignore-case)
+	(xref-backend-definitions, xref-backend-apropos): Placeholders to
+	call the standard 'etags' xref backend methods.
+	(xref-backend-references): Wrapper to call the default xref backend
+	method, finding as many relevant files as possible and using a bespoke
+	syntax-propertize-function when required.
+	(tex--collect-file-extensions, tex-xref-syntax-function): Helper
+	functions for previous.
+	(tex-find-references-syntax-table, tex--buffers-list)
+	(tex--xref-syntax-fun, tex--old-syntax-function): New variables for
+	the same.
+
+2024-09-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix indentation of Fortran do-loops
+
+	* lisp/progmodes/fortran.el (fortran-calculate-indent): Fix regexp
+	for do-loops.  Reported by Ken Mankoff <km@kenmankoff.com>.
+	(Bug#73218)
+
+2024-09-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	d509a356997 Fix regression in widget-move (bug#72995)
+	ef0276de82b ; * lisp/cus-edit.el (setopt): Doc fix.  (Bug#73098)
+	b115c2d5eba ; * lisp/minibuffer.el (completion-pcm--merge-completions...
+	3cda1fdc3b7 Correctly include fixed strings before a prefix wildcard ...
+	57d93d0259a ; * lisp/treesit.el (treesit-major-mode-setup): Doc fix.
+	ad289f364e5 ; Improve documentation of 'easy-menu-define'
+	3cad7cc8dc8 Set treesit-primary-parser for c and elixir ts mode
+	2f243fb91d6 ; Minor doc fix in treesit.el
+	6a6d7925c9d Fix range handling so it works for multibyte buffer (bug#...
+	76faf7e6091 Revert "Read more on each call to treesit's buffer reader"
+	c70bd0e3fe9 Fix tree-sitter indent preset prev-adaptive-prefix
+	272df33fb8b ; * CONTRIBUTE: Minor copyedits.
+	8e1187e336f Improve NEWS entries
+	ca3932121a8 Don't fail uniquify-tests in non-version-controlled sourc...
+	79f68597aba ; * etc/ORG-NEWS: Fix typo.
+	d66b70f3607 * doc/misc/auth.texi: Minor copy edits.
+	2c6b7b2da9f ; * admin/MAINTAINERS: Remove some entries for Artur Mala...
+	11e7ae3964e Fix bug#72254
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-09-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	68530860ae9 ; * ChangeLog.4: Update.
+	fb1db366b98 ; * etc/AUTHORS: Update.
+
+2024-09-14  Sean Whitton  <spwhitton@spwhitton.name>
+
+	New commands unix-word-rubout, unix-filename-rubout
+
+	* lisp/simple.el (forward-unix-word): New function.
+	(unix-word-rubout, unix-filename-rubout): New commands.
+	* etc/NEWS: Announce the new commands.
+
+2024-09-14  Cecilio Pardo  <cpardo@imayhem.com>
+
+	Support GUI dialogs and message boxes better on MS-Windows
+
+	* src/w32menu.c (TASKDIALOG_COMMON_BUTTON_FLAGS, TASKDIALOG_FLAGS)
+	(PFTASKDIALOGCALLBACK, TASKDIALOG_BUTTON, TASKDIALOGCONFIG)
+	(TDN_CREATED, TDM_ENABLE_BUTTON, TDF_ALLOW_DIALOG_CANCELLATION)
+	(TD_INFORMATION_ICON) [!MINGW_W64]: Define.
+	(TaskDialogIndirect_Proc): Declare function type.
+	(TASK_DIALOG_MAX_BUTTONS): New macro.
+	(task_dialog_callback): New callback function.
+	(w32_popup_dialog): Add dialog implementation using TaskDialog.
+	(globals_of_w32menu): Load TaskDialogIndirect from comctl32.dll.
+	(Bug#20481)
+
+2024-09-14  Visuwesh  <visuweshm@gmail.com>
+
+	Make the *grep* buffer editable
+
+	* lisp/progmodes/compile.el (compilation--update-markers):
+	Factor out function...
+	(compilation-next-error-function): ...from here.  Adjust
+	to use the above.
+	* lisp/progmodes/grep.el (grep-edit--prepare-buffer)
+	(grep-edit-mode-map, grep-edit-mode-hook, grep-edit-mode)
+	(grep-change-to-grep-edit-mode, grep-edit-save-changes): Add
+	new 'grep-edit-mode' to make the grep results editable like
+	in 'occur-edit-mode' by using the 'occur' framework.
+	(grep-mode-map): Bind 'e' to the new command
+	'grep-change-to-grep-edit-mode'.
+	* doc/emacs/building.texi (Grep Searching): Update Info
+	manual to include the above command.
+	* etc/NEWS: Announce the change.  (Bug#70820)
+
+2024-09-14  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Update completion-styles defcustom for variable overrides
+
+	In 69ec333eab0b801949d33ef5ae505addc9061793 I allowed
+	completion-styles to contain a list of bindings.  Now the
+	'defcustom' type also supports this.
+	Since the type is somewhat unusual (a value in the list can be
+	either a symbol or a list) I had to add a new widget to support
+	it.
+	* lisp/minibuffer.el (completion--styles-type): Update to allow
+	setting variable overrides.
+	(completion-styles, completion-category-overrides)
+	(completion-pcm-leading-wildcard): Update :version.
+
+	* lisp/wid-edit.el (widget-single-or-list-to-internal)
+	(single-or-list): Add.
+
+2024-09-14  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/net/tramp.el (tramp-wait-for-regexp): Deactivate (sit-for 0.005).
+
+2024-09-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	* etc/symbol-releases.eld: Fix URL.
+
+2024-09-13  Robert Pluim  <rpluim@gmail.com>
+
+	Use stable URLs for files imported from Unicode
+
+	* admin/notes/unicode: Point people at "admin/unidata/README" for URLs
+	for Unicode files.
+	* admin/unidata/README: Use stable URLs for the various files.  Remove
+	dates, the files self-describe their dates anyway.
+
+2024-09-13  Robert Pluim  <rpluim@gmail.com>
+
+	Add notes about documenting default values
+
+	* CONTRIBUTE: Ask people to document default values when adding new user
+	  options.
+
+2024-09-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve accuracy of character categories
+
+	* lisp/international/characters.el: Assign 'digit' category to all
+	the characters whose Unicode 'general-category' is Nd.
+
+	* admin/unidata/blocks.awk: Add code to assign 'symbol' category
+	to all characters belonging to the 'symbol' script.
+
+	* etc/NEWS: Announce the above changes
+
+2024-09-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Update Emacs sources for Unicode 16.0
+
+	* lisp/international/ucs-normalize.el (check-range): Update ranges
+	of character codes with decompositions.
+	* lisp/international/mule-cmds.el (ucs-names): Update unused
+	ranges.
+	* lisp/international/fontset.el (script-representative-chars)
+	(otf-script-alist, setup-default-fontset): Add new scripts.
+	* lisp/international/characters.el:
+	* admin/unidata/blocks.awk:
+	* test/manual/BidiCharacterTest.txt:
+	* test/lisp/international/ucs-normalize-tests.el
+	(ucs-normalize-tests--failing-lines-part2): Update for Unicode
+	16.0.
+
+	* etc/NEWS: Announce support for Unicode 16.0.
+
+2024-09-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Import updated Unicode files from Unicode 16.0
+
+	* admin/unidata/BidiBrackets.txt:
+	* admin/unidata/BidiMirroring.txt:
+	* admin/unidata/Blocks.txt:
+	* admin/unidata/IdnaMappingTable.txt:
+	* admin/unidata/NormalizationTest.txt:
+	* admin/unidata/PropertyValueAliases.txt:
+	* admin/unidata/ScriptExtensions.txt:
+	* admin/unidata/Scripts.txt:
+	* admin/unidata/SpecialCasing.txt:
+	* admin/unidata/UnicodeData.txt:
+	* admin/unidata/copyright.html:
+	* admin/unidata/emoji-data.txt:
+	* admin/unidata/emoji-sequences.txt:
+	* admin/unidata/emoji-test.txt:
+	* admin/unidata/emoji-variation-sequences.txt:
+	* admin/unidata/emoji-zwj-sequences.txt: Update from Unicode 16.0
+
+2024-09-12  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Human readable last display time of killed buffer
+
+	* lisp/midnight.el (clean-buffer-list): Upon killing a buffer,
+	add a human readable last displayed information.  (Bug#73150)
+
+2024-09-12  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Simple typo in `clean-buffer-list'
+
+	* lisp/midnight.el (clean-buffer-list): `delay' is always an
+	integer here.  (Bug#73144)
+
+2024-09-12  Yuan Fu  <casouri@gmail.com>
+
+	Add Ftreesit_grammar_location
+
+	* src/treesit.c (treesit_loaded_lang): New struct.
+	(treesit_load_language): Return a struct instead of just the language
+	object.  The struct contains both the language object and the path to
+	the shared library.
+	(Ftreesit_language_available_p, Ftreesit_language_abi_version)
+	(treesit_ensure_query_compiled, Ftreesit_parser_create): Update
+	call of treesit_load_language.
+	(Ftreesit_grammar_location): New function.
+
+2024-09-11  Michael Albinus  <michael.albinus@gmx.de>
+
+	Allow to disable symbolic links check in Dired
+
+	* doc/emacs/dired.texi (Misc Dired Features):
+	* doc/misc/tramp.texi (Frequently Asked Questions):
+	Explain dired-check-symlinks.
+
+	* etc/NEWS: Describe dired-check-symlinks.
+	Fix typos.
+
+	* lisp/dired.el (dired-check-symlinks): New defcustom.
+	(dired-font-lock-keywords): Use it.  (Bug#73046)
+
+2024-09-11  Paul Nelson  <ultrono@gmail.com>
+
+	Add Ediff feature for copying all differences
+
+	* lisp/vc/ediff-util.el (ediff-diff-to-diff): With universal
+	prefix, copy all differences.
+
+	* doc/misc/ediff.texi (Quick Help Commands): Document the new feature.
+	* etc/NEWS: Announce the new feature.
+
+	(Bug#72866)
+
+2024-09-11  Martin Rudalics  <rudalics@gmx.at>
+
+	For minibuffer windows record minibuffers only (Bug#72487)
+
+	* src/minibuf.c (zip_minibuffer_stacks): Use wset type
+	functions.  Call 'record-window-buffer' instead of
+	'push-window-buffer-onto-prev' to handle all sorts of buffers
+	shown in minibuffer windows in a uniform way.
+	(read_minibuf): Call 'record-window-buffer' instead of
+	'push-window-buffer-onto-prev' for same reason as previous.
+	* lisp/calculator.el (calculator-update-display)
+	(calculator-save-and-quit): Make sure calculator buffer is live
+	before operating on it.
+	* lisp/window.el (record-window-buffer): Handle case where
+	WINDOW is a minibuffer window: Unconditionally remove WINDOW's
+	buffer from WINDOW's list of previous buffers and push it if
+	and only if it is a live minibuffer (Bug#72487).  Do not run
+	'buffer-list-update-hook' if WINDOW is a minibuffer window.
+	(push-window-buffer-onto-prev): Make it an alias of
+	'record-window-buffer' so it will run the latter's checks.
+	(replace-buffer-in-windows): Handle minibuffer windows and
+	rewrite doc-string accordingly.
+	* doc/lispref/windows.texi (Buffers and Windows): Explain
+	handling of minibuffer windows in 'replace-buffer-in-windows'.
+
+2024-09-11  fpi  <git@pie.tf>
+
+	Allow comments to organizer in icalendar event replies (Bug#72831)
+
+	* lisp/gnus/gnus-icalendar.el
+	(gnus-icalendar-event--build-reply-event-body): Add optional COMMENT
+	argument to be inserted into the reply.
+	(gnus-icalendar-event-reply-from-buffer): Add COMMENT argument to be
+	passed through to gnus-icalendar-event--build-reply-event-body
+	(gnus-icalendar-reply-accept, gnus-icalendar-reply-tentative,
+	gnus-icalendar-reply-decline): If interactively called with a prefix
+	argument ask user for a COMMENT to add to the reply.
+
+	* test/lisp/gnus/gnus-icalendar-tests.el
+	(gnus-icalendar-accept-with-comment,
+	gnus-icalendar-decline-without-changing-comment): New tests.
+
+2024-09-11  Po Lu  <luangruo@yahoo.com>
+
+	* src/treesit.h (struct Lisp_TS_Parser): Correct merge error.
+
+2024-09-11  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	ee3e3a63111 ; Update version number of exec/configure.ac
+	c5925b6ba5f Fix heex-ts-mode indentation following previews elixir-mo...
+	c3383be5f04 ; * admin/make-tarball.txt: Improve last change.
+	8ddb54117f1 ; * admin/make-tarball.txt: Remove now unnecessary config...
+	7e194d33f90 * lisp/ldefs-boot.el: Update.
+	9019536ea66 Fix use of Uniscribe font driver in MinGW build
+	5c55c860db7 Avoid crashes in redisplay in batch-mode testing
+	ba2190e1ae7 ; * etc/NEWS: Fix indentation.
+	818c0cc9a51 eglot-test-rust-completion-exit-function: Fix failure in ...
+	f47297782bd ; * doc/lispref/searching.texi (Rx Notation): Simplify rx...
+	03e56981675 Clarify the semantics of 'string-pixel-width'
+	9f0603207b1 ; * src/treesit.c: Minor cleanups of recent changes.
+	e0d3f743957 * src/treesit.c (treesit_debug_print_parser_list): Fix fo...
+	bed38ded730 ; * src/treesit.c (treesit_debug_print_parser_list): Fix ...
+	18c6487dbd0 ; * src/treesit.c: Add a prototype so there's no warning ...
+	bf23382f1f2 Read more on each call to treesit's buffer reader
+	3435464452b Fix the range handling in treesit.c
+	3fcec09f754 Add debugging function for treesit.c
+	0fd259d166c Fix elixir-ts-mode's range query
+	2329b36b1fb ; project-files-relative-names: Update docstring (bug#72701)
+	e55e2e1c6ba Make json-serialize always return a unibyte string (bug#7...
+	89c99891b2b ; * doc/lispref/os.texi (Suspending Emacs): Fix last change.
+	4f044d0d3df ; Improve documentation of 'suspend-emacs'
+
+2024-09-10  Michael Albinus  <michael.albinus@gmx.de>
+
+	Avoid 100% CPU load in Tramp
+
+	* lisp/net/tramp.el (tramp-wait-for-regexp): Add (sit-for 0.005)
+	prior calling `tramp-accept-process-output'.  This avoids 100% CPU
+	load.  (Bug#73046)
+
+2024-09-09  Juri Linkov  <juri@linkov.net>
+
+	* src/xdisp.c (note_tab_bar_highlight): Remove fallback for help_echo_string.
+
+	Don't use TAB_BAR_ITEM_CAPTION as the default value
+	when TAB_BAR_ITEM_HELP is not specified (bug#73050).
+
+2024-09-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	Silence compiler error
+
+	* lisp/net/tramp.el (tramp-file-name*): Embed `function-put' calls
+	with `tramp--with-startup'.
+	(tramp-active-command-completion-p)
+	* lisp/net/tramp-cache.el (tramp-get-hash-table): Remove declare
+	form.  Add `tramp-suppress-trace' function property.
+
+2024-09-09  Mattias Engdegård  <mattiase@acm.org>
+
+	* etc/emacs_lldb.py (Lisp_Object): Recognise Lisp_Sub_Char_Table
+
+2024-09-09  Mattias Engdegård  <mattiase@acm.org>
+
+	Speed up LLDB support for debugging Emacs
+
+	* etc/emacs_lldb.py (Lisp_Object):
+	Perform some numeric operations in Python instead of invoking LLDB
+	for evaluation.  Add lots of caches.
+
+2024-09-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix :type of some user options
+
+	* lisp/which-key.el:
+	* lisp/progmodes/python.el:
+	* lisp/play/animate.el:
+	* lisp/pixel-scroll.el:
+	* lisp/image/image-dired.el:
+	* lisp/htmlfontify.el: Change :type of user options from 'float'
+	to 'number' where integer values make sense.  (Bug#73098)
+
+2024-09-08  Vincenzo Pupillo  <v.pupillo@gmail.com>
+
+	Support for custom php.ini for the built-in PHP web server.
+
+	A new CONFIG attribute, which defaults to 'php-ts-mode-php-config',
+	allows an alternative php.ini file to be specified for the built-in web
+	server.  The 'php-ts-mode-run-php-webserver' function, when called
+	interactively with a prefix argument, also requires this new attribute.
+	* lisp/progmodes/php-ts-mode.el (php-ts-mode--parent-html-bol):
+	Fix docstring.
+	* lisp/progmodes/php-ts-mode.el (php-ts-mode-run-php-webserver):
+	New CONFIG attribute.  Update docstring.
+	* lisp/progmodes/php-ts-mode.el (php-ts-mode--webserver-read-args):
+	Support the new TYPE.  Update docstring.  (Bug#72966)
+
+2024-09-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve diagnostic of type mismatch in 'setopt'
+
+	* lisp/cus-edit.el (setopt--set): Name the variable in the warning
+	message.  (Bug#73084)
+
+	* test/lisp/cus-edit-tests.el (test-setopt): Adjust test.
+
+2024-09-08  James Thomas  <jimjoe@gmx.net>
+
+	Keep local keymap out of vc-git-stash-get-at-point
+
+	* lisp/vc/vc-git.el (vc-git-stash-get-at-point):
+	Return the substring without text properties (bug#72768).
+
+2024-09-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	b420e149b1e Fix a typo in ediff-init.el
+	e1304e9b1bb Fix 'chart-space-usage' on MS-Windows
+	04c44405bf6 Fix alignment and documentation of vtable.el
+	4d6fadb8d21 ; * lisp/which-key.el: Fix ':package-version' (bug#73072).
+	54071b9cef2 ; Improve doc strings of 'tab-bar-mode' and 'tab-line-mode'
+	87a8b12a0c4 Fix test failure in erc-networks-tests
+	dad0935cfcb ; * doc/emacs/building.texi (Lisp Libraries): Update (bug...
+	e4dc6711b02 Fix :hook in 'use-package'
+	c1cd036d27a ; * doc/lispref/modes.texi (Mode Line Data): Fox wording.
+	ae2463796f2 ; Caveats about using :eval in 'mode-line-format'
+	4047072c7d8 Update FSF's address
+	24f12bdd77e Support the new option in ruby-ts-mode too
+	6c15b7710d4 Add new option ruby-bracketed-args-indent
+	7799ef43354 Fix Rmail base64 and qp decoding of MIME payloads
+	0def396fa8f Update to Org 9.7.11
+	8c044bd9726 ; Fix recent changes in documentation
+	e0d8879bcd5 * test/lisp/emacs-lisp/tabulated-list-tests.el: Add missi...
+	4ff4b78f922 ; Small doc fixes
+	da980ad838e ; Reword some "allows Xing"
+	2ca7d5649c6 ; More accurate text about how `equal` compares various o...
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-09-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Remove low-level keyboard hook when attaching GDB to Emacs on Windows
+
+	This fixes the problem whereby attaching GDB to a running Emacs
+	on MS-Windows would slow down keyboard input, because the
+	low-level keyboard hook installed by Emacs at startup was still
+	installed, but with Emacs stopped, the hook code couldn't run,
+	and therefore the OS would time-out waiting for the hook to
+	return.  Now when GDB is attached to Emacs, it will remove the
+	hook right away.
+	* src/.gdbinit: Call 'remove_w32_kbdhook' if the keyboard hook is
+	already installed.
+	* src/alloc.c (defined_WINDOWSNT): New enum.
+	(gdb_make_enums_visible): Add 'defined_WINDOWSNT'.
+
+2024-09-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix multisession.el when SQLite becomes unavailable
+
+	This is for the case when the user customizes multisession
+	to use SQLite, but then built-in SQLite support becomes
+	unavailable for some reason (e.g., upgrade the OS).
+	* lisp/emacs-lisp/multisession.el (multisession-backend-value)
+	(multisession--backend-set-value, multisession--backend-values)
+	(multisession--backend-delete): Call next method if built-in
+	SQLite support is not available.  Suggested by Stefan Monnier
+	<monnier@iro.umontreal.ca>.  (Bug#72788)
+
+2024-09-07  F. Jason Park  <jp@neverwas.me>
+
+	Fix discrepancies in auth-source-pass vs netrc behavior
+
+	The option `auth-source-pass-extra-query-keywords' aims to make its
+	back end hew as close to the other built-in ones as possible, except
+	WRT features not yet implemented, such as arbitrary "attribute"
+	retrieval and new entry creation.  This change only concerns behavior
+	exhibited when the option is enabled.
+
+	* lisp/auth-source-pass.el (auth-source-pass--match-parts): Account
+	for the case in which a query lacks a reference parameter for a
+	`:port' or `:user' but still requires one or both via the `:require'
+	keyword.  Previously, such a query would fail even when an entry met
+	this requirement by simply specifying a field with any non-null value
+	corresponding to the required parameter.
+	(auth-source-pass--find-match-many): Account for the baseline case
+	where a matching entry lacks a secret and the user doesn't require
+	one.  Although this function doesn't currently return so-called
+	"attributes" from the contents of a matching decrypted file, were it
+	to eventually, this case would no longer be academic.
+	* test/lisp/auth-source-pass-tests.el
+	(auth-source-pass-extra-query-keywords--req-noparam-miss-netrc)
+	(auth-source-pass-extra-query-keywords--req-noparam-miss)
+	(auth-source-pass-extra-query-keywords--req-param-netrc)
+	(auth-source-pass-extra-query-keywords--req-param): New tests.
+	(auth-source-pass-extra-query-keywords--netrc-baseline): New test
+	asserting behavior of netrc backend when passed a lone `:host' as a
+	query parameter.
+	(auth-source-pass-extra-query-keywords--baseline): Reverse expected
+	outcome to match that of the netrc reference implementation.
+	(bug#72441)
+
+2024-09-06  Spencer Baugh  <sbaugh@janestreet.com>
+
+	* etc/NEWS: Mention it.
+
+	Add project-find-file-in-root (bug#73044)
+
+	Several users have asked me for a command which is just
+	find-file, but starting from the project root.  In large
+	projects, where project-files is expensive, this will have
+	substantially better performance than project-find-file.
+
+	Also, it allows opening files which aren't included in
+	project-files without paying the further cost of running
+	project--files-in-directory (which is what happens when passing
+	INCLUDE-ALL=t to project-find-file).
+
+	Also, it may help with user confusion about why
+	project-find-file doesn't behave like find-file (which I've
+	encountered a few times).
+
+	This command is equivalent to C-x p o C-x C-f, but it's nice to
+	be able to bind it to a specific key.
+
+	Overall, this is easy enough to provide, so let's just do that.
+
+	* lisp/progmodes/project.el (project-find-file-in-root): Add.
+
+	* etc/NEWS: Mention it.
+
+2024-09-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Rework fix of MinGW build due to Gnulib update
+
+	This commit finishes the rework started by reverting changes
+	to lib/sig2str.h, by adding Emacs-private additions to
+	signal.h.
+	* nt/inc/signal.h: New file, defines SIG2STR_MAX and
+	prototypes of 'sig2str' and 'str2sig'.
+
+2024-09-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "Fix MinGW build broken by recent update from Gnulib"
+
+	This reverts commit b737c6125d69497ad5d2a29d4b5a2b17698992e5.
+	It is no longer needed with the introduction of nt/inc/signal.h.
+
+2024-09-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "; Fix last change in lib/sig2str.h."
+
+	This reverts commit 91e7b47d6c56e7963be232de8057e1a3f710f1b5.
+	It is no longer needed with the introduction of nt/inc/signal.h.
+
+2024-09-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "; Another fix for str2sig.h"
+
+	This reverts commit df57e44a08fd5c7dc159254a40f5d2e4d008e8df.
+	It is no longer needed with introduction of nt/inc/signal.h.
+
+2024-09-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix MinGW build broken by recent update from Gnulib
+
+	Gnulib moved the prototypes of 'sig2str' and 'str2sig' from
+	sig2str.h to signal.h, but MinGW does not use the Gnulib
+	signal.h header, and doesn't have these functions in its
+	own signal.h.
+	* lib/sig2str.h (SIG2STR_MAX, sig2str, str2sig): Define and
+	prototype if not already defined.
+
+2024-09-05  Po Lu  <luangruo@yahoo.com>
+
+	Better port to Android 35
+
+	* java/INSTALL: Don't refer users to build-tools 33.0.x.
+
+	* java/res/values-v35/style.xml: New dark theme; define status
+	bar colors properly for this release.
+
+2024-09-04  Eshel Yaron  <me@eshelyaron.com>
+
+	New variable 'completion-preview-overlay-priority'
+
+	* lisp/completion-preview.el: Update commentary.
+	(completion-preview-overlay-priority): New variable.
+	(completion-preview--make-overlay): Use it.  (Bug#72762)
+
+2024-09-04  Po Lu  <luangruo@yahoo.com>
+
+	Port to Android 35
+
+	* configure.ac: Temporary workaround for Gnulib bug.  Verify
+	that the provided android.jar corresponds to Android 35, or any
+	later version.
+
+	* cross/ndk-build/Makefile.in (NDK_BUILD_SO_LDFLAGS): New
+	variable.
+
+	* cross/ndk-build/ndk-resolve.mk
+	(NDK_LOCAL_A_NAMES_$(LOCAL_MODULE)): Define to
+	NDK_BUILD_SO_LDFLAGS by default to enable building binaries
+	with support for 16 kb page sizes.
+
+	* java/AndroidManifest.xml.in: Target SDK 35.
+
+	* java/INSTALL (16KB PAGE SIZES): New section.  Replace
+	references to Android 34 with 35.
+
+	* java/org/gnu/emacs/EmacsActivity.java (onCreate): Restore
+	pre-SDK 35 inset-relative placement.
+
+	* java/org/gnu/emacs/EmacsFillPolygon.java (perform): Suppress
+	deprecation warnings, and document why.
+
+	* m4/ndk-build.m4 (ndk_INIT, ndk_LATE): Check for and enable
+	toolchain support for 16 KB page sizes, if available.
+	(ndk_CONFIG_FILES): Export linker options so derived.
+
+	* src/conf_post.h [__ANDROID_API__ < 35]: Include system time.h
+	and redefine timezone_t to rpl_timezone_t, so that the Gnulib
+	replacement may not conflict with the useless OS type.
+
+2024-09-01  Juri Linkov  <juri@linkov.net>
+
+	* lisp/progmodes/js.el: Improve sexp navigation in js-ts-mode (bug#72573)
+
+	(js--treesit-sexp-nodes): Add "template_string", "template_substitution",
+	"property_identifier".
+	(js-ts-mode): Replace "template_string" with "string_fragment"
+	in 'text' part of 'treesit-thing-settings'.
+
+2024-09-01  Pip Cet  <pipcet@protonmail.com>
+
+	Explicitly include stdlib.h in src/image.c (Bug#72929)
+
+	* src/image.c: Add include.
+
+2024-09-01  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete cc-compat.el from Makefile.in
+
+	* lisp/Makefile.in: Delete obsolete file cc-compat.el.  It has been
+	moved to obsolete/ and is compiled separately.
+
+2024-09-01  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix integer overflow when reading XPM
+
+	* src/image.c (xpm_str_to_int): New function.
+	(xpm_load_image): Replace sscanf with strtol, to correctly handle
+	integer overflow when reading a malformed XPM file.  (Bug#72245)
+
+2024-09-01  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix broken use-package tests
+
+	* lisp/use-package/use-package-core.el (use-package-keywords): Change
+	keyword order to match the one before adding :pin, :ensure, :delight,
+	and :diminish directly to this list.  This fixes some broken unit tests.
+
+2024-08-31  Mattias Engdegård  <mattiase@acm.org>
+
+	Better ad-hoc Emacs release of symbol introduction override
+
+	The file etc/symbol-releases.eld now contains explicit version
+	information for selected symbols that our NEWS* scraper doesn't
+	resolve correctly.
+
+	* etc/NEWS.unknown: Remove this file, replaced with...
+	* etc/symbol-releases.eld: ...this new file.
+	* lisp/help-fns.el (help-fns--first-release-override)
+	(help-fns--mention-first-function-release)
+	(help-fns--mention-first-variable-release): New.
+	(help-fns--mention-first-release): Try the override information first
+	before scraping the NEWS* files.
+
+2024-08-31  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	5fd75133cfe Make 'python-shell--with-environment' respect buffer-loca...
+	e27849ecf6e Avoid ANSI escape characters in Python output (bug#45938)
+	4f521fa14c1 Fix handling of hook variables in 'use-package'
+	bb5576fc907 Work around Gnuplot bug in displaying plots
+
+2024-08-31  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	4b60267d832 Make Python skeletons available in 'python-ts-mode' as well
+	62dcbfb776f Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
+	1baa62b2ac1 ; * etc/NEWS: Fix typos.
+	dfcfaa0ef58 More accurate documentation of 'equal' in ELisp Reference
+	baaf97ce1a1 ; Fix some ungrammatical uses of "allows to"
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-08-31  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	a0f740c88d8 ; * lisp/progmodes/flymake.el: Fix "Maintainer" header
+	a9433858131 ; * etc/AUTHORS: Update.
+	762b85be27b ; Revert "; * admin/authors.el (authors-valid-file-names)...
+	e24d568b565 ; Revert "Revert "; * admin/authors.el (authors-ignored-f...
+	2d723a280b3 Revert "; * admin/authors.el (authors-ignored-files): Add...
+	2a5b129509f Revert "; * admin/authors.el (authors-ignored-files): Ign...
+	0db53f14a29 ; * admin/authors.el (authors-ignored-files): Ignore Unic...
+	6734b60c0c3 ; * admin/authors.el (authors-valid-file-names): Ignore U...
+	d809d53afc0 ; * admin/authors.el (authors-ignored-files): Add removed...
+	766f69bab12 ; * etc/NEWS: Announce VC-dir "Tracking" header. (bug#68183)
+	37a097d8663 ; * admin/authors.el (authors-aliases): Fix regexps.
+	0fb50e26316 ; * admin/MAINTAINERS: Spencer Baugh maintains flymake.el.
+	d05d8c336c8 xwidget: Fix xwidget-at misinterpreting non-xwidget text-...
+	13f69f254cf Fix rare segfaults due to freed fontsets
+	427fb319dab ; * lisp/simple.el (use-region-beginning, use-region-end)...
+
+	# Conflicts:
+	#	admin/MAINTAINERS
+	#	etc/NEWS
+
+2024-08-31  xenodium  <me+gh@xenodium.com>  (tiny change)
+
+	Adds NSSpeechRecognitionUsageDescription to Info.plist.in
+
+	Without this, we cannot launch processes that use macOS's
+	speech recognition APIs.
+	With NSSpeechRecognitionUsageDescription in place, macOS displays the
+	dialog asking the user to grant permission and allows the speech APIs
+	to be used from the process.
+	* nextstep/templates/Info.plist.in: Add
+	NSSpeechRecognitionUsageDescription key.  (Bug#72827)
+
+	* etc/NEWS: Announce the change.
+
+2024-08-31  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve 'C-h o' in NEWS files
+
+	* lisp/textmodes/emacs-news-mode.el (emacs-news--mode-common):
+	Modify syntax-table of NEWS modes to consider ' as string-quoting
+	character.  Suggested by Visuwesh <visuweshm@gmail.com>.
+	(Bug#72757)
+
+2024-08-31  David Ponce  <da_vid@orange.fr>
+
+	Use 'with-work-macro' in 'string-pixel-width'
+
+	Tweak the implementation of 'string-pixel-width' to run
+	faster and use less memory.  Also cater for the case where
+	this function is called in parallel (bug#72689).
+	* lisp/emacs-lisp/subr-x.el (string-pixel-width): Use
+	`with-work-macro'.  Prefer `remove-text-properties' to
+	`propertize' to avoid creating a new string on each call.
+
+2024-08-31  David Ponce  <da_vid@orange.fr>
+
+	New macro `with-work-buffer'.
+
+	* lisp/emacs-lisp/subr-x.el (work-buffer--list)
+	(work-buffer-limit): New variables.
+	(work-buffer--get, work-buffer--release): New function.
+	(with-work-buffer): New macro.  (Bug#72689)
+
+	* etc/NEWS: Announce 'with-work-buffer'.
+
+2024-08-30  Jim Porter  <jporterbugs@gmail.com>
+
+	Add manual tests for the 'min-width' display property
+
+	* test/manual/redisplay-testsuite.el (test-redisplay-5): Add some
+	newlines.
+	(test-redisplay-6): New function...
+	(test-redisplay): ... call it (bug#72721).
+
+2024-08-29  Eli Zaretskii  <eliz@gnu.org>
+
+	Document 'cond*'
+
+	* doc/lispref/control.texi (cond* Macro): New subsection.
+	Text written by Richard Stallman <rms@gnu.org>.
+	* etc/NEWS: Document 'cond*'.
+
+2024-08-29  Jim Porter  <jporterbugs@gmail.com>
+
+	Support "/dev/null" as a target when creating Eshell handles
+
+	Previously, you could only use this when setting the handle afterwards.
+
+	* lisp/eshell/esh-io.el (eshell-set-output-handle): Don't catch
+	'eshell-null-device' here...
+	(eshell-get-target): ... catch it here.
+
+	* test/lisp/eshell/eshell-tests.el
+	(eshell-test/eshell-command/output-dev-null): New test (bug#72857).
+
+2024-08-29  Jim Porter  <jporterbugs@gmail.com>
+
+	Fix redirecting Eshell output to symbols in some places
+
+	* lisp/eshell/esh-io.el (eshell-output-object-to-target): Don't require
+	TARGET to be bound.
+
+	* lisp/eshell/em-script.el (eshell-execute-file):
+	* lisp/eshell/eshell.el (eshell-command): Quote the output/error
+	targets.
+
+	* test/lisp/eshell/em-script-tests.el (eshell-execute-file-output): New
+	variable.
+	(em-script-test/execute-file/output-symbol): New test.
+
+	* test/lisp/eshell/eshell-tests.el (eshell-command-output): New
+	variable.
+	(eshell-test/eshell-command/output-symbol): New test (bug#72857).
+
+2024-08-29  Jim Porter  <jporterbugs@gmail.com>
+
+	Use 'eshell-with-handles' in a few more places
+
+	* lisp/eshell/em-alias.el (eshell-write-aliases-list):
+	* lisp/eshell/em-script.el (eshell-batch-file):
+	* lisp/eshell/esh-cmd.el (eshell-command-to-value):
+	* lisp/eshell/eshell.el (eshell-command): Use 'eshell-with-handles'.
+
+	* test/lisp/eshell/esh-io-tests.el (eshell-test-file-string): Move to...
+	* test/lisp/eshell/eshell-tests-helpers.el (eshell-test-file-string):
+	... here.
+
+	* test/lisp/eshell/eshell-tests.el
+	(eshell-test/eshell-command/output-file):
+	* test/lisp/eshell/em-script-tests.el
+	(em-script-test/execute-file/output-file): New tests.
+
+2024-08-29  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	e6c72aec9d7 ; Fix typos
+	9ffa38d3925 Eglot: fix completion highlighting (bug#72824)
+	d6880bc24dd ; * admin/make-tarball.txt: Document gotcha.
+	afee71273b7 Discuss commit log messages on feature branches
+	77302ccb6aa * admin/authors.el (authors-fixed-entries): Update docstr...
+	3a4839d1427 More consistent treesit-forward-sexp around comments (bug...
+	31293155879 Improve php-ts-mode font lock and support latest grammar ...
+	b8c05d73a11 Fix tree-sitter local parser overlay cleanup routine
+	aa6ed7f67ec Fix copyright years by hand (Bug#72809)
+
+2024-08-28  Jim Porter  <jporterbugs@gmail.com>
+
+	Use 'eshell-with-handles' when executing an Eshell file
+
+	This makes sure we close the handles as we should, which is important
+	for writing the output to an actual file (bug#72857).
+
+	* lisp/eshell/em-script.el (esh-cmd): Require this, just to be explicit.
+	(eshell-execute-file): Use 'eshell-with-handles'.
+
+2024-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(message-hide-headers): Don't bind `inhibit-modification-hooks`
+
+	This binding dates back at least to 2004 (where we bound
+	`after-change-functions` instead).  Maybe it had a real impact in the past,
+	but nowadays I can't see any effect other than maybe a negligible
+	performance improvement at the cost at breaking some uses of
+	`before-after-change-functions`.
+
+	* lisp/gnus/message.el (message-hide-headers):
+	Don't bind `inhibit-modification-hooks`.
+
+2024-08-28  Mattias Engdegård  <mattiase@acm.org>
+
+	Send useless output in flymake-tests to /dev/null (bug#70716)
+
+	* test/lisp/progmodes/flymake-resources/Makefile (check-syntax):
+	Avoid producing a useless file named `-.o` in the source tree.
+
+2024-08-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	Hide tramp-mode
+
+	* doc/misc/tramp.texi (Frequently Asked Questions): Remove tramp-mode.
+
+	* lisp/net/tramp.el (tramp-mode): Make it a defvar.  People shouldn't
+	customize it manually.
+
+2024-08-26  Michael Albinus  <michael.albinus@gmx.de>
+
+	Add convenience to Tramp
+
+	* doc/misc/tramp.texi (Inline methods): Add tramp-docker-program,
+	tramp-podman-program, tramp-kubernetes-program,
+	tramp-toolbox-program, tramp-distrobox-program,
+	tramp-flatpak-program, tramp-apptainer-program, and
+	tramp-nspawn-program.
+	(Remote shell setup): Rearrange indices.
+	(Ssh setup): Say "user option" when needed.
+	(Keeping files encrypted): Add tramp-crypt-encfs-program.
+	(Frequently Asked Questions): Rearrange indices.  Remove duplicate
+	text.  Add tramp-mode.
+
+	* lisp/net/tramp.el (tramp-active-command-completion-p): New defun.
+
+	* lisp/net/tramp-cmds.el (tramp-cleanup-connection)
+	(tramp-cleanup-all-connections, tramp-cleanup-some-buffers)
+	(tramp-cleanup-all-buffers, tramp-rename-files):
+	* lisp/net/tramp-message.el (tramp-setup-debug-buffer):
+	Declare `completion'.
+
+	* lisp/net/tramp-integration.el (tramp-info-link): New widget.
+	(tramp-widget-info-link-action): New defun.
+
+	* lisp/net/tramp.el (tramp, tramp-mode, tramp-backup-directory-alist)
+	(tramp-auto-save-directory, tramp-encoding-shell)
+	(tramp-encoding-command-switch)
+	(tramp-encoding-command-interactive, tramp-default-method)
+	(tramp-default-method-alist, tramp-default-user)
+	(tramp-default-user-alist, tramp-default-host)
+	(tramp-default-host-alist, tramp-default-proxies-alist)
+	(tramp-save-ad-hoc-proxies, tramp-show-ad-hoc-proxies)
+	(tramp-restricted-shell-hosts-alist, tramp-local-host-regexp)
+	(tramp-shell-prompt-pattern, tramp-password-prompt-regexp)
+	(tramp-otp-password-prompt-regexp, tramp-wrong-passwd-regexp)
+	(tramp-terminal-type, tramp-syntax)
+	(tramp-ignored-file-name-regexp, tramp-chunksize)
+	(tramp-process-connection-type, tramp-remote-path)
+	(tramp-remote-process-environment)
+	(tramp-completion-multi-hop-methods)
+	(tramp-completion-use-auth-sources, tramp-use-file-attributes)
+	(tramp-inhibit-errors-if-setting-file-attributes-fail)
+	(tramp-allow-unsafe-temporary-files):
+	* lisp/net/tramp-adb.el (tramp-adb-program)
+	(tramp-adb-connect-if-not-connected):
+	* lisp/net/tramp-cache.el (tramp-connection-properties)
+	(tramp-persistency-file-name, tramp-completion-use-cache):
+	* lisp/net/tramp-cmds.el (tramp-cleanup-some-buffers-hook)
+	(tramp-default-rename-alist, tramp-confirm-rename-file-names)
+	(tramp-file-name-with-method):
+	* lisp/net/tramp-container.el (tramp-docker-program)
+	(tramp-podman-program, tramp-kubernetes-program)
+	(tramp-kubernetes-context, tramp-kubernetes-namespace)
+	(tramp-toolbox-program, tramp-distrobox-program)
+	(tramp-flatpak-program, tramp-apptainer-program)
+	(tramp-nspawn-program):
+	* lisp/net/tramp-crypt.el (tramp-crypt-encfs-program)
+	(tramp-crypt-encfsctl-program, tramp-crypt-encfs-option)
+	(tramp-crypt-save-encfs-config-remote):
+	* lisp/net/tramp-fuse.el (tramp-fuse-unmount-on-cleanup):
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-methods):
+	* lisp/net/tramp-message.el (tramp-verbose, tramp-debug-to-file)
+	(tramp-debug-command-messages):
+	* lisp/net/tramp-rclone.el (tramp-rclone-program):
+	* lisp/net/tramp-sh.el (tramp-inline-compress-start-size)
+	(tramp-copy-size-limit, tramp-histfile-override)
+	(tramp-use-connection-share)
+	(tramp-use-scp-direct-remote-copying, tramp-sh-extra-args):
+	* lisp/net/tramp-sshfs.el (tramp-sshfs-program): Add `:link' key.
+
+	* lisp/net/tramp.el (tramp-enable-method): Move function ...
+	* lisp/net/tramp-cmds.el (tramp-enable-method): ... here.
+
+2024-08-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(pp): Indent lines right when starting in col > 0
+
+	This refines the fix for bug#72561: commit 0a500193087e fixes
+	the bug by changing `ert--pp-with-indentation-and-newline`,
+	but it turns out that `pp` was inconsistent (it sometimes
+	indented the subsequent lines correctly and sometimes not,
+	depending on the current-buffer's major mode).
+	So the fix really should be in `pp`, which is what this patch does.
+
+	* lisp/emacs-lisp/pp.el (pp): Appropriately indent subsequent lines
+	if the first line is not inserted in column 0 (tho only when
+	printing into a buffer since otherwise it's somewhere between
+	ill-defined and impossible to implement).
+	* lisp/emacs-lisp/ert.el (ert--pp-with-indentation-and-newline):
+	Remove the indentation code after `pp` which was just working
+	around the bug in `pp`.  Also remove the redundant addition of
+	`\n` since `pp` always does it nowadays.
+	* test/lisp/help-mode-tests.el (help-mode-tests-xref-on-pp):
+	Fix thinko.
+
+2024-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	9b299dd79c1 Revert a recent change that caused redisplay slowdown
+	4eaab54896f ; * doc/lispref/display.texi (Low-Level Font): Fix wordin...
+	0a500193087 Indent ERT failure explanations rigidly
+	713069dd7a8 [Eglot] Stricter "expand common" behavior
+	096730510cd eglot-tests.el: New tests for existing completion behavior
+	969498c25d0 Remove dangerous HTML edit from admin.el
+
+	# Conflicts:
+	#	etc/EGLOT-NEWS
+
+2024-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	8c251a4c419 ; Mention in PROBLEMS issues with long popup menus
+	0a626a64c70 * etc/emacs_lldb.py (Lisp_Object): PVEC_COMPILED -> PVEC_...
+
+2024-08-25  Jim Porter  <jporterbugs@gmail.com>
+
+	Improve computation of indent depth in SHR and 'visual-wrap-prefix-mode'
+
+	Now, we get the average-width of the current font using
+	'string-pixel-width' and a specified space display spec, which doesn't
+	require the buffer to be displayed in a window (bug#72771).
+
+	* lisp/net/shr.el (shr-indent):
+	* lisp/visual-wrap.el (visual-wrap--content-prefix): Fix getting the
+	font when the buffer isn't displayed in a window.
+	(visual-wrap-fill-context-prefix): Fix indentation.
+
+2024-08-25  Mattias Engdegård  <mattiase@acm.org>
+
+	Faster region-beginning and region-end for rectangle selections
+
+	* lisp/rect.el (rectangle--region-beginning, rectangle--region-end):
+	Make these run in O(1), not linear, time and space.
+
+2024-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix handling of 'min-width' display property
+
+	* src/xdisp.c (get_display_property, display_min_width): Rename
+	BUFPOS to CHARPOS, to avoid confusion (it is not necessarily a
+	buffer position).  Suggested by Jim Porter <jporterbugs@gmail.com>.
+	(get_display_property): Call 'Fget_char_property' to support
+	'min-width' properties of overlays as well.
+	(display_min_width): Handle the buffer and string cases more
+	accurately, without relying only on the values of positions.
+	(handle_display_prop, handle_single_display_spec): Pass correct
+	position to 'display_min_width', when iterating over a string.
+	(handle_display_prop): When OBJECT is a window, pass it to
+	display_min_width.
+	(set_iterator_to_next): Call 'display_min_width' when at end of a
+	display or overlay string.  (Bug#72721)
+
+	* etc/NEWS: Announce the support for overlays.
+
+2024-08-24  Yuan Fu  <casouri@gmail.com>
+
+	Fix Ftreesit_parser_create
+
+	* src/treesit.c (Ftreesit_parser_create): We recently changed something
+	such that base buffer and indirect buffer appears to use separate
+	parser-lists.  Therefore, creating a parser in one of the buffer
+	shouldn't reuse the parser in another buffer.
+
+2024-08-24  Yuan Fu  <casouri@gmail.com>
+
+	Fix tree-sitter test for indirect parser list
+
+	* test/src/treesit-tests.el (treesit-indirect-buffer): Now the base
+	buffer shouldn't contain indirect buffer's parsers.
+
+2024-08-24  Yuan Fu  <casouri@gmail.com>
+
+	Make sure treesit-parse-string gc its temp buffer (bug#71012)
+
+	* doc/lispref/parsing.texi (Using Parser): Add notice.
+	* lisp/treesit.el (treesit-parse-string): Remove function.
+	* src/treesit.c (make_treesit_parser): Init the new filed.
+	(treesit_delete_parser): Collect the temp buffer.
+	(Ftreesit_parse_string): New function.
+	* src/treesit.h (Lisp_TS_Parser): New field.
+
+2024-08-24  Björn Bidar  <bjorn.bidar@thaodan.de>
+
+	Forward user to auth-source inside url-basic-auth
+
+	* lisp/url/url-auth.el (url-basic-auth): Forward the user if
+	provided by the url or found by 'auth-source' when searching
+	for secrets.  Supplying 'auth-source' with the user when
+	matching secrets allows for more accurate retrieval and fixes
+	instances where the user enters an url that already contains
+	the user such as "user@host.de".  (Bug#72526)
+
+2024-08-24  Michael Albinus  <michael.albinus@gmx.de>
+
+	Optimize Tramp's copy-directory
+
+	* lisp/net/tramp-sh.el (tramp-sh-handle-copy-directory):
+	* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory):
+	Don't check existence of DIRNAME, this is done in
+	`tramp-skeleton-copy-directory' already.
+
+	* lisp/net/tramp-sh.el (tramp-sh-handle-copy-directory):
+	Apply `tramp-do-copy-or-rename-file-directly' if possible.
+
+2024-08-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	4211d85eec0 Fix rare segfaults due to freed fontsets
+	44c26140b6e ; Fix infloop in checkdoc-next-docstring
+	25f53721668 Avoid putting a dead buffer in the minibuffer window (Bug...
+
+2024-08-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	7e9d05e6d9b ; * admin/authors.el (authors-aliases): Escape periods.
+
+2024-08-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	8ccc165f95a * doc/man/emacsclient.1: Bump date.
+
+2024-08-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	a0b65be8eb0 * admin/authors.el (authors-aliases, authors-ignored-file...
+	58088b36e8a * admin/authors.el: Pick-up version from emacs-29.
+	9d7151c0ffa Add missing :version tags in use-package
+	3f019167b85 Suppress shallow cloning on emba
+
+	# Conflicts:
+	#	lisp/use-package/use-package-core.el
+	#	lisp/use-package/use-package-ensure.el
+
+2024-08-24  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Allow customizing partial-completion to be more like substring
+
+	The substring completion style completes "foo-bar" as "*foo-bar*".  The
+	partial-completion completion style completes "foo-bar" as "foo*bar*".
+
+	Previously, it was not possible to get completion of "foo-bar" to act as
+	"*foo*bar*", e.g. combining the partial-completion and substring styles.
+	This would be especially useful for things like project-find-file.
+
+	Now it is possible by customizing the completion-pcm-leading-wildcard variable
+	to a non-nil value.
+
+	Furthermore, it's convenient to be able to run
+	regular (completion-pcm-leading-wildcard=t, non-substring)
+	partial-completion before running completion-pcm-leading-wildcard=nil
+	partial-completion, since the former provides more narrowly targeted
+	completions.
+
+	It's possible to do this by customizing completion-styles.  Just add
+	'(partial-completion ((completion-pcm-leading-wildcard t))) and
+	'(partial-completion ((completion-pcm-leading-wildcard nil))) in that
+	order.  Then the completion machinery will first run partial-completion
+	with completion-pcm-leading-wildcard=t, and if that returns no
+	completions, run partial-completion with
+	completion-pcm-leading-wildcard=nil.
+
+	* lisp/minibuffer.el (completion--nth-completion): Allow an element of
+	completion-styles to contain a list of bindings.
+	(completion-styles): Document that.
+	(completion-pcm-leading-wildcard): Add.
+	(completion-pcm--string->pattern): Check completion-pcm-leading-wildcard.
+	(bug#70217)
+
+2024-08-24  Björn Bidar  <bjorn.bidar@thaodan.de>
+
+	Fix secret search with basic auth with a port in URL
+
+	* lisp/url/url-auth.el (url-basic-auth): Fix retrieving of
+	secrets when the URL contains a port.  Amending the port to
+	server breaks 'auth-source-search' matching for :host which
+	is redundant as it already specified in :port.  (Bug#72526)
+
+2024-08-24  Gautier Ponsinet  <gautier@gautierponsinet.xyz>
+
+	Allow using pulse.el with a single color without pulsation
+
+	* lisp/cedet/pulse.el (pulse-momentary-highlight-overlay): Add
+	the start color to the list of colors used for the pulsation
+	effect, to allow its use when 'pulse-iterations' is 1.
+	(Bug#72636)
+
+2024-08-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'next-line' in batch mode.
+
+	* lisp/simple.el (line-move-finish): Don't use 'vertical-motion'
+	in batch mode.  Reported by john muhl <jm@pub.pink>.  (Bug#72420)
+
+2024-08-23  Robert Pluim  <rpluim@gmail.com>
+
+	Create blessmail at build time instead of install time
+
+	blessmail is built via the install target, which means it ends up owned
+	by the user doing the install.  It's not installed, so build it at build
+	time instead.
+
+	Reported by Michael Heerdegen <michael_heerdegen@web.de> in
+	<https://lists.gnu.org/archive/html/help-gnu-emacs/2024-08/msg00270.html>
+
+	* Makefile.in (install): Move blessmail target from install to actual-all.
+
+2024-08-22  Philip Kaludercic  <philipk@posteo.net>
+
+	Add command to copy contents in a diff-mode buffer
+
+	* lisp/vc/diff-mode.el (diff-mode-shared-map): Bind 'diff-kill-ring-save'.
+	(diff-mode-map): Ensure the "w" binding does not get prefixed.
+	(diff-kill-ring-save): Add the command.
+	* etc/NEWS: Mention 'diff-kill-ring-save'.  (Bug#65380)
+
+2024-08-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix C-n/C-p under both 'line-prefix' and 'visual-line-mode'
+
+	* lisp/simple.el (line-move-finish): Use
+	'truncated-partial-width-window-p' to query whether partial-width
+	lines are actually truncated on display.  (Bug#72420)
+
+2024-08-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	GCC bug 58416 is fixed in GCC 15
+
+	* configure.ac (emacs_cv_gcc_bug_58416_CFLAGS):
+	No need for a workaround in GCC 15.
+
+	2024-08-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Remove obsolete comment about ‘volatile’
+
+2024-08-21  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer static_assert to verify
+
+	Although static_assert is C11-specific, and Emacs remains on C99, it
+	has been backported to older compilers by Gnulib.  Gnulib has already
+	changed to prefer static_assert, and we can do the same.
+
+	* lib-src/asset-directory-tool.c (main_2):
+	* src/alloc.c (BLOCK_ALIGN, aligned_alloc, lisp_align_malloc)
+	(vectorlike_nbytes, allocate_pseudovector):
+	* src/android.c (android_globalize_reference, android_set_dashes):
+	* src/android.h:
+	* src/androidfont.c (androidfont_draw, androidfont_text_extents):
+	* src/androidvfs.c:
+	* src/bidi.c (BIDI_CACHE_MAX_ELTS_PER_SLOT, bidi_find_bracket_pairs):
+	* src/buffer.c (init_buffer_once):
+	* src/casefiddle.c (do_casify_multibyte_string):
+	* src/dispnew.c (scrolling_window, scrolling):
+	* src/editfns.c (styled_format):
+	* src/emacs-module.c (module_extract_big_integer):
+	* src/fileio.c (Fdo_auto_save):
+	* src/fns.c (next_almost_prime, hash_string):
+	* src/fringe.c (init_fringe):
+	* src/keyboard.h (kbd_buffer_store_event_hold):
+	* src/keymap.c:
+	* src/lisp.h (memclear, reduce_emacs_uint_to_hash_hash, modiff_incr):
+	* src/lread.c (skip_lazy_string):
+	* src/pdumper.c (dump_bignum, Fdump_emacs_portable)
+	(dump_do_dump_relocation, pdumper_load):
+	* src/process.c (make_process, Fmake_process, connect_network_socket):
+	* src/regex-emacs.c:
+	* src/sort.c (tim_sort):
+	* src/sysdep.c (init_random, SSIZE_MAX):
+	* src/thread.c:
+	* src/timefns.c (trillion_factor):
+	* src/unexelf.c:
+	* src/xterm.c (x_send_scroll_bar_event): Prefer static_assert to Gnulib
+	verify.  Remove import of verify.h, except when used for other reasons.
+
+2024-08-21  Mattias Engdegård  <mattiase@acm.org>
+
+	Simplify and speed up make-hash-table argument parsing
+
+	* src/fns.c (get_key_arg): Remove.
+	(Fmake_hash_table): Traverse argument list once only.  Don't allocate a
+	helper array.  Use faster comparisons.
+
+2024-08-21  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix two issues with 'window-deletable-p'
+
+	* lisp/window.el (window-deletable-functions): Clarify
+	doc-string.
+	(window-deletable-p): Handle check whether WINDOW's frame can be
+	deleted via new function 'frame-deletable-p' (a comparison with
+	the frame returned by 'next-frame' fails in too many cases).  Do
+	not try to run 'window-deletable-functions' in WINDOW's buffer
+	when WINDOW is internal.
+	* lisp/frame.el (frame-deletable-p): New function.
+	* doc/lispref/frames.texi (Deleting Frames): Describe new
+	function 'frame-deletable-p'.
+	* etc/NEWS: Mention 'frame-deletable-p'.
+
+2024-08-21  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix a Tramp bug when running several asynchronous processes
+
+	* lisp/net/tramp-cache.el (tramp-get-hash-table):
+	Add ;;;###tramp-autoload cookie.
+
+	* lisp/net/tramp.el (tramp-file-name-handler): Flush connection
+	properties "process-name" and "process-buffer".
+
+	* test/lisp/net/tramp-tests.el
+	(tramp--test-deftest-direct-async-process): Skip when underlying
+	TEST has taken too much time.
+	(tramp--test-with-proper-process-name-and-buffer): Remove.
+	(tramp-test45-asynchronous-requests): Remove callees.
+
+2024-08-21  Protesilaos Stavrou  <info@protesilaos.com>
+
+	Update to modus-themes version 4.5.0
+
+	* doc/misc/modus-themes.org (COPYING): Update the version headers.
+	(Option to extend the palette): Document new user options.
+	(Full support for packages or face groups): Document more
+	packages that are explicitly supported by the themes.
+	(Acknowledgements): Update the list of people who have
+	contributed to the project in one way or another.
+
+	* etc/themes/modus-operandi-deuteranopia-theme.el:
+	* etc/themes/modus-operandi-deuteranopia-theme.el:
+	* etc/themes/modus-operandi-tinted-theme.el:
+	* etc/themes/modus-operandi-tritanopia-theme.el:
+	* etc/themes/modus-vivendi-deuteranopia-theme.el:
+	* etc/themes/modus-vivendi-theme.el:
+	* etc/themes/modus-vivendi-tinted-theme.el:
+	* etc/themes/modus-vivendi-tritanopia-theme.el: Update the
+	  palette of each theme and include the new user option to extend
+	  its palette.
+
+	* etc/themes/modus-themes.el: Cover more faces and include user
+	  option for common extension to all theme palettes.
+
+	Detailed release notes:
+	<https://protesilaos.com/codelog/2024-08-21-modus-themes-4-5-0/>.
+
+2024-08-21  Kévin Le Gouguec  <kevin.legouguec@gmail.com>
+
+	Restore vc-git helper function (bug#68183)
+
+	* lisp/vc/vc-git.el (vc-git--cmds-in-progress): Restore; it was removed
+	in a previous refactoring patch, but we may still find use for it.
+	(vc-git-dir--in-progress-headers): Use it.
+
+2024-08-21  Kévin Le Gouguec  <kevin.legouguec@gmail.com>
+
+	Split vc-git-dir-extra-headers into more manageable chunks
+
+	The current code requires a lot of eyeballing back-and-forth
+	to:
+
+	- check where variables are actually used, what impact changing
+	them can have: in actuality, there are three distinct "groups"
+	of headers we compute, each with their own independent state;
+	- understand formatting details such as "who's in charge of the
+	newlines".
+
+	To solve both issues, split that function into smaller ones,
+	each handling a "group" of headers.
+
+	The only expected "functional" change is that, by propertizing
+	"\nHeader: " strings, the original code sometimes applied the
+	vc-dir-header face to the newline preceding a header; the new
+	code applies no faces to these newlines.
+
+	This change would be visible to users with themes adding an
+	:extended background to vc-dir-header.  In practice, no in-tree
+	theme is impacted.
+
+	For bug#68183.
+
+	* lisp/vc/vc-git.el (vc-git-dir--branch-headers): New function
+	to compute "Branch", "Tracking" and "Remote".
+	(vc-git--cmds-in-progress): Rename to...
+	(vc-git-dir--in-progress-headers): ... this, and compute
+	headers.
+	(vc-git-dir--stash-headers): New function to compute the
+	"Stash" header.
+	(vc-git-dir-extra-headers): Boil down to just setting
+	default-directory and assembling the headers from these new
+	helpers.
+	(vc-git--out-match): New function to call 'git' and capture
+	specific bits of output.
+
+2024-08-21  Kévin Le Gouguec  <kevin.legouguec@gmail.com>
+
+	Test more vc-dir scenarios with Git (bug#68183)
+
+	* test/lisp/vc/vc-git-tests.el
+	(vc-git-test-dir-track-local-branch): Remove in favor of new
+	test.
+	(vc-git-test--start-branch): New helper to get a repository
+	going.
+	(vc-git-test--dir-headers): New helper to get a list of headers
+	in the current vc-dir buffer.
+	(vc-git-test-dir-branch-headers): New test, exercising the
+	original bug recipe plus more common scenarios.
+
+2024-08-20  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	3419e7ea522 Correct Android failure to open an old CJK font
+	45ae4de0e7c * lisp/help-fns.el (help-definition-prefixes): Don't dele...
+	fc7581ae2ee ; Fix documentation of secure-hash functions
+	21be5cadaf1 ; * lisp/subr.el (sha1): Fix typo in docstring.
+	8715619d485 ; * etc/NEWS: Fix wording of last change.
+	023d387a7bd Update to Org 9.7.10
+	b54e8b3741b ; * etc/NEWS: Announce 'shr-fill-text'.
+	acfd91bc0c7 ; * lisp/emacs-lisp/compat.el: Fix header style.
+	55337dc36a2 * test/infra/gitlab-ci.yml (.tree-sitter-template): Adapt...
+	d8e9eb73c2b Bump use-package version for Emacs 30.1
+	4d9d3fec1b9 * Makefile.in (CHANGELOG_HISTORY_INDEX_MAX): Bump.
+	502285e84aa ; * admin/make-tarball.txt: Some clarifications.
+
+2024-08-20  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	d6726e6dfc7 Further fix of reading and writing profiler data
+	30b2fae77b7 * Makefile.in (PREFERRED_BRANCH): Update to emacs-30.
+	5397808e5bc ; Eliminate more C++ comments
+	1463434907e ; Eliminate C++ comments and typo
+
+2024-08-20  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete defgroup use-package-ensure
+
+	* lisp/use-package/use-package-core.el (use-package-ensure):
+	Delete defgroup.
+	(use-package-always-ensure, use-package-always-pin)
+	(use-package-ensure-function): Move defcustoms from above deleted
+	defgroup to the 'use-package' defgroup.
+
+2024-08-20  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix early use of use-package-always-ensure
+
+	* lisp/use-package/use-package-core.el:
+	* lisp/use-package/use-package-delight.el:
+	* lisp/use-package/use-package-diminish.el:
+	* lisp/use-package/use-package-ensure.el: Move add-to-list for
+	'use-package-keywords' and 'use-package-defaults' from here...
+	* lisp/use-package/use-package-core.el (use-package-ensure)
+	(use-package-keywords): ...to the default definition here.
+
+	* lisp/use-package/use-package-ensure.el
+	(use-package-ensure): Move this defgroup...
+	(use-package-always-ensure)
+	(use-package-always-pin, use-package-ensure-function): ...and
+	these defcustoms from here...
+	* lisp/use-package/use-package-core.el (use-package-ensure)
+	(use-package-always-ensure, use-package-always-pin)
+	(use-package-ensure-function): ...to here.  (Bug#72453)
+
+2024-08-20  Stefan Kangas  <stefankangas@gmail.com>
+
+	Mark tex-dvi-view-command as :risky
+
+	* lisp/textmodes/tex-mode.el (tex-dvi-view-command): Mark as
+	:risky.
+
+2024-08-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Remove stray obsolete comment about ‘volatile’
+
+	* src/lisp.h: Remove comment about ‘volatile’ that was mistakenly
+	left behind when 2013-10-03T04:58:56!monnier@iro.umontreal.ca
+	(adf2aa61404305e58e71cde0193bb650aff2c4b3) removed all the volatile
+	members of struct handler.
+
+2024-08-19  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-bar.el: Improve tab-bar-auto-width-predicate-default (bug#71883).
+
+	(tab-bar--auto-width-faces-default): New variable with the
+	value from the default value of tab-bar-auto-width-faces.
+	(tab-bar-auto-width-faces): Set the default value to
+	tab-bar--auto-width-faces-default.
+	(tab-bar-auto-width-predicate-default): For backwards-compatibility
+	use the old logic of checking tab-bar-auto-width-faces when its value
+	was changed.  Otherwise, check for a symbol, but remove "current-group"
+	from the list of symbols.
+
+2024-08-19  Joseph Turner  <joseph@breatheoutbreathe.in>
+
+	Add abnormal hook to determine which tabs to auto-widen
+
+	* lisp/tab-bar.el (tab-bar-auto-width-predicate-default):  Default value
+	for tab-bar-auto-width-functions.
+	(tab-bar-auto-width-functions): New abnormal hook.
+	(tab-bar-auto-width): Run new abnormal hook until success instead of
+	comparing text properties.
+
+2024-08-18  Jim Porter  <jporterbugs@gmail.com>
+
+	Improve SHR/EWW support for 'visual-wrap-prefix-mode'
+
+	* lisp/visual-wrap.el (visual-wrap--apply-to-line): Use
+	'add-display-text-property' so we don't clobber other display
+	properties.
+	(visual-wrap--content-prefix): Remove special-case for spaces-only
+	indent prefix; this was an attempt to be helpful for variable-pitch
+	fonts, but in practice just interferes with matters.  This case now
+	falls back to the one immediately following it (return the string of
+	spaces).  Use 'string-pixel-width' instead of 'string-width'.
+
+	* lisp/net/shr.el (shr-indent): Set 'shr-prefix-length' here to help
+	keep track of the prefixes of nestedly-indented elements.  Set the
+	specified space width in terms of the default width of the current face.
+	* lisp/net/shr.el (shr-adaptive-fill-function): Use 'shr-prefix-length'
+	as set above to return a fill prefix.
+
+	* lisp/net/eww.el (eww-render): Enable 'visual-wrap-prefix-mode'
+	alongside of 'visual-line-mode'.
+	(eww-mode): Set 'adaptive-fill-function' to
+	'shr-adaptive-fill-function'.
+
+	* etc/NEWS: Announce this change (bug#72485).
+
+2024-08-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix finding tags by 'etags' in Java source code
+
+	* lib-src/etags.c (C_entries): A comma is not special inside class
+	parameters <..>.  (Bug#72402)
+	(hash, in_word_set): Regenerated after adding "@SuppressWarnings"
+	to wordlist[].  This avoids missing tags preceded by
+	"@SuppressWarnings".
+
+2024-08-17  Jim Porter  <jporterbugs@gmail.com>
+
+	Be more careful about aligning prefix lines in 'visual-wrap-prefix-mode'
+
+	* lisp/visual-wrap.el (visual-wrap--apply-to-line): Ensure we don't
+	apply the 'min-width' property across multiple lines (bug#72681).
+
+2024-08-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify GCC 14 on recent read_char change
+
+	* src/keyboard.c (read_char): Initialize c_volatile before
+	calling setjmp.  Although not necessary for correctness,
+	and not needed for gcc 14.2.1 20240801 (Red Hat 14.2.1-1)
+	on x86-64 when built with --enable-gcc-warnings,
+	some GCC 14 x86-64 configurations issue a false positive
+	without this change.
+	Problem reported by Andrea Corallo in:
+	https://lists.gnu.org/r/emacs-devel/2024-08/msg00620.html
+	and fix suggested by Pip Cet in:
+	https://lists.gnu.org/r/emacs-devel/2024-08/msg00627.html
+
+2024-08-17  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	6a512ab032e Fix a typo in Eglot manual
+	7b752a93a46 Fix dumping of Lisp profiles
+	bfe07eca598 Fix 'apropos-library' for 'define-symbol-props'
+	5c1bd991396 Fix 'forward-comment' in 'toml-ts-mode'
+	e966dd5ee2c Document spell-checking of multiple languages
+	8a072d1f05b Apply --display kluge for PGTK too
+
+2024-08-17  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Stop subprocesses from using inherited or default PAGER
+
+	At startup, set PAGER to "cat" so that any inherited or
+	default value of PAGER does not affect subprocesses of
+	Emacs.  Pagers generally won't work when a subprocess
+	runs under Emacs.
+	Users can use 'comint-pager' (or other customizations)
+	to tell subprocesses to use a different specific pager.
+	* lisp/startup.el (normal-top-level): Set PAGER to 'cat',
+	if 'cat' is available.  (Bug#72426)
+
+2024-08-17  Arash Esbati  <arash@gnu.org>
+
+	Delete matching of whitespace in ispell's LaTeX env names
+
+	* lisp/textmodes/ispell.el (ispell-begin-tex-skip-regexp): Remove
+	matching of arbitrary whitespaces in LaTeX environment names when
+	wrapping them inside \begin{}.  (bug#72262)
+
+2024-08-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix script for characters in 3300..3357 range
+
+	* admin/unidata/blocks.awk: The characters in the 3300..3357 range
+	are Katakana according to Unicode's Scripts.txt.
+
+2024-08-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	5c9de704cc8 ; * admin/make-tarball.txt: Minor copyedits.
+	3fc16357832 ; * doc/lispref/strings.texi (Text Comparison): Improve i...
+	45a78ec6c57 * lisp/files.el (require-with-check): Improve error messa...
+	9a04b99b3d3 ; * src/data.c (Fsubrp): Improve docstring.
+	4f3e8c3b4ed Improve documentation of ERT
+	ed8904937ec Disambiguate minor-mode variable in its function docstring
+	505139e0bad Fix project-dired keybinding in manual
+	9bedb957beb Improve documentation of time-parsing functions
+
+	# Conflicts:
+	#	doc/lispref/os.texi
+	#	lisp/calendar/iso8601.el
+	#	lisp/calendar/parse-time.el
+
+2024-08-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	4589f51c21d (project-find-regexp): Fix the temporary value of DEFAULT...
+	616a93d185a Tag test in typescript-ts-mode-tests.el as unstable
+	e9e7e3908ab ; * lisp/files.el (require-with-check): Fix last change.
+
+2024-08-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Add CJK Compatibility character to Han representative chars
+
+	* lisp/international/fontset.el (script-representative-chars): Add
+	U+3410 to Han characters, to represent the 3400..4DBF block.
+
+2024-08-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix x_construct_mouse_click || vs | typo
+
+	* src/xterm.c (x_construct_mouse_click): ‘||’ → ‘|’.
+	Typo found by clang 18.1.6 -Wbool-operation.
+
+2024-08-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Tune volatile in read_char
+
+	* src/keyboard.c (read_char): Optimize access to a local volatile.
+
+2024-08-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Don’t ignore -Wclobbered in keyboard.c
+
+	This fixes Emacs bug#71744.
+	* src/keyboard.c: Do not ignore -Wclobbered.
+	(read_char): Fix violation of the C standard, where setjmp
+	clobbered c.  Fix suggested by Pip Cet in
+	<https://debbugs.gnu.org/cgi/bugreport.cgi?bug=71744#38>
+
+2024-08-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Don’t ignore -Wclobbered in image.c
+
+	This fix is also prompted by Emacs bug#71744.
+	* src/image.c: Do not ignore -Wclobbered.
+	(png_load_body): Fix violations of the C standard, where setjmp
+	clobbered c.  Move mask_img decl to pacify GCC.
+	(jpeg_load_body): Don’t make fp volatile; solve that problem in a
+	better way, via a new fp_volatile local.  Fix violations of the C
+	standard, where setjmp clobbered mgr, img, and ximg.  If __GNUC__
+	&& !__clang__, add useless assignments to pacify GCC.
+
+2024-08-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Don’t ignore -Wclobbered in eval.c
+
+	This fix is also prompted by Emacs bug#71744.
+	* src/eval.c (CACHEABLE): Remove.  All uses removed.
+	Do not ignore -Wclobbered.
+	(internal_lisp_condition_case): Fix violations of the C standard,
+	where setjmp clobbered oldhandlerlist, var, and clauses.
+	Rewrite to pacify GCC, by using a sentinel rather than a count,
+	which GCC incorrectly complained about, and by coalescing some
+	duplicate code.  If GCC_LINT && __GNUC__ && !__clang__ add a useless
+	assignment to pacify GCC.
+
+2024-08-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Don’t ignore -Wclobbered in emacs-module.c
+
+	This fix is also prompted by Emacs bug#71744.
+	* src/emacs-module.c: Do not ignore -Wclobbered.
+	(MODULE_HANDLE_NONLOCAL_EXIT): Fix violations of the C standard,
+	where setjmp clobbered env and internal_cleanup.
+	(module_extract_big_integer) [GCC_LINT && __GNUC__ && !__clang__]:
+	Work around GCC -Wclobbered false positive for ‘sign’.
+
+2024-08-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Don’t ignore -Wclobbered in bytecode.c
+
+	This fix is prompted by Emacs bug#71744.
+	The working hypothesis is that there are some bugs in Emacs,
+	and some in GCC’s diagnostics, and that this patch
+	fixes the Emacs bugs and works around the GCC diagnostic bugs.
+	The hypothesis is that GCC diagnostic bugs occur when GCC
+	coalesces variables or temporaries and some variables
+	are clobbered by setjmp and some vars/temps are not.
+	Part of this hypothesis involves GCC diagnosing the wrong variables.
+	Instead of ignoring the diagnostics, which the hypothesis suggests
+	indicate either problems in Emacs or in GCC, fix the Emacs bugs
+	and pacify the GCC false positives, with comments about the GCC bugs.
+	GCC’s true positives are helpful enough in squashing obscure bugs like
+	Emacs bug#71744, that it’s worth going to some effort to pacify
+	-Wclobbered instead of ignoring it.
+	* src/bytecode.c: Do not ignore -Wclobbered.
+	(exec_byte_code): Fix violations of the C standard, where setjmp
+	clobbered quitcounter and bc.  If GCC_LINT && __GNUC__ && !__clang__,
+	work around GCC -Wclobbered warnings for bytestr_data and vectorp.
+
+2024-08-16  Po Lu  <luangruo@yahoo.com>
+
+	Remove Hangul character from `han' representative character list
+
+	* lisp/international/fontset.el (script-representative-chars):
+	U+3200 is a Hangul character that is predictably absent from CJK
+	fonts, such as are provided by Xiaomi devices.
+
+2024-08-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port better to NFS unlink
+
+	I found this problem while looking into Bug#72641.
+	* lib-src/etags.c (do_move_file):
+	* lib-src/update-game-score.c (unlock_file):
+	* src/androidvfs.c (android_hack_asset_fd_fallback):
+	* src/filelock.c (current_lock_owner):
+	Treat unlink as successful if it fails because the file wasn’t there.
+	This can happen with some NFS implementations, due to its
+	retrying over the network to get at-least-once semantics.
+	Although most of Emacs’s calls to unlink were already doing this,
+	a few instances were not.
+
+2024-08-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Remove empty (& invalid) lock files
+
+	* src/filelock.c (current_lock_owner):
+	Remove empty lock files, as they are necessarily invalid
+	and can be caused by buggy file systems.
+	Problem reported by Michal Nazarewicz (bug#72641).
+
+2024-08-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Refactor current_lock_owner
+
+	* src/filelock.c (current_lock_owner): Refactor to make further
+	changes easier.  This should not affect behavior.
+
+2024-08-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Avoid some GC when locking/unlocking files
+
+	* src/filelock.c (lock_file_1, current_lock_owner):
+	Don’t possibly invoke the garbage collector when
+	comparing lock file contents to host names.
+
+2024-08-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix unlikely lock file integer overflow
+
+	* src/filelock.c (within_one_second): Accept intmax_t first arg.
+	Avoid undefined behavior on integer overflow.
+	(current_lock_owner): Simplify based on within_one_second change.
+
+2024-08-15  Mattias Engdegård  <mattiase@acm.org>
+
+	Replace some EQ with BASE_EQ
+
+	* src/eval.c (FletX, Flet, funcall_lambda)
+	(let_shadows_buffer_binding_p):
+	* src/data.c (set_blv_found, set_internal, default_value)
+	(set_default_internal, Flocal_variable_p):
+	* src/buffer.c (Fkill_buffer):
+	(mouse_face_overlay_overlaps, compare_overlays)
+	(report_overlay_modification):
+	BASE_EQ is safe because we don't actually compare symbols here.
+
+2024-08-15  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Fix 'partial-completion' for candidates containing newlines
+
+	'partial-completion' tries to match a pattern containing wildcards
+	(such as `any' or `prefix') against completion candidates.
+	Wildcards are supposed to match any sequence of characters, but
+	'completion-pcm--pattern->regex' transformed the wildcards into
+	".*", which won't match sequences containing newlines.  Fix this to
+	properly match anything by using "[^z-a]*" instead.
+	(That's (rx (* anything)).)
+	* lisp/minibuffer.el (completion-pcm--pattern->regex): Fix
+	regex.  (Bug#72425)
+
+2024-08-15  Ulrich Müller  <ulm@gentoo.org>
+
+	Drop fallback code in date-to-time, update documentation
+
+	* lisp/calendar/time-date.el (date-to-time): Drop fallback code.
+	Document that the default timezone is local time, rather than GMT.
+	* test/lisp/calendar/time-date-tests.el (test-date-to-time):
+	Add more test cases.
+	* doc/lispref/os.texi (Time Parsing): Document that 'date-to-time'
+	defaults to local time.
+	* etc/NEWS: Announce the change.  (Bug#72570)
+
+2024-08-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* lisp/calendar/time-date.el: Add comment.
+
+2024-08-14  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tag treesit-indirect-buffer as :unstable
+
+	* test/src/treesit-tests.el (treesit-indirect-buffer):
+	Tag it as :unstable on emba.
+
+2024-08-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/infra/gitlab-ci.yml (.tree-sitter-template): Adapt changes.
+
+2024-08-13  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	b585826a65e ; * lisp/files.el (require-with-check): Fix doc string an...
+	6d55e94996e macOS: Wrong frame rectangle after wake (bug#71912)
+	c49724b9649 ; Grammar fixes
+	5c3d340e001 Fix format 2 cmap handling in sfnt.c
+
+2024-08-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Document time-parsing functions a bit better
+
+	See <https://bugs.gnu.org/72570#14>
+
+2024-08-12  Po Lu  <luangruo@yahoo.com>
+
+	Remove extraneous entries for `han' from script-representative-chars
+
+	* lisp/international/fontset.el (script-representative-chars):
+	Remove characters that are either Kana, obsolete, or radicals,
+	which interferes with the discovery of real Chinese fonts, and
+	does not impact font resolution on free systems with Fontconfig.
+
+2024-08-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt cache settings on emba.
+
+	* test/infra/gitlab-ci.yml (.job-template): Remove cache:policy.
+	(.gnustep-template, .filenotify-gio-template, .eglot-template)
+	(.tree-sitter-template, .native-comp-template): Remove cache.
+
+2024-08-11  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt emba cache settings
+
+	* test/infra/gitlab-ci.yml (.build-template, .test-template)
+	(.gnustep-template, .filenotify-gio-template, .eglot-template)
+	(.tree-sitter-template, .native-comp-template): Add job specific
+	cache settings.
+
+2024-08-10  Richard Stallman  <rms@gnu.org>
+
+	Fix buglet.
+
+	* lisp/emacs-lisp/cond-star.el (cond*-match): Move a backquote.
+
+2024-08-10  Pip Cet  <pipcet@protonmail.com>
+
+	Fix coordinate transformations in sfnt.c
+
+	* src/sfnt.c (sfnt_transform_coordinates):
+	(sfnt_transform_f26dot6): Fix calculation of transformed coordinates in
+	the very rare case of arbitrary transformation matrices.
+
+2024-08-10  Pip Cet  <pipcet@protonmail.com>
+
+	Make ftcrfont_close idempotent
+
+	This prevents crashes when running code like:
+
+	(let ((font (open-font (find-font (font-spec ...)))))
+	  (close-font font)
+	  (close-font font))
+
+	* src/ftcrfont.c (ftcrfont_close): Make sure the function can be run
+	several times in a row without crashing.
+
+2024-08-10  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	4dd953d3cc3 * lisp/epg.el (epg--start): Don't convert EOL on encoding...
+
+2024-08-10  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	a0406f7c12e ; Improve documentation of 'add-to-list'
+	bd6dfb97ff0 NS: Fix scroll-bar setting code (bug#72331)
+
+2024-08-10  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	Reuse already read `capabilities'
+
+	* lisp/mail/smtpmail.el (smtpmail-via-smtp): Reuse already read
+	`capabilities'.  (Bug#72544)
+
+2024-08-09  Kien Nguyen  <kien.n.quang@gmail.com>  (tiny change)
+
+	Use SetHandleInformation to set NOINHERIT in UCRT64
+
+	* src/w32.c (init_ntproc) [_UCRT]: Use SetHandleInformation to
+	prevent standard handles from being inherited, instead of relying
+	on MSVCRT-only behavior.  For the details of the problem, see
+	https://lists.gnu.org/archive/html/emacs-devel/2024-07/msg01129.html.
+
+2024-08-09  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
+
+	Add PROBLEMS entry for bug#72517
+
+	* etc/PROBLEMS (X runtime problems): Document ssh -X session
+	hang-on-exit after deletion of remote emacsclient -c frame.
+	(bug#72517)
+
+2024-08-09  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	16462b1a62d Register for more Intents actions on Android
+
+2024-08-09  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	a1b8c2610a4 * lisp/help-macro.el: Add 'help-for-help-use-variable-pit...
+	a577eccdbbc ; * doc/lispref/strings.texi (String Conversion): Fix las...
+	d22e52375a6 Remove manual entry for string-to-int
+	341e5795d5d Support minibuffer-visible-completions in completing-read...
+	3e30c779a70 * lisp/imenu.el (imenu-flatten): Fix doc about annotation...
+
+2024-08-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix problem in tramp-container.el
+
+	* lisp/net/tramp-container.el (tramp-kubernetes--context-namespace):
+	Handle nil list elements.
+
+2024-08-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port zoneinfo-world-style-list to Debian testing
+
+	Problem reported by Gijs Hillenius <gijs@hillenius.net> in:
+	https://lists.gnu.org/r/emacs-devel/2024-08/msg00279.html
+	* lisp/time.el (zoneinfo-style-world-list): Use Asia/Kolkata
+	instead of Asia/Calcutta.  The main name was changed in tzdata
+	2008b every practical system has it now.  Some systems do
+	not include backward-compatibility names, so it is better
+	to use the standard time now.
+
+2024-08-07  Augusto Stoffel  <arstoffel@gmail.com>
+
+	Eglot: send more accurate languageId strings to TeX servers
+
+	bug#72343
+
+	* lisp/progmodes/eglot.el (eglot-server-programs): Rework TeX-mode entry
+
+2024-08-07  João Távora  <joaotavora@gmail.com>
+
+	Eglot: simplify eglot--lookup-mode
+
+	No longer reorder the LANGUAGES return value to have the
+	originating mode upfront, since it doesn't seem to serve any
+	practical purpose anymore.
+
+	bug#72343
+
+	* lisp/progmodes/eglot.el (eglot--lookup-mode): Simplify.
+
+	* test/lisp/progmodes/eglot-tests.el
+	  (eglot-test-server-programs-guess-lang): Adjust.
+
+2024-08-07  Gerd Möllmann  <gerd@gnu.org>
+
+	Bind TAB not <tab> in M-x lldb
+
+	* lisp/progmodes/gud.el (lldb): Bind TAB not <tab> so that it also works
+	on terminals.
+
+2024-08-07  Randy Taylor  <dev@rjt.dev>
+
+	Fix cmake-ts-mode number fontification (Bug#72228)
+
+	* lisp/progmodes/cmake-ts-mode.el (cmake-ts-mode--constants):
+	Remove "1" and "0".
+	(cmake-ts-mode--font-lock-settings): Match negative numbers.
+
+2024-08-07  Andrea Corallo  <acorallo@gnu.org>
+
+	Clean-up warning due to unused lexical variable
+
+	* lisp/progmodes/c-ts-common.el (c-ts-common--fill-block-comment):
+	Remove 'start-mask-done'.
+
+2024-08-07  Yuan Fu  <casouri@gmail.com>
+
+	Merge from savannah/emacs-30
+
+2024-08-07  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	679f7ccc49f Prevent accesses to /content files without a GUI connection
+	f0a7eec5a7d * lisp/net/tramp-integration.el (shortdoc): Use `tramp--w...
+	fb642d9cf54 Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
+	f1e37ae423f Avoid crashes in very large buffers with long lines
+	4dc9e99349d Update description of string comparison functions
+	3817355aed5 Add sanity check when adding Tramp functions to shortdoc
+	1bbb3220179 ; * lisp/erc/erc-fill.el (erc-fill-wrap-mode): Doc fix.
+	3f6e7e1da68 js-ts-mode: Make jsdoc's "description" block a comment (b...
+	1c7e00f4f65 Also condition cjk-misc font-spec on Android
+	b89d65df5fa ; * etc/PROBLEMS: How to install sources on SUSE Linux (b...
+	729b17c2026 ; * src/lread.c (Fload): Add comment.  (Bug#72433)
+	bfb1aee9989 Fix ':defer nil' in 'use-package'
+	d787817076e Document unsupported color Emoji on OpenBSD
+	db1f749db55 Fix regressions in Customize caused by 'widget-unselected...
+	f94d58008eb Avoid inserting extra space in SVG data
+	292fcd20099 Fix c-ts-common filling function (bug#71760)
+	e50d597f450 Fix missing type checks before specbind
+
+	# Conflicts:
+	#	lisp/progmodes/c-ts-common.el
+
+2024-08-06  Ulrich Müller  <ulm@gentoo.org>
+
+	* lisp/format.el (format-alist): Make 'duden' format write-only.
+
+2024-08-06  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-bar.el (tab-bar--format-tab-group): Add 'current-group'.
+
+	Use current-group symbol for current tab group item (bug#71883).
+
+2024-08-05  Pip Cet  <pipcet@protonmail.com>
+
+	Avoid compiler warning
+
+	* src/timefns.c (Fdecode_time): Use 'UNINIT' to avoid a warning with
+	gcc 14 and checking enabled.
+
+2024-08-05  Pip Cet  <pipcet@protonmail.com>
+
+	Fix typo in pdumper.c
+
+	* src/pdumper.c (dump_interval_node): Call 'dump_field_fixup_later' with
+	the correct arguments.  Discovered by Danny McClanahan.
+
+2024-08-05  Pip Cet  <pipcet@protonmail.com>
+
+	* src/search.c (Fre__describe_compiled): Use 'CHECK_STRING'.
+
+2024-08-05  Mattias Engdegård  <mattiase@acm.org>
+
+	Avoid warning when building on macOS versions < 14 (bug#72440)
+
+	* src/nsterm.m ([EmacsView initFrameFromEmacs:]):
+	The clipsToBounds property of NSView is only public from macOS 14 on.
+
+2024-08-05  Jonas Bernoulli  <jonas@bernoul.li>
+
+	Update to Transient v0.7.4-1-g3d9e9358
+
+2024-08-05  Gerd Möllmann  <gerd@gnu.org>
+
+	Restore a default before macOS 14 API change (bug#72440)
+
+	* src/nsterm.m ([EmacsView initFrameFromEmacs:]): Set clipsToBounds to
+	YES.
+
+2024-08-05  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-bar.el (tab-bar-tab-group-format-default): Hide hints.
+
+	Don't display hints when tab-bar-show-inactive-group-tabs is customized
+	to t (bug#71939).  Suggested by Ship Mints <shipmints@gmail.com>.
+
+2024-08-05  Yuan Fu  <casouri@gmail.com>
+
+	Fix c-ts-common filling
+
+	* lisp/progmodes/c-ts-common.el:
+	(c-ts-common--fill-block-comment): Exclude the last line from filling if
+	it only has non-word characters like *=-.
+	* test/lisp/progmodes/c-ts-mode-resources/filling.erts: Fir the
+	multi-line test and add a single line test.
+
+2024-08-04  Jim Porter  <jporterbugs@gmail.com>
+
+	Add support for variable-pitch fonts in 'visual-wrap-prefix-mode'
+
+	* lisp/emacs-lisp/subr-x.el (string-pixel-width): Allow passing BUFFER
+	to use the face remappings from that buffer when calculating the width.
+
+	* lisp/visual-wrap.el (visual-wrap--prefix): Rename to...
+	(visual-wrap--adjust-prefix): ... this, and support PREFIX as a number.
+	(visual-wrap-fill-context-prefix): Make obsolete in favor of...
+	(visual-wrap--content-prefix): ... this.
+	(visual-wrap-prefix-function): Extract inside of loop into...
+	(visual-wrap--apply-to-line): ... this.
+
+	* doc/lispref/display.texi (Size of Displayed Text): Update
+	documentation for 'string-pixel-width'.
+
+	* etc/NEWS: Announce this change.
+
+2024-08-04  Philip Kaludercic  <philipk@posteo.net>
+
+	Clarify that 'pcase-lambda' only destructs
+
+	* lisp/emacs-lisp/pcase.el (pcase-lambda): Copy notice from
+	'pcase-let', indicating that pcase-lambda won't pattern match
+	like 'pcase', but just try to destruct with uncertain side
+	effects if this fails. (Bug#71503)
+
+2024-08-04  Michael Albinus  <michael.albinus@gmx.de>
+
+	Remove further compat code from Tramp
+
+	* lisp/net/tramp-adb.el (tramp-adb-handle-process-file):
+	Use `process-file-return-signal-string'.
+
+	* lisp/net/tramp-cache.el (tramp-dump-connection-properties):
+	Use "lisp-data" for persistency file.
+
+	* lisp/net/tramp-cmds.el (tramp-cleanup-this-connection)
+	(tramp-rename-these-files, tramp-recompile-elpa):
+	Declare `completion'.
+
+	* lisp/net/tramp-container.el (tramp-kubernetes--container)
+	(tramp-kubernetes--pod, tramp-kubernetes--namespace): Make more
+	robust.
+
+	* lisp/net/tramp-crypt.el (tramp-crypt-remove-directory):
+	Declare `completion'.
+
+	* lisp/net/tramp-gvfs.el (file-notyify-callback): Declare.
+
+	* lisp/net/tramp-sh.el (process-file-return-signal-string)
+	(vc-handled-backends): Don't declare.
+
+	* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory):
+	Use `copy-directory-create-symlink'.
+
+	* lisp/net/tramp.el (tramp-skeleton-write-region): Use `lock-file' and
+	`unlock-file'..
+	(tramp-handle-make-lock-file-name): Use `remote-file-name-inhibit-locks'.
+	(tramp-handle-unlock-file): Use `remote-file-name-inhibit-locks'
+	and `userlock--handle-unlock-error'.
+	(tramp-handle-shell-command): Use `shell-command-buffer-name-async'
+	and `shell-command-buffer-name'.
+	(tramp-read-passwd): Remove workaround.
+
+2024-08-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve font search and handling on MS-Windows
+
+	* src/w32font.c: Add commentary about font search on MS-Windows.
+	(w32font_coverage_ok, add_font_entity_to_list)
+	(font_supported_scripts): Consider the coverage OK if a font has
+	only the SIP bit set, but also sets relevant codepage bits in the
+	CSB bits.
+	(font_supported_scripts): Fix script for USB bit 99.
+	* src/font.c (font_parse_fcname, font_parse_family_registry)
+	[HAVE_NTGUI]: Don't consider hyphenated suffixes of some Windows
+	fonts as not belonging to the family name.
+	* src/w32uniscribe.c (uniscribe_check_otf_1): Increase tags[]
+	array size, to avoid the E_OUTOFMEMORY error for some fonts.
+
+	* lisp/international/fontset.el (font-encoding-alist): Add
+	'unicode-sip'.
+
+2024-08-03  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	8d073823c61 Revert "Remove redundant byte-swapping boundary"
+	c25687e860f Fix various typos reported by Pip Cet
+
+2024-08-03  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	e539a5c7d79 NS: Fix placement of candidate window (bug#72422)
+	94fe5894d99 ; * lisp/touch-screen.el: Correct commentary.
+
+2024-08-03  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	ef5466c2675 Avoid aborts when buffer is modified during its redisplay
+	cb421286d2e Fix c++-ts-mode indentation for templace (bug#72263)
+
+2024-08-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'script-representative-chars' for the 'han' script
+
+	* lisp/international/fontset.el (script-representative-chars):
+	Remove from 'han' codepoints that belong to 'cjk-misc'.
+
+2024-08-02  Richard Stallman  <rms@gnu.org>
+
+	Install cond*
+
+	* lisp/emacs-lisp/cond-star.el: New file.
+
+2024-08-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix display of empty margins when default face is remapped
+
+	* src/xdisp.c (display_line): Append space glyphs to margin areas
+	if the default face is remapped and nothing is written to the
+	margin area of this screen line.
+	(produce_special_glyphs): If the truncation/continuation glyphs do
+	not specify a face, use the remapped default face, not the
+	original frame-global default face.  Reported by Nicolas
+	P. Rougier <nicolas.rougier@inria.fr> in
+	https://lists.gnu.org/archive/html/emacs-devel/2024-07/msg01217.html.
+
+2024-08-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix finding anchor references after 'Info-on-current-buffer'
+
+	* lisp/info.el (Info--record-tag-table): New function, extracted
+	from 'Info-find-node-2'.
+	(Info-find-node-2, Info-on-current-buffer): Use
+	'Info--record-tag-table'.  (Bug#72391)
+
+2024-08-01  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix regression in 'todo-test-todo-quit02'
+
+	* lisp/window.el (switch-to-prev-buffer): If BURY-OR-KILL is
+	non-nil, remove any 'quit-restore' or 'quit-restore-prev'
+	parameter referencing the old buffer too.  This fixes a
+	regression when running 'todo-test-todo-quit02' from 'ert'
+	(reported by Andrea Corallo <acorallo@gnu.org>).
+
+2024-08-01  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix edge cases in tramp-crypt.el
+
+	* lisp/net/tramp-crypt.el (tramp-crypt-handle-set-visited-file-modtime)
+	(tramp-crypt-handle-verify-visited-file-modtime): New defuns.
+	(tramp-crypt-file-name-handler-alist): Use them.
+	(tramp-crypt-handle-lock-file): Care about `buffer-file-name'.
+	(tramp-crypt-handle-unlock-file): Remove compat code.
+
+2024-08-01  Mattias Engdegård  <mattiase@acm.org>
+
+	Remove misspelled rx category `chinse-two-byte`
+
+	* lisp/emacs-lisp/rx.el (rx--categories): Remove misspelled variant
+	present in Emacs 21-1-24.3, correct name since 24.4.
+	* etc/NEWS: Announce.
+
+2024-08-01  Martin Rudalics  <rudalics@gmx.at>
+
+	Improve window/buffer handling code
+
+	The purpose of these changes is to improve the code handling the
+	display of buffers in windows, switching to previous and next
+	buffers in windows and restoring a previous state after quitting
+	or killing buffers.  In particular it does:
+
+	- Add a new window parameter 'quit-restore-prev' so a window can
+	keep its initial 'quit-restore' parameter and undoing a sequence
+	of quit window operations becomes more reliable (Bug#59862).
+
+	- Optionally have 'kill-buffer' call 'quit-restore-window' for
+	all windows showing the argument buffer (Bug#59862).
+
+	- Add a new hook so it's possible to avoid that a window gets
+	deleted implicitly by functions like 'kill-buffer' (Bug#71386).
+
+	- Add a new option to make 'quit-restore-window' delete windows
+	more aggressively (Bug#59862).
+
+	- Immediately remove killed buffers from all windows' previous
+	and next buffers.  For windows that are already dead, use a weak
+	hash table to be used by 'kill-buffer'.  This avoids any special
+	handling of such windows by the garbage collector.
+
+	- Immediately remove 'quit-restore' and 'quit-restore-prev'
+	window parameters that reference killed buffers.  These
+	parameters have no more use once their buffers got killed.
+
+	- Make sure that internal windows do not have any previous and
+	next buffers.  This fixes a silly memory leak.
+
+	- Make sure that after set_window_buffer and some wset_buffer
+	calls the buffer now shown in the window does not appear in the
+	lists of that window's previous and next buffers.  The old
+	behavior could make functions investigating these lists
+	erroneously believe that there still existed some other buffer
+	to switch to.
+
+	* src/alloc.c (mark_discard_killed_buffers): Remove function.
+	(mark_window): No more filter previous and next buffer lists.
+	* src/window.h (struct window): Move up prev_buffers and
+	next-buffers in structure; they are now treated by the collector
+	as usual.
+	* src/window.c (window_discard_buffer_from_alist)
+	(window_discard_buffer_from_list)
+	(window_discard_buffer_from_window)
+	(window_discard_buffer_from_dead_windows)
+	(Fwindow_discard_buffer): New functions.
+	(set_window_buffer): Discard BUFFER from WINDOW's previous and
+	next buffers.
+	(make_parent_window): Make sure internal windows have no previous
+	and next buffers.
+	(make_window): Don't initialize window's previous and next
+	buffers, they are handled by allocate_window now.
+	(Fdelete_window_internal): Add WINDOW to window_dead_windows_table.
+	(Fset_window_configuration): Remove resurrected window from
+	window_dead_windows_table.  Make sure buffers set by wset_buffer
+	calls are not recorded in window's previous and next buffers.
+	(delete_all_child_windows): Add deleted windows to
+	window_dead_windows_table.
+	(window_dead_windows_table): New weak hash table to record dead
+	windows that are stored in saved window configurations.
+	* src/buffer.c (Fkill_buffer): Call new function
+	'window_discard_buffer_from_dead_windows'.
+	* lisp/window.el (window-deletable-functions): New hook.
+	(window-deletable-p): Update doc-string.  Run
+	'window-deletable-functions' (Bug#71386).
+	(unrecord-window-buffer): New argument ALL.  Move body to
+	'window-discard-buffer-from-window' so that if ALL is non-nil,
+	WINDOW's 'quit-restore' and 'quit-restore-prev' parameters get
+	removed too.
+	(switch-to-prev-buffer): Don't care about killed buffers here;
+	'replace-buffer-in-windows' should have done that already.  Use
+	'unrecord-window-buffer'.
+	(switch-to-next-buffer): Don't care about killed buffers here;
+	'replace-buffer-in-windows' should do that now.
+	(kill-buffer-quit-windows): New option.
+	(delete-windows-on): Update doc-string.  Handle new option
+	'kill-buffer-quit-windows'.  Update 'unrecord-window-buffer'
+	calls.
+	(replace-buffer-in-windows): Update doc-string.  Handle new
+	option 'kill-buffer-quit-windows' (Bug#59862).  Update call to
+	'unrecord-window-buffer'.
+	(quit-restore-window-no-switch): New option.
+	(quit-restore-window): Update doc-string.  Handle additional
+	values of BURY-OR-KILL so to not kill a buffer about to be
+	killed by the caller.  Handle 'quit-restore-prev' parameter
+	(Bug#59862).  Handle new option 'quit-restore-window-no-switch'
+	(Bug#59862).
+	(quit-windows-on): Update doc-string.  Call 'quit-window-hook'
+	and call 'quit-restore-window' directly so that the buffer does
+	not get buried or killed by the latter.  Update
+	'unrecord-window-buffer' call.
+	(display-buffer-record-window): Update doc-string.  Handle new
+	`quit-restore-prev' parameter (Bug#59862).
+	(switch-to-buffer): Call 'display-buffer-record-window' so a
+	latter 'quit-restore-window' can use its parameters.
+	* doc/lispref/windows.texi (Deleting Windows): Describe implicit
+	deletion of windows and new hook 'window-deletable-functions'.
+	(Buffers and Windows): Update description of
+	'replace-buffer-in-windows'.  Describe new option
+	'kill-buffer-quit-windows'.
+	(Quitting Windows): Describe 'quit-restore-prev' parameter and
+	new option 'quit-restore-window-no-switch'.  Update description
+	of 'quit-restore-window'.
+	(Window Parameters): Mention 'quit-restore-prev' parameter.
+	* etc/NEWS: Add entries for 'window-deletable-functions',
+	'kill-buffer-quit-windows', 'quit-restore-window-no-switch'.
+	mention new parameter 'quit-restore-prev' and new argument
+	values for 'quit-restore-window'.
+
+2024-08-01  Po Lu  <luangruo@yahoo.com>
+
+	Conclude previous change
+
+	* lisp/international/fontset.el (script-representative-chars)
+	<han>: Remove practically unattested characters, since this
+	variable is not used in font resolution on MS-Windows any
+	longer.
+
+2024-08-01  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	1154d8aafe2 Better resolve bug#72188
+	ceb5a152227 MacOS: Let EmacsView implement NSTextInputClient
+	9f7c1ace9f8 NS: Set frame position when entering/exiting fullscreen (...
+	74fe889a93f Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
+	abefd9514bc * lisp/tab-bar.el (tab-bar-move-tab-to-group): Fix for a ...
+	e09982f8f5a Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
+	5cf64d8377a Fix sporadic crashes and `select' failures in dumped images
+	a475360af98 Correct display of Doc View documents after tab switching
+	b0d927e1dce Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
+	469bc7c9686 Use 'kill-process' as a fallback when a pipe gets broken ...
+	158835668df ; * doc/lispref/modes.texi (Mode Line Data): Fix formatting.
+
+2024-07-31  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "Re-enable displaying `han' characters on Android"
+
+	This reverts commit bf0aeaa0d7a1581a095aa423e75d0d71cceb28cd.
+	The characters removed by this commit cause Emacs to select
+	sub-optimal fonts that lack many Chinese characters, because
+	Emacs generally stops looking for fonts when it finds the
+	first one that seems to match.
+
+2024-07-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(vhdl-run-when-idle): Don't use `timer--triggered`
+
+	* lisp/progmodes/vhdl-mode.el (vhdl-run-when-idle): Avoid relying
+	needlessly on internal accessor and fix last change to make sure
+	we always create a timer.
+
+2024-07-31  Po Lu  <luangruo@yahoo.com>
+
+	Re-enable displaying `han' characters on Android
+
+	* lisp/international/fontset.el (script-representative-chars)
+	<han>: Remove several characters that were just recently
+	introduced into unicode and are consequently absent from many
+	fonts, so that they may match font specs specifying scripts
+	rather than QClang in the default fontset.
+
+2024-07-31  Yuan Fu  <casouri@gmail.com>
+
+	New variable treesit-language-remap-alist (bug#72388)
+
+	* doc/lispref/parsing.texi (Using Parser): Manual entry for the new
+	variable.
+	* src/treesit.c (resolve_language_symbol): New function.
+	(Ftreesit_parser_create, Ftreesit_parser_list): Resolve language before
+	using it.
+	(Vtreesit_language_remap_alist): New variable.
+
+2024-07-31  Yuan Fu  <casouri@gmail.com>
+
+	Fix filling in c-ts-mode (bug#72116)
+
+	The previous fix introduced a regression in the case when there's only a
+	single line in the block comment.  In that case we don't want to add a
+	start at the second line:
+
+	/* foo foo foo */ should => /* foo foo
+	                               foo */
+
+	rather than   /* foo foo
+	               * foo */
+
+	This commit fixes that.
+
+	* lisp/progmodes/c-ts-common.el:
+	(c-ts-common--fill-block-comment): Don't mask the /*.
+	(c-ts-common--adaptive-fill-prefix): New function.
+	(c-ts-common-comment-setup): Don't set adaptive-regexp, change
+	adaptive-fill-first-line-regexp to work with the new
+	adaptive-fill-function.
+	* test/lisp/progmodes/c-ts-mode-resources/filling.erts: New tests
+
+2024-07-31  Yuan Fu  <casouri@gmail.com>
+
+	"Separate" tree-sitter parser list for indirect buffers
+
+	When create a parser for the indirect buffer, set the buffer field of
+	the parser to the indirect buffer, but add the parser to the base
+	buffer's parser list.  This way, all the parsers still get buffer
+	updates, but indirect buffer's parsers can have different narrowing than
+	the parsers of the base buffer.
+
+	When returning the parser list of a buffer, do filtering and only return
+	the parser for that buffer.
+
+	From user's POV, indirect buffers appear to have their own parser list.
+
+	* doc/lispref/parsing.texi (Using Parser): Remove the text describing
+	indirect buffer's special case.
+	* src/treesit.c (Ftreesit_parser_create): When create a parser for the
+	indirect buffer, set the buffer field of the parser to the indirect
+	buffer, but add the parser to the base buffer's parser list.
+	(Ftreesit_parser_list): Filter parser list, only return parsers for this
+	buffer.
+
+	xx
+
+2024-07-30  Richard Stallman  <rms@gnu.org>
+
+	Define custom var rmail-summary-starting-message.
+
+	* lisp/mail/rmailsum.el (rmail-summary-starting-message):
+	New custom variable.
+	(rmail-new-summary-1): Use it.
+
+2024-07-30  Mattias Engdegård  <mattiase@acm.org>
+
+	vhdl-mode: don't use timer accessors in XEmacs
+
+	* lisp/progmodes/vhdl-mode.el (vhdl-run-when-idle):
+	No need to activate a newly created idle timer; keep it as
+	compatibility (or voodoo) code for XEmacs which probably doesn't have
+	the timer accessors anyway.
+
+2024-07-29  Juri Linkov  <juri@linkov.net>
+
+	* lisp/tab-bar.el (tab-bar-show-inactive-group-tabs): New defcustom.
+
+	(tab-bar-format-tabs-groups): Use it (bug#71939).
+	Suggested by Ship Mints <shipmints@gmail.com>.
+
+2024-07-29  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	5cf64d8377a Fix sporadic crashes and `select' failures in dumped images
+	a475360af98 Correct display of Doc View documents after tab switching
+
+2024-07-28  Jim Porter  <jporterbugs@gmail.com>
+
+	Merge from origin/emacs-30
+
+	367c0490a82 ; * admin/MAINTAINERS: Note what I maintain
+
+2024-07-28  Philip Kaludercic  <philipk@posteo.net>
+
+	Simplify 'help-enable-variable-value-editing' using 'string-edit'
+
+	* lisp/help-fns.el (help-fns--edit-variable): Remove variable
+	declaration, as 'string-edit' makes manually storing the
+	variable name unnecessary.
+	(help-fns-edit-variable): Use 'read-string-from-buffer' instead
+	of custom major mode.
+	(help-fns--edit-value-mode-map, help-fns--edit-value-mode)
+	(help-fns-edit-mode-done, help-fns-edit-mode-cancel):  Remove
+	functionality provided by 'string-edit'.
+
+2024-07-28  Visuwesh  <visuweshm@gmail.com>
+
+	Add new optional argument NO-HIGHLIGHT to query-replace-read-args
+
+	* lisp/replace.el (query-replace-read-args): Add new optional
+	argument to disable regexp highlighting.
+
+	* lisp/dired-aux.el (dired-do-query-replace-regexp)
+	(dired-do-replace-regexp-as-diff)
+	(dired-do-find-regexp-and-replace): Revert last change, and use
+	the new argument instead.  (bug#72147)
+
+2024-07-28  Juri Linkov  <juri@linkov.net>
+
+	* lisp/language/misc-lang.el ("Tifinagh"): Fix `language-info-alist'.
+
+2024-07-27  Jim Porter  <jporterbugs@gmail.com>
+
+	Use 'unwind-protect' to ensure that Eshell always closes I/O handles
+
+	See bug#72220.
+
+	* lisp/eshell/esh-cmd.el (eshell-with-handles): New macro...
+	(eshell-commands): ... use it.
+	(eshell-with-copied-handles): Remove STEAL-P and allow multiple body
+	forms (this is an incompatible change, but the macro is currently
+	internal despite the name).
+	(eshell-parse-command, eshell-do-pipelines)
+	(eshell-do-pipelines-synchronously, eshell--invoke-command-directly-p):
+	Remove handle stealing.
+	(eshell-structure-basic-command, eshell-do-command)
+	(eshell-lisp-command): Remove 'eshell-close-handles'.
+	(eshell-protect): Make obsolete.
+	(eshell-rewrite-for-command, eshell-rewrite-while-command)
+	(eshell-rewrite-if-command, (eshell-parse-pipeline): Remove
+	'eshell-protect'.
+
+	* lisp/eshell/esh-io.el (eshell-duplicate-handles): Make STEAL-P
+	obsolete.
+
+	* lisp/eshell/esh-proc.el (eshell-gather-process-output): Call
+	'eshell-protect-handles' one more time.  Remove 'eshell-close-handles'.
+
+	* lisp/eshell/esh-var.el (eshell-parse-variable-ref): Reimplement
+	$<COMMAND> form using 'eshell-with-handles'.
+
+	* test/lisp/eshell/esh-cmd-tests.el
+	(esh-cmd-test/command-not-found/pipeline): New test.
+
+	* test/lisp/eshell/em-tramp-tests.el
+	(em-tramp-test/should-replace-command): Adjust check for
+	'eshell-with-copied-handles'.
+
+2024-07-27  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+
+	Make sure SES always writes non abbreviated expressions to data area.
+
+	Corrupted data area would occur when print-length or print-level are non nil.
+
+2024-07-27  Mattias Engdegård  <mattiase@acm.org>
+
+	Reduce type checks in arithcompare
+
+	* src/data.c (coerce_marker, not_number_or_marker): New.
+	(arithcompare): Don't use NUMBERP to check types up-front since we
+	are going to branch on types anyway.
+
+2024-07-27  Mattias Engdegård  <mattiase@acm.org>
+
+	* src/data.c (arithcompare): Simplify fixnum/bignum comparisons.
+
+	Noticed by Pip Cet.
+
+2024-07-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	Revert "* test/lisp/net/tramp-tests.el (tramp-test42-utf8): Don't test "Tifinagh"."
+
+	This reverts commit b9f2ef2a333fa7c813913dbba798c5ba8778eefd.
+
+2024-07-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/language/misc-lang.el ("Tifinagh"): Fix `sample-text'.
+
+2024-07-27  Mattias Engdegård  <mattiase@acm.org>
+
+	Simplify and speed up numeric comparisons
+
+	This makes comparison functions (=, /=, <, <=, >, >=, min, max) quite
+	a bit faster (10-20 %).  Bytecode ops on fixnums are not affected,
+	nor is `value<`.
+
+	* src/data.c (arithcompare): Simplify the code to reduce the number of
+	branches.  Remove the comparison code argument; instead, return the
+	relation encoded as bits, which can be tested cheaply.  All callers
+	adapted.
+	* src/lisp.h (enum Arith_Comparison): Remove.
+	(Cmp_Bit_*, cmp_bits_t): New.
+
+2024-07-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	88e1ec22f27 Update to Org 9.7.9
+	1ae2f004473 Fix edge-case with 'which-key-dont-use-unicode' setter
+	68a5f1f7d18 NS: prevent makeKeyWindow warnings (bug#69525)
+	59a895ec499 ; * .gitignore: Add lisp/eshell/esh-groups.el.
+	5c08cd4e7c3 ; * doc/emacs/cmdargs.texi (Initial Options): Fix last ch...
+	309d0a71864 Add PROBLEMS entry for bug#72303
+	87389f9ff90 ; Improve documentation of 'line-prefix' and 'wrap-prefix'.
+	268a2d10fc9 Improve documentation of '--init-directory' command-line ...
+	c27055a938a ; cperl-mode.el: Fix fontification of flip-flop (Bug#72296)
+	fcd4e4c895d ; * admin/MAINTAINERS: Add myself for maintaining some ar...
+	fdc133e97f6 Fix bug in server.el introduced by 0d7d835902df
+	af527051cd3 ; * admin/MAINTAINERS: Remove Nicolas Petton.
+	7170282a59a lisp/minibuffer.el (completion--sifn-requote): Fix bug#72176
+	68906f184cb * admin/notes/spelling: Update note.
+	9eea6be5abf Don't produce invalid XML with multi-line commenting style
+	b97786d9f6e ; * etc/NEWS: Entry for 'gnus-summary-limit-to-age' (bug#...
+	a7996615663 Standardize possessive apostrophe usage in manuals, docs,...
+	67faaead754 Don't refer to obsolete finder group "wp"
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-07-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/lisp/net/tramp-tests.el (tramp-test42-utf8): Don't test "Tifinagh".
+
+2024-07-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	Improve Tramp startup time
+
+	* lisp/net/tramp-cmds.el (tramp-repository-branch)
+	(tramp-repository-version):
+	* lisp/net/tramp-message.el (tramp-repository-branch)
+	(tramp-repository-version): Declare.
+
+	* lisp/net/trampver.el (tramp-repository-branch)
+	(tramp-repository-version): Remove ;;;###tramp-autoload cookie.
+
+2024-07-27  Liu Hui  <liuhui1610@gmail.com>
+
+	Use buffer-local value of 'comint-input-ring-size'
+
+	When 'comint-read-input-ring' was reading history to the ring,
+	the global value of 'comint-input-ring-size' was used regardless
+	of the local value, due to the use of a temporary buffer.
+	This change fixes the problem.
+	* lisp/comint.el (comint-read-input-ring): Use buffer-local
+	value of the ring size.  (Bug#72138)
+
+2024-07-27  Stefan Kangas  <stefankangas@gmail.com>
+
+	* lisp/net/nsm.el (nsm-verify-connection): Improve docstring.
+
+2024-07-26  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp: Handle hops with "%" in their names
+
+	* lisp/net/tramp.el (tramp-dissect-file-name, tramp-compute-multi-hops):
+	Handle hops with "%" in their names, like USER%DOMAIN or POD%NAMESPACE.
+
+2024-07-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Add support for Tifinagh script
+
+	* lisp/leim/quail/tifinagh.el: New file.  Contributed by Adam Oudad
+	<adam.oudad@gmail.com>.
+	* lisp/language/misc-lang.el ("Tifinagh"): New language environment.
+
+	* etc/HELLO: Add a greeting in Tifinagh.
+	* etc/NEWS: Announce the addition of Tifinagh.
+
+2024-07-25  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix display of 'display' strings in RTL paragraphs at window-start
+
+	* src/xdisp.c (handle_single_display_spec)
+	(get_overlay_strings_1, push_prefix_prop): Initialize bidi
+	paragraph direction if not yet done.  (Bug#72287)
+
+2024-07-25  Mattias Engdegård  <mattiase@acm.org>
+
+	Use timer accessors instead of aref/aset
+
+	* lisp/emacs-lisp/timer-list.el (list-timers):
+	* lisp/gnus/mail-source.el (mail-source-start-idle-timer):
+	* lisp/play/gamegrid.el (gamegrid-set-timer):
+	* lisp/progmodes/vhdl-mode.el (vhdl-run-when-idle):
+	* lisp/simple.el (analyze-text-conversion):
+	* lisp/time.el (display-time-event-handler):
+	Use timer accessors.
+
+2024-07-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp's method "kubernetes" supports now optional namespace
+
+	* doc/misc/tramp.texi (Inline methods): Extend Kubernetes host
+	name syntax by an optional namespace.
+	(Kubernetes setup): Mention optional namespace part of the host name.
+
+	* etc/NEWS: Tramp's method "kubernetes" supports now optional namespace.
+	Fix typos.
+
+	* lisp/net/tramp-container.el (tramp-kubernetes-namespace):
+	Initialize with nil.  Adapt docstring.
+	(tramp-kubernetes--name-regexp): New defconst.
+	(tramp-kubernetes--host-name-regexp): Change in order to cover
+	also an optional namespace.  (Bug#59797)
+	(tramp-kubernetes--namespace): New defun.
+	(tramp-kubernetes--context-namespace): Use it.
+	(tramp-skeleton-kubernetes-vector): Add sanity check for
+	superfluous user name or port number.
+
+2024-07-25  Tassilo Horn  <tsdh@gnu.org>
+
+	Fix jumping to page in DocView's text contents (bug#72275)
+
+	* lisp/doc-view.el (doc-view-open-text): Set page-delimiter to the form
+	feed character in the text contents buffer (bug#72275).
+
+2024-07-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix process-attributes rss and pmem on GNU/Linux
+
+	Problem reported by Rahguzar <https://bugs.gnu.org/72278>.
+	* src/sysdep.c (system_process_attributes):
+	[GNU_LINUX || CYGWIN || __ANDROID__]: When computing rss and pmem,
+	don’t assume pagesize is 4096; it could be greater.
+
+2024-07-25  Tassilo Horn  <tsdh@gnu.org>
+
+	Describe that DocView text contents display is in a separate buffer
+
+	* doc/emacs/misc.texi (Document View): Adjust the docs to describe the
+	new behavior (separate buffer for the text contents) from bug#72241.
+
+2024-07-25  Manuel Giraud  <manuel@ledu-giraud.fr>
+
+	bug#72241: 31.0.50; [PATCH] Use a dedicated buffer for `doc-view-open-text'
+
+	Here is an updated version of this patch.  WDYT?
+
+	From 6e32534012cafeda1d7e67aab23a8206bc887c9f Mon Sep 17 00:00:00 2001
+	From: Manuel Giraud <manuel@ledu-giraud.fr>
+	Date: Sun, 21 Jul 2024 18:52:52 +0200
+	Subject: [PATCH] Use a dedicated buffer for `doc-view-open-text'
+
+	* lisp/doc-view.el (doc-view-open-text): Create a new "text
+	contents" buffer and switch to it.
+	(doc-view-toggle-display): Switch back to the document buffer
+	and kill the "text contents" one.
+	* etc/NEWS: Mention the change.
+
+2024-07-24  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete defgroup "wp" obsolete since Emacs 26
+
+	* lisp/cus-edit.el (wp): Delete defgroup obsolete since Emacs 26.
+	(text): Don't inherit obsolete customization group 'wp'.
+	* lisp/finder.el (finder-known-keywords): Delete 'wp' keyword.
+
+2024-07-24  Stefan Kangas  <stefankangas@gmail.com>
+
+	(error): Remove support for old calling convention
+
+	* lisp/subr.el (error): Remove support for the Emacs 22 calling
+	convention '(error &rest args)'.
+
+2024-07-24  Andrea Corallo  <acorallo@gnu.org>
+
+	Add some basic checking for function type declarations
+
+	* lisp/emacs-lisp/byte-run.el (byte-run--anonymize-arg-list): New function.
+	(byte-run--set-function-type): Add some basic checking for
+	the function type being declared.
+
+2024-07-24  Andrea Corallo  <acorallo@gnu.org>
+
+	Merge from savannah/emacs-30
+
+	976416bebe2 Fix some function type declaration
+	23549d71751 * src/image.c (gui_put_x_image): Avoid memory leak.
+	cb633820c15 ; * doc/misc/use-package.texi (Getting Started): Fix word...
+
+2024-07-24  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt Tramp tests
+
+	* test/lisp/net/tramp-archive-tests.el (ert-resource-directory-format)
+	(ert-resource-directory-trim-left-regexp)
+	(ert-resource-directory-trim-right-regexp, ert-resource-directory)
+	(ert-resource-file): Don't define.
+	(tramp-archive--test-emacs28-p): Remove.
+	(top): Remove unneeded skips.  Use original objects instead of
+	their `tramp-compat-' counterparts when possible.
+
+	* test/lisp/net/tramp-tests.el (seq): Don't require.
+	(lock-file-name-transforms, process-file-return-signal-string)
+	(remote-file-name-inhibit-locks, dired-copy-dereference): Don't declare.
+	(ert-resource-directory-format)
+	(ert-resource-directory-trim-left-regexp)
+	(ert-resource-directory-trim-right-regexp, ert-resource-directory)
+	(ert-resource-file): Don't define.
+	(tramp--test-emacs28-p): Remove.
+	(top): Remove unneeded skips.  Use original objects instead of
+	their `tramp-compat-' counterparts when possible.
+
+2024-07-24  Michael Albinus  <michael.albinus@gmx.de>
+
+	Remove Emacs 27 compatibility from Tramp
+
+	* doc/misc/tramp.texi (Frequently Asked Questions):
+	Adapt supported Emacs versions.
+
+	* doc/misc/trampver.texi:
+	* lisp/net/trampver.el: Change version to "2.8.0-pre".
+
+	* lisp/net/tramp-compat.el (tramp-compat-file-modes)
+	(tramp-compat-set-file-modes, tramp-compat-set-file-times)
+	(tramp-compat-directory-files)
+	(tramp-compat-directory-files-and-attributes)
+	(tramp-compat-directory-empty-p, tramp-compat-null-device)
+	(tramp-compat-string-replace, tramp-compat-string-search)
+	(tramp-compat-make-lock-file-name)
+	(tramp-compat-file-name-concat)
+	(tramp-compat-replace-regexp-in-region, tramp-compat-length<)
+	(tramp-compat-length>, tramp-compat-length=)
+	(tramp-compat-always): Remove.
+
+	* lisp/net/tramp-adb.el:
+	* lisp/net/tramp-androidsu.el:
+	* lisp/net/tramp-archive.el:
+	* lisp/net/tramp-cache.el:
+	* lisp/net/tramp-cmds.el:
+	* lisp/net/tramp-compat.el:
+	* lisp/net/tramp-crypt.el:
+	* lisp/net/tramp-fuse.el:
+	* lisp/net/tramp-gvfs.el:
+	* lisp/net/tramp-message.el:
+	* lisp/net/tramp-sh.el:
+	* lisp/net/tramp-smb.el:
+	* lisp/net/tramp-sshfs.el:
+	* lisp/net/tramp-sudoedit.el:
+	* lisp/net/tramp.el: Use original objects instead of their
+	`tramp-compat-' counterparts when possible.
+
+2024-07-24  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	3a76354e092 Adapt last change to non-NS systems
+
+2024-07-24  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	b5543c54bf0 Fix NULL pointer dereferences in xpm_load_image
+
+2024-07-24  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	1ee8579eb7d Fix bug#72255
+	05629d3af0a Delete redundant "a.k.a." in use-package.texi
+	c7609464f70 Document (use-package 'emacs) declarations
+	de9f9add138 Improve 'emacs-news-view-mode' menus and bindings
+	7588e1f8a9f ; * src/xdisp.c (Fformat_mode_line): Doc fix.
+	2074e94c3b1 Fix disappearing bar cursor on Hebrew text (bug#72230)
+	1aaadc8aec5 Fix DocView with DVI files
+	c1382257aa8 ; Fix typo in use-package.texi
+	caf7426f0ca FIx spurious fontification of variable in Java Mode
+	9b426e15abd Correctly typeset nil and t in texinfo
+	f050b9c5033 Fix Tramp IPv6 handling in tests
+	46b192c04b1 Update to Org 9.7.8-5-gfdf0e0
+	87f41b937bc Fix Ftreesit_parser_create
+
+2024-07-24  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	c66bda1a19a Improve treesit-node-child-by-field-name docstring
+	85773ab9771 Minor copyedits in tree-sitter starting guide
+	2dacec1609a Update tag for prebuilt tree-sitter grammars
+	68615a38669 Fix punctuation and doc style in treesit.c
+	00adee897ac ; Fix punctuation in docs
+	ab29b28d4ba Fix DocView with PostScript files
+
+2024-07-23  Juri Linkov  <juri@linkov.net>
+
+	* lisp/isearch.el: Exit Isearch after deleting the frame (bug#41338).
+
+	(isearch-mode): Add 'isearch-done' to 'delete-frame-functions'.
+	(isearch-done): Remove 'isearch-done' from 'delete-frame-functions'.
+
+2024-07-23  Juri Linkov  <juri@linkov.net>
+
+	* lisp/isearch.el: Preserve original value of overriding-terminal-local-map.
+
+	(isearch--saved-local-map): New variable (bug#72229).
+	(isearch-mode): Set isearch--saved-local-map to
+	overriding-terminal-local-map.
+	(isearch-done): Set overriding-terminal-local-map back to
+	isearch--saved-local-map.
+	(isearch-mouse-2): Let-bind overriding-terminal-local-map to
+	isearch--saved-local-map.
+	(isearch-done): Move comment intended to be docstring to docstring.
+
+2024-07-23  Po Lu  <luangruo@yahoo.com>
+
+	Better reproduce mouse event coalescence during touch event translation
+
+	* lisp/touch-screen.el (touch-screen-handle-touch): Save the
+	confines of the current mouse glyph before initiating simple
+	translation.
+
+2024-07-23  Visuwesh  <visuweshm@gmail.com>
+
+	Don't highlight matches in dired query-replace commands
+
+	* lisp/dired-aux.el (dired-do-query-replace-regexp)
+	(dired-do-replace-regexp-as-diff)
+	(dired-do-find-regexp-and-replace): Turn off lazy highlighting
+	when reading the regexp from the user to avoid highlighting
+	regexp matches in the dired buffer. (bug#72147)
+
+2024-07-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	* src/comp.c (obj_to_reloc): Use eassume.
+
+2024-07-22  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use SBYTES instead of strlen in treesit.c
+
+	* src/treesit.c (treesit_ensure_query_compiled)
+	(Ftreesit_node_child_by_field_name, treesit_initialize_query):
+	Use SBYTES instead of strlen.
+
+2024-07-22  Po Lu  <luangruo@yahoo.com>
+
+	Prohibit unbinding of built-in variables
+
+	* src/data.c (set_internal): Signal error if a BLV with a
+	redirect or a forwarded symbol is being unbound.
+
+	* test/src/data-tests.el (binding-test-makunbound-built-in): New
+	test.
+
+2024-07-22  Yuan Fu  <casouri@gmail.com>
+
+	Fix segfault when deleting tree-sitter query (bug#72238)
+
+	* src/treesit.c (treesit_delete_query): Only delete query and cursor
+	when they are non-NULL.
+
+2024-07-21  Theodor Thornhill  <theo@thornhill.no>
+
+	Add link to commit compatibility function handles
+
+	* lisp/progmodes/typescript-ts-mode.el
+	(tsx-ts-mode--indent-compatibility-b893426): Add link to GitHub.
+
+2024-07-21  Theodor Thornhill  <theo@thornhill.no>
+
+	Improve one test (bug#71998)
+
+	* test/lisp/progmodes/typescript-ts-mode-resources/indent.erts (Name):
+	Add pre-indent state.
+
+2024-07-21  Theodor Thornhill  <theo@thornhill.no>
+
+	Signal error on wrong typescript dialect
+
+	*
+	lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode-wrong-dialect-error):
+	New error.
+
+	*
+	lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode--check-dialect):
+	Helper function.
+
+	*
+	lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode--indent-rules,
+	tsx-ts-mode--font-lock-compatibility-bb1f97b,
+	tsx-ts-mode--font-lock-compatibility-function-expression,
+	tsx-ts-mode--font-lock-compatibility-function-expression,
+	typescript-ts-mode--font-lock-settings): Use the new helper.
+
+2024-07-21  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/progmodes/go-ts-mode.el (go-ts-mode-build-tags): Fix :version.
+
+2024-07-21  Ankit R Gadiya  <git@argp.in>
+
+	Add commands to run unit tests in 'go-ts-mode'
+
+	* lisp/progmodes/go-ts-mode.el (go-ts-mode-build-tags): New variable.
+	(go-ts-mode-map): Add new bindings.
+	(go-ts-mode--get-build-tags-flag, go-ts-mode--compile-test)
+	(go-ts-mode--find-defun-at, go-ts-mode--get-function-regexp)
+	(go-ts-mode--get-functions-in-range)
+	(go-ts-mode--get-test-regexp-at-point)
+	(go-ts-mode-test-function-at-point, go-ts-mode-test-this-file)
+	(go-ts-mode-test-this-package): New functions.
+
+	* etc/NEWS: Mention the change.
+
+	(Bug#70939)
+
+2024-07-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix bool vector length overflow
+
+	* src/alloc.c (make_clear_bool_vector): It’s now the caller’s
+	responsibility to make sure the bool vector length is in range.
+	Add an eassert to double-check this.  This lets some locals be
+	ptrdiff_t not EMACS_INT.
+	(Fmake_bool_vector, Fbool_vector):
+	Check that bool vector lengths are in range.
+	* src/lisp.h (BOOL_VECTOR_LENGTH_MAX): New macro.
+	(bool_vector_words, bool_vector_bytes): Avoid undefined
+	behavior if size == EMACS_INT_MAX - (BITS_PER_BITS_WORD - 1).
+	This is mostly theoretical but it’s easy to do it right.
+	* src/lread.c (read_bool_vector): Use EMACS_INT, not just ptrdiff_t.
+	Check that length doesn’t exceed BOOL_VECTOR_LENGTH_MAX.
+	This fixes an unlikely integer overflow where the calculated size
+	went negative.
+
+2024-07-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Change list-length intptr_t to ptrdiff_t
+
+	* src/fns.c (list_length, Fsafe_length, Fproper_list_p):
+	Use ptrdiff_t not intptr_t for accumulator, since result is ptrdiff_t.
+	This fixes a minor glitch in 2019-01-11T05:35:31!eggert@cs.ucla.edu
+	where I removed unnecessary overflow checks but forgot to change types.
+	This change should alter generated code only on oddball platforms where
+	ptrdiff_t is narrower than intptr_t, e.g., CheriBSD.
+
+2024-07-20  Yuan Fu  <casouri@gmail.com>
+
+	Support dumping tree-sitter query (bug#69952)
+
+	Previous commit allows Emacs to dump tree-sitter queries by simply
+	dumping the query string and language symbol, and left the query object
+	and cursor object as NULL.  This commit makes sure Emacs doesn't crash
+	when loading the dumped query, by make sure Emacs can handle the case
+	where the cursor is NULL.
+
+	* src/treesit.c (make_treesit_query): Initialize query with null cursor.
+	(treesit_ensure_query_cursor): New function.
+	(treesit_initialize_query): Ensure cursor is non-null.
+	* src/treesit.h (Lisp_TS_Query): Update documentation.
+
+2024-07-20  Sergey Vinokurov  <serg.foo@gmail.com>
+
+	Support compiled queries in pdump by dumping source (bug#69952)
+
+	* src/pdumper.c (dump_vectorlike): Dump compiled queries.
+	* src/pdumper.c (dump_treesit_compiled_query): New function.
+
+2024-07-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	SAFE_ALLOCA fixes
+
+	* src/comp.c (declare_imported_func, emit_simple_limple_call)
+	(declare_lex_function, compile_function):
+	* src/emacs-module.c (funcall_module):
+	* src/fns.c (Fstring_distance):
+	* src/font.c (font_sort_entities):
+	* src/haikumenu.c (digest_menu_items, haiku_menu_show):
+	* src/pgtkselect.c (Fpgtk_register_dnd_targets):
+	* src/xfns.c (Fx_begin_drag):
+	* src/xmenu.c (x_menu_show):
+	* src/xterm.c (x_dnd_compute_toplevels, handle_one_xevent)
+	(x_term_init):
+	Prefer SAFE_NALLOCA to doing size multiplication by hand, to catch
+	unlikely integer overflows.
+	* src/comp.c (emit_simple_limple_call): Fix bug where
+	SAFE_FREE was called too early, leading to unlikely
+	use of freed storage.
+	* src/xterm.c (handle_one_xevent): Remove side effects
+	from SAFE_ALLOCA args, as the args are evaluated twice.
+
+2024-07-20  Stefan Kangas  <stefankangas@gmail.com>
+
+	Avoid magic values in xfont_list
+
+	* src/xfont.c (xfont_list): Avoid magic values.
+
+2024-07-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	816c53c2d9d Fix bibtex validation for non-file buffers
+	ab7c40ea52a Fix Imenu in 'emacs-news-view-mode'
+	ea30ffc52b3 ; * doc/misc/gnus.texi (Agent Caveats): Fix doc
+	07b1a36f78c ; * src/sqlite.c (Fsqlite_load_extension): Add "vec0" to ...
+	96f1db89ee7 Avoid errors in 'icomplete-vertical-mode'
+	55110d1fda2 Document GNU ELPA copyright in tips.texi
+	079e5a03156 Improve register-use-preview docstring
+	e4760109ac8 Miscellaneous checkdoc fixes
+
+2024-07-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Avoid accessing uninitialized bool_vector words
+
+	Although loading uninitialized works from memory and then ignoring
+	the result works fine on conventional architectures, it
+	technically has undefined behavior in C, so redo bool_vector
+	allocation so that the code never does that.  This can improve
+	performance when allocating large vectors of nil, since calloc can
+	clear the memory lazily.
+	* src/alloc.c (make_clear_bool_vector): New function,
+	a generalization of make_uninit_bool_vector.
+	(make_uninit_bool_vector): Use it.
+	(Fmake_bool_vector): If !INIT, rely on make_clear_bool_vector.
+	* src/alloc.c (Fbool_vector):
+	* src/fns.c (Freverse): Don’t access uninitialized bool_vector words.
+
+2024-07-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix setup of fonts for 'han' script.
+
+	* lisp/international/fontset.el (script-representative-chars): Add
+	more CJK representative characters to 'han' script.  (Bug#72188)
+
+2024-07-20  Po Lu  <luangruo@yahoo.com>
+
+	Fix compilation on builds with native rectangle structures
+
+	* src/androidgui.h (CONVERT_TO_NATIVE_RECT)
+	(CONVERT_FROM_EMACS_RECT): Delete redundant macro definitions.
+
+	* src/xdisp.c (Fremember_mouse_glyph) [CONVERT_TO_EMACS_RECT]:
+	Expand CONVERT_TO_EMACS_RECT to convert native rectangles into
+	a readable format if required.  Reported by Stefan Kangas
+	<stefankangas@gmail.com>.
+
+2024-07-20  Po Lu  <luangruo@yahoo.com>
+
+	Respect mouse-fine-graned-tracking in touch screen simple translation
+
+	* lisp/touch-screen.el (touch-screen-current-tool): Expand doc
+	string.
+	(touch-screen-handle-point-update): Record extents of glyph
+	beneath the mouse as computed by `remember_mouse_glyph' if
+	necessary, and defer generation of mouse-movement events till
+	the mouse exit it.
+
+	* src/xdisp.c (Fremember_mouse_glyph): New function.
+	(syms_of_xdisp): Define new subr.
+
+2024-07-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Work around GCC bug 58416 on 32-bit x86
+
+	* configure.ac (C_SWITCH_MATCHINE): On 32-bit x86 with GCC 4+,
+	append -mfpmath=sse (if SSE2 is known to work) or -fno-tree-sra
+	(otherwise) to work around GCC bug 58416.
+	* etc/NEWS: Mention this.
+
+2024-07-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	In ‘INSTALL’ put configure vars in one section
+
+	* INSTALL: Move description of CFLAGS etc. into the section headed
+	“Here is a complete list of the variables you may want to set”
+	since they are also variables one might want to set.
+
+2024-07-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Merge from origin/emacs-30
+
+	a478423d19f * lisp/progmodes/peg.el (peg-syntax-classes): Typo (bug#7...
+	951fb93956d * lisp/transient.el (static-if): Remove duplicated defini...
+	0218fb21437 Adapt file-remote-p doc
+	34c1094e607 ; Fix typo in etc/ORG-NEWS (Bug#72186)
+	5916b172bdc * etc/TODO: Delete item about merging Magit.
+	a6cab228d4d ; Fix typos
+	41dc28244f2 * doc/man/emacs.1.in: Add "No warranty" notice.
+	b2ac3435867 ; * doc/man/emacs.1.in: Improve wording.
+	110b3d08d73 Improve emacs man page description of --user flag
+	4911f08912a Checkdoc fixes in allout-widgets.el
+	109b592d77b Checkdoc fixes in subr.el
+	46436720787 Checkdoc fixes in touch-screen.el
+	9889774c62e Checkdoc fixes in treesit.el
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-07-19  Jim Porter  <jporterbugs@gmail.com>
+
+	Don't set exit info in Eshell if the command is being piped elsewhere
+
+	Previously, the exit info in Eshell was that of the last command that
+	finished, rather than the last command in a pipeline.
+
+	* lisp/eshell/esh-cmd.el (eshell-exec-lisp)
+	(eshell-lisp-command): Check whether the command is being piped.
+
+	* lisp/eshell/esh-proc.el (eshell-gather-process-output): Record whether
+	the command is being piped...
+	(eshell-sentinel): ... and do the right thing with that info.
+
+	* test/lisp/eshell/esh-proc-tests.el
+	(esh-proc-test/sigpipe-exits-process): Check the exit status to ensure
+	we don't report the first process's SIGPIPE exit.
+
+2024-07-19  Jim Porter  <jporterbugs@gmail.com>
+
+	Split out exit code parts of 'eshell-close-handles' into a new function
+
+	* lisp/eshell/esh-cmd.el (eshell-last-command-status)
+	(eshell-last-command-result): Move here from esh-io.el.
+	(eshell-set-exit-info): New function, extracted from
+	'eshell-close-handles'.
+
+	* lisp/eshell/esh-io.el (eshell-close-handles): Make old calling
+	convention obsolete.  Update callers to use 'eshell-set-exit-info' as
+	needed.
+
+2024-07-19  Philip Kaludercic  <philipk@posteo.net>
+
+	* lisp/which-key.el: Bump version to 3.6.1
+
+	This is necessary to trigger a new ELPA release.
+
+2024-07-19  Peder O. Klingenberg  <peder@klingenberg.no>
+
+	Visualize ranking of last game when adding scores
+
+	* lisp/play/gamegrid.el (gamegrid-add-score-insecure): Move point to
+	the score just added, or end of buffer if the new score did not make
+	the list.  This makes it easier to see where the last game
+	ranked.  (Bug#72185)
+
+2024-07-18  Jim Porter  <jporterbugs@gmail.com>
+
+	Allow specifying stdout/stderr separately in some Eshell commands
+
+	* lisp/eshell/eshell.el (eshell-command): Add ERROR-TARGET.
+	* lisp/eshell/em-script.el (eshell-execute-file): Make interactive, and
+	add ERROR-TARGET.
+
+	* doc/misc/eshell.texi (One-Off Commands, Scripts): Update
+	documentation.
+
+	* etc/NEWS: Announce this change.
+
+2024-07-18  Jim Porter  <jporterbugs@gmail.com>
+
+	Improve implementation of built-in Eshell "kill" command
+
+	* lisp/eshell/esh-proc.el (eshell/kill): Fix handling of commands like
+	"kill 123".  Use REMOTE when signalling PIDs in remote directories.
+	Signal using process objects when possible.  Report errors when failing
+	to signal.
+
+	* test/lisp/eshell/esh-proc-tests.el (esh-proc-test/kill/process-id)
+	(esh-proc-test/kill/process-object): New tests (bug#72013).
+
+2024-07-18  Jim Porter  <jporterbugs@gmail.com>
+
+	Handle broken pipes in a better way in Eshell
+
+	* lisp/eshell/esh-proc.el (eshell-insertion-filter): Send SIGPIPE
+	delaying for Tramp and falling back to SIGTERM for MS-Windows
+	(bug#72117).
+
+2024-07-18  Jim Porter  <jporterbugs@gmail.com>
+
+	Improve handling of deferrable Eshell commands
+
+	Now, we use the 'eshell-deferrable' wrapper to wrap a form that returns
+	a process (or list thereof).  This improves upon the old method, which
+	failed to handle 'eshell-replace-command' correctly.  In that case,
+	Eshell would fail to unmark commands as deferrable when necessary
+	(e.g. for commands in pipelines).
+
+	* lisp/eshell/esh-cmd.el (eshell-deferrable-commands): Make into a
+	defvar.
+	(eshell-deferrable): New function...
+	(eshell-structure-basic-command): ... use it.
+	(eshell-trap-errors): Rename to...
+	(eshell-do-command): ... this, and use 'eshell-deferrable'.  Update
+	callers.
+	(eshell--unmark-deferrable): Remove.  Update callers.
+	(eshell-execute-pipeline): Remove 'eshell-process-identity'.
+	(eshell-process-identity, eshell-named-command*, eshell-lisp-command*):
+	Make obsolete.
+
+	* test/lisp/eshell/esh-cmd-tests.el (eshell-test-replace-command): New
+	function.
+	(esh-cmd-test/pipeline/replace-command): New test.
+
+2024-07-18  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix minor code style issue in pgtkfns.c
+
+	* src/pgtkfns.c (pgtk_get_defaults_value)
+	(pgtk_set_defaults_value): Fix code style.
+
+2024-07-18  Stefan Kangas  <stefankangas@gmail.com>
+
+	Avoid overflow in pgtk_is_numeric_char
+
+	* src/pgtkfns.c (PATH_MAX_LEN): New macro.
+	(parse_resource_key): Avoid overflow if a key is RESOURCE_KEY_MAX_LEN
+	long by making the array larger.
+
+2024-07-18  Stefan Kangas  <stefankangas@gmail.com>
+
+	Use strnlen to avoid unnecessary work in pgtkfns.c
+
+	* src/pgtkfns.c (pgtk_get_defaults_value, pgtk_set_defaults_value):
+	Factor out new function...
+	(pgtk_check_resource_key_length): ...to here.  Avoid unnecessary work by
+	using strnlen.
+
+2024-07-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor cleanup of code in insdel.c
+
+	* src/insdel.c (del_range_2): Update *_BYTE variables _after_
+	updating the corresponding character values.  This follows what we
+	do everywhere else, and allows to put a watchpoint on, say, Z_BYTE
+	to check consistency between the character and byte counts.  See
+	bug#72165 for one situation where it is useful.
+
+2024-07-18  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	4c35382e983 ; * src/emacs.c (syms_of_emacs) <Vsystem_type>: Fix doc s...
+	34882d52432 Port better to Android 3.0
+	765cfaed775 ; * doc/emacs/anti.texi (Antinews): Fix typos (bug#72167).
+	7093504da2d ; Fix typos (bug#72167)
+	8c7c4f4baaa New Tramp tests
+	85d2d7982d4 Update Tramp manual
+	504bdd560af ; Fix last change
+	3ccebbe17b7 Fix 'toggle-window-dedicated' documentation
+	719d5753ca6 ; * doc/lispref/help.texi (Keys in Documentation): Add cr...
+	e3bba63ecb9 Checkdoc fixes in transient.el
+
+2024-07-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Go back to preferring -isystem to -I
+
+	* configure.ac: Go back to preferring -isystem to -I,
+	as headers like <gobject/gparam.h> still need it.  This
+	reverts almost all of 2024-07-16T02:25:44!eggert@cs.ucla.edu,
+	except that the ‘nw="$nw -Wsystem-headers"’ line continues to
+	be removed as it is no longer needed due to recent Gnulib changes.
+	Problem reported by Eli Zaretskii in:
+	https://lists.gnu.org/r/emacs-devel/2024-07/msg00756.html
+
+2024-07-17  Robert Pluim  <rpluim@gmail.com>
+
+	Add history variables for find-func entry points
+
+	* lisp/emacs-lisp/find-func.el (find-function--read-history-library):
+	New defvar.
+	(read-library-name): Use it in 'completing-read' calls.
+	(find-function--read-history-function,
+	find-function--read-history-variable, find-function--read-history-face):
+	New defvars.
+	(find-function-read): Use them in 'completing-read' calls.
+
+2024-07-17  Yuan Fu  <casouri@gmail.com>
+
+	Handle an edge case in c-ts-mode filling (bug#72116)
+
+	* lisp/progmodes/c-ts-common.el:
+	(c-ts-common-comment-setup): Add a new regexp branch.
+
+2024-07-17  João Távora  <joaotavora@gmail.com>
+
+	Eglot: supported nested {} patterns in globs
+
+	The tailwindcss-language server issues patterns like this:
+
+	   **/{tailwind,tailwind.config,tailwind.*.config,\
+	   tailwind.config.*}.{js,cjs,ts,mjs}
+
+	Notive the nested "*" blob inside the the {} group.
+
+	Eglot used to reject them in 'workspace/didChangeWatchedFiles' requests,
+	responding with "Internal Error".  This could confuse some servers.  Now
+	I've done some changes to the state machine generation and it supports
+	them.
+
+	* lisp/progmodes/eglot.el (eglot--glob-parse): Relax parser.
+	(eglot--glob-fsm): New helper.
+	(eglot--glob-compile, eglot--glob-emit-{}): Use it.
+
+	* test/lisp/progmodes/eglot-tests.el (eglot-test-glob-test):
+	Uncomment some test cases.
+
+	Github-reference: https://github.com/joaotavora/eglot/issues/1403
+
+2024-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Check for more ‘find’ failures and port ‘find’
+
+	* Makefile.in (install-eln), configure.ac (emacs_cv_find_delete):
+	* make-dist: Use ‘find ... -exec CMD {} +’ rather than ‘find
+	... -exec CMD {} \;’ so that if CMD fails, ‘find’ fails too.
+	* Makefile.in (install-eln): Port to ‘find’ implementations that
+	behave differently from GNU ‘find’ when given an argument
+	that contains ‘{}’ within a longer string.  POSIX allows
+	this behavior.
+
+2024-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Quote BIN_DESTDIR better
+
+	* Makefile.in (BIN_DESTDIR, install-eln, uninstall):
+	* src/Makefile.in ($(pdmp)):
+	Be more consistent about quoting BIN_DESTDIR and ELN_DESTDIR,
+	avoiding double-quoting ''like this'' which does not work as
+	expected.
+
+2024-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Prefer -I to -isystem
+
+	* configure.ac: Simplify configuration by using -I instead of
+	-isystem, as -isystem is no longer helpful for suppressing
+	diagnostics (and likely has not been helpful for years).
+	Do not suppress -Wsystem-headers, as Gnulib no longer enables it.
+
+2024-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Simplify time form analysis
+
+	This does not change behavior; it merely refactors the code
+	for simplicity.
+	* src/timefns.c (enum timeform, struct form_time):
+	Remove.  All uses removed.
+	(decode_time_components): Accept HZ instead of FORM.
+	This saves a switch.  All uses changed.
+	(decode_lisp_time): Return union c_time instead of struct form_time.
+	All uses changed.
+	(lisp_time_cform): Remove.  All uses changed to just use
+	decode_lisp_time.
+	(time_arith, Ftime_convert): Check (TICKS . HZ) form directly
+	using CONSP, instead of using the old struct form_time.
+	That's fast enough here.
+
+2024-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Test !FASTER_TIMEFNS with builtin resolutions
+
+	* src/timefns.c (timespec_hz, trillion, ztrillion):
+	If !FASTER_TIMEFNS, do not optimize the calculations of
+	these variables.  This gives better test coverage of the
+	slow-path code, when compiling with -DFASTER_TIMEFNS=0.
+	(NEED_ZTRILLION_INIT): Move up, to simplify #ifdefery.
+	Now defined or not defined, instead of being 1 or not defined,
+	since it is used only via #ifdef.
+
+2024-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Make ztrillion static
+
+	* src/timefns.c (ztrillion): Now static, when it is a variable,
+	since no other module uses it.
+
+2024-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix buffer size problem in print_bool_vector
+
+	* src/print.c (print_bool_vector): Don’t assume SIZE fits
+	into ptrdiff_t, since it is an EMACS_INT.  This
+	pacifies gcc -Wformat-overflow on i686 --with-wide-int.
+
+2024-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	alloc.c: ckd_add, not by-hand checks
+
+	* src/alloc.c (lmalloc, lrealloc): Prefer ckd_add to
+	by-hand checks for integer addition overflow.
+
+2024-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix get_conversion_field --with-wide-wint overflow
+
+	* src/textconv.c (get_conversion_field): Set max value to
+	PTRDIFF_MAX, not MOST_POSITIVE_FIXNUM, since the variable is
+	ptrdiff_t, not EMACS_INT.  Problem caught by gcc -Woverflow on a
+	32-bit platform with --with-wide-int.
+
+2024-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify -Wmissing-variable-declarations for lisp_malloc_user
+
+	* src/alloc.c (lisp_malloc_user) [!USE_LSB_TAG]:
+	Provide extern decl.
+
+2024-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify 32-bit GCC 14.1.1 in timer_check_2
+
+	* src/keyboard.c (timer_check_2): Refactor to make flow control
+	more obvious, to pacify -Wanalyzer-use-of-uninitialized-value with
+	gcc 14.1.1 20240607 (Red Hat 14.1.1-5) on i686.
+
+2024-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Use Gnulib workaround for Android strnlen bug
+
+	The workaround for the Android 5.0 (API 21) strnlen bug
+	is now done in m4/strnlen.m4, taken from Gnulib, so
+	there is no need for Emacs to have its own workaround.
+	* configure.ac (ORIGINAL_AC_FUNC_STRNLEN, AC_FUNC_STRNLEN):
+	Remove.
+
+2024-07-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+2024-07-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt tressitter tests on EMBA
+
+	* test/infra/Makefile.in (TREE-SITTER-FILES): Simplify.
+
+	* test/infra/test-jobs.yml: Regenerate.
+
+2024-07-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make error messages adhere to our standards
+
+	* src/cygw32.c (chdir_to_default_directory):
+	* src/fns.c (secure_hash):
+	* src/keyboard.c (Finternal_handle_focus_in):
+	* src/keymap.c (store_in_keymap):
+	* src/pgtkfns.c (pgtk_set_scroll_bar_foreground)
+	(pgtk_set_scroll_bar_background, Fx_export_frames)
+	(Fpgtk_set_monitor_scale_factor, pgtk_get_defaults_value)
+	(pgtk_set_defaults_value, Fpgtk_print_frames_dialog)
+	(pgtk_get_monitor_scale_factor):
+	* src/pgtkterm.c (pgtk_set_parent_frame):
+	* src/process.c (network_interface_info, send_process):
+	* src/w32.c (w32_read_registry):
+	* src/w32fns.c (Fw32_read_registry):
+	* src/window.c (Frecenter):
+	* src/xfns.c (Fx_export_frames, Fx_print_frames_dialog)
+	(x_set_mouse_color): Make 'error' message strings follow our guidelines.
+	More specifically, they should not end in a period, and normally also be
+	capitalized.  See '(elisp) Programming Tips'.
+
+2024-07-16  Po Lu  <luangruo@yahoo.com>
+
+	Merge remote-tracking branch 'savannah/master' into master-android-1
+
+2024-07-16  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	a7b68c25640 Fix intermittent failure of dired-test-bug27243-02
+	fc25b4d8370 * etc/TODO: Refer to Bug#72127 for Magit assignments.
+	17c62c1242f Rename treesitter test
+
+2024-07-16  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	68b7806c319 Support passing signals like 'SIGCODE' to 'tramp-signal-p...
+	510ca5e84b5 Merge branch 'emacs-30' of git.sv.gnu.org:/srv/git/emacs ...
+	fe28ba5d55b ; Replace quotes with @code{...} in texinfo files
+	ecc8516d9ca ; Replace (non-)nil with (non-)@code{nil} in texinfo files
+	3407e274999 Don't save to history from 'eshell-command' when aborting
+
+2024-07-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete commented out code from `signal_or_quit`
+
+	* src/eval.c (signal_or_quit): Delete code commented out since 2001.
+
+2024-07-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer `memcpy` to `strcpy` in image.c
+
+	* src/image.c (lookup_image, xpm_cache_color)
+	(imagemagick_create_cache): Prefer 'memcpy' to 'strcpy'.
+
+2024-07-16  Stefan Kangas  <stefankangas@gmail.com>
+
+	Restrict loop variable scope in `xpm_str_to_color_key`
+
+	* src/image.c (xpm_str_to_color_key): Restrict scope of
+	loop variable.
+
+2024-07-16  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Add project argument to project-kill-buffers
+
+	Previously, project-kill-buffers always called (project-current t).  A
+	Lisp program could change what project project-kill-buffers operated
+	on by binding project-current-directory-override.  However, in some
+	edge cases (for example, if the project was deleted between looking it
+	up and calling project-kill-buffers) this might fail to detect a
+	project, and so (project-current t) would prompt the user.
+
+	To avoid this, accept the project to kill buffers for as an argument.
+
+	* lisp/progmodes/project.el (project-kill-buffers): Take project as an
+	optional argument (bug#72019).
+
+2024-07-15  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	5ec73eca57c Update to Org 9.7.7-2-gf308d3
+	33ba72f52fd Fix decoding 'display' properties with SVG images in Enri...
+	174a0b7642b * configure.ac (D8): Fix typo.
+	c56e837a10e ; * src/android.c (setEmacsParams): Delete unused variable.
+
+2024-07-15  Michael Albinus  <michael.albinus@gmx.de>
+
+	Extend treesitter tests on emba
+
+	* test/infra/Dockerfile.emba (emacs-tree-sitter): Install c-ashrp
+	grammar.
+
+	* test/infra/Makefile.in (TREE-SITTER-FILES): Add csharp-mode-tests.el.
+	(tree-sitter-files): Rename from tree-sitter-files-template.
+	Generate .tree-sitter-files.
+
+	* test/infra/gitlab-ci.yml (test-tree-sitter): Extend .tree-sitter-files.
+
+	* test/infra/test-jobs.yml: Regenerate.
+
+2024-07-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve support for Tifinagh
+
+	* lisp/international/fontset.el (script-representative-chars)
+	(setup-default-fontset): Add support for Tifinagh.
+
+2024-07-14  Mattias Engdegård  <mattiase@acm.org>
+
+	Further time decoding tidying
+
+	* src/timefns.c (enum timeform): Reorder.
+	(decode_time_components, decode_lisp_time): Simplify and clean up.
+
+2024-07-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor improvement in 'rmail-redecode-body'
+
+	* lisp/mail/rmail.el (rmail-redecode-body): Signal user-error if
+	'rmail-enable-mime' is non-nil; doc fix.
+
+2024-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Minor renaming in timefns.c
+
+	* src/timefns.c (current_time_in_cform): Rename this static
+	function from current_time_in_form, since this is about enum cform
+	not enum timeform.  Use changed.
+
+2024-07-14  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	b00fc31dd1d Do not set LD_LIBRARY_PATH during Android initialization
+	04bf3172f03 ; Set Transient's version
+	e6f78485aa6 ; Fix typos in 'which-key-mode' (bug#72093)
+
+2024-07-13  Jim Porter  <jporterbugs@gmail.com>
+
+	Treat SVG images like other image types in 'shr-put-image'
+
+	For both SVG and no-SVG builds, this works as expected (in the no-SVG
+	case, it would raise an error which subsequently gets ignored).
+	However, compared to the previous implementation, this lets users resize
+	SVG images just like every other image type (bug#71913).
+
+	* lisp/net/shr.el (shr-put-image): Don't special-case SVGs.
+
+2024-07-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix renaming symlinks on MS-Windows
+
+	* src/w32.c (sys_rename_replace): Handle renames of a symlink.
+	This makes 'wdired-tests' succeed on MS-Windows.
+
+2024-07-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	a6c78ccf5f2 ; * src/w32fns.c (Fw32_notification_close): Fix typo (bug...
+	febafe37884 * test/lisp/wdired-tests.el (wdired-test-bug34915): Fix f...
+	846b79b6d02 Fix 'wdired-test-unfinished-edit-01'
+	bc154cba130 ; * src/search.c (Fre_search_forward): Clarify doc string...
+	53291e3d46e Fontify destructor in c++-ts-mode
+	d77f8a34750 Fix invalid defcustom type for erc-buffers option
+	d68a4ea3ec6 ; Fix 'ibuffer-do-isearch{-regexp}'
+	8b1a0f8695a Fix infloop in 'shell-resync-dirs'
+	ce13eee5ab7 ; * src/image.c (free_image_cache): Add assertion.  (Bug#...
+
+2024-07-13  Vincenzo Pupillo  <vincenzo.pupillo@unimi.it>
+
+	Fontify doxygen support to 'c-ts-mode', 'c++-ts-mode' and 'java-ts-mode'
+
+	Add doxygen support to 'c-ts-mode', 'c++-ts-mode' and
+	'java-ts-mode' using tree-sitter-doxygen from
+	github.com/tree-sitter-grammars.
+	* lisp/progmodes/c-ts-common.el
+	(c-ts-mode-doxygen-comment-font-lock-settings): Add font locking
+	rules for doxygen comment.
+
+	* lisp/progmodes/c-ts-mode.el (c-ts-mode--feature-list): Add
+	'document' feature.
+	(c-ts-mode--doxygen-comment-regex): New regular expression for
+	doxygen comments.
+	(c-ts-mode, c++-ts-mode): Add support for doxygen parser.
+	* lisp/progmodes/java-ts-mode.el (java-ts-mode): Add support for
+	doxygen parser.  (Bug#71874)
+
+2024-07-13  Mattias Engdegård  <mattiase@acm.org>
+
+	Simplify timestamp decoding
+
+	* src/timefns.c (current_time_in_form, time_spec_invalid): New.
+	(enum timeform): Remove TIMEFORM_INVALID.
+	(decode_time_components): Move handling of TIMEFORM_INVALID,
+	TIMEFORM_TICKS_HZ and TIMEFORM_NIL...
+	(decode_lisp_time): ...here, avoiding the detour.
+
+2024-07-12  Juri Linkov  <juri@linkov.net>
+
+	* lisp/gnus/mm-uu.el (mm-uu-type-alist): Fix end-regexp of git-format-patch.
+
+	Replace git-format-patch end-regexp "^-- " with "^$".
+	The regexp "^-- " was intended to mark the end
+	of the git-formatted patch.  However, git-format-patch
+	can produce patches without a signature.  Also often
+	patches are just copy-pasted from the output of 'C-x v d'.
+	Therefore, now an empty line marks the end of the patch
+	since properly formatted patches don't contain an empty line
+	and properly configured MUAs don't strip whitespace from patches.
+	Suggested by Luis Henriques <henrix@camandro.org> and
+	Kévin Le Gouguec <kevin.legouguec@gmail.com> in bug#72059.
+
+2024-07-12  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	b22ab99f0a8 Render more Android functions safe to execute in a batch ...
+
+2024-07-12  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	a5ef9e25680 Document means of executing Emacs from unrelated Android ...
+	0de0056fd6b Don't emit a prompt in Eshell when a background command i...
+	ec1e300a215 Fix reference from buffer-stale-function docstring
+
+2024-07-11  Andrea Corallo  <acorallo@gnu.org>
+
+	Add a type-check--optim test
+
+	* test/src/comp-tests.el (comp-tests-type-branch-optim-checker): New function.
+	(comp-tests-type-branch-optim): Add new test.
+
+2024-07-11  Andrea Corallo  <acorallo@gnu.org>
+
+	Some clean-up in comp-tests.el
+
+	* test/src/comp-tests.el (comp-tests-cond-rw-checked-function)
+	(comp-tests-cond-rw-checker-val)
+	(comp-tests-cond-rw-expected-type)
+	(comp-tests-cond-rw-checker-type): Remove.
+
+2024-07-11  Andrea Corallo  <acorallo@gnu.org>
+
+	Fix 'comp--type-check-optim-block' it using 'comp-cstr-type-p'
+
+	* lisp/emacs-lisp/comp.el (comp--type-check-optim-block): Better
+	condition.
+
+2024-07-11  Andrea Corallo  <acorallo@gnu.org>
+
+	Generalize 'comp-cstr-symbol-p'
+
+	* lisp/emacs-lisp/comp-cstr.el (comp-cstr-symbol-p): Make use of
+	'comp-cstr-type-p'.
+
+2024-07-11  Andrea Corallo  <akrl@sdf.org>
+
+	Add 'comp-type-check-optim' pass
+
+	* lisp/emacs-lisp/comp.el (comp-passes): Add 'comp--type-check-optim'.
+	(comp--type-check-optim-block, comp--type-check-optim): New functions.
+
+2024-07-11  Andrea Corallo  <acorallo@gnu.org>
+
+	Split 'comp--ssa' code
+
+	* lisp/emacs-lisp/comp.el (comp--ssa-function): New function.
+	(comp--ssa): Update.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Rename timefns static function lisp_time_struct
+
+	* src/timefns.c (lisp_time_cform): Rename from lisp_time_struct,
+	since it no longer returns a struct, and now accepts CFORM.
+	All uses changed.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Avoid mpz for some common timestamp cases
+
+	Performance problem reported by Gerd Möllmann and Mattias Engdegård in:
+	https://lists.gnu.org/r/emacs-devel/2024-06/msg00530.html
+	https://lists.gnu.org/r/emacs-devel/2024-06/msg00539.html
+	* src/timefns.c (CFORM_SECS_ONLY): The exact tv_nsec value is now
+	ignored if nonnegative (i.e., the only thing that matters is that
+	it’s nonnegative).
+	(decode_time_components): Use intmax_t instead of mpz arithmetic
+	if the tick count fits.  Add another ‘default: eassume (false);’
+	so that the revised code pacifies --enable-gcc-warnings with GCC
+	11.4.0 on x86-64.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Decode current time directly to timespec
+
+	* src/timefns.c (decode_time_components): If FASTER_TIMEFNS, when
+	returning the current time and the desired form is struct timespec
+	or time_t, return it directly rather than converting it to struct
+	ticks_hz and then to struct timespec.  This can avoid some mpz
+	calculations and/or bignums.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	In timefns.c avoid by-hand overflow checking
+
+	Prefer functions like ckd_add to do overflow checking, instead of
+	doing it by hand, to simplify and I hope to make things a bit less
+	error prone.
+	* src/timefns.c (TIME_T_MIN, TIME_T_MAX): Remove.  All by-hand
+	overflow checking replaced with calls to ckd_add or ckd_mul.
+	(s_ns_to_timespec): New static function, that uses ckd_add
+	instead of by-hand overflow checking.
+	(ticks_hz_to_timespec): Use it.
+	(check_tm_member): Use mpz_fits_sint_p and mpz_get_si rather
+	than mpz_to_intmax and by-hand overflow checking.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Optimize smallish mpz to native int conversion
+
+	* src/bignum.c (make_integer_mpz, mpz_to_intmax):
+	If FASTER_BIGNUM, optimize the common case where the value fits in
+	long int.  In this case we can use mpz_fits_slong_p and mpz_get_si
+	instead of looping with mpz_getlimbn.
+	(mpz_to_uintmax): Likewise for unsigned long int and mpz_get_ui.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	New FASTER_BIGNUM macro to test slow-path code
+
+	* src/bignum.h (FASTER_BIGNUM): New macro.
+	(mpz_set_intmax, mpz_set_uintmax): Optimize only if FASTER_BIGNUM.
+	Also, use ckd_add to test for overflow instead of doing it by hand.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	In timefns, call natnump only for non-fixnums
+
+	* src/timefns.c (decode_time_components): Call Fnatnump only
+	for non-fixnums, as we need to special-case 0 anyway.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	In timefns, do gcd reduction more often
+
+	* src/timefns.c (ticks_hz_hz_ticks): Reduce by gcd
+	even if t.ticks is not a fixnum, since that’s easy.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	In timefns, prefer ui mul and div
+
+	* src/timefns.c (ticks_hz_hz_ticks): If the multiplier
+	is a fixnum that fits in unsigned long, use mpz_mul_ui
+	instead of the more-expensive mpz_mul.  Similarly, if the
+	divisor is a fixnum that fits in unsigned long, use
+	mpz_fdiv_q_ui instead of mpz_fdiv_q.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Reduce size of integer product in timefns
+
+	* src/timefns.c (emacs_gcd): New static function.
+	(ticks_hz_hz_ticks): Use it to reduce the size of the integer
+	product in the common case when converting from ns to ps.  For
+	that, we need to multiply t.ticks only by 10³, not multiply by
+	10¹² and then divide by 10⁹.  This avoids the need to use bignums
+	in a significant number of cases.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Rename timefns internals
+
+	The old names didn’t fit in the conventions used for newer names.
+	* src/timefns.c (struct ticks_hz): Rename from struct lisp_time.
+	(union c_time): Rename lt to th.
+	(ticks_hz_hz_ticks): Rename from lisp_time_hz_ticks.
+	(ticks_hz_seconds): Rename from lisp_time_seconds.
+	All uses changed.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Speed up decode-time when not doing subseconds
+
+	* src/timefns.c (Fdecode_time): Avoid some unnecessary conversions
+	in the common case where subsecond resolution is not required.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Push some time conversions down
+
+	* src/timefns.c: Push some time conversions down to lower level fns.
+	This is a win in its own right and should allow for further speedups.
+	(lisp_to_timespec): Remove; this convenience function is no longer
+	needed now that there would be only one caller.  Remaining caller
+	changed to use definiens.
+	(enum cform): New constant CFORM_TIMESPEC.  Also, CFORM_SECS_ONLY
+	now generates a struct timespec instead of a struct lisp_time.
+	(union c_time.ts): New member.
+	(decode_ticks_hz): Handle new struct timespec cases.
+	(decode_float_time, lisp_time_struct): New arg cform, and return
+	union c_time rather than struct lisp_time.  All callers changed.
+	(list4_to_timespec, lisp_time_argument, lisp_seconds_argument):
+	Let lower-level function do the conversion, to allow for better
+	optimization.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Split lisp_to_timespec in two
+
+	* src/timefns.c (ticks_hz_to_timespec): New function,
+	which is almost all the old lisp_to_timespec but with
+	a 2-arg API.  This should help further changes.
+	(lisp_to_timespec): Use it.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Refactor decode_ticks_hz via switch
+
+	* src/timefns.c (decode_ticks_hz): Change ?: to ‘switch’,
+	for benefit of future changes.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Refactor timefns order
+
+	Move definitions around in timefns.c.  This does not affect the
+	implementation; it merely makes future changes easier to follow.
+	* src/timefns.c (frac_to_double, mpz_time, lisp_to_timespec)
+	(enum cform, union c_time, decode_ticks_hz): Move earlier.
+
+2024-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Refactor timefns more functionally
+
+	Use a more-functional style in timefns.c, rather than passing
+	pointers to objects that are filled in.  Although this does not
+	change behavior, it should help future improvements to the code.
+	* src/keyboard.c (decode_timer): Return a possibly-invalid struct
+	timespec instead of storing a timespec into a location specified
+	by an arg, and returning bool.  All callers changed.
+	* src/systime.h (struct lisp_time): Move from here to src/timefns.c,
+	since the type is private to timefns.c.
+	* src/timefns.c (decode_float_time, decode_ticks_hz):
+	Return timestamp instead of storing it into a location specified
+	by an arg.  All callers changed.
+	(enum cform, union c_time, struct err_time, struct form_time):
+	New types, to aid functional style.
+	(decode_time_components): Return struct err_time
+	instead of returning err and storing timestamp into a location
+	specified by an arg.  New arg cform.  All callers changed.
+	(decode_lisp_time): Return struct form_time instead of returning
+	form and storing timestamp into a location specified by an arg.
+	New arg cform, replacing decode_secs_only.  All callers changed.
+	(list4_to_timespec): Return possibly-invalid timestamp instead
+	of returning a bool and storing timestamp into a location specified
+	by an arg.  All callers changed.
+	(lisp_time_struct): Omit no-longer-needed arg PFORM.
+	All callers changed.
+
+2024-07-11  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	e0b271e279b Take precautions against ill-formed content URIs
+	9331ab056a4 etags-regen-mode: Handle TAGS buffer being killed
+	ef3f26ec02d ; Tag ERC multiline blanks test as :expensive
+	945335fec1e Improve 'put-image' documentation
+	c38d5cc3b28 Improve 'set-fontset-font' documentation
+	7de4dbea08f Adapt Tramp's "run0" method
+	871585db4ca * test/src/sqlite-tests.el (sqlite-execute-batch): Declar...
+	5cf8d60e0de Capitalize "Dired" and "Lisp" in docstrings
+	37475c9af7a Document Eshell entry points
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-07-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* lib/timespec-sub.c: Copy manually from Gnulib.
+
+2024-07-10  Michael Albinus  <michael.albinus@gmx.de>
+
+	Extend dbus-test04-call-method-authorizable
+
+	* test/lisp/net/dbus-tests.el
+	(dbus--test-method-authorizable-handler): New defun.
+	(dbus-test04-call-method-authorizable): Extend test.
+
+2024-07-10  Po Lu  <luangruo@yahoo.com>
+
+	* configure.ac: Fix typo in commentary of strlen substitute.
+
+2024-07-10  Jim Porter  <jporterbugs@gmail.com>
+
+	Improve Eshell's behavior when waiting for processes
+
+	This has a few benefits.  First, it fixes a race condition when killing
+	old processes in 'eshell-command'.  Second, the "wait" built-in command
+	is now more useful.  Finally, killing processes when exiting Eshell (via
+	'eshell-round-robin-kill') should be much faster.
+
+	* lisp/eshell/esh-proc.el (esh-opt): Require.
+	(eshell-wait-for-process): Make obsolete in favor of...
+	(eshell-wait-for-processes): ... this.  Accept a timeout and support
+	PIDs.  Update callers.
+	(eshell/wait): New implementation accepting -t/--timeout.
+	(eshell-round-robin-kill): Use 'eshell-wait-for-processes'.
+
+	* lisp/eshell/eshell.el (eshell-command): Use 'eshell-round-robin-kill'.
+
+	* doc/misc/eshell.texi (List of Built-ins): Document the new "wait"
+	behavior.
+
+	* etc/NEWS: Announce this change.
+
+2024-07-10  Jim Porter  <jporterbugs@gmail.com>
+
+	Don't use the Lisp implementation of "kill" in remote Eshell directories
+
+	* lisp/eshell/esh-proc.el (eshell/kill): When in a remote directory,
+	fall back to the external "kill" program (bug#72013).
+
+2024-07-09  Andrea Corallo  <acorallo@gnu.org>
+
+	* test/src/comp-tests.el (compile-forms): Simplify test.
+
+2024-07-09  Andrea Corallo  <acorallo@gnu.org>
+
+	Support interpreted functions as input for 'native-compile' (bug#71934)
+
+	* lisp/emacs-lisp/comp.el (comp--spill-lap-single-function): New function.
+	(comp--spill-lap-function): Make use of and do not accept
+	'(closure ...' as input.
+	(comp--spill-lap-function): Specialize on interpreted functions as
+	well.
+	(native-compile): Update doc.
+	* test/src/comp-tests.el (compile-interpreted-functions): New test.
+
+2024-07-09  Mattias Engdegård  <mattiase@acm.org>
+
+	Use cheaper string constructors
+
+	* src/coding.c (make_string_from_utf8):
+	* src/fileio.c (file_name_directory):
+	* src/lread.c (Fintern):
+	* src/gnutls.c (Fgnutls_format_certificate):
+	Use `make_multibyte_string` and `make_unibyte_string` instead of
+	more expensive `make_specified_string` and `make_string_from_bytes`.
+
+2024-07-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	Warn if D-Bus error "InteractiveAuthorizationRequired" occurs
+
+	* lisp/net/dbus.el
+	(dbus-error-interactive-authorization-required): New defconst.
+	(dbus-warn-interactive-authorization-required): New defun.
+	(dbus-event-error-functions): Add it.
+
+2024-07-09  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	8350ebd22e9 Fix bug#71929
+	8f96e0064fa ; Change `imap-shell-host` docstring to mention SSH
+
+2024-07-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt dbus-tests.el
+
+	* test/lisp/net/dbus-tests.el
+	(dbus-test04-call-method-authorizable): New test.
+	(dbus--test-signal-handler): Remove debug message.
+
+2024-07-09  Steven Allen  <steven@stebalien.com>
+
+	Support interactive D-Bus authorization
+
+	When invoking D-Bus methods, let the user enable interactive
+	authorization by passing an :authorizable t parameter.  This makes
+	it possible to D-Bus methods that require polkit authorization.
+
+	* configure.ac (HAVE_DBUS_MESSAGE_SET_ALLOW_INTERACTIVE_AUTHORIZATION):
+	Set a new variable if `dbus_message_set_allow_interactive_authorization'
+	is available.
+
+	* src/dbusbind.c (dbus-message-internal): Allow interactive
+	authorization by passing :authorizable t.
+
+	* doc/misc/dbus.texi (Synchronous Methods, Asynchronous Methods):
+	* etc/NEWS:
+	* lisp/net/dbus.el (dbus-call-method-asynchronously): Document the
+	new parameter.
+
+2024-07-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	Make D-Bus tests stable
+
+	* test/lisp/net/dbus-tests.el (dbus-debug): Declare, not define.
+	(dbus--test-event-expected): New defvar.
+	(dbus--test-signal-handler): Check for `dbus--test-event-expected'.
+	(dbus-test05-register-signal-with-nils)
+	(dbus-test08-register-monitor): Adapt tests.
+
+2024-07-09  Andrea Corallo  <acorallo@gnu.org>
+
+	Merge from savannah/emacs-30
+
+	671ad83026e Fix bug#70697 with respect to fringe bitmaps
+	15c591bad62 Fix byte-compiler warning in calc.el
+
+	# Conflicts:
+	#	lisp/calc/calc.el
+
+2024-07-09  Andrea Corallo  <acorallo@gnu.org>
+
+	Silence a warning in 'calc-embedded-open-close-new-formula-alist'
+
+	* lisp/calc/calc.el (calc-embedded-open-close-new-formula-alist):
+	Silence warning.
+
+2024-07-09  Andrea Corallo  <acorallo@gnu.org>
+
+	* etc/TODO (Native compiler improvements): Add entry.
+
+2024-07-09  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	dce31372a60 editorconfig-core-handle.el: Fix regressions in fnmatch h...
+	ed2986494c7 Checkdoc fixes in `url/*.el`
+	846c0e10ffa Checkdoc fixes in `term/*.el`
+	3977aa07568 Checkdoc fixes in `mh-e/*.el`
+	521f740d013 Checkdoc fixes in `calc/*.el`
+	336aa6ab17a Checkdoc fixes in `textmodes/*.el`
+	e19fd6a22de Checkdoc fixes in `gnus/*.el`
+	7350457c793 Checkdoc fixes in `eshell/*.el`
+	23c1ba81ddd Checkdoc fixes in `emulation/*.el`
+	c85f67a66df Checkdoc fixes in `erc/*.el`
+	e392382e2e2 Checkdoc fixes in `vc/*.el`
+	ef7364b070e Checkdoc fixes in `emacs-lisp/*.el`
+	5fe1ae0e843 Checkdoc fixes in `mail/*.el`
+	e43e9d09986 Checkdoc fixes in `net/*.el`
+	4c6e9f5b004 Improve `use-package-vc-valid-keywords` docstring format
+	928180f32be ; * etc/TODO: New item on installing Magit.
+	c193a702dc2 ; Improve a recent change to the documentation
+	6ebc5d5c278 ; Delete fixed item from etc/TODO: "proced on macOS"
+	7b2778e3a3d ; Delete fixed NS bug from etc/TODO
+	84552ff395c Revert "Fix link to major mode variable in docstring"
+	198063ba643 * etc/TODO: Add item to convert documentation to 'setopt'.
+	92de67829ca Prefer 'setopt' in browse-url docs
+	76683853905 ; Improve 'native-comp-debug' documentation
+
+2024-07-08  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make checkdoc recognize "U.S." acronym
+
+	* lisp/emacs-lisp/checkdoc.el (checkdoc-in-abbreviation-p): Recognize
+	"U.S." acronym.
+
+2024-07-08  Pip Cet  <pipcet@protonmail.com>
+
+	perl-mode: fix bug introduced in bd86a6c4fde
+
+	* lisp/progmodes/perl-mode.el (perl-calculate-indent): Use
+	`save-excursion' around code that modifies point.
+
+2024-07-08  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	67f291ddae3 Correct conditions for iconification on Android
+	130c3efa108 Fix execution of MS-Windows app execution aliases in Eshell
+	fffab032b05 Improve 'tab-line-tabs-fixed-window-buffers' sorting perf...
+
+2024-07-08  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	f4c0459ed3e Fix Tramp parser
+	47c79b62dd0 Checkdoc fixes in progmodes
+	6757f8e67d3 Checkdoc fixes in Org Mode
+	9fcee3c1d1e Clarify `checkdoc-max-keyref-before-warn` docstring
+	b249f022f12 * lisp/files.el (insert-directory): Quote switches in wil...
+	8911d53ce5d Fix uses of 'dired-omit-mode' (bug#71905)
+
+2024-07-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt Tramp version
+
+	* doc/misc/trampver.texi:
+	* lisp/net/trampver.el (tramp-version): Adapt Tramp versions.
+
+2024-07-07  Stefan Kangas  <stefankangas@gmail.com>
+
+	Mark `browse-url-default-scheme` as :risky
+
+	* lisp/net/browse-url.el (browse-url-default-scheme): Mark as
+	risky file local variable.
+
+2024-07-07  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make `checkdoc-verb-check-experimental-flag` default to nil
+
+	This user option leads to a very large amount of false positives in
+	practice.  In my personal experience, almost all occurrences that are
+	flagged are false positives.  Flipping the default to something less
+	intrusive should hopefully encourage more use of checkdoc.
+
+	* lisp/emacs-lisp/checkdoc.el
+	(checkdoc-verb-check-experimental-flag): Switch the default to nil.
+
+2024-07-07  Stefan Kangas  <stefankangas@gmail.com>
+
+	checkdoc: Flag formatting mistakes in warnings
+
+	* lisp/emacs-lisp/checkdoc.el (checkdoc-message-text-next-string)
+	(checkdoc-message-text-engine): Flag formatting mistakes in warnings.
+	(checkdoc--warning-function-re): New variable.
+
+2024-07-07  Stefan Kangas  <stefankangas@gmail.com>
+
+	checkdoc: Minor code cleanups
+
+	* lisp/emacs-lisp/checkdoc.el
+	(checkdoc-message-text-search): Use 'while-let'.
+	(checkdoc-message-text-engine): Use 'when' and 'unless'.
+
+2024-07-07  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix fontification of network files in `awk-mode`
+
+	* lisp/progmodes/cc-awk.el (awk-font-lock-keywords): Fix fontification
+	of special network file names such as "/inet4/tcp/0/localhost/daytime".
+	See Info node '(gawk) TCP/IP Networking'.
+
+2024-07-07  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	8589fd9cae2 * src/androidvfs.c (android_saf_check_nonnull): Fix typo.
+
+2024-07-07  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	99e510977b2 Correct JNI string error checking and miscellaneous corre...
+	bbe95a8ceab Correctly highlight SYMTAB in `awk-mode`
+	9625e4af994 Fix formatting of tables with thead/tfoot but no tbody
+
+2024-07-07  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	48f4c9cbbc1 ; Reflow "Commentary" in lisp-mnt.el
+	22155753a46 ; * lisp/emacs-lisp/comp-run.el (native--compile-async): ...
+	235b9e85a67 package-buffer-info: Move 'require' earlier
+
+2024-07-07  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fontify `mkbool` as function in `awk-mode`
+
+	* lisp/progmodes/cc-awk.el (awk-font-lock-keywords):
+	Fontify 'mkbool' function, added in gawk version 5.2.
+	See Info node '(gawk) Boolean Functions'.
+
+2024-07-06  Yuan Fu  <casouri@gmail.com>
+
+	Add a heuristic for type font-lock in rust-ts-mode (bug#69625)
+
+	* lisp/progmodes/rust-ts-mode.el:
+	(rust-ts-mode--font-lock-settings): Add rule.
+
+2024-07-06  Stefan Kangas  <stefankangas@gmail.com>
+
+	checkdoc: Relax footer line check for recent Emacs
+
+	* lisp/emacs-lisp/checkdoc.el (checkdoc-file-comments-engine):
+	Don't require a footer line unless 'lm-package-needs-footer-line'
+	returns true.
+
+2024-07-06  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make `lm-homepage` into an obsolete alias for 'lm-website'
+
+	* lisp/emacs-lisp/lisp-mnt.el (lm-homepage): Make into an obsolete
+	function alias for 'lm-website'.
+
+2024-07-06  Stefan Kangas  <stefankangas@gmail.com>
+
+	Make `lm-verify` obsolete in favor of checkdoc
+
+	* lisp/emacs-lisp/lisp-mnt.el (lm-verify): Make obsolete in favor
+	of checkdoc.
+
+2024-07-06  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add new function `lm-package-needs-footer-line`
+
+	* lisp/emacs-lisp/lisp-mnt.el (lm-package-needs-footer-line):
+	Factor out new function...
+	* lisp/emacs-lisp/package.el (package-buffer-info): ...from here.
+	* lisp/emacs-lisp/lisp-mnt.el (lm-verify): Use above new function.
+	* test/lisp/emacs-lisp/lisp-mnt-tests.el
+	(lm-tests--lm-package-needs-footer-line/empty-dependencies)
+	(lm-tests--lm-package-needs-footer-line/old-version)
+	(lm-tests--lm-package-needs-footer-line/new-version):
+	New tests.
+
+2024-07-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	f910514721e Fix treesit range rule for jsdoc
+	de3fa00a614 Fix documentation of 'balance-windows'
+	c986387c79f nnatom: Ensure some parsed values are one line
+	2fb6a98ecfa nnfeed: (Mostly) fix group descriptions
+	74b82e6802e Eglot: support deprecated MarkedString (bug#71353)
+	a6a588ccf10 ; * doc/lispref/strings.texi (Creating Strings): Followup...
+	a3e57a29bec ; Fix doc string of 'string-fill'
+	1b5cf29431a Fix returning to original TTY frame after 'rmail-reply'
+	814710067f0 Improve warnings from native compiler
+	cefec59df7b Document adding package dependency on Emacs version
+	d190cb0e886 Fix file-name detection in Dired under -F
+
+2024-07-06  Thierry Volpiatto  <thievol@posteo.net>
+
+	Allow using multiple buffers in 'eshell-command'
+
+	Provide the same functionality as 'async-shell-command-buffer' but for
+	'eshell-command'.
+
+	Co-Authored-By: Jim Porter <jporterbugs@gmail.com>
+
+	* lisp/eshell/eshell.el (eshell-command-async-buffer): New option...
+	(eshell-command): ... use it.
+
+	* lisp/eshell/esh-proc.el (eshell-sentinel): Check for buffer liveness
+	in 'finish-io'.
+
+	* test/lisp/eshell/eshell-tests.el
+	(eshell-test/eshell-command/output-buffer/async-kill): New test.
+
+	* etc/NEWS: Announce this change (bug#71554).
+
+2024-07-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	perl-mode.el: Improve indent after hanging open-paren
+
+	Make the indentation of the code right after an open paren/brace
+	use the same rule as already used to indent the corresponding
+	matching paren/brace.
+
+	* lisp/progmodes/perl-mode.el (perl-calculate-indent):
+	Use `perl-indent-new-calculate`s "virtual" indentation instead of
+	approximating it with `current-indentation`.
+
+2024-07-05  Po Lu  <luangruo@yahoo.com>
+
+	Enable Gnulib substitute on Android systems with defective strnlen
+
+	* configure.ac (AC_FUNC_STRNLEN): Detect a bug where strnlen is
+	liable to integer overflows if addition of the search limit to
+	the string would also overflow.
+
+	* src/xdisp.c (store_mode_line_string): Remove stopgap measure.
+
+2024-07-05  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	334d5132207 (edebug--called-interactively-skip): Fix bug#71934
+	6e8b9ccaec2 ; * lisp/ibuffer.el (ibuffer-mode): Doc fix.
+	3eaf1abbff8 Fix MS-Windows build with native-compilation
+	fc375359edd Tag dbus-test05-register-signal-with-nils as unstable
+	99230d7080f ; * src/w32fns.c (funhook): Restore mistakenly lost line.
+	81a7358a33b Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
+	b085d683962 Fix treesit test (bug#71907)
+	f39cf0beb74 Focus more on MS-Windows than MS-DOS in FAQ
+	d64396b8e42 Autoload some string functions
+	bd482b745aa Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
+	b5341831353 * etc/NEWS: Fix typos.
+	850fc68481a ; (grep-read-files): Fix completion table
+	28532599358 Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
+	921d40759e5 Remove a reference to a non-existant variable from a doc-...
+	5d2a115ab03 ; * src/fns.c (value_cmp): ASCIIfy.
+
+2024-07-04  Pip Cet  <pipcet@protonmail.com>
+
+	Fix dumping finalizers with pdumper
+
+	* src/pdumper.c (dump_finalizer): Use `out' (a pointer to a finalizer)
+	rather than `&out' (a pointer to a pointer to a finalizer).
+
+2024-07-04  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove redundant `require`s
+
+	* lisp/gnus/canlock.el (sha1):
+	* lisp/international/utf7.el (base64):
+	* lisp/net/hmac-md5.el (md5):
+	* lisp/org/ob-processing.el (sha1):
+	* lisp/org/org-feed.el (sha1):
+	* test/lisp/net/rfc2104-tests.el (sha1, md5): Don't require features
+	that are built-in, and always provided.
+
+2024-07-04  Jim Porter  <jporterbugs@gmail.com>
+
+	In SHR, load from URL cache if possible when zooming images
+
+	* lisp/net/shr.el (shr-replace-image): New function extracted from...
+	(shr-image-fetched): ... here.
+	(shr-zoom-image): Check URL cache and call 'shr-replace-image' if we
+	can.
+
+2024-07-04  Jim Porter  <jporterbugs@gmail.com>
+
+	Fix the different image zoom levels in SHR to work as expected
+
+	* lisp/net/shr.el (shr-image-zoom-levels): New option.
+	(shr-image-zoom-level-alist): New variable.
+	(shr-zoom-image): Take POSITION and ZOOM-LEVEL arguments.  Consult
+	'shr-image-zoom-levels'.
+	(shr-put-image): Use 'shr-image-zoom-level-alist'.
+	(shr-rescale-image): Only reset width *or* height when either is too
+	large.
+	(shr--image-zoom-original-size, shr--image-zoom-image-size)
+	(shr--image-zoom-fill-height): New functions.
+
+	* etc/NEWS: Announce this change.
+
+2024-07-04  Jim Porter  <jporterbugs@gmail.com>
+
+	In SHR, keep track of image sizes as specified by the HTML
+
+	Previously, these values got lost when zooming the image.
+
+	* lisp/net/shr.el (shr-tag-img): Set 'image-dom-size'...
+	(shr-zoom-image): ... use it.  Rename 'size' to 'zoom'.
+	(shr-image-fetched): Rename 'image-size' to 'image-zoom'.
+	(shr-put-image): Accept the zoom level as ':zoom' and document it.
+	Previously, FLAGS was a mix of alist and plist(!).
+
+	* test/lisp/net/shr-tests.el (shr-test/zoom-image): Rename "size" to
+	"zoom".
+
+2024-07-04  Jim Porter  <jporterbugs@gmail.com>
+
+	Slice images based on their height in SHR, not their zoom level
+
+	* lisp/net/shr.el (shr-sliced-image-height): New option...
+	(shr-put-image): ... use it.  Compute the number of slices in relation
+	to the image height; this way, each slice is roughly the height of a
+	line of ordinary text.
+
+	* test/lisp/net/shr-tests.el (shr-test/zoom-image): Update test, since
+	zooming no longer necessarily triggers slicing.
+
+	* doc/misc/eww.texi (Advanced): Document 'shr-sliced-image-proportion'.
+
+	* etc/NEWS: Announce this change.
+
+2024-07-04  Mattias Engdegård  <mattiase@acm.org>
+
+	Compare fixnums and floats accurately in value<
+
+	Make `value<` compare fixnums and floats by value, as `<` does, instead
+	of coercing the fixnum to a float first which is what C would do.
+	This matters when the fixnum cannot be represented as a float. For
+	example, C would evaluate
+
+	  72057594037927935 < 72057594037927936.0
+
+	to false since the operands are converted to the same floating-point
+	number.
+
+	* src/fns.c (fixnum_float_cmp): New.
+	(value_cmp): Use it.
+	* test/src/fns-tests.el (fns-value<-ordered, fns-value<-unordered):
+	New test cases.
+
+2024-07-03  Spencer Baugh  <sbaugh@janestreet.com>
+
+	Prefer to run find and grep in parallel in rgrep (bug#71094)
+
+	* lisp/progmodes/grep.el (grep-compute-defaults): Prefer `gnu' for
+	grep-find-use-xargs over `exec-plus', but not on Windows.  (bug#71094)
+
+2024-07-03  Po Lu  <luangruo@yahoo.com>
+
+	Adapt doc-view-set-slice-using-mouse to touch-screen input
+
+	* doc/lispref/commands.texi (Touchscreen Events): Document means
+	of unconditionally enabling simple conversion.
+
+	* lisp/doc-view.el (doc-view-set-slice-using-mouse): Bind
+	touch-screen-simple-mouse-conversion to t, and read translated
+	mouse events with read-key rather than read-event.
+
+	* lisp/subr.el (read-key): Don't permit idle timer to interfere
+	with reporting of translated mouse events.
+
+	* lisp/touch-screen.el (touch-screen-simple-mouse-conversion):
+	New variable.
+	(touch-screen-handle-point-up, touch-screen-handle-touch):
+	Unconditionally enable `mouse-drag' translation if set.  Decide
+	whether to send drag or mouse events by the values of the two
+	touchpoints' XY positions and point and double-click-fuzz, as in
+	make_lispy_event.
+
+2024-07-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(dump_interval_node): Remove unused arg `offset`
+
+	* src/pdumper.c (dump_interval_node): Remove unused arg `offset`.
+	(dump_overlay): Adjust call accordingly.
+
+2024-07-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(buf_*pos_to_*pos): Fix minor off-by one
+
+	* src/marker.c (buf_charpos_to_bytepos, buf_bytepos_to_charpos):
+	Slightly restructure the markers loop so we check `distance`
+	also before "consider"ing the first marker.
+
+2024-07-02  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	b5341831353 * etc/NEWS: Fix typos.
+	850fc68481a ; (grep-read-files): Fix completion table
+	921d40759e5 Remove a reference to a non-existant variable from a doc-...
+	4c64b990873 ; * etc/NEWS: Fix level of several entrries.
+	459e635099b ; * etc/NEWS: Fix typo.
+	7050128cfe9 ; * src/search.c (Fmatch_beginning, Fmatch_end): Doc fix.
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-07-02  Po Lu  <luangruo@yahoo.com>
+
+	Port seccomp acceleration to Linux 3.5.0
+
+	* etc/NEWS: Update correspondingly.
+
+	* exec/Makefile.in (config-mips.m4): Don't define rule
+	or predicate $(LOADOBJS) on it elsewhere than on MIPS.
+
+	* exec/README: Direct developers to GDB.
+
+	* exec/trace.c (finish_exec): Resume the tracee after reporting
+	an error in `exec'.
+	(after_fork): If seccomp is enabled on Android, and the kernel
+	is 4.7 or earlier, detect whether revisions to the sequencing of
+	seccomp events have been backported from 4.8.
+	(exec_waitpid): Resume the process with PTRACE_CONT after
+	receiving an unknown signal.
+	(exec_init): Cease disabling seccomp on Android kernels earlier
+	than 4.8.
+
+2024-07-01  Po Lu  <luangruo@yahoo.com>
+
+	* exec/exec.c (exec_0): Restore erroneously deleted statement.
+
+	* configure.ac: Provide for invocations where no cache file is set.
+
+	* configure.ac: Create a cache file for libexec.
+
+2024-07-01  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	1647494c04a ; * etc/NEWS: Clarify.
+	b2c966f8396 ; * src/treesit.c (Ftreesit_query_capture): Fix typo.
+	ae385794206 * java/res/mipmap-v26/emacs_icon.xml: Define monospace icon.
+	b2d99c0d0aa Improve `sentence-end-double-space` docstring
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-07-01  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	2f71460d52f More updates of documentation for Emacs 30
+	a9df581c403 ; * etc/NEWS: Copy-edit.
+	dfbdd38f701 Revert "; * etc/NEWS: Move items to "Incompatible Lisp Ch...
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-07-01  Po Lu  <luangruo@yahoo.com>
+
+	Optimize process execution on Android
+
+	* exec/configure.ac (REENTRANT): Remove option for reentrancy.
+	(PROGRAM_COUNTER, HAVE_SECCOMP): Define register providing the
+	program counter and enable seccomp if its headers are available.
+
+	* exec/exec.c (write_load_command): Avoid defining unused
+	variable.
+	(exec_0): Remove code specific to REENTRANT configurations.
+
+	* exec/exec.h (struct exec_tracee) <exec_data, data_size>: New
+	fields for loader instructions and their size.
+
+	* exec/exec1.c (main): Call exec_init before forking.
+
+	* exec/mipsel-user.h (ELF_NGREG): Delete definition.
+	(struct mipsel_regs): Reduce number of gregs to 32, but
+	introduce separate fields for special registers.
+
+	* exec/trace.c (use_seccomp_p): New variable; defile to false if
+	!HAVE_SECCOMP.
+	(remove_tracee): Cease providing for non-reentrant
+	configurations.  Release executable data if present.
+	(handle_clone_prepare): Likewise.  Resume process with
+	PTRACE_CONT if seccomp-based interception is enabled.
+	(handle_clone, check_signal): Resume processes as above.
+	(handle_exec): Divide into two functions, with only rewriting
+	the system call and generating instructions for the loader
+	remaining in the first, and copying such instructions into the
+	loader's stack removed into a new function, `finish_exec'.
+	(finish_exec): New function.
+	(handle_readlinkat, handle_openat): Abolish non-REENTRANT
+	configurations.
+	(process_system_call): Divide exec system calls into two phases,
+	disambiguated by the value of tracee->waiting_for_syscall.  Typo
+	fixes.  Accommodate syscall-exit-stops where the signal was
+	initially intercepted by `seccomp_system_call'.
+	(interesting_syscalls): New array.
+	(ARRAYELTS): New macro.
+	(seccomp_system_call, establish_seccomp_filter): New function.
+	(tracing_execve) [HAVE_SECCOMP]: Establish a seccomp filter if
+	this is to be enabled.
+	(after_fork): Provide PTRACE_O_TRACESECCOMP.  Resume process
+	with PTRACE_CONT if seccomp-based interception is enabled.
+	(exec_waitpid): Resume process with PTRACE_CONT if seccomp-based
+	interception is enabled.  Dispatch stops identifying as
+	PTRACE_EVENT_SECCOMP to `seccomp_system_call'.
+	(exec_init): Establish whether it is possible to enable seccomp.
+
+2024-06-30  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	64851d101a8 Improve Android "adaptive icon"
+	9b294059d71 Fix documentation for Emacs 30
+	f50167ab95e ; Update NEWS and corresponding manuals
+	4e22ef870c4 Add D-Bus test
+	f784d946d44 ; Repair corruption in etc/DEBUG
+	c750fbb539e ; * etc/DEBUG: Advice for debugging Emacs on OpenBSD (bug...
+	38179f85f8f Merge remote-tracking branch 'savannah/scratch/windows-98...
+	72cf9964f3c Inaccuracy in efaq.texi
+	fc48e9e8ed5 ; Fix typos in DOS Makefile scripts
+	9b8d754579f ; * etc/NEWS: Explain Nextstep.
+	8819e5a45d5 Fix treesit crash (bug#71681)
+	eaf2dc96c1f ; Fix SHR test on MS-Windows
+	57880f597c5 Delete redundant mention of `with-eval-after-load'
+	ea8ce984342 * doc/misc/efaq.texi (New in Emacs 30): Fix typos.
+	45a20d781a9 ; Fix typos in symbols
+	d95f039af43 Document security fixes in FAQ
+	d063af203c8 Add "New in Emacs 30" to FAQ
+	ca6b484162b ; * etc/NEWS: Move "Minibuffer and Completions"
+	35c46663e49 ; * etc/NEWS: Move item to "Lisp Changes".
+	0515b38d289 ; * etc/NEWS: Move keyboard macro items closer together.
+	22af3a71039 ; * etc/NEWS: More copy-edits.
+	000ef8876ae ; * etc/NEWS: Move items to "Incompatible Lisp Changes".
+	4088dc8e4ce ; * etc/NEWS: Rearrange "Incompatible Lisp Changes".
+	179800f36bb ; * lisp/epg.el (epg--start): Add commentary about encoding.
+	73898f0214c Fix non-ASCII filename operatiion on EasyPG (bug#71500)
+	a65b6aac6b5 Silence warning with global minor mode :predicate
+	f5f7343ac41 ; * etc/NEWS: Move an item to "Startup Changes"
+	c95066bf188 ; * etc/NEWS: Move some Lisp items to better place.
+	bf7db88ce1f ; * etc/NEWS: Rearrange "Editing Changes in Emacs 30.1"
+	000424eb9eb ; * etc/NEWS: Make touch screen support more prominent.
+	5b5671587fb ; * etc/NEWS: Rearrange "Changes in Emacs 30.1".
+	31124abdefe ; * lisp/thingatpt.el (sexp-at-point): Doc fix (bug#71777).
+	44f269d6e60 Fix: make 'xwidget-webkit-scroll-backward' scroll backwards
+	358085997c6 Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
+	736b7cad406 Add jsdoc support to php-ts-mode in <script> element
+	5f3d964e397 Update to Transient v0.7.2-4-gf75bc48d
+	2d8881d5267 Fix typo incurring leaks of face structures
+	219501dd629 ; Fix use of @footnote in cc-mode.texi
+	c7be2dcac44 Merge branch 'emacs-30' of git.sv.gnu.org:/srv/git/emacs ...
+	f0a48799756 Sync with Tramp 2.7.1
+	53dcf2b9492 ; * etc/NEWS: Move the mwheel entry to a better place.
+	a5726782d03 ; Sort tree-sitter modes in NEWS
+	daa89dc939e ; * etc/NEWS: Rearrange "New Modes and Packages in Emacs ...
+	4ddbf4f70ef ; * etc/NEWS: Move many items.
+	437b1ced268 ; * etc/NEWS: Copy-edits.
+	7372b2eb302 Expand docstring of which-key-mode
+	df0eb5be1ea Improve documentation of 'remove-overlays' in ELisp manual
+	73c1252bb6b Fix link to major mode variable in docstring
+	c4ad54812ac Make `shell-mode' more robust
+	c4ec905c9a9 Correct ommissions in rmc.el
+	bf862fc2770 * lisp/hi-lock.el: More fixes related to revert-buffer.
+	6cc8ffae9a6 Update to Org 9.7.5-9-ga091ca
+	c477443ab80 ; Fix typo in lua-ts-mode.el
+	6e5e4d61939 ; Add 'eglot-ensure' option to 'lua-ts-mode-hook'
+	58a2f36a8b9 ; * etc/NEWS: Copy edit.
+	df53ef176ac Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
+	039e6ffd866 Write Antinews for Emacs 30 ELisp Reference
+	bf8c9f702ba (eval-last-sexp): Fix bug#71774
+	6d94090cadc * lisp/hi-lock.el: More fixes for revert-buffer (bug#57534)
+	280c91782af * lisp/hi-lock.el (hi-lock-revert-buffer-rehighlight): Im...
+	339310d0205 * lisp/tab-bar.el (tab-bar-select-restore-windows): Impro...
+	c1e7569a925 Write Antinews for Emacs 30 user manual
+	233f683da8f ; * lisp/erc/erc-backend.el (erc-server-reconnect-timeout...
+	20a672b3b2b Change ERC version for Emacs 30 to 5.6.0.30.1
+	cbede3d43df * src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper): ...
+	6f9f9a21555 Fix two tests for --without-all build
+	98daa10f065 ; * etc/PROBLEMS (PGTK): Remove redundant 2nd PGTK section.
+	ced33bc2397 Fix handling of non-nil 'dired-movement-style'
+	b1e9b6fd67d ; * lisp/gnus/message.el (message-idna-to-ascii-rhs): Doc...
+	5eb9a0d2c79 ; * etc/NEWS: Fix last change (bug#71720).
+	6ec77f580dd Do not prematurely truncate python eldoc string
+	f475a1a2544 ; Fix simple-tests as fallout of last change
+	aa10d0c5ac1 Add tests for `kill-whole-line' (bug#65734)
+	058bb4ca25a kill-whole-line: Honor visibility; fix kill-ring when rea...
+	e45173d114e * lisp/hi-lock.el (hi-lock-file-patterns-policy): Add val...
+	d6afb017deb * lisp/progmodes/xref.el (xref-revert-buffer-restore-poin...
+	8d55b38e2a1 Fix Cygwin build
+	82125b1a661 Use 'revert-function' in *xref* buffer
+	860840621a1 Prevent crashes and related issues if initial activity is...
+	d5c6eb1f964 Doc fix in 'php-ts-mode'
+	fb15affde8c Avoid compiler warnings in the Cygwin-w32 build
+	8d354925ddb Add new face 'widget-unselected' to wid-edit.el
+	1809f6a93ef Always perform Eshell process cleanup runs in the Eshell ...
+	8b1841021c0 Avert crash in store_mode_line_string on Android 5.0 and ...
+	e7c85f9235a Use HarfBuzz in Cygwin-w32 build
+	8e3e206bd32 ; * src/buffer.c (syms_of_buffer) <mode-line-format>: ASC...
+	fe0d9dfb3b1 ; * lisp/treesit.el (treesit--syntax-propertize-start): F...
+	2f18929319a Fix tabbing between widgets (bug#70594)
+	6ad6507532b ; * lisp/which-key.el (which-key-dont-use-unicode): Add :...
+	60b38c317bb * lisp/touch-screen.el (touch-screen-inhibit-drag): Anoth...
+	a4ca30ac2e0 Fix rescaling of images via 'text-scale-mode' in EWW
+	0e43606b20d * lisp/touch-screen.el (touch-screen-inhibit-drag): Fix t...
+	1b4c5627211 Fix latent side-effects of respecting field boundaries in...
+	e4046f33ab8 ; * lisp/simple.el (undo-auto--boundaries): Doc fix (bug#...
+	008eeb21fdb ; * lisp/language/cyrillic.el: Delete obsolete commentary...
+	680155d3f03 Add missing builtin package declarations
+	ce4f56caf71 Extend treesitter tests on emba
+	7e8a97ac788 Show entries from key-translation-map in which-key mode
+	4a0958642d9 * lisp/tab-bar.el (tab-bar-tab-group-face-function): Impr...
+	a769f171e7e ; Fix flymake tests with GCC 14.
+	96e27c2ecf9 Don't show char name for multi-char translations
+	0715abfa86a Reset ls-lisp-use-string-collate when ls-lisp-emulation c...
+	4fcc38966bf Update to Transient v0.7.2-1-gf273c0c8
+	b7d5ca3a8fb * doc/misc/calc.texi (Musical Notes): Fix typo.
+	164f75822b2 ; Fix typos
+	768e92b9c02 Update options that depend on 'which-key-dont-use-unicode'
+	4b2682b17cd ; Remove debugging message in Completion Preview test
+	73a58329a69 Fix omission of updates to child frames on Android
+	0edacf2aa7e Add jsdoc support to js-ts-mode
+	cace0cbee93 ; Restore inadvertently removed line.
+	2b04effb13d ; * test/lisp/net/shr-tests.el (shr-test--rendering-check...
+	6619aec6bca ; Don't run new 'shr-test/zoom-image' when built without ...
+	5d19bfda321 ; * admin/release-branch.txt: Update and fix typo.
+	fb11294d415 ; Fix typos
+	d9bd1718f9a Backport: Minor changes in tramp-tests.el
+	1728de5a776 Backport: Tramp: Fix bug#71709, and other minor changes
+	dd0fc6aff60 New branch emacs-30
+	bc72c33ac38 * admin/admin.el: (set-version): Fix regexp for configure...
+	60475a73d17 Disable Ffile_system_info for Android special directories
+	18e7a9f3d0c Restore functionality on Windows 98
+	5f8a9cd4b6f Fix a bug in 'switch-to-buffer'
+	5f9b5803bea Fix zooming images in SHR
+	6f2036243f2 ; Doc fix in 'php-ts-mode'.
+	2f1c882a16e Colorize CSS property value like `css--fontify-region'
+	dd0994aa36c Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
+	486ea8ef5ac * configure.ac: Disable kqueue on Haiku.
+	737fa7c5292 Fix 'Customize' menu entry for 'php-ts-mode'
+	cb7be6035ee Fix compilation on prerelease versions of Haiku
+	2b848a4e504 Fix FIXME in comment
+	77e3a56507d Update SKK-JISYO.L from upstream
+	e5bae788614 Update publicsuffix.txt from upstream
+	bf5f74288b7 Add assignment form as `etc/copyright-assign.txt`
+	fcd37988048 ; Merge from origin/emacs-29
+	0f01cb0ebd1 Bump Emacs version to 29.4.50
+	014aab9847a Fix for grammar change of keyword "virtual" in tree-sitte...
+	fa364a0d469 Revert "; * etc/HISTORY: Delete never-released Emacs 28.3."
+	a81417e5766 Update Tramp version (don't merge to master)
+	ff389163ee8 Manually merge NEWS.29 from emacs-29
+	ea057131220 ; * etc/HISTORY: Delete never-released Emacs 28.3.
+	d3469978b89 Merge from origin/emacs-29
+	3739342a4e9 ; Merge from origin/emacs-29
+	38e738a35eb Merge from origin/emacs-29
+	4c4c94fa105 ; Merge from origin/emacs-29
+	1313b8966ae Merge from origin/emacs-29
+	4a76af51bb6 Replace literal whitespace with `\s`
+	e41dd2241f7 ; Merge from origin/emacs-29
+	8520ec829d3 ; * lisp/editorconfig.el (editorconfig-indentation-alist)...
+	99161fb7140 Fix non-existing `editorconfig-set-indentation-python-mode`
+	fd15d89ec51 Merge remote-tracking branch 'origin/emacs-29' into emacs-29
+	6a299b3cace Release Emacs 29.4
+	3f3c08bcc76 Add before-save-hook to man page files
+	7b0e6cb3ffa Use UTC when generating man page timestamps
+	a7cb642a9fc Merge from origin/emacs-29
+	6491d11b53a ; Merge from origin/emacs-29
+	2f39a4b28a9 Merge from origin/emacs-29
+	150e2b979c1 ; * src/xfns.c (unwind_create_frame): Add missing definit...
+	75fdeef7b49 Allow to expand truncated long lines in *Compilation* buf...
+	fb1b188e1ad Eglot: Fix command execution (bug#71642)
+	155cc89de02 Support for indentation of PHP alternative syntax control...
+	7f7b28a2500 ; Wayland SECONDARY selection problem
+	11fb3510f48 Prevent auto-revert when deleting entry (bug#71264)
+	a4fe4ca93cf Fix font lock regex for user defined constant in PHP
+	e1ba4ebb495 Make Compilation mode recognize non-legacy Kotlin/Gradle ...
+	4f030834994 ; Improve documentation of EditorConfig support
+	c0bfe429485 List Andrea Corallo as co-maintainer in ack.texi
+	b3d6880512f * admin/MAINTAINERS: Add myself in (co-)maintainers.
+	7cc939bf27e ; * lisp/ldefs-boot.el: Regenerated for Emacs 29.4
+	959eacc2a70 Bump Emacs version to 29.4
+	9a02fce714c Update files for Emacs 29.4
+	d96c54d3883 * admin/authors.el: Update for Emacs 29.4
+	fd207432e50 * etc/NEWS: Update for Emacs 29.4
+	c645e1d8205 org-link-expand-abbrev: Do not evaluate arbitrary unsafe ...
+	50a237c4689 Update Tramp version (don't merge to master)
+	f3e80dd0f70 * admin/emacs-shell-lib: Backport to Bash 4.4 or older.
+	ce85d3811da Fix bug#49289 also for other auth-source backends
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-06-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from gnulib
+
+2024-06-30  Po Lu  <luangruo@yahoo.com>
+
+	Respect --disable-build-details in Android builds
+
+	* java/Makefile.in (BUILD_DETAILS, GEN_BUILD_DETAILS): New
+	variables.
+	(install_tmp): Tolerate failures in generation of metadata files
+	and prefix commands for such generation with GEN_BUILD_DETAILS.
+
+	* lisp/version.el (android-read-build-system)
+	(android-read-build-time): Return nil if metadata file does not
+	exist.
+
+2024-06-30  Po Lu  <luangruo@yahoo.com>
+
+	* build-aux/ndk-module-extract.awk: Do not generate newlines in output.
+
+2024-06-30  Po Lu  <luangruo@yahoo.com>
+
+	Enable caching values generated by the Android build system
+
+	* build-aux/ndk-build-helper-1.mk:
+
+	* build-aux/ndk-build-helper-2.mk:
+
+	* build-aux/ndk-build-helper.mk: Do not generate file names with
+	redundant directory separators, to port to systems where the
+	semantics of this are undefined.
+
+	* configure.ac: Provide a cache file to the recursive invocation
+	of configure if one is specified for the initial.
+
+	* cross/ndk-build/Makefile.in (my-dir): Better conform to the
+	original ndk-build by generating directory names with no
+	trailing separator.
+
+	* m4/ndk-build.m4 (ndk_resolve_import_module, ndk_SEARCH_MODULE):
+	Cache the names of Android.mk files and the commands produced
+	from them.
+
+2024-06-30  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	72cf9964f3c Inaccuracy in efaq.texi
+	fc48e9e8ed5 ; Fix typos in DOS Makefile scripts
+	9b8d754579f ; * etc/NEWS: Explain Nextstep.
+	8819e5a45d5 Fix treesit crash (bug#71681)
+	eaf2dc96c1f ; Fix SHR test on MS-Windows
+	57880f597c5 Delete redundant mention of `with-eval-after-load'
+	ea8ce984342 * doc/misc/efaq.texi (New in Emacs 30): Fix typos.
+	45a20d781a9 ; Fix typos in symbols
+	d95f039af43 Document security fixes in FAQ
+	d063af203c8 Add "New in Emacs 30" to FAQ
+	ca6b484162b ; * etc/NEWS: Move "Minibuffer and Completions"
+	35c46663e49 ; * etc/NEWS: Move item to "Lisp Changes".
+	0515b38d289 ; * etc/NEWS: Move keyboard macro items closer together.
+	22af3a71039 ; * etc/NEWS: More copy-edits.
+	000ef8876ae ; * etc/NEWS: Move items to "Incompatible Lisp Changes".
+	4088dc8e4ce ; * etc/NEWS: Rearrange "Incompatible Lisp Changes".
+	179800f36bb ; * lisp/epg.el (epg--start): Add commentary about encoding.
+	73898f0214c Fix non-ASCII filename operatiion on EasyPG (bug#71500)
+	a65b6aac6b5 Silence warning with global minor mode :predicate
+	f5f7343ac41 ; * etc/NEWS: Move an item to "Startup Changes"
+	c95066bf188 ; * etc/NEWS: Move some Lisp items to better place.
+	bf7db88ce1f ; * etc/NEWS: Rearrange "Editing Changes in Emacs 30.1"
+	000424eb9eb ; * etc/NEWS: Make touch screen support more prominent.
+	5b5671587fb ; * etc/NEWS: Rearrange "Changes in Emacs 30.1".
+	31124abdefe ; * lisp/thingatpt.el (sexp-at-point): Doc fix (bug#71777).
+	44f269d6e60 Fix: make 'xwidget-webkit-scroll-backward' scroll backwards
+	358085997c6 Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
+	736b7cad406 Add jsdoc support to php-ts-mode in <script> element
+	5f3d964e397 Update to Transient v0.7.2-4-gf75bc48d
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-06-30  Po Lu  <luangruo@yahoo.com>
+
+	Update the DJGPP configuration scripts
+
+	* msdos/sedlibmk.inp (HAVE_WCHAR_T): Delete edit of variable
+	removed from Gnulib.
+
+2024-06-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Don’t define LC_COLLATE, LC_CTYPE
+
+	* src/sysdep.c (LC_COLLATE, LC_CTYPE): Remove unnecessary
+	macro defns.  They’re always available.
+
+2024-06-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Assume setlocale exists
+
+	Like locale.h, it was standardized by C89, is universally
+	available now, and some code already assumes it.
+	* configure.ac: Do not check for setlocale.
+	* src/emacs.c (setlocale) [!HAVE_SETLOCALE]: Remove.
+	(fixup_locale, synchronize_locale, Vprevious_system_time_locale)
+	(synchronize_system_time_locale): Define even if !HAVE_SETLOCALE.
+	* src/sysdep.c (emacs_setlocale): Simplify by assuming HAVE_SETLOCALE.
+
+2024-06-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Do not worry about whether locale.h is includable
+
+	* src/emacs.c, src/lread.c, src/sysdep.c: Remove preconditions
+	from including locale.h.  It was standardized in C89, is universal
+	now, and some code already assumes it.
+
+2024-06-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update from Gnulib by running admin/merge-gnulib
+
+	* m4/wchar_t.m4: Remove; no longer needed.
+
+2024-06-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Remove unused m4/printf-posix-rpl.m4
+
+	* m4/printf-posix-rpl.m4: Remove unused file.
+	This is leftover from an old Android branch,
+	and the m4 macros are no longer needed in the master branch.
+
+2024-06-29  Stefan Kangas  <stefankangas@gmail.com>
+
+	Complete to "nil" in directory local variables skeleton
+
+	* lisp/autoinsert.el (auto-insert-alist): Make "nil" a completion
+	candidate for the directory local variables skeleton.  The "nil" value
+	means "any mode" in the context of directory local variable files.
+
+2024-06-29  Stefan Kangas  <stefankangas@gmail.com>
+
+	Support grep.el better in `python-base-mode`
+
+	* lisp/progmodes/python.el (python-base-mode): When mode is first
+	enabled, add *.py alias to 'grep-files-aliases', and add common Python
+	tooling directories to 'grep-find-ignored-directories'.
+
+2024-06-29  Eshel Yaron  <me@eshelyaron.com>
+
+	Inherit text props in Completion Preview insertion commands
+
+	When completing with Completion Preview mode commands,
+	inherit text properties from surrounding text similarly to
+	other completion commands, such as 'completion-at-point'.
+
+	* lisp/completion-preview.el (completion-preview-insert)
+	(completion-preview-partial-insert)
+	(completion-preview-complete): Use 'insert-and-inherit'
+	instead of 'insert' to insert text for completion.
+	* test/lisp/completion-preview-tests.el
+	(completion-preview-insert-inherits-text-properties): New
+	test.
+
+2024-06-29  Björn Lindström  <bkhl@elektrubadur.se>
+
+	Make whitespace.el's cleanup add missing final newline
+
+	* lisp/whitespace.el (whitespace-cleanup-region): If cleaning
+	up at end of file, add missing newline if indicated by
+	'whitespace-style'.  (Bug#71499)
+
+	* etc/NEWS: Announce the change in behavior.
+
+2024-06-29  Po Lu  <luangruo@yahoo.com>
+
+	Merge from origin/emacs-30
+
+	2d8881d5267 Fix typo incurring leaks of face structures
+	219501dd629 ; Fix use of @footnote in cc-mode.texi
+	c7be2dcac44 Merge branch 'emacs-30' of git.sv.gnu.org:/srv/git/emacs ...
+	f0a48799756 Sync with Tramp 2.7.1
+	53dcf2b9492 ; * etc/NEWS: Move the mwheel entry to a better place.
+	a5726782d03 ; Sort tree-sitter modes in NEWS
+	daa89dc939e ; * etc/NEWS: Rearrange "New Modes and Packages in Emacs ...
+	4ddbf4f70ef ; * etc/NEWS: Move many items.
+	437b1ced268 ; * etc/NEWS: Copy-edits.
+	7372b2eb302 Expand docstring of which-key-mode
+	df0eb5be1ea Improve documentation of 'remove-overlays' in ELisp manual
+	73c1252bb6b Fix link to major mode variable in docstring
+	c4ad54812ac Make `shell-mode' more robust
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-06-29  Jules Tamagnan  <jtamagnan@gmail.com>
+
+	Flag checkdoc-package-keywords-flag as a :safe variable
+
+	* lisp/emacs-lisp/checkdoc.el: Mark 'checkdoc-package-keywords-flag'
+	as a safe local variable.  (Bug#71812)
+
+2024-06-28  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	c4ec905c9a9 Correct ommissions in rmc.el
+	bf862fc2770 * lisp/hi-lock.el: More fixes related to revert-buffer.
+	6cc8ffae9a6 Update to Org 9.7.5-9-ga091ca
+	c477443ab80 ; Fix typo in lua-ts-mode.el
+	6e5e4d61939 ; Add 'eglot-ensure' option to 'lua-ts-mode-hook'
+	58a2f36a8b9 ; * etc/NEWS: Copy edit.
+	df53ef176ac Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
+	039e6ffd866 Write Antinews for Emacs 30 ELisp Reference
+	bf8c9f702ba (eval-last-sexp): Fix bug#71774
+	6d94090cadc * lisp/hi-lock.el: More fixes for revert-buffer (bug#57534)
+	280c91782af * lisp/hi-lock.el (hi-lock-revert-buffer-rehighlight): Im...
+	339310d0205 * lisp/tab-bar.el (tab-bar-select-restore-windows): Impro...
+	c1e7569a925 Write Antinews for Emacs 30 user manual
+	233f683da8f ; * lisp/erc/erc-backend.el (erc-server-reconnect-timeout...
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-06-28  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	6f9f9a21555 Fix two tests for --without-all build
+
+2024-06-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(buf_bytepos_to_charpos): Fix mixup introduced in commit b300052fb4ef
+
+	* src/marker.c (buf_bytepos_to_charpos): Don't compare byte-positions
+	with char-positions.
+
+2024-06-27  F. Jason Park  <jp@neverwas.me>
+
+	Change ERC version to 5.6.1-git
+
+	* doc/misc/erc.texi: Change ERCVER to 5.6.1.
+	* lisp/erc/erc.el: (erc-version): Change working version to 5.6.1-git.
+	Do the same for the package Version header.  Don't bother updating
+	`customize-package-emacs-version-alist' until needed.
+
+2024-06-27  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	98daa10f065 ; * etc/PROBLEMS (PGTK): Remove redundant 2nd PGTK section.
+	ced33bc2397 Fix handling of non-nil 'dired-movement-style'
+	b1e9b6fd67d ; * lisp/gnus/message.el (message-idna-to-ascii-rhs): Doc...
+	5eb9a0d2c79 ; * etc/NEWS: Fix last change (bug#71720).
+	6ec77f580dd Do not prematurely truncate python eldoc string
+	f475a1a2544 ; Fix simple-tests as fallout of last change
+	aa10d0c5ac1 Add tests for `kill-whole-line' (bug#65734)
+	058bb4ca25a kill-whole-line: Honor visibility; fix kill-ring when rea...
+	e45173d114e * lisp/hi-lock.el (hi-lock-file-patterns-policy): Add val...
+	d6afb017deb * lisp/progmodes/xref.el (xref-revert-buffer-restore-poin...
+	82125b1a661 Use 'revert-function' in *xref* buffer
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-06-27  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	860840621a1 Prevent crashes and related issues if initial activity is...
+	d5c6eb1f964 Doc fix in 'php-ts-mode'
+	fb15affde8c Avoid compiler warnings in the Cygwin-w32 build
+	8d354925ddb Add new face 'widget-unselected' to wid-edit.el
+
+	# Conflicts:
+	#	etc/NEWS
+
+2024-06-27  Po Lu  <luangruo@yahoo.com>
+
+	Disable preprocessing of assembler files with m4 on non-MIPS systems
+
+	* exec/Makefile.in (is_mips): New substitution.
+	(.s.o): Avoid calling m4 unless it be set.
+
+	* exec/configure.ac: Substitute is_mips, and don't generate
+	config-mips.m4 otherwise.
+
+	* exec/loader-x86.s:
+
+	* exec/loader-x86_64.s: Use assembler rather than m4-defined
+	comment syntax.
+
+2024-06-27  Stefan Kangas  <stefankangas@gmail.com>
+
+	Improve Local Directory Variables auto-insert
+
+	* lisp/autoinsert.el (auto-insert-alist): Confirm after entering
+	in a non-existent mode in Local Directory Variables skeleton.
+
+2024-06-27  Stefan Kangas  <stefankangas@gmail.com>
+
+	Support .dir-locals-2.el in `auto-insert-mode`
+
+	* lisp/autoinsert.el (auto-insert-alist): Use Directory Local Variables
+	skeleton also for ".dir-locals-2.el".
+
+2024-06-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(quail-input-method): Fix bug#70541
+
+	* lisp/international/quail.el (quail-input-method): Don't bind
+	`inhibit-modification-hooks`.
+	(quail-point-in-conversion-region): Simplify.
+
+2024-06-26  Eshel Yaron  <me@eshelyaron.com>
+
+	Minor improvements to new Completion Preview commands
+
+	* lisp/completion-preview.el (Commentary): Mention
+	`completion-preview-partial-insert' and elaborate about
+	`completion-preview-insert-sexp'.
+	(completion-preview--barf-if-no-preview): New function.
+	(completion-preview-insert, completion-preview-complete):
+	Use it.
+	(completion-preview-partial-insert): Rename arg to FUN; only
+	compute (+ end (length aft)) once; bind 'deactivate-mark' to
+	nil while inserting/deleting to allow commands that use this
+	function to work as expected with 'shift-select-mode';
+	improve behavior when called with point not at the start of
+	the completion preview overlay (e.g. when point is in the
+	middle of a multi-word symbol and this function is called
+	via 'completion-preview-insert-word'); add the base part of
+	the completion candidate to when calling exit-function.
+	(completion-preview-insert-word): Improve docsting, rename
+	argument ARG to N.
+	(completion-preview-insert-sexp): Likewise, and also remove
+	second argument INTERACTIVE.
+	(completion-preview--active-p): Rename to...
+	(completion-preview-active-p): ...this.  Make this function
+	public so users can leverage it for their own commands.
+	Extend docstring to explain how to do that.
+
+	* test/lisp/completion-preview-tests.el
+	(completion-preview-insert-calls-exit-function)
+	(completion-preview-insert-word): Break long lines.
+	(completion-preview-insert-sexp)
+	(completion-preview-insert-nonsubword)
+	(completion-preview-insert-subword): Fix docstrings.
+	(completion-preview-insert-mid-symbol): New test.
+
+2024-06-26  Jules Tamagnan  <jtamagnan@gmail.com>
+
+	New commands 'completion-preview-insert-{word,sexp}'
+
+	* lisp/completion-preview.el
+	(completion-preview-partial-insert): New function.
+	(completion-preview-insert-word)
+	(completion-preview-insert-sexp): New commands.
+	(completion-preview-commands): Add them.
+	(Commentary): Document them.
+	(completion-preview-active-mode-map): Add comment.
+	* test/lisp/completion-preview-tests.el
+	(completion-preview-insert-calls-exit-function): Update.
+	(completion-preview-insert-nonsubword)
+	(completion-preview-insert-subword)
+	(completion-preview-insert-sexp):  New tests.  (Bug#71716)
+
+2024-06-26  Jim Porter  <jporterbugs@gmail.com>
+
+	Always perform Eshell process cleanup runs in the Eshell buffer
+
+	Previously, some code executed in a timer, which could execute in the
+	wrong buffer, leading to a hang.
+
+	* lisp/eshell/esh-proc.el (eshell-sentinel): Use 'with-current-buffer'
+	in the timer function.
+
+	* test/lisp/eshell/esh-proc-tests.el (eshell-test-value): New variable.
+	(esh-proc-test/sentinel/change-buffer): New test.
+
+2024-06-26  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	8b1841021c0 Avert crash in store_mode_line_string on Android 5.0 and ...
+	e7c85f9235a Use HarfBuzz in Cygwin-w32 build
+	8e3e206bd32 ; * src/buffer.c (syms_of_buffer) <mode-line-format>: ASC...
+
+2024-06-26  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	2f18929319a Fix tabbing between widgets (bug#70594)
+	6ad6507532b ; * lisp/which-key.el (which-key-dont-use-unicode): Add :...
+
+2024-06-25  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	60b38c317bb * lisp/touch-screen.el (touch-screen-inhibit-drag): Anoth...
+
+2024-06-25  Jim Porter  <jporterbugs@gmail.com>
+
+	Support rescaling sliced images in EWW via 'text-scale-mode'
+
+	* src/xdisp.c (find_display_property): When the property value has
+	multiple elements, return the whole list.
+
+	* lisp/net/eww.el (eww--rescale-images): Use 'get-display-property'.
+
+	* doc/lispref/display.texi (Display Property): Describe the new
+	'get-display-property' behavior (bug#71741).
+
+2024-06-25  Jim Porter  <jporterbugs@gmail.com>
+
+	Fix rescaling of images via 'text-scale-mode' in EWW
+
+	* lisp/net/eww.el (eww--rescale-images): Handle a :scale of 'default'
+	(bug#71741).
+
+2024-06-25  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	0e43606b20d * lisp/touch-screen.el (touch-screen-inhibit-drag): Fix t...
+
+2024-06-25  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	1b4c5627211 Fix latent side-effects of respecting field boundaries in...
+	e4046f33ab8 ; * lisp/simple.el (undo-auto--boundaries): Doc fix (bug#...
+	008eeb21fdb ; * lisp/language/cyrillic.el: Delete obsolete commentary...
+	680155d3f03 Add missing builtin package declarations
+
+2024-06-25  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	7e8a97ac788 Show entries from key-translation-map in which-key mode
+	4a0958642d9 * lisp/tab-bar.el (tab-bar-tab-group-face-function): Impr...
+	a769f171e7e ; Fix flymake tests with GCC 14.
+	96e27c2ecf9 Don't show char name for multi-char translations
+	0715abfa86a Reset ls-lisp-use-string-collate when ls-lisp-emulation c...
+	4fcc38966bf Update to Transient v0.7.2-1-gf273c0c8
+
+2024-06-25  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	164f75822b2 ; Fix typos
+	768e92b9c02 Update options that depend on 'which-key-dont-use-unicode'
+	4b2682b17cd ; Remove debugging message in Completion Preview test
+
+2024-06-24  Andreas Schwab  <schwab@suse.de>
+
+	* doc/misc/calc.texi (Musical Notes): Fix typo.
+
+2024-06-24  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	73a58329a69 Fix omission of updates to child frames on Android
+
+2024-06-24  Po Lu  <luangruo@yahoo.com>
+
+	Merge from savannah/emacs-30
+
+	0edacf2aa7e Add jsdoc support to js-ts-mode
+	cace0cbee93 ; Restore inadvertently removed line.
+	2b04effb13d ; * test/lisp/net/shr-tests.el (shr-test--rendering-check...
+	6619aec6bca ; Don't run new 'shr-test/zoom-image' when built without ...
+	5d19bfda321 ; * admin/release-branch.txt: Update and fix typo.
+	fb11294d415 ; Fix typos
+
+2024-06-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Ignore all dot-files in .gitignore
+
+	* .gitignore: Ignore all dot-files except for those checked into Git.
+	This makes us less opinionated about using tools in the Emacs tree.
+
+2024-06-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Delete obsolete file process.cocci
+
+	* admin/coccinelle/process.cocci: Delete file.  This semantic patch was
+	converting code to use the PVAR macro, which was removed by Paul Eggert
+	on 2012-08-17 (commit 6a09a33b5551).
+
+2024-06-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Allow git 1.8.2 features in .gitignore
+
+	* .gitignore: Assume git 1.8.2 or later; we already use the '**' feature
+	from that version since 2021.
+
+2024-06-23  Stefan Kangas  <stefankangas@gmail.com>
+
+	Prefer setq-local in reftex
+
+	* lisp/textmodes/reftex-global.el (reftex-find-duplicate-labels)
+	(reftex-isearch-minor-mode):
+	* lisp/textmodes/reftex-index.el (reftex-index-mode)
+	(reftex-display-index, reftex-index-initialize-phrases-buffer)
+	(reftex-index-phrases-mode):
+	* lisp/textmodes/reftex-sel.el (reftex-select-label-mode)
+	(reftex-select-bib-mode, reftex-insert-docstruct, reftex-select-item):
+	* lisp/textmodes/reftex-toc.el (reftex-toc-mode, reftex-toc):
+	* lisp/textmodes/reftex.el (reftex-fontify-select-label-buffer):
+	Prefer setq-local.
+
+2024-06-23  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/puresize.h (BASE_PURESIZE): Increase.
+
+2024-06-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Update emacs-module for Emacs 31
+
+	* src/module-env-31.h: New file.
+	* src/module-env-30.h:
+	* configure.ac:
+	* src/emacs-module.h.in: Update emacs-module files for Emacs 31.
+
+2024-06-23  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/cus-edit.el (customize-changed-options-previous-release): Bump version.
+
+2024-06-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Bump Emacs version to 31.0.50
+
+	* README:
+	* configure.ac:
+	* nt/README.W32:
+	* msdos/sed2v2.inp:
+	* etc/refcards/ru-refcard.tex:
+	* etc/NEWS: Bump Emacs version to 31.0.50.
+	* etc/NEWS.30: New file.
+
+2024-06-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Merge from origin/emacs-30
+
+	dd0fc6aff60 New branch emacs-30
+	bc72c33ac38 * admin/admin.el: (set-version): Fix regexp for configure...
+
+2024-06-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	Minor changes in tramp-tests.el
+
+	* test/lisp/net/tramp-tests.el (tramp--test-shell-file-name):
+	Use connection-local value.
+	(tramp--test-shell-command-switch): New defun.
+	(tramp-test28-process-file)
+	(tramp-test34-explicit-shell-file-name): Use it.
+	(tramp--test-supports-processes-p): Simplify.
+	(tramp--test-check-files): Use `tramp-compat-seq-keep'.
+	(tramp-test45-asynchronous-requests): Don't let-bind `shell-file-name'.
+	(tramp-test45-asynchronous-requests): Adjust timer.
+	(tramp-test45-asynchronous-requests): Add another test message.
+
+2024-06-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp: Fix bug#71709, and other minor changes
+
+	* lisp/net/tramp-message.el (tramp-backtrace): Print also in batch mode.
+
+	* lisp/net/tramp.el (tramp-skeleton-file-exists-p): Check for
+	property only.
+	(tramp-skeleton-make-process): Don't set `default-directory'.
+	(tramp-handle-make-process): Set it.  (Bug#71709)
+
 2025-08-14  Eli Zaretskii  <eliz@maintain0p.gnu.org>
 
 	* Version 30.2 released.
@@ -1460,7 +64583,7 @@
 
 This file records repository revisions from
 commit 1cda0967b4d3c815fc610794ad6a8fc2b913a3c5 (exclusive) to
-commit 49d64bfb1a4ca5fc8b3a4d215fb6cabbb9780f9b (inclusive).
+commit 311f1fe2ba2a4d069715c992ba839645b55a9427 (inclusive).
 See ChangeLog.4 for earlier changes.
 
 ;; Local Variables:
diff --git a/Makefile.in b/Makefile.in
index 849a75c82c5..698895b79d1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1313,7 +1313,7 @@ ChangeLog:
 	  ./$(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX)
 
 # Check that we are in a good state for changing history.
-PREFERRED_BRANCH = emacs-30
+PREFERRED_BRANCH = emacs-31
 preferred-branch-is-current:
 	git branch | grep -q '^\* $(PREFERRED_BRANCH)$$'
 unchanged-history-files:
diff --git a/admin/authors.el b/admin/authors.el
index 697f697f1f9..4771c101e56 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -49,9 +49,11 @@ files.")
     ("Alexander Gramiak" "Alex Gramiak")
     ("Alexandru Harsanyi" "Alex Harsanyi")
     ("Álvar Jesús Ibeas Martín" "Álvar Ibeas")
+    ("Álvaro Ramírez" "Alvaro Ramirez" "xenodium")
     (nil "ambihelical")
     ("Andrea Corallo" "AndreaCorallo")
     ("Andrii Kolomoiets" "andreyk\\.mad@gmail\\.com")
+    ("André A. Gomes" "Andre A. Gomes")
     ("Andrew Csillag" "Drew Csillag")
     ("Andrew G Cohen" "Andrew Cohen")
     ("Anna M. Bigatti" "Anna Bigatti")
@@ -226,6 +228,7 @@ files.")
     (nil "pillule")
     (nil "psyberbits@gmail\\.com")
     ("Paul Eggert" "Paul R\\. Eggert")
+    ("Paul Nelson" "Paul D. Nelson")
     ("Pavel Janík" "Pavel Janík Ml\\." "Pavel Janik Ml\\." "Pavel Janik")
     ("Pavel Kobiakov" "Pavel Kobyakov")
     ("Per Abrahamsen" "Per Abhiddenware")
@@ -700,7 +703,11 @@ Changes to files matching one of the regexps in this list are not listed.")
     "lisp/org/ob-picolisp.el"
     "lisp/obsolete/levents.el"
     "lisp/obsolete/lucid.el"
-    "lisp/obsolete/old-whitespace.el")
+    "lisp/obsolete/old-whitespace.el"
+    "doc/misc/modus-themes.texi"
+    "doc/misc/elisp-semantic-highlighting.org"
+    "lisp/emacs-lisp/scope.el"
+    "etc/yow.lines")
   "List of files and directories to ignore.
 Changes to files in this list are not listed.")
 
@@ -1164,7 +1171,42 @@ AUTHORS file.  There are also some more recent manual additions.")
     "admin/notes/tree-sitter/build-module/batch.sh"
     "doc/misc/gnus-coding.texi"
     "gnus-coding.texi"
-    "doc/misc/org.texi")
+    "doc/misc/org.texi"
+    ;; Unexec & pure space removal.
+    "src/puresize.h"
+    "src/sheap.c"
+    "src/sheap.h"
+    "src/unexec.h"
+    "src/unexaix.c"
+    "src/unexcoff.c"
+    "src/unexcw.c"
+    "src/unexelf.c"
+    "src/unexhp9k800.c"
+    "src/unexmacosx.c"
+    "src/unexsol.c"
+    "src/unexw32.c"
+    "src/firstfile.c"
+    "src/lastfile.c"
+    ;; Removed.
+    "nt/configure.bat"
+    "lisp/obsolete/cc-compat.el"
+    "lisp/obsolete/info-edit.el"
+    "lisp/obsolete/otodo-mode.el"
+    "lisp/obsolete/rcompile.el"
+    "lisp/terminal.el"
+    "lisp/obsolete/vi.el"
+    "lisp/obsolete/vip.el"
+    "doc/misc/vip.texi"
+    "lisp/obsolete/ws-mode.el"
+    "lisp/obsolete/yow.el"
+    "test/lisp/erc/resources/base/reconnect/ping-pong.eld"
+    "test/lisp/erc/resources/base/reconnect/proxy-solo.eld"
+    "test/lisp/erc/resources/erc-d/resources/proxy-solo.eld"
+    "admin/coccinelle/process.cocci"
+    "admin/coccinelle/window.cocci"
+    "admin/coccinelle/frame.cocci"
+    ;; Merged into various files in cl-lib.
+    "lisp/emacs-lisp/cl-types.el" "test/lisp/emacs-lisp/cl-types-tests.el")
   "File names which are valid, but no longer exist (or cannot be found)
 in the repository.")
 
@@ -1416,7 +1458,7 @@ in the repository.")
     ("lisp/new/eww.el" . "eww.el") ; an actual typo in ChangeLog.3
     ("gssapi.el" . "gssapi.el")
     ("lisp/gnus/gssapi.el" . "gssapi.el")
-    ("imap.el" . "net/imap.el")
+    ("imap.el" . "imap.el")
     ("mailcap.el" . "mailcap.el")
     ("gnus/mailcap.el" . "mailcap.el")
     ("lisp/gnus/mailcap.el" . "mailcap.el")
@@ -1726,7 +1768,17 @@ in the repository.")
     ("lisp/vt100-led.el" . "lisp/obsolete/vt100-led.el")
     ("lisp/mail/metamail.el" . "lisp/obsolete/metamail.el")
     ("lisp/sb-image.el" . "lisp/obsolete/sb-image.el")
-    ("lisp/cedet/semantic/grammar-wy.el" . "lisp/cedet/semantic/grm-wy-boot.el"))
+    ("lisp/cedet/semantic/grammar-wy.el" . "lisp/cedet/semantic/grm-wy-boot.el")
+    ("lisp/vc/vc-dav.el" . "vc-dav.el")
+    ("test/lisp/vc/vc-tests.el" . "vc-tests.el")
+    ("admin/notes/elpa" . "elpa.md")
+    ("etc/NEWS.unknown" . "symbol-releases.eld")
+    ("test/lisp/eshell/eshell-tests-helpers.el" . "eshell-tests-helpers.el")
+    ("test/lisp/package-vc-tests.el" . "package-vc-tests.el")
+    ("test/lisp/vc/vc-misc-tests.el" . "vc-test-misc.el")
+    ("admin/treesit-admin.el" . "treesit-admin.el")
+    ("java/incrementing-version-code" . "AndroidManifest.xml.in")
+    ("etc/ctags.1" "ctags.1"))
   "Alist of files which have been renamed during their lifetime.
 Elements are (OLDNAME . NEWNAME).")
 
diff --git a/etc/AUTHORS b/etc/AUTHORS
index ff7c2cc4ee6..4547a4c618d 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -9,14 +9,15 @@ Aaron Ecay: changed ob-R.el ob-core.el org-src.el ox-latex.el nsterm.m
   ob-awk.el ob-exp.el ob-python.el ob-tangle.el org-bibtex.el org-id.el
   org.el org.texi package.el paren.el
 
-Aaron Jensen: changed nsterm.m frameset.el xdisp-tests.el xdisp.c
-  Info.plist.in comp.el flyspell.el icomplete.el mouse.el
-  ruby-bracketed-args-indent.rb ruby-mode-tests.el ruby-mode.el server.el
+Aaron Jensen: changed nsterm.m frameset.el ruby-bracketed-args-indent.rb
+  ruby-mode.el xdisp-tests.el xdisp.c Info.plist.in comp.el flyspell.el
+  icomplete.el mouse.el ruby-mode-tests.el ruby-ts-mode.el server.el
   systhread.c w32term.c xterm.c
 
 Aaron Larson: co-wrote bibtex.el
 
-Aaron L. Zeng: changed savehist.el
+Aaron L. Zeng: changed savehist.el emacs-module-tests.el emacs-module.c
+  eval.c lisp.h vc-hg.el
 
 Aaron S. Hawley: wrote lisp-tests.el undo-tests.el
 and changed simple.el files.texi isearch.el morse.el sgml-mode.el
@@ -45,14 +46,16 @@ Adam Gołębiowski: changed lib-src/Makefile.in
 Adam Hupp: changed emacs.py emacs2.py emacs3.py gud.el
   progmodes/python.el
 
+Adam Oudad: wrote tifinagh.el
+
 Adam Porter: changed vtable.el tab-line.el cl-macs.el map.el control.texi
   map-tests.el pcase-tests.el tab-bar.el variables.texi vtable.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
   gnus-sum.el grin.xpm gtkutil.c indifferent.xpm message.el
-  reverse-smile.xpm sad.xpm smile.xpm wry.xpm gnus-html.el
-  and 10 other files
+  reverse-smile.xpm sad.xpm smile.xpm wry.xpm gnus-delay.el
+  and 13 other files
 
 Adam Sokolnicki: changed ruby-mode.el
 
@@ -81,7 +84,8 @@ and changed nsterm.m nsfns.m nsfont.m nsterm.h nsmenu.m configure.ac
 
 Agustín Martín: changed ispell.el flyspell.el fixit.texi
 
-Ahmed Khanzada: changed battery.el nsterm.m
+Ahmed Khanzada: changed gtkutil.c battery.el frame.c frame.el gtkutil.h
+  nsterm.m w32fns.c w32term.c w32term.h xsettings.c xsettings.h
 
 Aidan Gauland: wrote em-tramp.el
 and changed eshell.texi em-term.el em-unix.el erc-match.el em-cmpl.el
@@ -109,13 +113,15 @@ and changed url-expand.el process.c url-parse.el w32proc.c message.el
 
 Alakazam Petrofsky: changed hanoi.el
 
+Alan Coopersmith: changed configure.ac
+
 Alan Mackenzie: wrote cc-awk.el debug-early.el
 and co-wrote cc-align.el cc-cmds.el cc-defs.el cc-engine.el cc-fonts.el
   cc-langs.el cc-mode.el cc-styles.el cc-vars.el
 and changed cc-mode.texi bytecomp.el minibuf.c edebug.el subr.el window.c
-  follow.el frame.c lisp.h display.texi eval.c keyboard.c lread.c
-  syntax.texi xdisp.c macroexp.el progmodes/compile.el programs.texi
-  fns.c font-lock.el modes.texi and 203 other files
+  frame.c follow.el lisp.h macroexp.el display.texi eval.c keyboard.c
+  lread.c syntax.texi xdisp.c progmodes/compile.el programs.texi
+  byte-run.el fns.c font-lock.el and 207 other files
 
 Alan Modra: changed unexelf.c
 
@@ -127,10 +133,10 @@ Alan Shutko: changed diary-lib.el calendar.el bindings.el cal-hebrew.el
   solar.el
 
 Alan Third: wrote dabbrev-tests.el image-transforms-tests.el
-and changed nsterm.m nsterm.h nsfns.m image.c nsmenu.m configure.ac
-  nsimage.m ns-win.el macfont.m dispextern.h nsfont.m frame.el
-  display.texi xdisp.c emacs.c frame.c frame.h image.el macos.texi
-  nsselect.m xterm.c and 39 other files
+and changed nsterm.m nsterm.h image.c nsfns.m nsmenu.m configure.ac
+  nsimage.m ns-win.el macfont.m dispextern.h nsfont.m display.texi
+  frame.el xdisp.c emacs.c frame.c frame.h image.el macos.texi nsselect.m
+  xterm.c and 73 other files
 
 Alan Zimmerman: changed eglot.el
 
@@ -141,8 +147,8 @@ and changed sieve.el gnus-msg.el gnus.texi message.el sieve.texi
 
 Albert L. Ting: changed gnus-group.el mail-hist.el
 
-Aleksandr Vityazev: changed cl.texi epa.el epa.texi tramp-compat.el
-  treesit.el
+Aleksandr Vityazev: changed vc.el cl.texi epa.el epa.texi package-vc.el
+  tramp-compat.el treesit.el
 
 Aleksei Gusev: changed progmodes/compile.el
 
@@ -167,8 +173,8 @@ Alexander Klimov: changed files.el calc-graph.el files.texi man.el rx.el
 
 Alexander Kreuzer: changed nnrss.el
 
-Alexander Kuleshov: changed dns-mode.el files.texi image-mode.el
-  keyboard.c ld-script.el xdisp.c
+Alexander Kuleshov: changed dns-mode.el ld-script.el files.texi
+  image-mode.el keyboard.c xdisp.c
 
 Alexander L. Belikoff: wrote erc.el
 
@@ -206,9 +212,9 @@ and changed emacs3.py vc-hooks.el vc.el xml.el
 Alexandr Vityazev: changed shortdoc.el
 
 Alex Bochannek: changed gnus-sum.el gnus.texi gnus-score.el gnus-topic.el
-  gnus-util.el gnus-fun.el gnus-group.el gnus.el ange-ftp.el gnus-art.el
-  kmacro-tests.el kmacro.el newst-ticker.el newsticker.texi nnimap.el
-  tramp-sh.el
+  gnus-util.el gnus-fun.el gnus-group.el gnus.el ange-ftp.el erc-track.el
+  gnus-art.el kmacro-tests.el kmacro.el newst-ticker.el newsticker.texi
+  nnimap.el tramp-sh.el vc-src.el
 
 Alex Coventry: changed files.el
 
@@ -255,15 +261,13 @@ Ali Bahrami: changed configure configure.ac sol2-10.h
 Alin C. Soare: changed lisp-mode.el hexl.el
 
 Allen Li: changed abbrev.el abbrev-tests.el abbrevs.texi find-dired.el
-  recentf.el sending.texi autoload.el bookmark.el comint.el dired-aux.el
-  dired-x.el dired.texi elec-pair.el gnus-group.el misc.texi nsm.el
+  recentf.el sending.texi bookmark.el comint.el dired-aux.el dired-x.el
+  dired.texi elec-pair.el gnus-group.el misc.texi nsm.el
   progmodes/compile.el ring-tests.el ring.el sequences.texi subr.el
   xref.el
 
 Allen S. Rout: changed org-capture.el
 
-Alon Albert: wrote rcompile.el
-
 Alp Aker: changed nsfont.m nsterm.m buff-menu.el nsfns.m nsmenu.m
   nsterm.h configure.ac macfont.m mule-cmds.el nsselect.m process.c
   window.el
@@ -272,17 +276,19 @@ Al Petrofsky: changed term.el
 
 Álvar Jesús Ibeas Martín: changed TUTORIAL.es emacs-lisp-intro.texi
 
+Álvaro Ramírez: changed send-to.el Info.plist.in dired-tests.el dired.el
+  mouse.el ns-win.el nsfns.m nsterm.m
+
 Alyssa Ross: changed progmodes/compile.el simple.el vc-git.el
 
 Ami Fischman: changed bindings.el calendar.el diary-lib.el print.c
   savehist.el vc-git.el
 
-Amin Bandali: changed erc.el erc-button.el erc.texi erc-backend.el
-  erc-compat.el erc-match.el erc-track.el erc-dcc.el
-  erc-desktop-notifications.el erc-services.el erc-speedbar.el
-  erc-status-sidebar.el erc-autoaway.el erc-fill.el erc-goodies.el
-  erc-ibuffer.el erc-imenu.el erc-join.el erc-lang.el erc-list.el
-  erc-log.el and 11 other files
+Amin Bandali: changed erc.el erc.texi erc-backend.el erc-button.el
+  erc-compat.el erc-track.el erc-dcc.el erc-desktop-notifications.el
+  erc-match.el erc-services.el erc-speedbar.el erc-status-sidebar.el
+  erc-autoaway.el erc-fill.el erc-goodies.el erc-ibuffer.el erc-imenu.el
+  erc-join.el erc-lang.el erc-list.el erc-log.el and 13 other files
 
 Amos Bird: changed xfns.c
 
@@ -290,6 +296,8 @@ Amritpal Singh: changed decompress.c
 
 Anand Mitra: changed gnus-sum.el
 
+Anatolii Smolianinov: changed eglot.el
+
 Anders Holst: wrote hippie-exp.el
 
 Anders Lindgren: wrote autorevert.el cwarn.el faceup-test-basics.el
@@ -301,14 +309,18 @@ and changed nsterm.m nsfns.m nsmenu.m nsterm.h font-lock.el nsimage.m
 
 Anders Waldenborg: changed emacsclient.c
 
-Andrea Corallo: wrote comp-common.el comp-cstr-tests.el comp-cstr.el
-  comp-run.el comp-tests.el comp.c comp.el syncdoc-type-hierarchy.el
-and changed pdumper.c lread.c bytecomp.el configure.ac startup.el
-  loadup.el comp.h lisp.h cl-macs.el comp-test-funcs.el cl-preloaded.el
-  subr.el Makefile.in data.c elisp-mode.el nadvice.el alloc.c byte-run.el
-  emacs.c lisp/Makefile.in advice.el and 101 other files
+Andrea Alberti: changed dispextern.h faces.el xdisp.c xfaces.c
 
-André A. Gomes: changed ispell.el
+Andrea Corallo: wrote [native compilation of Emacs Lisp] comp-common.el
+  comp-cstr-tests.el comp-cstr.el comp-run.el comp-tests.el comp.c
+  comp.el syncdoc-type-hierarchy.el
+and changed pdumper.c lread.c bytecomp.el configure.ac startup.el
+  comp-test-funcs.el lisp.h loadup.el comp.h cl-macs.el cl-preloaded.el
+  subr.el Makefile.in byte-run.el data.c elisp-mode.el nadvice.el alloc.c
+  emacs.c lisp/Makefile.in advice.el and 104 other files
+
+André A. Gomes: changed bug-reference.el comint-tests.el comint.el
+  ispell.el
 
 Andrea Greselin: changed electric.el
 
@@ -348,14 +360,14 @@ Andreas Politz: changed buffer-tests.el buffer.c itree.h filenotify.el
   inotify.c itree.c alloc.c editfns.c xdisp.c buffer.h bytecomp.el
   check-sanitize.sh configure.ac elp.el emacs-compat.h filecache.el
   fileio.c filenotify-tests.el fns.c frame.c ibuffer.el
-  and 30 other files
+  and 29 other files
 
 Andreas Rottmann: changed emacsclient.1 emacsclient.c misc.texi server.el
 
 Andreas Schwab: changed configure.ac lisp.h xdisp.c process.c alloc.c
   coding.c Makefile.in emacs.c files.el fileio.c keyboard.c fns.c lread.c
   xterm.c src/Makefile.in editfns.c print.c eval.c font.c xfns.c sysdep.c
-  and 664 other files
+  and 660 other files
 
 Andreas Seltenreich: changed nnweb.el gnus.texi message.el gnus-sum.el
   gnus.el nnslashdot.el gnus-srvr.el gnus-util.el mm-url.el mm-uu.el
@@ -372,7 +384,7 @@ Andre Spiegel: changed vc.el vc-hooks.el vc-cvs.el vc-rcs.el vc-sccs.el
   parse-time.el startup.el tramp-vc.el vc-arch.el vc-mcvs.el vc-svn.el
   vcdiff viper-util.el
 
-Andrés Ramírez: changed viper-cmd.el viperCard.tex
+Andrés Ramírez: changed viper-cmd.el semantic/complete.el viperCard.tex
 
 Andre Srinivasan: changed gnus-group.el gnus-sum.el gnus.texi message.el
   mm-decode.el mml.el nnmail.el
@@ -397,8 +409,8 @@ Andrew Eggenberger: changed cl-extra.el seq.el
 Andrew G Cohen: wrote nnselect.el spam-wash.el
 and changed nnir.el gnus-sum.el nnimap.el gnus-group.el gnus.texi
   gnus-search.el gnus-msg.el gnus-art.el gnus-int.el gnus.el
-  auth-source.el gnus-cache.el mailcap.el nnagent.el nnheader.el
-  nnspool.el deps.mk dns.el doc-view.el fns-tests.el fns.c
+  auth-source.el gnus-cache.el mailcap.el message.el message.texi
+  nnagent.el nnheader.el nnspool.el deps.mk dns.el doc-view.el
   and 21 other files
 
 Andrew Hall: changed paren.el
@@ -409,7 +421,7 @@ Andrew Hyatt: changed bug-triage CONTRIBUTE buffer.c face-remap.el
 Andrew Innes: changed makefile.nt w32fns.c w32term.c w32.c w32proc.c
   fileio.c ms-w32.h w32-fns.el dos-w32.el w32term.h makefile.def
   unexw32.c w32menu.c w32xfns.c addpm.c cmdproxy.c emacs.c w32-win.el
-  w32inevt.c configure.bat lread.c and 126 other files
+  w32inevt.c configure.bat lread.c and 125 other files
 
 Andrew L. Moore: changed executable.el
 
@@ -461,33 +473,37 @@ and changed erc.el erc-nicks-tests.el erc-tests.el erc.texi
 
 Angelo Graziosi: changed sysdep.c term.c
 
+Ankit R Gadiya: changed go-ts-mode.el
+
 Anmol Khirbat: changed ido.el
 
 Anna M. Bigatti: wrote cal-html.el
 
 Ansgar Burchardt: changed latin-ltx.el
 
-Antero Mejr: changed custom.texi eww.el files.el variables.texi
-  em-unix.el eshell.texi files-tests.el pcmpl-git.el pcmpl-unix.el
+Antero Mejr: changed files.el custom.texi emacsbug.el eww.el pcmpl-git.el
+  scheme.el variables.texi em-unix.el eshell.texi files-tests.el image.el
+  pcmpl-unix.el
 
 Antoine Beaupré: changed vc-git.el
 
 Antoine Kalmbach: changed README.md eglot.el
 
-Antoine Levitt: changed gnus-group.el gnus-sum.el message.texi ada-prj.el
+Antoine Levitt: changed gnus-group.el gnus-sum.el message.texi
   ange-ftp.el cus-edit.el dired-x.el ebnf2ps.el emerge.el erc-button.el
   erc-goodies.el erc-stamp.el erc-track.el files.el find-file.el
   gnus-art.el gnus-uu.el gnus.el gnus.texi message.el mh-funcs.el
-  and 9 other files
+  mh-mime.el and 8 other files
 
 Antonin Houska: changed newcomment.el
 
 Antonio Ruiz: changed handwrite.el
 
 Arash Esbati: changed reftex-vars.el efaq-w32.texi reftex-cite.el
-  reftex-tests.el reftex-parse.el reftex.el gnus.texi reftex-auc.el
-  reftex-dcr.el reftex-ref.el tex-mode.el align.el eglot.el ffap.el
-  ispell.el maintaining.texi nnmaildir.el reftex-global.el reftex-toc.el
+  reftex-tests.el reftex.texi reftex-parse.el reftex.el gnus.texi
+  ispell.el reftex-auc.el reftex-dcr.el reftex-ref.el tex-mode.el
+  align.el eglot.el ffap.el latexenc.el maintaining.texi nnmaildir.el
+  reftex-global.el reftex-toc.el
 
 Arik Mitschang: changed smime.el
 
@@ -512,7 +528,8 @@ and changed frames.texi generic-x.el texinfo.el
 
 Arnold Noronha: changed ido.el
 
-Arsen Arsenović: changed typescript-ts-mode.el
+Arsen Arsenović: changed cc-langs.el c-ts-common.el ruler-mode.el
+  typescript-ts-mode.el
 
 Artem Chuprina: changed message.el
 
@@ -525,13 +542,15 @@ Arthur Miller: changed help-fns.el ange-ftp.el bytecomp.el comp.c comp.el
   ls-lisp.el sysdep.c tramp-adb.el tramp-rclone.el tramp-sh.el
   tramp-smb.el tramp.el w32.c wdired.el
 
+Arto Jantunen: changed em-alias-tests.el em-alias.el shr.el
+
 Artur Malabarba: wrote char-fold-tests.el faces-tests.el isearch-tests.el
   let-alist.el simple-tests.el sort-tests.el tabulated-list-tests.el
 and changed package.el isearch.el char-fold.el files.el tabulated-list.el
-  package-test.el menu-bar.el replace.el bytecomp.el faces.el files-x.el
+  package-tests.el menu-bar.el replace.el bytecomp.el faces.el files-x.el
   custom.el custom.texi help-fns.el let-alist-tests.el simple.el
   subr-tests.el align.el bindings.el cl-lib-tests.el cl-macs.el
-  and 43 other files
+  and 41 other files
 
 Artyom Loenko: changed Info.plist.in
 
@@ -539,6 +558,8 @@ Arun Isaac: changed quail/indian.el
 
 Arun Persaud: changed org-agenda.el org-src.el
 
+Asher Copeland: changed simple.el
+
 Asher Gordon: changed gomoku.el mml.el
 
 Ashish Shukla: changed emacs-gnutls.texi gnutls.el comp.el
@@ -558,11 +579,11 @@ August Feng: changed bookmark.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
-  progmodes/compile.el project.el README.md dired.el files.el
-  font-lock.el glasses.el man.el misc.texi modes.texi outline.el
-  pcmpl-git.el pcmpl-gnu.el pcmpl-linux.el pcmpl-rpm.el pcmpl-unix.el
-  and 11 other files
+and changed progmodes/python.el eglot.el isearch.el comint.el eldoc.el
+  progmodes/compile.el project.el README.md bookmark.el dired.el
+  dockerfile-ts-mode.el files.el font-lock.el glasses.el gnutls.el man.el
+  message.el message.texi misc.texi modes.texi outline.el
+  and 16 other files
 
 Aurélien Aptel: changed alloc.c emacs-module.h lisp.h Makefile
   configure.ac cus-face.el data.c dispextern.h display.texi dynlib.c
@@ -576,7 +597,8 @@ Axel Svensson: changed characters.el display.texi x-win.el
 Aymeric Agon-Rambosson: changed indent.el
 
 Azeem Hasan: wrote pakistan.el
-and changed shr.el eww.el proced.el
+and changed proced.el shr.el eww.el modes.texi pcmpl-rpm.el
+  tabulated-list.el url-queue.el
 
 Bahodir Mansurov: changed quail/cyrillic.el
 
@@ -586,28 +608,30 @@ B. Anyos: changed w32term.c
 
 Baoqiu Cui: changed org-docbook.el
 
+Baptiste Strazzulla: changed newst-plainview.el
+
+Barra Ó Catháin: changed bindings.el register.el regs.texi
+
 Barry A. Warsaw: wrote elp.el man.el regi.el reporter.el supercite.el
-and co-wrote cc-align.el cc-cmds.el cc-compat.el cc-defs.el cc-engine.el
-  cc-guess.el cc-langs.el cc-menus.el cc-mode.el cc-styles.el cc-vars.el
+and co-wrote cc-align.el cc-cmds.el cc-defs.el cc-engine.el cc-guess.el
+  cc-langs.el cc-menus.el cc-mode.el cc-styles.el cc-vars.el
 and changed c++-mode.el cplus-md1.el syntax.c syntax.h
 
 Barry Fishman: changed configure.ac gnu-linux.h image.c
 
 Barry O'Reilly: changed simple.el lisp.h undo-tests.el eval.c keyboard.c
   markers.texi alloc.c bytecode.c casetab.c data.c fileio.c fw.el idle.el
-  insdel.c lread.c pulse.el search.c subr.el text.texi timer-tests.el
-  undo.c
+  insdel.c lread.c search.c subr.el text.texi timer-tests.el undo.c
 
 Bartosz Duszel: changed allout.el bib-mode.el cc-cmds.el hexl.el icon.el
   menu-bar.el meta-mode.el mouse.el pascal.el perl-mode.el senator.el
-  sendmail.el ses.el simple.el verilog-mode.el vi.el vip.el viper-cmd.el
+  sendmail.el ses.el simple.el verilog-mode.el vip.el viper-cmd.el
   xscheme.el
 
-Basil L. Contovounesios: changed simple.el subr.el message.el eww.el
-  modes.texi custom.el text.texi bibtex.el eglot-tests.el js.el
-  gnus-sum.el internals.texi subr-tests.el customize.texi display.texi
-  files.texi gnus-art.el gnus-group.el gnus-win.el gnus.texi gravatar.el
-  and 371 other files
+Basil L. Contovounesios: changed simple.el subr.el message.el modes.texi
+  eww.el custom.el text.texi bibtex.el display.texi eglot-tests.el js.el
+  json.el battery.el gnus-sum.el image.c internals.texi project.el
+  subr-tests.el customize.texi files.texi gnus-art.el and 404 other files
 
 Bastian Beischer: changed semantic/complete.el calc-yank.el include.el
   mru-bookmark.el refs.el senator.el
@@ -643,8 +667,8 @@ Benjamin Ragheb: changed fortune.el
 
 Benjamin Riefenstahl: changed files.el image-mode.el nnrss-tests.el
   w32select.c emacs.c image.el lisp.h mac-win.el macterm.c ms-w32.h
-  mule-cmds.el mule-tests.el mule.el nnrss.el runemacs.c tcl.el thumbs.el
-  w32.c w32.h
+  mule-cmds.el mule-tests.el mule.el nnrss.el runemacs.c tcl.el w32.c
+  w32.h
 
 Benjamin Rutt: co-wrote gnus-dired.el
 and changed vc.el gnus-msg.el message.el diff-mode.el ffap.el nnimap.el
@@ -663,6 +687,8 @@ Ben North: changed outline.el buffer.c fill.el isearch.el lisp-mode.el
 
 Ben Scuron: changed etags-regen.el
 
+Ben Simms: changed nsimage.m nsterm.m
+
 Benson Chu: changed font-lock.el tab-bar.el tramp-sh.el
 
 Bernhard Herzog: changed vc-hg.el menu.c xsmfns.c
@@ -702,14 +728,21 @@ and changed mh-customize.el mh-search.el mh-alias.el mh-e.texi Makefile
   image.el mh-tool-bar.el mh-xemacs.el display.texi mh-pick.el
   and 82 other files
 
+Billy Lei: wrote burmese.el
+
 Billy Zheng: changed README.md eglot.el
 
+Binbin Ye: changed json-ts-mode-tests.el json-ts-mode.el
+
 Bjarte Johansen: wrote ob-sed.el
 and changed use-package-bind-key.el
 
+Björn Bidar: changed sieve.el url-auth.el browse-url.el nnregistry.el
+  sieve.texi
+
 Björn Holby: changed vhdl-mode.el
 
-Björn Lindström: changed rcirc.texi
+Björn Lindström: changed rcirc.texi whitespace.el
 
 Bjørn Mork: changed nnimap.el gnus-agent.el message.el mml2015.el
 
@@ -743,6 +776,8 @@ Bogdan Creanga: changed sequences.texi strings.texi symbols.texi
 
 Bojan Petrovic: changed pop3.el
 
+Boris Buliga: changed nsterm.m
+
 Boris Goldowsky: wrote avoid.el descr-text.el enriched.el facemenu.el
   format.el shadowfile.el
 and changed fill.el simple.el indent.el paragraphs.el cmds.c intervals.c
@@ -784,6 +819,8 @@ Brent Goodrick: changed abbrev.el
 
 Brent Westbrook: changed eudcb-mailabbrev.el
 
+Bret Mogilefsky: co-wrote lua-mode.el
+
 Brian Burns: changed INSTALL INSTALL.W64
 
 Brian Cully: wrote tramp-container.el
@@ -795,7 +832,7 @@ Brian D. Carlstrom: changed gud.el smtpmail.el
 Brian Fox: changed Makefile.in Makefile configure.ac minibuf.c dired.el
   files.el lib-src/Makefile.in oldXMenu/Makefile.in rmail.el search.c
   simple.el sysdep.c compile.el forms.texi frame.c keyboard.c make-dist
-  subr.el systty.h texindex.c xterm.c and 47 other files
+  subr.el systty.h texindex.c xterm.c and 46 other files
 
 Brian Jenkins: changed frame.c frames.texi hooks.texi
 
@@ -813,7 +850,7 @@ Brian Palmer: changed erc.el erc-list.el
 Brian Preble: changed abbrev.el apropos.el asm-mode.el awk-mode.el
   bytecomp.el c++-mode.el cal.el calc.el chistory.el cl-indent.el
   compare-w.el compile.el dabbrev.el debug.el diary.el diff.el dired.el
-  doctex.el doctor.el ebuff-menu.el echistory.el and 129 other files
+  doctex.el doctor.el ebuff-menu.el edebug.el and 124 other files
 
 Brian P Templeton: changed erc.el erc-compat.el erc-fill.el
   erc-nickserv.el erc-pcomplete.el erc-stamp.el erc-track.el lread.c
@@ -825,11 +862,13 @@ Brian van den Broek: changed org.texi
 
 Bruce Stephens: changed calc-ext.el
 
+Bruno Boal: changed erc-spelling.el
+
 Bruno Félix Rezende Ribeiro: changed os.texi finder.el functions.texi
   gnus.texi info.el lisp-mnt.el package.el
 
 Bruno Haible: co-wrote po.el
-and changed INSTALL emacs.1 epaths.in info.el paths.el
+and changed INSTALL emacs.1 epaths.in info.el
 
 Bryan C. Mills: changed lread.c
 
@@ -886,7 +925,10 @@ and changed ox.el ox-latex.el org.texi org-remember.el orgcard.tex
 
 Caveh Jalali: changed configure.ac intel386.h sol2-4.h
 
-Cecilio Pardo: changed DEVEL.HUMOR
+Cecilio Pardo: changed w32-win.el w32dwrite.c w32fns.c w32term.c
+  w32gdiplus.h w32image.c w32term.h DEVEL.HUMOR configure.ac dispextern.h
+  frames.texi image.c mailcap.el sgml-mode.el sound.c w32font.c w32menu.c
+  w32select.c w32uniscribe.c yank-media.el
 
 Cédric Chépied: changed newst-treeview.el tree-widget.el
 
@@ -899,7 +941,8 @@ Changwoo Ryu: changed files.el
 
 Chao-Hong Liu: changed TUTORIAL.cn TUTORIAL.zh
 
-Charalampos Mitrodimas: changed keymap.el locate.el srecode/find.el
+Charalampos Mitrodimas: changed keymap.el locate.el nsterm.m
+  srecode/find.el
 
 Charles A. Roelli: changed vc.el nsterm.m simple.el nsfns.m isearch.el
   nsmenu.m nsterm.h process.c register.el diff-mode.el display.texi
@@ -934,12 +977,12 @@ and co-wrote longlines.el tango-dark-theme.el tango-theme.el
 and changed simple.el display.texi xdisp.c files.el frames.texi
   cus-edit.el files.texi custom.el subr.el text.texi faces.el keyboard.c
   startup.el package.el misc.texi emacs.texi modes.texi mouse.el
-  custom.texi image.c window.el and 934 other files
+  custom.texi image.c window.el and 903 other files
 
 Chris Chase: co-wrote idlw-shell.el idlwave.el
 
-Chris Feng: changed dispnew.c keyboard-tests.el keyboard.c autoload.el
-  frame.c process.c
+Chris Feng: changed dispnew.c keyboard-tests.el keyboard.c frame.c
+  process.c
 
 Chris Foote: changed progmodes/python.el
 
@@ -969,6 +1012,8 @@ Chris Newton: changed url-http.el
 
 Chris Prince: changed w32term.c
 
+Chris Roberts: changed sqlite.c
+
 Chris Smith: wrote icon.el
 and changed icon-mode.el
 
@@ -1004,10 +1049,14 @@ Christian Plaunt: wrote soundex.el
 
 Christian Schwarzgruber: changed epa.el
 
+Christian Vogler: co-wrote lua-mode.el
+
 Christian von Roques: changed mml2015.el epg.el gnus-start.el
 
 Christian Wittern: changed image-mode.el
 
+Christoph Badura: changed log-edit-tests.el log-edit.el
+
 Christoph Bauer: changed configure.ac
 
 Christoph Conrad: changed gnus-agent.el gnus-score.el qp.el
@@ -1016,7 +1065,7 @@ Christoph Dittmann: changed ox-beamer.el
 
 Christophe de Dinechin: co-wrote ns-win.el
 
-Christophe Deleuze: changed ange-ftp.el icalendar.el image-dired.el
+Christophe Deleuze: changed ange-ftp.el icalendar.el
 
 Christoph Egger: changed configure.ac
 
@@ -1049,7 +1098,7 @@ Christopher Wellons: changed emacs-lisp/cl-lib.el hashcash.el
   viper-cmd.el viper-ex.el viper-init.el viper.el
 
 Christophe Troestler: changed rust-ts-mode.el gnus-icalendar.el epg.el
-  newcomment.el
+  font-lock-number.rs font-lock.rs newcomment.el rust-ts-mode-tests.el
 
 Christoph Göttschkes: changed make-mode.el
 
@@ -1060,9 +1109,9 @@ Christoph Scholtes: changed README.W32 progmodes/python.el stdint.h
   progmodes/grep.el and 5 other files
 
 Christoph Wedler: wrote antlr-mode.el
-and changed progmodes/python.el format.el gnus-art.el gnus-picon.el
-  message.el prog-mode.el python-tests.el register.el smiley.el
-  texinfmt.el
+and changed progmodes/python.el files.el format.el gnus-art.el
+  gnus-picon.el message.el prog-mode.el python-tests.el register.el
+  smiley.el texinfmt.el
 
 Chris Zheng: changed gnutls.c calculator.el json.c w32-win.el
 
@@ -1095,13 +1144,17 @@ and changed calc.el replace.el update-game-score.c calc-ext.el
   calc-misc.el calc-macs.el calc-mode.el calc-graph.el gamegrid.el
   calc-aent.el calc-bin.el calc-embed.el calc-keypd.el calc-math.el
   calc-prog.el calc-units.el calcalg2.el font-core.el info.el calc-alg.el
-  calc-arith.el and 81 other files
+  calc-arith.el and 80 other files
 
 Colin Williams: changed calc.texi
 
 Colin Woodbury: changed cl-seq.el files.el progmodes/python.el files.texi
   frame.c macros.texi shortdoc.el
 
+Collin Funk: changed coding.c configure.ac fns-tests.el fns.c
+  gnulib-comp.m4 gnulib.mk.in gnutls-tests.el merge-gnulib sha3.c sha3.h
+  sha3.m4 text.texi
+
 Constantin Kulikov: changed server.el startup.el
 
 Constantino Calancha: changed dired.el
@@ -1159,8 +1212,8 @@ Damon Anton Permezel: wrote hanoi.el (public domain)
 Damyan Pepper: changed font.c font.h ftfont.c w32font.c
 
 Dan Christensen: changed gnus-sum.el nndoc.el nnfolder.el gnus-art.el
-  gnus-group.el gnus-registry.el gnus-score.el gnus-util.el nnmail.el
-  spam.el time-date.el
+  gnus-group.el gnus-registry.el gnus-score.el gnus-util.el nnimap.el
+  nnmail.el spam.el time-date.el
 
 Dan Davison: wrote ob-matlab.el ob-octave.el
 and co-wrote ob-R.el ob-core.el ob-exp.el ob-java.el ob-lob.el ob-perl.el
@@ -1184,15 +1237,17 @@ Daniel Colascione: wrote alloc-tests.el generator-tests.el generator.el
   lisp-tests.el
 and co-wrote js.el
 and changed keyboard.c emacs.c w32fns.c alloc.c image.c cl-macs.el
-  frame.c lisp.h src/Makefile.in configure.ac frame.el process.c xterm.el
-  sh-script.el xfaces.c xterm.c coding.c cygw32.c data.c dbusbind.c fns.c
-  and 213 other files
+  frame.c lisp.h src/Makefile.in term.el configure.ac frame.el process.c
+  xfaces.c xterm.el sh-script.el xterm.c coding.c cygw32.c data.c
+  dbusbind.c and 227 other files
 
 Daniel Dehennin: changed gnus-mlspl.el mml2015.el gnus-msg.el gnus.texi
   mm-decode.el nnmail.el ox.el
 
 Daniel E. Doherty: changed calc.texi
 
+Daniel Eklöf: changed xterm.el
+
 Daniel Elliott: changed octave.el
 
 Daniel Engeler: changed sysdep.c elisp.texi emacs.texi internals.texi
@@ -1207,12 +1262,12 @@ Daniel Freeman: changed eglot.el js.el eglot.texi
 Daniel Gröber: changed rxvt.el
 
 Daniel Hackney: wrote package-tests.el
-and co-wrote package.el
-and changed package-test.el package-x.el ange-ftp.el
-  automated/Makefile.in browse-url.el dbus.el dired-x.el ediff-diff.el
-  ediff-init.el ediff-merg.el ediff-mult.el ediff-util.el ediff-wind.el
-  ediff.el emacsclient.c emerge.el eudc.el eudcb-ldap.el eww.el finder.el
-  imap.el and 6 other files
+and co-wrote package-activate.el package.el
+and changed ange-ftp.el automated/Makefile.in browse-url.el dbus.el
+  dired-x.el ediff-diff.el ediff-init.el ediff-merg.el ediff-mult.el
+  ediff-util.el ediff-wind.el ediff.el emacsclient.c emerge.el eudc.el
+  eudcb-ldap.el eww.el finder.el imap.el pcvs.el printing.el
+  and 4 other files
 
 Daniel Jensen: changed apropos.el
 
@@ -1244,8 +1299,10 @@ Daniel McClanahan: changed lisp-mode.el
 Daniel M Coffman: changed arc-mode.el
 
 Daniel Mendler: co-wrote compat.el
-and changed minibuffer.el minibuf.texi simple.el elp.el help-fns.el
-  info.el minibuf.c minibuffer-tests.el xref.el
+and changed minibuffer.el simple.el browse-url.el ibuffer.el crm.el
+  eww.el minibuf.texi project.el buffer-tests.el buffer.c buffer.h
+  dispextern.h display.texi faces.el frame.c frame.h package.el
+  picture.el subr-tests.el subr.el window.c and 30 other files
 
 Daniel M German: co-wrote org-protocol.el
 
@@ -1254,7 +1311,7 @@ Daniel Néri: changed message.el
 Daniel Ortmann: changed paragraphs.el
 
 Daniel Pettersson: changed jsonrpc.el em-cmpl.el erc-dcc-tests.el
-  erc-dcc.el
+  erc-dcc.el nsterm.m
 
 Daniel Pfeiffer: wrote conf-mode.el copyright.el executable.el
   sh-script.el skeleton.el two-column.el
@@ -1279,6 +1336,8 @@ Daniel Schoepe: changed gnus-sum.el
 Daniel Semyonov: wrote nnatom.el nnfeed.el
 and changed mairix.el gnus.el gnus.texi package-vc.el
 
+Daniel Watson: changed eww.el
+
 Dani Moncayo: changed msys-to-w32 Makefile.in configure.ac buffers.texi
   lists.texi mini.texi INSTALL README.W32 basic.texi custom.texi
   dired.texi display.texi emacs-lisp-intro.texi files.texi killing.texi
@@ -1291,7 +1350,7 @@ and co-wrote hideshow.el
 and changed vc.el configure.ac vc-hg.el vc-git.el src/Makefile.in
   vc-bzr.el sysdep.c emacs.c process.c vc-cvs.el lisp.h term.c
   vc-hooks.el xterm.c keyboard.c vc-svn.el xterm.el callproc.c darwin.h
-  term.el gnu-linux.h and 920 other files
+  term.el gnu-linux.h and 911 other files
 
 Danny Freeman: changed treesit-tests.el treesit.el
 
@@ -1331,7 +1390,7 @@ and co-wrote latin-ltx.el socks.el
 and changed configure.ac help.el mule-cmds.el fortran.el mule-conf.el
   xterm.c browse-url.el mule.el coding.c src/Makefile.in european.el
   fns.c mule-diag.el simple.el wid-edit.el cus-edit.el cus-start.el
-  files.el keyboard.c byte-opt.el info.el and 771 other files
+  files.el keyboard.c byte-opt.el info.el and 768 other files
 
 Dave Pearson: wrote 5x5.el quickurl.el
 
@@ -1359,7 +1418,7 @@ David Byers: changed minibuf.c
 
 David Cadé: changed mpc.el
 
-David Caldwell: changed unexmacosx.c vc-hooks.el
+David Caldwell: changed nsterm.m unexmacosx.c vc-hooks.el
 
 David Casperson: changed font-core.el menu-bar.el tex-mode.el
 
@@ -1380,12 +1439,16 @@ and changed cedet/semantic.el db.el insert.el semantic/complete.el c.by
   c.el db-el.el db-file.el db-find.el ede-grammar.el eieio-opt.el
   eieio.el eieio.texi gnus.texi registry.el srecode/compile.el
   wisent/python.el analyze.el bovine/el.el bovine/grammar.el
-  decorate/mode.el and 88 other files
+  decorate/mode.el and 87 other files
 
 Davide Pola: changed comp-cstr.el comp-run.el
 
 David Florness: changed eglot.el
 
+David Fussner: changed package-vc.el tex-mode.el CTAGS.good ETAGS.good_1
+  ETAGS.good_2 ETAGS.good_3 ETAGS.good_4 ETAGS.good_5 ETAGS.good_6
+  etags.c maintaining.texi
+
 David Gillespie: wrote calc-aent.el calc-alg.el calc-arith.el calc-bin.el
   calc-comb.el calc-cplx.el calc-embed.el calc-ext.el calc-fin.el
   calc-forms.el calc-frac.el calc-funcs.el calc-graph.el calc-help.el
@@ -1413,7 +1476,7 @@ David Hull: changed etags.c vc-hg.el
 
 David Hunter: changed flymake.el ms-w32.h process.c
 
-David J. Biesack: changed antlr-mode.el quickurl.el
+David J. Biesack: changed antlr-mode.el
 
 David J. MacKenzie: changed configure.ac Makefile.in etags.c fakemail.c
   cvtmail.c movemail.c termcap.c wakeup.c yow.c Makefile avoid.el b2m.c
@@ -1426,12 +1489,12 @@ and changed sendmail.el xmenu.c
 David Kastrup: changed greek.el replace.el subr.el efaq.texi search.c
   gnus-art.el help.el keymaps.texi mouse.el woman.el ange-ftp.el calc.el
   cperl-mode.el desktop.el ebrowse.el info.el keyboard.c keymap.c
-  keymap.h kmacro.el lisp-mnt.el and 98 other files
+  keymap.h kmacro.el lisp-mnt.el and 96 other files
 
 David Lawrence: changed comint.el simple.el files.el c++-mode.el
   compile.el inf-lisp.el shell.el emerge.el tex-mode.el c-mode.el cl.el
   dired.el getdate.y gnus.el history.el lisp-mode.el lisp.el mh-e.el
-  rnews.el subr.el Makefile and 79 other files
+  rnews.el subr.el Makefile and 77 other files
 
 David Leatherman: co-wrote erc-nicks.el
 and changed erc-nicks-tests.el erc-tests.el erc.el erc.texi
@@ -1479,10 +1542,10 @@ David Ponce: wrote bovine/grammar.el cedet.el comp.el java-tags.el
   semantic/java.el semantic/wisent.el senator.el tree-widget.el
   wisent/grammar.el wisent/wisent.el
 and co-wrote util-modes.el
-and changed image.el w32menu.c w32term.c close.png close.xpm empty.png
+and changed subr-x.el wid-edit.el image.el w32menu.c w32term.c
+  cl-extra.el cl-types.el close.png close.xpm cus-edit.el empty.png
   empty.xpm end-guide.png end-guide.xpm files.el guide.png guide.xpm
-  handle.png handle.xpm keyboard.c leaf.png leaf.xpm no-guide.png
-  no-guide.xpm no-handle.png no-handle.xpm and 25 other files
+  handle.png handle.xpm keyboard.c leaf.png and 36 other files
 
 David Raynes: changed ns-win.el
 
@@ -1512,10 +1575,10 @@ Debarshi Ray: changed erc-backend.el erc.el
 
 Decklin Foster: changed nngateway.el
 
-Deepak Goel: changed idlw-shell.el ada-xref.el feedmail.el files.el
-  find-func.el flymake.el mh-search.el mh-seq.el mh-thread.el mh-xface.el
-  org.el simple.el vc.el vhdl-mode.el wdired.el README ada-mode.el
-  allout.el appt.el apropos.el artist.el and 85 other files
+Deepak Goel: changed feedmail.el files.el find-func.el flymake.el
+  mh-search.el mh-seq.el mh-thread.el mh-xface.el org.el simple.el vc.el
+  vhdl-mode.el wdired.el README allout.el appt.el apropos.el artist.el
+  bibtex.el bindings.el bookmark.el and 78 other files
 
 D. E. Evans: changed basic.texi
 
@@ -1535,8 +1598,8 @@ Denis Zubarev: changed treesit-tests.el progmodes/python.el
 
 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
-  vc/vc-bzr.el wdired.el window.el
+  lisp-mode.el process.c progmodes/python.el rcirc.texi vc/vc-bzr.el
+  wdired.el window.el
 
 Dennis Gilmore: changed sparc.h
 
@@ -1565,7 +1628,7 @@ Devon Sean McCullough: changed url-http.el buff-menu.el comint.el
 Dhruva Krishnamurthy: changed emacsclient.c fontset.c image.c sound.c
   w32proc.c
 
-Diancheng Wang: changed gdb-mi.el gud.el
+Diancheng Wang: changed gud.el gdb-mi.el
 
 Diane Murray: changed erc.el erc-backend.el erc-menu.el erc-button.el
   erc-track.el erc-match.el erc-nets.el erc-list.el erc-autoaway.el
@@ -1587,6 +1650,8 @@ and changed nntp.el message.el gnus-group.el gnus-sum.el gnus-msg.el
   gnus-util.el message.texi nnmail.el rect.el cl-indent.el gmm-utils.el
   and 10 other files
 
+Diep Pham: changed eglot.el
+
 Dieter Deyke: changed vc-src.el
 
 Dieter Schoen: wrote ob-lua.el
@@ -1605,7 +1670,7 @@ Dionisio E Alonso: changed eglot.el
 
 Dirk Herrmann: co-wrote bibtex.el
 
-Dirk-Jan C. Binnema: changed org-agenda.el
+Dirk-Jan C. Binnema: changed configure.ac org-agenda.el xwidget.c
 
 Dirk Ullrich: changed ispell.el
 
@@ -1616,7 +1681,7 @@ Dmitri Paduchikh: changed advice.el
 Dmitry Antipov: changed lisp.h xdisp.c alloc.c xterm.c frame.c buffer.c
   xfns.c window.c font.c w32term.c frame.h keyboard.c nsterm.m w32fns.c
   editfns.c xterm.h xfaces.c dispnew.c fileio.c dispextern.h fns.c
-  and 276 other files
+  and 271 other files
 
 Dmitry Bolshakov: changed hideshow.el
 
@@ -1627,11 +1692,11 @@ Dmitry Gorbik: changed org.el
 
 Dmitry Gutov: wrote elisp-mode-tests.el etags-regen.el jit-lock-tests.el
   json-tests.el vc-hg-tests.el xref-tests.el
-and changed xref.el project.el ruby-mode.el ruby-ts-mode.el vc-git.el
-  js.el elisp-mode.el ruby-mode-tests.el vc.el etags.el package.el
-  vc-hg.el minibuffer.el simple.el symref/grep.el progmodes/python.el
-  ruby-ts-mode-tests.el treesit.el dired-aux.el log-edit.el
-  rust-ts-mode.el and 175 other files
+and changed project.el xref.el ruby-mode.el vc-git.el ruby-ts-mode.el
+  vc.el elisp-mode.el js.el etags.el ruby-mode-tests.el vc-hg.el
+  package.el minibuffer.el maintaining.texi simple.el symref/grep.el
+  progmodes/python.el ruby-ts-mode-tests.el treesit.el dired-aux.el
+  project-tests.el and 189 other files
 
 Dmitry Kurochkin: changed isearch.el
 
@@ -1666,15 +1731,17 @@ and co-wrote color.el
 and changed dired.el cus-edit.el imenu.el info.el ls-lisp.el menu-bar.el
   dired-aux.el dired.texi faces.el files.el frame.el help-fns.el
   help-mode.el help.el help.texi isearch.el modes.texi mouse.el
-  wid-edit.el ange-ftp.el apropos.el and 25 other files
+  wid-edit.el ange-ftp.el apropos.el and 24 other files
+
+Dr.Sc.Kawamoto,Takuji: changed nsterm.m
 
 Duncan Findlay: changed frame.el keyboard.c xterm.el
 
-Earl Hyatt: changed kmacro.el autotype.texi ffap.el kmacro.texi map.el
-  seq-tests.el sequences.texi windows.texi control.texi cus-edit.el
-  edmacro.el eshell.texi hi-lock.el map-tests.el misc.texi package-vc.el
-  package.texi pcase-tests.el pcase.el replace.el search.texi
-  and 4 other files
+Earl Hyatt: changed kmacro.el autotype.texi cl-macs-tests.el ffap.el
+  kmacro.texi map.el seq-tests.el sequences.texi windows.texi
+  cl-lib-tests.el cl-macs.el cl.texi control.texi cus-edit.el delsel.el
+  edmacro.el eshell.texi hi-lock.el map-tests.el mark.texi misc.texi
+  and 10 other files
 
 E. Choroba: changed cperl-mode.el simple.el
 
@@ -1714,13 +1781,17 @@ Ehud Karni: changed rmail.el aviion-intel.h complete.el configure.ac
 
 Eirik Fuller: changed ralloc.c xterm.c
 
-E. Jay Berkenbilt: changed b2m.c flyspell.el ispell.el unrmail.el
-  whitespace.el window.h
+E. Jay Berkenbilt: changed b2m.c flyspell.el unrmail.el whitespace.el
+  window.h
 
 Elad Lahav: changed configure.ac
 
-Elías Gabriel Pérez: changed flymake.el flymake.texi image.c w32term.c
-  w32term.h
+Elías Gabriel Pérez: wrote ring-bell-fns.el
+and changed hideshow.el programs.texi treesit.el hideshow-tests.el
+  progmodes/python.el electric.el fortran.el icon.el lisp-mode.el
+  lua-mode.el nxml-mode.el progmodes/f90.el project.el sgml-mode.el
+  tab-line.el verilog-mode.el vhdl-mode.el README bibtex.el cc-mode.el
+  display.texi and 58 other files
 
 Elias Oltmanns: changed tls.el gnus-agent.el gnus-cite.el gnus-int.el
   gnus-srvr.el gnus.el nnimap.el
@@ -1739,8 +1810,8 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c]
 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 configure.ac emacs.c text.texi w32term.c
-  dispnew.c frames.texi files.texi w32proc.c xfaces.c window.c
-  dispextern.h lisp.h and 1409 other files
+  dispnew.c frames.texi files.texi w32proc.c xfaces.c process.c window.c
+  dispextern.h and 1437 other files
 
 Eliza Velasquez: changed server.el simple.el
 
@@ -1759,14 +1830,16 @@ Emanuele Giaquinta: changed configure.ac rxvt.el charset.c etags.c
 
 Emil Åström: co-wrote prolog.el
 
+Emil Ingelman Sahlén: changed window.el
+
 Emilio C. Lopes: changed woman.el cmuscheme.el help.el vc.el advice.el
   animate.el apropos.el artist.el bookmark.el cal-menu.el calc-prog.el
   calc-store.el calcalg3.el calendar.el calendar.texi checkdoc.el
   code-pages.el codepage.el completion.el cus-edit.el diff.el
-  and 58 other files
+  and 57 other files
 
 Emmanuel Briot: wrote xml.el
-and changed ada-mode.el ada-stmt.el ada-prj.el ada-xref.el
+and changed ada-stmt.el
 
 Era Eriksson: changed bibtex.el dired.el json.el ses.el ses.texi shell.el
   tramp.el tramp.texi
@@ -1790,6 +1863,8 @@ and changed mh-utils.el mh-e.el mh-comp.el mh-mime.el
 
 Eric Eide: changed gnus-xmas.el
 
+Eric Frederickson: changed eshell.texi
+
 Eric Hanchrow: changed erc.el vc-git.el TUTORIAL.es abbrev.el
   autorevert.el cperl-mode.el dired.el emacsclient.c env.el frames.texi
   ibuf-ext.el ispell.el ldap.el make-dist opascal.el progmodes/python.el
@@ -1799,7 +1874,8 @@ Eric Hanchrow: changed erc.el vc-git.el TUTORIAL.es abbrev.el
 
 Eric Knauel: changed gnus.el spam-report.el spam.el
 
-Eric Marsden: changed gnus-cache.el url-util.el
+Eric Marsden: changed bytecomp.el gnus-cache.el process.c processes.texi
+  url-util.el
 
 Eric M. Ludlam: wrote analyze.el analyze/complete.el analyze/debug.el
   args.el auto.el autoconf-edit.el base.el bovine.el bovine/debug.el
@@ -1838,16 +1914,16 @@ and changed c.srt ede.texi info.el rmail.el speedbspec.el  cedet.el
   ede-autoconf.srt ede-make.srt eieio.texi gud.el sb-dir-minus.xpm
   sb-dir-plus.xpm sb-dir.xpm sb-mail.xpm sb-pg-minus.xpm sb-pg-plus.xpm
   sb-pg.xpm sb-tag-gt.xpm sb-tag-minus.xpm sb-tag-plus.xpm
-  and 35 other files
+  and 34 other files
 
-Eric Schulte: wrote ob-awk.el ob-calc.el ob-comint.el ob-css.el
-  ob-ditaa.el ob-dot.el ob-emacs-lisp.el ob-eval.el ob-forth.el
-  ob-gnuplot.el ob-haskell.el ob-js.el ob-latex.el ob-makefile.el
-  ob-ocaml.el ob-org.el ob-ruby.el ob-sass.el ob-shell.el ob-sql.el
-  ob-sqlite.el ob-table.el ob-tangle.el ob.el org-plot.el
-and co-wrote ob-C.el ob-R.el ob-core.el ob-exp.el ob-fortran.el
-  ob-java.el ob-lisp.el ob-lob.el ob-maxima.el ob-perl.el ob-python.el
-  ob-ref.el ob-scheme.el ol-bibtex.el
+Eric Schulte: wrote ob-awk.el ob-calc.el ob-comint.el ob-css.el ob-dot.el
+  ob-emacs-lisp.el ob-eval.el ob-forth.el ob-gnuplot.el ob-haskell.el
+  ob-js.el ob-latex.el ob-makefile.el ob-ocaml.el ob-org.el ob-ruby.el
+  ob-sass.el ob-shell.el ob-sql.el ob-sqlite.el ob-table.el ob-tangle.el
+  ob.el org-plot.el
+and co-wrote ob-C.el ob-R.el ob-core.el ob-ditaa.el ob-exp.el
+  ob-fortran.el ob-java.el ob-lisp.el ob-lob.el ob-maxima.el ob-perl.el
+  ob-python.el ob-ref.el ob-scheme.el ol-bibtex.el
 and changed org.texi org.el ob-clojure.el org-exp-blocks.el ob-sh.el
   org-bibtex.el ox.el ox-latex.el org-src.el ob-plantuml.el ob-keys.el
   ob-screen.el org-macs.el org-table.el org-agenda.el org-mouse.el
@@ -1865,7 +1941,7 @@ and co-wrote make-mode.el
 and changed vc.el vc-hooks.el vc-svn.el vc-cvs.el vc-git.el vc-rcs.el
   vc-sccs.el vc-hg.el vc-bzr.el vc-dispatcher.el files.texi vc-mcvs.el
   vc-mtn.el files.el vc-arch.el comint.el emacsbug.el simple.el vc-src.el
-  Makefile.in add-log.el and 275 other files
+  Makefile.in add-log.el and 269 other files
 
 Eric Youngdale: changed etags-vmslib.c
 
@@ -1879,7 +1955,7 @@ Erik Naggum: wrote disp-table.el mailheader.el parse-time.el
 and changed simple.el emacs.c files.el lread.c rmail.el alloc.c editfns.c
   keyboard.c apropos.el configure.ac dispnew.c filelock.c fns.c keymap.c
   lisp.h print.c process.c add-log.el buffer.c casetab.c cl-macs.el
-  and 114 other files
+  and 113 other files
 
 Erik Toubro Nielsen: changed gnus-sum.el gnus-topic.el
 
@@ -1889,22 +1965,24 @@ Ernest N. Mamikonyan: changed texinfo.el
 
 Ernesto Alfonso: changed simple.el
 
-E Sabof: changed hi-lock.el image-dired.el
+E Sabof: changed hi-lock.el
 
-Eshel Yaron: wrote completion-preview.el
-and changed eglot.el emoji.el eww.el help-fns.el info.el programs.texi
-  text-mode.el window.c xdisp.c xref.el bookmark.el
-  completion-preview-tests.el dictionary.el easy-mmode.el eldoc.el
-  emacs.texi eww.texi fixit.texi frames.texi help-mode.el help.el
-  and 14 other files
+Eshel Yaron: wrote completion-preview.el elisp-scope.el
+and changed completion-preview-tests.el programs.texi eglot.el
+  elisp-mode.el emacs.texi emoji.el eww.el help-fns.el info.el
+  minibuffer-tests.el minibuffer.el text-mode.el window.c xdisp.c xref.el
+  bookmark.el dictionary.el display.texi easy-mmode.el eldoc.el
+  elec-pair.el and 21 other files
 
 Espen Skoglund: wrote pascal.el
 
 Espen Wiborg: changed utf-7.el
 
-Ethan Bradford: changed ispell.el ange-ftp.el gnus.el gnuspost.el lpr.el
+Ethan Bradford: changed ange-ftp.el gnus.el gnuspost.el lpr.el
   mailalias.el vt-control.el
 
+Ethan Kong: changed fns.c
+
 Ethan Ligon: changed org-docbook.el ox-html.el
 
 Etienne Prud’Homme: changed align.el css-mode-tests.el css-mode.el
@@ -1933,13 +2011,21 @@ Evgeny Roubinchtein: changed mail-source.el pc-select.el
 
 Evgeny Zajcev: changed battery.el image.c image.el quail.el
 
+Ewan Townshend: wrote [24-bit color support for MS-Windows console]
+and changed cmdargs.texi faces.el msdos.texi startup.el term.c
+  tty-colors.el w32console.c w32console.el xdisp.c
+
 Exal de Jesus Garcia Carrillo: changed erc-sound.el erc.texi
 
 Eyal Lotem: changed ido.el
 
+Eyal Soha: changed tramp-sh.el
+
 Fabián Ezequiel Gallina: wrote progmodes/python.el subr-x-tests.el
 and changed python-tests.el subr-x.el imenu.el wisent/python.el
 
+Fabio Natali: changed eww.el
+
 Fabrice Bauzac: changed objects.texi dired-aux.el fixit.texi ibuf-ext.el
   search.texi
 
@@ -1953,7 +2039,7 @@ and changed org-agenda.el
 Fabrice Popineau: changed ms-w32.h w32.c w32fns.c w32heap.c w32term.c
   configure.ac lisp.h unexw32.c buffer.c emacs.c image.c w32heap.h
   w32proc.c w32term.h INSTALL addsection.c alloc.c dispextern.h
-  emacs-x64.manifest emacs-x86.manifest etags.c and 24 other files
+  emacs-x64.manifest emacs-x86.manifest etags.c and 23 other files
 
 Fangrui Song: changed eglot.el
 
@@ -1986,8 +2072,6 @@ Felix Lee: changed flyspell.el outline.el cl.texi data.c gud.el nntp.el
 
 Felix Mueller: changed nsterm.m
 
-Felix S. T. Wu: co-wrote vi.el (public domain)
-
 Feng Li: changed calc-ext.el pascal.el which-func.el
 
 Feng Shu: changed org.el org.texi ox.el ox-html.el ox-latex.el xwidget.el
@@ -2007,14 +2091,14 @@ Filipp Gunbin: changed ldap.el compilation.txt progmodes/compile.el
   compile-tests.el custom.el dabbrev.el epa-ks.el ert.el eudc-vars.el
   eudc.texi and 19 other files
 
-Filippo Argiolas: changed eglot.el eglot.texi
+Filippo Argiolas: changed eglot.el eglot.texi c-ts-common.el
 
 F. Jason Park: changed erc.el erc-tests.el erc-backend.el erc-common.el
-  erc-stamp.el erc-fill.el erc-goodies.el erc-button.el erc.texi
-  erc-networks.el foonet.eld erc-fill-tests.el erc-compat.el erc-dcc.el
-  erc-match.el erc-speedbar.el erc-sasl.el erc-scenarios-common.el
-  erc-networks-tests.el erc-stamp-tests.el erc-track.el
-  and 193 other files
+  erc-stamp.el erc-fill.el erc.texi erc-goodies.el erc-button.el
+  erc-fill-tests.el erc-networks.el foonet.eld erc-compat.el erc-match.el
+  erc-speedbar.el erc-dcc.el erc-scenarios-common.el erc-sasl.el
+  erc-networks-tests.el erc-track.el erc-goodies-tests.el
+  and 209 other files
 
 Flemming Hoejstrup Hansen: changed forms.el
 
@@ -2031,7 +2115,7 @@ Florian V. Savigny: changed sql.el
 Florian Weimer: changed message.el configure.ac gnus.el coding.c
   gnus-sum.el gnus.texi mm-decode.el mm-util.el
 
-F. Moukayed: changed erc-goodies.el mm-view.el
+F. Moukayed: changed erc-goodies.el mm-view.el rcirc.el
 
 Francesco Pizzolante: changed org-clock.el org-macs.el org.el ox-html.el
 
@@ -2039,7 +2123,7 @@ Francesco Potortì: wrote cmacexp.el
 and changed etags.c man.el delta.h etags.1 undigest.el rmail.el comint.el
   configure.ac maintaining.texi uniquify.el latin-post.el etags.el
   latin-alt.el lib-src/Makefile.in sgml-mode.el Makefile.in data.c
-  european.el filelock.c files.el generic-x.el and 45 other files
+  european.el filelock.c files.el generic-x.el and 44 other files
 
 Francesc Rocher: changed splash.png splash.svg startup.el README
   cus-start.el gnus.el gnus.png gnus.svg macterm.c splash.pbm splash.xpm
@@ -2092,10 +2176,10 @@ Frederic Pierresteguy: wrote widget.c
 and changed xmenu.c xterm.c xfns.c dpx2.h lwlib.c rmailsum.el rmail.el
   xlwmenu.c xterm.h lwlib-Xaw.c lwlib-Xlw.c configure.ac lwlib-Xaw.h
   lwlib-int.h xdisp.c compile.el editfns.c fns.c frame.h hilit19.el
-  keyboard.c and 10 other files
+  keyboard.c and 9 other files
 
 Frederik Fouvry: changed sendmail.el TUTORIAL.nl emacs.bash faces.el
-  filecache.el mailalias.el rmail.el thumbs.el
+  filecache.el mailalias.el rmail.el
 
 Fred Fish: changed linux.h unexcoff.c
 
@@ -2120,8 +2204,12 @@ Gábor Vida: changed gnus-demon.el auth-source.el ido.el
 Gabriel Do Nascimento Ribeiro: changed remember.el tab-line.el
   mb-depth.el repeat.el tab-bar.el bookmark.el cmuscheme.el comint.el
   dired-tests.el dired.el esh-mode.el etags.el faces.el gnus-sum.el
-  goto-addr.el hl-line.el ibuf-ext.el idlwave.el inf-lisp.el mh-gnus.el
-  mh-letter.el and 18 other files
+  goto-addr.el hl-line.el ibuf-ext.el inf-lisp.el mh-gnus.el mh-letter.el
+  mh-mime.el and 16 other files
+
+Gabriel Santos: changed batch.sh browse-url.el build.sh eglot.el
+  font-lock-package.go go-ts-mode-tests.el go-ts-mode.el image-dired.el
+  indent-mod.erts indent-work.erts treesit.el
 
 Gaby Launay: changed auth-source-pass.el
 
@@ -2146,7 +2234,7 @@ Gary Wong: changed termcap.c tparam.c
 
 Gaute B Strokkenes: changed imap.el gnus-fun.el mail-source.el process.c
 
-Gautier Ponsinet: changed calendar.texi
+Gautier Ponsinet: changed calendar.texi newst-backend.el
 
 G Dinesh Dutt: changed etags.el
 
@@ -2193,9 +2281,9 @@ George V. Reilly: changed emacs.ico makefile.nt
 
 Gerd Möllmann: wrote authors.el ebrowse.el jit-lock.el tooltip.el
 and changed xdisp.c xterm.c dispnew.c dispextern.h xfns.c xfaces.c
-  window.c keyboard.c lisp.h faces.el alloc.c buffer.c startup.el xterm.h
-  fns.c term.c configure.ac simple.el frame.c xmenu.c emacs.c
-  and 626 other files
+  window.c keyboard.c lisp.h faces.el alloc.c buffer.c term.c startup.el
+  frame.c xterm.h fns.c configure.ac simple.el minibuf.c xmenu.c
+  and 631 other files
 
 Gergely Nagy: changed erc.el
 
@@ -2225,7 +2313,7 @@ and changed configure.ac Makefile.in src/Makefile.in calendar.el
   lisp/Makefile.in diary-lib.el files.el make-dist rmail.el
   progmodes/f90.el bytecomp.el admin.el misc/Makefile.in simple.el
   authors.el startup.el emacs.texi lib-src/Makefile.in display.texi
-  ack.texi subr.el and 1796 other files
+  ack.texi subr.el and 1753 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -2277,7 +2365,7 @@ Gregory Chernov: changed nnslashdot.el
 Gregory Heytings: changed xdisp.c editfns.c subr.el keyboard.c buffer.c
   dispextern.h lisp.h buffer.h Makefile.in display.texi efaq.texi emake
   files.el isearch.el minibuffer.el bytecode.c composite.c positions.texi
-  bytecomp.el help-fns.el lread.c and 80 other files
+  bytecomp.el help-fns.el lread.c and 79 other files
 
 Grégory Mounié: changed display.texi hi-lock.el man.el xfns.c
 
@@ -2290,12 +2378,14 @@ Greg Stark: changed gnus-ems.el timezone.el
 Guanpeng Xu: changed add-log.el TUTORIAL.cn display.texi mouse.el
   pcomplete.el search.c subr.el type-break.el
 
+Guilherme De Almeida Suckevicz: changed tab-bar.el
+
 Gunnar Horrigmo: changed gnus-sum.el
 
 Gustaf Waldemarson: changed gdb-mi.el
 
-Gustav Hållberg: changed descr-text.el diff-mode.el progmodes/compile.el
-  rect.el vc.el
+Gustav Hållberg: changed descr-text.el diff-mode.el gud.el
+  progmodes/compile.el rect.el vc.el
 
 Gustav Wikström: changed org-agenda.el org.texi
 
@@ -2355,10 +2445,10 @@ H. Dieter Wilhelm: changed calc-help.el maintaining.texi paragraphs.el
 Heiko Muenkel: changed b2m.c
 
 Helmut Eller: wrote peg.el
-and changed emacs-lisp/debug.el lisp-mode.el xref.el  CTAGS.good
-  ETAGS.good_1 ETAGS.good_2 ETAGS.good_3 ETAGS.good_4 ETAGS.good_5
-  ETAGS.good_6 bytecomp-tests.el bytecomp.el cl-indent.el cl-macs.el
-  elisp-mode.el ert.el etags.c etags.el eval.c faces.el and 5 other files
+and changed lisp.h data.c pdumper.c buffer.c charset.c charset.h
+  emacs-lisp/debug.el fns-tests.el lisp-mode.el lread.c xref.el 
+  CTAGS.good ETAGS.good_1 ETAGS.good_2 ETAGS.good_3 ETAGS.good_4
+  ETAGS.good_5 ETAGS.good_6 alloc.c bytecomp-tests.el and 19 other files
 
 Helmut Waitzmann: changed gnus-sum.el gnus.texi
 
@@ -2368,7 +2458,7 @@ Henrik Enberg: changed rmailout.el gnus-art.el gnus-msg.el lread.c
   mail/rmailmm.el rmail.el rmailedit.el rmailkwd.el rmailmsc.el
   rmailsort.el rmailsum.el xfaces.c
 
-Henrique Martins: changed mh-mime.el mh-xface.el
+Henrique Martins: changed mh-mime.el mh-thread.el mh-xface.el
 
 Henry Guillaume: wrote find-file.el
 
@@ -2414,7 +2504,9 @@ Hrvoje Nikšić: wrote croatian.el savehist.el
 and changed gnus-xmas.el message.el nnmail.el fileio.c fns.c gnus-art.el
   gnus-salt.el gnus-spec.el mm-decode.el simple.el add-log.el appt.el
   arc-mode.el avoid.el bookmark.el cal-china.el cal-tex.el calendar.el
-  cl-indent.el cmacexp.el comint.el and 83 other files
+  cl-indent.el cmacexp.el comint.el and 81 other files
+
+Huang Jing: changed nxml-mode.el window.c windows.texi
 
 Huan Nguyen: changed treesit.el
 
@@ -2424,7 +2516,8 @@ Hugh Brown: changed progmodes/grep.el building.texi
 
 Hugh Daschbach: changed dbus-tests.el dbus.el org.gnu.Emacs.TestDBus.xml
 
-Hugo Heagren: changed window.el windows.texi bindings.el modes.texi
+Hugo Heagren: changed window.el windows.texi bindings.el keymap.el
+  modes.texi
 
 Hynek Schlawack: changed gnus-art.el gnus-sum.el
 
@@ -2456,12 +2549,12 @@ Ihor Radchenko: wrote org-element-ast.el org-fold-core.el org-fold.el
 and changed org.el files.el ox.el buffer.c emacsclient.desktop
   eval-tests.el fns.c lisp.h mm-view.el org-macro.el buffer.h editfns.c
   filelock.c help-mode.el internals.texi mhtml-mode.el minibuf.c oc.el
-  ol.el org-element.el pdumper.c and 3 other files
+  ol.el org-element.el pdumper.c and 4 other files
 
 Iku Iwasa: changed auth-source-pass-tests.el auth-source-pass.el
 
 Ikumi Keita: changed display.texi files.el characters.el fill.el
-  japan-util.el kinsoku.el minibuf.c
+  japan-util.el kinsoku.el minibuf.c reftex.el
 
 Ilja Weis: co-wrote gnus-topic.el
 
@@ -2470,6 +2563,8 @@ Illia Danko: changed README.md eglot.el
 Illia Ostapyshyn: changed cus-start.el calc-graph.el emacs-mime.texi
   mml-smime.el mml.el
 
+Ilya Chernyshov: changed time-date.el
+
 Ilya N. Golubev: changed mm-util.el shell.el
 
 Ilya Shlyakhter: changed org.el ob-lilypond.el org-clock.el
@@ -2552,7 +2647,8 @@ Iwamuro Motonori: changed gnus-kill.el
 
 Jaap-Henk Hoepman: changed mm-decode.el
 
-Jacek Chrząszcz: changed ispell.el
+Jacek Świerk: changed compilation.txt compile-tests.el
+  progmodes/compile.el
 
 Jack Coughlin: changed calc-prog.el
 
@@ -2561,6 +2657,7 @@ Jack Duthen: changed which-func.el
 Jack Repenning: changed unexelfsgi.c
 
 Jackson Ray Hamilton: changed js.el files.el sgml-mode.el
+  typescript-ts-mode.el
 
 Jack Twilley: changed message.el
 
@@ -2568,6 +2665,9 @@ Jacob Leeming: changed csharp-mode.el
 
 Jacob Morzinski: changed mh-comp.el
 
+Jacob S. Gordon: changed calc-tests.el calc.texi calccomp.el time.el
+  calc.el editfns-tests.el editfns.c pp.el strings.texi
+
 Jacques Duthen: co-wrote ps-print.el ps-samp.el
 
 Jae-hyeon Park: changed fontset.el gnus-icalendar.el
@@ -2581,8 +2681,8 @@ Jai Flack: changed gnus-search.el
 
 Jake Moss: changed gdb-mi.el
 
-Jakub Ječmínek: changed gnus-score.el TUTORIAL.cs org-table.el
-  progmodes/python.el python-tests.el rmail.texi
+Jakub Ječmínek: changed gnus-score.el progmodes/python.el python-tests.el
+  TUTORIAL.cs dired.el nnmbox.el org-table.el rmail.texi
 
 Jakub-W: changed calculator.el
 
@@ -2598,7 +2698,10 @@ and changed org-lparse.el org.el org.texi ox.el icomplete.el
   OrgOdtContentTemplate.xml OrgOdtStyles.xml hi-lock.el replace.el
   minibuffer.el org-footnote.el org-inlinetask.el register.el doc-view.el
   etags.el htmlfontify.el ido.el indian.el iswitchb.el org-bbdb.el
-  org-compat.el and 6 other files
+  org-compat.el and 5 other files
+
+James Cherti: changed sh-script.el eldoc.el outline.el
+  progmodes/python.el yaml-ts-mode.el
 
 James Clark: wrote nxml-enc.el nxml-maint.el nxml-mode.el nxml-ns.el
   nxml-outln.el nxml-parse.el nxml-rap.el nxml-util.el rng-cmpct.el
@@ -2625,7 +2728,8 @@ James TD Smith: changed org.el org-colview.el org-clock.el
   org.texi
 
 James Thomas: changed eww.el nnmail.el quail/indian.el gnus-cache.el
-  gnus-msg.el gnus.texi ind-util.el info-look.el progmodes/python.el
+  gnus-msg.el gnus.texi ind-util.el info-look.el nnfeed.el
+  progmodes/python.el tab-bar.el vc-git.el window.el windows.texi
 
 James Troup: changed gnus-sum.el
 
@@ -2654,6 +2758,8 @@ Jan Moringen: co-wrote srecode/cpp.el tango-dark-theme.el tango-theme.el
 and changed dbus.el dbus.texi dbusbind.c eieio.el faces.el idle.el
   insert.el log-edit.el srecode/find.el wisent/python.el zeroconf.el
 
+Janneke Nieuwenhuizen: changed shell.el
+
 Jan Nieuwenhuizen: changed gud.el info.el TUTORIAL.nl add-log.el
   compilation.txt compile-tests.el emacs.c emacsclient.c gnus-start.el
   nnmh.el progmodes/compile.el server.el startup.el
@@ -2675,10 +2781,10 @@ and changed gnus-score.el gnus-logic.el
 Jan Vroonhof: changed gnus-cite.el gnus-msg.el nntp.el
 
 Jared Finder: wrote window-tool-bar.el
-and changed commands.texi menu-bar.el term.c tab-line.el xt-mouse.el
-  frame.c frames.texi isearch.el modes.texi mouse.el subr.el tmm.el
-  tool-bar.el wid-edit.el windows.texi artist.el dired.el dispnew.c
-  ediff-wind.el ediff.el elisp.texi and 16 other files
+and changed xt-mouse.el xterm.el term.c commands.texi menu-bar.el
+  frames.texi subr.el tab-line.el wid-edit.el windows.texi frame.c
+  ielm.el isearch.el modes.texi mouse.el ruler-mode.el termhooks.h tmm.el
+  tool-bar.el xdisp.c xt-mouse-tests.el and 21 other files
 
 Jarek Czekalski: changed keyboard.c callproc.c mini.texi minibuf.c
   misc.texi server.el shell.el w32fns.c xgselect.c
@@ -2688,9 +2794,10 @@ and changed add-log.el filecache.el progmodes/grep.el comint.el
   gnus-art.el gnus-sum.el gnus.texi ispell.el lisp-mnt.el man.el
   nnmail.el apropos.el autorevert.el checkdoc.el cperl-mode.el
   css-mode.el desktop.el em-ls.el emacs-lisp/debug.el emacsclient.1
-  executable.el and 24 other files
+  executable.el and 23 other files
 
 Jarmo Hurri: wrote ob-processing.el
+and co-wrote ob-ditaa.el
 and changed org-gnus.el org-table.el org.texi
 
 Jarno Malmari: wrote url-auth-tests.el
@@ -2740,9 +2847,10 @@ Jay McCarthy: changed org-colview.el
 Jay Sachs: changed gnus-score.el gnus-win.el
 
 J.D. Smith: co-wrote idlw-help.el idlw-shell.el idlwave.el
-and changed idlw-rinfo.el idlw-toolbar.el comint.el idlwave.texi vc.el
-  bibtex.el eglot.el files.texi hideshow.el idlw-complete-structtag.el
-  misc.texi mouse.el shr.el table.html table.txt tree-widget.el
+and changed idlw-rinfo.el comint.el idlwave.texi loaddefs-gen.el vc.el
+  bibtex.el byte-run.el cl-generic.el easy-mmode.el eglot.el files.texi
+  functions.texi hideshow.el inline.el loading.texi misc.texi mouse.el
+  os.texi pcase.el repeat.el shr.el and 9 other files
 
 Jean Abou Samra: changed scheme.el
 
@@ -2789,9 +2897,11 @@ and changed mh-e.el mh-comp.el mh-utils.el mh-mime.el mh-customize.el
 
 Jeff Spencer: changed dired.el
 
+Jeff Valk: changed files.el
+
 Jeff Walsh: changed pgtkterm.c pgtkterm.h gtkutil.c pgtkfns.c comp.c
-  pgtkmenu.c image.c xdisp.c configure.ac ftcrfont.c pgtkgui.h pgtkim.c
-  pgtkselect.c pgtkselect.h xwidget.c
+  pgtkmenu.c image.c xdisp.c atimer.c configure.ac ftcrfont.c pgtkgui.h
+  pgtkim.c pgtkselect.c pgtkselect.h xwidget.c
 
 Jelle Licht: changed auth-source-pass-tests.el auth-source-pass.el
 
@@ -2803,15 +2913,16 @@ Jens Lautenbacher: changed gnus.el
 
 Jens Lechtenbörger: wrote gnus-util-tests.el mml-sec-tests.el
 and changed mml-sec.el gnus-util.el message.texi mml-smime.el mml1991.el
-  mml2015.el message.el package.el package.texi
+  mml2015.el imap.el message.el package.el package.texi
 
 Jens Petersen: wrote find-func.el
 and changed mule-cmds.el pcmpl-rpm.el
 
-Jens Schmidt: changed plstore.el comint.el elisp-mode.el epa.texi
-  isearch.el auth.texi comp-common.el comp.el epa-file.el epg.el
-  files-tests.el files.el gnus.texi ldap.el lisp.el loadup.el macroexp.el
-  nadvice.el sgml-mode.el
+Jens Schmidt: changed plstore.el comint.el editfns.c elisp-mode.el
+  emacs.c epa.texi isearch.el package-tests.el tips.texi
+  arc-mode-tests.el arc-mode.el auth.texi comp-common.el comp.el
+  edebug-test-code.el edebug-tests.el edebug.el edebug.texi
+  editfns-tests.el elisp.texi epa-file.el and 32 other files
 
 Jens Toivo Berger Thielemann: changed word-help.el
 
@@ -2827,9 +2938,10 @@ 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 which-key.el cl-extra.el abbrev.el cl-macs.el
-  display.texi emacs-lisp/cl-lib.el files.texi functions.texi help.texi
-  rmail.el simple.el
+Jeremy Bryant: changed which-key.el cl-extra.el .gdbinit DEBUG abbrev.el
+  cl-macs.el cond-star.el control.texi display.texi emacs-lisp/cl-lib.el
+  eval.c files.texi functions.texi help.texi package.el rmail.el
+  saveplace.el simple.el
 
 Jérémy Compostella: changed tramp-sh.el mml.el battery.el keyboard.c
   windmove.el window.el xdisp.c
@@ -2853,7 +2965,7 @@ and changed gnus-sum.el gnus-art.el message.el gnus-group.el gnus-msg.el
   gnus.el gnus-util.el rfc2047.el mm-bodies.el mm-util.el mml.el
   mm-decode.el nnrss.el gnus-srvr.el gnus-topic.el nnmail.el
   gnus-start.el gnus-uu.el gnus.texi spam-stat.el gnus-score.el
-  and 200 other files
+  and 199 other files
 
 Jhair Tocancipa Triana: changed gnus-audio.el
 
@@ -2868,7 +2980,7 @@ and co-wrote pcvs.el wyse50.el
 and changed keyboard.c xterm.c xfns.c window.c process.c ymakefile
   dispnew.c xdisp.c sysdep.c configure.ac lisp.h Makefile.in keymap.c
   configure make-dist buffer.c frame.c screen.c simple.el alloc.c emacs.c
-  and 404 other files
+  and 400 other files
 
 Jim Diamond: changed server.el
 
@@ -2878,7 +2990,7 @@ and changed emacs.texi emacsclient.c functions.texi hp300bsd.h rmail.el
 Jim Meyering: changed lread.c make-docfile.c w32.c w32font.c configure.ac
   copyright.el ebrowse.c emacs.c nsfont.m pop.c term.c xfaces.c xselect.c
   xterm.c alloc.c artist.el autoinsert.el buffer.h callproc.c character.h
-  charset.c and 55 other files
+  charset.c and 54 other files
 
 Jimmy Aguilar Mena: changed xdisp.c simple.el xfaces.c minibuffer.el
   dispextern.h mini.texi mouse.el compilation.txt face-remap.el
@@ -2889,11 +3001,11 @@ Jimmy Yuen Ho Wong: changed nsm.el gnutls.c gnutls.el disass.el eglot.el
 
 Jim Paris: changed process.c
 
-Jim Porter: changed eshell.texi esh-cmd.el esh-var.el esh-var-tests.el
-  eshell-tests.el esh-proc.el esh-io.el esh-cmd-tests.el esh-util.el
-  esh-arg.el esh-mode.el esh-proc-tests.el eshell-tests-helpers.el
-  tramp.el em-cmpl.el em-pred.el em-unix.el em-dirs.el em-glob.el
-  eshell/eshell.el em-cmpl-tests.el and 137 other files
+Jim Porter: changed esh-cmd.el eshell.texi esh-var.el esh-var-tests.el
+  esh-proc.el eshell-tests.el esh-io.el esh-cmd-tests.el esh-util.el
+  esh-arg.el esh-proc-tests.el eww.el esh-mode.el eshell-tests-helpers.el
+  em-unix.el eshell/eshell.el em-glob.el em-pred.el em-cmpl.el em-dirs.el
+  tramp.el and 145 other files
 
 Jim Radford: changed gnus-start.el
 
@@ -2941,11 +3053,11 @@ João P. L. De Carvalho: changed sh-script.el
 João Távora: wrote eglot-tests.el eglot.el elec-pair.el electric-tests.el
   flymake-cc.el jsonrpc-tests.el jsonrpc.el message-tests.el
   shorthands.el
-and changed flymake.el icomplete.el README.md eldoc.el minibuffer.el
-  EGLOT-NEWS flymake-proc.el flymake.texi eglot.texi elisp-mode.el
+and changed flymake.el icomplete.el EGLOT-NEWS README.md eldoc.el
+  eglot.texi minibuffer.el flymake-proc.el flymake.texi elisp-mode.el
   flymake-tests.el flymake-elisp.el electric.el elisp-mode-tests.el
-  lread.c text.texi Makefile flymake-ui.el progmodes/python.el xref.el
-  json-tests.el and 69 other files
+  lread.c text.texi Makefile flymake-ui.el progmodes/python.el project.el
+  xref.el and 74 other files
 
 Jochen Hein: changed gnus-art.el
 
@@ -2998,7 +3110,7 @@ Johan Bockgård: changed erc.el cl-macs.el pcase.el erc-backend.el
   erc-button.el erc-match.el icomplete.el mouse-sel.el subr.el xdisp.c
   browse-url.el bytecomp.el custom.el display.texi edebug.el eieio.el
   erc-compat.el erc-nickserv.el erc-ring.el erc-speak.el erc-track.el
-  and 63 other files
+  and 62 other files
 
 Johan Claesson: changed cl.texi filecache.el files-x.el help-fns.el
   tabulated-list.el term.el
@@ -3049,14 +3161,16 @@ John Mastro: changed auth-source.el ibuffer.el w32heap.c
 John Mongan: changed progmodes/f90.el
 
 John Muhl: wrote lua-ts-mode.el
-and changed indent.erts batch.sh lua-ts-mode-tests.el align-tests.el
-  align.el calculator.el font-lock.lua java-ts-mode.el lua-ts-mode.erts
-  movement.erts mpc.el speedbar.el sqlite-mode.el which-function.lua
+and changed lua-mode.el mpc.el indent.erts lua-ts-mode-tests.el batch.sh
+  font-lock.lua align-tests.el align.el browse-url.el calculator.el
+  diff-mode.el hide-show.lua hideshow.el java-ts-mode.el lua-ts-mode.erts
+  movement.erts pgtk-win.el ruby-mode.el speedbar.el sqlite-mode.el
+  which-function.lua x-win.el
 
 John Paul Wallington: changed ibuffer.el ibuf-ext.el subr.el help-fns.el
-  rmail.el files.el thumbs.el bindings.el fns.c xfns.c arc-mode.el
-  bytecomp.el cus-theme.el font-lock.el hexl.el ibuf-macs.el info.el
-  minibuf.c re-builder.el simple.el startup.el and 135 other files
+  rmail.el files.el bindings.el fns.c xfns.c arc-mode.el bytecomp.el
+  cus-theme.el font-lock.el hexl.el ibuf-macs.el info.el minibuf.c
+  re-builder.el simple.el startup.el apropos.el and 130 other files
 
 John Shahid: changed term.el easy-mmode.el tramp.el window.c window.el
   env.el flymake.el term.c termhooks.h terminal.c windows.texi
@@ -3067,23 +3181,23 @@ John Tobey: changed gud.el
 
 John W. Eaton: co-wrote octave.el
 
-John Wiegley: wrote align.el bind-key.el cal-bahai.el em-alias.el
-  em-banner.el em-basic.el em-cmpl.el em-dirs.el em-glob.el em-hist.el
-  em-ls.el em-pred.el em-prompt.el em-rebind.el em-script.el em-smart.el
-  em-term.el em-unix.el em-xtra.el erc-identd.el esh-arg.el esh-cmd.el
-  esh-ext.el esh-io.el esh-mode.el esh-module.el esh-opt.el esh-proc.el
-  esh-util.el esh-var.el eshell-tests-helpers.el eshell-tests.el
-  eshell/eshell.el eudcb-mab.el isearchb.el org-attach.el org-crypt.el
-  org-habit.el pcmpl-cvs.el pcomplete.el remember.el timeclock.el
-  use-package-bind-key.el use-package-core.el use-package-delight.el
-  use-package-diminish.el use-package-ensure.el use-package-jump.el
-  use-package-lint.el use-package.el
+John Wiegley: wrote align.el bind-key.el cal-bahai-tests.el cal-bahai.el
+  em-alias.el em-banner.el em-basic.el em-cmpl.el em-dirs.el em-glob.el
+  em-hist.el em-ls.el em-pred.el em-prompt.el em-rebind.el em-script.el
+  em-smart.el em-term.el em-unix.el em-xtra.el erc-identd.el esh-arg.el
+  esh-cmd.el esh-ext.el esh-io.el esh-mode.el esh-module.el esh-opt.el
+  esh-proc.el esh-util.el esh-var.el eshell-tests-helpers.el
+  eshell-tests.el eshell/eshell.el eudcb-mab.el isearchb.el org-attach.el
+  org-crypt.el org-habit.el pcmpl-cvs.el pcomplete.el remember.el
+  timeclock.el use-package-bind-key.el use-package-core.el
+  use-package-delight.el use-package-diminish.el use-package-ensure.el
+  use-package-jump.el use-package-lint.el use-package.el
 and co-wrote org-pcomplete.el
 and changed org-clock.el org-agenda.el erc-chess.el org.el erc.el
-  iswitchb.el ido.el alloc.c allout.el auth-source.el cal-menu.el
-  calendar.el control.texi desktop.el diary-lib.el erc-bbdb.el
-  erc-button.el erc-complete.el erc-fill.el erc-ibuffer.el erc-list.el
-  and 25 other files
+  iswitchb.el ido.el alloc.c holidays.el align-tests.el allout.el
+  auth-source.el cal-menu.el calendar.el calendar.texi control.texi
+  desktop.el diary-lib.el erc-bbdb.el erc-button.el erc-complete.el
+  and 27 other files
 
 John Williams: changed bytecomp-tests.el etags.el
 
@@ -3094,18 +3208,18 @@ Jon Anders Skorpen: changed ox-publish.el
 Jonas Bernoulli: wrote transient.el
 and changed emoji.el epa.el epa-file.el lisp-mnt.el tips.texi
   dired-aux.el dired-x.el dired.el eieio.el epa-dired.el font-lock.el
-  progmodes/compile.el simple.el transient.texi allout.el button.el
-  check-declare.el comint.el cus-edit.el editorconfig-conf-mode.el
-  editorconfig-core-handle.el and 25 other files
+  icomplete.el loaddefs-gen.el progmodes/compile.el simple.el
+  transient.texi allout.el button.el check-declare.el comint.el
+  cus-edit.el and 30 other files
 
 Jonas Hoersch: changed org-inlinetask.el org.el
 
 Jonathan Ganc: changed vc-git.el
 
 Jonathan I. Kamens: changed pop.c movemail.c rmail.el configure.ac b2m.pl
-  lib-src/Makefile.in Makefile.in config.in files.el pop.h terminal.el
-  vc.el gnus-sum.el jka-compr.el rmailout.el rnewspost.el sendmail.el
-  simple.el timezone.el vc-hooks.el
+  lib-src/Makefile.in Makefile.in config.in files.el pop.h vc.el
+  gnus-sum.el jka-compr.el rmailout.el rnewspost.el sendmail.el simple.el
+  timezone.el vc-hooks.el
 
 Jonathan Kyle Mitchell: changed em-dirs.el em-ls.el em-unix.el esh-cmd.el
   esh-ext.el esh-mode.el xdisp.c
@@ -3139,8 +3253,8 @@ Jon K Hellan: wrote utf7.el
 
 Joost Diepenmaat: changed org.el
 
-Joost Kremers: changed vtable.texi control.texi reftex-toc.el
-  vtable-tests.el vtable.el
+Joost Kremers: changed vtable.el vtable.texi control.texi reftex-toc.el
+  vtable-tests.el
 
 Joram Schrijver: changed eglot.el
 
@@ -3157,7 +3271,7 @@ Jørgen Kvalsvik: changed c-ts-mode.el indent.erts
 Jorgen Schäfer: wrote erc-autoaway.el erc-goodies.el erc-spelling.el
 and changed erc.el erc-track.el erc-backend.el erc-match.el misc.el
   erc-stamp.el erc-button.el erc-fill.el erc-members.el erc-truncate.el
-  erc-compat.el package-test.el progmodes/python.el Makefile erc-dcc.el
+  erc-compat.el package-tests.el progmodes/python.el Makefile erc-dcc.el
   erc-ibuffer.el erc-macs.el erc-page.el erc-pcomplete.el erc-sound.el
   minibuffer.el and 15 other files
 
@@ -3166,23 +3280,26 @@ Jorge P. De Morais Neto: changed TUTORIAL cl.texi
 Jose A. Ortega Ruiz: changed doc-view.el misc.texi mixal-mode.el
   gnus-sum.el imenu.el url-http.el
 
-Jose E. Marchesi: changed ada-mode.el gomoku.el simple.el smtpmail.el
+Jose E. Marchesi: changed gomoku.el simple.el smtpmail.el
 
 José L. Doménech: changed dired-aux.el
 
-Jose Marino: changed idlw-shell.el
-
 Joseph Arceneaux: wrote xrdb.c
 and changed xterm.c xfns.c keyboard.c screen.c dispnew.c xdisp.c window.c
   x-win.el fileio.c buffer.c xterm.h minibuf.c editfns.c lread.c
   process.c alloc.c buffer.h files.el screen.el insdel.c emacs.c
-  and 106 other files
+  and 103 other files
+
+Joseph Mingrone: changed tramp.el
 
 Joseph M. Kelsey: changed fileio.c skeleton.el
 
 Joseph Turner: changed package-vc.el minibuffer.el subr.el image.el
-  display.texi image-tests.el info.el ispell.el lists.texi package.el
-  package.texi records.texi shortdoc.el shorthands.el subr-tests.el
+  color-tests.el color.el display.texi files.el image-tests.el info.el
+  ispell.el lists.texi minibuf.texi package.el package.texi records.texi
+  shortdoc.el shorthands.el subr-tests.el tab-bar.el vtable.el
+
+Josh Berdine: changed latin-ltx.el
 
 Josh Elsasser: changed eglot.el README.md configure.ac
 
@@ -3199,10 +3316,11 @@ Joshua Datko: changed fortune.el
 Joshua Varner: changed intro.texi
 
 Jostein Kjønigsen: changed csharp-mode.el typescript-ts-mode.el eglot.el
-  js.el progmodes/compile.el README dotnet-appconfig.rnc
+  js.el sh-script.el progmodes/compile.el progmodes/python.el schemas.xml
+  README dockerfile-ts-mode.el dotnet-appconfig.rnc
   dotnet-packages-config.rnc dotnet-packages-props.rnc dotnet-resx.rnc
-  json-ts-mode.el msbuild.rnc nuget.rnc nuspec.rnc nxml-mode.el
-  schemas.xml treesit.el
+  dotnet-slnx.rnc files.el json-ts-mode.el msbuild.rnc nuget.rnc
+  nuspec.rnc nxml-mode.el and 3 other files
 
 Jouni K. Seppänen: changed gnus.texi nnimap.el mm-url.el
 
@@ -3219,19 +3337,20 @@ and co-wrote help-tests.el keymap-tests.el
 and changed subr.el desktop.el w32fns.c bs.el faces.el simple.el
   emacsclient.c files.el server.el help-fns.el xdisp.c org.el w32term.c
   w32.c buffer.c keyboard.c ido.el image.c window.c eval.c allout.el
-  and 1228 other files
+  and 1191 other files
 
 Juan Pechiar: changed ob-octave.el
 
 Juergen Kreileder: changed imap.el nnimap.el
 
-Juergen Nickelsen: wrote ws-mode.el
-
-Jules Tamagnan: changed progmodes/python.el
+Jules Tamagnan: changed progmodes/python.el checkdoc.el
+  completion-preview-tests.el completion-preview.el
 
 Julian Gehring: changed org.texi orgcard.tex
 
-Julian Scheid: changed tramp.el cl-extra.el color.el ert.el
+Julian Scheid: changed tramp.el cl-extra.el color.el
+  comp-test-direct-call-dup.el comp-test-direct-call.el comp-tests.el
+  comp.el ert.el
 
 Julien Avarre: changed gnus-fun.el
 
@@ -3260,6 +3379,7 @@ Jurgen De Backer: changed progmodes/compile.el
 Jürgen Hartmann: changed window.el
 
 Jürgen Hötzel: wrote tramp-adb.el
+and co-wrote lua-mode.el
 and changed callproc.c eglot.el tramp-gvfs.el tramp-sh.el comint.el
   em-unix.el esh-util.el tramp-cache.el tramp.el url-handlers.el
   wid-edit.el
@@ -3267,10 +3387,10 @@ and changed callproc.c eglot.el tramp-gvfs.el tramp-sh.el comint.el
 Juri Linkov: wrote compose.el emoji.el files-x.el misearch.el
   repeat-tests.el replace-tests.el tab-bar-tests.el tab-bar.el
   tab-line.el
-and changed isearch.el simple.el info.el replace.el dired.el dired-aux.el
-  minibuffer.el window.el progmodes/grep.el outline.el subr.el vc.el
-  mouse.el diff-mode.el repeat.el files.el image-mode.el menu-bar.el
-  vc-git.el project.el search.texi and 491 other files
+and changed isearch.el simple.el replace.el info.el dired.el treesit.el
+  minibuffer.el dired-aux.el window.el outline.el progmodes/grep.el
+  subr.el diff-mode.el repeat.el vc.el mouse.el files.el image-mode.el
+  menu-bar.el project.el display.texi and 525 other files
 
 Jussi Lahdenniemi: changed w32fns.c ms-w32.h msdos.texi w32.c w32.h
   w32console.c w32heap.c w32inevt.c w32term.h
@@ -3300,12 +3420,12 @@ and co-wrote longlines.el tramp-sh.el tramp.el
 and changed message.el gnus-agent.el gnus-sum.el files.el nnmail.el
   tramp.texi nntp.el gnus.el simple.el ange-ftp.el dired.el paragraphs.el
   bindings.el files.texi gnus-art.el gnus-group.el man.el INSTALL
-  Makefile.in crisp.el fileio.c and 45 other files
+  Makefile.in crisp.el fileio.c and 44 other files
 
 Kailash C. Chowksey: changed HELLO ind-util.el kannada.el knd-util.el
   lisp/Makefile.in loadup.el
 
-Kai Ma: changed nsterm.m
+Kai Ma: changed building.texi nsterm.m progmodes/compile.el
 
 Kai Tetzlaff: changed sieve-manage.el ox-publish.el sieve.el url-http.el
 
@@ -3346,7 +3466,7 @@ and changed simple.el files.el CONTRIBUTE doc-view.el image-mode.el
 Karl Heuer: changed keyboard.c lisp.h xdisp.c buffer.c xfns.c xterm.c
   alloc.c files.el frame.c configure.ac window.c data.c minibuf.c
   editfns.c fns.c process.c Makefile.in fileio.c simple.el keymap.c
-  indent.c and 447 other files
+  indent.c and 442 other files
 
 Karl Kleinpaste: changed gnus-sum.el gnus-art.el gnus-picon.el
   gnus-score.el gnus-uu.el gnus-xmas.el gnus.el mm-uu.el mml.el nnmail.el
@@ -3366,9 +3486,10 @@ Karol Ostrovsky: changed configure.ac src/Makefile.in
 Károly Lőrentey: changed xfns.c bindings.el keyboard.c menu-bar.el
   buffer.c coding.c frame.el print.c rxvt.el simple.el spam.el sysdep.c
   x-win.el xdisp.c xt-mouse.el xterm.c xterm.h .gdbinit AT386.el HELLO
-  README and 101 other files
+  README and 100 other files
 
-Karthik Chikmagalur: changed pcmpl-unix.el
+Karthik Chikmagalur: wrote timeout.el
+and changed hideshow.el pcmpl-unix.el programs.texi
 
 Katsuhiro Hermit Endo: changed gnus-group.el gnus-spec.el
 
@@ -3389,9 +3510,10 @@ Kaveh R. Ghazi: changed delta88k.h xterm.c
 
 Kayvan Sylvan: changed supercite.el
 
-Kazuhiro Ito: changed coding.c epg.el japan-util.el uudecode.el
-  flow-fill.el font.c image.c keyboard.c language/japanese.el
-  make-mode.el starttls.el xdisp.c
+Kazuhiro Ito: changed coding.c epg.el image.c japan-util.el uudecode.el
+  flow-fill.el font.c keyboard.c language/japanese.el loadup.el
+  make-mode.el rfc6068.el starttls.el subr.el treesit.c w32-nt.el
+  w32-win.el xdisp.c
 
 Kazushi Marukawa: changed filelock.c hexl.c profile.c unexalpha.c
 
@@ -3412,7 +3534,7 @@ Keith Packard: changed font.c
 
 Kelly Dean: changed simple.el help-mode.el desktop.el files.el lisp.el
   register.el easy-mmode.el fileio.c help-fns.el help-macro.el help.el
-  keyboard.c package-x.el rect.el windmove.el winner.el
+  keyboard.c rect.el windmove.el winner.el
 
 Kelvin White: changed erc.el erc-pcomplete.el erc.texi erc-backend.el
   erc-ring.el erc-stamp.el
@@ -3430,7 +3552,7 @@ and co-wrote ps-def.el ps-mule.el ps-print.el ps-samp.el quail.el
 and changed coding.c mule-cmds.el mule.el fontset.c charset.c xdisp.c
   font.c fontset.el xterm.c fileio.c mule-conf.el ftfont.c characters.el
   fns.c mule-diag.el coding.h charset.h ccl.c xfaces.c editfns.c
-  composite.c and 386 other files
+  composite.c and 370 other files
 
 Kenichi Okada: co-wrote sasl-cram.el sasl-digest.el
 
@@ -3490,11 +3612,11 @@ Kevin Greiner: changed gnus-agent.el gnus-sum.el gnus-start.el
 
 Kevin Layer: changed mml.el w32proc.c
 
-Kévin Le Gouguec: changed files-tests.el files.el progmodes/python.el
-  font-lock.el gnus-sum.el shr.el vc-git-tests.el blockquote.html
-  blockquote.txt conceal.svg configure.ac dired-aux-tests.el dired-aux.el
-  electric-tests.el faces.el font-lock-tests.el fontset.el gnus.el
-  leim/Makefile.in message.texi project.el and 11 other files
+Kévin Le Gouguec: changed files-tests.el vc-git-tests.el files.el
+  progmodes/python.el vc-git.el font-lock.el gnus-sum.el shr.el
+  blockquote.html blockquote.txt button-tests.el button.el conceal.svg
+  configure.ac dired-aux-tests.el dired-aux.el electric-tests.el faces.el
+  font-lock-tests.el fontset.el gnus.el and 13 other files
 
 Kevin Rodgers: changed compile.el mailabbrev.el progmodes/compile.el
   dired-x.el files.el ange-ftp.el byte-opt.el desktop.el diff-mode.el
@@ -3506,16 +3628,18 @@ Kevin Ryde: wrote info-xref.el
 and changed info-look.el info.el checkdoc.el cl.texi compilation.txt
   etags.c arc-mode.el ffap.el gnus-art.el gnus-sum.el mule.el os.texi
   progmodes/compile.el woman.el browse-url.el copyright.el dig.el
-  files.el flyspell.el keyboard.c mailcap.el and 88 other files
+  files.el flyspell.el keyboard.c mailcap.el and 84 other files
 
-Kien Nguyen: changed browse-url.el comp.c files.el w32.c
+Kien Nguyen: changed w32.c browse-url.el comp.c files.el
+
+Kierin Bell: wrote iroquoian.el
 
 Kim F. Storm: wrote bindat.el cua-base.el cua-gmrk.el cua-rect.el ido.el
   keypad.el kmacro.el
 and changed xdisp.c dispextern.h process.c simple.el window.c keyboard.c
   xterm.c dispnew.c subr.el w32term.c lisp.h fringe.c display.texi
   macterm.c alloc.c fns.c xfaces.c keymap.c xfns.c xterm.h .gdbinit
-  and 249 other files
+  and 248 other files
 
 Kimit Yada: changed copyright.el
 
@@ -3529,8 +3653,6 @@ Kirill A. Korinskiy: changed fortune.el
 
 Kirk Kelsey: changed make-mode.el vc-hg.el
 
-Kishore Kumar: changed terminal.el
-
 Kiso Katsuyuki: changed tab-line.el
 
 Kjartan Óli Ágústsson: changed doc-view.el
@@ -3566,11 +3688,11 @@ Koichi Arakawa: changed tramp-sh.el w32proc.c
 Konrad Hinsen: wrote ol-eshell.el
 and changed ob-python.el
 
-Konstantin Kharlamov: changed indent.erts smerge-mode.el
-  typescript-ts-mode.el diff-mode.el files.el ada-mode.el alloc.c
+Konstantin Kharlamov: changed files.el indent.erts progmodes/python.el
+  smerge-mode.el typescript-ts-mode.el conf-mode.el diff-mode.el alloc.c
   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 and 33 other files
+  ebnf-ebx.el emacs-module-tests.el and 34 other files
 
 Konstantin Kliakhandler: changed org-agenda.el
 
@@ -3578,6 +3700,8 @@ Konstantin Novitsky: changed progmodes/python.el
 
 Kristian Hole: changed sql.el
 
+Kristoffer Balintona: changed flyspell.el log-edit.el minibuffer.el
+
 Kristoffer Grönlund: wrote wombat-theme.el
 
 Krzysztof Jurewicz: changed erc.el secrets.el
@@ -3625,7 +3749,7 @@ Lars Brinkhoff: changed records.texi fns.c lread.c data.c elisp.texi
 Lars Hansen: changed desktop.el tramp.el info.el mh-e.el dired-x.el
   dired-x.texi dired.el ls-lisp.el rmail.el dired.c files.texi
   hilit-chg.el misc.texi url-auth.el url-cache.el url-dired.el url-ftp.el
-  url-irc.el url-misc.el url-news.el url-privacy.el and 39 other files
+  url-irc.el url-misc.el url-news.el url-privacy.el and 38 other files
 
 Lars Lindberg: wrote msb.el
 and co-wrote dabbrev.el imenu.el
@@ -3655,7 +3779,7 @@ and co-wrote gnus-kill.el gnus-mh.el gnus-msg.el gnus-score.el
 and changed subr.el simple.el gnus.texi files.el display.texi process.c
   help-fns.el text.texi image.c dired.el help.el image.el package.el
   edebug.el shortdoc.el dired-aux.el gnutls.c minibuffer.el subr-x.el
-  auth-source.el smtpmail.el and 1061 other files
+  auth-source.el smtpmail.el and 1050 other files
 
 Lars Rasmusson: changed ebrowse.c
 
@@ -3668,6 +3792,10 @@ Laurence Warne: changed proced-tests.el proced.el progmodes/python.el
 
 Laurent Martelli: changed mm-decode.el
 
+Laurent Stacul: changed CTAGS.good CTAGS.good_crlf CTAGS.good_update
+  ETAGS.good_1 ETAGS.good_2 ETAGS.good_3 ETAGS.good_4 ETAGS.good_5
+  ETAGS.good_6 ETAGS.good_7 README etags.c test1.ru
+
 Lawrence Mitchell: wrote erc-backend.el erc-log.el
 and changed erc.el ox-latex.el org.el ox.el erc-match.el erc-nets.el
   erc-nickserv.el ox-html.el browse-url.el erc-button.el erc-compat.el
@@ -3675,15 +3803,18 @@ and changed erc.el ox-latex.el org.el ox.el erc-match.el erc-nets.el
   cl-macs.el erc-autoaway.el erc-autojoin.el and 25 other files
 
 Lawrence R. Dodd: co-wrote dired-x.el
-and changed fortran.el ispell.el sendmail.el cmuscheme.el comint.el
-  compile.el dired.el find-dired.el gnus.el gud.el inf-lisp.el info.el
-  lisp.el man.el minibuf.c rcs2log rmail.el simple.el terminal.el
-  text-mode.el tpu-edt.el and 3 other files
+and changed fortran.el sendmail.el cmuscheme.el comint.el compile.el
+  dired.el find-dired.el gnus.el gud.el inf-lisp.el info.el lisp.el
+  man.el minibuf.c rcs2log rmail.el simple.el text-mode.el tpu-edt.el
+  two-column.el vc.el
 
 Lee Bochicchio: changed abbrev-tests.el
 
 Lee Duhem: changed eval.c
 
+Lee Thompson: wrote syriac.el
+and changed HELLO misc-lang.el
+
 Leigh Stoller: changed emacsclient.c server.el
 
 Lele Gaifax: changed progmodes/python.el TUTORIAL.it python-tests.el
@@ -3691,20 +3822,22 @@ Lele Gaifax: changed progmodes/python.el TUTORIAL.it python-tests.el
   flymake-proc.el flymake.texi isearch.el pgtkfns.c xterm.c
 
 Lennart Borgman: co-wrote ert-x.el
-and changed nxml-mode.el tutorial.el re-builder.el window.el ada-xref.el
-  buff-menu.el emacs-lisp/debug.el emacsclient.c filesets.el flymake.el
-  help-fns.el isearch.el linum.el lisp-mode.el lisp.el mouse.el
-  progmodes/grep.el recentf.el remember.el replace.el reveal.el
-  and 6 other files
+and changed nxml-mode.el tutorial.el re-builder.el window.el buff-menu.el
+  emacs-lisp/debug.el emacsclient.c filesets.el flymake.el help-fns.el
+  isearch.el lisp-mode.el lisp.el mouse.el progmodes/grep.el recentf.el
+  remember.el replace.el reveal.el ruby-mode.el shell.el
+  and 4 other files
 
 Lennart Staflin: changed dired.el diary-ins.el diary-lib.el tq.el xdisp.c
 
+Leo C. Stein: changed latin-ltx.el ffap.el
+
 Leo Liu: wrote calc-tests.el pcmpl-x.el
 and changed octave.el ido.el rcirc.el files.el subr.el lisp-mode.el
   eldoc.el simple.el flymake.el smie.el abbrev.el progmodes/python.el
   cfengine.el cl-extra.el cl-macs.el emacs-lisp/cl-lib.el fns.c
   progmodes/compile.el register.el rng-valid.el thingatpt.el
-  and 166 other files
+  and 165 other files
 
 Leonard H. Tower Jr.: changed rnews.el rnewspost.el emacsbug.el
   rmailout.el sendmail.el
@@ -3719,6 +3852,8 @@ Leo P. White: changed eieio-custom.el
 
 Leo Vivier: changed dired-aux.el
 
+Lester Longley: changed cond-star.el
+
 Le Trung Dan: changed files.el files.texi package-vc.el shortdoc.el
 
 Levin Du: changed parse-time.el org-clock.el
@@ -3737,15 +3872,21 @@ Liang Wang: changed etags.el
 
 Liāu, Kiong-Gē 廖宮毅: changed comp.c mingw-cfg.site
 
-Lin Sun: changed python-tests.el progmodes/python.el calc.el esh-mode.el
-  eww.el ls-lisp-tests.el ls-lisp.el master.el package-test-server.py
-  package-tests.el package.el
+Lin Jian: changed Makefile.in subr.el
+
+Lin Sun: changed python-tests.el cedet/semantic.el ediff-util.el
+  package.el progmodes/python.el autorevert-tests.el autorevert.el
+  bovine/make.el calc.el esh-mode.el eww.el find-func.el html.el
+  java-tags.el javascript.el lread.c ls-lisp-tests.el ls-lisp.el
+  master.el package-test-server.py package-tests.el and 5 other files
 
 Lin Zhou: changed w32fns.c w32term.h
 
-Liu Hui: changed python-tests.el em-hist.el progmodes/python.el bibtex.el
-  dired.el eglot.el em-hist-tests.el eshell.texi pcmpl-linux.el
-  saveplace.el strokes.el wdired.el
+Liu Hui: changed calendar.el progmodes/python.el diary-lib.el
+  python-tests.el cal-hebrew.el cal-move.el comint.el em-hist.el
+  ffap-tests.el ffap.el holidays.el bibtex.el cal-bahai.el cal-china.el
+  cal-islam.el cal-julian.el cal-menu.el calendar-tests.el calendar.texi
+  dired.el eglot.el and 14 other files
 
 Lixin Chin: changed bibtex.el
 
@@ -3757,6 +3898,8 @@ Logan Perkins: changed keyboard.c
 
 Loïc Lemaître: changed typescript-ts-mode.el
 
+Lua Viana Reis: changed eglot.el
+
 Luca Capello: changed mm-encode.el
 
 Lucas Werkmeister: changed emacs.c emacs.service nxml-mode.el
@@ -3772,7 +3915,7 @@ Luc Teirlinck: wrote help-at-pt.el
 and changed files.el autorevert.el cus-edit.el subr.el simple.el
   frames.texi startup.el display.texi files.texi dired.el comint.el
   modes.texi custom.texi emacs.texi fns.c frame.el ielm.el minibuf.texi
-  variables.texi buffers.texi commands.texi and 212 other files
+  variables.texi buffers.texi commands.texi and 210 other files
 
 Ludovic Courtès: wrote nnregistry.el
 and changed configure.ac gnus.texi loadup.el
@@ -3791,6 +3934,7 @@ Lukas Huonker: changed tetris.el
 Łukasz Stelmach: changed erc.el message.el ps-print.el cookie1.el
   gnus-group.el gnus-logic.el gnutls.c gtkutil.c nsm.el org-agenda.el
   org-bbdb.el org.el org.texi ox-html.el ox.el shr.el simple.el
+  time-date-tests.el time-date.el
 
 Luke Lee: changed hideif.el
 
@@ -3800,7 +3944,7 @@ Lute Kamstra: changed modes.texi emacs-lisp/debug.el generic-x.el
   generic.el font-lock.el simple.el subr.el battery.el debugging.texi
   easy-mmode.el elisp.texi emacs-lisp/generic.el hl-line.el info.el
   octave.el basic.texi bindings.el calc.el cmdargs.texi diff-mode.el
-  doclicense.texi and 289 other files
+  doclicense.texi and 283 other files
 
 Lynn Slater: wrote help-macro.el
 
@@ -3823,11 +3967,11 @@ Malcolm Purvis: changed spam-stat.el
 
 Manoj Srivastava: wrote manoj-dark-theme.el
 
-Manuel Giraud: changed image-dired.el xdisp.c vc.el image.c ox-html.el
-  bookmark.el doc-view.el find-dired.el image-dired-util.el keyboard.c
-  longlines.el ox-publish.el dired.el dispextern.h gdb-mi.el gnus.el
-  paragraphs.el simple.el androidterm.c basic.texi battery.el
-  and 30 other files
+Manuel Giraud: changed image-dired.el xdisp.c tmm.el calendar.el
+  doc-view.el image.c vc.el ox-html.el bookmark.el diary-lib.el
+  find-dired.el gnus.el image-dired-util.el keyboard.c longlines.el
+  midnight.el ox-publish.el simple.el smtpmail.el buff-menu.el
+  cal-hebrew.el and 68 other files
 
 Manuel Gómez: changed speedbar.el
 
@@ -3845,6 +3989,8 @@ Marc Fleischeuers: changed files.el
 
 Marc Girod: changed informat.el rmail.el rmailsum.el sendmail.el
 
+Marc Herbert: changed gnus.el
+
 Marcin Borkowski: wrote fill-tests.el lisp-tests.el
 and changed battery.el doc-view.el elisp-mode-tests.el fill.el lisp.el
   parse-time.el studly.el
@@ -3858,7 +4004,7 @@ Marco Centurion: changed dired-aux.el files.el files.texi
 Marco Melgazzi: changed term.el
 
 Marco Wahl: wrote ol-eww.el
-and changed org-agenda.el page-ext.el ffap.el kmacro.el kmacro.texi
+and changed page-ext.el org-agenda.el ffap.el kmacro.el kmacro.texi
   org.el scroll-lock-tests.el scroll-lock.el
 
 Marco Walther: changed mips-siemens.h unexelfsni.c unexsni.c
@@ -3934,10 +4080,10 @@ Marko Kohtala: changed info.el
 Mark Osbourne: changed hexl-mode.el
 
 Mark Oteiza: wrote mailcap-tests.el md4-tests.el xdg-tests.el xdg.el
-and changed image-dired.el dunnet.el mpc.el eww.el json.el calc-units.el
-  lcms.c subr-x.el subr.el message.el tex-mode.el cl-macs.el cl.texi
-  ibuffer.el lcms-tests.el mailcap.el progmodes/python.el cl-print.el
-  eldoc.el emacs-lisp/chart.el files.el and 172 other files
+and changed dunnet.el mpc.el eww.el json.el calc-units.el lcms.c
+  subr-x.el subr.el message.el tex-mode.el cl-macs.el cl.texi ibuffer.el
+  lcms-tests.el mailcap.el progmodes/python.el cl-print.el eldoc.el
+  emacs-lisp/chart.el files.el htmlfontify.el and 167 other files
 
 Mark Plaksin: changed nnrss.el term.el
 
@@ -3962,7 +4108,7 @@ and changed cus-edit.el files.el progmodes/compile.el rmail.el
   tex-mode.el find-func.el rmailsum.el simple.el cus-dep.el dired.el
   mule-cmds.el rmailout.el checkdoc.el configure.ac custom.el emacsbug.el
   gnus.el help-fns.el ls-lisp.el mwheel.el sendmail.el
-  and 126 other files
+  and 123 other files
 
 Markus Sauermann: changed lisp-mode.el
 
@@ -4008,14 +4154,15 @@ Martin Neitzel: changed supercite.el
 
 Martin Pohlack: changed iimage.el pc-select.el
 
-Martin Rudalics: changed window.el window.c windows.texi frame.c xdisp.c
-  xterm.c frames.texi w32fns.c w32term.c xfns.c frame.el display.texi
-  frame.h help.el cus-start.el buffer.c window.h mouse.el dispnew.c
-  keyboard.c nsfns.m and 216 other files
+Martin Rudalics: co-wrote window-x.el
+and changed window.el window.c windows.texi frame.c xdisp.c frames.texi
+  xterm.c w32fns.c frame.el w32term.c xfns.c frame.h display.texi
+  cus-start.el buffer.c help.el keyboard.c mouse.el window.h dispnew.c
+  gtkutil.c and 220 other files
 
 Martin Stjernholm: wrote cc-bytecomp.el
-and co-wrote cc-align.el cc-cmds.el cc-compat.el cc-defs.el cc-engine.el
-  cc-fonts.el cc-langs.el cc-menus.el cc-mode.el cc-styles.el cc-vars.el
+and co-wrote cc-align.el cc-cmds.el cc-defs.el cc-engine.el cc-fonts.el
+  cc-langs.el cc-menus.el cc-mode.el cc-styles.el cc-vars.el
 and changed cc-fix.el nnimap.el cc-guess.el cc-mode-19.el cc-mode.texi
   lisp/Makefile.in ack.texi awk-mode.el cc-awk.el cc-lobotomy.el
   cc-make.el cc-subword.el files.el generic-x.el gnus-agent.el
@@ -4028,8 +4175,6 @@ Martin Thornquist: changed gnus-group.el gnus-topic.el
 Martyn Jago: wrote ob-lilypond.el
 and changed ob-emacs-lisp.el
 
-Masahiko Sato: wrote vip.el
-
 Masahiro Nakamura: changed mpc.el tramp.texi nsterm.m w32fns.c keyboard.c
   ns-win.el nsmenu.m nsterm.h package.el refcard.tex shortdoc.el
   strokes.el
@@ -4046,8 +4191,8 @@ Masatake Yamato: wrote add-log-tests.el imenu-tests.el ld-script.el
   subword.el
 and co-wrote cc-guess.el
 and changed etags.el asm-mode.el hexl.el xdisp.c bindings.el man.el
-  xfaces.c simple.el vc.el wid-edit.el add-log.el etags.c faces.el
-  pcvs.el progmodes/compile.el progmodes/cpp.el register.el ruler-mode.el
+  xfaces.c register.el simple.el vc.el wid-edit.el add-log.el etags.c
+  faces.el pcvs.el progmodes/compile.el progmodes/cpp.el ruler-mode.el
   sh-script.el buffer.c cc-langs.el and 80 other files
 
 Masayuki Ataka: changed texinfmt.el texinfo.el characters.el cmuscheme.el
@@ -4063,7 +4208,8 @@ Mathias Megyei: changed lisp/Makefile.in
 
 Mathieu Othacehe: changed tramp-adb.el
 
-Mats Lidell: changed TUTORIAL.sv european.el gnus-art.el org-element.el
+Mats Lidell: changed TUTORIAL.sv european.el gnus-art.el info.el
+  org-element.el
 
 Matt Armstrong: changed itree.c buffer-tests.el itree.h buffer.c alloc.c
   buffer.h display.texi editfns.c filelock-tests.el package.el pdumper.c
@@ -4074,11 +4220,10 @@ Matt Beshara: changed js.el nsfns.m
 
 Matt Bisson: changed xterm.c
 
-Matt Curtis: changed pulse.el
-
 Matt Fidler: changed package.el
 
-Matthew Bauer: changed comint.el shell.el startup.el
+Matthew Bauer: changed comint.el eldoc.el jit-lock.el eglot.el shell.el
+  startup.el
 
 Matthew Carter: changed sql.el
 
@@ -4100,7 +4245,7 @@ Matthew Newton: changed imenu.el
 
 Matthew Smith: changed typescript-ts-mode-tests.el
 
-Matthew Tromp: changed ielm.el
+Matthew Tromp: changed flymake.el ielm.el simple.el
 
 Matthew White: changed buffer.c bookmark-tests.el bookmark.el
   test-list.bmk
@@ -4115,8 +4260,8 @@ Matthias Meulien: wrote ansi-osc-tests.el
 and co-wrote ansi-osc.el
 and changed diff-mode.el progmodes/python.el bookmark.el vc-dir.el
   comint.el outline.el vc.el buff-menu.el doc-view.el eww.el gnus-sum.el
-  help-mode.el image-dired.el info.el man.el prog-mode.el project.el
-  simple.el tab-bar.el tabify.el vc-git.el and 3 other files
+  help-mode.el info.el man.el prog-mode.el project.el remember.el
+  simple.el speedbar.el tab-bar.el tabify.el and 4 other files
 
 Matthias Wiehl: changed gnus.el
 
@@ -4131,14 +4276,16 @@ Matt Hodges: changed textmodes/table.el faces.el iswitchb.el simple.el
   edebug.texi eldoc.el em-hist.el em-pred.el fixit.texi icon.el ido.el
   locate.el paragraphs.el pcomplete.el repeat.el and 3 other files
 
-Mattias Engdegård: changed byte-opt.el bytecomp.el bytecomp-tests.el
-  fns.c subr.el rx.el lisp.h rx-tests.el lread.c searching.texi eval.c
-  bytecode.c print.c alloc.c calc-tests.el progmodes/compile.el
-  fns-tests.el macroexp.el subr-tests.el cconv.el data.c
-  and 789 other files
+Mattias Engdegård: changed byte-opt.el bytecomp.el fns.c
+  bytecomp-tests.el subr.el rx.el lisp.h lread.c rx-tests.el eval.c
+  searching.texi bytecode.c print.c alloc.c calc-tests.el
+  progmodes/compile.el subr-tests.el fns-tests.el data.c macroexp.el
+  cconv.el and 806 other files
 
 Mattias M: changed asm-mode-tests.el asm-mode.el
 
+Mattias Roux: changed autoinsert.el autotype.texi autoinsert-tests.el
+
 Matt Kramer: changed tab-line.el
 
 Matt Lundin: changed org-agenda.el org.el org-bibtex.el org-footnote.el
@@ -4156,13 +4303,17 @@ 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 wid-edit-tests.el custom.el
-  widget.texi perl-mode.el cperl-mode-tests.el cus-edit-tests.el
-  custom-tests.el customize.texi checkdoc-tests.el checkdoc.el
-  cus-theme.el custom.texi files.texi filesets.el gnus.texi octave.el
-  pong.el align.el auth-source.el and 80 other files
+  widget.texi perl-mode.el cus-edit-tests.el customize.texi
+  cperl-mode-tests.el cus-theme.el custom-tests.el checkdoc-tests.el
+  checkdoc.el custom.texi files.texi filesets.el gnus.texi help-fns.el
+  octave.el pong.el vc.el and 90 other files
+
+Maxim Cournoyer: changed gnus.texi lisp-mode-tests.el lisp-mode.el
 
 Maxime Edouard Robert Froumentin: changed gnus-art.el mml.el
 
+Maximilian Kueffner: wrote ob-csharp.el
+
 Maxim Nikulin: changed mailcap.el os.texi timefns.c
 
 Max Mikhanosha: changed org-agenda.el org-habit.el keyboard.c org.el
@@ -4179,13 +4330,13 @@ Michael Albinus: wrote autorevert-tests.el dbus-tests.el dbus.el
   tramp-cmds.el tramp-compat.el tramp-crypt.el tramp-ftp.el tramp-fuse.el
   tramp-gvfs.el tramp-integration.el tramp-message.el tramp-rclone.el
   tramp-smb.el tramp-sshfs.el tramp-sudoedit.el tramp-tests.el
-  url-tramp-tests.el url-tramp.el vc-tests.el zeroconf.el
-and co-wrote tramp-cache.el tramp-sh.el tramp.el
-and changed tramp.texi tramp-adb.el trampver.el trampver.texi files.el
-  dbusbind.c gitlab-ci.yml files.texi ange-ftp.el dbus.texi
-  file-notify-tests.el Dockerfile.emba autorevert.el tramp-container.el
-  tramp-fish.el kqueue.c os.texi files-x.el shell.el simple.el README
-  and 333 other files
+  url-tramp-tests.el url-tramp.el zeroconf.el
+and co-wrote tramp-cache.el tramp-sh.el tramp.el vc-tests.el
+and changed tramp.texi tramp-adb.el trampver.el trampver.texi
+  gitlab-ci.yml files.el dbusbind.c files.texi ange-ftp.el
+  Dockerfile.emba dbus.texi file-notify-tests.el autorevert.el
+  tramp-container.el auth-source.el tramp-fish.el README kqueue.c
+  infra/Makefile.in test-jobs.yml test/Makefile.in and 363 other files
 
 Michael Ben-Gershon: changed acorn.h configure.ac riscix1-1.h riscix1-2.h
   unexec.c
@@ -4199,13 +4350,13 @@ Michaël Cadilhac: changed browse-url.el fr-dired-ref.tex gnus-sum.el
   gnus.texi ido.el Makefile emacsbug.el files.el fill.el flyspell.el
   fr-refcard.tex ispell.el meta-mode.el nnrss.el anti.texi battery.el
   blackbox.el bs.el calccard.tex callint.c cmuscheme.el
-  and 58 other files
+  and 57 other files
 
 Michael D. Ernst: wrote reposition.el
-and changed dired-x.el uniquify.el ispell.el bibtex.el rmail.el dired.el
-  simple.el dired-aux.el gud.el rmailsum.el bytecomp.el compare-w.el
-  complete.el fill.el shadow.el texnfo-upd.el vc.el allout.el comint.el
-  cust-print.el edebug.el and 28 other files
+and changed dired-x.el uniquify.el bibtex.el rmail.el dired.el simple.el
+  dired-aux.el gud.el rmailsum.el bytecomp.el compare-w.el complete.el
+  fill.el shadow.el texnfo-upd.el vc.el allout.el comint.el cust-print.el
+  edebug.el ediff.texi and 27 other files
 
 Michael Downes: changed gnus-sum.el
 
@@ -4221,11 +4372,11 @@ Michael Gschwind: wrote iso-cvt.el
 
 Michael Harnois: changed nnimap.el
 
-Michael Heerdegen: changed pp.el subr.el bytecomp.el cl-macs.el advice.el
-  control.texi copyright.el css-mode.el dired.el easy-mmode.el
-  eieio-core.el filesets.el gv.el hi-lock.el macroexp.el modula2.el
-  ob-C.el ob-core.el ob-exp.el ob-groovy.el ob-haskell.el
-  and 237 other files
+Michael Heerdegen: changed pp.el subr.el bytecomp.el cl-macs.el gv.el
+  ob-exp.el advice.el control.texi copyright.el css-mode.el dired.el
+  easy-mmode.el eieio-core.el filesets.el hi-lock.el hideshow.el
+  macroexp.el modula2.el ob-C.el ob-core.el ob-groovy.el
+  and 236 other files
 
 Michael Hendricks: changed help.el
 
@@ -4266,7 +4417,7 @@ Michael Olson: changed erc.el erc-backend.el Makefile erc-track.el
   erc-log.el erc-stamp.el erc-autoaway.el erc-dcc.el erc-goodies.el
   erc-list.el erc-compat.el erc-identd.el erc.texi erc-bbdb.el
   erc-match.el erc-notify.el erc-ibuffer.el erc-services.el remember.el
-  erc-button.el erc-nicklist.el and 54 other files
+  erc-button.el erc-nicklist.el and 53 other files
 
 Michael Orlitzky: changed tex-mode.el
 
@@ -4275,8 +4426,8 @@ Michael Piotrowski: changed gnus-art.el gnus-sum.el ps-print.el
 Michael R. Cook: changed gnus-sum.el gnus-topic.el gnus-art.el
 
 Michael R. Mauger: changed sql.el sql-tests.el comint.el emacsclient.c
-  comint-tests.el cua-base.el custom.el facemenu.el recentf.el replace.el
-  server.el tramp.el w32fns.c
+  zone.el comint-tests.el cua-base.el custom.el facemenu.el
+  jka-cmpr-hook.el recentf.el replace.el server.el tramp.el w32fns.c
 
 Michael R. Wolf: changed ange-ftp.el
 
@@ -4286,7 +4437,8 @@ Michael Schuldt: changed calc-comb.el
 
 Michael Shields: changed spam.el gnus-art.el gnus-sum.el gnus-cite.el
   server.el Makefile.in gnus-group.el gnus.el intel386.h nndraft.el
-  pgg-def.el window.c window.el
+  pgg-def.el use-package-core.el use-package-tests.el use-package.texi
+  window.c window.el
 
 Michael Sperber: changed org.el nnmail.el aix3-1.h aix4-2.h gnus-sum.el
   gnus.texi mail-source.el mailcap.el nnml.el org-capture.el
@@ -4369,7 +4521,7 @@ 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-funcs.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 variables.texi xftfont.c
+  mh-scan.el mh-thread.el variables.texi xftfont.c
 
 Mike Lamb: changed em-unix.el esh-util.el pcmpl-unix.el
 
@@ -4401,7 +4553,7 @@ Miles Bader: wrote button.el face-remap.el image-file.el macroexp.el
 and changed comint.el faces.el simple.el editfns.c xfaces.c xdisp.c
   info.el minibuf.c display.texi quick-install-emacs wid-edit.el xterm.c
   dispextern.h subr.el window.el cus-edit.el diff-mode.el xfns.c
-  bytecomp.el help.el lisp.h and 272 other files
+  bytecomp.el help.el lisp.h and 266 other files
 
 Milton Wulei: changed gdb-ui.el
 
@@ -4430,11 +4582,12 @@ Mohsin Kaleem: changed cus-face.el dispextern.h eglot.el term.c
 
 Mon Key: changed animate.el imap.el syntax.el
 
-Morgan Smith: changed image-dired.el doc-view.el window.el
-  esh-var-tests.el esh-var.el eshell.texi gnus-group-tests.el
+Morgan Smith: changed doc-view.el image-dired.el window.el battery.el
+  dbus.texi esh-var-tests.el esh-var.el eshell.texi gnus-group-tests.el
   minibuffer-tests.el minibuffer.el url-vars.el vc-git.el
 
-Morgan Willcock: changed tempo.el electric.el ert-font-lock.el
+Morgan Willcock: changed tempo.el electric.el ert-font-lock.el imenu.el
+  modes.texi progmodes/python.el smie.el speedbar-tests.el speedbar.el
 
 Moritz Maxeiner: changed commands.texi cus-start.el dispnew.c xdisp.c
 
@@ -4455,10 +4608,10 @@ Muchenxuan Tong: changed org-agenda.el org-mobile.el org-timer.el
 
 Murata Shuuichirou: changed coding.c
 
-M Visuwesh: changed dired-aux.el image.el ind-util.el quail/indian.el
-  delsel.el doc-view.el eww.el find-dired.el mailcap.el mouse.el shr.el
-  arc-mode.el comint.el dired-x.el dired.el easy-mmode.el emacsbug.el
-  ffap.el files.el files.texi gnus-group.el and 19 other files
+M Visuwesh: changed dired-aux.el doc-view.el dired.el help-fns.el
+  image.el ind-util.el misc.texi quail/indian.el shr.el delsel.el eww.el
+  find-dired.el mailcap.el mouse.el project.el vc-git.el arc-mode.el
+  building.texi calc-ext.el calc-mode.el calc.el and 35 other files
 
 Myles English: changed org-clock.el
 
@@ -4477,7 +4630,7 @@ Nakamura Toshikazu: changed w32fns.c
 
 Nali Toja: changed configure.ac
 
-Naofumi Yasufuku: changed search.c tramp-sh.el
+Naofumi Yasufuku: changed auth-source-pass.el search.c tramp-sh.el
 
 Naohiro Aota: changed fontset.c ftfont.c gnus-art.el mm-view.el tls.el
   xftfont.c
@@ -4494,13 +4647,11 @@ Nathan J. Williams: changed imap.el
 Nathan Moreau: changed vc.el
 
 Nathan Trapuzzano: changed cconv.el cl-macs.el cperl-mode.el gnus.texi
-  linum.el progmodes/python.el python-tests.el
+  progmodes/python.el python-tests.el
 
 Nathan Weizenbaum: changed js.el progmodes/python.el
 
-Neal Sidhwaney: changed lisp-mode-tests.el lisp-mode.el
-
-Neal Ziring: co-wrote vi.el (public domain)
+Neal Sidhwaney: changed lisp-mode-tests.el lisp-mode.el subr-tests.el
 
 Neil Mager: wrote appt.el
 
@@ -4531,7 +4682,8 @@ Nicholas Maniscalco: changed term.el
 
 Nicholas Strauss: changed lunar.el
 
-Nicholas Vollmer: changed emacs.1.in checkdoc.el easy-mmode.el
+Nicholas Vollmer: changed emacs.1.in checkdoc.el dictionary.el
+  easy-mmode.el
 
 Nick Alcock: changed control.texi customize.texi display.texi files.el
   frames.texi gnus.el keymaps.texi modes.texi nonascii.texi syntax.texi
@@ -4550,9 +4702,9 @@ Nick Helm: changed dired-aux.el eldoc.el help.el help.texi nsterm.m
 
 Nick Roberts: wrote gdb-mi.el t-mouse.el
 and changed gdb-ui.el gud.el building.texi tooltip.el speedbar.el
-  bindings.el thumbs.el xt-mouse.el .gdbinit DEBUG cc-mode.el comint.el
-  keyboard.c subr.el frames.texi help-mode.el progmodes/compile.el
-  xdisp.c display.texi term.c vc-svn.el and 145 other files
+  bindings.el xt-mouse.el .gdbinit DEBUG cc-mode.el comint.el keyboard.c
+  subr.el frames.texi help-mode.el progmodes/compile.el xdisp.c
+  display.texi term.c vc-svn.el break.pbm and 144 other files
 
 Nick Savage: changed help-mode.el
 
@@ -4568,6 +4720,8 @@ Nicolás Bértolo: changed comp.c comp.el emacs.c lread.c comp.h lisp.h
 
 Nicolas Calderon Asselin: changed org-clock.el
 
+Nicolas Despres: changed window.el windows.texi
+
 Nicolas Goaziou: wrote oc-basic.el oc-biblatex.el oc-bibtex.el oc-csl.el
   oc-natbib.el oc.el ol-doi.el org-duration.el org-element.el org-keys.el
   org-lint.el org-macro.el org-num.el ox-ascii.el ox-latex.el ox-md.el
@@ -4624,7 +4778,7 @@ Nils Ackermann: changed message.el nnmh.el reftex-vars.el
 
 Nitish Chinta: changed progmodes/python.el sendmail.el simple.el
 
-N. Jackson: changed emacs.texi forms.texi gnus.info os.texi
+N. Jackson: changed emacs.texi forms.texi gnus.texi os.texi
 
 Noah Evans: changed follow.el
 
@@ -4633,7 +4787,7 @@ and co-wrote erc-dcc.el
 and changed rsz-mini.el emacs-buffer.gdb comint.el files.el Makefile
   mailabbrev.el sendmail.el shell.el src/sysdep.c subr.el timer.el xfns.c
   yow.el apropos.el battery.el bytecomp.el calc.el coding.c complete.el
-  config.in configure.ac and 24 other files
+  config.in configure.ac and 22 other files
 
 Noah Lavine: changed tramp.el
 
@@ -4648,7 +4802,7 @@ Noam Postavsky: changed progmodes/python.el lisp-mode.el bytecomp.el
   lisp-mode-tests.el term.el xdisp.c cl-macs.el eval.c simple.el data.c
   emacs-lisp/debug.el modes.texi elisp-mode.el help-fns.el subr.el ert.el
   isearch.el processes.texi search.c cl-print.el diff-mode.el
-  and 362 other files
+  and 361 other files
 
 Nobuyoshi Nakada: co-wrote ruby-mode.el
 and changed ehelp.el ruby-mode-tests.el
@@ -4686,14 +4840,14 @@ Olaf Sylvester: wrote bs.el
 
 Olaf Trygve Berglihn: changed bibtex.el
 
-Ola Nilsson: changed sh-script.el
+Ola Nilsson: changed make-mode.el sh-script.el
 
 Ole Aamot: changed compile.el
 
 Oleg Pykhalov: changed gnus-sum.el
 
-Oleg S. Tihonov: changed cyrillic.el ispell.el language/cyrillic.el
-  map-ynp.el subr.el
+Oleg S. Tihonov: changed cyrillic.el language/cyrillic.el map-ynp.el
+  subr.el
 
 Oleh Krehel: co-wrote subr-tests.el
 and changed dired-aux.el outline.el checkdoc.el files.el subr.el buffer.c
@@ -4712,8 +4866,7 @@ Oliver Scholz: wrote ipa-praat.el
 and changed gamegrid.el gnus-cite.el nonascii.texi rx.el startup.el
   update-game-score.c
 
-Oliver Seidel: wrote otodo-mode.el
-and co-wrote todo-mode.el
+Oliver Seidel: co-wrote todo-mode.el
 
 Olivier Certner: wrote vc-cvs-tests.el
 and changed erc-track.el erc-ibuffer.el vc-cvs.el ediff-diff.el
@@ -4744,8 +4897,8 @@ and changed ph.el
 Óscar Fuentes: changed ido.el password-cache.el progmodes/grep.el ses.el
   vc-hooks.el xfns.c CPP-DEFINES INSTALL.W64 addpm.c addsection.c
   browse-url.el callproc.c cmdproxy.c configure.ac diff-mode.el
-  em-cmpl.el emacsclient.c keyboard.c ms-w32.h preprep.c vc-bzr.el
-  and 11 other files
+  em-cmpl.el emacsclient.c keyboard.c ms-w32.h vc-bzr.el vc-cvs.el
+  and 10 other files
 
 Osmo Karppinen: changed erc.el
 
@@ -4781,9 +4934,9 @@ and changed imenu.el make-mode.el
 Paul Eggert: wrote rcs2log
 and co-wrote cal-dst.el
 and changed lisp.h configure.ac alloc.c fileio.c process.c editfns.c
-  sysdep.c xdisp.c fns.c image.c data.c emacs.c keyboard.c lread.c
-  xterm.c eval.c gnulib-comp.m4 merge-gnulib callproc.c Makefile.in
-  buffer.c and 1892 other files
+  sysdep.c xdisp.c fns.c image.c emacs.c keyboard.c data.c lread.c
+  xterm.c merge-gnulib eval.c gnulib-comp.m4 Makefile.in callproc.c
+  frame.c and 1899 other files
 
 Paul Fisher: changed fns.c
 
@@ -4797,6 +4950,12 @@ and changed message.el gnus-util.el gnus-int.el gnus.el gnus-agent.el
 
 Paul M. Rodriguez: changed eglot.el
 
+Paul Nelson: changed bind-key.el foldout.el reftex-global.el
+  reftex-parse.el repeat-tests.el rmail.texi rmailsum.el tex-mode.el
+  building.texi calendar.el calendar.texi display.texi ediff-util.el
+  ediff.el ediff.texi fixit.texi gud.el ispell.el keymap.el lisp.el
+  mail/rmailmm.el and 22 other files
+
 Paul Pogonyshev: changed subr.el byte-opt.el bytecomp.el desktop.el
   emacs-lisp/debug.el eval.c package.el progmodes/python.el which-func.el
   align.el bytecode.c cc-langs.el cl-macs.el configure.ac dabbrev.el
@@ -4811,7 +4970,7 @@ Paul Reilly: changed dgux.h lwlib-Xm.c lwlib.c xlwmenu.c configure.ac
   lwlib/Makefile.in mail/rmailmm.el rmailedit.el rmailkwd.el
   and 10 other files
 
-Paul Rivier: changed ada-mode.el mixal-mode.el reftex-vars.el reftex.el
+Paul Rivier: changed mixal-mode.el reftex-vars.el reftex.el
 
 Paul Rubin: changed config.h sun2.h texinfmt.el window.c
 
@@ -4833,21 +4992,25 @@ Pavel Janík: co-wrote eudc-bob.el eudc-export.el eudc-hotlist.el
 and changed keyboard.c xterm.c COPYING xdisp.c process.c emacs.c lisp.h
   menu-bar.el ldap.el make-dist xfns.c buffer.c coding.c eval.c fileio.c
   flyspell.el fns.c indent.c Makefile.in callint.c cus-start.el
-  and 702 other files
+  and 689 other files
 
 Pavel Kobiakov: wrote flymake-proc.el flymake.el
 and changed flymake.texi
 
 Peder O. Klingenberg: wrote dns-mode-tests.el
-and changed dns-mode.el icalendar.el mm-decode.el org.el calc-comb.el
-  calc.texi dunnet.el emacsbug.el emacsclient.c eww.el gnus.texi
-  misc.texi snake.el subr.el url-http.el url-queue.el url-util.el
-  url-vars.el url.texi
+and changed url-http.el dns-mode.el icalendar.el mm-decode.el org.el
+  calc-comb.el calc.texi dunnet.el emacsbug.el emacsclient.c eww.el
+  gamegrid.el gnus.texi misc.texi snake.el subr.el url-queue.el
+  url-util.el url-vars.el url.texi
 
 Pedro Andres Aranda Gutierrez: changed cus-face.el xfaces.c
 
 P. E. Jareth Hein: changed gnus-util.el
 
+Pengji Zhang: changed bindings.el buff-menu.el comint.el display.texi
+  em-hist.el eshell.texi flow-fill-tests.el flow-fill.el flymake-cc.el
+  modes.texi reftex-ref.el reftex-sel.el xdisp.c
+
 Per Abrahamsen: wrote cus-dep.el cus-edit.el cus-face.el cus-start.el
   custom.el double.el gnus-cite.el gnus-cus.el progmodes/cpp.el
   wid-browse.el wid-edit.el widget.el xt-mouse.el
@@ -4855,7 +5018,7 @@ and co-wrote gnus-score.el
 and changed message.el menu-bar.el gnus.el gnus-art.el gnus-msg.el
   gnus-group.el gnus-sum.el frame.el gnus-draft.el tool-bar.el
   widget.texi apropos.el easymenu.el facemenu.el faces.el gnus-srvr.el
-  gnus-uu.el ispell.el lisp-mode.el makefile.el mouse.el
+  gnus-uu.el lisp-mode.el makefile.el mouse.el nnmail.el
   and 30 other files
 
 Per Bothner: wrote term.el
@@ -4874,10 +5037,10 @@ Perry E. Metzger: changed xdisp.c bindings.el buffer.c display.texi
 Perry Smith: wrote ruby-ts-mode.el
 and changed eglot.el ruby-ts-mode-tests.el
 
-Per Starbäck: changed ispell.el characters.el dired.el gnus-start.el BUGS
+Per Starbäck: changed characters.el dired.el gnus-start.el BUGS
   apropos.el bibtex.el bytecomp.el charset.h coding.c doctor.el emacs.c
-  european.el iso-transl.el pcmpl-gnu.el progmodes/python.el replace.el
-  startup.el trouble.texi vc.el xdisp.c
+  european.el iso-transl.el ispell.el pcmpl-gnu.el progmodes/python.el
+  replace.el startup.el trouble.texi vc.el xdisp.c
 
 Pete Beardmore: changed semantic/complete.el idle.el
 
@@ -4913,11 +5076,12 @@ Peter Münster: changed image-dired.el gnus-delay.el gnus-demon.el
 
 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 configure.ac misc.texi server.el
-  admin.el dired-tests.el ediff-diff.el emacs.c emacs.desktop
-  emacs.metainfo.xml emacsclient.1 incrementing-version-code perl-mode.el
-  ruby-mode-tests.el vc-sccs.el wdired-tests.el
+Peter Oliver: changed emacsclient.desktop emacs.metainfo.xml
+  emacsclient-mail.desktop Makefile.in emacs-mail.desktop
+  treesit-admin.el configure.ac dired-tests.el efaq.texi misc.texi
+  server.el term.c AndroidManifest.xml.in Dockerfile.emba admin.el
+  compat-template.html ediff-diff.el emacs.c emacs.desktop emacsclient.1
+  perl-mode.el and 6 other files
 
 Peter Povinec: changed term.el
 
@@ -4926,7 +5090,7 @@ Peter Rosin: changed configure.ac
 Peter Runestig: changed configure.bat dos-w32.el emacs.rc.in w32fns.c
   zone-mode.el
 
-Peter Seibel: changed cl-indent.el lisp-mode.el
+Peter Seibel: changed cl-indent.el lisp-mode.el pcmpl-git.el
 
 Peter S. Galbraith: wrote mh-alias.el mh-identity.el mh-inc.el
   mh-limit.el
@@ -4970,12 +5134,13 @@ Philip Hudson: changed em-hist.el
 Philip Jackson: wrote find-cmd.el ol-irc.el
 and changed org-irc.el
 
-Philip Kaludercic: wrote epa-ks.el package-vc.el
+Philip Kaludercic: wrote epa-ks.el newcomers-presets-theme.el
+  package-vc.el scrape-elpa.el
 and co-wrote compat.el
-and changed rcirc.el package.el vc.el rcirc.texi vc-git.el package.texi
-  project.el which-key.el eglot.el message.el loaddefs-gen.el simple.el
-  subr.el vc-hg.el .dir-locals.el bytecomp.el custom.el gravatar.el
-  help.el outline.el vc-svn.el and 73 other files
+and changed package.el rcirc.el package.texi rcirc.texi vc.el
+  sgml-mode.el vc-git.el project.el which-key.el package-autosuggest.eld
+  package-activate.el message.el startup.el subr.el custom.texi eglot.el
+  simple.el bytecomp.el cus-edit.el custom.el help.el and 94 other files
 
 Philippe Altherr: changed sh-script.el sh-script-tests.el shell.sh
 
@@ -5000,10 +5165,10 @@ Philipp Stephani: wrote callint-tests.el checkdoc-tests.el
   cl-preloaded-tests.el ediff-diff-tests.el eval-tests.el ido-tests.el
   lread-tests.el mouse-tests.el startup-tests.el xt-mouse-tests.el
 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 189 other files
+  internals.texi process.c eval.c json-tests.el process-tests.el
+  pdumper.c alloc.c emacs-module.in.h emacs.c lisp.h lread.c nsterm.m
+  bytecomp.el seccomp-filter.c callproc.c cl-macs.el gtkutil.c
+  and 190 other files
 
 Philipp Uhl: changed secrets.el
 
@@ -5013,16 +5178,16 @@ Phillip Lord: wrote ps-print-tests.el w32-feature.el
 and changed build-zips.sh build-dep-zips.py lisp/Makefile.in undo.c
   simple.el test/Makefile.in README-scripts README-windows-binaries
   emacs.nsi Makefile Makefile.in keyboard.c viper-cmd.el README.W32
-  elisp-mode-tests.el ldefs-clean.el loadup.el autoload.el
-  automated/Makefile.in cmds.c dired.el and 171 other files
+  elisp-mode-tests.el ldefs-clean.el loadup.el automated/Makefile.in
+  cmds.c dired.el eieio-tests.el and 168 other files
 
 Phil Sainty: wrote autoload-longlines-mode-tests.el
   autoload-major-mode-tests.el autoload-minor-mode-tests.el
   so-long-tests-helpers.el so-long-tests.el so-long.el spelling-tests.el
 and changed buffer.c modes.texi term.el comint.el diff.el goto-addr.el
-  xdisp.c cl-macs.el derived.el easy-mmode.el ecomplete.el emacs.texi
-  files.texi lisp.el misc.texi package.el progmodes/grep.el simple.el
-  subr-x.el subword.el trouble.texi
+  tab-bar.el window.el xdisp.c cl-macs.el comp-run.el derived.el
+  easy-mmode.el ecomplete.el emacs.texi files.texi ibuffer.el lisp.el
+  misc.texi package.el progmodes/grep.el and 6 other files
 
 Phil Sung: changed wdired.el dired.texi follow.el progmodes/python.el
 
@@ -5052,6 +5217,8 @@ Pieter Van Prooijen: changed xsettings.c ftcrfont.c xsettings.h
 
 Piet van Oostrum: changed data.c fileio.c flyspell.el smtpmail.el
 
+Pig Fang: changed eglot.el
+
 Pinku Surana: changed sql.el
 
 Piotr Kwiecinski: changed eglot.el
@@ -5061,22 +5228,27 @@ Piotr Trojanek: changed gnutls.c process.c
 Piotr Zieliński: wrote org-mouse.el
 
 Pip Cet: wrote image-circular-tests.el
-and changed xdisp.c comp.c byte-opt.el fns.c pdumper.c alloc.c
-  display.texi eval.c ftcrfont.c image.c sfnt.c xterm.c DEBUG
-  bytecomp-tests.el bytecomp.el ccl-tests.el ccl.c ccl.el cl-macs.el
-  cmds.c comint.el and 34 other files
+and changed pdumper.c comp.c lisp.h xdisp.c alloc.c xterm.c fns.c
+  configure.ac emacs.c eval.c image.c comp.el frame.c print.c
+  src/Makefile.in byte-opt.el conf_post.h data.c doc.c ftcrfont.c
+  gtkutil.c and 116 other files
 
 Platon Pronko: changed tramp.el
 
 Po Lu: wrote tramp-androidsu.el
 and changed xterm.c haikuterm.c xfns.c haiku_support.cc android.c xterm.h
-  configure.ac xwidget.c sfnt.c EmacsService.java haiku_support.h
-  androidterm.c haikufns.c android.texi keyboard.c pgtkterm.c frames.texi
-  nsterm.m pixel-scroll.el sfntfont.c EmacsWindow.java
-  and 535 other files
+  configure.ac xwidget.c EmacsService.java sfnt.c androidterm.c
+  haiku_support.h haikufns.c android.texi keyboard.c pgtkterm.c
+  frames.texi nsterm.m EmacsWindow.java pixel-scroll.el sfntfont.c
+  and 582 other files
 
 Pontus Michael: changed simple.el
 
+Pooya Moradi: changed eglot.el
+
+Pranshu Sharma: co-wrote window-x.el
+and changed gnus-salt.el
+
 Prateek Sharma: changed progmodes/python.el
 
 Prestoo Ten: changed screen.el
@@ -5089,9 +5261,18 @@ Protesilaos Stavrou: wrote modus-operandi-deuteranopia-theme.el
   modus-vivendi-deuteranopia-theme.el modus-vivendi-theme.el
   modus-vivendi-tinted-theme.el modus-vivendi-tritanopia-theme.el
 and changed modus-themes.org eww.el vc-dir.el TUTORIAL.el_GR log-view.el
-  modus-themes.texi time.el vc-git.el appt.el apropos.el custom.el
-  diff-mode.el language/greek.el log-edit.el minibuffer.el perl-mode.el
-  shortdoc.el shr.el vc-cvs.el vc-hg.el vc-svn.el vc/vc-bzr.el
+  time.el vc-git.el appt.el apropos.el custom.el diff-mode.el flymake.el
+  ibuffer.el language/greek.el log-edit.el minibuffer.el package.el
+  perl-mode.el shortdoc.el shr.el vc-cvs.el and 5 other files
+
+Przemsyław Kryger: wrote package-vc-tests.el
+
+Przemysław Alexander Kamiński: changed buffer-tests.el buffer.c buffer.h
+  dispextern.h display.texi frame.c frame.h nsterm.m picture.el simple.el
+  subr-tests.el subr.el window.c window.el window.h xdisp.c
+
+Przemysław Kryger: changed package-vc-tests.el package-vc.el package.el
+  vc-git-tests.el vc-tests.el
 
 Przemysław Wojnowski: wrote obarray-tests.el sgml-mode-tests.el
 and changed abbrev-tests.el abbrev.el cl-lib-tests.el loadup.el
@@ -5102,8 +5283,8 @@ Puneeth Chaganti: changed org.texi ox.el org-agenda.el org-capture.el
 
 Qiantan Hong: changed xwidget.c
 
-Qifan Wang: changed auth-source-tests.el auth-source.el eww.texi
-  newst-backend.el newst-plainview.el shr.el
+Qifan Wang: changed newst-backend.el auth-source-tests.el auth-source.el
+  eww.texi newst-plainview.el shr.el
 
 Radon Rosborough: changed package.el custom.texi package.texi startup.el
   eval.c lread.c org.texi os.texi xterm.c
@@ -5116,6 +5297,9 @@ Raffael Mancini: changed misc.el
 
 Raffael Stocker: changed w32.c w32console.c w32fns.c w32term.h w32xfns.c
 
+Rahul Martim Juliato: changed markdown-ts-mode.el icomplete.el
+  markdown-ts-mode-x.el newst-backend.el
+
 Raimon Grau: changed thingatpt.el calc-fin.el eww.el replace.el
   thingatpt-tests.el
 
@@ -5160,11 +5344,11 @@ Randall Smith: changed dired.el
 
 Randal Schwartz: wrote pp.el
 
-Randy Taylor: changed go-ts-mode.el build.sh dockerfile-ts-mode.el
-  eglot.el batch.sh cmake-ts-mode.el rust-ts-mode.el c-ts-mode.el
-  cus-theme.el font-lock.el font-lock.go 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
+Randy Taylor: changed go-ts-mode.el build.sh cmake-ts-mode.el
+  dockerfile-ts-mode.el eglot.el batch.sh rust-ts-mode.el c-ts-mode.el
+  yaml-ts-mode.el configure.ac cus-theme.el emacs.c font-lock.el
+  font-lock.go java-ts-mode.el js.el json-ts-mode.el modes.texi
+  progmodes/python.el project.el sh-script.el and 6 other files
 
 Ransom Williams: changed files.el
 
@@ -5189,7 +5373,7 @@ Reiner Steib: wrote gmm-utils.el
 and changed message.el gnus.texi gnus-art.el gnus-sum.el gnus-group.el
   gnus.el mml.el gnus-faq.texi mm-util.el gnus-score.el message.texi
   gnus-msg.el gnus-start.el gnus-util.el spam-report.el mm-uu.el spam.el
-  mm-decode.el files.el gnus-agent.el nnmail.el and 170 other files
+  mm-decode.el files.el gnus-agent.el nnmail.el and 169 other files
 
 Remek Trzaska: changed gnus-ems.el
 
@@ -5199,6 +5383,8 @@ Remington Furman: changed thingatpt.el
 
 Rémi Vanicat: changed ox-icalendar.el org-table.el
 
+Renato Ferreira: changed tramp.el
+
 Renaud Rioboo: changed nnmail.el
 
 René Kyllingstad: changed editfns.c mule-cmds.el pcomplete.el
@@ -5207,11 +5393,11 @@ Reto Zimmermann: wrote vera-mode.el
 and co-wrote vhdl-mode.el
 and changed vhdl-mode.texi
 
-Reuben Thomas: changed ispell.el whitespace.el dired-x.el files.el
-  sh-script.el emacsclient-tests.el remember.el README emacsclient.c
-  misc.texi msdos.c simple.el INSTALL ada-mode.el ada-xref.el alloc.c
-  arc-mode.el authors.el config.bat copyright cperl-mode.el
-  and 38 other files
+Reuben Thomas: co-wrote lua-mode.el
+and changed ispell.el whitespace.el dired-x.el files.el sh-script.el
+  emacsclient-tests.el remember.el README emacsclient.c misc.texi msdos.c
+  simple.el INSTALL alloc.c arc-mode.el authors.el config.bat copyright
+  cperl-mode.el dired-x.texi dired.el and 37 other files
 
 Ricardo Martins: changed eglot.el
 
@@ -5238,7 +5424,18 @@ and changed bovine.texi db-global.el gud.el loading.texi python-wy.el
 
 Richard King: wrote filelock.c uniquify.el userlock.el
 
-Richard Lawrence: changed calendar.el org-agenda.el ox-latex.el
+Richard Lawrence: wrote calendar-tests.el diary-icalendar.el
+  icalendar-ast.el icalendar-macs.el icalendar-mode.el
+  icalendar-parser.el icalendar-recur.el icalendar-shortdoc.el
+  icalendar-utils.el
+and changed calendar.el icalendar.el calendar.texi
+  diary-icalendar-tests.el icalendar-recur-tests.el diary-lib.el
+  icalendar-tests.el .gitattributes cal-dst.el cal-move.el cond-star.el
+  diary-icalendar-resources emacs.texi gnus-icalendar-tests.el
+  gnus-icalendar.el icalendar-ast-tests.el icalendar-parser-tests.el
+  import-legacy-function.ics import-legacy-vars.ics
+  import-non-recurring-all-day.ics import-rrule-anniversary.ics
+  and 8 other files
 
 Richard Levitte: changed vc-mtn.el
 
@@ -5247,7 +5444,6 @@ Richard L. Pieri: wrote pop3.el
 Richard M. Heiberger: changed tex-mode.el
 
 Richard Mlynarik: wrote cl-indent.el ebuff-menu.el ehelp.el rfc822.el
-  terminal.el yow.el
 and changed files.el rmail.el simple.el info.el sysdep.c bytecomp.el
   startup.el keyboard.c fileio.c process.c sendmail.el window.c editfns.c
   unexec.c xfns.c keymap.c lisp-mode.el minibuf.c buffer.c dired.el
@@ -5260,7 +5456,7 @@ and co-wrote cc-align.el cc-cmds.el cc-defs.el cc-engine.el cc-langs.el
 and changed files.el keyboard.c simple.el xterm.c xdisp.c rmail.el
   fileio.c process.c sysdep.c buffer.c xfns.c window.c subr.el
   configure.ac startup.el sendmail.el emacs.c Makefile.in editfns.c
-  info.el dired.el and 1339 other files
+  info.el dired.el and 1328 other files
 
 Richard Ryniker: changed sendmail.el
 
@@ -5313,11 +5509,11 @@ Roberto Rodríguez: changed glossary.texi widget.texi
 Robert P. Goldman: changed org.texi ob-exp.el org.el ox-latex.el
 
 Robert Pluim: wrote nsm-tests.el
-and changed configure.ac process.c keymap.el blocks.awk processes.texi
-  custom.texi font.c network-stream-tests.el emoji-zwj.awk ftfont.c
-  gtkutil.c process-tests.el unicode vc-git.el display.texi files.texi
-  network-stream.el nsterm.m terminal.c char-fold.el gnutls.el
-  and 218 other files
+and changed process.c configure.ac keymap.el network-stream-tests.el
+  blocks.awk processes.texi custom.texi emoji-zwj.awk font.c
+  process-tests.el display.texi unicode ftfont.c gtkutil.c nsterm.m
+  vc-git.el files.texi message.el network-stream.el terminal.c auth.texi
+  and 233 other files
 
 Robert Thorpe: changed cus-start.el indent.el rmail.texi
 
@@ -5344,6 +5540,14 @@ Rodrigo Real: changed pt-br-refcard.tex
 
 Roger Breitenstein: changed smtpmail.el
 
+Roi Martin: changed fill.el fill-tests.el ert-tests.el text.texi
+  cmake-ts-mode.el ert.el fill-region.erts go-ts-mode.el js.el calc.texi
+  comp-run.el csharp-mode.el elixir-ts-mode.el ert.texi erts-fail.erts
+  erts-file-test-list-fail.erts erts-file-test-list.erts erts-pass.erts
+  fill-paragraph-semlf-c-mode.erts
+  fill-paragraph-semlf-emacs-lisp-mode.erts
+  fill-paragraph-semlf-markdown-mode.erts and 12 other files
+
 Roland B. Roberts: changed buffer.h callproc.c dired.c files.el
   gnus-group.el gnus-sum.el process.c sort.el sysdep.c systty.h
 
@@ -5354,7 +5558,7 @@ and co-wrote find-dired.el progmodes/compile.el
 and changed compile.el add-log.el configure.ac files.el vc.el simple.el
   mailabbrev.el comint.el Makefile.in buffer.c upd-copyr.el menu-bar.el
   etags.c mem-limits.h ralloc.c src/Makefile.in fileio.c data.c process.c
-  rlogin.el rmail.el and 139 other files
+  rlogin.el rmail.el and 137 other files
 
 Roland Winkler: wrote proced.el
 and changed bibtex.el faces.el crm.el find-dired.el bookmark.el process.c
@@ -5370,12 +5574,14 @@ Romain Francoise: changed efaq.texi message.el make-dist gnus.texi
   dired-x.el Makefile.in comint.el fileio.c ibuf-ext.el subr.el
   configure.ac files.texi gnus-sum.el gnus-uu.el progmodes/compile.el
   puresize.h replace.el startup.el doclicense.texi emacs.c gnus-fun.el
-  and 149 other files
+  and 148 other files
 
 Roman Belenov: changed which-func.el
 
 Ronan Waide: changed smtpmail.el
 
+Ron Parker: changed editorconfig-core-handle.el
+
 Ron Schnell: wrote dunnet.el
 and changed misc.texi
 
@@ -5393,16 +5599,16 @@ R Primus: changed eglot.el
 
 Rüdiger Sonderfeld: wrote inotify-tests.el reftex-tests.el
 and changed eww.el octave.el shr.el bibtex.el configure.ac
-  misc/Makefile.in reftex-vars.el vc-git.el TUTORIAL.de ada-mode.el
-  autoinsert.el building.texi bytecomp.el calc-lang.el cc-langs.el
-  dired.texi editfns.c emacs.c emacs.texi epa.el erc.el
-  and 40 other files
+  misc/Makefile.in reftex-vars.el vc-git.el TUTORIAL.de autoinsert.el
+  building.texi bytecomp.el calc-lang.el cc-langs.el dired.texi editfns.c
+  emacs.c emacs.texi epa.el erc.el eww.texi and 39 other files
 
 Rudolf Adamkovič: co-wrote quail/slovak.el
-and changed compilation.txt compile-tests.el progmodes/compile.el
-  calc-units.el files.el ispell.el scheme.el
+and changed nsterm.m compilation.txt compile-tests.el ispell.el
+  progmodes/compile.el calc-units.el comint.el files.el hi-lock.el
+  message.el scheme.el sql.el
 
-Rudolf Schlatte: changed README.md eglot.el iso-transl.el
+Rudolf Schlatte: changed README.md eglot.el iso-transl.el vc-hooks.el
 
 Ruijie Yu: changed TUTORIAL.cn arc-mode-tests.el arc-mode.el
 
@@ -5447,7 +5653,9 @@ Ryszard Kubiak: co-wrote ogonek.el
 R-Zip: changed eglot.el
 
 Sacha Chua: wrote erc-pcomplete.el
-and changed erc.el org.el erc-button.el org.texi shr.el
+and changed erc.el org.el erc-button.el image-dired.el org.texi shr.el
+
+Sahil Kang: changed pdumper.c
 
 Saito Takuya: changed mule.el progmodes/compile.el
 
@@ -5467,7 +5675,7 @@ Sam Steingold: wrote gulp.el midnight.el
 and changed progmodes/compile.el cl-indent.el simple.el vc-cvs.el vc.el
   mouse.el vc-hg.el files.el gnus-sum.el tex-mode.el etags.el
   font-lock.el sgml-mode.el subr.el window.el ange-ftp.el inf-lisp.el
-  message.el package.el rcirc.el shell.el and 216 other files
+  message.el package.el rcirc.el shell.el and 211 other files
 
 Samuel Bronson: changed custom.el emacsclient.c keyboard.c
   progmodes/grep.el semantic/format.el unexmacosx.c
@@ -5528,10 +5736,14 @@ Scott Frazer: wrote deeper-blue-theme.el whiteboard-theme.el
 
 Scott M. Meyers: changed cmacexp.el
 
+Sean Allred: changed project.el
+
 Sean Bright: changed emacs.nsi
 
 Sean Connor: changed gnus-sum.el
 
+Sean Devlin: changed calc.el package.el calc-tests.el calc.texi
+
 Sean Neakums: changed gnus-msg.el gnus-uu.el supercite.el
 
 Sean O'Halpin: changed ob.el
@@ -5542,10 +5754,12 @@ Sean O'Rourke: changed complete.el comint.el dabbrev.el find-func.el
 Sean Sieger: changed emacs-lisp-intro.texi
 
 Sean Whitton: wrote em-elecslash.el em-extpipe-tests.el em-extpipe.el
-and changed vc-git.el project.el vc.el bindings.el server.el simple.el
-  subr.el vc-dispatcher.el window.el eshell-tests.el eshell.texi
-  subr-x.el .dir-locals.el cl-macs.el eshell-tests-helpers.el files.texi
-  ftfont.c remember.el startup.el term.el INSTALL and 40 other files
+  vc-test-misc.el
+and co-wrote vc-tests.el
+and changed vc.el vc-git.el vc-dispatcher.el vc-hg.el vc-dir.el
+  diff-mode.el vc-hooks.el vc1-xtra.texi log-view.el maintaining.texi
+  subr.el project.el log-edit.el files.texi server.el simple.el window.el
+  cond-star.el dired-aux.el keyboard.c vc/vc-bzr.el and 329 other files
 
 Sebastian Fieber: changed gnus-art.el mm-decode.el mm-view.el
 
@@ -5559,6 +5773,8 @@ and changed add-log.el
 
 Sebastian Miele: changed simple-tests.el simple.el strings.texi
 
+Sebastián Monía: changed eww.el url-parse-tests.el url-parse.el
+
 Sebastian Reuße: changed find-dired.el
 
 Sebastian Rose: co-wrote org-protocol.el
@@ -5609,13 +5825,15 @@ Sergey Poznyakoff: changed rmail.el mh-mime.el rmail.texi smtpmail.el
 
 Sergey Trofimov: changed window.el
 
-Sergey Vinokurov: changed data.c buffer.c emacs-module-tests.el
+Sergey Vinokurov: changed data.c pdumper.c buffer.c emacs-module-tests.el
   emacs-module.c memory-report.el
 
 Sergio Durigan Junior: changed eudcb-bbdb.el gdb-mi.el
 
 Sergio Martinez: changed nnimap.el
 
+Sergio Pastor Pérez: changed indent.c
+
 Sergio Pokrovskij: changed TUTORIAL.eo
 
 Seweryn Kokot: changed positions.texi searching.texi
@@ -5633,6 +5851,8 @@ Shawn Boles: changed url-cookie.el
 
 Shawn M. Carey: wrote [some early FreeBSD support]
 
+Shay Elkin: changed nsfns.m
+
 Shenghuo Zhu: wrote binhex.el gnus-rfc1843.el mm-extern.el mm-partial.el
   mm-url.el mm-uu.el mml2015.el nnrss.el rfc1843.el uudecode.el
 and co-wrote gnus-dired.el nnfolder.el
@@ -5640,11 +5860,11 @@ and changed gnus-art.el message.el gnus-sum.el gnus-msg.el gnus.el
   gnus-agent.el mm-decode.el mm-util.el gnus-group.el mml.el
   gnus-start.el gnus-util.el mm-view.el nnslashdot.el nnmail.el nntp.el
   gnus-topic.el gnus-xmas.el rfc2047.el mail-source.el gnus-win.el
-  and 93 other files
+  and 92 other files
 
 Shigeru Fukaya: wrote bytecomp-tests.el
-and changed apropos.el bs.el byte-opt.el bytecomp.el elint.el rx-new.el
-  ses.el subr.el texinfmt.el
+and changed apropos.el bs.el byte-opt.el bytecomp.el rx-new.el ses.el
+  subr.el texinfmt.el
 
 Shingo Tanaka: changed files.el
 
@@ -5684,7 +5904,7 @@ and changed css-mode.el project.el json-tests.el json.el scss-mode.scss
   sgml-mode.el less-css-mode.less maintaining.texi modes.texi page.el
   ring.el rot13.el scheme.el sql.el apropos.el asm-mode.el autoconf.el
   autoinsert.el browse-url.el check-declare.el color.el
-  and 18 other files
+  and 17 other files
 
 Simona Arizanova: changed help.el
 
@@ -5713,7 +5933,7 @@ and co-wrote comint.el shell.el
 and changed font-lock.el fast-lock.el lazy-lock.el rmail.el fortran.el
   sendmail.el subr.el dired.el sh-script.el texinfo.el add-log.el
   compile.el outline.el help.el menu-bar.el perl-mode.el ps-print.el
-  rmailsum.el bytecomp.el cc-fonts.el data.c and 58 other files
+  rmailsum.el bytecomp.el cc-fonts.el data.c and 57 other files
 
 Simon Schubert: changed json.el
 
@@ -5721,6 +5941,8 @@ Simon South: co-wrote opascal.el
 
 Simon Thum: changed ob-maxima.el
 
+Siyuan Chen: changed cua-base.el
+
 Skip Collins: changed w32fns.c w32term.c w32term.h
 
 Skykanin-: changed eglot.el
@@ -5730,12 +5952,13 @@ Slava Akhmechet: changed eglot.texi
 Sławomir Nowaczyk: changed emacs.py progmodes/python.el TUTORIAL.pl
   flyspell.el ls-lisp.el w32proc.c
 
-Spencer Baugh: wrote uniquify-tests.el which-func-tests.el
-and changed project.el minibuffer.el simple.el flymake.el
-  progmodes/grep.el vc-hg.el data-tests.el mini.texi minibuffer-tests.el
-  startup.el uniquify.el which-func.el alloc.c autorevert.el bindings.el
-  casefiddle-tests.el casefiddle.c comint.el crm.el dired-aux.el
-  dired-x.el and 22 other files
+Spencer Baugh: wrote map-ynp-tests.el uniquify-tests.el
+  which-func-tests.el
+and changed minibuffer.el project.el minibuffer-tests.el simple.el
+  flymake.el process.c progmodes/grep.el startup.el vc-hg.el crm.el
+  mini.texi uniquify.el comint.el data-tests.el dired-aux.el
+  easy-mmode.el eglot.el elisp-mode.el ffap.el flymake.texi keymap.c
+  and 48 other files
 
 Spencer Thomas: changed dabbrev.el emacsclient.c gnus.texi server.el
   unexcoff.c
@@ -5762,10 +5985,10 @@ Stefan Kangas: wrote bookmark-tests.el cal-julian-tests.el
   studly-tests.el tabify-tests.el time-tests.el timezone-tests.el
   underline-tests.el uudecode-tests.el wallpaper.el warnings-tests.el
 and co-wrote help-tests.el keymap-tests.el
-and changed image-dired.el efaq.texi package.el cperl-mode.el checkdoc.el
-  subr.el help.el simple.el bookmark.el dired.el files.el gnus.texi
-  dired-x.el browse-url.el erc.el keymap.c image-mode.el ediff-util.el
-  eglot.el speedbar.el woman.el and 1811 other files
+and changed subr.el package.el image-dired.el checkdoc.el efaq.texi
+  cperl-mode.el help.el simple.el progmodes/python.el dired.el files.el
+  bookmark.el browse-url.el gnus.texi keymap.c dired-x.el erc.el image.c
+  cl-macs.el message.el subr-tests.el and 1947 other files
 
 Stefan Merten: co-wrote rst.el
 
@@ -5779,10 +6002,10 @@ Stefan Monnier: wrote bibtex-style.el bytecomp-tests.el
   pcvs-util.el radix-tree.el regexp-opt-tests.el reveal.el smerge-mode.el
   smie.el subword-tests.el track-changes.el vc-mtn.el
 and co-wrote font-lock.el gitmerge.el pcvs.el visual-wrap.el
-and changed subr.el simple.el cl-macs.el bytecomp.el keyboard.c files.el
-  lisp.h vc.el eval.c xdisp.c alloc.c buffer.c sh-script.el help-fns.el
-  progmodes/compile.el tex-mode.el lread.c keymap.c package.el window.c
-  edebug.el and 1728 other files
+and changed subr.el simple.el cl-macs.el bytecomp.el files.el keyboard.c
+  lisp.h vc.el eval.c xdisp.c alloc.c help-fns.el buffer.c sh-script.el
+  package.el tex-mode.el progmodes/compile.el lread.c keymap.c window.c
+  easy-mmode.el and 1743 other files
 
 Stefano Facchini: changed gtkutil.c
 
@@ -5808,6 +6031,14 @@ Steinar Bang: changed gnus-setup.el imap.el
 
 Stéphane Boucher: changed replace.el
 
+Stephane Marks: wrote savehist-tests.el system-sleep.el system-taskbar.el
+and changed frame.el frames.texi nsfns.m tab-bar.el bookmark.el frame.c
+  nsterm.m project.el recentf.el savehist.el subr.el vtable.el w32fns.c
+  display.texi ibuf-macs.el os.texi saveplace.el shell.el vtable-tests.el
+  androidfns.c ansi-osc.el and 32 other files
+
+Stephane Zermatten: changed term-tests.el term.el ansi-osc.el
+
 Stephan Stahl: changed which-func.el buff-menu.el buffer.c dired-x.texi
   ediff-mult.el
 
@@ -5815,11 +6046,11 @@ Stephen A. Wood: changed fortran.el
 
 Stephen Berman: wrote todo-mode-tests.el
 and co-wrote todo-mode.el visual-wrap.el
-and changed wid-edit.el wdired.el todo-mode.texi wdired-tests.el
-  dabbrev-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 widget.texi
-  allout.el dabbrev.el eww.el find-dired.el frames.texi hl-line.el
-  and 78 other files
+and changed dired.el wid-edit.el wdired.el dired-tests.el files.el
+  todo-mode.texi dabbrev-tests.el wdired-tests.el diary-lib.el
+  menu-bar.el minibuffer.el dabbrev.el dired-aux.el doc-view.el info.el
+  outline.el simple.el todo-test-1.todo widget.texi INSTALL_BEGIN
+  allout.el and 89 other files
 
 Stephen C. Gilardi: changed configure.ac
 
@@ -5831,22 +6062,22 @@ and changed diary-lib.el octave.el org-agenda.el locate.el replace.el
   allout.el autoinsert.el avoid.el backquote.el battery.el bib-mode.el
   bruce.el c-mode.el ccl.el and 79 other files
 
-Stephen Gildea: wrote refcard.tex
+Stephen Gildea: wrote refcard.tex time-stamp.el
 and co-wrote mh-funcs.el mh-search.el
-and changed time-stamp.el time-stamp-tests.el mh-e.el mh-utils-tests.el
-  mh-junk.el mh-utils.el mh-comp.el files.texi mh-show.el mh-e.texi
-  test-all-mh-variants.sh files.el mh-customize.el mh-folder.el
-  mh-scan.el mh-xface-tests.el backups.texi comp-tests.el compile.texi
-  dns-mode.el emacs.texi and 24 other files
+and changed time-stamp-tests.el mh-e.el mh-utils-tests.el files.texi
+  mh-junk.el mh-utils.el mh-comp.el mh-show.el find-func.el mh-e.texi
+  mh-folder.el symbols.texi test-all-mh-variants.sh ert.texi files.el
+  functions.texi mh-customize.el mh-scan.el mh-xface-tests.el tips.texi
+  backups.texi and 44 other files
 
 Stephen J. Turnbull: changed ediff-init.el strings.texi subr.el
 
 Stephen Leake: wrote elisp-mode-tests.el
-and changed ada-mode.el ada-xref.el elisp-mode.el xref.el eglot.el
-  window.el mode-local.el project.el CONTRIBUTE ada-prj.el vc-mtn.el
-  ada-stmt.el cedet-global.el ede/generic.el simple.el autoload.el
-  bytecomp.el cl-generic.el ede/locate.el files.texi functions.texi
-  and 36 other files
+and changed elisp-mode.el xref.el eglot.el window.el mode-local.el
+  project.el CONTRIBUTE vc-mtn.el ada-stmt.el cedet-global.el
+  ede/generic.el simple.el bytecomp.el cl-generic.el ede/locate.el
+  files.texi functions.texi package.el progmodes/grep.el windows.texi
+  INSTALL.REPO and 31 other files
 
 Stephen Pegoraro: changed xterm.c
 
@@ -5858,9 +6089,11 @@ Steve Fisk: co-wrote cal-tex.el
 
 Steve Grubb: changed vcdiff
 
-Steven Allen: changed functions.texi nadvice.el package-vc.el
-  em-prompt.el esh-mode.el tramp-gvfs.el tramp-integration.el
-  url-expand.el use-package-core.el use-package-tests.el xdg.el
+Steven Allen: changed dbus.texi functions.texi nadvice.el package-vc.el
+  c-ts-common.el configure.ac dbus.el dbusbind.c desktop.el
+  display-fill-column-indicator.el eglot-tests.el eglot.el em-prompt.el
+  emacsbug.el esh-mode.el eww-tests.el eww.el flymake.el
+  font-lock-no-parent.rs frame.el linum.el and 19 other files
 
 Steven De Herdt: changed vc/vc-bzr.el
 
@@ -5986,9 +6219,9 @@ Tassilo Horn: wrote doc-view.el
 and co-wrote ol-gnus.el
 and changed bug-reference.el reftex-vars.el tex-mode.el browse-url.el
   gnus.texi reftex-cite.el tsdh-dark-theme.el tsdh-light-theme.el
-  gnus-sum.el maintaining.texi file-notify-tests.el gnus-art.el misc.texi
-  reftex.el org-gnus.el prog-mode.el simple.el subword.el dired.el
-  image-mode.el json.el and 105 other files
+  gnus-sum.el maintaining.texi misc.texi simple.el dired.el
+  file-notify-tests.el gnus-art.el paren.el reftex.el org-gnus.el
+  prog-mode.el subword.el image-mode.el and 105 other files
 
 Tatsuya Ichikawa: changed gnus-agent.el gnus-cache.el
 
@@ -6009,7 +6242,7 @@ and changed spam.el gnus.el nnimap.el gnus.texi gnutls.c gnus-sum.el
   auth.texi cfengine.el gnus-sync.el gnus-util.el gnus-start.el netrc.el
   gnutls.h message.el spam-stat.el .gitlab-ci.yml encrypt.el
   mail-source.el nnir.el nnmail.el auth-source-tests.el
-  and 125 other files
+  and 124 other files
 
 Terje Rosten: changed xfns.c version.el xterm.c xterm.h
 
@@ -6026,13 +6259,15 @@ T.F. Torrey: changed org-rmail.el ox.el
 
 Thamer Mahmoud: changed arabic.el
 
+Thanos Apollo: changed quail/greek.el
+
 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 js.el csharp-mode.el css-mode.el indent.erts
+  c-ts-mode.el eglot.el js.el csharp-mode.el indent.erts css-mode.el
   project.el treesit.el json-ts-mode.el html-ts-mode.el eglot-tests.el
   prog-mode.el simple.el EGLOT-NEWS c-ts-common.el java-ts-mode-tests.el
-  movement.erts positions.texi programs.texi and 17 other files
+  movement.erts positions.texi programs.texi and 18 other files
 
 Theresa O'Connor: wrote json.el
 and changed erc.el erc-viper.el erc-log.el erc-track.el viper.el
@@ -6047,18 +6282,18 @@ and co-wrote hideshow.el
 and changed ewoc.el vc.el info.el processes.texi zone.el lisp-mode.el
   scheme.el text.texi vc-rcs.el display.texi fileio.c files.el vc-git.el
   TUTORIAL.it bindat.el cc-vars.el configure.ac dcl-mode.el diff-mode.el
-  dired.el elisp.texi and 169 other files
+  dired.el elisp.texi and 165 other files
 
 Thierry Banel: co-wrote ob-C.el
 and changed calc-arith.el
 
 Thierry Emery: changed kinsoku.el timezone.el url-http.el wid-edit.el
 
-Thierry Volpiatto: changed register.el bookmark.el files.el dired-aux.el
-  eshell/eshell.el gnus-sum.el keyboard.c net-utils.el package.el
+Thierry Volpiatto: changed register.el bookmark.el eshell/eshell.el
+  files.el dired-aux.el gnus-sum.el keyboard.c net-utils.el package.el
   tramp.el woman.el eldoc.el files.texi image-mode.el info.el man.el
   minibuffer.el pcmpl-gnu.el subr.el use-package.el winner.el
-  and 22 other files
+  and 26 other files
 
 Thomas Bach: changed wisent/python.el
 
@@ -6074,7 +6309,7 @@ Thomas Dorner: changed ange-ftp.el
 Thomas Dye: changed org.texi org-bibtex.el ob-R.el org.el
 
 Thomas Fitzsimmons: wrote soap-client.el
-and changed soap-inspect.el eudc-vars.el eudc.el eudc.texi ldap.el
+and changed soap-inspect.el eudc.el eudc-vars.el eudc.texi ldap.el
   ntlm.el url-http.el eudcb-bbdb.el eudcb-ldap.el eudc-bob.el
   eudc-tests.el ntlm-tests.el eudc-export.el eudcb-ph.el package.el
   README authinfo bbdb diary-lib.el display.texi eudc-capf.el
@@ -6130,15 +6365,18 @@ Tim Harper: changed ns-win.el
 
 Tim Howe: changed org-clock.el
 
-Tim Landscheidt: changed gnus-art.el eieio-opt.el gnus.texi icalendar.el
-  sort.el ws-mode.el
+Tim Landscheidt: changed gnus-art.el eieio-opt.el flymake.texi gnus.texi
+  icalendar.el ruby-mode.el sort.el ws-mode.el
 
 Timo Juhani Lindfors: changed gnus-msg.el
 
 Timo Lilja: changed mail-source.el
 
 Timo Myyrä: changed battery.el configure.ac english.el european.el
-  language/japanese.el mule-conf.el systhread.c
+  language/japanese.el log-view.el maintaining.texi mule-conf.el
+  systhread.c
+
+Timon Reinold: changed eww.el flyspell.el
 
 Timo Savola: changed emacs.c gtkutil.c startup.el x-win.el xfns.c xterm.c
   xterm.h
@@ -6148,7 +6386,8 @@ Timo Taipalus: changed display.texi image.c image.el
 Timothee Denizou: changed tetris.el
 
 Tim Ruffing: changed keyboard.c calc-prog.el emacs.service keyboard.h
-  macros.c dbus.el ftcrfont.c macros.h process.c subr.el term.c
+  macros.c term.c dbus.el ftcrfont.c macros.h process.c subr.el
+  termchar.h
 
 Tim Van Holder: changed emacsclient.c Makefile.in configure.ac
   progmodes/compile.el which-func.el
@@ -6160,7 +6399,7 @@ and changed ibuffer.el dired.el ibuf-ext.el dired-tests.el replace.el
   dired-aux.el simple.el replace-tests.el subr.el dired.texi files.el
   ibuf-macs.el ibuffer-tests.el ls-lisp.el cl-macs.el diff-mode.el
   cl-seq.el dired-x.el display.texi ediff-ptch.el em-ls.el
-  and 116 other files
+  and 115 other files
 
 Titus von der Malsburg: changed window.el display.texi simple.el
   windows.texi
@@ -6183,6 +6422,9 @@ Toby Cubitt: co-wrote avl-tree.el
 and changed org-capture.el org.el org-agenda.el cl-macs.el org-clock.el
   org-colview.el org.texi
 
+Toby Dylan Hocking: changed compilation.txt compile-tests.el
+  progmodes/compile.el
+
 Toby Speight: changed generic-x.el window.el
 
 Toke Høiland-Jørgensen: changed gnutls.c nnmaildir.el smime.el
@@ -6194,9 +6436,10 @@ Tomas Abrahamsson: wrote artist.el
 
 Tomas Fabrizio Orsi: changed net-utils.el
 
-Tomas Nordin: changed progmodes/python.el subr.el
+Tomas Nordin: changed diff-mode-tests.el diff-mode.el progmodes/python.el
+  subr.el view.el
 
-Tomas Volf: changed esh-mode.el
+Tomas Volf: changed esh-mode.el message.el
 
 Tomasz Gajewski: changed cpp-root.el
 
@@ -6242,11 +6485,11 @@ Tom Regner: changed notifications.el
 Tom Seddon: changed w32font.c
 
 Tom Tromey: wrote bug-reference.el erc-list.el package-x.el
-and co-wrote package.el tcl.el
+and co-wrote package-activate.el package.el tcl.el
 and changed data.c lisp.h js.el buffer.c data-tests.el mhtml-mode.el
   alloc.c css-mode.el js-tests.el process.c window.c bytecode.c editfns.c
   files.el fns.c keyboard.c keymap.c lread.c makefile.el xfns.c cmds.c
-  and 210 other files
+  and 208 other files
 
 Tom Willemse: changed elec-pair.el package.el perl-mode.el prog-mode.el
   progmodes/python.el simple.el
@@ -6275,7 +6518,7 @@ and changed net
 Toru Tomabechi: wrote language/tibetan.el quail/tibetan.el tibet-util.el
 
 Toru Tsuneyoshi: changed ange-ftp.el buff-menu.el cus-start.el fileio.c
-  files.el fill.el lisp.h tramp.el w32fns.c
+  files.el fill.el lisp.h tramp-sh.el tramp.el w32fns.c
 
 Toshiaki Nomura: changed uxpds.h
 
@@ -6285,8 +6528,10 @@ Travis Jeffery: changed nextstep/templates/Info.plist.in
 
 Trent W. Buck: changed rcirc.el remember.el rx.el
 
-Trevor Murphy: changed eglot.el find-dired.el gnus.texi nnimap.el org.el
-  window.el
+Trevor Arjeski: changed erc.el gnus.el
+
+Trevor Murphy: changed window.el dispextern.h display.texi eglot.el
+  faces.el find-dired.el gnus.texi nnimap.el org.el xdisp.c xfaces.c
 
 Trevor Spiteri: changed progmodes/grep.el
 
@@ -6298,7 +6543,7 @@ Troels Henriksen: changed EGLOT-NEWS README.md eglot.el
 
 Troels Nielsen: changed process.c buffer.c progmodes/compile.el window.el
 
-Troy Brown: changed eglot.el
+Troy Brown: changed eglot.el align.el
 
 Troy Hinckley: changed progmodes/compile.el
 
@@ -6339,9 +6584,9 @@ Ulrich Leodolter: changed w32proc.c
 
 Ulrich Müller: changed configure.ac calc-units.el Makefile.in
   emacsclient-mail.desktop lib-src/Makefile.in src/Makefile.in version.el
-  bindings.el doctor.el emacs.1 files.el gamegrid.el gud.el
+  bindings.el calc-ext.el doctor.el emacs.1 files.el gamegrid.el gud.el
   language/cyrillic.el server.el strings.texi ChgPane.c ChgSel.c HELLO
-  INSTALL XMakeAssoc.c and 56 other files
+  INSTALL and 61 other files
 
 Ulrich Neumerkel: changed xterm.c
 
@@ -6350,8 +6595,8 @@ Ulrich Ölmann: changed misc.texi
 Ulrik Vieth: wrote meta-mode.el
 and changed files.el
 
-Umut Tuna Akgül: changed tabulated-list.el cal-julian-tests.el
-  cl-preloaded.el image-file.el parse-time.el rcirc.el
+Umut Tuna Akgül: changed rcirc.el tabulated-list.el cal-julian-tests.el
+  cl-preloaded.el image-file.el lisp-mode.el parse-time.el print-tests.el
 
 Ury Marshak: changed nsfns.m
 
@@ -6406,22 +6651,27 @@ and changed ob-sql.el org.el
 
 Viktor Slavkovikj: changed rmail.el
 
+Vili Aapro: changed elisp-mode.el
+
 Ville Skyttä: changed mh-comp.el pgg.el tcl.el
 
 Vincent Belaïche: wrote ses-tests.el
 and changed ses.el ses.texi 5x5.el calc-alg.el calc-vec.el calc.texi
   compilation.txt doc/translations/fr/misc/ses-fr.texi autotype.texi
   cal-tex.el calc-embed.el calc-help.el calc-misc.el calc.el
-  configure.bat floatfns.c macroexp.el org.el package.el
-  progmodes/compile.el recentf.el and 4 other files
+  configure.bat erc-scenarios-spelling.el ert-x-tests.el ert-x.el
+  ert.texi floatfns.c macroexp.el and 9 other files
 
 Vincent Bernat: changed gnus-int.el nnimap.el xsettings.c
 
 Vincent Del Vecchio: changed info.el mh-utils.el
 
-Vincenzo Pupillo: wrote php-ts-mode.el
-and changed js.el cmake-ts-mode.el typescript-ts-mode.el c-ts-mode.el
-  c-ts-common.el java-ts-mode.el Makefile.in
+Vincenzo Pupillo: wrote mhtml-ts-mode.el php-ts-mode.el
+and changed js.el c-ts-mode.el java-ts-mode.el c-ts-common.el
+  cmake-ts-mode.el typescript-ts-mode.el speedbar.el treesit.el
+  Makefile.in compilation.txt compile-tests.el css-mode.el frames.texi
+  html-ts-mode.el progmodes/compile.el progmodes/python.el speedbar.texi
+  sql.el treesit-admin.el yaml-ts-mode.el
 
 Vince Salvino: changed msdos.texi w32.c w32fns.c
 
@@ -6454,14 +6704,18 @@ Vladimir Alexiev: changed arc-mode.el nnvirtual.el tmm.el
 
 Vladimir Kazanov: wrote ert-font-lock-tests.el ert-font-lock.el
 and changed ert.texi broken.js correct.js display.texi frame.c java.srt
-  no-asserts.js text.texi xdisp.c
+  keyboard-tests.el no-asserts.js text.texi xdisp.c
 
 Vladimir Lomov: changed ox-html.el
 
-Vladimir Nikishkin: changed scm.el textmodes/table.el
+Vladimir Nikishkin: wrote ispell-aspell-tests.el ispell-hunspell-tests.el
+  ispell-international-ispell-tests.el ispell-tests-common.el
+  ispell-tests.el
+and changed fake-aspell-new.bash README fake-aspell.bash ispell.el
+  recentf.el scm.el test/Makefile.in textmodes/table.el
 
 Vladimir Panteleev: wrote bat-mode-tests.el
-and changed eglot.el ert.texi xselect.c bat-mode.el
+and changed eglot.el ert.texi xselect.c bat-mode.el sqlite-mode.el
 
 Vladimir Sedach: changed shell.el
 
@@ -6483,13 +6737,15 @@ Wenjamin Petrenko: changed files-x.el filesets.el
 
 Werner Benger: changed keyboard.c
 
+Werner Fink: changed seccomp-filter.c
+
 Werner Lemberg: wrote sisheng.el vntelex.el
 and co-wrote vnvni.el
 and changed TUTORIAL.de calc.texi chinese.el emacs.1 european.el
-  idlwave.el language/czech.el language/slovak.el lispref/Makefile.in
-  reftex-vars.el reftex.el reftex.texi supercite.el advice.el
-  calc-forms.el calc-sel.el calendar.el china-util.el cl-macs.el cl.texi
-  complete.el and 53 other files
+  language/czech.el language/slovak.el lispref/Makefile.in reftex-vars.el
+  reftex.el reftex.texi supercite.el advice.el calc-forms.el calc-sel.el
+  calendar.el china-util.el cl-macs.el cl.texi complete.el cperl-mode.el
+  and 51 other files
 
 Werner Meisner: changed lwlib-Xm.c
 
@@ -6526,6 +6782,8 @@ and changed url-handlers.el url-file.el url-methods.el url-vars.el
   url-ftp.el url-history.el url-irc.el url-misc.el url-parse.el
   url-privacy.el and 3 other files
 
+William O'Brien: changed go-ts-mode.el
+
 William Parsons: changed ange-ftp.el
 
 William Smith: changed strftime.c
@@ -6571,7 +6829,7 @@ and changed configure.ac gmalloc.c gnus-agent.el image-mode.el man.el
 
 Wolfgang Lux: changed nsterm.m keyboard.c
 
-Wolfgang Rupprecht: wrote float-sup.el floatfns.c sup-mouse.el
+Wolfgang Rupprecht: wrote float-sup.el floatfns.c
 and changed process.c alloc.c callint.c config.in configure.ac data.c
   fns.c lisp-mode.el lisp.h loadup.el lread.c net-utils.el nntp.el
   print.c sort.el
@@ -6591,15 +6849,12 @@ Xavier Maillard: changed gnus-faq.texi gnus-score.el mh-utils.el spam.el
 
 Xiaoyue Chen: changed esh-proc.el
 
-Xie Qi: changed simple.el dired.el customize.texi display.texi
-  functions.texi keymap.el loading.texi progmodes/python.el xdisp.c
-
 Xi Lu: changed etags.c htmlfontify.el ruby-mode.el CTAGS.good_crlf
   CTAGS.good_update Makefile TUTORIAL.cn crlf eww.el filesets.el
   man-tests.el man.el shortdoc.el tramp-sh.el
 
-Xiyue Deng: changed emacs-lisp-intro.texi strings.texi functions.texi
-  smtpmail.el symbols.texi
+Xiyue Deng: changed emacs-lisp-intro.texi strings.texi smtpmail.el
+  functions.texi package.el package.texi symbols.texi
 
 Xuan Wang: changed warnings.el
 
@@ -6635,14 +6890,14 @@ Yasuoka Masahiko: changed configure.ac
 
 Yasushi Shoji: changed org-clock.el org.texi ox-ascii.el
 
-Yavor Doganov: changed configure.ac Makefile.in emacs.1 etags.1 make-dist
-  nsfont.m
+Yavor Doganov: changed configure.ac nsterm.m Makefile.in emacs.1 etags.1
+  image.c make-dist nsfont.m nsimage.m pdumper.c
 
 Ye Qianchuan: changed descr-text.el
 
 Yichao Yu: changed pgtkim.c pgtkterm.c pgtkterm.h xfns.c xterm.c
 
-Yikai Zhao: changed memory-report.el sh-script.el
+Yikai Zhao: changed memory-report.el project.el sh-script.el
 
 Yilkal Argaw: changed manoj-dark-theme.el
 
@@ -6670,10 +6925,10 @@ and changed fontset.el message.el nnheader.el nnmail.el
 Your Name: changed configure.ac
 
 Yuan Fu: changed treesit.el treesit.c c-ts-mode.el parsing.texi
-  treesit-tests.el progmodes/python.el modes.texi js.el indent.erts
-  treesit.h typescript-ts-mode.el c-ts-common.el css-mode.el
-  java-ts-mode.el rust-ts-mode.el go-ts-mode.el print.c sh-script.el
-  configure.ac csharp-mode.el gdb-mi.el and 79 other files
+  treesit-tests.el progmodes/python.el modes.texi js.el c-ts-common.el
+  typescript-ts-mode.el indent.erts treesit.h java-ts-mode.el
+  rust-ts-mode.el css-mode.el go-ts-mode.el sh-script.el configure.ac
+  csharp-mode.el treesit-admin.el cmake-ts-mode.el and 88 other files
 
 Yuanle Song: changed rng-xsd.el
 
@@ -6681,7 +6936,9 @@ Yuchen Pei: changed calendar.texi diary-lib.el icalendar-tests.el
 
 Yue Daian: wrote cl-font-lock.el
 
-Yue Yi: changed peg.texi
+Yue Yi: changed peg.texi sqlite-mode.el w32.c w32.h w32proc.c
+
+Yuhei Kikuchi: changed editorconfig-core-handle.el
 
 Yu-ji Hosokawa: changed README.W32
 
@@ -6713,18 +6970,23 @@ Yuuki Harano: changed pgtkterm.c pgtkfns.c pgtkterm.h gtkutil.c
 Yuya Nishihara: changed vc-hooks.el
 
 Yuzhana Ego: changed custom.texi diff-mode.el emacs-lisp-intro.texi
-  info.el
+  info.el css-mode.el
 
 Yves Baumes: changed package.el
 
 Zachary Kanfer: changed org.el cus-edit.el files.el files.texi keyboard.c
   newcomment.el simple.el
 
+Zach Shaftel: changed bytecomp-tests.el bytecomp.el gv.el print.c
+  profiler-tests.el profiler.c
+
 Zajcev Evgeny: changed display.texi image.c battery.el buffer.c
   dispextern.h fileio.c lread.c svg.el window.el xdisp.c
 
 Zaz Brown: changed misc.el
 
+Zeke Dou: changed emacs.c
+
 Zhang Wei: changed chinese.el characters.el mule-cmds.el xfns.c erc.el
   faces.el fontset.el mm-util.el mule.el org-publish.el rfc2047.el
   x-win.el
@@ -6733,7 +6995,7 @@ Zhang Weize: wrote ob-plantuml.el
 
 Zhehao Lin: changed xfaces.c
 
-Zhengyi Fu: changed bookmark.el
+Zhengyi Fu: changed bookmark.el executable.el
 
 Zhiwei Chen: changed hideif.el
 
@@ -6755,10 +7017,14 @@ and changed fontset.el HELLO language/indian.el quail/indian.el loadup.el
   IdnaMappingTable.txt NormalizationTest.txt PropertyValueAliases.txt
   ScriptExtensions.txt Scripts.txt SpecialCasing.txt UnicodeData.txt
   characters.el confusables.txt copyright.html emoji-data.txt
-  emoji-sequences.txt and 7 other files
+  emoji-sequences.txt and 8 other files
 
 উৎসব রায়: changed quail/indian.el
 
+谢骐 Xie Qi: changed simple.el dired.el files.el customize.texi
+  display.texi functions.texi keymap.el loading.texi progmodes/python.el
+  xdisp.c
+
 Local Variables:
 mode: emacs-authors
 coding: utf-8

From 8d0bf280a64a96deec4e4bf62bf36af7b42d2f4a Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 7 May 2026 20:14:12 +0100
Subject: [PATCH 381/463] ; * ChangeLog.5: Some fixes and tidying up.

---
 ChangeLog.5 | 151 ++--------------------------------------------------
 1 file changed, 4 insertions(+), 147 deletions(-)

diff --git a/ChangeLog.5 b/ChangeLog.5
index ff0d0aebc80..c20a552f2c5 100644
--- a/ChangeLog.5
+++ b/ChangeLog.5
@@ -5193,31 +5193,6 @@
 	dimensions to real values.
 	(Fimage_transforms_p): Fix typo.
 
-2026-03-04  Michael Albinus  <michael.albinus@gmx.de>
-
-	Revert "Repair serious breakage in the batch tests."
-
-	This reverts commit feac53141577161c32a7a6dfe75399a5ae98a7c1.
-
-	This patch has deactivated 253 test cases without a sufficient reasoning.
-	Instead it speaks about a shotgun in its commite message.
-
-	The patch is reverted because
-
-	- It hasn't been discussed on emacs-devel. It should have, because it is
-	  a serious change in our infrastructure (new official tag :nobatch). Any
-	  documentation of this change, for example in test/README, is missing.
-
-	- The proper way to deactivate such tests would have been
-
-	  (skip-when noninteractive)
-
-	  Even better to skip for the respective reasons.
-
-	- There is no fault report. There is no information about how these tests
-	  have failed. Since it hasn't been a problem so far for us, nobody will
-	  work on a fix forever.
-
 2026-03-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	(flymake-start): Give a bit more info in the log
@@ -5254,14 +5229,6 @@
 	* lisp/frame.el (frame--purify-parameters):
 	'frame-inherited-parameters' is a parameter list, not an alist.
 
-2026-03-03  Mattias Engdegård  <mattias.engdegard@gmail.com>
-
-	Revert "Rename 'any' to 'member-if' and deprecate 'cl-member-if'"
-
-	This reverts commit 2bdf15f6d8293b21234cd236f39ce68f62e1f6c3.
-
-	There is no consensus for this change.
-
 2026-03-03  Mattias Engdegård  <mattias.engdegard@gmail.com>
 
 	Faster JSON string serialisation (bug#80529)
@@ -5324,22 +5291,6 @@
 	* lisp/vc/vc.el (vc-print-change-log, vc-print-root-change-log):
 	Respect vc-log-show-limit when there is no prefix argument (bug#80532).
 
-2026-03-03  Sean Whitton  <spwhitton@spwhitton.name>
-
-	Rename 'any' to 'member-if' and deprecate 'cl-member-if'
-
-	* lisp/subr.el (any): Rename from this ...
-	(member-if): ... to this.  All uses changed.
-	Implement '&key KEY-FN' for backwards compatibility.
-	(any): New function alias.
-	* lisp/emacs-lisp/cl-seq.el (cl-member-if): Make an alias for
-	'member-if'.
-	* lisp/obsolete/cl.el (member-if): Delete obsolete function
-	alias.
-	* doc/lispref/lists.texi (List Elements):
-	* doc/misc/cl.texi (Lists as Sets):
-	* etc/NEWS: Document the change.
-
 2026-03-03  Sean Whitton  <spwhitton@spwhitton.name>
 
 	dired-diff: Fix default input in inserted subdirectory
@@ -5816,20 +5767,6 @@
 	indentation rules in other TS modes for embedding C/++ segments
 	in other languages.
 
-2026-02-26  Eric S. Raymond  <esr@thyrsus.com>
-
-	Repair another test bollixed by aggressive optimization.
-
-	Repair ab ecal test by making a variable kexical,
-
-	Complete the test set for floatfns,c.
-
-	Tesrts for the portable primitives in fileio.c.
-
-	Tests for primitives in coding.c and charset.c.
-
-	Tests for primitives from the character.c module.
-
 2026-02-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	lisp/vc/smerge-mode.el (smerge-refine-shadow-cursor): Make it thinner
@@ -5843,67 +5780,6 @@
 	because it's occasionally bad enough that it's unclear which
 	cursor is the real one.
 
-2026-02-26  Eric S. Raymond  <esr@thyrsus.com>
-
-	Tests for the lreaf.c amd print.c primitives.
-
-2026-02-25  Eric S. Raymond  <esr@thyrsus.com>
-
-	Tests for remaining functions iun eval.c.
-
-	Completing test coverage for dataa.c orimitives.
-
-	More correctness tesrs for orinitives from fns.c.
-
-	More tests for edit functions, buffers, and markers.
-
-	Added more buffer/marker/editing test coverage.
-
-	Category/charset/coding + char-table tests.
-
-	More test coverage improvements.
-
-2026-02-25  Eric S. Raymond  <esr@thyrsus.com>
-
-	Repair serious breakage in the batch tests.
-
-	There were a bunch of tests that were breaking make check and should
-	never be run in batch mode, because they do things like assuming there
-	is a controlling tty or assuming we can access network services when
-	we can't (e/g. in a CI/CD environment). I have shotgunned this
-	problem by tagging all the failing tests with :nobatch and then
-	changing the default and expensive selectors so make check won't barf
-	all over its shoes.
-
-	As many of these :nobatch should be individually removed as possible, after
-	upgrading the test harness to mock the environmental stuff they need.
-	Investigate these failures with "make check-nobatch".
-
-2026-02-25  Eric S. Raymond  <esr@thyrsus.com>
-
-	More test coverage improvements.
-
-	Bignum corner-case tests in data-tests.el.
-	More buffer-primitive tests in editfns-test.el
-	Some condition-case tesrs in eval-tests.el.
-	And another marker-primitive test in marker-tests.el.
-
-2026-02-25  Eric S. Raymond  <esr@thyrsus.com>
-
-	More test coverage improvements for ERT.
-
-	In marker-tests.el, editfbs-tests.el, and data-tests.el.
-
-2026-02-25  Eric S. Raymond  <esr@thyrsus.com>
-
-	Crrections to tedt coverrage extensuion after bootstrap build.
-
-	Files: data-tests.el, editfns-tests.el.
-
-2026-02-25  Eric S. Raymond  <esr@thyrsus.com>
-
-	Improve test coverage of builtin predicates.
-
 2026-02-25  Sean Whitton  <spwhitton@spwhitton.name>
 
 	New function multiple-command-partition-arguments
@@ -5924,25 +5800,6 @@
 	Don't autoload the `treesit-language-source-alist` setting.
 	Generate simpler code for the common case where AUTO-MODE is a string.
 
-2026-02-25  Eric S. Raymond  <esr@thyrsus.com>
-
-	Tests for 2 marker primitives previously not covered.
-
-	      - insertion-type
-	      - last-position-after-kill
-
-2026-02-25  Eric S. Raymond  <esr@thyrsus.com>
-
-	Tests for 7 editor primitives previously not covered.
-
-	      - byte-to-position
-	      - byte-to-string
-	      - insert-byte
-	      - insert-buffer-substring
-	      - insert-before-markers-and-inherit
-	      - field-string-and-delete
-	      - constrain-to-field
-
 2026-02-25  Liu Hui  <liuhui1610@gmail.com>
 
 	calendar-check-holidays: Call calendar-increment-month
@@ -17182,10 +17039,10 @@
 
 2025-11-10  Sean Whitton  <spwhitton@spwhitton.name>
 
-	vc-do-command: Support discarding standard error
+	vc-do-command: Support discarding stdout and stderr
 
 	* lisp/vc/vc-dispatcher.el (vc-do-command): Support discarding
-	standard error.
+	standard output and standard error.
 	* lisp/vc/vc-hg.el (vc-hg-dir-status-files): Discard standard
 	error of 'hg status' to avoid parsing mistakes.
 	(vc-hg-command): Update docstring given new meaning of first
@@ -25520,7 +25377,7 @@
 
 2025-07-25  Sean Whitton  <spwhitton@spwhitton.name>
 
-	VC: New support for other working trees
+	VC: New support for other working trees (bug#79024)
 
 	* lisp/vc/vc-git.el (vc-git--read-start-point): New function,
 	factored out of vc-git-create-tag.
@@ -36502,7 +36359,7 @@
 
 	* lisp/vc/log-edit.el (log-edit-mode): Don't add rear-nonsticky
 	to font-lock-extra-managed-props (bug#77197).  Investigated by
-	Paul D. Nelson <ultrano@gmail.com>.  Fix due to Stefan Monnier.
+	Paul D. Nelson <ultrono@gmail.com>.  Fix due to Stefan Monnier.
 
 2025-03-23  Stefan Kangas  <stefankangas@gmail.com>
 

From 48b064a2aa3bb25137c31aac9994cd2d36fe71c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Thu, 7 May 2026 22:06:45 +0100
Subject: [PATCH 382/463] Fix 'vc-dir-resynch-file' again (bug#80967)

This unbreak project-vc-dir for dirs under non-truename
hierarchies.

The following commit presumably makes 'M-x vc-dir' usable again
for versioned directories inside non-truename hierarchies,

   commit e05fab5775c96f8f88eab8d75dea40253bfb78eb
   Author: Stephen Berman <stephen.berman@gmx.net>
   Date:   Sat May 2 15:11:37 2026 +0200

       Fix 'vc-dir-resynch-file' (bug#80803)

       * lisp/vc/vc-dir.el (vc-dir-resynch-file): Apply 'file-truename'
       instead of 'expand-file-name' to FNAME argument to prevent
       spurious display of symlinked files in *vc-dir* buffer.

However the similar command 'M-x project-vc-dir' was broken and made
unusable in similar circumstances.

This relatively simple fix addresses both situations touching only the
problematic 'vc-resynch-file' and one of its callees,
'vc-dir-recompute-file-state', which now discerns clearly between the
short/familiar name to present in the list and the "fname" to use to
call into the backend to gather the VC state.  Since this function is
also called from another context, where the requirements are less clear,
keeping current smenatics in that situation seemed prudent, so the new
behaviour is activate with a new optional parameter.

* lisp/vc/vc-dir.el (vc-dir-resynch-file): Call
vc-dir-recompute-file-state with truename=t.
(vc-dir-recompute-file-state): Accept optional truename param.
---
 lisp/vc/vc-dir.el | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 21658312a13..3c9222d725f 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -1261,8 +1261,12 @@ that file."
 	     (vc-dir-fileinfo->state crt-data)) result))
     (nreverse result)))
 
-(defun vc-dir-recompute-file-state (fname def-dir)
-  (let* ((file-short (file-relative-name fname def-dir))
+(defun vc-dir-recompute-file-state (fname def-dir &optional truename)
+  "Compute state of FNAME known to live inside DEF-DIR.
+If TRUENAME is non-nil, FNAME is a truename, DEF-DIR not necessarily."
+  (let* ((file-short (file-relative-name
+                      fname (if truename (file-truename def-dir) def-dir)))
+         (fname (if truename (expand-file-name file-short def-dir) fname))
 	 (_remove-me-when-CVS-works
 	  (when (eq vc-dir-backend 'CVS)
 	    ;; FIXME: Warning: UGLY HACK.  The CVS backend caches the state
@@ -1330,7 +1334,11 @@ that file."
 		      (vc-dir-resync-directory-files file)
 		      (ewoc-set-hf vc-ewoc
 				   (vc-dir-headers vc-dir-backend ddir) ""))
-                  (let* ((complete-state (vc-dir-recompute-file-state file ddir))
+                  (let* ((complete-state
+                          ;; Make sure 'vc-dir-recompute-file-state'
+                          ;; knows about the truename nature of 'file'
+                          ;; (bug#80967).
+                          (vc-dir-recompute-file-state file ddir t))
 			 (state (cadr complete-state)))
                     (vc-dir-update
                      (list complete-state)

From 060451d6e0b3c91882c62ae1a574125c1f448487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Marks?= <shipmints@gmail.com>
Date: Thu, 30 Apr 2026 15:34:23 -0400
Subject: [PATCH 383/463] treesit-explore-mode usability improvements
 (bug#80935)

Improve the usability of treesit-explore-mode.

- Prompt for the primary parser first, if there is one, rather
than the first in the list reported by 'treesit-parser-list'.
Previously, in a multi-parser buffer like 'markdown-ts-mode', one
had to hunt for the primary parser.

- Kill the tree buffer and its window if the source buffer is
killed or 'treesit-explore-mode'.  Previously, when
'treesit-explore-mode' is disabled in the source buffer, its
companion explorer tree buffer was left dangling and window
open (with an unrelated buffer).

- Improve 'treesit--explorer-refresh-1' to recenter the window
around the selected nodes when the selected region in the source
buffer changes.  Previously, one had to navigate manually to find
the corresponding highlighted node in the tree window which may
be far away from that the source buffer's region represents.

- Disable 'treesit-explore-mode' in the source buffer if its
companion tree buffer is killed.  Previously,
'treesit-explore-mode' remained active in the source buffer in
an effectively unusable state.

- Disable 'treesit-explore-mode' if the user quits
'completing-read' in 'treesit-explorer-switch-parser' when
enabling the mode.  Previously, 'treesit-explore-mode' was left
enabled after quit.

- New command to switch back and forth between the source buffer
and tree buffer windows to make navigating more convenient.
Previously, in a multi-window frame, one had to navigate to/from
these two related windows in a more cumbersome way.

- New command to quit 'treesit-explore-mode' and
'treesit--explorer-tree-mode' and handle buffer and window
cleanup.

* lisp/treesit.el (treesit--explorer-refresh-1): Recenter the
window, if amenable, to the node selected in the source buffer.
(treesit--explorer-kill-explorer-buffer): Remove function.
(treesit--explorer-generate-parser-alist): Prioritize the
primary parser, if there is one.
(treesit--explorer-tree-mode-cleanup): New defun.
(treesit-explore-quit): New command.
(treesit-explorer-tree-window): New defun.
(treesit-explorer-source-buffer-window): New defun.
(treesit-explore-mode-map): Revise key bindings.
(treesit--explorer-tree-mode-map): Revise key bindings.
(treesit--explorer-tree-mode): New keymap.
(treesit-explorer-switch-parser): Add a default to
completing-read.
(treesit-explore-mode): Guard completing read quit.  Wire up the
new cleanup functions.
---
 lisp/treesit.el | 151 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 114 insertions(+), 37 deletions(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 01e82b56bb8..5253439a9dd 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -5035,6 +5035,10 @@ in the region."
               (while (and (null (pos-visible-in-window-p pos window))
                           (= (forward-line 4) 0))
                 (set-window-start window (point))))
+            ;; Recenter if amenable.
+            (when (< scroll-conservatively 101)
+              (with-selected-window window
+                (recenter)))
             (set-window-point window pos)))))))
 
 (defun treesit--explorer-refresh ()
@@ -5197,11 +5201,6 @@ leaves point at the end of the last line of NODE."
       (when (not named)
         (overlay-put ov 'face 'treesit-explorer-anonymous-node)))))
 
-(defun treesit--explorer-kill-explorer-buffer ()
-  "Kill the explorer buffer of this buffer."
-  (when (buffer-live-p treesit--explorer-buffer)
-    (kill-buffer treesit--explorer-buffer)))
-
 (defun treesit--explorer-generate-parser-alist ()
   "Return an alist of (PARSER-NAME . PARSER) for relevant parsers.
 Relevant parsers include all global parsers and local parsers that
@@ -5210,7 +5209,12 @@ covers point.  PARSER-NAME are unique."
          (local-parsers-at-point
           (treesit-local-parsers-at (point)))
          res)
-    (dolist (parser (treesit-parser-list nil nil t))
+    ;; Add `treesit-primary-parser' first in the list, if populated.
+    (dolist (parser (delete-dups
+                     (delq nil
+                           (append
+                            (list treesit-primary-parser)
+                            (treesit-parser-list nil nil t)))))
       ;; Exclude local parsers that doesn't cover point.
       (when (or (memq parser local-parsers-at-point)
                 (not (memq parser local-parsers)))
@@ -5230,20 +5234,68 @@ covers point.  PARSER-NAME are unique."
               res)))
     (nreverse res)))
 
+(defun treesit--explorer-tree-mode-cleanup ()
+  "Clean up `treesit--explorer-tree-mode'.
+If called from the source buffer, quit the tree buffer window and kill
+the explorer buffer.
+If called from the explorer tree buffer, disable `treesit-explore-mode'
+in the source buffer, quit the tree window and kill its buffer."
+  (cond
+   ;; Called from the source buffer.
+   ((buffer-live-p treesit--explorer-buffer)
+    (when (window-live-p (get-buffer-window treesit--explorer-buffer))
+      (let ((buf treesit--explorer-buffer))
+        (with-selected-window (get-buffer-window treesit--explorer-buffer)
+          (quit-window))
+        (kill-buffer buf))))
+   ;; Called from the tree buffer.
+   ((buffer-live-p treesit--explorer-source-buffer)
+    (with-current-buffer treesit--explorer-source-buffer
+      (treesit-explore-mode -1))
+    (when (window-live-p (get-buffer-window (current-buffer)))
+      (with-selected-window (get-buffer-window (current-buffer))
+        (quit-window 'kill))))))
+
+(defun treesit-explorer-tree-window-select ()
+  "Select the `treesit--explorer-buffer' window.
+Invoke this command from the source window."
+  (interactive)
+  (if (buffer-live-p treesit--explorer-buffer)
+      (select-window (get-buffer-window treesit--explorer-buffer))
+    (user-error "The `treesit-explorer-mode' tree buffer does not exist")))
+
+(defun treesit-explorer-source-buffer-window-select ()
+  "Select the `treesit--explorer-buffer' window.
+Invoke this command from the tree window."
+  (interactive)
+  (if (buffer-live-p treesit--explorer-source-buffer)
+      (select-window (get-buffer-window treesit--explorer-source-buffer))
+    (user-error "The `treesit-explorer-mode' source buffer does not exist")))
+
+(defvar-keymap treesit-explore-mode-map
+  :doc "Keymap for the treesit explore mode."
+  "C-c C-t o" #'treesit-explorer-tree-window-select
+  "C-c C-t q" #'treesit-explore-quit)
+
 (defvar-keymap treesit--explorer-tree-mode-map
   :doc "Keymap for the treesit tree explorer.
-
 Navigates from button to button."
   :parent special-mode-map
-  "n" #'forward-button
-  "p" #'backward-button
-  "TAB" #'forward-button
-  "<backtab>" #'backward-button)
+  "n"         #'forward-button
+  "p"         #'backward-button
+  "q"         #'treesit-explore-quit
+  "TAB"       #'forward-button
+  "<backtab>" #'backward-button
+  "C-c C-t o" #'treesit-explorer-source-buffer-window-select
+  "C-c C-t q" #'treesit-explore-quit)
 
 (define-derived-mode treesit--explorer-tree-mode special-mode
   "TS Explorer"
   "Mode for displaying syntax trees for `treesit-explore-mode'."
-  nil)
+  ;; Clean up `treesit--explorer-tree-mode' when the tree buffer is
+  ;; killed.
+  (add-hook 'kill-buffer-hook
+            #'treesit--explorer-tree-mode-cleanup 0 t))
 
 (defun treesit-explorer-switch-parser (parser)
   "Switch explorer to use PARSER."
@@ -5252,8 +5304,14 @@ Navigates from button to button."
                  (treesit--explorer-generate-parser-alist))
                 (parser-name (if (= (length parser-alist) 1)
                                  (car parser-alist)
+                               ;; Default to the first parser in the
+                               ;; list which we hope is
+                               ;; `treesit-primary-parser'.
                                (completing-read
-                                "Parser: " (mapcar #'car parser-alist)))))
+                                "Parser: "
+                                (mapcar #'car parser-alist)
+                                nil t nil nil
+                                (caar parser-alist)))))
            (alist-get parser-name parser-alist
                       nil nil #'equal))))
   (unless treesit-explore-mode
@@ -5262,7 +5320,9 @@ Navigates from button to button."
   (display-buffer treesit--explorer-buffer
                   (cons nil '((inhibit-same-window . t))))
   (setq-local treesit--explorer-last-node nil)
-  (treesit--explorer-refresh))
+  (treesit--explorer-refresh)
+  ;; Signal that `completing-read' did not quit.
+  t)
 
 (define-minor-mode treesit-explore-mode
   "Enable exploring the current buffer's syntax tree.
@@ -5281,33 +5341,41 @@ window."
                                (buffer-name))))
           (with-current-buffer treesit--explorer-buffer
             (treesit--explorer-tree-mode)))
-        ;; Select parser.
-        (call-interactively #'treesit-explorer-switch-parser)
-        ;; Set up variables and hooks.
-        (add-hook 'post-command-hook
-                  #'treesit--explorer-post-command 0 t)
-        (add-hook 'kill-buffer-hook
-                  #'treesit--explorer-kill-explorer-buffer 0 t)
-        ;; Tell `desktop-save' to not save explorer buffers.
-        (when (boundp 'desktop-modes-not-to-save)
-          (unless (memq 'treesit--explorer-tree-mode
-                        desktop-modes-not-to-save)
-            (push 'treesit--explorer-tree-mode
-                  desktop-modes-not-to-save)))
-        ;; Tell `desktop-save' to not save this minor mode
-        ;; that might disrupt loading the desktop
-        ;; with the prompt to select a parser.
-        (when (boundp 'desktop-minor-mode-table)
-          (unless (member '(treesit-explore-mode nil)
-                          desktop-minor-mode-table)
-            (push '(treesit-explore-mode nil)
-                  desktop-minor-mode-table))))
+        ;; Select parser.  `treesit-explorer-switch-parser' will return
+        ;; t if its `completing-read' did not quit.
+        (if (not (condition-case _
+                     (call-interactively #'treesit-explorer-switch-parser)
+                   (quit)))
+            (setq treesit-explore-mode nil)
+          ;; Track the `treesit--explorer-source-buffer' active region.
+          (add-hook 'post-command-hook
+                    #'treesit--explorer-post-command 0 t)
+          ;; Clean up when the `treesit-explore-mode' buffer is killed.
+          (add-hook 'kill-buffer-hook
+                    #'treesit--explorer-tree-mode-cleanup 0 t)
+          ;; Tell `desktop-save' to not save explorer buffers.
+          (when (boundp 'desktop-modes-not-to-save)
+            (unless (memq 'treesit--explorer-tree-mode
+                          desktop-modes-not-to-save)
+              (push 'treesit--explorer-tree-mode
+                    desktop-modes-not-to-save)))
+          ;; Tell `desktop-save' to not save this minor mode
+          ;; that might disrupt loading the desktop
+          ;; with the prompt to select a parser.
+          (when (boundp 'desktop-minor-mode-table)
+            (unless (member '(treesit-explore-mode nil)
+                            desktop-minor-mode-table)
+              (push '(treesit-explore-mode nil)
+                    desktop-minor-mode-table)))))
     ;; Turn off explore mode.
     (remove-hook 'post-command-hook
                  #'treesit--explorer-post-command t)
     (remove-hook 'kill-buffer-hook
-                 #'treesit--explorer-kill-explorer-buffer t)
-    (treesit--explorer-kill-explorer-buffer)))
+                 #'treesit--explorer-tree-mode-cleanup t)
+    ;; Clean up if the user disables `treesit-explore-mode' interactively; e.g.,
+    ;; via M-x while leaving the source buffer alive.
+    (when (called-interactively-p 'any)
+      (treesit--explorer-tree-mode-cleanup))))
 
 (defun treesit-explore ()
   "Show the explorer."
@@ -5317,6 +5385,15 @@ window."
       (display-buffer treesit--explorer-buffer '(nil (inhibit-same-window . t)))
     (treesit-explore-mode)))
 
+(defun treesit-explore-quit ()
+  "Quit and clean up `treesit-explore-mode'.
+Invoke this command from the source buffer or its tree buffer."
+  (interactive)
+  ;; Called from the source buffer.
+  (when (buffer-live-p treesit--explorer-buffer)
+    (treesit-explore-mode -1))
+  (treesit--explorer-tree-mode-cleanup))
+
 ;;; Install & build language grammar
 
 (defvar treesit-language-source-alist nil

From 730d3884dc3ee540c3d68f64edffa35cb5561f34 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 8 May 2026 09:51:13 +0300
Subject: [PATCH 384/463] ; Fix the build broken by a typo in configure.ac

* configure.ac (module_env_snippet_32): Fix typo.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 6c45f2ccb48..9832ef2f7ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5108,7 +5108,7 @@ module_env_snippet_28="$srcdir/src/module-env-28.h"
 module_env_snippet_29="$srcdir/src/module-env-29.h"
 module_env_snippet_30="$srcdir/src/module-env-30.h"
 module_env_snippet_31="$srcdir/src/module-env-31.h"
-module_env_snippet_31="$srcdir/src/module-env-32.h"
+module_env_snippet_32="$srcdir/src/module-env-32.h"
 emacs_major_version=`AS_ECHO([$PACKAGE_VERSION]) | sed 's/[[.]].*//'`
 AC_SUBST([emacs_major_version])
 

From 5e0b4b96bc5ad23ca8d7fad4595e465eef69bf96 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 8 May 2026 10:47:26 +0200
Subject: [PATCH 385/463] ; Adapt files in admin/notes for emacs-31 branch

* admin/notes/emba: Mention scheduled pipelines.

* admin/notes/git-workflow: Adapt for emacs-31 branch.
---
 admin/notes/emba         | 4 ++++
 admin/notes/git-workflow | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/admin/notes/emba b/admin/notes/emba
index 4bf6f3a9c76..83688e7287b 100644
--- a/admin/notes/emba
+++ b/admin/notes/emba
@@ -76,6 +76,10 @@ Every pipeline generates a JUnit test report for the respective test
 jobs, which can be inspected on the pipeline web page.  This test
 report counts completed ERT tests, aborted tests are not counted.
 
+Twice a day, a pipeline for branch 'master', and another pipeline for
+branch 'emacs-31' are started automatically, running all stages for
+normal and expensive tests.
+
 * Emba configuration
 
 The emba configuration files are hosted on
diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow
index 8e7d597db17..a1d4044df77 100644
--- a/admin/notes/git-workflow
+++ b/admin/notes/git-workflow
@@ -16,14 +16,14 @@ Initial setup
 
 Then we want to clone the repository.  We normally want to have both
 the current master and (if there is one) the active release branch
-(eg emacs-30).
+(eg emacs-31).
 
 mkdir ~/emacs
 cd ~/emacs
 git clone <membername>@git.sv.gnu.org:/srv/git/emacs.git master
 cd master
 git config push.default current
-git worktree add ../emacs-30 emacs-30
+git worktree add ../emacs-31 emacs-31
 
 You now have both branches conveniently accessible, and you can do
 "git pull" in them once in a while to keep updated.
@@ -67,7 +67,7 @@ which will look like
 
 commit 958b768a6534ae6e77a8547a56fc31b46b63710b
 
-cd ~/emacs/emacs-30
+cd ~/emacs/emacs-31
 git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b
 
 and add "Backport:" to the commit string.  Then
@@ -109,7 +109,7 @@ up-to-date by doing a pull.  Then start Emacs with
   emacs -l admin/gitmerge.el -f gitmerge
 
 You'll be asked for the branch to merge, which will default to
-(eg) 'origin/emacs-30', which you should accept.  Merging a local tracking
+(eg) 'origin/emacs-31', which you should accept.  Merging a local tracking
 branch is discouraged, since it might not be up-to-date, or worse,
 contain commits from you which are not yet pushed upstream.
 

From f94637749a26d12892c1044483350fbe43d048f5 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dmitry@gutov.dev>
Date: Fri, 8 May 2026 12:25:49 +0100
Subject: [PATCH 386/463] vc-switch-working-tree: Use project-current again

* lisp/vc/vc.el (vc-switch-working-tree): Use project-current
instead of manually constructing VC project objects.
---
 lisp/vc/vc.el | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 4ecfb2d1e98..4a6ae7e4290 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -5789,14 +5789,11 @@ to the root of this working tree."
   (let ((backend (or (vc-deduce-backend)
                      (vc-responsible-backend default-directory)
                      (error "No VC backend"))))
-    ;; Manually construct VC project objects because `project-current'
-    ;; might find a non-VC project within the VC working tree containing
-    ;; DIRECTORY, but we should ignore that (bug#80939).
+    ;; Skip to the VC root, otherwise `project-current' could find a
+    ;; non-VC project between DEFAULT-DIRECTORY and there (bug#80939).
     (funcall project-find-matching-buffer-function
-             `(vc ,backend ,(vc-root-dir backend))
-             `(vc ,backend
-                  ,(let ((default-directory directory))
-                     (vc-root-dir backend))))))
+             (project-current nil (vc-root-dir backend))
+             (project-current nil directory))))
 
 ;;;###autoload
 (defun vc-working-tree-switch-project (dir)

From 69c50dcb47338f178758e30d59d7346a4512a3a4 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Fri, 8 May 2026 12:27:24 +0100
Subject: [PATCH 387/463] ; package-activate-all: Drop requiring package now
 not preloaded.

---
 lisp/emacs-lisp/package-activate.el | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/lisp/emacs-lisp/package-activate.el b/lisp/emacs-lisp/package-activate.el
index d79628b172b..53a3fa30836 100644
--- a/lisp/emacs-lisp/package-activate.el
+++ b/lisp/emacs-lisp/package-activate.el
@@ -451,15 +451,13 @@ The variable `package-load-list' controls which packages to load."
                    (setq package-activated-list nil))
                  (load qs nil 'nomessage)
                  t)))
-        (progn
-          (require 'package)
-          ;; Silence the "unknown function" warning when this is compiled
-          ;; inside `loaddefs.el'.
-          ;; FIXME: We use `with-no-warnings' because the effect of
-          ;; `declare-function' is currently not scoped, so if we use
-          ;; it here, we end up with a redefinition warning instead :-)
-          (with-no-warnings
-            (package--activate-all))))))
+        ;; Silence the "unknown function" warning when this is compiled
+        ;; inside `loaddefs.el'.
+        ;; FIXME: We use `with-no-warnings' because the effect of
+        ;; `declare-function' is currently not scoped, so if we use
+        ;; it here, we end up with a redefinition warning instead :-)
+        (with-no-warnings
+          (package--activate-all)))))
 
 (defun package--activate-all ()
   (dolist (elt (package--alist))

From 2d496b842d6c6f2a6eb0ca891e00396caedb5178 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Fri, 8 May 2026 13:47:52 +0100
Subject: [PATCH 388/463] ; Fix Gregor Schmid's attribution for lua-mode.el.

---
 etc/AUTHORS                | 44 ++++++++++++++++++++------------------
 lisp/progmodes/lua-mode.el |  8 +++----
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/etc/AUTHORS b/etc/AUTHORS
index 4547a4c618d..ab4abbfc62b 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -977,7 +977,7 @@ and co-wrote longlines.el tango-dark-theme.el tango-theme.el
 and changed simple.el display.texi xdisp.c files.el frames.texi
   cus-edit.el files.texi custom.el subr.el text.texi faces.el keyboard.c
   startup.el package.el misc.texi emacs.texi modes.texi mouse.el
-  custom.texi image.c window.el and 903 other files
+  custom.texi image.c window.el and 920 other files
 
 Chris Chase: co-wrote idlw-shell.el idlwave.el
 
@@ -1439,7 +1439,7 @@ and changed cedet/semantic.el db.el insert.el semantic/complete.el c.by
   c.el db-el.el db-file.el db-find.el ede-grammar.el eieio-opt.el
   eieio.el eieio.texi gnus.texi registry.el srecode/compile.el
   wisent/python.el analyze.el bovine/el.el bovine/grammar.el
-  decorate/mode.el and 87 other files
+  decorate/mode.el and 88 other files
 
 Davide Pola: changed comp-cstr.el comp-run.el
 
@@ -1811,7 +1811,7 @@ 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 configure.ac emacs.c text.texi w32term.c
   dispnew.c frames.texi files.texi w32proc.c xfaces.c process.c window.c
-  dispextern.h and 1437 other files
+  dispextern.h and 1451 other files
 
 Eliza Velasquez: changed server.el simple.el
 
@@ -1914,7 +1914,7 @@ and changed c.srt ede.texi info.el rmail.el speedbspec.el  cedet.el
   ede-autoconf.srt ede-make.srt eieio.texi gud.el sb-dir-minus.xpm
   sb-dir-plus.xpm sb-dir.xpm sb-mail.xpm sb-pg-minus.xpm sb-pg-plus.xpm
   sb-pg.xpm sb-tag-gt.xpm sb-tag-minus.xpm sb-tag-plus.xpm
-  and 34 other files
+  and 35 other files
 
 Eric Schulte: wrote ob-awk.el ob-calc.el ob-comint.el ob-css.el ob-dot.el
   ob-emacs-lisp.el ob-eval.el ob-forth.el ob-gnuplot.el ob-haskell.el
@@ -2313,7 +2313,7 @@ and changed configure.ac Makefile.in src/Makefile.in calendar.el
   lisp/Makefile.in diary-lib.el files.el make-dist rmail.el
   progmodes/f90.el bytecomp.el admin.el misc/Makefile.in simple.el
   authors.el startup.el emacs.texi lib-src/Makefile.in display.texi
-  ack.texi subr.el and 1753 other files
+  ack.texi subr.el and 1771 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -2357,8 +2357,9 @@ Gregorio Gervasio, Jr.: changed gnus-sum.el
 
 Gregor Kappler: changed ox.el
 
-Gregor Schmid: changed intervals.c intervals.h tcl-mode.el textprop.c
-  dispnew.c indent.c xdisp.c
+Gregor Schmid: co-wrote lua-mode.el
+and changed intervals.c intervals.h tcl-mode.el textprop.c dispnew.c
+  indent.c xdisp.c
 
 Gregory Chernov: changed nnslashdot.el
 
@@ -3337,7 +3338,7 @@ and co-wrote help-tests.el keymap-tests.el
 and changed subr.el desktop.el w32fns.c bs.el faces.el simple.el
   emacsclient.c files.el server.el help-fns.el xdisp.c org.el w32term.c
   w32.c buffer.c keyboard.c ido.el image.c window.c eval.c allout.el
-  and 1191 other files
+  and 1206 other files
 
 Juan Pechiar: changed ob-octave.el
 
@@ -3390,7 +3391,7 @@ Juri Linkov: wrote compose.el emoji.el files-x.el misearch.el
 and changed isearch.el simple.el replace.el info.el dired.el treesit.el
   minibuffer.el dired-aux.el window.el outline.el progmodes/grep.el
   subr.el diff-mode.el repeat.el vc.el mouse.el files.el image-mode.el
-  menu-bar.el project.el display.texi and 525 other files
+  menu-bar.el project.el display.texi and 526 other files
 
 Jussi Lahdenniemi: changed w32fns.c ms-w32.h msdos.texi w32.c w32.h
   w32console.c w32heap.c w32inevt.c w32term.h
@@ -3420,7 +3421,7 @@ and co-wrote longlines.el tramp-sh.el tramp.el
 and changed message.el gnus-agent.el gnus-sum.el files.el nnmail.el
   tramp.texi nntp.el gnus.el simple.el ange-ftp.el dired.el paragraphs.el
   bindings.el files.texi gnus-art.el gnus-group.el man.el INSTALL
-  Makefile.in crisp.el fileio.c and 44 other files
+  Makefile.in crisp.el fileio.c and 45 other files
 
 Kailash C. Chowksey: changed HELLO ind-util.el kannada.el knd-util.el
   lisp/Makefile.in loadup.el
@@ -3552,7 +3553,7 @@ and co-wrote ps-def.el ps-mule.el ps-print.el ps-samp.el quail.el
 and changed coding.c mule-cmds.el mule.el fontset.c charset.c xdisp.c
   font.c fontset.el xterm.c fileio.c mule-conf.el ftfont.c characters.el
   fns.c mule-diag.el coding.h charset.h ccl.c xfaces.c editfns.c
-  composite.c and 370 other files
+  composite.c and 385 other files
 
 Kenichi Okada: co-wrote sasl-cram.el sasl-digest.el
 
@@ -3779,7 +3780,7 @@ and co-wrote gnus-kill.el gnus-mh.el gnus-msg.el gnus-score.el
 and changed subr.el simple.el gnus.texi files.el display.texi process.c
   help-fns.el text.texi image.c dired.el help.el image.el package.el
   edebug.el shortdoc.el dired-aux.el gnutls.c minibuffer.el subr-x.el
-  auth-source.el smtpmail.el and 1050 other files
+  auth-source.el smtpmail.el and 1051 other files
 
 Lars Rasmusson: changed ebrowse.c
 
@@ -3915,7 +3916,7 @@ Luc Teirlinck: wrote help-at-pt.el
 and changed files.el autorevert.el cus-edit.el subr.el simple.el
   frames.texi startup.el display.texi files.texi dired.el comint.el
   modes.texi custom.texi emacs.texi fns.c frame.el ielm.el minibuf.texi
-  variables.texi buffers.texi commands.texi and 210 other files
+  variables.texi buffers.texi commands.texi and 211 other files
 
 Ludovic Courtès: wrote nnregistry.el
 and changed configure.ac gnus.texi loadup.el
@@ -4417,7 +4418,7 @@ Michael Olson: changed erc.el erc-backend.el Makefile erc-track.el
   erc-log.el erc-stamp.el erc-autoaway.el erc-dcc.el erc-goodies.el
   erc-list.el erc-compat.el erc-identd.el erc.texi erc-bbdb.el
   erc-match.el erc-notify.el erc-ibuffer.el erc-services.el remember.el
-  erc-button.el erc-nicklist.el and 53 other files
+  erc-button.el erc-nicklist.el and 54 other files
 
 Michael Orlitzky: changed tex-mode.el
 
@@ -5261,9 +5262,10 @@ Protesilaos Stavrou: wrote modus-operandi-deuteranopia-theme.el
   modus-vivendi-deuteranopia-theme.el modus-vivendi-theme.el
   modus-vivendi-tinted-theme.el modus-vivendi-tritanopia-theme.el
 and changed modus-themes.org eww.el vc-dir.el TUTORIAL.el_GR log-view.el
-  time.el vc-git.el appt.el apropos.el custom.el diff-mode.el flymake.el
-  ibuffer.el language/greek.el log-edit.el minibuffer.el package.el
-  perl-mode.el shortdoc.el shr.el vc-cvs.el and 5 other files
+  modus-themes.texi time.el vc-git.el appt.el apropos.el custom.el
+  diff-mode.el flymake.el ibuffer.el language/greek.el log-edit.el
+  minibuffer.el package.el perl-mode.el shortdoc.el shr.el
+  and 6 other files
 
 Przemsyław Kryger: wrote package-vc-tests.el
 
@@ -5988,7 +5990,7 @@ and co-wrote help-tests.el keymap-tests.el
 and changed subr.el package.el image-dired.el checkdoc.el efaq.texi
   cperl-mode.el help.el simple.el progmodes/python.el dired.el files.el
   bookmark.el browse-url.el gnus.texi keymap.c dired-x.el erc.el image.c
-  cl-macs.el message.el subr-tests.el and 1947 other files
+  cl-macs.el message.el subr-tests.el and 1948 other files
 
 Stefan Merten: co-wrote rst.el
 
@@ -6005,7 +6007,7 @@ and co-wrote font-lock.el gitmerge.el pcvs.el visual-wrap.el
 and changed subr.el simple.el cl-macs.el bytecomp.el files.el keyboard.c
   lisp.h vc.el eval.c xdisp.c alloc.c help-fns.el buffer.c sh-script.el
   package.el tex-mode.el progmodes/compile.el lread.c keymap.c window.c
-  easy-mmode.el and 1743 other files
+  easy-mmode.el and 1744 other files
 
 Stefano Facchini: changed gtkutil.c
 
@@ -6050,7 +6052,7 @@ and changed dired.el wid-edit.el wdired.el dired-tests.el files.el
   todo-mode.texi dabbrev-tests.el wdired-tests.el diary-lib.el
   menu-bar.el minibuffer.el dabbrev.el dired-aux.el doc-view.el info.el
   outline.el simple.el todo-test-1.todo widget.texi INSTALL_BEGIN
-  allout.el and 89 other files
+  allout.el and 90 other files
 
 Stephen C. Gilardi: changed configure.ac
 
@@ -6242,7 +6244,7 @@ and changed spam.el gnus.el nnimap.el gnus.texi gnutls.c gnus-sum.el
   auth.texi cfengine.el gnus-sync.el gnus-util.el gnus-start.el netrc.el
   gnutls.h message.el spam-stat.el .gitlab-ci.yml encrypt.el
   mail-source.el nnir.el nnmail.el auth-source-tests.el
-  and 124 other files
+  and 125 other files
 
 Terje Rosten: changed xfns.c version.el xterm.c xterm.h
 
diff --git a/lisp/progmodes/lua-mode.el b/lisp/progmodes/lua-mode.el
index dca93a86888..72c1932ab64 100644
--- a/lisp/progmodes/lua-mode.el
+++ b/lisp/progmodes/lua-mode.el
@@ -8,10 +8,10 @@
 ;;         2004 various (support for Lua 5 and byte compilation)
 ;;         2001 Christian Vogler <cvogler@gradient.cis.upenn.edu>
 ;;         1997 Bret Mogilefsky <mogul-lua@gelatinous.com>
-;; Bret Mogilefsky started from tcl-mode by
-;;                               Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>
-;; with tons of assistance from  Paul Du Bois <pld-lua@gelatinous.com>
-;;                          and  Aaron Smith <aaron-lua@gelatinous.com>.
+;;              Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>
+;; Bret Mogilefsky started from tcl-mode by Gregor Schmid with tons of
+;; assistance from Paul Du Bois <pld-lua@gelatinous.com>
+;; and Aaron Smith <aaron-lua@gelatinous.com>.
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages, processes, tools
 

From 543d8a7a9d7edadced77aced028b848bd9802a6b Mon Sep 17 00:00:00 2001
From: Alan Third <alan@idiocy.org>
Date: Thu, 7 May 2026 22:57:13 +0100
Subject: [PATCH 389/463] [NS] Fix deprecated variable (bug#80985)

* src/nsterm.h (NSLevelIndicatorStyleContinuousCapacity): Define in
macOS < 10.15.
---
 src/nsterm.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/nsterm.h b/src/nsterm.h
index 610ca4c4acc..b21dd519e4b 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -1384,6 +1384,11 @@ enum NSWindowTabbingMode
 #define NSButtonTypeMomentaryPushIn NSMomentaryPushInButton
 #endif
 
+#if !defined (NS_IMPL_COCOA) || !defined (MAC_OS_X_VERSION_10_15)
+/* Deprecated in macOS 10.15.  */
+#define NSLevelIndicatorStyleContinuousCapacity NSContinuousCapacityLevelIndicatorStyle
+#endif
+
 extern void mark_nsterm (void);
 
 #endif	/* HAVE_NS */

From 56f27dd9f066a1dc80942a100f1045bdf5376152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Sat, 9 May 2026 00:58:36 +0100
Subject: [PATCH 390/463] Eglot: fix eglot--sig-info with non-UTF-32
 positionEncoding

Github-reference: https://github.com/joaotavora/eglot/discussions/1588

When the server negotiates positionEncoding utf-8 or utf-16,
ParameterInformation.label vector offsets are byte/code-unit counts
into the signature label, not character counts.  Using them raw caused
wrong highlights and crashes on Unicode-rich signatures.

* lisp/progmodes/eglot.el (eglot--sig-info): Mostly rewrite.
(eglot-move-to-utf-8-linepos-function): Tweak docstring.
(eglot-move-to-utf-8-linepos, eglot-move-to-utf-16-linepos): Return
position moved to.
---
 lisp/progmodes/eglot.el | 114 ++++++++++++++++++++--------------------
 1 file changed, 58 insertions(+), 56 deletions(-)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index b41fd3d2212..e97b1749b79 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -2152,19 +2152,18 @@ LBP defaults to `eglot--bol'."
                            (funcall eglot-current-linepos-function)))))
 
 (defvar eglot-move-to-linepos-function #'eglot-move-to-utf-16-linepos
-  "Function to move to a position within a line reported by the LSP server.
+  "Move point to LSP-reported position within a line.
 
-Per the LSP spec, character offsets in LSP Position objects count
-UTF-16 code units, not actual code points.  So when LSP says
-position 3 of a line containing just \"aXbc\", where X is a funny
-looking character in the UTF-16 \"supplementary plane\", it
-actually means `b', not `c'.  The default value
-`eglot-move-to-utf-16-linepos' accounts for this.
+Per the LSP spec, character offsets in LSP Position objects count UTF-16
+code units, not actual code points.  So when LSP says position 3 of a
+line containing just \"aXbc\", where X is a funny looking character in
+the UTF-16 \"supplementary plane\", it actually means `b', not `c'.  The
+default value `eglot-move-to-utf-16-linepos' accounts for this.
 
 This variable can also be set to `eglot-move-to-utf-8-linepos' or
-`eglot-move-to-utf-32-linepos' for servers not closely following
-the spec.  Also, since LSP 3.17 server and client may agree on an
-encoding and Eglot will set this variable automatically.")
+`eglot-move-to-utf-32-linepos' for servers not closely following the
+spec.  Also, since LSP 3.17 server and client may agree on an encoding
+and Eglot will set this variable automatically.")
 
 (defun eglot-move-to-utf-8-linepos (n)
   "Move to line's Nth byte as computed by LSP's UTF-8 criterion."
@@ -2175,7 +2174,8 @@ encoding and Eglot will set this variable automatically.")
     (while (and (< (position-bytes (point)) goal-byte) (< (point) eol))
       ;; raw bytes take 2 bytes in the buffer
       (when (>= (char-after) #x3fff80) (setq goal-byte (1+ goal-byte)))
-      (forward-char 1))))
+      (forward-char 1))
+    (point)))
 
 (defun eglot-move-to-utf-16-linepos (n)
   "Move to line's Nth code unit as computed by LSP's UTF-16 criterion."
@@ -2186,7 +2186,8 @@ encoding and Eglot will set this variable automatically.")
     (while (and (< (point) goal-char) (< (point) eol))
       ;; code points in the "supplementary place" use two code units
       (when (<= #x010000 (char-after) #x10ffff) (setq goal-char (1- goal-char)))
-      (forward-char 1))))
+      (forward-char 1))
+    (point)))
 
 (defun eglot-move-to-utf-32-linepos (n)
   "Move to line's Nth codepoint as computed by LSP's UTF-32 criterion."
@@ -4108,66 +4109,67 @@ for which LSP on-type-formatting should be requested."
   (mapconcat #'eglot--format-markup
              (if (vectorp contents) contents (list contents)) "\n"))
 
-(defun eglot--sig-info (sig &optional sig-active briefp)
+(cl-defun eglot--sig-info (sig &optional sig-active briefp
+                               &aux (move-fn eglot-move-to-linepos-function)
+                               first-parlabel
+                               fpardoc)
   (eglot--dbind ((SignatureInformation)
                  ((:label siglabel))
                  ((:documentation sigdoc)) parameters activeParameter)
       sig
     (with-temp-buffer
-      (insert siglabel)
-      ;; Add documentation, indented so we can distinguish multiple signatures
-      (when-let* ((doc (and (not briefp) sigdoc (eglot--format-markup sigdoc))))
-        (goto-char (point-max))
-        (insert "\n" (replace-regexp-in-string "^" "  " doc)))
-      ;; Try to highlight function name only
-      (let (first-parlabel)
-        (cond ((and (cl-plusp (length parameters))
-                    (vectorp (setq first-parlabel
-                                   (plist-get (aref parameters 0) :label))))
-               (save-excursion
-                (goto-char (elt first-parlabel 0))
-                (skip-syntax-backward "^w")
-                (add-face-text-property (point-min) (point)
-                                        'font-lock-function-name-face)))
-              ((save-excursion
-                 (goto-char (point-min))
-                 (looking-at "\\([^(]*\\)([^)]*)"))
-               (add-face-text-property (match-beginning 1) (match-end 1)
-                                       'font-lock-function-name-face))))
+      (save-excursion
+        ;; Insert main siglabel line
+        (insert siglabel)
+        ;; Add function documentation to end on a new line, indented so
+        ;; we can distinguish multiple signatures
+        (when-let* ((doc (and (not briefp) sigdoc (eglot--format-markup sigdoc))))
+          (goto-char (point-max))
+          (insert "\n" (replace-regexp-in-string "^" "  " doc))))
+      ;; Back to point-min: try to highlight function name only
+      (cond ((and (cl-plusp (length parameters))
+                  (vectorp (setq first-parlabel
+                                 (plist-get (aref parameters 0) :label))))
+             (funcall move-fn (elt first-parlabel 0))
+             (skip-syntax-backward "^w")
+             (add-face-text-property (point-min) (point)
+                                     'font-lock-function-name-face))
+            ((looking-at "\\([^(]*\\)([^)]*)")
+             (add-face-text-property (match-beginning 1) (match-end 1)
+                                     'font-lock-function-name-face)))
       ;; Now to the parameters
       (cl-loop
        with active-param = (or activeParameter sig-active)
+       with case-fold-search = nil
        for i from 0 for parameter across parameters do
        (eglot--dbind ((ParameterInformation)
                       ((:label parlabel))
                       ((:documentation pardoc)))
            parameter
-         ;; ...perhaps highlight it in the formals list
-         (when (eq i active-param)
-           (save-excursion
-             (goto-char (point-min))
-             (pcase-let
-                 ((`(,beg ,end)
-                   (if (stringp parlabel)
-                       (let ((case-fold-search nil))
-                         (and (search-forward parlabel (line-end-position) t)
-                              (list (match-beginning 0) (match-end 0))))
-                     (list (1+ (aref parlabel 0)) (1+ (aref parlabel 1))))))
-               (if (and beg end)
-                   (add-face-text-property
-                    beg end
-                    'eldoc-highlight-function-argument)))))
-         ;; ...and/or maybe add its doc on a line by its own.
-         (let (fpardoc)
+         (cl-flet ((parlabel-bounds ()
+                     (cond ((stringp parlabel)
+                            (and (search-forward parlabel (line-end-position) t)
+                                 (match-data)))
+                           (t (mapcar move-fn parlabel)))))
+           ;; ...perhaps highlight it in the formals list
+           (when-let* ((b (and (eq i active-param)
+                               (parlabel-bounds))))
+             (add-face-text-property
+              (car b) (cadr b)
+              'eldoc-highlight-function-argument))
+           ;; ...and/or maybe add its doc on a line by its own.
            (when (and pardoc (not briefp)
                       (not (string-empty-p
                             (setq fpardoc (eglot--format-markup pardoc)))))
-             (insert "\n  "
-                     (propertize
-                      (if (stringp parlabel) parlabel
-                        (substring siglabel (aref parlabel 0) (aref parlabel 1)))
-                      'face (and (eq i active-param) 'eldoc-highlight-function-argument))
-                     ": " fpardoc)))))
+             (unless (stringp parlabel)
+               (setq parlabel (apply #'buffer-substring (parlabel-bounds))))
+             (save-excursion
+               (goto-char (point-max))
+               (insert "\n  "
+                       (propertize
+                        parlabel
+                        'face (and (eq i active-param) 'eldoc-highlight-function-argument))
+                       ": " fpardoc))))))
       (buffer-string))))
 
 (defun eglot-signature-eldoc-function (cb &rest _ignored)

From 6ba05106f4e29af8434885134306a25ba00ef983 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 9 May 2026 08:58:59 +0300
Subject: [PATCH 391/463] Fix display images in the display margins

* src/xdisp.c (handle_single_display_spec): Set the iterator face
to use 'margin' when displaying in the margins.  (Bug#80693)
---
 src/xdisp.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 773aba2789f..b485d9ccf40 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6534,10 +6534,19 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
 
       if (NILP (location))
 	it->area = TEXT_AREA;
-      else if (EQ (location, Qleft_margin))
-	it->area = LEFT_MARGIN_AREA;
       else
-	it->area = RIGHT_MARGIN_AREA;
+	{
+	  if (EQ (location, Qleft_margin))
+	    it->area = LEFT_MARGIN_AREA;
+	  else
+	    it->area = RIGHT_MARGIN_AREA;
+	  /* Use the 'margin' face for displaying text and images
+	     in the margins.  */
+	  it->face_id =
+	    NILP (Vface_remapping_alist)
+	    ? MARGIN_FACE_ID
+	    : lookup_basic_face (it->w, it->f, MARGIN_FACE_ID);
+	}
 
       if (STRINGP (value))
 	{

From 547b1ee7b6dadb65ebddea5a700042bd3976b56c Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 9 May 2026 12:01:07 +0300
Subject: [PATCH 392/463] Fix Rmail behavior wrt globalized minor modes

Previously, "M-x rmail" would not call 'run-mode-hooks', which
didn't let globalized minor modes a chance to turn on themselves
in Rmail buffers.  This modifies the way Rmail runs the various
hooks so as to abide by behavior required by Emacs 30 and later.
* lisp/mail/rmail.el (rmail-mode-2): Call 'run-mode-hooks'.
(rmail-mode): Call 'run-hooks', not 'run-mode-hooks'.  Suggested
by Mark Lillibridge <mdl@alum.mit.edu>.  (Bug#80879)
---
 lisp/mail/rmail.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 5f1cabaccdc..d51a90d1e63 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1328,13 +1328,14 @@ Instead, these commands are available:
       (when rmail-display-summary
 	(rmail-summary))
       (rmail-construct-io-menu))
-    (run-mode-hooks 'rmail-mode-hook)))
+    (run-hooks 'rmail-mode-hook)))
 
 (defun rmail-mode-2 ()
   (kill-all-local-variables)
   (rmail-mode-1)
   (rmail-perm-variables)
-  (rmail-variables))
+  (rmail-variables)
+  (run-mode-hooks))
 
 (defun rmail-mode-1 ()
   (setq major-mode 'rmail-mode)

From 5579893ed7c786608d79fd57c4dc53de58d2bfe2 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 9 May 2026 12:22:02 +0300
Subject: [PATCH 393/463] ; Don't block/unblock input in text_extents methods

* src/xftfont.c (xftfont_text_extents):
* src/ftcrfont.c (ftcrfont_text_extents): Don't block/unblock
input.  (Bug#80863)
---
 src/ftcrfont.c | 2 --
 src/xftfont.c  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index 3a609187a53..ac5f52eccc2 100644
--- a/src/ftcrfont.c
+++ b/src/ftcrfont.c
@@ -415,7 +415,6 @@ ftcrfont_text_extents (struct font *font,
 {
   int width, i;
 
-  block_input ();
   width = ftcrfont_glyph_extents (font, code[0], metrics);
   for (i = 1; i < nglyphs; i++)
     {
@@ -435,7 +434,6 @@ ftcrfont_text_extents (struct font *font,
 	}
       width += w;
     }
-  unblock_input ();
 
   if (metrics)
     metrics->width = width;
diff --git a/src/xftfont.c b/src/xftfont.c
index f15dbae1e7a..113c51eebe0 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -466,10 +466,8 @@ xftfont_text_extents (struct font *font, const unsigned int *code,
   struct font_info *xftfont_info = (struct font_info *) font;
   XGlyphInfo extents;
 
-  block_input ();
   XftGlyphExtents (xftfont_info->display, xftfont_info->xftfont, code, nglyphs,
 		   &extents);
-  unblock_input ();
 
   metrics->lbearing = - extents.x;
   metrics->rbearing = - extents.x + extents.width;

From d7c130972e08875c97731ceeb31e198696659b05 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 9 May 2026 12:44:59 +0300
Subject: [PATCH 394/463] ; * lisp/term/pgtk-win.el (icon-map-list): Fix :type.

---
 lisp/term/pgtk-win.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/term/pgtk-win.el b/lisp/term/pgtk-win.el
index abf3ab0951e..ffa20d21e63 100644
--- a/lisp/term/pgtk-win.el
+++ b/lisp/term/pgtk-win.el
@@ -302,7 +302,10 @@ If you don't want stock icons, set the variable to nil."
   :type '(choice (const :tag "Don't use stock icons" nil)
 		 (repeat (choice symbol
 				 (cons (string :tag "Emacs icon")
-				       (string :tag "Stock/named")))))
+                                       (choice
+                                        (group (string "Named")
+                                               (string "Stock"))
+				        (string :tag "Stock/named"))))))
   :group 'pgtk)
 
 (defconst x-gtk-stock-cache (make-hash-table :weakness t :test 'equal))

From 984024daf3cea96d760c9d6a3a89d826a0750fb6 Mon Sep 17 00:00:00 2001
From: Morgan Smith <Morgan.J.Smith@outlook.com>
Date: Tue, 20 Jan 2026 15:18:33 -0500
Subject: [PATCH 395/463] Gnus: Use new sleep library

* etc/NEWS: Announce.
* lisp/gnus/gnus-start.el: Don't require gnus-dbus.
(gnus-sleep-handler): New function.
(gnus-close-on-sleep): New variable.
(gnus-1): Add `gnus-sleep-handler' to
`system-sleep-event-functions' when `gnus-close-on-sleep' is
non-nil.
* doc/misc/gnus.texi: Update documentation.
---
 doc/misc/gnus.texi      | 25 +++++++++++--------------
 etc/NEWS                |  8 ++++++++
 lisp/gnus/gnus-start.el | 22 +++++++++++++++++++---
 3 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index a440aac1a90..fffe81eac06 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -849,7 +849,7 @@ Various
 * Spam Package::                A package for filtering and processing spam.
 * The Gnus Registry::           A package for tracking messages by Message-ID.
 * The Gnus Cloud::              A package for synchronizing Gnus marks.
-* D-Bus Integration::           Closing Gnus servers on system sleep.
+* System Sleep Integration::    Closing Gnus servers on system sleep.
 * Other modes::                 Interaction with other modes.
 * Various Various::             Things that are really various.
 
@@ -22712,7 +22712,7 @@ For instance, @code{nnir-notmuch-program} is now
 * Spam Package::                A package for filtering and processing spam.
 * The Gnus Registry::           A package for tracking messages by Message-ID.
 * The Gnus Cloud::              A package for synchronizing Gnus marks.
-* D-Bus Integration::           Closing Gnus servers on system sleep.
+* System Sleep Integration::    Closing Gnus servers on system sleep.
 * Other modes::                 Interaction with other modes.
 * Various Various::             Things that are really various.
 @end menu
@@ -26680,11 +26680,11 @@ CloudSynchronizationDataPack(TM)s.  It's easiest to set this from the
 Server buffer (@pxref{Gnus Cloud Setup}).
 @end defvar
 
-@node D-Bus Integration
-@section D-Bus Integration
-@cindex dbus
-@cindex D-Bus
-@cindex gnus-dbus
+@node System Sleep Integration
+@section System Sleep Integration
+@c Section name changed from this in Emacs 31. @c
+@c This anchor allows old links to continue working. @c
+@anchor{D-Bus Integration}
 @cindex system sleep
 @cindex closing servers automatically
 @cindex hung connections
@@ -26692,13 +26692,10 @@ Server buffer (@pxref{Gnus Cloud Setup}).
 When using laptops or other systems that have a sleep or hibernate
 functionality, it's possible for long-running server connections to
 become ``hung'', requiring the user to manually close and re-open the
-connections after the system resumes.  On systems compiled with D-Bus
-support (check the value of @code{(featurep 'dbusbind)}), Gnus can
-register a D-Bus signal to automatically close all server connections
-before the system goes to sleep.  To enable this, set
-@code{gnus-dbus-close-on-sleep} to a non-@code{nil} value.
-
-For more information about D-Bus and Emacs, @pxref{Top,,, dbus, D-Bus integration in Emacs}.
+connections after the system resumes.  Using the system sleep library,
+Gnus can automatically close all server connections before the system
+goes to sleep.  To enable this, set @code{gnus-close-on-sleep} to a
+non-@code{nil} value.
 
 @node Other modes
 @section Interaction with other modes
diff --git a/etc/NEWS b/etc/NEWS
index 0c221d049e0..1fe24bd61e4 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1967,6 +1967,14 @@ Gnus, see "(gnus) Symbolic Prefixes" in the Gnus manual.
 ---
 *** Sorting selected groups is now possible with 'gnus-topic-mode'.
 
++++
+*** System sleep integration is now independent of D-Bus.
+The system sleep integration previously provided by customizing the
+variable 'gnus-dbus-close-on-sleep' is now deprecated.  A new system
+using the builtin sleep library is now available by customizing
+'gnus-close-on-sleep'.  This will work on all systems that the sleep
+library supports.
+
 ** Sieve
 
 +++
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index f63fc41ea5e..ba308990407 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -31,7 +31,6 @@
 (require 'gnus-range)
 (require 'gnus-util)
 (require 'gnus-cloud)
-(require 'gnus-dbus)
 (autoload 'message-make-date "message")
 (autoload 'gnus-agent-read-servers-validate "gnus-agent")
 (autoload 'gnus-agent-save-local "gnus-agent")
@@ -733,6 +732,22 @@ the first newsgroup."
   ;; Remove Gnus frames.
   (gnus-kill-gnus-frames))
 
+(defcustom gnus-close-on-sleep nil
+  "When non-nil, close Gnus servers on system sleep."
+  :type 'boolean
+  :group 'gnus-start)
+
+(defun gnus-sleep-handler (sleep-event)
+  "Close connection to servers before system sleep.
+See `gnus-close-on-sleep' to enable this functionality.
+
+SLEEP-EVENT is checked to ensure this is only run before sleep."
+  (when (and (eq 'pre-sleep (sleep-event-state sleep-event))
+             (gnus-alive-p))
+    (condition-case nil
+        (gnus-close-all-servers)
+      (error nil))))
+
 (defun gnus-no-server-1 (&optional arg child)
   "Read network news.
 If ARG is a positive number, Gnus will use that as the startup
@@ -800,8 +815,9 @@ prompt the user for the name of an NNTP server to use."
 	  (gnus-run-hooks 'gnus-setup-news-hook)
 	  (when gnus-agent
 	    (gnus-request-create-group "queue" '(nndraft "")))
-	  (when gnus-dbus-close-on-sleep
-	    (gnus-dbus-register-sleep-signal))
+	  (when gnus-close-on-sleep
+            (add-hook 'system-sleep-event-functions
+                      #'gnus-sleep-handler))
 	  (gnus-start-draft-setup)
 	  ;; Generate the group buffer.
 	  (gnus-group-list-groups level)

From 9bf2a19bb21418ca0716142629a9f0f32b7e3b31 Mon Sep 17 00:00:00 2001
From: Morgan Smith <Morgan.J.Smith@outlook.com>
Date: Wed, 6 May 2026 20:24:50 -0400
Subject: [PATCH 396/463] Move gnus-dbus.el to obsolete/gnus-dbus.el

* lisp/gnus/gnus-dbus.el: Move from here...
* lisp/obsolete/gnus-dbus.el: ...to here.
---
 lisp/{gnus => obsolete}/gnus-dbus.el | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lisp/{gnus => obsolete}/gnus-dbus.el (100%)

diff --git a/lisp/gnus/gnus-dbus.el b/lisp/obsolete/gnus-dbus.el
similarity index 100%
rename from lisp/gnus/gnus-dbus.el
rename to lisp/obsolete/gnus-dbus.el

From d54faa0f1bff14a8a8f79bba8fa9d496f5ff4544 Mon Sep 17 00:00:00 2001
From: Morgan Smith <Morgan.J.Smith@outlook.com>
Date: Wed, 6 May 2026 20:37:37 -0400
Subject: [PATCH 397/463] Mark gnus-dbus.el as obsolete

This functionality has been replaced by the new sleep library
which supports more then just DBUS systems.

* lisp/obsolete/gnus-dbus.el: Add Obsolete-since header.  Add
commentary.
(gnus-dbus-close-on-sleep, gnus-dbus-sleep-registration-object)
(gnus-dbus-register-sleep-signal gnus-dbus-sleep-handler)
(gnus-dbus-unregister-sleep-signal): Mark as obsolete.
---
 lisp/obsolete/gnus-dbus.el | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/lisp/obsolete/gnus-dbus.el b/lisp/obsolete/gnus-dbus.el
index a985e44c5b8..a62cf8a0f97 100644
--- a/lisp/obsolete/gnus-dbus.el
+++ b/lisp/obsolete/gnus-dbus.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2020-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric Abrahamsen <eric@ericabrahamsen.net>
+;; Obsolete-since: 31.1
 
 ;; This file is part of GNU Emacs.
 
@@ -21,6 +22,10 @@
 
 ;;; Commentary:
 
+;; This library is obsolete.
+;;
+;; Use `gnus-close-on-sleep' instead.
+
 ;; This library contains some Gnus integration for systems using DBUS.
 ;; At present it registers a signal to close all Gnus servers before
 ;; system sleep or hibernation.
@@ -31,17 +36,29 @@
 (require 'dbus)
 (declare-function gnus-close-all-servers "gnus-start")
 
-(defcustom gnus-dbus-close-on-sleep nil
-  "When non-nil, close Gnus servers on system sleep."
-  :group 'gnus-dbus
-  :type 'boolean)
+;; (defcustom gnus-dbus-close-on-sleep nil
+;;   "When non-nil, close Gnus servers on system sleep."
+;;   :group 'gnus-dbus
+;;   :type 'boolean)
+
+;; It is suggested in the elisp documention that we create variable
+;; alias's before executing the `defcustom'.  To reliably accomplish
+;; that in this case we would have to edit gnus-start.el which I don't
+;; want to do.  So I've done this instead.
+(require 'gnus-start) ;; Run defcustom for `gnus-close-on-sleep'
+(when (bound-and-true-p gnus-dbus-close-on-sleep)
+  (setq gnus-close-on-sleep gnus-dbus-close-on-sleep))
+(with-suppressed-warnings ((suspicious nil)) ;; Doesn't like aliasing bound variables
+  (define-obsolete-variable-alias 'gnus-dbus-close-on-sleep 'gnus-close-on-sleep "31.1"))
 
 (defvar gnus-dbus-sleep-registration-object nil
   "Object returned from `dbus-register-signal'.
 Used to unregister the signal.")
+(make-obsolete-variable 'gnus-dbus-sleep-registration-object nil "31.1")
 
 (defun gnus-dbus-register-sleep-signal ()
   "Use `dbus-register-signal' to close servers on sleep."
+  (declare (obsolete nil "31.1"))
   (when (featurep 'dbusbind)
     (setq gnus-dbus-sleep-registration-object
 	  (dbus-register-signal :system
@@ -54,6 +71,7 @@ Used to unregister the signal.")
 
 (defun gnus-dbus-sleep-handler (sleep-start)
   ;; Sleep-start is t before sleeping.
+  (declare (obsolete nil "31.1"))
   (when (and sleep-start
 	     (gnus-alive-p))
     (condition-case nil
@@ -61,6 +79,7 @@ Used to unregister the signal.")
       (error nil))))
 
 (defun gnus-dbus-unregister-sleep-signal ()
+  (declare (obsolete gnus-sleep-handler "31.1"))
   (condition-case nil
       (dbus-unregister-object
        gnus-dbus-sleep-registration-object)

From e4d529c67b6a751c3a0858b057afafd1b37cd30a Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 9 May 2026 13:17:06 +0200
Subject: [PATCH 398/463] ; Fix last change

* doc/misc/gnus.texi (System Sleep Integration): Move @anchor up.

* etc/NEWS: gnus-dbus.el is obsolete.
Presentational fixes and improvements.

* lisp/gnus/gnus-start.el (gnus-close-on-sleep): Add :version.
(gnus-sleep-handler): Use `ignore-errors'.
---
 doc/misc/gnus.texi      |  6 +++---
 etc/NEWS                | 16 ++++++++++------
 lisp/gnus/gnus-start.el |  5 ++---
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index fffe81eac06..fa436e0b87d 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -26680,11 +26680,11 @@ CloudSynchronizationDataPack(TM)s.  It's easiest to set this from the
 Server buffer (@pxref{Gnus Cloud Setup}).
 @end defvar
 
+@c Section name changed from this in Emacs 31.  @c
+@c This anchor allows old links to continue working.  @c
+@anchor{D-Bus Integration}
 @node System Sleep Integration
 @section System Sleep Integration
-@c Section name changed from this in Emacs 31. @c
-@c This anchor allows old links to continue working. @c
-@anchor{D-Bus Integration}
 @cindex system sleep
 @cindex closing servers automatically
 @cindex hung connections
diff --git a/etc/NEWS b/etc/NEWS
index 1fe24bd61e4..c0e05deed2e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -795,7 +795,7 @@ docstring for the new option.
 See the file "etc/ORG-NEWS" for user-visible changes in Org.
 
 +++
-** New user option 'compilation-search-extra-path'
+** New user option 'compilation-search-extra-path'.
 compile.el will now use paths specified in both
 'compilation-search-extra-path' and 'compilation-search-path', when
 doing search.  'compilation-search-extra-path' is consulted first.
@@ -1967,13 +1967,16 @@ Gnus, see "(gnus) Symbolic Prefixes" in the Gnus manual.
 ---
 *** Sorting selected groups is now possible with 'gnus-topic-mode'.
 
+---
+*** gnus-dbus.el is now obsolete.
+
 +++
 *** System sleep integration is now independent of D-Bus.
 The system sleep integration previously provided by customizing the
 variable 'gnus-dbus-close-on-sleep' is now deprecated.  A new system
-using the builtin sleep library is now available by customizing
-'gnus-close-on-sleep'.  This will work on all systems that the sleep
-library supports.
+using the builtin 'system-sleep' library is now available by customizing
+'gnus-close-on-sleep'.  This will work on all systems that the
+'system-sleep' library supports.
 
 ** Sieve
 
@@ -2819,7 +2822,7 @@ another branch.
 ---
 *** VC Annotate for Mercurial repositories shows changeset hashes.
 To restore showing revision numbers instead of changeset hashes,
-customize the new option vc-hg-annotate-show-revision-numbers to
+customize the new user option 'vc-hg-annotate-show-revision-numbers' to
 non-nil.
 
 +++
@@ -4613,7 +4616,7 @@ singleton list.
 By default it kills Emacs, as before, but 'kill-emacs-on-sigint'
 can be set to nil to change that.
 The response to SIGINT in interactive sessions is unaffected,
-e.g. in a normal GUI session it still kills Emacs whereas in a terminal
+e.g., in a normal GUI session it still kills Emacs whereas in a terminal
 it causes 'quit' since it is used for 'C-g'.
 
 +++
@@ -4622,6 +4625,7 @@ While it is marginally more efficient than ':after' or ':before',
 the main purpose is to make the intention more obvious when the advice
 modifies only the interactive form and not the actual behavior
 of the function.
+
 
 * Changes in Emacs 31.1 on Non-Free Operating Systems
 
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index ba308990407..62faa26468d 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -734,6 +734,7 @@ the first newsgroup."
 
 (defcustom gnus-close-on-sleep nil
   "When non-nil, close Gnus servers on system sleep."
+  :version "31.1"
   :type 'boolean
   :group 'gnus-start)
 
@@ -744,9 +745,7 @@ See `gnus-close-on-sleep' to enable this functionality.
 SLEEP-EVENT is checked to ensure this is only run before sleep."
   (when (and (eq 'pre-sleep (sleep-event-state sleep-event))
              (gnus-alive-p))
-    (condition-case nil
-        (gnus-close-all-servers)
-      (error nil))))
+    (ignore-errors (gnus-close-all-servers))))
 
 (defun gnus-no-server-1 (&optional arg child)
   "Read network news.

From 6a605c65a836d70b5765b173e1a706137554d6d6 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 9 May 2026 14:59:54 +0300
Subject: [PATCH 399/463] Fix vertical-motion across overlay strings with
 embedded newlines

* src/indent.c (Fvertical_motion): Handle the case of an overlay
string on invisible text at point.  (Bug#80989)
---
 src/indent.c | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/indent.c b/src/indent.c
index 9721c95dcf7..e8513fbf6f2 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2295,6 +2295,7 @@ buffer, whether or not it is currently displayed in some window.  */)
       double start_col UNINIT;
       int start_x UNINIT;
       int to_x = -1;
+      ptrdiff_t ovl_start = -1;
 
       bool start_x_given = !NILP (cur_col);
       if (start_x_given)
@@ -2327,13 +2328,29 @@ buffer, whether or not it is currently displayed in some window.  */)
 	{
 	  const char *s = SSDATA (it.string);
 	  const char *e = s + SBYTES (it.string);
+	  Lisp_Object prop;
+	  ptrdiff_t ovl_idx =
+	    it.current.overlay_string_index >= 0
+	     ? it.current.overlay_string_index % OVERLAY_STRING_CHUNK_SIZE
+	     : -1;
+
+	  /* If this is a string from an overlay, compute where that
+             overlay starts.  */
+	  if (!it.string_from_display_prop_p && ovl_idx >= 0)
+	    ovl_start = OVERLAY_START (it.string_overlays[ovl_idx]);
 
 	  disp_string_at_start_p =
 	  /* If it.area is anything but TEXT_AREA, we need not bother
 	     about the display string, as it doesn't affect cursor
 	     positioning.  */
 	    it.area == TEXT_AREA
-	    && it.string_from_display_prop_p
+	    && (it.string_from_display_prop_p
+		/* Overlay string on invisible text has the same effect
+                   on display and cursor movement as a display string.  */
+		|| (ovl_start >= BEGV
+		    && (prop = Fget_char_property (make_fixnum (ovl_start),
+						   Qinvisible, window),
+			TEXT_PROP_MEANS_INVISIBLE (prop))))
 	    /* A display string on anything but buffer text (e.g., on
 	       an overlay string) doesn't affect cursor positioning.  */
 	    && (it.sp > 0 && it.stack[it.sp - 1].method == GET_FROM_BUFFER);
@@ -2456,6 +2473,13 @@ buffer, whether or not it is currently displayed in some window.  */)
 	  if ((nlines < 0 && IT_CHARPOS (it) > BEGV)
 	      || (nlines == 0 && !(start_x_given && start_x <= to_x)))
 	    move_it_by_lines (&it, max (PTRDIFF_MIN, nlines));
+	  /* If we haven't moved due to an overlay string on invisible
+             text, back up past that overlay string.  */
+	  if (IT_CHARPOS (it) == it_start
+	      && disp_string_at_start_p
+	      && ovl_start >= BEGV
+	      && it_overshoot_count > 0)
+	    move_it_by_lines (&it, -it_overshoot_count);
 	}
       else if (overshoot_handled)
 	{

From 3b608b233edb87eacbd50b6afc9d3273d23b1e24 Mon Sep 17 00:00:00 2001
From: Pip Cet <pipcet@protonmail.com>
Date: Wed, 6 May 2026 18:09:25 +0000
Subject: [PATCH 400/463] Fix terminal emulation of "ESC [ K" sequence

* lisp/term.el (term-erase-in-line): Don't immediately delete the
newly inserted characters.
---
 lisp/term.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lisp/term.el b/lisp/term.el
index 15ba310a73a..79697170338 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -4128,10 +4128,11 @@ all pending output has been dealt with."))
         ;; contain a space, to force the previous line to continue to wrap.
         ;; We could do this always, but it seems preferable to not add the
         ;; extra space when wrapped is false.
-        (when wrapped
-	  (insert-before-markers ? ))
-        (insert-before-markers ?\n)
-        (delete-region saved-point (point)))
+        (let ((deletion-point (point)))
+          (when wrapped
+	    (insert-before-markers ? ))
+          (insert-before-markers ?\n)
+          (delete-region saved-point deletion-point)))
       (put-text-property saved-point (point) 'font-lock-face 'default)
       (goto-char saved-point))))
 

From 66729f3e5080f8853393e5f88ce6f062b45164b7 Mon Sep 17 00:00:00 2001
From: Eshel Yaron <me@eshelyaron.com>
Date: Fri, 8 May 2026 12:45:00 +0200
Subject: [PATCH 401/463] New variable 'completion-frontend-properties'
 (bug#80990)

Allow completion "frontends" to provide extra information
that the backends they call can use to adjust or optimize
their behavior.
See some relevant discussion at
https://yhetil.org/emacs/jwv7bpl28y6.fsf-monnier+emacs@gnu.org/

* lisp/minibuffer.el (completion-frontend-properties):
New variable.
(completion-lazy-hilit-p): New function.
(completion-hilit-commonality, completion-lazy-hilit)
(completion-pcm--hilit-commonality)
(completion-flex-all-completions): Use it instead of
checking the 'completion-lazy-hilit' variable directly.
* lisp/completion-preview.el (completion-preview--capf-wrapper):
Bind 'completion-frontend-properties'.
(completion-preview--try-table): Add comment.
* etc/NEWS: Announce 'completion-frontend-properties'.
---
 etc/NEWS                   |  7 +++++++
 lisp/completion-preview.el | 11 +++++++++--
 lisp/minibuffer.el         | 35 +++++++++++++++++++++++++++++------
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index edb682a4968..73a4ad72180 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -45,6 +45,13 @@ applies, and please also update docstrings as needed.
 
 * Lisp Changes in Emacs 32.1
 
+---
+** New variable 'completion-frontend-properties'.
+This variable generalizes the 'completion-lazy-hilit' variable added in
+Emacs 30.  It allows Lisp programs that present completion candidates
+("completion frontends") to provide additional information which can be
+used to adjust or optimize completion candidates computation.
+
 
 * Changes in Emacs 32.1 on Non-Free Operating Systems
 
diff --git a/lisp/completion-preview.el b/lisp/completion-preview.el
index ff348ebf9af..c38bcd70654 100644
--- a/lisp/completion-preview.el
+++ b/lisp/completion-preview.el
@@ -499,7 +499,12 @@ candidates or if there are multiple matching completions and
          (sort-fn (or (completion-metadata-get md 'cycle-sort-function)
                       (completion-metadata-get md 'display-sort-function)
                       completion-preview-sort-function))
-         (all (let ((completion-lazy-hilit t)
+         (all (let (;; This is somewhat redundant since we also specify
+                    ;; non-nil `lazy-highlight' in
+                    ;; `completion-frontend-properties', but we keep it
+                    ;; for compatibility with backends that do not know
+                    ;; about `completion-frontend-properties' yet.
+                    (completion-lazy-hilit t)
                     ;; FIXME: This does not override styles prescribed
                     ;; by the completion category via
                     ;; e.g. `completion-category-defaults'.
@@ -525,7 +530,9 @@ candidates or if there are multiple matching completions and
 
 (defun completion-preview--capf-wrapper (capf)
   "Translate return value of CAPF to properties for completion preview overlay."
-  (let ((res (ignore-errors (funcall capf))))
+  (let* ((completion-frontend-properties '((no-annotations . t)
+                                           (lazy-highlight . t)))
+         (res (ignore-errors (funcall capf))))
     (and (consp res)
          (not (functionp res))
          (seq-let (beg end table &rest plist) res
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 636d0951645..744e20cf444 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -2586,7 +2586,7 @@ and with BASE-SIZE appended as the last element."
                  com-str-len (1+ com-str-len)
                  'face 'completions-first-difference str))
               str)))
-      (if completion-lazy-hilit
+      (if (completion-lazy-hilit-p)
           (setq completion-lazy-hilit-fn hilit-fn)
         (setq completions
               (mapcar
@@ -2604,6 +2604,11 @@ and with BASE-SIZE appended as the last element."
                completions)))
       (nconc completions base-size))))
 
+(defun completion-lazy-hilit-p ()
+  "Return non-nil if the completion frontend supports lazy highlighting."
+  (or completion-lazy-hilit
+      (alist-get 'lazy-highlight completion-frontend-properties)))
+
 (defun display-completion-list (completions &optional common-substring group-fun)
   "Display the list of completions, COMPLETIONS, using `standard-output'.
 Each element may be just a symbol or string
@@ -3198,6 +3203,23 @@ Also respects the obsolete wrapper hook `completion-in-region-functions'.
       (delq (assq 'completion-in-region-mode minor-mode-map-alist)
             minor-mode-map-alist))
 
+(defvar completion-frontend-properties nil
+  "Alist of properties describing the current completion frontend.
+
+Frontends may let-bind this variable while calling a completion backend
+to provide information which the backend can use to optimize or adjust
+its behavior.  More specifically, frontends should bind this variable
+when calling `completion-try-completion' or `completion-all-completions'.
+
+Currently known frontend properties are:
+
+- \\+`no-annotations': if non-nil, the frontend ignores any
+  `annotation-function'/`affixation-function'.
+
+- \\+`lazy-highlight': If non-nil, the front-end does not require
+  `completion-all-completions' completions to be highlighted and knows
+  to call the function `completion-lazy-hilit' as needed instead.")
+
 (defvar completion-at-point-functions '(tags-completion-at-point-function)
   "Special hook to find the completion table for the entity at point.
 Each function on this hook is called in turn without any argument and
@@ -4501,9 +4523,10 @@ strings with the `face' property.")
 
 (defun completion-lazy-hilit (str)
   "Return a copy of completion candidate STR that is `face'-propertized.
-See documentation of the variable `completion-lazy-hilit' for more
-details."
-  (if (and completion-lazy-hilit completion-lazy-hilit-fn)
+Apply `completion-lazy-hilit-fn' if it is set and the frontend supports
+lazy highlighting (see `completion-lazy-hilit-p'), otherwise return STR
+as is."
+  (if (and (completion-lazy-hilit-p) completion-lazy-hilit-fn)
       (funcall completion-lazy-hilit-fn (copy-sequence str))
     str))
 
@@ -4556,7 +4579,7 @@ see) for later lazy highlighting."
            (re (completion-pcm--segments->regex segments 'group))
            (point-idx (completion-pcm--segments-point-idx segments)))
       (setq completion-pcm--regexp re)
-      (cond (completion-lazy-hilit
+      (cond ((completion-lazy-hilit-p)
              (setq completion-lazy-hilit-fn
                    (lambda (str) (completion--hilit-from-re str re point-idx)))
              completions)
@@ -5036,7 +5059,7 @@ usual. Returns (ALL PAT PREFIX SUFFIX)."
                    (1+ special-match) (+ 2 special-match)
                    'completions-first-difference nil str))))
             str))
-    (unless completion-lazy-hilit
+    (unless (completion-lazy-hilit-p)
       (setq all (mapcar completion-lazy-hilit-fn all)))
     ;; Store pattern for adjust-metadata to use
     (setq completion-flex--pattern-str pattern-str)

From 027043df257848cb79390f4585a19e478a86568b Mon Sep 17 00:00:00 2001
From: Augusto Stoffel <arstoffel@gmail.com>
Date: Sun, 10 May 2026 15:09:05 +0200
Subject: [PATCH 402/463] ; * lisp/gnus/message.el (message-server-alist): Doc
 fix (bug#80880).

---
 lisp/gnus/message.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 0879f3be1b4..671c3fdc1bc 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4401,6 +4401,9 @@ a non-nil value when called in the message buffer without any
 arguments.  If METHOD is nil in this case, the return value of
 the function will be inserted instead.
 
+For an explanation of the \"X-Message-SMTP-Method\" header, see
+Info node `(message) Mail Variables'.
+
 Note: if the buffer already has a \"X-Message-SMTP-Method\"
 header, these rules are ignored, and the header is left
 unchanged."

From 01c5990dd064211a27022a94ee0ec3fd8b74ce06 Mon Sep 17 00:00:00 2001
From: Pip Cet <pipcet@protonmail.com>
Date: Sat, 2 May 2026 16:58:38 +0000
Subject: [PATCH 403/463] Fix nested read-passwd calls (bug#80838)

Calls to 'read-passwd' may be nested.  The old code didn't handle
that, because some of the state was global and we'd end up revealing
passwords.  The new code still has global state, but it has been
changed so that we hide rather than reveal passwords when we enter or
leave a nested read-passwd prompt.

* lisp/auth-source.el (read-passwd--hide-password): Removed.
(read-passwd--password-hidden): New.
(read-passwd-toggle-visibility): Add optional FORCE argument.
(read-passwd--mini-buffers): New variable.
(read-passwd-mode): Don't modify mode line when nested.  Hide password
when returning to nested minibuffer or entering a new one.
---
 lisp/auth-source.el | 51 ++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 6cdea11c1ee..bc660b2f4ab 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -2602,14 +2602,14 @@ point is moved into the passwords (see `authinfo-hide-elements').
 (defvar read-passwd--mode-line-icon nil
   "Propertized mode line icon for showing/hiding passwords.")
 
-(defvar read-passwd--hide-password t
-  "Toggle whether password should be hidden in minibuffer.")
+(defvar read-passwd--password-hidden nil
+  "Flag indicating whether password in minibuffer is hidden.")
 
 (defun read-passwd--hide-password ()
   "Make password in minibuffer hidden or visible."
   (let ((beg (minibuffer-prompt-end)))
     (dotimes (i (1+ (- (buffer-size) beg)))
-      (if read-passwd--hide-password
+      (if read-passwd--password-hidden
           (put-text-property
            (+ i beg) (+ 1 i beg) 'display (string (or read-hide-char ?*)))
         (remove-list-of-text-properties (+ i beg) (+ 1 i beg) '(display)))
@@ -2617,9 +2617,10 @@ point is moved into the passwords (see `authinfo-hide-elements').
        (+ i beg) (+ 1 i beg)
        'help-echo "C-u: Clear password\nTAB: Toggle password visibility"))))
 
-(defun read-passwd-toggle-visibility ()
+(defun read-passwd-toggle-visibility (&optional force)
   "Toggle minibuffer contents visibility.
-Adapt also mode line."
+Adapt also mode line.  If optional FORCE is non-nil, hide the minibuffer
+contents."
   (interactive)
   (let ((win (active-minibuffer-window)))
     (unless win (error "No active minibuffer"))
@@ -2627,12 +2628,13 @@ Adapt also mode line."
     ;; mini-buffer.
     (with-current-buffer (window-buffer win)
       (when (memq 'read-passwd-mode local-minor-modes)
-        (setq read-passwd--hide-password (not read-passwd--hide-password))
+        (setq read-passwd--password-hidden
+              (or force (not read-passwd--password-hidden)))
         (setq read-passwd--mode-line-icon
               `(:propertize
                 ,(if icon-preference
                      (icon-string
-                      (if read-passwd--hide-password
+                      (if read-passwd--password-hidden
                           'read-passwd--show-password-icon
                         'read-passwd--hide-password-icon))
                    "")
@@ -2652,6 +2654,9 @@ Adapt also mode line."
   "C-u" #'delete-minibuffer-contents ;bug#12570
   "TAB" #'read-passwd-toggle-visibility)
 
+(defvar read-passwd--mini-buffers nil
+  "List of minibuffers where `read-passwd' is active.")
+
 (define-minor-mode read-passwd-mode
   "Toggle visibility of password in minibuffer."
   :group 'mode-line
@@ -2659,21 +2664,25 @@ Adapt also mode line."
   :keymap read-passwd-map
   :version "30.1"
 
-  (setq read-passwd--hide-password nil)
-  (or global-mode-string (setq global-mode-string '("")))
-
-  (let ((mode-string '(:eval read-passwd--mode-line-icon)))
-    (if read-passwd-mode
-        ;; Add `read-passwd--mode-line-icon'.
-        (or (member mode-string global-mode-string)
-            (setq global-mode-string
-	          (append global-mode-string (list mode-string))))
-      ;; Remove `read-passwd--mode-line-icon'.
-      (setq global-mode-string
-	    (delete mode-string global-mode-string))))
-
+  (unless read-passwd-mode
+    (setq read-passwd--mini-buffers
+          (delq (current-buffer) read-passwd--mini-buffers)))
+  (unless read-passwd--mini-buffers
+    (let ((mode-string '(:eval read-passwd--mode-line-icon)))
+      (if read-passwd-mode
+          ;; Add `read-passwd--mode-line-icon'.
+          (or (member mode-string global-mode-string)
+              (setq global-mode-string
+	            (append global-mode-string (list mode-string))))
+        ;; Remove `read-passwd--mode-line-icon'.
+        (setq global-mode-string
+	      (delete mode-string global-mode-string)))))
   (when read-passwd-mode
-    (read-passwd-toggle-visibility)))
+    (push (current-buffer) read-passwd--mini-buffers))
+  ;; Always hide the current password.
+  (when read-passwd--mini-buffers
+    (with-current-buffer (car read-passwd--mini-buffers)
+      (read-passwd-toggle-visibility t))))
 
 (defvar overriding-text-conversion-style)
 

From 5323eebcffcc21bbc5eb681353baee70ef5c236e Mon Sep 17 00:00:00 2001
From: Pip Cet <pipcet@protonmail.com>
Date: Sat, 2 May 2026 16:59:34 +0000
Subject: [PATCH 404/463] Test read-passwd behavior (bug#80838)

* test/lisp/auth-source-tests.el (auth-source-test--displayed-string):
(auth-source-test-read-passwd):
(auth-source-test-read-passwd-revealed):
(auth-source-test-read-passwd-nested): New.
---
 test/lisp/auth-source-tests.el | 113 +++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)

diff --git a/test/lisp/auth-source-tests.el b/test/lisp/auth-source-tests.el
index 7da3fed70be..9a58d15484d 100644
--- a/test/lisp/auth-source-tests.el
+++ b/test/lisp/auth-source-tests.el
@@ -571,5 +571,118 @@ machine c1 port c2 user c3 password c4\n"
        :user '("a" "b") :host '("example.org")
        :port '("irc" "ftp" "https" 123)))))
 
+(defun auth-source-test--displayed-string (string)
+  "Apply `display' properties of STRING and return the displayed string."
+  (let ((i 0)
+        res)
+    (while i
+      (let ((display (get-text-property i 'display string))
+            (i0 i))
+        (setq i (next-single-property-change i 'display string))
+        (if display
+            (push display res)
+          (push (substring string i0 i) res))))
+    (apply #'concat (nreverse res))))
+
+(ert-deftest auth-source-test-read-passwd ()
+  "Check that a password read with `read-passwd' isn't visible by default."
+  (let* ((cursor-in-echo-area t)
+         (screenshot (intern "ert--screenshot"))
+         (keys `[,@"secret"
+                 ;; fake input event to capture the current minibuf string
+                 ,screenshot
+                 ;; leave outer prompt
+                 ,@(kbd "RET")])
+         (minibuffer-string nil)
+         (command-screenshot
+          (lambda ()
+            (interactive)
+            (setq minibuffer-string (buffer-string)))))
+    (unwind-protect
+        (progn
+          (define-key global-map `[,screenshot] command-screenshot)
+          (ert-simulate-keys keys
+            (should (equal (read-passwd "Test: ") "secret"))))
+      (define-key global-map `[,screenshot] command-screenshot t))
+    ;; check that the secret's there
+    (should (equal "Test: secret" minibuffer-string))
+    ;; now simulate what redisplay does to hide the password
+    (setq minibuffer-string
+          (auth-source-test--displayed-string minibuffer-string))
+    ;; check that the secret is not visible
+    (should (equal "Test: ******" minibuffer-string))))
+
+(ert-deftest auth-source-test-read-passwd-revealed ()
+  "Check that a password read with `read-passwd' can be made visible."
+  (let* ((cursor-in-echo-area t)
+         (screenshot (intern "ert--screenshot"))
+         (keys `[,@"secret"
+                 ;; TAB: reveals the password
+                 ,@(kbd "TAB")
+                 ;; fake input event to capture the current minibuf string
+                 ,screenshot
+                 ;; leave outer prompt
+                 ,@(kbd "RET")])
+         (minibuffer-string nil)
+         (command-screenshot
+          (lambda ()
+            (interactive)
+            (setq minibuffer-string (buffer-string)))))
+    (unwind-protect
+        (progn
+          (define-key global-map `[,screenshot] command-screenshot)
+          (ert-simulate-keys keys
+            (should (equal (read-passwd "Test: ") "secret"))))
+      (define-key global-map `[,screenshot] command-screenshot t))
+    ;; check that the secret's there
+    (should (equal "Test: secret" minibuffer-string))
+    ;; now simulate what redisplay does to hide the password
+    (setq minibuffer-string
+          (auth-source-test--displayed-string minibuffer-string))
+    ;; check that the secret is visible once more
+    (should (equal "Test: secret" minibuffer-string))))
+
+(ert-deftest auth-source-test-read-passwd-nested ()
+  "Check that nested `read-passwd' calls do not reveal the password."
+  (let* ((cursor-in-echo-area t)
+         (trigger-nested (intern "ert--trigger-nested"))
+         (screenshot (intern "ert--screenshot"))
+         (keys `[,@"secret"
+                 ;; fake input event to trigger a nested prompt
+                 ,trigger-nested
+                 ,@"SECRET"
+                 ;; leave nested prompt
+                 ,@(kbd "RET")
+                 ;; fake input event to capture the current minibuf string
+                 ,screenshot
+                 ;; leave outer prompt
+                 ,@(kbd "RET")])
+         (inner-password nil)
+         (command-trigger-nested
+          (lambda ()
+            (interactive)
+            (setq inner-password (read-passwd "inner prompt: "))))
+         (minibuffer-string nil)
+         (command-screenshot
+          (lambda ()
+            (interactive)
+            (setq minibuffer-string (buffer-string)))))
+    (unwind-protect
+        (progn
+          (define-key global-map `[,screenshot] command-screenshot)
+          (define-key global-map `[,trigger-nested] command-trigger-nested)
+          (ert-simulate-keys keys
+            (should (equal (read-passwd "Test: ") "secret"))))
+      (define-key global-map `[,screenshot] command-screenshot t)
+      (define-key global-map `[,trigger-nested] command-trigger-nested t))
+    (should (equal inner-password "SECRET"))
+    ;; check that the secret's there
+    (should (equal "Test: secret" minibuffer-string))
+    ;; now simulate what redisplay does to hide the password
+    (setq minibuffer-string
+          (auth-source-test--displayed-string minibuffer-string))
+    ;; check that the secret has been hidden
+    (should (equal "Test: ******" minibuffer-string))))
+
 (provide 'auth-source-tests)
 ;;; auth-source-tests.el ends here

From acc07f1a0301e4e797728c170e652290d0721927 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dmitry@gutov.dev>
Date: Mon, 11 May 2026 02:03:30 +0300
Subject: [PATCH 405/463] [GTK3] On Expose, repaint the border before the
 content

* src/xterm.c (handle_one_xevent): Move the
x_clear_under_internal_border call before expose_frame, for less
chance of implicit flush to screen in between (bug#80662).
---
 src/xterm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index c021d06dd5d..1401693541c 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -19931,14 +19931,14 @@ handle_one_xevent (struct x_display_info *dpyinfo,
               x_clear_area (f,
                             event->xexpose.x, event->xexpose.y,
                             event->xexpose.width, event->xexpose.height);
+	      /* Paint the border before content (few operations, less
+		 chance for a compositor sync in between).  */
+	      x_clear_under_internal_border (f);
 #endif
               expose_frame (f, event->xexpose.x, event->xexpose.y,
 			    event->xexpose.width, event->xexpose.height);
 #ifndef USE_TOOLKIT_SCROLL_BARS
 	      x_scroll_bar_handle_exposure (f, (XEvent *) event);
-#endif
-#ifdef USE_GTK
-	      x_clear_under_internal_border (f);
 #endif
             }
 #ifndef USE_TOOLKIT_SCROLL_BARS

From 196fd80689e3274352fea165a6d8c63b9257d105 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dmitry@gutov.dev>
Date: Mon, 11 May 2026 03:32:29 +0300
Subject: [PATCH 406/463] [GTK3, HiDPI] Fix width/height round-trip through
 ConfigureNotify

* src/gtkutil.c (xg_frame_set_char_size)
(xg_frame_set_size_and_position): Truncate WIDTH and HEIGHT to
be multiples of the scale factor (bug#80662).
---
 src/gtkutil.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/gtkutil.c b/src/gtkutil.c
index ce91d2a189b..daa3fd1b993 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1181,6 +1181,7 @@ xg_frame_set_char_size (struct frame *f, int width, int height)
   int outer_height
     = height + FRAME_TOOLBAR_HEIGHT (f) + FRAME_MENUBAR_HEIGHT (f);
   int outer_width = width + FRAME_TOOLBAR_WIDTH (f);
+  int scale = xg_get_scale (f);
 
 #ifndef HAVE_PGTK
   gtk_window_get_size (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
@@ -1200,8 +1201,10 @@ xg_frame_set_char_size (struct frame *f, int width, int height)
     }
 #endif
 
-  outer_height /= xg_get_scale (f);
-  outer_width /= xg_get_scale (f);
+  outer_height /= scale;
+  outer_width /= scale;
+  height = outer_height * scale;
+  width = outer_width * scale;
 
   xg_wm_set_size_hint (f, 0, 0);
 
@@ -1328,6 +1331,9 @@ xg_frame_set_size_and_position (struct frame *f, int width, int height)
 
   outer_height /= scale;
   outer_width /= scale;
+  height = outer_height * scale;
+  width = outer_width * scale;
+
   x /= scale;
   y /= scale;
 

From e613e38021e35f30831827cd216dd28378b94950 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Fri, 8 May 2026 13:42:54 +0200
Subject: [PATCH 407/463] Update "timeout" to 2.1.6

See https://lists.gnu.org/archive/html/emacs-devel/2026-05/msg00033.html.
---
 lisp/emacs-lisp/timeout.el | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/lisp/emacs-lisp/timeout.el b/lisp/emacs-lisp/timeout.el
index b5ea819a6e2..5accb5b7e24 100644
--- a/lisp/emacs-lisp/timeout.el
+++ b/lisp/emacs-lisp/timeout.el
@@ -1,10 +1,10 @@
 ;;; timeout.el --- Throttle or debounce Elisp functions  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2023-2026 Free Software Foundation, Inc.
+;; Copyright (C) 2023-2026  Free Software Foundation, Inc.
 
 ;; Author: Karthik Chikmagalur <karthikchikmagalur@gmail.com>
 ;; Keywords: convenience, extensions
-;; Version: 2.1
+;; Version: 2.1.6
 ;; Package-Requires: ((emacs "24.4"))
 ;; URL: https://github.com/karthink/timeout
 
@@ -58,6 +58,9 @@
 ;;; Code:
 (require 'nadvice)
 
+(define-obsolete-function-alias 'timeout-throttle! 'timeout-throttle "v2.0")
+(define-obsolete-function-alias 'timeout-debounce! 'timeout-debounce "v2.0")
+
 (defsubst timeout--eval-value (value)
   "Eval a VALUE.
 If value is a function (either lambda or a callable symbol), eval the
@@ -109,9 +112,13 @@ This is intended for use as function advice."
       "Debounce calls to this function."
       (prog1 default
         (if (timerp debounce-timer)
-            (timer-set-idle-time debounce-timer (timeout--eval-value delay-value))
+            (progn
+              (cancel-timer debounce-timer)
+              (timer-set-time
+               debounce-timer (time-add nil (timeout--eval-value delay-value)))
+              (timer-activate debounce-timer))
           (setq debounce-timer
-                (run-with-idle-timer
+                (run-with-timer
                  (timeout--eval-value delay-value) nil
                  (lambda (buf)
                    (cancel-timer debounce-timer)
@@ -206,7 +213,7 @@ previous successful call is returned."
           (unless (and throttle-timer (timerp throttle-timer))
             (setq result (apply func args))
             (setq throttle-timer
-             (run-with-timer
+                  (run-with-timer
                    (timeout--eval-value throttle-value) nil
                    (lambda ()
                      (cancel-timer throttle-timer)
@@ -238,9 +245,13 @@ returned."
                         (cadr (interactive-form func))))
           (prog1 default
             (if (timerp debounce-timer)
-                (timer-set-idle-time debounce-timer (timeout--eval-value delay-value))
+                (progn
+                  (cancel-timer debounce-timer)
+                  (timer-set-time
+                   debounce-timer (time-add nil (timeout--eval-value delay-value)))
+                  (timer-activate debounce-timer))
               (setq debounce-timer
-                    (run-with-idle-timer
+                    (run-with-timer
                      (timeout--eval-value delay-value) nil
                      (lambda (buf)
                        (cancel-timer debounce-timer)
@@ -259,9 +270,13 @@ returned."
           "\n\nDebounce calls to this function"))
         (prog1 default
           (if (timerp debounce-timer)
-              (timer-set-idle-time debounce-timer (timeout--eval-value delay-value))
+              (progn
+                (cancel-timer debounce-timer)
+                (timer-set-time
+                 debounce-timer (time-add nil (timeout--eval-value delay-value)))
+                (timer-activate debounce-timer))
             (setq debounce-timer
-                  (run-with-idle-timer
+                  (run-with-timer
                    (timeout--eval-value delay-value) nil
                    (lambda (buf)
                      (cancel-timer debounce-timer)

From 9e4ea934f23ffdc988bc10104169b99a44502e20 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Mon, 11 May 2026 15:34:24 +0200
Subject: [PATCH 408/463] Fix 'prepare-user-lisp' to follow symlinks

* lisp/startup.el (prepare-user-lisp): Call
'directory-files-recursively' with a non-nil value for
FOLLOW-SYMLINKS.  This was the intended way for the function to
operate, during the planning phase, so that users could
structure their User Lisp directory by linking in Lisp
directories from other parts of their file system.
---
 lisp/startup.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/startup.el b/lisp/startup.el
index e4c20d4b592..e6f2087604f 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1265,7 +1265,7 @@ unconditionally."
          (backup-inhibited t)
          (dirs (list dir)))
     (add-to-list 'load-path (directory-file-name dir))
-    (dolist (file (directory-files-recursively dir "" t pred))
+    (dolist (file (directory-files-recursively dir "" t pred t))
       (cond
        ((and (file-regular-p file) (string-suffix-p ".el" file))
         (unless just-activate

From 519fd832111c5d10e67db11866557f2881083449 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 11 May 2026 18:11:24 +0200
Subject: [PATCH 409/463] Fix secrets.el when Emacs is a flatpak

* doc/misc/dbus.texi (Flatpak integration): New chapter.

* lisp/net/secrets.el (top): Protect against wrong signals in the
flatpak case.  (Bug#80977)
---
 doc/misc/dbus.texi  | 33 +++++++++++++++++++++++++++++++++
 lisp/net/secrets.el | 13 ++++++++-----
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 1f9d571a3b0..8764fcade90 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -66,6 +66,7 @@ another.  An overview of D-Bus can be found at
 * Errors and Events::           Errors and events.
 * Monitoring Messages::         Monitoring messages.
 * File Descriptors::            Handle file descriptors.
+* Flatpak integration::         Integration with flatpak
 * Index::                       Index including concepts, functions, variables.
 
 * GNU Free Documentation License:: The license for this documentation.
@@ -2302,6 +2303,38 @@ instance have acquired a file descriptor as well.  Example:
 @end defun
 
 
+@node Flatpak integration
+@chapter Integration with flatpak
+
+@c https://docs.flatpak.org/en/latest/sandbox-permissions.html
+@c TODO: This needs more input.
+
+If you run the Emacs flatpak program, there are restrictions.  By
+default, there is limited access to the session D-Bus, and no access to
+the system D-Bus.  You must enable access to services living outside the
+sandbox like
+
+@example
+# flatpak override --talk-name=org.freedesktop.secrets org.gnu.emacs
+@end example
+
+@samp{org.gnu.emacs} is the Emacs flatpak application, and
+@samp{org.freedesktop.secrets} is a service you want to talk to, for
+example.
+
+Access to the entire bus with @samp{--socket=system-bus} or
+@samp{--socket=session-bus} stops the filtering and using them is a
+security risk. So they must be avoided.
+
+@c Bug#80977.
+Service names might be mapped when arriving Emacs.  For example, you
+will see the @samp{org.freedesktop.DBus.NameOwnerChanged} signal for
+service @samp{org.freedesktop.portal.Flatpak}, even if you have
+registered the signal for another namespace.
+
+@c TODO: What about portals?
+
+
 @node Index
 @unnumbered Index
 
diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el
index 0d585ffa261..973fd6bebab 100644
--- a/lisp/net/secrets.el
+++ b/lisp/net/secrets.el
@@ -913,11 +913,14 @@ to their attributes."
    :session dbus-service-dbus dbus-path-dbus
    dbus-interface-dbus "NameOwnerChanged"
    (lambda (&rest args)
-     (when secrets-debug (message "Secret Service has changed: %S" args))
-     (setq secrets-session-path secrets-empty-path
-	   secrets-prompt-signal nil
-	   secrets-collection-paths nil))
-   secrets-service)
+     ;; The flatpak version of Emacs shows also signals from
+     ;; "org.freedesktop.portal.Flatpak".  (Bug#80977)
+     (when (and (stringp (car args)) (string-equal secrets-service (car args)))
+       (when secrets-debug (message "Secret Service has changed: %S" args))
+       (setq secrets-session-path secrets-empty-path
+	     secrets-prompt-signal nil
+	     secrets-collection-paths nil)))
+   :arg-namespace secrets-service)
 
   ;; We want to refresh our cache, when there is a change in
   ;; collections.

From f12b01582db7ca834e60b21760d18db3f2c8bf54 Mon Sep 17 00:00:00 2001
From: Juri Linkov <juri@linkov.net>
Date: Mon, 11 May 2026 20:30:15 +0300
Subject: [PATCH 410/463] Fix Completions buffer disappearing with tmm-menubar
 (bug#80995)

* lisp/minibuffer.el (completions--start-background-update):
Cancel a possible leftover timer (e.g. from the previous
after-change hook) that would suppress the display of
*Completions* when 'completion-eager-update' is nil.
(completions--after-change): Don't start background update
when not required to automatically update *Completions*.
---
 lisp/minibuffer.el | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 636d0951645..e8fb479bc85 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -2791,6 +2791,9 @@ Whether we update the buffer is based on `completion-eager-display' and
 `eager-display' and `eager-update'.
 
 If FORCE-EAGER-UPDATE is non-nil, we only check eager-display."
+  (when (and force-eager-update completions--background-update-timer)
+    (cancel-timer completions--background-update-timer)
+    (setq completions--background-update-timer nil))
   (unless completions--background-update-timer
     (setq completions--background-update-timer
           (run-with-idle-timer
@@ -2811,7 +2814,10 @@ has been requested by the completion table."
       (when completion-auto-deselect
         (with-selected-window window
           (completions--deselect))))
-    (completions--start-background-update)))
+    (when (or completion-in-region-mode
+              (completions--should-show-p
+               (completion--field-metadata (minibuffer-prompt-end))))
+      (completions--start-background-update))))
 
 (defun minibuffer-completion-help (&optional start end)
   "Display a list of possible completions of the current minibuffer contents."

From 0e7a24d93131924837f93dd6b3ea27e6585d1bd1 Mon Sep 17 00:00:00 2001
From: Elias Gabriel Perez <eg642616@gmail.com>
Date: Wed, 15 Apr 2026 10:58:28 -0600
Subject: [PATCH 411/463] * lisp/progmodes/hideshow.el (hs--set-variable): Use
 'set-local' (bug#80999)

---
 lisp/progmodes/hideshow.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index 34a3fe97da3..f781a82b105 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -1228,9 +1228,9 @@ DEFAULT is a value to use as fallback."
               (val (if (integerp nth)
                        (nth nth old-lookup)
                      (funcall nth old-lookup))))
-        (set (make-local-variable var) val)
+        (set-local var val)
       (when default
-        (set (make-local-variable var) default)))))
+        (set-local var default)))))
 
 ;; TODO: When `hs-special-modes-alist' is removed, `hs-grok-mode-type'
 ;; and `hs--set-variable' will no longer be necessary, but

From 09dc864b0b86e6db292b51983db7086d7a5cc53c Mon Sep 17 00:00:00 2001
From: Aidan Coyle <packrat386@gmail.com>
Date: Wed, 29 Apr 2026 11:17:44 -0500
Subject: [PATCH 412/463] Fix eww-submit for forms with no action (bug#80918)

* lisp/net/eww.el (eww-submit): If a form does not specify an action
the assumed action is the current URL. If the current URL has an
existing query part, that part must be replaced by the form values,
rather than appended to.

Copyright-paperwork-exempt: yes
---
 lisp/net/eww.el | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 70d70185688..9acbaa52fa9 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -2246,11 +2246,12 @@ Interactively, EVENT is the value of `last-nonmenu-event'."
 				    (plist-get eww-data :url)))))))
       (eww-browse-url
        (concat
-	(if (cdr (assq :action form))
-	    (shr-expand-url (cdr (assq :action form)) (plist-get eww-data :url))
-	  (plist-get eww-data :url))
-	"?"
-	(mm-url-encode-www-form-urlencoded values))))))
+        (shr-expand-url
+         (or (cdr (assq :action form))
+             (car (url-path-and-query (url-generic-parse-url (plist-get eww-data :url)))))
+         (plist-get eww-data :url))
+        "?"
+        (mm-url-encode-www-form-urlencoded values))))))
 
 (defun eww-browse-with-external-browser (&optional url)
   "Browse the current URL with an external browser.

From 7eab6ef3cee22c5f3ada55f1a68e29cb3f23da45 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Mon, 11 May 2026 23:43:27 +0200
Subject: [PATCH 413/463] Fix 'sgml-parse-tag-backward' to handle tags in
 comments

* lisp/textmodes/sgml-mode.el (sgml--find-<>-backward): Ignore
SGML tags that happen to occur within comments.  This also means
that the contents of comments are not indented, but also do not
affect the indentation of tags following the comments as well.

(Bug#80841)
---
 lisp/textmodes/sgml-mode.el | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index be14462d1a0..c9f38d1ee47 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1397,7 +1397,13 @@ Returns t if found, nil otherwise."
     (while (re-search-backward "[<>]" limit 'move)
       ;; If this character has "open" or "close" syntax, then we've
       ;; found the one we want.
-      (when (memq (syntax-class (syntax-after (point))) '(4 5))
+      (when (and (memq (syntax-class (syntax-after (point))) '(4 5))
+                 ;; We want to ignore tags in comments.  We could also
+                 ;; check `syntax-ppss', but that can become expensive
+                 ;; in a busy loop, so we re-use the face instead.
+                 (not (memq (get-text-property (point) 'face)
+                            '(font-lock-comment-delimiter-face
+                              font-lock-comment-face))))
         (throw 'found t)))))
 
 (defun sgml-parse-tag-backward (&optional limit)

From a8f67a1f06700044b0d19413af7f5427b20eda0e Mon Sep 17 00:00:00 2001
From: "F. Jason Park" <jp@neverwas.me>
Date: Mon, 11 May 2026 11:33:55 -0700
Subject: [PATCH 414/463] Change ERC version for Emacs 31 to 5.6.2.31.1

* doc/misc/erc.texi: Change ERCVER to 5.6.2.31.1.
* lisp/erc/erc.el: Change "Version" package header to 5.6.2.31.1.  Don't
update the `customize-package-emacs-version-alist' entry because this is
not a GNU ELPA release.
(erc-version): Change version to 5.6.2.31.1.

Do not merge to master.
---
 doc/misc/erc.texi | 2 +-
 lisp/erc/erc.el   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index ef4b85da485..5e41ccf0eef 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -3,7 +3,7 @@
 @setfilename ../../info/erc.info
 @settitle ERC Manual
 @documentlanguage en
-@set ERCVER 5.6.2
+@set ERCVER 5.6.2.31.1
 @set ERCDIST as distributed with Emacs @value{EMACSVER}
 @include docstyle.texi
 @syncodeindex fn cp
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 6facb7966b0..d37862406e9 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -12,7 +12,7 @@
 ;;               David Edmondson (dme@dme.org)
 ;;               Michael Olson (mwolson@gnu.org)
 ;;               Kelvin White (kwhite@gnu.org)
-;; Version: 5.6.2-git
+;; Version: 5.6.2.31.1
 ;; Package-Requires: ((emacs "27.1") (compat "29.1.4.5"))
 ;; Keywords: IRC, chat, client, Internet
 ;; URL: https://www.gnu.org/software/emacs/erc.html
@@ -70,7 +70,7 @@
 (require 'auth-source)
 (eval-when-compile (require 'subr-x))
 
-(defconst erc-version "5.6.2-git"
+(defconst erc-version "5.6.2.31.1"
   "This version of ERC.")
 
 (defvar erc-official-location

From 6d347d983480c17293da0d430360d98cfc8bd805 Mon Sep 17 00:00:00 2001
From: "F. Jason Park" <jp@neverwas.me>
Date: Mon, 11 May 2026 11:54:38 -0700
Subject: [PATCH 415/463] Release ERC 5.6.2

* lisp/erc/erc.el: Change "Version" package header from 5.6.2-git to
5.6.2.  The ERCVER variable in doc/misc/erc.texi is already there.
Retain `customize-package-emacs-version-alist' mapping to Emacs 31.1
even though master has already advanced to 32.0.50.
(erc-version): Change version from 5.6.2-git to 5.6.2.
---
 lisp/erc/erc.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 6facb7966b0..6dd60cf82a9 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -12,7 +12,7 @@
 ;;               David Edmondson (dme@dme.org)
 ;;               Michael Olson (mwolson@gnu.org)
 ;;               Kelvin White (kwhite@gnu.org)
-;; Version: 5.6.2-git
+;; Version: 5.6.2
 ;; Package-Requires: ((emacs "27.1") (compat "29.1.4.5"))
 ;; Keywords: IRC, chat, client, Internet
 ;; URL: https://www.gnu.org/software/emacs/erc.html
@@ -70,7 +70,7 @@
 (require 'auth-source)
 (eval-when-compile (require 'subr-x))
 
-(defconst erc-version "5.6.2-git"
+(defconst erc-version "5.6.2"
   "This version of ERC.")
 
 (defvar erc-official-location

From c68f3237bea2b38a327f891b4517bee4e317daec Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 12 May 2026 08:48:43 +0200
Subject: [PATCH 416/463] Fix file-name-non-special implementation of
 get-file-buffer

* lisp/files.el (file-name-non-special): Fix `get-file-buffer'.
(Bug#80718)

* test/lisp/files-tests.el
(files-tests-file-name-non-special--temp-file-prefixes): Extend list.
(w32-downcase-file-names): Declare.
(files-tests-file-name-non-special-get-file-buffer): Adapt test.
---
 lisp/files.el            |  3 +++
 test/lisp/files-tests.el | 13 ++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lisp/files.el b/lisp/files.el
index 9b1fc09fcfa..22313b71635 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -8742,6 +8742,9 @@ arguments as the running Emacs)."
 			  (file-in-directory-p 0 1)
 			  (make-symbolic-link 0 1)
 			  (add-name-to-file 0 1)
+                          ;; `get-file-buffer' shall simply run the
+                          ;; original function.
+                          (get-file-buffer)
                           ;; These file-notify-* operations take a
                           ;; descriptor.
                           (file-notify-rm-watch)
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index 55011cd461a..822e031e0bf 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -401,7 +401,8 @@ be $HOME."
   (append '("foo" "$foo" "~foo")
           ;; No amount of quoting will allow creation of a file name
           ;; with an embedded '*' on MS-Windows and MS-DOS.
-          (if (not (memq system-type '(windows-nt ms-dos))) '("foo*bar")))
+          (if (not (memq system-type '(windows-nt ms-dos)))
+              '("foo*bar" "foo?bar")))
   "Prefixes to be tested for `file-name-non-special' tests.")
 
 (ert-deftest files-tests-file-name-non-special--subprocess ()
@@ -696,6 +697,8 @@ unquoted file names."
       (tmpdir nospecial-dir t)
     (should-error (directory-files-and-attributes nospecial-dir))))
 
+(defvar w32-downcase-file-names)
+
 (ert-deftest files-tests-directory-files-recursively-w32 ()
   "Test MS-Windows specific features of `directory-files-recursively'."
   (skip-unless (eq system-type 'windows-nt))
@@ -1054,12 +1057,16 @@ unquoted file names."
 (ert-deftest files-tests-file-name-non-special-get-file-buffer ()
   ;; Make sure these buffers don't exist.
   (files-tests--with-temp-non-special (tmpfile nospecial)
+    (find-file-noselect nospecial)
     (let ((fbuf (get-file-buffer nospecial)))
-      (if fbuf (kill-buffer fbuf))
+      (should (get-file-buffer nospecial))
+      (kill-buffer fbuf)
       (should-not (get-file-buffer nospecial))))
   (files-tests--with-temp-non-special-and-file-name-handler (tmpfile nospecial)
+    (find-file-noselect nospecial)
     (let ((fbuf (get-file-buffer nospecial)))
-      (if fbuf (kill-buffer fbuf))
+      (should (get-file-buffer nospecial))
+      (kill-buffer fbuf)
       (should-not (get-file-buffer nospecial)))))
 
 (ert-deftest files-tests-file-name-non-special-insert-directory ()

From 07f2bbc905d8c8ba6fa676db30ed226f2e4e3ae3 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Tue, 12 May 2026 09:49:53 +0100
Subject: [PATCH 417/463] vc-dir-resynch-file: Pass down non-truename'd FILE

* lisp/vc/vc-dir.el (vc-dir-recompute-file-state): Delete
recently introduced TRUENAME parameter.
(vc-dir-resynch-file): Pass the file name from before calling
file-truename to vc-dir-recompute-file-state.
---
 lisp/vc/vc-dir.el | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 3c9222d725f..2d6f8ee97d0 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -1261,12 +1261,9 @@ that file."
 	     (vc-dir-fileinfo->state crt-data)) result))
     (nreverse result)))
 
-(defun vc-dir-recompute-file-state (fname def-dir &optional truename)
-  "Compute state of FNAME known to live inside DEF-DIR.
-If TRUENAME is non-nil, FNAME is a truename, DEF-DIR not necessarily."
-  (let* ((file-short (file-relative-name
-                      fname (if truename (file-truename def-dir) def-dir)))
-         (fname (if truename (expand-file-name file-short def-dir) fname))
+(defun vc-dir-recompute-file-state (fname def-dir)
+  "Compute state of FNAME known to live inside DEF-DIR."
+  (let* ((file-short (file-relative-name fname def-dir))
 	 (_remove-me-when-CVS-works
 	  (when (eq vc-dir-backend 'CVS)
 	    ;; FIXME: Warning: UGLY HACK.  The CVS backend caches the state
@@ -1309,8 +1306,9 @@ If TRUENAME is non-nil, FNAME is a truename, DEF-DIR not necessarily."
 
 (defun vc-dir-resynch-file (&optional fname)
   "Update the entries for FNAME in any directory buffers that list it."
-  (let ((file (file-truename (or fname buffer-file-name)))
-        (drop '()))
+  (let* ((file  (or fname buffer-file-name))
+         (file-tn (file-truename file))
+         (drop '()))
     (save-current-buffer
       ;; look for a vc-dir buffer that might show this file.
       (dolist (status-buf vc-dir-buffers)
@@ -1328,17 +1326,15 @@ If TRUENAME is non-nil, FNAME is a truename, DEF-DIR not necessarily."
                          ;; `default-directory' in order to do its work,
                          ;; but that's irrelevant to us here.
                          (buffer-local-toplevel-value 'default-directory))))
-              (when (file-in-directory-p file ddir)
-                (if (file-directory-p file)
+              (when (file-in-directory-p file-tn ddir)
+                (if (file-directory-p file-tn)
 		    (progn
-		      (vc-dir-resync-directory-files file)
+		      (vc-dir-resync-directory-files file-tn)
 		      (ewoc-set-hf vc-ewoc
 				   (vc-dir-headers vc-dir-backend ddir) ""))
                   (let* ((complete-state
-                          ;; Make sure 'vc-dir-recompute-file-state'
-                          ;; knows about the truename nature of 'file'
-                          ;; (bug#80967).
-                          (vc-dir-recompute-file-state file ddir t))
+                          ;; Pass FILE not FILE-TN here.  See bug#80967.
+                          (vc-dir-recompute-file-state file ddir))
 			 (state (cadr complete-state)))
                     (vc-dir-update
                      (list complete-state)

From 306f4d1660829fc4c56d8a56f3a28044dbd99d68 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Tue, 12 May 2026 15:47:44 +0200
Subject: [PATCH 418/463] url-cookie: use C locale when formatting expiry times

The expiry time needs to be reconizable by parse-time-string,
which is only guaranteed with the C locale.

* lisp/url/url-cookie.el (url-cookie-parse-file-netscape): Use C
locale for formatted expiry time.
(url-cookie-handle-set-cookie): Likewise.
---
 lisp/url/url-cookie.el | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index 153d39213b4..2cc67a030ce 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -103,12 +103,13 @@ i.e. 1970-1-1) are loaded as expiring one year from now instead."
 		    ;; reuse a browser session, so to prevent the
 		    ;; cookie from being detected as expired straight
 		    ;; away, make it expire a year from now
-		    (expires (format-time-string
-			      "%d %b %Y %T [GMT]"
-			      (let ((s (string-to-number (nth 4 fields))))
-				(if (and (zerop s) long-session)
-				    (time-add nil (* 365 24 60 60))
-				  s))))
+		    (expires (let ((system-time-locale "C"))
+                               (format-time-string
+			        "%d %b %Y %T [GMT]"
+			        (let ((s (string-to-number (nth 4 fields))))
+				  (if (and (zerop s) long-session)
+				      (time-add nil (* 365 24 60 60))
+				    s)))))
 		    (key (nth 5 fields))
 		    (val (nth 6 fields)))
                 (incf n)
@@ -300,9 +301,10 @@ i.e. 1970-1-1) are loaded as expiring one year from now instead."
 	 (expires nil))
     (if (and max-age (string-match "\\`-?[0-9]+\\'" max-age))
 	(setq expires (ignore-errors
-                        (format-time-string "%a %b %d %H:%M:%S %Y GMT"
-					    (time-add nil (read max-age))
-					    t)))
+                        (let ((system-time-locale "C"))
+                          (format-time-string "%a %b %d %H:%M:%S %Y GMT"
+					      (time-add nil (read max-age))
+					      t)))
       (setq expires (cdr-safe (assoc-string "expires" args t))))
     (while (consp trusted)
       (if (string-match (car trusted) current-url)

From 98c28606d2a67ceab4c6cb03a17eb756e809b31b Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Tue, 12 May 2026 17:10:35 +0200
Subject: [PATCH 419/463] ; Fix typo

---
 lisp/url/url-cookie.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index 2cc67a030ce..67f6d1e216d 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -304,7 +304,7 @@ i.e. 1970-1-1) are loaded as expiring one year from now instead."
                         (let ((system-time-locale "C"))
                           (format-time-string "%a %b %d %H:%M:%S %Y GMT"
 					      (time-add nil (read max-age))
-					      t)))
+					      t))))
       (setq expires (cdr-safe (assoc-string "expires" args t))))
     (while (consp trusted)
       (if (string-match (car trusted) current-url)

From 20d17df3f4ffc0214cf86f49ed4dc35810bafd7d Mon Sep 17 00:00:00 2001
From: Juri Linkov <juri@linkov.net>
Date: Tue, 12 May 2026 18:42:42 +0300
Subject: [PATCH 420/463] Use the new 'margin' face in Flymake (bug#80693)

* lisp/progmodes/flymake.el (flymake--bs-display):
Use the 'margin' face when it's available.
---
 lisp/progmodes/flymake.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index f62f9f5ce3c..823aa4fe673 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -2428,7 +2428,10 @@ symbol `fringes' or the symbol `margins'."
            `((margin ,flymake-margin-indicator-position)
              ,(propertize
                indicator-car
-               'face `(:inherit (,(cdr valuelist) default))
+               'face `(:inherit (,(cdr valuelist)
+                                 ,(if (facep 'margin)
+                                      'margin
+                                    'default)))
                'mouse-face 'highlight
                'help-echo "Open Flymake diagnostics"
                'keymap (let ((map (make-sparse-keymap)))

From 3630baae720842152c4d0df6692fabe8b3908203 Mon Sep 17 00:00:00 2001
From: Elias Gabriel Perez <eg642616@gmail.com>
Date: Sun, 10 May 2026 10:14:21 -0600
Subject: [PATCH 421/463] hideshow: Support new 'margin' face for margin
 indicators. (Bug#80693)

* lisp/progmodes/hideshow.el (hs-indicator-hide): Remove 'default' face.
(hs--make-indicators-overlays): Rework.
---
 lisp/progmodes/hideshow.el | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index f781a82b105..44b50584bf4 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -299,7 +299,7 @@ use that face for the ellipsis instead."
   :version "31.1")
 
 (defface hs-indicator-hide
-  '((t :inherit (shadow default)))
+  '((t :inherit shadow))
   "Face used in hideshow indicator to indicate a hidden block."
   :version "31.1")
 
@@ -1094,14 +1094,16 @@ the overlay: `invisible' `hs'.  Also, depending on variable
              `(left-fringe ,fringe-type ,face-or-icon)))
            ;; Margins
            ('margin
-            (propertize
-             "+" 'display
-             `((margin left-margin)
-               ,(or (plist-get (icon-elements face-or-icon) 'image)
-                    (propertize (icon-string face-or-icon)
-                                'keymap hs-indicators-map)))
-             'face face-or-icon
-             'keymap hs-indicators-map))
+            (let* ((icon-elements (icon-elements face-or-icon)))
+              (propertize
+               "+" 'display
+               `((margin left-margin)
+                 ,(or (plist-get icon-elements 'image)
+                      (propertize (plist-get icon-elements 'string)
+                                  'face `(,face-or-icon margin)
+                                  'keymap hs-indicators-map)))
+               'face `(,face-or-icon margin)
+               'keymap hs-indicators-map)))
            ;; EOL string
            ('nil
             (concat

From 08dc13ea94f13b0801579a87c7332838d22ca6d7 Mon Sep 17 00:00:00 2001
From: "F. Jason Park" <jp@neverwas.me>
Date: Mon, 11 May 2026 22:16:09 -0700
Subject: [PATCH 422/463] Change ERC version to 5.7-git

* doc/misc/erc.texi: Change ERCVER to 5.7 without a "-git" suffix.
* lisp/erc/erc.el (erc-version): Change working version to 5.7-git.  Do
the same for the package "Version" header.  Bump required Compat version
to 31.  Add new 5.7 to Emacs 32.1 mapping in top-level modification of
`customize-package-emacs-version-alist'.
---
 doc/misc/erc.texi | 2 +-
 lisp/erc/erc.el   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index ef4b85da485..03767a2e68c 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -3,7 +3,7 @@
 @setfilename ../../info/erc.info
 @settitle ERC Manual
 @documentlanguage en
-@set ERCVER 5.6.2
+@set ERCVER 5.7
 @set ERCDIST as distributed with Emacs @value{EMACSVER}
 @include docstyle.texi
 @syncodeindex fn cp
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 6dd60cf82a9..e3872d6d36a 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -12,8 +12,8 @@
 ;;               David Edmondson (dme@dme.org)
 ;;               Michael Olson (mwolson@gnu.org)
 ;;               Kelvin White (kwhite@gnu.org)
-;; Version: 5.6.2
-;; Package-Requires: ((emacs "27.1") (compat "29.1.4.5"))
+;; Version: 5.7-git
+;; Package-Requires: ((emacs "27.1") (compat "31"))
 ;; Keywords: IRC, chat, client, Internet
 ;; URL: https://www.gnu.org/software/emacs/erc.html
 
@@ -70,7 +70,7 @@
 (require 'auth-source)
 (eval-when-compile (require 'subr-x))
 
-(defconst erc-version "5.6.2"
+(defconst erc-version "5.7-git"
   "This version of ERC.")
 
 (defvar erc-official-location
@@ -89,7 +89,8 @@
        ("5.5" . "29.1")
        ("5.6" . "30.1")
        ("5.6.1" . "31.1")
-       ("5.6.2" . "31.1")))
+       ("5.6.2" . "31.1")
+       ("5.7" . "32.1")))
 
 (defgroup erc nil
   "Emacs Internet Relay Chat client."

From 88e8b8c073e8b1b9e90d26fab2998c863d3bba62 Mon Sep 17 00:00:00 2001
From: "F. Jason Park" <jp@neverwas.me>
Date: Tue, 16 Sep 2025 18:43:58 -0700
Subject: [PATCH 423/463] ; Remove some forward declarations from ERC tests

* lisp/erc/erc.el (erc--insert-before-markers-transplanting-hidden):
Don't deliberately return anything because the return value is
undefined.  The only existing call site, in `erc-insert-line', invokes
the function indirectly via `erc--insert-line-function' and discards the
result.
* test/lisp/erc/erc-scenarios-join-display-context.el: Require
`erc-join'.
* test/lisp/erc/erc-scenarios-log.el: Remove forward declarations and
require `erc-stamp'.
* test/lisp/erc/erc-scenarios-match.el: Require `erc-match'.
* test/lisp/erc/erc-scenarios-misc.el
(erc-scenarios-base-kill-server-track): Suppress unwanted newline in
test output.
* test/lisp/erc/erc-scenarios-sasl.el (erc-scenarios-sasl--plain-fail):
Don't redundantly bind `erc--warnings-buffer-name' or create a buffer
for it.  Use literal value assigned by test fixture instead.
* test/lisp/erc/erc-scenarios-services-misc.el: Require `erc-services'.
* test/lisp/erc/erc-tests.el (erc-handle-irc-url): Remove redundant
`save-excursion'.
(erc-tests--modules): Reflow into single column for easier management of
divergent WIP patch sets.  This should help minimize manual surgery when
applying them atop one another.
* test/lisp/erc/resources/erc-scenarios-common.el: Remove unused
`require's and forward declarations from top of file.
(erc-scenarios-common--make-bindings): Remove the non-existent
`erc-auth-source-parameters-join-function' and add
`erc--warnings-buffer-name'.  The latter's buffer, if created, will be
killed automatically when the test body exits.
(erc-scenarios-common-with-cleanup): Generate locally scoped defvars to
be used in a manner similar to `dlet' for user options yet to be loaded.
(erc-scenarios-common--assert-date-stamps): Don't run when `erc-stamp'
isn't loaded.
---
 lisp/erc/erc.el                               |   3 +-
 .../erc/erc-scenarios-join-display-context.el |   2 +
 test/lisp/erc/erc-scenarios-log.el            |   6 +-
 test/lisp/erc/erc-scenarios-match.el          |   5 +-
 test/lisp/erc/erc-scenarios-misc.el           |   3 +-
 test/lisp/erc/erc-scenarios-sasl.el           |   4 +-
 test/lisp/erc/erc-scenarios-services-misc.el  |   3 +-
 test/lisp/erc/erc-tests.el                    |  48 +++++--
 .../erc/resources/erc-scenarios-common.el     | 133 ++++++++++--------
 9 files changed, 124 insertions(+), 83 deletions(-)

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index e3872d6d36a..d70a1f11ede 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -3749,7 +3749,8 @@ the inserted version of STRING."
          (new (and before (erc--solo (cl-intersection b a)))))
     (when new
       (erc--remove-from-prop-value-list (1- (point)) (point) 'invisible a))
-    (prog1 (insert-before-markers string)
+    (progn
+      (insert-before-markers string)
       (when new
         (erc--merge-prop (1- (point)) (point) 'invisible new)))))
 
diff --git a/test/lisp/erc/erc-scenarios-join-display-context.el b/test/lisp/erc/erc-scenarios-join-display-context.el
index 07d7ff1519e..e525eb59f82 100644
--- a/test/lisp/erc/erc-scenarios-join-display-context.el
+++ b/test/lisp/erc/erc-scenarios-join-display-context.el
@@ -26,6 +26,8 @@
   (let ((load-path (cons (ert-resource-directory) load-path)))
     (require 'erc-scenarios-common)))
 
+(require 'erc-join)
+
 ;; This module uses the list `erc-join--requested-channels' to detect
 ;; whether a JOIN response was likely triggered by an outgoing JOIN
 ;; emitted on behalf of `erc-autojoin-channels-alist'.  When a related
diff --git a/test/lisp/erc/erc-scenarios-log.el b/test/lisp/erc/erc-scenarios-log.el
index 7452062e3c5..4f190ae898e 100644
--- a/test/lisp/erc/erc-scenarios-log.el
+++ b/test/lisp/erc/erc-scenarios-log.el
@@ -28,8 +28,7 @@
 
 (require 'erc-log)
 (require 'erc-truncate)
-
-(defvar erc-timestamp-format-left)
+(require 'erc-stamp)
 
 (ert-deftest erc-scenarios-log--kill-hook ()
   :tags '(:expensive-test)
@@ -327,9 +326,6 @@
        (funcall expect 1 "loathed enemy")
        (funcall expect -0.001 "please your lordship")))))
 
-(defvar erc-insert-timestamp-function)
-(declare-function erc-insert-timestamp-left "erc-stamp" (string))
-
 (ert-deftest erc-scenarios-log--save-buffer-in-logs/truncate-on-save ()
   :tags '(:expensive-test)
   (with-suppressed-warnings ((obsolete erc-truncate-buffer-on-save))
diff --git a/test/lisp/erc/erc-scenarios-match.el b/test/lisp/erc/erc-scenarios-match.el
index bc5ebe27ce9..b22cff18c46 100644
--- a/test/lisp/erc/erc-scenarios-match.el
+++ b/test/lisp/erc/erc-scenarios-match.el
@@ -24,10 +24,7 @@
   (let ((load-path (cons (ert-resource-directory) load-path)))
     (require 'erc-scenarios-common)))
 
-(eval-when-compile
-  (require 'erc-join)
-  (require 'erc-match))
-
+(require 'erc-match)
 (require 'erc-stamp)
 (require 'erc-fill)
 
diff --git a/test/lisp/erc/erc-scenarios-misc.el b/test/lisp/erc/erc-scenarios-misc.el
index e973c912cf9..ef6e2fd3392 100644
--- a/test/lisp/erc/erc-scenarios-misc.el
+++ b/test/lisp/erc/erc-scenarios-misc.el
@@ -236,7 +236,8 @@
         (set-process-query-on-exit-flag erc-server-process nil)
         (kill-buffer))
       (should-not (eq (current-buffer) (get-buffer "#chan"))) ; *temp*
-      (ert-simulate-command '(erc-track-switch-buffer 1)) ; No longer signals
+      (let ((inhibit-message noninteractive))
+        (ert-simulate-command '(erc-track-switch-buffer 1))) ; doesn't signal
       (should (eq (current-buffer) (get-buffer "#chan"))))))
 
 ;;; erc-scenarios-misc.el ends here
diff --git a/test/lisp/erc/erc-scenarios-sasl.el b/test/lisp/erc/erc-scenarios-sasl.el
index c7ea3e46997..edd0dcf3fa0 100644
--- a/test/lisp/erc/erc-scenarios-sasl.el
+++ b/test/lisp/erc/erc-scenarios-sasl.el
@@ -149,8 +149,6 @@
        (erc-modules (cons 'sasl erc-modules))
        (erc-sasl-password "wrong")
        (erc-sasl-mechanism 'plain)
-       (erc--warnings-buffer-name  "*ERC test warnings*")
-       (warnings-buffer (get-buffer-create erc--warnings-buffer-name))
        (inhibit-message noninteractive)
        (expect (erc-d-t-make-expecter)))
 
@@ -164,7 +162,7 @@
       (funcall expect 20 "Connection failed!")
       (should-not (erc-server-process-alive)))
 
-    (with-current-buffer warnings-buffer
+    (with-current-buffer "*ERC test warnings*"
       (funcall expect 10 "please review SASL settings")))
 
   (when noninteractive
diff --git a/test/lisp/erc/erc-scenarios-services-misc.el b/test/lisp/erc/erc-scenarios-services-misc.el
index bc6522ae110..6a7d3c2f882 100644
--- a/test/lisp/erc/erc-scenarios-services-misc.el
+++ b/test/lisp/erc/erc-scenarios-services-misc.el
@@ -24,8 +24,7 @@
   (let ((load-path (cons (ert-resource-directory) load-path)))
     (require 'erc-scenarios-common)))
 
-(eval-when-compile (require 'erc-join)
-                   (require 'erc-services))
+(require 'erc-services)
 
 (ert-deftest erc-scenarios-services-password ()
   :tags '(:expensive-test)
diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el
index dd439e73fc9..2b8e6b3ecca 100644
--- a/test/lisp/erc/erc-tests.el
+++ b/test/lisp/erc/erc-tests.el
@@ -3602,8 +3602,7 @@
         (should-not calls))
 
       (ert-info ("Known network, existing chan with key")
-        (save-excursion
-          (with-current-buffer "foonet" (erc--open-target "#chan")))
+        (with-current-buffer "foonet" (erc--open-target "#chan"))
         (erc-handle-irc-url "irc.foonet.org" nil "#chan?sec" nil nil "irc")
         (should (equal '("#chan" "sec") (pop calls)))
         (should-not calls))
@@ -3685,12 +3684,45 @@
       (should (= 0 (erc-channel-user-status u))))))
 
 (defconst erc-tests--modules
-  '( autoaway autojoin bufbar button capab-identify
-     command-indicator completion dcc fill identd
-     imenu irccontrols keep-place list log match menu move-to-prompt netsplit
-     networks nickbar nicks noncommands notifications notify page readonly
-     replace ring sasl scrolltobottom services smiley sound
-     spelling stamp track truncate unmorse xdcc))
+  '(autoaway
+    autojoin
+    bufbar
+    button
+    capab-identify
+    command-indicator
+    completion
+    dcc
+    fill
+    identd
+    imenu
+    irccontrols
+    keep-place
+    list log
+    match
+    menu
+    move-to-prompt
+    netsplit
+    networks
+    nickbar
+    nicks
+    noncommands
+    notifications
+    notify
+    page
+    readonly
+    replace
+    ring
+    sasl
+    scrolltobottom
+    services
+    smiley
+    sound
+    spelling
+    stamp
+    track
+    truncate
+    unmorse
+    xdcc))
 
 ;; Ensure that `:initialize' doesn't change the ordering of the
 ;; members because otherwise the widget's state is "edited".
diff --git a/test/lisp/erc/resources/erc-scenarios-common.el b/test/lisp/erc/resources/erc-scenarios-common.el
index fa187cc59f7..aa18bbf7b21 100644
--- a/test/lisp/erc/resources/erc-scenarios-common.el
+++ b/test/lisp/erc/resources/erc-scenarios-common.el
@@ -93,13 +93,6 @@
 
 (require 'erc)
 
-(eval-when-compile (require 'erc-join)
-                   (require 'erc-services)
-                   (require 'erc-fill))
-
-(declare-function erc-network "erc-networks")
-(defvar erc-network)
-
 (defvar erc-scenarios-common--resources-dir
   (expand-file-name "../" (ert-resource-directory)))
 
@@ -149,76 +142,96 @@
       (auth-source-do-cache nil)
       (timer-list (copy-sequence timer-list))
       (timer-idle-list (copy-sequence timer-idle-list))
-      (erc-auth-source-parameters-join-function nil)
+      ;; This binding exists to protect the default value because ERC
+      ;; adds all joined channels automatically.
       (erc-autojoin-channels-alist nil)
       (erc-server-auto-reconnect nil)
       (erc-after-connect nil)
       (erc-last-input-time 0)
       (erc-d-linger-secs 10)
+      ;; This buffer, if created by `erc--lwarn', will be killed before
+      ;; `erc-scenarios-common-with-cleanup' exits.
+      (erc--warnings-buffer-name  "*ERC test warnings*")
       ,@bindings)))
 
 (defmacro erc-scenarios-common-with-cleanup (bindings &rest body)
   "Provide boilerplate cleanup tasks after calling BODY with BINDINGS.
+Shadow various options and variables used by ERC with values more
+suitable for test purposes.  These can be overridden in the \"varlist\"
+BINDINGS.  Upon exiting, kill buffers and delete processes created by
+ERC, as well as any bound to variables in BINDINGS.  However, adding
+items not referenced in BODY for this purpose alone can confuse readers.
 
-If an `erc-d' process exists, wait for it to start before running BODY.
-If `erc-autojoin-mode' mode is bound, restore it during cleanup if
-disabled by BODY.  Other defaults common to these test cases are added
-below and can be overridden, except when wanting the \"real\" default
-value, which must be looked up or captured outside of the calling form.
+Avoid taking special care to restore the effect of activating global
+modules in BODY.  However, as a special case, if the variable
+`erc-autojoin-mode' mode is bound, restore its minor-mode activation
+state during teardown if modified by BODY.
 
-When running tests tagged as serially runnable while interactive
-and the flag `erc-scenarios-common--graphical-p' is non-nil, run
-teardown tasks normally inhibited when interactive.  That is,
-behave almost as if `noninteractive' were also non-nil, and
-ensure buffers and other resources are destroyed on completion.
+Additionally, prepare the environment for an `erc-d' test server.  If an
+`erc-d' process exists, wait for it to start before running BODY.
+Locate dialog resource directories by expanding the variable
+`erc-scenarios-common-dialog' or its value in BINDINGS.
 
-Dialog resource directories are located by expanding the variable
-`erc-scenarios-common-dialog' or its value in BINDINGS."
+If the flag `erc-scenarios-common--graphical-p' is non-nil and a test is
+tagged as interactive-aware, usually via the \"ERC_TESTS_GRAPHICAL\"
+environment variable, run teardown tasks normally inhibited when
+interactive.  That is, behave almost as if `noninteractive' were also
+non-nil, and ensure buffers and other resources are destroyed on
+completion."
   (declare (indent 1))
 
   (let* ((orig-autojoin-mode (make-symbol "orig-autojoin-mode"))
          (combined `((,orig-autojoin-mode (bound-and-true-p erc-autojoin-mode))
-                     ,@(erc-scenarios-common--make-bindings bindings))))
+                     ,@(erc-scenarios-common--make-bindings bindings)))
+         (dynvars ()))
 
-    `(erc-d-t-with-cleanup (,@combined)
+    ;; Declare "erc-" variables dynamic in test scope.
+    (dolist (binder combined)
+      (setq binder (ensure-list binder))
+      (when (and (string-prefix-p "erc-" (symbol-name (car binder)))
+                 (not (special-variable-p (car binder))))
+        (push `(defvar ,(car binder)) dynvars)))
+    `(let (_)
+       ,@dynvars
+       (erc-d-t-with-cleanup (,@combined)
 
-         (ert-info ("Restore autojoin, etc., kill ERC buffers")
+           (ert-info ("Restore autojoin, etc., kill ERC buffers")
+             (dolist (buf (buffer-list))
+               (when-let* ((erc-d-u--process-buffer)
+                           (proc (get-buffer-process buf)))
+                 (delete-process proc)))
+
+             (erc-scenarios-common--remove-silence)
+
+             (when erc-scenarios-common-extra-teardown
+               (ert-info ("Running extra teardown")
+                 (funcall erc-scenarios-common-extra-teardown)))
+
+             (erc-buffer-do #'erc-scenarios-common--assert-date-stamps)
+             (when (and (boundp 'erc-autojoin-mode)
+                        (not (eq erc-autojoin-mode ,orig-autojoin-mode)))
+               (erc-autojoin-mode (if ,orig-autojoin-mode +1 -1)))
+
+             (when (or noninteractive erc-scenarios-common--graphical-p)
+               (when noninteractive
+                 (erc-scenarios-common--print-trace))
+               (erc-d-t-kill-related-buffers)
+               (delete-other-windows)))
+
+         (erc-scenarios-common--add-silence)
+
+         (ert-info ("Wait for dumb server")
            (dolist (buf (buffer-list))
-             (when-let* ((erc-d-u--process-buffer)
-                         (proc (get-buffer-process buf)))
-               (delete-process proc)))
+             (with-current-buffer buf
+               (when erc-d-u--process-buffer
+                 (erc-d-t-search-for 3 "Starting")))))
 
-           (erc-scenarios-common--remove-silence)
+         (ert-info ("Activate erc-debug-irc-protocol")
+           (unless (and (or noninteractive erc-scenarios-common--graphical-p)
+                        (not erc-debug-irc-protocol))
+             (erc-toggle-debug-irc-protocol)))
 
-           (when erc-scenarios-common-extra-teardown
-             (ert-info ("Running extra teardown")
-               (funcall erc-scenarios-common-extra-teardown)))
-
-           (erc-buffer-do #'erc-scenarios-common--assert-date-stamps)
-           (when (and (boundp 'erc-autojoin-mode)
-                      (not (eq erc-autojoin-mode ,orig-autojoin-mode)))
-             (erc-autojoin-mode (if ,orig-autojoin-mode +1 -1)))
-
-           (when (or noninteractive erc-scenarios-common--graphical-p)
-             (when noninteractive
-               (erc-scenarios-common--print-trace))
-             (erc-d-t-kill-related-buffers)
-             (delete-other-windows)))
-
-       (erc-scenarios-common--add-silence)
-
-       (ert-info ("Wait for dumb server")
-         (dolist (buf (buffer-list))
-           (with-current-buffer buf
-             (when erc-d-u--process-buffer
-               (erc-d-t-search-for 3 "Starting")))))
-
-       (ert-info ("Activate erc-debug-irc-protocol")
-         (unless (and (or noninteractive erc-scenarios-common--graphical-p)
-                      (not erc-debug-irc-protocol))
-           (erc-toggle-debug-irc-protocol)))
-
-       ,@body)))
+         ,@body))))
 
 (defvar erc-scenarios-common--term-size '(34 . 80))
 (declare-function term-char-mode "term" nil)
@@ -336,9 +349,11 @@ See Info node `(emacs) Term Mode' for the various commands."
 
 (defun erc-scenarios-common--assert-date-stamps ()
   "Ensure all date stamps are accounted for."
-  (dolist (stamp erc-stamp--date-stamps)
-    (should (eq 'datestamp (get-text-property (erc-stamp--date-marker stamp)
-                                              'erc--msg)))))
+  (defvar erc-stamp--date-stamps)
+  (when (fboundp 'erc-stamp--date-marker)
+    (dolist (stamp erc-stamp--date-stamps)
+      (should (eq 'datestamp (get-text-property (erc-stamp--date-marker stamp)
+                                                'erc--msg))))))
 
 (defun erc-scenarios-common-assert-initial-buf-name (id port)
   ;; Assert no limbo period when explicit ID given

From f3da59a8c55f8fbf3f14589286ee2d8c775de74c Mon Sep 17 00:00:00 2001
From: "F. Jason Park" <jp@neverwas.me>
Date: Tue, 16 Sep 2025 18:43:58 -0700
Subject: [PATCH 424/463] Improve isolation of some ERC test environments

* lisp/erc/erc.el (erc--lwarn): During tests where the variable
`erc--warnings-buffer-name' is non-nil, don't display the Warnings
buffer, and inhibit messages for the benefit of batch runs.
* test/lisp/erc/erc-tests.el (erc--modify-local-map): Protect various
hooks from module-setup code.
* test/lisp/erc/resources/erc-tests-common.el
(erc-tests-common-equal-with-props): Act more like
`equal-including-properties' in accepting arbitrary objects rather than
just strings.
(erc-tests-common-with-global-modules): New macro.
(erc-tests-common-frozen-options): New variable.
(erc-tests-common-with-frozen-options): New macro.
(erc-tests-common-make-server-buf): Accept a buffer for the NAME arg.
(erc-tests-common-assert-get-inserted-msg-readonly-with): Instead of
shadowing, use macro to protect calling environment from effects of
activating global module.
---
 lisp/erc/erc.el                             | 13 +++-
 test/lisp/erc/erc-tests.el                  | 82 ++++++++++----------
 test/lisp/erc/resources/erc-tests-common.el | 84 +++++++++++++++++----
 3 files changed, 124 insertions(+), 55 deletions(-)

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index d70a1f11ede..6157b0d2777 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -3028,8 +3028,17 @@ message instead, to make debugging easier."
 
 (defun erc--lwarn (type level format-string &rest args)
   "Issue a warning of TYPE and LEVEL with FORMAT-STRING and ARGS."
-  (let ((message (substitute-command-keys
-                  (apply #'format-message format-string args))))
+  (let ((message (with-temp-buffer
+                   (insert (substitute-command-keys
+                            (apply #'format-message format-string args)))
+                   (delete-indentation (point-min) (point-max))
+                   (buffer-string)))
+        (inhibit-message (or inhibit-message
+                             (and erc--warnings-buffer-name t)))
+        (display-buffer-overriding-action
+         (if erc--warnings-buffer-name
+             '(display-buffer-no-window (allow-no-window . t))
+           display-buffer-overriding-action)))
     (display-warning type message level erc--warnings-buffer-name)))
 
 ;;; Debugging the protocol
diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el
index 2b8e6b3ecca..3900f5d4880 100644
--- a/test/lisp/erc/erc-tests.el
+++ b/test/lisp/erc/erc-tests.el
@@ -1429,49 +1429,51 @@
                    #s(erc--target-channel-local "&Bitlbee" &bitlbee nil)))))
 
 (ert-deftest erc--modify-local-map ()
-  (when (and (bound-and-true-p erc-irccontrols-mode)
-             (fboundp 'erc-irccontrols-mode))
-    (erc-irccontrols-mode -1))
-  (when (and (bound-and-true-p erc-match-mode)
-             (fboundp 'erc-match-mode))
-    (erc-match-mode -1))
-  (let* (calls
-         (inhibit-message noninteractive)
-         (cmd-foo (lambda () (interactive) (push 'foo calls)))
-         (cmd-bar (lambda () (interactive) (push 'bar calls))))
+  (erc-tests-common-with-frozen-options
+    (erc-tests-common-with-global-modules (irccontrols match)
+      (let* ((calls ())
+             (erc-mode-map (copy-keymap erc-mode-map))
+             (inhibit-message noninteractive)
+             (cmd-foo (lambda () (interactive) (push 'foo calls)))
+             (cmd-bar (lambda () (interactive) (push 'bar calls))))
 
-    (ert-info ("Add non-existing")
-      (erc--modify-local-map t "C-c C-c" cmd-foo "C-c C-k" cmd-bar)
-      (with-temp-buffer
-        (set-window-buffer (selected-window) (current-buffer))
-        (use-local-map erc-mode-map)
-        (execute-kbd-macro "\C-c\C-c")
-        (execute-kbd-macro "\C-c\C-k"))
-      (should (equal calls '(bar foo))))
-    (setq calls nil)
+        (when (bound-and-true-p erc-irccontrols-mode)
+          (erc-irccontrols-mode -1))
+        (when (bound-and-true-p erc-match-mode)
+          (erc-match-mode -1))
 
-    (ert-info ("Add existing") ; Attempt to swap definitions fails
-      (erc--modify-local-map t "C-c C-c" cmd-bar "C-c C-k" cmd-foo)
-      (with-temp-buffer
-        (set-window-buffer (selected-window) (current-buffer))
-        (use-local-map erc-mode-map)
-        (execute-kbd-macro "\C-c\C-c")
-        (execute-kbd-macro "\C-c\C-k"))
-      (should (equal calls '(bar foo))))
-    (setq calls nil)
+        (ert-info ("Add non-existing")
+          (erc--modify-local-map t "C-c C-c" cmd-foo "C-c C-k" cmd-bar)
+          (with-temp-buffer
+            (set-window-buffer (selected-window) (current-buffer))
+            (use-local-map erc-mode-map)
+            (execute-kbd-macro "\C-c\C-c")
+            (execute-kbd-macro "\C-c\C-k"))
+          (should (equal calls '(bar foo))))
+        (setq calls nil)
 
-    (ert-info ("Remove existing")
-      (erc--modify-local-map nil "C-c C-c" cmd-foo "C-c C-k" cmd-bar)
-      (with-temp-buffer
-        (set-window-buffer (selected-window) (current-buffer))
-        (use-local-map erc-mode-map)
-        (cl-letf (((symbol-function 'undefined)
-                   (lambda ()
-                     (push (key-description (this-single-command-keys))
-                           calls))))
-          (execute-kbd-macro "\C-c\C-c")
-          (execute-kbd-macro "\C-c\C-k")))
-      (should (equal calls '("C-c C-k" "C-c C-c"))))))
+        (ert-info ("Add existing") ; Attempt to swap definitions fails
+          (erc--modify-local-map t "C-c C-c" cmd-bar "C-c C-k" cmd-foo)
+          (with-temp-buffer
+            (set-window-buffer (selected-window) (current-buffer))
+            (use-local-map erc-mode-map)
+            (execute-kbd-macro "\C-c\C-c")
+            (execute-kbd-macro "\C-c\C-k"))
+          (should (equal calls '(bar foo))))
+        (setq calls nil)
+
+        (ert-info ("Remove existing")
+          (erc--modify-local-map nil "C-c C-c" cmd-foo "C-c C-k" cmd-bar)
+          (with-temp-buffer
+            (set-window-buffer (selected-window) (current-buffer))
+            (use-local-map erc-mode-map)
+            (cl-letf (((symbol-function 'undefined)
+                       (lambda ()
+                         (push (key-description (this-single-command-keys))
+                               calls))))
+              (execute-kbd-macro "\C-c\C-c")
+              (execute-kbd-macro "\C-c\C-k")))
+          (should (equal calls '("C-c C-k" "C-c C-c"))))))))
 
 (ert-deftest erc-ring-previous-command-base-case ()
   (ert-info ("Create ring when nonexistent and do nothing")
diff --git a/test/lisp/erc/resources/erc-tests-common.el b/test/lisp/erc/resources/erc-tests-common.el
index 525bc2ed868..382f2855fbd 100644
--- a/test/lisp/erc/resources/erc-tests-common.el
+++ b/test/lisp/erc/resources/erc-tests-common.el
@@ -46,12 +46,67 @@
     (require 'erc-d-i)))
 
 (defmacro erc-tests-common-equal-with-props (a b)
-  "Compare strings A and B for equality including text props.
+  "Compare sequences A and B for equality including text props.
 Use `ert-equal-including-properties' on older Emacsen."
-  (list (if (< emacs-major-version 29)
-            'ert-equal-including-properties
-          'equal-including-properties)
-        a b))
+  (if (>= emacs-major-version 29)
+      `(equal-including-properties ,a ,b)
+    (list #'named-let 'doit `((a ,a)
+                              (b ,b))
+          '(cond ((and (stringp a) (stringp b))
+                  (ert-equal-including-properties a b))
+                 ((and (sequencep a) (sequencep b) (= (length a) (length b)))
+                  (seq-every-p (pcase-lambda (`(,a . ,b)) (doit a b))
+                               (cl-mapcar #'cons a b)))
+                 (t (equal a b))))))
+
+(defmacro erc-tests-common-with-global-modules (module &rest body)
+  "Run BODY with entry state for global MODULE(s) restored on exit."
+  (declare (indent 1))
+  (if (consp module)
+      ;; Flattening this would make stack traces less noisy but would
+      ;; also neglect modules that require one another.  However, as
+      ;; yet, there are no global modules that do this.
+      (setq body `(erc-tests-common-with-global-modules
+                      ,(erc--solo (cdr module))
+                    ,@body)
+            module (car module))
+    (setq body (macroexp-progn body)
+          module (erc--normalize-module-symbol module)))
+  (let ((mode-symbol (intern (concat "erc-" (symbol-name module) "-mode")))
+        (value-var (make-symbol "value")))
+    `(let ((,value-var (bound-and-true-p ,mode-symbol)))
+       (unwind-protect
+           (let ((erc-modules erc-modules))
+             ,body)
+         (unless (eq ,value-var (bound-and-true-p ,mode-symbol))
+           (let ((erc--inside-mode-toggle-p t))
+             (funcall #',mode-symbol (if ,value-var +1 -1))))))))
+
+(defvar erc-tests-common-frozen-options
+  '(erc-modules
+    erc-mode-map
+    erc-mode-hook
+    erc-insert-pre-hook
+    erc-insert-modify-hook
+    erc-insert-post-hook
+    erc-insert-done-hook
+    erc-pre-send-functions
+    erc-send-modify-hook
+    erc-send-post-hook
+    erc-send-completed-hook)
+  "Common insert-hook options and related variables.")
+
+(defmacro erc-tests-common-with-frozen-options (&rest body)
+  "Save and compare snapshot of insert-hook options around BODY."
+  (let ((values-var (make-symbol "values")))
+    `(let ((,values-var ()))
+       (dolist (sym erc-tests-common-frozen-options)
+         (push (cons sym (sxhash-equal (symbol-value sym))) ,values-var))
+       (prog1 (progn ,@body)
+         (dolist (item ,values-var)
+           (let ((value (symbol-value (car item))))
+             (ert-info ((format "Option %S" (list :s (car item) :v value)))
+               (should (equal (sxhash-equal value) (cdr item))))))))))
 
 ;; Caller should probably shadow `erc-insert-modify-hook' or populate
 ;; user tables for erc-button.
@@ -94,6 +149,13 @@ Assign the result to `erc-server-process' in the current buffer."
           (when (buffer-live-p buf)
             (kill-buffer buf)))))))
 
+;; Note that this fixture is relatively low level.  It's not needed
+;; merely to call `erc-send-current-line' without emitting anything to
+;; the fake server process because the send queue won't run before the
+;; test exits.  If that's ever not the case, such as when waiting with
+;; `sit-for' or similar after `erc-server-send' has run, you can
+;; suppress `erc-server-send-queue' by binding `erc-server-flood-margin'
+;; to a large negative number.
 (defun erc-tests-common-with-process-input-spy (test-fn)
   "Mock `erc-process-input-line' and call TEST-FN.
 Shadow `erc--input-review-functions' and `erc-pre-send-functions'
@@ -126,7 +188,7 @@ recently passed to the mocked `erc-process-input-line'.  Make
   "Return a server buffer named NAME, creating it if necessary.
 Use NAME for the network and the session server as well."
   (with-current-buffer (if name
-                           (get-buffer-create name)
+                           (setq name (buffer-name (get-buffer-create name)))
                          (and (string-search "temp" (buffer-name))
                               (setq name "foonet")
                               (buffer-name)))
@@ -247,13 +309,9 @@ For simplicity, assume string evaluates to itself."
 ;; `erc-tests-common-assert-get-inserted-msg/basic', to work.
 (defun erc-tests-common-assert-get-inserted-msg-readonly-with
     (assert-fn test-fn)
-  (defvar erc-readonly-mode)
-  (defvar erc-readonly-mode-hook)
-  (let ((erc-readonly-mode nil)
-        (erc-readonly-mode-hook nil)
-        (erc-send-post-hook erc-send-post-hook)
-        (erc-insert-post-hook erc-insert-post-hook))
-    (erc-readonly-mode +1)
+  (erc-tests-common-with-global-modules readonly
+    (let ((erc--inside-mode-toggle-p t))
+      (erc-readonly-mode +1))
     (funcall assert-fn test-fn)))
 
 (defun erc-tests--common-display-message (orig &rest args)

From aa316285846b4758c57deea13214dd87f41334da Mon Sep 17 00:00:00 2001
From: "F. Jason Park" <jp@neverwas.me>
Date: Sun, 3 May 2026 18:31:40 -0700
Subject: [PATCH 425/463] Refactor erc--warn-once-before-connect

* lisp/erc/erc-button.el (erc-button--display-error-notice-with-keys):
Ensure tail of let-bound `erc-insert-post-hook' is a list.
* lisp/erc/erc-truncate.el (erc-truncate--warn-about-logging): Use
`erc--warn-once-before-connect' instead of calling
`erc-button--display-error-notice-with-keys-and-warn' directly.
* lisp/erc/erc.el (erc--warn-once-before-connect-function)
(erc--warn-once-before-connect-calls): New variables.
(erc--warn-once-before-connect): Refactor for readability, incorporating
new definitions above for flexibility and to help ensure uniqueness.
---
 lisp/erc/erc-button.el   |  2 +-
 lisp/erc/erc-truncate.el |  8 ++--
 lisp/erc/erc.el          | 82 ++++++++++++++++++++++++----------------
 3 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 875ceec111a..3cb2d527cd4 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -857,7 +857,7 @@ non-strings, concatenate leading string members before applying
           (cons (lambda ()
                   (setq string (buffer-substring (point-min)
                                                  (1- (point-max)))))
-                erc-insert-post-hook))
+                (ensure-list erc-insert-post-hook)))
          (erc-button-alist
           `((,(rx "\\[" (group (+ (not "]"))) "]") 0
              erc-button--display-error-with-buttons
diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el
index 8323eb92235..340584e26db 100644
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -98,9 +98,11 @@ for other purposes should customize either `erc-enable-logging' or
              (erc-log--check-legacy-implicit-enabling-by-truncate))
     ;; Emit a real Emacs warning because the message may be
     ;; truncated away before it can be read if merely inserted.
-    (erc-button--display-error-notice-with-keys-and-warn
-     "The `truncate' module no longer enables logging implicitly."
-     " See the doc string for `erc-truncate-mode' for details.")))
+    (let ((erc--warn-once-before-connect-function
+           #'erc-button--display-error-notice-with-keys-and-warn))
+      (erc--warn-once-before-connect 'erc-truncate-mode
+        "The `truncate' module no longer enables logging implicitly."
+        " See the doc string for `erc-truncate-mode' for details."))))
 
 ;;;###autoload
 (defun erc-truncate-buffer-to-size (size &optional buffer)
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 6157b0d2777..335896db13d 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1682,42 +1682,58 @@ capabilities."
     (add-hook hook fun -95 t)
     fun))
 
+(defvar erc--warn-once-before-connect-function
+  #'erc-button--display-error-notice-with-keys
+  "Function to display an \"error notice\".
+See `erc-button--display-error-notice-with-keys' for expected args.")
+
+(defvar-local erc--warn-once-before-connect-calls ()
+  "Alist of (INTEGER . t) for `erc--warn-once-before-connect'.")
+
 (defun erc--warn-once-before-connect (mode-var &rest args)
-  "Display an \"error notice\" once.
-Expect ARGS to be `erc-button--display-error-notice-with-keys'
-compatible parameters, except without any leading buffers or processes.
-If the current buffer has an `erc-server-process', print the notice
-immediately.  Otherwise, if it's a server buffer without a process,
-arrange to do so on `erc-connect-pre-hook'.  In non-ERC buffers, so long
-as MODE-VAR belongs to a global module, try again at most once the next
-time `erc-mode-hook' runs for any connection."
+  "Display an \"error notice\" once per session (logical connection).
+Defer to `erc--warn-once-before-connect-function' to do the displaying.
+If the current buffer is associated with a live server buffer and a
+non-nil `erc-server-process', even if no longer live, display the
+notice.  Do so soon rather than immediately if called by
+`erc-display-message' indirectly.  If in a server buffer that's yet to
+dial, arrange to try again on `erc-connect-pre-hook'.  Otherwise, in
+non-ERC buffers, if MODE-VAR belongs to a global module, try again at
+most once the next time `erc-mode-hook' runs anywhere.  If a message is
+displayed, inhibit duplicates by adding a hash of MODE-VAR and ARGS to
+`erc--warn-once-before-connect-calls'."
   (declare (indent 1))
   (cl-assert (stringp (car args)))
-  (if (derived-mode-p 'erc-mode)
-      (unless
-          (or (erc-with-server-buffer ; needs `erc-server-process'
-                (let ((fn
-                       (lambda (buffer)
-                         (erc-with-buffer (buffer)
-                           (apply #'erc-button--display-error-notice-with-keys
-                                  buffer args)))))
-                  (if erc--msg-props
-                      (run-at-time nil nil fn (current-buffer))
-                    (funcall fn (current-buffer))))
-                t)
-              erc--target) ; unlikely
-        (let (hook)
-          (setq hook
-                (lambda (_)
-                  (remove-hook 'erc-connect-pre-hook hook t)
-                  (apply #'erc-button--display-error-notice-with-keys args)))
-          (add-hook 'erc-connect-pre-hook hook nil t)))
-    (when (custom-variable-p mode-var)
-      (let (hook)
-        (setq hook (lambda ()
-                     (remove-hook 'erc-mode-hook hook)
-                     (apply #'erc--warn-once-before-connect 'erc-fake args)))
-        (add-hook 'erc-mode-hook hook)))))
+  (letrec ((warn-fn erc--warn-once-before-connect-function)
+           (hook-name nil)
+           (hook-fn
+            (lambda (&rest _)
+              (when hook-name
+                (remove-hook hook-name hook-fn (local-variable-p hook-name)))
+              (let ((erc--warn-once-before-connect-function warn-fn))
+                (apply #'erc--warn-once-before-connect 'erc-fake args)))))
+    (cond
+     ((not (derived-mode-p 'erc-mode))
+      (when (custom-variable-p mode-var)
+        (add-hook (setq hook-name 'erc-mode-hook) hook-fn)))
+     ;; Has a live server buffer with a non-nil `erc-server-process'.
+     ((erc-with-server-buffer
+        (let ((do-fn (lambda ()
+                       (with-memoization
+                           ;; Use `sxhash' to avoid weak references.
+                           (alist-get (sxhash-equal (cons mode-var args))
+                                      erc--warn-once-before-connect-calls)
+                         (apply warn-fn args)
+                         t)))) ; for side-effects only
+          (if erc--msg-props ; escape `erc-display-message' call stack
+              (run-at-time nil nil (lambda (buffer)
+                                     (erc-with-buffer (buffer)
+                                       (funcall do-fn)))
+                           (current-buffer))
+            (funcall do-fn)))))
+     ;; A server buffer with a null `erc-server-process'.
+     ((null erc--target)
+      (add-hook (setq hook-name 'erc-connect-pre-hook) hook-fn 0 t)))))
 
 (defun erc-server-buffer ()
   "Return the server buffer for the current buffer's process.

From 76f5181bc6af50dd7eab6deb75d83fd8e83e50e4 Mon Sep 17 00:00:00 2001
From: "F. Jason Park" <jp@neverwas.me>
Date: Fri, 28 Nov 2025 16:21:57 -0800
Subject: [PATCH 426/463] Improve source NUH handling in ERC

* lisp/erc/erc.el (erc--user-nuh-message-types): New variable.
(erc--shuffle-nuh-nickward, erc--interpret-nuh): Replace former with
latter, whose behavior is easier to predict.
* test/lisp/erc/erc-tests.el (erc--interpret-nuh): New test.
---
 lisp/erc/erc.el            | 27 ++++++++++++++++++++++-----
 test/lisp/erc/erc-tests.el | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 335896db13d..d14d85913b3 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -7991,11 +7991,28 @@ See associated unit test for precise behavior."
           (match-string 2 string)
           (match-string 3 string))))
 
-(defun erc--shuffle-nuh-nickward (nick login host)
-  "Interpret results of `erc--parse-nuh', promoting loners to nicks."
-  (cond (nick (cl-assert (null login)) (list nick login host))
-        ((and (null login) host) (list host nil nil))
-        ((and login (null host)) (list login nil nil))))
+(defvar erc--user-nuh-message-types
+  '(PRIVMSG JOIN PART QUIT NICK KICK TOPIC AWAY ACCOUNT TAGMSG))
+
+(defun erc--interpret-nuh (nuh &optional cmd noerrorp)
+  "Return new NUH triple with non-nil nickname or host component, or signal.
+If CMD is null or appears in `erc--user-nuh-message-types', promote a
+lone host to a lone nick.  With NOERRORP, return a copy of NUH instead
+of signaling."
+  (pcase-let ((`(,nick ,login ,host) nuh))
+    (cond (nick (list nick login host))
+          ((and (null login) host)
+           (if (or (null cmd) (memq cmd erc--user-nuh-message-types))
+               (list host nil nil)
+             (list nil nil host)))
+          ((and login
+                (let ((types (or (erc--get-isupport-entry 'CHANTYPES 'single)
+                                 erc--fallback-channel-prefixes)))
+                  (not (seq-some (lambda (c) (seq-contains-p types c #'eq))
+                                 login))))
+           (list login nil host))
+          (noerrorp (list nick login host))
+          (t (error "Failed to interpret: %s" nuh)))))
 
 (defun erc-extract-nick (string)
   "Return the nick corresponding to a user specification STRING.
diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el
index 3900f5d4880..35997a83de1 100644
--- a/test/lisp/erc/erc-tests.el
+++ b/test/lisp/erc/erc-tests.el
@@ -674,6 +674,39 @@
   ;; No fallback behavior.
   (should-not (erc--parse-nuh "abc\nde!fg@xy")))
 
+;; NUH interpretation rules:
+;;
+;; 1. "a@b" or "a!b" - "a" is the nick and "b" is the host.  Can't have
+;;    a login without a nick and a host.
+;;
+;; 2. "a" - either a nick or a host, depending on message type.  The
+;;    presence of a "." does not imply a host because some IRC-adjacent
+;;    bridges allow nicks to contain dots, and a host can be a host
+;;    name, like "localhost" without a domain structure.  Nick-only
+;;    types include PRIVMSG, JOIN, PART, QUIT, NICK, KICK, TOPIC, AWAY,
+;;    ACCOUNT, and TAGMSG.  MODE can be either but is usually a nick
+;;    unless recovering from a netsplit or as a response to a ChanServ
+;;    OP.  NOTICE can be either but is always a nick when directed to a
+;;    channel.
+;;
+;; 3. "a!", "a!@", "a@", "!a@", "@a", etc. are pathological.
+;;
+(ert-deftest erc--interpret-nuh ()
+  (should (equal (erc--interpret-nuh (erc--parse-nuh "a@b"))
+                 '("a" nil "b")))
+  (should (equal (erc--interpret-nuh (erc--parse-nuh "a!b"))
+                 '("a" nil "b")))
+  (should (equal (erc--interpret-nuh (erc--parse-nuh "B..o..b"))
+                 '("B..o..b" nil nil)))
+  (should (equal (erc--interpret-nuh (erc--parse-nuh "gnu.org"))
+                 '("gnu.org" nil nil)))
+  (should (equal (erc--interpret-nuh (erc--parse-nuh "localhost"))
+                 '("localhost" nil nil)))
+
+  ;; Reject login containing CHANTYPE chars.
+  (should (equal (erc--parse-nuh "a&b@c") '(nil "a&b" "c")))
+  (should-error (erc--interpret-nuh '(nil "a&b" "c"))))
+
 (ert-deftest erc--parsed-prefix ()
   ;; Effectively a no-op in a non-ERC buffer.
   (should-not (erc--parsed-prefix))

From 1613f2e65263f01339be4107271d4abcee79edc5 Mon Sep 17 00:00:00 2001
From: "F. Jason Park" <jp@neverwas.me>
Date: Sun, 21 Sep 2025 15:52:16 -0700
Subject: [PATCH 427/463] Preserve order of local ERC modules for activation

* etc/ERC-NEWS: Add new section for ERC 5.7.
* lisp/erc/erc.el (erc--update-modules): Reverse returned list.
* test/lisp/erc/erc-tests.el (erc--update-modules/local): Update.
---
 etc/ERC-NEWS               | 14 ++++++++++++++
 lisp/erc/erc.el            |  2 +-
 test/lisp/erc/erc-tests.el |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 082c10702f3..de27b8f07e7 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -11,6 +11,20 @@ This file is about changes in ERC, the powerful, modular, and
 extensible IRC (Internet Relay Chat) client distributed with
 GNU Emacs since Emacs version 22.1.
 
+
+* Changes in ERC 5.7
+
+** Changes in the library API.
+
+*** Local modules activate in preferred order instead of in reverse.
+In recent versions, ERC has enabled local modules in the reverse order
+of that produced by the "set" function used by 'setopt' and the Custom
+UI for the option 'erc-modules'.  Specifically, Built-in locals were
+activated in reverse lexicographic order after third-party ones, which
+were simply reversed as given.  Now, just like with global modules, ERC
+preserves the preferred order when activating local modules for new
+sessions.
+
 
 * Changes in ERC 5.6.2
 
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index d14d85913b3..755b00f375c 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -2467,7 +2467,7 @@ invocations by third-party packages.")
 
 (defun erc--update-modules (modules)
   (let (local-modes)
-    (dolist (module modules local-modes)
+    (dolist (module modules (nreverse local-modes))
       (if-let* ((mode (erc--find-mode module)))
           (if (custom-variable-p mode)
               (funcall mode 1)
diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el
index 35997a83de1..f2f874717e9 100644
--- a/test/lisp/erc/erc-tests.el
+++ b/test/lisp/erc/erc-tests.el
@@ -3990,7 +3990,7 @@ keyword :result."
 
        ;; Returns local modules.
        (should (equal (mapcar #'symbol-name (erc--update-modules erc-modules))
-                      '("erc-lo2-mode" "erc-lo1-mode")))
+                      '("erc-lo1-mode" "erc-lo2-mode")))
 
        ;; Requiring `erc-lo2' defines `erc-lo2-mode'.
        (should (equal (mapcar #'prin1-to-string (funcall get-calls))

From 606c0b22e4ee2d01de9bcf064205716dca1ef8b3 Mon Sep 17 00:00:00 2001
From: "F. Jason Park" <jp@neverwas.me>
Date: Tue, 11 Feb 2025 22:02:16 -0800
Subject: [PATCH 428/463] ; Make reconnect detection more readable in erc-open

* lisp/erc/erc.el (erc-open): Bind `erc--server-reconnecting' instead of
relying on a confusing single-use variable.
---
 lisp/erc/erc.el | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 755b00f375c..6781c3d117d 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -2634,13 +2634,18 @@ side effect of setting the current buffer to the one it returns.  Use
          (old-recon-count erc-server-reconnect-count)
          (old-point nil)
          (delayed-modules nil)
-         (continued-session (or erc--server-reconnecting
-                                erc--target-priors
-                                (and-let* (((not target))
-                                           (m (buffer-local-value
-                                               'erc-input-marker buffer))
-                                           ((marker-position m)))
-                                  (buffer-local-variables buffer)))))
+         (erc--server-reconnecting
+          (or erc--server-reconnecting
+              ;; Interpret an entry-point invocation reassociated with
+              ;; an existing session via explicit ID as an "implied"
+              ;; reconnection, but only if it at least tried to connect.
+              (and-let* ((id) (connect) ; `target' must be null
+                         (m (buffer-local-value 'erc-input-marker buffer))
+                         ((marker-position m))
+                         ((buffer-local-value 'erc-server-process buffer))
+                         (netid (buffer-local-value 'erc-networks--id buffer)))
+                (cl-assert (string-equal (erc-networks--id-given netid) id))
+                (buffer-local-variables buffer)))))
     (when connect (run-hook-with-args 'erc-before-connect server port nick))
     (set-buffer buffer)
     (setq old-point (point))
@@ -2705,7 +2710,8 @@ side effect of setting the current buffer to the one it returns.  Use
           (when erc-log-p
             (get-buffer-create (concat "*ERC-DEBUG: " server "*"))))
 
-    (erc--initialize-markers old-point continued-session)
+    (erc--initialize-markers old-point (or erc--server-reconnecting
+                                           erc--target-priors))
     (erc-determine-parameters server port nick full-name user passwd)
     (save-excursion (run-mode-hooks)
                     (dolist (mod (car delayed-modules))

From ec7a5f85c934d83239c1a77e5122b288c4cd0b25 Mon Sep 17 00:00:00 2001
From: "F. Jason Park" <jp@neverwas.me>
Date: Wed, 1 May 2024 07:21:01 -0700
Subject: [PATCH 429/463] Run module setup in ERC query buffers on reconnect

* etc/ERC-NEWS: Mention change.
* lisp/erc/erc.el (erc-connection-established): Apply `erc--open-target'
to all existing query buffers after they've been reassociated by
the erc-networks logic.
---
 etc/ERC-NEWS    |  6 ++++++
 lisp/erc/erc.el | 13 ++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index de27b8f07e7..d28c0670a73 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -16,6 +16,12 @@ GNU Emacs since Emacs version 22.1.
 
 ** Changes in the library API.
 
+*** Module setup runs in query buffers on reconnect.
+A module's setup would always run in channel buffers on reconnect, due
+to channels being rejoined, but query buffers lacked a similar
+opportunity to reinitialize their state for the new session.  This is no
+longer the case.
+
 *** Local modules activate in preferred order instead of in reverse.
 In recent versions, ERC has enabled local modules in the reverse order
 of that produced by the "set" function used by 'setopt' and the Custom
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 6781c3d117d..591ca1f5fbe 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -6840,9 +6840,16 @@ See also: `erc-echo-notice-in-user-buffers',
         (erc-update-mode-line)
         (erc-set-initial-user-mode nick buffer)
         (erc-server-setup-periodical-ping buffer)
-        (when erc-unhide-query-prompt
-          (erc-with-all-buffers-of-server erc-server-process nil
-            (when (and erc--target (not (erc--target-channel-p erc--target)))
+        ;; Run mode hooks on all reclaimed query buffers.
+        (let ((buffer (current-buffer))
+              (erc-join-buffer 'bury)
+              erc-active-buffer)
+          (erc-with-all-buffers-of-server erc-server-process
+              #'erc-query-buffer-p
+            (let ((target (erc-target)))
+              (with-current-buffer buffer
+                (erc--open-target target)))
+            (when erc-unhide-query-prompt
               (erc--unhide-prompt))))
         (run-hook-with-args 'erc-after-connect server nick)))))
 

From c2a24dcec8bac200e142badd5ff6ec1542ce38c6 Mon Sep 17 00:00:00 2001
From: Corwin Brust <corwin@bru.st>
Date: Wed, 13 May 2026 00:46:31 -0500
Subject: [PATCH 430/463] ; update msys2 build helper for Emacs 31 & UCRT

---
 admin/nt/dist-build/build-dep-zips.py | 116 ++++++++------------------
 1 file changed, 35 insertions(+), 81 deletions(-)

diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py
index 5c760fb21ce..f70f083b999 100755
--- a/admin/nt/dist-build/build-dep-zips.py
+++ b/admin/nt/dist-build/build-dep-zips.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-## Copyright (C) 2017-2026 Free Software Foundation, Inc.
+## Copyright (C) 2017-2023 Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
 
@@ -25,12 +25,12 @@
 from subprocess import check_output
 
 ## Constants
-EMACS_MAJOR_VERSION= os.getenv('EMACS_MAJOR_VERSION') or "30"
+EMACS_MAJOR_VERSION= os.getenv('EMACS_MAJOR_VERSION') or "31"
 
 # Base URI for the package sources mapped in PKG_REQ
 SRC_REPO="https://repo.msys2.org/mingw/sources"
 
-# Map items in `dynamic-library-alist' to source packages
+# Map items in `dynamic-library-alist' to source pakages
 PKG_REQ='''mingw-w64-x86_64-giflib
 mingw-w64-x86_64-gnutls
 mingw-w64-x86_64-harfbuzz
@@ -47,8 +47,10 @@
 mingw-w64-x86_64-tree-sitter
 mingw-w64-x86_64-sqlite3'''.split()
 
-# Emacs style path to dependency DLLs on build system
-DLL_SRC="c:/msys64/mingw64/bin"
+# Emacs style path to dependancy DLLs on build system
+#DLL_SRC="c:/msys64/mingw64/bin"
+DLL_SRC="mingw64"
+OUT_TAG=""
 
 # libraries we never include
 DLL_SKIP=["libgccjit-0.dll"]
@@ -95,12 +97,12 @@ def gather_deps():
         if dep not in DLL_SKIP:
             if args.l != True:
                 print("Adding dep", dep)
-            check_output_maybe(["cp /mingw64/bin/{} .".format(dep)], shell=True)
+            check_output_maybe(["cp /{}/bin/{} .".format(DLL_SRC,dep)], shell=True)
         else:
             if args.l != True:
                 print("Skipping dep", dep)
 
-    zipfile="../emacs-{}-{}deps.zip".format(EMACS_MAJOR_VERSION, DATE)
+    zipfile="../emacs-{}{}-{}deps.zip".format(EMACS_MAJOR_VERSION, OUT_TAG, DATE)
     tmpfile="{}.tmp".format(zipfile)
     print("Zipping deps in", os.getcwd(), "as", tmpfile)
     check_output_maybe("zip -9vr {} *.dll".format(tmpfile), shell=True)
@@ -110,7 +112,7 @@ def gather_deps():
     print("Deps updated in", os.getcwd(), "as", zipfile)
     os.chdir("../")
 
-# Return dependencies listed in Emacs
+# Return dependancies listed in Emacs
 def init_deps():
     return '''libXpm-nox4.dll
 libpng16-16.dll
@@ -125,11 +127,11 @@ def init_deps():
 libgio-2.0-0.dll
 libgobject-2.0-0.dll
 libgnutls-30.dll
-libxml2-2.dll
+libxml2-16.dll
 zlib1.dll
 liblcms2-2.dll
 libgccjit-0.dll
-libtree-sitter.dll'''.split()
+libtree-sitter-0.26.dll'''.split()
     # job_args=[NEW_EMACS, "--batch", "--eval", ELISP_PROG]
     # #print("args: ", job_args)
     # return subprocess.check_output(job_args, stderr=subprocess.STDOUT
@@ -170,78 +172,20 @@ def ntldd_munge(out):
 
 ## Packages to fiddle with
 ## Source for gcc-libs is part of gcc
-SKIP_SRC_PKGS=["mingw-w64-gcc-libs"]
-SKIP_DEP_PKGS=["mingw-w64-glib2", "mingw-w64-ca-certificates-20211016-3"]
+SKIP_SRC_PKGS=["mingw-w64-gcc-libs"] #, "mingw-w64-x86_64-libwinpthread-git"]
+SKIP_DEP_PKGS=["mingw-w64-glib2", "mingw-w64-x86_64-cc-libs", "mingw-w64-ca-certificates-20211016-3"] #, "mingw-w64-x86_64-libwinpthread-git"]
 MUNGE_SRC_PKGS={
-    "mingw-w64-libwinpthread-git":"mingw-w64-winpthreads-git",
+    "mingw-w64-libwinpthread":"mingw-w64-winpthreads",
     "mingw-w64-gettext-runtime":"mingw-w64-gettext"
 }
 MUNGE_DEP_PKGS={
-    "mingw-w64-x86_64-libwinpthread":"mingw-w64-x86_64-libwinpthread-git",
-    "mingw-w64-x86_64-libtre": "mingw-w64-x86_64-libtre-git",
+    #"mingw-w64-x86_64-libwinpthread":"mingw-w64-x86_64-libwinpthread-git",
+    #"mingw-w64-x86_64-libtre": "mingw-w64-x86_64-libtre-git",
 }
+
+#  usual source ext is now tar.zst; this overrides that..
 SRC_EXT={
-    "mingw-w64-freetype": ".src.tar.zst",
-    "mingw-w64-fribidi": ".src.tar.zst",
-    "mingw-w64-glib2": ".src.tar.zst",
-    "mingw-w64-harfbuzz": ".src.tar.zst",
-    "mingw-w64-libunistring": ".src.tar.zst",
-    "mingw-w64-winpthreads-git": ".src.tar.zst",
-    "mingw-w64-ca-certificates": ".src.tar.zst",
-    "mingw-w64-libxml2": ".src.tar.zst",
-    "mingw-w64-ncurses": ".src.tar.zst",
-    "mingw-w64-openssl": ".src.tar.zst",
-    "mingw-w64-pango": ".src.tar.zst",
-    "mingw-w64-python": ".src.tar.zst",
-    "mingw-w64-sqlite3": ".src.tar.zst",
-    "mingw-w64-xpm-nox": ".src.tar.zst",
-    "mingw-w64-xz": ".src.tar.zst",
-    "mingw-w64-bzip2": ".src.tar.zst",
-    "mingw-w64-cairo": ".src.tar.zst",
-    "mingw-w64-expat": ".src.tar.zst",
-    "mingw-w64-fontconfig":  ".src.tar.zst",
-    "mingw-w64-gdk-pixbuf2":  ".src.tar.zst",
-    "mingw-w64-giflib":  ".src.tar.zst",
-    "mingw-w64-gmp":  ".src.tar.zst",
-    "mingw-w64-gnutls":  ".src.tar.zst",
-    "mingw-w64-graphite2":  ".src.tar.zst",
-    "mingw-w64-jbigkit":  ".src.tar.zst",
-    "mingw-w64-lcms2":  ".src.tar.zst",
-    "mingw-w64-lerc":  ".src.tar.zst",
-    "mingw-w64-libdatrie":  ".src.tar.zst",
-    "mingw-w64-libffi":  ".src.tar.zst",
-    "mingw-w64-libiconv":  ".src.tar.zst",
-    "mingw-w64-libiconv":  ".src.tar.zst",
-    "mingw-w64-libpng":  ".src.tar.zst",
-    "mingw-w64-librsvg": ".src.tar.zst",
-    "mingw-w64-libsystre": ".src.tar.zst",
-    "mingw-w64-libtasn": ".src.tar.zst",
-    "mingw-w64-libthai": ".src.tar.zst",
-    "mingw-w64-libtiff": ".src.tar.zst",
-    "mingw-w64-libtre-git": ".src.tar.zst",
-    "mingw-w64-libwebp": ".src.tar.zst",
-    "mingw-w64-mpdecimal": ".src.tar.zst",
-    "mingw-w64-nettle": ".src.tar.zst",
-    "mingw-w64-p11-kit": ".src.tar.zst",
-    "mingw-w64-pcre": ".src.tar.zst",
-    "mingw-w64-pixman": ".src.tar.zst",
-    "mingw-w64-python-packaging": ".src.tar.zst",
-    "mingw-w64-readline": ".src.tar.zst",
-    "mingw-w64-tcl": ".src.tar.zst",
-    "mingw-w64-termcap": ".src.tar.zst",
-    "mingw-w64-tk": ".src.tar.zst",
-    "mingw-w64-tree-sitter": ".src.tar.zst",
-    "mingw-w64-tzdata": ".src.tar.zst",
-    "mingw-w64-wineditline": ".src.tar.zst",
-    "mingw-w64-zlib": ".src.tar.zst",
-    "mingw-w64-zstd": ".src.tar.zst",
-    "mingw-w64-brotli": ".src.tar.zst",
-    "mingw-w64-gettext": ".src.tar.zst",
-    "mingw-w64-libdeflate": ".src.tar.zst",
-    "mingw-w64-libidn2": ".src.tar.zst",
-    "mingw-w64-libjpeg-turbo": ".src.tar.zst",
-    "mingw-w64-libtasn1": ".src.tar.zst",
-    "mingw-w64-pcre2": ".src.tar.zst",
+#    "mingw-w64-brotli": ".src.tar.gz",
 }
 
 ## Currently no packages seem to require this!
@@ -296,7 +240,7 @@ def download_source(tarball):
         )
         print("Downloading {}... done".format(tarball))
 
-    print("Copying {} from local".format(tarball))
+    #print("Copying {} from local".format(tarball))
     shutil.copyfile("../emacs-src-cache/{}".format(tarball),
                     "{}".format(tarball))
 
@@ -311,6 +255,7 @@ def gather_source(deps):
     os.chdir("emacs-src")
 
     for pkg in deps:
+        #print("Parsing pkg name and version from {}".format(pkg))
         pkg_name_and_version= \
             check_output(["pacman","-Q", pkg]).decode("utf-8").strip()
 
@@ -321,7 +266,7 @@ def gather_source(deps):
         pkg_version=pkg_name_components[1]
 
         ## source pkgs don't have an architecture in them
-        pkg_name = re.sub(r"x86_64-","",pkg_name)
+        pkg_name = re.sub(r"(ucrt-)?x86_64-","",pkg_name)
 
         if(pkg_name in SKIP_SRC_PKGS):
             continue
@@ -333,13 +278,14 @@ def gather_source(deps):
         if pkg_name in SRC_EXT.keys():
             src_ext = SRC_EXT[pkg_name]
         else:
-            src_ext = ".src.tar.gz"
+            src_ext = ".src.tar.zst"
 
         tarball = "{}-{}{}".format(pkg_name,pkg_version,src_ext)
 
         download_source(tarball)
 
-    srczip="../emacs-{}-{}deps-mingw-w64-src.zip".format(EMACS_MAJOR_VERSION,DATE)
+    srczip="../emacs-{}{}-{}deps-mingw-w64-src.zip".format(
+        EMACS_MAJOR_VERSION,OUT_TAG, DATE)
     tmpzip="{}.tmp".format(srczip)
     print("Zipping Dsrc in", os.getcwd(), "as", tmpzip)
     check_output_maybe("zip -9 {} *".format(tmpzip), shell=True)
@@ -367,6 +313,9 @@ def clean():
 
 #parser.add_argument("emacs", help="emacs executable")
 
+parser.add_argument("-u", help="UCRT64 build",
+                    action="store_true")
+
 parser.add_argument("-s", help="snapshot build",
                     action="store_true")
 
@@ -382,16 +331,21 @@ def clean():
 parser.add_argument("-l", help="list dependencies",
                     action="store_true")
 
-parser.add_argument("-e", help="extract direct dependencies",
+parser.add_argument("-e", help="extract direct dependancies",
                     action="store_true")
 
 args = parser.parse_args()
 do_all=not (args.c or args.r)
 
+
 #NEW_EMACS=args.emacs
 
 DRY_RUN=args.d
 
+if( args.u ):
+    DLL_SRC="ucrt64"
+    OUT_TAG="-ucrt"
+
 if( args.e ):
     print("\n".join(init_deps()))
 

From 13039e3442b8da51a284643be43c4f21d2f2d08d Mon Sep 17 00:00:00 2001
From: Corwin Brust <corwin@bru.st>
Date: Wed, 13 May 2026 01:06:17 -0500
Subject: [PATCH 431/463] ; touch-up last commit: copyright and comments

---
 admin/nt/dist-build/build-dep-zips.py | 40 ++++++++-------------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py
index f70f083b999..493e7616fa9 100755
--- a/admin/nt/dist-build/build-dep-zips.py
+++ b/admin/nt/dist-build/build-dep-zips.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-## Copyright (C) 2017-2023 Free Software Foundation, Inc.
+## Copyright (C) 2017-2026 Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
 
@@ -48,30 +48,14 @@
 mingw-w64-x86_64-sqlite3'''.split()
 
 # Emacs style path to dependancy DLLs on build system
-#DLL_SRC="c:/msys64/mingw64/bin"
 DLL_SRC="mingw64"
 OUT_TAG=""
 
 # libraries we never include
 DLL_SKIP=["libgccjit-0.dll"]
 
-# Report first existing file for entries in dynamic-library-alist
-# ELISP_PROG="""
-# (message "%s" (mapconcat 'identity (remove nil
-# 	(mapcar (lambda(lib)
-# 		  (seq-find
-# 		   (lambda(file)
-# 		     (file-exists-p
-# 		      (file-name-concat "{}"
-# 					file)))
-# 		   (cdr lib)))
-# 		dynamic-library-alist)
-# 	) "\\n"))
-# """.format(DLL_SRC)
-
 ## Options
 DRY_RUN=False
-# NEW_EMACS="bin/emacs.exe"
 
 def check_output_maybe(*args,**kwargs):
     if(DRY_RUN):
@@ -84,7 +68,6 @@ def check_output_maybe(*args,**kwargs):
 
 # entry point
 def gather_deps():
-
     os.mkdir("x86_64")
     os.chdir("x86_64")
 
@@ -132,18 +115,12 @@ def init_deps():
 liblcms2-2.dll
 libgccjit-0.dll
 libtree-sitter-0.26.dll'''.split()
-    # job_args=[NEW_EMACS, "--batch", "--eval", ELISP_PROG]
-    # #print("args: ", job_args)
-    # return subprocess.check_output(job_args, stderr=subprocess.STDOUT
-    #                                ).decode('utf-8').splitlines()
 
 # Return all second order dependencies
 def full_dll_dependency(dlls):
     deps = [dll_dependency(dep) for dep in dlls]
     return set(sum(deps, []) + dlls)
 
-#xs = filter(lambda x: x.attribute == value, xs)
-
 # Dependencies for a given DLL
 def dll_dependency(dll):
     output = check_output(["/mingw64/bin/ntldd", "--recursive",
@@ -172,12 +149,18 @@ def ntldd_munge(out):
 
 ## Packages to fiddle with
 ## Source for gcc-libs is part of gcc
-SKIP_SRC_PKGS=["mingw-w64-gcc-libs"] #, "mingw-w64-x86_64-libwinpthread-git"]
-SKIP_DEP_PKGS=["mingw-w64-glib2", "mingw-w64-x86_64-cc-libs", "mingw-w64-ca-certificates-20211016-3"] #, "mingw-w64-x86_64-libwinpthread-git"]
+SKIP_SRC_PKGS=["mingw-w64-gcc-libs"]
+SKIP_DEP_PKGS=["mingw-w64-glib2", "mingw-w64-x86_64-cc-libs", "mingw-w64-ca-certificates-20211016-3"]
+
+## A few source packages don't follow typical naming conventions.
+## Handle transformation from formulaic name to actual name
 MUNGE_SRC_PKGS={
     "mingw-w64-libwinpthread":"mingw-w64-winpthreads",
     "mingw-w64-gettext-runtime":"mingw-w64-gettext"
 }
+
+##  As above, but for source packages of second order deps
+##  Empty as of 30.0.50 (May, 2026), last used for Emacs 30.2
 MUNGE_DEP_PKGS={
     #"mingw-w64-x86_64-libwinpthread":"mingw-w64-x86_64-libwinpthread-git",
     #"mingw-w64-x86_64-libtre": "mingw-w64-x86_64-libtre-git",
@@ -188,7 +171,8 @@ def ntldd_munge(out):
 #    "mingw-w64-brotli": ".src.tar.gz",
 }
 
-## Currently no packages seem to require this!
+## Pick up packages only when building for a given architecture
+## Currently no packages seem to require this! Unused since Emacs 26
 ARCH_PKGS=[]
 
 def immediate_deps(pkg):
@@ -274,7 +258,7 @@ def gather_source(deps):
         ## Switch names if necessary
         pkg_name = MUNGE_SRC_PKGS.get(pkg_name,pkg_name)
 
-        ## src archive is usually a .tar.gz
+        ## src archive is usually a .tar.zst
         if pkg_name in SRC_EXT.keys():
             src_ext = SRC_EXT[pkg_name]
         else:

From 9bc04b001ac93bd926715b1a9aac0b8e4e46b1ae Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 13 May 2026 13:15:23 +0100
Subject: [PATCH 432/463] vc-next-action: Call vc-delete-file on
 FILESET-ONLY-FILES

* lisp/vc/vc.el (vc-next-action): Call vc-delete-file on
FILESET-ONLY-FILES, not FILES (bug#80998).
---
 lisp/vc/vc.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 4a6ae7e4290..8f0e9e5bdc4 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1719,7 +1719,7 @@ from which to check out the file(s)."
             (t
              (vc-register vc-fileset))))
      ((eq state 'missing)
-      (vc-delete-file files))
+      (vc-delete-file fileset-only-files))
      ;; Files are up-to-date, or need a merge and user specified a revision
      ((or (eq state 'up-to-date) (and verbose (eq state 'needs-update)))
       (cond

From ce3098752cfb8cbb57c4f643088a2e6b16919ea7 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 13 May 2026 10:34:03 -0400
Subject: [PATCH 433/463] doc: Remove long obsolete references to
 `package-initialize`

Since Emacs-27, `package-initialize` is for internal use only,
and callers should either call `package-activate-all` instead
(cheaper and faster) or do nothing at all (because the other
functions should trigger the needed initialization automatically
as needed).

* doc/lispref/package.texi (Packaging Basics): Delete `package-initialize`.

* doc/misc/eglot.texi (Reporting bugs): Don't recommend using `package-initialize`.

* doc/misc/org.org (Using Emacs packaging system): Simplify the command
line since both `(require 'package)` and `(package-initialize)` are
redundant here.
---
 doc/lispref/package.texi | 9 ---------
 doc/misc/eglot.texi      | 2 +-
 doc/misc/org.org         | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi
index 8f3f5fe79b0..3097ed02345 100644
--- a/doc/lispref/package.texi
+++ b/doc/lispref/package.texi
@@ -133,15 +133,6 @@ init file, and any code that should run after it in the primary init
 file (@pxref{Init File,,, emacs, The GNU Emacs Manual}).
 @end defun
 
-@deffn Command package-initialize &optional no-activate
-This function initializes Emacs's internal record of which packages are
-installed, and then calls @code{package-activate-all}.
-
-The optional argument @var{no-activate}, if non-@code{nil}, causes
-Emacs to update its record of installed packages without actually
-making them available.
-@end deffn
-
 @node Simple Packages
 @section Simple Packages
 @cindex single file package
diff --git a/doc/misc/eglot.texi b/doc/misc/eglot.texi
index 0b6be34c41f..3deabb894c0 100644
--- a/doc/misc/eglot.texi
+++ b/doc/misc/eglot.texi
@@ -1969,7 +1969,7 @@ directory is a way to tell the maintainers about ELPA package versions.
 
 @item
 Include a recipe to replicate the problem with @emph{a clean Emacs run}.
-The invocation @code{emacs -Q -f package-initialize} starts Emacs with
+The invocation @code{emacs -Q -f package-activate-all} starts Emacs with
 no configuration and initializes the ELPA packages.  A very minimal
 @file{.emacs} initialization file (10 lines or less) is also acceptable
 and good means to describe changes to variables.
diff --git a/doc/misc/org.org b/doc/misc/org.org
index ab0f8a9c1a6..8644109a6a1 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -125,7 +125,7 @@ To avoid interference with the built-in Org mode, you can use the
 command line (you need Emacs 30 or later):
 
 #+begin_src sh
-emacs -Q -batch -eval "(progn (require 'package) (package-initialize) (package-refresh-contents) (package-upgrade 'org))"
+emacs -Q -batch -eval "(progn (package-refresh-contents) (package-upgrade 'org))"
 #+end_src
 
 This approach has the advantage of isolating the upgrade process from

From ff96db93f23d17a1dcdc12aec4067007b5a4e18e Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 13 May 2026 10:45:38 -0400
Subject: [PATCH 434/463] keyboard-tests.el: Try and fix the failure on EMBA

* test/src/keyboard-tests.el (keyboard-sigint-to-quit): Fix a small
race condition and avoid `sit-for` returning early.
---
 test/src/keyboard-tests.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/src/keyboard-tests.el b/test/src/keyboard-tests.el
index e4a1bf36a63..b64b20fb6cb 100644
--- a/test/src/keyboard-tests.el
+++ b/test/src/keyboard-tests.el
@@ -92,11 +92,11 @@
              `(,(expand-file-name invocation-name invocation-directory)
                "-Q" "--batch" "--eval"
                ,(prin1-to-string
-                 `(progn (setq kill-emacs-on-sigint nil)
-                         (message "Ready!")
-                         (condition-case nil
-                             (dotimes (_ 3) (sit-for 1))
-                           (quit (message "%s" ,exit-msg)))))))))
+                 `(condition-case nil
+                      (progn (setq kill-emacs-on-sigint nil)
+                             (message "Ready!")
+                             (sleep-for 3))
+                    (quit (message "%s" ,exit-msg))))))))
       (while (progn (accept-process-output proc 1.0)
                     (goto-char (point-min))
                     (not (re-search-forward "Ready!" nil t)))

From 2e71d2c709f003cd33597d106e8a483500ec99c9 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 13 May 2026 18:39:04 +0200
Subject: [PATCH 435/463] Propagate EMACSCLIENT_TRAMP to remote hosts with
 Tramp

* doc/misc/tramp.texi (Remote processes):
Explain `tramp-propagate-emacsclient-tramp'.

* lisp/net/tramp.el (tramp-remote-process-environment): Adapt docstring.
(tramp-propagate-emacsclient-tramp): New defcustom.
(tramp-handle-make-process):
* lisp/net/tramp-sh.el (tramp-sh-handle-make-process)
(tramp-sh-handle-process-file): Use it.

* test/lisp/net/tramp-tests.el (tramp-test33-environment-variables):
Adapt test.
---
 doc/misc/tramp.texi          |  8 ++++++++
 lisp/net/tramp-sh.el         |  9 +++++++++
 lisp/net/tramp.el            | 16 ++++++++++++++++
 test/lisp/net/tramp-tests.el | 15 +++++++++++++++
 4 files changed, 48 insertions(+)

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 8428109fde7..ae65cf2a620 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -4227,6 +4227,14 @@ called is local or remote, since @value{tramp} would add just the
 @env{HGPLAIN} setting and local processes would take whole value of
 @code{process-environment} along with the new value of @env{HGPLAIN}.
 
+@vindex tramp-propagate-emacsclient-tramp
+@vindex EMACSCLIENT_TRAMP@r{, environment variable}
+If you set the user option @code{tramp-propagate-emacsclient-tramp} to
+a non-@code{nil} value, the environment variable
+@env{EMACSCLIENT_TRAMP} will be set to a value which allows to call
+@command{emacsclient} from a process running on the remote
+host. @xref{emacsclient Options, , , emacs}.
+
 For integrating other Emacs packages so @value{tramp} can execute
 remotely, please file a bug report.  @xref{Bug Reports}.
 
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 92002b854b3..7b90ae9c11b 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3091,6 +3091,11 @@ will be used."
 			(if (string-search "=" elt)
 			    (setq env (append env `(,elt)))
 			  (setq uenv (cons elt uenv))))))
+	     (env (if tramp-propagate-emacsclient-tramp
+		      (setenv-internal
+		       env "EMACSCLIENT_TRAMP"
+		       (tramp-make-tramp-file-name v 'noloc) 'keep)
+		    env))
 	     (env (setenv-internal
 		   env "INSIDE_EMACS" (tramp-inside-emacs) 'keep))
 	     ;; Environment is too large.  Keep it here.
@@ -3340,6 +3345,10 @@ will be used."
             (if (string-search "=" elt)
                 (setq env (append env `(,elt)))
               (setq uenv (cons elt uenv)))))
+      (when tramp-propagate-emacsclient-tramp
+	(setq env (setenv-internal
+		   env "EMACSCLIENT_TRAMP"
+		   (tramp-make-tramp-file-name v 'noloc) 'keep)))
       (setq env (setenv-internal env "INSIDE_EMACS" (tramp-inside-emacs) 'keep))
       (when env
 	(setq command
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 6219d097f4f..ffcf8f4929c 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1528,12 +1528,21 @@ The PATH environment variable should be set via `tramp-remote-path'.
 
 The TERM environment variable should be set via `tramp-terminal-type'.
 
+The EMACSCLIENT_TRAMP environment variable will be set accordingly, if
+`tramp-propagate-emacsclient-tramp' is non-nil.
+
 The INSIDE_EMACS environment variable will automatically be set
 based on the Tramp and Emacs versions, and should not be set here."
   :version "26.1"
   :type '(repeat string)
   :link '(info-link :tag "Tramp manual" "(tramp) Remote processes"))
 
+(defcustom tramp-propagate-emacsclient-tramp nil
+  "Whether to propagate the EMACSCLIENT_TRAMP environment variable."
+  :version "31.1"
+  :type 'boolean
+  :link '(info-link :tag "Tramp manual" "(tramp) Remote processes"))
+
 ;;; Internal Variables:
 
 ;;;###tramp-autoload
@@ -5509,6 +5518,13 @@ processes."
 	   (env (if sh-file-name-handler-p
 		    (setenv-internal env "TERM" tramp-terminal-type 'keep)
 		  env))
+	   ;; Add EMACSCLIENT_TRAMP.
+	   (env (if (and tramp-propagate-emacsclient-tramp
+			 sh-file-name-handler-p)
+		    (setenv-internal
+		     env "EMACSCLIENT_TRAMP"
+		     (tramp-make-tramp-file-name v 'noloc) 'keep)
+		  env))
 	   ;; Add INSIDE_EMACS.
 	   (env (setenv-internal env "INSIDE_EMACS" (tramp-inside-emacs) 'keep))
 	   (env (mapcar #'tramp-shell-quote-argument (delq nil env)))
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index c76d6d54c3d..d6eb782df3d 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -6555,6 +6555,21 @@ INPUT, if non-nil, is a string sent to the process."
 	  (funcall
 	   this-shell-command-to-string "echo \"${INSIDE_EMACS:-bla}\""))))
 
+      ;; Check EMACSCLIENT_TRAMP.
+      (setenv "EMACSCLIENT_TRAMP")
+      (let ((tramp-propagate-emacsclient-tramp t))
+	(should
+	 (string-equal
+	  (format "%s\n" (tramp-make-tramp-file-name tramp-test-vec 'noloc))
+	  (funcall
+	   this-shell-command-to-string "echo \"${EMACSCLIENT_TRAMP:-bla}\""))))
+      (let (tramp-propagate-emacsclient-tramp)
+	(should
+	 (string-equal
+	  "bla\n"
+	  (funcall
+	   this-shell-command-to-string "echo \"${EMACSCLIENT_TRAMP:-bla}\""))))
+
       ;; Set a value.
       (let ((process-environment
 	     (cons (concat envvar "=foo") process-environment)))

From a0c05029fd18c33f897d0c8ee3424735b53fe645 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 13 May 2026 18:46:31 +0200
Subject: [PATCH 436/463] * etc/NEWS: Mention new user option
 tramp-propagate-emacsclient-tramp.

---
 etc/NEWS | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/etc/NEWS b/etc/NEWS
index c0e05deed2e..a746ca7b1a3 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2451,6 +2451,13 @@ This can be used by external ELPA packages for performance optimizations
 in special cases.  For more information, see "(tramp) New operations" in
 the Tramp manual.
 
++++
+*** New user option 'tramp-propagate-emacsclient-tramp'.
+When this option is non-nil, Tramp propagates the environment variable
+EMACSCLIENT_TRAMP with a proper value to remote processes.  This is
+helpful if you want to start emacsclient on a remote host from a process
+started inside Emacs.
+
 ** Isearch and Replace
 
 *** Typing 'd' during 'query-replace' shows the diff buffer with replacements.

From a00beb3a31bd998cba547a6b06d662799bdc28c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Marks?= <shipmints@gmail.com>
Date: Thu, 7 May 2026 08:09:28 -0400
Subject: [PATCH 437/463] Make 'markdown-ts-inline-images' buffer local and
 test for GUI (bug#80978)

* lisp/textmodes/markdown-ts-mode.el (markdown-ts-inline-images):
Now buffer local.
(markdown-ts--fontify-image): Defensively test for graphical
display before rendering images.
---
 lisp/textmodes/markdown-ts-mode.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lisp/textmodes/markdown-ts-mode.el b/lisp/textmodes/markdown-ts-mode.el
index 05f016ab377..56fd98d86b8 100644
--- a/lisp/textmodes/markdown-ts-mode.el
+++ b/lisp/textmodes/markdown-ts-mode.el
@@ -279,6 +279,8 @@ use that string instead."
 (defcustom markdown-ts-inline-images nil
   "Non-nil means display inline images below image links."
   :type 'boolean
+  :local t
+  :safe #'booleanp
   :version "31.1"
   :package-version "1.0")
 
@@ -1524,6 +1526,7 @@ Remote images are controlled by
                  (<= (overlay-end ov) search-end))
         (delete-overlay ov)))
     (when (and markdown-ts-inline-images
+               (display-images-p)
                ;; Don't create image overlays for nodes inside
                ;; folded (outline-invisible) headings, since the
                ;; images wouldn't be visible and could interfere

From 0be998d4bc03b4ea12e506363d41b7e9ceeefc04 Mon Sep 17 00:00:00 2001
From: Rahul Martim Juliato <rahul.juliato@gmail.com>
Date: Thu, 7 May 2026 11:24:30 -0300
Subject: [PATCH 438/463] Fix code-span in headings in 'markdown-ts-mode'
 (bug#80979)

* lisp/textmodes/markdown-ts-mode.el
(markdown-ts--treesit-settings): Move the 'code_span' and
'code_span_delimiter' font-lock rules into a separate block with
':override prepend' instead of 'append'.  The heading feature
(level 1) applies its face via 'font-lock-append-text-property',
so a code span that later appends 'markdown-ts-code-span' ends
up with '(markdown-ts-heading-N markdown-ts-code-span)', where
the heading face takes priority and the code-span face is
suppressed.  Prepending ensures 'markdown-ts-code-span' appears
first in the face list and wins visually.
---
 lisp/textmodes/markdown-ts-mode.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/textmodes/markdown-ts-mode.el b/lisp/textmodes/markdown-ts-mode.el
index 56fd98d86b8..8e28be036b7 100644
--- a/lisp/textmodes/markdown-ts-mode.el
+++ b/lisp/textmodes/markdown-ts-mode.el
@@ -1697,12 +1697,16 @@ Skip matches already inside tree-sitter link or autolink nodes."
    :override 'append
    '((fenced_code_block (code_fence_content) @markdown-ts--fontify-code-block))
 
+   :language 'markdown-inline
+   :override 'prepend
+   :feature 'paragraph-inline
+   '(((code_span) @markdown-ts-code-span)
+     ((code_span_delimiter) @markdown-ts--fontify-delimiter))
+
    :language 'markdown-inline
    :override 'append
    :feature 'paragraph-inline
    '(((link_destination) @markdown-ts--fontify-link-destination)
-     ((code_span) @markdown-ts-code-span)
-     ((code_span_delimiter) @markdown-ts--fontify-delimiter)
      ((emphasis) @markdown-ts-emphasis)
      ((strong_emphasis) @markdown-ts-bold)
      ((strikethrough) @markdown-ts-strikethrough)

From b39c123490b3baeb6c8f88908f3ff854ed2f2fee Mon Sep 17 00:00:00 2001
From: Rahul Martim Juliato <rahul.juliato@gmail.com>
Date: Fri, 8 May 2026 19:23:07 -0300
Subject: [PATCH 439/463] Fix strikethrough in 'markdown-ts-mode' (bug#80991)

* lisp/textmodes/markdown-ts-mode.el
(markdown-ts--treesit-settings): Add a new font-lock block for
'paragraph-inline' that handles strikethrough nodes more
carefully.
---
 lisp/textmodes/markdown-ts-mode.el | 33 +++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/lisp/textmodes/markdown-ts-mode.el b/lisp/textmodes/markdown-ts-mode.el
index 8e28be036b7..8646842cfc3 100644
--- a/lisp/textmodes/markdown-ts-mode.el
+++ b/lisp/textmodes/markdown-ts-mode.el
@@ -154,6 +154,17 @@
 ;;   content.  Lowercase `<!doctype html>' works as a workaround.
 ;;   See <https://github.com/tree-sitter-grammars/tree-sitter-markdown/issues/233>.
 ;;
+;; - The grammar parses solo tildes, incorrectly applying strikethrough.
+;;   For example, writing:
+;;
+;;     I see ~approximately four lights.
+;;     I do not see ~approximately five lights.
+;;
+;;   Results in strikethrough incorrectly starting at the first
+;;   ~approximately and extending till the tilde at the second
+;;   ~approximately.
+;;   See <https://github.com/tree-sitter-grammars/tree-sitter-markdown/issues/236>.
+;;
 ;; - Superscript (`^text^') and subscript (`~text~') syntax is not
 ;;   supported by the grammar.  No EXTENSION_ build flag exists for
 ;;   this.  This is Pandoc / PHP Markdown Extra syntax, not CommonMark
@@ -1703,13 +1714,33 @@ Skip matches already inside tree-sitter link or autolink nodes."
    '(((code_span) @markdown-ts-code-span)
      ((code_span_delimiter) @markdown-ts--fontify-delimiter))
 
+   :language 'markdown-inline
+   :override 'append
+   :feature 'paragraph-inline
+   ;; Order matters: most specific to least specific.
+   '(;; ~ x ~ (strikethrough (emphasis_delimiter) ) : ( (emphasis_delimiter))
+     ;;                                           ^^^
+     ;;                                           inline text needs to be ignored
+     ((strikethrough ((emphasis_delimiter)
+                      :anchor
+                      _ @foo
+                      (emphasis_delimiter))
+                     (:match "\\`[~[:print:]]\\'" @foo)
+                     )
+      @default)
+     ;; ~~x~~ (strikethrough (emphasis_delimiter) (strikethrough (emphasis_delimiter) (emphasis_delimiter)) (emphasis_delimiter))
+     ((strikethrough (emphasis_delimiter) (strikethrough (emphasis_delimiter) (emphasis_delimiter)) (emphasis_delimiter))
+      @markdown-ts-strikethrough)
+     ;;  ~x~  (strikethrough (emphasis_delimiter) (emphasis_delimiter))
+     ((strikethrough (emphasis_delimiter) (emphasis_delimiter))
+      @markdown-ts-strikethrough))
+
    :language 'markdown-inline
    :override 'append
    :feature 'paragraph-inline
    '(((link_destination) @markdown-ts--fontify-link-destination)
      ((emphasis) @markdown-ts-emphasis)
      ((strong_emphasis) @markdown-ts-bold)
-     ((strikethrough) @markdown-ts-strikethrough)
      (inline_link (link_text) @markdown-ts--fontify-link-node)
      (full_reference_link (link_text) @markdown-ts--fontify-link-node)
      (full_reference_link (link_label) @markdown-ts--fontify-link-node)

From 286833e401d7058a8968ee3e023b526b0a9a6883 Mon Sep 17 00:00:00 2001
From: Rahul Martim Juliato <rahul.juliato@gmail.com>
Date: Tue, 12 May 2026 00:03:16 -0300
Subject: [PATCH 440/463] Add read-only 'markdown-ts-view-mode' (bug#81023)

This new derived mode is intended for consumers that render
Markdown content for display rather than editing, such as Eglot
and Eldoc when showing documentation popups and buffers.  It
pre-sets the relevant customizations (markup hidden, inline
images on, hard-line-break markup hidden, native code-block
fontification, table and code-block context minor modes off),
makes the buffer read-only, and uses its own keymap derived from
'special-mode-map' so navigation keys behave like a viewer.

A pre-init hook lets callers normalize buffer content before the
grammar parses it; 'markdown-ts-add-final-newline' is the
default so that markup depending on a terminating newline parses
correctly.  'markdown-ts-buffer-string' returns the rendered
buffer string with overlay faces flattened into text properties,
which is useful for callers that capture the rendered output.

Along the way: 'list_marker_parenthesis' is now recognized as an
ordered list marker; the strikethrough query is simplified to a
single rule; thematic breaks span the window via an ':extend'
underline when the face supports it.

* lisp/textmodes/markdown-ts-mode.el (markdown-ts-view-mode):
New read-only derived mode.
(markdown-ts-view-mode-map): New keymap.
(markdown-ts-view-mode-pre-init-hook): New hook, defaulting to
'markdown-ts-add-final-newline'.
(markdown-ts-mode--initialize): New helper, factored out of
'markdown-ts-mode' so 'markdown-ts-view-mode' can reuse the
parser readiness and setup logic after overriding local
variables.
(markdown-ts-mode): Call 'markdown-ts-mode--initialize'.
(markdown-ts-add-final-newline): New function.
(markdown-ts-buffer-string): New function.
(markdown-ts-unordered-list-marker): New defcustom.
(markdown-ts-hard-line-break-backslash)
(markdown-ts-hard-line-break-space): Accept the symbol 'hide.
(markdown-ts--fontify-hard-line-break): Honor 'hide.
(markdown-ts--fontify-atx-heading)
(markdown-ts--fontify-setext-heading)
(markdown-ts--fontify-atx-delimiter)
(markdown-ts--fontify-unordered-list-marker)
(markdown-ts--list-item-depth): New functions supporting clean
rendering when markup is hidden.
(markdown-ts--fontify-thematic-break): Use ':extend' underline
span when the face supports it.
(markdown-ts--resolve-display-value): Accept non-cons values.
(markdown-ts--list-ordered-item-p): Also recognize
'list_marker_parenthesis'.
(markdown-ts--range-settings): Mark markdown-inline embed as
':local t'.
(markdown-ts--set-up): Create the markdown-inline parser only in
the inline setup branch; drop the redundant
'markdown-ts-hide-markup' make-local-variable.
(markdown-ts--treesit-settings): Route atx and setext headings
to their dedicated fontifiers; route unordered list markers
through 'markdown-ts--fontify-unordered-list-marker'; move
'strikethrough' to the simpler paragraph-inline query.
---
 lisp/textmodes/markdown-ts-mode.el | 479 ++++++++++++++++++++---------
 1 file changed, 336 insertions(+), 143 deletions(-)

diff --git a/lisp/textmodes/markdown-ts-mode.el b/lisp/textmodes/markdown-ts-mode.el
index 8646842cfc3..d57b7aa98ef 100644
--- a/lisp/textmodes/markdown-ts-mode.el
+++ b/lisp/textmodes/markdown-ts-mode.el
@@ -315,6 +315,28 @@ Remote images are skipped by default for security."
   :version "31.1"
   :package-version "1.0")
 
+(defcustom markdown-ts-unordered-list-marker '(("● " . "- ")
+                                               ("○ " . "- ")
+                                               ("◼ " . "- ")
+                                               ("• " . "- "))
+  "If markup is hidden, display these for an unordered list marker.
+Each list item marker's depth in its list controls its selected string
+starting at the first element and cycling through the others for deeper
+items.  The list will be cycle around back to the beginning if there are
+insufficient strings to represent deep levels.
+
+Note that the default strings have trailing spaces.
+
+Value forms:
+ - (list (cons (PREFERRED . FALLBACK)) ...): where PREFERRED is used if
+   its first character passes `char-displayable-p', otherwise FALLBACK.
+ - nil: display the raw markup."
+  :type '(choice (repeat (cons (string :tag "Preferred (GUI)")
+                               (string :tag "Fallback (TTY)")))
+                 (const :tag "Display original markup" nil))
+  :version "31.1"
+  :package-version "1.0")
+
 (defcustom markdown-ts-checked-checkbox '("☑" . "+")
   "If markup is hidden, display this for a checked task list marker.
 Value forms:
@@ -367,10 +389,14 @@ Consulted only when `markdown-ts-unchecked-checkbox' is the symbol
 
 (defcustom markdown-ts-thematic-break-character '(?─ . ?-)
   "If markup is hidden, display this character for thematic breaks.
-It is repeated to fill the window width.
+It is repeated to fill the window width.  This assumes a static window
+width.
+You may prefer an `:extend' attribute on the
+`markdown-ts-thematic-break' which will span window width dynamically
+using an underline, in which case this character is ignored.
 The value is a cons (PREFERRED . FALLBACK): PREFERRED is used if it passes
 `char-displayable-p', otherwise FALLBACK is used.
-nil displays the raw markup."
+Use nil to display the raw markup."
   :type '(choice (cons (character :tag "Preferred (GUI)")
                        (character :tag "Fallback (TTY)"))
                  (const :tag "Display original markup" nil))
@@ -384,7 +410,8 @@ The value is a cons (PREFERRED . FALLBACK): PREFERRED is used if it passes
 nil keeps the raw markup."
   :type '(choice (cons (character :tag "Preferred (GUI)")
                        (character :tag "Fallback (TTY)"))
-                 (const :tag "Display original markup" nil))
+                 (const :tag "Display original markup" nil)
+                 (const :tag "Hide markup" hide))
   :version "31.1"
   :package-version "1.0")
 
@@ -404,7 +431,8 @@ The value can be:
   :type '(choice (character :tag "Display specified character (no repetition)")
                  (string :tag "Display specified string (no repetition)")
                  (function :tag "Function from count to display string")
-                 (const :tag "Display original markup" nil))
+                 (const :tag "Display original markup" nil)
+                 (const :tag "Hide markup" hide))
   :version "31.1"
   :package-version "1.0")
 
@@ -536,6 +564,18 @@ Set to nil to disable the lighter."
   :version "31.1"
   :package-version "1.0")
 
+(defcustom markdown-ts-view-mode-pre-init-hook (list #'markdown-ts-add-final-newline)
+  "Hooks run before `markdown-ts-view-mode` initialization.
+Functions on this list are intended to amend buffer content for
+`markdown-ts-view-mode' and tree-sitter Markdown grammar compatibility.
+
+For example, `markdown-ts-add-final-newline' ensures the grammar
+correctly parses markup at the end of the buffer that depends on a final
+newline."
+  :type '(hook)
+  :version "31.1"
+  :package-version "1.0")
+
 ;;; Faces:
 
 (defgroup markdown-ts-faces nil
@@ -763,7 +803,6 @@ shadow-colored block."
     (ts typescript-ts-mode)
     (yml yaml-ts-mode))
   "Extra mappings from code block language tags to major modes.
-
 Entries here are only needed when the language tag in a fenced code
 block does NOT match the conventional mode name derivation, e.g. the
 user writes \\=`\\=`\\=`ts instead of \\=`\\=`\\=`typescript, or
@@ -796,7 +835,6 @@ conventional font-lock.  `markdown-ts-mode' itself is one of them.")
 
 (defun markdown-ts--fontify-delimiter (node override start end &rest _)
   "Fontify delimiter NODE and optionally hide its markup.
-
 NODE is the tree-sitter node representing the delimiter.
 OVERRIDE, START, and END are passed through to
 `treesit-fontify-with-override'."
@@ -807,6 +845,26 @@ OVERRIDE, START, and END are passed through to
     (put-text-property (treesit-node-start node) (treesit-node-end node)
                        'invisible 'markdown-ts--markup)))
 
+(defun markdown-ts--fontify-atx-delimiter (node override start end &rest _)
+  "Fontify atx_heading delimiter NODE and optionally hide its markup.
+NODE is the tree-sitter node representing the delimiter.
+Leading whitespace between the delimiter and the heading text is hidden
+along with the delimiter when hiding markup.
+OVERRIDE, START, and END are passed through to
+`treesit-fontify-with-override'."
+  (treesit-fontify-with-override
+   (treesit-node-start node) (treesit-node-end node)
+   'markdown-ts-delimiter override start end)
+  (when markdown-ts-hide-markup
+    (put-text-property (treesit-node-start node)
+                       (save-excursion
+                         (goto-char (treesit-node-end node))
+                         (re-search-forward "[^[:blank:]]" (pos-eol) 'no-error)
+                         (if (eq (point) (pos-eol))
+                             (point)
+                           (1- (point))))
+                       'invisible 'markdown-ts--markup)))
+
 (defvar url-mail-command) ; url/url-vars.el
 
 (defun markdown-ts--make-link-button (beg end url)
@@ -1021,57 +1079,89 @@ Pushes the mark before moving so `C-u C-SPC' returns.  Signals
         (recenter))
     (user-error "No heading for fragment: #%s" id)))
 
-(defun markdown-ts--fontify-heading (node _override _start _end &rest _)
-  "Apply the heading face across NODE.
+(defun markdown-ts--fontify-atx-heading (node _override _start _end &rest _)
+  "Apply the heading face across an atx_heading NODE.
 Layer the face on top of child sub-nodes (e.g. an inline link) so
 their own faces are preserved.  Strip any prior copy of the face
 first so it does not accumulate when the heading is refontified or
 its level/type changes during editing.
-
-For ATX headings, also fontify any optional trailing closing-`#'
-sequence as a delimiter.  The tree-sitter grammar does not produce a
-separate node for these; per CommonMark they are decorative and
-must be preceded by a space or tab."
-  (let* ((type (treesit-node-type node))
-         (n-start (treesit-node-start node))
+Do not fontify the header's trailing newline.
+Elide trailing whitespace when hiding markup.
+Fontify any optional trailing closing-`#' sequence as a delimiter.  The
+tree-sitter grammar does not produce a separate node for these; per
+CommonMark they are decorative and must be preceded by a space or tab."
+  (let* ((n-start (treesit-node-start node))
          (n-end   (treesit-node-end node))
-         (face (cond
-                ((equal type "setext_heading")
-                 'markdown-ts-setext-heading)
-                (t
-                 (let ((marker (treesit-node-child node 0)))
-                   (intern (format "markdown-ts-heading-%d"
-                                   (length (treesit-node-text marker t)))))))))
+         (face (let ((marker (treesit-node-child node 0)))
+                 (intern (format "markdown-ts-heading-%d"
+                                 (length (treesit-node-text marker t)))))))
     (font-lock--remove-face-from-text-property n-start n-end 'face face)
-    (font-lock-append-text-property n-start n-end 'face face)
-    (when (string-prefix-p "atx_" type)
-      (save-excursion
-        (goto-char n-end)
-        (skip-chars-backward " \t\n" n-start)
-        (let ((line-end (point)))
-          (skip-chars-backward " \t" n-start)
-          (let ((trailing-end (point)))
-            (skip-chars-backward "#" n-start)
-            (let ((trailing-start (point)))
-              (when (and (< trailing-start trailing-end)
-                         (> trailing-start n-start)
-                         (memq (char-before trailing-start) '(?\s ?\t)))
-                (font-lock--remove-face-from-text-property
-                 trailing-start trailing-end
-                 'face 'markdown-ts-delimiter)
-                (font-lock-prepend-text-property
-                 trailing-start trailing-end
-                 'face 'markdown-ts-delimiter)
-                (when markdown-ts-hide-markup
-                  ;; Also hide the space(s) preceding the closer and any
-                  ;; trailing whitespace, so the heading looks clean.
-                  (let ((hide-start (save-excursion
-                                      (goto-char trailing-start)
-                                      (skip-chars-backward " \t" n-start)
-                                      (point))))
-                    (put-text-property hide-start line-end
-                                       'invisible
-                                       'markdown-ts--markup)))))))))))
+    (font-lock-append-text-property n-start (1- n-end) 'face face)
+    (save-excursion
+      (goto-char n-end)
+      (skip-chars-backward "[:space:]" n-start)
+      (let ((trailing-end (point)))
+        (skip-chars-backward "#" n-start)
+        (let ((trailing-start (point)))
+          (cond ((and (< trailing-start trailing-end)
+                      (> trailing-start n-start)
+                      (memq (char-before trailing-start) '(?\s ?\t)))
+                 ;; Identify the optional trailing closing-# sequence,
+                 ;; fontify it as a delimiter, and remove whitespace
+                 ;; between the heading text and the delimiter.  The
+                 ;; grammar omits a node for this run despite CommonMark.
+                 (font-lock--remove-face-from-text-property
+                  trailing-start trailing-end
+                  'face 'markdown-ts-delimiter)
+                 (font-lock-prepend-text-property
+                  trailing-start trailing-end
+                  'face 'markdown-ts-delimiter)
+                 (when markdown-ts-hide-markup
+                   (let ((hide-start (save-excursion
+                                       (goto-char trailing-start)
+                                       (skip-chars-backward "[:space:]" n-start)
+                                       (point))))
+                     (put-text-property hide-start (pos-eol)
+                                        'invisible 'markdown-ts--markup))))
+                (markdown-ts-hide-markup
+                 ;; Hide trailing whitespace in the nominal case.
+                 (put-text-property trailing-end (pos-eol)
+                                    'invisible 'markdown-ts--markup))))))))
+
+(defun markdown-ts--fontify-setext-heading (node _override _start _end &rest _)
+  "Apply the heading face across a setext NODE.
+Layer the face on top of child sub-nodes (e.g. an inline link) so
+their own faces are preserved.  Strip any prior copy of the face
+first so it does not accumulate when the heading is refontified or
+its level/type changes during editing.
+Apply the face to the setext heading_content separately from the
+underline rather than treat them as a single range.  This avoids putting
+the face on the heading_content newline.  If `markdown-ts-hide-markup'
+is non-nil, hide the underline line entirely by setting its line-height
+text property to 0.
+Elide trailing whitespace when hiding markup."
+  (let* ((n-start (treesit-node-start node))
+         (n-end (treesit-node-end node))
+         (content (treesit-node-child node 0 'named))
+         (content-start (treesit-node-start content))
+         (content-end (treesit-node-end content))
+         (underline (treesit-node-child node 1 'named))
+         (underline-start (treesit-node-start underline))
+         (underline-end (treesit-node-end underline))
+         (face 'markdown-ts-setext-heading))
+    (font-lock--remove-face-from-text-property n-start n-end 'face face)
+    ;; 1- content-end avoids the newline so it hides correctly.
+    (font-lock-append-text-property content-start (1- content-end) 'face face)
+    (font-lock-append-text-property underline-start underline-end 'face face)
+    (when markdown-ts-hide-markup
+      ;; Hide heading_content trailing spaces.
+      (put-text-property (save-excursion
+                           (goto-char content-end)
+                           (skip-chars-backward "[:space:]" content-start)
+                           (point))
+                         content-end
+                         'invisible 'markdown-ts--markup)
+      (put-text-property underline-start underline-end 'line-height 0))))
 
 (defun markdown-ts--fontify-link-node (node override start end &rest _)
   "Fontify link or image text NODE as a clickable button.
@@ -1261,12 +1351,51 @@ OVERRIDE, START, and END are passed through to
 
 (defun markdown-ts--resolve-display-value (val)
   "Resolve VAL, a cons (PREFERRED . FALLBACK), to a displayable value.
-Return PREFERRED if its first character passes `char-displayable-p',
-otherwise return FALLBACK.  Return nil if VAL is nil."
-  (when val
-    (let* ((preferred (car val))
-           (ch (if (characterp preferred) preferred (aref preferred 0))))
-      (if (char-displayable-p ch) (car val) (cdr val)))))
+PREFERRED and FALLBACK can be a character or a string.  Return PREFERRED
+if it, or its first character, is `char-displayable-p', otherwise return
+FALLBACK.
+If VAL is not a cons or is nil, return VAL."
+  (if (consp val)
+      (let* ((preferred (car val))
+             (ch (if (characterp preferred)
+                     preferred
+                   (aref preferred 0))))
+        (if (char-displayable-p ch)
+            (car val)
+          (cdr val)))
+    val))
+
+(defun markdown-ts--list-item-depth (node)
+  "Compute the depth of list NODE relative to its parents.
+NODE can be a list, list_item, or one of the list_marker_'s.
+If NODE is not in a list, return -1."
+  (let ((depth -1))
+    (while (and node
+                (not (equal (treesit-node-type node) "section")))
+      (when (equal (treesit-node-type node) "list")
+        (setq depth (1+ depth)))
+      (setq node (treesit-node-parent node)))
+    depth))
+
+(defun markdown-ts--fontify-unordered-list-marker (node override start end &rest _)
+  "Fontify unordered list marker NODE, show a symbol when markup is hidden.
+OVERRIDE, START, and END are passed through to
+`treesit-fontify-with-override'."
+  (let* ((node-start (treesit-node-start node))
+         (node-end (treesit-node-end node))
+         (face 'markdown-ts-list-marker))
+    (treesit-fontify-with-override node-start node-end face
+                                   override start end)
+    (cond (markdown-ts-hide-markup
+           (let* ((depth (markdown-ts--list-item-depth node))
+                  (value (if markdown-ts-unordered-list-marker
+                             (nth (mod depth (length markdown-ts-unordered-list-marker))
+                                  markdown-ts-unordered-list-marker)
+                           nil))
+                  (display-spec (markdown-ts--resolve-display-value value)))
+             (put-text-property node-start node-end 'display display-spec)))
+          (t
+           (remove-text-properties node-start node-end '(display nil))))))
 
 (defun markdown-ts--fontify-checkbox (node override start end &rest _)
   "Fontify task list checkbox NODE, show a Unicode symbol when markup is hidden.
@@ -1310,6 +1439,9 @@ A backslash break gets `markdown-ts-hard-line-break-backslash' (or its
 backslash break is replaced by a single `markdown-ts-hard-line-break'
 glyph; a trailing-spaces break replaces each space with the glyph, so the run
 of pilcrows fills the line up to the newline.
+If `markdown-ts-hard-line-break-backslash' or
+`markdown-ts-hard-line-break-space' are the symbol `hide', hide the
+markup entirely.
 OVERRIDE, START, and END are passed through to
 `treesit-fontify-with-override'."
   (let* ((node-start (treesit-node-start node))
@@ -1363,21 +1495,24 @@ OVERRIDE, START, and END are passed through to
                    ((stringp spec) spec)
                    ((functionp spec)
                     (funcall spec (- region-end region-start))))))
-        (when (and (stringp str)
-                   (> (length str) 0)
-                   (char-displayable-p (aref str 0)))
-          (put-text-property region-start (1+ region-start)
-                             'display str)
-          ;; For the trailing-spaces variant, hide the remaining
-          ;; spaces in the run so the line doesn't end with leftover
-          ;; whitespace after the substituted glyph.  Each position
-          ;; gets its own empty-string `display' so cursor placement
-          ;; stays unambiguous.
-          (unless backslash
-            (let ((i (1+ region-start)))
-              (while (< i region-end)
-                (put-text-property i (1+ i) 'display "")
-                (setq i (1+ i))))))))))
+        (if (eq spec 'hide)
+            (put-text-property region-start region-end
+                               'invisible 'markdown-ts--markup)
+          (when (and (stringp str)
+                     (> (length str) 0)
+                     (char-displayable-p (aref str 0)))
+            (put-text-property region-start (1+ region-start)
+                               'display str)
+            ;; For the trailing-spaces variant, hide the remaining
+            ;; spaces in the run so the line doesn't end with leftover
+            ;; whitespace after the substituted glyph.  Each position
+            ;; gets its own empty-string `display' so cursor placement
+            ;; stays unambiguous.
+            (unless backslash
+              (let ((i (1+ region-start)))
+                (while (< i region-end)
+                  (put-text-property i (1+ i) 'display "")
+                  (setq i (1+ i)))))))))))
 
 (defun markdown-ts--fontify-thematic-break (node override start end &rest _)
   "Fontify thematic break NODE and show a line when markup is hidden.
@@ -1388,22 +1523,27 @@ OVERRIDE, START, and END are passed through to
     (treesit-fontify-with-override node-start node-end
                                    'markdown-ts-thematic-break
                                    override start end)
-    (let ((char (markdown-ts--resolve-display-value
-                 markdown-ts-thematic-break-character)))
-      (if (and markdown-ts-hide-markup char (char-displayable-p char))
-          (let* ((col (save-excursion (goto-char node-start)
-                                      (current-column)))
-                 ;; Span if the face has non-nil :extend.
-                 (span-length (if (face-attribute 'markdown-ts-thematic-break
-                                                  :extend nil 'default)
-                                  (- (window-body-width) col)
-                                12)))
-            (put-text-property node-start node-end
-                               'display
-                               (concat
-                                (make-string span-length char)
-                                "\n")))
-        (remove-text-properties node-start node-end '(display nil))))))
+    (if markdown-ts-hide-markup
+        (cond
+         ((and (display-supports-face-attributes-p '(:extend t))
+               (face-attribute 'markdown-ts-thematic-break
+                               :extend nil 'default))
+          (put-text-property node-start node-end
+                             'display
+                             (propertize "\n" 'face '(:extend t :underline t))))
+         (t
+          (when-let* ((char (markdown-ts--resolve-display-value
+                             markdown-ts-thematic-break-character))
+                      (_ (char-displayable-p char)))
+            (let* ((col (save-excursion (goto-char node-start)
+                                        (current-column)))
+                   (span-length (max 12 (- (window-body-width) col))))
+              (put-text-property node-start node-end
+                                 'display
+                                 (concat
+                                  (make-string span-length char)
+                                  "\n"))))))
+      (remove-text-properties node-start node-end '(display nil)))))
 
 (defun markdown-ts--fontify-code-block (node _override _start _end &rest _)
   "Fontify code block content NODE with a background overlay.
@@ -1637,18 +1777,18 @@ Skip matches already inside tree-sitter link or autolink nodes."
 
    :language 'markdown
    :feature 'heading
-   '(((atx_heading)    @markdown-ts--fontify-heading)
-     ((setext_heading) @markdown-ts--fontify-heading))
+   '(((atx_heading)    @markdown-ts--fontify-atx-heading)
+     ((setext_heading) @markdown-ts--fontify-setext-heading))
 
    :language 'markdown
    :feature 'heading
    :override 'prepend
-   '((atx_h1_marker) @markdown-ts--fontify-delimiter
-     (atx_h2_marker) @markdown-ts--fontify-delimiter
-     (atx_h3_marker) @markdown-ts--fontify-delimiter
-     (atx_h4_marker) @markdown-ts--fontify-delimiter
-     (atx_h5_marker) @markdown-ts--fontify-delimiter
-     (atx_h6_marker) @markdown-ts--fontify-delimiter
+   '((atx_h1_marker) @markdown-ts--fontify-atx-delimiter
+     (atx_h2_marker) @markdown-ts--fontify-atx-delimiter
+     (atx_h3_marker) @markdown-ts--fontify-atx-delimiter
+     (atx_h4_marker) @markdown-ts--fontify-atx-delimiter
+     (atx_h5_marker) @markdown-ts--fontify-atx-delimiter
+     (atx_h6_marker) @markdown-ts--fontify-atx-delimiter
      (setext_h1_underline) @markdown-ts--fontify-delimiter
      (setext_h2_underline) @markdown-ts--fontify-delimiter)
 
@@ -1657,9 +1797,9 @@ Skip matches already inside tree-sitter link or autolink nodes."
    '(((thematic_break) @markdown-ts--fontify-thematic-break)
      ((html_block) @markdown-ts-html-block)
      ((indented_code_block) @markdown-ts-indented-code-block)
-     (list_item (list_marker_star) @markdown-ts-list-marker)
-     (list_item (list_marker_plus) @markdown-ts-list-marker)
-     (list_item (list_marker_minus) @markdown-ts-list-marker)
+     (list_item (list_marker_star) @markdown-ts--fontify-unordered-list-marker)
+     (list_item (list_marker_plus) @markdown-ts--fontify-unordered-list-marker)
+     (list_item (list_marker_minus) @markdown-ts--fontify-unordered-list-marker)
      (list_item (list_marker_dot) @markdown-ts-list-marker)
      (list_item (list_marker_parenthesis) @markdown-ts-list-marker)
      (list_item (task_list_marker_unchecked) @markdown-ts--fontify-checkbox)
@@ -1714,33 +1854,13 @@ Skip matches already inside tree-sitter link or autolink nodes."
    '(((code_span) @markdown-ts-code-span)
      ((code_span_delimiter) @markdown-ts--fontify-delimiter))
 
-   :language 'markdown-inline
-   :override 'append
-   :feature 'paragraph-inline
-   ;; Order matters: most specific to least specific.
-   '(;; ~ x ~ (strikethrough (emphasis_delimiter) ) : ( (emphasis_delimiter))
-     ;;                                           ^^^
-     ;;                                           inline text needs to be ignored
-     ((strikethrough ((emphasis_delimiter)
-                      :anchor
-                      _ @foo
-                      (emphasis_delimiter))
-                     (:match "\\`[~[:print:]]\\'" @foo)
-                     )
-      @default)
-     ;; ~~x~~ (strikethrough (emphasis_delimiter) (strikethrough (emphasis_delimiter) (emphasis_delimiter)) (emphasis_delimiter))
-     ((strikethrough (emphasis_delimiter) (strikethrough (emphasis_delimiter) (emphasis_delimiter)) (emphasis_delimiter))
-      @markdown-ts-strikethrough)
-     ;;  ~x~  (strikethrough (emphasis_delimiter) (emphasis_delimiter))
-     ((strikethrough (emphasis_delimiter) (emphasis_delimiter))
-      @markdown-ts-strikethrough))
-
    :language 'markdown-inline
    :override 'append
    :feature 'paragraph-inline
    '(((link_destination) @markdown-ts--fontify-link-destination)
      ((emphasis) @markdown-ts-emphasis)
      ((strong_emphasis) @markdown-ts-bold)
+     ((strikethrough) @markdown-ts-strikethrough)
      (inline_link (link_text) @markdown-ts--fontify-link-node)
      (full_reference_link (link_text) @markdown-ts--fontify-link-node)
      (full_reference_link (link_label) @markdown-ts--fontify-link-node)
@@ -2073,7 +2193,8 @@ indentation, which tree-sitter may include in the node."
 (defun markdown-ts--list-ordered-item-p (item)
   "Return non-nil if ITEM is an ordered (numbered) list item."
   (let ((marker (treesit-node-child item 0)))
-    (equal (treesit-node-type marker) "list_marker_dot")))
+    (member (treesit-node-type marker)
+            '("list_marker_dot" "list_marker_parenthesis"))))
 
 (defun markdown-ts--list-promote-or-demote (demote)
   "Change nesting of the list item at point.
@@ -4631,15 +4752,16 @@ If point is not at a table, do nothing."
   "Return range settings for `markdown-ts-mode'."
   (apply
    #'treesit-range-rules
-   `(:embed markdown-inline
-     :host markdown
+   `( :embed markdown-inline
+      :host markdown
+      :local t
      ((inline) @markdown-inline)
      ,@(when markdown-ts-fontify-code-blocks-natively
-         '(:embed markdown-ts--code-block-ts-language
-           :host markdown
-           :local t
-           ((fenced_code_block (info_string (language) @language)
-                               (code_fence_content) @content)))))))
+         '( :embed markdown-ts--code-block-ts-language
+            :host markdown
+            :local t
+            ((fenced_code_block (info_string (language) @language)
+                                (code_fence_content) @content)))))))
 
 (defun markdown-ts--remove-image-overlays ()
   "Remove all inline image overlays from the current buffer."
@@ -4924,6 +5046,27 @@ On a heading, call `outline-cycle'.  Otherwise do nothing."
   "M-RET"       #'markdown-ts-insert-list-item
   "TAB"         #'markdown-ts-outline-cycle)
 
+(defvar-keymap markdown-ts-view-mode-map
+  :doc "Keymap for `markdown-ts-view-mode'."
+  :parent special-mode-map
+  :menu nil
+  "g"           #'ignore ; Override special-mode-map #'revert-buffer
+  "C-c C-n"     #'outline-next-heading
+  "n"           #'outline-next-heading
+  "C-c C-p"     #'outline-previous-heading
+  "p"           #'outline-previous-heading
+  "C-c C-u"     #'outline-up-heading
+  "u"           #'outline-up-heading
+  "C-c C-f"     #'outline-forward-same-level
+  "f"           #'outline-forward-same-level
+  "C-c C-b"     #'outline-backward-same-level
+  "b"           #'outline-backward-same-level
+  "C-c C-x C-m" #'markdown-ts-toggle-hide-markup
+  "C-c C-x C-v" #'markdown-ts-toggle-inline-images
+  "C-c C-v n"   #'markdown-ts-move-to-next-code-block
+  "C-c C-v p"   #'markdown-ts-move-to-previous-code-block
+  "TAB"         #'markdown-ts-outline-cycle)
+
 (defvar-keymap markdown-ts-code-block-in-context-mode-map
   :doc "Keymap for `markdown-ts-code-block-in-context-mode'.
 These override keys in `markdown-ts-mode-map' to support executing their
@@ -5047,7 +5190,6 @@ NOTE: Call this function only when the treesit `markdown' and
   (setq-local adaptive-fill-function #'markdown-ts--adaptive-fill)
 
   ;; Create and configure the parsers.
-  (treesit-parser-create 'markdown-inline)
   (setq treesit-primary-parser
         (treesit-parser-create 'markdown))
 
@@ -5059,11 +5201,12 @@ NOTE: Call this function only when the treesit `markdown' and
                                                (image-preview error)))
 
   (cond (markdown-ts--set-up-inline
-          (setq-local treesit-range-settings
-                      (treesit-range-rules
-                       :embed 'markdown-inline
-                       :host 'markdown
-                       '((inline) @markdown-inline))))
+         (treesit-parser-create 'markdown-inline)
+         (setq-local treesit-range-settings
+                     (treesit-range-rules
+                      :embed 'markdown-inline
+                      :host 'markdown
+                      '((inline) @markdown-inline))))
         (t
          ;; Range settings differ in the master buffer vs. inline above.
          (setq-local treesit-range-settings (markdown-ts--range-settings))
@@ -5092,7 +5235,6 @@ NOTE: Call this function only when the treesit `markdown' and
                      #'markdown-ts--outline-view-change nil t))
 
          (progn
-           (make-local-variable 'markdown-ts-hide-markup)
            (make-local-variable 'font-lock-extra-managed-props)
            (dolist (prop '(invisible display button category action help-echo))
              (add-to-list 'font-lock-extra-managed-props prop)))
@@ -5209,10 +5351,8 @@ With a prefix argument, ARG, if needed, install parsers for `html',
       (require 'toml-ts-mode)
       (treesit-install-language-grammar 'toml))))
 
-;;;###autoload
-(define-derived-mode markdown-ts-mode text-mode "Markdown"
-  "Major mode for editing Markdown using tree-sitter grammar.
-NOTE: See `markdown-ts--set-up-inline'."
+(defun markdown-ts-mode--initialize ()
+  "Invoke this from major mode definitions after local variable set up."
   (treesit-ensure-installed 'markdown)
   (treesit-ensure-installed 'markdown-inline)
   ;; Bypass `treesit-max-buffer-size' so the mode activates in large
@@ -5221,16 +5361,57 @@ NOTE: See `markdown-ts--set-up-inline'."
   ;; they are installed.  Revisit if `treesit-parser-create' gains its
   ;; own buffer-size guard (see bug#80909).
   (let ((treesit-max-buffer-size most-positive-fixnum))
-    (if (treesit-ready-p '(markdown markdown-inline) t)
-        (markdown-ts--set-up)
-      (warn "markdown-ts-mode cannot be set up; using fundamental-mode.
+    (cond ((treesit-ready-p '(markdown markdown-inline) t)
+           (markdown-ts--set-up))
+          (t
+           (warn "markdown-ts-mode cannot be set up; using fundamental-mode.
 The tree-sitter parsers `markdown' and `markdown-inline' were not found.
 Use the command `markdown-ts-mode-install-parsers' to install them.
 With a prefix argument, it can also install optional parsers.")
-      (fundamental-mode))))
+           (fundamental-mode)))))
+
+;;;###autoload
+(define-derived-mode markdown-ts-mode text-mode "Markdown"
+  "Major mode for editing Markdown using tree-sitter grammar.
+NOTE: See `markdown-ts--set-up-inline'."
+  (markdown-ts-mode--initialize))
 
 (derived-mode-add-parents 'markdown-ts-mode '(markdown-mode))
 
+;;; View mode:
+
+;;;###autoload
+(define-derived-mode markdown-ts-view-mode
+  nil ; Intentionally left blank.
+  "Markdown View"
+  "Major mode for read-only viewing Markdown using tree-sitter grammar."
+  ;; NOTE: `markdown-ts-mode' is manually added as a parent to avoid
+  ;; invoking its initialization before we set override variables.
+  (setq-local markdown-ts-menu-bar-show nil)
+  (setq-local markdown-ts-hide-markup t)
+  (setq-local markdown-ts-inline-images t)
+  (setq-local markdown-ts-hard-line-break-backslash 'hide)
+  (setq-local markdown-ts-hard-line-break-space 'hide)
+  (setq-local markdown-ts-fontify-code-blocks-natively t)
+  (setq-local markdown-ts-enable-code-block-context-mode nil)
+  (setq-local markdown-ts-enable-table-mode nil)
+  (run-hooks 'markdown-ts-view-mode-pre-init-hook)
+  (markdown-ts-mode--initialize)
+  (setq buffer-read-only t))
+
+(derived-mode-add-parents 'markdown-ts-view-mode '(markdown-ts-mode special-mode))
+
+;;; Mode utilities:
+
+;;;###autoload
+(defun markdown-ts-buffer-string ()
+  "Like `buffer-string', and convert overlay properties to text properties."
+  (let ((str (buffer-string)))
+    (dolist (ov (overlays-in (point-min) (point-max)) str)
+      (when-let* ((face (overlay-get ov 'face)))
+        (font-lock-append-text-property
+         (overlay-start ov) (overlay-end ov) 'face face str)))))
+
 (defun markdown-ts--barf-if-not-mode (&optional context)
   "Signal an error if the current buffer is not a `markdown-ts-mode' buffer.
 Prefix the error message with CONTEXT."
@@ -5238,6 +5419,18 @@ Prefix the error message with CONTEXT."
     (user-error "%sis valid only in `markdown-ts-mode' buffers"
                 (if context (format "%s: " context) ""))))
 
+(defun markdown-ts-add-final-newline ()
+  "Add a final newline to the current buffer, if necessary."
+  ;; Inspired by files.el.
+  (let ((inhibit-read-only t))
+    (when (or (eq (buffer-size) 0)
+              (and (/= (char-after (1- (point-max))) ?\n)
+                   (not (and (eq selective-display t)
+                             (= (char-after (1- (point-max))) ?\r)))))
+      (save-excursion
+        (goto-char (point-max))
+        (insert ?\n)))))
+
 (define-minor-mode markdown-ts-code-block-in-context-mode
   "Minor mode enabled if point is within a fenced code block.
 This enables the keymap `markdown-ts-code-block-in-context-mode-map'."

From 71809ee5df5965e304bbbb02828b2de1f89cbd81 Mon Sep 17 00:00:00 2001
From: Rahul Martim Juliato <rahul.juliato@gmail.com>
Date: Tue, 12 May 2026 00:14:02 -0300
Subject: [PATCH 441/463] Fix 'markdown-ts-code-span' face (bug#81026)

* lisp/textmodes/markdown-ts-mode.el (markdown-ts-code-span):
Inherit from 'font-lock-keyword-face' rather than
'font-lock-string-face'.
---
 lisp/textmodes/markdown-ts-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/textmodes/markdown-ts-mode.el b/lisp/textmodes/markdown-ts-mode.el
index d57b7aa98ef..12e2e7c37f9 100644
--- a/lisp/textmodes/markdown-ts-mode.el
+++ b/lisp/textmodes/markdown-ts-mode.el
@@ -639,7 +639,7 @@ newline."
   "Face for Markdown link destinations (URLs)."
   :version "31.1")
 
-(defface markdown-ts-code-span '((t (:inherit font-lock-string-face)))
+(defface markdown-ts-code-span '((t (:inherit font-lock-keyword-face)))
   "Face for Markdown inline code spans."
   :version "31.1")
 

From 689c3bd5088c385fda6ce8054eb659737080d694 Mon Sep 17 00:00:00 2001
From: Rahul Martim Juliato <rahul.juliato@gmail.com>
Date: Tue, 12 May 2026 00:16:55 -0300
Subject: [PATCH 442/463] Use 'read-multiple-choice' in 'markdown-ts-mode'
 (bug#81027)

Replace the "c" character-prompt interactive spec with
'read-multiple-choice', which presents named options instead of
requiring users to decode the prompt string and type a single
character.

* lisp/textmodes/markdown-ts-mode.el
(markdown-ts-table-align-column): Use 'read-multiple-choice'.
Adjust ALIGN docstring punctuation.
* lisp/textmodes/markdown-ts-mode-x.el
(markdown-ts-toc-insert-template): Use 'read-multiple-choice'.
---
 lisp/textmodes/markdown-ts-mode-x.el | 6 +++++-
 lisp/textmodes/markdown-ts-mode.el   | 9 +++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lisp/textmodes/markdown-ts-mode-x.el b/lisp/textmodes/markdown-ts-mode-x.el
index 1327191828e..1296e3567a3 100644
--- a/lisp/textmodes/markdown-ts-mode-x.el
+++ b/lisp/textmodes/markdown-ts-mode-x.el
@@ -736,7 +736,11 @@ is nil and the command is run interactively, prompt for a template.
 The basic template uses all defaults and is likely the best choice for
 most uses.  The complete template illustrates all parameters set to
 their defaults and is useful as a starting point to customize a table."
-  (interactive "cTemplate [b]asic [c]omplete:")
+  (interactive
+   (list (car (read-multiple-choice
+               "Table of contents template"
+               '((?b "basic")
+                 (?c "complete"))))))
   (pcase char
     (?b
      (insert "<!-- markdown-ts-toc: -->\n"
diff --git a/lisp/textmodes/markdown-ts-mode.el b/lisp/textmodes/markdown-ts-mode.el
index 12e2e7c37f9..d2f4fcd8fa7 100644
--- a/lisp/textmodes/markdown-ts-mode.el
+++ b/lisp/textmodes/markdown-ts-mode.el
@@ -4392,13 +4392,18 @@ Note: To compute the column, point must be within the column and cannot
 be on the leading or trailing whitespace or on a column delimiter.
 
 ALIGN can be one of the symbols `left', `center', `right' or nil for
-unspecified or the characters l, c, or r.
+unspecified, or the characters l, c, or r.
 
 If ALIGN is nil, assume unspecified.  Make the alignment string a
 minimum of 5 characters to accommodate Markdown conventions.
 
 If point is not at a table, do nothing."
-  (interactive "cAlign column [l]eft [c]enter [r]ight [u]nspecified:")
+  (interactive
+   (list (car (read-multiple-choice
+               "Align column" '((?l "left")
+                                (?c "center")
+                                (?r "right")
+                                (?u "unspecified"))))))
   (markdown-ts--barf-if-not-mode 'markdown-ts-table-align-column)
   (setq align (if (characterp align)
                   (pcase align (?l 'left) (?c 'center) (?r 'right))

From aba60ad0c5be8f657230649df9b78db534027a20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Fri, 8 May 2026 22:22:49 +0100
Subject: [PATCH 443/463] Eglot: prefer markdown-ts-view-mode for markup
 rendering (bug#80127)

Eglot previously needed gfm-view-mode from markdown-mode.el to render
Markdown from LSP servers.  It now prefers markdown-ts-view-mode when
available.

* lisp/progmodes/eglot.el (eglot--accepted-formats): Recognize
markdown-ts-view-mode as a Markdown renderer.
(eglot--format-markup): Rework with cl-labels; prefer
markdown-ts-view-mode over gfm-view-mode.

* doc/misc/eglot.texi (Eglot Features): Don't mention
markdown-mode directly.

* etc/EGLOT-NEWS: Mention change
---
 doc/misc/eglot.texi     |  9 ++---
 etc/EGLOT-NEWS          |  6 +++
 lisp/progmodes/eglot.el | 85 ++++++++++++++++++++++-------------------
 3 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/doc/misc/eglot.texi b/doc/misc/eglot.texi
index 3deabb894c0..59cecbbc0c4 100644
--- a/doc/misc/eglot.texi
+++ b/doc/misc/eglot.texi
@@ -488,12 +488,11 @@ completion package to instantiate these snippets using YASnippet.
 (YASnippet can be installed from GNU ELPA.)
 
 @item
-If the popular third-party package @code{markdown-mode} is installed,
-and the server provides at-point documentation formatted as Markdown in
+When the server provides at-point documentation formatted as Markdown in
 addition to plain text, Eglot arranges for the ElDoc package to enrich
-this text with fontifications and other nice formatting before
-displaying it to the user.  This makes the documentation shown by ElDoc
-look nicer on display.
+this text with fontifications, hyperlinks and other nice formatting
+before displaying it to the user.  This makes the documentation shown by
+ElDoc look nicer on display.
 
 @item
 In addition to enabling and enhancing other features and packages, Eglot
diff --git a/etc/EGLOT-NEWS b/etc/EGLOT-NEWS
index 4e01f32cecd..eb4040d107e 100644
--- a/etc/EGLOT-NEWS
+++ b/etc/EGLOT-NEWS
@@ -32,6 +32,12 @@ New key bindings: 'k' shuts down, 'r' reconnects, 'e' visits the events
 buffer, 'w' shows workspace configuration, and 'RET' invokes
 'eglot-describe-connection'.
 
+** Eglot uses new built-in 'markdown-ts-mode' of Emacs 31 (bug#80127)
+
+This means that on newer versions of Emacs the external
+'markdown-mode.el' package does not need to be installed to render
+Markdown content.
+
 
 * Changes in Eglot 1.23 (2/4/2026)
 
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index e97b1749b79..bf851684c90 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -721,8 +721,12 @@ This can be useful when using docker to run a language server.")
     (executable-find command)))
 
 (defun eglot--accepted-formats ()
-  (if (and (not eglot-prefer-plaintext) (fboundp 'gfm-view-mode))
-      ["markdown" "plaintext"] ["plaintext"]))
+  (if (and (not eglot-prefer-plaintext)
+           (or (fboundp 'gfm-view-mode)
+               (and (fboundp 'markdown-ts-view-mode)
+                    (treesit-grammar-location 'markdown))))
+      ["markdown" "plaintext"]
+    ["plaintext"]))
 
 (defconst eglot--uri-path-allowed-chars
   (let ((vec (copy-sequence url-path-allowed-chars)))
@@ -2225,48 +2229,51 @@ Doubles as an indicator of snippet support."
            (unless (bound-and-true-p yas-minor-mode) (yas-minor-mode 1))
            (apply #'yas-expand-snippet args)))))
 
-(defun eglot--format-markup (markup &optional mode)
+(cl-defun eglot--format-markup
+    (markup &optional mode
+            &aux string lang render extract
+            (built-in (and (fboundp 'markdown-ts-view-mode)
+                           (treesit-grammar-location 'markdown))))
   "Format MARKUP according to LSP's spec.
-MARKUP is either an LSP MarkedString or MarkupContent object."
-  (let (string render-mode language)
-    (cond ((stringp markup)
-           (setq string markup
-                 render-mode (or mode 'gfm-view-mode)))
-          ((setq language (plist-get markup :language))
-           ;; Deprecated MarkedString
-           (setq string (concat "```" language "\n"
-                                (plist-get markup :value) "\n```")
-                 render-mode (or mode 'gfm-view-mode)))
-          (t
-           ;; MarkupContent
-           (setq string (plist-get markup :value)
-                 render-mode
-                 (or mode
-                     (pcase (plist-get markup :kind)
-                       ("markdown" 'gfm-view-mode)
-                       ("plaintext" 'text-mode)
-                       (_ major-mode))))))
+MARKUP is either an LSP MarkedString or MarkupContent object.
+If MODE, force MODE to be used for fontifying MARKUP."
+  (cl-labels
+      ((gfm-extract ()
+         ;; For `gfm-view-mode', the `invisible' regions are set to
+         ;; `markdown-markup'.  Set them to 't' on extraction, since
+         ;; this has actual meaning in the "*eldoc*" buffer where we're
+         ;; taking this string (#bug79552).
+         (cl-loop with inhibit-read-only = t
+                  for from = (point-min) then to
+                  while (< from (point-max))
+                  for inv = (get-text-property from 'invisible)
+                  for to = (or (next-single-property-change from 'invisible)
+                               (point-max))
+                  when inv
+                  do (put-text-property from to 'invisible t)))
+       (calc2 (forced-mode)
+         (cond
+          (forced-mode              `(,forced-mode))
+          (built-in                 `(,#'markdown-ts-view-mode))
+          ((fboundp 'gfm-view-mode) `(,#'gfm-view-mode #'gfm-extract))
+          (t                        `(#'text-mode))))
+       (calc (s &optional (forced-mode mode) &aux (x (calc2 forced-mode)))
+         (setq string s render (car x) extract (or (cadr x) #'buffer-string))))
+    (cond ((stringp markup) (calc string))            ; plain string
+          ((setq lang (plist-get markup :language))   ; deprecated MarkedString
+           (calc (format "```%s\n%s\n```" lang (plist-get markup :value))))
+          (t (calc (plist-get markup :value)          ; Assume MarkupContent
+                   (or mode (pcase (plist-get markup :kind)
+                              ("markdown" nil)
+                              ("plaintext" 'text-mode)
+                              (_ major-mode))))))
     (with-temp-buffer
       (setq-local markdown-fontify-code-blocks-natively t)
       (insert string)
-      (let ((inhibit-message t)
-            (message-log-max nil))
-        (ignore-errors (delay-mode-hooks (funcall render-mode)))
+      (let ((inhibit-message t) (message-log-max nil))
+        (ignore-errors (delay-mode-hooks (funcall render)))
         (font-lock-ensure)
-        (goto-char (point-min))
-        (let ((inhibit-read-only t))
-          ;; If `render-mode' is `gfm-view-mode', the `invisible'
-          ;; regions are set to `markdown-markup'.  Set them to 't'
-          ;; instead, since this has actual meaning in the "*eldoc*"
-          ;; buffer where we're taking this string (#bug79552).
-          (cl-loop for from = (point) then to
-                   while (< from (point-max))
-                   for inv = (get-text-property from 'invisible)
-                   for to = (or (next-single-property-change from 'invisible)
-                                (point-max))
-                   when inv
-                   do (put-text-property from to 'invisible t)))
-        (string-trim (buffer-string))))))
+        (string-trim (funcall extract))))))
 
 (defun eglot--read-server (prompt &optional dont-if-just-the-one)
   "Read a running Eglot server from minibuffer using PROMPT.

From 2a166c2dbdb9f0406828f44827f109d0fb8a187f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Thu, 14 May 2026 09:35:38 +0100
Subject: [PATCH 444/463] Eldoc: display documentation in visual-line-mode

Documentation is overwhelmingly prose and intended to be viewed,
not edited.  Using visual-line-mode allows members of
'eldoc-doc-functions' to provide long lines that correctly fill
to the window width.

* lisp/emacs-lisp/eldoc.el (eldoc--format-doc-buffer): Use
visual-line-mode.
---
 lisp/emacs-lisp/eldoc.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 77ff567954f..55f9fb1988b 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -530,6 +530,7 @@ If INTERACTIVE, display it.  Else, return said buffer."
           (things-reported-on))
       (special-mode)
       (erase-buffer)
+      (visual-line-mode)
       (setq-local nobreak-char-display nil)
       (cl-loop for (docs . rest) on docs
                for (this-doc . plist) = docs

From 318084829c580e7579905b281d8373ed73f1f1b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Thu, 14 May 2026 10:53:04 +0100
Subject: [PATCH 445/463] Eglot: adjust reference to completion frontends in
 manual

* doc/misc/eglot.texi (Eglot Features): Rework.
---
 doc/misc/eglot.texi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/misc/eglot.texi b/doc/misc/eglot.texi
index 59cecbbc0c4..d501fe32d5d 100644
--- a/doc/misc/eglot.texi
+++ b/doc/misc/eglot.texi
@@ -474,11 +474,11 @@ Code reformatting via the @code{eglot-format} and related commands
 supported and is activated automatically as you type.
 
 @item
-If a completion package such as the Company package (a popular
-third-party completion package providing @code{company-mode}), is
-installed, Eglot enhances it by providing completion candidates based on
-the language server's analysis of the source code.  (Company can be
-installed from GNU ELPA.)
+Eglot enhances symbol completion front-ends by providing completion
+candidates based on the language server's understanding of the source
+code (@pxref{Symbol Completion,,, emacs, GNU Emacs Manual}).  The
+Company package, installable from GNU ELPA, is a popular package known
+to work well with Eglot.
 
 @item
 If YASnippet, a popular third-party package for automatic insertion of

From 93ea0d7d289ad384a5d71aefe9e68551abcffd24 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 14 May 2026 13:12:21 +0300
Subject: [PATCH 446/463] ; Improve documentation of VC commands in Dired

* doc/emacs/dired.texi (Misc Dired Features): Move VC reference
from here...
(Operating on Files): ...to here.  Add other VC commands supported
by Dired.
* doc/emacs/maintaining.texi (Old Revisions, VC Change Log): Fix
cross-references.
---
 doc/emacs/dired.texi       | 22 ++++++++++++++++------
 doc/emacs/maintaining.texi |  8 ++++----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 9abef21f459..1991ab0858a 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -761,7 +761,7 @@ that operates on the marked files finishes.
 @cindex operating on files in Dired
 
   This section describes the basic Dired commands to operate on one file
-or several files.  All of these commands are capital letters; all of
+or several files.  Many of these commands are capital letters; all of
 them use the minibuffer, either to read an argument or to ask for
 confirmation, before they act.  All of them let you specify the
 files to manipulate in these ways:
@@ -1022,6 +1022,21 @@ single archive anywhere on the file system.  The default archive is
 controlled by the @code{dired-compress-directory-default-suffix} user
 option.  Also see @code{dired-compress-files-alist}.
 
+@cindex Dired and version control
+@findex dired-vc-next-action
+@kindex C-x v v @r{(Dired)}
+@item C-x v v
+@itemx C-x v = @r{(Dired)}
+@itemx C-x v l @r{(Dired)}
+  If the directory you are visiting is under version control
+(@pxref{Version Control}), then the normal VC commands will operate on
+the selected files.  For example, @kbd{C-x v v} invokes
+@code{dired-vc-next-action}, which does the same as
+@code{vc-next-action} in a buffer visiting a file under version control
+(@pxref{Basic VC Editing}).  Similarly, @kbd{C-x v =} shows the diffs
+between the marked files and their committed versions, and @code{C-x v l}
+shows the VC change history for the marked files.
+
 @findex epa-dired-do-decrypt
 @kindex :d @r{(Dired)}
 @cindex decrypting files (in Dired)
@@ -1947,11 +1962,6 @@ file/directory listings.  To change this, customize the options
 @code{dired-hide-details-hide-symlink-targets} and
 @code{dired-hide-details-hide-information-lines}, respectively.
 
-@cindex Dired and version control
-  If the directory you are visiting is under version control
-(@pxref{Version Control}), then the normal VC diff and log commands
-will operate on the selected files.
-
 @findex dired-compare-directories
   The command @kbd{M-x dired-compare-directories} is used to compare
 the current Dired buffer with another directory.  It marks all the files
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 2400440f951..a1825c5e515 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -862,7 +862,7 @@ v} to check-out the file and start editing it.
 Compare the work files in the current VC fileset with the versions you
 started from (@code{vc-diff}).  With a prefix argument, prompt for two
 revisions of the current VC fileset and compare them.  You can also
-call this command from a Dired buffer (@pxref{Dired}).
+call this command from a Dired buffer (@pxref{Operating on Files}).
 
 @ifnottex
 @item M-x vc-ediff
@@ -1137,9 +1137,9 @@ Buffer}).  If invoked from a buffer visiting a file, the current
 fileset consists of that single file, and point in the displayed
 @file{*vc-change-log*} buffer is centered at the revision of that
 file.  If invoked from a VC Directory buffer (@pxref{VC Directory
-Mode}) or from a Dired buffer (@pxref{Dired}), the fileset consists of
-all the marked files, defaulting to the file shown on the current line
-in the directory buffer if no file is marked.
+Mode}) or from a Dired buffer (@pxref{Operating on Files}), the fileset
+consists of all the marked files, defaulting to the file shown on the
+current line in the directory buffer if no file is marked.
 
   If the fileset includes one or more directories, the resulting
 @file{*vc-change-log*} buffer shows a short log of changes (one line

From d0d657fa9027a1a4fa4ce151f65f3bcac1e2d535 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 14 May 2026 12:31:04 +0200
Subject: [PATCH 447/463] ; Minor Tramp cleanup

* lisp/net/tramp.el (tramp-unquote-shell-quote-argument): Do not
expand remote file names w/o a localname.

* test/lisp/net/tramp-tests.el
(tramp--test-supports-environment-variables-p): New defun.
(tramp-test33-environment-variables): Use it.
---
 lisp/net/tramp.el            | 3 ++-
 test/lisp/net/tramp-tests.el | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index ffcf8f4929c..fc897fb2a7c 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -7406,7 +7406,8 @@ T1 and T2 are time values (as returned by `current-time' for example)."
 Suppress `shell-file-name'.  This is needed on w32 systems, which
 would use a wrong quoting for local file names.  See `w32-shell-name'."
   (let (shell-file-name)
-    (shell-quote-argument (file-name-unquote s))))
+    ;; Do not expand remote file names w/o a localname.
+    (shell-quote-argument (file-name-unquote s 'top))))
 
 ;; Currently (as of Emacs 20.5), the function `shell-quote-argument'
 ;; does not deal well with newline characters.  Newline is replaced by
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index d6eb782df3d..c0ad7205c5d 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -6524,8 +6524,7 @@ INPUT, if non-nil, is a string sent to the process."
   "Check that remote processes set / unset environment variables properly."
   :tags '(:expensive-test)
   (skip-unless (tramp--test-enabled))
-  (skip-unless (tramp--test-sh-p))
-  (skip-unless (not (tramp--test-crypt-p)))
+  (skip-unless (tramp--test-supports-environment-variables-p))
 
   (dolist (this-shell-command-to-string
 	   (append
@@ -7797,6 +7796,11 @@ This requires restrictions of file name syntax."
       (tramp--test-sh-p) (tramp--test-smb-p)
       (tramp--test-sudoedit-p)))
 
+(defun tramp--test-supports-environment-variables-p ()
+  "Return whether setting environment variables is supported."
+  (and (tramp--test-sh-p)
+       (not (tramp--test-crypt-p))))
+
 (defun tramp--test-check-files (&rest files)
   "Run a simple but comprehensive test over every file in FILES."
   (dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))

From 20500d62006c0302f686f036821ec5d8e4bb808b Mon Sep 17 00:00:00 2001
From: Eshel Yaron <me@eshelyaron.com>
Date: Thu, 14 May 2026 17:07:30 +0200
Subject: [PATCH 448/463] ; htmlfontify: Handle 'reset' face attribute value
 (bug#81032)

* lisp/htmlfontify.el (hfy-face-to-style-i): Add special
handling for the 'reset' face attribute value.
---
 lisp/htmlfontify.el | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index e4d838d2968..7298dd447e8 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -1000,6 +1000,12 @@ to be merged by the user - `hfy-flatten-style' should do this."
                    parent
                    (hfy-face-to-style-i
                     (hfy-face-attr-for-class v hfy-display-class))))))
+        ;; The special value `reset' stands for the value of the
+        ;; corresponding attribute (KEY) of the ‘default’ face.
+        (when (eq val 'reset)
+          (setq val (plist-get
+                     (hfy-face-attr-for-class 'default hfy-display-class)
+                     key)))
         (setq this
               (if val (cl-case key
                        (:family         (hfy-family    val))

From 0fb9d096e38a0d1317fd819f6bccca6cdeb86e77 Mon Sep 17 00:00:00 2001
From: Richard Stallman <rms@gnu.org>
Date: Wed, 22 Apr 2026 15:41:40 -0400
Subject: [PATCH 449/463] The summary scan should include the current msg and
 run to end.

* lisp/mail/rmailsum.el (rmail-new-summary-1): If we are before,
or close to, msg number rmail-summary-starting-message,
start the search a little before there.
---
 lisp/mail/rmailsum.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 8bfd3d91fa0..52dd9aaaf1e 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -789,7 +789,11 @@ message."
 	(sumbuf (rmail-get-create-summary-buffer)))
     ;; Scan the messages, getting their summary strings
     ;; and putting the list of them in SUMMARY-MSGS.
-    (let ((msgnum rmail-summary-starting-message)
+    (let ((msgnum (min rmail-summary-starting-message
+                       ;; If we are before, or close to, msg number
+                       ;; rmail-summary-starting-message,
+                       ;; start the search a little before there.
+                       (max 1 (floor (* .9 rmail-current-message)))))
 	  (main-buffer (current-buffer))
 	  (total rmail-total-messages)
 	  (inhibit-read-only t))

From 025ecf9e7b45aa7a8d5825559f0e6226bfebb9d2 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Wed, 13 May 2026 10:48:38 +0200
Subject: [PATCH 450/463] * lisp/net/rcirc.el (rcirc-monospace-text): Inherit
 'fixed-pitch'

---
 lisp/net/rcirc.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index c067c2472bb..a7cf5c0db37 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -3933,7 +3933,7 @@ PROCESS is the process object for the current connection."
   :group 'faces)
 
 (defface rcirc-monospace-text
-  '((t :family "Monospace"))
+  '((t :inherit fixed-pitch))
   "Face used for monospace text in messages.")
 
 (defface rcirc-my-nick                  ; font-lock-function-name-face

From bf89ee6d078c684bb0e527a057eb871b1d8d81ee Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 15 May 2026 10:20:31 +0300
Subject: [PATCH 451/463] ; * etc/PROBLEMS: Cursor not shown on Windows with
 system caret (bug#81047).

---
 etc/PROBLEMS | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 340e99c0425..2ae82292e04 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -3262,6 +3262,30 @@ To turn the Windows Magnifier off, click "Start->All Programs", or
 "Accessibility" and click "Magnifier".  In the Magnifier Settings
 dialog that opens, click "Exit".
 
+** Cursor is invisible, or appears at times and then disappears
+
+This is known to happen if 'w32-use-visible-system-caret' is non-nil.
+That variable is nil by default, but if your system has the "Speech
+Recognition" feature enabled, Emacs automatically sets this variable
+non-nil at startup to allow the screen reader to read the relevant part
+of the Emacs display and dictate it.
+
+To turn this off on modern Windows systems, go to "Settings ->
+Accessibility -> Speech", and turn off "Voice access".  If you need to
+leave this accessibility feature turned on, you can alternatively set
+'w32-use-visible-system-caret' to the nil value in your init file:
+
+  (setq w32-use-visible-system-caret nil)
+
+If you do need to see the system caret in Emacs windows, you can instead
+work around this problem by disabling double-buffering in your init
+file:
+
+  (set-frame-parameter nil 'inhibit-double-buffering nil)
+
+Note that inhibiting double-buffering might cause the Emacs display to
+flicker in some cases.
+
 ** Problems with mouse-tracking and focus management
 
 There are problems with display if mouse-tracking is enabled and the

From f4c326c378aa25251ebd8e29db4d1ce42d26eaaa Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 15 May 2026 15:00:35 +0300
Subject: [PATCH 452/463] ; * src/sfnt.c (sfnt_read_cmap_format_12): Assert
 there's no overflow.

---
 src/sfnt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/sfnt.c b/src/sfnt.c
index f778179a5ff..ab6a2d5e7bc 100644
--- a/src/sfnt.c
+++ b/src/sfnt.c
@@ -736,6 +736,7 @@ sfnt_read_cmap_format_12 (int fd,
     return NULL;
 
   /* Allocate a buffer of sufficient size.  */
+  eassert (length < UINT32_MAX - sizeof *format12);
   format12 = xmalloc (length + sizeof *format12);
   format12->format = header->format;
   format12->reserved = header->length;

From 8e374990357426c24d870f65051e591ca1c75b21 Mon Sep 17 00:00:00 2001
From: Manuel Giraud <manuel@ledu-giraud.fr>
Date: Fri, 15 May 2026 12:45:39 +0200
Subject: [PATCH 453/463] ; * doc/lispref/os.texi (Init File): Fix markup
 (bug#81049).

---
 doc/lispref/os.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 72a1fdc7878..809fa36098a 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -411,8 +411,8 @@ that the early init file is loaded much earlier during the startup
 process, so you can use it to customize some things that are
 initialized before loading the regular init file.  For example, you
 can customize the process of initializing the package system, by
-setting variables such as @var{package-load-list} or
-@var{package-enable-at-startup}.  @xref{Package Installation,,,
+setting variables such as @code{package-load-list} or
+@code{package-enable-at-startup}.  @xref{Package Installation,,,
 emacs,The GNU Emacs Manual}.
 
 @cindex default init file

From a981517b72e8d5e07a8ea6cf31b2fd6dcda4ec1f Mon Sep 17 00:00:00 2001
From: Andrea Alberti <a.alberti82@gmail.com>
Date: Wed, 13 May 2026 17:45:54 +0200
Subject: [PATCH 454/463] Fill margins with 'margin' face on truncated screen
 lines

* src/xdisp.c (display_line): Remove the unnecessary condition that
row->used of the margin areas is zero, for when we call
'extend_face_to_end_of_line'.  (Bug#80693)
---
 src/xdisp.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index b485d9ccf40..ca8fa5dffee 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26657,10 +26657,8 @@ display_line (struct it *it, int cursor_vpos)
 	         != DEFAULT_FACE_ID
 	         || FACE_FROM_ID (it->f, margin_face_id)->background
 	         != FRAME_BACKGROUND_PIXEL (it->f))
-	        && ((WINDOW_LEFT_MARGIN_WIDTH (it->w) > 0
-	             && it->glyph_row->used[LEFT_MARGIN_AREA] == 0)
-	            || (WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0
-	                && it->glyph_row->used[RIGHT_MARGIN_AREA] == 0)))
+	        && (WINDOW_LEFT_MARGIN_WIDTH (it->w) > 0
+	            || WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0))
 	      extend_face_to_end_of_line (it);
 	  }
 

From d3c72b83890f6893ff9603d19d0e615d678fcb1f Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 16 May 2026 11:54:43 +0300
Subject: [PATCH 455/463] ; * src/xdisp.c (display_line): Fix commentary
 (bug#80693).

---
 src/xdisp.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index ca8fa5dffee..c1d6fedb553 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26643,13 +26643,11 @@ display_line (struct it *it, int cursor_vpos)
 
 	  /* If the default face is remapped or the 'margin' face has a
 	     non-default background, and the window has display margins,
-	     and no glyphs were written yet to the margins on this screen
-	     line, fill the margin area so that the margins use the
-	     correct background.  Placed here, after the if/else-if chain
-	     above, so it fires for all three truncation paths: TTY/no-fringe
-	     truncation glyph, GUI newline-overflow-into-fringe, and GUI
-	     regular truncation where the indicator is drawn as a fringe
-	     bitmap.  */
+	     extend the face in the margin area so that the margins use
+	     the correct background.  This handles all three truncation
+	     paths: TTY/no-fringe truncation glyph, GUI
+	     newline-overflow-into-fringe, and GUI regular truncation
+	     where the indicator is drawn as a fringe bitmap.  */
 	  {
 	    int margin_face_id =
 	      lookup_basic_face (it->w, it->f, MARGIN_FACE_ID);

From 8b6fb2f64655be62fb42dbeaf8c6ea945acf6a11 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 16 May 2026 13:16:09 +0300
Subject: [PATCH 456/463] ; * doc/lispref/variables.texi (Local Variables): Fix
 'named-let'.

---
 doc/lispref/variables.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index abb2c883f78..10d0927312e 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -317,7 +317,7 @@ Binding}), but it's impractical to @code{defvar} these variables.
 the forms, and then make the variables non-special again.
 @end defspec
 
-@defspec named-let name bindings &rest body
+@defmac named-let name bindings &rest body
 This special form is a looping construct inspired from the
 Scheme language.  It is similar to @code{let}: It binds the variables in
 @var{bindings}, and then evaluates @var{body}.  However,

From 23575adc7be741e8d859227ad78a605b391ae46e Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 16 May 2026 13:43:53 +0300
Subject: [PATCH 457/463] ; * doc/lispref/variables.texi (Local Variables): Fix
 types (bug#81004).

---
 doc/lispref/variables.texi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 10d0927312e..8779cf88917 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -282,7 +282,7 @@ previous example is equivalent to using nested @code{let} bindings:
 
 @end defspec
 
-@defspec letrec (bindings@dots{}) forms@dots{}
+@defmac letrec (bindings@dots{}) forms@dots{}
 This special form is like @code{let*}, but all the variables are bound
 before any of the local values are computed.  The values are then
 assigned to the locally bound variables.  This is useful only when
@@ -299,11 +299,11 @@ being run once:
                     (remove-hook 'post-command-hook hookfun))))
   (add-hook 'post-command-hook hookfun))
 @end lisp
-@end defspec
+@end defmac
 
 @cindex dynamic binding, temporarily
 @cindex dynamic let-binding
-@defspec dlet (bindings@dots{}) forms@dots{}
+@defmac dlet (bindings@dots{}) forms@dots{}
 This special form is like @code{let}, but it binds all variables
 dynamically.  This is rarely useful---you usually want to bind normal
 variables lexically, and special variables (i.e., variables that are
@@ -315,7 +315,7 @@ that certain variables are dynamically bound (@pxref{Dynamic
 Binding}), but it's impractical to @code{defvar} these variables.
 @code{dlet} will temporarily make the bound variables special, execute
 the forms, and then make the variables non-special again.
-@end defspec
+@end defmac
 
 @defmac named-let name bindings &rest body
 This special form is a looping construct inspired from the
@@ -353,7 +353,7 @@ itself, as is the case in the recursive call to @code{sum} above.
 
 @code{named-let} can be used only when lexical-binding is enabled.
 @xref{Lexical Binding}.
-@end defspec
+@end defmac
 
   Here is a complete list of the other facilities that create local
 bindings:

From cf96e9cb5a5a03fc17f3d11c80c9dc482a58107d Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 16 May 2026 14:13:56 +0300
Subject: [PATCH 458/463] ; Fix byte-compilation warnings in non-Tree-Sitter
 builds

* lisp/progmodes/eglot.el (treesit-grammar-location):
* lisp/treesit.el (treesit-grammar-location): Declare.
---
 lisp/progmodes/eglot.el | 1 +
 lisp/treesit.el         | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index bf851684c90..3d2c267650e 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -720,6 +720,7 @@ This can be useful when using docker to run a language server.")
   (if (>= emacs-major-version 27) (executable-find command remote)
     (executable-find command)))
 
+(declare-function treesit-grammar-location "treesit.c")
 (defun eglot--accepted-formats ()
   (if (and (not eglot-prefer-plaintext)
            (or (fboundp 'gfm-view-mode)
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 5253439a9dd..e2e62bb71a2 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -133,6 +133,8 @@ in a Emacs not built with tree-sitter library."
 
      (declare-function treesit-parser-remove-notifier "treesit.c")
 
+     (declare-function treesit-grammar-location "treesit.c")
+
      (defvar treesit-thing-settings)
      (defvar treesit-major-mode-remap-alist)
      (defvar treesit-extra-load-path)))

From b13450973abb19b2bf0d7a96516ce23c385e7713 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Sat, 16 May 2026 16:31:13 +0200
Subject: [PATCH 459/463] Copy changes from tarballs when installing VC
 packages

* etc/NEWS: Document change.
* lisp/emacs-lisp/package-vc.el (package-vc--clone): Implement
logic to find and copy files from a previous installation.
(package-vc-install): Indicate the effect of the prefix argument
in the prompt.
---
 etc/NEWS                      | 10 ++++++++++
 lisp/emacs-lisp/package-vc.el | 25 +++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 73a4ad72180..1224f079ca0 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -36,6 +36,16 @@ applies, and please also update docstrings as needed.
 
 * Changes in Specialized Modes and Packages in Emacs 32.1
 
+** Package
+
+---
+*** Package-vc can copy local changes from existing installations
+When installing the latest release of a package, package-vc will propose
+copying files from an existing, tarball installation of the same package
+with the same version.  This is useful if you have started making local
+changes to your tarball installation, and then decide to check out the
+repository to prepare a patch for the package maintainer.
+
 
 * New Modes and Packages in Emacs 32.1
 
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index ff39786e8bd..2641fafdcd9 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -725,7 +725,25 @@ attribute in PKG-SPEC."
     ;; Check out the latest release if requested
     (when (eq rev :last-release)
       (if-let* ((release-rev (package-vc--release-rev pkg-desc)))
-          (vc-retrieve-tag dir release-rev)
+          (progn
+            (vc-retrieve-tag dir release-rev)
+            (when-let* ((vers (version-to-list
+                               (lm-package-version (package-vc--main-file pkg-desc))))
+                        (prev-desc (package-get-descriptor
+                                    name 'installed
+                                    (lambda (desc)
+                                      (version-list-= (package-desc-version desc)
+                                                      vers))))
+                        (_ (yes-or-no-p "Copy files from previous installation?")))
+              (let* ((remove (seq-remove
+                              #'file-exists-p
+                              (let ((default-directory dir))
+                                (mapcar #'expand-file-name '("REAME-elpa"))))))
+                (copy-directory
+                 (file-name-as-directory (package-desc-dir prev-desc))
+                 (file-name-as-directory dir)
+                 nil 'parents 'copy-contents)
+                (mapc #'delete-file remove))))
         (message "No release revision was found, continuing...")))))
 
 (defvar package-vc-non-code-file-names
@@ -941,7 +959,10 @@ installs takes precedence."
      ;; symbols for completion.
      (package-vc--archives-initialize)
      (let* ((name-or-url (package-vc--read-package-name
-                          "Fetch and install package: " t))
+                          (if current-prefix-arg
+                              "Fetch and install latest release of package: "
+                            "Fetch and install package: ")
+                          t))
             (name (file-name-base (directory-file-name name-or-url))))
        (when (string-empty-p name)
          (user-error "Empty package name"))

From 84e646f0b320bbb3560706cf588d4cc3a50f4abd Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 16 May 2026 18:18:54 +0300
Subject: [PATCH 460/463] ; * etc/NEWS: Fix last change.

---
 etc/NEWS | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 1224f079ca0..795ac6f5c3d 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -39,12 +39,12 @@ applies, and please also update docstrings as needed.
 ** Package
 
 ---
-*** Package-vc can copy local changes from existing installations
-When installing the latest release of a package, package-vc will propose
-copying files from an existing, tarball installation of the same package
-with the same version.  This is useful if you have started making local
-changes to your tarball installation, and then decide to check out the
-repository to prepare a patch for the package maintainer.
+*** Package-vc can copy local changes from existing installations.
+When installing the latest release of a package, 'package-vc' will
+propose copying files from an existing tarball installation of the same
+package with the same version.  This is useful if you have started
+making local changes to your tarball installation, and then decided to
+check out the repository to prepare a patch for the package maintainer.
 
 
 * New Modes and Packages in Emacs 32.1

From 1fae14a022f8ec81eb2ed3f3972cdecf2b428ac5 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 16 May 2026 23:30:53 -0700
Subject: [PATCH 461/463] Streamline styled_format aux allocation

* src/editfns.c (styled_format): Streamline allocation of
auxiliary tables, by allocating them all in one go
rather than via separate alloca / mallocs.
---
 src/editfns.c | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/editfns.c b/src/editfns.c
index 52c45d76074..3a1eb3e860a 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3490,29 +3490,34 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
   CHECK_STRING (args[0]);
   bool multibyte_format = STRING_MULTIBYTE (args[0]);
   ptrdiff_t formatlen = SBYTES (args[0]);
-  char *format_start = SAFE_ALLOCA (formatlen + 1);
-  memcpy (format_start, SSDATA (args[0]), formatlen + 1);
   bool fmt_props = !!string_intervals (args[0]);
 
   /* Upper bound on number of format specs.  Each uses at least 2 chars.  */
   ptrdiff_t nspec_bound = SCHARS (args[0]) >> 1;
 
-  /* Allocate the info and discarded tables.  */
-  ptrdiff_t info_size, alloca_size;
-  if (ckd_mul (&info_size, nspec_bound, sizeof *info)
-      || ckd_add (&alloca_size, formatlen, info_size)
-      || SIZE_MAX < alloca_size)
+  /* Allocate auxiliary tables in one go, in the order:
+     spec_arguments, info, format_start, discarded.
+     Because nspec_bound <= formatlen / 2, EXTRA is an upper bound on
+     (nspec_bound * sizeof *info {for info} + formatlen {for
+     format_start} + formatlen {for discarded}).  */
+  ptrdiff_t extra;
+  if (ckd_mul (&extra, formatlen, 2 + (sizeof *info + 1) / 2))
     memory_full (SIZE_MAX);
-  info = SAFE_ALLOCA (alloca_size);
   /* One argument belonging to each spec; but needs to be allocated
      separately so GC doesn't free the strings (bug#75754).  */
   Lisp_Object *spec_arguments;
-  SAFE_ALLOCA_LISP (spec_arguments, nspec_bound);
-  /* discarded[I] is 1 if byte I of the format
-     string was not copied into the output.
-     It is 2 if byte I was not the first byte of its character.  */
-  char *discarded = (char *) &info[nspec_bound];
-  memset (discarded, 0, formatlen);
+  SAFE_ALLOCA_LISP_EXTRA (spec_arguments, nspec_bound, extra);
+  /* The info table.  */
+  static_assert (alignof (struct info) <= alignof (Lisp_Object));
+  info = (struct info *) &spec_arguments[nspec_bound];
+  /* The format string's bytes, sans trailing '\0'.  */
+  char *format_start = memcpy (&info[nspec_bound],
+			       SSDATA (args[0]), formatlen);
+  /* discarded[I] is:
+       1 if byte I of the format string was not copied into the output.
+       2 if byte I was not the first byte of its character.
+       0 otherwise.  */
+  char *discarded = memset (&format_start[formatlen], 0, formatlen);
 
   /* Try to determine whether the result should be multibyte.
      This is not always right; sometimes the result needs to be multibyte
@@ -4397,7 +4402,7 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
     }
 
  return_val:
-  /* If we allocated BUF or INFO with malloc, free it too.  */
+  /* If we allocated BUF or auxiliary tables with malloc, free it too.  */
   SAFE_FREE ();
 
   return val;

From cf693ce0592191b7b1c38114614980687bbbc1a2 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 17 May 2026 00:11:35 -0700
Subject: [PATCH 462/463] Grow styled_format's frame somewhat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* src/editfns.c (styled_format): Don’t subtract
sizeof initial_buffer from sa_avail (bug#81057).
---
 src/editfns.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/editfns.c b/src/editfns.c
index 3a1eb3e860a..07ecbf76da3 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3472,7 +3472,9 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
   Lisp_Object val;
   bool arg_intervals = false;
   USE_SAFE_ALLOCA;
-  sa_avail -= sizeof initial_buffer;
+  /* Do not bother doing "sa_avail -= sizeof initial_buffer;" here,
+     as it is OK to go somewhat over MAX_ALLOCA bytes
+     for this particular function's stack frame.  */
 
   /* Information recorded for each format spec.  */
   struct info

From f599a922770839306a0e655af0426f4bae83420f Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 17 May 2026 00:58:02 -0700
Subject: [PATCH 463/463] Shrink styled_format's frame quite a bit

Problem reported by Helmut Eller (Bug#81057).
On x86-64 this patch shrinks USEFUL_PRECISION_MAX
from 16382 to 1074, SPRINTF_BUFSIZE from 21318 to 1386,
and sizeof initial_buffer from 22318 to 2386.
This also fixes a problem reported privately by Pip Cet:
exactly formatting the smallest positive IEEE double 2**-1074
with %f	needs %.1074f and 1074 is DBL_MANT_DIG - DBL_MIN_EXP,
not merely 1 - DBL_MIN_EXP.
* src/editfns.c (USEFUL_PRECISION_MAX, SPRINTF_BUFSIZE):
Base these on double, not long double, since long double
is not the worst case (it is used only for converted u?intmax_t).
(USEFUL_PRECISION_MAX): Add DBL_MANT_DIG - 1 as per Pip Cet.
---
 src/editfns.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/editfns.c b/src/editfns.c
index 07ecbf76da3..168e897262a 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3442,15 +3442,16 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
    /* Maximum precision for a %f conversion such that the trailing
       output digit might be nonzero.  Any precision larger than this
       will not yield useful information.  */
-   USEFUL_PRECISION_MAX = ((1 - LDBL_MIN_EXP)
+   USEFUL_PRECISION_MAX = ((DBL_MANT_DIG - DBL_MIN_EXP)
 			   * (FLT_RADIX == 2 || FLT_RADIX == 10 ? 1
 			      : FLT_RADIX == 16 ? 4
 			      : -1)),
 
    /* Maximum number of bytes (including terminating null) generated
       by any format, if precision is no more than USEFUL_PRECISION_MAX.
-      On all practical hosts, %Lf is the worst case.  */
-   SPRINTF_BUFSIZE = (sizeof "-." + (LDBL_MAX_10_EXP + 1)
+      On all practical hosts %f is the worst case, as %Lf is used only
+      on arguments exactly representable as intmax_t or uintmax_t.  */
+   SPRINTF_BUFSIZE = (sizeof "-." + (DBL_MAX_10_EXP + 1)
 		      + USEFUL_PRECISION_MAX)
   };
   static_assert (USEFUL_PRECISION_MAX > 0);