From 1bad5ccc1a1e738b4575281f46413fc9b69f154c Mon Sep 17 00:00:00 2001
From: teramako <teramako@gmail.com>
Date: Mon, 9 Nov 2009 21:43:51 +0900
Subject: [PATCH 1/2] Fix: options.js initialization at loading

---
 common/content/options.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/content/options.js b/common/content/options.js
index 4af8899b..d4a6eb61 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -404,6 +404,9 @@ const Options = Module("options", {
     requires: ["config", "highlight", "storage"],
 
     init: function () {
+        this._optionHash = {};
+        this._prefContexts = [];
+
         for (let [, pref] in Iterator(this.allPrefs(Options.OLD_SAVED))) {
             let saved = Options.SAVED + pref.substr(Options.OLD_SAVED.length)
             if (!this.getPref(saved))
@@ -436,9 +439,6 @@ const Options = Module("options", {
         storage.newMap("options", { store: false });
         storage.addObserver("options", optionObserver, window);
 
-        this._optionHash = {};
-        this._prefContexts = [];
-
         this.prefObserver.register();
     },
 

From fd80fab39f7f3cc0cc4bb0b3eb8d8a9f048e10fa Mon Sep 17 00:00:00 2001
From: teramako <teramako@gmail.com>
Date: Mon, 9 Nov 2009 23:41:52 +0900
Subject: [PATCH 2/2] Fix: not show match number of completion in statusline

---
 common/content/commandline.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/content/commandline.js b/common/content/commandline.js
index f8d89139..d491446b 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -1363,7 +1363,7 @@ const CommandLine = Module("commandline", {
                 this.wildIndex = util.Math.constrain(this.wildIndex + 1, 0, this.wildtypes.length - 1);
                 this.preview();
 
-                this._statusTimer.tell();
+                commandline._statusTimer.tell();
             }
 
             if (this.items.length == 0)