aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/erc/erc-replace.el
diff options
context:
space:
mode:
authorGlenn Morris2020-03-23 09:46:39 -0700
committerGlenn Morris2020-03-23 09:46:39 -0700
commitd5cfc4ac8bd25ec43864af4b8d10fff643fb47bd (patch)
tree2cdc6a7d87cebbfd788f985f05f7d92ed711e5f5 /lisp/erc/erc-replace.el
parent8f694831c04b1fb9db81be72afdc1a1101d619c4 (diff)
parentbed04c502caa8cf0365a0808adb70451b3d8761a (diff)
downloademacs-d5cfc4ac8bd25ec43864af4b8d10fff643fb47bd.tar.gz
emacs-d5cfc4ac8bd25ec43864af4b8d10fff643fb47bd.zip
Merge from origin/emacs-27
bed04c502c Use correct registry name for windows-1251 charset 1aa1529301 ERC: Update maintainer address
Diffstat (limited to 'lisp/erc/erc-replace.el')
-rw-r--r--lisp/erc/erc-replace.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/erc-replace.el b/lisp/erc/erc-replace.el
index dfb20626fd5..8bd97be9494 100644
--- a/lisp/erc/erc-replace.el
+++ b/lisp/erc/erc-replace.el
@@ -4,7 +4,7 @@
4;; Inc. 4;; Inc.
5 5
6;; Author: Andreas Fuchs <asf@void.at> 6;; Author: Andreas Fuchs <asf@void.at>
7;; Maintainer: Amin Bandali <mab@gnu.org> 7;; Maintainer: Amin Bandali <bandali@gnu.org>
8;; URL: https://www.emacswiki.org/emacs/ErcReplace 8;; URL: https://www.emacswiki.org/emacs/ErcReplace
9;; Keywords: IRC, client, Internet 9;; Keywords: IRC, client, Internet
10 10