diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2020-08-12 19:32:52 +0200 |
|---|---|---|
| committer | Amin Bandali <bandali@gnu.org> | 2020-08-13 19:31:54 -0400 |
| commit | 32cb84974faac7cecdd82e154f7cae9ac0ee8320 (patch) | |
| tree | ca64ae597f9d0f3d0d70baaede2463c637f603bf /lisp/erc/erc-goodies.el | |
| parent | 48c7caf3aca85f9878ae05bff9a0dca43b8f540b (diff) | |
| download | emacs-32cb84974faac7cecdd82e154f7cae9ac0ee8320.tar.gz emacs-32cb84974faac7cecdd82e154f7cae9ac0ee8320.tar.bz2 emacs-32cb84974faac7cecdd82e154f7cae9ac0ee8320.zip | |
Make erc-compat.el obsolete
* lisp/erc/erc-compat.el: Move from here...
* lisp/obsolete/erc-compat.el: ...to here.
* lisp/erc/erc-backend.el:
* lisp/erc/erc-pcomplete.el:
* lisp/erc/erc-stamp.el:
* lisp/erc/erc-track.el:
* lisp/erc/erc.el: Don't require 'erc-compat'.
* lisp/erc/erc-backend.el (erc-decode-string-from-target):
* lisp/erc/erc-dcc.el (pcomplete/erc-mode/DCC):
* lisp/erc/erc-fill.el (erc-fill-mode):
* lisp/erc/erc-goodies.el (erc-controls-interpret):
* lisp/erc/erc-log.el (erc-log-setup-logging):
* lisp/erc/erc-notify.el (erc-notify-QUIT):
* lisp/erc/erc.el (erc-startup-file-list, define-erc-module)
(erc-canonicalize-server-name, erc-cmd-SV, erc-banlist-update)
(erc-group-list, erc-seconds-to-string): Adjust callers.
* lisp/erc/erc.el: Require cl-lib and format-spec.
* etc/NEWS: Add entry announcing erc-compat.el being marked as
obsolete.
Diffstat (limited to 'lisp/erc/erc-goodies.el')
| -rw-r--r-- | lisp/erc/erc-goodies.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el index ff7a77f1265..a475f0a1770 100644 --- a/lisp/erc/erc-goodies.el +++ b/lisp/erc/erc-goodies.el @@ -399,8 +399,7 @@ See `erc-interpret-controls-p' and `erc-interpret-mirc-color' for options." (start (match-beginning 0)) (end (+ (match-beginning 0) (length (match-string 5 s))))) - (setq s (erc-replace-match-subexpression-in-string - "" s control 1 start)) + (setq s (replace-match "" nil nil s 1)) (cond ((and erc-interpret-mirc-color (or fg-color bg-color)) (setq fg fg-color) (setq bg bg-color)) |