diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-11-04 21:08:57 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-11-04 21:08:57 -0800 |
| commit | b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934 (patch) | |
| tree | c7562d5cde06977fc2eb14a7c0b6972738696386 /lisp/erc/erc.el | |
| parent | ddce73d32fa3e62e022842e3bbdc0aa83bb358cc (diff) | |
| parent | 58064b4da2835acb24d0f68021c84102e0fb1c0f (diff) | |
| download | emacs-b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934.tar.gz emacs-b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934.tar.bz2 emacs-b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934.zip | |
Merge from emacs-24; up to 117669
Diffstat (limited to 'lisp/erc/erc.el')
| -rw-r--r-- | lisp/erc/erc.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 3bb68abfc9e..37b24eaaa60 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1005,7 +1005,7 @@ display of that particular string at all." "Hook called first when some text is sent through `erc-send-current-line'. It gets called with one argument, STRING. -To change the text that will be sent, set the variable STR which is +To change the text that will be sent, set the variable `str' which is used in `erc-send-current-line'. To change the text inserted into the buffer without changing the text @@ -5361,6 +5361,7 @@ This returns non-nil only if we actually send anything." (beep)) nil) (t + (defvar str) ;; FIXME: Make it obey the "erc-" prefix convention. (let ((str input) (erc-insert-this t)) (setq erc-send-this t) |