diff options
author | Glenn Morris <rgm@gnu.org> | 2020-01-20 07:50:26 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2020-01-20 07:50:26 -0800 |
commit | 519de2f88e3f9985f41a763953711b63a8223628 (patch) | |
tree | db5a2f2bea7a9531ea736d100142f9cc434ea4fb /lisp/erc/erc-ezbounce.el | |
parent | cdede988b48802c5f2ccce2d38bebcdc4c7dbb05 (diff) | |
parent | f3d30b5303783a307921b914d4df0b082106b39d (diff) | |
download | emacs-519de2f88e3f9985f41a763953711b63a8223628.tar.gz |
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
Diffstat (limited to 'lisp/erc/erc-ezbounce.el')
-rw-r--r-- | lisp/erc/erc-ezbounce.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/erc-ezbounce.el b/lisp/erc/erc-ezbounce.el index a604f51145f..a2d58e927e9 100644 --- a/lisp/erc/erc-ezbounce.el +++ b/lisp/erc/erc-ezbounce.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2002, 2004, 2006-2020 Free Software Foundation, Inc. ;; Author: Andreas Fuchs <asf@void.at> -;; Maintainer: emacs-devel@gnu.org +;; Maintainer: Amin Bandali <mab@gnu.org> ;; Keywords: comm ;; This file is part of GNU Emacs. |