From: Morgan Smith <Morgan.J.Smith@outlook.com>
Date: Sat, 24 Feb 2024 00:03:13 +0000 (-0500)
Subject: ; Normalize Morgan Smith's attributions.
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fdaaeb37dbff376151b247cd95278ff191ac601d;p=emacs.git

; Normalize Morgan Smith's attributions.

(cherry picked from commit 8b1f10f8cf473cdc57e780845393d8681ee2ed4c)
---

diff --git a/.mailmap b/.mailmap
index 5e6ab5b8878..7c474fcdaf6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -129,7 +129,7 @@ Maxim Nikulin <manikulin@gmail.com>
 Michael Albinus <michael.albinus@gmx.de> <albinus@detlef>
 Michalis V <mvar.40k@gmail.com>
 Miha Rihtaršič <miha@kamnitnik.top>
-Morgan J. Smith <Morgan.J.Smith@outlook.com>
+Morgan Smith <Morgan.J.Smith@outlook.com>
 Nick Drozd <nicholasdrozd@gmail.com>
 Nicolas Petton <nicolas@petton.fr> <petton.nicolas@gmail.com>
 Nitish Chandra <nitishchandrachinta@gmail.com>
diff --git a/admin/authors.el b/admin/authors.el
index 6c74f4dd7a1..d9835edc1fd 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -175,6 +175,9 @@ files.")
     ("Michalis V" "^mvar")
     ("Miha Rihtaršič" "Miha Rihtarsic")
     ("Mikio Nakajima" "Nakajima Mikio")
+    (nil "montag451@laposte\\.net")
+    (nil "na@aisrntairetnraoitn")
+    ("Morgan Smith" "Morgan J. Smith")
     ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira")
     ("Noah Peart" "noah\\.v\\.peart@gmail\\.com")
     ("Noorul Islam" "Noorul Islam K M")