From 68629f3fd59a5e0f6314f5e18aea9e0f69885c58 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 16 Jun 2011 01:09:05 +1000
Subject: [PATCH] More assorted map aliases.

--HG--
extra : rebase_source : 8614d45db94c8415542c0a264b602b24d898971e
---
 common/content/browser.js        |  8 ++++----
 common/content/buffer.js         |  4 ++--
 common/content/dactyl.js         |  4 ++--
 common/content/events.js         |  2 +-
 common/locale/en-US/browsing.xml | 12 ++++++------
 common/locale/en-US/buffer.xml   |  4 ++--
 common/locale/en-US/various.xml  |  6 +++---
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/common/content/browser.js b/common/content/browser.js
index e5529a30..de697117 100644
--- a/common/content/browser.js
+++ b/common/content/browser.js
@@ -233,22 +233,22 @@ var Browser = Module("browser", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
             "Open one or more URLs in a new window, based on current location",
             function () { CommandExMode().open("winopen " + decode(buffer.uri.spec)); });
 
-        mappings.add([modes.NORMAL], ["~"],
+        mappings.add([modes.NORMAL], ["<open-home-directory>", "~"],
             "Open home directory",
             function () { dactyl.open("~"); });
 
-        mappings.add([modes.NORMAL], ["gh"],
+        mappings.add([modes.NORMAL], ["<open-homepage>", "gh"],
             "Open homepage",
             function () { BrowserHome(); });
 
-        mappings.add([modes.NORMAL], ["gH"],
+        mappings.add([modes.NORMAL], ["<tab-open-homepage>", "gH"],
             "Open homepage in a new tab",
             function () {
                 let homepages = gHomeButton.getHomePage();
                 dactyl.open(homepages, { from: "homepage", where: dactyl.NEW_TAB });
             });
 
-        mappings.add([modes.MAIN], ["<C-l>"],
+        mappings.add([modes.MAIN], ["<redraw-screen>", "<C-l>"],
             "Redraw the screen",
             function () { ex.redraw(); });
     }
diff --git a/common/content/buffer.js b/common/content/buffer.js
index 8ec666e7..017e418a 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -1606,12 +1606,12 @@ var Buffer = Module("buffer", {
             function (args) { buffer.incrementURL(-Math.max(args.count, 1)); },
             { count: true });
 
-        mappings.add([modes.NORMAL], ["gu", "<parent-url-path>"],
+        mappings.add([modes.NORMAL], ["gu", "<open-parent-path>"],
             "Go to parent directory",
             function (args) { buffer.climbUrlPath(Math.max(args.count, 1)); },
             { count: true });
 
-        mappings.add([modes.NORMAL], ["gU", "<root-url-path>"],
+        mappings.add([modes.NORMAL], ["gU", "<open-root-path>"],
             "Go to the root of the website",
             function () { buffer.climbUrlPath(-1); });
 
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 5e705f07..5fcf2edd 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -1713,11 +1713,11 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
     },
 
     mappings: function () {
-        mappings.add([modes.MAIN], ["<F1>"],
+        mappings.add([modes.MAIN], ["<open-help>", "<F1>"],
             "Open the introductory help page",
             function () { dactyl.help(); });
 
-        mappings.add([modes.MAIN], ["<A-F1>"],
+        mappings.add([modes.MAIN], ["<open-single-help>", "<A-F1>"],
             "Open the single, consolidated help page",
             function () { ex.helpall(); });
 
diff --git a/common/content/events.js b/common/content/events.js
index 3c72b4e8..3be14fff 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -1565,7 +1565,7 @@ var Events = Module("events", {
     mappings: function () {
 
         mappings.add([modes.MAIN],
-            ["<A-b>"], "Process the next key as a builtin mapping",
+            ["<A-b>", "<pass-next-key-builtin>"], "Process the next key as a builtin mapping",
             function () {
                 events.processor = ProcessorStack(modes.getStack(0), mappings.hives.array, true);
                 events.processor.keyEvents = events.keyEvents;
diff --git a/common/locale/en-US/browsing.xml b/common/locale/en-US/browsing.xml
index 1f97dea6..f71a2b00 100644
--- a/common/locale/en-US/browsing.xml
+++ b/common/locale/en-US/browsing.xml
@@ -20,7 +20,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 &dactyl.host; or to a web page, you have two options:
 
 <item>
-    <tags><![CDATA[<A-b>]]></tags>
+    <tags><![CDATA[<pass-next-key-builtin> <A-b>]]></tags>
     <spec><![CDATA[<A-b>]]></spec>
     <description>
         <p>
@@ -249,7 +249,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 </item>
 
 <item>
-    <tags>~</tags>
+    <tags><![CDATA[<open-home-directory> ~]]></tags>
     <spec>~</spec>
     <description short="true">
         <p>Open home directory. Equivalent to <ex>:open ~/</ex></p>
@@ -303,7 +303,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 </item>
 
 <item>
-    <tags>gh</tags>
+    <tags><![CDATA[<open-homepage> gh]]></tags>
     <spec>gh</spec>
     <description short="true">
         <p>Go home. Opens the homepage in the current tab.</p>
@@ -311,7 +311,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 </item>
 
 <item>
-    <tags>gH</tags>
+    <tags><![CDATA[<tab-open-homepage> gH]]></tags>
     <strut/>
     <spec>gH</spec>
     <description>
@@ -324,7 +324,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 </item>
 
 <item>
-    <tags><![CDATA[<parent-url-path> gu]]></tags>
+    <tags><![CDATA[<open-parent-path> gu]]></tags>
     <spec><oa>count</oa>gu</spec>
     <description short="true">
         <p>Go to <oa>count</oa>th parent directory.</p>
@@ -338,7 +338,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 </item>
 
 <item>
-    <tags><![CDATA[<root-url-path> gU]]></tags>
+    <tags><![CDATA[<open-root-path> gU]]></tags>
     <spec>gU</spec>
     <description short="true">
         <p>Go to the root of the web site.</p>
diff --git a/common/locale/en-US/buffer.xml b/common/locale/en-US/buffer.xml
index d6725bd1..c027e431 100644
--- a/common/locale/en-US/buffer.xml
+++ b/common/locale/en-US/buffer.xml
@@ -55,7 +55,7 @@
 </item>
 
 <item>
-    <tags>gf</tags>
+    <tags><![CDATA[<view-source> gf]]></tags>
     <strut/>
     <spec>gf</spec>
     <description>
@@ -67,7 +67,7 @@
 </item>
 
 <item>
-    <tags>gF</tags>
+    <tags><![CDATA[<view-source-externally> gF]]></tags>
     <strut/>
     <spec>gF</spec>
     <description>
diff --git a/common/locale/en-US/various.xml b/common/locale/en-US/various.xml
index 78ade2e5..76a4f116 100644
--- a/common/locale/en-US/various.xml
+++ b/common/locale/en-US/various.xml
@@ -87,7 +87,7 @@
 </item>
 
 <item>
-    <tags><![CDATA[<C-l> CTRL-L :redr :redraw]]></tags>
+    <tags><![CDATA[<redraw-screen> <C-l> CTRL-L :redr :redraw]]></tags>
     <strut/>
     <spec>:redr<oa>aw</oa></spec>
     <description>
@@ -166,7 +166,7 @@
 <h2 tag="online-help">Online help</h2>
 
 <item>
-    <tags><![CDATA[<F1> :help :h help]]></tags>
+    <tags><![CDATA[<open-help> <F1> :help :h help]]></tags>
     <spec>:h<oa>elp</oa> <oa>subject</oa></spec>
     <spec>&lt;F1></spec>
     <description>
@@ -180,7 +180,7 @@
 </item>
 
 <item>
-    <tags><![CDATA[<A-F1> :helpall :helpa help-all]]></tags>
+    <tags><![CDATA[<open-single-help> <A-F1> :helpall :helpa help-all]]></tags>
     <spec>:helpa<oa>ll</oa> <oa>subject</oa></spec>
     <spec>&lt;A-F1></spec>
     <description>