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

9 files changed, 199 insertions, 129 deletions

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/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"
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:
diff --git a/etc/NEWS.30 b/etc/NEWS.30
index 90e3a42beb1..15e4034b7e6 100644
--- a/etc/NEWS.30
+++ b/etc/NEWS.30
@@ -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
 
 ---
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index e72f25fd0cd..9a6b62ca254 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003-2024 Free Software Foundation, Inc.
 
 ;; Author: Pavel Kobyakov <pk_at_work@yahoo.com>
-;; Maintainer: João Távora <joaotavora@gmail.com>
+;; Maintainer: Spencer Baugh <sbaugh@janestreet.com>
 ;; Version: 1.3.7
 ;; Keywords: c languages tools
 ;; Package-Requires: ((emacs "26.1") (eldoc "1.14.0") (project "0.7.1"))
diff --git a/lisp/simple.el b/lisp/simple.el
index 2453a129d0a..eedc5768fe2 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 ()
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)))
 
 
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;
     }
 }