diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-20 01:44:19 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-20 12:51:39 +0200 |
| commit | 9f4cced5db01b256dfcb78a8fa90f388ec32a840 (patch) | |
| tree | 0e2cbd1e864af0754371afaefd2841cf6e9ae084 /lisp/erc/erc-compat.el | |
| parent | 45a0ce0905e495ae93b39e75cedb34ac95c6ea71 (diff) | |
| download | emacs-9f4cced5db01b256dfcb78a8fa90f388ec32a840.tar.gz | |
Remove XEmacs compat code from erc
* lisp/erc/erc-button.el (button, erc-button-keymap)
(erc-button-setup, erc-button-add-button): Remove XEmacs compat code.
* lisp/erc/erc-compat.el (erc-replace-match-subexpression-in-string):
* lisp/erc/erc-log.el (erc-log-file-coding-system):
* lisp/erc/erc-menu.el (menu):
* lisp/erc/erc-stamp.el (erc-timestamp-use-align-to):
* lisp/erc/erc-track.el (erc-modified-channels-object, track)
(erc-track-mouse-face):
* lisp/erc/erc.el (erc-update-undo-list)
(erc-quit-reason-various, erc-part-reason-various, erc-cmd-SV)
(erc-input-message, erc-get-channel-mode-from-keypress)
(erc-update-mode-line-buffer):
Diffstat (limited to 'lisp/erc/erc-compat.el')
| -rw-r--r-- | lisp/erc/erc-compat.el | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el index e724e367ab1..aae0f09a2c5 100644 --- a/lisp/erc/erc-compat.el +++ b/lisp/erc/erc-compat.el @@ -71,17 +71,13 @@ See `erc-encoding-coding-alist'." are placed. Note that this should end with a directory separator.") -;; XEmacs's `replace-match' does not replace matching subexpressions in strings. (defun erc-replace-match-subexpression-in-string (newtext string match subexp start &optional fixedcase literal) "Replace the subexpression SUBEXP of the last match in STRING with NEWTEXT. MATCH is the text which matched the subexpression (see `match-string'). START is the beginning position of the last match (see `match-beginning'). See `replace-match' for explanations of FIXEDCASE and LITERAL." - (cond ((featurep 'xemacs) - (string-match match string start) - (replace-match newtext fixedcase literal string)) - (t (replace-match newtext fixedcase literal string subexp)))) + (replace-match newtext fixedcase literal string subexp)) (defalias 'erc-with-selected-window 'with-selected-window) (defalias 'erc-cancel-timer 'cancel-timer) |