diff options
| author | Lars Ingebrigtsen | 2019-06-19 16:42:02 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-06-19 17:07:41 +0200 |
| commit | 12efa07f95d96fe42d6c72794e3bf4fac62a4bf4 (patch) | |
| tree | c12f38c593d87baecf3713f4e571116852cf4c71 | |
| parent | 416b83e90724f0026fb757362e113cd542fe3de6 (diff) | |
| download | emacs-12efa07f95d96fe42d6c72794e3bf4fac62a4bf4.tar.gz emacs-12efa07f95d96fe42d6c72794e3bf4fac62a4bf4.zip | |
Don't have erc-goodies and erc-ring register functions multiple times
* lisp/erc/erc-goodies.el (noncommands): Don't register functions
twice.
* lisp/erc/erc-ring.el (ring): Ditto.
| -rw-r--r-- | lisp/erc/erc-goodies.el | 2 | ||||
| -rw-r--r-- | lisp/erc/erc-ring.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el index 41083829bac..ff5539e7928 100644 --- a/lisp/erc/erc-goodies.el +++ b/lisp/erc/erc-goodies.el | |||
| @@ -177,7 +177,7 @@ does not appear in the ERC buffer after the user presses ENTER.") | |||
| 177 | "This mode distinguishes non-commands. | 177 | "This mode distinguishes non-commands. |
| 178 | Commands listed in `erc-insert-this' know how to display | 178 | Commands listed in `erc-insert-this' know how to display |
| 179 | themselves." | 179 | themselves." |
| 180 | ((push 'erc-send-distinguish-noncommands erc-pre-send-functions)) | 180 | ((cl-pushnew 'erc-send-distinguish-noncommands erc-pre-send-functions)) |
| 181 | ((setq erc-pre-send-functions (delq 'erc-send-distinguish-noncommands | 181 | ((setq erc-pre-send-functions (delq 'erc-send-distinguish-noncommands |
| 182 | erc-pre-send-functions)))) | 182 | erc-pre-send-functions)))) |
| 183 | 183 | ||
diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el index 2ee78f4d46d..aaf4bd8c499 100644 --- a/lisp/erc/erc-ring.el +++ b/lisp/erc/erc-ring.el | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | (define-erc-module ring nil | 46 | (define-erc-module ring nil |
| 47 | "Stores input in a ring so that previous commands and messages can | 47 | "Stores input in a ring so that previous commands and messages can |
| 48 | be recalled using M-p and M-n." | 48 | be recalled using M-p and M-n." |
| 49 | ((push 'erc-add-to-input-ring erc-pre-send-functions) | 49 | ((cl-pushnew 'erc-add-to-input-ring erc-pre-send-functions) |
| 50 | (define-key erc-mode-map "\M-p" 'erc-previous-command) | 50 | (define-key erc-mode-map "\M-p" 'erc-previous-command) |
| 51 | (define-key erc-mode-map "\M-n" 'erc-next-command)) | 51 | (define-key erc-mode-map "\M-n" 'erc-next-command)) |
| 52 | ((setq erc-pre-send-functions (delq 'erc-add-to-input-ring | 52 | ((setq erc-pre-send-functions (delq 'erc-add-to-input-ring |