diff options
| author | Paul Eggert | 2012-03-01 18:29:30 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-03-01 18:29:30 -0800 |
| commit | 9d6b4d53469a9ffd67bd770fabc6fe254e35c21d (patch) | |
| tree | de238c6f707915be9ed1f10235589b4e975a08fb /lisp/erc | |
| parent | a89654f8f34114db543cb91363e8fded6d73e986 (diff) | |
| parent | eec1549a6b89359b6d970f14dead275e59b7bc6f (diff) | |
| download | emacs-9d6b4d53469a9ffd67bd770fabc6fe254e35c21d.tar.gz emacs-9d6b4d53469a9ffd67bd770fabc6fe254e35c21d.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/erc-compat.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el index 4057d1eabc2..1fb3930091e 100644 --- a/lisp/erc/erc-compat.el +++ b/lisp/erc/erc-compat.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; erc-compat.el --- ERC compatibility code for XEmacs | 1 | ;;; erc-compat.el --- ERC compatibility code for XEmacs |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2002-2003, 2005-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2002-2003, 2005-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Alex Schroeder <alex@gnu.org> | 5 | ;; Author: Alex Schroeder <alex@gnu.org> |
| 6 | ;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC | 6 | ;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC |
| @@ -70,7 +70,7 @@ See `erc-encoding-coding-alist'." | |||
| 70 | are placed. | 70 | are placed. |
| 71 | Note that this should end with a directory separator.") | 71 | Note that this should end with a directory separator.") |
| 72 | 72 | ||
| 73 | ;; XEmacs' `replace-match' does not replace matching subexpressions in strings. | 73 | ;; XEmacs's `replace-match' does not replace matching subexpressions in strings. |
| 74 | (defun erc-replace-match-subexpression-in-string | 74 | (defun erc-replace-match-subexpression-in-string |
| 75 | (newtext string match subexp start &optional fixedcase literal) | 75 | (newtext string match subexp start &optional fixedcase literal) |
| 76 | "Replace the subexpression SUBEXP of the last match in STRING with NEWTEXT. | 76 | "Replace the subexpression SUBEXP of the last match in STRING with NEWTEXT. |