From 1d01dc70c30132d154b53aa17e156285a56b0ba1 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 1 Jun 2011 17:49:08 -0400
Subject: [PATCH] =?UTF-8?q?:map=20sans=20-count=20=E2=89=A1=20:map=20-coun?=
 =?UTF-8?q?t=20=E2=8C=A9lhs=E2=8C=AA=20<count>=E2=8C=A9rhs=E2=8C=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/content/mappings.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/content/mappings.js b/common/content/mappings.js
index b4751586..ea539199 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -477,6 +477,9 @@ var Mappings = Module("mappings", {
                     return;
                 }
 
+                if (args[1] && !args["-count"] && !args["-ex"] && !args["-javascript"])
+                    args[1] = "<count>" + args[1];
+
                 let [lhs, rhs] = args;
                 if (noremap)
                     args["-builtin"] = true;
@@ -492,7 +495,7 @@ var Mappings = Module("mappings", {
                         contexts.bindMacro(args, "-keys", function (params) params),
                         {
                             arg: args["-arg"],
-                            count: args["-count"],
+                            count: args["-count"] || !(args["-ex"] || args["-javascript"]),
                             noremap: args["-builtin"],
                             persist: !args["-nopersist"],
                             get rhs() String(this.action),