From 14a367ff716d5bef07f5c5e7665a8d758f607801 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Mon, 17 Dec 2007 11:29:01 +0000
Subject: [PATCH] count support for @, and removed old unused hint mappings
 code

---
 content/mappings.js | 237 ++------------------------------------------
 1 file changed, 7 insertions(+), 230 deletions(-)

diff --git a/content/mappings.js b/content/mappings.js
index 613b5b1f..7ca1e573 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -1301,240 +1301,17 @@ vimperator.Mappings = function () //{{{
         }
     ));
     addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["@"], 
-        function (arg) { vimperator.events.playMacro(arg); },
+        function (count, arg)
+        {
+            if (count < 1) count = 1;
+            while (count--)
+                vimperator.events.playMacro(arg);
+        },
         {
             shortHelp: "Execute the contents of macro {0-9a-z}. @@ repeats the previous @{0-9a-z}",
-            flags: vimperator.Mappings.flags.ARGUMENT
+            flags: vimperator.Mappings.flags.ARGUMENT | vimperator.Mappings.flags.COUNT
         }
     ));
-    // }}}
-    // HINTS mode
-    // {{{
-
-//    // action keys
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["o"],
-//        function () { vimperator.hints.openHints(false, false); },
-//        {
-//            cancelMode: true,
-//            alwaysActive: false
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["t"],
-//        function () { vimperator.hints.openHints(true,  false); },
-//        {
-//            cancelMode: true,
-//            alwaysActive: false
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-w>"],
-//        function () { vimperator.hints.openHints(false, true ); },
-//        {
-//            cancelMode: true,
-//            alwaysActive: false
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["s"],
-//        function () { vimperator.hints.saveHints(true); },
-//        {
-//            cancelMode: true,
-//            alwaysActive: false
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["a"],
-//        function () { vimperator.hints.saveHints(false); },
-//        {
-//            cancelMode: true,
-//            alwaysActive: false
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["y"],
-//        function () { vimperator.hints.yankUrlHints(); },
-//        {
-//            cancelMode: true,
-//            alwaysActive: false
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["Y"],
-//        function () { vimperator.hints.yankTextHints(); },
-//        {
-//            cancelMode: true,
-//            alwaysActive: false
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], [","],
-//        function () { vimperator.input.buffer += ","; vimperator.hints.setCurrentState(0); },
-//        {
-//            cancelMode: false,
-//            alwaysActive: true
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], [":"],
-//        function () { vimperator.commandline.open(":", "", vimperator.modes.EX); },
-//        {
-//            cancelMode: false,
-//            alwaysActive: true
-//        }
-//    ));
-//
-//    // movement keys
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-e>"],
-//        function (count) { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
-//        {
-//            cancelMode: false,
-//            alwaysActive: true,
-//            flags: vimperator.Mappings.flags.COUNT
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-y>"],
-//        function (count) { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
-//        {
-//            cancelMode: false,
-//            alwaysActive: true,
-//            flags: vimperator.Mappings.flags.COUNT
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<Home>"],
-//        function () { vimperator.buffer.scrollTop(); },
-//        {
-//            cancelMode: false,
-//            alwaysActive: true
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<End>"],
-//        function () { vimperator.buffer.scrollBottom(); },
-//        {
-//            cancelMode: false,
-//            alwaysActive: true
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<PageUp>", "<C-b>"],
-//        function (count) { vimperator.buffer.scrollPages(-(count > 1 ? count : 1)); },
-//        {
-//            cancelMode: false,
-//            alwaysActive: true,
-//            flags: vimperator.Mappings.flags.COUNT
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<PageDown>", "<C-f>"],
-//        function (count) { vimperator.buffer.scrollPages(count > 1 ? count : 1); },
-//        {
-//            cancelMode: false,
-//            alwaysActive: true,
-//            flags: vimperator.Mappings.flags.COUNT
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<Left>"],
-//        function () { vimperator.buffer.scrollColumns(-(count > 1 ? count : 1)); },
-//        {
-//            cancelMode: false,
-//            alwaysActive: true,
-//            flags: vimperator.Mappings.flags.COUNT
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<Down>"],
-//        function () { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
-//        {
-//            cancelMode: false,
-//            alwaysActive: true,
-//            flags: vimperator.Mappings.flags.COUNT
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<Up>"],
-//        function () { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
-//        {
-//            cancelMode: false,
-//            alwaysActive: true,
-//            flags: vimperator.Mappings.flags.COUNT
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<Right>"],
-//        function () { vimperator.buffer.scrollColumns(count > 1 ? count : 1); },
-//        {
-//            cancelMode: false,
-//            alwaysActive: true,
-//            flags: vimperator.Mappings.flags.COUNT
-//        }
-//    ));
-//
-//    // tab management
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-n>"],
-//        function () { vimperator.tabs.select("+1", true); },
-//        {
-//            cancelMode: true,
-//            alwaysActive: true
-//        }
-//    )); // same as gt, but no count supported
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-p>"],
-//        function () { vimperator.tabs.select("-1", true); },
-//        {
-//            cancelMode: true,
-//            alwaysActive: true
-//        }
-//    ));
-//
-//    // navigation
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-o>"],
-//        function (count) { vimperator.history.stepTo(count > 0 ? -count : -1); },
-//        {
-//            cancelMode: false,
-//            alwaysActive: true,
-//            flags: vimperator.Mappings.flags.COUNT
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-i>"],
-//        function (count) { vimperator.history.stepTo(count > 1 ? count : 1); },
-//        {
-//            cancelMode: false,
-//            alwaysActive: true,
-//            flags: vimperator.Mappings.flags.COUNT
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-h>"],
-//        function (count) { vimperator.history.stepTo(count > 0 ? -count : -1); },
-//        {
-//            cancelMode: false,
-//            alwaysActive: true,
-//            flags: vimperator.Mappings.flags.COUNT
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-l>"],
-//        function (count) { vimperator.history.stepTo(count > 1 ? count : 1); },
-//        {
-//            cancelMode: false,
-//            alwaysActive: true,
-//            flags: vimperator.Mappings.flags.COUNT
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-d>"],
-//        function () { vimperator.tabs.remove(getBrowser().mCurrentTab, vimperator.input.count, false, 0); },
-//        {
-//            cancelMode: true,
-//            alwaysActive: true
-//        }
-//    ));
-//
-//    // cancelMode hint mode keys
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-c>"],
-//        function () { ; },
-//        {
-//            cancelMode: true,
-//            alwaysActive: true
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-g>"],
-//        function () { ; },
-//        {
-//            cancelMode: true,
-//            alwaysActive: true
-//        }
-//    ));
-//    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-[>"],
-//        function () { ; },
-//        {
-//            cancelMode: true,
-//            alwaysActive: true
-//        }
-//    ));
 
     // }}}
     // CARET mode