commit 59e0b82776ade72680e7c369f6089eab4a74dc4a (HEAD, refs/remotes/origin/master)
Author: Mattias Engdegård <mattiase@acm.org>
Date:   Mon Aug 26 17:18:25 2024 +0200

    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.

diff --git a/etc/NEWS.unknown b/etc/NEWS.unknown
deleted file mode 100644
index eafdc953cac..00000000000
--- a/etc/NEWS.unknown
+++ /dev/null
@@ -1,31 +0,0 @@
-This file contains mentions of functions and variables whose
-version of introduction would otherwise be guessed incorrectly
-by 'M-x describe-function'.
-
-Since much of early Emacs source history is lost, these versions are
-conservative estimates: the actual version of first appearance may very
-well be much earlier.
-
-* Changes in Emacs 19.7
-** 'defsubst'
-
-* Changes in Emacs 18.59
-** 'mark'
-
-* Changes in Emacs 13.8
-This may be the earliest surviving version with source code, although
-damaged.  See
-https://github.com/larsbrinkhoff/emacs-history/decuslib.com/decus/vax85b/gnuemax
-
-** 'nthcdr'
-** 'nreverse
-** 'let*'
-** 'rassq'
-** '>='
-** 'transpose-sexps'
-** 'buffer-modified-p'
-** 'current-column'
-** 'downcase'
-** 'previous-line'
-** 'catch', 'throw'
-** 'count-lines'
diff --git a/etc/symbol-releases.eld b/etc/symbol-releases.eld
new file mode 100644
index 00000000000..dc991ae5747
--- /dev/null
+++ b/etc/symbol-releases.eld
@@ -0,0 +1,36 @@
+;; Emacs versions when certain symbols and variables were first introduced,
+;; for use in `describe-function'.
+;;
+;; This file is used to explicitly override the heuristic scraping NEWS*
+;; files, when that would result in misleading information.
+;;
+;; It should contain a single list of (VERSION TYPE SYMBOL), where
+;; VERSION is the Emacs version when SYMBOL was introduced as a TYPE,
+;; TYPE being `fun' or `var'.
+
+(
+ ("28.1" fun always)
+
+;; Since much of early Emacs source history is lost, these versions are
+;; conservative estimates: the actual version of first appearance may very
+;; well be much earlier.
+;; 13.8 may be the earliest surviving version with source code, although
+;; damaged.  See
+;; https://github.com/larsbrinkhoff/emacs-history/decuslib.com/decus/vax85b/gnuemax
+
+ ("19.7" fun defsubst)
+ ("18.59" fun mark)
+ ("13.8" fun nthcdr)
+ ("13.8" fun nreverse)
+ ("13.8" fun let*)
+ ("13.8" fun rassq)
+ ("13.8" fun >=)
+ ("13.8" fun transpose-sexps)
+ ("13.8" fun buffer-modified-p)
+ ("13.8" fun current-column)
+ ("13.8" fun downcase)
+ ("13.8" fun previous-line)
+ ("13.8" fun catch)
+ ("13.8" fun throw)
+ ("13.8" fun count-lines)
+ )
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 8a2ae79736f..3d3b841d827 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -869,6 +869,21 @@ the C sources, too."
     ))
 
 
+(defun help-fns--first-release-override (symbol type)
+  "The first release defining SYMBOL of TYPE, or nil.
+TYPE indicates the namespace and is `fun' or `var'."
+  (let* ((sym-rel-file (expand-file-name "symbol-releases.eld" data-directory))
+         (tuples
+          (with-temp-buffer
+            (ignore-errors
+              (insert-file-contents sym-rel-file)
+              (goto-char (point-min))
+              (read (current-buffer))))))
+    (unless (cl-every (lambda (x) (and (= (length x) 3) (stringp (car x))))
+                      tuples)
+      (error "Bad %s format" sym-rel-file))
+    (car (rassoc (list type symbol) tuples))))
+
 (defun help-fns--first-release (symbol)
   "Return the likely first release that defined SYMBOL, or nil."
   ;; Code below relies on the etc/NEWS* files.
@@ -949,16 +964,24 @@ the C sources, too."
 ;;       (display-buffer (current-buffer)))))
 
 (add-hook 'help-fns-describe-function-functions
-          #'help-fns--mention-first-release)
+          #'help-fns--mention-first-function-release)
 (add-hook 'help-fns-describe-variable-functions
-          #'help-fns--mention-first-release)
-(defun help-fns--mention-first-release (object)
+          #'help-fns--mention-first-variable-release)
+
+(defun help-fns--mention-first-function-release (object)
+  (help-fns--mention-first-release object 'fun))
+
+(defun help-fns--mention-first-variable-release (object)
   ;; Don't output anything if we've already output the :version from
   ;; the `defcustom'.
   (unless (memq 'help-fns--customize-variable-version
                 help-fns--activated-functions)
-    (when-let ((first (and (symbolp object)
-                           (help-fns--first-release object))))
+    (help-fns--mention-first-release object 'var)))
+
+(defun help-fns--mention-first-release (object type)
+  (when (symbolp object)
+    (when-let ((first (or (help-fns--first-release-override object type)
+                          (help-fns--first-release object))))
       (with-current-buffer standard-output
         (insert (format "  Probably introduced at or before Emacs version %s.\n"
                         first))))))

commit ca8170d906f99f40a953c399a94bf99e6466abed
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Aug 31 08:20:44 2024 -0400

    ; Fix merge problem in etc/NEWS.30.
    
    Author:

diff --git a/etc/NEWS.30 b/etc/NEWS.30
index 40c8d4782a1..0766900a495 100644
--- a/etc/NEWS.30
+++ b/etc/NEWS.30
@@ -1416,6 +1416,16 @@ manual "(tramp) Improving performance of asynchronous remote processes".
 When a direct asynchronous process is invoked, it uses 'tramp-remote-path'
 for setting the remote 'PATH' environment variable.
 
+** SHR
+
+---
+*** New user option 'shr-fill-text'.
+When 'shr-fill-text' is non-nil (the default), SHR will fill text
+according to the width of the window.  If you customize it to nil, SHR
+will leave the text as-is; in that case, EWW will automatically enable
+'visual-line-mode' when displaying a page so that long lines are
+visually wrapped at word boundaries.
+
 ** EWW
 
 ---

commit fa76ec7b5f0e509655662e684ab974a91288695b
Merge: e176ec4a8f2 5fd75133cfe
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Aug 31 08:14:14 2024 -0400

    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

commit e176ec4a8f287d95d2126fcd3e757b8c10deb36b
Merge: d1f896b5f89 608526a91a0
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Aug 31 08:14:14 2024 -0400

    ; Merge from origin/emacs-30
    
    The following commit was skipped:
    
    608526a91a0 Revert "* lisp/help-fns.el (help-definition-prefixes): Do...

commit d1f896b5f8918ecd29a7e8e7a835ffefb655ddb5
Merge: fa00e4a10c8 4b60267d832
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Aug 31 08:14:13 2024 -0400

    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

commit fa00e4a10c82b87143a21d494cdc5cfee94d2d1a
Merge: a18c29a7ebe 5fbbc3d0cd2
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Aug 31 08:14:08 2024 -0400

    ; Merge from origin/emacs-30
    
    The following commits were skipped:
    
    5fbbc3d0cd2 Support "/dev/null" as a target when creating Eshell handles
    4af1dc83ae8 Fix redirecting Eshell output to symbols in some places

commit a18c29a7ebe508ef0baa5572003b01ea2ca36de5
Merge: a9889b8eece a0f740c88d8
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Aug 31 08:14:03 2024 -0400

    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

commit a9889b8eeceb4f1f7835be04f66d3c91c6f36621
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Aug 31 14:59:46 2024 +0300

    ; Fix last change in subr-x.el
    
    * lisp/emacs-lisp/subr-x.el (string-pixel-width): Remove
    unnecessary call to 'erase-buffer'.  (Bug#72689)

diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 83528f5c5dd..4cdb065feeb 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -405,7 +405,6 @@ determining the width."
                       (with-current-buffer buffer
                         face-remapping-alist))
         (kill-local-variable 'face-remapping-alist))
-      (erase-buffer)
       (insert string)
       ;; Prefer `remove-text-properties' to `propertize' to avoid
       ;; creating a new string on each call.

commit deb31ba825937cb27ab2b0e157e3e540be215eb2
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Aug 31 13:38:45 2024 +0300

    ; * etc/NEWS: Move last added entry to its proper place (bug#72827).

diff --git a/etc/NEWS b/etc/NEWS
index cdebc3595db..1e66f084117 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -43,15 +43,6 @@ The 'find-function', 'find-library', 'find-face-definition', and
 'find-variable' commands now allow retrieving previous input using the
 usual minibuffer history commands.  Each command has a separate history.
 
----
-** NSSpeechRecognitionUsageDescription now included in Info.plist (macOS).
-Should Emacs (or any built-in shell) invoke a process using macOS speech
-recognition APIs, the relevant permission dialog is now displayed, thus
-allowing Emacs users access to speech recognition utilities.
-
-Note: Accepting this permission allows the use of system APIs, which may
-send user data to Apple’s speech recognition servers.
-
 ** Minibuffer and Completions
 
 +++
@@ -371,6 +362,15 @@ The run-time performance of subprocesses on recent Android releases,
 where a userspace executable loader is required, has been optimized on
 systems featuring Linux 3.5.0 and above.
 
+---
+** NSSpeechRecognitionUsageDescription now included in Info.plist (macOS).
+Should Emacs (or any built-in shell) invoke a process using macOS speech
+recognition APIs, the relevant permission dialog is now displayed, thus
+allowing Emacs users access to speech recognition utilities.
+
+Note: Accepting this permission allows the use of system APIs, which may
+send user data to Apple’s speech recognition servers.
+
 
 ----------------------------------------------------------------------
 This file is part of GNU Emacs.

commit c36ff7d8e46c75cfadea6f4c1f4eadb3aef37f2d
Author: xenodium <me+gh@xenodium.com>
Date:   Tue Aug 27 09:36:56 2024 +0100

    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.
    
    Copyright-paperwork-exempt: yes

diff --git a/etc/NEWS b/etc/NEWS
index dc70eb25de7..cdebc3595db 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -43,6 +43,15 @@ The 'find-function', 'find-library', 'find-face-definition', and
 'find-variable' commands now allow retrieving previous input using the
 usual minibuffer history commands.  Each command has a separate history.
 
+---
+** NSSpeechRecognitionUsageDescription now included in Info.plist (macOS).
+Should Emacs (or any built-in shell) invoke a process using macOS speech
+recognition APIs, the relevant permission dialog is now displayed, thus
+allowing Emacs users access to speech recognition utilities.
+
+Note: Accepting this permission allows the use of system APIs, which may
+send user data to Apple’s speech recognition servers.
+
 ** Minibuffer and Completions
 
 +++
diff --git a/nextstep/templates/Info.plist.in b/nextstep/templates/Info.plist.in
index beddbf4a893..192c061bd1e 100644
--- a/nextstep/templates/Info.plist.in
+++ b/nextstep/templates/Info.plist.in
@@ -693,5 +693,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
         <string>Emacs requires permission to access the Downloads folder.</string>
         <key>NSRemovableVolumesUsageDescription</key>
         <string>Emacs requires permission to access files on Removable Volumes.</string>
+        <key>NSSpeechRecognitionUsageDescription</key>
+        <string>Emacs requires permission to handle any speech recognition.</string>
 </dict>
 </plist>

commit 5fd75133cfe389004f9fca8f11e093e531c45fe2
Author: Evgenii Klimov <eugene.dev@lipklim.org>
Date:   Thu Aug 29 23:36:12 2024 +0100

    Make 'python-shell--with-environment' respect buffer-local vars
    
    * lisp/progmodes/python.el (python-shell--with-environment):
    Make `with-temp-buffer' respect buffer-local values of
    `process-environment' and `exec-path', if set.  (Bug#72849)

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 227be64b5b0..a50446343a0 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3030,11 +3030,11 @@ machine then modifies `tramp-remote-process-environment' and
                  (tramp-dissect-file-name default-directory 'noexpand)))))
     (if vec
         (python-shell--tramp-with-environment vec extraenv bodyfun)
-      (let ((process-environment
-             (append extraenv process-environment))
-            (exec-path
-             ;; FIXME: This is still Python-specific.
-             (python-shell-calculate-exec-path)))
+      (cl-letf (((default-value 'process-environment)
+		 (append extraenv process-environment))
+		((default-value 'exec-path)
+		 ;; FIXME: This is still Python-specific.
+		 (python-shell-calculate-exec-path)))
         (funcall bodyfun)))))
 
 (defun python-shell--tramp-with-environment (vec extraenv bodyfun)

commit e27849ecf6ee01f6d02ef2785d0c10e32bc764e9
Author: Evgenii Klimov <eugene.dev@lipklim.org>
Date:   Sun Feb 25 20:12:38 2024 +0000

    Avoid ANSI escape characters in Python output (bug#45938)
    
    * lisp/progmodes/python.el (python-shell-completion-native-setup):
    Prevent Readline from emitting escape characters in comint output.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 692d915f8f8..227be64b5b0 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -4549,6 +4549,9 @@ def __PYTHON_EL_native_completion_setup():
             readline.parse_and_bind('tab: complete')
             # Require just one tab to send output.
             readline.parse_and_bind('set show-all-if-ambiguous on')
+            # Avoid ANSI escape characters in the output
+            readline.parse_and_bind('set colored-completion-prefix off')
+            readline.parse_and_bind('set colored-stats off')
             # Avoid replacing common prefix with ellipsis.
             readline.parse_and_bind('set completion-prefix-display-length 0')
 

commit 4f521fa14c18f57e5207bffd68e9f79454dccc79
Author: John Wiegley <johnw@gnu.org>
Date:   Mon Aug 26 11:47:25 2024 -0700

    Fix handling of hook variables in 'use-package'
    
    * lisp/use-package/use-package-core.el
    (use-package-handler/:hook): Append "-hook" to the symbol's name
    only if the named hook variable has no 'symbol-value'.
    (Bug#72818)

diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 7148c334126..2c5fc560749 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -1376,11 +1376,13 @@ enable gathering statistics."
           (when fun
             (mapcar
              #'(lambda (sym)
-                 `(add-hook
-                   (quote ,(intern
-                            (concat (symbol-name sym)
-                                    use-package-hook-name-suffix)))
-                   (function ,fun)))
+                 (if (boundp sym)
+                     `(add-hook (quote ,sym) (function ,fun))
+                   `(add-hook
+                     (quote ,(intern
+                              (concat (symbol-name sym)
+                                      use-package-hook-name-suffix)))
+                     (function ,fun))))
              (use-package-hook-handler-normalize-mode-symbols syms)))))
     (use-package-normalize-commands args))))
 

