Update Arni Magnusson's email address

* .mailmap:
* doc/lispref/ChangeLog.1:
* doc/misc/ChangeLog.1:
* lisp/ChangeLog.16:
* lisp/ChangeLog.17:
* lisp/progmodes/bat-mode.el: Update email address of
Arni Magnusson.  (Bug#73631)

(cherry picked from commit 5a462948e13393fc742e36b655c529f3c5e851bb)

diff --git a/.mailmap b/.mailmap
index 9647749940fe5f82372eb6e000d284f4fdb6f44a..bbfe4bceba177e1c30b58a61818292870652261a 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -26,6 +26,7 @@ Andrew G Cohen <cohen@andy.bu.edu>
 Andrew G Cohen <cohen@andy.bu.edu> <cohen@bu.edu>
 Arash Esbati <arash@gnu.org> <arash.esbati@gmail.com>
 Arash Esbati <arash@gnu.org> <esbati@gmx.de>
+Arni Magnusson <thisisarni@gmail.com> <arnima@hafro.is>
 Artur Malabarba <bruce.connor.am@gmail.com> <am12548@it055607.users.bris.ac.uk>
 Artur Malabarba <bruce.connor.am@gmail.com> Artur Malabarba <address@hidden>
 Basil L. Contovounesios <basil@contovou.net> <contovob@tcd.ie>

diff --git a/doc/lispref/ChangeLog.1 b/doc/lispref/ChangeLog.1
index e2d4c019b4a1bd74687f6cd6154c3f2af2d8dbb5..a508ad9f28bd942c178de37ec64c8b5b8a9499e9 100644 (file)
--- a/doc/lispref/ChangeLog.1
+++ b/doc/lispref/ChangeLog.1
@@ -5551,7 +5551,7 @@
        * loading.texi (Hooks for Loading): Document after-load-functions.
        Copyedits.
 
-2010-03-24  Arni Magnusson  <arnima@hafro.is>  (tiny change)
+2010-03-24  Arni Magnusson  <thisisarni@gmail.com>  (tiny change)
 
        * frames.texi (Cursor Parameters): Fix typo.  (Bug#5760)
 

diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1
index 37b304c2dcae7181b032101c014813e6341420d2..14570bb174f0c21c830fcf91b65841dad6c76079 100644 (file)
--- a/doc/misc/ChangeLog.1
+++ b/doc/misc/ChangeLog.1
@@ -6407,7 +6407,7 @@
        * epa.texi (Mail-mode integration): Mention the way to do
        "encrypt-to-self".  (Bug#1807)
 
-2009-02-05  Arni Magnusson  <arnima@hafro.is>  (tiny change)
+2009-02-05  Arni Magnusson  <thisisarni@gmail.com>  (tiny change)
 
        * ada-mode.texi (No project files): Fix typo.  (Bug#2214)
 

diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index fa956ac8784429a20953e20a219ae6d98f0dde52..6d807fbd44de1ada92253a3040bf3382775a6eea 100644 (file)
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -25198,7 +25198,7 @@
        * emacs-lisp/package-x.el (package-upload-buffer-internal):
        Use `equal' for upload base check.
 
-2011-03-08  Arni Magnusson  <arnima@hafro.is>  (tiny change)
+2011-03-08  Arni Magnusson  <thisisarni@gmail.com>  (tiny change)
 
        * textmodes/texinfo.el (texinfo-environments):
        Add deftypecv, deftypeivar, deftypemethod, deftypeop, html.  (Bug#2783)

diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index 3eec2da2038cde45871bb98747e2729d85187979..e6c35f63a20adbcfedde05d66ed3d9e9b1e2c00a 100644 (file)
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -6706,7 +6706,7 @@
 2014-10-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/bat-mode.el (bat-font-lock-keywords): Fix \\<_ typo
-       (bug#18622).  Reported by Arni Magnusson <arnima@hafro.is>.
+       (bug#18622).  Reported by Arni Magnusson <thisisarni@gmail.com>.
        * progmodes/prolog.el (prolog-electric--underscore): Same.
 
 2014-10-12  Michael Albinus  <michael.albinus@gmx.de>
@@ -20214,7 +20214,7 @@
        (dos-mode-syntax-table): Don't use "w" for symbol chars.
        (dos-font-lock-keywords): Try to adjust font-lock rules accordingly.
 
-2013-08-07  Arni Magnusson  <arnima@hafro.is>
+2013-08-07  Arni Magnusson  <thisisarni@gmail.com>
 
        * progmodes/dos.el: New file.
        * generic-x.el (bat-generic-mode): Redefine as an obsolete alias to

diff --git a/lisp/progmodes/bat-mode.el b/lisp/progmodes/bat-mode.el
index 0687a0c9f322d50db2bb55be5b42de8b58a72794..613de34eb7e0d85047a1681240c6cc382958a3fa 100644 (file)
--- a/lisp/progmodes/bat-mode.el
+++ b/lisp/progmodes/bat-mode.el
@@ -1,8 +1,8 @@
 ;;; bat-mode.el --- Major mode for editing DOS/Windows scripts  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2003, 2008-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2024 Free Software Foundation, Inc.
 
-;; Author: Arni Magnusson <arnima@hafro.is>
+;; Author: Arni Magnusson <thisisarni@gmail.com>
 ;; Keywords: languages
 
 ;; This file is part of GNU Emacs.