From aa6c8b8a40ccea4cf2fc2dabd6266d55727e4ef1 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Sat, 30 Jun 2007 13:14:28 +0000
Subject: [PATCH] changed gO to gn

---
 ChangeLog                             |  7 +++++--
 chrome/content/vimperator/mappings.js | 12 +++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 64463e22..4d9e9375 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,13 @@
 <pre>
-2007-05-02:
+2007-07-02:
 	* version ???
+	* QuickMarks support (new commands :qmarks/:qmarkadd/:qmarkdel and
+	  mappings go{a-z}, gn{a-z} and M{a-z}
+	* Multiline echo support
 	* Command line is now cleared on most redraws like in vim
     * The RSS feed button in the address bar works again
     * reload/stop buttons update enabled state again
-	* added marks support (thanks Viktor Kojouharov)
+	* added local/url marks support (thanks Viktor Kojouharov)
 	* temporary shortcut Y to yank current selection (for non UNIX-users)
 	* Flashing frame with ]f now works as expected
 	* many help fixes (most of them by Doug Kearns)
diff --git a/chrome/content/vimperator/mappings.js b/chrome/content/vimperator/mappings.js
index 147346e5..54634110 100644
--- a/chrome/content/vimperator/mappings.js
+++ b/chrome/content/vimperator/mappings.js
@@ -261,16 +261,17 @@ function Mappings() //{{{
         {
             short_help: "Jump to a QuickMark in the current buffer",
             usage: ["go{a-zA-Z0-9}"],
-            help: "TODO",
+            help: "Open any QuickMark in the current buffer. You can mark any URLs with <code class=\"mapping\">M{a-zA-Z0-9}</code>. " +
+                  "These QuickMarks are persistent across browser session.",
             flags: Mappings.flags.ARGUMENT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["gO"],
+    addDefaultMap(new Map(vimperator.modes.NORMAL, ["gn"],
         function (mark) { vimperator.quickmarks.jumpTo(mark, true) },
         {
             short_help: "Jump to a QuickMark in a new buffer",
-            usage: ["gO{a-zA-Z0-9}"],
-            help: "TODO",
+            usage: ["gn{a-zA-Z0-9}"],
+            help: "Mnemonic: Go in a new buffer. <code class=\"mapping\">gt</code> would make more sense but is already taken.",
             flags: Mappings.flags.ARGUMENT
         }
     ));
@@ -311,7 +312,8 @@ function Mappings() //{{{
         {
             short_help: "Add new QuickMark for current URL",
             usage: ["M{a-zA-Z0-9}"],
-            help: "TODO.",
+            help: "You can go to a marked url in the current tab with <code class=\"mapping\">go{a-zA-Z0-9}</code> or in a new tab with <code class=\"mapping\">gn{a-zA-Z0-9}</code>." +
+                  "These QuickMarks are persistent across browser session.",
             flags: Mappings.flags.ARGUMENT
         }
     ));