summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2014-11-04 15:07:59 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2014-11-04 15:07:59 -0500
commit6cd9d8c94dd81f7aa1753b1c6320d089f0fe6fcd (patch)
treef09fd3f2e2bf8c32f0a33c73bec565809797e792
parenta1740a150d2d15189b0e93878845e62a569c257f (diff)
downloademacs-6cd9d8c94dd81f7aa1753b1c6320d089f0fe6fcd.tar.gz
* lisp/erc/erc.el (erc-send-input): Bind `str' dynamically.
Fixes: debbugs:18936
-rw-r--r--lisp/erc/ChangeLog4
-rw-r--r--lisp/erc/erc.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index ca018c47db8..869befc1191 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-04 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * erc.el (erc-send-input): Bind `str' dynamically (bug#18936).
+
2014-10-20 Glenn Morris <rgm@gnu.org>
* Version 24.4 released.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index d93e9e02156..3a107c69f9a 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -975,7 +975,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
@@ -5268,6 +5268,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)