From 72cb6c35e9d68a73d3ebf4ccf0a8e4a08e59f2d0 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 29 Dec 2008 13:43:26 -0500
Subject: [PATCH] Fix some bugs.

---
 common/content/events.js        | 3 ++-
 vimperator/content/bookmarks.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/content/events.js b/common/content/events.js
index 35a4fada..7c12af22 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -38,7 +38,6 @@ function AutoCommands() //{{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     var store = [];
-    var lastFocus = null;
 
     function matchAutoCmd(autoCmd, event, regex)
     {
@@ -295,6 +294,8 @@ function Events() //{{{
 
     var fullscreen = window.fullScreen;
 
+    var lastFocus = null;
+
     var inputBufferLength = 0; // count the number of keys in v.input.buffer (can be different from v.input.buffer.length)
     var skipMap = false; // while feeding the keys (stored in v.input.buffer | no map found) - ignore mappings
 
diff --git a/vimperator/content/bookmarks.js b/vimperator/content/bookmarks.js
index 019da2e7..a7b5db6f 100644
--- a/vimperator/content/bookmarks.js
+++ b/vimperator/content/bookmarks.js
@@ -29,7 +29,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 const DEFAULT_FAVICON = "chrome://mozapps/skin/places/defaultFavicon.png";
 
 // Try to import older command line history, quick marks, etc.
-liberator.registerObserver("load_options", function () {
+liberator.registerObserver("load", function () {
     if (!options.getPref("extensions.vimperator.commandline_cmd_history"))
         return;