[Erc-commit] [commit][emacs22] Take small update from Circe.

[mwolson]

commit caf849bafadd2998d6e74fb8440f065f0be17af1
Author: Michael Olson <address@hidden>
Date:   Sun Aug 6 06:16:22 2006 +0000

    Take small update from Circe.
    
    * erc-backend.el (erc-server-send-queue): Update from Circe version of
      this function.
    git-archimport-id: address@hidden/erc--main--0--patch-34

diff --git a/ChangeLog b/ChangeLog
index abf1d2f..8892366 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-06  Michael Olson  <address@hidden>
 
+       * erc-backend.el (erc-server-send-queue): Update from Circe
+       version of this function.
+
        * erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
        multi-tty Emacs.
 
diff --git a/erc-backend.el b/erc-backend.el
index 705ca7a..81ab0b8 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -680,7 +680,8 @@ protection algorithm."
               (error nil)))))
       (when erc-server-flood-queue
         (setq erc-server-flood-timer
-              (run-at-time 2 nil #'erc-server-send-queue buffer))))))
+              (run-at-time (+ 0.2 erc-server-flood-penalty)
+                           nil #'erc-server-send-queue buffer))))))
 
 (defun erc-message (message-command line &optional force)
   "Send LINE to the server as a privmsg or a notice.