From aaab59aab6b014e70adcff79f4a220e3619f5e58 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 19 Dec 2008 12:29:13 -0500
Subject: [PATCH] Revert "Allow empty defsearch."

This reverts commit 3cab7c16a0ef5e39f9aeeb8ea1ed9602a6a152f4.
---
 common/content/completion.js        | 2 +-
 vimperator/content/bookmarks.js     | 7 -------
 vimperator/locale/en-US/options.txt | 3 ---
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/common/content/completion.js b/common/content/completion.js
index f7594214..f9ddee03 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -1645,7 +1645,7 @@ function Completion() //{{{
             let engines = bookmarks.getSearchEngines();
 
             context.title = ["Search Keywords"];
-            context.completions = [ bookmarks.makeKeyword("", "No default search engine", null, "") ].concat( keywords.concat(engines) );
+            context.completions = keywords.concat(engines);
             context.keys = { text: 0, description: 1, icon: 2 };
 
             if (!space || noSuggest)
diff --git a/vimperator/content/bookmarks.js b/vimperator/content/bookmarks.js
index e887a580..8acac9f7 100644
--- a/vimperator/content/bookmarks.js
+++ b/vimperator/content/bookmarks.js
@@ -589,13 +589,6 @@ function Bookmarks() //{{{
                 return process(resp);
         },
 
-        // Allows for creation of anonymous keyword (e.g., for empty
-        // defsearch's)
-        makeKeyword: function makeKeyword(keyword, title, icon, url)
-        {
-            return new Keyword( keyword, title, icon, url );
-        },
-
         // TODO: add filtering
         // format of returned array:
         // [keyword, helptext, url]
diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt
index 22cdd8c7..2d017a69 100644
--- a/vimperator/locale/en-US/options.txt
+++ b/vimperator/locale/en-US/options.txt
@@ -247,9 +247,6 @@ This means, it you set 'defsearch' to "youtube", then [c]:open arnold
 schwarzenegger[c] will be exactly the same as [c]:open youtube arnold
 schwarzenegger[c]. Therefore, you need to add a keyword or search engine
 "youtube" first.
-
-If 'defsearch' is empty, then Firefox will always attempt to open the
-raw [[arg]].
 ____