Merge from origin/emacs-27

f3d30b5303 Remove some doc references to old Emacs versions
4217bc229b Fix infloop in shell.el
74b151195d Fix erc-notifications-notify for non-PRIVMSGs, broken in l...
db4436eaf9 Fix the notification action for PRIVMSG in erc-notificatio...
36a4068105 ERC: New maintainer.
2391d3f45d ; spelling fixes
e898442be3 Honor tags-case-fold-search during xref identifer completion

# Conflicts:
#	etc/NEWS

1 files changed, 10 insertions, 0 deletions

diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index 05faa586c20..f7ec181bf9c 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -126,6 +126,11 @@ Ulf Jasper
             lisp/calendar/icalendar.el
             test/lisp/calendar/icalendar-tests.el
 
+Amin Bandali
+        ERC
+            lisp/erc/*
+            doc/misc/erc.texi
+
 ==============================================================================
 2. Areas that someone is willing to maintain, although he would not
 necessarily mind if someone else was the official maintainer.
@@ -248,6 +253,11 @@ Alan Third
             lisp/term/ns-win.el
             doc/emacs/macos.texi
 
+Amin Bandali
+        Eshell
+            lisp/eshell/*
+            doc/misc/eshell.texi
+
 
 ;;; Local Variables:
 ;;;   coding: utf-8