From 64df9d9740c8c6d453da8a73dc24036b6b1c9def Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 3 Oct 2011 23:55:21 -0400
Subject: [PATCH] Only gripe about recursive mapping execution for macro keys.

---
 common/content/mappings.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/content/mappings.js b/common/content/mappings.js
index 01e32f16..0b8ec7c7 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -129,8 +129,11 @@ var Map = Class("Map", {
             mappings.repeat = repeat;
 
         if (this.executing) {
-            util.dumpStack(_("map.recursive", args.command));
-            throw FailedAssertion(_("map.recursive", args.command));
+            if (args.keypressEvents[0].isMacro) {
+                util.dumpStack(_("map.recursive", args.command));
+                throw FailedAssertion(_("map.recursive", args.command));
+            }
+            this.executing = false;
         }
 
         try {