gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-21 20:47:58 +01:00
Code Issues Projects Releases Wiki Activity

Prevent user mappings from shadowing longer ones with a common prefix.

Browse Source
This commit is contained in:
Doug Kearns
2009-07-01 18:53:49 +10:00
parent 8ef5ab8178
commit 581b2e67dc
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/content/events.js
View File

@@ -1452,13 +1452,11 @@ function Events() //{{{
modes.isReplaying = false; modes.isReplaying = false;
setTimeout(function () { liberator.echomsg("Canceled playback of macro '" + lastMacro + "'"); }, 100); setTimeout(function () { liberator.echomsg("Canceled playback of macro '" + lastMacro + "'"); }, 100);
} }
return void killEvent();
} }
else else
{
events.duringFeed.push(event); events.duringFeed.push(event);
return void killEvent();
} return void killEvent();
} }
try try
@@ -1588,8 +1586,7 @@ function Events() //{{{
} }
// only follow a map if there isn't a longer possible mapping // 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) // (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 && candidates.length == 0)
else if (map && !event.skipmap && (map.rhs || candidates.length == 0))
{ {
input.pendingMap = null; input.pendingMap = null;
input.count = parseInt(countStr, 10); input.count = parseInt(countStr, 10);