From 35f7fb4aa0be3de5841861d7e570b51b0f990f85 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 18 Jan 2011 20:13:24 -0500
Subject: [PATCH] Fix typing numbers in input modes.

---
 common/content/events.js |  4 ++--
 common/content/modes.js  | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/content/events.js b/common/content/events.js
index dccdd66e..b2583da2 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -1004,7 +1004,7 @@ var Events = Module("events", {
 
             if (waiting)
                 this._processors = processors;
-            else if (res !== Events.KILL && (mode.main & (modes.TEXT_EDIT | modes.VISUAL)))
+            else if (res === Events.KILL && (mode.main & (modes.TEXT_EDIT | modes.VISUAL)))
                 dactyl.beep();
 
             if (refeed && refeed[0] && !refeed[0].getPreventDefault()) {
@@ -1020,7 +1020,7 @@ var Events = Module("events", {
                     if (event.originalTarget) {
                         util.dump("Re-feed " + i + " " + refeed.length + " " + (events.toString(event) || "").quote());
                         let evt = events.create(event.originalTarget.ownerDocument, event.type, event);
-                        events.dispatch(event.originalTarget, evt, i == 0 && { skipmap: true });
+                        events.dispatch(event.originalTarget, evt, { skipmap: true });
                     }
                     else if (i > 0)
                         events.onKeyPress(event);
diff --git a/common/content/modes.js b/common/content/modes.js
index 2137e17d..b0de047e 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -36,12 +36,14 @@ var Modes = Module("modes", {
         this.boundProperties = {};
 
         this.addMode("BASE", {
-            description: "The base mode for all other modes"
+            description: "The base mode for all other modes",
+            count: false
         });
         this.addMode("MAIN", {
             char: "m",
             description: "The base mode for most other modes",
-            bases: [this.BASE]
+            bases: [this.BASE],
+            count: false
         });
         this.addMode("COMMAND", {
             description: "The base mode for most modes which accept commands rather than input",
@@ -100,7 +102,9 @@ var Modes = Module("modes", {
 
         this.addMode("INPUT", {
             char: "I",
-            description: "The base mode for input modes, including Insert and Command Line"
+            description: "The base mode for input modes, including Insert and Command Line",
+            bases: [this.BASE],
+            input: true
         });
         this.addMode("INSERT", {
             char: "i",