From 581b2e67dc54be6dd49e49c5b58d624a2d49edb6 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 1 Jul 2009 18:53:49 +1000
Subject: [PATCH] Prevent user mappings from shadowing longer ones with a
 common prefix.

---
 common/content/events.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/common/content/events.js b/common/content/events.js
index c2e10902..d39a0d56 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -1452,13 +1452,11 @@ function Events() //{{{
                         modes.isReplaying = false;
                         setTimeout(function () { liberator.echomsg("Canceled playback of macro '" + lastMacro + "'"); }, 100);
                     }
-                    return void killEvent();
                 }
                 else
-                {
                     events.duringFeed.push(event);
-                    return void killEvent();
-                }
+
+                return void killEvent();
             }
 
             try
@@ -1588,8 +1586,7 @@ function Events() //{{{
                 }
                 // only follow a map if there isn't a longer possible mapping
                 // (allows you to do :map z yy, when zz is a longer mapping than z)
-                // TODO: map.rhs is only defined for user defined commands, should add a "isDefault" property
-                else if (map && !event.skipmap && (map.rhs || candidates.length == 0))
+                else if (map && !event.skipmap && candidates.length == 0)
                 {
                     input.pendingMap = null;
                     input.count = parseInt(countStr, 10);