From c9229435c3e7b0703e9a31c74dfd6daaa1e6b9fe Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Thu, 9 Aug 2007 22:41:53 +0000
Subject: [PATCH] - Fixed gn command - added gH to activate option

---
 ChangeLog                             |  4 ++--
 TODO                                  |  1 +
 chrome/content/vimperator/mappings.js | 12 +++++++++---
 chrome/content/vimperator/options.js  |  5 +++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 53127bd8..6f90efdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@
 	* files in ~/.vimperator/plugin/ are auto-sourced
 	* :winopen support (multiple windows still very very experimental)
 	* 'activate' option implemented
-	* search enginges which use POST instead of GET work now
+	* search engines which use POST instead of GET work now
 	* :javascript <<EOF uses a better multiline input widget now
 	* new :map, :noremap, :mapclear and :unmap commands
 	* :saveas finally works (by calmar)
@@ -20,7 +20,7 @@
 	* The RSS feed button in the address bar works again
 	* reload/stop buttons update enabled state again
 	* added local/url marks support (thanks Viktor Kojouharov)
-	* temporary shortcut Y to yank current selection (for non UNIX-users)
+	* temporary shortcut Y to yank current selection (for non X11-users)
 	* Flashing frame with ]f now works as expected
 	* many help fixes (most of them by Doug Kearns)
 	* new :reloadall command
diff --git a/TODO b/TODO
index 5bb42105..c434dfbb 100644
--- a/TODO
+++ b/TODO
@@ -15,6 +15,7 @@ BUGS:
 - can't reverse tab through the vimperator toolbar
 - gu doesn't work when the current URL contains a trailing slash
 - gu and gU don't work on local files properly
+- http://www.suckless.org/pipermail/dwm/2007-July/003075.html
 
 FEATURES:
 9 :command for new commands
diff --git a/chrome/content/vimperator/mappings.js b/chrome/content/vimperator/mappings.js
index b6e86e2e..17033f94 100644
--- a/chrome/content/vimperator/mappings.js
+++ b/chrome/content/vimperator/mappings.js
@@ -358,10 +358,16 @@ function Mappings() //{{{
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["gH"],
-        function() { vimperator.open("", vimperator.NEW_TAB); BrowserHome(); },
+        function()
+        {
+            var homepages = gHomeButton.getHomePage();
+            vimperator.open(homepages, /\bhomepage\b/.test(vimperator.options["activate"]) ?
+                    vimperator.NEW_TAB : vimperator.NEW_BACKGROUND_TAB);
+        },
         {
             short_help: "Go home in a new tab",
-            help: "Opens the homepage in a new tab."
+            help: "Opens the homepage in a new tab. " +
+                  "Whether the new tab is activated or not depends on the <code class=\"option\">'activate'</code> option.<br/>"
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["go"],
@@ -377,7 +383,7 @@ function Mappings() //{{{
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["gn"],
         function(arg)
         {
-            vimperator.quickmarks.jumpTo(mark,
+            vimperator.quickmarks.jumpTo(arg,
                 /\bquickmark\b/.test(vimperator.options["activate"]) ?
                 vimperator.NEW_TAB : vimperator.NEW_BACKGROUND_TAB);
         },
diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index eff0acf9..5344f1aa 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -302,16 +302,17 @@ function Options() //{{{
                              "//xhtml:*[@onclick or @onmouseover or @onmousedown or @onmouseup or @oncommand or @class='lk' or @class='s'] | " +
                              "//xhtml:input[not(@type='hidden')] | //xhtml:a | //xhtml:area | //xhtml:iframe | //xhtml:textarea | //xhtml:button | //xhtml:select"
 
-    addOption(new Option(["activate"], "stringlist",
+    addOption(new Option(["activate", "act"], "stringlist",
         {
             short_help: "Define when tabs are automatically activated",
             help: "Available items:<br/>" +
                   "<ul>" +
+                  "<li><b>homepage</b>:  <code class=\"mapping\">gH</code> mapping</li>" +
                   "<li><b>quickmark</b>: <code class=\"mapping\">go</code> and <code class=\"mapping\">gn</code> mappings</li>" +
                   "<li><b>tabopen</b>:   <code class=\"command\">:tabopen[!]</code> command</li>" +
                   "<li><b>paste</b>:     <code class=\"mapping\">P</code> and <code class=\"mapping\">gP</code> mappings</li>" +
                   "</ul>",
-            default_value: "quickmark,tabopen,paste"
+            default_value: "homepage,quickmark,tabopen,paste"
         }
     ));
     addOption(new Option(["beep"], "boolean",