From a1003650ea58789b50f7dd8d994dc599893073ce Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 15 Oct 2008 23:47:41 +0000
Subject: [PATCH] Fix namespace clash

---
 content/completion.js | 2 +-
 content/ui.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/completion.js b/content/completion.js
index b98c4282..3e70fd1e 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -954,7 +954,7 @@ function Completion() //{{{
             return [0, this.filter(res, filter)];
         },
 
-        history: function history(filter) [0, history.get(filter)],
+        history: function _history(filter) [0, history.get(filter)],
 
         get javascriptCompleter() javascript,
 
diff --git a/content/ui.js b/content/ui.js
index 433b1f35..88700e7e 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -784,7 +784,7 @@ function CommandLine() //{{{
                         else if (historyIndex >= inputHistory.length + 1)
                         {
                             historyIndex = inputHistory.length;
-                            beep();
+                            liberator.beep();
                             break;
                         }