From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 4 Nov 2014 20:07:59 +0000 (-0500)
Subject: * lisp/erc/erc.el (erc-send-input): Bind `str' dynamically.
X-Git-Tag: emacs-24.4.90~269
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6cd9d8c94dd81f7aa1753b1c6320d089f0fe6fcd;p=emacs.git

* lisp/erc/erc.el (erc-send-input): Bind `str' dynamically.

Fixes: debbugs:18936
---

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)