From d31aa9fefc26f562f45043ad184846c469a580a9 Mon Sep 17 00:00:00 2001
From: jez
Date: Tue, 1 Feb 2011 02:03:12 +0800
Subject: Tidy up merge

---
 commands.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'commands.js')

diff --git a/commands.js b/commands.js
index 7c0f4a9d..b5d0a359 100644
--- a/commands.js
+++ b/commands.js
@@ -146,6 +146,9 @@ function clearKeyMappingsAndSetDefaults() {
     "x": "removeTab",
     "X": "restoreTab",
 
+    "b": "activateBookmarkFindMode",
+    "B": "activateBookmarkFindModeToOpenInNewTab",
+
     "gf": "nextFrame"
   };
 
@@ -207,6 +210,9 @@ var commandDescriptions = {
   removeTab: ["Close current tab", { background: true }],
   restoreTab: ["Restore closed tab", { background: true }],
 
+  activateBookmarkFindMode: ["Open a bookmark in the current tab"],
+  activateBookmarkFindModeToOpenInNewTab: ["Open a bookmark in a new tab"],
+
   nextFrame: ["Cycle forward to the next frame on the page", { background: true }]
 };
 
-- 
cgit v1.2.3