diff options
author | Bill Wohler <wohler@newt.com> | 2012-11-24 19:43:02 -0800 |
---|---|---|
committer | Bill Wohler <wohler@newt.com> | 2012-11-24 19:43:02 -0800 |
commit | 5244bc019bf7376caff3bb198ff674e0ad9fb0e6 (patch) | |
tree | 02ee1615e904771f692ec2957c79a08ae029a13d /lisp/erc/erc-replace.el | |
parent | 9f7e719509474e92f85955e22e57ffeebd4e96f3 (diff) | |
parent | c07a6ded1df2f4156badc9add2953579622c3722 (diff) | |
download | emacs-5244bc019bf7376caff3bb198ff674e0ad9fb0e6.tar.gz |
Merge from trunk.
Diffstat (limited to 'lisp/erc/erc-replace.el')
-rw-r--r-- | lisp/erc/erc-replace.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/erc/erc-replace.el b/lisp/erc/erc-replace.el index 4d3ba1e230d..3d4a5d311b1 100644 --- a/lisp/erc/erc-replace.el +++ b/lisp/erc/erc-replace.el @@ -1,9 +1,9 @@ ;; erc-replace.el -- wash and massage messages inserted into the buffer -;; Copyright (C) 2001-2002, 2004, 2006-2011 Free Software Foundation, Inc. +;; Copyright (C) 2001-2002, 2004, 2006-2012 Free Software Foundation, Inc. ;; Author: Andreas Fuchs <asf@void.at> -;; Maintainer: Mario Lang (mlang@delysid.org) +;; Maintainer: FSF ;; Keywords: IRC, client, Internet ;; This file is part of GNU Emacs. @@ -25,7 +25,7 @@ ;; This module allows you to systematically replace text in incoming ;; messages. Load erc-replace, and customize `erc-replace-alist'. -;; Then add to your ~/.emacs: +;; Then add to your init file: ;; (require 'erc-replace) ;; (erc-replace-mode 1) |