[Erc-commit] [commit][emacs22] Flood-control fix.

[mwolson]

commit c67d34a0e8010c275fa82d7834fb3787e7a07706
Author: Michael Olson <address@hidden>
Date:   Mon Mar 27 02:46:02 2006 +0000

    Flood-control fix.
    
    * erc.el (erc-send-input): If flood control is not activated, don't split
      the input line.
    git-archimport-id: address@hidden/erc--cvs--0--patch-148

diff --git a/ChangeLog b/ChangeLog
index ae4a3ee..a8b49e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
        (erc-update-mode-line-buffer): Use the aforementioned option and
        face to colorize the header-line text, if that is what the user
        wants.
+       (erc-send-input): If flood control is not activated, don't split
+       the input line.
 
 2006-03-25  Michael Olson  <address@hidden>
 
diff --git a/erc.el b/erc.el
index c0d21d3..223bc2e 100644
--- a/erc.el
+++ b/erc.el
@@ -4870,7 +4870,8 @@ This returns non-nil only iff we actually send anything."
                  (erc-display-msg line)
                  (erc-process-input-line (concat line "\n")
                                          (null erc-flood-protect) t))
-               (erc-split-line line)))
+               (or (and erc-flood-protect (erc-split-line line))
+                   (list line))))
             (split-string str "\n"))
          ;; Insert the prompt along with the command.
          (erc-display-command str)