From 430468ee01be0015a4074254a08c96e9de55c5d5 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 20 Jan 2011 00:44:23 -0500
Subject: [PATCH] Fix stupid miscalculation in previous changeset.

---
 common/content/events.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/common/content/events.js b/common/content/events.js
index 5920c5b3..09ca6a55 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -886,6 +886,8 @@ var Events = Module("events", {
             // interrupting whatever it's started and a real <C-c>
             // interrupting our playback.
             if (events.feedingKeys && !event.isMacro) {
+                if (!event.originalTarget)
+                    util.dumpStack();
                 if (key == "<C-c>") {
                     events.feedingKeys = false;
                     if (modes.replaying) {
@@ -1016,13 +1018,16 @@ var Events = Module("events", {
         }
         finally {
             [duringFeed, this.duringFeed] = [this.duringFeed, duringFeed];
-            for (let event in this.duringFeed)
-                try {
-                    this.dispatch(event.originalTarget, event, event);
-                }
-                catch (e) {
-                    util.reportError(e);
-                }
+            if (this.feedingKeys)
+                this.duringFeed = this.duringFeed.concat(duringFeed);
+            else
+                for (let event in values(duringFeed))
+                    try {
+                        this.dispatch(event.originalTarget, event, event);
+                    }
+                    catch (e) {
+                        util.reportError(e);
+                    }
         }
     },