From 09f3541a76737cb85e2e9bad027d2f56dc48a640 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 28 Jan 2011 23:31:40 -0500
Subject: [PATCH] Fix search engine slug issue and remove "Generating
 Results..." for engines that don't support suggestions.

--HG--
branch : key-processing
extra : rebase_source : 5a8b2e8c4848c4d0670402c9ea6d7760bc2a0fdf
---
 common/content/bookmarks.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index f185154a..9bec779b 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -212,7 +212,7 @@ var Bookmarks = Module("bookmarks", {
         return iter(services.browserSearch.getVisibleEngines({})).map(function ([, engine]) {
             let alias = engine.alias;
             if (!alias || !/^[a-z-]+$/.test(alias))
-                alias = engine.name.replace(/^[a-z_-]+/gi, "-").replace(/^-|-$/, "").toLowerCase();
+                alias = engine.name.replace(/[^a-z_-]+/gi, "-").replace(/^-|-$/, "").toLowerCase();
             if (!alias)
                 alias = "search"; // for search engines which we can't find a suitable alias
 
@@ -248,7 +248,7 @@ var Bookmarks = Module("bookmarks", {
         if (engine && engine.supportsResponseType(responseType))
             var queryURI = engine.getSubmission(query, responseType).uri.spec;
         if (!queryURI)
-            return [];
+            return (callback || util.identity)([]);
 
         function process(resp) {
             let results = [];