diff options
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 75a01581fcd..0875994e775 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2014-11-05 Stefan Monnier <monnier@iro.umontreal.ca> + + * erc.el (erc-send-input): Bind `str' dynamically (bug#18936). + 2014-10-29 Paul Eggert <eggert@cs.ucla.edu> Simplify use of current-time and friends. 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) |