commit bb5576fc9071590143af2106111d95ca2221a20c
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Aug 31 12:58:39 2024 +0300

    Work around Gnuplot bug in displaying plots
    
    * lisp/calc/calc-graph.el (calc-gnuplot-command): Prepend newline
    to Gnuplot command.  Suggested by Visuwesh <visuweshm@gmail.com>.
    (Bug#72778)

diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el
index fb817b1bc3d..804ee3944c7 100644
--- a/lisp/calc/calc-graph.el
+++ b/lisp/calc/calc-graph.el
@@ -1417,7 +1417,9 @@ This \"dumb\" driver will be present in Gnuplot 3.0."
   "Send ARGS to Gnuplot.
 Returns nil if Gnuplot signaled an error."
   (calc-graph-init)
-  (let ((cmd (concat (mapconcat 'identity args " ") "\n")))
+  ;; We prepend the newline to work around a bug in Gnuplot, whereby it
+  ;; sometimes does not display the plot, see bug#72778.
+  (let ((cmd (concat "\n" (mapconcat 'identity args " ") "\n")))
     (or (calc-graph-w32-p)
 	(accept-process-output))
     (with-current-buffer calc-gnuplot-buffer

commit 608526a91a0e0f0287448eb88b0bd11c78fa8688
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Aug 31 12:51:59 2024 +0300

    Revert "* lisp/help-fns.el (help-definition-prefixes): Don't delete the hashtable"
    
    This reverts commit 45ae4de0e7ce99c88c62f940f605bca693b8e33f.
    It did not fix a regression or even a user-visible bug, and
    it caused bug#72787.
    
    Do not merge to master.

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index c03593bcb69..1ffe1b16588 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -85,14 +85,14 @@ current help buffer.")
 
 (defun help-definition-prefixes ()
   "Return the up-to-date radix-tree form of `definition-prefixes'."
-  (when (and (null help-definition-prefixes)
-             (> (hash-table-count definition-prefixes) 0))
+  (when (> (hash-table-count definition-prefixes) 0)
     (maphash (lambda (prefix files)
                (let ((old (radix-tree-lookup help-definition-prefixes prefix)))
                  (setq help-definition-prefixes
                        (radix-tree-insert help-definition-prefixes
                                           prefix (append old files)))))
-             definition-prefixes))
+             definition-prefixes)
+    (clrhash definition-prefixes))
   help-definition-prefixes)
 
 (defun help--loaded-p (file)

commit 4b60267d832e0de209dd7a7665f7ed165091bd7d
Author: kobarity <kobarity@gmail.com>
Date:   Sat Aug 24 20:13:16 2024 +0900

    Make Python skeletons available in 'python-ts-mode' as well
    
    * lisp/progmodes/python.el (python-base-mode-abbrev-table):
    Renamed from 'python-mode-abbrev-table' to be available for both
    'python-mode' and 'python-ts-mode'.  (Bug#72298)

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index f0a86843683..692d915f8f8 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -5390,8 +5390,8 @@ be added to `python-mode-skeleton-abbrev-table'."
               (format "Insert %s statement." name))
          ,@skel))))
 
-(define-abbrev-table 'python-mode-abbrev-table ()
-  "Abbrev table for Python mode."
+(define-abbrev-table 'python-base-mode-abbrev-table ()
+  "Abbrev table for Python modes."
   :parents (list python-mode-skeleton-abbrev-table))
 
 (defmacro python-define-auxiliary-skeleton (name &optional doc &rest skel)

commit e5b6c39f5d0f51ed0a2a12a3f1e99b91f1bc6ecf
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Aug 31 12:37:23 2024 +0300

    ; Fix comments in supercite
    
    * lisp/mail/supercite.el (sc-make-citation): Remove stale comment
    about gin-mode.  (Bug#72798)

diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index add1582d72a..a3b5542bfdc 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -1244,9 +1244,7 @@ to the auto-selected attribution string."
 
 
 ;; ======================================================================
-;; filladapt hooks for supercite 3.1. you shouldn't need anything
-;; extra to make gin-mode understand supercited lines.  Even this
-;; stuff might not be entirely necessary...
+;; filladapt hooks for supercite 3.1.
 
 (defun sc-cite-regexp (&optional root-regexp)
   "Return a regexp describing a Supercited line.

commit 5cb218596639d87f4114968b8555ce19eb2c5ea2
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Aug 31 12:12:00 2024 +0300

    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)

diff --git a/lisp/textmodes/emacs-news-mode.el b/lisp/textmodes/emacs-news-mode.el
index edeb1540feb..48e9244a4ef 100644
--- a/lisp/textmodes/emacs-news-mode.el
+++ b/lisp/textmodes/emacs-news-mode.el
@@ -106,6 +106,8 @@
               outline-minor-mode-use-buttons 'in-margins)
   (outline-minor-mode)
   (setq-local imenu-generic-expression outline-imenu-generic-expression)
+  ;; This is so 'C-h o' picks up correctly symbols quoted 'like this'.
+  (modify-syntax-entry ?' "\"")
   (emacs-etc--hide-local-variables))
 
 ;;;###autoload

commit dffdbc1f1fd6569c518e2e3b5e771a54e9e9483f
Author: David Ponce <da_vid@orange.fr>
Date:   Thu Aug 22 16:56:11 2024 +0200

    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.

diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 3347c802f68..83528f5c5dd 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -393,20 +393,24 @@ determining the width."
       0
     ;; Keeping a work buffer around is more efficient than creating a
     ;; new temporary buffer.
-    (with-current-buffer (get-buffer-create " *string-pixel-width*")
-      ;; If `display-line-numbers' is enabled in internal buffers
-      ;; (e.g. globally), it breaks width calculation (bug#59311)
-      (setq-local display-line-numbers nil)
-      (delete-region (point-min) (point-max))
-      ;; Disable line-prefix and wrap-prefix, for the same reason.
-      (setq line-prefix nil
-	    wrap-prefix nil)
+    (with-work-buffer
+      ;; If `display-line-numbers' is enabled in internal
+      ;; buffers (e.g. globally), it breaks width calculation
+      ;; (bug#59311).  Disable `line-prefix' and `wrap-prefix',
+      ;; for the same reason.
+      (setq display-line-numbers nil
+            line-prefix nil wrap-prefix nil)
       (if buffer
           (setq-local face-remapping-alist
                       (with-current-buffer buffer
                         face-remapping-alist))
         (kill-local-variable 'face-remapping-alist))
-      (insert (propertize string 'line-prefix nil 'wrap-prefix nil))
+      (erase-buffer)
+      (insert string)
+      ;; Prefer `remove-text-properties' to `propertize' to avoid
+      ;; creating a new string on each call.
+      (remove-text-properties
+       (point-min) (point-max) '(line-prefix nil wrap-prefix nil))
       (car (buffer-text-pixel-size nil nil t)))))
 
 ;;;###autoload

commit b930a698f2ba4e8b5878a4b604098e1201796b7f
Author: David Ponce <da_vid@orange.fr>
Date:   Thu Aug 22 16:56:11 2024 +0200

    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'.

diff --git a/etc/NEWS b/etc/NEWS
index faf9a963d39..dc70eb25de7 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -321,6 +321,13 @@ language A.
 If supplied, 'string-pixel-width' will use any face remappings from
 BUFFER when computing the string's width.
 
+---
+*** New macro 'with-work-buffer'.
+This macro is similar to the already existing macro `with-temp-buffer',
+except that it does not allocate a new temporary buffer on each call,
+but tries to reuse those previously allocated (up to a number defined by
+the new variable `work-buffer-limit', which defaults to 10).
+
 +++
 ** 'date-to-time' now defaults to local time.
 The function now assumes local time instead of Universal Time when
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 058c06bc5f6..3347c802f68 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -336,6 +336,53 @@ This construct can only be used with lexical binding."
       (cl-labels ((,name ,fargs . ,body)) #',name)
       . ,aargs)))
 
+(defvar work-buffer--list nil)
+(defvar work-buffer-limit 10
+  "Maximum number of reusable work buffers.
+When this limit is exceeded, newly allocated work buffers are
+automatically killed, which means that in a such case
+`with-work-buffer' becomes equivalent to `with-temp-buffer'.")
+
+(defsubst work-buffer--get ()
+  "Get a work buffer."
+  (let ((buffer (pop work-buffer--list)))
+    (if (buffer-live-p buffer)
+        buffer
+      (generate-new-buffer " *work*" t))))
+
+(defun work-buffer--release (buffer)
+  "Release work BUFFER."
+  (if (buffer-live-p buffer)
+      (with-current-buffer buffer
+        ;; 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?
+        (erase-buffer)
+        (delete-all-overlays)
+        (let (change-major-mode-hook)
+          (kill-all-local-variables t))
+        ;; Make the buffer available again.
+        (push buffer work-buffer--list)))
+  ;; If the maximum number of reusable work buffers is exceeded, kill
+  ;; work buffer in excess, taking into account that the limit could
+  ;; have been let-bound to temporarily increase its value.
+  (when (> (length work-buffer--list) work-buffer-limit)
+    (mapc #'kill-buffer (nthcdr work-buffer-limit work-buffer--list))
+    (setq work-buffer--list (ntake work-buffer-limit work-buffer--list))))
+
+;;;###autoload
+(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."
+  (declare (indent 0) (debug t))
+  (let ((work-buffer (make-symbol "work-buffer")))
+    `(let ((,work-buffer (work-buffer--get)))
+       (with-current-buffer ,work-buffer
+         (unwind-protect
+             (progn ,@body)
+           (work-buffer--release ,work-buffer))))))
+
 ;;;###autoload
 (defun string-pixel-width (string &optional buffer)
   "Return the width of STRING in pixels.

commit 62dcbfb776f7dce2da3de3d5cd31da7360316ded
Merge: dfcfaa0ef58 1baa62b2ac1
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Fri Aug 30 20:33:11 2024 +0300

    Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/emacs into emacs-30

commit 1baa62b2ac12ac4dcdace079fabd4c21d10e3e6e
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Fri Aug 30 14:00:47 2024 +0200

    ; * etc/NEWS: Fix typos.

diff --git a/etc/NEWS b/etc/NEWS
index 90dbcd2cada..0766900a495 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1021,7 +1021,7 @@ It allows tweaking the thresholds for rename and copy detection.
 *** VC Directory buffers now display the upstream branch in Git repositories.
 The "upstream branch" is the branch from which 'vc-pull' fetches changes
 by default.  In Git terms, the upstream branch of branch B is determined
-by configuration variables branch.B.remote and branch.B.merge.
+by configuration variables 'branch.B.remote' and 'branch.B.merge'.
 
 When these configuration variables are set for the current branch, the
 VC Directory buffer will show the corresponding upstream branch under

commit dfcfaa0ef58bab0df243ebf816293a124f4c91c9
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Fri Aug 30 13:57:29 2024 +0300

    More accurate documentation of 'equal' in ELisp Reference
    
    * doc/lispref/objects.texi (Equality Predicates): Add lists and
    conses.  (Bug#72888)

diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index ec6ab8204d6..399a1d169c2 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -2413,6 +2413,11 @@ the converse is not always true.
 @end group
 @end example
 
+The @code{equal} function recursively compares the contents of objects
+if they are integers, strings, markers, lists, cons cells, vectors,
+bool-vectors, byte-code function objects, char-tables, records, or font
+objects.
+
 Comparison of strings is case-sensitive, but does not take account of
 text properties---it compares only the characters in the strings.
 @xref{Text Properties}.  Use @code{equal-including-properties} to also
@@ -2428,10 +2433,6 @@ same sequence of character codes and all these codes are in the range
 @end group
 @end example
 
-The @code{equal} function recursively compares the contents of objects
-if they are integers, strings, markers, vectors, bool-vectors,
-byte-code function objects, char-tables, records, or font objects.
-
 If @var{object1} or @var{object2} contains symbols with position,
 @code{equal} treats them as if they were their bare symbols when
 @code{symbols-with-pos-enabled} is non-@code{nil}.  Otherwise

commit baaf97ce1a1f14e1b999ad17084022a725fbcccc
Author: Sean Whitton <spwhitton@spwhitton.name>
Date:   Fri Aug 30 11:43:35 2024 +0100

    ; Fix some ungrammatical uses of "allows to"
    
    * doc/emacs/anti.texi (Antinews):
    * etc/NEWS:
    * etc/NEWS.29:
    * lib/cdefs.h:
    * lisp/tab-bar.el (tab-bar-select-restore-windows):
    * lisp/vc/vc-git.el (vc-git-print-log-follow):
    * m4/gnulib-common.m4 (gl_CHECK_FUNCS_SET_RESULTS):
    (gl_CHECK_FUNCS_ANDROID): Fix ungrammatical uses of "allows to".

diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi
index bf355ff1fea..97110dc8cdb 100644
--- a/doc/emacs/anti.texi
+++ b/doc/emacs/anti.texi
@@ -71,7 +71,7 @@ tool bars on the bottom.  For the same reasons @code{modifier-bar-mode}
 is now gone.
 
 @item
-The command @code{recover-file} no longer allows to display the diffs
+The command @code{recover-file} no longer allows displaying the diffs
 between a file and its auto-save file.  You either want to recover a
 file or you don't; confusing users with a third alternative when they
 are anxious already by the possibility of losing precious edits is
diff --git a/etc/NEWS b/etc/NEWS
index 9cf41188868..90dbcd2cada 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1102,7 +1102,7 @@ in size.
 
 +++
 *** 'dired-listing-switches' handles connection-local values if exist.
-This allows to customize different switches for different remote machines.
+This allows customizing different switches for different remote machines.
 
 ** Ediff
 
diff --git a/etc/NEWS.29 b/etc/NEWS.29
index 1e381034ada..bd893c04446 100644
--- a/etc/NEWS.29
+++ b/etc/NEWS.29
@@ -2032,7 +2032,7 @@ The intention is that this command can be used to access a wide
 variety of version control system-specific functionality from VC
 without complexifying either the VC command set or the backend API.
 
-*** 'C-x v v' in a diffs buffer allows to commit only some of the changes.
+*** 'C-x v v' in a diffs buffer allows committing only some of the changes.
 This command is intended to allow you to commit only some of the
 changes you have in your working tree.  Begin by creating a buffer
 with the changes against the last commit, e.g. with 'C-x v D'
@@ -3529,7 +3529,7 @@ The variables 'connection-local-profile-alist' and
 make it more convenient to inspect and modify them.
 
 *** New function 'connection-local-update-profile-variables'.
-This function allows to modify the settings of an existing
+This function allows modifying the settings of an existing
 connection-local profile.
 
 *** New macro 'with-connection-local-application-variables'.
@@ -4046,8 +4046,8 @@ measured will be counted for the purpose of calculating the text
 dimensions.
 
 ** 'window-text-pixel-size' understands a new meaning of FROM.
-Specifying a cons as the FROM argument allows to start measuring text
-from a specified amount of pixels above or below a position.
+Specifying a cons as the FROM argument allows starting the measurement
+of text from a specified amount of pixels above or below a position.
 
 ** 'window-body-width' and 'window-body-height' can use remapped faces.
 Specifying 'remap' as the PIXELWISE argument now checks if the default
diff --git a/lib/cdefs.h b/lib/cdefs.h
index d38382ad9d8..02fcabce722 100644
--- a/lib/cdefs.h
+++ b/lib/cdefs.h
@@ -497,7 +497,7 @@
 # endif
 #endif
 
-/* ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+/* ISO C99 also allows declaring arrays as non-overlapping.  The syntax is
      array_name[restrict]
    GCC 3.1 and clang support this.
    This syntax is not usable in C++ mode.  */
diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index 60d5bbf169b..363c98d8337 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -1478,7 +1478,7 @@ in the same window to give information about the killed buffer."
 
 (defun tab-bar-select-restore-windows (_frame windows _type)
   "Display a placeholder buffer in the window whose buffer was killed.
-A button in the window allows to restore the killed buffer,
+A button in the window allows restoring the killed buffer,
 if it was visiting a file."
   (dolist (quad windows)
     (when (window-live-p (nth 0 quad))
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index e8257c5dbd0..4006623799b 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1453,7 +1453,7 @@ way may omit certain (merge) commits, and that `log-view-diff'
 fails on commits that used the previous name, in that log buffer.
 
 When this variable is nil, and the log ends with a rename, we
-show a button below that which allows to show the log for the
+show a button below that which allows showing the log for the
 file name before the rename."
   :type 'boolean
   :version "26.1")
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index b34b4534bfe..06dd6029759 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -1364,7 +1364,7 @@ dnl
 dnl This macro sets two variables:
 dnl   - gl_cv_onwards_func_<func>   to yes / no / "future OS version"
 dnl   - ac_cv_func_<func>           to yes / no / no
-dnl The first variable allows to distinguish all three cases.
+dnl The first variable allows distinguishing all three cases.
 dnl The second variable is set, so that an invocation
 dnl   gl_CHECK_FUNCS_ANDROID([func], [[#include <foo.h>]])
 dnl can be used as a drop-in replacement for
@@ -1417,7 +1417,7 @@ dnl
 dnl This macro sets two variables:
 dnl   - gl_cv_onwards_func_<func>   to yes / no / "future OS version"
 dnl   - ac_cv_func_<func>           to yes / no / no
-dnl The first variable allows to distinguish all three cases.
+dnl The first variable allows distinguishing all three cases.
 dnl The second variable is set, so that an invocation
 dnl   gl_CHECK_FUNCS_MACOS([func], [[#include <foo.h>]])
 dnl can be used as a drop-in replacement for

commit 5fbbc3d0cd277ec71de55c9fd9036afadc875020
Author: Jim Porter <jporterbugs@gmail.com>
Date:   Wed Aug 28 19:12:29 2024 -0700

    Support "/dev/null" as a target when creating Eshell handles
    
    Previously, you could only use this when setting the handle afterwards.
    
    Do not merge to master.
    
    * lisp/eshell/esh-io.el (eshell-set-output-handle): Don't catch
    'eshell-null-device' here...
    (eshell-get-target): ... catch it here.

diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index 570ace2ebb8..18fd1cdb0ec 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -431,11 +431,10 @@ current list of targets."
       (when defaultp
         (cl-decf (cdar handle))
         (setcar handle (cons nil 1)))
-      (catch 'eshell-null-device
-        (let ((current (caar handle))
-              (where (eshell-get-target target mode)))
-          (unless (member where current)
-            (setcar (car handle) (append current (list where))))))
+      (let ((current (caar handle))
+            (where (eshell-get-target target mode)))
+        (when (and where (not (member where current)))
+          (setcar (car handle) (append current (list where)))))
       (setcar (cdr handle) nil))))
 
 (defun eshell-copy-output-handle (index index-to-copy &optional handles)
@@ -611,11 +610,13 @@ return an `eshell-generic-target' instance; otherwise, return a
 marker for a file named TARGET."
   (setq mode (or mode 'insert))
   (if-let ((redir (assoc raw-target eshell-virtual-targets)))
-      (let ((target (if (nth 2 redir)
-                        (funcall (nth 1 redir) mode)
-                      (nth 1 redir))))
-        (unless (eshell-generic-target-p target)
-          (setq target (eshell-function-target-create target)))
+      (let (target)
+        (catch 'eshell-null-device
+          (setq target (if (nth 2 redir)
+                           (funcall (nth 1 redir) mode)
+                         (nth 1 redir)))
+          (unless (eshell-generic-target-p target)
+            (setq target (eshell-function-target-create target))))
         target)
     (let ((exists (get-file-buffer raw-target))
           (buf (find-file-noselect raw-target t)))

commit 4af1dc83ae8857665162dc4dd05cb5a46e2f9449
Author: Jim Porter <jporterbugs@gmail.com>
Date:   Wed Aug 28 18:53:03 2024 -0700

    Fix redirecting Eshell output to symbols in some places
    
    Do not merge to master.
    
    * 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): Quote the output/error
    targets.
    
    * test/lisp/eshell/em-script-tests.el (eshell-execute-file-output): New
    variable.
    (em-script-test/execute-file/output-file)
    (em-script-test/execute-file/output-symbol): New tests.
    
    * 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.

diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index ba020d2eb5b..ebba0440d68 100644
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -119,7 +119,7 @@ Comments begin with `#'."
       (eshell-mode)
       (eshell-do-eval
        `(let ((eshell-current-handles
-               (eshell-create-handles ,stdout 'insert))
+               (eshell-create-handles ',stdout 'insert))
               (eshell-current-subjob-p))
           ,(eshell--source-file file args))
        t))))
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index 9de9cc4509a..570ace2ebb8 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -713,7 +713,7 @@ Returns what was actually sent, or nil if nothing was sent.")
 
 (cl-defmethod eshell-output-object-to-target (object (target symbol))
   "Output OBJECT to the value of the symbol TARGET."
-  (if (not (symbol-value target))
+  (if (not (and (boundp target) (symbol-value target)))
       (set target object)
     (setq object (eshell-stringify object))
     (if (not (stringp (symbol-value target)))
diff --git a/test/lisp/eshell/em-script-tests.el b/test/lisp/eshell/em-script-tests.el
index 86a78e43026..5e5eb80f215 100644
--- a/test/lisp/eshell/em-script-tests.el
+++ b/test/lisp/eshell/em-script-tests.el
@@ -33,6 +33,9 @@
          (expand-file-name "eshell-tests-helpers"
                            (file-name-directory (or load-file-name
                                                     default-directory))))
+
+(defvar eshell-execute-file-output)
+
 ;;; Tests:
 
 (ert-deftest em-script-test/source-script ()
@@ -113,6 +116,21 @@
         (eshell-execute-file temp-file '(1 2 3) t))
       (should (equal (buffer-string) "6")))))
 
+(ert-deftest em-script-test/execute-file/output-file ()
+  "Test `eshell-execute-file' redirecting to a file."
+  (ert-with-temp-file temp-file :text "echo more"
+    (ert-with-temp-file output-file :text "initial"
+      (with-temp-eshell-settings
+        (eshell-execute-file temp-file nil output-file))
+      (should (equal (eshell-test-file-string output-file) "moreinitial")))))
+
+(ert-deftest em-script-test/execute-file/output-symbol ()
+  "Test `eshell-execute-file' redirecting to a symbol."
+  (ert-with-temp-file temp-file :text "echo hi\necho bye"
+    (with-temp-eshell-settings
+      (eshell-execute-file temp-file nil 'eshell-execute-file-output))
+    (should (equal eshell-execute-file-output "hibye"))))
+
 (ert-deftest em-script-test/batch-file ()
   "Test running an Eshell script file as a batch script."
   (ert-with-temp-file temp-file
diff --git a/test/lisp/eshell/esh-io-tests.el b/test/lisp/eshell/esh-io-tests.el
index b4e8c0b4a9a..6add14c05fa 100644
--- a/test/lisp/eshell/esh-io-tests.el
+++ b/test/lisp/eshell/esh-io-tests.el
@@ -34,12 +34,6 @@
 (defvar eshell-test-value-with-fun nil)
 (defun eshell-test-value-with-fun ())
 
-(defun eshell-test-file-string (file)
-  "Return the contents of FILE as a string."
-  (with-temp-buffer
-    (insert-file-contents file)
-    (buffer-string)))
-
 (defun eshell/test-output ()
   "Write some test output separately to stdout and stderr."
   (eshell-printn "stdout")
diff --git a/test/lisp/eshell/eshell-tests-helpers.el b/test/lisp/eshell/eshell-tests-helpers.el
index bfd829c95e9..def04be0577 100644
--- a/test/lisp/eshell/eshell-tests-helpers.el
+++ b/test/lisp/eshell/eshell-tests-helpers.el
@@ -139,6 +139,12 @@ After inserting, call FUNC.  If FUNC is nil, instead call
   (buffer-substring-no-properties
    (eshell-beginning-of-output) (eshell-end-of-output)))
 
+(defun eshell-test-file-string (file)
+  "Return the contents of FILE as a string."
+  (with-temp-buffer
+    (insert-file-contents file)
+    (buffer-string)))
+
 (defun eshell-match-output (regexp)
   "Test whether the output of the last command matches REGEXP."
   (string-match-p regexp (eshell-last-output)))

commit a0f740c88d88fdd64738518d030951cd336327c7
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Thu Aug 29 22:30:38 2024 +0200

    ; * lisp/progmodes/flymake.el: Fix "Maintainer" header
    
    Functions such as 'lm-maintainer' assume there to be only a
    single header, and won't return the second value.  By João's
    request, this change fixes the issue by unmarking him as the
    maintainer of Flymake.
    
    See https://lists.gnu.org/archive/html/emacs-devel/2024-08/msg00943.html

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 6265928b274..9a6b62ca254 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -4,7 +4,6 @@
 
 ;; Author: Pavel Kobyakov <pk_at_work@yahoo.com>
 ;; Maintainer: Spencer Baugh <sbaugh@janestreet.com>
-;; Maintainer: João Távora <joaotavora@gmail.com>
 ;; Version: 1.3.7
 ;; Keywords: c languages tools
 ;; Package-Requires: ((emacs "26.1") (eldoc "1.14.0") (project "0.7.1"))

commit a94338581314a5cdc6ec79f658df268c094625ca
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Aug 29 14:43:45 2024 -0400

    ; * etc/AUTHORS: Update.

diff --git a/ChangeLog.4 b/ChangeLog.4
index 6dd76dae86d..d46d0a14921 100644
--- a/ChangeLog.4
+++ b/ChangeLog.4
@@ -67311,7 +67311,6 @@
 	(NEXT_LIMITS_H):
 	(SIZEOF_LONG):
 	(stdalign.h):
-	* ../../../../dev/null:
 	* lib/stdalign.in.h (_GL_STDALIGN_H):
 	(_):
 	(__alignof_is_defined):
diff --git a/etc/AUTHORS b/etc/AUTHORS
index 13da8e285c5..291c50a33ca 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -80,6 +80,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
+
 Aidan Gauland: wrote em-tramp.el
 and changed eshell.texi em-term.el em-unix.el erc-match.el em-cmpl.el
   em-dirs.el em-ls.el em-script.el esh-proc.el eshell-tests.el
@@ -131,6 +133,8 @@ and changed nsterm.m nsterm.h nsfns.m image.c nsmenu.m configure.ac
 
 Alan Zimmerman: changed eglot.el
 
+Alastair Burt: changed gnus-art.el smiley.el
+
 Albert Krewinkel: co-wrote sieve-manage.el
 and changed sieve.el gnus-msg.el gnus.texi message.el sieve.texi
 
@@ -350,7 +354,7 @@ 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 663 other files
+  and 664 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
@@ -469,11 +473,11 @@ Antoine Beaupré: changed vc-git.el
 
 Antoine Kalmbach: changed README.md eglot.el
 
-Antoine Levitt: changed gnus-group.el gnus-sum.el message.texi
+Antoine Levitt: changed gnus-group.el gnus-sum.el message.texi ada-prj.el
   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
-  mh-mime.el and 8 other files
+  and 9 other files
 
 Antonin Houska: changed newcomment.el
 
@@ -743,7 +747,7 @@ and changed fill.el simple.el indent.el paragraphs.el cmds.c intervals.c
   text-mode.el textprop.c ada.el allout.el awk-mode.el bibtex.el buffer.c
   buffer.h c-mode.el and 38 other files
 
-Boris Samorodov: changed net/imap.el
+Boris Samorodov: changed imap.el
 
 Boruch Baum: co-wrote footnote.el
 and changed bookmark.el apropos.el autorevert.el calc.el cua-rect.el
@@ -757,6 +761,8 @@ Bozhidar Batsov: changed ruby-mode.el subr-x.el subr.el bytecomp.el
 
 Brad Howes: changed ansi-osc.el gnus-demon.el
 
+Brad Knotwell: changed calc.texi
+
 Brady Trainor: changed README.md eglot.el
 
 Brahimi Saifullah: changed wid-edit.el
@@ -841,6 +847,8 @@ Campbell Barton: changed bookmark.el subr.el
 
 Cao Zhenxiang: changed fw.el project.el
 
+Carl D. Roth: changed gnus-nocem.el
+
 Carl Edman: co-wrote ns-win.el
 
 Carl Henrik Lunde: changed format-spec.el
@@ -902,6 +910,8 @@ Charles Rendleman: changed eww.el
 
 Charles Sebold: changed org-plot.el
 
+Charlie Martin: wrote autoinsert.el
+
 Charl P. Botha: changed js.el
 
 Chen Bin: changed fns.c subr-tests.el
@@ -919,7 +929,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 932 other files
+  custom.texi image.c window.el and 934 other files
 
 Chris Chase: co-wrote idlw-shell.el idlwave.el
 
@@ -1275,7 +1285,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 918 other files
+  term.el gnu-linux.h and 920 other files
 
 Danny Freeman: changed treesit-tests.el treesit.el
 
@@ -1283,6 +1293,8 @@ Danny Roozendaal: wrote handwrite.el
 
 Danny Siu: changed gnus-sum.el gnus-picon.el nndoc.el nnimap.el smiley.el
 
+Dan Ports: changed configure.ac
+
 Dan Rosenberg: changed movemail.c
 
 Dario Gjorgjevski: changed progmodes/python.el project.el auth-source.el
@@ -1313,7 +1325,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 772 other files
+  files.el keyboard.c byte-opt.el info.el and 771 other files
 
 Dave Pearson: wrote 5x5.el quickurl.el
 
@@ -1349,7 +1361,7 @@ David De La Harpe Golden: changed files.el mouse.el simple.el fileio.c
   cus-start.el nsselect.m select.el w32-fns.el x-win.el xterm.c
 
 David Edmondson: changed message.el erc.el mml2015.el process.c
-  gnus-cite.el gnus-cloud.el gnus.texi mm-uu.el mm-view.el net/imap.el
+  gnus-cite.el gnus-cloud.el gnus.texi imap.el mm-uu.el mm-view.el
   nnfolder.el nnimap.el nnml.el rcirc.el shr.el
 
 Davide Masserut: changed sh-script.el bindings.el Makefile.in basic.texi
@@ -1400,7 +1412,15 @@ David J. Biesack: changed antlr-mode.el quickurl.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
   config.in digest-doc.c emacsclient.c emacsserver.c emacstool.c
-  etags-vmslib.c fortran.el hexl.c isearch.el and 13 other files
+  etags-vmslib.c fortran.el hexl.c isearch.el and 14 other files
+
+David Kågedal: wrote tempo.el
+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
 
 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
@@ -1430,15 +1450,15 @@ and changed mode-clone.el
 David Michael: changed files.el
 
 David M. Koppelman: wrote hi-lock.el
-and changed userlock.el
+and changed display.texi userlock.el
 
 David Moore: co-wrote nnvirtual.el
 and changed gnus-xmas.el
 
 David Mosberger-Tang: changed alpha.h unexelf.c cm.h config.in
   configure.ac cvtmail.c data.c dispnew.c emacsserver.c etags.c
-  fakemail.c keyboard.c mem-limits.h process.c sorted-doc.c sysdep.c
-  terminfo.c unexelf1.c yow.c
+  fakemail.c keyboard.c mem-limits.h process.c profile.c sorted-doc.c
+  sysdep.c terminfo.c unexelf1.c yow.c
 
 David M. Smith: wrote ielm.el
 and changed imenu.el pgg-def.el xterm.c
@@ -1486,10 +1506,10 @@ Debarshi Ray: changed erc-backend.el erc.el
 
 Decklin Foster: changed nngateway.el
 
-Deepak Goel: changed idlw-shell.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 allout.el appt.el
-  apropos.el artist.el bibtex.el bindings.el and 82 other files
+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
 
 D. E. Evans: changed basic.texi
 
@@ -1518,7 +1538,7 @@ Denys Duchier: changed pop3.el
 
 Denys Nykula: changed TUTORIAL.uk language/cyrillic.el
 
-Derek Atkins: changed net/imap.el pgg-pgp.el
+Derek Atkins: changed imap.el pgg-pgp.el
 
 Derek L. Davies: changed gud.el
 
@@ -1658,7 +1678,7 @@ Editorconfig Team: wrote editorconfig-conf-mode.el
   editorconfig-core-handle.el editorconfig-core.el
   editorconfig-fnmatch.el editorconfig-tools.el editorconfig.el
 
-Ed L. Cashin: changed gnus-sum.el net/imap.el
+Ed L. Cashin: changed gnus-sum.el imap.el
 
 Ed Swarthout: changed hexl.el textmodes/table.el
 
@@ -1683,6 +1703,9 @@ Edward Trumbo: changed Makefile.in
 
 Edwin Steiner: changed gnus-nocem.el
 
+Ehud Karni: changed rmail.el aviion-intel.h complete.el configure.ac
+  frame.el progmodes/compile.el rmailsum.el sort.el xdisp.c
+
 Eirik Fuller: changed ralloc.c xterm.c
 
 E. Jay Berkenbilt: changed b2m.c flyspell.el ispell.el unrmail.el
@@ -1710,9 +1733,9 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c]
   chartab-tests.el coding-tests.el etags-tests.el rxvt.el tty-colors.el
 and co-wrote help-tests.el
 and changed xdisp.c display.texi w32.c msdos.c simple.el w32fns.c
-  files.el fileio.c keyboard.c emacs.c configure.ac text.texi w32term.c
+  files.el fileio.c keyboard.c configure.ac emacs.c text.texi w32term.c
   dispnew.c frames.texi w32proc.c files.texi xfaces.c window.c
-  dispextern.h lisp.h and 1395 other files
+  dispextern.h lisp.h and 1399 other files
 
 Eliza Velasquez: changed server.el simple.el
 
@@ -1736,6 +1759,7 @@ Emilio C. Lopes: changed woman.el cmuscheme.el help.el vc.el advice.el
   and 58 other files
 
 Emmanuel Briot: wrote xml.el
+and changed ada-mode.el ada-stmt.el ada-prj.el ada-xref.el
 
 Era Eriksson: changed bibtex.el dired.el json.el ses.el ses.texi shell.el
   tramp.el tramp.texi
@@ -1804,10 +1828,10 @@ Eric M. Ludlam: wrote analyze.el analyze/complete.el analyze/debug.el
   tag-ls.el tag-write.el tag.el test.el
 and co-wrote db-ebrowse.el srecode/cpp.el util-modes.el
 and changed c.srt ede.texi info.el rmail.el speedbspec.el  cedet.el
-  ede-autoconf.srt ede-make.srt eieio.texi gud.el
-  lisp/obsolete/inversion.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 and 37 other files
+  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
 
 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
@@ -1870,8 +1894,8 @@ Espen Skoglund: wrote pascal.el
 
 Espen Wiborg: changed utf-7.el
 
-Ethan Bradford: changed ispell.el ange-ftp.el gnus.el gnuspost.el
-  lisp/obsolete/vt-control.el lpr.el mailalias.el
+Ethan Bradford: changed ispell.el ange-ftp.el gnus.el gnuspost.el lpr.el
+  mailalias.el vt-control.el
 
 Ethan Ligon: changed org-docbook.el ox-html.el
 
@@ -2110,8 +2134,7 @@ Gary Oberbrunner: changed eglot.el gud.el
 
 Gary Wong: changed termcap.c tparam.c
 
-Gaute B Strokkenes: changed net/imap.el gnus-fun.el mail-source.el
-  process.c
+Gaute B Strokkenes: changed imap.el gnus-fun.el mail-source.el process.c
 
 Gautier Ponsinet: changed calendar.texi
 
@@ -2162,7 +2185,7 @@ 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 621 other files
+  and 626 other files
 
 Gergely Nagy: changed erc.el
 
@@ -2192,7 +2215,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 1790 other files
+  ack.texi subr.el and 1796 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -2345,6 +2368,8 @@ Henry Weller: changed mairix.el
 
 Hewlett-Packard: changed emacsclient.c keyboard.c server.el
 
+Hideki Iwamoto: changed etags.c
+
 Hiroshi Fujishima: changed efaq.texi gnus-score.el mail-source.el
   spam-stat.el
 
@@ -2674,7 +2699,7 @@ Jason Kim: changed shell.el
 
 Jason L. Wright: changed smtpmail.el
 
-Jason Merrill: changed gnus-sum.el add-log.el gnus-salt.el net/imap.el
+Jason Merrill: changed gnus-sum.el add-log.el gnus-salt.el imap.el
   nnfolder.el
 
 Jason Riedy: changed org-table.el org.texi
@@ -3129,7 +3154,7 @@ 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 gomoku.el simple.el smtpmail.el
+Jose E. Marchesi: changed ada-mode.el gomoku.el simple.el smtpmail.el
 
 José L. Doménech: changed dired-aux.el
 
@@ -3182,11 +3207,11 @@ 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 1222 other files
+  and 1228 other files
 
 Juan Pechiar: changed ob-octave.el
 
-Juergen Kreileder: changed net/imap.el nnimap.el
+Juergen Kreileder: changed imap.el nnimap.el
 
 Juergen Nickelsen: wrote ws-mode.el
 
@@ -3233,7 +3258,7 @@ Juri Linkov: wrote compose.el emoji.el files-x.el misearch.el
 and changed isearch.el simple.el info.el replace.el dired.el dired-aux.el
   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 490 other files
+  vc-git.el project.el search.texi and 491 other files
 
 Jussi Lahdenniemi: changed w32fns.c ms-w32.h msdos.texi w32.c w32.h
   w32console.c w32heap.c w32inevt.c w32term.h
@@ -3263,7 +3288,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
@@ -3309,7 +3334,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 445 other files
+  indent.c and 447 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
@@ -3339,7 +3364,7 @@ Katsumi Yamaoka: wrote canlock.el
 and changed gnus-art.el gnus-sum.el message.el mm-decode.el gnus.texi
   mm-util.el mm-view.el gnus-group.el gnus-util.el gnus-msg.el mml.el
   shr.el rfc2047.el gnus-start.el gnus.el nntp.el gnus-agent.el nnrss.el
-  mm-uu.el nnmail.el emacs-mime.texi and 159 other files
+  mm-uu.el nnmail.el emacs-mime.texi and 158 other files
 
 Kaushal Modi: changed dired-aux.el files.el isearch.el apropos.el
   calc-yank.el custom.texi desktop.el dired.el dired.texi ediff-diff.el
@@ -3356,7 +3381,7 @@ 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
 
-Kazushi Marukawa: changed filelock.c hexl.c unexalpha.c
+Kazushi Marukawa: changed filelock.c hexl.c profile.c unexalpha.c
 
 Keiichi Suzuki: changed nntp.el
 
@@ -3476,12 +3501,12 @@ Kim F. Storm: wrote bindat.el cua-base.el cua-gmrk.el cua-rect.el ido.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 248 other files
+  and 249 other files
 
 Kimit Yada: changed copyright.el
 
 Kim-Minh Kaplan: changed gnus-picon.el gnus-sum.el gnus-start.el
-  gnus-win.el gnus-xmas.el gnus.texi message.el net/imap.el nndraft.el
+  gnus-win.el gnus-xmas.el gnus.texi imap.el message.el nndraft.el
   nnml.el
 
 Kira Bruneau: changed files.el pgtk-win.el
@@ -3526,10 +3551,10 @@ Konrad Hinsen: wrote ol-eshell.el
 and changed ob-python.el
 
 Konstantin Kharlamov: changed smerge-mode.el diff-mode.el files.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 faces.el gnus-art.el gtkutil.c
-  and 30 other files
+  ada-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 faces.el
+  gnus-art.el and 31 other files
 
 Konstantin Kliakhandler: changed org-agenda.el
 
@@ -3614,7 +3639,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 1063 other files
+  auth-source.el smtpmail.el and 1061 other files
 
 Lars Rasmusson: changed ebrowse.c
 
@@ -3650,11 +3675,11 @@ 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 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 ruby-mode.el
-  and 5 other files
+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
 
 Lennart Staflin: changed dired.el diary-ins.el diary-lib.el tq.el xdisp.c
 
@@ -3757,10 +3782,12 @@ 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 288 other files
+  doclicense.texi and 289 other files
 
 Lynn Slater: wrote help-macro.el
 
+Maciej Kalandyk: changed progmodes/python.el
+
 Maciek Pasternacki: changed nnrss.el
 
 Madan Ramakrishnan: changed org-agenda.el
@@ -3917,7 +3944,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 124 other files
+  and 126 other files
 
 Markus Sauermann: changed lisp-mode.el
 
@@ -3966,7 +3993,7 @@ 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 215 other files
+  keyboard.c nsfns.m and 216 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
@@ -4023,7 +4050,7 @@ Mats Lidell: changed TUTORIAL.sv european.el gnus-art.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
   .clang-format coding.c commands.texi eval.c filelock.c files.el
-  gnus-topic.el gnus.el lisp-mnt.el lisp.h and 12 other files
+  gnus-topic.el gnus.el imap.el lisp-mnt.el and 12 other files
 
 Matt Beshara: changed js.el nsfns.m
 
@@ -4137,10 +4164,10 @@ Michael Albinus: wrote autorevert-tests.el dbus-tests.el dbus.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 files.texi gitlab-ci.yml ange-ftp.el file-notify-tests.el
+  dbusbind.c gitlab-ci.yml files.texi ange-ftp.el file-notify-tests.el
   dbus.texi Dockerfile.emba autorevert.el tramp-container.el
   tramp-fish.el kqueue.c os.texi files-x.el shell.el simple.el README
-  and 329 other files
+  and 330 other files
 
 Michael Ben-Gershon: changed acorn.h configure.ac riscix1-1.h riscix1-2.h
   unexec.c
@@ -4356,7 +4383,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 271 other files
+  bytecomp.el help.el lisp.h and 272 other files
 
 Milton Wulei: changed gdb-ui.el
 
@@ -4393,11 +4420,12 @@ Morgan Willcock: changed tempo.el
 
 Moritz Maxeiner: changed commands.texi cus-start.el dispnew.c xdisp.c
 
-Morten Welinder: wrote [many MS-DOS files] arc-mode.el dosfns.c msdos.h
-and changed alpha.h editfns.c keyboard.c osf1.h data.c emacs.c lisp.h
-  Makefile.in add-log.el alloc.c buffer.h comint.el config.bat config.in
-  configure.ac desktop.el dispextern.h dispnew.c doprnt.c dos-fns.el
-  dosfns.h and 37 other files
+Morten Welinder: wrote [many MS-DOS files] arc-mode.el desktop.el
+  dosfns.c internal.el msdos.h pc-win.el
+and changed msdos.c sed1.inp config.bat keyboard.c sed2.inp fileio.c
+  sed3.inp dos-fns.el callproc.c add-log.el alpha.h data.c editfns.c
+  emacs.c etags.c files.el info.el lread.c mainmake osf1.h tar-mode.el
+  and 74 other files
 
 Mosur Mohan: changed etags.c
 
@@ -4421,7 +4449,7 @@ Nacho Barrientos: changed url-http.el bindat-tests.el bindat.el
 Nachum Dershowitz: co-wrote cal-hebrew.el
 
 Nagy Andras: co-wrote gnus-sieve.el
-and changed net/imap.el gnus.el
+and changed imap.el gnus.el
 
 Nakagawa Makoto: changed ldap.el
 
@@ -4460,6 +4488,8 @@ Neil Mager: wrote appt.el
 
 Neil Roberts: changed custom.texi display.texi files.el xdisp.c
 
+Neil W. Van Dyke: wrote webjump.el
+
 Nelson H. F. Beebe: changed configure.ac
 
 Nelson Jose dos Santos Ferreira: changed nnsoup.el emacs.el gnus-art.el
@@ -4489,6 +4519,9 @@ Nick Alcock: changed control.texi customize.texi display.texi files.el
   frames.texi gnus.el keymaps.texi modes.texi nonascii.texi syntax.texi
   text.texi windows.texi
 
+Nick Dokos: changed org-table.el ox.el icalendar.el mh-search.el
+  org-mobile.el org.el ox-ascii.el url-cache.el
+
 Nick Drozd: changed quail/georgian.el eww.el eww.texi shr.el HELLO
   cc-mode-tests.el ido.texi replace-tests.el
 
@@ -4539,7 +4572,7 @@ and changed README authors.el configure.ac sed2v2.inp sequences.texi
   README.W32 emacs.png HISTORY emacs23.png arc-mode.el cl-extra.el
   emacs.svg manoj-dark-theme.el Emacs.icns Makefile.in auth-source.el
   emacs.ico fns.c make-tarball.txt obarray-tests.el obarray.el
-  and 36 other files
+  and 37 other files
 
 Nicolas Richard: wrote cl-seq-tests.el cmds-tests.el replace-tests.el
 and changed ffap.el package.el use-package.el byte-run.el help.el
@@ -4730,7 +4763,7 @@ 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 1886 other files
+  buffer.c and 1891 other files
 
 Paul Fisher: changed fns.c
 
@@ -4758,7 +4791,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 mixal-mode.el reftex-vars.el reftex.el
+Paul Rivier: changed ada-mode.el mixal-mode.el reftex-vars.el reftex.el
 
 Paul Rubin: changed config.h sun2.h texinfmt.el window.c
 
@@ -4780,7 +4813,7 @@ 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 697 other files
+  and 702 other files
 
 Pavel Kobiakov: wrote flymake-proc.el flymake.el
 and changed flymake.texi
@@ -5020,7 +5053,7 @@ 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 534 other files
+  and 533 other files
 
 Pontus Michael: changed simple.el
 
@@ -5136,7 +5169,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 171 other files
+  mm-decode.el files.el gnus-agent.el nnmail.el and 170 other files
 
 Remek Trzaska: changed gnus-ems.el
 
@@ -5156,9 +5189,9 @@ 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 alloc.c arc-mode.el authors.el
-  config.bat copyright cperl-mode.el dired-x.texi dired.el
-  and 36 other files
+  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
 
 Ricardo Martins: changed eglot.el
 
@@ -5179,6 +5212,10 @@ Richard Hansen: changed whitespace.el bindat-tests.el bindat.el
 
 Richard Hoskins: changed message.el
 
+Richard Kim: wrote wisent/python.el
+and changed bovine.texi db-global.el gud.el loading.texi python-wy.el
+  texnfo-upd.el wisent.texi
+
 Richard King: wrote filelock.c uniquify.el userlock.el
 
 Richard Lawrence: changed org-agenda.el ox-latex.el
@@ -5203,7 +5240,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 1336 other files
+  info.el dired.el and 1339 other files
 
 Richard Ryniker: changed sendmail.el
 
@@ -5238,7 +5275,7 @@ Robert Cochran: changed tab-bar.el bytecomp.el checkdoc.el data.c
 
 Robert Fenk: changed desktop.el
 
-Robert Jarzmik: changed ede/linux.el lisp/obsolete/inversion.el
+Robert Jarzmik: changed ede/linux.el inversion.el
 
 Robert J. Chassell: wrote makeinfo.el page-ext.el texinfo.el
   texnfo-upd.el
@@ -5275,7 +5312,6 @@ Rob Kaut: changed vhdl-mode.el
 
 Rob Riepel: wrote tpu-edt.doc tpu-edt.el tpu-extras.el tpu-mapper.el
   vt-control.el
-and changed lisp/obsolete/vt-control.el
 
 Roderick Schertler: changed dgux.h dgux4.h gud.el sysdep.c
 
@@ -5291,6 +5327,8 @@ Roger Breitenstein: changed smtpmail.el
 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
 
+Roland Kaufmann: changed configure.ac ox.el
+
 Roland McGrath: wrote autoload.el etags.el map-ynp.el progmodes/grep.el
 and co-wrote find-dired.el progmodes/compile.el
 and changed compile.el add-log.el configure.ac files.el vc.el simple.el
@@ -5335,9 +5373,10 @@ 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 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
+  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
 
 Rudi Schlatte: changed iso-transl.el
 
@@ -5385,6 +5424,8 @@ Ryo Takaishi: changed ob-tangle.el org-capture.el org-protocol.el
 Ryo Yoshitake: changed xterm.c frame.c frame.h mac.c macfns.c w32fns.c
   xfns.c
 
+Ryszard Kubiak: co-wrote ogonek.el
+
 R-Zip: changed eglot.el
 
 Sacha Chua: wrote erc-pcomplete.el
@@ -5408,7 +5449,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 214 other files
+  message.el package.el rcirc.el shell.el and 216 other files
 
 Samuel Bronson: changed custom.el emacsclient.c keyboard.c
   progmodes/grep.el semantic/format.el unexmacosx.c
@@ -5633,11 +5674,10 @@ Simon Josefsson: wrote dig.el dns-mode.el flow-fill.el fringe.el imap.el
   url-imap.el
 and co-wrote gnus-sieve.el gssapi.el mml1991.el nnfolder.el nnimap.el
   nnml.el rot13.el sieve-manage.el
-and changed message.el gnus-sum.el net/imap.el gnus-art.el smtpmail.el
-  pgg-gpg.el pgg.el gnus-agent.el mml2015.el mml.el gnus-group.el
-  mm-decode.el gnus-msg.el gnus.texi pgg-pgp5.el browse-url.el
-  gnus-int.el gnus.el hashcash.el mm-view.el password.el
-  and 100 other files
+and changed message.el gnus-sum.el gnus-art.el smtpmail.el pgg-gpg.el
+  pgg.el gnus-agent.el mml2015.el mml.el gnus-group.el mm-decode.el
+  gnus-msg.el gnus.texi pgg-pgp5.el browse-url.el gnus-int.el gnus.el
+  hashcash.el mm-view.el password.el gnus-cache.el and 99 other files
 
 Simon Lang: changed building.texi icomplete.el misterioso-theme.el
   progmodes/grep.el
@@ -5722,7 +5762,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 keyboard.c lisp.h
   files.el 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 1724 other files
+  edebug.el and 1726 other files
 
 Stefano Facchini: changed gtkutil.c
 
@@ -5738,7 +5778,7 @@ Stefan-W. Hahn: changed org-bibtex.el ps-print.el simple.el subr.el
 
 Stefan Wiens: changed gnus-sum.el
 
-Steinar Bang: changed gnus-setup.el net/imap.el
+Steinar Bang: changed gnus-setup.el imap.el
 
 Štěpán Němec: changed loadhist.el files.el gnus-sum.el loading.texi
   subr.el INSTALL calc-ext.el checkdoc.el cl.texi comint.el edebug.texi
@@ -5782,11 +5822,11 @@ and changed time-stamp.el time-stamp-tests.el mh-e.el mh-utils-tests.el
 Stephen J. Turnbull: changed ediff-init.el strings.texi subr.el
 
 Stephen Leake: wrote elisp-mode-tests.el
-and changed elisp-mode.el xref.el eglot.el window.el mode-local.el
-  project.el CONTRIBUTE vc-mtn.el cedet-global.el ede/generic.el
-  simple.el autoload.el bytecomp.el cl-generic.el ede/locate.el
-  files.texi functions.texi package.el progmodes/grep.el windows.texi
-  INSTALL.REPO and 32 other files
+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
 
 Stephen Pegoraro: changed xterm.c
 
@@ -5987,7 +6027,7 @@ 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 167 other files
+  dired.el elisp.texi and 169 other files
 
 Thierry Banel: co-wrote ob-C.el
 and changed calc-arith.el
@@ -6332,6 +6372,8 @@ Vibhav Pant: changed bytecomp.el byte-opt.el bytecode.c bytecomp-tests.el
   cconv-tests.el cconv.el configure.ac data.c emacs-module.c
   and 9 other files
 
+Victor J. Orlikowski: changed erc-dcc.el
+
 Victor Zandy: wrote zone.el
 
 Viktor Rosenfeld: co-wrote ox-koma-letter.el
@@ -6422,6 +6464,9 @@ and changed TUTORIAL.de calc.texi chinese.el emacs.1 european.el
 
 Werner Meisner: changed lwlib-Xm.c
 
+Wes Hardaker: changed gnus-score.el gnus-art.el gnus-sum.el gnus-win.el
+  spam.el
+
 Wesley Dawson: changed icomplete.el
 
 W. Garrett Mitchener: changed ipa-praat.el
@@ -6475,7 +6520,8 @@ Wim Nieuwenhuizen: changed TUTORIAL.nl
 
 Win Treese: changed nsmenu.m
 
-Włodzimierz Bzyl: changed latin-pre.el pl-refcard.tex survival.tex
+Włodzimierz Bzyl: co-wrote ogonek.el
+and changed latin-pre.el pl-refcard.tex survival.tex
 
 W. Martin Borgert: changed files.el schemas.xml
 
@@ -6510,7 +6556,7 @@ Wolfram Gloger: changed emacs.c
 
 W. Trevor King: changed xterm.el
 
-Xavier Maillard: changed mh-utils.el
+Xavier Maillard: changed gnus-faq.texi gnus-score.el mh-utils.el spam.el
 
 Xiaoyue Chen: changed esh-proc.el
 
@@ -6568,8 +6614,7 @@ Yilkal Argaw: changed manoj-dark-theme.el
 
 Yoav Marco: changed sqlite-mode.el
 
-Yoichi Nakayama: changed browse-url.el finder.el
-  lisp/obsolete/mail/rfc2368.el man.el
+Yoichi Nakayama: changed browse-url.el finder.el man.el rfc2368.el
 
 Yong Lu: changed charset.c coding.c language/greek.el
 
@@ -6600,6 +6645,8 @@ Yuanle Song: changed rng-xsd.el
 
 Yuchen Pei: changed calendar.texi diary-lib.el icalendar-tests.el
 
+Yue Daian: wrote cl-font-lock.el
+
 Yu-ji Hosokawa: changed README.W32
 
 Yukihiro Matsumoto: co-wrote ruby-mode.el
@@ -6678,8 +6725,3 @@ Local Variables:
 mode: emacs-authors
 coding: utf-8
 End:
-
-Local Variables:
-mode: emacs-authors
-coding: utf-8
-End:

commit 762b85be27b46ddccefa655244fbf469ded206dc
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Aug 29 21:26:54 2024 +0300

    ; Revert "; * admin/authors.el (authors-valid-file-names): Ignore Unicode files."
    
    This reverts commit 6734b60c0c325cf4e7e0614fe67ed24fafc9dd9a.
    Existing files cannot be ignored.

diff --git a/admin/authors.el b/admin/authors.el
index 96c07c2ec9b..bcb06953df3 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -1151,27 +1151,6 @@ 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"
-    ;; These are imported from Unicode
-    "unidata/UnicodeData.txt" "admin/unidata/UnicodeData.txt"
-    "admin/unidata/BidiBrackets.txt" "unidata/BidiBrackets.txt"
-    "admin/unidata/BidiMirroring.txt" "unidata/BidiMirroring.txt"
-    "admin/unidata/Blocks.txt"
-    "admin/unidata/IVD_Sequences.txt" "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/copyright.html"
-    "test/manual/BidiCharacterTest.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"
     )
   "File names which are valid, but no longer exist (or cannot be found)
 in the repository.")

commit e24d568b565cf4417ce4a89996dbb47b9dc22f13
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Aug 29 21:26:10 2024 +0300

    ; Revert "Revert "; * admin/authors.el (authors-ignored-files): Add removed files.""
    
    This reverts commit 2d723a280b3846de9cad8561b971a44ec95c7961.
    It mistakenly reverted the wrong commit.

diff --git a/admin/authors.el b/admin/authors.el
index 47a966789ee..96c07c2ec9b 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -655,10 +655,13 @@ Changes to files matching one of the regexps in this list are not listed.")
     "if-11.res"
     "java/org/gnu/emacs/EmacsWindowAttachmentManager.java"
     "lisp/gnus/legacy-gnus-agent.el"
+    "legacy-gnus-agent.el"
     "admin/coccinelle/xsave.cocci"
+    "coccinelle/xsave.cocci"
     "register-tests.el"
     "feat" "build" "docs" "chore"
-    "nt/ftime-nostartup.bat" "nt/ftime.bat"
+    "nt/ftime-nostartup.bat" "ftime-nostartup.bat"
+    "nt/ftime.bat" "ftime.bat"
     "java/org/gnu/emacs/EmacsCopyArea.java"
     "test/lisp/erc/resources/base/renick/regain/normal-again.eld"
     "test/lisp/erc/resources/base/commands/motd.eld"

commit 2d723a280b3846de9cad8561b971a44ec95c7961
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Aug 29 21:16:12 2024 +0300

    Revert "; * admin/authors.el (authors-ignored-files): Add removed files."
    
    This reverts commit d809d53afc007574b3054027ff2eaf6c8d66996c.
    Not useful, for the same reason as the previously reverted
    commit.

diff --git a/admin/authors.el b/admin/authors.el
index 96c07c2ec9b..47a966789ee 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -655,13 +655,10 @@ Changes to files matching one of the regexps in this list are not listed.")
     "if-11.res"
     "java/org/gnu/emacs/EmacsWindowAttachmentManager.java"
     "lisp/gnus/legacy-gnus-agent.el"
-    "legacy-gnus-agent.el"
     "admin/coccinelle/xsave.cocci"
-    "coccinelle/xsave.cocci"
     "register-tests.el"
     "feat" "build" "docs" "chore"
-    "nt/ftime-nostartup.bat" "ftime-nostartup.bat"
-    "nt/ftime.bat" "ftime.bat"
+    "nt/ftime-nostartup.bat" "nt/ftime.bat"
     "java/org/gnu/emacs/EmacsCopyArea.java"
     "test/lisp/erc/resources/base/renick/regain/normal-again.eld"
     "test/lisp/erc/resources/base/commands/motd.eld"

commit 2a5b129509fa32e6789525403ee8d3e809b6820d
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Aug 29 21:15:08 2024 +0300

    Revert "; * admin/authors.el (authors-ignored-files): Ignore Unicode files."
    
    This reverts commit 0db53f14a2974de5209439326d4a9e4749462f42.
    It doesn't help, since existing files are considered worthy
    of mentioning regardless of the other lists.

diff --git a/admin/authors.el b/admin/authors.el
index 7a7bdc6ac5c..96c07c2ec9b 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -392,6 +392,8 @@ If REALNAME is nil, ignore that author.")
     "test/etags/"
     "\\`\\(indent\\|automated\\)\\'" "indent/" "mod-test/"
     "-resources/"
+    "unidata/.*\\.txt\\'"
+    "BidiCharacterTest\\.txt"
     ;; TODO lib/? Matches other things?
     "build-aux/" "m4/" "Emacs\\.xcodeproj" "mapfiles" "\\.map\\'"
     "preferences\\.\\(nib\\|gorm\\)"
@@ -686,29 +688,7 @@ 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"
-    ;; These are imported from Unicode
-    "unidata/UnicodeData.txt" "admin/unidata/UnicodeData.txt"
-    "admin/unidata/BidiBrackets.txt" "unidata/BidiBrackets.txt"
-    "admin/unidata/BidiMirroring.txt" "unidata/BidiMirroring.txt"
-    "admin/unidata/Blocks.txt"
-    "admin/unidata/IVD_Sequences.txt" "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/copyright.html"
-    "test/manual/BidiCharacterTest.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"
-    )
+    "lisp/obsolete/old-whitespace.el")
   "List of files and directories to ignore.
 Changes to files in this list are not listed.")
 
@@ -1171,6 +1151,27 @@ 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"
+    ;; These are imported from Unicode
+    "unidata/UnicodeData.txt" "admin/unidata/UnicodeData.txt"
+    "admin/unidata/BidiBrackets.txt" "unidata/BidiBrackets.txt"
+    "admin/unidata/BidiMirroring.txt" "unidata/BidiMirroring.txt"
+    "admin/unidata/Blocks.txt"
+    "admin/unidata/IVD_Sequences.txt" "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/copyright.html"
+    "test/manual/BidiCharacterTest.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"
     )
   "File names which are valid, but no longer exist (or cannot be found)
 in the repository.")

commit 0db53f14a2974de5209439326d4a9e4749462f42
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Aug 29 20:59:37 2024 +0300

    ; * admin/authors.el (authors-ignored-files): Ignore Unicode files.

diff --git a/admin/authors.el b/admin/authors.el
index 96c07c2ec9b..7a7bdc6ac5c 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -392,8 +392,6 @@ If REALNAME is nil, ignore that author.")
     "test/etags/"
     "\\`\\(indent\\|automated\\)\\'" "indent/" "mod-test/"
     "-resources/"
-    "unidata/.*\\.txt\\'"
-    "BidiCharacterTest\\.txt"
     ;; TODO lib/? Matches other things?
     "build-aux/" "m4/" "Emacs\\.xcodeproj" "mapfiles" "\\.map\\'"
     "preferences\\.\\(nib\\|gorm\\)"
@@ -688,7 +686,29 @@ 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"
+    ;; These are imported from Unicode
+    "unidata/UnicodeData.txt" "admin/unidata/UnicodeData.txt"
+    "admin/unidata/BidiBrackets.txt" "unidata/BidiBrackets.txt"
+    "admin/unidata/BidiMirroring.txt" "unidata/BidiMirroring.txt"
+    "admin/unidata/Blocks.txt"
+    "admin/unidata/IVD_Sequences.txt" "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/copyright.html"
+    "test/manual/BidiCharacterTest.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"
+    )
   "List of files and directories to ignore.
 Changes to files in this list are not listed.")
 
@@ -1151,27 +1171,6 @@ 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"
-    ;; These are imported from Unicode
-    "unidata/UnicodeData.txt" "admin/unidata/UnicodeData.txt"
-    "admin/unidata/BidiBrackets.txt" "unidata/BidiBrackets.txt"
-    "admin/unidata/BidiMirroring.txt" "unidata/BidiMirroring.txt"
-    "admin/unidata/Blocks.txt"
-    "admin/unidata/IVD_Sequences.txt" "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/copyright.html"
-    "test/manual/BidiCharacterTest.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"
     )
   "File names which are valid, but no longer exist (or cannot be found)
 in the repository.")

commit 6734b60c0c325cf4e7e0614fe67ed24fafc9dd9a
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Aug 29 20:37:29 2024 +0300

    ; * admin/authors.el (authors-valid-file-names): Ignore Unicode files.

diff --git a/admin/authors.el b/admin/authors.el
index bcb06953df3..96c07c2ec9b 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -1151,6 +1151,27 @@ 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"
+    ;; These are imported from Unicode
+    "unidata/UnicodeData.txt" "admin/unidata/UnicodeData.txt"
+    "admin/unidata/BidiBrackets.txt" "unidata/BidiBrackets.txt"
+    "admin/unidata/BidiMirroring.txt" "unidata/BidiMirroring.txt"
+    "admin/unidata/Blocks.txt"
+    "admin/unidata/IVD_Sequences.txt" "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/copyright.html"
+    "test/manual/BidiCharacterTest.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"
     )
   "File names which are valid, but no longer exist (or cannot be found)
 in the repository.")

commit d809d53afc007574b3054027ff2eaf6c8d66996c
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Aug 29 19:40:26 2024 +0300

    ; * admin/authors.el (authors-ignored-files): Add removed files.

diff --git a/admin/authors.el b/admin/authors.el
index a0da8f01f72..bcb06953df3 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -655,10 +655,13 @@ Changes to files matching one of the regexps in this list are not listed.")
     "if-11.res"
     "java/org/gnu/emacs/EmacsWindowAttachmentManager.java"
     "lisp/gnus/legacy-gnus-agent.el"
+    "legacy-gnus-agent.el"
     "admin/coccinelle/xsave.cocci"
+    "coccinelle/xsave.cocci"
     "register-tests.el"
     "feat" "build" "docs" "chore"
-    "nt/ftime-nostartup.bat" "nt/ftime.bat"
+    "nt/ftime-nostartup.bat" "ftime-nostartup.bat"
+    "nt/ftime.bat" "ftime.bat"
     "java/org/gnu/emacs/EmacsCopyArea.java"
     "test/lisp/erc/resources/base/renick/regain/normal-again.eld"
     "test/lisp/erc/resources/base/commands/motd.eld"

commit 766f69bab12e8d6e2955313247466329b0f48550
Author: Kévin Le Gouguec <kevin.legouguec@gmail.com>
Date:   Thu Aug 22 08:34:03 2024 +0200

    ; * etc/NEWS: Announce VC-dir "Tracking" header. (bug#68183)

diff --git a/etc/NEWS b/etc/NEWS
index 98eca7b8061..9cf41188868 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1017,6 +1017,16 @@ behavior, set user option 'vc-annotate-use-short-revision' to nil.
 *** New user option 'vc-git-file-name-changes-switches'.
 It allows tweaking the thresholds for rename and copy detection.
 
+---
+*** VC Directory buffers now display the upstream branch in Git repositories.
+The "upstream branch" is the branch from which 'vc-pull' fetches changes
+by default.  In Git terms, the upstream branch of branch B is determined
+by configuration variables branch.B.remote and branch.B.merge.
+
+When these configuration variables are set for the current branch, the
+VC Directory buffer will show the corresponding upstream branch under
+the "Tracking" header.
+
 ** Diff mode
 
 ---

commit 37a097d86631b7897ceea2c01ecbf6c0039cb15e
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Aug 29 19:22:11 2024 +0300

    ; * admin/authors.el (authors-aliases): Fix regexps.

diff --git a/admin/authors.el b/admin/authors.el
index 75843e259ae..a0da8f01f72 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -56,23 +56,23 @@ files.")
     ("Anna M. Bigatti" "Anna Bigatti")
     ("Aurélien Aptel" "Aurelien Aptel")
     ("Azeem Hasan" "Rahguzar" "rahguzar@zohomail\\.eu")
-    ("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc."
+    ("Barry A. Warsaw" "Barry A\\. Warsaw, Century Computing, Inc\\."
      "Barry A. Warsaw, ITB" "Barry Warsaw")
     ("Bastien Guerry" "Bastien .*bzg")
     ("Benjamin Carlsson" "glacials" "ben@twos\\.dev")
     ("Benjamin Schwerdtner" "Benjamin\\.Schwerdtner@gmail\\.com" "Ben Schw")
     ("Bill Carpenter" "WJ Carpenter")
-    ("Bill Mann" "William F. Mann")
-    ("Bill Rozas" "Guillermo J. Rozas")
+    ("Bill Mann" "William F\\. Mann")
+    ("Bill Rozas" "Guillermo J\\. Rozas")
     ("Billy Zheng" "vil963@gmail\\.com")
     (nil "binjo\\.cn@gmail\\.com")
     (nil "BlaCk_Void" "alstjr7375@daum\\.net")
     (nil "bug-gnu-emacs@gnu\\.org")  ; mistake
     ("Björn Torkelsson" "Bjorn Torkelsson")
-    (nil "brandon.irizarry@gmail\\.com")
-    ("Brian Fox" "Brian J. Fox")
+    (nil "brandon\\.irizarry@gmail\\.com")
+    ("Brian Fox" "Brian J\\. Fox")
     ("Brian P Templeton" "BT Templeton")
-    ("Brian Sniffen" "Brian T. Sniffen")
+    ("Brian Sniffen" "Brian T\\. Sniffen")
     (nil "brotzeitmacher@gmail\\.com")
     (nil "castor@my-dejanews")
     (nil "chengang31@gmail\\.com")
@@ -80,7 +80,7 @@ files.")
     ("Clément Pit-Claudel" "Clément Pit--Claudel")
     (nil "Cristian" "crstml@libero\\.it")
     ("Le Trung Dan" "daanturo@gmail\\.com" "Daanturo")
-    (nil "D.K" "beerandhot@gmail\\.com")
+    (nil "D\\.K" "beerandhot@gmail\\.com")
     ("Daniel Freeman" "dannyfreeman")
     ("David Abrahams" "Dave Abrahams")
     ("David J. Biesack" "David Biesack")
@@ -90,10 +90,10 @@ files.")
     ("David Kågedal" "David K..edal")
     ("David M. Koppelman" "David Koppelman")
     ("David M. Smith" "David Smith" "David M Smith")
-    ("David O'Toole" "David T. O'Toole")
+    ("David O'Toole" "David T\\. O'Toole")
     ("Daniel Laurens Nicolai" "dalanicolai")
     (nil "deech@deech")
-    ("Deepak Goel" "D. Goel")
+    ("Deepak Goel" "D\\. Goel")
     ("Earl Hyatt" "Earl" "ej32u@protonmail\\.com")
     ("Ed L. Cashin" "Ed L Cashin")
     ("Edward M. Reingold" "Ed\\(ward\\( M\\)?\\)? Reingold" "Reingold Edward M")
@@ -110,7 +110,7 @@ files.")
      "NightMachinary"
      "rudiwillalwaysloveyou@gmail\\.com" "fifymehry@gmail\\.com")
     ("Francis Litterio" "Fran Litterio")
-    ("Francis J. Wright" "Dr Francis J. Wright" "Francis Wright")
+    ("Francis J. Wright" "Dr Francis J\\. Wright" "Francis Wright")
     ("François Pinard" "Francois Pinard")
     ("Francesco Potortì" "Francesco Potorti" "Francesco Potorti`")
     ("Frederic Pierresteguy" "Fred Pierresteguy")
@@ -163,23 +163,23 @@ files.")
     (nil "kby@tilde\\.team")
     ("K. Shane Hartman" "Shane Hartman")
     ("Kai Großjohann" "Kai Grossjohann")
-    ("Karl Berry" "K. Berry")
+    ("Karl Berry" "K\\. Berry")
     ("Károly Lőrentey" "Károly Lőrentey" "Lőrentey Károly")
     ("Kazushi Marukawa" "Kazushi (Jam) Marukawa")
     ("Ken Manheimer" "Kenneth Manheimer")
     ("Kenichi Handa" "Ken'ichi Handa" "Kenichi HANDA" "K\\. Handa")
-    ("Kevin Greiner" "Kevin J. Greiner")
+    ("Kevin Greiner" "Kevin J\\. Greiner")
     ("Kim F. Storm" "Kim Storm")
     ("Kjartan Óli Ágústsson" "Kjartan Oli Agustsson")
     ;; The dash is a kludge, so this contributor is not ignored.
     ("kobarity-" "kobarity@gmail\\.com")
     ("Koen van Greevenbroek" "realcomplex" "koenvg@posteo\\.net")
-    ("Kyle Jones" "Kyle E. Jones")
+    ("Kyle Jones" "Kyle E\\. Jones")
     ("Lars Magne Ingebrigtsen" "Lars Ingebrigtsen")
     ("Laurence Warne" "lWarne" "laurencewarne@gmail\\.com")
     (nil "lensplaysgames@gmail\\.com")
     (nil "lorniu@gmail\\.com")
-    (nil "LynX@bk.ru")
+    (nil "LynX@bk\\.ru")
     (nil "lu4nx")
     ("Marcus G. Daniels" "Marcus Daniels")
     ("Mark D. Baushke" "Mark D Baushke")
@@ -191,14 +191,14 @@ files.")
     ("Matt Swift" "Matthew Swift")
     ("Mattias Engdegård" "Mattias Engdegard")
     (nil "^Madhu")
-    (nil "mu@magi.net.ru")
+    (nil "mu@magi\\.net\\.ru")
     ("Maxime Edouard Robert Froumentin" "Max Froumentin")
     ("Michael R. Mauger" "Michael Mauger")
     ("Michael D. Ernst" "Michael Ernst")
     ("Michaël Cadilhac" "Michael Cadilhac")
-    ("Michael I. Bushnell" "Michael I Bushnell" "Michael I. Bushnell, p/BSG")
+    ("Michael I. Bushnell" "Michael I Bushnell" "Michael I\\. Bushnell, p/BSG")
     ("Michael R. Cook" "Michael Cook")
-    ("Michael Sperber" "Mike Sperber" "Michael Sperber \\[Mr. Preprocessor\\]")
+    ("Michael Sperber" "Mike Sperber" "Michael Sperber \\[Mr\\. Preprocessor\\]")
     ("Michalis V" "^mvar")
     ("Miha Rihtaršič" "Miha Rihtarsic" "miha@kamnitnik\\.top" "miha")
     (nil "mikpom" "mikpom@mikpom\\.ru")
@@ -219,7 +219,7 @@ files.")
     (nil "pillule")
     (nil "psyberbits@gmail\\.com")
     ("Paul Eggert" "Paul R\\. Eggert")
-    ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik")
+    ("Pavel Janík" "Pavel Janík Ml\\." "Pavel Janik Ml\\." "Pavel Janik")
     ("Pavel Kobiakov" "Pavel Kobyakov")
     ("Per Abrahamsen" "Per Abhiddenware")
     ("Per Starbäck" "Per Starback")
@@ -240,7 +240,7 @@ files.")
     (nil "rbrtb@")
     ("Richard G. Bielawski" "Richard G Bielawski" "Richard Bielawski")
     ("Richard King" "Dick King")
-    ("Richard M. Stallman" "Richard Stallman" "rms@gnu.org")
+    ("Richard M. Stallman" "Richard Stallman" "rms@gnu\\.org")
     (nil "webmaster@robario\\.com")
     ("Robert J. Chassell" "Bob Chassell")
     ("Roberto Huelga Díaz" "Roberto Huelga")
@@ -257,7 +257,7 @@ files.")
     ("Sébastien Vauban" "Sebastien Vauban")
     ("Sergey Litvinov" "Litvinov Sergey")
     ("Simen Heggestøyl" "simenheg@gmail\\.com")
-    (nil "prime.wizard")
+    (nil "prime\\.wizard")
     ("Shun-ichi Goto" "Shun-ichi GOTO")
     ;; The trailing dash is a kludge, so this contributor is not ignored.
     ("skykanin-" "skykanin@users\\.noreply\\.github\\.com")
@@ -294,7 +294,7 @@ files.")
     (nil "vjoki@")
     (nil "whatacold@gmail\\.com")
     ("William M. Perry" "Bill Perry")
-    ("Wlodzimierz Bzyl" "W.*dek Bzyl")
+    ("Włodzimierz Bzyl" "W.*dek Bzyl")
     (nil "xyblor")
     ("Yilkal Argaw" "yilkalargaw" "yilkalargawworkneh@gmail\\.com")
     ("Yoni Rabkin" "Yoni Rabkin Katzenell")

commit 0fb50e2631656546004d25d81518f9bc8c06d0c2
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Aug 29 15:20:07 2024 +0300

    ; * admin/MAINTAINERS: Spencer Baugh maintains flymake.el.

diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index b073529e94b..f65a9decadc 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -376,6 +376,9 @@ Juri Linkov
 Philip Kaludercic
 	lisp/epa-ks.el
 
+Spencer Baugh
+	lisp/progmodes/flymake.el
+
 ==============================================================================
 3. Externally maintained packages.
 ==============================================================================
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index e72f25fd0cd..6265928b274 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2003-2024 Free Software Foundation, Inc.
 
 ;; Author: Pavel Kobyakov <pk_at_work@yahoo.com>
+;; Maintainer: Spencer Baugh <sbaugh@janestreet.com>
 ;; Maintainer: João Távora <joaotavora@gmail.com>
 ;; Version: 1.3.7
 ;; Keywords: c languages tools

commit d05d8c336c82457dcad3b924b19c3bb57ff0e791
Author: George Huebner <george@feyor.sh>
Date:   Sun Jul 14 01:46:07 2024 -0500

    xwidget: Fix xwidget-at misinterpreting non-xwidget text-properties
    
    'xwidget-open' wrongly assumed the the text-property at
    min-position is an xwidget, if it exists; the fix is just
    returning nil if the text-property isn't an xwidget.
    * lisp/xwidget.el (xwidget-at): Use 'ignore-errors'.  (Bug#72848)
    
    Copyright-paperwork-exempt: yes

diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index bf5987d742f..c5a84db6d4a 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -81,7 +81,7 @@ This returns the result of `make-xwidget'."
 (defun xwidget-at (pos)
   "Return xwidget at POS."
   (let* ((disp (get-text-property pos 'display))
-         (xw (car (cdr (cdr disp)))))
+         (xw (ignore-errors (car (cdr (cdr disp))))))
     (when (xwidget-live-p xw) xw)))
 
 

commit 13f69f254cfacfcc780b49c34e044b39dc333732
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Aug 29 12:56:27 2024 +0300

    Fix rare segfaults due to freed fontsets
    
    * src/xfaces.c (recompute_basic_faces): Force complete
    recalculation of non-ASCII faces and their fontsets if any
    non-ASCII faces are in the frame's face cache.  (Bug#72692)

diff --git a/src/xfaces.c b/src/xfaces.c
index 684b6ccfac7..bbc3448e457 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -733,9 +733,18 @@ recompute_basic_faces (struct frame *f)
 {
   if (FRAME_FACE_CACHE (f))
     {
+      bool non_basic_faces_cached =
+	FRAME_FACE_CACHE (f)->used > BASIC_FACE_ID_SENTINEL;
       clear_face_cache (false);
       if (!realize_basic_faces (f))
 	emacs_abort ();
+      /* The call to realize_basic_faces above recomputed the basic
+         faces and freed their fontsets, but if there are non-ASCII
+         faces in the cache, they might now be invalid, and they
+         reference fontsets that are no longer in Vfontset_table.  We
+         therefore must force complete regeneration of all frame faces.  */
+      if (non_basic_faces_cached)
+	f->face_change = true;
     }
 }
 

commit 427fb319dabf2b7fa4526f244d1e8d57f9e6cca0
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Aug 29 12:33:30 2024 +0300

    ; * lisp/simple.el (use-region-beginning, use-region-end): Doc fix.

diff --git a/lisp/simple.el b/lisp/simple.el
index 5961afa20e9..3054c8ab6a7 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7085,11 +7085,15 @@ point otherwise."
   :group 'editing-basics)
 
 (defun use-region-beginning ()
-  "Return the start of the region if `use-region-p'."
+  "Return the start of the region if `use-region-p' returns non-nil.
+This is a convenience function to use in `interactive' forms of
+commands that need to act on the region when it is active."
   (and (use-region-p) (region-beginning)))
 
 (defun use-region-end ()
-  "Return the end of the region if `use-region-p'."
+  "Return the end of the region if `use-region-p' returns non-nil.
+This is a convenience function to use in `interactive' forms of
+commands that need to act on the region when it is active."
   (and (use-region-p) (region-end)))
 
 (defun use-region-noncontiguous-p ()