[Emacs-diffs] emacs-24 r117668: * lisp/erc/erc.el (erc-send-input): Bind `str' dynamically.

[Stefan Monnier]

------------------------------------------------------------
revno: 117668
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18936
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-11-04 15:07:59 -0500
message:
  * lisp/erc/erc.el (erc-send-input): Bind `str' dynamically.
modified:
  lisp/erc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-4305
  lisp/erc/erc.el                erc.el-20091113204419-o5vbwnq5f7feedwu-4346

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2014-10-20 19:21:15 +0000
+++ b/lisp/erc/ChangeLog        2014-11-04 20:07:59 +0000
@@ -1,3 +1,7 @@
+2014-11-04  Stefan Monnier  <address@hidden>
+
+       * erc.el (erc-send-input): Bind `str' dynamically (bug#18936).
+
 2014-10-20  Glenn Morris  <address@hidden>
 
        * Version 24.4 released.

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2014-02-10 01:34:22 +0000
+++ b/lisp/erc/erc.el   2014-11-04 20:07:59 +0000
@@ -975,7 +975,7 @@
   "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 @@
       (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)