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

2 files changed, 28 insertions, 22 deletions

diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index de74a2b9a20..11a264f9ead 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -379,6 +379,9 @@ Philip Kaludercic
 Harald Jörg
         lisp/progmodes/cperl-mode.el
 
+Spencer Baugh
+        lisp/progmodes/flymake.el
+
 ==============================================================================
 3. Externally maintained packages.
 ==============================================================================
diff --git a/admin/authors.el b/admin/authors.el
index 75843e259ae..bcb06953df3 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")
@@ -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"