[Conkeror] [PATCH] Enable URL completion for both bookmarks and history (workaround).

[David Kettler]

Previously, enabling url_completion_use_bookmarks when
url_completion_use_history was enabled did not provide bookmarks in
the completion list.  The underlying issue is that QUERY_TYPE_UNIFIED
is not implemented in xulrunner.

This commit works around the problem by issuing two separate queries.
That will lead to duplicates if the URL appears in both bookmarks and
history, but I don't think that's an important issue.
---
 modules/history.js |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/history.js b/modules/history.js
index 08007c6..9a235ef 100644
--- a/modules/history.js
+++ b/modules/history.js
@@ -66,10 +66,12 @@ function url_completer() {
     if(use_webjumps) {
         completers.push(webjump_completer());
     }
-    if(use_history || use_bookmarks) {
-        completers.push(history_completer($use_history = use_history,
-                                          $use_bookmarks = use_bookmarks));
-    }
+    /* Do queries separately (which can lead to duplicates).  The
+     * queries can be combined when QUERY_TYPE_UNIFIED is implemented. */
+    if (use_bookmarks)
+        completers.push(history_completer($use_bookmarks = true));
+    if (use_history)
+        completers.push(history_completer($use_history = true));
     return merge_completers(completers);
 }
 
-- 
1.6.3.1