From e8aac67312e9274394e0f20e0a5540ad285f5da1 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 18 Nov 2010 14:03:13 -0500
Subject: [PATCH] Fix interpolation of counts into key mappings.

---
 common/content/commands.js | 2 +-
 common/content/events.js   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/content/commands.js b/common/content/commands.js
index 12fe55e5..478b5263 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -330,7 +330,7 @@ const Command = Class("Command", {
             /* fallthrough */
         case "-keys":
             let silent = args["-silent"];
-            rhs = events.canonicalKeys(rhs);
+            rhs = events.canonicalKeys(rhs, true);
             var action = function action(count)
                 events.feedkeys(commands.replaceTokens(rhs, { count: count }),
                                 noremap, silent);
diff --git a/common/content/events.js b/common/content/events.js
index 26e409a8..b3fa5a27 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -352,8 +352,8 @@ const Events = Module("events", {
      * @param {string} keys Messy form.
      * @returns {string} Canonical form.
      */
-    canonicalKeys: function (keys) {
-        return events.fromString(keys).map(events.closure.toString).join("");
+    canonicalKeys: function (keys, unknownOk) {
+        return events.fromString(keys, unknownOk).map(events.closure.toString).join("");
     },
 
     /**
@@ -545,6 +545,8 @@ const Events = Module("events", {
                         return key;
                 }
             }
+            if (key == null)
+                key = event.dactylKeyname;
             if (key == null)
                 return null;
         }