Merge from origin/emacs-26

7efb366 ; * etc/AUTHORS: Regenerate.
3dc7f68 * admin/authors.el (authors-aliases): Tighten more entries.
7428062 ; * lisp/vc/vc.el: Comment fixes.
f4e6b6e Small startup fix for current-load-list
5b776bf ; * etc/AUTHORS: Regenerate.
d80295c authors-aliases is based on regexps, not literals

1 files changed, 12 insertions, 12 deletions

diff --git a/admin/authors.el b/admin/authors.el
index 8c94014c575..25871abe95d 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -51,17 +51,17 @@ files.")
     ("Aurélien Aptel" "Aurelien Aptel")
     ("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc."
      "Barry A. Warsaw, ITB" "Barry Warsaw")
-    ("Bastien Guerry" "Bastien")
+    ("Bastien Guerry" "Bastien .*bzg")
     ("Bill Carpenter" "WJ Carpenter")
     ("Bill Mann" "William F. Mann")
     ("Bill Rozas" "Guillermo J. Rozas")
-    (nil "Binjo")
+    (nil "binjo.cn@gmail.com")
     ("Björn Torkelsson" "Bjorn Torkelsson")
     ("Brian Fox" "Brian J. Fox")
     ("Brian P Templeton" "BT Templeton")
     ("Brian Sniffen" "Brian T. Sniffen")
-    (nil "Castor")
-    (nil "cg")
+    (nil "castor@my-dejanews")
+    (nil "chengang31@gmail.com")
     ("David Abrahams" "Dave Abrahams")
     ("David J. Biesack" "David Biesack")
     ("David De La Harpe Golden" "David Golden")
@@ -71,7 +71,7 @@ files.")
     ("David M. Koppelman" "David Koppelman")
     ("David M. Smith" "David Smith" "David M Smith")
     ("David O'Toole" "David T. O'Toole")
-    (nil "Deech")
+    (nil "deech@deech")
     ("Deepak Goel" "D. Goel")
     ("Ed L. Cashin" "Ed L Cashin")
     ("Edward M. Reingold" "Ed\\(ward\\( M\\)?\\)? Reingold" "Reingold Edward M")
@@ -79,7 +79,7 @@ files.")
     ("Eric M. Ludlam" "Eric Ludlam")
     ("Eric S. Raymond" "Eric Raymond")
     ("Fabián Ezequiel Gallina" "Fabian Ezequiel Gallina" "Fabi.n E\\. Gallina")
-    (nil "felix")
+    (nil "felix.*EmacsWiki")
     (nil "foudfou")
     ("Francis Litterio" "Fran Litterio")
     ("Francis J. Wright" "Dr Francis J. Wright" "Francis Wright")
@@ -121,7 +121,7 @@ files.")
     ("Kim F. Storm" "Kim Storm")
     ("Kyle Jones" "Kyle E. Jones")
     ("Lars Magne Ingebrigtsen" "Lars Ingebrigtsen")
-    (nil "LynX")
+    (nil "LynX@bk.ru")
     (nil "lu4nx")
     ("Marcus G. Daniels" "Marcus Daniels")
     ("Mark D. Baushke" "Mark D Baushke")
@@ -143,7 +143,7 @@ files.")
     ("Noorul Islam" "Noorul Islam K M")
 ;;;    ("Tetsurou Okazaki" "OKAZAKI Tetsurou") ; FIXME?
     ("Óscar Fuentes" "Oscar Fuentes")
-    (nil "oblique")
+    (nil "psyberbits@gmail.com")
     ("Paul Eggert" "Paul R\\. Eggert")
     ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik")
     ("Pavel Kobiakov" "Pavel Kobyakov")
@@ -155,10 +155,10 @@ files.")
     ("Philipp Stephani" "Philipp .*phst@google")
     ("Piotr Zieliński" "Piotr Zielinski")
     ("Przemysław Wojnowski" "Przemyslaw Wojnowski")
-    ("R. Bernstein" "rocky")
+    ("R. Bernstein" "rb@dustyfeet.com")
     ("Rainer Schöpf" "Rainer Schoepf")
     ("Raja R. Harinath" "Raja R Harinath")
-    ("Rasmus Pank Roulund" "Rasmus")
+    ("Rasmus Pank Roulund" "Rasmus .*rasmus@gmx")
     ("Richard G. Bielawski" "Richard G Bielawski" "Richard Bielawski")
     ("Richard King" "Dick King")
     ("Richard M. Stallman" "Richard Stallman" "rms@gnu.org")
@@ -175,8 +175,8 @@ files.")
     ("Satyaki Das" "Indexed search by Satyaki Das")
     ("Sébastien Vauban" "Sebastien Vauban")
     ("Sergey Litvinov" "Litvinov Sergey")
-    ("Simen Heggestøyl" "Simen")
-    (nil "sj")
+    ("Simen Heggestøyl" "simenheg@gmail.com")
+    (nil "prime.wizard")
     ("Shun-ichi Goto" "Shun-ichi GOTO")
     ;; There are other Stefans.
 ;;;    ("Stefan Monnier" "Stefan")