From 18b1bec16c630a2f1d4071f9aeb355dd40f6f5da Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 21 Aug 2007 21:54:43 +0000
Subject: [PATCH 001/224] merge HEAD


From 3f6e7e87662b34bc542d08b7a25f289e3f88412b Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 23 Aug 2007 13:38:14 +0000
Subject: [PATCH 002/224] use 0.5 for the version strings

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9d42e5a2..52984f12 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 TOP           = $(shell pwd)
 
-VERSION       = 0.6
+VERSION       = 0.5
 OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 

From 1c8373041a063d53174eb8ccbc39d9456ee5c5b1 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 23 Aug 2007 14:07:25 +0000
Subject: [PATCH 003/224] allow ~/_vimperatorrc as the RC file and
 ~/vimperator/plugin as the plugin directory on Windows

---
 chrome/content/vimperator/vimperator.js | 112 ++++++++++++++++--------
 1 file changed, 77 insertions(+), 35 deletions(-)

diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index 07248c01..d0e6019a 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -32,9 +32,6 @@ const vimperator = (function() //{{{
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    const RC_FILE = "~/.vimperatorrc";
-    const PLUGIN_DIR = "~/.vimperator/plugin";
-
     var modes = {
         // main modes
         NONE:             0,
@@ -118,11 +115,8 @@ const vimperator = (function() //{{{
             var home = environment_service.get("HOME");
 
             if (WINDOWS && !home)
-            {
-                home = environment_service.get("USERPROFILE");
-                if (!home)
-                    home = environment_service.get("HOMEDRIVE") + environment_service.get("HOMEPATH");
-            }
+                home = environment_service.get("USERPROFILE") ||
+                       environment_service.get("HOMEDRIVE") + environment_service.get("HOMEPATH");
 
             path = path.replace("~", home);
         }
@@ -145,6 +139,46 @@ const vimperator = (function() //{{{
         return path;
     }
 
+    // TODO: add this functionality to LocalFile or wait for Scriptable I/O in FUEL
+    function pathExists(path)
+    {
+        var p = Components.classes["@mozilla.org/file/local;1"]
+            .createInstance(Components.interfaces.nsILocalFile);
+        p.initWithPath(expandPath(path));
+
+        return p.exists();
+    }
+
+    function getPluginDir()
+    {
+        var plugin_dir;
+
+        if (navigator.platform == "Win32")
+            plugin_dir = "~/vimperator/plugin";
+        else
+            plugin_dir = "~/.vimperator/plugin";
+
+        plugin_dir = expandPath(plugin_dir);
+
+        return pathExists(plugin_dir) ? plugin_dir : null;
+    }
+
+    function getRCFile()
+    {
+        var rc_file1 = expandPath("~/.vimperatorrc");
+        var rc_file2 = expandPath("~/_vimperatorrc");
+
+        if (navigator.platform == "Win32")
+            [rc_file1, rc_file2] = [rc_file2, rc_file1]
+
+        if (pathExists(rc_file1))
+            return rc_file1;
+        else if (pathExists(rc_file2))
+            return rc_file2;
+        else
+            return null;
+    }
+
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
@@ -169,14 +203,12 @@ const vimperator = (function() //{{{
             count: -1                  // parsed count from the input buffer
         },
 
-        /**
-         * @param type can be:
-         *  "submit": when the user pressed enter in the command line
-         *  "change"
-         *  "cancel"
-         *  "complete"
-         *  TODO: "zoom": if the zoom value of the current buffer changed
-         */
+        // @param type can be:
+        //  "submit": when the user pressed enter in the command line
+        //  "change"
+        //  "cancel"
+        //  "complete"
+        //  TODO: "zoom": if the zoom value of the current buffer changed
         registerCallback: function(type, mode, func)
         {
             // TODO: check if callback is already registered
@@ -207,7 +239,7 @@ const vimperator = (function() //{{{
             if (main)
             {
                 mode = main;
-                extended_mode = this.modes.NONE;
+                extended_mode = vimperator.modes.NONE;
             }
             if (typeof extended === "number")
                 extended_mode = extended;
@@ -304,19 +336,15 @@ const vimperator = (function() //{{{
             return new LocalFile(path, mode, perms, tmp);
         },
 
-        /**
-         * logs a message to the javascript error console
-         */
+        // logs a message to the javascript error console
         log: function(msg, level)
         {
             // if (Options.getPref("verbose") >= level) // FIXME: hangs vimperator, probably timing issue --mst
                 console_service.logStringMessage('vimperator: ' + msg);
         },
 
-        /**
-         * logs an object to the javascript error console also prints all
-         * properties of the object
-         */
+        // logs an object to the javascript error console also prints all
+        // properties of the object
         logObject: function(object, level)
         {
             if (typeof object != 'object')
@@ -337,7 +365,7 @@ const vimperator = (function() //{{{
 
                 string += i + ': ' + value + '\n';
             }
-            this.log(string, level);
+            vimperator.log(string, level);
         },
 
         // open one or more URLs
@@ -512,7 +540,7 @@ const vimperator = (function() //{{{
                     });
                 }
 
-                vimperator.log("Sourced: " + filename, 1);
+                vimperator.log("Sourced: " + filename, 3);
             }
             catch (e)
             {
@@ -584,20 +612,34 @@ const vimperator = (function() //{{{
             // make sourcing asynchronous, otherwise commands that open new tabs won't work
             setTimeout(function() {
 
-                vimperator.source(RC_FILE, true);
+                var rc_file = getRCFile();
+
+                if (rc_file)
+                    vimperator.source(rc_file, true);
+                else
+                    vimperator.log("No user RC file found", 3);
 
                 // also source plugins in ~/.vimperator/plugin/
                 var entries = [];
                 try
                 {
-                    var plugin_dir = expandPath(PLUGIN_DIR);
-                    var fd = vimperator.fopen(plugin_dir);
-                    var entries = fd.read();
-                    fd.close();
-                    entries.forEach(function(file) {
-                        if (!file.isDirectory())
-                            vimperator.source(file.path, false);
-                    });
+                    var plugin_dir = getPluginDir();
+
+                    if (plugin_dir)
+                    {
+                        var fd = vimperator.fopen(plugin_dir);
+                        var entries = fd.read();
+                        fd.close();
+                        vimperator.log("Sourcing plugin directory...", 3);
+                        entries.forEach(function(file) {
+                            if (!file.isDirectory())
+                                vimperator.source(file.path, false);
+                        });
+                    }
+                    else
+                    {
+                        vimperator.log("No user plugin directory found", 3);
+                    }
                 }
                 catch (e)
                 {

From d8c5ce148c0488c402dd051389297cc9b116d63b Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 24 Aug 2007 11:12:24 +0000
Subject: [PATCH 004/224] make sure the active listcell in the second column of
 the preview window uses HighlightText as the CSS color value and move the
 #vimperator-multiline-output styles to default.css

---
 chrome/content/vimperator/default.css    | 10 +++++++---
 chrome/content/vimperator/vimperator.xul |  3 +--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/chrome/content/vimperator/default.css b/chrome/content/vimperator/default.css
index 0ace7442..a7dee5a6 100644
--- a/chrome/content/vimperator/default.css
+++ b/chrome/content/vimperator/default.css
@@ -144,9 +144,9 @@ fieldset.paypal {
 }
 
 /* the selected item in listboxes is hardly readable without this */
-#vimperator-completion > listitem[selected="true"],
-#vimperator-bufferwindow > listitem[selected="true"],
-#vimperator-previewwindow > listitem[selected="true"]
+#vimperator-completion    > listitem[selected="true"] > listcell,
+#vimperator-bufferwindow  > listitem[selected="true"] > listcell,
+#vimperator-previewwindow > listitem[selected="true"] > listcell
 {
    background-color: Highlight !important;
    color: HighlightText !important;
@@ -169,6 +169,10 @@ fieldset.paypal {
     color: black;
 }
 
+#vimperator-multiline-output {
+    overflow: hidden;
+}
+
 .status_insecure, .status_insecure * {
     background-color: transparent;
 }
diff --git a/chrome/content/vimperator/vimperator.xul b/chrome/content/vimperator/vimperator.xul
index 369837e4..16868ae0 100644
--- a/chrome/content/vimperator/vimperator.xul
+++ b/chrome/content/vimperator/vimperator.xul
@@ -101,8 +101,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
                         onblur="vimperator.commandline.onEvent(event);"/>
                 </hbox>
 
-                <iframe  id="vimperator-multiline-output" src="about:blank" flex="1" height="10px" hidden="false" collapsed="true"
-                        style="overflow: hidden"
+                <iframe id="vimperator-multiline-output" src="about:blank" flex="1" height="10px" hidden="false" collapsed="true"
                         onkeypress="vimperator.commandline.onMultilineOutputEvent(event)"/>
 
                 <textbox id="vimperator-multiline-input" class="plain" flex="1" rows="10" hidden="false" collapsed="true" multiline="true"

From 85cfdc4334d0d1aa78e356888e4121a1d907fca5 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 24 Aug 2007 11:14:57 +0000
Subject: [PATCH 005/224] remove unnecessary temp variable

---
 chrome/content/vimperator/ui.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/chrome/content/vimperator/ui.js b/chrome/content/vimperator/ui.js
index 190eaca9..2f87d4be 100644
--- a/chrome/content/vimperator/ui.js
+++ b/chrome/content/vimperator/ui.js
@@ -89,8 +89,7 @@ function CommandLine() //{{{
     var multiline_callback = null;
 
     // load the commandline history
-    var hist = Options.getPref("commandline_history", "");
-    history = hist.split("\n");
+    history = Options.getPref("commandline_history", "").split("\n");
 
     // TODO: these styles should be moved to the .css file
     function setNormalStyle()

From d005665723cd8e346a37f61d075d6bc8ca1a9a40 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 24 Aug 2007 16:37:15 +0000
Subject: [PATCH 006/224] make sure search engine aliases are properly
 initialized

---
 chrome/content/vimperator/bookmarks.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/chrome/content/vimperator/bookmarks.js b/chrome/content/vimperator/bookmarks.js
index 9c3ae7bd..7900699a 100644
--- a/chrome/content/vimperator/bookmarks.js
+++ b/chrome/content/vimperator/bookmarks.js
@@ -200,6 +200,10 @@ function Bookmarks() //{{{
         if (!engine_name || engine_name == "")
             engine_name = vimperator.options["defsearch"];
 
+        // we need to make sure our custom alias have been set, even if the user
+        // did not :open <tab> once before
+        this.getSearchEngines();
+
         // first checks the search engines for a match
         var engine = search_service.getEngineByAlias(engine_name);
         if (engine)

From 654749932357225865d83cf9eb77518dc2198cf0 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 25 Aug 2007 15:48:15 +0000
Subject: [PATCH 007/224] read the Bookmarks Toolbar Folder when loading
 bookmarks - it has previously been skipped since
 BookmarksUtils.getAllChildren(root) doesn't read it

---
 chrome/content/vimperator/bookmarks.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/chrome/content/vimperator/bookmarks.js b/chrome/content/vimperator/bookmarks.js
index 7900699a..71465f31 100644
--- a/chrome/content/vimperator/bookmarks.js
+++ b/chrome/content/vimperator/bookmarks.js
@@ -53,14 +53,22 @@ function Bookmarks() //{{{
 
         var bmarks = [];   // here getAllChildren will store the bookmarks
         BookmarksUtils.getAllChildren(root, bmarks);
-        for (var bm in bmarks)
+
+        // getAllChildren(root) ignores the BTF
+        // NOTE: there's probably a better way to do this...
+        var btf_bmarks = [];
+        BookmarksUtils.getAllChildren(BMSVC.getBookmarksToolbarFolder(), btf_bmarks);
+
+        bmarks = bmarks.concat(btf_bmarks);
+
+        for (var i = 0; i < bmarks.length; i++)
         {
-            if (bmarks[bm][0] && bmarks[bm][1])
-                bookmarks.push([bmarks[bm][1].Value, bmarks[bm][0].Value ]);
+            if (bmarks[i][0] && bmarks[i][1])
+                bookmarks.push([bmarks[i][1].Value, bmarks[i][0].Value ]);
 
             // keyword
-            if (bmarks[bm][1] && bmarks[bm][2])
-                keywords.push([bmarks[bm][2].Value, bmarks[bm][0].Value, bmarks[bm][1].Value]);
+            if (bmarks[i][1] && bmarks[i][2])
+                keywords.push([bmarks[i][2].Value, bmarks[i][0].Value, bmarks[i][1].Value]);
         }
     }
 

From 581980a2b0795b1d70e2dba5e55d550c42c61852 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 26 Aug 2007 11:57:32 +0000
Subject: [PATCH 008/224] add filename completion for Windows

---
 chrome/content/vimperator/completion.js | 52 +++++++++++++++----------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/chrome/content/vimperator/completion.js b/chrome/content/vimperator/completion.js
index 21d6edc1..896d8d0c 100644
--- a/chrome/content/vimperator/completion.js
+++ b/chrome/content/vimperator/completion.js
@@ -243,46 +243,58 @@ vimperator.completion = (function() // {{{
             return filter_url_array(bookmarks, filter);
         }, //}}}
 
+        // TODO: support file:// and \ or / path separators on both platforms
         get_file_completions: function(filter) //{{{
         {
             //var completions = [];
-            /* This is now also used as part of the url completion, so the substrings shouldn't be cleared for that case */
+
+            // this is now also used as part of the url completion, so the
+            // substrings shouldn't be cleared for that case
             if (!arguments[1])
                 g_substrings = [];
 
-            var match = filter.match(/^(.*[\/\\])(.*?)$/);
+            var matches = filter.match(/^(.*[\/\\])(.*?)$/);
             var dir;
 
-            if (!match || !(dir = match[1]))
+            if (!matches || !(dir = matches[1]))
                 return [];
 
-            var compl = match[2] || '';
+            var compl = matches[2] || "";
+
             try
             {
-                var fd = vimperator.fopen(dir, "<");
+                var fd = vimperator.fopen(dir);
             }
-            catch(e)
+            catch (e)
             {
                 // thrown if file does not exist
-                return [ ];
+                return [];
             }
 
             if (!fd)
                 return [];
 
-            var entries = fd.read();
-            var delim = fd.path.length == 1 ? '' : (fd.path.search(/\\/) != -1) ? "\\" : "/";
-            var new_filter = fd.path + delim + compl;
-            if (!filter) return entries.map(function($_) {
-                var path = $_.path;
-                if ($_.isDirectory()) path += '/';
-                return [path, ''];
-            });
-            var mapped = entries.map(function($_) {
-                var path = $_.path;
-                if ($_.isDirectory()) path += '/';
-                return [[path], ''];
-            });
+            try
+            {
+                var entries = fd.read();
+                var separator = fd.path.length == 1 ? "" : /\\/.test(fd.path) ? "\\" : "/";
+                var new_filter = fd.path + separator + compl;
+                if (!filter) return entries.map(function($_) {
+                    var path = $_.path;
+                    if ($_.isDirectory()) path += separator;
+                    return [path, ""];
+                });
+                var mapped = entries.map(function($_) {
+                    var path = $_.path;
+                    if ($_.isDirectory()) path += separator;
+                    return [[path], ""];
+                });
+            }
+            catch (e)
+            {
+                //vimperator.log(e);
+                return [];
+            }
 
             return build_longest_starting_substring(mapped, new_filter);
         }, //}}}

From 4351b29d5c33403ab97f4fc66e366babe97d5a54 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 26 Aug 2007 12:05:18 +0000
Subject: [PATCH 009/224] update NEWS

---
 NEWS | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index c652e7b9..3dd0c580 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,15 @@
 <pre>
 2007-xx-xx:
-	* version 0.6
+	* version 0.5.1
+	* filename completion now works on Windows
+	* the Bookmarks Toolbar Folder is now read when bookmarks are first
+	  loaded - it was skipped entirely in the past
+	* fixed search for :open (previously needed to do :o <tab> ONCE to
+	  initialize them)
 	* added :set {option}! support to toggle a boolean option's value
 	* added :set all and :set all& support to show the current value of all
-	options and to reset all options to their default value
+	  options and to reset all options to their default value
+	* :tabmove! wrapping works again
 
 2007-08-16:
 	* version 0.5

From 61deeec541c2fffc72720efc8f31ed52602866ca Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 26 Aug 2007 14:27:40 +0000
Subject: [PATCH 010/224] fix commandline history on Windows - prevent the
 default cmd_charPrevious action from being invoked for <Up

---
 NEWS                            |  1 +
 chrome/content/vimperator/ui.js | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 3dd0c580..c76df1fa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-xx-xx:
 	* version 0.5.1
+	* commandline history now works properly on Windows
 	* filename completion now works on Windows
 	* the Bookmarks Toolbar Folder is now read when bookmarks are first
 	  loaded - it was skipped entirely in the past
diff --git a/chrome/content/vimperator/ui.js b/chrome/content/vimperator/ui.js
index 2f87d4be..3fa02b6e 100644
--- a/chrome/content/vimperator/ui.js
+++ b/chrome/content/vimperator/ui.js
@@ -355,24 +355,32 @@ function CommandLine() //{{{
             /* user pressed UP or DOWN arrow to cycle history completion */
             else if (key == "<Up>" || key == "<Down>")
             {
-                //always reset the tab completion if we use up/down keys
+                event.preventDefault();
+                event.stopPropagation();
+
+                // always reset the tab completion if we use up/down keys
                 completion_index = UNINITIALIZED;
 
-                /* save 'start' position for iterating through the history */
+                // save 'start' position for iterating through the history
                 if (history_index == UNINITIALIZED)
                 {
                     history_index = history.length;
                     history_start = command;
                 }
 
+                // search the history for the first item matching the current
+                // commandline string
                 while (history_index >= -1 && history_index <= history.length)
                 {
                     key == "<Up>" ? history_index-- : history_index++;
-                    if (history_index == history.length) // user pressed DOWN when there is no newer history item
+
+                    // user pressed DOWN when there is no newer history item
+                    if (history_index == history.length)
                     {
                         setCommand(history_start);
                         return;
                     }
+
                     // cannot go past history start/end
                     if (history_index <= -1)
                     {
@@ -393,7 +401,6 @@ function CommandLine() //{{{
                         return;
                     }
                 }
-                vimperator.beep();
             }
 
             /* user pressed TAB to get completions of a command */

From ee350f2387b30244907f1c9682c1bdbb8710b8bd Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 26 Aug 2007 15:13:16 +0000
Subject: [PATCH 011/224] complete ':set inv' with boolean options

---
 chrome/content/vimperator/completion.js | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/chrome/content/vimperator/completion.js b/chrome/content/vimperator/completion.js
index 896d8d0c..9d266139 100644
--- a/chrome/content/vimperator/completion.js
+++ b/chrome/content/vimperator/completion.js
@@ -351,19 +351,17 @@ vimperator.completion = (function() // {{{
         {
             g_substrings = [];
             var options_completions = [];
-            var no_mode = false;
-            if (filter.indexOf("no") == 0) // boolean option
-            {
-                no_mode = true;
-                filter = filter.substr(2);
-            }
+            var prefix = filter.match(/^no|inv/) || "";
+
+            if (prefix)
+                filter = filter.replace(prefix, "");
 
             if (unfiltered)
             {
                 var options = [];
                 for (var option in vimperator.options)
                 {
-                    if (no_mode && option.type != "boolean")
+                    if (prefix && option.type != "boolean")
                         continue;
                     options.push([option.names, option.short_help])
                 }
@@ -375,18 +373,16 @@ vimperator.completion = (function() // {{{
                 var options = [];
                 for (var option in vimperator.options)
                 {
-                    if (no_mode && option.type != "boolean")
+                    if (prefix && option.type != "boolean")
                         continue;
-                    var prefix = no_mode ? 'no' : '';
                     options.push([prefix + option.name, option.short_help])
                 }
                 return options;
             }
-
             // check if filter ends with =, then complete current value
-            else if (filter.length > 0 && filter.lastIndexOf("=") == filter.length -1)
+            else if (filter.length > 0 && filter.lastIndexOf("=") == filter.length - 1)
             {
-                filter = filter.substr(0, filter.length-1);
+                filter = filter.substr(0, filter.length - 1);
                 for (var option in vimperator.options)
                 {
                     if (option.hasName(filter))
@@ -402,9 +398,8 @@ vimperator.completion = (function() // {{{
             var filter_length = filter.length;
             for (var option in vimperator.options)
             {
-                if (no_mode && option.type != "boolean")
+                if (prefix && option.type != "boolean")
                     continue;
-                var prefix = no_mode ? 'no' : '';
                 for (var j = 0; j < option.names.length; j++)
                 {
                     if (option.names[j].indexOf(filter) != 0)

From 7064444fd88d5ba607fca32b003170a2df9aaa4c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 27 Aug 2007 07:08:53 +0000
Subject: [PATCH 012/224] if no argument is given to :winopen open about:blank
 in the new window

---
 chrome/content/vimperator/commands.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 41b6c18d..70d58e2d 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -1222,7 +1222,13 @@ function Commands() //{{{
         }
     ));
     addDefaultCommand(new Command(["wino[pen]", "w[open]", "wine[dit]"],
-        function(args) { vimperator.open(args, vimperator.NEW_WINDOW); },
+        function(args)
+        {
+            if (args)
+                vimperator.open(args, vimperator.NEW_WINDOW);
+            else
+                vimperator.open("about:blank", vimperator.NEW_WINDOW);
+        },
         {
             usage: ["wino[pen] [url] [, url]"],
             short_help: "Open one or more URLs in a new window",

From af890f107f96bc7101fd0b172e80f7a46084a6f3 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 27 Aug 2007 11:46:48 +0000
Subject: [PATCH 013/224] use the coerced boolean value of args rather than
 testing for 0 string length when determining if an arg was passed to an ex
 command

---
 chrome/content/vimperator/commands.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 70d58e2d..62bddeac 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -623,7 +623,7 @@ function Commands() //{{{
     addDefaultCommand(new Command(["mapc[lear]"],
         function(args)
         {
-            if (args.length > 0)
+            if (args)
             {
                 vimperator.echoerr("E474: Invalid argument");
                 return;
@@ -667,7 +667,7 @@ function Commands() //{{{
         function(args)
         {
             // ignore invalid mark characters unless there are no valid mark chars
-            if (args.length > 0 && !/[a-zA-Z]/.test(args))
+            if (args && !/[a-zA-Z]/.test(args))
             {
                 vimperator.echoerr("E283: No marks matching \"" + args + "\"");
                 return;
@@ -756,8 +756,10 @@ function Commands() //{{{
     addDefaultCommand(new Command(["o[pen]", "e[dit]"],
         function(args, special)
         {
-            if (args.length > 0)
+            if (args)
+            {
                 vimperator.open(args);
+            }
             else
             {
                 if (special)
@@ -780,10 +782,10 @@ function Commands() //{{{
                   "and the first word is the name of a search engine (<code class=\"command\">:open wikipedia linus torvalds</code> " +
                   "will open the wikipedia entry for linus torvalds). The short name of a search engine is automatically guessed from its name. " +
                   "If you want to set a custom name, open the $FIREFOX_PROFILE/searchplugins/*.xml file of the search engine, and add/change " +
-                  "&lt;Alias&gt;myalias&lt;/Alias&gt; </li>" +
-                  "    <li>Opened with the default search engine or keyword (specified with the <code class=\"option\">'defsearch'</code> option) " +
+                  "&lt;Alias&gt;myalias&lt;/Alias&gt;</li>" +
+                  "<li>Opened with the default search engine or keyword (specified with the <code class=\"option\">'defsearch'</code> option) " +
                   "if the first word is no search engine (<code class=\"command\">:open linus torvalds</code> will open a Google search for linux torvalds).</li>" +
-                  "    <li>Passed directly to Firefox in all other cases (<code class=\"command\">:open www.osnews.com, www.slashdot.org</code> will " +
+                  "<li>Passed directly to Firefox in all other cases (<code class=\"command\">:open www.osnews.com, www.slashdot.org</code> will " +
                   "open OSNews in the current, and Slashdot in a new background tab).</li>" +
                   "</ol>" +
                   "You WILL be able to use <code class=\"command\">:open [-T \"linux\"] torvalds&lt;Tab&gt;</code> to complete bookmarks " +
@@ -838,7 +840,7 @@ function Commands() //{{{
         function(args)
         {
             // ignore invalid mark characters unless there are no valid mark chars
-            if (args.length > 0 && !/[a-zA-Z0-9]/.test(args))
+            if (args && !/[a-zA-Z0-9]/.test(args))
             {
                 vimperator.echoerr("E283: No QuickMarks matching \"" + args + "\"");
                 return;
@@ -1143,7 +1145,7 @@ function Commands() //{{{
             if (/\btabopen\b/.test(vimperator.options["activate"]))
                 where = special ? vimperator.NEW_BACKGROUND_TAB : vimperator.NEW_TAB;
 
-            if (args.length > 0)
+            if (args)
                 vimperator.open(args, where);
             else
                 vimperator.open("about:blank", where);

From 15afd8dfc9bc1738382d19e28d7049dacf56670b Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 27 Aug 2007 12:09:11 +0000
Subject: [PATCH 014/224] GNU make 3.80 can't parse "else ifeq"

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 52984f12..e2724d4a 100644
--- a/Makefile
+++ b/Makefile
@@ -40,12 +40,14 @@ SED = sed
 
 ifeq (${OS},Darwin)
 FIREFOX_DEFAULT = $(wildcard ${HOME}/Library/Application\ Support/Firefox/Profiles/*default)
-else ifeq ($(findstring CYGWIN,${OS}),CYGWIN)
+else
+ifeq ($(findstring CYGWIN,${OS}),CYGWIN)
 HOME = $(shell cygpath -sm "${USERPROFILE}")
 FIREFOX_DEFAULT = $(wildcard ${HOME}/Application\ Data/Mozilla/Firefox/Profiles/*default)
 else
 FIREFOX_DEFAULT = $(wildcard ${HOME}/.mozilla/firefox/*.default)
 endif
+endif
 
 VIMPERATOR_CHROME_EMAIL = ${FIREFOX_DEFAULT}/extensions/vimperator@mozdev.org/chrome/
 FOUND_CHROME_UUID = $(dir $(wildcard ${FIREFOX_DEFAULT}/extensions/{*-*-*-*-*}/chrome/vimperator.jar))

From 626d8472d9d4c6f07c4acb570fd73c11ed505188 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 27 Aug 2007 14:19:47 +0000
Subject: [PATCH 015/224] update Makefile version to 0.5.1

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e2724d4a..fdd73ef9 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 TOP           = $(shell pwd)
 
-VERSION       = 0.5
+VERSION       = 0.5.1
 OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 

From bf881b0292e2f87860df5d7465c6f9492566b540 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 27 Aug 2007 14:26:43 +0000
Subject: [PATCH 016/224] add menu mode

---
 chrome/content/vimperator/events.js     | 49 +++++++++++++++++++++++++
 chrome/content/vimperator/vimperator.js |  4 +-
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/events.js b/chrome/content/vimperator/events.js
index e4fd58d8..cf81346b 100644
--- a/chrome/content/vimperator/events.js
+++ b/chrome/content/vimperator/events.js
@@ -72,6 +72,47 @@ function Events() //{{{
         vimperator.setMode(); // trick to reshow the mode in the command line
     }, null);
 
+    //
+    // track if a popup is open or the menubar is active
+    //
+
+    var popup_count = 0;
+    var active_menubar = false;
+
+    function enterPopupMode()
+    {
+        popup_count++;
+        vimperator.log("Open popup window count: " + popup_count, 9);
+        vimperator.addMode(null, vimperator.modes.MENU);
+    }
+
+    function exitPopupMode()
+    {
+        popup_count--;
+        vimperator.log("Open popup window count: " + popup_count, 9);
+        if (popup_count == 0)
+            vimperator.removeMode(null, vimperator.modes.MENU);
+    }
+
+    function enterMenuMode()
+    {
+        active_menubar = true;
+        vimperator.log("Menubar is active", 9);
+        vimperator.addMode(null, vimperator.modes.MENU)
+    }
+
+    function exitMenuMode()
+    {
+        active_menubar = false;
+        vimperator.log("Menubar is inactive", 9);
+        vimperator.removeMode(null, vimperator.modes.MENU);
+    }
+
+    window.addEventListener("popupshown", enterPopupMode, true);
+    window.addEventListener("popuphidden", exitPopupMode, true);
+    window.addEventListener("DOMMenuBarActive", enterMenuMode, true);
+    window.addEventListener("DOMMenuBarInactive", exitMenuMode, true);
+
     window.document.addEventListener("DOMTitleChanged", function(event)
     {
         //alert("titlechanged");
@@ -209,6 +250,11 @@ function Events() //{{{
         window.dump("TODO: remove all eventlisteners");
 
         getBrowser().removeProgressListener(this.progressListener);
+
+        window.removeEventListener("popupshowing", enterPopupMode(), true);
+        window.removeEventListener("popuphidden", exitPopupMode(), true);
+        window.removeEventListener("DOMMenuBarActive", enterMenuMode(), true);
+        window.removeEventListener("DOMMenuBarInactive", exitMenuMode(), true);
     }
 
     // This method pushes keys into the event queue from vimperator
@@ -356,12 +402,15 @@ function Events() //{{{
         //    if (event.target.id == "main-window")
         //        alert("focusContent();");
 
+        if (vimperator.hasMode(vimperator.modes.MENU))
+            return false;
 
         // XXX: ugly hack for now pass certain keys to firefox as they are without beeping
         // also fixes key navigation in menus, etc.
         if (key == "<Tab>" || key == "<Return>" || key == "<Space>" || key == "<Up>" || key == "<Down>")
             return false;
 
+
         // XXX: for now only, later: input mappings if form element focused
         if (isFormElemFocused())
         {
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index d0e6019a..16d35791 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -49,7 +49,8 @@ const vimperator = (function() //{{{
         ESCAPE_ALL_KEYS:  1 << 15,
         QUICK_HINT:       1 << 16,
         EXTENDED_HINT:    1 << 17,
-        ALWAYS_HINT:      1 << 18
+        ALWAYS_HINT:      1 << 18,
+        MENU:             1 << 19 // a popupmenu is active
     }
 
     var mode_messages = {};
@@ -63,6 +64,7 @@ const vimperator = (function() //{{{
     mode_messages[modes.QUICK_HINT]      = "quick";
     mode_messages[modes.EXTENDED_HINT]   = "extended";
     mode_messages[modes.ALWAYS_HINT]     = "always";
+    mode_messages[modes.MENU]            = "menu"; // TODO: desirable?
 
     var mode = modes.NORMAL;
     var extended_mode = modes.NONE;

From 17ee83057b2d69c2a1494d1c63df6cac4a38d323 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 27 Aug 2007 17:36:26 +0000
Subject: [PATCH 017/224] fix typo in removeEventListener call

---
 chrome/content/vimperator/events.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/events.js b/chrome/content/vimperator/events.js
index cf81346b..469e6bd2 100644
--- a/chrome/content/vimperator/events.js
+++ b/chrome/content/vimperator/events.js
@@ -251,7 +251,7 @@ function Events() //{{{
 
         getBrowser().removeProgressListener(this.progressListener);
 
-        window.removeEventListener("popupshowing", enterPopupMode(), true);
+        window.removeEventListener("popupshown", enterPopupMode(), true);
         window.removeEventListener("popuphidden", exitPopupMode(), true);
         window.removeEventListener("DOMMenuBarActive", enterMenuMode(), true);
         window.removeEventListener("DOMMenuBarInactive", exitMenuMode(), true);

From 52a1046e0e0db74dabea39dece1fc1684ad7ae8e Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 28 Aug 2007 09:55:07 +0000
Subject: [PATCH 018/224] allow text in the status line URL field to be
 selected

---
 chrome/content/vimperator/vimperator.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/vimperator.xul b/chrome/content/vimperator/vimperator.xul
index 16868ae0..20463c1e 100644
--- a/chrome/content/vimperator/vimperator.xul
+++ b/chrome/content/vimperator/vimperator.xul
@@ -78,7 +78,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
                 </listbox>
 
                 <hbox id="vimperator-statusline" flex="1" height="10" hidden="false">
-                    <label class="plain" id="vimperator-statusline-field-url"            flex="1" crop="end"/>
+                    <textbox class="plain" id="vimperator-statusline-field-url" readonly="true" flex="1" crop="end"/>
                     <label class="plain" id="vimperator-statusline-field-inputbuffer"    flex="0"/>
                     <label class="plain" id="vimperator-statusline-field-progress"       flex="0"/>
                     <label class="plain" id="vimperator-statusline-field-tabcount"       flex="0"/>

From 353cb80580fb686e101ab81e0e59f3c43318702a Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 28 Aug 2007 12:14:37 +0000
Subject: [PATCH 019/224] minor help highlighting improvments

---
 chrome/content/vimperator/commands.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 62bddeac..7474b27d 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -520,8 +520,8 @@ function Commands() //{{{
         {
             usage: ["h[elp] {subject}"],
             short_help: "Open the help window",
-            help: "You can jump to the specified {subject} with <code class=\"command\">:help {subject}</code>.<br/>" +
-                  "Make sure you use the full vim notation when jumping to {subject}. This means:<br/>" +
+            help: "You can jump to the specified <code class=\"argument\">{subject}</code> with <code class=\"command\">:help {subject}</code>.<br/>" +
+                  "Make sure you use the full vim notation when jumping to <code class=\"argument\">{subject}</code>. This means:<br/>" +
                   "<ul>" +
                   "<li><code class=\"command\">:help :help</code> for commands (: prefix)</li>" +
                   "<li><code class=\"command\">:help 'complete'</code> for options (surrounded by ' and ')</li>" +
@@ -1280,8 +1280,8 @@ function Commands() //{{{
         {
             usage: ["zo[om] [value]", "zo[om] +{value} | -{value}"],
             short_help: "Set zoom value of the web page",
-            help: "{value} can be an absolute value between 1 and 2000% or a relative value if prefixed with - or +. " +
-                  "If {value} is omitted, zoom is reset to 100%."
+            help: "If <code class=\"argument\">{value}</code> can be an absolute value between 1 and 2000% or a relative value if prefixed with - or +. " +
+                  "If <code class=\"argument\">{value}</code> is omitted, zoom is reset to 100%."
         }
     ));
     //}}}

From 69acf721edf42d76be9b34724fc0e8936ba38946 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 28 Aug 2007 12:16:49 +0000
Subject: [PATCH 020/224] update NEWS

---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index c76df1fa..b9eaab68 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-xx-xx:
 	* version 0.5.1
+	* the URL in the status line can be selected with the mouse again
 	* commandline history now works properly on Windows
 	* filename completion now works on Windows
 	* the Bookmarks Toolbar Folder is now read when bookmarks are first

From 6c73d204bc2f7860eb3b077fd1e27a8f4b48116c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 29 Aug 2007 13:22:44 +0000
Subject: [PATCH 021/224] don't enter menu mode when tooltip popups are shown

---
 chrome/content/vimperator/events.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/events.js b/chrome/content/vimperator/events.js
index 469e6bd2..35bdbc4a 100644
--- a/chrome/content/vimperator/events.js
+++ b/chrome/content/vimperator/events.js
@@ -79,8 +79,11 @@ function Events() //{{{
     var popup_count = 0;
     var active_menubar = false;
 
-    function enterPopupMode()
+    function enterPopupMode(event)
     {
+        if (event.originalTarget.localName == "tooltip")
+            return;
+
         popup_count++;
         vimperator.log("Open popup window count: " + popup_count, 9);
         vimperator.addMode(null, vimperator.modes.MENU);

From 63232971b1ef12a13f96e5b8943ff5470f70b81a Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 29 Aug 2007 15:55:37 +0000
Subject: [PATCH 022/224] use gContextMenu and the menubar events for
 controlling menu mode

---
 chrome/content/vimperator/events.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/chrome/content/vimperator/events.js b/chrome/content/vimperator/events.js
index 35bdbc4a..7b095270 100644
--- a/chrome/content/vimperator/events.js
+++ b/chrome/content/vimperator/events.js
@@ -76,7 +76,6 @@ function Events() //{{{
     // track if a popup is open or the menubar is active
     //
 
-    var popup_count = 0;
     var active_menubar = false;
 
     function enterPopupMode(event)
@@ -84,30 +83,25 @@ function Events() //{{{
         if (event.originalTarget.localName == "tooltip")
             return;
 
-        popup_count++;
-        vimperator.log("Open popup window count: " + popup_count, 9);
         vimperator.addMode(null, vimperator.modes.MENU);
     }
 
     function exitPopupMode()
     {
-        popup_count--;
-        vimperator.log("Open popup window count: " + popup_count, 9);
-        if (popup_count == 0)
+        // gContextMenu is set to NULL by firefox, when a context menu is closed
+        if (!gContextMenu && !active_menubar)
             vimperator.removeMode(null, vimperator.modes.MENU);
     }
 
     function enterMenuMode()
     {
         active_menubar = true;
-        vimperator.log("Menubar is active", 9);
         vimperator.addMode(null, vimperator.modes.MENU)
     }
 
     function exitMenuMode()
     {
         active_menubar = false;
-        vimperator.log("Menubar is inactive", 9);
         vimperator.removeMode(null, vimperator.modes.MENU);
     }
 

From 0782dae1f4fdaa923fae3a2626ef6d8847c4f31b Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 31 Aug 2007 06:53:38 +0000
Subject: [PATCH 023/224] don't indicate menu mode when 'smd' is set

---
 chrome/content/vimperator/vimperator.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index 16d35791..58c260e8 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -64,7 +64,7 @@ const vimperator = (function() //{{{
     mode_messages[modes.QUICK_HINT]      = "quick";
     mode_messages[modes.EXTENDED_HINT]   = "extended";
     mode_messages[modes.ALWAYS_HINT]     = "always";
-    mode_messages[modes.MENU]            = "menu"; // TODO: desirable?
+    //mode_messages[modes.MENU]            = "menu"; // not a user visible mode
 
     var mode = modes.NORMAL;
     var extended_mode = modes.NONE;
@@ -607,7 +607,6 @@ const vimperator = (function() //{{{
                 }, 1000);
             }
 
-            //gURLBar.blur(); // TODO: needed anymore?
             vimperator.focusContent();
 
             // finally, read a ~/.vimperatorrc

From dbf731e3f69182e53809838d13d6a1c3efd55f28 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 31 Aug 2007 06:54:29 +0000
Subject: [PATCH 024/224] comment out currently unused DOMTitleChanged event
 handler

---
 chrome/content/vimperator/events.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/chrome/content/vimperator/events.js b/chrome/content/vimperator/events.js
index 7b095270..7a23fe11 100644
--- a/chrome/content/vimperator/events.js
+++ b/chrome/content/vimperator/events.js
@@ -110,10 +110,10 @@ function Events() //{{{
     window.addEventListener("DOMMenuBarActive", enterMenuMode, true);
     window.addEventListener("DOMMenuBarInactive", exitMenuMode, true);
 
-    window.document.addEventListener("DOMTitleChanged", function(event)
-    {
-        //alert("titlechanged");
-    }, null);
+    //window.document.addEventListener("DOMTitleChanged", function(event)
+    //{
+    //    //alert("titlechanged");
+    //}, null);
 
     // NOTE: the order of ["Esc", "Escape"] or ["Escape", "Esc"]
     //       matters, so use that string as the first item, that you

From 43fd49cbde465115b3aed450281f3b625b8333df Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 1 Sep 2007 11:39:36 +0000
Subject: [PATCH 025/224] add initialization section to help

---
 chrome/content/vimperator/completion.js |  1 +
 chrome/content/vimperator/help.js       | 25 ++++++++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/chrome/content/vimperator/completion.js b/chrome/content/vimperator/completion.js
index 9d266139..b290f42a 100644
--- a/chrome/content/vimperator/completion.js
+++ b/chrome/content/vimperator/completion.js
@@ -302,6 +302,7 @@ vimperator.completion = (function() // {{{
         get_help_completions: function(filter) //{{{
         {
             var help_array = [[["introduction"], "Introductory text"],
+                              [["initialization"], "Initialization and startup"],
                               [["mappings"], "Normal mode commands"],
                               [["commands"], "Ex commands"],
                               [["options"], "Configuration options"]]; // TODO: hardcoded until we have proper 'pages'
diff --git a/chrome/content/vimperator/help.js b/chrome/content/vimperator/help.js
index f57900df..7bbb4a92 100644
--- a/chrome/content/vimperator/help.js
+++ b/chrome/content/vimperator/help.js
@@ -166,23 +166,41 @@ vimperator.help = function(section, easter) //{{{
 
         '<p>Of course as a believer in free open source software, only make a donation if you really like Vimperator and the money doesn\'t hurt - otherwise just use it, recommend it and like it :)</p>\n'
 
+    var initialization = '<span style="float: right"><code class="tag">initialization</code></span><h2 id="initialization">Initialization</h2>\n' +
+        '<p>At startup Vimperator sources a user RC file, containing Ex commands, and any JavaScript files found in the plugin directory.</p>' +
+        '<p>The RC file may be named .vimperatorrc or _vimperatorrc. The search order is:</p>' +
+        '<ul>' +
+        '<li>Unix and Mac - ~/.vimperatorrc then ~/_vimperatorrc</li>' +
+        '<li>Windows - ~/_vimperatorrc then ~/.vimperatorrc</li>' +
+        '</ul>' +
+        '<p>The plugin directory is named:</p>' +
+        '<ul>' +
+        '<li>Unix and Mac - ~/.vimperator/plugin</li>' +
+        '<li>Windows - ~/vimperator/plugin</li>' +
+        '</ul>' +
+        '<p>The user\'s $HOME(~) directory is determined as follows:</p>' +
+        '<ul>' +
+        '<li>Unix and Mac - $HOME is used.</li>' +
+        '<li>Windows - if $HOME is set then this is used, otherwise $USERPROFILE or finally $HOMEDRIVE$HOMEPATH.</li>' +
+        '</ul>\n';
+
     var mappings = '<span style="float: right"><code class="tag">mappings</code></span><h2 id="mappings">Mappings</h2>\n' +
         '<p>The denotion of modifier keys is like in Vim, so C- means the Control key, M- the Meta key, A- the Alt key and S- the Shift key.</p>'+
         '<table class="vimperator mappings">'
     mappings += makeHelpString(vimperator.mappings, "", "", null);
     mappings += '</table>';
     if (section && section == 'holy-grail')
-        mappings += '<span id="holy-grail">You found it, Arthur!</span>\n';
+        mappings += '<div><p id="holy-grail">You found it, Arthur!</p></div>\n';
 
     var commands = '<span style="float: right"><code class="tag">commands</code></span><h2 id="commands">Commands</h2>\n' +
         '<table class="vimperator commands">\n';
     commands += makeHelpString(vimperator.commands, ":", "", null);
     commands += '</table>';
     if (section && section == '42')
-        commands += '<p id="42">What is the meaning of life, the universe and everything?<br/>' +
+        commands += '<div><p id="42">What is the meaning of life, the universe and everything?<br/>' +
                     'Douglas Adams, the only person who knew what this question really was about is<br/>' +
                     'now dead, unfortunately.  So now you might wonder what the meaning of death<br/>' +
-                    'is...</p>\n';
+                    'is...</p></div>\n';
 
     var options = '<span style="float: right"><code class="tag">options</code></span><h2 id="options">Options</h2>\n' +
         '<table class="vimperator options">\n';
@@ -198,6 +216,7 @@ vimperator.help = function(section, easter) //{{{
         '<span class="version">version ' + vimperator.version + '</span>\n' +
         header +
         introduction +
+        initialization +
         mappings +
         commands +
         options +

From 0fd4d5530d21b1608638199f3236b75a8cc9a97d Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 1 Sep 2007 11:49:27 +0000
Subject: [PATCH 026/224] remove outdated :js examples

---
 vimperatorrc.example | 66 ++------------------------------------------
 1 file changed, 3 insertions(+), 63 deletions(-)

diff --git a/vimperatorrc.example b/vimperatorrc.example
index 4839bd63..c1288600 100644
--- a/vimperatorrc.example
+++ b/vimperatorrc.example
@@ -1,3 +1,5 @@
+" TODO: add some useful examples
+
 " I don't like beeps
 set nobeep
 echo vimperatorrc found
@@ -9,68 +11,6 @@ hello = function(name)
 {
 	alert("Hello world: " + name);
 }
-
-//Checks if a mapping is already defined and returnes the index in g_mappings,
-//where it is defined, or -1
-find_map = function(tofind)
-{
-        for (var i in g_mappings)
-        {
-                // each internal mapping can have multiple keys
-                for (var j in g_mappings[i][0])
-                {
-                        var mapping = g_mappings[i][0][j];
-                        if(mapping == tofind) {
-                                //alert("Mapping '"+tofind+"' found");
-                                return i;
-                        }
-                }
-        }
-//      alert("Mapping '"+tofind+"' not found");
-        return -1;
-}
-
-//(re)define a mapping map, with usage, helptext by function func
-//see examples below
-//Current problem: Doesn't remove helptext, when a mapping is unassigned
-define_map = function(map, usage, helptext, func) {
-        //check if mapping exists:
-        var i=find_map(map);
-        var newmap = [[map],[usage],helptext,func];
-        if(i>=0)
-        {
-                //unassign map
-                var changed_maps=new Array();
-                for(j in g_mappings[i][0]) {
-                        if(g_mappings[i][0][j]!=map)
-                                changed_maps.push(g_mappings[i][0][j]);
-                }
-                g_mappings[i][0]=changed_maps;
-        }
-        //add new map
-        g_mappings.push(newmap);
-        alert("Mapping '"+map+"' added.");
-}
-print_maps = function (toPrint) {
-var doc = gBrowser.contentDocument;
-doc.open();
-var text="";
-for( i in g_mappings) {
-        var curmaps = "";
-        for (j in g_mappings[i][0])
-                curmaps += g_mappings[i][0][j].replace("<","&le;").replace(">","&ge")+", ";
-        text +="<br><br>["+curmaps+"]";
-}
-doc.write(text);
-
-doc.close();
-}
-
 EOF
 
-
-" use functions to define maps for h and l
-javascript define_map("h","h","previous tab",function(){tab_go(-1);});
-javascript define_map("l","l","next tab",function(){tab_go(0);});
-
-" vim: set syntax=vimperator:
+" vim: ft=vimperator:

From abd42d741c46bdd60cbe38bb71c7e159ff7ca6a0 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 1 Sep 2007 15:57:22 +0000
Subject: [PATCH 027/224] use document.location.href for buffer.URL rather than
 document.URL since the latter is undefined for XUL documents

---
 chrome/content/vimperator/buffers.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/buffers.js b/chrome/content/vimperator/buffers.js
index 794de5db..bdb68bc9 100644
--- a/chrome/content/vimperator/buffers.js
+++ b/chrome/content/vimperator/buffers.js
@@ -115,7 +115,9 @@ function Buffer() //{{{
 
     this.__defineGetter__("URL", function()
     {
-        return window.content.document.URL;
+        // TODO: .URL is not defined for XUL documents
+        //return window.content.document.URL;
+        return window.content.document.location.href;
     });
 
     this.__defineGetter__("pageHeight", function()

From b009a6160b3e28415cba27273e64f10147b36c73 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 3 Sep 2007 05:12:50 +0000
Subject: [PATCH 028/224] merge native / and ? search

---
 NEWS                                  |   3 +
 chrome/content/vimperator/commands.js |  10 +
 chrome/content/vimperator/find.js     | 496 +++++---------------------
 chrome/content/vimperator/mappings.js |  23 +-
 chrome/content/vimperator/options.js  |   2 +-
 chrome/content/vimperator/ui.js       |   4 +-
 vimperator.vim                        |  10 +-
 7 files changed, 129 insertions(+), 419 deletions(-)

diff --git a/NEWS b/NEWS
index b9eaab68..abdac68a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,10 @@
 <pre>
 2007-xx-xx:
 	* version 0.5.1
+	* native / and ? search and n and N working again
 	* the URL in the status line can be selected with the mouse again
+	* the Windows default RC file is now ~/_vimperatorrc and the plugin
+	  directory is ~/vimperator/plugin
 	* commandline history now works properly on Windows
 	* filename completion now works on Windows
 	* the Bookmarks Toolbar Folder is now read when bookmarks are first
diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 7474b27d..80a60526 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -682,6 +682,16 @@ function Commands() //{{{
             help: "If <code class=\"argument\">[arg]</code> is specified then limit the list to those marks mentioned."
         }
     ));
+    addDefaultCommand(new Command(["noh[lsearch]"],
+        function(args)
+        {
+            vimperator.search.clear();
+        },
+        {
+            short_help: "Clear the current selection",
+            help: "TODO"
+        }
+    ));
     addDefaultCommand(new Command(["norm[al]"],
         function(args)
         {
diff --git a/chrome/content/vimperator/find.js b/chrome/content/vimperator/find.js
index f61d2ec7..3d268012 100644
--- a/chrome/content/vimperator/find.js
+++ b/chrome/content/vimperator/find.js
@@ -11,9 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 for the specific language governing rights and limitations under the
 License.
 
-The Initial Developer of the Original Code is Shawn Betts.
-Portions created by the Initial Developer are Copyright (C) 2004,2005
-by the Initial Developer. All Rights Reserved.
+(c) 2006-2007: Martin Stubenschrott <stubenschrott@gmx.net>
 
 Alternatively, the contents of this file may be used under the terms of
 either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -28,443 +26,135 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-// Finder for vimperator
-// Author: Nigel McNie <http://nigel.mcnie.name/>
-// Original Author: Shawn Betts
-//
-// The algorithm was taken from conkeror <http://conkeror.mozdev.net/>, but
-// extensively refactored and changed to behave like vim (naturally!)
 
-// The window to search in (which frame)
-//var gWin = null;
-//var gSelCtrl = null;
-
-//function highlight(range, node) {
-//  var startContainer = range.startContainer;
-//  var startOffset = range.startOffset;
-//  var endOffset = range.endOffset;
-//  var docfrag = range.extractContents();
-//  var before = startContainer.splitText(startOffset);
-//  var parent = before.parentNode;
-//  node.appendChild(docfrag);
-//  parent.insertBefore(node, before);
-//  return node;
-//}
-
-// Clears the current selection
-// @todo this should be in vimperator.js, and not depend on searcher.gSelCtrl
-function clearSelection() {
-    //var selctrl = gSelCtrl;
-    var selctrl = vimperator.search.gSelCtrl;
-    var sel = selctrl.getSelection(Components.interfaces.nsISelectionController.SELECTION_NORMAL);
-    sel.removeAllRanges();
-    gFindBar.highlightDoc();
-}
-
-// Sets what is currently selected
-// @todo as for clearSelection
-function setSelection(range) {
-    try {
-        var selctrlcomp = Components.interfaces.nsISelectionController;
-        //var selctrl = gSelCtrl;
-        var selctrl = vimperator.search.gSelCtrl;
-        var sel = selctrl.getSelection(selctrlcomp.SELECTION_NORMAL);
-        sel.removeAllRanges();
-        sel.addRange(range.cloneRange());
-
-        selctrl.scrollSelectionIntoView(selctrlcomp.SELECTION_NORMAL,
-                        selctrlcomp.SELECTION_FOCUS_REGION,
-                         true);
-    }
-    catch (e) {
-        alert("setSelection: " + e);
-    }
-}
-
-// Highlight find matches and move selection to the first occurrence
-// starting from pt.
-// @todo move into searcher and clean up
-function highlightFind(str, color, wrapped, dir, pt)
-{
-    try {
-    var gWin = vimperator.search.gWin;//document.commandDispatcher.focusedWindow;
-    if (!gWin) {
-        alert('gWin does not exist here...');
-        alert(vimperator.search.gWin);
-    }
-    var doc = gWin.document;
-    var finder = Components.classes["@mozilla.org/embedcomp/rangefind;1"].createInstance()
-        .QueryInterface(Components.interfaces.nsIFind);
-    var searchRange;
-    var startPt;
-    var endPt;
-    var body = doc.body;
-
-    finder.findBackwards = !dir;
-
-    searchRange = doc.createRange();
-    startPt = doc.createRange();
-    endPt = doc.createRange();
-
-    var count = body.childNodes.length;
-
-    // Search range in the doc
-    searchRange.setStart(body,0);
-    searchRange.setEnd(body, count);
-
-    if (!dir) {
-        if (pt == null) {
-        startPt.setStart(body, count);
-        startPt.setEnd(body, count);
-        } else {
-        startPt.setStart(pt.startContainer, pt.startOffset);
-        startPt.setEnd(pt.startContainer, pt.startOffset);
-        }
-        endPt.setStart(body, 0);
-        endPt.setEnd(body, 0);
-    } else {
-        if (pt == null) {
-        startPt.setStart(body, 0);
-        startPt.setEnd(body, 0);
-        } else {
-        startPt.setStart(pt.endContainer, pt.endOffset);
-        startPt.setEnd(pt.endContainer, pt.endOffset);
-        }
-        endPt.setStart(body, count);
-        endPt.setEnd(body, count);
-    }
-    // search the doc
-    var retRange = null;
-    var selectionRange = null;
-
-    if (!wrapped) {
-        do {
-        retRange = finder.Find(str, searchRange, startPt, endPt);
-        var keepSearching = false;
-        if (retRange) {
-            var sc = retRange.startContainer;
-            var ec = retRange.endContainer;
-            var scp = sc.parentNode;
-            var ecp = ec.parentNode;
-            var sy1 = abs_point(scp).y;
-            var ey2 = abs_point(ecp).y + ecp.offsetHeight;
-
-            startPt = retRange.startContainer.ownerDocument.createRange();
-            if (!dir) {
-            startPt.setStart(retRange.startContainer, retRange.startOffset);
-            startPt.setEnd(retRange.startContainer, retRange.startOffset);
-            } else {
-            startPt.setStart(retRange.endContainer, retRange.endOffset);
-            startPt.setEnd(retRange.endContainer, retRange.endOffset);
-            }
-            // We want to find a match that is completely
-            // visible, otherwise the view will scroll just a
-            // bit to fit the selection in completely.
-//          alert ("sy1: " + sy1 + " scry: " + gWin.scrollY);
-//          alert ("ey2: " + ey2 + " bot: " + (gWin.scrollY + gWin.innerHeight));
-            keepSearching = (dir && sy1 < gWin.scrollY)
-            || (!dir && ey2 >= gWin.scrollY + gWin.innerHeight);
-        }
-        } while (retRange && keepSearching);
-    } else {
-        retRange = finder.Find(str, searchRange, startPt, endPt);
-    }
-
-    if (retRange) {
-        setSelection(retRange);
-        selectionRange = retRange.cloneRange();
-        //      highlightAllBut(str, retRange, color);
-    } else {
-
-    }
-
-    return selectionRange;
-    } catch(e) { alert('highlightFind:'+e); }
-}
-
-function clearHighlight()
-{
-    gFindBar.highlightDoc();
-    var win = window.content;
-    var doc = win.document;
-    if (!document)
-    return;
-
-    var elem = null;
-    while ((elem = doc.getElementById("__vimperator-findbar-search-id"))) {
-    var child = null;
-    var docfrag = doc.createDocumentFragment();
-    var next = elem.nextSibling;
-    var parent = elem.parentNode;
-    while ((child = elem.firstChild)) {
-        docfrag.appendChild(child);
-    }
-    parent.removeChild(elem);
-    parent.insertBefore(docfrag, next);
-    }
-}
-
-/*
- * Finds the absolute X and Y co-ordinates of a given node from the top left of
- * the document
- *
- * Taken from conkeror utils.js
- */
-function abs_point (node) {
-    var orig = node;
-    var pt = {};
-    try {
-        pt.x = node.offsetLeft;
-        pt.y = node.offsetTop;
-
-        // Find imagemap's coordinates
-        if (node.tagName == "AREA") {
-            var coords = node.getAttribute("coords").split(",");
-            pt.x += Number(coords[0]);
-            pt.y += Number(coords[1]);
-        }
-
-        node = node.offsetParent;
-
-        while (node.tagName != "BODY") {
-            pt.x += node.offsetLeft;
-            pt.y += node.offsetTop;
-            node = node.offsetParent;
-        }
-    }
-    catch (e) {
-        // Ignore
-    }
-    return pt;
-}
-
-// Vimperator searcher
 // make sure you only create this object when the "vimperator" object is ready
-//vimperator.search = new function()
+// vimperator.search = new function()
 function Search() //{{{
 {
     var self = this; // needed for callbacks since "this" is the "vimperator" object in a callback
-    this.gWin = null;
-    this.gSelCtrl = null;
-    this.gFindState = [];
+    var found = false;   // true if the last search was successful
+    var backwards = false;
+    var lastsearch = ""; // keep track of the last searched string
+    var lastsearch_backwards = false; // like "backwards", but for the last search, so if you cancel a search with <esc> this is not set
 
     // Event handlers for search - closure is needed
     vimperator.registerCallback("change", vimperator.modes.SEARCH_FORWARD, function(command){ self.searchKeyPressed(command); });
     vimperator.registerCallback("submit", vimperator.modes.SEARCH_FORWARD, function(command){ self.searchSubmitted(command); });
-    vimperator.registerCallback("cancel", vimperator.modes.SEARCH_FORWARD, function(){ self.searchCancelled(); });
+    vimperator.registerCallback("cancel", vimperator.modes.SEARCH_FORWARD, function(){ self.searchCanceled(); });
+    // TODO: allow advanced modes in register/triggerCallback
+    vimperator.registerCallback("change", vimperator.modes.SEARCH_BACKWARD, function(command){ self.searchKeyPressed(command); });
+    vimperator.registerCallback("submit", vimperator.modes.SEARCH_BACKWARD, function(command){ self.searchSubmitted(command); });
+    vimperator.registerCallback("cancel", vimperator.modes.SEARCH_BACKWARD, function(){ self.searchCanceled(); });
 
-
-    // Called when the search dialog is asked for. Sets up everything necessary
-    // for this round of searching
-    this.openSearchDialog = function()
+    // Called when the search dialog is asked for
+    // If you omit "mode", it will default to forward searching
+    this.openSearchDialog = function(mode)
     {
-        // Get a reference to the focused window if necessary
-        if (this.gWin == null) this.gWin = document.commandDispatcher.focusedWindow;
-
-        // Change the currently selected text to not be the attention colour
-        // @todo: check what this REALLY does
-        try {
-            this.gSelCtrl = this.getFocusedSelCtrl();
-            this.gSelCtrl.setDisplaySelection(Components.interfaces.nsISelectionController.SELECTION_ATTENTION);
-            this.gSelCtrl.repaintSelection(Components.interfaces.nsISelectionController.SELECTION_NORMAL);
+        if (mode == vimperator.modes.SEARCH_BACKWARD)
+        {
+            vimperator.commandline.open('?', '', vimperator.modes.SEARCH_BACKWARD);
+            backwards = true;
         }
-        catch (e) {
-            alert('Could not change the colour of the current selection:' + e);
+        else
+        {
+            vimperator.commandline.open('/', '', vimperator.modes.SEARCH_FORWARD);
+            backwards = false;
         }
 
-        // Initialize the state list for this attempt at searching
-        var state = this.createInitialFindState();
-        this.gFindState = [];
-        this.gFindState.push(state);
-        this.resumeFindState(state);
-
-        vimperator.commandline.open('/', '', vimperator.modes.SEARCH_FORWARD);
+        // TODO: focus the top of the currently visible screen
     }
 
-    // Called when the current search needs to be repeated in the forward
-    // direction
-    // @todo will need re-jigging when reverse search comes in
-    this.findNext = function() {
-        this.find(this.lastFindState()["search-str"], true, this.lastFindState()["range"]);
-        this.resumeFindState(this.lastFindState());
-        // if there is still a search result
-        if (this.lastFindState()["range"]) {
-            if (this.lastFindState()["wrapped"]) {
-                vimperator.echoerr("search hit BOTTOM, continuing at TOP");
-                this.lastFindState()["wrapped"] = false;
-            }
-            else {
-                // TODO: this could probably be done in a nicer way - perhaps
-                // echoErr could not clobber all of this information somehow?
-                vimperator.echo('/' + this.lastFindState()["search-str"]);
-            }
-        }
+    // Finds text in a page
+    // TODO: backwards seems impossible i fear :(
+    this.find = function(str, backwards)
+    {
+        const FIND_NORMAL = 0;
+        const FIND_TYPEAHEAD = 1;
+        const FIND_LINKS = 2;
+
+        found = getBrowser().fastFind.find(str, false) != Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND;
+
+        return found;
     }
 
-    // Called when the current search needs to be repeated in the backward
-    // direction
-    this.findPrevious = function() {
-        this.find(this.lastFindState()["search-str"], false, this.lastFindState()["range"]);
-        this.resumeFindState(this.lastFindState());
-        // if there is still a search result
-        if (this.lastFindState()["range"]) {
-            if (this.lastFindState()["wrapped"]) {
-                vimperator.echoerr("search hit TOP, continuing at BOTTOM");
-                this.lastFindState()["wrapped"] = false;
-            }
-            else {
-                vimperator.echo('/' + this.lastFindState()["search-str"]);
-            }
+    // Called when the current search needs to be repeated
+    this.findAgain = function(reverse)
+    {
+        // this hack is needed to make n/N work with the correct string, if
+        // we typed /foo<esc> after the original search
+        if (getBrowser().fastFind.searchString != lastsearch)
+        {
+            this.clear();
+            this.find(lastsearch, false);
+            gFindBar.highlightDoc("yellow", "black", lastsearch);
         }
+
+        var up = reverse ? !lastsearch_backwards : lastsearch_backwards;
+        var result;
+
+        if (up)
+            result = getBrowser().fastFind.findPrevious();
+        else
+            result = getBrowser().fastFind.findNext();
+
+        if (result == Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND)
+            vimperator.echoerr("E486: Pattern not found: " + lastsearch);
+        else if (result == Components.interfaces.nsITypeAheadFind.FIND_WRAPPED)
+        {
+            // hack needed, because wrapping causes a "scroll" event which clears
+            // our command line
+            setTimeout( function() {
+                if (up)
+                    vimperator.echoerr("search hit TOP, continuing at BOTTOM");
+                else
+                    vimperator.echoerr("search hit BOTTOM, continuing at TOP");
+            }, 10);
+        }
+        else // just clear the command line if something has been found
+            vimperator.echo("");
     }
 
     // Called when the user types a key in the search dialog. Triggers a find attempt
-    this.searchKeyPressed = function(command) {
-        if (command != "") {
-            var str = vimperator.commandline.getCommand();
-            this.find(str, true, this.lastFindState()["point"]);
-            this.resumeFindState(this.lastFindState());
-        }
-        else {
-            clearSelection();
-        }
+    this.searchKeyPressed = function(command)
+    {
+        // TODO: check for 'incsearch'
+        var backward = vimperator.hasMode(vimperator.modes.SEARCH_BACKWARD);
+        this.find(command, backward);
     }
 
     // Called when the enter key is pressed to trigger a search
-    this.searchSubmitted = function(command) {
-        //removeMode(MODE_SEARCH);
+    this.searchSubmitted = function(command)
+    {
+        this.clear();
+        gFindBar.highlightDoc("yellow", "black", command);
+
+        // need to find again to draw the highlight of the current search
+        // result over the "highlight all" search results
+        // very hacky, but seem to work
+        setTimeout(function() { self.findAgain(false); }, 10);
+
+        lastsearch_backwards = backwards;
+        lastsearch = command;
+
         vimperator.setMode(vimperator.modes.NORMAL);
-        if (this.lastFindState()["range"] == null) {
-            vimperator.echoerr("E492: Pattern not found: " + this.lastFindState()["search-str"]);
-        }
+        vimperator.focusContent();
     }
 
     // Called when the search is cancelled - for example if someone presses
     // escape while typing a search
-    this.searchCancelled = function() {
+    this.searchCanceled = function()
+    {
         //removeMode(MODE_SEARCH);
         vimperator.setMode(vimperator.modes.NORMAL);
-        clearSelection();
+        this.clear();
         vimperator.focusContent();
     }
 
-
-    //
-    // Helper methods
-    //
-
-    // Turn on the selection in all frames
-    // @todo to tell the truth, I have no idea what this does
-    this.getFocusedSelCtrl = function() {
-      var ds = getBrowser().docShell;
-      var dsEnum = ds.getDocShellEnumerator(Components.interfaces.nsIDocShellTreeItem.typeContent,
-                                            Components.interfaces.nsIDocShell.ENUMERATE_FORWARDS);
-      while (dsEnum.hasMoreElements()) {
-          ds = dsEnum.getNext().QueryInterface(Components.interfaces.nsIDocShell);
-          if (ds.hasFocus) {
-              var display = ds.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                  .getInterface(Components.interfaces.nsISelectionDisplay);
-              if (!display) return null;
-              return display.QueryInterface(Components.interfaces.nsISelectionController);
-          }
-      }
-
-      // One last try
-      return getBrowser().docShell
-          .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-          .getInterface(Components.interfaces.nsISelectionDisplay)
-          .QueryInterface(Components.interfaces.nsISelectionController);
-    }
-
-    // Creates a default find state
-    this.createInitialFindState = function() {
-        var state = [];
-        state["screenx"] = this.gWin.scrollX;
-        state["screeny"] = this.gWin.scrollY;
-        state["search-str"] = "";
-        state["wrapped"] = false;
-        state["point"] = null;
-        state["range"] = document.createRange();
-        state["selection"] = null;
-        state["direction"] = true;
-        return state;
-    }
-
-    // Given a find state, moves the browser to the way it should be in the
-    // state - highlighting the correct thing and the screen scrolled to the
-    // correct location
-    this.resumeFindState = function(state) {
-        if (state["selection"]) {
-            setSelection(state["selection"]);
-        }
-        else {
-            clearSelection();
-        }
-        this.gWin.scrollTo(state["screenx"], state["screeny"]);
-    }
-
-    // Retrieves the current find state that we're in
-    // @todo rename to currentFindState?
-    this.lastFindState = function() {
-        return this.gFindState[this.gFindState.length - 1];
-    }
-
-    // Adds a find state to the stack of such states. This is done every time a find is successful
-    this.addFindState = function(screenX, screenY, searchStr, wrapped, point, range, selection, direction) {
-        var state = [];
-        state["screenx"] = screenX;
-        state["screeny"] = screenY;
-        state["search-str"] = searchStr;
-        state["wrapped"] = wrapped;
-        state["point"] = point;
-        state["range"] = range;
-        state["selection"] = selection;
-        state["direction"] = direction;
-        this.gFindState.push(state);
-    }
-
-    // Finds text in a page
-    this.find = function(str, dir, pt)
+    this.clear = function()
     {
-        var norecurse = arguments[3];
-
-        var matchRange;
-        clearHighlight();
-
-        // Should we wrap this time?
-        var wrapped = this.lastFindState()["wrapped"];
-        var point = pt;
-        if (this.lastFindState()["wrapped"] == false
-        && this.lastFindState()["range"] == null
-        && this.lastFindState()["search-str"] == str
-        && this.lastFindState()["direction"] == dir) {
-            wrapped = true;
-            point = null;
-        }
-        gFindBar.highlightDoc('yellow', 'black', str);
-        matchRange = highlightFind(str, "lightblue", wrapped, dir, point);
-        if (matchRange == null) {
-            // No more matches in this direction. So add the state and then find
-            // again to wrap around. But only find again once to prevent infinite
-            // recursion if an error occurs
-            this.addFindState(this.gWin.scrollX, this.gWin.scrollY, str, wrapped, point,
-                matchRange, this.lastFindState()["selection"], dir);
-            if (!norecurse)
-                this.find(str, dir, pt, true);
-        }
-        else {
-            this.addFindState(this.gWin.scrollX, this.gWin.scrollY, str, wrapped,
-                point, matchRange, matchRange, dir);
-        }
+        gFindBar.highlightDoc();
     }
+
 } //}}}
 
-//// @TODO should be moved into commands.js
-//vimperator.commands.add(new Command(["noh[lsearch]"],
-//        clearSelection,
-//        {
-//            short_help: "Clear the current selection"
-//        }
-//));
-
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/chrome/content/vimperator/mappings.js b/chrome/content/vimperator/mappings.js
index 7631aa19..61ad5388 100644
--- a/chrome/content/vimperator/mappings.js
+++ b/chrome/content/vimperator/mappings.js
@@ -938,27 +938,32 @@ function Mappings() //{{{
     ));
 
     // search management
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["g/"],
-        function() { vimperator.search.openSearchDialog(); },
+    addDefaultMap(new Map(vimperator.modes.NORMAL, ["/"],
+        function() { vimperator.search.openSearchDialog(vimperator.modes.SEARCH_FORWARD); },
         {
             short_help: "Search forward for a pattern",
-            help: "Buggy on many sites, use / if you want a reliable search!"
+            help: "TODO"
+        }
+    ));
+    addDefaultMap(new Map(vimperator.modes.NORMAL, ["?"],
+        function() { vimperator.search.openSearchDialog(vimperator.modes.SEARCH_BACKWARD); },
+        {
+            short_help: "Search backwards for a pattern",
+            help: "TODO"
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["n"],
-        function() { vimperator.search.findNext(); },
+        function() { vimperator.search.findAgain(false); },
         {
             short_help: "Find next",
-            help: "Repeat the last \"g/\" 1 time (until count is supported). <br/>" +
-                  "NOTE: As \"g/\" is a little broken right now, use &lt;F3&gt; to go to the next search item of the \"/\" search for now."
+            help: "Repeat the last search 1 time (until count is supported)."
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["N"],
-        function() { vimperator.search.findPrevious(); },
+        function() { vimperator.search.findAgain(true); },
         {
             short_help: "Find previous",
-            help: "Repeat the last \"g/\" 1 time (until count is supported) in the opposite direction.<br/>" +
-                  "NOTE: As \"g/\" is a little broken right now, use &lt;S-F3&gt; to go to the previous search item of the \"/\" search for now."
+            help: "Repeat the last search 1 time (until count is supported) in the opposite direction."
         }
     ));
 
diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index 8b018a22..89d874cc 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -415,7 +415,7 @@ function Options() //{{{
     addOption(new Option(["hintstyle", "hs"], "string",
         {
             short_help: "CSS specification of unfocused hints appearance",
-            default_value: "z-index:5000; font-family:monospace; font-size:12px; color:black; background-color:yellow; " +
+            default_value: "z-index:5000; font-family:monospace; font-size:12px; color:white; background-color:red; " +
                            "border-color:ButtonShadow; border-width:0px; border-style:solid; padding:0px 1px 0px 1px; position:absolute;"
         }
     ));
diff --git a/chrome/content/vimperator/ui.js b/chrome/content/vimperator/ui.js
index 3fa02b6e..fd126578 100644
--- a/chrome/content/vimperator/ui.js
+++ b/chrome/content/vimperator/ui.js
@@ -528,8 +528,10 @@ function CommandLine() //{{{
                 // and blur the command line if there is no text left
                 if (command.length == 0)
                 {
-                    this.clear();
+                    vimperator.triggerCallback("cancel", cur_extended_mode);
+                    vimperator.setMode(old_mode, old_extended_mode);
                     vimperator.focusContent();
+                    this.clear();
                 }
             }
             else // any other key
diff --git a/vimperator.vim b/vimperator.vim
index 57d56792..739487c6 100644
--- a/vimperator.vim
+++ b/vimperator.vim
@@ -18,11 +18,11 @@ syn match   vimperatorComment +".*$+ contains=vimperatorTodo,@Spell
 
 syn keyword vimperatorCommand addo[ns] ba[ck] bd[elete] bw[ipeout] bun[load] tabc[lose] beep bma[dd] bmd[el] bookm[arks] bm
 	\ b[uffer] buffers files ls delm[arks] downl[oads] dl ec[ho] echoe[rr] exe[cute] exu[sage] fo[rward] fw ha[rdcopy] h[elp]
-	\ hist[ory] hs javas[cript] js mapc[lear] ma[rk] map marks no[remap] o[pen] e[dit] pc[lose] pref[erences] prefs q[uit]
-	\ quita[ll] qa[ll] re[load] reloada[ll] res[tart] sav[eas] se[t] so[urce] st[op] tab tabl[ast] tabm[ove] tabn[ext] tn[ext]
-	\ tabo[nly] tabopen t[open] tabnew tabe[dit] tabp[revious] tp[revious] tabN[ext] tN[ext] tabr[ewind] tabfir[st] u[ndo]
-	\ qmarka[dd] qma[dd] qmarkd[el] qmd[el] qmarks qms unm[ap] ve[rsion] viu[sage] win[open] w[open] wine[dit] wqa[ll] wq
-	\ xa[ll] zo[om] noh[ilight]
+	\ hist[ory] hs javas[cript] js mapc[lear] ma[rk] map marks noh[lsearch] no[remap] o[pen] e[dit] pc[lose] pref[erences]
+	\ prefs q[uit] quita[ll] qa[ll] re[load] reloada[ll] res[tart] sav[eas] se[t] so[urce] st[op] tab tabl[ast] tabm[ove]
+	\ tabn[ext] tn[ext] tabo[nly] tabopen t[open] tabnew tabe[dit] tabp[revious] tp[revious] tabN[ext] tN[ext] tabr[ewind]
+	\ tabfir[st] u[ndo] qmarka[dd] qma[dd] qmarkd[el] qmd[el] qmarks qms unm[ap] ve[rsion] viu[sage] win[open] w[open]
+	\ wine[dit] wqa[ll] wq xa[ll] zo[om]
 	\ contained
 
 " FIXME

From fcb0ad68ed3e0c9424bdce1da7d76c2abaed83ae Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 3 Sep 2007 05:26:31 +0000
Subject: [PATCH 029/224] whitespace formatting improvements

---
 chrome/content/vimperator/options.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index 89d874cc..92a49f2c 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -430,7 +430,7 @@ function Options() //{{{
             short_help: "Maximum number of simultaneously shown hints",
             help: "If you want to speed up display of hints, choose a smaller value",
             default_value: 250,
-            validator: function (value) { if (value>=1 && value <=1000) return true; else return false; }
+            validator: function (value) { if (value >= 1 && value <= 1000) return true; else return false; }
         }
     ));
     addOption(new Option(["preload"], "boolean",
@@ -445,10 +445,10 @@ function Options() //{{{
         {
             short_help: "Default height for preview window",
             help: "Value must be between 1 and 50. If the value is too high, completions may cover the command-line. " +
-                  "Close the preview window with <code class=\"command\">:pclose</code>." +
+                  "Close the preview window with <code class=\"command\">:pclose</code>.<br/>" +
                   "NOTE: Option currently disabled",
             default_value: 10,
-            validator: function (value) { if (value>=1 && value <=50) return true; else return false; }
+            validator: function (value) { if (value >= 1 && value <= 50) return true; else return false; }
         }
     ));
     addOption(new Option(["scroll", "scr"], "number",
@@ -458,7 +458,7 @@ function Options() //{{{
                   "When a <code class=\"argument\">{count}</code> is specified to the <code class=\"mapping\">&lt;C-u&gt;</code> or <code class=\"mapping\">&lt;C-d&gt;</code> commands this is used to set the value of <code class=\"option\">'scroll'</code> and also used for the current command. " +
                   "The value can be reset to half the window height with <code class=\"command\">:set scroll=0</code>.",
             default_value: 0,
-            validator: function (value) { if (value >= 0) return true; else return false; }
+            validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
         }
     ));
     addOption(new Option(["showmode", "smd"], "boolean",
@@ -517,7 +517,7 @@ function Options() //{{{
             help: "When bigger than zero, Vimperator will give messages about what it is doing. They are printed to the error console which can be shown with <code class=\"command\">:javascript!</code>.<br/>" +
                   "The highest value is 9, being the most verbose mode.",
             default_value: 0,
-            validator: function (value) { if (value>=0 && value <=9) return true; else return false; }
+            validator: function (value) { if (value >= 0 && value <= 9) return true; else return false; }
         }
     ));
     addOption(new Option(["wildmode", "wim"], "stringlist",

From 4908e6fef70d9f94ed69675e6b4df6f2d9726983 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 3 Sep 2007 10:18:53 +0000
Subject: [PATCH 030/224] remove extra blank lines from help page

---
 chrome/content/vimperator/help.js | 32 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/chrome/content/vimperator/help.js b/chrome/content/vimperator/help.js
index 7bbb4a92..c43e0ac9 100644
--- a/chrome/content/vimperator/help.js
+++ b/chrome/content/vimperator/help.js
@@ -137,36 +137,36 @@ vimperator.help = function(section, easter) //{{{
         return ret;
     }
 
-    var header = '<h1>Vimperator</h1>\n' +
+    var header = '<h1>Vimperator</h1>' +
         '<p class="tagline">First there was a Navigator, then there was an Explorer.\n' +
-        'Later it was time for a Konqueror. Now it\'s time for an Imperator, the VIMperator :)</p>\n';
+        'Later it was time for a Konqueror. Now it\'s time for an Imperator, the VIMperator :)</p>';
 
     var introduction = '<span style="float: right"><code class="tag">introduction</code></span><h2 id="introduction">Introduction</h2>' +
         '<p><a href="http://vimperator.mozdev.org">Vimperator</a> is a free browser add-on for Firefox, which makes it look and behave like the <a href="http://www.vim.org">Vim</a> text editor. ' +
-        'It has similar key bindings, and you could call it a modal web browser, as key bindings differ according to which mode you are in.</p>\n' +
+        'It has similar key bindings, and you could call it a modal web browser, as key bindings differ according to which mode you are in.</p>' +
 
         '<p><span class="warning">Warning:</span> To provide the most authentic Vim experience, the Firefox menubar and toolbar were hidden.<br/>' +
-        'If you really need them, type: <code class="command">:set guioptions+=mT</code> to get it back.\n' +
-        'If you don\'t like Vimperator at all, you can uninstall it by typing <code class="command">:addons</code> and remove/disable it. ' +
-        'If you like it, but can\'t remember the shortcuts, press <code class="mapping">F1</code> or <code class="command">:help</code> to get this help window back.</p>\n' +
+        'If you really need them, type: <code class="command">:set guioptions+=mT</code> to get them back.\n' +
+        'If you don\'t like Vimperator at all, you can uninstall it by typing <code class="command">:addons</code> and remove/disable it.\n' +
+        'If you like it, but can\'t remember the shortcuts, press <code class="mapping">F1</code> or <code class="command">:help</code> to get this help window back.</p>' +
 
         '<p>Since Vimperator\'s GUI is embedded into a toolbar, it may look too 3D-like with the default theme. ' +
-        'For the best experience, I therefore recommend the <a href="https://addons.mozilla.org/firefox/364/">Whitehart</a> theme or any other flat theme.</p>\n' +
+        'For the best experience, I therefore recommend the <a href="https://addons.mozilla.org/firefox/364/">Whitehart</a> theme or any other flat theme.</p>' +
 
         '<p>Vimperator was written by <a href="mailto:stubenschrott@gmx.net">Martin Stubenschrott</a>. ' +
-        'If you appreciate my work on Vimperator and want to encourage me working on it more, you can either send me greetings, patches or make a donation: </p>\n' +
+        'If you appreciate my work on Vimperator and want to encourage me working on it more, you can either send me greetings, patches or make a donation: </p>' +
 
-        '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">\n<fieldset class="paypal">' +
+        '<form action="https://www.paypal.com/cgi-bin/webscr" method="post"><fieldset class="paypal">' +
         '<input type="hidden" name="cmd" value="_s-xclick"/>' +
         '<input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but21.gif" name="submit" alt="Make payments with PayPal - it\'s fast, free and secure!"/>' +
 
         '<img alt="" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1"/>' +
         '<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHPwYJKoZIhvcNAQcEoIIHMDCCBywCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYBDDJfc+lXLBSAM9XSWv/ebzG/L7PTqYiIXaWVg8pfinDsfYaAcifcgCTuApg4v/VaZIQ/hLODzQu2EvmjGXP0twErA/Q8G5gx0l197PJSyVXb1sLwd1mgOdLF4t0HmDCdEI9z3H6CMhsb3xVwlfpzllSfCIqzlSpx4QtdzEZGzLDELMAkGBSsOAwIaBQAwgbwGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQI8ZOwn5QkHgaAgZjjtPQxB7Vw2rS7Voap9y+xdVLoczUQ97hw+bOdZLcGykBtfoVjdn76MS51QKjGp1fEmxkqTuQ+Fxv8+OVtHu0QF/qlrhmC3fJBRJ0IFWxKdXS+Wod4615BDaG2X1hzvCL443ffka8XlLSiFTuW43BumQs/O+6Jqsk2hcReP3FIQOvtWMSgGTALnZx7x5c60u/3NSKW5qvyWKCCA4cwggODMIIC7KADAgECAgEAMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTAeFw0wNDAyMTMxMDEzMTVaFw0zNTAyMTMxMDEzMTVaMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwUdO3fxEzEtcnI7ZKZL412XvZPugoni7i7D7prCe0AtaHTc97CYgm7NsAtJyxNLixmhLV8pyIEaiHXWAh8fPKW+R017+EmXrr9EaquPmsVvTywAAE1PMNOKqo2kl4Gxiz9zZqIajOm1fZGWcGS0f5JQ2kBqNbvbg2/Za+GJ/qwUCAwEAAaOB7jCB6zAdBgNVHQ4EFgQUlp98u8ZvF71ZP1LXChvsENZklGswgbsGA1UdIwSBszCBsIAUlp98u8ZvF71ZP1LXChvsENZklGuhgZSkgZEwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAgV86VpqAWuXvX6Oro4qJ1tYVIT5DgWpE692Ag422H7yRIr/9j/iKG4Thia/Oflx4TdL+IFJBAyPK9v6zZNZtBgPBynXb048hsP16l2vi0k5Q2JKiPDsEfBhGI+HnxLXEaUWAcVfCsQFvd2A1sxRr67ip5y2wwBelUecP3AjJ+YcxggGaMIIBlgIBATCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwCQYFKw4DAhoFAKBdMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTA3MDMyMTIyMzI1OFowIwYJKoZIhvcNAQkEMRYEFCirrvlwYVHQiNEEbM6ikfx9+Dm5MA0GCSqGSIb3DQEBAQUABIGAtbsR8GdCdURLziozXLSdtY+zJZUPPeQFXXy2V1S/3ldiN+pRvd4HI7xz8mOY1UaKJZpwZnOosy9MflL1/hbiEtEyQ2Dm/s4jnTcJng/NjLIZu+0NYxXRJhB+zMJubnMMMjzNrGlqI4F2HAB/bCA1eOJ5B83Of3dA4rk/T/8GoSQ=-----END PKCS7-----"/>' +
-        '</fieldset>\n</form>\n' +
+        '</fieldset></form>' +
 
-        '<p>Of course as a believer in free open source software, only make a donation if you really like Vimperator and the money doesn\'t hurt - otherwise just use it, recommend it and like it :)</p>\n'
+        '<p>Of course as a believer in free open source software, only make a donation if you really like Vimperator and the money doesn\'t hurt - otherwise just use it, recommend it and like it :)</p>'
 
-    var initialization = '<span style="float: right"><code class="tag">initialization</code></span><h2 id="initialization">Initialization</h2>\n' +
+    var initialization = '<span style="float: right"><code class="tag">initialization</code></span><h2 id="initialization">Initialization</h2>' +
         '<p>At startup Vimperator sources a user RC file, containing Ex commands, and any JavaScript files found in the plugin directory.</p>' +
         '<p>The RC file may be named .vimperatorrc or _vimperatorrc. The search order is:</p>' +
         '<ul>' +
@@ -182,9 +182,9 @@ vimperator.help = function(section, easter) //{{{
         '<ul>' +
         '<li>Unix and Mac - $HOME is used.</li>' +
         '<li>Windows - if $HOME is set then this is used, otherwise $USERPROFILE or finally $HOMEDRIVE$HOMEPATH.</li>' +
-        '</ul>\n';
+        '</ul>';
 
-    var mappings = '<span style="float: right"><code class="tag">mappings</code></span><h2 id="mappings">Mappings</h2>\n' +
+    var mappings = '<span style="float: right"><code class="tag">mappings</code></span><h2 id="mappings">Mappings</h2>' +
         '<p>The denotion of modifier keys is like in Vim, so C- means the Control key, M- the Meta key, A- the Alt key and S- the Shift key.</p>'+
         '<table class="vimperator mappings">'
     mappings += makeHelpString(vimperator.mappings, "", "", null);
@@ -192,7 +192,7 @@ vimperator.help = function(section, easter) //{{{
     if (section && section == 'holy-grail')
         mappings += '<div><p id="holy-grail">You found it, Arthur!</p></div>\n';
 
-    var commands = '<span style="float: right"><code class="tag">commands</code></span><h2 id="commands">Commands</h2>\n' +
+    var commands = '<span style="float: right"><code class="tag">commands</code></span><h2 id="commands">Commands</h2>' +
         '<table class="vimperator commands">\n';
     commands += makeHelpString(vimperator.commands, ":", "", null);
     commands += '</table>';
@@ -202,7 +202,7 @@ vimperator.help = function(section, easter) //{{{
                     'now dead, unfortunately.  So now you might wonder what the meaning of death<br/>' +
                     'is...</p></div>\n';
 
-    var options = '<span style="float: right"><code class="tag">options</code></span><h2 id="options">Options</h2>\n' +
+    var options = '<span style="float: right"><code class="tag">options</code></span><h2 id="options">Options</h2>' +
         '<table class="vimperator options">\n';
     options += makeHelpString(vimperator.options, "'", "'", makeOptionsHelpString);
     options += '</table>';

From fcf635ae6b81175e5c7b7a9c698baded6e28b909 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 3 Sep 2007 12:46:46 +0000
Subject: [PATCH 031/224] add usage and long help for / and ? mappings

---
 chrome/content/vimperator/mappings.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/chrome/content/vimperator/mappings.js b/chrome/content/vimperator/mappings.js
index 61ad5388..fc4b9ffa 100644
--- a/chrome/content/vimperator/mappings.js
+++ b/chrome/content/vimperator/mappings.js
@@ -942,14 +942,16 @@ function Mappings() //{{{
         function() { vimperator.search.openSearchDialog(vimperator.modes.SEARCH_FORWARD); },
         {
             short_help: "Search forward for a pattern",
-            help: "TODO"
+            usage: ["/{pattern}<CR>"],
+            help: "Search forward for the first occurance of <code class=\"argument\">{pattern}</code>."
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["?"],
         function() { vimperator.search.openSearchDialog(vimperator.modes.SEARCH_BACKWARD); },
         {
             short_help: "Search backwards for a pattern",
-            help: "TODO"
+            usage: ["?{pattern}<CR>"],
+            help: "Search backward for the first occurance of <code class=\"argument\">{pattern}</code>."
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["n"],

From 44a9a0e75c2de528e5012ce2a02b1a6652cb683c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 3 Sep 2007 14:48:31 +0000
Subject: [PATCH 032/224] remove CVS from version string for release

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

diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index 58c260e8..30e62fb0 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -197,7 +197,7 @@ const vimperator = (function() //{{{
         //},
 
         // ###VERSION### and ###DATE### are replaced by the Makefile
-        version: "###VERSION### CVS (created: ###DATE###)",
+        version: "###VERSION### (created: ###DATE###)",
 
         input: {
             buffer: "",                // partial command storage

From 5bd722f69fe47eea05285c9d8873ca0b3069030c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 3 Sep 2007 15:14:44 +0000
Subject: [PATCH 033/224] update NEWS and ChangeLog for release

---
 ChangeLog | 1081 ++++++++++++++++++++++++++++++-----------------------
 NEWS      |    4 +-
 2 files changed, 621 insertions(+), 464 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b4fc613e..587232b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,110 +1,314 @@
-2007-08-16 16:19  stubenschrott
+2007-09-03 14:48  dougkearns
+
+	* chrome/content/vimperator/vimperator.js: remove CVS from version
+	  string for release
+
+2007-09-03 12:46  dougkearns
+
+	* chrome/content/vimperator/mappings.js: add usage and long help
+	  for / and ? mappings
+
+2007-09-03 10:18  dougkearns
+
+	* chrome/content/vimperator/help.js: remove extra blank lines from
+	  help page
+
+2007-09-03 05:26  dougkearns
+
+	* chrome/content/vimperator/options.js: whitespace formatting
+	  improvements
+
+2007-09-03 05:12  dougkearns
+
+	* NEWS, vimperator.vim, chrome/content/vimperator/commands.js,
+	  chrome/content/vimperator/find.js,
+	  chrome/content/vimperator/mappings.js,
+	  chrome/content/vimperator/options.js,
+	  chrome/content/vimperator/ui.js: merge native / and ? search
+
+2007-09-01 15:57  dougkearns
+
+	* chrome/content/vimperator/buffers.js: use document.location.href
+	  for buffer.URL rather than document.URL since the latter is
+	  undefined for XUL documents
+
+2007-09-01 11:49  dougkearns
+
+	* vimperatorrc.example: remove outdated :js examples
+
+2007-09-01 11:39  dougkearns
+
+	* chrome/content/vimperator/: completion.js, help.js: add
+	  initialization section to help
+
+2007-08-31 06:54  dougkearns
+
+	* chrome/content/vimperator/events.js: comment out currently unused
+	  DOMTitleChanged event handler
+
+2007-08-31 06:53  dougkearns
+
+	* chrome/content/vimperator/vimperator.js: don't indicate menu mode
+	  when 'smd' is set
+
+2007-08-29 15:55  dougkearns
+
+	* chrome/content/vimperator/events.js: use gContextMenu and the
+	  menubar events for controlling menu mode
+
+2007-08-29 13:20  dougkearns
+
+	* chrome/content/vimperator/events.js: don't enter menu mode when
+	  tooltip popups are shown
+
+2007-08-28 12:16  dougkearns
+
+	* NEWS: update NEWS
+
+2007-08-28 12:14  dougkearns
+
+	* chrome/content/vimperator/commands.js: minor help highlighting
+	  improvments
+
+2007-08-28 09:55  dougkearns
+
+	* chrome/content/vimperator/vimperator.xul: allow text in the
+	  status line URL field to be selected
+
+2007-08-27 17:35  dougkearns
+
+	* chrome/content/vimperator/events.js: fix typo in
+	  removeEventListener call
+
+2007-08-27 14:26  dougkearns
+
+	* chrome/content/vimperator/: events.js, vimperator.js: add menu
+	  mode
+
+2007-08-27 14:19  dougkearns
+
+	* Makefile: update Makefile version to 0.5.1
+
+2007-08-27 12:08  dougkearns
+
+	* Makefile: GNU make 3.80 can't parse "else ifeq"
+
+2007-08-27 11:44  dougkearns
+
+	* chrome/content/vimperator/commands.js: use the coerced boolean
+	  value of args rather than testing for 0 string length when
+	  determining if an arg was passed to an ex command
+
+2007-08-27 07:07  dougkearns
+
+	* chrome/content/vimperator/commands.js: if no argument is given to
+	  :winopen open about:blank in the new window
+
+2007-08-26 15:12  dougkearns
+
+	* chrome/content/vimperator/completion.js: complete ':set inv' with
+	  boolean options
+
+2007-08-26 14:27  dougkearns
+
+	* NEWS, chrome/content/vimperator/ui.js: fix commandline history on
+	  Windows - prevent the default cmd_charPrevious action from being
+	  invoked for <Up
+
+2007-08-26 12:05  dougkearns
+
+	* NEWS: update NEWS
+
+2007-08-26 11:57  dougkearns
+
+	* chrome/content/vimperator/completion.js: add filename completion
+	  for Windows
+
+2007-08-25 15:48  dougkearns
+
+	* chrome/content/vimperator/bookmarks.js: read the Bookmarks
+	  Toolbar Folder when loading bookmarks - it has previously been
+	  skipped since BookmarksUtils.getAllChildren(root) doesn't read it
+
+2007-08-24 16:37  dougkearns
+
+	* chrome/content/vimperator/bookmarks.js: make sure search engine
+	  aliases are properly initialized
+
+2007-08-24 11:13  dougkearns
+
+	* chrome/content/vimperator/ui.js: remove unnecessary temp variable
+
+2007-08-24 11:10  dougkearns
+
+	* chrome/content/vimperator/: default.css, vimperator.xul: make
+	  sure the active listcell in the second column of the preview
+	  window uses HighlightText as the CSS color value and move the
+	  #vimperator-multiline-output styles to default.css
+
+2007-08-23 14:07  dougkearns
+
+	* chrome/content/vimperator/vimperator.js: allow ~/_vimperatorrc as
+	  the RC file and ~/vimperator/plugin as the plugin directory on
+	  Windows
+
+2007-08-23 13:38  dougkearns
+
+	* Makefile: use 0.5 for the version strings
+
+2007-08-21 21:54  dougkearns
+
+	* Makefile, NEWS, TODO, chrome/content/vimperator/bookmarks.js,
+	  chrome/content/vimperator/buffers.js,
+	  chrome/content/vimperator/commands.js,
+	  chrome/content/vimperator/completion.js,
+	  chrome/content/vimperator/events.js,
+	  chrome/content/vimperator/file.js,
+	  chrome/content/vimperator/find.js,
+	  chrome/content/vimperator/help.js,
+	  chrome/content/vimperator/mappings.js,
+	  chrome/content/vimperator/options.js,
+	  chrome/content/vimperator/tabs.js,
+	  chrome/content/vimperator/ui.js,
+	  chrome/content/vimperator/vimperator.js: merge HEAD
+
+2007-08-16 16:54  stubenschrott
+
+	* chrome/content/vimperator/: commands.js, ui.js: fixed :map x
+	  :<cr> problem
+
+2007-08-16 16:18  stubenschrott
+
+	* ChangeLog, NEWS: last commit before 0.5 is tagged
+
+2007-08-16 16:01  dougkearns
+
+	* chrome/content/vimperator/events.js: reset
+	  vimperator.input.buffer before executing mappings that may add
+	  more key events to the event buffer
+
+2007-08-16 15:56  dougkearns
+
+	* chrome/content/vimperator/commands.js: revert changes to :map arg
+	  parsing regexp in 1.190
+
+2007-08-16 15:51  dougkearns
+
+	* chrome/content/vimperator/help.js: fix help typo
+
+2007-08-16 15:49  dougkearns
+
+	* chrome/content/vimperator/commands.js: make sure URLs processed
+	  as a result of "gu" don't have //../ (the double forward slash)
+	  at the end
+
+2007-08-16 14:19  stubenschrott
 
 	* chrome/content/vimperator/: commands.js, help.js, vimperator.js:
 	  Fixed :map partly, still cannot cope with :map commans, where lhs
 	  is a 2-char string
 
-2007-08-16 14:25  dougkearns
+2007-08-16 12:25  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js: fix some
 	  trivial capitalization errors in help
 
-2007-08-16 13:21  dougkearns
+2007-08-16 11:21  dougkearns
 
 	* chrome/content/vimperator/mappings.js: replace '<' and '>' with
 	  HTML entities in help for n and N mappings
 
-2007-08-16 13:14  dougkearns
+2007-08-16 11:14  dougkearns
 
 	* chrome/content/vimperator/: buffers.js, commands.js, help.js,
 	  hints.js: move the global evaluateXPath() function to
 	  vimperator.buffer
 
-2007-08-16 12:58  dougkearns
+2007-08-16 10:58  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js, events.js,
 	  hints.js, mappings.js, options.js: fix some help typos
 
-2007-08-16 11:31  stubenschrott
+2007-08-16 09:31  stubenschrott
 
 	* chrome/content/vimperator/: commands.js, default.css, help.js,
 	  mappings.js, options.js: many small help fixes
 
-2007-08-15 20:49  dougkearns
+2007-08-15 18:49  dougkearns
 
 	* chrome/content/vimperator/commands.js: remove half-baked guard
 	  clauses for unimplemented bookmark commands
 
-2007-08-15 20:27  stubenschrott
+2007-08-15 18:27  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/bookmarks.js: added colors
 	  to :ls
 
-2007-08-15 19:47  stubenschrott
+2007-08-15 17:47  stubenschrott
 
 	* chrome/content/vimperator/ui.js: fixed focusing the MOW
 
-2007-08-15 19:45  stubenschrott
+2007-08-15 17:45  stubenschrott
 
 	* chrome/content/vimperator/vimperator.xul: overflow: hidden for
 	  the MOW
 
-2007-08-15 19:31  stubenschrott
+2007-08-15 17:31  stubenschrott
 
 	* chrome/content/vimperator/buffers.js: added colors to :ls
 
-2007-08-15 19:21  dougkearns
+2007-08-15 17:21  dougkearns
 
 	* chrome/content/vimperator/commands.js: use
 	  vimperator.events.feedkeys() for :map
 
-2007-08-15 18:45  dougkearns
+2007-08-15 16:45  dougkearns
 
 	* chrome/content/vimperator/: buffers.js, commands.js, mappings.js,
 	  tabs.js: use the multiline output window for :buffers and move
 	  the existing persistent window functionality to :buffers!
 
-2007-08-15 17:32  dougkearns
+2007-08-15 15:32  dougkearns
 
 	* NEWS, chrome/content/vimperator/commands.js: update NEWS to
 	  mention the renaming of bookmark related commands and fix some
 	  trivial help typos
 
-2007-08-15 15:24  dougkearns
+2007-08-15 13:24  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js: rename
 	  :bm, :bmadd, :bmdel to :bmarks, :bmark, :delbmarks respectively
 	  and use the multiline output window for :bmarks and :history
 
-2007-08-15 02:08  stubenschrott
+2007-08-15 00:08  stubenschrott
 
 	* chrome/content/vimperator/: buffers.js, mappings.js:
 	  australian/british english -> american english in comments added
 	  more help
 
-2007-08-14 18:16  dougkearns
+2007-08-14 16:16  dougkearns
 
 	* chrome/content/vimperator/bookmarks.js: use TH to markup the
 	  table headers in :marks/:qmarks output
 
-2007-08-14 17:32  dougkearns
+2007-08-14 15:32  dougkearns
 
 	* chrome/content/vimperator/: buffers.js, events.js, mappings.js,
 	  options.js: break up buffer.scrollAbsolute and
 	  buffer.scrollRelative into smaller, more specific, methods
 
-2007-08-14 17:24  dougkearns
+2007-08-14 15:24  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js,
 	  completion.js, default.css, events.js, file.js, find.js, ui.js,
 	  vimperator.js: some trivial formatting fixes
 
-2007-08-14 17:23  dougkearns
+2007-08-14 15:23  dougkearns
 
 	* chrome/content/vimperator/vimperator.js: don't echo an error
 	  message if no plugin directory is found
 
-2007-08-13 20:12  stubenschrott
+2007-08-13 18:12  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/mappings.js,
 	  chrome/content/vimperator/ui.js,
@@ -112,34 +316,34 @@
 	  hack better, so that it doesn't show during startup fixed
 	  wildoptions=sort
 
-2007-08-13 11:29  dougkearns
+2007-08-13 09:29  dougkearns
 
 	* chrome/content/vimperator/vimperator.js: fix plugin directory
 	  sourcing so it works on Windows - don't attempt to open the
 	  directory as an input stream
 
-2007-08-12 18:39  dougkearns
+2007-08-12 16:39  dougkearns
 
 	* chrome/content/vimperator/: commands.js, vimperator.js: expand
 	  environment variables in the filename argument to :source
 
-2007-08-12 15:20  dougkearns
+2007-08-12 13:20  dougkearns
 
 	* chrome/content/vimperator/mappings.js: don't echo text after
 	  copying it to the clipboard with "Y"
 
-2007-08-12 12:30  dougkearns
+2007-08-12 10:30  dougkearns
 
 	* chrome/content/vimperator/buffers.js: display an informational
 	  message when the text zoom value is changed
 
-2007-08-12 08:48  dougkearns
+2007-08-12 06:48  dougkearns
 
 	* NEWS, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/ui.js: add initial implementation of
 	  :normal command
 
-2007-08-12 02:03  stubenschrott
+2007-08-12 00:03  stubenschrott
 
 	* NEWS, chrome/content/vimperator/events.js,
 	  chrome/content/vimperator/ui.js,
@@ -149,56 +353,56 @@
 	  autosize MIW on new content new handling should be more robust,
 	  but there may be bugs, please report
 
-2007-08-11 22:05  stubenschrott
+2007-08-11 20:05  stubenschrott
 
 	* chrome/content/vimperator/: events.js, ui.js: fixed/renamed
 	  vimperator.events.toString(event); v.e.is{Accept,Cancel}Key(key)
 	  helper functions
 
-2007-08-11 21:20  stubenschrott
+2007-08-11 19:20  stubenschrott
 
 	* chrome/content/vimperator/: events.js, vimperator.xul: added
 	  <space>-support for feedkeys() moved
 	  KeyboardEvent.prototype.toString() ->
 	  vimperator.events.eventToString()
 
-2007-08-11 19:08  stubenschrott
+2007-08-11 17:08  stubenschrott
 
 	* ChangeLog, NEWS: changelog->NEWS, ChangeLog autogenerated now
 
-2007-08-11 18:26  dougkearns
+2007-08-11 16:26  dougkearns
 
 	* chrome/content/vimperator/commands.js: only allow :source to
 	  accept a single filename
 
-2007-08-11 16:49  dougkearns
+2007-08-11 14:49  dougkearns
 
 	* chrome/content/vimperator/buffers.js: change the bounds checking
 	  in scrollAbsolute() to allow for the fact scrollY can be larger
 	  than scrollMaxY
 
-2007-08-11 15:18  dougkearns
+2007-08-11 13:18  dougkearns
 
 	* chrome/content/vimperator/commands.js: allow multiple ranges to
 	  be specified to :delmarks - missing global regexp flag
 
-2007-08-11 15:07  dougkearns
+2007-08-11 13:07  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js: add
 	  support for the special version of :delqmarks!
 
-2007-08-11 14:46  dougkearns
+2007-08-11 12:46  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, completion.js,
 	  events.js, find.js, hints.js, ui.js: change remaining uses of the
 	  Array() constructor in array initializations to literals
 
-2007-08-11 13:53  dougkearns
+2007-08-11 11:53  dougkearns
 
 	* chrome/content/vimperator/buffers.js: beep when frame motion
 	  bounds are exceeded
 
-2007-08-11 11:28  dougkearns
+2007-08-11 09:28  dougkearns
 
 	* ChangeLog, chrome/content/vimperator/bookmarks.js,
 	  chrome/content/vimperator/commands.js,
@@ -206,101 +410,101 @@
 	  and :qmarkdel :delqmarks, sort :qmarks list output and limit
 	  buffer marks to [a-zA-Z]
 
-2007-08-10 20:30  stubenschrott
+2007-08-10 18:30  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/events.js: "enter" is an
 	  alias for "return" or "cr"
 
-2007-08-10 19:52  stubenschrott
+2007-08-10 17:52  stubenschrott
 
 	* chrome/content/vimperator/events.js: some whitespace formatting
 
-2007-08-10 19:48  stubenschrott
+2007-08-10 17:48  stubenschrott
 
 	* chrome/content/vimperator/: events.js, hints.js: feedkeys()
 	  support!! Some bugs may remain, please test thorougly escaping
 	  the < char not yet done, as the semantics is not clear yet
 
-2007-08-10 14:57  dougkearns
+2007-08-10 12:57  dougkearns
 
 	* chrome/content/vimperator/mappings.js: allow the Ctrl-U/Ctrl-D
 	  scroll count to be >= 1
 
-2007-08-10 13:58  dougkearns
+2007-08-10 11:58  dougkearns
 
 	* chrome/content/vimperator/hints.js: declare loop counter in
 	  yankUrlHints() and yankTextHints() and reverse rev 1.27
 
-2007-08-10 13:14  dougkearns
+2007-08-10 11:14  dougkearns
 
 	* chrome/content/vimperator/hints.js: move win.res guard clause
 	  after initialisation of win in loadCoord()
 
-2007-08-10 04:36  stubenschrott
+2007-08-10 02:36  stubenschrott
 
 	* chrome/content/vimperator/ui.js: fixed first use of
 	  setMultiline() with an ugly (but working) hack
 
-2007-08-10 03:38  stubenschrott
+2007-08-10 01:38  stubenschrott
 
 	* chrome/content/vimperator/hints.js: attempt to fix problems with
 	  hints on not finished page load, should fix messages to the error
 	  console
 
-2007-08-10 00:41  stubenschrott
+2007-08-09 22:41  stubenschrott
 
 	* ChangeLog, TODO, chrome/content/vimperator/mappings.js,
 	  chrome/content/vimperator/options.js: - Fixed gn command - added
 	  gH to activate option
 
-2007-08-09 17:32  dougkearns
+2007-08-09 15:32  dougkearns
 
 	* chrome/content/vimperator/mappings.js: use
 	  vimperator.buffer.location rather than replaced
 	  getCurrentLocation() for "y" mapping
 
-2007-08-09 16:42  dougkearns
+2007-08-09 14:42  dougkearns
 
 	* chrome/content/vimperator/contents.rdf: whitespace formatting fix
 
-2007-08-09 16:25  dougkearns
+2007-08-09 14:25  dougkearns
 
 	* chrome/content/vimperator/bookmarks.js: don't output status
 	  messages when history bounds are exceeded - just beep
 
-2007-08-09 14:26  dougkearns
+2007-08-09 12:26  dougkearns
 
 	* chrome/content/vimperator/hints.js: don't add a trailing '\n'
 	  when yanking a single line of text in extended hints mode
 
-2007-08-09 14:15  dougkearns
+2007-08-09 12:15  dougkearns
 
 	* chrome/content/vimperator/: commands.js, hints.js: remove the
 	  word "version" from the :version output string
 
-2007-08-09 06:29  dougkearns
+2007-08-09 04:29  dougkearns
 
 	* vimperator.vim: reorder vimperatorCommand highlight group so that
 	  :map is highlighted
 
-2007-08-08 18:47  dougkearns
+2007-08-08 16:47  dougkearns
 
 	* chrome/content/vimperator/: buffers.js, commands.js,
 	  completion.js, ui.js, vimperator.js: move global completion
 	  functions into a vimperator.completion module
 
-2007-08-08 12:19  dougkearns
+2007-08-08 10:19  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js: move global
 	  isDirectory() to Commands()
 
-2007-08-08 07:46  dougkearns
+2007-08-08 05:46  dougkearns
 
 	* chrome/content/vimperator/: commands.js, help.js, mappings.js:
 	  change {count} to [count] in the usage strings since specifying a
 	  count is always optional
 
-2007-08-08 07:27  dougkearns
+2007-08-08 05:27  dougkearns
 
 	* ChangeLog, chrome/content/vimperator/buffers.js,
 	  chrome/content/vimperator/commands.js,
@@ -308,29 +512,29 @@
 	  chrome/content/vimperator/options.js: add C-u/C-d mappings and
 	  the associated 'scroll' option
 
-2007-08-07 16:19  dougkearns
+2007-08-07 14:19  dougkearns
 
 	* chrome/content/vimperator/: buffers.js, commands.js, events.js,
 	  mappings.js, tabs.js, ui.js, vimperator.js, vimperator.xul:
 	  initial buffer implementation
 
-2007-08-07 14:57  dougkearns
+2007-08-07 12:57  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js: fix typo -
 	  using quickmark value from 'activate' rather than tabopen for
 	  :tabopen
 
-2007-08-07 14:14  dougkearns
+2007-08-07 12:14  dougkearns
 
 	* chrome/content/vimperator/: options.js, vimperator.js: move
 	  remaining preference setting from vimperator.startup to Options()
 
-2007-08-06 15:45  dougkearns
+2007-08-06 13:45  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, options.js, ui.js,
 	  vimperator.js: reverse last commit
 
-2007-08-06 14:52  dougkearns
+2007-08-06 12:52  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, options.js, ui.js,
 	  vimperator.js: move Option constructor to Options, move
@@ -338,87 +542,87 @@
 	  in vimperator.options and move all option initialisation to
 	  Options()
 
-2007-08-06 13:04  dougkearns
+2007-08-06 11:04  dougkearns
 
 	* chrome/content/vimperator/vimperator.js: don't emit an error
 	  message when ~/.vimperatorrc doesn't exist
 
-2007-08-05 16:12  dougkearns
+2007-08-05 14:12  dougkearns
 
 	* chrome/content/vimperator/: options.js, vimperator.js: use an
 	  unordered list rather than a table in the 'activate' help
 
-2007-08-05 08:43  dougkearns
+2007-08-05 06:43  dougkearns
 
 	* chrome/content/vimperator/: commands.js, hints.js, mappings.js,
 	  vimperator.js: move the global copyToClipboard() to a slot in
 	  vimperator
 
-2007-08-05 08:29  dougkearns
+2007-08-05 06:29  dougkearns
 
 	* chrome/content/vimperator/: commands.js, events.js, ui.js: move
 	  the global isFormElemFocused() to Events
 
-2007-08-04 15:38  dougkearns
+2007-08-04 13:38  dougkearns
 
 	* chrome/content/vimperator/: ui.js, vimperator.xul: add
 	  onMultilineOutputEvent for handling more-prompt keypress events
 
-2007-08-04 14:40  dougkearns
+2007-08-04 12:40  dougkearns
 
 	* chrome/content/vimperator/: commands.js, completion.js, file.js,
 	  vimperator.js: move global fopen() to a slot in vimperator
 
-2007-08-04 14:35  dougkearns
+2007-08-04 12:35  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js, options.js:
 	  remove debug toString() methods now we have vimperator.logObject
 
-2007-08-04 14:33  dougkearns
+2007-08-04 12:33  dougkearns
 
 	* chrome/content/vimperator/ui.js: remove more unnecessary
 	  toString() calls
 
-2007-08-04 14:18  dougkearns
+2007-08-04 12:18  dougkearns
 
 	* chrome/content/vimperator/bookmarks.js: remove unnecessary
 	  toString() call
 
-2007-08-04 05:22  dougkearns
+2007-08-04 03:22  dougkearns
 
 	* chrome/content/vimperator/: find.js, hints.js: replace references
 	  to deprecated window._content with window.content
 
-2007-08-03 04:45  stubenschrott
+2007-08-03 02:45  stubenschrott
 
 	* chrome/content/vimperator/: commands.js, events.js, hints.js,
 	  mappings.js, vimperator.js: - code cleanup by removing old
 	  commented code - merged zoom_in/to into vimperator.zoom()
 
-2007-08-02 17:43  dougkearns
+2007-08-02 15:43  dougkearns
 
 	* chrome/content/vimperator/: commands.js, completion.js, ui.js,
 	  vimperator.js: merge vimperator.execute and the execute_command()
 	  global function
 
-2007-08-02 07:10  dougkearns
+2007-08-02 05:10  dougkearns
 
 	* chrome/content/vimperator/: commands.js, vimperator.js: move the
 	  execute() global function to a slot of vimperator
 
-2007-08-01 14:29  stubenschrott
+2007-08-01 12:29  stubenschrott
 
 	* chrome/content/vimperator/default.css: changed listitem selection
 	  color to be the normal selection color of the system theme
 
-2007-08-01 06:13  stubenschrott
+2007-08-01 04:13  stubenschrott
 
 	* chrome/content/vimperator/default.css: finally found the CSS code
 	  to make the selection of listboxes better readable Putting it in
 	  default.css instead of my own userChrome.css, because also others
 	  have mentioned the hard readability.
 
-2007-08-01 04:51  stubenschrott
+2007-08-01 02:51  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/completion.js,
@@ -428,7 +632,7 @@
 	  add support for auto-sourcing ~/.vimperator/plugin/ before we
 	  release 0.5
 
-2007-08-01 03:17  stubenschrott
+2007-08-01 01:17  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/bookmarks.js,
 	  chrome/content/vimperator/commands.js,
@@ -436,32 +640,32 @@
 	  chrome/content/vimperator/options.js,
 	  chrome/content/vimperator/vimperator.js: winopen support
 
-2007-08-01 01:44  stubenschrott
+2007-07-31 23:44  stubenschrott
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js,
 	  vimperator.js: changed vimperator.open() to accept postdata,
 	  makes the design a little uncleaner, but supports _all_ firefox
 	  search engines now.
 
-2007-07-31 18:15  dougkearns
+2007-07-31 16:15  dougkearns
 
 	* chrome/content/vimperator/: mappings.js, vimperator.xul: add
 	  missing crop attribute to #vimperator-statusline-field-url label
 	  use "end" value for crop attributes rather than the deprecated
 	  "right"
 
-2007-07-31 18:02  stubenschrott
+2007-07-31 16:02  stubenschrott
 
 	* chrome/content/vimperator/commands.js: he is called linus
 	  torvalds
 
-2007-07-31 17:41  stubenschrott
+2007-07-31 15:41  stubenschrott
 
 	* TODO, chrome/content/vimperator/bookmarks.js,
 	  chrome/content/vimperator/commands.js: Make sure, search engine
 	  aliases are unique
 
-2007-07-29 05:48  stubenschrott
+2007-07-29 03:48  stubenschrott
 
 	* ChangeLog, TODO, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/ui.js,
@@ -470,38 +674,38 @@
 	  finished (some display bug may remain) :js <<EOF support is back,
 	  better than ever (TM)
 
-2007-07-27 20:49  stubenschrott
+2007-07-27 18:49  stubenschrott
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js, help.js,
 	  hints.js, mappings.js, ui.js, vimperator.js: openURLs ->
 	  vimperator.open(...) Support for adding bookmark groups to
 	  QuickMarks
 
-2007-07-27 12:24  stubenschrott
+2007-07-27 10:24  stubenschrott
 
 	* chrome/content/vimperator/mappings.js: added <Nop> support
 
-2007-07-27 02:01  stubenschrott
+2007-07-27 00:01  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/hints.js: stringToURLs ->
 	  String.prototype.toURLArray
 
-2007-07-26 15:39  dougkearns
+2007-07-26 13:39  dougkearns
 
 	* Makefile: fix bug #17377 - Unable to build sources on Mac OS X
 
-2007-07-25 17:55  dougkearns
+2007-07-25 15:55  dougkearns
 
 	* TODO, chrome/content/vimperator/mappings.js: fix infinite loop
 	  when calling "gu" with a {count}
 
-2007-07-25 16:09  dougkearns
+2007-07-25 14:09  dougkearns
 
 	* chrome/content/vimperator/default.css: make sure the first status
 	  bar label is flush left
 
-2007-07-25 15:33  dougkearns
+2007-07-25 13:33  dougkearns
 
 	* chrome/content/vimperator/: commands.js, find.js, help.js,
 	  mappings.js, vimperator.js: intialize the vimperator global
@@ -509,82 +713,82 @@
 	  function; move the init() and unload() global functions to
 	  startup and shutdown slots of vimperator
 
-2007-07-25 09:46  dougkearns
+2007-07-25 07:46  dougkearns
 
 	* chrome/content/vimperator/mappings.js: fix gH mapping so that it
 	  opens in a new tab - a regression
 
-2007-07-22 17:15  dougkearns
+2007-07-22 15:15  dougkearns
 
 	* vimperator.vim: add map, mapclear, noremap and unmap commands to
 	  the vimperatorCommand highlight group
 
-2007-07-22 16:59  dougkearns
+2007-07-22 14:59  dougkearns
 
 	* chrome/content/vimperator/mappings.js: initial mapping tables for
 	  all modes at startup
 
-2007-07-22 14:59  dougkearns
+2007-07-22 12:59  dougkearns
 
 	* chrome/content/vimperator/mappings.js: restore guard clause to
 	  the head of getMap() to test for uninitialized stacks
 
-2007-07-22 13:44  dougkearns
+2007-07-22 11:44  dougkearns
 
 	* ChangeLog, chrome/content/vimperator/commands.js: allow :noremap
 	  name abbreviations
 
-2007-07-22 13:36  dougkearns
+2007-07-22 11:36  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js: add initial
 	  (very rough) implementation of :noremap
 
-2007-07-22 09:18  dougkearns
+2007-07-22 07:18  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js: allow
 	  {count}, and other flags, to be passed to e user mapping's action
 
-2007-07-21 18:42  dougkearns
+2007-07-21 16:42  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js: add initial
 	  (very rough) implementations of :map, :mapclear and :unmap
 
-2007-07-21 16:19  dougkearns
+2007-07-21 14:19  dougkearns
 
 	* chrome/content/vimperator/commands.js: add missing :javascript[!]
 	  variant to the command's usage synopsis
 
-2007-07-21 16:12  dougkearns
+2007-07-21 14:12  dougkearns
 
 	* chrome/content/vimperator/: commands.js, help.js: make sure [!]
 	  is highlighted properly in the help page for all command usage
 	  synopses
 
-2007-07-21 11:25  dougkearns
+2007-07-21 09:25  dougkearns
 
 	* chrome/content/vimperator/help.js: fix typo in introductory help
 	  text
 
-2007-07-19 18:58  dougkearns
+2007-07-19 16:58  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, mappings.js: fix
 	  trivial help text typos
 
-2007-07-19 17:23  dougkearns
+2007-07-19 15:23  dougkearns
 
 	* chrome/content/vimperator/commands.js: don't specify Command
 	  usage strings when they match the default
 
-2007-07-19 07:56  dougkearns
+2007-07-19 05:56  dougkearns
 
 	* chrome/content/vimperator/commands.js: fix trivial help text
 	  typos
 
-2007-07-18 12:12  dougkearns
+2007-07-18 10:12  dougkearns
 
 	* chrome/content/vimperator/mappings.js: fix some comment typos
 
-2007-07-17 16:55  dougkearns
+2007-07-17 14:55  dougkearns
 
 	* ChangeLog, TODO, chrome/content/vimperator/bookmarks.js,
 	  chrome/content/vimperator/default.css,
@@ -593,17 +797,17 @@
 	  textboxes in the commandline and statusbar with labels and
 	  simplify the skin styling
 
-2007-07-13 18:40  dougkearns
+2007-07-13 16:40  dougkearns
 
 	* chrome/content/vimperator/help.js: remove the trailing HR from
 	  the help tables
 
-2007-07-13 17:01  dougkearns
+2007-07-13 15:01  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js: always
 	  construct a default usage string for mappings and commands
 
-2007-07-13 16:11  dougkearns
+2007-07-13 14:11  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, completion.js,
 	  events.js, mappings.js, options.js, tabs.js, ui.js,
@@ -611,144 +815,144 @@
 	  to files of their own and add a license header to files without
 	  one
 
-2007-07-12 09:48  dougkearns
+2007-07-12 07:48  dougkearns
 
 	* chrome/content/vimperator/vimperator.js: move initialisation of
 	  vimperator.input to the constructor function
 
-2007-07-11 19:10  dougkearns
+2007-07-11 17:10  dougkearns
 
 	* chrome/content/vimperator/vimperator.js: remove unused local
 	  variables in Vimperator()
 
-2007-07-11 10:35  dougkearns
+2007-07-11 08:35  dougkearns
 
 	* chrome/content/vimperator/: commands.js, vimperator.js: don't
 	  update the alternate tab list on TabOpen events
 
-2007-07-11 07:04  dougkearns
+2007-07-11 05:04  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js: move the
 	  global function focusNextFrame to a slot on vimperator -
 	  vimperator.shiftFrameFocus
 
-2007-07-10 17:02  dougkearns
+2007-07-10 15:02  dougkearns
 
 	* chrome/content/vimperator/vimperator.js: add KeyEvent -> String
 	  mappings for DOM_VK_LEFT_SHIFT, DOM_VK_LEFT_SHIFT and
 	  DOM_VK_F13-24
 
-2007-07-10 15:39  dougkearns
+2007-07-10 13:39  dougkearns
 
 	* chrome/content/vimperator/options.js: make sure input fields
 	  without an explicit 'type' attribute are matched by hinttags and
 	  extendedhintags
 
-2007-07-10 12:25  dougkearns
+2007-07-10 10:25  dougkearns
 
 	* chrome/content/vimperator/default.css: fix typo
 
-2007-07-10 12:07  dougkearns
+2007-07-10 10:07  dougkearns
 
 	* chrome/content/vimperator/: mappings.js, ui.js: limit the size of
 	  the multiline output window to the size of the browser panel
 
-2007-07-10 01:55  stubenschrott
+2007-07-09 23:55  stubenschrott
 
 	* chrome/content/vimperator/vimperator.js: changed shift-insert
 	  patch
 
-2007-07-10 01:12  stubenschrott
+2007-07-09 23:12  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/commands.js: :saveas works
 	  now
 
-2007-07-09 15:27  stubenschrott
+2007-07-09 13:27  stubenschrott
 
 	* AUTHORS, chrome/content/vimperator/commands.js: reverted scroll
 	  window.content patch for now (untested)
 
-2007-07-09 08:47  dougkearns
+2007-07-09 06:47  dougkearns
 
 	* chrome/content/vimperator/: default.css, vimperator.xul: move all
 	  XUL styling to default.css
 
-2007-07-08 22:38  stubenschrott
+2007-07-08 20:38  stubenschrott
 
 	* chrome/content/vimperator/vimperator.js: applied shift-insert
 	  patch
 
-2007-07-05 15:02  dougkearns
+2007-07-05 13:02  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js, options.js:
 	  use 'web page' rather than 'webpage' in the help text
 
-2007-07-05 08:52  dougkearns
+2007-07-05 06:52  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js: inline
 	  yankCurrentSelection(), yankCurrentLocation(), goUp()
 
-2007-07-05 08:48  dougkearns
+2007-07-05 06:48  dougkearns
 
 	* chrome/content/vimperator/: mappings.js, vimperator.js: reformat
 	  hints mode mapping definitions
 
-2007-07-05 08:14  dougkearns
+2007-07-05 06:14  dougkearns
 
 	* chrome/content/vimperator/: commands.js, options.js,
 	  vimperator.js: move the global function updateBufferList() to
 	  vimperator.tabs until we have real buffers
 
-2007-07-04 19:32  stubenschrott
+2007-07-04 17:32  stubenschrott
 
 	* chrome/content/vimperator/vimperator.js: applied the hintchar
 	  patch from calmar
 
-2007-07-04 15:32  stubenschrott
+2007-07-04 13:32  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/vimperator.js,
 	  chrome/content/vimperator/vimperator.xul: changed '|' to ', ' as
 	  a url separator
 
-2007-07-04 13:59  dougkearns
+2007-07-04 11:59  dougkearns
 
 	* chrome/content/vimperator/commands.js: move the bmadd() and
 	  bmdel() global functions into the corresponding command
 	  definitions
 
-2007-07-04 12:58  dougkearns
+2007-07-04 10:58  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js: move
 	  global function bmshow() to vimperator.bookmarks.list
 
-2007-07-04 12:31  dougkearns
+2007-07-04 10:31  dougkearns
 
 	* chrome/content/vimperator/commands.js: move tab() global function
 	  into :tab command definition
 
-2007-07-04 12:18  dougkearns
+2007-07-04 10:18  dougkearns
 
 	* chrome/content/vimperator/commands.js: complete :tab with command
 	  completions
 
-2007-07-04 12:11  dougkearns
+2007-07-04 10:11  dougkearns
 
 	* chrome/content/vimperator/: commands.js, help.js, mappings.js,
 	  vimperator.js, vimperator.xul: move global help() command to a
 	  vimperator slot
 
-2007-07-03 14:46  dougkearns
+2007-07-03 12:46  dougkearns
 
 	* chrome/content/vimperator/: mappings.js, vimperator.js: remove
 	  g_hint_mappings - initialise hint mappings in vimperator.mappings
 
-2007-07-03 13:37  dougkearns
+2007-07-03 11:37  dougkearns
 
 	* chrome/content/vimperator/mappings.js: change last references to
 	  stepInHistory() to vimperator.history.stepTo
 
-2007-07-03 11:04  stubenschrott
+2007-07-03 09:04  stubenschrott
 
 	* TODO, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/ui.js,
@@ -756,18 +960,18 @@
 	  chrome/content/vimperator/vimperator.xul: Fixed some focus issues
 	  First (non-working) readMultiline implementation
 
-2007-07-03 08:49  dougkearns
+2007-07-03 06:49  dougkearns
 
 	* chrome/content/vimperator/mappings.js: update old references to
 	  g_inputbuffer and g_count to vimperator.input.buffer and
 	  vimperator.input.count respectively
 
-2007-07-03 07:41  dougkearns
+2007-07-03 05:41  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js: move
 	  g_hint_mappings to mappings.js
 
-2007-07-03 07:30  dougkearns
+2007-07-03 05:30  dougkearns
 
 	* chrome/content/vimperator/: commands.js, help.js, mappings.js,
 	  options.js, vimperator.js: move buffer_switch and
@@ -775,115 +979,115 @@
 	  the "u" normal mode command call vimperator.commands.undo rather
 	  than execute_command() directly
 
-2007-07-02 17:06  dougkearns
+2007-07-02 15:06  dougkearns
 
 	* chrome/content/vimperator/commands.js: delete unused
 	  getCurrentLinkLocation() - moved to wiki
 
-2007-07-02 16:48  dougkearns
+2007-07-02 14:48  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js: move the
 	  hsshow(), stepInHistory(), historyGoToBeginning(), and
 	  historyGoToStart() global functions to vimperator.history
 
-2007-07-02 14:40  dougkearns
+2007-07-02 12:40  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js,
 	  vimperator.js: move reload() and reload_all() global functions to
 	  vimperator.tabs
 
-2007-07-02 14:15  dougkearns
+2007-07-02 12:15  dougkearns
 
 	* chrome/content/vimperator/commands.js: don't prefix false boolean
 	  option values with whitespace when reporting the value
 
-2007-07-02 13:59  dougkearns
+2007-07-02 11:59  dougkearns
 
 	* chrome/content/vimperator/commands.js: move the global set()
 	  command to the ex-command definition and return "name|noname' for
 	  boolean option queries rather than "name=value"
 
-2007-07-02 13:40  dougkearns
+2007-07-02 11:40  dougkearns
 
 	* chrome/content/vimperator/commands.js: remove template
 	  *_url_mark() functions now QuickMarks has been implemented
 
-2007-07-02 13:34  dougkearns
+2007-07-02 11:34  dougkearns
 
 	* chrome/content/vimperator/commands.js: move global restart()
 	  command to a vimperator slot
 
-2007-07-02 13:17  dougkearns
+2007-07-02 11:17  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js,
 	  vimperator.js: move global quit() command to a vimperator slot
 
-2007-07-02 12:29  dougkearns
+2007-07-02 10:29  dougkearns
 
 	* chrome/content/vimperator/: commands.js, hints.js, ui.js,
 	  vimperator.js: move global beep() command to a vimperator slot
 
-2007-07-02 11:43  dougkearns
+2007-07-02 09:43  dougkearns
 
 	* chrome/content/vimperator/: commands.js, vimperator.js: move
 	  global source() command to a vimperator slot
 
-2007-07-02 09:55  dougkearns
+2007-07-02 07:55  dougkearns
 
 	* chrome/content/vimperator/mappings.js: fix typo in help for 'M'
 	  mapping
 
-2007-07-02 09:40  dougkearns
+2007-07-02 07:40  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js: allow
 	  :marks to take an argument and sort its output properly
 
-2007-07-02 08:57  dougkearns
+2007-07-02 06:57  dougkearns
 
 	* ChangeLog, chrome/content/vimperator/mappings.js,
 	  chrome/content/vimperator/vimperator.js: add new Ctrl-^ mapping
 	  for selecting the alternate tab
 
-2007-07-01 15:04  dougkearns
+2007-07-01 13:04  dougkearns
 
 	* chrome/content/vimperator/commands.js: declare undeclared
 	  variable url
 
-2007-07-01 13:04  stubenschrott
+2007-07-01 11:04  stubenschrott
 
 	* chrome/content/vimperator/: hints.js, ui.js: autosize multiline
 	  widget
 
-2007-06-30 15:14  stubenschrott
+2007-06-30 13:14  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/mappings.js: changed gO to
 	  gn
 
-2007-06-30 12:37  dougkearns
+2007-06-30 10:37  dougkearns
 
 	* chrome/content/vimperator/mappings.js: allow multi-character
 	  normal mode user mappings
 
-2007-06-29 13:45  stubenschrott
+2007-06-29 11:45  stubenschrott
 
 	* chrome/content/vimperator/bookmarks.js: fixed :qmarks output
 
-2007-06-29 13:44  stubenschrott
+2007-06-29 11:44  stubenschrott
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js,
 	  mappings.js, vimperator.js: added QuickMarks
 
-2007-06-29 08:29  dougkearns
+2007-06-29 06:29  dougkearns
 
 	* chrome/content/vimperator/: hints.js, vimperator.js: rename the
 	  hints constructor hit_a_hint() to Hints()
 
-2007-06-29 06:30  dougkearns
+2007-06-29 04:30  dougkearns
 
 	* chrome/content/vimperator/help.js: declare undeclared variable
 	  'element'
 
-2007-06-28 04:16  dougkearns
+2007-06-28 02:16  dougkearns
 
 	* TODO, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/hints.js,
@@ -891,243 +1095,243 @@
 	  chrome/content/vimperator/vimperator.js: move the global variable
 	  hah to vimperator.hints and fix bug #17254
 
-2007-06-27 16:45  stubenschrott
+2007-06-27 14:45  stubenschrott
 
 	* chrome/content/vimperator/bookmarks.js: small display fixes in
 	  :marks
 
-2007-06-27 16:35  stubenschrott
+2007-06-27 14:35  stubenschrott
 
 	* chrome/content/vimperator/: bookmarks.js, ui.js: :marks support
 
-2007-06-27 15:10  stubenschrott
+2007-06-27 13:10  stubenschrott
 
 	* chrome/content/vimperator/: ui.js, vimperator.js, vimperator.xul:
 	  initial commit of multiline echo()
 
-2007-06-27 13:22  dougkearns
+2007-06-27 11:22  dougkearns
 
 	* chrome/content/vimperator/ui.js: declare loop counter in
 	  InformationList#fill
 
-2007-06-26 16:45  dougkearns
+2007-06-26 14:45  dougkearns
 
 	* chrome/content/vimperator/completion.js: remove unused var in
 	  exTabCompletion()
 
-2007-06-26 15:11  dougkearns
+2007-06-26 13:11  dougkearns
 
 	* chrome/content/vimperator/ui.js: rename StatusLine#setClass's
 	  parameter to 'type' since 'class' is a reserved word
 
-2007-06-26 14:50  dougkearns
+2007-06-26 12:50  dougkearns
 
 	* chrome/content/vimperator/find.js: comment out unused :nohlsearch
 	  for now
 
-2007-06-26 14:32  dougkearns
+2007-06-26 12:32  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js: don't
 	  bother returning a status value in Marks#jumpTo and remove
 	  trailing comma in :mark help propery assignment
 
-2007-06-26 14:19  dougkearns
+2007-06-26 12:19  dougkearns
 
 	* chrome/content/vimperator/commands.js: remove trailing comma in
 	  :delmarks help propery assignment
 
-2007-06-26 07:07  dougkearns
+2007-06-26 05:07  dougkearns
 
 	* chrome/content/vimperator/help.js: remove FIXME comment
 
-2007-06-26 06:44  dougkearns
+2007-06-26 04:44  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js,
 	  vimperator.js: fix :mark and :delmarks (AKA return of the marks)
 	  and add range support to :delmarks
 
-2007-06-25 23:23  stubenschrott
+2007-06-25 21:23  stubenschrott
 
 	* vimperator.vim: verbosity -> verbose
 
-2007-06-25 17:57  dougkearns
+2007-06-25 15:57  dougkearns
 
 	* chrome/content/vimperator/options.js: remove unnecessarily
 	  defined getters for the go, stal, titlestring options
 
-2007-06-25 17:54  dougkearns
+2007-06-25 15:54  dougkearns
 
 	* vimperator.vim: add verbosity and vbs to options syntax group
 
-2007-06-25 17:37  dougkearns
+2007-06-25 15:37  dougkearns
 
 	* chrome/content/vimperator/: completion.js, options.js: add basic
 	  validators for the cpt, go, ssli, vbs, wim, and wop options
 
-2007-06-25 14:53  dougkearns
+2007-06-25 12:53  dougkearns
 
 	* chrome/content/vimperator/commands.js: make :set display an error
 	  message and abort if an explicit value is specified for a boolean
 	  option
 
-2007-06-25 14:06  dougkearns
+2007-06-25 12:06  dougkearns
 
 	* chrome/content/vimperator/commands.js: make error messages
 	  generated by :set more Vim-like
 
-2007-06-23 13:08  dougkearns
+2007-06-23 11:08  dougkearns
 
 	* vimperator.vim: link vimperatorTodo to the Todo highlight group
 
-2007-06-22 13:00  dougkearns
+2007-06-22 11:00  dougkearns
 
 	* chrome/content/vimperator/vimperator.js: move hrist's incomplete
 	  tab numbering patch to the Wiki for now
 
-2007-06-22 12:42  dougkearns
+2007-06-22 10:42  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js,
 	  completion.js, file.js, find.js, help.js, hints.js, mappings.js,
 	  options.js, ui.js, vimperator.js: normalise fold markers
 
-2007-06-21 18:13  dougkearns
+2007-06-21 16:13  dougkearns
 
 	* chrome/content/vimperator/completion.js: remove FIXME comment
 
-2007-06-21 16:29  dougkearns
+2007-06-21 14:29  dougkearns
 
 	* chrome/content/vimperator/bookmarks.js: add fold markers
 
-2007-06-21 13:45  dougkearns
+2007-06-21 11:45  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js: improve the
 	  frame motion command - add [f to the existing ]f and support
 	  {count} for both
 
-2007-06-20 16:07  stubenschrott
+2007-06-20 14:07  stubenschrott
 
 	* chrome/content/vimperator/: ui.js, vimperator.js: keyToString ->
 	  event.toString()
 
-2007-06-20 01:01  stubenschrott
+2007-06-19 23:01  stubenschrott
 
 	* chrome/content/vimperator/: bookmarks.js, find.js, hints.js,
 	  options.js, ui.js, vimperator.js: moved log and logObject into
 	  the vimperator object
 
-2007-06-19 16:57  dougkearns
+2007-06-19 14:57  dougkearns
 
 	* chrome/content/vimperator/commands.js: remove unused functions
 	  outputAddonsList, selectInput, and toggle_image
 
-2007-06-19 16:34  dougkearns
+2007-06-19 14:34  dougkearns
 
 	* chrome/content/vimperator/bookmarks.js: declare title temporary
 	  variable
 
-2007-06-19 15:42  dougkearns
+2007-06-19 13:42  dougkearns
 
 	* chrome/content/vimperator/vimperator.js: remove unused prev_match
 	  and heredoc global variables
 
-2007-06-19 14:37  dougkearns
+2007-06-19 12:37  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js: make the
 	  global function parseBookmarkString a static function of
 	  Bookmarks
 
-2007-06-19 08:27  dougkearns
+2007-06-19 06:27  dougkearns
 
 	* chrome/content/vimperator/commands.js: add all commands by name
 	  as properties of vimperator.commands
 
-2007-06-19 08:22  dougkearns
+2007-06-19 06:22  dougkearns
 
 	* chrome/content/vimperator/commands.js: output "not implemented
 	  yet" messages for all unimplemented commands
 
-2007-06-19 06:40  dougkearns
+2007-06-19 04:40  dougkearns
 
 	* vimperator.vim: update vimperator.vim with new commands
 
-2007-06-19 06:18  dougkearns
+2007-06-19 04:18  dougkearns
 
 	* chrome/content/vimperator/commands.js: make sure Command.names
 	  includes unabbreviatable names
 
-2007-06-18 16:34  dougkearns
+2007-06-18 14:34  dougkearns
 
 	* chrome/content/vimperator/: commands.js, help.js, vimperator.js:
 	  rename vimperator.ver to vimperator.version
 
-2007-06-18 09:59  dougkearns
+2007-06-18 07:59  dougkearns
 
 	* chrome/content/vimperator/options.js: don't include "no" prefixed
 	  variants of boolean option names in the usage
 
-2007-06-18 09:31  dougkearns
+2007-06-18 07:31  dougkearns
 
 	* chrome/content/vimperator/commands.js: fix typo in :bdelete help
 
-2007-06-18 08:28  dougkearns
+2007-06-18 06:28  dougkearns
 
 	* chrome/content/vimperator/: commands.js, completion.js: remove
 	  COMMANDS, USAGE, SHORTHELP and HELP global constants
 
-2007-06-18 07:37  dougkearns
+2007-06-18 05:37  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js: improve
 	  whitespace formatting of Command.toString
 
-2007-06-17 13:56  dougkearns
+2007-06-17 11:56  dougkearns
 
 	* chrome/content/vimperator/help.js: fix typo in previous commit
 
-2007-06-17 11:34  stubenschrott
+2007-06-17 09:34  stubenschrott
 
 	* chrome/content/vimperator/help.js: made default value in help
 	  monospace again
 
-2007-06-16 13:36  dougkearns
+2007-06-16 11:36  dougkearns
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js,
 	  completion.js, help.js, hints.js, mappings.js, options.js, ui.js,
 	  vimperator.js: initial Option/Options implementation - replacing
 	  g_options
 
-2007-06-15 13:08  dougkearns
+2007-06-15 11:08  dougkearns
 
 	* chrome/content/vimperator/completion.js: allow :set no<TAB> to be
 	  completed with the "no"-prefix version of all boolean options
 
-2007-06-15 12:37  dougkearns
+2007-06-15 10:37  dougkearns
 
 	* chrome/content/vimperator/commands.js: reorder Command.names as
 	  longname1, shortname1, longname2, shortname2
 
-2007-06-14 06:11  dougkearns
+2007-06-14 04:11  dougkearns
 
 	* chrome/content/vimperator/: commands.js, options.js, ui.js,
 	  vimperator.js: remove unnecessary parentheses from typeof
 	  operands
 
-2007-06-13 09:53  dougkearns
+2007-06-13 07:53  dougkearns
 
 	* chrome/content/vimperator/default.css: don't specify a font-size
 	  for the help page
 
-2007-06-13 09:17  dougkearns
+2007-06-13 07:17  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js: remove some
 	  unnecessary guard clauses
 
-2007-06-13 09:14  dougkearns
+2007-06-13 07:14  dougkearns
 
 	* chrome/content/vimperator/: commands.js, vimperator.js: prefer
 	  comparison with the undefined literal rather than using typeof
 	  and comparing against "undefined"
 
-2007-06-12 12:48  stubenschrott
+2007-06-12 10:48  stubenschrott
 
 	* ChangeLog, TODO, chrome/content/vimperator/find.js,
 	  chrome/content/vimperator/ui.js,
@@ -1138,33 +1342,33 @@
 	  should come later when holding shift - cleared commandline on
 	  scroll events
 
-2007-06-12 08:21  vkojouharov
+2007-06-12 06:21  vkojouharov
 
 	* chrome/content/vimperator/bookmarks.js: uppercase marks work once
 	  again
 
-2007-06-11 14:51  dougkearns
+2007-06-11 12:51  dougkearns
 
 	* chrome/content/vimperator/: completion.js, default.css, help.js:
 	  use code.tag element's text content to anchor the help 'section'
 	  location rather than code.id
 
-2007-06-10 18:03  dougkearns
+2007-06-10 16:03  dougkearns
 
 	* chrome/content/vimperator/commands.js: remove unused var
 	  declaration in commandsIterator()
 
-2007-06-10 13:16  dougkearns
+2007-06-10 11:16  dougkearns
 
 	* chrome/content/vimperator/commands.js: translate ~ to HOME on
 	  Windows for use with :source
 
-2007-06-09 16:06  stubenschrott
+2007-06-09 14:06  stubenschrott
 
 	* chrome/content/vimperator/: mappings.js, vimperator.js: Final
 	  commit for the weekend: moved onKeyPress -> vimperator.events;
 
-2007-06-09 15:39  stubenschrott
+2007-06-09 13:39  stubenschrott
 
 	* ChangeLog, TODO, chrome/content/vimperator/mappings.js,
 	  chrome/content/vimperator/vimperator.js,
@@ -1172,51 +1376,51 @@
 	  class Please report all bugs which arised because of these
 	  changes Still not sure, if we should put that into an event.js
 
-2007-06-09 15:20  vkojouharov
+2007-06-09 13:20  vkojouharov
 
 	* chrome/content/vimperator/bookmarks.js: The global marks
 	  correctly jump to their stored position, once the page has been
 	  loaded
 
-2007-06-09 15:05  stubenschrott
+2007-06-09 13:05  stubenschrott
 
 	* chrome/content/vimperator/vimperator.js: Finally made event
 	  handling sane, creating an Events object will come soon.  This
 	  fixed many bugs like the reload/stop buttons being correctly
 	  updated now, while getting rid of lots of old code.
 
-2007-06-08 19:21  stubenschrott
+2007-06-08 17:21  stubenschrott
 
 	* mozunit.js: added preliminary unit tests, not working yet,
 	  because the vimperator object cannot be found in this context.
 
-2007-06-08 17:33  dougkearns
+2007-06-08 15:33  dougkearns
 
 	* chrome/content/vimperator/: default.css, help.js: make sure the
 	  help text is using a fixed-pitch font
 
-2007-06-08 17:16  dougkearns
+2007-06-08 15:16  dougkearns
 
 	* chrome/content/vimperator/: commands.js, mappings.js: use ||
 	  short-circuit initialization idiom when processing Command and
 	  Map constructor args
 
-2007-06-08 08:48  dougkearns
+2007-06-08 06:48  dougkearns
 
 	* chrome/content/vimperator/commands.js: markup the ex-command
 	  special flag '!' with code.command in help text
 
-2007-06-08 02:46  dougkearns
+2007-06-08 00:46  dougkearns
 
 	* chrome/content/vimperator/commands.js: remove old/disabled
 	  :addons command
 
-2007-06-08 02:06  stubenschrott
+2007-06-08 00:06  stubenschrott
 
 	* chrome/content/vimperator/vimperator.js: small fixes to the input
 	  handling
 
-2007-06-08 01:33  stubenschrott
+2007-06-07 23:33  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/bookmarks.js,
 	  chrome/content/vimperator/commands.js,
@@ -1225,206 +1429,205 @@
 	  chrome/content/vimperator/vimperator.js: marks support (thanks
 	  viktor)
 
-2007-06-07 14:53  stubenschrott
+2007-06-07 12:53  stubenschrott
 
 	* chrome/content/vimperator/commands.js: added back zoom_to
 	  function
 
-2007-06-07 08:54  dougkearns
+2007-06-07 06:54  dougkearns
 
 	* chrome/content/vimperator/commands.js: markup 'activate' option
 	  as such in :tabopen help text
 
-2007-06-07 08:45  dougkearns
+2007-06-07 06:45  dougkearns
 
 	* chrome/content/vimperator/: commands.js, help.js, mappings.js,
 	  options.js: fix some help text typos
 
-2007-06-07 06:40  stubenschrott
+2007-06-07 04:40  stubenschrott
 
 	* chrome/content/vimperator/default.css: changed the colors back to
 	  green/red.
 
-2007-06-06 18:01  dougkearns
+2007-06-06 16:01  dougkearns
 
 	* chrome/content/vimperator/commands.js: remove unused global
 	  constants FUNCTION and COMPLETEFUNC
 
-2007-06-06 17:32  dougkearns
+2007-06-06 15:32  dougkearns
 
 	* chrome/content/vimperator/: commands.js, completion.js,
-	  default.css, help.js, mappings.js, options.js, settings.js,
-	  vimperator.xul: change all references to "settings" to "options"
+	  default.css, help.js, mappings.js, options.js, vimperator.xul:
+	  change all references to "settings" to "options"
 
-2007-06-06 15:52  dougkearns
+2007-06-06 13:52  dougkearns
 
 	* chrome/content/vimperator/: commands.js, completion.js,
-	  default.css, help.js, mappings.js, settings.js, vimperator.xul:
-	  convert help page to XHTML Strict (excepting the id values) and
-	  add initial implementations for the :viusage and :exusage
-	  commands
+	  default.css, help.js, mappings.js, vimperator.xul: convert help
+	  page to XHTML Strict (excepting the id values) and add initial
+	  implementations for the :viusage and :exusage commands
 
-2007-06-06 08:42  dougkearns
+2007-06-06 06:42  dougkearns
 
 	* chrome/content/vimperator/: commands.js, completion.js, find.js,
 	  help.js, mappings.js: initial Command/Commands implementation -
 	  replacing g_commands
 
-2007-06-05 16:05  dougkearns
+2007-06-05 14:05  dougkearns
 
 	* chrome/content/vimperator/bookmarks.js: comment out debugging log
 	  message
 
-2007-06-05 07:22  dougkearns
+2007-06-05 05:22  dougkearns
 
 	* TODO: add <ESC> closes :addons window bug to TODO
 
-2007-06-03 18:12  dougkearns
+2007-06-03 16:12  dougkearns
 
 	* chrome/content/vimperator/: mappings.js, vimperator.js: fix
 	  missing [count] functionality in normal mode commands
 
-2007-05-31 19:58  stubenschrott
+2007-05-31 17:58  stubenschrott
 
 	* chrome/content/vimperator/mappings.js: made action public to
 	  change .execute() to be a prototype
 
-2007-05-31 13:02  dougkearns
+2007-05-31 11:02  dougkearns
 
 	* chrome/content/vimperator/: completion.js, help.js: add missing
 	  var declarations
 
-2007-05-31 11:11  stubenschrott
+2007-05-31 09:11  stubenschrott
 
 	* chrome/content/vimperator/: commands.js, completion.js, help.js,
 	  mappings.js, vimperator.js, vimperator.xul: merged the new
 	  mappings code, all glory goes to Doug!
 
-2007-05-31 08:45  dougkearns
+2007-05-31 06:45  dougkearns
 
 	* chrome/content/vimperator/mappings.js: fix the mapping usage
 	  string to only show the primary command
 
-2007-05-30 15:03  dougkearns
+2007-05-30 13:03  dougkearns
 
 	* chrome/content/vimperator/ui.js: fix typo in bufferposition_str
 	  variable declaration
 
-2007-05-30 13:58  dougkearns
+2007-05-30 11:58  dougkearns
 
 	* chrome/content/vimperator/mappings.js: remove a trailing , and
 	  :retab the file
 
-2007-05-30 11:35  dougkearns
+2007-05-30 09:35  dougkearns
 
 	* chrome/content/vimperator/mappings.js: change references to
 	  vimperator.mode to vimperator.modes
 
-2007-05-30 09:22  dougkearns
+2007-05-30 07:22  dougkearns
 
 	* chrome/content/vimperator/mappings.js: fix extra_info processing
 	  in Map() and other minor typos
 
-2007-05-30 06:25  stubenschrott
+2007-05-30 04:25  stubenschrott
 
 	* chrome/content/vimperator/mappings.js: cleaned up mappings code,
 	  should be feature complete now (apart from the non-implemented
 	  getAll() method.
 
-2007-05-29 12:42  stubenschrott
+2007-05-29 10:42  stubenschrott
 
-	* chrome/content/vimperator/: settings.js, vimperator.js: Added
-	  (outcommented because too slow) 'numbertabs' option (by hrist).
+	* chrome/content/vimperator/vimperator.js: Added (outcommented
+	  because too slow) 'numbertabs' option (by hrist).
 
-2007-05-29 08:38  vkojouharov
+2007-05-29 06:38  vkojouharov
 
 	* chrome/content/vimperator/mappings.js: changed the flags back.
 	  don't use 1 << 0 for any of the flags, since the 'default' one is
 	  0
 
-2007-05-29 03:55  dougkearns
+2007-05-29 01:55  dougkearns
 
 	* chrome/content/vimperator/mappings.js: fix some minor,
 	  reintroduced, typos and add missing help line for <ESC> map
 
-2007-05-29 00:46  stubenschrott
+2007-05-28 22:46  stubenschrott
 
 	* chrome/content/vimperator/mappings.js: changed coding style,
 	  commented things which should be changed with XXX:
 
-2007-05-28 19:09  dougkearns
+2007-05-28 17:09  dougkearns
 
 	* chrome/content/vimperator/commands.js: add missing var
 	  declaration to urls in openURLs*()
 
-2007-05-28 18:49  dougkearns
+2007-05-28 16:49  dougkearns
 
 	* chrome/content/vimperator/mappings.js: finish converting the
 	  mappings to the new Map() format
 
-2007-05-28 09:22  dougkearns
+2007-05-28 07:22  dougkearns
 
 	* chrome/content/vimperator/vimperator.js: add missing variable
 	  declaration for thistype, thismode, thisfunc in triggerCallBack()
 
-2007-05-28 03:06  dougkearns
+2007-05-28 01:06  dougkearns
 
 	* chrome/content/vimperator/: find.js, vimperator.js: remove last
 	  references to command_line and status_line
 
-2007-05-27 17:48  stubenschrott
+2007-05-27 15:48  stubenschrott
 
 	* chrome/content/vimperator/: vimperator.js, vimperator.xul:
 	  explicitly set JS version to 1.7
 
-2007-05-27 17:20  vkojouharov
+2007-05-27 15:20  vkojouharov
 
 	* chrome/content/vimperator/mappings.js: RFC: the api for the new
 	  mappings
 
-2007-05-25 15:11  stubenschrott
+2007-05-25 13:11  stubenschrott
 
 	* chrome/content/vimperator/find.js: removed 'noh'
 
-2007-05-25 13:13  stubenschrott
+2007-05-25 11:13  stubenschrott
 
 	* chrome/content/vimperator/: commands.js, find.js: changed
 	  nohlsearch to the new spec
 
-2007-05-25 08:59  dougkearns
+2007-05-25 06:59  dougkearns
 
 	* chrome/content/vimperator/commands.js: fix accidental regression
 	  in :tabmove name specification
 
-2007-05-24 23:57  stubenschrott
+2007-05-24 21:57  stubenschrott
 
 	* AUTHORS, ChangeLog, TODO, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/vimperator.js: added Y command
 
-2007-05-24 18:54  dougkearns
+2007-05-24 16:54  dougkearns
 
 	* chrome/content/vimperator/vimperator.js: update the buffer list
 	  on page load completion (the non-existant showBufferList() was
 	  being called rather than updateBufferList())
 
-2007-05-24 13:49  dougkearns
+2007-05-24 11:49  dougkearns
 
 	* chrome/content/vimperator/commands.js: fix typo in :open
 	  command's short help description
 
-2007-05-24 12:47  stubenschrott
+2007-05-24 10:47  stubenschrott
 
 	* AUTHORS, ChangeLog, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/vimperator.js: flashing frame works now
 
-2007-05-23 03:18  stubenschrott
+2007-05-23 01:18  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/vimperator.js,
 	  chrome/content/vimperator/vimperator.xul: moved tab related
 	  functions to the Tabs class
 
-2007-05-22 11:13  stubenschrott
+2007-05-22 09:13  stubenschrott
 
 	* ChangeLog, TODO, chrome/content/vimperator/bookmarks.js,
 	  chrome/content/vimperator/commands.js,
@@ -1433,23 +1636,23 @@
 	  chrome/content/vimperator/vimperator.xul: many help fixes moved
 	  echo() -> vimperator.echo() and removed old XUL entries.
 
-2007-05-21 11:35  stubenschrott
+2007-05-21 09:35  stubenschrott
 
 	* ChangeLog, TODO, vimperator.vim,
 	  chrome/content/vimperator/commands.js: "R" -> reload without
 	  cache
 
-2007-05-20 18:01  stubenschrott
+2007-05-20 16:01  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/default.css,
 	  chrome/content/vimperator/vimperator.js: changed colors
 
-2007-05-20 17:52  stubenschrott
+2007-05-20 15:52  stubenschrott
 
 	* chrome/content/vimperator/: commands.js, completion.js, help.js,
 	  vimperator.js: commited help typos
 
-2007-05-20 15:53  vkojouharov
+2007-05-20 13:53  vkojouharov
 
 	* chrome/content/vimperator/: default.css, ui.js, vimperator.js:
 	  move the statusbar color handling to the css file. for the
@@ -1457,261 +1660,243 @@
 	  should also be set, otherwise text might be unreadable in dark
 	  themes (or light themes, depending on what theme the user has)
 
-2007-05-20 13:05  stubenschrott
+2007-05-20 11:05  stubenschrott
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js,
 	  contents.rdf, vimperator.js: commited pending changes, nothing
 	  big
 
-2007-05-18 17:43  stubenschrott
+2007-05-18 15:43  stubenschrott
 
 	* chrome/content/vimperator/completion.js: one less global variable
 	  (g_completions)
 
-2007-05-18 17:36  stubenschrott
+2007-05-18 15:36  stubenschrott
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js,
 	  completion.js, ui.js, vimperator.js: fully objectized History()
 	  and Bookmarks()
 
-2007-05-18 06:13  stubenschrott
+2007-05-18 04:13  stubenschrott
 
 	* chrome/content/vimperator/: commands.js, find.js, hints.js,
-	  settings.js, ui.js, vimperator.js: rewrote mode-handling
+	  ui.js, vimperator.js: rewrote mode-handling
 
-2007-05-17 20:48  stubenschrott
+2007-05-17 18:48  stubenschrott
 
 	* AUTHORS, ChangeLog, TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/settings.js,
 	  chrome/content/vimperator/vimperator.js: Added "titlestring"
 	  setting
 
-2007-05-16 17:31  stubenschrott
+2007-05-16 15:31  stubenschrott
 
-	* chrome/content/vimperator/: commandline.js, commands.js, find.js,
-	  ui.js, vimperator.js, vimperator.xul: renamed commandline.js ->
-	  ui.js moved all statusbar code to the StatusLine() class
+	* chrome/content/vimperator/: commands.js, find.js, ui.js,
+	  vimperator.js, vimperator.xul: renamed commandline.js -> ui.js
+	  moved all statusbar code to the StatusLine() class
 
-2007-05-15 06:50  stubenschrott
+2007-05-15 04:50  stubenschrott
 
-	* chrome/content/vimperator/: commandline.js, commands.js,
-	  completion.js, settings.js, tags, vimperator.js, vimperator.xul:
-	  renamed CompletionList -> InformationList which is now a common
-	  class for the completion window, for the preview window and the
-	  buffer window ("B").	Only the StatusLine class to go...
+	* chrome/content/vimperator/: commands.js, completion.js,
+	  vimperator.js, vimperator.xul: renamed CompletionList ->
+	  InformationList which is now a common class for the completion
+	  window, for the preview window and the buffer window ("B").  Only
+	  the StatusLine class to go...
 
-2007-05-14 15:51  stubenschrott
+2007-05-14 13:51  stubenschrott
 
-	* chrome/content/vimperator/: commandline.js, default.css, find.js:
-	  small CSS fixes by Doug and added modelines to find.js and
-	  commandline.js
+	* chrome/content/vimperator/: default.css, find.js: small CSS fixes
+	  by Doug and added modelines to find.js and commandline.js
 
-2007-05-14 15:24  stubenschrott
+2007-05-14 13:24  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/commands.js: initial
 	  :tabmove command
 
-2007-05-14 00:29  vkojouharov
+2007-05-13 22:29  vkojouharov
 
 	* chrome/content/vimperator/help.js: The Help Strikes Back
 
-2007-05-13 23:36  vkojouharov
+2007-05-13 21:36  vkojouharov
 
-	* chrome/content/vimperator/: settings.js, vimperator.js: The
-	  Return of the Link
+	* chrome/content/vimperator/vimperator.js: The Return of the Link
 
-2007-05-13 19:17  vkojouharov
+2007-05-12 15:27  stubenschrott
 
-	* chrome/content/vimperator/commandline.js: fixed the indentation
-	  and and command line completion
+	* chrome/content/vimperator/find.js: add forgotten files
 
-2007-05-12 17:27  stubenschrott
-
-	* chrome/content/vimperator/: commandline.js, find.js: add
-	  forgotten files
-
-2007-05-11 14:42  stubenschrott
+2007-05-11 12:42  stubenschrott
 
 	* Makefile, chrome/content/vimperator/bookmarks.js,
 	  chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/completion.js,
 	  chrome/content/vimperator/help.js,
 	  chrome/content/vimperator/hints.js,
-	  chrome/content/vimperator/settings.js,
-	  chrome/content/vimperator/tags,
 	  chrome/content/vimperator/vimperator.js,
 	  chrome/content/vimperator/vimperator.xul: First attempt in making
 	  vimperator object orietened.	For now only the CommandLine widget
 	  was made a real encapsulated object.
 
-2007-05-09 13:56  stubenschrott
+2007-05-09 11:56  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/vimperator.js: final commit before
 	  trying to integrate the search patch
 
-2007-05-09 03:44  stubenschrott
+2007-05-09 01:44  stubenschrott
 
 	* chrome/content/vimperator/vimperator.js: changed setOverLink back
 	  to echo() as I really couldn't stand it anymore in the statusbar
 	  Mail me if you really want it in the statusbar, and come up with
 	  a good setting name for this preference
 
-2007-05-09 02:31  stubenschrott
+2007-05-09 00:31  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/help.js,
-	  chrome/content/vimperator/settings.js,
 	  chrome/content/vimperator/vimperator.js: cleaned up html code for
 	  :help to make it more xhtml compatible :help now opens in the
 	  current tab even when current tab is a xhtml document
 
-2007-05-08 23:21  stubenschrott
+2007-05-08 21:21  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/hints.js,
-	  chrome/content/vimperator/settings.js: hint work on xhtml pages
-	  now (slight problem with not disapperaring them still open)
+	  chrome/content/vimperator/hints.js: hint work on xhtml pages now
+	  (slight problem with not disapperaring them still open)
 
-2007-05-08 18:57  stubenschrott
+2007-05-08 16:57  stubenschrott
 
 	* AUTHORS, ChangeLog, TODO, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/completion.js,
 	  chrome/content/vimperator/help.js: added :tablast etc. commands
 
-2007-05-08 17:04  vkojouharov
+2007-05-08 15:04  vkojouharov
 
 	* chrome/content/vimperator/completion.js: the substrings shouldn't
 	  be cleared in this particular case
 
-2007-05-05 00:48  stubenschrott
+2007-05-04 22:48  stubenschrott
 
 	* AUTHORS, ChangeLog, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/completion.js: fixed :dl command
 
-2007-05-04 20:04  stubenschrott
+2007-05-04 18:04  stubenschrott
 
 	* ChangeLog, Donators, Makefile, vimperator.vim,
 	  vimperatorrc.example, chrome/content/vimperator/bookmarks.js,
 	  chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/completion.js,
 	  chrome/content/vimperator/help.js,
-	  chrome/content/vimperator/settings.js,
-	  chrome/content/vimperator/tags,
 	  chrome/content/vimperator/vimperator.js: keyword support for
 	  bookmarks
 
-2007-05-03 15:27  stubenschrott
+2007-05-03 13:27  stubenschrott
 
 	* chrome/content/vimperator/help.js: fixed \\n in help files
 
-2007-05-02 14:59  stubenschrott
+2007-05-02 12:59  stubenschrott
 
 	* ChangeLog: [no log message]
 
-2007-05-02 14:55  stubenschrott
+2007-05-02 12:55  stubenschrott
 
 	* ChangeLog, Makefile, chrome/content/vimperator/bookmarks.js: bug
 	  fix release
 
-2007-05-02 14:47  stubenschrott
+2007-05-02 12:47  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/commands.js: fixed :open
 	  google.com opening google for searching ".com"
 
-2007-05-02 14:28  stubenschrott
+2007-05-02 12:28  stubenschrott
 
 	* chrome/content/vimperator/: default.css, help.js, vimperator.js:
 	  pass <enter> <space> <tab> etc. to vimperator now, so that they
 	  can perform their default action without beeping.  Quite hacky so
 	  far, should be cleaned up.
 
-2007-05-02 06:18  stubenschrott
+2007-05-02 04:18  stubenschrott
 
 	* chrome/content/vimperator/: default.css, help.js: added version
 	  info to help file, fixed font size for tables
 
-2007-05-01 19:29  stubenschrott
+2007-05-01 17:29  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/bookmarks.js,
 	  chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/settings.js,
-	  chrome/content/vimperator/tags,
 	  chrome/content/vimperator/vimperator.js: added 'defsearch'
 	  setting
 
-2007-05-01 17:31  vkojouharov
+2007-05-01 15:31  vkojouharov
 
 	* chrome/content/vimperator/help.js: scroll to the proper location
 	  without the need of an offset
 
-2007-05-01 13:23  stubenschrott
+2007-05-01 11:23  stubenschrott
 
 	* ChangeLog, TODO, install.rdf,
 	  chrome/content/vimperator/commands.js: [no log message]
 
-2007-05-01 02:19  stubenschrott
+2007-05-01 00:19  stubenschrott
 
 	* Makefile, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/completion.js: fixed gu and gU
 
-2007-04-30 12:59  stubenschrott
+2007-04-30 10:59  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/commands.js: fixed :o
 	  http://www.url.com
 
-2007-04-30 05:15  stubenschrott
+2007-04-30 03:15  stubenschrott
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js,
 	  completion.js: - use default firefox engines :qsadd, :qsdel
 	  commands not yet done
 
-2007-04-29 21:13  stubenschrott
+2007-04-29 19:13  stubenschrott
 
-	* Makefile, update.rdf.in: new make release command
+	* Makefile: new make release command
 
-2007-04-29 20:55  stubenschrott
+2007-04-29 18:55  stubenschrott
 
 	* Makefile: more makefile fixes by Bart
 
-2007-04-29 20:50  stubenschrott
+2007-04-29 18:50  stubenschrott
 
 	* Makefile: [no log message]
 
-2007-04-29 19:51  stubenschrott
+2007-04-29 17:51  stubenschrott
 
 	* chrome/content/vimperator/default.css: add
 
-2007-04-29 18:31  stubenschrott
+2007-04-29 16:31  stubenschrott
 
 	* ChangeLog, install.rdf: website updates
 
-2007-04-29 17:04  stubenschrott
+2007-04-29 15:04  stubenschrott
 
 	* ChangeLog, TODO, chrome/content/vimperator/bookmarks.js,
 	  chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/completion.js,
-	  chrome/content/vimperator/settings.js,
 	  chrome/content/vimperator/vimperator.js: Many small bugfixes
 	  changed wildsort -> wildoptions=sort added completion for
 	  filenames
 
-2007-04-29 05:35  stubenschrott
+2007-04-29 03:35  stubenschrott
 
 	* chrome/content/vimperator/: commands.js, completion.js, help.js,
-	  tags, vimperator.js: changed ":help open" to ":help :open"
+	  vimperator.js: changed ":help open" to ":help :open"
 
-2007-04-29 04:18  stubenschrott
+2007-04-29 02:18  stubenschrott
 
 	* chrome/content/vimperator/: commands.js, help.js: fixed display
 	  of <> in help
 
-2007-04-29 03:48  stubenschrott
+2007-04-29 01:48  stubenschrott
 
 	* chrome/content/vimperator/: commands.js, help.js: experimental
 	  new help design
 
-2007-04-29 02:26  stubenschrott
+2007-04-29 00:26  stubenschrott
 
 	* Makefile, TODO, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/help.js,
@@ -1719,47 +1904,44 @@
 	  chrome/content/vimperator/vimperator.xul: Makefile fixes and much
 	  sexier help file
 
-2007-04-28 20:08  stubenschrott
+2007-04-28 18:08  stubenschrott
 
-	* update.rdf.in, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/help.js,
-	  chrome/content/vimperator/settings.js: added update.rdf.in
-	  changed help file to look much more vim like (with monospaced
-	  font)
+	* chrome/content/vimperator/: commands.js, help.js: added
+	  update.rdf.in changed help file to look much more vim like (with
+	  monospaced font)
 
-2007-04-28 19:18  stubenschrott
+2007-04-28 17:18  stubenschrott
 
-	* chrome/content/vimperator/: commands.js, help.js, settings.js,
-	  vimperator.js: fixed :q command
+	* chrome/content/vimperator/: commands.js, help.js, vimperator.js:
+	  fixed :q command
 
-2007-04-28 18:05  stubenschrott
+2007-04-28 16:05  stubenschrott
 
 	* chrome/content/vimperator/vimperator.js: typo
 
-2007-04-28 18:05  stubenschrott
+2007-04-28 16:05  stubenschrott
 
 	* install.rdf, chrome/content/vimperator/help.js,
-	  chrome/content/vimperator/settings.js,
 	  chrome/content/vimperator/vimperator.js: added ###VERSION### and
 	  ###DATE### for being seded in the Makefile
 
-2007-04-28 17:39  stubenschrott
+2007-04-28 15:39  stubenschrott
 
 	* chrome/content/vimperator/: commands.js, help.js, hints.js,
-	  settings.js, vimperator.js: fixed hints
+	  vimperator.js: fixed hints
 
-2007-04-28 14:14  stubenschrott
+2007-04-28 12:14  stubenschrott
 
 	* ChangeLog, TODO, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/help.js: added goUp() and
 	  isDirectory(uri) functions gu and gU mappings for going up
 
-2007-04-28 12:15  vkojouharov
+2007-04-28 10:15  vkojouharov
 
 	* chrome/content/vimperator/vimperator.js: delay sourcing of the rc
 	  file so that commands that open new tabs (like js!) can work
 
-2007-04-28 11:52  vkojouharov
+2007-04-28 09:52  vkojouharov
 
 	* chrome/content/vimperator/: commands.js, completion.js, file.js,
 	  help.js: fixes:   'tag' command works once more   'source ~/'
@@ -1768,65 +1950,58 @@
 	  current document is a XULDocument (it shows the help in a new
 	  tab)
 
-2007-04-28 03:56  stubenschrott
+2007-04-28 01:56  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/completion.js,
 	  chrome/content/vimperator/help.js,
-	  chrome/content/vimperator/settings.js,
 	  chrome/content/vimperator/vimperator.js: major code cleanup by
 	  using constants instead of indices, small bugs still may occur
 	  due to this change
 
-2007-04-27 21:06  stubenschrott
+2007-04-27 19:06  stubenschrott
 
 	* TODO, install.rdf, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/completion.js,
-	  chrome/content/vimperator/settings.js,
-	  chrome/content/vimperator/tags,
 	  chrome/content/vimperator/vimperator.js: wildmode and wildsort
 	  support :open . and .. and .../ supported
 
-2007-04-26 01:49  stubenschrott
+2007-04-25 23:49  stubenschrott
 
 	* chrome/content/vimperator/commands.js: small changes
 
-2007-04-25 19:11  stubenschrott
+2007-04-25 17:11  stubenschrott
 
 	* Makefile, TODO, vimperatorrc.example: Makefile changes for
 	  missing chrome/ dir
 
-2007-04-25 11:30  stubenschrott
+2007-04-25 09:30  stubenschrott
 
 	* chrome/content/vimperator/vimperator.js: changed version number
 	  for now a little
 
-2007-04-25 11:20  stubenschrott
+2007-04-25 09:20  stubenschrott
 
 	* TODO, chrome/content/vimperator/commands.js: added feeling lucky
 	  'lucky' quick search
 
-2007-04-24 23:06  stubenschrott
+2007-04-24 21:06  stubenschrott
 
 	* ChangeLog, TODO, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/vimperator.js: esc -> C-c to stop page
 	  :stop command added
 
-2007-04-24 21:47  stubenschrott
+2007-04-24 19:47  stubenschrott
 
 	* chrome/content/vimperator/: commands.js, vimperator.js: 'B' works
 	  now as it is supposed to do
 
-2007-04-24 20:42  stubenschrott
-
-	* chrome/content/vimperator/settings.js: hinttags fixes
-
-2007-04-24 16:10  stubenschrott
+2007-04-24 14:10  stubenschrott
 
 	* vimperatorrc.example: added sample vimperatorrc, not really
 	  useful yet
 
-2007-04-24 14:12  stubenschrott
+2007-04-24 12:12  stubenschrott
 
 	* AUTHORS, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/completion.js,
@@ -1834,237 +2009,219 @@
 	  Lars (not working fully) cleaned up init() and moved all
 	  eventlisteneres code to addEventListeners()
 
-2007-04-23 20:46  vkojouharov
+2007-04-23 18:46  vkojouharov
 
 	* chrome/content/vimperator/: commands.js, help.js: removed the
 	  command wrapping in the help output
 
-2007-04-23 20:23  vkojouharov
+2007-04-23 18:23  vkojouharov
 
 	* chrome/content/vimperator/: commands.js, vimperator.xul: fix the
 	  :help command
 
-2007-04-23 13:14  stubenschrott
+2007-04-23 11:14  stubenschrott
 
 	* chrome/content/vimperator/: commands.js, completion.js, help.js,
-	  tags, vimperator.xul: make help.js a seperate file, small
-	  indention fixes
+	  vimperator.xul: make help.js a seperate file, small indention
+	  fixes
 
-2007-04-23 01:56  vkojouharov
+2007-04-22 23:56  vkojouharov
 
 	* chrome/content/vimperator/completion.js: file completion now
 	  works for the path '/' also
 
-2007-04-23 01:21  vkojouharov
+2007-04-22 23:21  vkojouharov
 
 	* Makefile, install.rdf, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/settings.js,
 	  chrome/content/vimperator/vimperator.js: redesing of the help
 	  page to be more like vim's help. :tab command like in vim.  the
 	  extension id has changed to a more readable string. any older
 	  versions of vimperator MUST be uninstalled, otherwise there will
 	  be 2 versions of the extension in the addons list.
 
-2007-04-22 19:50  stubenschrott
+2007-04-22 17:50  stubenschrott
 
 	* Donators: update
 
-2007-04-22 16:17  vkojouharov
+2007-04-22 14:17  vkojouharov
 
 	* chrome/content/vimperator/: commands.js, completion.js, file.js,
-	  settings.js, vimperator.js, vimperator.xul: ex parser for use
-	  with .vimperatorrc, the command line and other sourced files.
-	  sourced files are no longer javascript code, but can use the new
+	  vimperator.js, vimperator.xul: ex parser for use with
+	  .vimperatorrc, the command line and other sourced files. sourced
+	  files are no longer javascript code, but can use the new
 	  :javascript ex command to execute javascript. :javascript also
 	  supports multiline with heredocs (:js <<EOF). File completion for
 	  the :source command.
 
-2007-04-22 16:10  vkojouharov
+2007-04-22 14:10  vkojouharov
 
 	* TODO: bug--
 
-2007-04-22 15:00  stubenschrott
+2007-04-22 13:00  stubenschrott
 
 	* AUTHORS: updated AUTHORS file
 
-2007-04-21 20:07  stubenschrott
-
-	* Contributors, vimperator_0.1.xpi, vimperator_0.2.xpi: removed old
-	  files
-
-2007-04-21 20:06  stubenschrott
+2007-04-21 18:06  stubenschrott
 
 	* ChangeLog, chrome/content/vimperator/commands.js: :back! and
 	  :forward! support
 
-2007-04-21 13:18  stubenschrott
+2007-04-21 11:18  stubenschrott
 
 	* Donators, chrome/content/vimperator/commands.js: set horizontal
 	  offset to 0
 
-2007-04-21 04:08  stubenschrott
+2007-04-21 02:08  stubenschrott
 
 	* chrome/content/vimperator/commands.js: coding style fixes
 
-2007-04-21 04:05  stubenschrott
+2007-04-21 02:05  stubenschrott
 
 	* chrome/content/vimperator/: commands.js, hints.js, vimperator.js:
 	  valign=top for cells
 
-2007-04-20 23:25  stubenschrott
+2007-04-20 21:25  stubenschrott
 
 	* ChangeLog, Donators, TODO, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/completion.js,
 	  chrome/content/vimperator/vimperator.js: added section support
 	  for :help
 
-2007-04-20 17:23  stubenschrott
+2007-04-20 15:23  stubenschrott
 
 	* AUTHORS: forgot this file
 
-2007-04-20 17:07  stubenschrott
+2007-04-20 15:07  stubenschrott
 
 	* Makefile: small changes
 
-2007-04-20 17:03  stubenschrott
+2007-04-20 15:03  stubenschrott
 
 	* ChangeLog, Makefile, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/vimperator.js: :source support
 
-2007-04-20 16:46  stubenschrott
+2007-04-20 14:46  stubenschrott
 
-	* ChangeLog, Makefile, build.sh,
-	  chrome/content/vimperator/commands.js,
+	* ChangeLog, Makefile, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/file.js,
 	  chrome/content/vimperator/vimperator.js,
 	  chrome/content/vimperator/vimperator.xul: now we have a new build
 	  Makefile also added file.js which is responsible for file
 	  writing/loading in future
 
-2007-04-20 15:33  stubenschrott
+2007-04-20 13:33  stubenschrott
 
 	* ChangeLog, TODO, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/hints.js,
-	  chrome/content/vimperator/settings.js,
-	  chrome/content/vimperator/tags,
 	  chrome/content/vimperator/vimperator.js: - fixed hints display on
 	  zoom - fixed n and N commands (don't use closures)
 
-2007-04-20 05:01  stubenschrott
+2007-04-20 03:01  stubenschrott
 
 	* ChangeLog, TODO, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/completion.js,
-	  chrome/content/vimperator/settings.js,
 	  chrome/content/vimperator/vimperator.js: hmm, forgot what I
 	  changed :)
 
-2007-04-20 01:35  stubenschrott
+2007-04-19 23:35  stubenschrott
 
 	* chrome/content/vimperator/: commands.js, completion.js, hints.js,
-	  settings.js, vimperator.js: added showmode setting
+	  vimperator.js: added showmode setting
 
-2007-04-19 18:21  stubenschrott
+2007-04-19 16:21  stubenschrott
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js,
-	  completion.js, hints.js, settings.js, vimperator.js: change
-	  tabs->4 spaces
+	  completion.js, hints.js, vimperator.js: change tabs->4 spaces
 
-2007-04-19 18:09  stubenschrott
+2007-04-19 16:09  stubenschrott
 
 	* ChangeLog, Donators, TODO,
 	  chrome/content/vimperator/bookmarks.js,
 	  chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/completion.js,
 	  chrome/content/vimperator/hints.js,
-	  chrome/content/vimperator/settings.js,
-	  chrome/content/vimperator/tags,
 	  chrome/content/vimperator/vimperator.js: added modelines
 	  everywhere
 
-2007-04-19 16:00  stubenschrott
+2007-04-19 14:00  stubenschrott
 
 	* chrome/content/vimperator/: commands.js, completion.js: added
 	  :buffer(s) commands
 
-2007-04-19 15:29  stubenschrott
+2007-04-19 13:29  stubenschrott
 
 	* TODO, chrome/content/vimperator/commands.js: restart command
 
-2007-04-18 15:33  stubenschrott
+2007-04-18 13:33  stubenschrott
 
-	* TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/settings.js: added contact section to
-	  homepage
+	* TODO, chrome/content/vimperator/commands.js: added contact
+	  section to homepage
 
-2007-04-18 13:42  stubenschrott
+2007-04-18 11:42  stubenschrott
 
 	* ChangeLog, TODO, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/hints.js,
 	  chrome/content/vimperator/vimperator.js: support for space and
 	  alt-left/right keys
 
-2007-04-18 13:06  stubenschrott
+2007-04-18 11:06  stubenschrott
 
 	* ChangeLog, TODO, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/vimperator.js: [+-] support for
 	  settings
 
-2007-04-18 03:18  stubenschrott
+2007-04-18 01:18  stubenschrott
 
-	* chrome/content/vimperator/: commands.js, settings.js,
-	  vimperator.xul: added counter to web site
+	* chrome/content/vimperator/: commands.js, vimperator.xul: added
+	  counter to web site
 
-2007-04-18 00:44  stubenschrott
+2007-04-17 22:44  stubenschrott
 
-	* chrome/content/vimperator/: commands.js, settings.js: Changed
-	  wiki search engine
+	* chrome/content/vimperator/commands.js: Changed wiki search engine
 
-2007-04-17 22:07  stubenschrott
+2007-04-17 20:07  stubenschrott
 
 	* ChangeLog, Donators, TODO, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/hints.js: Added n and N commands
 
-2007-04-17 19:34  stubenschrott
+2007-04-17 17:34  stubenschrott
 
 	* ChangeLog: removed < and >
 
-2007-04-17 18:44  stubenschrott
+2007-04-17 16:44  stubenschrott
 
-	* ChangeLog, Donators, TODO, build.sh, install.rdf,
+	* ChangeLog, Donators, TODO, install.rdf,
 	  chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/vimperator.js: version 0.3, added
 	  ignorekeys support
 
-2007-04-17 01:31  stubenschrott
+2007-04-16 23:31  stubenschrott
 
-	* ChangeLog, Contributors, Donators, TODO, build.sh,
-	  chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/settings.js,
+	* ChangeLog, Donators, TODO, chrome/content/vimperator/commands.js,
 	  chrome/content/vimperator/vimperator.js,
 	  chrome/content/vimperator/vimperator.xul: Added Ctrl-[ alias, and
 	  's' guioption
 
-2007-04-11 20:38  stubenschrott
+2007-04-11 18:38  stubenschrott
 
 	* TODO, chrome/content/vimperator/commands.js: go_tab -> tab_go
 
-2007-04-11 05:15  stubenschrott
+2007-04-11 03:15  stubenschrott
 
 	* TODO: updated TODO file
 
-2007-04-11 04:04  stubenschrott
+2007-04-11 02:04  stubenschrott
 
 	* ChangeLog, TODO: [no log message]
 
-2007-04-10 21:43  stubenschrott
+2007-04-10 19:43  stubenschrott
 
 	* chrome/content/vimperator/: bookmarks.js, commands.js,
-	  completion.js, contents.rdf, hints.js, settings.js, tags,
-	  vimperator.js, vimperator.xul: Initial import
+	  completion.js, contents.rdf, hints.js, vimperator.js,
+	  vimperator.xul: Initial import
 
-2007-04-10 21:32  stubenschrott
+2007-04-10 19:32  stubenschrott
 
-	* ChangeLog, TODO, build.sh, chrome.manifest, install.rdf,
-	  vimperator_0.1.xpi, vimperator_0.2.xpi:
+	* ChangeLog, TODO, chrome.manifest, install.rdf:
 	  Initial import
 
diff --git a/NEWS b/NEWS
index abdac68a..767f80e0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 <pre>
-2007-xx-xx:
+2007-09-03:
 	* version 0.5.1
 	* native / and ? search and n and N working again
 	* the URL in the status line can be selected with the mouse again
@@ -84,7 +84,7 @@
 	* added 'f' to the 'complete' option to allow listing of filenames in :open prompt
 	* changed regexp search to normal text search for completion -> massive speedup, but limited functionality
 	* support for :open ./ , :open .. and :open ... (patch from Lee Hinman)
-	  'gu' and <BackSpace> goes up a directory component, gU and <C-BackSpace> to the root directory 
+	  'gu' and <BackSpace> goes up a directory component, gU and <C-BackSpace> to the root directory
 	* Esc now doesn't stop loading the webpage, use Ctrl-c instead, :stop command added
 	* changed hinttags to work with dict.leo.org and hintstyle to work with digg.com
 	* :back! goes to beginning of history now

From 38ebd2273c27815737f4c8d80cc251fea2b84d64 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 4 Sep 2007 02:12:04 +0000
Subject: [PATCH 034/224] fix typo in 'scroll' validator - incorrectly
 restricting value to 0-2

---
 chrome/content/vimperator/options.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index 92a49f2c..3f97c35a 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -458,7 +458,7 @@ function Options() //{{{
                   "When a <code class=\"argument\">{count}</code> is specified to the <code class=\"mapping\">&lt;C-u&gt;</code> or <code class=\"mapping\">&lt;C-d&gt;</code> commands this is used to set the value of <code class=\"option\">'scroll'</code> and also used for the current command. " +
                   "The value can be reset to half the window height with <code class=\"command\">:set scroll=0</code>.",
             default_value: 0,
-            validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
+            validator: function (value) { if (value >= 0) return true; else return false; }
         }
     ));
     addOption(new Option(["showmode", "smd"], "boolean",
@@ -489,7 +489,7 @@ function Options() //{{{
                   "NOTE: Not fully implemented yet and buggy with stal=0",
             setter: function(value) { Options.setPref("showtabline", value); setShowTabline(value); },
             default_value: 2,
-            validator: function (value) { if (value>=0 && value <=2) return true; else return false; }
+            validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
         }
     ));
     addOption(new Option(["titlestring"], "string",

From a66b756111780db47e1e3aa1e63a6c670ae7c784 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 4 Sep 2007 02:50:17 +0000
Subject: [PATCH 035/224] update version to 0.5.2dev

---
 Makefile | 2 +-
 NEWS     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index fdd73ef9..72452306 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 TOP           = $(shell pwd)
 
-VERSION       = 0.5.1
+VERSION       = 0.5.2dev
 OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 
diff --git a/NEWS b/NEWS
index 767f80e0..2c7b6159 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,7 @@
 <pre>
+2007-XX-XX:
+	* version 0.5.2
+
 2007-09-03:
 	* version 0.5.1
 	* native / and ? search and n and N working again

From a6bf9f11a1c928060d4255ca01cf4130b1dc62d2 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 4 Sep 2007 08:08:21 +0000
Subject: [PATCH 036/224] add logo to help page

---
 Makefile                                 |   1 +
 chrome/content/vimperator/help.js        |   2 +-
 chrome/content/vimperator/logo_white.png | Bin 0 -> 1924 bytes
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 chrome/content/vimperator/logo_white.png

diff --git a/Makefile b/Makefile
index 72452306..cef3fa6b 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ JAR_FILES     = ${shell find chrome/content -type f 		\
 				     -o  -path '*.css' 	\
 				     -o  -path '*.xul' 	\
 				     -o  -path '*.rdf' 	\
+				     -o  -path '*.png' 	\
 				   \) } chrome.manifest
 JAR_DIRS      = $(foreach f,${JAR_FILES},$(dir $f))
 JAR           = chrome/vimperator.jar
diff --git a/chrome/content/vimperator/help.js b/chrome/content/vimperator/help.js
index c43e0ac9..3f5a5767 100644
--- a/chrome/content/vimperator/help.js
+++ b/chrome/content/vimperator/help.js
@@ -137,7 +137,7 @@ vimperator.help = function(section, easter) //{{{
         return ret;
     }
 
-    var header = '<h1>Vimperator</h1>' +
+    var header = '<h1><img src="chrome://vimperator/content/logo_white.png" alt="Vimperator"></h1>' + 
         '<p class="tagline">First there was a Navigator, then there was an Explorer.\n' +
         'Later it was time for a Konqueror. Now it\'s time for an Imperator, the VIMperator :)</p>';
 
diff --git a/chrome/content/vimperator/logo_white.png b/chrome/content/vimperator/logo_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..0783f7e45d649910847dc8f50e448087cdf6af89
GIT binary patch
literal 1924
zcmV-~2YdL5P)<h;3K|Lk000e1NJLTq006=O001}$1^@s6ujnUE00009a7bBm000XT
z000XT0n*)m`~Uz4Hc3Q5RCt{2+*?RgTO7yn@6NGCOEFC=AG$%K33;SrG+}5D(QT$I
z27)g7qU1vm)ah7BoFckmMGz>4RxnCEWLaJ!C?dj+4_SE2hY&?fn&aRok_DEo^H9#w
zX4IL|Mm_%zY#7$8wf9=f`R&W>J!(oRg!sRk;p+|vF&Rh@gg}BI1Ry~W0+1jG0Z0&p
z03--P01^Zt03QXRw6s*|bULNe>C}xIH{_1q1UP;Av~!MYYinhW$Ds4YMh6B4=<n}$
zz82$e=p4(_17nj@BO&n75n;)aC8VXL0T3M>?Tao5F^o@w5EmDx6%-WsV$(vn<xvoN
zdU{l5W+niMiHYplvq$^BPIq^=I(F=s$8`p!q@<9Lkl<1m;Khp<s<5zd%>E@OC$nYC
zmSO7{+UL<MTeghM%uKi2udlCHIXO9AwRJaFMMXubva-_cI^4}wZf>rstE(He-v<vK
zBqk=t+3x%CR##U$U!OgDmawoeHBz4k`D(nAf>LVC<^B8j3Q&N`$jDIc>a?}Bc~xg{
z$<NPsTURMXety17eRs=>6)V)^$B)%WeI9L@J9n-+ckY}^ADWt)l+kGPy6yLKb^G>h
zwRrL35!c~vu1qG=nEhV6cCBh|ZdTrocg>nLZs*&V<DCr4FFiGih=`!7s*2~&pL6u+
zQLoxwx^#(zgak|`6Ap)i=;&x}-n>akNeS86*<@s7V6|G6yQ9m_ojY-Nbg<j)Y~Q|}
zix)5A=jW#e_jV44L+#kHgNB9%uiFk)Qc^;Bc{%Ov?auyxZ~pxGE@hW5U*^P#6C=*W
z`Sa%~EiENEIhkkAo~h8#P%SJhjH;?CXPttA0<K@b4uI8aW%=^u00adExvbCE<DCpV
z3PMCg1Qit(m`o;$ii$884C?UV!_JB5@9$TuSFZ+O)22;axNyPkdS=d?sTqw%Y&M(M
z-{(a|MPW1=HGhA91u%Q|Y>Y;uR#Q`>0GgYd>FVklvHwP+(d7^K?%g{D(ACvNb91w^
zysxj1hK7b8YCBX%M+X4e+1VU8Z~(nt@6jniR8-Wc^}@r$6+nG`J$-$B0Qmd+Yeu8d
zS?AHCN6tB3xpF0Oad9KA)7Rsj3_J?Lj2Sbuh=>RU(A(QfPfyRV_mxuEY&HP&dOaZ_
zAyZ}oCQ?8^0H;o!;>eLBXqx8LoOE_}s?VQ4yM6D|r%&V3zw!1n<MlO<PmKZt16jIs
zDJ?B6*lac&4u=X24b=b|8ykn!nNB)8I~hFc3^lm-8%=6z>WCMnqiJbrQD(E*Ij>X2
zkB)aT@HhxDF)`ZJt5?;wZQHnZ?Hcj%@ua7x1F&)9M&Roq_{x<lQ*t6kQe0e2adGi4
z+g^Qry-G_<qp`7(4I4HvYt}56I(2n*w6(SUvOfJE_~bsqR1zH>?e?N?sCDbsjobEe
za&mb2@+AO;g@r6wu)t-<lAfNf1}}ug`0y$S27>{U$wWm(1*N5>Bqk=Rr%#{q;ll@l
zf`Xh!i0LFLDT%ziylHim6Rx~^*2rKmXlAn+fU>eO-oAZHUS1x(y}bkn2a}$jE*}^%
zCCNi~Kd7^_Q<=?XWj32tZf>qT-Z{m2eT`tTSa|*VHTn7Z96EG}_V#xC{QP+M@Zp$k
zJ32bl)~#FV?(TM$ojG%cyu3Vh>((s{2E&9LQSRNlM|E|z%ZGLF>&c{~B(k!yoaOW8
z&BJQ7lA4-2YTLTHI+Bu-7(7ajhpenD-n@B3Wo0FsH*ZF#)46QBwY7E3_3YojpPHH)
z9z1x!-o1MX2nZOq9*f1o@#Due@O-@BI#<($*Fgvm57#0iBNaeXQxgDwetyKp#*X<R
z?(6I0)vH&-%351nX>D!g<HwKQcEw|MyB)jT?)JS^t5$LU{{3P1K6E;rwtM$(rD+-|
zDJfpH{aK3^Ez-)$%GCPx>#41+{o(aQMn-B@t5sPn7M?tL;_`lce7y6uFULDsXw&sa
z8#bFwEnK(|fQ*a`x!|3I1_lO{C--9p1qKEZ92`6$e@FTHRQOCsM+bvDD^Gmep-o6%
zBnZN1^m;uelgZ=yv9Yle))xta@R^X15Usqt+}GUzrg0GF%$dW<lP7`U7luN(Gi@)H
zh46;lP!j?Pf)IcNK?vXnf^hdPYQci9%iX&SyTGv9zn1UXg<N=uDaGR;eEEX9a|g9=
z-+yKM_Q9Pys4ri>e(?MI;h%rN;TZpp3Nev94nji%?Aiqu3)pOEHXEA7^0n;S@4khY
zvVQ75!f(I9qet-f-(a($y1F1J2)_M83n8YAp9;dCf1>sGqfVTFt}f8);qYNNdlq@X
zO-v~s2O%N?{`doa|9yD*v14enW}({KAvhTR`b$C}rXIPoECg~NK?p#CAOs*m5CV`O
z2mweCga9N6LI4s3Api-25P$?h2ta}$1Ry~W0+1jG0Z0&p0N`Kk#&#w>-ZB{g0000<
KMNUMnLSTZ@c&IM`

literal 0
HcmV?d00001


From 9f53fb7de226891fb70db4549aa0714d86098297 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 5 Sep 2007 08:26:17 +0000
Subject: [PATCH 037/224] remove some redundant help page CSS properties

---
 chrome/content/vimperator/default.css | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/chrome/content/vimperator/default.css b/chrome/content/vimperator/default.css
index a7dee5a6..458c1194 100644
--- a/chrome/content/vimperator/default.css
+++ b/chrome/content/vimperator/default.css
@@ -19,10 +19,6 @@ p.tagline {
     font-weight: bold;
 }
 
-/* the text in the tables is too large without that */
-table {
-    font-size: 1.0em;
-}
 table.vimperator {
     border-width: 1px;
     border-style: dotted;
@@ -30,29 +26,23 @@ table.vimperator {
     margin-bottom: 2em; /* FIXME: just a quick hack until we have proper pages */
 }
 table.vimperator td {
-    border-width: 0px;
+    border: none;
     padding: 3px;
-    border-style: none;
 }
 tr.separator {
-/*    border-width: 3px 0px 0px 0px;
-    border-style: solid none none none;*/
-    border-color: gray;
-    height: 10px !important;
+    height: 10px;
 }
-hr { /* horizontal lines */
-    width: 100%;
+hr {
     height: 1px;
-    border-style: solid;
-    /*border-color: #6A97D4;*/
-    border-color: white;
+    background-color: white;
+    border-style: none;
+    margin-top: 0;
+    margin-bottom: 0;
 }
 td.taglist {
     text-align: right;
     vertical-align: top;
     border-spacing: 13px 10px;
-    border-width: 0px 10px;
-    border-color: blue !important;
 }
 td.taglist td {
     width: 100px;

From fe876573072e42d4dc47c440ee91cb223657d7e0 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 5 Sep 2007 11:46:02 +0000
Subject: [PATCH 038/224] use preX.X for development version numbers

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index cef3fa6b..70f84700 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 TOP           = $(shell pwd)
 
-VERSION       = 0.5.2dev
+VERSION       = pre0.5.2
 OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 

From 30d9b25d3512ca9ea6d61c28a54548b9852e34ec Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 6 Sep 2007 00:04:10 +0000
Subject: [PATCH 039/224] merge new 'incsearch', 'ignorecase', 'smartcase',
 'hlsearch' options from MAIN

---
 NEWS                                  |   1 +
 chrome/content/vimperator/find.js     | 106 ++++++++++++++++++++------
 chrome/content/vimperator/mappings.js |  13 +++-
 chrome/content/vimperator/options.js  |  27 +++++++
 vimperator.vim                        |   9 ++-
 5 files changed, 123 insertions(+), 33 deletions(-)

diff --git a/NEWS b/NEWS
index 2c7b6159..40b88a96 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.2
+	* added 'hlsearch','incsearch', 'ignorecase' and 'smartcase' options
 
 2007-09-03:
 	* version 0.5.1
diff --git a/chrome/content/vimperator/find.js b/chrome/content/vimperator/find.js
index 3d268012..7eafdcdb 100644
--- a/chrome/content/vimperator/find.js
+++ b/chrome/content/vimperator/find.js
@@ -26,25 +26,64 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-
+// TODO: <ESC> should cancel search highlighting in 'incsearch' mode
 // make sure you only create this object when the "vimperator" object is ready
-// vimperator.search = new function()
 function Search() //{{{
 {
-    var self = this; // needed for callbacks since "this" is the "vimperator" object in a callback
-    var found = false;   // true if the last search was successful
-    var backwards = false;
-    var lastsearch = ""; // keep track of the last searched string
+    var self = this;                  // needed for callbacks since "this" is the "vimperator" object in a callback
+    var found = false;                // true if the last search was successful
+    var backwards = false;            // currently searching backwards
+    var lastsearch = "";              // keep track of the last searched string
     var lastsearch_backwards = false; // like "backwards", but for the last search, so if you cancel a search with <esc> this is not set
+    var case_sensitive = true;
 
     // Event handlers for search - closure is needed
-    vimperator.registerCallback("change", vimperator.modes.SEARCH_FORWARD, function(command){ self.searchKeyPressed(command); });
-    vimperator.registerCallback("submit", vimperator.modes.SEARCH_FORWARD, function(command){ self.searchSubmitted(command); });
-    vimperator.registerCallback("cancel", vimperator.modes.SEARCH_FORWARD, function(){ self.searchCanceled(); });
+    vimperator.registerCallback("change", vimperator.modes.SEARCH_FORWARD, function(command) { self.searchKeyPressed(command); });
+    vimperator.registerCallback("submit", vimperator.modes.SEARCH_FORWARD, function(command) { self.searchSubmitted(command); });
+    vimperator.registerCallback("cancel", vimperator.modes.SEARCH_FORWARD, function() { self.searchCanceled(); });
     // TODO: allow advanced modes in register/triggerCallback
-    vimperator.registerCallback("change", vimperator.modes.SEARCH_BACKWARD, function(command){ self.searchKeyPressed(command); });
-    vimperator.registerCallback("submit", vimperator.modes.SEARCH_BACKWARD, function(command){ self.searchSubmitted(command); });
-    vimperator.registerCallback("cancel", vimperator.modes.SEARCH_BACKWARD, function(){ self.searchCanceled(); });
+    vimperator.registerCallback("change", vimperator.modes.SEARCH_BACKWARD, function(command) { self.searchKeyPressed(command); });
+    vimperator.registerCallback("submit", vimperator.modes.SEARCH_BACKWARD, function(command) { self.searchSubmitted(command); });
+    vimperator.registerCallback("cancel", vimperator.modes.SEARCH_BACKWARD, function() { self.searchCanceled(); });
+
+    // clean the pattern search string of modifiers and set the
+    // case-sensitivity flag
+    function processPattern(pattern)
+    {
+        // strip off pattern terminator and trailing /junk
+        if (backwards)
+            pattern = pattern.replace(/\?.*/, "");
+        else
+            pattern = pattern.replace(/\/.*/, "");
+
+        if (!pattern)
+            pattern = lastsearch;
+
+        if (/\\C/.test(pattern))
+        {
+            case_sensitive = true;
+            pattern = pattern.replace(/\\C/, "");
+        }
+        else if (/\\c/.test(pattern))
+        {
+            case_sensitive = false;
+            pattern = pattern.replace(/\\c/, "");
+        }
+        else if (vimperator.options["ignorecase"] && vimperator.options["smartcase"] && /[A-Z]/.test(pattern))
+        {
+            case_sensitive = true;
+        }
+        else if (vimperator.options["ignorecase"])
+        {
+            case_sensitive = false;
+        }
+        else
+        {
+            case_sensitive = true;
+        }
+
+        return pattern;
+    }
 
     // Called when the search dialog is asked for
     // If you omit "mode", it will default to forward searching
@@ -52,12 +91,12 @@ function Search() //{{{
     {
         if (mode == vimperator.modes.SEARCH_BACKWARD)
         {
-            vimperator.commandline.open('?', '', vimperator.modes.SEARCH_BACKWARD);
+            vimperator.commandline.open("?", "", vimperator.modes.SEARCH_BACKWARD);
             backwards = true;
         }
         else
         {
-            vimperator.commandline.open('/', '', vimperator.modes.SEARCH_FORWARD);
+            vimperator.commandline.open("/", "", vimperator.modes.SEARCH_FORWARD);
             backwards = false;
         }
 
@@ -68,11 +107,10 @@ function Search() //{{{
     // TODO: backwards seems impossible i fear :(
     this.find = function(str, backwards)
     {
-        const FIND_NORMAL = 0;
-        const FIND_TYPEAHEAD = 1;
-        const FIND_LINKS = 2;
+        var fastFind = getBrowser().fastFind;
 
-        found = getBrowser().fastFind.find(str, false) != Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND;
+        fastFind.caseSensitive = case_sensitive;
+        found = fastFind.find(str, false) != Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND;
 
         return found;
     }
@@ -82,11 +120,12 @@ function Search() //{{{
     {
         // this hack is needed to make n/N work with the correct string, if
         // we typed /foo<esc> after the original search
+        // TODO: this should also clear the current item highlighting
         if (getBrowser().fastFind.searchString != lastsearch)
         {
             this.clear();
             this.find(lastsearch, false);
-            gFindBar.highlightDoc("yellow", "black", lastsearch);
+            this.highlight(lastsearch);
         }
 
         var up = reverse ? !lastsearch_backwards : lastsearch_backwards;
@@ -98,12 +137,14 @@ function Search() //{{{
             result = getBrowser().fastFind.findNext();
 
         if (result == Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND)
+        {
             vimperator.echoerr("E486: Pattern not found: " + lastsearch);
+        }
         else if (result == Components.interfaces.nsITypeAheadFind.FIND_WRAPPED)
         {
             // hack needed, because wrapping causes a "scroll" event which clears
             // our command line
-            setTimeout( function() {
+            setTimeout(function() {
                 if (up)
                     vimperator.echoerr("search hit TOP, continuing at BOTTOM");
                 else
@@ -111,26 +152,32 @@ function Search() //{{{
             }, 10);
         }
         else // just clear the command line if something has been found
+        {
             vimperator.echo("");
+        }
     }
 
     // Called when the user types a key in the search dialog. Triggers a find attempt
     this.searchKeyPressed = function(command)
     {
-        // TODO: check for 'incsearch'
-        var backward = vimperator.hasMode(vimperator.modes.SEARCH_BACKWARD);
-        this.find(command, backward);
+        if (!vimperator.options["incsearch"])
+            return;
+
+        command = processPattern(command);
+        this.find(command, backwards);
     }
 
     // Called when the enter key is pressed to trigger a search
     this.searchSubmitted = function(command)
     {
         this.clear();
-        gFindBar.highlightDoc("yellow", "black", command);
+        command = processPattern(command);
+        this.find(command, backwards);
+        this.highlight(command);
 
         // need to find again to draw the highlight of the current search
         // result over the "highlight all" search results
-        // very hacky, but seem to work
+        // very hacky, but seems to work
         setTimeout(function() { self.findAgain(false); }, 10);
 
         lastsearch_backwards = backwards;
@@ -150,6 +197,15 @@ function Search() //{{{
         vimperator.focusContent();
     }
 
+    this.highlight = function(word)
+    {
+        if (!word)
+            word = lastsearch;
+
+        gFindBar.setCaseSensitivity(case_sensitive)
+        gFindBar.highlightDoc("yellow", "black", word);
+    }
+
     this.clear = function()
     {
         gFindBar.highlightDoc();
diff --git a/chrome/content/vimperator/mappings.js b/chrome/content/vimperator/mappings.js
index fc4b9ffa..40fdf6da 100644
--- a/chrome/content/vimperator/mappings.js
+++ b/chrome/content/vimperator/mappings.js
@@ -942,16 +942,21 @@ function Mappings() //{{{
         function() { vimperator.search.openSearchDialog(vimperator.modes.SEARCH_FORWARD); },
         {
             short_help: "Search forward for a pattern",
-            usage: ["/{pattern}<CR>"],
-            help: "Search forward for the first occurance of <code class=\"argument\">{pattern}</code>."
+            usage: ["/{pattern}[/]<CR>"],
+            help: "Search forward for the first occurance of <code class=\"argument\">{pattern}</code>.<br/>" +
+                  "When \"\\c\" appears anywhere in the pattern the whole pattern is handled as though <code class=\"option\">'ignorecase'</code> is on. " +
+                  "\"\\C\" forces case-sensitive matching for the whole pattern."
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["?"],
         function() { vimperator.search.openSearchDialog(vimperator.modes.SEARCH_BACKWARD); },
         {
             short_help: "Search backwards for a pattern",
-            usage: ["?{pattern}<CR>"],
-            help: "Search backward for the first occurance of <code class=\"argument\">{pattern}</code>."
+            usage: ["?{pattern}[?]<CR>"],
+            help: "Search backward for the first occurance of <code class=\"argument\">{pattern}</code>.<br/>" +
+                  "When '\\c' appears anywhere in the pattern the whole pattern is handled as though <code class=\"option\">'ignorecase'</code> is on. " +
+                  "'\\C' forces case-sensitive matching for the whole pattern.<br/>" +
+                  "NOTE: incremental searching currenly only works in the forward direction."
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["n"],
diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index 3f97c35a..f52b370e 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -425,6 +425,26 @@ function Options() //{{{
             default_value: DEFAULT_HINTTAGS
         }
     ));
+    addOption(new Option(["hlsearch", "hls"], "boolean",
+        {
+            short_help: "Highlight previous search pattern matches",
+            setter: function(value) { if (value) vimperator.search.highlight(); else vimperator.search.clear(); },
+            default_value: true
+        }
+    ));
+    addOption(new Option(["ignorecase", "ic"], "boolean",
+        {
+            short_help: "Ignore case in search patterns",
+            default_value: true
+        }
+    ));
+    addOption(new Option(["incsearch", "is"], "boolean",
+        {
+            short_help: "Show where the search pattern matches as it is typed",
+            help: "NOTE: Incremental searching currently only works in the forward direction.",
+            default_value: true
+        }
+    ));
     addOption(new Option(["maxhints", "mh"], "number",
         {
             short_help: "Maximum number of simultaneously shown hints",
@@ -492,6 +512,13 @@ function Options() //{{{
             validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
         }
     ));
+    addOption(new Option(["smartcase", "scs"], "boolean",
+        {
+            short_help: "Override the 'ignorecase' option if the pattern contains uppercase characters",
+            help: "This is only used if the <code class=\"option\">'ignorecase'</code> option is set.",
+            default_value: false
+        }
+    ));
     addOption(new Option(["titlestring"], "string",
         {
             short_help: "Change the title of the browser window",
diff --git a/vimperator.vim b/vimperator.vim
index 739487c6..8a6a92c4 100644
--- a/vimperator.vim
+++ b/vimperator.vim
@@ -29,10 +29,11 @@ syn keyword vimperatorCommand addo[ns] ba[ck] bd[elete] bw[ipeout] bun[load] tab
 syn match vimperatorCommandWrapper "\<\h\w*\>" contains=vimperatorCommand
 
 syn region vimperatorSet matchgroup=vimperatorCommand start="\<set\=\>" end="$" keepend oneline contains=vimperatorOption
-syn keyword vimperatorOption activate beep nobeep beep complete cpt defsearch ds extendedhinttags eht focusedhintstyle fhs
-	\ fullscreen fs nofullscreen nofs guioptions go hintchars hc hintstyle hs hinttags maxhints mh preload nopreload
-	\ previewheight pvh showmode smd noshowmode nosmd showstatuslinks ssli showtabline stal titlestring usermode um nousermode
-	\ noum verbose vbs wildmode wim wildoptions wop
+syn keyword vimperatorOption activate act complete cpt defsearch ds extendedhinttags eht focusedhintstyle fhs fullscreen fs
+	\ nofullscreen nofs guioptions go hintchars hc hintstyle hs hinttags incsearch is noincsearch nois ignorecase ic
+	\ noignorecase noic maxhints mh preload nopreload previewheight pvh showmode smd noshowmode nosmd showstatuslinks ssli
+	\ showtabline stal smartcase scs nosmartcase noscs titlestring usermode um nousermode noum verbose vbs visualbell vb
+	\ wildmode wim wildoptions wop
 	\ contained
 
 syn region vimperatorJavascript start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=" end="$" contains=@javascriptTop keepend oneline

From e9f3a2a7033cc35785e2e5c109f495502f8667ab Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 8 Sep 2007 09:41:30 +0000
Subject: [PATCH 040/224] use preX.X for development version numbers

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 70f84700..3645f6ad 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 TOP           = $(shell pwd)
 
-VERSION       = pre0.5.2
+VERSION       = 0.5.2pre
 OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 

From 635b6258c1c7c0bb916e8efd883790584a44394e Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 8 Sep 2007 09:45:55 +0000
Subject: [PATCH 041/224] merge minor Search#find refactoring from MAIN

---
 chrome/content/vimperator/find.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/chrome/content/vimperator/find.js b/chrome/content/vimperator/find.js
index 7eafdcdb..913c3842 100644
--- a/chrome/content/vimperator/find.js
+++ b/chrome/content/vimperator/find.js
@@ -108,6 +108,7 @@ function Search() //{{{
     this.find = function(str, backwards)
     {
         var fastFind = getBrowser().fastFind;
+        str = processPattern(str);
 
         fastFind.caseSensitive = case_sensitive;
         found = fastFind.find(str, false) != Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND;
@@ -163,15 +164,17 @@ function Search() //{{{
         if (!vimperator.options["incsearch"])
             return;
 
-        command = processPattern(command);
         this.find(command, backwards);
     }
 
     // Called when the enter key is pressed to trigger a search
-    this.searchSubmitted = function(command)
+    // use forced_direction if you call this function directly
+    this.searchSubmitted = function(command, forced_backward)
     {
+        if (typeof forced_backward === "boolean")
+            backwards = forced_backward;
+
         this.clear();
-        command = processPattern(command);
         this.find(command, backwards);
         this.highlight(command);
 

From eb26d2cdc3b6096ecae95e69e8ec2df171a7c132 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 8 Sep 2007 09:50:33 +0000
Subject: [PATCH 042/224] added a visual bell and replaced the 'beep' option
 with 'visualbell'

---
 NEWS                                     |  1 +
 chrome/content/vimperator/default.css    |  4 ++++
 chrome/content/vimperator/events.js      |  2 +-
 chrome/content/vimperator/options.js     | 12 ++++++------
 chrome/content/vimperator/vimperator.js  | 20 +++++++++++++++++++-
 chrome/content/vimperator/vimperator.xul |  6 +++++-
 6 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/NEWS b/NEWS
index 40b88a96..47a19f43 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.2
+	* added a visual bell and replaced 'beep' with 'visualbell'
 	* added 'hlsearch','incsearch', 'ignorecase' and 'smartcase' options
 
 2007-09-03:
diff --git a/chrome/content/vimperator/default.css b/chrome/content/vimperator/default.css
index 458c1194..6e370cc0 100644
--- a/chrome/content/vimperator/default.css
+++ b/chrome/content/vimperator/default.css
@@ -163,6 +163,10 @@ fieldset.paypal {
     overflow: hidden;
 }
 
+#vimperator-visualbell {
+    background-color: black;
+}
+
 .status_insecure, .status_insecure * {
     background-color: transparent;
 }
diff --git a/chrome/content/vimperator/events.js b/chrome/content/vimperator/events.js
index 7a23fe11..2cba982a 100644
--- a/chrome/content/vimperator/events.js
+++ b/chrome/content/vimperator/events.js
@@ -80,7 +80,7 @@ function Events() //{{{
 
     function enterPopupMode(event)
     {
-        if (event.originalTarget.localName == "tooltip")
+        if (event.originalTarget.localName == "tooltip" || event.originalTarget.id == "vimperator-visualbell")
             return;
 
         vimperator.addMode(null, vimperator.modes.MENU);
diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index f52b370e..4894440d 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -343,12 +343,6 @@ function Options() //{{{
             default_value: "homepage,quickmark,tabopen,paste"
         }
     ));
-    addOption(new Option(["beep"], "boolean",
-        {
-            short_help: "Emit a pc speaker beep on certain errors",
-            default_value: true
-        }
-    ));
     addOption(new Option(["complete", "cpt"], "charlist",
         {
             short_help: "Items which are completed at the :[tab]open prompt",
@@ -547,6 +541,12 @@ function Options() //{{{
             validator: function (value) { if (value >= 0 && value <= 9) return true; else return false; }
         }
     ));
+    addOption(new Option(["visualbell", "vb"], "boolean",
+        {
+            short_help: "Use visual bell instead of beeping on errors",
+            default_value: false
+        }
+    ));
     addOption(new Option(["wildmode", "wim"], "stringlist",
         {
             short_help: "Define how command line completion works",
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index 30e62fb0..811895df 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -280,8 +280,26 @@ const vimperator = (function() //{{{
 
         beep: function()
         {
-            if (vimperator.options["beep"])
+            if (vimperator.options["visualbell"])
+            {
+                // flash the visual bell
+                var vbell = document.getElementById("vimperator-visualbell");
+                var box = getBrowser().mPanelContainer.boxObject;
+
+                vbell.style.position = "fixed";
+                vbell.style.height = box.height + "px";
+                vbell.style.width = box.width + "px";
+                vbell.style.left = box.x + "px";
+                vbell.style.top = box.y + "px";
+
+                vbell.hidden = false
+
+                setTimeout(function() { vbell.hidden = true; }, 50); // may as well be 0 ;-)
+            }
+            else
+            {
                 sound_service.beep();
+            }
         },
 
         copyToClipboard: function(str)
diff --git a/chrome/content/vimperator/vimperator.xul b/chrome/content/vimperator/vimperator.xul
index 20463c1e..613fc9d4 100644
--- a/chrome/content/vimperator/vimperator.xul
+++ b/chrome/content/vimperator/vimperator.xul
@@ -102,7 +102,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
                 </hbox>
 
                 <iframe id="vimperator-multiline-output" src="about:blank" flex="1" height="10px" hidden="false" collapsed="true"
-                        onkeypress="vimperator.commandline.onMultilineOutputEvent(event)"/>
+                    onkeypress="vimperator.commandline.onMultilineOutputEvent(event)"/>
 
                 <textbox id="vimperator-multiline-input" class="plain" flex="1" rows="10" hidden="false" collapsed="true" multiline="true"
                         onkeypress="vimperator.commandline.onMultilineInputEvent(event);"
@@ -116,6 +116,10 @@ the terms of any one of the MPL, the GPL or the LGPL.
            <key id="key_stop" keycode="VK_ESCAPE" oncommand="vimperator.events.onEscape();"/>
            <!-- other keys are handled inside vimperator.js event loop -->
         </keyset>
+
+        <!-- TODO: move to browser-stack? -->
+        <box id="vimperator-visualbell" hidden="true"/>
+
     </window>
 </overlay>
 

From a1f6b707c8db1fce4d0216d1847519b026d8d8a5 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 8 Sep 2007 09:58:01 +0000
Subject: [PATCH 043/224] use true as the default value of 'hlsearch' and
 'ignorecase' and store 'hlsearch' as a preference

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

diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index 4894440d..c79d17a0 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -422,8 +422,8 @@ function Options() //{{{
     addOption(new Option(["hlsearch", "hls"], "boolean",
         {
             short_help: "Highlight previous search pattern matches",
-            setter: function(value) { if (value) vimperator.search.highlight(); else vimperator.search.clear(); },
-            default_value: true
+            setter: function(value) { Options.setPref("hlsearch", value); if (value) vimperator.search.highlight(); else vimperator.search.clear(); },
+            default_value: false
         }
     ));
     addOption(new Option(["ignorecase", "ic"], "boolean",
@@ -510,7 +510,7 @@ function Options() //{{{
         {
             short_help: "Override the 'ignorecase' option if the pattern contains uppercase characters",
             help: "This is only used if the <code class=\"option\">'ignorecase'</code> option is set.",
-            default_value: false
+            default_value: true
         }
     ));
     addOption(new Option(["titlestring"], "string",

From ccb246d187e0fc1c7ff63ad8c348bd8fac641c7c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 8 Sep 2007 10:02:54 +0000
Subject: [PATCH 044/224] merge improved setTitleString() from MAIN

---
 chrome/content/vimperator/options.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index c79d17a0..75cb7351 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -224,7 +224,10 @@ function Options() //{{{
     function setTitleString(value)
     {
         document.getElementById("main-window").setAttribute("titlemodifier", value);
-        document.title = window.content.document.title + " - " + value; // not perfect fix, but good enough
+        if (window.content.document.title.length > 0)
+            document.title = window.content.document.title + " - " + value;
+        else
+            document.title = value;
     }
 
     //

From c03c8349b2eec45e8cb050abd04ccfce885d2773 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 8 Sep 2007 10:05:53 +0000
Subject: [PATCH 045/224] fixed saving qmarks

---
 chrome/content/vimperator/events.js     | 10 +++++-----
 chrome/content/vimperator/vimperator.js |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/chrome/content/vimperator/events.js b/chrome/content/vimperator/events.js
index 2cba982a..d234c002 100644
--- a/chrome/content/vimperator/events.js
+++ b/chrome/content/vimperator/events.js
@@ -244,14 +244,14 @@ function Events() //{{{
     this.destroy = function()
     {
         // BIG TODO: removeEventListeners() to avoid mem leaks
-        window.dump("TODO: remove all eventlisteners");
+        window.dump("TODO: remove all eventlisteners\n");
 
         getBrowser().removeProgressListener(this.progressListener);
 
-        window.removeEventListener("popupshown", enterPopupMode(), true);
-        window.removeEventListener("popuphidden", exitPopupMode(), true);
-        window.removeEventListener("DOMMenuBarActive", enterMenuMode(), true);
-        window.removeEventListener("DOMMenuBarInactive", exitMenuMode(), true);
+        window.removeEventListener("popupshown", enterPopupMode, true);
+        window.removeEventListener("popuphidden", exitPopupMode, true);
+        window.removeEventListener("DOMMenuBarActive", enterMenuMode, true);
+        window.removeEventListener("DOMMenuBarInactive", exitMenuMode, true);
     }
 
     // This method pushes keys into the event queue from vimperator
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index 811895df..e44ad4ae 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -676,9 +676,11 @@ const vimperator = (function() //{{{
 
             // save our preferences
             vimperator.commandline.destroy();
-            vimperator.events.destroy();
-            vimperator.options.destroy();
             vimperator.quickmarks.destroy();
+            vimperator.options.destroy();
+            vimperator.events.destroy();
+
+            window.dump("All vimperator modules destroyed\n");
         }
     } //}}}
 })(); //}}}

From 5abcf8fefe988a80988454a4074bd034b591bdc4 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 8 Sep 2007 10:08:07 +0000
Subject: [PATCH 046/224] added :w -> :saveas alias, and changed :w[open] to
 :wo[pen]

---
 chrome/content/vimperator/commands.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 80a60526..15f63d00 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -902,7 +902,7 @@ function Commands() //{{{
             help: "Useful when installing extensions."
         }
     ));
-    addDefaultCommand(new Command(["sav[eas]"],
+    addDefaultCommand(new Command(["sav[eas]", "w[rite]"],
         function() { saveDocument(window.content.document); },
         {
             short_help: "Save current web page to disk",
@@ -1233,7 +1233,7 @@ function Commands() //{{{
             short_help: "Show help for normal mode commands"
         }
     ));
-    addDefaultCommand(new Command(["wino[pen]", "w[open]", "wine[dit]"],
+    addDefaultCommand(new Command(["wino[pen]", "wo[pen]", "wine[dit]"],
         function(args)
         {
             if (args)

From 1c032bcba6636d68e34cd6e783796314a09e2748 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 8 Sep 2007 10:10:12 +0000
Subject: [PATCH 047/224] fixed multiline input widget

---
 chrome/content/vimperator/ui.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/ui.js b/chrome/content/vimperator/ui.js
index fd126578..ea634ac8 100644
--- a/chrome/content/vimperator/ui.js
+++ b/chrome/content/vimperator/ui.js
@@ -310,7 +310,8 @@ function CommandLine() //{{{
         {
             // prevent losing focus, there should be a better way, but it just didn't work otherwise
             setTimeout(function() {
-                if (vimperator.hasMode(vimperator.modes.COMMAND_LINE))
+                if (vimperator.hasMode(vimperator.modes.COMMAND_LINE) &&
+                    !vimperator.hasMode(vimperator.modes.READ_MULTILINE))
                         command_widget.inputField.focus();
             }, 0);
         }

From 89cd85d06c0b8eb1d3a511e458cf2c04e4ffbc44 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 9 Sep 2007 10:22:53 +0000
Subject: [PATCH 048/224] fix case sensitivity of search highlighting -
 gFindBar.setCaseSensitivity() in FF2 does not set the preference as
 _setCaseSensitivity() does in FF3

---
 chrome/content/vimperator/find.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/find.js b/chrome/content/vimperator/find.js
index 913c3842..417300b7 100644
--- a/chrome/content/vimperator/find.js
+++ b/chrome/content/vimperator/find.js
@@ -205,7 +205,10 @@ function Search() //{{{
         if (!word)
             word = lastsearch;
 
-        gFindBar.setCaseSensitivity(case_sensitive)
+        // NOTE: setCaseSensitivity() in FF2 does NOT set the
+        // accessibility.typeaheadfind.casesensitive pref as needed by
+        // highlightDoc()
+        gFindBar.mTypeAheadCaseSensitive = case_sensitive ? 1 : 0;
         gFindBar.highlightDoc("yellow", "black", word);
     }
 

From 52270c27e8920a0f7945290ad85316b0babbf87f Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 11 Sep 2007 04:15:08 +0000
Subject: [PATCH 049/224] fix 'cpt' help typo

---
 chrome/content/vimperator/options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index 75cb7351..3f80e12d 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -350,7 +350,7 @@ function Options() //{{{
         {
             short_help: "Items which are completed at the :[tab]open prompt",
             help: "Available items:<br/><ul>" +
-                  "<li><b>s</b>: Search machines and keyword URLs</li>" +
+                  "<li><b>s</b>: Search engines and keyword URLs</li>" +
                   "<li><b>f</b>: Local files</li>" +
                   "<li><b>b</b>: Bookmarks</li>" +
                   "<li><b>h</b>: History</li></ul>" +

From 79bbf87a8ecde5428a733ab57a0c510816a105eb Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 11 Sep 2007 14:01:58 +0000
Subject: [PATCH 050/224] merge new 'popups' option

---
 chrome/content/vimperator/options.js | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index 3f80e12d..1a39caf9 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -230,6 +230,16 @@ function Options() //{{{
             document.title = value;
     }
 
+    function setPopups(value)
+    {
+        var values = [ [0, 1], // always in current tab
+                       [0, 3], // in a new tab
+                       [2, 3], // in a new window if it has specified sizes
+                       [1, 2]];// always in new window
+        storePreference("browser.link.open_newwindow.restriction", values[value][0]);
+        storePreference("browser.link.open_newwindow", values[value][1]);
+    }
+
     //
     // firefox preferences which need to be changed to work well with vimperator
     //
@@ -450,6 +460,21 @@ function Options() //{{{
             validator: function (value) { if (value >= 1 && value <= 1000) return true; else return false; }
         }
     ));
+    addOption(new Option(["popups", "pps"], "number",
+        {
+            short_help: "Where to show requested popup windows",
+            help: "Define where to show requested popup windows. Does not apply to windows which are opened by middle clicking a link, they always open in a new tab. " +
+                  "Possible values:<br/><ul>" +
+                  "<li><b>0</b>: Force to open in the current tab (NOTE: this can stop some web sites from working correctly!)</li>" +
+                  "<li><b>1</b>: Always open in a new tab</li>" +
+                  "<li><b>2</b>: Open in a new window if it has a specific requested size (default in Firefox)</li>"+
+                  "<li><b>3</b>: Always open in a new window</li></ul>" +
+                  "NOTE: This option does not change the popup blocker of Firefox in any way.",
+            default_value: 1,
+            setter: function(value) { Options.setPref("popups", value); setPopups(value); },
+            validator: function (value) { if (value >= 0 && value <= 3) return true; else return false; }
+        }
+    ));
     addOption(new Option(["preload"], "boolean",
         {
             short_help: "Speed up first time history/bookmark completion",
@@ -594,6 +619,7 @@ function Options() //{{{
     setShowTabline(this.showtabline);
     setGuiOptions(this.guioptions);
     setTitleString(this.titlestring);
+    setPopups(this.popups);
 } //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:

From 2209703239743c17cc29e2debe13afbd8f4e566a Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 14 Sep 2007 04:31:37 +0000
Subject: [PATCH 051/224] allow single line :js commands to be source from RC
 files

---
 chrome/content/vimperator/vimperator.js | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index e44ad4ae..331edf82 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -518,23 +518,27 @@ const vimperator = (function() //{{{
 
                 // handle pure javascript files specially
                 if (filename.search("\.js$") != -1)
+                {
                     eval(s);
+                }
                 else
                 {
                     var heredoc = "";
-                    var heredocEnd = null; // the string which ends the heredoc
+                    var heredoc_end = null; // the string which ends the heredoc
                     s.split("\n").forEach(function(line)
                     {
-                        if (heredocEnd) // we already are in a heredoc
+                        if (heredoc_end) // we already are in a heredoc
                         {
-                            if (line.search(heredocEnd) != -1)
+                            if (heredoc_end.test(line))
                             {
                                 eval(heredoc);
                                 heredoc = "";
-                                heredocEnd = null;
+                                heredoc_end = null;
                             }
                             else
+                            {
                                 heredoc += line + "\n";
+                            }
                         }
                         else
                         {
@@ -544,12 +548,16 @@ const vimperator = (function() //{{{
                             if (command && command.name == "javascript")
                             {
                                 var matches = args.match(/(.*)<<\s*([^\s]+)$/);
-                                if (matches && matches[2])
+                                if (matches)
                                 {
-                                    heredocEnd = new RegExp("^" + matches[2] + "$", "m");
+                                    heredoc_end = new RegExp("^" + matches[2] + "$", "m");
                                     if (matches[1])
                                         heredoc = matches[1] + "\n";
                                 }
+                                else
+                                {
+                                    command.execute(args, special, count);
+                                }
                             }
                             else
                             {

From b7b1aaac0c11539a21e73913ae085d18fb80275a Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 14 Sep 2007 04:37:45 +0000
Subject: [PATCH 052/224] merge keyDown event handling from MAIN - helps with
 sites such as yahoo.com which trap all keyDown events

---
 chrome/content/vimperator/events.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/chrome/content/vimperator/events.js b/chrome/content/vimperator/events.js
index d234c002..b7fce475 100644
--- a/chrome/content/vimperator/events.js
+++ b/chrome/content/vimperator/events.js
@@ -611,6 +611,18 @@ function Events() //{{{
     }
     window.addEventListener("keypress", this.onKeyPress, true);
 
+    // this is need for sites like msn.com which focus the input field on keydown
+    this.onKeyDown = function(event)
+    {
+        if (vimperator.modes.passNextKey ^ vimperator.modes.passAllKeys || isFormElemFocused())
+            return true;
+
+        event.preventDefault();
+        event.stopPropagation();
+        return false;
+    }
+    window.addEventListener("keydown", this.onKeyDown, true);
+
     this.progressListener =
     {
         QueryInterface: function(aIID)

From 57886630c05cb5b9d0d5a5151dd4e08b2243e161 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 14 Sep 2007 13:38:17 +0000
Subject: [PATCH 053/224] add a 'hlsearchstyle' option to allow for match
 styling and a 'linksearch' option to restrict page searches to link text

---
 NEWS                                  |   4 +
 chrome/content/vimperator/find.js     | 163 ++++++++++++++++----------
 chrome/content/vimperator/mappings.js |  12 +-
 chrome/content/vimperator/options.js  |  20 +++-
 4 files changed, 131 insertions(+), 68 deletions(-)

diff --git a/NEWS b/NEWS
index 47a19f43..5d4a9a52 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.2
+	* added 'hlsearchstyle' option to allow for user CSS styling of the
+	  highlighted text strings when 'hlsearch' is set
+	* added 'linksearch' option to restrict page searches to link text - \U
+	  and \u can be used in the search pattern to override 'linksearch'
 	* added a visual bell and replaced 'beep' with 'visualbell'
 	* added 'hlsearch','incsearch', 'ignorecase' and 'smartcase' options
 
diff --git a/chrome/content/vimperator/find.js b/chrome/content/vimperator/find.js
index 417300b7..0e47db0b 100644
--- a/chrome/content/vimperator/find.js
+++ b/chrome/content/vimperator/find.js
@@ -26,16 +26,29 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-// TODO: <ESC> should cancel search highlighting in 'incsearch' mode
+// TODO: proper backwards search - implement our own component?
+//     : implement our own highlighter?
+//     : frameset pages
+//     : <ESC> should cancel search highlighting in 'incsearch' mode and jump
+//       back to the presearch page location - can probably use the same
+//       solution as marks
+//     : 'linksearch' searches should highlight link matches only
+//     : changing any search settings should also update the search state including highlighting
+//     : incremental searches shouldn't permanently update search modifiers
+
 // make sure you only create this object when the "vimperator" object is ready
 function Search() //{{{
 {
-    var self = this;                  // needed for callbacks since "this" is the "vimperator" object in a callback
-    var found = false;                // true if the last search was successful
-    var backwards = false;            // currently searching backwards
-    var lastsearch = "";              // keep track of the last searched string
-    var lastsearch_backwards = false; // like "backwards", but for the last search, so if you cancel a search with <esc> this is not set
-    var case_sensitive = true;
+    var self = this;                   // needed for callbacks since "this" is the "vimperator" object in a callback
+    var found = false;                 // true if the last search was successful
+    var backwards = false;             // currently searching backwards
+    var search_string = "";            // current search string (without modifiers)
+    var search_pattern = "";           // current search string (includes modifiers)
+    var last_search_pattern = "";      // the last searched pattern (includes modifiers)
+    var last_search_string = "";       // the last searched string (without modifiers)
+    var last_search_backwards = false; // like "backwards", but for the last search, so if you cancel a search with <esc> this is not set
+    var case_sensitive = false;        // search string is case sensitive
+    var links_only = false;            // search is limited to link text only
 
     // Event handlers for search - closure is needed
     vimperator.registerCallback("change", vimperator.modes.SEARCH_FORWARD, function(command) { self.searchKeyPressed(command); });
@@ -46,43 +59,46 @@ function Search() //{{{
     vimperator.registerCallback("submit", vimperator.modes.SEARCH_BACKWARD, function(command) { self.searchSubmitted(command); });
     vimperator.registerCallback("cancel", vimperator.modes.SEARCH_BACKWARD, function() { self.searchCanceled(); });
 
-    // clean the pattern search string of modifiers and set the
-    // case-sensitivity flag
-    function processPattern(pattern)
+    // set search_string, search_pattern, case_sensitive, links_only
+    function processUserPattern(pattern)
     {
-        // strip off pattern terminator and trailing /junk
+        // strip off pattern terminator and offset
         if (backwards)
             pattern = pattern.replace(/\?.*/, "");
         else
             pattern = pattern.replace(/\/.*/, "");
 
-        if (!pattern)
-            pattern = lastsearch;
+        search_pattern = pattern;
 
-        if (/\\C/.test(pattern))
-        {
-            case_sensitive = true;
-            pattern = pattern.replace(/\\C/, "");
-        }
-        else if (/\\c/.test(pattern))
-        {
+        // case sensitivity - \c wins if both modifiers specified
+        if (/\c/.test(pattern))
             case_sensitive = false;
-            pattern = pattern.replace(/\\c/, "");
-        }
+        else if (/\C/.test(pattern))
+            case_sensitive = true;
         else if (vimperator.options["ignorecase"] && vimperator.options["smartcase"] && /[A-Z]/.test(pattern))
-        {
             case_sensitive = true;
-        }
         else if (vimperator.options["ignorecase"])
-        {
             case_sensitive = false;
-        }
         else
-        {
             case_sensitive = true;
-        }
 
-        return pattern;
+        // links only search - \u wins if both modifiers specified
+        if (/\\u/.test(pattern))
+            links_only = false;
+        else if (/\U/.test(pattern))
+            links_only = true;
+        else if (vimperator.options["linksearch"])
+            links_only = true;
+        else
+            links_only = false;
+
+        // strip modifiers
+        pattern = pattern.replace(/(\\)?\\[cCuU]/g, function($0, $1) { return $1 ? $0 : "" });
+
+        // remove the modifer escape \
+        pattern = pattern.replace(/\\(\\[cCuU])/g, '$1')
+
+        search_string = pattern;
     }
 
     // Called when the search dialog is asked for
@@ -108,10 +124,14 @@ function Search() //{{{
     this.find = function(str, backwards)
     {
         var fastFind = getBrowser().fastFind;
-        str = processPattern(str);
+
+        processUserPattern(str);
 
         fastFind.caseSensitive = case_sensitive;
-        found = fastFind.find(str, false) != Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND;
+        found = fastFind.find(search_string, links_only) != Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND;
+
+        if (!found)
+            vimperator.echoerr("E486: Pattern not found: " + search_pattern);
 
         return found;
     }
@@ -120,16 +140,12 @@ function Search() //{{{
     this.findAgain = function(reverse)
     {
         // this hack is needed to make n/N work with the correct string, if
-        // we typed /foo<esc> after the original search
-        // TODO: this should also clear the current item highlighting
-        if (getBrowser().fastFind.searchString != lastsearch)
-        {
-            this.clear();
-            this.find(lastsearch, false);
-            this.highlight(lastsearch);
-        }
+        // we typed /foo<esc> after the original search.  Since searchString is
+        // readonly we have to call find() again to update it.
+        if (getBrowser().fastFind.searchString != last_search_string)
+            this.find(last_search_string, false);
 
-        var up = reverse ? !lastsearch_backwards : lastsearch_backwards;
+        var up = reverse ? !last_search_backwards : last_search_backwards;
         var result;
 
         if (up)
@@ -139,7 +155,7 @@ function Search() //{{{
 
         if (result == Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND)
         {
-            vimperator.echoerr("E486: Pattern not found: " + lastsearch);
+            vimperator.echoerr("E486: Pattern not found: " + last_search_pattern);
         }
         else if (result == Components.interfaces.nsITypeAheadFind.FIND_WRAPPED)
         {
@@ -150,21 +166,22 @@ function Search() //{{{
                     vimperator.echoerr("search hit TOP, continuing at BOTTOM");
                 else
                     vimperator.echoerr("search hit BOTTOM, continuing at TOP");
-            }, 10);
+            }, 0);
         }
-        else // just clear the command line if something has been found
+        else
         {
-            vimperator.echo("");
+            vimperator.echo((up ? "?" : "/") + last_search_pattern);
+
+            if (vimperator.options["hlsearch"])
+                this.highlight(last_search_string);
         }
     }
 
-    // Called when the user types a key in the search dialog. Triggers a find attempt
+    // Called when the user types a key in the search dialog. Triggers a find attempt if 'incsearch' is set
     this.searchKeyPressed = function(command)
     {
-        if (!vimperator.options["incsearch"])
-            return;
-
-        this.find(command, backwards);
+        if (vimperator.options["incsearch"])
+            this.find(command, backwards);
     }
 
     // Called when the enter key is pressed to trigger a search
@@ -174,17 +191,24 @@ function Search() //{{{
         if (typeof forced_backward === "boolean")
             backwards = forced_backward;
 
+        // use the last pattern if none specified
+        if (!command)
+            command = last_search_pattern;
+
         this.clear();
         this.find(command, backwards);
-        this.highlight(command);
 
-        // need to find again to draw the highlight of the current search
-        // result over the "highlight all" search results
-        // very hacky, but seems to work
-        setTimeout(function() { self.findAgain(false); }, 10);
+        last_search_backwards = backwards;
+        last_search_pattern = command.replace(backwards ? /\?.*/ : /\/.*/, ""); // XXX
+        last_search_string = search_string;
 
-        lastsearch_backwards = backwards;
-        lastsearch = command;
+        // TODO: move to find() when reverse incremental searching is kludged in
+        // need to find again for reverse searching
+        if (backwards)
+            setTimeout(function() { self.findAgain(false); }, 0);
+
+        if (vimperator.options["hlsearch"])
+            this.highlight(search_string);
 
         vimperator.setMode(vimperator.modes.NORMAL);
         vimperator.focusContent();
@@ -196,25 +220,42 @@ function Search() //{{{
     {
         //removeMode(MODE_SEARCH);
         vimperator.setMode(vimperator.modes.NORMAL);
-        this.clear();
         vimperator.focusContent();
     }
 
-    this.highlight = function(word)
+    this.highlight = function(text)
     {
-        if (!word)
-            word = lastsearch;
+        // already highlighted?
+        if (window.content.document.getElementById("__firefox-findbar-search-id"))
+            return;
+
+        if (!text)
+            text = last_search_string;
 
         // NOTE: setCaseSensitivity() in FF2 does NOT set the
         // accessibility.typeaheadfind.casesensitive pref as needed by
         // highlightDoc()
         gFindBar.mTypeAheadCaseSensitive = case_sensitive ? 1 : 0;
-        gFindBar.highlightDoc("yellow", "black", word);
+        gFindBar.highlightDoc("white", "black", text);
+
+        // TODO: seems fast enough for now
+        // NOTE: FF2 highlighting spans all have this id rather than a class attribute
+        var spans = vimperator.buffer.evaluateXPath('//span[@id="__firefox-findbar-search-id"]')
+        for (var i = 0; i < spans.snapshotLength; i++)
+            spans.snapshotItem(i).setAttribute("style", vimperator.options["hlsearchstyle"]);
+
+        // recreate selection since _highlightDoc collapses the selection backwards
+        getBrowser().fastFind.findNext();
+
+        // TODO: remove highlighting from non-link matches (HTML - A/AREA with href attribute; XML - Xlink [@type="simple"])
     }
 
     this.clear = function()
     {
         gFindBar.highlightDoc();
+        // need to manually collapse the selection if the document is not
+        // highlighted
+        getBrowser().fastFind.collapseSelection();
     }
 
 } //}}}
diff --git a/chrome/content/vimperator/mappings.js b/chrome/content/vimperator/mappings.js
index 40fdf6da..2ca9a642 100644
--- a/chrome/content/vimperator/mappings.js
+++ b/chrome/content/vimperator/mappings.js
@@ -945,7 +945,9 @@ function Mappings() //{{{
             usage: ["/{pattern}[/]<CR>"],
             help: "Search forward for the first occurance of <code class=\"argument\">{pattern}</code>.<br/>" +
                   "When \"\\c\" appears anywhere in the pattern the whole pattern is handled as though <code class=\"option\">'ignorecase'</code> is on. " +
-                  "\"\\C\" forces case-sensitive matching for the whole pattern."
+                  "\"\\C\" forces case-sensitive matching for the whole pattern.<br/>" +
+                  "If \"\\u\" appears in the pattern only the text of links is searched for a match as though <code class=\"option\">'linksearch'</code> is on. " +
+                  "\"\\U\" forces the entire page to be searched for a match."
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["?"],
@@ -954,9 +956,11 @@ function Mappings() //{{{
             short_help: "Search backwards for a pattern",
             usage: ["?{pattern}[?]<CR>"],
             help: "Search backward for the first occurance of <code class=\"argument\">{pattern}</code>.<br/>" +
-                  "When '\\c' appears anywhere in the pattern the whole pattern is handled as though <code class=\"option\">'ignorecase'</code> is on. " +
-                  "'\\C' forces case-sensitive matching for the whole pattern.<br/>" +
-                  "NOTE: incremental searching currenly only works in the forward direction."
+                  "When \"\\c\" appears anywhere in the pattern the whole pattern is handled as though <code class=\"option\">'ignorecase'</code> is on. " +
+                  "\"\\C\" forces case-sensitive matching for the whole pattern.<br/>" +
+                  "If \"\\u\" appears in the pattern only the text of links is searched for a match as though <code class=\"option\">'linksearch'</code> is on. " +
+                  "\"\\U\" forces the entire page to be searched for a match.<br/>" +
+                  "NOTE: incremental searching currently only works in the forward direction."
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["n"],
diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index 1a39caf9..37e9755e 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -387,7 +387,7 @@ function Options() //{{{
     ));
     addOption(new Option(["focusedhintstyle", "fhs"], "string",
         {
-            short_help: "CSS specification of focused hints appearance",
+            short_help: "CSS specification of focused hints",
             default_value: "z-index:5000; font-family:monospace; font-size:12px; color:ButtonText; background-color:ButtonShadow; " +
                            "border-color:ButtonShadow; border-width:1px; border-style:solid; padding:0px 1px 0px 1px; position:absolute;"
         }
@@ -421,12 +421,12 @@ function Options() //{{{
     ));
     addOption(new Option(["hintstyle", "hs"], "string",
         {
-            short_help: "CSS specification of unfocused hints appearance",
+            short_help: "CSS specification of unfocused hints",
             default_value: "z-index:5000; font-family:monospace; font-size:12px; color:white; background-color:red; " +
                            "border-color:ButtonShadow; border-width:0px; border-style:solid; padding:0px 1px 0px 1px; position:absolute;"
         }
     ));
-    addOption(new Option(["hinttags"], "string",
+    addOption(new Option(["hinttags", "ht"], "string",
         {
             short_help: "XPath string of hintable elements activated by <code class=\"mapping\">'f'</code> and <code class=\"mapping\">'F'</code>",
             default_value: DEFAULT_HINTTAGS
@@ -439,6 +439,12 @@ function Options() //{{{
             default_value: false
         }
     ));
+    addOption(new Option(["hlsearchstyle", "hlss"], "string",
+        {
+            short_help: "CSS specification of highlighted search items",
+            default_value: "color: black; background-color: yellow; padding: 0; display: inline;"
+        }
+    ));
     addOption(new Option(["ignorecase", "ic"], "boolean",
         {
             short_help: "Ignore case in search patterns",
@@ -452,6 +458,13 @@ function Options() //{{{
             default_value: true
         }
     ));
+    addOption(new Option(["linksearch", "ls"], "boolean",
+        {
+            short_help: "Limit the search to hyperlink text",
+            help: "This includes (X)HTML elements with an \"href\" atrribute and XLink \"simple\" links.",
+            default_value: false
+        }
+    ));
     addOption(new Option(["maxhints", "mh"], "number",
         {
             short_help: "Maximum number of simultaneously shown hints",
@@ -572,6 +585,7 @@ function Options() //{{{
     addOption(new Option(["visualbell", "vb"], "boolean",
         {
             short_help: "Use visual bell instead of beeping on errors",
+            setter: function(value) { Options.setPref("visualbell", value); Options.setFirefoxPref("accessibility.typeaheadfind.enablesound", !value); },
             default_value: false
         }
     ));

From b64e882c9ce1ed3ba1bb8fa666ec263d93dcff4a Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 17 Sep 2007 01:33:59 +0000
Subject: [PATCH 054/224] fix onKeyDown handler to use 0.5 style mode handling
 - bad merge

---
 chrome/content/vimperator/events.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/events.js b/chrome/content/vimperator/events.js
index b7fce475..08b640a6 100644
--- a/chrome/content/vimperator/events.js
+++ b/chrome/content/vimperator/events.js
@@ -614,7 +614,7 @@ function Events() //{{{
     // this is need for sites like msn.com which focus the input field on keydown
     this.onKeyDown = function(event)
     {
-        if (vimperator.modes.passNextKey ^ vimperator.modes.passAllKeys || isFormElemFocused())
+        if (vimperator.hasMode(vimperator.modes.ESCAPE_ONE_KEY) || vimperator.hasMode(vimperator.modes.ESCAPE_ALL_KEYS) || isFormElemFocused())
             return true;
 
         event.preventDefault();

From 29eb1446174106110109905e06d4bd03993952f3 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 17 Sep 2007 05:49:44 +0000
Subject: [PATCH 055/224] merge new 'more' option and more-prompt improvements

---
 NEWS                                     |   2 +
 chrome/content/vimperator/events.js      |  74 ++++++--
 chrome/content/vimperator/options.js     |   6 +
 chrome/content/vimperator/ui.js          | 216 +++++++++++++++++++++--
 chrome/content/vimperator/vimperator.js  |  17 +-
 chrome/content/vimperator/vimperator.xul |   7 +-
 6 files changed, 282 insertions(+), 40 deletions(-)

diff --git a/NEWS b/NEWS
index 5d4a9a52..05794c45 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.2
+	* added 'more' and standard more-prompt key mappings to control
+	  behaviour of the message list pager 
 	* added 'hlsearchstyle' option to allow for user CSS styling of the
 	  highlighted text strings when 'hlsearch' is set
 	* added 'linksearch' option to restrict page searches to link text - \U
diff --git a/chrome/content/vimperator/events.js b/chrome/content/vimperator/events.js
index 08b640a6..f4c444f8 100644
--- a/chrome/content/vimperator/events.js
+++ b/chrome/content/vimperator/events.js
@@ -326,6 +326,7 @@ function Events() //{{{
 
         var key = null;
         var modifier = "";
+
         if (event.ctrlKey)
             modifier += "C-";
         if (event.altKey)
@@ -333,33 +334,61 @@ function Events() //{{{
         if (event.metaKey)
             modifier += "M-";
 
-        if (event.charCode == 0)
+        if (event.type == "keypress")
         {
-            if (event.shiftKey)
-                modifier += "S-";
-
-            for (var i in keyTable)
+            if (event.charCode == 0)
             {
-                if (keyTable[i][0] == event.keyCode)
+                if (event.shiftKey)
+                    modifier += "S-";
+
+                for (var i in keyTable)
                 {
-                    key = keyTable[i][1][0];
-                    break;
+                    if (keyTable[i][0] == event.keyCode)
+                    {
+                        key = keyTable[i][1][0];
+                        break;
+                    }
                 }
             }
+            // special handling of the Space key
+            else if (event.charCode == 32)
+            {
+                if (event.shiftKey)
+                    modifier += "S-";
+                key = "Space";
+            }
+            // a normal key like a, b, c, 0, etc.
+            else if (event.charCode > 0)
+            {
+                key = String.fromCharCode(event.charCode);
+                if (modifier.length == 0)
+                    return key;
+            }
+
+            if (key == null)
+                return null;
+
         }
-        // special handling of the Space key
-        else if (event.charCode == 32)
+        else if (event.type == "click" || event.type == "dblclick")
         {
             if (event.shiftKey)
                 modifier += "S-";
-            key = "Space";
-        }
-        // a normal key like a, b, c, 0, etc.
-        else if (event.charCode > 0)
-        {
-            key = String.fromCharCode(event.charCode);
-            if (modifier.length == 0)
-                return key;
+            if (event.type == "dblclick")
+                modifier += "2-";
+            // TODO: triple and quadruple click
+
+            switch (event.button)
+            {
+                case 0:
+                    key = "LeftMouse"
+                    break;
+                case 1:
+                    key = "MiddleMouse"
+                    break;
+                case 2:
+                    key = "RightMouse"
+                    break;
+            }
         }
 
         if (key == null)
@@ -367,6 +396,7 @@ function Events() //{{{
 
         // a key like F1 is always enclosed in < and >
         return "<" + modifier + key + ">";
+
     } //}}}
 
     this.isAcceptKey = function(key)
@@ -449,6 +479,14 @@ function Events() //{{{
                 ; // let flow continue to handle these keys
             else
                 return false;
+
+        }
+
+        if (vimperator.hasMode(vimperator.modes.COMMAND_LINE) &&
+            vimperator.hasMode(vimperator.modes.WRITE_MULTILINE))
+        {
+            vimperator.commandline.onMultilineOutputEvent(event);
+            return false;
         }
 
     //  // FIXME: handle middle click in content area {{{
diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index 37e9755e..f3d92470 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -465,6 +465,12 @@ function Options() //{{{
             default_value: false
         }
     ));
+    addOption(new Option(["more"], "boolean",
+        {
+            short_help: "Pause the message list window when more than one screen of listings is displayed",
+            default_value: true
+        }
+    ));
     addOption(new Option(["maxhints", "mh"], "number",
         {
             short_help: "Maximum number of simultaneously shown hints",
diff --git a/chrome/content/vimperator/ui.js b/chrome/content/vimperator/ui.js
index ea634ac8..3cb01d15 100644
--- a/chrome/content/vimperator/ui.js
+++ b/chrome/content/vimperator/ui.js
@@ -133,7 +133,11 @@ function CommandLine() //{{{
         command_widget.value = cmd;
     }
 
-    function setMultiline(cmd)
+    // TODO: the invoking command should be pasted at the top of the MOW and
+    //       the MOW messages should actually be displayed in the commandline
+    //     : extract CSS
+    //     : resize upon a window resize
+    function setMultiline(str)
     {
         // TODO: we should retain any previous command output like Vim
         if (!multiline_output_widget.collapsed)
@@ -141,22 +145,42 @@ function CommandLine() //{{{
 
         multiline_input_widget.collapsed = true;
 
-        // vimperator.log(content_height);
-        cmd = cmd.replace(/\n|\\n/g, "<br/>") + "<br/><span style=\"color: green;\">Press ENTER or type command to continue</span>";
-        multiline_output_widget.contentDocument.body.innerHTML = cmd;
+        var output = str.replace(/\n|\\n/g, "<br/>");
+        //output =  ":" + command_widget.value + "<br/>" + output;
+        output += "<br/>"
+        output += '<span id="end-prompt" style="color: green; background-color: white;">Press ENTER or type command to continue</span>';
+        output += '<span id="more-prompt" style="display: none; position: fixed; top: auto; bottom: 0; left: 0; right: 0; color: green; background-color: white;">';
+        output += "-- More --";
+        output += '</span>';
+        output += '<span id="more-help-prompt" style="display: none; position: fixed; top: auto; bottom: 0; left: 0; right: 0; color: green; background-color: white;">';
+        output += "-- More -- SPACE/d/j: screen/page/line down, b/u/k: up, q: quit";
+        output += '</span>';
+
+        multiline_output_widget.contentDocument.body.innerHTML = output;
 
-        // TODO: resize upon a window resize
         var available_height = getBrowser().mPanelContainer.boxObject.height;
         var content_height = multiline_output_widget.contentDocument.height;
-        // vimperator.log(content_height);
         var height = content_height < available_height ? content_height : available_height;
 
         //multiline_output_widget.style.height = height + "px";
         multiline_output_widget.height = height + "px";
         multiline_output_widget.collapsed = false;
-        //vimperator.log(content_height);
-        multiline_output_widget.contentWindow.scrollTo(0, content_height); // scroll to the end when 'nomore' is set
+
+        if (vimperator.options["more"] && multiline_output_widget.contentWindow.scrollMaxY > 0)
+        {
+            multiline_output_widget.contentWindow.document.getElementById("more-prompt").style.display = "inline";
+            multiline_output_widget.contentWindow.scrollTo(0, 0);
+        }
+        else
+        {
+            multiline_output_widget.contentWindow.scrollTo(0, content_height);
+        }
+
         multiline_output_widget.contentWindow.focus();
+
+        // save the mode, because we need to restore it on blur()
+        [old_mode, old_extended_mode] = vimperator.getMode();
+        vimperator.setMode(vimperator.modes.COMMAND_LINE, vimperator.modes.WRITE_MULTILINE, true);
     }
 
     function autosizeMultilineInputWidget()
@@ -311,7 +335,8 @@ function CommandLine() //{{{
             // prevent losing focus, there should be a better way, but it just didn't work otherwise
             setTimeout(function() {
                 if (vimperator.hasMode(vimperator.modes.COMMAND_LINE) &&
-                    !vimperator.hasMode(vimperator.modes.READ_MULTILINE))
+                    !vimperator.hasMode(vimperator.modes.READ_MULTILINE) &&
+                    !vimperator.hasMode(vimperator.modes.WRITE_MULTILINE))
                         command_widget.inputField.focus();
             }, 0);
         }
@@ -577,14 +602,183 @@ function CommandLine() //{{{
         }
     }
 
+    // FIXME: if 'more' is set and the MOW is not scrollable we should still
+    // allow a down motion after an up rather than closing
     this.onMultilineOutputEvent = function(event)
     {
-        var key = vimperator.events.toString(event);
-        if (vimperator.events.isAcceptKey(key) || vimperator.events.isCancelKey(key))
+        var win = multiline_output_widget.contentWindow;
+
+        var show_more_help_prompt = false;
+        var show_more_prompt = false;
+
+        function isScrollable() { return !win.scrollMaxY == 0; }
+
+        function atEnd() { return win.scrollY / win.scrollMaxY >= 1; }
+
+        function close()
         {
             multiline_output_widget.collapsed = true;
+            vimperator.setMode(vimperator.modes.NORMAL);
             vimperator.focusContent();
         }
+
+        function pass(event)
+        {
+            close();
+            vimperator.events.onKeyPress(event);
+        }
+
+        var key = vimperator.events.toString(event);
+
+        switch (key)
+        {
+            case ":":
+                vimperator.commandline.open(":", "", vimperator.modes.EX);
+                break;
+
+            // down a line
+            case "j":
+            case "<Down>":
+                if (vimperator.options["more"] && isScrollable())
+                    win.scrollByLines(1);
+                else
+                    pass(event);
+                break;
+
+            case "<C-j>":
+            case "<C-m>":
+            case "<Return>":
+                if (vimperator.options["more"] && isScrollable() && !atEnd())
+                    win.scrollByLines(1);
+                else
+                    close(); // don't propagate the event for accept keys
+                break;
+
+            // up a line
+            case "k":
+            case "<Up>":
+            case "<BS>":
+                if (vimperator.options["more"] && isScrollable())
+                    win.scrollByLines(-1);
+                else if (vimperator.options["more"] && !isScrollable())
+                    show_more_prompt = true;
+                else
+                    pass(event);
+                break;
+
+            // half page down
+            case "d":
+                if (vimperator.options["more"] && isScrollable())
+                    win.scrollBy(0, win.innerHeight / 2);
+                else
+                    pass(event);
+                break;
+
+            case "<LeftMouse>":
+            case "<A-LeftMouse>":
+            case "<C-LeftMouse>":
+            case "<S-LeftMouse>":
+                if (/^(end|more(-help)?)-prompt$/.test(event.target.id))
+                    ; // fall through
+                else
+                    break;
+
+            // page down
+            case "f":
+                if (vimperator.options["more"] && isScrollable())
+                    win.scrollByPages(1);
+                else
+                    pass(event);
+                break;
+
+            case "<Space>":
+            case "<PageDown>":
+                if (vimperator.options["more"] && isScrollable() && !atEnd())
+                    win.scrollByPages(1);
+                else
+                    pass(event);
+                break;
+
+            // half page up
+            case "u":
+                // if (more and scrollable)
+                if (vimperator.options["more"] && isScrollable())
+                    win.scrollBy(0, -(win.innerHeight / 2));
+                else
+                    pass(event);
+                break;
+
+            // page up
+            case "b":
+                if (vimperator.options["more"] && isScrollable())
+                    win.scrollByPages(-1);
+                else if (vimperator.options["more"] && !isScrollable())
+                    show_more_prompt = true;
+                else
+                    pass(event);
+                break;
+
+            case "<PageUp>":
+                if (vimperator.options["more"] && isScrollable())
+                    win.scrollByPages(-1);
+                else
+                    pass(event);
+                break;
+
+            // top of page
+            case "g":
+                if (vimperator.options["more"] && isScrollable())
+                    win.scrollTo(0, 0);
+                else if (vimperator.options["more"] && !isScrollable())
+                    show_more_prompt = true;
+                else
+                    pass(event);
+                break;
+
+            // bottom of page
+            case "G":
+                if (vimperator.options["more"] && isScrollable() && !atEnd())
+                    win.scrollTo(0, win.scrollMaxY);
+                else
+                    pass(event);
+                break;
+
+            // copy text to clipboard
+            case "<C-y>":
+                vimperator.copyToClipboard(win.getSelection());
+                break;
+
+            // close the window
+            case "q":
+                close();
+                break;
+
+            // unmapped key
+            default:
+                if (!vimperator.options["more"] || !isScrollable() || atEnd() || vimperator.events.isCancelKey(key))
+                    pass(event);
+                else
+                    show_more_help_prompt = true;
+        }
+
+        // set appropriate prompt string
+        var more_prompt = win.document.getElementById("more-prompt");
+        var more_help_prompt = win.document.getElementById("more-help-prompt");
+
+        if (show_more_help_prompt)
+        {
+            more_prompt.style.display = "none";
+            more_help_prompt.style.display = "inline";
+        }
+        else if (show_more_prompt || (vimperator.options["more"] && isScrollable() && !atEnd()))
+        {
+            more_help_prompt.style.display = "none";
+            more_prompt.style.display = "inline";
+        }
+        else
+        {
+            more_prompt.style.display = more_help_prompt.style.display = "none";
+        }
     }
 
     // it would be better if we had a destructor in javascript ...
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index 331edf82..e20ca9c0 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -43,14 +43,15 @@ const vimperator = (function() //{{{
         // extended modes
         EX:               1 << 10,
         READ_MULTILINE:   1 << 11,
-        SEARCH_FORWARD:   1 << 12,
-        SEARCH_BACKWARD:  1 << 13,
-        ESCAPE_ONE_KEY:   1 << 14,
-        ESCAPE_ALL_KEYS:  1 << 15,
-        QUICK_HINT:       1 << 16,
-        EXTENDED_HINT:    1 << 17,
-        ALWAYS_HINT:      1 << 18,
-        MENU:             1 << 19 // a popupmenu is active
+        WRITE_MULTILINE:  1 << 12,
+        SEARCH_FORWARD:   1 << 13,
+        SEARCH_BACKWARD:  1 << 14,
+        ESCAPE_ONE_KEY:   1 << 15,
+        ESCAPE_ALL_KEYS:  1 << 16,
+        QUICK_HINT:       1 << 17,
+        EXTENDED_HINT:    1 << 18,
+        ALWAYS_HINT:      1 << 19,
+        MENU:             1 << 20 // a popupmenu is active
     }
 
     var mode_messages = {};
diff --git a/chrome/content/vimperator/vimperator.xul b/chrome/content/vimperator/vimperator.xul
index 613fc9d4..8b6148ad 100644
--- a/chrome/content/vimperator/vimperator.xul
+++ b/chrome/content/vimperator/vimperator.xul
@@ -92,6 +92,10 @@ the terms of any one of the MPL, the GPL or the LGPL.
                     </listcols>
                 </listbox>
 
+                <iframe id="vimperator-multiline-output" src="about:blank" flex="1" height="10px" hidden="false" collapsed="true"
+                    onclick="vimperator.commandline.onMultilineOutputEvent(event)"/>
+                    <!--onkeypress="vimperator.commandline.onMultilineOutputEvent(event)"/>-->
+
                 <hbox id="vimperator-commandline" flex="1" hidden="false">
                     <label class="plain" id="vimperator-commandline-prompt"  flex="0" crop="end" value="" collapsed="true"/>
                     <textbox class="plain" id="vimperator-commandline-command" flex="1" hidden="false" type="timed" timeout="100"
@@ -101,9 +105,6 @@ the terms of any one of the MPL, the GPL or the LGPL.
                         onblur="vimperator.commandline.onEvent(event);"/>
                 </hbox>
 
-                <iframe id="vimperator-multiline-output" src="about:blank" flex="1" height="10px" hidden="false" collapsed="true"
-                    onkeypress="vimperator.commandline.onMultilineOutputEvent(event)"/>
-
                 <textbox id="vimperator-multiline-input" class="plain" flex="1" rows="10" hidden="false" collapsed="true" multiline="true"
                         onkeypress="vimperator.commandline.onMultilineInputEvent(event);"
                         oninput="vimperator.commandline.onMultilineInputEvent(event);"

From b261cb851a02e2601fcdb1365fa6901461746d14 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 17 Sep 2007 13:26:33 +0000
Subject: [PATCH 056/224] add an initial implementation of :sidebar

---
 NEWS                                    |  1 +
 chrome/content/vimperator/commands.js   | 26 +++++++++++++++++++++++++
 chrome/content/vimperator/completion.js | 11 +++++++++++
 3 files changed, 38 insertions(+)

diff --git a/NEWS b/NEWS
index 05794c45..0f133e47 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.2
+	* added a new :sidebar command
 	* added 'more' and standard more-prompt key mappings to control
 	  behaviour of the message list pager 
 	* added 'hlsearchstyle' option to allow for user CSS styling of the
diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 15f63d00..79422b1a 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -1076,6 +1076,32 @@ function Commands() //{{{
             completer: function(filter) { return vimperator.completion.get_options_completions(filter); }
         }
     ));
+    addDefaultCommand(new Command(["sideb[ar]"],
+        function(args)
+        {
+            if (!args)
+            {
+                vimperator.echoerr("E471: Argument required");
+                return;
+            }
+
+            var menu = document.getElementById("viewSidebarMenu")
+
+            for (var i = 0; i < menu.childNodes.length; i++)
+            {
+                if (menu.childNodes[i].label == args)
+                {
+                    eval(menu.childNodes[i].getAttribute('oncommand'))
+                    break;
+                }
+            }
+        },
+        {
+            short_help: "Open the sidebar",
+            help: "TODO",
+            completer: function(filter) { return vimperator.completion.get_sidebar_completions(filter); }
+        }
+    ));
     addDefaultCommand(new Command(["so[urce]"],
         function(args)
         {
diff --git a/chrome/content/vimperator/completion.js b/chrome/content/vimperator/completion.js
index b290f42a..3a6603f8 100644
--- a/chrome/content/vimperator/completion.js
+++ b/chrome/content/vimperator/completion.js
@@ -461,6 +461,17 @@ vimperator.completion = (function() // {{{
             return build_longest_common_substring(items, filter);
         }, //}}}
 
+        get_sidebar_completions: function(filter) //{{{
+        {
+            var menu = document.getElementById("viewSidebarMenu")
+            var nodes = [];
+
+            for (var i = 0; i < menu.childNodes.length; i++)
+                nodes.push([[menu.childNodes[i].label], ""]);
+            
+            return build_longest_starting_substring(nodes, filter);
+        }, //}}}
+
         exTabCompletion: function(str) //{{{
         {
             var [count, cmd, special, args] = vimperator.commands.parseCommand(str);

From d8ad3a2d9426603b1f43a66b55a90cd69628d865 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 18 Sep 2007 08:49:49 +0000
Subject: [PATCH 057/224] merge :sbclose and viewSidebarMenu menuitem additions

---
 NEWS                                     |  2 +-
 TODO                                     |  2 --
 chrome/content/vimperator/commands.js    | 22 +++++++++++++++-
 chrome/content/vimperator/vimperator.xul | 33 +++++++++++++++++++++++-
 4 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 0f133e47..3b5908c4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.2
-	* added a new :sidebar command
+	* added new :sidebar and :sbclose commands
 	* added 'more' and standard more-prompt key mappings to control
 	  behaviour of the message list pager 
 	* added 'hlsearchstyle' option to allow for user CSS styling of the
diff --git a/TODO b/TODO
index eac7644f..bb9a7bb8 100644
--- a/TODO
+++ b/TODO
@@ -19,8 +19,6 @@ BUGS:
 
 FEATURES:
 9 :command for new commands
-9 :sidebar {addons/bookmarks/history/downloads/...} command with tab completion
-  (and automatically getting possible sidebar elements from View->sidebar
 9 Use our own find-as-you-type mechanism (like conkeror does)
 9 make hints smarter, not only with characters from from hintchars, but use "NE" or "NP" for 'new posts' e.g. (might be too slow)
 8 middleclick in content == p, and if command line is open, paste there the clipboard buffer
diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 79422b1a..699c4fc5 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -1076,7 +1076,27 @@ function Commands() //{{{
             completer: function(filter) { return vimperator.completion.get_options_completions(filter); }
         }
     ));
-    addDefaultCommand(new Command(["sideb[ar]"],
+    // TODO: sclose instead?
+    addDefaultCommand(new Command(["sbcl[ose]"],
+        function(args)
+        {
+            if (args)
+            {
+                vimperator.echoerr("E488: Trailing characters");
+                return;
+            }
+
+            document.getElementById("sidebar-box").hidden = true;;
+            document.getElementById("sidebar-splitter").hidden = true;;
+        },
+        {
+            short_help: "Close the sidebar",
+            help: "TODO"
+        }
+    ));
+    // TODO: sopen instead? Separate :sidebar from :sbopen and make them behave
+    // more like :cw, :cope etc
+    addDefaultCommand(new Command(["sideb[ar]", "sb[ar]", "sbope[n]"],
         function(args)
         {
             if (!args)
diff --git a/chrome/content/vimperator/vimperator.xul b/chrome/content/vimperator/vimperator.xul
index 8b6148ad..183f434e 100644
--- a/chrome/content/vimperator/vimperator.xul
+++ b/chrome/content/vimperator/vimperator.xul
@@ -55,6 +55,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
     <script type="application/x-javascript;version=1.7" src="ui.js"/>
 
     <window id="main-window">
+
         <toolbar id="vimperator-toolbar" hidden="false" align="center" fullscreentoolbar="true">
             <vbox id="vimperator-container" flex="1" hidden="false">
                 <listbox id="vimperator-bufferwindow" class="plain" rows="10" flex="1" hidden="true"
@@ -94,7 +95,6 @@ the terms of any one of the MPL, the GPL or the LGPL.
 
                 <iframe id="vimperator-multiline-output" src="about:blank" flex="1" height="10px" hidden="false" collapsed="true"
                     onclick="vimperator.commandline.onMultilineOutputEvent(event)"/>
-                    <!--onkeypress="vimperator.commandline.onMultilineOutputEvent(event)"/>-->
 
                 <hbox id="vimperator-commandline" flex="1" hidden="false">
                     <label class="plain" id="vimperator-commandline-prompt"  flex="0" crop="end" value="" collapsed="true"/>
@@ -122,6 +122,37 @@ the terms of any one of the MPL, the GPL or the LGPL.
         <box id="vimperator-visualbell" hidden="true"/>
 
     </window>
+
+    <menupopup id="viewSidebarMenu">
+        <menuitem observes="vimperator-viewAddonsSidebar" label="Add-ons" accesskey="A"/>
+        <menuitem observes="vimperator-viewPreferencesSidebar" label="Preferences" accesskey="P"/>
+        <menuitem observes="vimperator-viewDownloadsSidebar" label="Downloads" accesskey="D"/>
+    </menupopup>
+
+    <broadcasterset id="mainBroadcasterSet">
+        <broadcaster id="vimperator-viewAddonsSidebar"
+            autoCheck="false"
+            type="checkbox"
+            group="sidebar"
+            sidebarurl="chrome://mozapps/content/extensions/extensions.xul"
+            sidebartitle="Add-ons"
+            oncommand="toggleSidebar('vimperator-viewAddonsSidebar');"/>
+        <broadcaster id="vimperator-viewPreferencesSidebar"
+            autoCheck="false"
+            type="checkbox"
+            group="sidebar"
+            sidebarurl="about:config"
+            sidebartitle="Preferences"
+            oncommand="toggleSidebar('vimperator-viewPreferencesSidebar');"/>
+        <broadcaster id="vimperator-viewDownloadsSidebar"
+            autoCheck="false"
+            type="checkbox"
+            group="sidebar"
+            sidebarurl="chrome://mozapps/content/downloads/downloads.xul"
+            sidebartitle="Downloads"
+            oncommand="toggleSidebar('vimperator-viewDownloadsSidebar');"/>
+    </broadcasterset>
+
 </overlay>
 
 <!-- vim: set fdm=marker sw=4 ts=4 et: -->

From 2202d2636c592a03a3f195c171f86c444e1f5fd3 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 18 Sep 2007 11:33:42 +0000
Subject: [PATCH 058/224] use toggleSidebar for closing the sidebar so that the
 menu state is properly updated

---
 chrome/content/vimperator/commands.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 699c4fc5..d09a7f00 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -1086,8 +1086,8 @@ function Commands() //{{{
                 return;
             }
 
-            document.getElementById("sidebar-box").hidden = true;;
-            document.getElementById("sidebar-splitter").hidden = true;;
+            if (document.getElementById("sidebar-box").hidden == false)
+                toggleSidebar();
         },
         {
             short_help: "Close the sidebar",

From 3baf614b118b09cd2dab9dd5958bd52f68e7bef3 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 18 Sep 2007 16:30:39 +0000
Subject: [PATCH 059/224] use build_longest_common_substring rather than
 build_longest_starting_substring for :sidebar completion

---
 chrome/content/vimperator/completion.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/chrome/content/vimperator/completion.js b/chrome/content/vimperator/completion.js
index 3a6603f8..0c02f520 100644
--- a/chrome/content/vimperator/completion.js
+++ b/chrome/content/vimperator/completion.js
@@ -467,9 +467,16 @@ vimperator.completion = (function() // {{{
             var nodes = [];
 
             for (var i = 0; i < menu.childNodes.length; i++)
-                nodes.push([[menu.childNodes[i].label], ""]);
+                nodes.push([menu.childNodes[i].label, ""]);
+
+            if (!filter)
+                return nodes;
+
+            var mapped = nodes.map(function($_) {
+                return [[$_[0]], $_[1]];
+            });
             
-            return build_longest_starting_substring(nodes, filter);
+            return build_longest_common_substring(mapped, filter);
         }, //}}}
 
         exTabCompletion: function(str) //{{{

From ba33ed5b134095e08e9f6aec3662d8555f9124e7 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 19 Sep 2007 12:25:45 +0000
Subject: [PATCH 060/224] merge refactored key event handlers

---
 chrome/content/vimperator/events.js     | 202 +++++++++++++-----------
 chrome/content/vimperator/vimperator.js |   3 +-
 2 files changed, 113 insertions(+), 92 deletions(-)

diff --git a/chrome/content/vimperator/events.js b/chrome/content/vimperator/events.js
index f4c444f8..7538038d 100644
--- a/chrome/content/vimperator/events.js
+++ b/chrome/content/vimperator/events.js
@@ -46,17 +46,14 @@ function Events() //{{{
     tabcontainer.addEventListener("TabOpen",   function(event) {
         vimperator.statusline.updateTabCount();
         vimperator.buffer.updateBufferList();
-        //vimperator.setMode(); // trick to reshow the mode in the command line
     }, false);
     tabcontainer.addEventListener("TabClose",  function(event) {
         vimperator.statusline.updateTabCount()
         vimperator.buffer.updateBufferList();
-        //vimperator.setMode(); // trick to reshow the mode in the command line
     }, false);
     tabcontainer.addEventListener("TabSelect", function(event) {
         vimperator.statusline.updateTabCount();
         vimperator.buffer.updateBufferList();
-        //vimperator.setMode(); // trick to reshow the mode in the command line
         vimperator.tabs.updateSelectionHistory();
         setTimeout(vimperator.focusContent, 10); // just make sure, that no widget has focus
     }, false);
@@ -72,12 +69,10 @@ function Events() //{{{
         vimperator.setMode(); // trick to reshow the mode in the command line
     }, null);
 
-    //
+
+    /////////////////////////////////////////////////////////
     // track if a popup is open or the menubar is active
-    //
-
     var active_menubar = false;
-
     function enterPopupMode(event)
     {
         if (event.originalTarget.localName == "tooltip" || event.originalTarget.id == "vimperator-visualbell")
@@ -85,35 +80,31 @@ function Events() //{{{
 
         vimperator.addMode(null, vimperator.modes.MENU);
     }
-
     function exitPopupMode()
     {
         // gContextMenu is set to NULL by firefox, when a context menu is closed
         if (!gContextMenu && !active_menubar)
             vimperator.removeMode(null, vimperator.modes.MENU);
     }
-
     function enterMenuMode()
     {
         active_menubar = true;
         vimperator.addMode(null, vimperator.modes.MENU)
     }
-
     function exitMenuMode()
     {
         active_menubar = false;
         vimperator.removeMode(null, vimperator.modes.MENU);
     }
-
     window.addEventListener("popupshown", enterPopupMode, true);
     window.addEventListener("popuphidden", exitPopupMode, true);
     window.addEventListener("DOMMenuBarActive", enterMenuMode, true);
     window.addEventListener("DOMMenuBarInactive", exitMenuMode, true);
 
-    //window.document.addEventListener("DOMTitleChanged", function(event)
-    //{
-    //    //alert("titlechanged");
-    //}, null);
+    // window.document.addEventListener("DOMTitleChanged", function(event)
+    // {
+    //     vimperator.log("titlechanged");
+    // }, null);
 
     // NOTE: the order of ["Esc", "Escape"] or ["Escape", "Esc"]
     //       matters, so use that string as the first item, that you
@@ -230,9 +221,8 @@ function Events() //{{{
             // code which is only relevant if the page load is the current tab goes here:
             if (doc == getBrowser().selectedBrowser.contentDocument)
             {
-                /* none yet */
-                //vimperator.statusline.updateUrl();
-                //logMessage("onpageLoad");
+                // we want to stay in command mode after a page has loaded
+                setTimeout(vimperator.focusContent, 10);
             }
         }
     }
@@ -243,7 +233,7 @@ function Events() //{{{
 
     this.destroy = function()
     {
-        // BIG TODO: removeEventListeners() to avoid mem leaks
+        // removeEventListeners() to avoid mem leaks
         window.dump("TODO: remove all eventlisteners\n");
 
         getBrowser().removeProgressListener(this.progressListener);
@@ -252,6 +242,9 @@ function Events() //{{{
         window.removeEventListener("popuphidden", exitPopupMode, true);
         window.removeEventListener("DOMMenuBarActive", enterMenuMode, true);
         window.removeEventListener("DOMMenuBarInactive", exitMenuMode, true);
+
+        window.removeEventListener("keypress", this.onKeyPress, true);
+        window.removeEventListener("keydown", this.onKeyDown, true);
     }
 
     // This method pushes keys into the event queue from vimperator
@@ -262,7 +255,7 @@ function Events() //{{{
     //              if you want < to be taken literally, prepend it with a \\
     this.feedkeys = function(keys)
     {
-        var doc = window.content.document;
+        var doc = window.document;
         var view = window.document.defaultView;
         var escapeKey = false; // \ to escape some special keys
 
@@ -304,13 +297,13 @@ function Events() //{{{
                     i += matches[0].length + 1;
                 }
             }
-            var evt = doc.createEvent('KeyEvents');
-            evt.initKeyEvent('keypress', true, true, view, ctrl, alt, shift, meta, keyCode, charCode );
 
             var elem = window.document.commandDispatcher.focusedElement;
             if (!elem)
-                elem = window;
+                elem = window.content;
 
+            var evt = doc.createEvent("KeyEvents");
+            evt.initKeyEvent("keypress", true, true, view, ctrl, alt, shift, meta, keyCode, charCode );
             elem.dispatchEvent(evt);
         }
     }
@@ -364,10 +357,6 @@ function Events() //{{{
                 if (modifier.length == 0)
                     return key;
             }
-
-            if (key == null)
-                return null;
-
         }
         else if (event.type == "click" || event.type == "dblclick")
         {
@@ -408,10 +397,17 @@ function Events() //{{{
         return (key == "<Esc>" || key == "<C-[>" || key == "<C-c>");
     }
 
+    // global escape handler, is called in ALL modes
     this.onEscape = function()
     {
         if (!vimperator.hasMode(vimperator.modes.ESCAPE_ONE_KEY))
         {
+            if (vimperator.hasMode(vimperator.modes.ESCAPE_ALL_KEYS))
+            {
+                vimperator.removeMode(null, vimperator.modes.ESCAPE_ALL_KEYS);
+                return;
+            }
+
             vimperator.setMode(vimperator.modes.NORMAL);
             vimperator.commandline.clear();
             vimperator.hints.disableHahMode();
@@ -420,24 +416,19 @@ function Events() //{{{
         }
     }
 
+    // this keypress handler gets always called first, even if e.g.
+    // the commandline has focus
     this.onKeyPress = function(event)
     {
         var key = vimperator.events.toString(event);
         if (!key)
-             return false;
-        // sometimes the non-content area has focus, making our keys not work
-        //    if (event.target.id == "main-window")
-        //        alert("focusContent();");
+             return true;
+
+        var stop = true; // set to false if we should NOT consume this event but let also firefox handle it
 
         if (vimperator.hasMode(vimperator.modes.MENU))
             return false;
 
-        // XXX: ugly hack for now pass certain keys to firefox as they are without beeping
-        // also fixes key navigation in menus, etc.
-        if (key == "<Tab>" || key == "<Return>" || key == "<Space>" || key == "<Up>" || key == "<Down>")
-            return false;
-
-
         // XXX: for now only, later: input mappings if form element focused
         if (isFormElemFocused())
         {
@@ -468,7 +459,7 @@ function Events() //{{{
         if (vimperator.hasMode(vimperator.modes.ESCAPE_ONE_KEY) && !vimperator.hasMode(vimperator.modes.ESCAPE_ALL_KEYS))
         {
             vimperator.removeMode(null, vimperator.modes.ESCAPE_ONE_KEY);
-            return false;
+            return true;
         }
         // handle Escape-all-keys mode (I)
         if (vimperator.hasMode(vimperator.modes.ESCAPE_ALL_KEYS))
@@ -478,10 +469,14 @@ function Events() //{{{
             else if (key == "<Esc>" || key == "<C-[>" || key == "<C-v>")
                 ; // let flow continue to handle these keys
             else
-                return false;
-
+                return true;
         }
 
+        // FIXME: proper way is to have a better onFocus handler which also handles events for the XUL
+        if (!vimperator.hasMode(vimperator.modes.COMMAND_LINE) &&
+                    isFormElemFocused()) // non insert mode, but e.g. the location bar has focus
+                return true;
+
         if (vimperator.hasMode(vimperator.modes.COMMAND_LINE) &&
             vimperator.hasMode(vimperator.modes.WRITE_MULTILINE))
         {
@@ -489,6 +484,15 @@ function Events() //{{{
             return false;
         }
 
+        // XXX: ugly hack for now pass certain keys to firefox as they are without beeping
+        // also fixes key navigation in combo boxes, etc.
+        if (vimperator.hasMode(vimperator.modes.NORMAL))
+        {
+            if (key == "<Tab>" || key == "<S-Tab>" || key == "<Return>" || key == "<Space>" || key == "<Up>" || key == "<Down>")
+                return false;
+        }
+
+
     //  // FIXME: handle middle click in content area {{{
     //  //     alert(event.target.id);
     //  if (/*event.type == 'mousedown' && */event.button == 1 && event.target.id == 'content')
@@ -515,8 +519,8 @@ function Events() //{{{
         if (vimperator.hasMode(vimperator.modes.HINTS))
         {
             // never propagate this key to firefox, when hints are visible
-            event.preventDefault();
-            event.stopPropagation();
+            //event.preventDefault();
+            //event.stopPropagation();
 
             var map = vimperator.mappings.get(vimperator.modes.HINTS, key);
             if (map)
@@ -574,7 +578,6 @@ function Events() //{{{
                 else // open in current window
                     vimperator.hints.openHints(false, false);
 
-                //if (vimperator.hints.currentMode() == HINT_MODE_QUICK)
                 if (vimperator.hasMode(vimperator.modes.QUICK_HINT))
                     vimperator.hints.disableHahMode();
                 else // ALWAYS mode
@@ -587,64 +590,85 @@ function Events() //{{{
             return true;
         }
 
-        if (vimperator.hasMode(vimperator.modes.NORMAL))
+
+        var count_str = vimperator.input.buffer.match(/^[0-9]*/)[0];
+        var candidate_command = (vimperator.input.buffer + key).replace(count_str, '');
+        var map;
+
+        // counts must be at the start of a complete mapping (10j -> go 10 lines down)
+        if ((vimperator.input.buffer + key).match(/^[1-9][0-9]*$/))
         {
-            var count_str = vimperator.input.buffer.match(/^[0-9]*/)[0];
-            var candidate_command = (vimperator.input.buffer + key).replace(count_str, '');
-            var map;
-
-            // counts must be at the start of a complete mapping (10j -> go 10 lines down)
-            if ((vimperator.input.buffer + key).match(/^[1-9][0-9]*$/))
-            {
+            // no count for insert mode mappings
+            if (vimperator.hasMode(vimperator.modes.COMMAND_LINE))
+                stop = false;
+            else
                 vimperator.input.buffer += key;
-                vimperator.statusline.updateInputBuffer(vimperator.input.buffer);
-                return true;
-            }
+        }
+        else if (vimperator.input.pendingArgMap)
+        {
+            vimperator.input.buffer = "";
 
-            if (vimperator.input.pendingMap)
+            if (key != "<Esc>" && key != "<C-[>")
+                vimperator.input.pendingArgMap.execute(null, vimperator.input.count, key);
+
+            vimperator.input.pendingArgMap = null;
+        }
+        else if (map = vimperator.mappings.get(vimperator.modes.NORMAL, candidate_command))
+        {
+            vimperator.input.count = parseInt(count_str, 10);
+            if (isNaN(vimperator.input.count))
+                vimperator.input.count = -1;
+            if (map.flags & Mappings.flags.ARGUMENT)
+            {
+                vimperator.input.pendingArgMap = map;
+                vimperator.input.buffer += key;
+            }
+            else if (vimperator.input.pendingMotionMap)
             {
-                vimperator.input.buffer = "";
-
                 if (key != "<Esc>" && key != "<C-[>")
-                    vimperator.input.pendingMap.execute(null, vimperator.input.count, key);
-
-                vimperator.input.pendingMap = null;
-                event.preventDefault();
-                event.stopPropagation();
-            }
-            else if (map = vimperator.mappings.get(vimperator.modes.NORMAL, candidate_command))
-            {
-                vimperator.input.count = parseInt(count_str, 10);
-                if (isNaN(vimperator.input.count))
-                    vimperator.input.count = -1;
-                if (map.flags & Mappings.flags.ARGUMENT)
                 {
-                    vimperator.input.pendingMap = map;
-                    vimperator.input.buffer += key;
+                    vimperator.input.pendingMotionMap.execute(candidate_command, vimperator.input.count, null);
                 }
-                else
-                {
-                    vimperator.input.buffer = "";
-                    map.execute(null, vimperator.input.count);
-                }
-
-                event.preventDefault();
-                event.stopPropagation();
+                vimperator.input.pendingMotionMap = null;
+                vimperator.input.buffer = "";
             }
-            else if (vimperator.mappings.getCandidates(vimperator.modes.NORMAL, candidate_command).length > 0)
+            // no count support for these commands yet
+            else if (map.flags & Mappings.flags.MOTION)
             {
-                vimperator.input.buffer += key;
-                event.preventDefault();
-                event.stopPropagation();
+                vimperator.input.pendingMotionMap = map;
+                vimperator.input.buffer = "";
             }
             else
             {
                 vimperator.input.buffer = "";
-                vimperator.input.pendingMap = null;
-                vimperator.beep();
+                // vimperator.log("executed: " + candidate_command + " in mode: " + mode, 8);
+                map.execute(null, vimperator.input.count);
             }
         }
-        vimperator.statusline.updateInputBuffer(vimperator.input.buffer);
+        else if (vimperator.mappings.getCandidates(vimperator.modes.NORMAL, candidate_command).length > 0)
+        {
+            vimperator.input.buffer += key;
+        }
+        else
+        {
+            vimperator.input.buffer = "";
+            vimperator.input.pendingArgMap = null;
+            vimperator.input.pendingMotionMap = null;
+
+            if (vimperator.hasMode(vimperator.modes.COMMAND_LINE))
+                stop = false; // command was not a vimperator command, maybe it is a firefox command
+            else
+                vimperator.beep();
+        }
+
+        if (stop)
+        {
+            event.preventDefault();
+            event.stopPropagation();
+        }
+
+        var motion_map = (vimperator.input.pendingMotionMap && vimperator.input.pendingMotionMap.names[0]) || "";
+        vimperator.statusline.updateInputBuffer(motion_map + vimperator.input.buffer);
         return false;
     }
     window.addEventListener("keypress", this.onKeyPress, true);
@@ -655,7 +679,6 @@ function Events() //{{{
         if (vimperator.hasMode(vimperator.modes.ESCAPE_ONE_KEY) || vimperator.hasMode(vimperator.modes.ESCAPE_ALL_KEYS) || isFormElemFocused())
             return true;
 
-        event.preventDefault();
         event.stopPropagation();
         return false;
     }
@@ -712,13 +735,10 @@ function Events() //{{{
         // happens when the users switches tabs
         onLocationChange: function()
         {
-            // if (vimperator.hasMode(vimperator.modes.HINTS) && !vimperator.hasMode(vimperator.modes.ALWAYS_HINT))
-            //     vimperator.hints.disableHahMode();
-
             vimperator.statusline.updateUrl();
             vimperator.statusline.updateProgress();
 
-            // if this is not delayed we get the wrong position of the old buffer
+            // if this is not delayed we get the position of the old buffer
             setTimeout(function() { vimperator.statusline.updateBufferPosition(); }, 100);
         },
         // called at the very end of a page load
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index e20ca9c0..d19785fd 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -202,7 +202,8 @@ const vimperator = (function() //{{{
 
         input: {
             buffer: "",                // partial command storage
-            pendingMap: null,          // pending map storage
+            pendingMotionMap: null,    // e.g. "d{motion}" if we wait for a motion of the "d" command
+            pendingArgMap: null,       // pending map storage for commands like m{a-z}
             count: -1                  // parsed count from the input buffer
         },
 

From 4ec9477c7450c140c5d0cc6f6bebfcc32ed28638 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 22 Sep 2007 14:29:56 +0000
Subject: [PATCH 061/224] merge the existing status bar with the standard FF
 status bar

---
 NEWS                                     |   2 +
 chrome/content/vimperator/default.css    |  24 +++--
 chrome/content/vimperator/options.js     |   4 +-
 chrome/content/vimperator/ui.js          |  11 +--
 chrome/content/vimperator/vimperator.xul | 115 ++++++++++++-----------
 5 files changed, 83 insertions(+), 73 deletions(-)

diff --git a/NEWS b/NEWS
index 3b5908c4..290ee2de 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.2
+	* merge the existing status bar with the standard FF status bar so that
+	  security information and extension buttons are included
 	* added new :sidebar and :sbclose commands
 	* added 'more' and standard more-prompt key mappings to control
 	  behaviour of the message list pager 
diff --git a/chrome/content/vimperator/default.css b/chrome/content/vimperator/default.css
index 6e370cc0..35b9a5dc 100644
--- a/chrome/content/vimperator/default.css
+++ b/chrome/content/vimperator/default.css
@@ -124,7 +124,7 @@ fieldset.paypal {
  * TODO: move to the standard location: chrome/skin/vimperator.css...if I can
  * ever convince MS ;-) -- djk
  */
-#vimperator-toolbar  {
+#vimperator-container  {
     font-family: monospace;
 }
 
@@ -142,21 +142,30 @@ fieldset.paypal {
    color: HighlightText !important;
 }
 
+statusbarpanel {
+    -moz-appearance: none !important;
+    border: none !important;
+}
+#vimperator-statusline {
+    font-family: monospace;
+    margin: 0
+}
 #vimperator-statusline > label {
     padding: 0px 0px 0px 8px;
 }
 #vimperator-statusline > label:first-child {
     padding: 0px;
 }
-
-#vimperator-commandline {
-    background-color: white;
+#vimperator-statusline-field-url {
+    background-color: transparent;
     color: black;
 }
-#vimperator-commandline-prompt {
-    /* FIXME: black on white or default skin colours? */
+
+#vimperator-commandline {
+    /* FIXME: black on white or default skin colors? */
     background-color: white;
     color: black;
+    padding: 1px;
 }
 
 #vimperator-multiline-output {
@@ -167,9 +176,10 @@ fieldset.paypal {
     background-color: black;
 }
 
+/*
 .status_insecure, .status_insecure * {
-    background-color: transparent;
 }
+*/
 .status_secure, .status_secure * {
     background-color: #B0FF00; /* light green */
     color: black;
diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index f3d92470..5737a05e 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -407,9 +407,9 @@ function Options() //{{{
                   "<li><b>m</b>: menubar</li>" +
                   "<li><b>T</b>: toolbar</li>" +
                   "<li><b>b</b>: bookmark bar</li>" +
-                  "<li><b>s</b>: original Firefox statusbar</li></ul>",
+                  "<li><b>s</b>: statusbar</li></ul>",
             setter: function(value) { Options.setPref("guioptions", value); setGuiOptions(value); },
-            default_value: "",
+            default_value: "s",
             validator: function (value) { if (/[^mTbs]/.test(value)) return false; else return true; }
         }
     ));
diff --git a/chrome/content/vimperator/ui.js b/chrome/content/vimperator/ui.js
index 3cb01d15..56c87195 100644
--- a/chrome/content/vimperator/ui.js
+++ b/chrome/content/vimperator/ui.js
@@ -1004,6 +1004,8 @@ function StatusLine() //{{{
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
+    var status_bar = document.getElementById("status-bar");
+
     // our status bar fields
     var statusline_widget     = document.getElementById("vimperator-statusline");
     var url_widget            = document.getElementById("vimperator-statusline-field-url");
@@ -1016,16 +1018,9 @@ function StatusLine() //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    // use names for the color or "transparent" to remove color information
-    this.setColor = function(color)
-    {
-        if (!color)
-            color = "transparent";
-        statusline_widget.setAttribute("style", "background-color: " + color);
-    };
     this.setClass = function(type)
     {
-        statusline_widget.setAttribute("class", "status_" + type);
+        status_bar.setAttribute("class", "chromeclass-status status_" + type);
     };
 
     this.updateUrl = function(url)
diff --git a/chrome/content/vimperator/vimperator.xul b/chrome/content/vimperator/vimperator.xul
index 183f434e..7c57f892 100644
--- a/chrome/content/vimperator/vimperator.xul
+++ b/chrome/content/vimperator/vimperator.xul
@@ -56,62 +56,6 @@ the terms of any one of the MPL, the GPL or the LGPL.
 
     <window id="main-window">
 
-        <toolbar id="vimperator-toolbar" hidden="false" align="center" fullscreentoolbar="true">
-            <vbox id="vimperator-container" flex="1" hidden="false">
-                <listbox id="vimperator-bufferwindow" class="plain" rows="10" flex="1" hidden="true"
-                        onclick=   "vimperator.bufferwindow.onEvent(event);"
-                        ondblclick="vimperator.bufferwindow.onEvent(event);"
-                        onkeydown= "vimperator.bufferwindow.onEvent(event);">
-                    <listcols>
-                        <listcol flex="1" width="50%"/>
-                        <listcol flex="1" width="50%"/>
-                    </listcols>
-                </listbox>
-
-                <listbox id="vimperator-previewwindow" class="plain" rows="10" flex="1" hidden="true"
-                        onclick=   "vimperator.previewwindow.onEvent(event);"
-                        ondblclick="vimperator.previewwindow.onEvent(event);"
-                        onkeydown= "vimperator.previewwindow.onEvent(event);">
-                    <listcols>
-                        <listcol flex="1" width="50%"/>
-                        <listcol flex="1" width="50%"/>
-                    </listcols>
-                </listbox>
-
-                <hbox id="vimperator-statusline" flex="1" height="10" hidden="false">
-                    <textbox class="plain" id="vimperator-statusline-field-url" readonly="true" flex="1" crop="end"/>
-                    <label class="plain" id="vimperator-statusline-field-inputbuffer"    flex="0"/>
-                    <label class="plain" id="vimperator-statusline-field-progress"       flex="0"/>
-                    <label class="plain" id="vimperator-statusline-field-tabcount"       flex="0"/>
-                    <label class="plain" id="vimperator-statusline-field-bufferposition" flex="0"/>
-                </hbox>
-
-                <listbox id="vimperator-completion" class="plain" rows="1" flex="1" hidden="true">
-                    <listcols>
-                        <listcol flex="1" width="50%"/>
-                        <listcol flex="1" width="50%"/>
-                    </listcols>
-                </listbox>
-
-                <iframe id="vimperator-multiline-output" src="about:blank" flex="1" height="10px" hidden="false" collapsed="true"
-                    onclick="vimperator.commandline.onMultilineOutputEvent(event)"/>
-
-                <hbox id="vimperator-commandline" flex="1" hidden="false">
-                    <label class="plain" id="vimperator-commandline-prompt"  flex="0" crop="end" value="" collapsed="true"/>
-                    <textbox class="plain" id="vimperator-commandline-command" flex="1" hidden="false" type="timed" timeout="100"
-                        onkeypress="vimperator.commandline.onEvent(event);"
-                        oninput="vimperator.commandline.onEvent(event);"
-                        onfocus="vimperator.commandline.onEvent(event);"
-                        onblur="vimperator.commandline.onEvent(event);"/>
-                </hbox>
-
-                <textbox id="vimperator-multiline-input" class="plain" flex="1" rows="10" hidden="false" collapsed="true" multiline="true"
-                        onkeypress="vimperator.commandline.onMultilineInputEvent(event);"
-                        oninput="vimperator.commandline.onMultilineInputEvent(event);"
-                        onblur="vimperator.commandline.onMultilineInputEvent(event);"/>
-            </vbox>
-        </toolbar>
-
         <keyset id="mainKeyset">
            <key id="key_open_vimbar" key=":" oncommand="vimperator.commandline.open(':', '', vimperator.modes.EX);" modifiers=""/>
            <key id="key_stop" keycode="VK_ESCAPE" oncommand="vimperator.events.onEscape();"/>
@@ -121,6 +65,65 @@ the terms of any one of the MPL, the GPL or the LGPL.
         <!-- TODO: move to browser-stack? -->
         <box id="vimperator-visualbell" hidden="true"/>
 
+        <statusbar id="status-bar">
+            <hbox insertbefore="statusbar-display" id="vimperator-statusline" flex="1" height="10" hidden="false" align="center">
+                <textbox class="plain" id="vimperator-statusline-field-url" readonly="false" flex="1" crop="end"/>
+                <label class="plain" id="vimperator-statusline-field-inputbuffer"    flex="0"/>
+                <label class="plain" id="vimperator-statusline-field-progress"       flex="0"/>
+                <label class="plain" id="vimperator-statusline-field-tabcount"       flex="0"/>
+                <label class="plain" id="vimperator-statusline-field-bufferposition" flex="0"/>
+            </hbox>
+            <!-- just hide them so other elements since other elements expect them -->
+            <statusbarpanel id="statusbar-display" hidden="true"/>
+            <statusbarpanel id="statusbar-progresspanel" hidden="true"/>
+        </statusbar>
+
+        <vbox id="vimperator-container" hidden="false">
+            <listbox id="vimperator-bufferwindow" class="plain" rows="10" flex="1" hidden="true"
+                onclick=   "vimperator.bufferwindow.onEvent(event);"
+                ondblclick="vimperator.bufferwindow.onEvent(event);"
+                onkeydown= "vimperator.bufferwindow.onEvent(event);">
+                <listcols>
+                    <listcol flex="1" width="50%"/>
+                    <listcol flex="1" width="50%"/>
+                </listcols>
+            </listbox>
+
+            <listbox id="vimperator-previewwindow" class="plain" rows="10" flex="1" hidden="true"
+                onclick=   "vimperator.previewwindow.onEvent(event);"
+                ondblclick="vimperator.previewwindow.onEvent(event);"
+                onkeydown= "vimperator.previewwindow.onEvent(event);">
+                <listcols>
+                    <listcol flex="1" width="50%"/>
+                    <listcol flex="1" width="50%"/>
+                </listcols>
+            </listbox>
+
+            <listbox id="vimperator-completion" class="plain" rows="1" flex="1" hidden="true">
+                <listcols>
+                    <listcol flex="1" width="50%"/>
+                    <listcol flex="1" width="50%"/>
+                </listcols>
+            </listbox>
+
+            <iframe id="vimperator-multiline-output" src="about:blank" flex="1" height="10px" hidden="false" collapsed="true"
+                onclick="vimperator.commandline.onMultilineOutputEvent(event)"/>
+
+            <hbox id="vimperator-commandline" hidden="false">
+                <label class="plain" id="vimperator-commandline-prompt"  flex="0" crop="end" value="" collapsed="true"/>
+                <textbox class="plain" id="vimperator-commandline-command" flex="1" hidden="false" type="timed" timeout="100"
+                    onkeypress="vimperator.commandline.onEvent(event);"
+                    oninput="vimperator.commandline.onEvent(event);"
+                    onfocus="vimperator.commandline.onEvent(event);"
+                    onblur="vimperator.commandline.onEvent(event);"/>
+            </hbox>
+
+            <textbox id="vimperator-multiline-input" class="plain" flex="1" rows="1" hidden="false" collapsed="true" multiline="true"
+                onkeypress="vimperator.commandline.onMultilineInputEvent(event);"
+                oninput="vimperator.commandline.onMultilineInputEvent(event);"
+                onblur="vimperator.commandline.onMultilineInputEvent(event);"/>
+        </vbox>
+
     </window>
 
     <menupopup id="viewSidebarMenu">

From 145c854b5ec0f0ec22e6f4c05bf9470b57f7580f Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 22 Sep 2007 14:50:19 +0000
Subject: [PATCH 062/224] process link text only find modifiers \[uU] before
 looking for capitalized letters when 'smartcase' is set

---
 NEWS                                  |  1 +
 chrome/content/vimperator/commands.js | 26 ++++++++++++++++++++----
 chrome/content/vimperator/find.js     | 29 +++++++++++++++------------
 3 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/NEWS b/NEWS
index 290ee2de..9d474404 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.2
+  	* :buffer partial_string works now as in vim, and with ! even better
 	* merge the existing status bar with the standard FF status bar so that
 	  security information and extension buttons are included
 	* added new :sidebar and :sbclose commands
diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index d09a7f00..2d2ab225 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -318,22 +318,40 @@ function Commands() //{{{
     ));
     addDefaultCommand(new Command(["b[uffer]"],
         // TODO: move to v.tabs/buffers
-        function(args)
+        function(args, special)
         {
             var match;
             if (match = args.match(/^(\d+):?/))
                 return vimperator.tabs.select(parseInt(match[1]) - 1, false); // make it zero-based
+
+            var matches = [];
+            var lower_args = args.toLowerCase();
+            var first = vimperator.tabs.index() + 1;
             for (var i = 0; i < getBrowser().browsers.length; i++)
             {
-                var url = getBrowser().getBrowserAtIndex(i).contentDocument.location.href;
+                var index = (i + first) % getBrowser().browsers.length;
+                var url = getBrowser().getBrowserAtIndex(index).contentDocument.location.href;
+                var title = getBrowser().getBrowserAtIndex(index).contentDocument.title.toLowerCase();
                 if (url == args)
-                    return vimperator.tabs.select(i, false);
+                    return vimperator.tabs.select(index, false);
+
+                if (url.indexOf(args) >= 0 || title.indexOf(lower_args) >= 0)
+                    matches.push(index);
             }
+            if (matches.length == 0)
+                vimperator.echoerr("E94: No matching buffer for " + args);
+            else if (matches.length > 1 && !special)
+                vimperator.echoerr("E93: More than one match for " + args);
+            else
+                vimperator.tabs.select(matches[0], false);
         },
         {
-            usage: ["b[uffer] {url|index}"],
+            usage: ["b[uffer][!] {url|index}"],
             short_help: "Go to buffer from buffer list",
             help: "Argument can be either the buffer index or the full URL.<br/>" +
+                  "If argument is neither a full URL nor an index but uniquely identifies a buffer, " +
+                  "it is selected. With <code class=\"argument\">[!]</code> the next buffer matching the argument " +
+                  "is selected, even if it cannot be identified uniquely.<br/>" +
                   "Use <code class=\"mapping\">b</code> as a shortcut to open this prompt.",
             completer: function(filter) { return vimperator.completion.get_buffer_completions(filter); }
         }
diff --git a/chrome/content/vimperator/find.js b/chrome/content/vimperator/find.js
index 0e47db0b..55531ff3 100644
--- a/chrome/content/vimperator/find.js
+++ b/chrome/content/vimperator/find.js
@@ -70,6 +70,19 @@ function Search() //{{{
 
         search_pattern = pattern;
 
+        // links only search - \u wins if both modifiers specified
+        if (/\\u/.test(pattern))
+            links_only = false;
+        else if (/\U/.test(pattern))
+            links_only = true;
+        else if (vimperator.options["linksearch"])
+            links_only = true;
+        else
+            links_only = false;
+
+        // strip links-only modifiers
+        pattern = pattern.replace(/(\\)?\\[uU]/g, function($0, $1) { return $1 ? $0 : "" });
+
         // case sensitivity - \c wins if both modifiers specified
         if (/\c/.test(pattern))
             case_sensitive = false;
@@ -82,20 +95,10 @@ function Search() //{{{
         else
             case_sensitive = true;
 
-        // links only search - \u wins if both modifiers specified
-        if (/\\u/.test(pattern))
-            links_only = false;
-        else if (/\U/.test(pattern))
-            links_only = true;
-        else if (vimperator.options["linksearch"])
-            links_only = true;
-        else
-            links_only = false;
+        // strip case-sensitive modifiers
+        pattern = pattern.replace(/(\\)?\\[cC]/g, function($0, $1) { return $1 ? $0 : "" });
 
-        // strip modifiers
-        pattern = pattern.replace(/(\\)?\\[cCuU]/g, function($0, $1) { return $1 ? $0 : "" });
-
-        // remove the modifer escape \
+        // remove any modifer escape \
         pattern = pattern.replace(/\\(\\[cCuU])/g, '$1')
 
         search_string = pattern;

From d490d12c43ca01a73917ee30909699466589d249 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 22 Sep 2007 14:51:42 +0000
Subject: [PATCH 063/224] don't close the sidebar if it is already open with
 the requested type

---
 chrome/content/vimperator/commands.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 2d2ab225..d3f0b838 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -1123,6 +1123,10 @@ function Commands() //{{{
                 return;
             }
 
+            // do nothing if the requested sidebar is already open
+            if (document.getElementById("sidebar-title").value == args)
+                return;
+            
             var menu = document.getElementById("viewSidebarMenu")
 
             for (var i = 0; i < menu.childNodes.length; i++)

From c80fc678680ef51f6891d19dbdcdfd15bd672479 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 22 Sep 2007 15:44:36 +0000
Subject: [PATCH 064/224] add a new 'visualbellstyle' option

---
 NEWS                                    |  1 +
 chrome/content/vimperator/default.css   |  4 ----
 chrome/content/vimperator/options.js    | 10 +++++++++-
 chrome/content/vimperator/vimperator.js |  1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 9d474404..e8a2f63a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.2
+	* added 'visualbellstyle' for styling/hiding the visual bell
   	* :buffer partial_string works now as in vim, and with ! even better
 	* merge the existing status bar with the standard FF status bar so that
 	  security information and extension buttons are included
diff --git a/chrome/content/vimperator/default.css b/chrome/content/vimperator/default.css
index 35b9a5dc..0c55749c 100644
--- a/chrome/content/vimperator/default.css
+++ b/chrome/content/vimperator/default.css
@@ -172,10 +172,6 @@ statusbarpanel {
     overflow: hidden;
 }
 
-#vimperator-visualbell {
-    background-color: black;
-}
-
 /*
 .status_insecure, .status_insecure * {
 }
diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index 5737a05e..64753bcb 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -365,7 +365,7 @@ function Options() //{{{
                   "<li><b>b</b>: Bookmarks</li>" +
                   "<li><b>h</b>: History</li></ul>" +
                   "The order is important, so <code class=\"command\">:set complete=bs</code> would list bookmarks first, and then any available quick searches.<br/>" +
-                  "Add 'sort' to the <code class=\"option\">'wildoptions'</code> option if you want all entries sorted.",
+                  "Add <code class=\"option\">'sort'</code> to the <code class=\"option\">'wildoptions'</code> option if you want all entries sorted.",
             default_value: "sfbh",
             validator: function (value) { if (/[^sfbh]/.test(value)) return false; else return true; }
         }
@@ -595,6 +595,14 @@ function Options() //{{{
             default_value: false
         }
     ));
+    addOption(new Option(["visualbellstyle"], "string",
+        {
+            short_help: "CSS specification of the visual bell",
+            help: "To hide the visual bell use a value of \"display: none;\".",
+            setter: function(value) { if (!value) value = "display: none;"; Options.setPref("visualbellstyle", value); },
+            default_value: "background-color: black; color: black;"
+        }
+    ));
     addOption(new Option(["wildmode", "wim"], "stringlist",
         {
             short_help: "Define how command line completion works",
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index d19785fd..6aa84e52 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -288,6 +288,7 @@ const vimperator = (function() //{{{
                 var vbell = document.getElementById("vimperator-visualbell");
                 var box = getBrowser().mPanelContainer.boxObject;
 
+                vbell.style.cssText = vimperator.options["visualbellstyle"];
                 vbell.style.position = "fixed";
                 vbell.style.height = box.height + "px";
                 vbell.style.width = box.width + "px";

From 6b3df3408a6207e728fd72b6d79407242dfb9a61 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 23 Sep 2007 10:21:43 +0000
Subject: [PATCH 065/224] merge new :time command

---
 NEWS                                  |  5 +-
 chrome/content/vimperator/commands.js | 79 +++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index e8a2f63a..de394988 100644
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,10 @@
 2007-XX-XX:
 	* version 0.5.2
 	* added 'visualbellstyle' for styling/hiding the visual bell
-  	* :buffer partial_string works now as in vim, and with ! even better
 	* merge the existing status bar with the standard FF status bar so that
 	  security information and extension buttons are included
+  	* :buffer partial_string works now as in vim, and with ! even better
+	* new :time command for profiling
 	* added new :sidebar and :sbclose commands
 	* added 'more' and standard more-prompt key mappings to control
 	  behaviour of the message list pager 
@@ -12,7 +13,9 @@
 	  highlighted text strings when 'hlsearch' is set
 	* added 'linksearch' option to restrict page searches to link text - \U
 	  and \u can be used in the search pattern to override 'linksearch'
+	* vimperator trys to stay in command mode after loading pages instead of having a text field focused
 	* added a visual bell and replaced 'beep' with 'visualbell'
+	* added vimperator logo (can be seen in the addons manager)
 	* added 'hlsearch','incsearch', 'ignorecase' and 'smartcase' options
 
 2007-09-03:
diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index d3f0b838..0f868897 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -1251,6 +1251,85 @@ function Commands() //{{{
             short_help: "Switch to the first tab"
         }
     ));
+    addDefaultCommand(new Command(["time"],
+        function(args, special, count)
+        {
+            if (!count || count < 1)
+                count = 1;
+
+            try
+            {
+                if (count > 1)
+                {
+                    var i = count;
+                    var before_time = Date.now();
+
+                    if (args && args[0] == ":")
+                        while (i--)
+                            vimperator.execute(args);
+                    else
+                        while (i--)
+                            eval(args);
+
+                    if (special)
+                        return;
+
+                    var after_time = Date.now();
+                
+                    if ((after_time - before_time) / count >= 100)
+                        var each = "&nbsp;&nbsp;Each time:&nbsp;&nbsp;<span style=\"color: green\">" +
+                            ((after_time - before_time) / 1000.0 / count) +
+                            "</span> sec<br/>";
+                    else
+                        var each = "&nbsp;&nbsp;Each time:&nbsp;&nbsp;<span style=\"color: green\">" +
+                            ((after_time - before_time) / count) +
+                            "</span> msec<br/>";
+
+                    if (after_time - before_time >= 100)
+                        var total = "&nbsp;&nbsp;Total time: <span style=\"color: red\">" +
+                            ((after_time - before_time) / 1000.0) +
+                            "</span> sec";
+                    else
+                        var total = "&nbsp;&nbsp;Total time: <span style=\"color: red\">" +
+                            (after_time - before_time) + "</span> msec";
+
+
+                    vimperator.echo("<span style=\"color: magenta; font-weight: bold\">Code execution summary</span>:<br/>" +
+                        "&nbsp;&nbsp;Executed:&nbsp;&nbsp;&nbsp;<span style=\"color: green\">" + count + "</span> times<br/>" + each + total);
+                }
+                else
+                {
+                    var before_time = Date.now();
+                    if (args && args[0] == ":")
+                        vimperator.execute(args);
+                    else
+                        eval(args);
+
+                    if (special)
+                        return;
+
+                    var after_time = Date.now();
+                    
+                    if (after_time - before_time >= 100)
+                        vimperator.echo("Total time: " + ((after_time - before_time) / 1000.0) + " sec");
+                    else
+                        vimperator.echo("Total time: " + (after_time - before_time) + " msec");
+                }
+            }
+            catch (e)
+            {
+                vimperator.echoerr(e);
+            }
+        },
+        {
+            usage: ["{count}time[!] {code|:command}"],
+            short_help: "Profile a piece of code or a command",
+            help: "Runs <code class=\"argument\">{code} {count}</code> times (default 1) and returns the elapsed time. " +
+                  "<code class=\"argument\">{code}</code> is always passed to JavaScript's eval(), which might be slow, so take the results with a grain of salt.<br/>" +
+                  "If <code class=\"argument\">{code}</code> starts with a :, it is executed as a vimperator command.<br/>" +
+                  "Use the special version with [!] if you just want to run any command multiple times without showing profiling statistics."
+        }
+    ));
     addDefaultCommand(new Command(["u[ndo]"],
         function(args, special, count) { if (count < 1) count = 1; undoCloseTab(count-1); },
         {

From 17a37d5864a22ed091fdb68c3fcb7c667c331067 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 23 Sep 2007 13:30:48 +0000
Subject: [PATCH 066/224] allow all unknown key mappings to be passed through
 to FF

---
 chrome/content/vimperator/events.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/chrome/content/vimperator/events.js b/chrome/content/vimperator/events.js
index 7538038d..653e561e 100644
--- a/chrome/content/vimperator/events.js
+++ b/chrome/content/vimperator/events.js
@@ -655,9 +655,9 @@ function Events() //{{{
             vimperator.input.pendingArgMap = null;
             vimperator.input.pendingMotionMap = null;
 
-            if (vimperator.hasMode(vimperator.modes.COMMAND_LINE))
-                stop = false; // command was not a vimperator command, maybe it is a firefox command
-            else
+            stop = false; // command was not a vimperator command, maybe it is a firefox command
+
+            if (!vimperator.hasMode(vimperator.modes.COMMAND_LINE))
                 vimperator.beep();
         }
 

From db4a3f3f7df78916c05dd5a872789926c8997a85 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 23 Sep 2007 14:14:36 +0000
Subject: [PATCH 067/224] separate Ex command and search commandline history

---
 NEWS                            |  4 +-
 chrome/content/vimperator/ui.js | 97 +++++++++++++++++++++------------
 2 files changed, 64 insertions(+), 37 deletions(-)

diff --git a/NEWS b/NEWS
index de394988..4e5b0f59 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.2
+	* separated search and Ex command history
 	* added 'visualbellstyle' for styling/hiding the visual bell
 	* merge the existing status bar with the standard FF status bar so that
 	  security information and extension buttons are included
@@ -13,7 +14,8 @@
 	  highlighted text strings when 'hlsearch' is set
 	* added 'linksearch' option to restrict page searches to link text - \U
 	  and \u can be used in the search pattern to override 'linksearch'
-	* vimperator trys to stay in command mode after loading pages instead of having a text field focused
+	* vimperator trys to stay in command mode after loading pages instead
+	  of having a text field focused
 	* added a visual bell and replaced 'beep' with 'visualbell'
 	* added vimperator logo (can be seen in the addons manager)
 	* added 'hlsearch','incsearch', 'ignorecase' and 'smartcase' options
diff --git a/chrome/content/vimperator/ui.js b/chrome/content/vimperator/ui.js
index 56c87195..94cd34d2 100644
--- a/chrome/content/vimperator/ui.js
+++ b/chrome/content/vimperator/ui.js
@@ -39,12 +39,55 @@ function CommandLine() //{{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     const UNINITIALIZED = -2; // notifies us, if we need to start history/tab-completion from the beginning
-    const HISTORY_SIZE = 500;
 
     var completionlist = new InformationList("vimperator-completion", { min_items: 2, max_items: 10 });
     var completions = [];
 
-    var history = [];
+    // TODO: clean this up when it's not 3am...
+    var history = {
+        SIZE: 500,
+
+        get _mode() { return (vimperator.hasMode(vimperator.modes.EX)) ? "cmd" : "search"; },
+
+        cmd: null,    // ex command history
+        search: null, // text search history
+
+        get: function() { return this[this._mode]; },
+        set: function(lines) { this[this._mode] = lines; },
+
+        load: function()
+        {
+            this.cmd = Options.getPref("commandline_cmd_history", "").split("\n");
+            this.search = Options.getPref("commandline_search_history", "").split("\n");
+        },
+
+        save: function()
+        {
+            Options.setPref("commandline_cmd_history", this.cmd.join("\n"));
+            Options.setPref("commandline_search_history", this.search.join("\n"));
+        },
+
+        add: function(str)
+        {
+            if (!str)
+                return;
+
+            var lines = this.get();
+
+            // remove all old history lines which have this string
+            lines = lines.filter(function(line) {
+                    return line != str;
+            });
+
+            // add string to the command line history
+            if (lines.push(str) > this.SIZE) // remove the first 10% of the history
+                lines = lines.slice(this.SIZE / 10);
+
+            this.set(lines);
+        }
+    };
+    history.load();
+
     var history_index = UNINITIALIZED;
     var history_start = "";
 
@@ -88,9 +131,6 @@ function CommandLine() //{{{
     var multiline_regexp = null;
     var multiline_callback = null;
 
-    // load the commandline history
-    history = Options.getPref("commandline_history", "").split("\n");
-
     // TODO: these styles should be moved to the .css file
     function setNormalStyle()
     {
@@ -199,20 +239,6 @@ function CommandLine() //{{{
         multiline_input_widget.setAttribute("rows", lines.toString());
     }
 
-    function addToHistory(str)
-    {
-        if (str.length < 1)
-            return;
-
-        // first remove all old history elements which have this string
-        history = history.filter(function(elem) {
-                return elem != str;
-        });
-        // add string to the command line history
-        if (history.push(str) > HISTORY_SIZE) //remove the first 10% of the history
-            history = history.slice(HISTORY_SIZE / 10);
-    }
-
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
@@ -222,9 +248,6 @@ function CommandLine() //{{{
         return command_widget.value;
     };
 
-    /**
-     * All arguments can be ommited and will be defaulted to "" or null
-     */
     this.open = function(prompt, cmd, ext_mode)
     {
         // save the current prompts, we need it later if the command widget
@@ -353,11 +376,11 @@ function CommandLine() //{{{
         {
             var key = vimperator.events.toString(event);
 
-            /* user pressed ENTER to carry out a command */
+            // user pressed ENTER to carry out a command
             if (vimperator.events.isAcceptKey(key))
             {
                 var mode = cur_extended_mode; // save it here, as setMode() resets it
-                addToHistory(command);
+                history.add(command);
                 vimperator.setMode(old_mode, old_extended_mode);
                 vimperator.focusContent();
                 completionlist.hide();
@@ -365,11 +388,11 @@ function CommandLine() //{{{
                 return vimperator.triggerCallback("submit", mode, command);
             }
 
-            /* user pressed ESCAPE to cancel this prompt */
+            // user pressed ESCAPE to cancel this prompt
             else if (vimperator.events.isCancelKey(key))
             {
                 var res = vimperator.triggerCallback("cancel", cur_extended_mode);
-                addToHistory(command);
+                history.add(command);
                 vimperator.setMode(old_mode, old_extended_mode);
                 vimperator.focusContent();
                 completionlist.hide();
@@ -378,9 +401,11 @@ function CommandLine() //{{{
                 return res;
             }
 
-            /* user pressed UP or DOWN arrow to cycle history completion */
+            // user pressed UP or DOWN arrow to cycle history completion
             else if (key == "<Up>" || key == "<Down>")
             {
+                var lines = history.get();
+
                 event.preventDefault();
                 event.stopPropagation();
 
@@ -390,18 +415,18 @@ function CommandLine() //{{{
                 // save 'start' position for iterating through the history
                 if (history_index == UNINITIALIZED)
                 {
-                    history_index = history.length;
+                    history_index = lines.length;
                     history_start = command;
                 }
 
                 // search the history for the first item matching the current
                 // commandline string
-                while (history_index >= -1 && history_index <= history.length)
+                while (history_index >= -1 && history_index <= lines.length)
                 {
                     key == "<Up>" ? history_index-- : history_index++;
 
                     // user pressed DOWN when there is no newer history item
-                    if (history_index == history.length)
+                    if (history_index == lines.length)
                     {
                         setCommand(history_start);
                         return;
@@ -414,22 +439,22 @@ function CommandLine() //{{{
                         vimperator.beep();
                         break;
                     }
-                    if (history_index >= history.length + 1)
+                    if (history_index >= lines.length + 1)
                     {
-                        history_index = history.length;
+                        history_index = lines.length;
                         vimperator.beep();
                         break;
                     }
 
-                    if (history[history_index].indexOf(history_start) == 0)
+                    if (lines[history_index].indexOf(history_start) == 0)
                     {
-                        setCommand(history[history_index]);
+                        setCommand(lines[history_index]);
                         return;
                     }
                 }
             }
 
-            /* user pressed TAB to get completions of a command */
+            // user pressed TAB to get completions of a command
             else if (key == "<Tab>" || key == "<S-Tab>")
             {
                 //always reset our completion history so up/down keys will start with new values
@@ -784,7 +809,7 @@ function CommandLine() //{{{
     // it would be better if we had a destructor in javascript ...
     this.destroy = function()
     {
-        Options.setPref("commandline_history", history.join("\n"));
+        history.save();
     }
     //}}}
 } //}}}

From 72ca90fa8fd5d4caedc981249f8cbefee68ddf38 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 23 Sep 2007 14:17:51 +0000
Subject: [PATCH 068/224] prevent the failed find error message from being
 cleared

---
 chrome/content/vimperator/find.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/find.js b/chrome/content/vimperator/find.js
index 55531ff3..57824215 100644
--- a/chrome/content/vimperator/find.js
+++ b/chrome/content/vimperator/find.js
@@ -134,7 +134,7 @@ function Search() //{{{
         found = fastFind.find(search_string, links_only) != Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND;
 
         if (!found)
-            vimperator.echoerr("E486: Pattern not found: " + search_pattern);
+            setTimeout(function() { vimperator.echoerr("E486: Pattern not found: " + search_pattern); }, 0);
 
         return found;
     }

From 1e7c19bc97bd21ed45ef62e52418adeae92fd75d Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 24 Sep 2007 16:02:58 +0000
Subject: [PATCH 069/224] merge CSS improvements to the statusbar and preview
 window

---
 chrome/content/vimperator/default.css | 41 ++++++++++++++++-----------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/chrome/content/vimperator/default.css b/chrome/content/vimperator/default.css
index 0c55749c..a71262d8 100644
--- a/chrome/content/vimperator/default.css
+++ b/chrome/content/vimperator/default.css
@@ -1,5 +1,5 @@
 /*
- * Help file
+ * Help file {{{
  */
 
 div.main {
@@ -118,11 +118,10 @@ fieldset.paypal {
     color: red;
 }
 
-/*
- * XUL
- *
+/* }}}
+ * XUL {{{
  * TODO: move to the standard location: chrome/skin/vimperator.css...if I can
- * ever convince MS ;-) -- djk
+ * ever convince MS :( -- djk
  */
 #vimperator-container  {
     font-family: monospace;
@@ -131,6 +130,8 @@ fieldset.paypal {
 #vimperator-bufferwindow, #vimperator-completion, #vimperator-previewwindow {
     -moz-user-focus: ignore;
     overflow: -moz-scrollbars-none;
+    border-width: 0px !important;
+    -moz-appearance: none !important; /* prevent an ugly 3D border */
 }
 
 /* the selected item in listboxes is hardly readable without this */
@@ -142,9 +143,12 @@ fieldset.paypal {
    color: HighlightText !important;
 }
 
-statusbarpanel {
+/* fixes the min-height: 22px from firefox */
+#status-bar, statusbarpanel {
     -moz-appearance: none !important;
+	min-height: 18px !important;
     border: none !important;
+    font-weight: bold;
 }
 #vimperator-statusline {
     font-family: monospace;
@@ -160,29 +164,34 @@ statusbarpanel {
     background-color: transparent;
     color: black;
 }
+/* no longer at the window's bottom right corner */
+.statusbar-resizerpanel {
+    display: none;
+}
 
 #vimperator-commandline {
-    /* FIXME: black on white or default skin colors? */
+    /* FIXME: black on white or default skin colors? -moz-Field/-moz-FieldText */
     background-color: white;
     color: black;
     padding: 1px;
 }
 
-#vimperator-multiline-output {
-    overflow: hidden;
+/* colors for the statusbar */
+/* #status-bar is included so it also gets the right color before the first setClass("insecure") */
+#status-bar, #status-bar.status_insecure*/ {
+    background-color: black;
+    color: white;
 }
-
-/*
-.status_insecure, .status_insecure * {
-}
-*/
-.status_secure, .status_secure * {
+#status-bar.status_secure {
     background-color: #B0FF00; /* light green */
     color: black;
 }
-.status_broken, .status_broken * {
+#status-bar.status_broken {
     background-color: #FF6060; /* light red */
     color: black;
 }
 
+#vimperator-multiline-output {
+    overflow: hidden;
+}
 /* vim: set fdm=marker sw=4 ts=4 et: */

From c6134b1111f82c43cca896a0f85a7f89f3748201 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 25 Sep 2007 11:03:44 +0000
Subject: [PATCH 070/224] fix statusbar colours again, again, again - broken by
 typo

---
 chrome/content/vimperator/default.css | 39 ++++++++++++++-------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/chrome/content/vimperator/default.css b/chrome/content/vimperator/default.css
index a71262d8..4343e799 100644
--- a/chrome/content/vimperator/default.css
+++ b/chrome/content/vimperator/default.css
@@ -149,6 +149,7 @@ fieldset.paypal {
 	min-height: 18px !important;
     border: none !important;
     font-weight: bold;
+    font-family: monospace;
 }
 #vimperator-statusline {
     font-family: monospace;
@@ -160,15 +161,30 @@ fieldset.paypal {
 #vimperator-statusline > label:first-child {
     padding: 0px;
 }
-#vimperator-statusline-field-url {
-    background-color: transparent;
-    color: black;
-}
 /* no longer at the window's bottom right corner */
 .statusbar-resizerpanel {
     display: none;
 }
 
+/* colors for the statusbar */
+/* #status-bar is included so it also gets the right color before the first setClass("insecure") */
+#status-bar,
+#status-bar.status_insecure,
+#status-bar.status_insecure #vimperator-statusline-field-url {
+    background-color: black;
+    color: white;
+}
+#status-bar.status_secure,
+#status-bar.status_secure #vimperator-statusline-field-url {
+    background-color: #B0FF00; /* light green */
+    color: black;
+}
+#status-bar.status_broken,
+#status-bar.status_broken #vimperator-statusline-field-url {
+    background-color: #FF6060; /* light red */
+    color: black;
+}
+
 #vimperator-commandline {
     /* FIXME: black on white or default skin colors? -moz-Field/-moz-FieldText */
     background-color: white;
@@ -176,21 +192,6 @@ fieldset.paypal {
     padding: 1px;
 }
 
-/* colors for the statusbar */
-/* #status-bar is included so it also gets the right color before the first setClass("insecure") */
-#status-bar, #status-bar.status_insecure*/ {
-    background-color: black;
-    color: white;
-}
-#status-bar.status_secure {
-    background-color: #B0FF00; /* light green */
-    color: black;
-}
-#status-bar.status_broken {
-    background-color: #FF6060; /* light red */
-    color: black;
-}
-
 #vimperator-multiline-output {
     overflow: hidden;
 }

From fd3b691a874a070d7f3692a4cf5c05a1e0033382 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 25 Sep 2007 12:40:18 +0000
Subject: [PATCH 071/224] hide the statusbar-progresspanel in CSS too since
 some extensions hide/reshow it

---
 chrome/content/vimperator/default.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/chrome/content/vimperator/default.css b/chrome/content/vimperator/default.css
index 4343e799..30190388 100644
--- a/chrome/content/vimperator/default.css
+++ b/chrome/content/vimperator/default.css
@@ -165,6 +165,9 @@ fieldset.paypal {
 .statusbar-resizerpanel {
     display: none;
 }
+#statusbar-display, #statusbar-progresspanel {
+    display: none;
+}
 
 /* colors for the statusbar */
 /* #status-bar is included so it also gets the right color before the first setClass("insecure") */

From 96b1bb6c8c391b33cd6ad53efcf29ff1b9f3a2a2 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 25 Sep 2007 18:25:37 +0000
Subject: [PATCH 072/224] remove whitehart them references in help page

---
 chrome/content/vimperator/help.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/chrome/content/vimperator/help.js b/chrome/content/vimperator/help.js
index 3f5a5767..0b287470 100644
--- a/chrome/content/vimperator/help.js
+++ b/chrome/content/vimperator/help.js
@@ -150,9 +150,6 @@ vimperator.help = function(section, easter) //{{{
         'If you don\'t like Vimperator at all, you can uninstall it by typing <code class="command">:addons</code> and remove/disable it.\n' +
         'If you like it, but can\'t remember the shortcuts, press <code class="mapping">F1</code> or <code class="command">:help</code> to get this help window back.</p>' +
 
-        '<p>Since Vimperator\'s GUI is embedded into a toolbar, it may look too 3D-like with the default theme. ' +
-        'For the best experience, I therefore recommend the <a href="https://addons.mozilla.org/firefox/364/">Whitehart</a> theme or any other flat theme.</p>' +
-
         '<p>Vimperator was written by <a href="mailto:stubenschrott@gmx.net">Martin Stubenschrott</a>. ' +
         'If you appreciate my work on Vimperator and want to encourage me working on it more, you can either send me greetings, patches or make a donation: </p>' +
 

From 19a40ba575b902441db13a8d54a032b746a56228 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 25 Sep 2007 18:42:49 +0000
Subject: [PATCH 073/224] merge new :let and :unlet commands and support for
 <Leader> in mappings

---
 NEWS                                    |   4 +
 chrome/content/vimperator/commands.js   | 109 ++++++++++++++++++++++++
 chrome/content/vimperator/vimperator.js |  78 ++++++++++++++++-
 3 files changed, 189 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 4e5b0f59..1231c7ee 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.2
+	* statusline is now white on black with bold font by default (like in (g)vim)
+	  (change with userChrome.css if you don't like it until we have :colorscheme)
+	* :let mapleader=","  and <Leader> in :map support
+	* added new :let and :unlet commands
 	* separated search and Ex command history
 	* added 'visualbellstyle' for styling/hiding the visual bell
 	* merge the existing status bar with the standard FF status bar so that
diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 0f868897..ae40247e 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -604,6 +604,77 @@ function Commands() //{{{
                   "The special version <code class=\"command\">:javascript!</code> will open the JavaScript console of Firefox."
         }
     ));
+    addDefaultCommand(new Command(["let"],
+        function(args)
+        {
+            if (!args)
+            {
+                return;
+                // List all defined variables
+            }
+
+            var match;
+            // 1 - type, 2 - name, 3 - +-., 4 - expr
+            if (match = args.match(/([$@&])?([\w:]+)\s*([+-.])?=\s*(.+)/))
+            {
+                if (!match[1])
+                {
+                    var reference = vimperator.variableReference(match[2]);
+                    if (!reference[0] && match[3])
+                        return vimperator.echoerr("E121: Undefined variable: " + match[2]);
+
+                    var expr = vimperator.eval(match[4]);
+                    if (typeof expr === undefined)
+                        return vimperator.echoerr("E15: Invalid expression: " + match[4]);
+                    else
+                    {
+                        if (!reference[0]) {
+                            if (reference[2] == 'g')
+                                reference[0] = vimperator.globalVariables;
+                            else
+                                return; // for now
+                        }
+
+                        if (match[3])
+                        {
+                            if (match[3] == '+')
+                                reference[0][reference[1]] += expr;
+                            else if (match[3] == '-')
+                                reference[0][reference[1]] -= expr;
+                            else if (match[3] == '.')
+                                reference[0][reference[1]] += expr.toString();
+                        }
+                        else
+                            reference[0][reference[1]] = expr;
+                    }
+                }
+            }
+            // 1 - name
+            else if (match = args.match(/^\s*([\w:]+)\s*$/))
+            {
+                var reference = vimperator.variableReference(match[1]);
+                if (!reference[0])
+                    return vimperator.echoerr("E121: Undefined variable: " + match[1]);
+
+                var value = reference[0][reference[1]];
+                if (typeof value == 'number')
+                    var prefix = '#';
+                else if (typeof value == 'function')
+                    var prefix = '*';
+                else
+                    var prefix = '';
+                vimperator.echo(reference[1] + '\t\t' + prefix + value);
+            }
+        },
+        {
+            usage: ["let {var-name} [+-.]= {expr1}", "let {var-name}", "let"],
+            short_help: "Sets or lists a variable",
+            help: "Sets the variable <code class=\"argument\">{var-name}</code> " +
+                  "to the value of the expression <code class=\"argument\">{expr1}</code>." +
+                  "If no expression is given, the value of the variable is displayed." +
+                  "Without arguments, displays a list of all variables."
+        }
+    ));
     addDefaultCommand(new Command(["map"],
         // 0 args -> list all maps
         // 1 arg  -> list the maps starting with args
@@ -618,6 +689,15 @@ function Commands() //{{{
 
             var matches = args.match(/^([^\s]+)(?:\s+(.+))?$/)
             var [lhs, rhs] = [matches[1], matches[2]];
+            var leader_reg = new RegExp('<Leader>', 'i');
+
+            if (leader_reg.test(lhs))
+            {
+                var leader_ref = vimperator.variableReference('mapleader');
+                var leader = leader_ref[0] ? leader_ref[0][leader_ref[1]] : '\\';
+
+                lhs = lhs.replace(leader_reg, leader);
+            }
 
             if (rhs)
             {
@@ -1338,6 +1418,35 @@ function Commands() //{{{
             help: "If a count is given, don't close the last but the <code class=\"argument\">[count]</code>th last tab."
         }
     ));
+    addDefaultCommand(new Command(["unl[et]"],
+        function(args, special)
+        {
+            if (!args)
+                return vimperator.echoerr("E471: Argument required");
+
+            var names = args.split(/ /);
+            if (typeof names == 'string') names = [names];
+            var length = names.length;
+            for (var i = 0, name = names[i]; i < length; name = names[++i])
+            {
+                var reference = vimperator.variableReference(name);
+                if (!reference[0])
+                {
+                    if (!special)
+                        vimperator.echoerr("E108: No such variable: " + name);
+                    return;
+                }
+
+                delete reference[0][reference[1]];
+            }
+        },
+        {
+            usage: ["unl[et][!] {name} ..."],
+            short_help: "Deletes a variable.",
+            help: "Deletes the variable <code class=\"argument\">{name}</code>." +
+                  "Several variable names can be given."
+        }
+    ));
     addDefaultCommand(new Command(["unm[ap]"],
         function(args)
         {
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index 6aa84e52..ed1d9a0a 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -359,6 +359,78 @@ const vimperator = (function() //{{{
             return new LocalFile(path, mode, perms, tmp);
         },
 
+        // partial sixth level expression evaluation
+        eval: function(string)
+        {
+            string = string.toString().replace(/^\s*/, "").replace(/\s*$/, "");
+            var match = string.match(/^&(\w+)/);
+            if (match)
+            {
+                var opt = this.options.get(match[1]);
+                if (!opt)
+                {
+                    this.echoerr("E113: Unknown option: " + match[1]);
+                    return;
+                }
+                var type = opt.type;
+                var value = opt.getter();
+                if (type != "boolean" && type != "number")
+                    value = value.toString();
+                return value;
+            }
+
+            // String
+            else if (match = string.match(/^(['"])([^\1]*?[^\\]?)\1/))
+            {
+                if (match)
+                    return match[2].toString();
+                else
+                {
+                    this.echoerr("E115: Missing quote: " + string);
+                    return;
+                }
+            }
+
+            // Number
+            else if (match = string.match(/^(\d+)$/))
+            {
+                return parseInt(match[1]);
+            }
+
+            var reference = this.variableReference(string);
+            if (!reference[0])
+                this.echoerr("E121: Undefined variable: " + string);
+            else
+                return reference[0][reference[1]];
+
+            return;
+        },
+
+        variableReference: function(string)
+        {
+            if (!string)
+                return [null, null, null];
+
+            if (match = string.match(/^([bwtglsv]):(\w+)/)) // Variable
+            {
+                // Other variables should be implemented
+                if (match[1] == "g")
+                {
+                    if (match[2] in this.globalVariables)
+                        return [this.globalVariables, match[2], match[1]];
+                    else
+                        return [null, match[2], match[1]];
+                }
+            }
+            else // Global variable
+            {
+                if (string in this.globalVariables)
+                    return [this.globalVariables, string, "g"];
+                else
+                    return [null, string, "g"];
+            }
+        },
+
         // logs a message to the javascript error console
         log: function(msg, level)
         {
@@ -383,10 +455,10 @@ const vimperator = (function() //{{{
                 }
                 catch (e)
                 {
-                    value = '';
+                    value = "";
                 }
 
-                string += i + ': ' + value + '\n';
+                string += i + ": " + value + "\n";
             }
             vimperator.log(string, level);
         },
@@ -623,6 +695,8 @@ const vimperator = (function() //{{{
             vimperator.echo    = vimperator.commandline.echo;
             vimperator.echoerr = vimperator.commandline.echoErr;
 
+            vimperator.globalVariables = {};
+
             // TODO: move elsewhere
             vimperator.registerCallback("submit", vimperator.modes.EX, function(command) { vimperator.execute(command); } );
             vimperator.registerCallback("complete", vimperator.modes.EX, function(str) { return vimperator.completion.exTabCompletion(str); } );

From 8b77ce674fc6217f1a37ac79ac92c60349ec4027 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 25 Sep 2007 19:02:31 +0000
Subject: [PATCH 074/224] merge updated QuickMarks error message

---
 chrome/content/vimperator/bookmarks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/bookmarks.js b/chrome/content/vimperator/bookmarks.js
index 71465f31..b265caa2 100644
--- a/chrome/content/vimperator/bookmarks.js
+++ b/chrome/content/vimperator/bookmarks.js
@@ -833,7 +833,7 @@ function QuickMarks() //{{{
 
         if (marks.length == 0)
         {
-            vimperator.echoerr("No marks set");
+            vimperator.echoerr("No QuickMarks set");
             return;
         }
 

From b8ac03c9e88562c7518955f3b60a795a1bdd9c4b Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 25 Sep 2007 19:11:38 +0000
Subject: [PATCH 075/224] allow hidden help messages to be found

---
 chrome/content/vimperator/help.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/help.js b/chrome/content/vimperator/help.js
index 0b287470..4ee38e98 100644
--- a/chrome/content/vimperator/help.js
+++ b/chrome/content/vimperator/help.js
@@ -262,7 +262,7 @@ vimperator.help = function(section, easter) //{{{
     {
         function findSectionElement(section)
         {
-            return vimperator.buffer.evaluateXPath('//code[@class="tag" and text()="' + section + '"]')
+            return vimperator.buffer.evaluateXPath('//code[@class="tag" and text()="' + section + '"] | id("' + section + '")')
                 .snapshotItem(0);
         }
 

From 3c87cd0257c58395fd0fc01af013367d74922c55 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 25 Sep 2007 19:28:55 +0000
Subject: [PATCH 076/224] merge refactored loadPreference()

---
 chrome/content/vimperator/options.js | 32 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index 64753bcb..43570e30 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -143,16 +143,15 @@ function Options() //{{{
 
     function loadPreference(name, forced_default, vimperator_branch)
     {
-        var pref = null;
-        var default_value = "";
+        var default_value = null;
+        if (forced_default != null)  // this argument sets defaults for non-user settable options (like comp_history)
+            default_value = forced_default;
 
         if (vimperator_branch)
         {
             branch = vimperator_prefs;
 
-            if (forced_default)  // this argument sets defaults for non-user settable options (like comp_history)
-                default_value = forced_default;
-            else
+            if (!forced_default)  // this argument sets defaults for non-user settable options (like comp_history)
             {
                 for (var i = 0; i < options.length; i++)
                 {
@@ -171,21 +170,22 @@ function Options() //{{{
 
         try
         {
-            if (typeof default_value == "string")
-                pref = branch.getCharPref(name);
-            else if (typeof default_value == "number")
-                pref = branch.getIntPref(name);
-            else if (typeof default_value == "boolean")
-                pref = branch.getBoolPref(name);
-            else
-                pref = default_value;
+            switch (typeof default_value)
+            {
+                case "string":
+                    return branch.getCharPref(name);
+                case "number":
+                    return branch.getIntPref(name);
+                case "boolean":
+                    return branch.getBoolPref(name);
+                default:
+                    return default_value;
+            }
         }
         catch (e)
         {
-            //alert("error: " + e);
-            pref = default_value;
+            return default_value;
         }
-        return pref;
     }
 
     function setGuiOptions(value)

From 4ab5832072c70bcd4e9bab4b16da219df3472001 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 25 Sep 2007 19:34:20 +0000
Subject: [PATCH 077/224] merge minor fixes to Commandline echo/echoerr/clear

---
 chrome/content/vimperator/ui.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/chrome/content/vimperator/ui.js b/chrome/content/vimperator/ui.js
index 94cd34d2..824dce09 100644
--- a/chrome/content/vimperator/ui.js
+++ b/chrome/content/vimperator/ui.js
@@ -273,7 +273,7 @@ function CommandLine() //{{{
     this.echo = function(str, flags)
     {
         var focused = document.commandDispatcher.focusedElement;
-        if (/*!echo_allowed && focused && */focused == command_widget.inputField)
+        if (focused && focused == command_widget.inputField || focused == multiline_input_widget.inputField)
             return false;
 
         if (typeof str != "string")
@@ -296,7 +296,7 @@ function CommandLine() //{{{
     this.echoErr = function(str)
     {
         var focused = document.commandDispatcher.focusedElement;
-        if (/*!echo_allowed && focused && */focused == command_widget.inputField)
+        if (focused && focused == command_widget.inputField || focused == multiline_input_widget.inputField)
             return false;
 
         setErrorStyle();
@@ -343,6 +343,7 @@ function CommandLine() //{{{
     {
         multiline_input_widget.collapsed = true;
         multiline_output_widget.collapsed = true;
+        completionlist.hide();
 
         setPrompt(" "); // looks faster than an empty string as most prompts are 1 char long
         setCommand("");
@@ -374,6 +375,9 @@ function CommandLine() //{{{
         }
         else if (event.type == "keypress")
         {
+            if (!cur_extended_mode)
+                return;
+
             var key = vimperator.events.toString(event);
 
             // user pressed ENTER to carry out a command
@@ -600,7 +604,6 @@ function CommandLine() //{{{
             var key = vimperator.events.toString(event);
             if (vimperator.events.isAcceptKey(key))
             {
-                //var lines = multiline_input_widget.value.substr(0, multiline_input_widget.selectionStart).split(/\n/);
                 var text = multiline_input_widget.value.substr(0, multiline_input_widget.selectionStart);
                 if (text.match(multiline_regexp))
                 {

From 7374bda39bba4c13617906dc749325f68e515ddf Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 25 Sep 2007 19:37:09 +0000
Subject: [PATCH 078/224] merge new VIMPERATOR_HOME env variable support

---
 AUTHORS                                 | 1 +
 chrome/content/vimperator/vimperator.js | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 6efbeec8..2f7b69c4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,4 +13,5 @@ Patches:
   * Bart Trojanowski (Makefile)
   * Hannes Rist (:set titlestring support)
   * Marco Candrian (shift-insert patch)
+  * Nikolai Weibull ($VIMPERATOR_HOME)
 </pre>
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index ed1d9a0a..6d192f4d 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -112,10 +112,13 @@ const vimperator = (function() //{{{
         if (WINDOWS)
             path = path.replace('/', '\\', 'g');
 
-        // expand "~" to HOME (USERPROFILE or HOMEDRIVE\HOMEPATH on Windows if HOME is not set)
+        // expand "~" to VIMPERATOR_HOME or HOME (USERPROFILE or HOMEDRIVE\HOMEPATH on Windows if HOME is not set)
         if (/^~/.test(path))
         {
-            var home = environment_service.get("HOME");
+            var home = environment_service.get("VIMPERATOR_HOME");
+
+            if (!home)
+                home = environment_service.get("HOME");
 
             if (WINDOWS && !home)
                 home = environment_service.get("USERPROFILE") ||

From 83903d0adef37786a317007fd76d710f08e1119c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 26 Sep 2007 08:14:45 +0000
Subject: [PATCH 079/224] prevent the statusbar URL text field from flashing a
 white background color upon restarts

---
 chrome/content/vimperator/default.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/chrome/content/vimperator/default.css b/chrome/content/vimperator/default.css
index 30190388..aa791565 100644
--- a/chrome/content/vimperator/default.css
+++ b/chrome/content/vimperator/default.css
@@ -161,6 +161,11 @@ fieldset.paypal {
 #vimperator-statusline > label:first-child {
     padding: 0px;
 }
+/* FIXME: prevent this from flashing the default background-color on restarts */
+#vimperator-statusline-field-url {
+    background-color: transparent;
+}
+
 /* no longer at the window's bottom right corner */
 .statusbar-resizerpanel {
     display: none;

From d5e0711c6ff8bd7af98892f95cc04460216cf41a Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 26 Sep 2007 11:31:20 +0000
Subject: [PATCH 080/224] add 't_vb' as an alias for 'visualbellstyle'

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

diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index 43570e30..122e153d 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -199,7 +199,7 @@ function Options() //{{{
         // and bookmarks toolbar
         document.getElementById("PersonalToolbar").collapsed = value.indexOf("b") > -1 ? false : true;
         document.getElementById("PersonalToolbar").hidden = value.indexOf("b") > -1 ? false : true;
-        // and original status bar (default), but show it, e.g. when needed for extensions
+        // and status bar (default on)
         document.getElementById("status-bar").collapsed = value.indexOf("s") > -1 ? false : true;
         document.getElementById("status-bar").hidden = value.indexOf("s") > -1 ? false : true;
     }
@@ -595,10 +595,10 @@ function Options() //{{{
             default_value: false
         }
     ));
-    addOption(new Option(["visualbellstyle"], "string",
+    addOption(new Option(["visualbellstyle", "t_vb"], "string",
         {
             short_help: "CSS specification of the visual bell",
-            help: "To hide the visual bell use a value of \"display: none;\".",
+            help: "To hide the visual bell use a value of \"display: none;\" or unset it with <code class=\"command\">:set t_vb=</code>",
             setter: function(value) { if (!value) value = "display: none;"; Options.setPref("visualbellstyle", value); },
             default_value: "background-color: black; color: black;"
         }

From ac6892f3387bc4fd1b77609cefdb0acae674fe05 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 26 Sep 2007 11:40:30 +0000
Subject: [PATCH 081/224] force #vimperator-statusline-field-url to inherit
 status bar colors

---
 chrome/content/vimperator/default.css | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/chrome/content/vimperator/default.css b/chrome/content/vimperator/default.css
index aa791565..da8fdcd8 100644
--- a/chrome/content/vimperator/default.css
+++ b/chrome/content/vimperator/default.css
@@ -161,9 +161,9 @@ fieldset.paypal {
 #vimperator-statusline > label:first-child {
     padding: 0px;
 }
-/* FIXME: prevent this from flashing the default background-color on restarts */
 #vimperator-statusline-field-url {
-    background-color: transparent;
+    background-color: inherit;
+    color: inherit;
 }
 
 /* no longer at the window's bottom right corner */
@@ -177,18 +177,15 @@ fieldset.paypal {
 /* colors for the statusbar */
 /* #status-bar is included so it also gets the right color before the first setClass("insecure") */
 #status-bar,
-#status-bar.status_insecure,
-#status-bar.status_insecure #vimperator-statusline-field-url {
+#status-bar.status_insecure {
     background-color: black;
     color: white;
 }
-#status-bar.status_secure,
-#status-bar.status_secure #vimperator-statusline-field-url {
+#status-bar.status_secure {
     background-color: #B0FF00; /* light green */
     color: black;
 }
-#status-bar.status_broken,
-#status-bar.status_broken #vimperator-statusline-field-url {
+#status-bar.status_broken {
     background-color: #FF6060; /* light red */
     color: black;
 }

From d9d30765c37d0a1c0dae375b6e38ac1c742ebac4 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 26 Sep 2007 14:50:06 +0000
Subject: [PATCH 082/224] add full help for :sidebar and :nohlsearch

---
 chrome/content/vimperator/commands.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index ae40247e..1079c428 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -786,8 +786,9 @@ function Commands() //{{{
             vimperator.search.clear();
         },
         {
-            short_help: "Clear the current selection",
-            help: "TODO"
+            short_help: "Remove the search highlighting",
+            help: "The document highlighting is turned back on when another search command is used or the " +
+                  "<code class=\"option\">'hlsearch'</code> option is set."
         }
     ));
     addDefaultCommand(new Command(["norm[al]"],
@@ -1188,8 +1189,7 @@ function Commands() //{{{
                 toggleSidebar();
         },
         {
-            short_help: "Close the sidebar",
-            help: "TODO"
+            short_help: "Close the sidebar"
         }
     ));
     // TODO: sopen instead? Separate :sidebar from :sbopen and make them behave
@@ -1219,8 +1219,10 @@ function Commands() //{{{
             }
         },
         {
-            short_help: "Open the sidebar",
-            help: "TODO",
+            usage: ["sidebar {name}"],
+            short_help: "Open the sidebar window",
+            help: "<code class=\"argument\">{name}</code> is any of the menu items listed under the standard Firefox View->Sidebar " +
+                  "menu. Add-ons, Preferences and Downloads are also available in the sidebar.",
             completer: function(filter) { return vimperator.completion.get_sidebar_completions(filter); }
         }
     ));

From f33a6b435d26bcc4f14eddba49ec4189d912d503 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 26 Sep 2007 16:11:36 +0000
Subject: [PATCH 083/224] return true from onKeyPress when in MENU mode

---
 chrome/content/vimperator/events.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/events.js b/chrome/content/vimperator/events.js
index 653e561e..17a6035b 100644
--- a/chrome/content/vimperator/events.js
+++ b/chrome/content/vimperator/events.js
@@ -427,7 +427,7 @@ function Events() //{{{
         var stop = true; // set to false if we should NOT consume this event but let also firefox handle it
 
         if (vimperator.hasMode(vimperator.modes.MENU))
-            return false;
+            return true;
 
         // XXX: for now only, later: input mappings if form element focused
         if (isFormElemFocused())

From a2f048c32a54c0cf0f1629e81150cc79ce870855 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 28 Sep 2007 13:20:48 +0000
Subject: [PATCH 084/224] apply 'hlsearchstyle' to frame documents

---
 chrome/content/vimperator/find.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/chrome/content/vimperator/find.js b/chrome/content/vimperator/find.js
index 57824215..eeed6073 100644
--- a/chrome/content/vimperator/find.js
+++ b/chrome/content/vimperator/find.js
@@ -235,17 +235,22 @@ function Search() //{{{
         if (!text)
             text = last_search_string;
 
-        // NOTE: setCaseSensitivity() in FF2 does NOT set the
+        // NOTE: gFindBar.setCaseSensitivity() in FF2 does NOT set the
         // accessibility.typeaheadfind.casesensitive pref as needed by
         // highlightDoc()
         gFindBar.mTypeAheadCaseSensitive = case_sensitive ? 1 : 0;
         gFindBar.highlightDoc("white", "black", text);
 
-        // TODO: seems fast enough for now
-        // NOTE: FF2 highlighting spans all have this id rather than a class attribute
-        var spans = vimperator.buffer.evaluateXPath('//span[@id="__firefox-findbar-search-id"]')
-        for (var i = 0; i < spans.snapshotLength; i++)
-            spans.snapshotItem(i).setAttribute("style", vimperator.options["hlsearchstyle"]);
+        // TODO: seems fast enough for now...just
+        // NOTE: FF2 highlighting spans all have the same id rather than a class attribute
+        (function(win)
+        {
+            for (var i = 0; i < win.frames.length; i++)
+                arguments.callee(win.frames[i])
+            var spans = vimperator.buffer.evaluateXPath('//span[@id="__firefox-findbar-search-id"]', win.document)
+            for (var i = 0; i < spans.snapshotLength; i++)
+                spans.snapshotItem(i).setAttribute("style", vimperator.options["hlsearchstyle"]);
+        })(window.content);
 
         // recreate selection since _highlightDoc collapses the selection backwards
         getBrowser().fastFind.findNext();

From 378c8fcf20c1d393d05192800c8a8d976bc30abc Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 28 Sep 2007 13:28:16 +0000
Subject: [PATCH 085/224] allow for option names with underscores

---
 chrome/content/vimperator/commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 1079c428..11ed0cb5 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -1027,7 +1027,7 @@ function Commands() //{{{
             else
             {
                 //                               1        2       3    4  5      6
-                var matches = args.match(/^\s*(no|inv)?([a-z]+)([?&!])?(([+-])?=(.*))?/);
+                var matches = args.match(/^\s*(no|inv)?([a-z_]+)([?&!])?(([+-])?=(.*))?/);
                 if (!matches)
                 {
                     vimperator.echoerr("E518: Unknown option: " + args);

From 01418fe122b23a68023d97fa9d35c7b0ff5eabb2 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 28 Sep 2007 13:31:11 +0000
Subject: [PATCH 086/224] move commandline styling to the CSS file and remove
 white border around error messages

---
 chrome/content/vimperator/default.css | 16 +++++++++++++++-
 chrome/content/vimperator/ui.js       | 18 +++++++++---------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/chrome/content/vimperator/default.css b/chrome/content/vimperator/default.css
index da8fdcd8..8bdba34e 100644
--- a/chrome/content/vimperator/default.css
+++ b/chrome/content/vimperator/default.css
@@ -153,7 +153,7 @@ fieldset.paypal {
 }
 #vimperator-statusline {
     font-family: monospace;
-    margin: 0
+    margin: 0px;
 }
 #vimperator-statusline > label {
     padding: 0px 0px 0px 8px;
@@ -196,6 +196,20 @@ fieldset.paypal {
     color: black;
     padding: 1px;
 }
+#vimperator-commandline-prompt, #vimperator-commandline-command {
+    background-color: inherit;
+    color: inherit;
+}
+#vimperator-commandline.error {
+    background-color: red;
+    color: white;
+    font-weight: bold;
+}
+#vimperator-commandline.message > #vimperator-commandline-prompt {
+    background-color: white;
+    color: magenta;
+    font-weight: bold;
+}
 
 #vimperator-multiline-output {
     overflow: hidden;
diff --git a/chrome/content/vimperator/ui.js b/chrome/content/vimperator/ui.js
index 824dce09..e190fe27 100644
--- a/chrome/content/vimperator/ui.js
+++ b/chrome/content/vimperator/ui.js
@@ -99,12 +99,14 @@ function CommandLine() //{{{
     var wild_index = 0;  // keep track how often we press <Tab> in a row
     var completion_index = UNINITIALIZED;
 
-    // The prompt for the current command, for example : or /. Can be blank
+    // the containing box for the prompt_widget and command_widget
+    var commandline_widget = document.getElementById('vimperator-commandline');
+    // the prompt for the current command, for example : or /. Can be blank
     var prompt_widget = document.getElementById('vimperator-commandline-prompt');
-    // The command bar which contains the current command
+    // the command bar which contains the current command
     var command_widget = document.getElementById('vimperator-commandline-command');
 
-    // The widget used for multiline output
+    // the widget used for multiline output
     var multiline_output_widget = document.getElementById("vimperator-multiline-output");
     multiline_output_widget.contentDocument.body.setAttribute("style", "margin: 0px; font-family: -moz-fixed;"); // get rid of the default border
     multiline_output_widget.contentDocument.body.innerHTML = "";
@@ -115,7 +117,7 @@ function CommandLine() //{{{
         multiline_output_widget.collapsed = true;
     }, 100);
 
-    // The widget used for multiline intput
+    // the widget used for multiline intput
     var multiline_input_widget = document.getElementById("vimperator-multiline-input");
 
     // we need to save the mode which were in before opening the command line
@@ -131,19 +133,17 @@ function CommandLine() //{{{
     var multiline_regexp = null;
     var multiline_callback = null;
 
-    // TODO: these styles should be moved to the .css file
     function setNormalStyle()
     {
-        command_widget.inputField.setAttribute("style","font-family: monospace;");
+        commandline_widget.setAttribute("class", "normal");
     }
     function setMessageStyle()
     {
-        prompt_widget.setAttribute("style", "font-family: monospace; color:magenta; font-weight: bold");
-        command_widget.inputField.setAttribute("style", "font-family: monospace;");
+        commandline_widget.setAttribute("class", "message");
     }
     function setErrorStyle()
     {
-        command_widget.inputField.setAttribute("style", "font-family: monospace; color:white; background-color:red; font-weight: bold");
+        commandline_widget.setAttribute("class", "error");
     }
 
     // Sets the prompt - for example, : or /

From 6b6b6c2c8b64a43cc4177f5808b32c5ce4f564c9 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 28 Sep 2007 13:38:24 +0000
Subject: [PATCH 087/224] :let shows all defined (global) variables now

---
 chrome/content/vimperator/commands.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 11ed0cb5..f3f0fdd7 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -609,8 +609,24 @@ function Commands() //{{{
         {
             if (!args)
             {
+                var str = "";
+                for (var i in vimperator.globalVariables)
+                {
+                    var value = vimperator.globalVariables[i];
+                    if (typeof value == "number")
+                        var prefix = "#";
+                    else if (typeof value == "function")
+                        var prefix = "*";
+                    else
+                        var prefix = "";
+
+                    str += "<tr><td style=\"width: 200px;\">" + i + "</td><td>" + prefix + value + "</td>\n";
+                }
+                if (str)
+                    vimperator.echo("<table>" + str + "</table>", true);
+                else
+                    vimperator.echo("No variables found");
                 return;
-                // List all defined variables
             }
 
             var match;

From 2d60a48fd18ba98ec162b1d01531a6c9242b4ebd Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 1 Oct 2007 10:23:39 +0000
Subject: [PATCH 088/224] change directory structure to follow the more
 standard package hierarchy

---
 Makefile                                      |  19 +-
 chrome.manifest                               |   4 +-
 chrome/content/vimperator/contents.rdf        |  24 ---
 .../vimperator => content}/bookmarks.js       |   0
 .../content/vimperator => content}/buffers.js |   0
 .../vimperator => content}/commands.js        |   0
 .../vimperator => content}/completion.js      |   0
 .../content/vimperator => content}/events.js  |   0
 .../content/vimperator => content}/file.js    |   0
 .../content/vimperator => content}/find.js    |   0
 content/help.css                              | 117 +++++++++++
 .../content/vimperator => content}/help.js    |   2 +-
 .../content/vimperator => content}/hints.js   |   0
 .../vimperator => content}/logo_white.png     | Bin
 .../vimperator => content}/mappings.js        |   0
 content/modes.js                              | 184 ++++++++++++++++++
 .../content/vimperator => content}/options.js |   0
 .../content/vimperator => content}/tabs.js    |   0
 content/test.js                               |  13 ++
 {chrome/content/vimperator => content}/ui.js  |   0
 .../vimperator => content}/vimperator.js      |   0
 .../vimperator => content}/vimperator.xul     |   4 +-
 .../default.css => skin/vimperator.css        | 126 +-----------
 23 files changed, 330 insertions(+), 163 deletions(-)
 delete mode 100644 chrome/content/vimperator/contents.rdf
 rename {chrome/content/vimperator => content}/bookmarks.js (100%)
 rename {chrome/content/vimperator => content}/buffers.js (100%)
 rename {chrome/content/vimperator => content}/commands.js (100%)
 rename {chrome/content/vimperator => content}/completion.js (100%)
 rename {chrome/content/vimperator => content}/events.js (100%)
 rename {chrome/content/vimperator => content}/file.js (100%)
 rename {chrome/content/vimperator => content}/find.js (100%)
 create mode 100644 content/help.css
 rename {chrome/content/vimperator => content}/help.js (99%)
 rename {chrome/content/vimperator => content}/hints.js (100%)
 rename {chrome/content/vimperator => content}/logo_white.png (100%)
 rename {chrome/content/vimperator => content}/mappings.js (100%)
 create mode 100644 content/modes.js
 rename {chrome/content/vimperator => content}/options.js (100%)
 rename {chrome/content/vimperator => content}/tabs.js (100%)
 create mode 100755 content/test.js
 rename {chrome/content/vimperator => content}/ui.js (100%)
 rename {chrome/content/vimperator => content}/vimperator.js (100%)
 rename {chrome/content/vimperator => content}/vimperator.xul (98%)
 rename chrome/content/vimperator/default.css => skin/vimperator.css (56%)

diff --git a/Makefile b/Makefile
index 3645f6ad..318854e0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,16 @@ VERSION       = 0.5.2pre
 OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 
-JAR_FILES     = ${shell find chrome/content -type f 		\
-					-a ! -path '*CVS*' 	\
-					-a \( -path '*.js' 	\
-				     -o  -path '*.css' 	\
-				     -o  -path '*.xul' 	\
-				     -o  -path '*.rdf' 	\
-				     -o  -path '*.png' 	\
-				   \) } chrome.manifest
+JAR_FILES     = ${shell find content skin	\
+			-type f			\
+			-a ! -path '*CVS*'	\
+			-a \(			\
+				-path '*.js'	\
+			     -o -path '*.css'	\
+			     -o -path '*.xul'	\
+			     -o -path '*.png'	\
+			   \)			\
+		}
 JAR_DIRS      = $(foreach f,${JAR_FILES},$(dir $f))
 JAR           = chrome/vimperator.jar
 
@@ -148,6 +150,7 @@ ${BUILD_JAR_SUBDIRS}:
 
 ${JAR}: ${BUILD_JAR_SUBDIRS} ${JAR_FILES}
 	@echo "Building JAR..."
+	${Q}mkdir -p $(dir ${JAR}) #FIXME
 	${Q}for f in ${JAR_FILES} ; do \
 		${SED} -e "s,###VERSION###,${VERSION},g" \
 		       -e "s,###DATE###,${BUILD_DATE},g" \
diff --git a/chrome.manifest b/chrome.manifest
index 2c931d0a..73afa673 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,3 +1,3 @@
-# vimperators chrome registration file
-content	vimperator	jar:chrome/vimperator.jar!/chrome/content/vimperator/
+content	vimperator jar:chrome/vimperator.jar!/content/
+skin vimperator classic/1.0 jar:chrome/vimperator.jar!/skin/
 overlay chrome://browser/content/browser.xul chrome://vimperator/content/vimperator.xul
diff --git a/chrome/content/vimperator/contents.rdf b/chrome/content/vimperator/contents.rdf
deleted file mode 100644
index 6ae9141d..00000000
--- a/chrome/content/vimperator/contents.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <RDF:Seq RDF:about="urn:mozilla:package:root">
-    <RDF:li RDF:resource="urn:mozilla:package:vimperator"/>
-  </RDF:Seq>
-
-  <!--<RDF:Seq RDF:about="urn:mozilla:overlays">-->
-  <!--<RDF:li RDF:resource="chrome://browser/content/browser.xul"/>-->
-  <!--</RDF:Seq>-->
-
-  <RDF:Seq RDF:about="chrome://browser/content/browser.xul">
-    <RDF:li>chrome://vimperator/content/vimperator.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Description RDF:about="urn:mozilla:package:vimperator"
-        chrome:displayName="Vimperator"
-        chrome:author="Martin Stubenschrott"
-        chrome:name="vimperator"
-        chrome:extension="true"
-        chrome:description="Make Firefox behave like Vim">
-  </RDF:Description>
-</RDF:RDF>
diff --git a/chrome/content/vimperator/bookmarks.js b/content/bookmarks.js
similarity index 100%
rename from chrome/content/vimperator/bookmarks.js
rename to content/bookmarks.js
diff --git a/chrome/content/vimperator/buffers.js b/content/buffers.js
similarity index 100%
rename from chrome/content/vimperator/buffers.js
rename to content/buffers.js
diff --git a/chrome/content/vimperator/commands.js b/content/commands.js
similarity index 100%
rename from chrome/content/vimperator/commands.js
rename to content/commands.js
diff --git a/chrome/content/vimperator/completion.js b/content/completion.js
similarity index 100%
rename from chrome/content/vimperator/completion.js
rename to content/completion.js
diff --git a/chrome/content/vimperator/events.js b/content/events.js
similarity index 100%
rename from chrome/content/vimperator/events.js
rename to content/events.js
diff --git a/chrome/content/vimperator/file.js b/content/file.js
similarity index 100%
rename from chrome/content/vimperator/file.js
rename to content/file.js
diff --git a/chrome/content/vimperator/find.js b/content/find.js
similarity index 100%
rename from chrome/content/vimperator/find.js
rename to content/find.js
diff --git a/content/help.css b/content/help.css
new file mode 100644
index 00000000..e1ac9f88
--- /dev/null
+++ b/content/help.css
@@ -0,0 +1,117 @@
+div.main {
+    font-family: -moz-fixed;
+    white-space: -moz-pre-wrap;
+    width: 800px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+h1 {
+    text-align: center;
+}
+
+p.tagline {
+    text-align: center;
+    font-weight: bold;
+}
+
+table.vimperator {
+    border-width: 1px;
+    border-style: dotted;
+    border-color: gray;
+    margin-bottom: 2em; /* FIXME: just a quick hack until we have proper pages */
+}
+table.vimperator td {
+    border: none;
+    padding: 3px;
+}
+tr.separator {
+    height: 10px;
+}
+hr {
+    height: 1px;
+    background-color: white;
+    border-style: none;
+    margin-top: 0;
+    margin-bottom: 0;
+}
+td.taglist {
+    text-align: right;
+    vertical-align: top;
+    border-spacing: 13px 10px;
+}
+td.taglist td {
+    width: 100px;
+    padding: 3px 0px;
+}
+tr.taglist code, td.usage code {
+    margin: 0px 2px;
+}
+td.usage code {
+    white-space: nowrap;
+}
+td.taglist code {
+    margin-left: 2em;
+}
+code.tag {
+    font-weight: bold;
+    color: rgb(255, 0, 255); /* magenta */
+}
+tr.description {
+    margin-bottom: 4px;
+}
+table.commands {
+    background-color: rgb(250, 240, 230);
+}
+table.mappings {
+    background-color: rgb(230, 240, 250);
+}
+table.options {
+    background-color: rgb(240, 250, 230);
+}
+
+fieldset.paypal {
+    border: none;
+}
+
+.argument {
+    color: #6A97D4;
+}
+
+.command {
+    font-weight: bold;
+    color: #632610;
+}
+
+.mapping {
+    font-weight: bold;
+    color: #102663;
+}
+
+.option {
+    font-weight: bold;
+    color: #106326;
+}
+
+.code {
+    color: #108826;
+}
+
+.shorthelp {
+    font-weight: bold;
+}
+
+.version {
+    position: absolute;
+    top: 10px;
+    right: 2%;
+    color: #C0C0C0;
+    text-align: right;
+}
+
+.warning {
+    font-weight: bold;
+    color: red;
+}
+
+/* vim: set fdm=marker sw=4 ts=4 et: */
diff --git a/chrome/content/vimperator/help.js b/content/help.js
similarity index 99%
rename from chrome/content/vimperator/help.js
rename to content/help.js
index 4ee38e98..6da9766e 100644
--- a/chrome/content/vimperator/help.js
+++ b/content/help.js
@@ -208,7 +208,7 @@ vimperator.help = function(section, easter) //{{{
         '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"\n  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n' +
         '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head>\n<title>Vimperator help</title>\n' +
         // XXX: stylesheet broken here? Have to add it in the vimperator.xul file
-        '<link rel="stylesheet" href="chrome://vimperator/content/default.css" type="text/css"/>\n' +
+        '<link rel="stylesheet" href="chrome://vimperator/content/help.css" type="text/css"/>\n' +
         '</head>\n<body>\n<div class="main">\n' +
         '<span class="version">version ' + vimperator.version + '</span>\n' +
         header +
diff --git a/chrome/content/vimperator/hints.js b/content/hints.js
similarity index 100%
rename from chrome/content/vimperator/hints.js
rename to content/hints.js
diff --git a/chrome/content/vimperator/logo_white.png b/content/logo_white.png
similarity index 100%
rename from chrome/content/vimperator/logo_white.png
rename to content/logo_white.png
diff --git a/chrome/content/vimperator/mappings.js b/content/mappings.js
similarity index 100%
rename from chrome/content/vimperator/mappings.js
rename to content/mappings.js
diff --git a/content/modes.js b/content/modes.js
new file mode 100644
index 00000000..a64af728
--- /dev/null
+++ b/content/modes.js
@@ -0,0 +1,184 @@
+/***** BEGIN LICENSE BLOCK ***** {{{
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.
+
+(c) 2006-2007: Martin Stubenschrott <stubenschrott@gmx.net>
+
+Alternatively, the contents of this file may be used under the terms of
+either the GNU General Public License Version 2 or later (the "GPL"), or
+the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+in which case the provisions of the GPL or the LGPL are applicable instead
+of those above. If you wish to allow use of your version of this file only
+under the terms of either the GPL or the LGPL, and not to allow others to
+use your version of this file under the terms of the MPL, indicate your
+decision by deleting the provisions above and replace them with the notice
+and other provisions required by the GPL or the LGPL. If you do not delete
+the provisions above, a recipient may use your version of this file under
+the terms of any one of the MPL, the GPL or the LGPL.
+}}} ***** END LICENSE BLOCK *****/
+
+vimperator.modes = (function()
+{
+    var main = 1;     // NORMAL
+    var extended = 0; // NONE
+
+    var passNextKey = false;
+    var passAllKeys = false;
+
+    function getModeMessage()
+    {
+        if (passNextKey && !passAllKeys)
+            return "PASS THROUGH (next)";
+        else if (passAllKeys && !passNextKey)
+            return "PASS THROUGH";
+
+        var ext = "";
+        switch (extended)
+        {
+            case vimperator.modes.QUICK_HINT:
+                ext = " (quick)"; break;
+            case vimperator.modes.EXTENDED_HINT:
+                ext = " (extended)"; break;
+            case vimperator.modes.ALWAYS_HINT:
+                ext = " (always)"; break;
+            case vimperator.modes.MENU: // TODO: desirable?
+                ext = " (menu)"; break;
+        }
+
+        switch (main)
+        {
+            case vimperator.modes.HINTS:
+                return "HINTS" + ext;
+            default:
+                return null;
+        }
+    }
+
+    function handleModeChange(oldmode, newmode)
+    {
+        vimperator.log("switching from mode " + oldmode + " to mode " + newmode, 7);
+
+        switch (oldmode)
+        {
+            case vimperator.modes.HINTS:
+                // XXX: for now this does not work, but later it should be here
+                // vimperator.hints.disableHahMode();
+                break;
+        }
+
+        if (newmode == vimperator.modes.NORMAL)
+        {
+            var value = Options.getFirefoxPref("accessibility.browsewithcaret", false);
+            if (value)
+                Options.setFirefoxPref("accessibility.browsewithcaret", false);
+
+            vimperator.statusline.updateUrl();
+            vimperator.focusContent();
+        }
+    }
+
+    return {
+        // main modes, only one should ever be active
+        NONE:             0,
+        NORMAL:           1 << 0,
+        HINTS:            1 << 1,
+        COMMAND_LINE:     1 << 2,
+        // extended modes, can include multiple modes, and even main modes
+        EX:               1 << 10,
+        INPUT_MULTILINE:  1 << 11,
+        OUTPUT_MULTILINE: 1 << 12,
+        SEARCH_FORWARD:   1 << 13,
+        SEARCH_BACKWARD:  1 << 14,
+        QUICK_HINT:       1 << 15,
+        EXTENDED_HINT:    1 << 16,
+        ALWAYS_HINT:      1 << 17,
+        MENU:             1 << 18, // a popupmenu is active
+
+        reset: function(silent)
+        {
+            this.set(vimperator.modes.NORMAL, vimperator.modes.NONE, silent);
+        },
+
+        show: function()
+        {
+            if (!vimperator.options["showmode"])
+                return;
+
+            // never show mode messages if we are in command line mode
+            if (main == vimperator.modes.COMMAND_LINE)
+                return;
+
+            var msg = getModeMessage();
+            if (msg)
+                vimperator.commandline.echo("-- " + getModeMessage() + " --");
+            else
+                vimperator.commandline.echo("");
+        },
+
+        // helper function to set both modes in one go
+        set: function(main_mode, extended_mode, silent)
+        {
+            // if a main mode is set, the extended is always cleared
+            if (typeof main_mode === "number")
+            {
+                if (main_mode != main)
+                    handleModeChange(main, main_mode);
+
+                main = main_mode;
+                if (!extended_mode)
+                    extended = vimperator.modes.NONE;
+
+            }
+            if (typeof extended_mode === "number")
+                extended = extended_mode;
+
+            if (!silent)
+                this.show();
+        },
+
+        // add/remove always work on the extended mode only
+        add: function(mode)
+        {
+            extended |= mode;
+            this.show();
+        },
+        remove: function(mode)
+        {
+            extended = (extended | mode) ^ mode;
+            this.show();
+        },
+
+        get passNextKey() { return passNextKey; },
+        set passNextKey(value) { passNextKey = value; this.show(); },
+
+        get passAllKeys() { return passAllKeys; },
+        set passAllKeys(value) { passAllKeys = value; this.show(); },
+
+        get main()      { return main; },
+        set main(value) {
+            if (value != main)
+                handleModeChange(main, value);
+
+            main = value;
+            // setting the main mode always resets any extended mode
+            extended = vimperator.modes.NONE;
+            this.show();
+        },
+
+        get extended()      { return extended; },
+        set extended(value) {
+            extended = value; this.show();
+        }
+    }
+})();
+
+// vim: set fdm=marker sw=4 ts=4 et:
diff --git a/chrome/content/vimperator/options.js b/content/options.js
similarity index 100%
rename from chrome/content/vimperator/options.js
rename to content/options.js
diff --git a/chrome/content/vimperator/tabs.js b/content/tabs.js
similarity index 100%
rename from chrome/content/vimperator/tabs.js
rename to content/tabs.js
diff --git a/content/test.js b/content/test.js
new file mode 100755
index 00000000..a09ce39e
--- /dev/null
+++ b/content/test.js
@@ -0,0 +1,13 @@
+var TestCase = mozlab.mozunit.TestCase;
+var assert = mozlab.mozunit.assertions;
+
+var tc = new TestCase('testcase description here');
+
+tc.tests = {
+    'First test is successful': function() {
+        var vimperator = new Vimperator();
+        assert.isDefined(vimperator);
+        assert.isTrue(true);
+    }
+}
+tc.run()
diff --git a/chrome/content/vimperator/ui.js b/content/ui.js
similarity index 100%
rename from chrome/content/vimperator/ui.js
rename to content/ui.js
diff --git a/chrome/content/vimperator/vimperator.js b/content/vimperator.js
similarity index 100%
rename from chrome/content/vimperator/vimperator.js
rename to content/vimperator.js
diff --git a/chrome/content/vimperator/vimperator.xul b/content/vimperator.xul
similarity index 98%
rename from chrome/content/vimperator/vimperator.xul
rename to content/vimperator.xul
index 7c57f892..345d1602 100644
--- a/chrome/content/vimperator/vimperator.xul
+++ b/content/vimperator.xul
@@ -29,9 +29,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-
-<!-- The stylesheet which is used for the :help command -->
-<?xml-stylesheet href="chrome://vimperator/content/default.css" type="text/css"?>
+<?xml-stylesheet href="chrome://vimperator/skin/vimperator.css" type="text/css"?>
 
 <overlay id="vimperator"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/chrome/content/vimperator/default.css b/skin/vimperator.css
similarity index 56%
rename from chrome/content/vimperator/default.css
rename to skin/vimperator.css
index 8bdba34e..59f1c59d 100644
--- a/chrome/content/vimperator/default.css
+++ b/skin/vimperator.css
@@ -1,128 +1,3 @@
-/*
- * Help file {{{
- */
-
-div.main {
-    font-family: -moz-fixed;
-    white-space: -moz-pre-wrap;
-    width: 800px;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-h1 {
-    text-align: center;
-}
-
-p.tagline {
-    text-align: center;
-    font-weight: bold;
-}
-
-table.vimperator {
-    border-width: 1px;
-    border-style: dotted;
-    border-color: gray;
-    margin-bottom: 2em; /* FIXME: just a quick hack until we have proper pages */
-}
-table.vimperator td {
-    border: none;
-    padding: 3px;
-}
-tr.separator {
-    height: 10px;
-}
-hr {
-    height: 1px;
-    background-color: white;
-    border-style: none;
-    margin-top: 0;
-    margin-bottom: 0;
-}
-td.taglist {
-    text-align: right;
-    vertical-align: top;
-    border-spacing: 13px 10px;
-}
-td.taglist td {
-    width: 100px;
-    padding: 3px 0px;
-}
-tr.taglist code, td.usage code {
-    margin: 0px 2px;
-}
-td.usage code {
-    white-space: nowrap;
-}
-td.taglist code {
-    margin-left: 2em;
-}
-code.tag {
-    font-weight: bold;
-    color: rgb(255, 0, 255); /* magenta */
-}
-tr.description {
-    margin-bottom: 4px;
-}
-table.commands {
-    background-color: rgb(250, 240, 230);
-}
-table.mappings {
-    background-color: rgb(230, 240, 250);
-}
-table.options {
-    background-color: rgb(240, 250, 230);
-}
-
-fieldset.paypal {
-    border: none;
-}
-
-.argument {
-    color: #6A97D4;
-}
-
-.command {
-    font-weight: bold;
-    color: #632610;
-}
-
-.mapping {
-    font-weight: bold;
-    color: #102663;
-}
-
-.option {
-    font-weight: bold;
-    color: #106326;
-}
-
-.code {
-    color: #108826;
-}
-
-.shorthelp {
-    font-weight: bold;
-}
-
-.version {
-    position: absolute;
-    top: 10px;
-    right: 2%;
-    color: #C0C0C0;
-    text-align: right;
-}
-
-.warning {
-    font-weight: bold;
-    color: red;
-}
-
-/* }}}
- * XUL {{{
- * TODO: move to the standard location: chrome/skin/vimperator.css...if I can
- * ever convince MS :( -- djk
- */
 #vimperator-container  {
     font-family: monospace;
 }
@@ -214,4 +89,5 @@ fieldset.paypal {
 #vimperator-multiline-output {
     overflow: hidden;
 }
+
 /* vim: set fdm=marker sw=4 ts=4 et: */

From b570cadd737732c9b4f3f088ad52d1a0378fff25 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 1 Oct 2007 10:28:29 +0000
Subject: [PATCH 089/224] add icon for addons dialog

---
 install.rdf   |   1 +
 skin/icon.png | Bin 0 -> 524 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 skin/icon.png

diff --git a/install.rdf b/install.rdf
index e03149b2..55bd59dc 100644
--- a/install.rdf
+++ b/install.rdf
@@ -9,6 +9,7 @@
 	<em:description>Make Firefox behave like Vim</em:description>
 	<em:creator>Martin Stubenschrott</em:creator>
 	<em:homepageURL>http://vimperator.mozdev.org</em:homepageURL>
+	<em:iconURL>chrome://vimperator/skin/icon.png</em:iconURL>
 	<!--em:updateURL>http://downloads.mozdev.org/vimperator/update.rdf</em:updateURL-->
 	<em:file>
 	    <Description about="urn:mozilla:extension:file:vimperator.jar">
diff --git a/skin/icon.png b/skin/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..07a3331409ae67f60af99ec34331baba082ccea5
GIT binary patch
literal 524
zcmV+n0`vWeP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XT
z000XT0n*)m`~Uy}zDYzuR9J=Wm9c92P!z_0{?j2U36vHRbQ0X-AovIlK7zC8-b@`D
zw?eIT6?_a|LVO0-g0q<U>yXC&(-^TfVh2As5bizXe&;*)p06N@OX3D#Fc=76I-M4>
z65|}#br}wanR!3Prvd`h@AoB%eQ`|ADe*72N=}6&f*=r}a=EPWc$})xbzK2!x7)c^
zzf&OYX&8oVHk%a5^?D6}X_~nUuxmlBR!bcA9i>ufmy;`EDdIK&n$2cAsU61=pjNAu
zyZnhu`2W*dE|>XNnt{YC=yW<jvJKnq7R$0&EEf5_{VW2_W)pz<d=5aP(NGwM*tUI+
zvm;~;oFE9~d7c1OtJSmgUs9Stuh$cxdcCe<u_(hZ4jvv8J|^}}(VOpzR4Nq!R;v{N
zhG863Fupg(V4v3%F71XF_kt^dD}gJ4zeQj)LarOdXhdp4xh|Sa((AuMJd+<DB-4}}
zCkoS)-rl6-+?O67b<i75GNYH5=&RfP`gynexqD^;nRmeR;O-85Ka$+{k!8XCeXb42
zRzMQZ&(iH}v}c<6S1;+y4SgTIzLK)b$ppQ>gKfjpQ+ofmxZ3f>348!&PyMHJKs6`;
O0000<MNUMnLSTY1k?MW`

literal 0
HcmV?d00001


From abce70dadd200d1fa0e9280a7da184090676d337 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 1 Oct 2007 13:31:08 +0000
Subject: [PATCH 090/224] merge new 'laststatus' option

---
 NEWS               |  1 +
 content/options.js | 79 +++++++++++++++++++++++++++++++++++-----------
 vimperator.vim     |  6 ++--
 3 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/NEWS b/NEWS
index 1231c7ee..5ccaad3f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.2
+	* added new 'laststatus' option and removed "s" value from 'guioptions'
 	* statusline is now white on black with bold font by default (like in (g)vim)
 	  (change with userChrome.css if you don't like it until we have :colorscheme)
 	* :let mapleader=","  and <Leader> in :map support
diff --git a/content/options.js b/content/options.js
index 122e153d..577b46a4 100644
--- a/content/options.js
+++ b/content/options.js
@@ -199,9 +199,24 @@ function Options() //{{{
         // and bookmarks toolbar
         document.getElementById("PersonalToolbar").collapsed = value.indexOf("b") > -1 ? false : true;
         document.getElementById("PersonalToolbar").hidden = value.indexOf("b") > -1 ? false : true;
-        // and status bar (default on)
-        document.getElementById("status-bar").collapsed = value.indexOf("s") > -1 ? false : true;
-        document.getElementById("status-bar").hidden = value.indexOf("s") > -1 ? false : true;
+    }
+
+    function setStatusLine(value)
+    {
+        if (value == 0)
+        {
+            document.getElementById("status-bar").collapsed = true;
+            document.getElementById("status-bar").hidden = true;
+        }
+        else if (value == 1)
+        {
+            vimperator.echo("show status line only with > 1 window not implemented yet");
+        }
+        else
+        {
+            document.getElementById("status-bar").collapsed = false;
+            document.getElementById("status-bar").hidden = false;
+        }
     }
 
     function setShowTabline(value)
@@ -213,7 +228,9 @@ function Options() //{{{
             getBrowser().mStrip.hidden = true;
         }
         else if (value == 1)
-            vimperator.echo("show tabline only with > 1 page open not impl. yet");
+        {
+            vimperator.echo("show tabline only with > 1 page open not implemented yet");
+        }
         else
         {
             getBrowser().mStrip.collapsed = false;
@@ -359,11 +376,13 @@ function Options() //{{{
     addOption(new Option(["complete", "cpt"], "charlist",
         {
             short_help: "Items which are completed at the :[tab]open prompt",
-            help: "Available items:<br/><ul>" +
+            help: "Available items:<br/>" +
+                  "<ul>" +
                   "<li><b>s</b>: Search engines and keyword URLs</li>" +
                   "<li><b>f</b>: Local files</li>" +
                   "<li><b>b</b>: Bookmarks</li>" +
-                  "<li><b>h</b>: History</li></ul>" +
+                  "<li><b>h</b>: History</li>" +
+                  "</ul>" +
                   "The order is important, so <code class=\"command\">:set complete=bs</code> would list bookmarks first, and then any available quick searches.<br/>" +
                   "Add <code class=\"option\">'sort'</code> to the <code class=\"option\">'wildoptions'</code> option if you want all entries sorted.",
             default_value: "sfbh",
@@ -403,14 +422,15 @@ function Options() //{{{
     addOption(new Option(["guioptions", "go"], "charlist",
         {
             short_help: "Show or hide the menu, toolbar and scrollbars",
-            help: "Supported characters:<br/><ul>" +
+            help: "Supported characters:<br/>" +
+                  "<ul>" +
                   "<li><b>m</b>: menubar</li>" +
                   "<li><b>T</b>: toolbar</li>" +
                   "<li><b>b</b>: bookmark bar</li>" +
-                  "<li><b>s</b>: statusbar</li></ul>",
+                  "</ul>",
             setter: function(value) { Options.setPref("guioptions", value); setGuiOptions(value); },
-            default_value: "s",
-            validator: function (value) { if (/[^mTbs]/.test(value)) return false; else return true; }
+            default_value: "",
+            validator: function (value) { if (/[^mTb]/.test(value)) return false; else return true; }
         }
     ));
     addOption(new Option(["hintchars", "hc"], "charlist",
@@ -458,7 +478,23 @@ function Options() //{{{
             default_value: true
         }
     ));
-    addOption(new Option(["linksearch", "ls"], "boolean",
+    addOption(new Option(["laststatus", "ls"], "number",
+        {
+            short_help: "Show the status line",
+            help: "Determines when the last window will have a status line. " +
+                  "Possible values:<br/>" +
+                  "<ul>" +
+                  "<li><b>0</b>: never</li>" +
+                  "<li><b>1</b>: only if there are multiple windows</li>" +
+                  "<li><b>2</b>: always</li>" +
+                  "</ul>" +
+                  "NOTE: laststatus=1 not implemented yet.",
+            default_value: 2,
+            setter: function(value) { Options.setPref("laststatus", value); setStatusLine(value); },
+            validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
+        }
+    ));
+    addOption(new Option(["linksearch", "lks"], "boolean",
         {
             short_help: "Limit the search to hyperlink text",
             help: "This includes (X)HTML elements with an \"href\" atrribute and XLink \"simple\" links.",
@@ -483,11 +519,13 @@ function Options() //{{{
         {
             short_help: "Where to show requested popup windows",
             help: "Define where to show requested popup windows. Does not apply to windows which are opened by middle clicking a link, they always open in a new tab. " +
-                  "Possible values:<br/><ul>" +
+                  "Possible values:<br/>" +
+                  "<ul>" +
                   "<li><b>0</b>: Force to open in the current tab (NOTE: this can stop some web sites from working correctly!)</li>" +
                   "<li><b>1</b>: Always open in a new tab</li>" +
                   "<li><b>2</b>: Open in a new window if it has a specific requested size (default in Firefox)</li>"+
-                  "<li><b>3</b>: Always open in a new window</li></ul>" +
+                  "<li><b>3</b>: Always open in a new window</li>" +
+                  "</ul>" +
                   "NOTE: This option does not change the popup blocker of Firefox in any way.",
             default_value: 1,
             setter: function(value) { Options.setPref("popups", value); setPopups(value); },
@@ -532,10 +570,12 @@ function Options() //{{{
         {
             short_help: "Show the destination of the link under the cursor in the status bar",
             help: "Also links which are focused by keyboard commands like <code class=\"mapping\">&lt;Tab&gt;</code> are shown. " +
-                  "Possible values:<br/><ul>" +
+                  "Possible values:<br/>" +
+                  "<ul>" +
                   "<li><b>0</b>: Don't show link destination</li>" +
                   "<li><b>1</b>: Show the link in the status line</li>" +
-                  "<li><b>2</b>: Show the link in the command line</li></ul>",
+                  "<li><b>2</b>: Show the link in the command line</li>" +
+                  "</ul>",
             default_value: 1,
             validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
         }
@@ -543,11 +583,13 @@ function Options() //{{{
     addOption(new Option(["showtabline", "stal"], "number",
         {
             short_help: "Control when to show the tab bar of opened web pages",
-            help: "Possible values:<br/><ul>" +
+            help: "Possible values:<br/>" +
+                  "<ul>" +
                   "<li><b>0</b>: Never show tab bar</li>" +
                   "<li><b>1</b>: Show tab bar only if more than one tab is open</li>" +
-                  "<li><b>2</b>: Always show tab bar</li></ul>" +
-                  "NOTE: Not fully implemented yet and buggy with stal=0",
+                  "<li><b>2</b>: Always show tab bar</li>" +
+                  "</ul>" +
+                  "NOTE: showtabline=1 not implemented yet and buggy with showtabline=0",
             setter: function(value) { Options.setPref("showtabline", value); setShowTabline(value); },
             default_value: 2,
             validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
@@ -646,6 +688,7 @@ function Options() //{{{
 
     setShowTabline(this.showtabline);
     setGuiOptions(this.guioptions);
+    setStatusLine(this.laststatus);
     setTitleString(this.titlestring);
     setPopups(this.popups);
 } //}}}
diff --git a/vimperator.vim b/vimperator.vim
index 8a6a92c4..6e4a9dee 100644
--- a/vimperator.vim
+++ b/vimperator.vim
@@ -31,9 +31,9 @@ syn match vimperatorCommandWrapper "\<\h\w*\>" contains=vimperatorCommand
 syn region vimperatorSet matchgroup=vimperatorCommand start="\<set\=\>" end="$" keepend oneline contains=vimperatorOption
 syn keyword vimperatorOption activate act complete cpt defsearch ds extendedhinttags eht focusedhintstyle fhs fullscreen fs
 	\ nofullscreen nofs guioptions go hintchars hc hintstyle hs hinttags incsearch is noincsearch nois ignorecase ic
-	\ noignorecase noic maxhints mh preload nopreload previewheight pvh showmode smd noshowmode nosmd showstatuslinks ssli
-	\ showtabline stal smartcase scs nosmartcase noscs titlestring usermode um nousermode noum verbose vbs visualbell vb
-	\ wildmode wim wildoptions wop
+	\ noignorecase noic laststatus ls maxhints mh preload nopreload previewheight pvh showmode smd noshowmode nosmd
+	\ showstatuslinks ssli showtabline stal smartcase scs nosmartcase noscs titlestring usermode um nousermode noum verbose
+	\ vbs visualbell vb wildmode wim wildoptions wop
 	\ contained
 
 syn region vimperatorJavascript start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=" end="$" contains=@javascriptTop keepend oneline

From 887ea6e17d917efda25b0527d45a39b0308d7acd Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 1 Oct 2007 17:39:25 +0000
Subject: [PATCH 091/224] don't run the binary files through sed when replacing
 the VERSION token

---
 Makefile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 318854e0..085d6a0a 100644
--- a/Makefile
+++ b/Makefile
@@ -6,17 +6,22 @@ VERSION       = 0.5.2pre
 OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 
-JAR_FILES     = ${shell find content skin	\
+JAR_TXT_FILES = ${shell find content skin	\
 			-type f			\
 			-a ! -path '*CVS*'	\
 			-a \(			\
 				-path '*.js'	\
 			     -o -path '*.css'	\
 			     -o -path '*.xul'	\
-			     -o -path '*.png'	\
 			   \)			\
 		}
 JAR_DIRS      = $(foreach f,${JAR_FILES},$(dir $f))
+JAR_BIN_FILES = ${shell find content skin	\
+			-type f			\
+			-a ! -path '*CVS*'	\
+			-a -path '*.png'	\
+		}
+JAR_FILES     = ${JAR_BIN_FILES} ${JAR_TXT_FILES}
 JAR           = chrome/vimperator.jar
 
 XPI_TXT_FILES = install.rdf chrome.manifest TODO AUTHORS Donators NEWS
@@ -150,8 +155,11 @@ ${BUILD_JAR_SUBDIRS}:
 
 ${JAR}: ${BUILD_JAR_SUBDIRS} ${JAR_FILES}
 	@echo "Building JAR..."
-	${Q}mkdir -p $(dir ${JAR}) #FIXME
-	${Q}for f in ${JAR_FILES} ; do \
+	${Q}mkdir -p $(dir ${JAR})
+	${Q}for f in ${JAR_BIN_FILES} ; do \
+		cp $$f ${BUILD_JAR_DIR}/$$f ; \
+	    done
+	${Q}for f in ${JAR_TXT_FILES} ; do \
 		${SED} -e "s,###VERSION###,${VERSION},g" \
 		       -e "s,###DATE###,${BUILD_DATE},g" \
 		       < $$f > ${BUILD_JAR_DIR}/$$f ; \

From 235ad7f750af006c19f5526e36f65e38d17f92fd Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 1 Oct 2007 18:50:04 +0000
Subject: [PATCH 092/224] close help logo img element

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

diff --git a/content/help.js b/content/help.js
index 6da9766e..89b0e16e 100644
--- a/content/help.js
+++ b/content/help.js
@@ -137,7 +137,7 @@ vimperator.help = function(section, easter) //{{{
         return ret;
     }
 
-    var header = '<h1><img src="chrome://vimperator/content/logo_white.png" alt="Vimperator"></h1>' + 
+    var header = '<h1><img src="chrome://vimperator/content/logo_white.png" alt="Vimperator"/></h1>' + 
         '<p class="tagline">First there was a Navigator, then there was an Explorer.\n' +
         'Later it was time for a Konqueror. Now it\'s time for an Imperator, the VIMperator :)</p>';
 

From ff026eb2aa56d66dd3385c917db1a13ba29d9893 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 1 Oct 2007 19:04:40 +0000
Subject: [PATCH 093/224] merge completion refactoring

---
 content/completion.js | 75 +++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/content/completion.js b/content/completion.js
index 0c02f520..a827ac57 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -36,8 +36,6 @@ vimperator.completion = (function() // {{{
     function build_longest_common_substring(list, filter) //{{{
     {
         var filtered = [];
-        //var filter_length = filter.length;
-        //filter = filter.toLowerCase();
         var ignorecase = false;
         if (filter == filter.toLowerCase())
             ignorecase = true;
@@ -55,7 +53,6 @@ vimperator.completion = (function() // {{{
 
                 if (g_substrings.length == 0)
                 {
-                    //alert('if: ' + item);
                     var last_index = item.lastIndexOf(filter);
                     var length = item.length;
                     for (var k = item.indexOf(filter); k != -1 && k <= last_index; k = item.indexOf(filter, k + 1))
@@ -66,7 +63,6 @@ vimperator.completion = (function() // {{{
                 }
                 else
                 {
-                    //alert('else: ' + item);
                     g_substrings = g_substrings.filter(function($_) {
                         return list[i][0][j].indexOf($_) >= 0;
                     });
@@ -78,17 +74,17 @@ vimperator.completion = (function() // {{{
         return filtered;
     } //}}}
 
-    /* this function is case sensitive */
+    /* this function is case sensitive and should be documented about input and output ;) */
     function build_longest_starting_substring(list, filter) //{{{
     {
         var filtered = [];
-        //var filter_length = filter.length;
         for (var i = 0; i < list.length; i++)
         {
             for (var j = 0; j < list[i][0].length; j++)
             {
                 if (list[i][0][j].indexOf(filter) != 0)
                     continue;
+
                 if (g_substrings.length == 0)
                 {
                     var length = list[i][0][j].length;
@@ -120,7 +116,6 @@ vimperator.completion = (function() // {{{
             return [$_[0], $_[1]]
         });
 
-        //var filter_length = filter.length;
         var ignorecase = false;
         if (filter == filter.toLowerCase())
             ignorecase = true;
@@ -169,23 +164,21 @@ vimperator.completion = (function() // {{{
     } //}}}
 
     return {
-
         /*
          * returns the longest common substring
          * used for the 'longest' setting for wildmode
-         *
          */
         get_longest_substring: function() //{{{
         {
             if (g_substrings.length == 0)
                 return '';
+
             var longest = g_substrings[0];
             for (var i = 1; i < g_substrings.length; i++)
             {
                 if (g_substrings[i].length > longest.length)
                     longest = g_substrings[i];
             }
-            //alert(longest);
             return longest;
         }, //}}}
 
@@ -222,11 +215,11 @@ vimperator.completion = (function() // {{{
         {
             var engines = vimperator.bookmarks.getSearchEngines().concat(vimperator.bookmarks.getKeywords());
 
-            if (!filter) return engines.map(function($_) {
-                return [$_[0], $_[1]];
+            if (!filter) return engines.map(function(engine) {
+                return [engine[0], engine[1]];
             });
-            var mapped = engines.map(function($_) {
-                return [[$_[0]], $_[1]];
+            var mapped = engines.map(function(engine) {
+                return [[engine[0]], engine[1]];
             });
             return build_longest_common_substring(mapped, filter);
         }, //}}}
@@ -246,8 +239,6 @@ vimperator.completion = (function() // {{{
         // TODO: support file:// and \ or / path separators on both platforms
         get_file_completions: function(filter) //{{{
         {
-            //var completions = [];
-
             // this is now also used as part of the url completion, so the
             // substrings shouldn't be cleared for that case
             if (!arguments[1])
@@ -279,20 +270,21 @@ vimperator.completion = (function() // {{{
                 var entries = fd.read();
                 var separator = fd.path.length == 1 ? "" : /\\/.test(fd.path) ? "\\" : "/";
                 var new_filter = fd.path + separator + compl;
-                if (!filter) return entries.map(function($_) {
-                    var path = $_.path;
-                    if ($_.isDirectory()) path += separator;
+                if (!filter) return entries.map(function(file) {
+                    var path = file.path;
+                    if (file.isDirectory())
+                        path += separator;
                     return [path, ""];
                 });
-                var mapped = entries.map(function($_) {
-                    var path = $_.path;
-                    if ($_.isDirectory()) path += separator;
+                var mapped = entries.map(function(file) {
+                    var path = file.path;
+                    if (file.isDirectory())
+                        path += separator;
                     return [[path], ""];
                 });
             }
             catch (e)
             {
-                //vimperator.log(e);
                 return [];
             }
 
@@ -333,7 +325,6 @@ vimperator.completion = (function() // {{{
 
         get_command_completions: function(filter) //{{{
         {
-            //g_completions = [];
             g_substrings = [];
             var completions = []
             if (!filter)
@@ -401,10 +392,12 @@ vimperator.completion = (function() // {{{
             {
                 if (prefix && option.type != "boolean")
                     continue;
+
                 for (var j = 0; j < option.names.length; j++)
                 {
                     if (option.names[j].indexOf(filter) != 0)
                         continue;
+
                     if (g_substrings.length == 0)
                     {
                         var length = option.names[j].length;
@@ -463,6 +456,7 @@ vimperator.completion = (function() // {{{
 
         get_sidebar_completions: function(filter) //{{{
         {
+            g_substrings = [];
             var menu = document.getElementById("viewSidebarMenu")
             var nodes = [];
 
@@ -472,8 +466,8 @@ vimperator.completion = (function() // {{{
             if (!filter)
                 return nodes;
 
-            var mapped = nodes.map(function($_) {
-                return [[$_[0]], $_[1]];
+            var mapped = nodes.map(function(node) {
+                return [[node[0]], node[1]];
             });
             
             return build_longest_common_substring(mapped, filter);
@@ -482,7 +476,7 @@ vimperator.completion = (function() // {{{
         exTabCompletion: function(str) //{{{
         {
             var [count, cmd, special, args] = vimperator.commands.parseCommand(str);
-            var completions = new Array;
+            var completions = [];
             var start = 0;
 
             // if there is no space between the command name and the cursor
@@ -498,14 +492,27 @@ vimperator.completion = (function() // {{{
                 var command = vimperator.commands.get(cmd);
                 if (command && command.completer)
                 {
+                    matches = str.match(/^:*\d*\w+\s+/);
+                    start = matches ? matches[0].length : 0;
+
+                    // TODO: maybe we should move these checks to the complete functions
+                    if (command.hasName("open") || command.hasName("tabopen") || command.hasName("winopen"))
+                    {
+                        var skip = args.match(/^(.*,\s+)(.*)/); // start after the last ", "
+                        if (skip)
+                        {
+                            start += skip[1].length;
+                            args = skip[2];
+                        }
+                    }
+                    else if (command.hasName("echo") || command.hasName("echoerr") || command.hasName("javascript"))
+                    {
+                        var skip = args.match(/^(.*?)(\w*)$/); // start at beginning of the last word
+                        if (skip)
+                            start += skip[1].length;
+                    }
+
                     completions = command.completer.call(this, args);
-        //          if (command[0][0] == "open" ||
-        //                  command[0][0] == "tabopen" ||
-        //                  command[0][0] == "winopen")
-        //              start = str.search(/^:*\d*\w+(\s+|.*\|)/); // up to the last | or the first space
-        //          else
-                    matches = str.match(/^:*\d*\w+\s+/); // up to the first spaces only
-                    start = matches[0].length;
                 }
             }
             return [start, completions];

From 171a036d59a3573d5f3d7cb29614c8ad6a7ac0ce Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 1 Oct 2007 19:10:50 +0000
Subject: [PATCH 094/224] merge improved :echo, :echoerr and :javascript
 commands

---
 content/commands.js   | 62 +++++++++++++++++++++++++++++----
 content/completion.js | 67 +++++++++++++++++++++++++++++++++++
 content/vimperator.js | 81 +++++++++++++++++++++++++++++++++++--------
 3 files changed, 188 insertions(+), 22 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index f3f0fdd7..25df755d 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -483,18 +483,62 @@ function Commands() //{{{
                   "Here, downloads can be paused, canceled and resumed."
         }
     ));
-    addDefaultCommand(new Command(["ec[ho]"],
-        function(args) { vimperator.echo(args); } ,
+
+    function argToString(arg, color)
+    {
+        if (!arg)
+            return "";
+
+        try
         {
+            // TODO: move to vimperator.eval()?
+            arg = eval(arg);
+        }
+        catch (e)
+        {
+            vimperator.echoerr(e.toString());
+            return null;
+        }
+
+        if (typeof arg === "object")
+            arg = vimperator.objectToString(arg, color);
+        else if (typeof arg === "function")
+            arg = arg.toString().replace(/</g, "&lt;").replace(/>/, "&gt;");
+        else if (typeof arg === "number" || typeof arg === "boolean")
+            arg = "" + arg;
+        else if (typeof arg === "undefined")
+            arg = "undefined";
+
+        return arg;
+    }
+    addDefaultCommand(new Command(["ec[ho]"],
+        function(args)
+        {
+            var res = argToString(args, true);
+            if (res != null)
+                vimperator.echo(res);
+        },
+        {
+            usage: ["ec[ho] {expr}"],
             short_help: "Display a string at the bottom of the window",
-            help: "Echo all arguments of this command. Useful for showing informational messages.<br/>Multiple lines can be separated by \\n."
+            help: "Useful for showing informational messages. Multiple lines can be separated by \\n.<br/>" +
+                  "<code class=\"argument\">{expr}</code> can either be a quoted string, or any expression which can be fed to eval() like 4+5. " +
+                  "You can also view the source code of objects and functions if the return value of <code class=\"argument\">{expr}</code> is an object or function.",
+            completer: function(filter) { return vimperator.completion.javascript(filter); }
         }
     ));
     addDefaultCommand(new Command(["echoe[rr]"],
-        function(args) { vimperator.echoerr(args); } ,
+        function(args)
         {
+            var res = argToString(args, false);
+            if (res != null)
+                vimperator.echoerr(res);
+        },
+        {
+            usage: ["echoe[rr] {expr}"],
             short_help: "Display an error string at the bottom of the window",
-            help: "Echo all arguments of this command highlighted in red. Useful for showing important messages."
+            help: "Just like <code class=\"command\">:ec[ho]</code>, but echoes the result highlighted in red. Useful for showing important messages.",
+            completer: function(filter) { return vimperator.completion.javascript(filter); }
         }
     ));
     addDefaultCommand(new Command(["exe[cute]"],
@@ -601,7 +645,11 @@ function Commands() //{{{
             help: "Acts as a JavaScript interpreter by passing the argument to <code>eval()</code>.<br/>" +
                   "<code class=\"command\">:javascript alert('Hello world')</code> would show a dialog box with the text \"Hello world\".<br/>" +
                   "<code class=\"command\">:javascript &lt;&lt;EOF</code> would read all the lines until a line starting with 'EOF' is found, and will <code>eval()</code> them.<br/>" +
-                  "The special version <code class=\"command\">:javascript!</code> will open the JavaScript console of Firefox."
+                  "The special version <code class=\"command\">:javascript!</code> will open the JavaScript console of Firefox.<br/>" +
+                  "Rudimentary <code class=\"mapping\">&lt;Tab&gt;</code> completion is available for <code class=\"command\">:javascript {cmd}&lt;Tab&gt;</code> (but not yet for the " +
+                  "<code class=\"command\">:js &lt;&lt;EOF</code> multiline widget). Be aware that Vimperator needs to run {cmd} through eval() " +
+                  "to get the completions, which could have unwanted side effects.",
+            completer: function(filter) { return vimperator.completion.javascript(filter); }
         }
     ));
     addDefaultCommand(new Command(["let"],
@@ -915,7 +963,7 @@ function Commands() //{{{
                   "</ol>" +
                   "You WILL be able to use <code class=\"command\">:open [-T \"linux\"] torvalds&lt;Tab&gt;</code> to complete bookmarks " +
                   "with tag \"linux\" and which contain \"torvalds\". Note that -T support is only available for tab completion, not for the actual command.<br/>" +
-                  "The items which are completed on <code>&lt;Tab&gt;</code> are specified in the <code class=\"option\">'complete'</code> option.<br/>" +
+                  "The items which are completed on <code class=\"mapping\">&lt;Tab&gt;</code> are specified in the <code class=\"option\">'complete'</code> option.<br/>" +
                   "Without argument, reloads the current page.<br/>" +
                   "Without argument but with <code class=\"command\">!</code>, reloads the current page skipping the cache.",
             completer: function(filter) { return vimperator.completion.get_url_completions(filter); }
diff --git a/content/completion.js b/content/completion.js
index a827ac57..0e0f9972 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -473,6 +473,73 @@ vimperator.completion = (function() // {{{
             return build_longest_common_substring(mapped, filter);
         }, //}}}
 
+        javascript: function(str)
+        {
+            g_substrings = [];
+            var matches = str.match(/^(.*?)(\s*\.\s*)?(\w*)$/);
+            var object = "window";
+            var filter = matches[3] || "";
+            var start = matches[1].length-1;
+            if (matches[2])
+            {
+                var brackets = 0, parentheses = 0;
+                outer:
+                for (; start >= 0; start--)
+                {
+                    switch (matches[1][start])
+                    {
+                        case ";":
+                        case "{":
+                            break outer;
+
+                        case "]":
+                            brackets--;
+                            break;
+                        case "[":
+                            brackets++;
+                            break;
+                        case ")":
+                            parentheses--;
+                            break;
+                        case "(":
+                            parentheses++;
+                            break;
+                    }
+                    if (brackets > 0 || parentheses > 0)
+                        break outer;
+                }
+            }
+            object = matches[1].substr(start+1) || "window";
+
+            var completions = []; 
+            try
+            {
+                completions = eval(
+                    "var comp = [];" +
+                    "var type = '';" +
+                    "var value = '';" +
+                    "var obj = eval(" + object + ");" +
+                    "for (var i in obj) {" +
+                    "     try { type = typeof(obj[i]); } catch (e) { type = 'unknown type'; };" +
+                    "     if (type == 'number' || type == 'string' || type == 'boolean') {" +
+                    "          value = obj[i];" +
+                    "          comp.push([[i], type + ': ' + value]); }" +
+                    // The problem with that is that you complete vimperator.
+                    // but can't press <Tab> to complete sub items
+                    // so it's better to complete vimperator and the user can do
+                    // .<tab> to get the sub items
+                    //"     else if (type == 'function') {" +
+                    //"          comp.push([[i+'('], type]); }" +
+                    //"     else if (type == 'object') {" +
+                    //"          comp.push([[i+'.'], type]); }" +
+                    "     else {" +
+                    "          comp.push([[i], type]); }" +
+                    "} comp;");
+            } catch (e) { completions = []; };
+
+            return build_longest_starting_substring(completions, filter);
+        },
+
         exTabCompletion: function(str) //{{{
         {
             var [count, cmd, special, args] = vimperator.commands.parseCommand(str);
diff --git a/content/vimperator.js b/content/vimperator.js
index 6d192f4d..c2ca5035 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -434,36 +434,87 @@ const vimperator = (function() //{{{
             }
         },
 
-        // logs a message to the javascript error console
-        log: function(msg, level)
+        // if color = true it uses HTML markup to color certain items
+        objectToString: function(object, color)
         {
-            // if (Options.getPref("verbose") >= level) // FIXME: hangs vimperator, probably timing issue --mst
-                console_service.logStringMessage('vimperator: ' + msg);
-        },
-
-        // logs an object to the javascript error console also prints all
-        // properties of the object
-        logObject: function(object, level)
-        {
-            if (typeof object != 'object')
+            if (object === null)
+                return "null";
+            if (typeof object != "object")
                 return false;
 
-            var string = object + '::\n';
+            var string = "";
+            var obj = "";
+            try { // for window.JSON
+                obj = object.toString();
+            } catch (e) {
+                obj = "&lt;Object&gt;";
+            }
+
+            if (color)
+                string += "<span style=\"color: magenta; font-weight: bold;\">" + obj + "</span>::\n";
+            else
+                string += obj + "::\n";
+
             for (var i in object)
             {
                 var value;
                 try
                 {
-                    var value = object[i];
+                    if (i == "JSON") // without this ugly hack, ":echo window" does not work
+                        value = "[object JSON]";
+                    else
+                        value = object[i];
                 }
                 catch (e)
                 {
                     value = "";
                 }
 
-                string += i + ": " + value + "\n";
+                if (color)
+                {
+                    // syntax highlighting for special items
+                    if (typeof value === "number")
+                        value = "<span style=\"color: red;\">" + value + "</span>";
+                    else if (typeof value === "string")
+                    {
+                        value = value.replace(/\n/, "\\n").replace(/</, "&lt;");
+                        value = "<span style=\"color: green;\">\"" + value + "\"</span>";
+                    }
+                    else if (typeof value === "boolean")
+                        value = "<span style=\"color: blue;\">" + value + "</span>";
+                    else if (value == null || value == "undefined")
+                        value = "<span style=\"color: blue;\">" + value + "</span>";
+                    else if (typeof value === "object" || typeof value === "function")
+                    {
+                        // for java packages value.toString() would crash so badly 
+                        // that we cannot even try/catch it
+                        if (/^\[JavaPackage.*\]$/.test(value)) 
+                            value = "[JavaPackage]";
+                        else
+                        {
+                            var str = value.toString();
+                            if (typeof str == "string")  // can be "undefined"
+                                value = str.replace(/</g, "&lt;").replace(/>/g, "&gt;");
+                        }
+                    }
+                    
+                    string += "<span style=\"font-weight: bold;\">" + i + "</span>: " + value + "\n";
+                }
+                else
+                    string += i + ": " + value + "\n";
             }
-            vimperator.log(string, level);
+            return string;
+        },
+
+        // logs a message to the javascript error console
+        // if msg is an object, it is beautified
+        log: function(msg, level)
+        {
+            //if (Options.getPref("verbose") >= level) // FIXME: hangs vimperator, probably timing issue --mst
+            if (typeof msg == "object")
+                msg = this.objectToString(msg, false);
+
+            console_service.logStringMessage('vimperator: ' + msg);
         },
 
         // open one or more URLs

From 8121de585ceb2da3624f18f37d0aaf3e2989f182 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 1 Oct 2007 19:13:41 +0000
Subject: [PATCH 095/224] update NEWS

---
 NEWS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NEWS b/NEWS
index 5ccaad3f..3ab8a802 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@
 2007-XX-XX:
 	* version 0.5.2
 	* added new 'laststatus' option and removed "s" value from 'guioptions'
+	* Tab-completion improvements for :javascript and :open
+	* IMPORTANT: changed semantics of :echo and :echoerr: Strings must be quoted with " or ' now,
+	  but you can do things like :echo 3+2 or :echo window.document now
 	* statusline is now white on black with bold font by default (like in (g)vim)
 	  (change with userChrome.css if you don't like it until we have :colorscheme)
 	* :let mapleader=","  and <Leader> in :map support

From 493c2c3576d7d44bce5a5265618a2bed457e02f7 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 4 Oct 2007 10:54:21 +0000
Subject: [PATCH 096/224] don't call focusContent() on page load since it
 causes window map events to be fired

---
 content/events.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/content/events.js b/content/events.js
index 17a6035b..4d3f2a0a 100644
--- a/content/events.js
+++ b/content/events.js
@@ -221,8 +221,9 @@ function Events() //{{{
             // code which is only relevant if the page load is the current tab goes here:
             if (doc == getBrowser().selectedBrowser.contentDocument)
             {
+                // FIXME: this currently causes window map events which is _very_ annoying
                 // we want to stay in command mode after a page has loaded
-                setTimeout(vimperator.focusContent, 10);
+                //setTimeout(vimperator.focusContent, 10);
             }
         }
     }

From 07e0ce01e235e44baad94e4774be667b12328861 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 4 Oct 2007 11:45:34 +0000
Subject: [PATCH 097/224] update RC file highlighting

---
 vimperator.vim | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/vimperator.vim b/vimperator.vim
index 6e4a9dee..649b7c7d 100644
--- a/vimperator.vim
+++ b/vimperator.vim
@@ -16,13 +16,13 @@ unlet b:current_syntax
 syn keyword vimperatorTodo    FIXME NOTE TODO XXX contained
 syn match   vimperatorComment +".*$+ contains=vimperatorTodo,@Spell
 
-syn keyword vimperatorCommand addo[ns] ba[ck] bd[elete] bw[ipeout] bun[load] tabc[lose] beep bma[dd] bmd[el] bookm[arks] bm
-	\ b[uffer] buffers files ls delm[arks] downl[oads] dl ec[ho] echoe[rr] exe[cute] exu[sage] fo[rward] fw ha[rdcopy] h[elp]
-	\ hist[ory] hs javas[cript] js mapc[lear] ma[rk] map marks noh[lsearch] no[remap] o[pen] e[dit] pc[lose] pref[erences]
-	\ prefs q[uit] quita[ll] qa[ll] re[load] reloada[ll] res[tart] sav[eas] se[t] so[urce] st[op] tab tabl[ast] tabm[ove]
-	\ tabn[ext] tn[ext] tabo[nly] tabopen t[open] tabnew tabe[dit] tabp[revious] tp[revious] tabN[ext] tN[ext] tabr[ewind]
-	\ tabfir[st] u[ndo] qmarka[dd] qma[dd] qmarkd[el] qmd[el] qmarks qms unm[ap] ve[rsion] viu[sage] win[open] w[open]
-	\ wine[dit] wqa[ll] wq xa[ll] zo[om]
+syn keyword vimperatorCommand addo[ns] b[uffer] ba[ck] bd[elete] beep bma[rk] bmarks buffers bun[load] bw[ipeout] delbm[arks]
+	\ delm[arks] delqm[arks] dl downl[oads] e[dit] ec[ho] echoe[rr] exe[cute] exu[sage] files fo[rward] fw h[elp] ha[rdcopy]
+	\ hist[ory] hs javas[cript] js ls ma[rk] map mapc[lear] marks no[remap] noh[lsearch] norm[al] o[pen] pc[lose]
+	\ let pref[erences] prefs q[uit] qa[ll] qma[rk] qmarks quita[ll] re[load] reloada[ll] res[tart] sav[eas] sideb[ar] sb[ar]
+	\ sbcl[ose] sb[open] se[t] so[urce] st[op] time tN[ext] t[open] tab tabN[ext] tabc[lose] tabe[dit] tabfir[st] tabl[ast]
+	\ tabm[ove] tabn[ext] tabnew tabo[nly] tabopen tabp[revious] tabr[ewind] tabs tn[ext] tp[revious] u[ndo] unl[et] unm[ap]
+	\ ve[rsion] viu[sage] w[rite] win[open] wine[dit] wo[pen] wq wqa[ll] xa[ll] zo[om] run
 	\ contained
 
 " FIXME
@@ -30,10 +30,11 @@ syn match vimperatorCommandWrapper "\<\h\w*\>" contains=vimperatorCommand
 
 syn region vimperatorSet matchgroup=vimperatorCommand start="\<set\=\>" end="$" keepend oneline contains=vimperatorOption
 syn keyword vimperatorOption activate act complete cpt defsearch ds extendedhinttags eht focusedhintstyle fhs fullscreen fs
-	\ nofullscreen nofs guioptions go hintchars hc hintstyle hs hinttags incsearch is noincsearch nois ignorecase ic
-	\ noignorecase noic laststatus ls maxhints mh preload nopreload previewheight pvh showmode smd noshowmode nosmd
-	\ showstatuslinks ssli showtabline stal smartcase scs nosmartcase noscs titlestring usermode um nousermode noum verbose
-	\ vbs visualbell vb wildmode wim wildoptions wop
+	\ nofullscreen nofs guioptions go hintchars hc hintstyle hs hinttags ht hlsearch nohlsearch hls nohls hlsearchstyle hlss
+	\ incsearch is noincsearch nois ignorecase ic noignorecase noic laststatus ls linksearch nolinksearch lks nolks maxhints
+	\ mh more nomore preload nopreload popups pps previewheight pvh scroll scr showmode smd noshowmode nosmd showstatuslinks
+	\ ssli showtabline stal smartcase scs nosmartcase noscs titlestring usermode um nousermode noum verbose vbs visualbell vb
+	\ novisualbell novb visualbellstyle visualbellstyle t_vb wildmode wim wildoptions wop
 	\ contained
 
 syn region vimperatorJavascript start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=" end="$" contains=@javascriptTop keepend oneline

From a596fa94f6215c06c7c6013a61f6e579772ec240 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 4 Oct 2007 13:29:40 +0000
Subject: [PATCH 098/224] add fold markers

---
 content/completion.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/completion.js b/content/completion.js
index 0e0f9972..971c0ee6 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -473,7 +473,7 @@ vimperator.completion = (function() // {{{
             return build_longest_common_substring(mapped, filter);
         }, //}}}
 
-        javascript: function(str)
+        javascript: function(str) // {{{
         {
             g_substrings = [];
             var matches = str.match(/^(.*?)(\s*\.\s*)?(\w*)$/);
@@ -538,7 +538,7 @@ vimperator.completion = (function() // {{{
             } catch (e) { completions = []; };
 
             return build_longest_starting_substring(completions, filter);
-        },
+        }, // }}}
 
         exTabCompletion: function(str) //{{{
         {

From 50ae2312b6012a6dfbed7460205b019feebbddec Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 4 Oct 2007 13:59:01 +0000
Subject: [PATCH 099/224] move the completion widget beneath the MOW

---
 content/vimperator.xul | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/vimperator.xul b/content/vimperator.xul
index 345d1602..c28e2a81 100644
--- a/content/vimperator.xul
+++ b/content/vimperator.xul
@@ -97,6 +97,9 @@ the terms of any one of the MPL, the GPL or the LGPL.
                 </listcols>
             </listbox>
 
+            <iframe id="vimperator-multiline-output" src="about:blank" flex="1" height="10px" hidden="false" collapsed="true"
+                onclick="vimperator.commandline.onMultilineOutputEvent(event)"/>
+
             <listbox id="vimperator-completion" class="plain" rows="1" flex="1" hidden="true">
                 <listcols>
                     <listcol flex="1" width="50%"/>
@@ -104,9 +107,6 @@ the terms of any one of the MPL, the GPL or the LGPL.
                 </listcols>
             </listbox>
 
-            <iframe id="vimperator-multiline-output" src="about:blank" flex="1" height="10px" hidden="false" collapsed="true"
-                onclick="vimperator.commandline.onMultilineOutputEvent(event)"/>
-
             <hbox id="vimperator-commandline" hidden="false">
                 <label class="plain" id="vimperator-commandline-prompt"  flex="0" crop="end" value="" collapsed="true"/>
                 <textbox class="plain" id="vimperator-commandline-command" flex="1" hidden="false" type="timed" timeout="100"

From e093b814378c58a92c1484ced898f94ba9b33996 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 4 Oct 2007 19:13:34 +0000
Subject: [PATCH 100/224] allow the Console to be opened by :sidebar

---
 content/vimperator.xul | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/content/vimperator.xul b/content/vimperator.xul
index c28e2a81..456e7de8 100644
--- a/content/vimperator.xul
+++ b/content/vimperator.xul
@@ -126,8 +126,9 @@ the terms of any one of the MPL, the GPL or the LGPL.
 
     <menupopup id="viewSidebarMenu">
         <menuitem observes="vimperator-viewAddonsSidebar" label="Add-ons" accesskey="A"/>
-        <menuitem observes="vimperator-viewPreferencesSidebar" label="Preferences" accesskey="P"/>
+        <menuitem observes="vimperator-viewConsoleSidebar" label="Console" accesskey="C"/>
         <menuitem observes="vimperator-viewDownloadsSidebar" label="Downloads" accesskey="D"/>
+        <menuitem observes="vimperator-viewPreferencesSidebar" label="Preferences" accesskey="P"/>
     </menupopup>
 
     <broadcasterset id="mainBroadcasterSet">
@@ -138,13 +139,13 @@ the terms of any one of the MPL, the GPL or the LGPL.
             sidebarurl="chrome://mozapps/content/extensions/extensions.xul"
             sidebartitle="Add-ons"
             oncommand="toggleSidebar('vimperator-viewAddonsSidebar');"/>
-        <broadcaster id="vimperator-viewPreferencesSidebar"
+        <broadcaster id="vimperator-viewConsoleSidebar"
             autoCheck="false"
             type="checkbox"
             group="sidebar"
-            sidebarurl="about:config"
-            sidebartitle="Preferences"
-            oncommand="toggleSidebar('vimperator-viewPreferencesSidebar');"/>
+            sidebarurl="chrome://global/content/console.xul"
+            sidebartitle="Console"
+            oncommand="toggleSidebar('vimperator-viewConsoleSidebar');"/>
         <broadcaster id="vimperator-viewDownloadsSidebar"
             autoCheck="false"
             type="checkbox"
@@ -152,6 +153,13 @@ the terms of any one of the MPL, the GPL or the LGPL.
             sidebarurl="chrome://mozapps/content/downloads/downloads.xul"
             sidebartitle="Downloads"
             oncommand="toggleSidebar('vimperator-viewDownloadsSidebar');"/>
+        <broadcaster id="vimperator-viewPreferencesSidebar"
+            autoCheck="false"
+            type="checkbox"
+            group="sidebar"
+            sidebarurl="about:config"
+            sidebartitle="Preferences"
+            oncommand="toggleSidebar('vimperator-viewPreferencesSidebar');"/>
     </broadcasterset>
 
 </overlay>

From 2028ebba19763bb8d5bd2c9819afa4a32890898e Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 6 Oct 2007 13:16:01 +0000
Subject: [PATCH 101/224] merge MOW improvements

---
 content/bookmarks.js   |  48 ++++++---
 content/buffers.js     |  16 +--
 content/commands.js    |  28 +++---
 content/find.js        |   4 +-
 content/mappings.js    |   7 +-
 content/options.js     |  10 +-
 content/ui.js          | 220 +++++++++++++++++++++--------------------
 content/util.js        |  38 +++++++
 content/vimperator.js  |   8 +-
 content/vimperator.xul |   1 +
 skin/vimperator.css    |  89 ++++++++++++++---
 11 files changed, 305 insertions(+), 164 deletions(-)
 create mode 100644 content/util.js

diff --git a/content/bookmarks.js b/content/bookmarks.js
index b265caa2..8ce25daa 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -271,17 +271,26 @@ function Bookmarks() //{{{
 
             for (var i = 0; i < items.length; i++)
             {
-                var list = "<table><tr align=\"left\" style=\"color: magenta\"><th>title</th><th>URL</th></tr>";
+                var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                           "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>keyword</th><th>URL</th><th align=\"right\">tags</th></tr>";
                 for (var i = 0; i < items.length; i++)
                 {
-                    list += "<tr><td>" + items[i][1] + "</td><td style=\"color: green\">" + items[i][0] + "</td></tr>";
+                    var title = vimperator.util.escapeHTML(items[i][1]);
+                    if (title.length > 50)
+                        title = title.substr(0, 47) + "...";
+                    var keyword = "".substr(0,12); // maximum 12 chars
+                    var url = vimperator.util.escapeHTML(items[i][0]);
+                    var tags = "tag1, tag2";
+                    list += "<tr><td>" + title + "</td><td style=\"color: blue\" align=\"center\">" + keyword +
+                            "</td><td style=\"color: green; width: 100%\">" + url +
+                            "</td><td style=\"color: red;\" align=\"right\">" + tags + "</td></tr>";
                     // TODO: change that list to something like this when we have keywords
                     //list += "<tr><td width=\"30%\"><span style=\"font-weight: bold\">" + items[i][1].substr(0,20) + "</span></td><td width=\"70%\"><span style=\"color: green\">" + items[i][0] + "</span><br/>" + "Keyword: <span style=\"color: blue\">foo</span> Tags: <span style=\"color: red\">computer, news</span>" + "</td></tr>";
 
                 }
                 list += "</table>";
 
-                vimperator.commandline.echo(list, true);
+                vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
             }
         }
     }
@@ -441,6 +450,7 @@ function History() //{{{
     };
 
     // TODO: better names?
+    //       and move to vimperator.buffer.?
     this.stepTo = function(steps)
     {
         var index = getWebNavigation().sessionHistory.index + steps;
@@ -504,14 +514,19 @@ function History() //{{{
 
             for (var i = 0; i < items.length; i++)
             {
-                var list = "<table><tr align=\"left\" style=\"color: magenta\"><th>title</th><th>URL</th></tr>";
+                var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                           "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>URL</th></tr>";
                 for (var i = 0; i < items.length; i++)
                 {
-                    list += "<tr><td>" + items[i][1] + "</td><td>" + items[i][0] + "</td></tr>";
+                    var title = vimperator.util.escapeHTML(items[i][1]);
+                    if (title.length > 50)
+                        title = title.substr(0, 47) + "...";
+                    var url = vimperator.util.escapeHTML(items[i][0]);
+                    list += "<tr><td>" + title + "</td><td style=\"color: green;\">" + url + "</td></tr>";
                 }
                 list += "</table>";
 
-                vimperator.commandline.echo(list, true);
+                vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
             }
         }
     }
@@ -755,19 +770,20 @@ function Marks() //{{{
             }
         }
 
-        var list = "<table><tr align=\"left\" style=\"color: magenta\"><th>mark</th><th>line</th><th>col</th><th>file</th></tr>";
+        var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                   "<table><tr align=\"left\" class=\"hl-Title\"><th>mark</th><th>line</th><th>col</th><th>file</th></tr>";
         for (var i = 0; i < marks.length; i++)
         {
             list += "<tr>"
-                  + "<td>&nbsp;"           + marks[i][0]                              +  "</td>"
-                  + "<td align=\"right\">" + Math.round(marks[i][1].position.y * 100) + "%</td>"
-                  + "<td align=\"right\">" + Math.round(marks[i][1].position.x * 100) + "%</td>"
-                  + "<td>"                 + marks[i][1].location                     +  "</td>"
+                  + "<td> "                        + marks[i][0]                              +  "</td>"
+                  + "<td align=\"right\">"         + Math.round(marks[i][1].position.y * 100) + "%</td>"
+                  + "<td align=\"right\">"         + Math.round(marks[i][1].position.x * 100) + "%</td>"
+                  + "<td style=\"color: green;\">" + vimperator.util.escapeHTML(marks[i][1].location) +  "</td>"
                   + "</tr>";
         }
         list += "</table>";
 
-        vimperator.commandline.echo(list, true); // TODO: force of multiline widget a better way
+        vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true); // TODO: force of multiline widget a better way
     }
     //}}}
 } //}}}
@@ -850,14 +866,16 @@ function QuickMarks() //{{{
             }
         }
 
-        var list = "<table><tr align=\"left\" style=\"color: magenta\"><th>QuickMark</th><th>URL</th></tr>";
+        var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                   "<table><tr align=\"left\" class=\"hl-Title\"><th>QuickMark</th><th>URL</th></tr>";
         for (var i = 0; i < marks.length; i++)
         {
-            list += "<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;" + marks[i][0] + "</td><td>" + marks[i][1] + "</td></tr>";
+            list += "<tr><td>    " + marks[i][0] +
+                    "</td><td style=\"color: green;\">" + vimperator.util.escapeHTML(marks[i][1]) + "</td></tr>";
         }
         list += "</table>";
 
-        vimperator.commandline.echo(list, true); // TODO: force of multiline widget a better way
+        vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true); // TODO: force of multiline widget a better way
     }
 
     this.destroy = function()
diff --git a/content/buffers.js b/content/buffers.js
index bdb68bc9..07facc69 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -185,24 +185,28 @@ function Buffer() //{{{
             var items = vimperator.completion.get_buffer_completions("");
             var number, indicator, title, url;
 
-            var list = "<table>"
+            var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" + "<table>";
             for (var i = 0; i < items.length; i++)
             {
                 if (i == vimperator.tabs.index())
-                   indicator = "&nbsp;<span style=\"color: blue\">%</span>&nbsp;";
+                   indicator = " <span style=\"color: blue\">%</span> ";
                 else if (i == vimperator.tabs.index(vimperator.tabs.alternate))
-                   indicator = "&nbsp;<span style=\"color: blue\">#</span>&nbsp;";
+                   indicator = " <span style=\"color: blue\">#</span> ";
                 else
-                   indicator = "&nbsp;&nbsp;&nbsp;";
+                   indicator = "   ";
 
                 [number, title] = items[i][0].split(/:\s+/, 2);
                 url = items[i][1];
+                url = vimperator.util.escapeHTML(url);
+                title = vimperator.util.escapeHTML(title);
 
-                list += "<tr><td align=\"right\">&nbsp;&nbsp;" + number + "</td><td>" + indicator + "</td><td>" + title + "</td><td><span style=\"color: green\">" + url + "</span></td></tr>";
+                list += "<tr><td align=\"right\">  " + number + "</td><td>" + indicator +
+                        "</td><td style=\"width: 250px; max-width: 500px; overflow: hidden;\">" + title +
+                        "</td><td><span style=\"color: green\">" + url + "</span></td></tr>";
             }
             list += "</table>";
 
-            vimperator.commandline.echo(list, true);
+            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
         }
     }
 
diff --git a/content/commands.js b/content/commands.js
index 25df755d..bac54358 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -503,7 +503,7 @@ function Commands() //{{{
         if (typeof arg === "object")
             arg = vimperator.objectToString(arg, color);
         else if (typeof arg === "function")
-            arg = arg.toString().replace(/</g, "&lt;").replace(/>/, "&gt;");
+            arg = vimperator.util.escapeHTML(arg.toString());
         else if (typeof arg === "number" || typeof arg === "boolean")
             arg = "" + arg;
         else if (typeof arg === "undefined")
@@ -1423,25 +1423,31 @@ function Commands() //{{{
                     var after_time = Date.now();
                 
                     if ((after_time - before_time) / count >= 100)
-                        var each = "&nbsp;&nbsp;Each time:&nbsp;&nbsp;<span style=\"color: green\">" +
+                        var each = "<td>  Each time:</td><td align=\"right\"><span style=\"color: green\">" +
                             ((after_time - before_time) / 1000.0 / count) +
-                            "</span> sec<br/>";
+                            "</span></td><td>sec</td>";
                     else
-                        var each = "&nbsp;&nbsp;Each time:&nbsp;&nbsp;<span style=\"color: green\">" +
+                        var each = "<td>  Each time:</td><td align=\"right\"><span style=\"color: green\">" +
                             ((after_time - before_time) / count) +
-                            "</span> msec<br/>";
+                            "</span></td><td>msec</td>";
 
                     if (after_time - before_time >= 100)
-                        var total = "&nbsp;&nbsp;Total time: <span style=\"color: red\">" +
+                        var total = "<td>  Total time:</td><td align=\"right\"><span style=\"color: red\">" +
                             ((after_time - before_time) / 1000.0) +
-                            "</span> sec";
+                            "</span></td><td>sec</td>";
                     else
-                        var total = "&nbsp;&nbsp;Total time: <span style=\"color: red\">" +
-                            (after_time - before_time) + "</span> msec";
+                        var total = "<td>  Total time:</td><td align=\"right\"><span style=\"color: red\">" +
+                            (after_time - before_time) + "</span></td><td>msec</td>";
 
+                    var str = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                              "<table>" +
+                              "<tr align=\"left\" class=\"hl-Title\"><th colspan=\"3\">Code execution summary</th></tr>" +
+                              "<tr><td>  Executed:</td><td align=\"right\"><span style=\"color: green\">" + count + "</span></td><td>times</td></tr>" +
+                              "<tr>" + each + "</tr>" +
+                              "<tr>" + total + "</tr>"
+                              "</table>";
 
-                    vimperator.echo("<span style=\"color: magenta; font-weight: bold\">Code execution summary</span>:<br/>" +
-                        "&nbsp;&nbsp;Executed:&nbsp;&nbsp;&nbsp;<span style=\"color: green\">" + count + "</span> times<br/>" + each + total);
+                    vimperator.commandline.echo(str, vimperator.commandline.HL_NORMAL, true);
                 }
                 else
                 {
diff --git a/content/find.js b/content/find.js
index eeed6073..6df14a8f 100644
--- a/content/find.js
+++ b/content/find.js
@@ -166,9 +166,9 @@ function Search() //{{{
             // our command line
             setTimeout(function() {
                 if (up)
-                    vimperator.echoerr("search hit TOP, continuing at BOTTOM");
+                    vimperator.commandline.echo("search hit TOP, continuing at BOTTOM", vimperator.commandline.HL_WARNING);
                 else
-                    vimperator.echoerr("search hit BOTTOM, continuing at TOP");
+                    vimperator.commandline.echo("search hit BOTTOM, continuing at TOP", vimperator.commandline.HL_WARNING);
             }, 0);
         }
         else
diff --git a/content/mappings.js b/content/mappings.js
index 2ca9a642..19537a4d 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -270,21 +270,20 @@ function Mappings() //{{{
         }
 
         var list = "<table>";
-
         for (var i = 0; i < maps.length; i++)
         {
             for (var j = 0; j < maps[i].names.length; j++)
             {
                 list += "<tr>";
-                list += "<td>&nbsp;" + maps[i].names[j].replace(/</g, "&lt;").replace(/>/g, "&gt;") + "</td>"
+                list += "<td> " + vimperator.util.escapeHTML(maps[i].names[j]) + "</td>"
                 if (maps[i].rhs)
-                    list += "<td>&nbsp;" + maps[i].rhs.replace(/</g, "&lt;").replace(/>/g, "&gt;") + "</td>"
+                    list += "<td> " + vimperator.util.escapeHTML(maps[i].rhs) + "</td>"
                 list += "</tr>";
             }
         }
         list += "</table>";
 
-        vimperator.commandline.echo(list, true); // TODO: force of multiline widget a better way
+        vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true); // TODO: force of multiline widget a better way
     }
 
     /////////////////////////////////////////////////////////////////////////////}}}
diff --git a/content/options.js b/content/options.js
index 577b46a4..6fc6c922 100644
--- a/content/options.js
+++ b/content/options.js
@@ -304,8 +304,8 @@ function Options() //{{{
     this.list = function()
     {
         // TODO: columns like Vim?
-        var list = "<table style=\"white-space: nowrap;\">" +
-                   "<tr align=\"left\" style=\"color: magenta\"><th>--- Options ---</th></tr>";
+        var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                   "<table><tr align=\"left\" class=\"hl-Title\"><th>--- Options ---</th></tr>";
         var name, value;
 
         for (var i = 0; i < options.length; i++)
@@ -315,18 +315,18 @@ function Options() //{{{
 
             if (options[i].type == "boolean")
             {
-                name = value ? "&nbsp;&nbsp;" + name : "no" + name;
+                name = value ? "  " + name : "no" + name;
                 list += "<tr><td>" + name + "</td></tr>";
             }
             else
             {
-                list += "<tr><td>" + "&nbsp;&nbsp;" + name + "=" + value + "</td></tr>";
+                list += "<tr><td>" + "  " + name + "=" + value + "</td></tr>";
             }
         }
 
         list += "</table>";
 
-        vimperator.commandline.echo(list, true);
+        vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
     }
 
     // TODO: separate Preferences from Options? Would these utility functions
diff --git a/content/ui.js b/content/ui.js
index e190fe27..4fe76132 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -110,12 +110,6 @@ function CommandLine() //{{{
     var multiline_output_widget = document.getElementById("vimperator-multiline-output");
     multiline_output_widget.contentDocument.body.setAttribute("style", "margin: 0px; font-family: -moz-fixed;"); // get rid of the default border
     multiline_output_widget.contentDocument.body.innerHTML = "";
-    // we need this hack, or otherwise the first use of setMultiline() will have a wrong height
-    setTimeout(function() {
-        multiline_output_widget.collapsed = false;
-        var content_height = multiline_output_widget.contentDocument.height;
-        multiline_output_widget.collapsed = true;
-    }, 100);
 
     // the widget used for multiline intput
     var multiline_input_widget = document.getElementById("vimperator-multiline-input");
@@ -133,20 +127,12 @@ function CommandLine() //{{{
     var multiline_regexp = null;
     var multiline_callback = null;
 
-    function setNormalStyle()
+    function setHighlightGroup(group)
     {
-        commandline_widget.setAttribute("class", "normal");
-    }
-    function setMessageStyle()
-    {
-        commandline_widget.setAttribute("class", "message");
-    }
-    function setErrorStyle()
-    {
-        commandline_widget.setAttribute("class", "error");
+        commandline_widget.setAttribute("class", group);
     }
 
-    // Sets the prompt - for example, : or /
+    // sets the prompt - for example, : or /
     function setPrompt(prompt)
     {
         if (typeof prompt != "string")
@@ -155,7 +141,7 @@ function CommandLine() //{{{
         prompt_widget.value = prompt;
         if (prompt)
         {
-            // Initially (in the xul) the prompt is 'collapsed', this makes
+            // initially (in the xul) the prompt is 'collapsed', this makes
             // sure it's visible, then we toggle the display which works better
             prompt_widget.style.visibility = 'visible';
             prompt_widget.style.display = 'inline';
@@ -167,53 +153,67 @@ function CommandLine() //{{{
         }
     }
 
-    // Sets the command - e.g. 'tabopen', 'open http://example.com/'
+    // sets the command - e.g. 'tabopen', 'open http://example.com/'
     function setCommand(cmd)
     {
+        command_widget.hidden = false;
         command_widget.value = cmd;
     }
 
-    // TODO: the invoking command should be pasted at the top of the MOW and
-    //       the MOW messages should actually be displayed in the commandline
-    //     : extract CSS
+    // TODO: extract CSS
     //     : resize upon a window resize
+    //     : echoed lines longer than v-c-c.width should wrap and use MOW
     function setMultiline(str)
     {
-        // TODO: we should retain any previous command output like Vim
-        if (!multiline_output_widget.collapsed)
-            multiline_output_widget.collapsed = true;
-
         multiline_input_widget.collapsed = true;
 
-        var output = str.replace(/\n|\\n/g, "<br/>");
-        //output =  ":" + command_widget.value + "<br/>" + output;
-        output += "<br/>"
-        output += '<span id="end-prompt" style="color: green; background-color: white;">Press ENTER or type command to continue</span>';
-        output += '<span id="more-prompt" style="display: none; position: fixed; top: auto; bottom: 0; left: 0; right: 0; color: green; background-color: white;">';
-        output += "-- More --";
-        output += '</span>';
-        output += '<span id="more-help-prompt" style="display: none; position: fixed; top: auto; bottom: 0; left: 0; right: 0; color: green; background-color: white;">';
-        output += "-- More -- SPACE/d/j: screen/page/line down, b/u/k: up, q: quit";
-        output += '</span>';
+        var output = "<div class=\"ex-command-output\">" + str + "</div>";
+        if (!multiline_output_widget.collapsed)
+        {
+            // FIXME: need to make sure an open MOW is closed when commands
+            //        that don't generate output are executed
+            output = multiline_output_widget.contentDocument.body.innerHTML + output;
+            multiline_output_widget.collapsed = true;
+        }
+
+        var font_size = document.defaultView.getComputedStyle(document.getElementById("main-window"), null).getPropertyValue("font-size");
+        multiline_output_widget.contentDocument.body.setAttribute("style", "font-size: " + font_size);
 
         multiline_output_widget.contentDocument.body.innerHTML = output;
+        multiline_output_widget.contentDocument.body.id = "vimperator-multiline-output-content";
+
+        var stylesheet = multiline_output_widget.contentDocument.createElement("link");
+        stylesheet.setAttribute("rel", "Stylesheet");
+        stylesheet.setAttribute("href", "chrome://vimperator/skin/vimperator.css");
+        multiline_output_widget.contentDocument.getElementsByTagName("head")[0].appendChild(stylesheet);
 
         var available_height = getBrowser().mPanelContainer.boxObject.height;
         var content_height = multiline_output_widget.contentDocument.height;
         var height = content_height < available_height ? content_height : available_height;
 
-        //multiline_output_widget.style.height = height + "px";
         multiline_output_widget.height = height + "px";
         multiline_output_widget.collapsed = false;
 
         if (vimperator.options["more"] && multiline_output_widget.contentWindow.scrollMaxY > 0)
         {
-            multiline_output_widget.contentWindow.document.getElementById("more-prompt").style.display = "inline";
-            multiline_output_widget.contentWindow.scrollTo(0, 0);
+            // start the last executed command's output at the top of the screen
+            var elements = multiline_output_widget.contentDocument.getElementsByTagName("div");
+            for (var i = 0; i < elements.length; i++)
+            {
+                if (elements[i].className != "ex-command-output")
+                    elements.splice(i, 1);
+            }
+            elements[elements.length - 1].scrollIntoView(true);
+
+            if (multiline_output_widget.contentWindow.scrollY >= multiline_output_widget.contentWindow.scrollMaxY)
+                vimperator.commandline.echo("Press ENTER or type command to continue", vimperator.commandline.HL_QUESTION);
+            else
+                vimperator.commandline.echo("-- More --", vimperator.commandline.HL_MOREMSG);
         }
         else
         {
             multiline_output_widget.contentWindow.scrollTo(0, content_height);
+            vimperator.commandline.echo("Press ENTER or type command to continue", vimperator.commandline.HL_QUESTION);
         }
 
         multiline_output_widget.contentWindow.focus();
@@ -243,6 +243,18 @@ function CommandLine() //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
+    this.HL_NORMAL   = "hl-Normal";
+    this.HL_ERRORMSG = "hl-ErrorMsg";
+    this.HL_MODEMSG  = "hl-ModeMsg";
+    this.HL_MOREMSG  = "hl-MoreMsg";
+    this.HL_QUESTION = "hl-Question";
+    this.HL_WARNING  = "hl-Warning";
+
+    // not yet used
+    this.FORCE_MULTILINE  =  1 << 0;
+    this.FORCE_SINGLELINE  = 1 << 1;
+    this.FORCE_ECHO  =       1 << 2; // also echoes if the commandline has focus
+
     this.getCommand = function()
     {
         return command_widget.value;
@@ -256,7 +268,7 @@ function CommandLine() //{{{
         cur_command = cmd || "";
         cur_extended_mode = ext_mode || null;
 
-        setNormalStyle();
+        setHighlightGroup(this.HL_NORMAL);
         history_index = UNINITIALIZED;
         completion_index = UNINITIALIZED;
 
@@ -269,8 +281,19 @@ function CommandLine() //{{{
         command_widget.focus();
     };
 
+    // normally used when pressing esc, does not execute a command
+    this.close = function()
+    {
+        var res = vimperator.triggerCallback("cancel", cur_extended_mode);
+        history.add(this.getCommand());
+        //vimperator.modes.set(old_mode, old_extended_mode);
+        vimperator.statusline.updateProgress(""); // we may have a "match x of y" visible
+        this.clear();
+    }
+
     // FIXME: flags not yet really functional --mst
-    this.echo = function(str, flags)
+    // multiline string don't obey highlight_group
+    this.echo = function(str, highlight_group, flags)
     {
         var focused = document.commandDispatcher.focusedElement;
         if (focused && focused == command_widget.inputField || focused == multiline_input_widget.inputField)
@@ -279,42 +302,42 @@ function CommandLine() //{{{
         if (typeof str != "string")
             str = "";
 
-        setNormalStyle();
-        if (flags || str.indexOf("\n") > -1 || str.indexOf("\\n") > -1 || str.indexOf("<br>") > -1 || str.indexOf("<br/>") > -1)
+        highlight_group = highlight_group || this.HL_NORMAL;
+        setHighlightGroup(highlight_group);
+        if (flags /*|| !multiline_output_widget.collapsed*/ || /\n|<br\/?>/.test(str))
         {
             setMultiline(str);
         }
         else
         {
-            setPrompt("");
-            setCommand(str);
+            if (!str)
+                str = "";
+
+            setCommand("");
+            setPrompt(str);
+            // FIXME: this causes the commandline to lose focus in FF2
+            //command_widget.hidden = true;
+
+            // initially (in the xul) the prompt is 'collapsed', this makes
+            // sure it's visible, then we toggle the display which works better
+            prompt_widget.style.visibility = 'visible';
+            prompt_widget.style.display = 'inline';
+            prompt_widget.size = str.length;
         }
         cur_extended_mode = null;
         return true;
     };
 
-    this.echoErr = function(str)
-    {
-        var focused = document.commandDispatcher.focusedElement;
-        if (focused && focused == command_widget.inputField || focused == multiline_input_widget.inputField)
-            return false;
-
-        setErrorStyle();
-        setPrompt("");
-        setCommand(str);
-        cur_extended_mode = null;
-        return true;
-    };
-
     // this will prompt the user for a string
     // vimperator.commandline.input("(s)ave or (o)pen the file?")
     this.input = function(str)
     {
         // TODO: unfinished, need to find out how/if we can block the execution of code
         // to make this code synchronous or at least use a callback
-        setMessageStyle();
+        setHighlightGroup(this.HL_QUESTION);
         setPrompt(str);
         setCommand("");
+        command_widget.focus();
         return "not implemented";
     };
 
@@ -345,9 +368,7 @@ function CommandLine() //{{{
         multiline_output_widget.collapsed = true;
         completionlist.hide();
 
-        setPrompt(" "); // looks faster than an empty string as most prompts are 1 char long
-        setCommand("");
-        setNormalStyle();
+        this.echo("");
     };
 
     this.onEvent = function(event)
@@ -366,7 +387,7 @@ function CommandLine() //{{{
         }
         else if (event.type == "focus")
         {
-            if (!cur_extended_mode)
+            if (!cur_extended_mode && event.target == command_widget.inputField)
                 event.target.blur();
         }
         else if (event.type == "input")
@@ -478,7 +499,7 @@ function CommandLine() //{{{
                     if (res)
                         [completion_start_index, completions] = res;
 
-                    // Sort the completion list
+                    // sort the completion list
                     if (vimperator.options["wildoptions"].search(/\bsort\b/) > -1)
                     {
                         completions.sort(function(a, b) {
@@ -638,31 +659,20 @@ function CommandLine() //{{{
 
         var show_more_help_prompt = false;
         var show_more_prompt = false;
+        var close_window = false;
+        var pass_event = false;
 
         function isScrollable() { return !win.scrollMaxY == 0; }
 
         function atEnd() { return win.scrollY / win.scrollMaxY >= 1; }
 
-        function close()
-        {
-            multiline_output_widget.collapsed = true;
-            vimperator.setMode(vimperator.modes.NORMAL);
-            vimperator.focusContent();
-        }
-
-        function pass(event)
-        {
-            close();
-            vimperator.events.onKeyPress(event);
-        }
-
         var key = vimperator.events.toString(event);
 
         switch (key)
         {
             case ":":
                 vimperator.commandline.open(":", "", vimperator.modes.EX);
-                break;
+                return;
 
             // down a line
             case "j":
@@ -670,7 +680,7 @@ function CommandLine() //{{{
                 if (vimperator.options["more"] && isScrollable())
                     win.scrollByLines(1);
                 else
-                    pass(event);
+                    pass_event = true;
                 break;
 
             case "<C-j>":
@@ -679,7 +689,7 @@ function CommandLine() //{{{
                 if (vimperator.options["more"] && isScrollable() && !atEnd())
                     win.scrollByLines(1);
                 else
-                    close(); // don't propagate the event for accept keys
+                    close_window = true;; // don't propagate the event for accept keys
                 break;
 
             // up a line
@@ -691,7 +701,7 @@ function CommandLine() //{{{
                 else if (vimperator.options["more"] && !isScrollable())
                     show_more_prompt = true;
                 else
-                    pass(event);
+                    pass_event = true;
                 break;
 
             // half page down
@@ -699,7 +709,7 @@ function CommandLine() //{{{
                 if (vimperator.options["more"] && isScrollable())
                     win.scrollBy(0, win.innerHeight / 2);
                 else
-                    pass(event);
+                    pass_event = true;
                 break;
 
             case "<LeftMouse>":
@@ -716,7 +726,7 @@ function CommandLine() //{{{
                 if (vimperator.options["more"] && isScrollable())
                     win.scrollByPages(1);
                 else
-                    pass(event);
+                    pass_event = true;
                 break;
 
             case "<Space>":
@@ -724,7 +734,7 @@ function CommandLine() //{{{
                 if (vimperator.options["more"] && isScrollable() && !atEnd())
                     win.scrollByPages(1);
                 else
-                    pass(event);
+                    pass_event = true;
                 break;
 
             // half page up
@@ -733,7 +743,7 @@ function CommandLine() //{{{
                 if (vimperator.options["more"] && isScrollable())
                     win.scrollBy(0, -(win.innerHeight / 2));
                 else
-                    pass(event);
+                    pass_event = true;
                 break;
 
             // page up
@@ -743,14 +753,14 @@ function CommandLine() //{{{
                 else if (vimperator.options["more"] && !isScrollable())
                     show_more_prompt = true;
                 else
-                    pass(event);
+                    pass_event = true;
                 break;
 
             case "<PageUp>":
                 if (vimperator.options["more"] && isScrollable())
                     win.scrollByPages(-1);
                 else
-                    pass(event);
+                    pass_event = true;
                 break;
 
             // top of page
@@ -760,7 +770,7 @@ function CommandLine() //{{{
                 else if (vimperator.options["more"] && !isScrollable())
                     show_more_prompt = true;
                 else
-                    pass(event);
+                    pass_event = true;
                 break;
 
             // bottom of page
@@ -768,7 +778,7 @@ function CommandLine() //{{{
                 if (vimperator.options["more"] && isScrollable() && !atEnd())
                     win.scrollTo(0, win.scrollMaxY);
                 else
-                    pass(event);
+                    pass_event = true;
                 break;
 
             // copy text to clipboard
@@ -778,34 +788,34 @@ function CommandLine() //{{{
 
             // close the window
             case "q":
-                close();
+                close_window = true;;
                 break;
 
             // unmapped key
             default:
                 if (!vimperator.options["more"] || !isScrollable() || atEnd() || vimperator.events.isCancelKey(key))
-                    pass(event);
+                    pass_event = true;
                 else
                     show_more_help_prompt = true;
         }
 
-        // set appropriate prompt string
-        var more_prompt = win.document.getElementById("more-prompt");
-        var more_help_prompt = win.document.getElementById("more-help-prompt");
+        if (pass_event || close_window)
+        {
+            vimperator.setMode(vimperator.modes.NORMAL);
+            vimperator.focusContent();
+            this.clear();
 
-        if (show_more_help_prompt)
-        {
-            more_prompt.style.display = "none";
-            more_help_prompt.style.display = "inline";
+            if (pass_event)
+                vimperator.events.onKeyPress(event);
         }
-        else if (show_more_prompt || (vimperator.options["more"] && isScrollable() && !atEnd()))
+        else // set update the prompt string
         {
-            more_help_prompt.style.display = "none";
-            more_prompt.style.display = "inline";
-        }
-        else
-        {
-            more_prompt.style.display = more_help_prompt.style.display = "none";
+            if (show_more_help_prompt)
+                this.echo("-- More -- SPACE/d/j: screen/page/line down, b/u/k: up, q: quit", this.HL_MOREMSG);
+            else if (show_more_prompt || (vimperator.options["more"] && isScrollable() && !atEnd()))
+                this.echo("-- More --", this.HL_MOREMSG);
+            else
+                this.echo("Press ENTER or type command to continue", this.HL_QUESTION);
         }
     }
 
diff --git a/content/util.js b/content/util.js
new file mode 100644
index 00000000..b6572d04
--- /dev/null
+++ b/content/util.js
@@ -0,0 +1,38 @@
+/***** BEGIN LICENSE BLOCK ***** {{{
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.
+
+(c) 2006-2007: Martin Stubenschrott <stubenschrott@gmx.net>
+
+Alternatively, the contents of this file may be used under the terms of
+either the GNU General Public License Version 2 or later (the "GPL"), or
+the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+in which case the provisions of the GPL or the LGPL are applicable instead
+of those above. If you wish to allow use of your version of this file only
+under the terms of either the GPL or the LGPL, and not to allow others to
+use your version of this file under the terms of the MPL, indicate your
+decision by deleting the provisions above and replace them with the notice
+and other provisions required by the GPL or the LGPL. If you do not delete
+the provisions above, a recipient may use your version of this file under
+the terms of any one of the MPL, the GPL or the LGPL.
+}}} ***** END LICENSE BLOCK *****/
+
+vimperator.util = {
+    escapeHTML: function(str)
+    {   
+        var e = window.content.document.createElement("div");
+        e.appendChild(window.content.document.createTextNode(str));
+        return e.innerHTML;
+    }
+}
+
+// vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/vimperator.js b/content/vimperator.js
index c2ca5035..d73ffe1c 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -451,7 +451,7 @@ const vimperator = (function() //{{{
             }
 
             if (color)
-                string += "<span style=\"color: magenta; font-weight: bold;\">" + obj + "</span>::\n";
+                string += "<span class=\"hl-Title\">" + obj + "</span>::\n";
             else
                 string += obj + "::\n";
 
@@ -494,7 +494,7 @@ const vimperator = (function() //{{{
                         {
                             var str = value.toString();
                             if (typeof str == "string")  // can be "undefined"
-                                value = str.replace(/</g, "&lt;").replace(/>/g, "&gt;");
+                                value = vimperator.util.escapeHTML(str);
                         }
                     }
                     
@@ -746,8 +746,8 @@ const vimperator = (function() //{{{
             vimperator.hints         = new Hints();
             vimperator.log("All modules loaded", 3);
 
-            vimperator.echo    = vimperator.commandline.echo;
-            vimperator.echoerr = vimperator.commandline.echoErr;
+            vimperator.echo    = function(str) { vimperator.commandline.echo(str); }
+            vimperator.echoerr = function(str) { vimperator.commandline.echo(str, vimperator.commandline.HL_ERRORMSG); }
 
             vimperator.globalVariables = {};
 
diff --git a/content/vimperator.xul b/content/vimperator.xul
index 456e7de8..ad423199 100644
--- a/content/vimperator.xul
+++ b/content/vimperator.xul
@@ -51,6 +51,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
     <script type="application/x-javascript;version=1.7" src="options.js"/>
     <script type="application/x-javascript;version=1.7" src="tabs.js"/>
     <script type="application/x-javascript;version=1.7" src="ui.js"/>
+    <script type="application/x-javascript;version=1.7" src="util.js"/>
 
     <window id="main-window">
 
diff --git a/skin/vimperator.css b/skin/vimperator.css
index 59f1c59d..eab11d71 100644
--- a/skin/vimperator.css
+++ b/skin/vimperator.css
@@ -66,28 +66,93 @@
 }
 
 #vimperator-commandline {
-    /* FIXME: black on white or default skin colors? -moz-Field/-moz-FieldText */
+    padding: 1px;
+    /*
     background-color: white;
     color: black;
-    padding: 1px;
+    */
 }
 #vimperator-commandline-prompt, #vimperator-commandline-command {
     background-color: inherit;
     color: inherit;
 }
-#vimperator-commandline.error {
-    background-color: red;
-    color: white;
-    font-weight: bold;
-}
-#vimperator-commandline.message > #vimperator-commandline-prompt {
-    background-color: white;
-    color: magenta;
-    font-weight: bold;
-}
 
 #vimperator-multiline-output {
     overflow: hidden;
 }
 
+/* highlight groups */
+
+.hl-Normal {
+    background-color: white;
+    color: black;
+}
+.hl-ErrorMsg {
+    background-color: red;
+    color: white;
+    font-weight: bold;
+}
+.hl-ModeMsg {
+    background-color: white;
+    color: black;
+}
+.hl-MoreMsg {
+    background-color: white;
+    color: green;
+}
+.hl-Question {
+    background-color: white;
+    color: green;
+}
+.hl-Title {
+    background-color: white;
+    color: magenta;
+    font-weight: bold;
+}
+.hl-Warning {
+    background-color: white;
+    color: red;
+}
+
+.hl-Normal {
+    background-color: white;
+    color: black;
+}
+.hl-ErrorMsg {
+    background-color: red;
+    color: white;
+    font-weight: bold;
+}
+.hl-MoreMsg {
+    color: green;
+    background-color: white;
+}
+.hl-Title {
+    color: magenta;
+    background-color: white;
+    font-weight: bold;
+}
+
+/* MOW */
+
+#vimperator-multiline-output-content {
+    white-space: pre; /* -moz-pre-wrap FIXME: Should lines wrap like Vim? */
+    font-family: -moz-fixed;
+    margin: 0px;
+}
+
+#vimperator-multiline-output-content * {
+    font: inherit;
+}
+
+#vimperator-multiline-output-content table {
+    white-space: inherit;
+    border-spacing: 0px;
+}
+
+#vimperator-multiline-output-content td,
+#vimperator-multiline-output-content th {
+    padding: 0px 2px;
+}
+
 /* vim: set fdm=marker sw=4 ts=4 et: */

From 8afbbd90d1dfe0efde6e8b04c9489ab7e9fc05ef Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 6 Oct 2007 13:17:57 +0000
Subject: [PATCH 102/224] display an error message if :buffers is given an
 argument

---
 content/commands.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/content/commands.js b/content/commands.js
index bac54358..dfe6db40 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -357,7 +357,16 @@ function Commands() //{{{
         }
     ));
     addDefaultCommand(new Command(["buffers", "files", "ls", "tabs"],
-        function(args, special) { vimperator.buffer.list(special); },
+        function(args, special)
+        {
+            if (args)
+            {
+                vimperator.echoerr("E488: Trailing characters");
+                return;
+            }
+
+            vimperator.buffer.list(special);
+        },
         {
             usage: ["buffers[!]"],
             short_help: "Show a list of all buffers (=tabs)",

From 386b03cb990d342283ca6eeb6a739ea866a1eb0d Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 6 Oct 2007 13:18:31 +0000
Subject: [PATCH 103/224] update vimperatorrc.example - 'beep' is now
 'visualbell'

---
 vimperatorrc.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vimperatorrc.example b/vimperatorrc.example
index c1288600..1438e94e 100644
--- a/vimperatorrc.example
+++ b/vimperatorrc.example
@@ -1,7 +1,7 @@
 " TODO: add some useful examples
 
 " I don't like beeps
-set nobeep
+set visualbell
 echo vimperatorrc found
 
 " embedded javascript is possible

From 99fd79cdd7112a37dfa7dfaf6cee8ca58f318d1f Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 6 Oct 2007 14:40:01 +0000
Subject: [PATCH 104/224] merge :! es command

---
 NEWS                  |  2 +
 content/commands.js   | 31 ++++++++++++--
 content/vimperator.js | 97 ++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 126 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 3ab8a802..acb38a78 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@
 	  (change with userChrome.css if you don't like it until we have :colorscheme)
 	* :let mapleader=","  and <Leader> in :map support
 	* added new :let and :unlet commands
+	* :b2 now allowed, no space required before the 2 anymore
+	* :! to run commands through system()
 	* separated search and Ex command history
 	* added 'visualbellstyle' for styling/hiding the visual bell
 	* merge the existing status bar with the standard FF status bar so that
diff --git a/content/commands.js b/content/commands.js
index dfe6db40..7d2d044f 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -42,7 +42,7 @@ function Command(specs, action, extra_info) //{{{
         for (var i = 0; i < specs.length; i++)
         {
             var match;
-            if (match = specs[i].match(/(\w+)\[(\w+)\]/))
+            if (match = specs[i].match(/(\w+|!)\[(\w+)\]/))
             {
                 short_names.push(match[1]);
                 long_names.push(match[1] + match[2]);
@@ -114,7 +114,7 @@ Command.prototype.hasName = function(name)
     {
         if (this.specs[i] == name)                    // literal command name
             return true;
-        else if (this.specs[i].match(/^\w+\[\w+\]$/)) // abbreviation spec
+        else if (this.specs[i].match(/^(\w+|!)\[\w+\]$/)) // abbreviation spec
             if (matchAbbreviation(name, this.specs[i]))
                 return true;
     }
@@ -194,7 +194,7 @@ function Commands() //{{{
         }
 
         // 0 - count, 1 - cmd, 2 - special, 3 - args, 4 - heredoc tag
-        var matches = string.match(/^:*(\d+)?([a-zA-Z]+)(!)?(?:\s+(.*?)\s*)?$/);
+        var matches = string.match(/^:*(\d+)?([a-zA-Z]+|!)(!)?(?:\s*(.*?)\s*)?$/);
         if (!matches)
             return [null, null, null, null, null];
         matches.shift();
@@ -1629,6 +1629,31 @@ function Commands() //{{{
             short_help: "Set zoom value of the web page",
             help: "If <code class=\"argument\">{value}</code> can be an absolute value between 1 and 2000% or a relative value if prefixed with - or +. " +
                   "If <code class=\"argument\">{value}</code> is omitted, zoom is reset to 100%."
+        },
+        {
+            usage: ["zo[om][!] [value]", "zo[om][!] +{value} | -{value}"],
+            short_help: "Set zoom value of current web page",
+            help: "If <code class=\"argument\">{value}</code> can be an absolute value between 1 and 2000% or a relative value if prefixed with - or +. " +
+                  "If <code class=\"argument\">{value}</code> is omitted, zoom is reset to 100%.<br/>" +
+                  "Normally this command operates on the text zoom, if used with <code class=\"argument\">[!]</code> it operates on full zoom."
+        }
+    ));
+    addDefaultCommand(new Command(["!", "run"],
+        function(args, special)
+        {
+            // TODO: if special, run the last command
+            var output = vimperator.system(args)
+            if (typeof output === "string")
+                vimperator.echo(vimperator.util.escapeHTML(output));
+            else
+                // FIXME: why are we accepting only a string return value from v.system()? -- djk
+                vimperator.echoerr("Invalid system command: " + args);
+        },
+        {
+            usage: ["!{command}"],
+            short_help: "Run a command",
+            help: "Runs {command} through system() and displays its output. " +
+                  "Input redirection (< foo) not done, do not run commands which require stdin or it will hang Firefox!"
         }
     ));
     //}}}
diff --git a/content/vimperator.js b/content/vimperator.js
index d73ffe1c..f33931cb 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -629,6 +629,89 @@ const vimperator = (function() //{{{
                 .quit(nsIAppStartup.eRestart | nsIAppStartup.eAttemptQuit);
         },
 
+        run: function(program, args, blocking)
+        {
+            const WINDOWS = navigator.platform == "Win32";
+
+            var file = Components.classes["@mozilla.org/file/local;1"].
+                                  createInstance(Components.interfaces.nsILocalFile);
+            try
+            {
+                file.initWithPath(program);
+            }
+            catch (e)
+            {
+                var dirs = environment_service.get("PATH").split(WINDOWS ? ";" : ":");
+                for (var i = 0; i < dirs.length; i++)
+                {
+                    var path = dirs[i] + (WINDOWS ? "\\" : "/") + program;
+                    try
+                    {
+                        file.initWithPath(path);
+                        if (file.exists())
+                            break;
+                    }
+                    catch (e) { }
+                }
+            }
+            if (!file.exists())
+            {
+                vimperator.echoerr("command not found: " + program);
+                return -1;
+            }
+
+            var process = Components.classes["@mozilla.org/process/util;1"].
+                                     createInstance(Components.interfaces.nsIProcess);
+            process.init(file);
+             
+            var ec = process.run(blocking, args, args.length);
+            return ec;
+        },
+
+        // when https://bugzilla.mozilla.org/show_bug.cgi?id=68702 is fixed
+        // is fixed, should use that instead of a tmpfile
+        // TODO: pass "input" as stdin
+        // TODO: add shell/shellcmdflag options to replace "sh" and "-c"
+        system: function (str, input)
+        {
+            const WINDOWS = navigator.platform == "Win32"; // FIXME: duplicated everywhere
+
+            var fileout = getTempFile();
+            if (!fileout)
+                return "";
+
+            if (WINDOWS)
+                var command = str + " > " + fileout.path;
+            else
+                var command = str + " > \"" + fileout.path.replace('"', '\\"') + "\"";
+
+            var filein = null;
+            if (input)
+            {
+                filein = getTempFile();
+                var fdin = vimperator.fopen(filein, ">");
+                fdin.write(input);
+                fdin.close();
+                command += " < \"" + filein.path.replace('"', '\\"') + "\"";
+            }
+
+            if (WINDOWS)
+                this.run("cmd.exe", ["/C", command], true);
+            else
+                this.run("sh", ["-c", command], true);
+
+            var fd = vimperator.fopen(fileout, "<");
+            if (!fd)
+                return null;
+
+            var s = fd.read();
+            fd.close();
+            fileout.remove(false);
+            if (filein)
+                filein.remove(false);
+
+            return s;
+        },
 
         // files which end in .js are sourced as pure javascript files,
         // no need (actually forbidden) to add: js <<EOF ... EOF around those files
@@ -820,7 +903,19 @@ const vimperator = (function() //{{{
             vimperator.events.destroy();
 
             window.dump("All vimperator modules destroyed\n");
-        }
+        },
+
+        sleep: function(ms)
+        {
+            var threadManager = Cc["@mozilla.org/thread-manager;1"].getService(Ci.nsIThreadManager); 
+            var mainThread = threadManager.mainThread; 
+
+            var then = new Date().getTime(), now = then; 
+            for (; now - then < ms; now = new Date().getTime()) { 
+                mainThread.processNextEvent(true); 
+            } 
+        } 
+
     } //}}}
 })(); //}}}
 

From 9d7fb15229e8e23aed57a23fbaf17e0a67f53baa Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 7 Oct 2007 21:20:17 +0000
Subject: [PATCH 105/224] clear the commandline when changing tabs

---
 content/events.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/content/events.js b/content/events.js
index 4d3f2a0a..31b60cb6 100644
--- a/content/events.js
+++ b/content/events.js
@@ -52,6 +52,7 @@ function Events() //{{{
         vimperator.buffer.updateBufferList();
     }, false);
     tabcontainer.addEventListener("TabSelect", function(event) {
+        vimperator.commandline.clear();
         vimperator.statusline.updateTabCount();
         vimperator.buffer.updateBufferList();
         vimperator.tabs.updateSelectionHistory();

From 22e77df0ea7f0822bd80d8dc5d629e41f7a8bb17 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 7 Oct 2007 23:09:06 +0000
Subject: [PATCH 106/224] close :time MOW output table element

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

diff --git a/content/commands.js b/content/commands.js
index 7d2d044f..7d8f6b68 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1453,7 +1453,7 @@ function Commands() //{{{
                               "<tr align=\"left\" class=\"hl-Title\"><th colspan=\"3\">Code execution summary</th></tr>" +
                               "<tr><td>  Executed:</td><td align=\"right\"><span style=\"color: green\">" + count + "</span></td><td>times</td></tr>" +
                               "<tr>" + each + "</tr>" +
-                              "<tr>" + total + "</tr>"
+                              "<tr>" + total + "</tr>" +
                               "</table>";
 
                     vimperator.commandline.echo(str, vimperator.commandline.HL_NORMAL, true);

From 0f84ec6ee71acd154069d1a25e2d6f814261c23b Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 8 Oct 2007 00:44:49 +0000
Subject: [PATCH 107/224] use standard-ish Vim highlight group names for the
 statusline styling

---
 content/ui.js       | 17 ++++++++++++++-
 skin/vimperator.css | 52 ++++++++++++---------------------------------
 2 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/content/ui.js b/content/ui.js
index 4fe76132..f916c03e 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -1058,7 +1058,22 @@ function StatusLine() //{{{
 
     this.setClass = function(type)
     {
-        status_bar.setAttribute("class", "chromeclass-status status_" + type);
+        var highlight_group;
+
+        switch (type)
+        {
+            case "secure":
+                highlight_group = "hl-StatusLineSecure";
+                break;
+            case "broken":
+                highlight_group = "hl-StatusLineBroken";
+                break;
+            case "insecure":
+                highlight_group = "hl-StatusLine";
+                break;
+        }
+
+        status_bar.setAttribute("class", "chromeclass-status " + highlight_group);
     };
 
     this.updateUrl = function(url)
diff --git a/skin/vimperator.css b/skin/vimperator.css
index eab11d71..011c9fc8 100644
--- a/skin/vimperator.css
+++ b/skin/vimperator.css
@@ -12,8 +12,7 @@
 /* the selected item in listboxes is hardly readable without this */
 #vimperator-completion    > listitem[selected="true"] > listcell,
 #vimperator-bufferwindow  > listitem[selected="true"] > listcell,
-#vimperator-previewwindow > listitem[selected="true"] > listcell
-{
+#vimperator-previewwindow > listitem[selected="true"] > listcell {
    background-color: Highlight !important;
    color: HighlightText !important;
 }
@@ -49,22 +48,6 @@
     display: none;
 }
 
-/* colors for the statusbar */
-/* #status-bar is included so it also gets the right color before the first setClass("insecure") */
-#status-bar,
-#status-bar.status_insecure {
-    background-color: black;
-    color: white;
-}
-#status-bar.status_secure {
-    background-color: #B0FF00; /* light green */
-    color: black;
-}
-#status-bar.status_broken {
-    background-color: #FF6060; /* light red */
-    color: black;
-}
-
 #vimperator-commandline {
     padding: 1px;
     /*
@@ -77,10 +60,6 @@
     color: inherit;
 }
 
-#vimperator-multiline-output {
-    overflow: hidden;
-}
-
 /* highlight groups */
 
 .hl-Normal {
@@ -113,28 +92,25 @@
     background-color: white;
     color: red;
 }
-
-.hl-Normal {
-    background-color: white;
+.hl-StatusLine {
+    background-color: black;
+    color: white;
+}
+.hl-StatusLineSecure {
+    background-color: #B0FF00; / * light green * /
     color: black;
 }
-.hl-ErrorMsg {
-    background-color: red;
-    color: white;
-    font-weight: bold;
-}
-.hl-MoreMsg {
-    color: green;
-    background-color: white;
-}
-.hl-Title {
-    color: magenta;
-    background-color: white;
-    font-weight: bold;
+.hl-StatusLineBroken {
+    background-color: #FF6060; / * light red * /
+    color: black;
 }
 
 /* MOW */
 
+#vimperator-multiline-output {
+    overflow: hidden;
+}
+
 #vimperator-multiline-output-content {
     white-space: pre; /* -moz-pre-wrap FIXME: Should lines wrap like Vim? */
     font-family: -moz-fixed;

From ae0768055fd04206b519fa72b38dafe1dc46be69 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 8 Oct 2007 01:37:10 +0000
Subject: [PATCH 108/224] sst default highlight group class to hl-Normal for
 #status-bar and #vimperator-commandline

---
 content/vimperator.xul | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/vimperator.xul b/content/vimperator.xul
index ad423199..77c0b7b6 100644
--- a/content/vimperator.xul
+++ b/content/vimperator.xul
@@ -64,7 +64,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
         <!-- TODO: move to browser-stack? -->
         <box id="vimperator-visualbell" hidden="true"/>
 
-        <statusbar id="status-bar">
+        <statusbar id="status-bar" class="hl-StatusLine">
             <hbox insertbefore="statusbar-display" id="vimperator-statusline" flex="1" height="10" hidden="false" align="center">
                 <textbox class="plain" id="vimperator-statusline-field-url" readonly="false" flex="1" crop="end"/>
                 <label class="plain" id="vimperator-statusline-field-inputbuffer"    flex="0"/>
@@ -108,7 +108,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
                 </listcols>
             </listbox>
 
-            <hbox id="vimperator-commandline" hidden="false">
+            <hbox id="vimperator-commandline" hidden="false" class="hl-Normal">
                 <label class="plain" id="vimperator-commandline-prompt"  flex="0" crop="end" value="" collapsed="true"/>
                 <textbox class="plain" id="vimperator-commandline-command" flex="1" hidden="false" type="timed" timeout="100"
                     onkeypress="vimperator.commandline.onEvent(event);"

From 3c7fbb878d781790f85da76109fa66880f3219d8 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 9 Oct 2007 05:13:34 +0000
Subject: [PATCH 109/224] merge use of "[Help]" and "[No Name]" in the status
 line for the internal help page and about:blank

---
 content/help.js |  2 +-
 content/ui.js   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/content/help.js b/content/help.js
index 89b0e16e..bc0cc989 100644
--- a/content/help.js
+++ b/content/help.js
@@ -206,7 +206,7 @@ vimperator.help = function(section, easter) //{{{
 
     var fulldoc = '<?xml version="1.0"?>\n' +
         '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"\n  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n' +
-        '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head>\n<title>Vimperator help</title>\n' +
+        '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head>\n<title>Vimperator Help</title>\n' +
         // XXX: stylesheet broken here? Have to add it in the vimperator.xul file
         '<link rel="stylesheet" href="chrome://vimperator/content/help.css" type="text/css"/>\n' +
         '</head>\n<body>\n<div class="main">\n' +
diff --git a/content/ui.js b/content/ui.js
index f916c03e..f0b7e378 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -1081,6 +1081,17 @@ function StatusLine() //{{{
         if (!url || typeof url != "string")
             url = vimperator.buffer.URL;
 
+        // make it even more vim-like
+        if (url == "about:blank")
+        {
+            var title = vimperator.buffer.title;
+
+            if (title == "Vimperator Help")
+                url = "[Help]";
+            else if (!title)
+                url = "[No Name]";
+        }
+
         url_widget.value = url;
     };
 

From 0a71af0d0a5d2bac49bdedaf159355549f2ec72d Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 9 Oct 2007 05:44:27 +0000
Subject: [PATCH 110/224] merge MOW improvements

---
 content/ui.js          | 111 +++++++++++++++++++----------------------
 content/vimperator.xul |   8 +--
 2 files changed, 56 insertions(+), 63 deletions(-)

diff --git a/content/ui.js b/content/ui.js
index f0b7e378..a97293e4 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -133,41 +133,42 @@ function CommandLine() //{{{
     }
 
     // sets the prompt - for example, : or /
-    function setPrompt(prompt)
+    function setPrompt(pmt)
     {
-        if (typeof prompt != "string")
-            prompt = "";
+        prompt_widget.value = pmt;
 
-        prompt_widget.value = prompt;
-        if (prompt)
+        if (pmt)
         {
-            // initially (in the xul) the prompt is 'collapsed', this makes
-            // sure it's visible, then we toggle the display which works better
-            prompt_widget.style.visibility = 'visible';
-            prompt_widget.style.display = 'inline';
-            prompt_widget.size = prompt.length;
+            prompt_widget.size = pmt.length;
+            prompt_widget.collapsed = false;
         }
         else
         {
-            prompt_widget.style.display = 'none';
+            prompt_widget.collapsed = true;
         }
     }
 
     // sets the command - e.g. 'tabopen', 'open http://example.com/'
     function setCommand(cmd)
     {
-        command_widget.hidden = false;
         command_widget.value = cmd;
     }
 
+    function setLine(str, highlight_group)
+    {
+        setHighlightGroup(highlight_group);
+        setPrompt("");
+        setCommand(str);
+    }
+
     // TODO: extract CSS
     //     : resize upon a window resize
     //     : echoed lines longer than v-c-c.width should wrap and use MOW
-    function setMultiline(str)
+    function setMultiline(str, highlight_group)
     {
         multiline_input_widget.collapsed = true;
 
-        var output = "<div class=\"ex-command-output\">" + str + "</div>";
+        var output = "<div class=\"ex-command-output " + highlight_group + "\">" + str + "</div>";
         if (!multiline_output_widget.collapsed)
         {
             // FIXME: need to make sure an open MOW is closed when commands
@@ -197,23 +198,18 @@ function CommandLine() //{{{
         if (vimperator.options["more"] && multiline_output_widget.contentWindow.scrollMaxY > 0)
         {
             // start the last executed command's output at the top of the screen
-            var elements = multiline_output_widget.contentDocument.getElementsByTagName("div");
-            for (var i = 0; i < elements.length; i++)
-            {
-                if (elements[i].className != "ex-command-output")
-                    elements.splice(i, 1);
-            }
-            elements[elements.length - 1].scrollIntoView(true);
+            var elements = vimperator.buffer.evaluateXPath("//div[contains(@class, 'ex-command-output')]", multiline_output_widget.contentDocument);
+            elements.snapshotItem(elements.snapshotLength - 1).scrollIntoView(true);
 
             if (multiline_output_widget.contentWindow.scrollY >= multiline_output_widget.contentWindow.scrollMaxY)
-                vimperator.commandline.echo("Press ENTER or type command to continue", vimperator.commandline.HL_QUESTION);
+                setLine("Press ENTER or type command to continue", vimperator.commandline.HL_QUESTION);
             else
-                vimperator.commandline.echo("-- More --", vimperator.commandline.HL_MOREMSG);
+                setLine("-- More --", vimperator.commandline.HL_QUESTION);
         }
         else
         {
             multiline_output_widget.contentWindow.scrollTo(0, content_height);
-            vimperator.commandline.echo("Press ENTER or type command to continue", vimperator.commandline.HL_QUESTION);
+            setLine("Press ENTER or type command to continue", vimperator.commandline.HL_QUESTION);
         }
 
         multiline_output_widget.contentWindow.focus();
@@ -251,9 +247,12 @@ function CommandLine() //{{{
     this.HL_WARNING  = "hl-Warning";
 
     // not yet used
-    this.FORCE_MULTILINE  =  1 << 0;
-    this.FORCE_SINGLELINE  = 1 << 1;
-    this.FORCE_ECHO  =       1 << 2; // also echoes if the commandline has focus
+    this.FORCE_MULTILINE     = 1 << 0;
+    this.FORCE_SINGLELINE    = 1 << 1;
+    this.DISALLOW_MULTILINE  = 1 << 2; // if an echo() should try to use the single line,
+                                       // but output nothing when the MOW is open; when also
+                                       // FORCE_MULTILINE is given, FORCE_MULTILINE takes precedence
+    this.APPEND_TO_MESSAGES  = 1 << 3; // will show the string in :messages
 
     this.getCommand = function()
     {
@@ -268,13 +267,13 @@ function CommandLine() //{{{
         cur_command = cmd || "";
         cur_extended_mode = ext_mode || null;
 
-        setHighlightGroup(this.HL_NORMAL);
         history_index = UNINITIALIZED;
         completion_index = UNINITIALIZED;
 
         // save the mode, because we need to restore it
         [old_mode, old_extended_mode] = vimperator.getMode();
         vimperator.setMode(vimperator.modes.COMMAND_LINE, cur_extended_mode, true);
+        setHighlightGroup(this.HL_NORMAL);
         setPrompt(cur_prompt);
         setCommand(cur_command);
 
@@ -291,40 +290,36 @@ function CommandLine() //{{{
         this.clear();
     }
 
-    // FIXME: flags not yet really functional --mst
-    // multiline string don't obey highlight_group
+    // TODO: add :messages entry
+    // vimperator.echo uses different order of flags as it omits the hightlight group, change v.commandline.echo argument order? --mst
     this.echo = function(str, highlight_group, flags)
     {
         var focused = document.commandDispatcher.focusedElement;
         if (focused && focused == command_widget.inputField || focused == multiline_input_widget.inputField)
             return false;
 
-        if (typeof str != "string")
-            str = "";
-
         highlight_group = highlight_group || this.HL_NORMAL;
-        setHighlightGroup(highlight_group);
-        if (flags /*|| !multiline_output_widget.collapsed*/ || /\n|<br\/?>/.test(str))
-        {
-            setMultiline(str);
-        }
-        else
-        {
-            if (!str)
-                str = "";
 
-            setCommand("");
-            setPrompt(str);
-            // FIXME: this causes the commandline to lose focus in FF2
-            //command_widget.hidden = true;
-
-            // initially (in the xul) the prompt is 'collapsed', this makes
-            // sure it's visible, then we toggle the display which works better
-            prompt_widget.style.visibility = 'visible';
-            prompt_widget.style.display = 'inline';
-            prompt_widget.size = str.length;
+        var where = setLine;
+        if (flags & this.FORCE_MULTILINE)
+            where = setMultiline;
+        else if (flags & this.FORCE_SINGLELINE)
+            where = setLine;
+        else if (!multiline_output_widget.collapsed)
+        {
+            if (flags & this.DISALLOW_MULTILINE)
+                where = null;
+            else
+                where = setMultiline;
         }
+        else if (/\n|<br\/?>/.test(str))
+            where = setMultiline;
+
+        if (where)
+            where(str, highlight_group);
+
         cur_extended_mode = null;
+
         return true;
     };
 
@@ -334,9 +329,7 @@ function CommandLine() //{{{
     {
         // TODO: unfinished, need to find out how/if we can block the execution of code
         // to make this code synchronous or at least use a callback
-        setHighlightGroup(this.HL_QUESTION);
-        setPrompt(str);
-        setCommand("");
+        setLine(str, this.HL_QUESTION);
         command_widget.focus();
         return "not implemented";
     };
@@ -368,7 +361,7 @@ function CommandLine() //{{{
         multiline_output_widget.collapsed = true;
         completionlist.hide();
 
-        this.echo("");
+        setLine("", this.HL_NORMAL);
     };
 
     this.onEvent = function(event)
@@ -811,11 +804,11 @@ function CommandLine() //{{{
         else // set update the prompt string
         {
             if (show_more_help_prompt)
-                this.echo("-- More -- SPACE/d/j: screen/page/line down, b/u/k: up, q: quit", this.HL_MOREMSG);
+                setLine("-- More -- SPACE/d/j: screen/page/line down, b/u/k: up, q: quit", this.HL_MOREMSG);
             else if (show_more_prompt || (vimperator.options["more"] && isScrollable() && !atEnd()))
-                this.echo("-- More --", this.HL_MOREMSG);
+                setLine("-- More --", this.HL_MOREMSG);
             else
-                this.echo("Press ENTER or type command to continue", this.HL_QUESTION);
+                setLine("Press ENTER or type command to continue", this.HL_QUESTION);
         }
     }
 
diff --git a/content/vimperator.xul b/content/vimperator.xul
index 77c0b7b6..dc16e8d9 100644
--- a/content/vimperator.xul
+++ b/content/vimperator.xul
@@ -56,9 +56,9 @@ the terms of any one of the MPL, the GPL or the LGPL.
     <window id="main-window">
 
         <keyset id="mainKeyset">
-           <key id="key_open_vimbar" key=":" oncommand="vimperator.commandline.open(':', '', vimperator.modes.EX);" modifiers=""/>
-           <key id="key_stop" keycode="VK_ESCAPE" oncommand="vimperator.events.onEscape();"/>
-           <!-- other keys are handled inside vimperator.js event loop -->
+            <key id="key_open_vimbar" key=":" oncommand="vimperator.commandline.open(':', '', vimperator.modes.EX);" modifiers=""/>
+            <key id="key_stop" keycode="VK_ESCAPE" oncommand="vimperator.events.onEscape();"/>
+            <!-- other keys are handled inside vimperator.js event loop -->
         </keyset>
 
         <!-- TODO: move to browser-stack? -->
@@ -110,7 +110,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 
             <hbox id="vimperator-commandline" hidden="false" class="hl-Normal">
                 <label class="plain" id="vimperator-commandline-prompt"  flex="0" crop="end" value="" collapsed="true"/>
-                <textbox class="plain" id="vimperator-commandline-command" flex="1" hidden="false" type="timed" timeout="100"
+                <textbox class="plain" id="vimperator-commandline-command" flex="1" type="timed" timeout="100"
                     onkeypress="vimperator.commandline.onEvent(event);"
                     oninput="vimperator.commandline.onEvent(event);"
                     onfocus="vimperator.commandline.onEvent(event);"

From bb41e285103c7f08950e88e7d7c56e8399895e5f Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 9 Oct 2007 06:38:42 +0000
Subject: [PATCH 111/224] merge new :redraw command and changed 'linksearch'
 pattern modifiers

---
 Donators            | 10 ++++++++++
 NEWS                |  5 +++--
 content/commands.js | 12 ++++++++++++
 content/find.js     |  6 +++---
 content/mappings.js |  8 ++++++++
 5 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/Donators b/Donators
index d36eb2b8..cc072a07 100644
--- a/Donators
+++ b/Donators
@@ -7,6 +7,16 @@
 * Cillian de Roiste
 * Miron Tewfik
 * Robert Heckel
+* Stefan Krauth
+* Giuseppe Guida
+* Richard Dooling
+* Nigel McNie
+* Paulo Tanimoto
+* Nathan Saper
+* Albert Menkveld
+* Ian Taylor
+* Thomas Svensen
+* Ramana Kumar
 
 I want to say a big <b>THANK YOU</b> for all people which supported this project in this way.
 </pre>
diff --git a/NEWS b/NEWS
index acb38a78..b8a425fc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.2
+	* new :redraw and Ctrl-L commands for forced redrawing of the screen
 	* added new 'laststatus' option and removed "s" value from 'guioptions'
 	* Tab-completion improvements for :javascript and :open
 	* IMPORTANT: changed semantics of :echo and :echoerr: Strings must be quoted with " or ' now,
@@ -22,8 +23,8 @@
 	  behaviour of the message list pager 
 	* added 'hlsearchstyle' option to allow for user CSS styling of the
 	  highlighted text strings when 'hlsearch' is set
-	* added 'linksearch' option to restrict page searches to link text - \U
-	  and \u can be used in the search pattern to override 'linksearch'
+	* added 'linksearch' option to restrict page searches to link text - \L
+	  and \l can be used in the search pattern to override 'linksearch'
 	* vimperator trys to stay in command mode after loading pages instead
 	  of having a text field focused
 	* added a visual bell and replaced 'beep' with 'visualbell'
diff --git a/content/commands.js b/content/commands.js
index 7d8f6b68..5f5cbabf 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1051,6 +1051,18 @@ function Commands() //{{{
             help: "Quit Vimperator, no matter how many tabs/windows are open. The session is not stored."
         }
     ));
+    addDefaultCommand(new Command(["redr[aw]"],
+        function()
+        {
+            var wu = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
+                            getInterface(Components.interfaces.nsIDOMWindowUtils);
+            wu.redraw();
+        },
+        {
+            short_help: "Redraw the screen",
+            help: "Useful to update the screen halfway executing a script or function."
+        }
+    ));
     addDefaultCommand(new Command(["re[load]"],
         function(args, special) { vimperator.tabs.reload(getBrowser().mCurrentTab, special); },
         {
diff --git a/content/find.js b/content/find.js
index 6df14a8f..d99a4d27 100644
--- a/content/find.js
+++ b/content/find.js
@@ -70,10 +70,10 @@ function Search() //{{{
 
         search_pattern = pattern;
 
-        // links only search - \u wins if both modifiers specified
-        if (/\\u/.test(pattern))
+        // links only search - \l wins if both modifiers specified
+        if (/\\l/.test(pattern))
             links_only = false;
-        else if (/\U/.test(pattern))
+        else if (/\L/.test(pattern))
             links_only = true;
         else if (vimperator.options["linksearch"])
             links_only = true;
diff --git a/content/mappings.js b/content/mappings.js
index 19537a4d..0765b9c1 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -579,6 +579,14 @@ function Mappings() //{{{
                   "Whether the new buffer is activated, depends on the <code class=\"option\">'activate'</code> option."
         }
     ));
+    addDefaultMap(new Map([vimperator.modes.NORMAL], ["<C-l>"],
+        function(count) { vimperator.commands.redraw(); },
+        {
+            short_help: "Redraw the screen",
+            help: "Works like <code class=\"command\">:redraw</code>.",
+            flags: Mappings.flags.COUNT
+        }
+    ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["r"],
         function() { vimperator.tabs.reload(getBrowser().mCurrentTab, false); },
         {

From 47d351e44b8660db05884bce9926e070fa9d435a Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 9 Oct 2007 06:40:41 +0000
Subject: [PATCH 112/224] update / and ? help for changed 'linksearch'
 modifiers

---
 content/mappings.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/mappings.js b/content/mappings.js
index 0765b9c1..fc5d7ca5 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -953,8 +953,8 @@ function Mappings() //{{{
             help: "Search forward for the first occurance of <code class=\"argument\">{pattern}</code>.<br/>" +
                   "When \"\\c\" appears anywhere in the pattern the whole pattern is handled as though <code class=\"option\">'ignorecase'</code> is on. " +
                   "\"\\C\" forces case-sensitive matching for the whole pattern.<br/>" +
-                  "If \"\\u\" appears in the pattern only the text of links is searched for a match as though <code class=\"option\">'linksearch'</code> is on. " +
-                  "\"\\U\" forces the entire page to be searched for a match."
+                  "If \"\\l\" appears in the pattern only the text of links is searched for a match as though <code class=\"option\">'linksearch'</code> is on. " +
+                  "\"\\L\" forces the entire page to be searched for a match."
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["?"],
@@ -965,8 +965,8 @@ function Mappings() //{{{
             help: "Search backward for the first occurance of <code class=\"argument\">{pattern}</code>.<br/>" +
                   "When \"\\c\" appears anywhere in the pattern the whole pattern is handled as though <code class=\"option\">'ignorecase'</code> is on. " +
                   "\"\\C\" forces case-sensitive matching for the whole pattern.<br/>" +
-                  "If \"\\u\" appears in the pattern only the text of links is searched for a match as though <code class=\"option\">'linksearch'</code> is on. " +
-                  "\"\\U\" forces the entire page to be searched for a match.<br/>" +
+                  "If \"\\l\" appears in the pattern only the text of links is searched for a match as though <code class=\"option\">'linksearch'</code> is on. " +
+                  "\"\\L\" forces the entire page to be searched for a match.<br/>" +
                   "NOTE: incremental searching currently only works in the forward direction."
         }
     ));

From 79eb375e68b30eee9ec9c17842743d9810e11c8b Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 9 Oct 2007 12:51:38 +0000
Subject: [PATCH 113/224] add "s" and "a" mappings to extended hints mode for
 saving hint targets

---
 NEWS                |  2 ++
 content/hints.js    | 24 ++++++++++++++++++++++++
 content/mappings.js | 12 ++++++++++--
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index b8a425fc..9a1306fc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.2
+	* added "s" and "a" mappings to extended hints mode for saving hint
+	  targets
 	* new :redraw and Ctrl-L commands for forced redrawing of the screen
 	* added new 'laststatus' option and removed "s" value from 'guioptions'
 	* Tab-completion improvements for :javascript and :open
diff --git a/content/hints.js b/content/hints.js
index e1835fdf..6d68e4d8 100644
--- a/content/hints.js
+++ b/content/hints.js
@@ -467,6 +467,8 @@ function Hints() //{{{
     };
 
 
+    // TODO: move these functions somewhere more general
+
     // this function 'click' an element, which also works
     // for javascript links
     this.openHints = function(new_tab, new_window)
@@ -561,6 +563,28 @@ function Hints() //{{{
         vimperator.echo("Yanked " + loc);
     };
 
+    this.saveHints = function(skip_prompt)
+    {
+        var elems = this.hintedElements();
+
+        for (var i = 0; i < elems.length; i++)
+        {
+            var doc  = elems[i].ownerDocument;
+            var url = makeURLAbsolute(elems[i].refElem.baseURI, elems[i].refElem.href);
+            var text = elems[i].refElem.textContent;
+
+            try
+            {
+                urlSecurityCheck(url, doc.location.href);
+                saveURL(url, text, null, true, skip_prompt, makeURI(url, doc.characterSet));
+            }
+            catch (e)
+            {
+                vimperator.echoerr(e);
+            }
+        }
+    }
+
     function setMouseOverElement(elem)
     {
         var doc = window.document;
diff --git a/content/mappings.js b/content/mappings.js
index fc5d7ca5..598828a7 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -936,7 +936,8 @@ function Mappings() //{{{
                   "<li><code class=\"mapping\">t</code> to open its location in a new tab</li>" +
                   "<li><code class=\"mapping\">O</code> to open its location in an <code class=\"command\">:open</code> query (not implemented yet)</li>" +
                   "<li><code class=\"mapping\">T</code> to open its location in an <code class=\"command\">:tabopen</code> query (not implemented yet)</li>" +
-                  "<li><code class=\"mapping\">s</code> to save its destination (not implemented yet)</li>" +
+                  "<li><code class=\"mapping\">s</code> to save its destination</li>" +
+                  "<li><code class=\"mapping\">a</code> to save its destination (prompting for save location)</li>" +
                   "<li><code class=\"mapping\">&lt;C-w&gt;</code> to open its destination in a new window</li>" +
                   "</ul>" +
                   "Multiple hints can be separated by commas where it makes sense. <code class=\"mapping\">;ab,ac,adt</code> opens <code>AB</code>, <code>AC</code> and <code>AD</code> in a new tab.<br/>" +
@@ -1013,7 +1014,14 @@ function Mappings() //{{{
         }
     ));
     addDefaultMap(new Map(vimperator.modes.HINTS, ["s"],
-        function() { vimperator.echoerr('Saving of links not yet implemented'); },
+        function() { vimperator.hints.saveHints(true); },
+        {
+            cancel_mode: true,
+            always_active: false
+        }
+    ));
+    addDefaultMap(new Map([vimperator.modes.HINTS], ["a"],
+        function() { vimperator.hints.saveHints(false); },
         {
             cancel_mode: true,
             always_active: false

From 5dfa3f6e19fcf54463e2500f4c34ad7fa26c926d Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 9 Oct 2007 13:19:20 +0000
Subject: [PATCH 114/224] :undoall + :undo tab-completion

---
 NEWS                |  1 +
 content/commands.js | 55 ++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 9a1306fc..a6f0ee73 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
 	* version 0.5.2
 	* added "s" and "a" mappings to extended hints mode for saving hint
 	  targets
+	* :undoall support, and tabcompletion for :undo <tab>
 	* new :redraw and Ctrl-L commands for forced redrawing of the screen
 	* added new 'laststatus' option and removed "s" value from 'guioptions'
 	* Tab-completion improvements for :javascript and :open
diff --git a/content/commands.js b/content/commands.js
index 5f5cbabf..e075c9e4 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1504,13 +1504,62 @@ function Commands() //{{{
         }
     ));
     addDefaultCommand(new Command(["u[ndo]"],
-        function(args, special, count) { if (count < 1) count = 1; undoCloseTab(count-1); },
+        function(args, special, count)
         {
-            usage: ["[count]u[ndo]"],
+            if (count < 1)
+                count = 1;
+
+            if (args)
+            {
+                var ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
+                var undoItems = eval("(" + ss.getClosedTabData(window) + ")");
+                for (var i = 0; i < undoItems.length; i++)
+                {
+                    if (undoItems[i].state.entries[0].url == args)
+                    {
+                        count = i+1;
+                        break;
+                    }
+                }
+            }
+            undoCloseTab(count-1);
+        },
+        {
+            usage: ["[count]u[ndo][!] [url]"],
             short_help: "Undo closing of a tab",
-            help: "If a count is given, don't close the last but the <code class=\"argument\">[count]</code>th last tab."
+            help: "If a count is given, don't close the last but the <code class=\"argument\">[count]</code>th last tab. " +
+                  "With <code class=\"argument\">[url]</code> restores the tab matching the url.",
+            completer: function(filter)
+            {
+                // get closed-tabs from nsSessionStore
+                var ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
+                var undoItems = eval("(" + ss.getClosedTabData(window) + ")");
+                var completions = [];
+                for (var i = 0; i < undoItems.length; i++)
+                {
+                    // undoItems[i].image is also available if need for favicons
+                    completions.push([undoItems[i].state.entries[0].url, undoItems[i].title]);
+                }
+                return completions;
+            }
         }
     ));
+    addDefaultCommand(new Command(["undoa[ll]"],
+        function(args, special, count)
+        {
+            if (count || special)
+                return vimperator.echoerr("E488: Trailing characters");
+
+            var ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
+            var undoItems = eval("(" + ss.getClosedTabData(window) + ")");
+            for (var i = 0; i < undoItems.length; i++)
+                undoCloseTab(); // doesn't work with i as the index to undoCloseTab
+        },
+        {
+            short_help: "Undo closing of all closed tabs",
+            help: "Firefox stores up to 10 closed tabs, even after a browser restart."
+        }
+    )),
     addDefaultCommand(new Command(["unl[et]"],
         function(args, special)
         {

From c3a62852d1b72135ce0fa3a29806d9a2dd98bd7c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 9 Oct 2007 13:34:59 +0000
Subject: [PATCH 115/224] back/:forward has tab completion, slightly broken for
 wildmode=longest for now, as we need to refactor g_substrings later

---
 NEWS                  |  1 +
 TODO                  |  1 -
 content/commands.js   | 69 +++++++++++++++++++++++++++++++++++++++----
 content/completion.js | 27 +++++++++++++++++
 4 files changed, 92 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index a6f0ee73..7ca2dbaa 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
 	* version 0.5.2
 	* added "s" and "a" mappings to extended hints mode for saving hint
 	  targets
+	* :back/:forward can use tabcompletion
 	* :undoall support, and tabcompletion for :undo <tab>
 	* new :redraw and Ctrl-L commands for forced redrawing of the screen
 	* added new 'laststatus' option and removed "s" value from 'guioptions'
diff --git a/TODO b/TODO
index bb9a7bb8..b756c719 100644
--- a/TODO
+++ b/TODO
@@ -22,7 +22,6 @@ FEATURES:
 9 Use our own find-as-you-type mechanism (like conkeror does)
 9 make hints smarter, not only with characters from from hintchars, but use "NE" or "NP" for 'new posts' e.g. (might be too slow)
 8 middleclick in content == p, and if command line is open, paste there the clipboard buffer
-8 it would be nice to have :(undo|back|forward) <url> w/ tab completion support
 7 [ctrl-o/i] to Go back to a Previous Position (done partly, however currenty does not use a per tab jumplist)
 7 whereever possible: get rid of dialogs and ask console-like dialog questions or write error prompts directly on the webpage or with :echo()
 7 3d should delete 3 tabs
diff --git a/content/commands.js b/content/commands.js
index e075c9e4..51345c44 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -240,13 +240,41 @@ function Commands() //{{{
             if (special)
                 vimperator.history.goToStart();
             else
+            {
+                if (args)
+                {
+                    var sh = getWebNavigation().sessionHistory;
+                    for (var i = sh.index - 1; i >= 0; i--)
+                    {
+                        if (sh.getEntryAtIndex(i, false).URI.spec == args)
+                        {
+                            getWebNavigation().gotoIndex(i);
+                            return;
+                        }
+                    }
+                }
                 vimperator.history.stepTo(count > 0 ? -1 * count : -1);
+            }
         },
         {
-            usage: ["[count]ba[ck][!]"],
+            usage: ["[count]ba[ck][!] [url]"],
             short_help: "Go back in the browser history",
             help: "Count is supported, <code class=\"command\">:3back</code> goes back 3 pages in the browser history.<br/>" +
-                  "The special version <code class=\"command\">:back!</code> goes to the beginning of the browser history."
+                  "The special version <code class=\"command\">:back!</code> goes to the beginning of the browser history.",
+            completer: function(filter)
+            {
+                var sh = getWebNavigation().sessionHistory;
+                var completions = [];
+                for (var i = sh.index - 1; i >= 0; i--)
+                {
+                    var entry = sh.getEntryAtIndex(i, false);
+                    var url = entry.URI.spec;
+                    var title = entry.title;
+                    if (vimperator.completion.match(filter, [url, title], false))
+                        completions.push([url, title]);
+                }
+                return completions;
+            }
         }
     ));
     addDefaultCommand(new Command(["bd[elete]", "bw[ipeout]", "bun[load]", "tabc[lose]"],
@@ -570,13 +598,41 @@ function Commands() //{{{
             if (special)
                 vimperator.history.goToEnd();
             else
+            {
+                if (args)
+                {
+                    var sh = getWebNavigation().sessionHistory;
+                    for (var i = sh.index + 1; i < sh.count; i++)
+                    {
+                        if (sh.getEntryAtIndex(i, false).URI.spec == args)
+                        {
+                            getWebNavigation().gotoIndex(i);
+                            return;
+                        }
+                    }
+                }
                 vimperator.history.stepTo(count > 0 ? count : 1);
+            }
         },
         {
-            usage: ["[count]fo[rward][!]"],
+            usage: ["[count]fo[rward][!] [url]"],
             short_help: "Go forward in the browser history",
             help: "Count is supported, <code class=\"command\">:3forward</code> goes forward 3 pages in the browser history.<br/>" +
-                  "The special version <code class=\"command\">:forward!</code> goes to the end of the browser history."
+                  "The special version <code class=\"command\">:forward!</code> goes to the end of the browser history.",
+            completer: function(filter)
+            {
+                var sh = getWebNavigation().sessionHistory;
+                var completions = [];
+                for (var i = sh.index + 1; i < sh.count; i++)
+                {
+                    var entry = sh.getEntryAtIndex(i, false);
+                    var url = entry.URI.spec;
+                    var title = entry.title;
+                    if (vimperator.completion.match(filter, [url, title], false))
+                        completions.push([url, title]);
+                }
+                return completions;
+            }
         }
     ));
     addDefaultCommand(new Command(["ha[rdcopy]"],
@@ -1538,7 +1594,10 @@ function Commands() //{{{
                 for (var i = 0; i < undoItems.length; i++)
                 {
                     // undoItems[i].image is also available if need for favicons
-                    completions.push([undoItems[i].state.entries[0].url, undoItems[i].title]);
+                    var url = undoItems[i].state.entries[0].url;
+                    var title = undoItems[i].title;
+                    if (vimperator.completion.match(filter, [url, title], false))
+                        completions.push([url, title]);
                 }
                 return completions;
             }
diff --git a/content/completion.js b/content/completion.js
index 971c0ee6..c1372f96 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -540,6 +540,33 @@ vimperator.completion = (function() // {{{
             return build_longest_starting_substring(completions, filter);
         }, // }}}
 
+        // helper function which checks if the given arguments pass "filter"
+        // items must be an array of strings
+        // if case_sensitive == true, be sure to pass filter already in lowercased version
+        match: function(filter, items, case_sensitive)
+        {
+            if (typeof(filter) != "string" || !items)
+                return false;
+
+            if (case_sensitive)
+            {
+                for (var i = 0; i < items.length; i++)
+                {
+                    if (items[i].toLowerCase().indexOf(filter) > -1)
+                        return true;
+                }
+            }
+            else
+            {
+                for (var i = 0; i < items.length; i++)
+                {
+                    if (items[i].indexOf(filter) > -1)
+                        return true;
+                }
+            }
+            return false;
+        },
+
         exTabCompletion: function(str) //{{{
         {
             var [count, cmd, special, args] = vimperator.commands.parseCommand(str);

From ee740a8fc0995bc16eff9af1b317f75ada7164b5 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 9 Oct 2007 13:50:13 +0000
Subject: [PATCH 116/224] merge count support for deleting buffers

---
 NEWS                |  1 +
 TODO                |  1 -
 content/commands.js |  3 ++-
 content/mappings.js |  6 ++++--
 content/tabs.js     | 37 +++++++++++++++++++++++++++++++++----
 5 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index 7ca2dbaa..a9e9f3fb 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
 	* version 0.5.2
 	* added "s" and "a" mappings to extended hints mode for saving hint
 	  targets
+	* "d", "D" and :bdelete support count now 
 	* :back/:forward can use tabcompletion
 	* :undoall support, and tabcompletion for :undo <tab>
 	* new :redraw and Ctrl-L commands for forced redrawing of the screen
diff --git a/TODO b/TODO
index b756c719..8f0a7b27 100644
--- a/TODO
+++ b/TODO
@@ -24,7 +24,6 @@ FEATURES:
 8 middleclick in content == p, and if command line is open, paste there the clipboard buffer
 7 [ctrl-o/i] to Go back to a Previous Position (done partly, however currenty does not use a per tab jumplist)
 7 whereever possible: get rid of dialogs and ask console-like dialog questions or write error prompts directly on the webpage or with :echo()
-7 3d should delete 3 tabs
 6 downloading of links to filesystem (:save <filename>)
 6 autocommands (BrowserStart, BrowserQuit, TabClose, TabOpen, TabChanged, PageLoaded, any more?)
 6 vim like mappings for caret mode and textboxes (i to start caret mode?)
diff --git a/content/commands.js b/content/commands.js
index 51345c44..35ebeb41 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -282,7 +282,8 @@ function Commands() //{{{
         {
             usage: ["[count]bd[elete][!]"],
             short_help: "Delete current buffer (=tab)",
-            help: "Count WILL be supported in future releases, then <code class=\"command\">:2bd</code> removes two tabs and the one to the right is selected.<br/>Do <code class=\"command\">:bdelete!</code> to select the tab to the left after removing the current tab."
+            help: "Count is supported, <code class=\"command\">:2bd</code> removes two tabs and the one to the right is selected. " +
+                  "Do <code class=\"command\">:bdelete!</code> to select the tab to the left after removing the current tab."
         }
     ));
     addDefaultCommand(new Command(["beep"],
diff --git a/content/mappings.js b/content/mappings.js
index 598828a7..80c3100a 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -386,7 +386,8 @@ function Mappings() //{{{
         function(count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count, false, 0); },
         {
             short_help: "Delete current buffer (=tab)",
-            help: "Count WILL be supported in future releases, then <code class=\"mapping\">2d</code> removes two tabs and the one the right is selected.",
+            help: "Count is supported, <code class=\"mapping\">2d</code> removes the current and next tab and the one to the right is selected. " +
+                  "Does not wrap if <code class=\"argument\">[count]</code> is larger than available tabs to the right.",
             flags: Mappings.flags.COUNT
         }
     ));
@@ -394,7 +395,8 @@ function Mappings() //{{{
         function(count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count, true, 0); },
         {
             short_help: "Delete current buffer (=tab)",
-            help: "Count WILL be supported in future releases, then <code class=\"mapping\">2d</code> removes two tabs and the one the right is selected.",
+            help: "Count is supported, <code class=\"mapping\">2D</code> removes the current and previous tab and the one to the left is selected. " +
+                  "Does not wrap if <code class=\"argument\">[count]</code> is larger than available tabs to the left.",
             flags: Mappings.flags.COUNT
         }
     ));
diff --git a/content/tabs.js b/content/tabs.js
index 978b21fb..37b75f78 100644
--- a/content/tabs.js
+++ b/content/tabs.js
@@ -151,15 +151,44 @@ function Tabs() //{{{
      */
     this.remove = function(tab, count, focus_left_tab, quit_on_last_tab)
     {
-        if (count < 1) count = 1;
+        function removeOrBlankTab (tab)
+        {
+            if (getBrowser().mTabs.length > 1)
+                getBrowser().removeTab(tab);
+            else
+            {
+                vimperator.open("about:blank", vimperator.NEW_BACKGROUND_TAB);
+                getBrowser().removeTab(tab);
+            }
+        }
+
+        if (count < 1)
+            count = 1;
 
         if (quit_on_last_tab >= 1 && getBrowser().mTabs.length <= count)
             vimperator.quit(quit_on_last_tab == 2);
 
-        if (focus_left_tab && tab.previousSibling)
-            this.select("-1", false);
 
-        getBrowser().removeTab(tab);
+        var index = this.index(tab);
+        if (focus_left_tab)
+        {
+            var last_removed_tab = 0;
+            for (var i = index; i > index - count && i >= 0; i--)
+            {
+                removeOrBlankTab(this.getTab(i));
+                last_removed_tab = i > 0 ? i : 1;
+            }
+            getBrowser().mTabContainer.selectedIndex = last_removed_tab - 1;
+        }
+        else
+        {
+            var i = index + count - 1;
+            if (i >= this.count())
+                i = this.count() - 1;
+
+            for (; i >= index; i--)
+                removeOrBlankTab(this.getTab(i));
+        }
     }
 
     this.keepOnly = function(tab)

From f64f0f5d40f711a34adca868b17f410c5d377df0 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 9 Oct 2007 23:21:13 +0000
Subject: [PATCH 117/224] allow the sidebar width to range from 10% - 90%

---
 skin/vimperator.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/skin/vimperator.css b/skin/vimperator.css
index 011c9fc8..c076ae97 100644
--- a/skin/vimperator.css
+++ b/skin/vimperator.css
@@ -60,6 +60,11 @@
     color: inherit;
 }
 
+#sidebar {
+    max-width: 90% !important;
+    min-width: 10% !important;
+}
+
 /* highlight groups */
 
 .hl-Normal {

From 0608e6849ba6da433da3a8d422de041ace8066f6 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 10 Oct 2007 00:39:39 +0000
Subject: [PATCH 118/224] add :!! support and don't show error on
 :!non-existing-command (as the non-existing-command can't be known if it
 really does not exist)

---
 content/commands.js   | 24 +++++++++++++++---------
 content/vimperator.js | 25 +++++++++++++++++--------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index 35ebeb41..9b5bc1e0 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -129,6 +129,7 @@ function Commands() //{{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     var ex_commands = [];
+    var last_run_command = ""; // updated whenever the users runs a command with :!
 
     function addDefaultCommand(command)
     {
@@ -177,7 +178,6 @@ function Commands() //{{{
         return null;
     }
 
-
     // FIXME: doesn't really belong here...
     // return [null, null, null, null, heredoc_tag || false];
     //        [count, cmd, special, args] = match;
@@ -1762,19 +1762,25 @@ function Commands() //{{{
     addDefaultCommand(new Command(["!", "run"],
         function(args, special)
         {
-            // TODO: if special, run the last command
+            // :!! needs to be treated specially as the command parser sets the special flag but removes the ! from args
+            if (special)
+                args = "!" + (args || "");
+
+            // TODO: better escaping of ! to also substitute \\! correctly
+            args = args.replace(/(^|[^\\])!/g, "$1" + last_run_command);
+            last_run_command = args;
+
             var output = vimperator.system(args)
-            if (typeof output === "string")
+            if (output)
                 vimperator.echo(vimperator.util.escapeHTML(output));
-            else
-                // FIXME: why are we accepting only a string return value from v.system()? -- djk
-                vimperator.echoerr("Invalid system command: " + args);
         },
         {
-            usage: ["!{command}"],
+            usage: ["!{cmd}"],
             short_help: "Run a command",
-            help: "Runs {command} through system() and displays its output. " +
-                  "Input redirection (< foo) not done, do not run commands which require stdin or it will hang Firefox!"
+            help: "Runs <code class=\"argument\">{cmd}</code> through system() and displays its output. " +
+                  "Any '!' in <code class=\"argument\">{cmd}</code> is replaced with the previous external command. " +
+                  "But not when there is a backslash before the '!', then that backslash is removed.<br/>" +
+                  "Input redirection (< foo) not done, also do not run commands which require stdin or it will hang Firefox!"
         }
     ));
     //}}}
diff --git a/content/vimperator.js b/content/vimperator.js
index f33931cb..4ee726fd 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -631,10 +631,15 @@ const vimperator = (function() //{{{
 
         run: function(program, args, blocking)
         {
+            var file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
             const WINDOWS = navigator.platform == "Win32";
 
-            var file = Components.classes["@mozilla.org/file/local;1"].
-                                  createInstance(Components.interfaces.nsILocalFile);
+            if (!args)
+                args = [];
+
+            if (typeof(blocking) != "boolean")
+                blocking = false;
+
             try
             {
                 file.initWithPath(program);
@@ -654,14 +659,14 @@ const vimperator = (function() //{{{
                     catch (e) { }
                 }
             }
+
             if (!file.exists())
             {
                 vimperator.echoerr("command not found: " + program);
                 return -1;
             }
 
-            var process = Components.classes["@mozilla.org/process/util;1"].
-                                     createInstance(Components.interfaces.nsIProcess);
+            var process = Cc["@mozilla.org/process/util;1"].createInstance(Ci.nsIProcess);
             process.init(file);
              
             var ec = process.run(blocking, args, args.length);
@@ -670,7 +675,6 @@ const vimperator = (function() //{{{
 
         // when https://bugzilla.mozilla.org/show_bug.cgi?id=68702 is fixed
         // is fixed, should use that instead of a tmpfile
-        // TODO: pass "input" as stdin
         // TODO: add shell/shellcmdflag options to replace "sh" and "-c"
         system: function (str, input)
         {
@@ -695,14 +699,15 @@ const vimperator = (function() //{{{
                 command += " < \"" + filein.path.replace('"', '\\"') + "\"";
             }
 
+            var res;
             if (WINDOWS)
-                this.run("cmd.exe", ["/C", command], true);
+                res = this.run("cmd.exe", ["/C", command], true);
             else
-                this.run("sh", ["-c", command], true);
+                res = this.run("sh", ["-c", command], true);
 
             var fd = vimperator.fopen(fileout, "<");
             if (!fd)
-                return null;
+                return "";
 
             var s = fd.read();
             fd.close();
@@ -710,6 +715,10 @@ const vimperator = (function() //{{{
             if (filein)
                 filein.remove(false);
 
+            // if there is only one \n at the end, chop it off
+            if (s && s.indexOf("\n") == s.length-1)
+                s = s.substr(0, s.length-1);
+
             return s;
         },
 

From 0e576502d913ea8b415a7f9a80497e8f9ed3a4ae Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 10 Oct 2007 02:46:10 +0000
Subject: [PATCH 119/224] update NEWS and TODO

---
 NEWS | 8 +++++---
 TODO | 9 ++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index a9e9f3fb..eb374161 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,10 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.2
-	* added "s" and "a" mappings to extended hints mode for saving hint
-	  targets
-	* "d", "D" and :bdelete support count now 
+	* changed semantics of :set[!] and :prefs[!] a little, :set shows now all non-default
+	  options, use :prefs! to get the about:config window
+	* added "s" and "a" mappings to extended hints mode for saving hint targets
+	* "d", "D" and :bdelete support count now
 	* :back/:forward can use tabcompletion
 	* :undoall support, and tabcompletion for :undo <tab>
 	* new :redraw and Ctrl-L commands for forced redrawing of the screen
@@ -35,6 +36,7 @@
 	* added a visual bell and replaced 'beep' with 'visualbell'
 	* added vimperator logo (can be seen in the addons manager)
 	* added 'hlsearch','incsearch', 'ignorecase' and 'smartcase' options
+	* many small bug fixes and enhancments
 
 2007-09-03:
 	* version 0.5.1
diff --git a/TODO b/TODO
index 8f0a7b27..30e9643b 100644
--- a/TODO
+++ b/TODO
@@ -3,7 +3,6 @@ Priority list:
 1-9 as in vim (9=required for next release, 5=would be nice, 1=probably not)
 
 BUGS:
-- autoupdate does not work
 - multiple windows do not work at all, so :q will close the whole browser session, even when there are other windows which has tabs
 - http://en.wikipedia.org/wiki/Portal:Current_events - 'f' shows more hints than 'F' (on left side of nav bar)
 - dpb| 09:09:56  dpb :: when I save a page with vimperator, it adds <hints
@@ -14,14 +13,15 @@ BUGS:
 - can't reverse tab through the vimperator toolbar
 - gu and gU don't work on local files properly
 - :noremap does not work fully
-- n and N are broken with /
 - pvh option not working
+- searching backwards incrementally does not work i.e. with 'incsearch' set
 
 FEATURES:
 9 :command for new commands
-9 Use our own find-as-you-type mechanism (like conkeror does)
 9 make hints smarter, not only with characters from from hintchars, but use "NE" or "NP" for 'new posts' e.g. (might be too slow)
+8 add an interface for navigating document relationships
 8 middleclick in content == p, and if command line is open, paste there the clipboard buffer
+7 use ctrl-n/p in insert mode for word completion
 7 [ctrl-o/i] to Go back to a Previous Position (done partly, however currenty does not use a per tab jumplist)
 7 whereever possible: get rid of dialogs and ask console-like dialog questions or write error prompts directly on the webpage or with :echo()
 6 downloading of links to filesystem (:save <filename>)
@@ -31,7 +31,6 @@ FEATURES:
 6 pipe selected text/link/website to an external command
 6 macros (qq)
 6 gf = view source?
-6 make a real one-tab-mode, divert _all_ other targets, possible by setting a firefox option (set popup=0-3)
 6 page info support (ctrl-g, g<C-g>)
 5 Use arrow keys in preview window, and ctrl-w+j/k to switch to from preview window
 5 Sort :open completion by date? (use 'wildsort')
@@ -40,7 +39,7 @@ FEATURES:
 4 Support multiple top-level windows?
 3 Splitting Windows with [:sp :vsp ctrl-w,s ctrl-w,v] and closing with [ctrl-w,q], moving with [ctrl-w,w or tab]
   have a look into the split browser extension
-3 :set should also set about:config options (with autocomplete)
+3 :set! should also set about:config options (with autocomplete)
 - many other ideas are listed in the wiki
 
 RANDOM IDEAS:

From 21703d5b57497cbd719dcd6acb34413d231d6927 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 10 Oct 2007 02:54:44 +0000
Subject: [PATCH 120/224] new :set and :prefs commands, tweaked :set output to
 use colors

---
 content/commands.js   | 293 +++++++++++++++++++++++-------------------
 content/options.js    |  18 ++-
 content/util.js       |  43 +++++++
 content/vimperator.js |  29 +----
 4 files changed, 220 insertions(+), 163 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index 9b5bc1e0..aeb5e819 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1042,11 +1042,35 @@ function Commands() //{{{
         }
     ));
     addDefaultCommand(new Command(["pref[erences]", "prefs"],
-        openPreferences,
+        function(args, special, count, modifiers)
         {
+            if (!args)
+            {
+                // TODO: copy these snippets to more function which should work with :tab xxx
+                if (modifiers && modifiers.inTab)
+                {
+                    vimperator.open(special ? "about:config" :
+                        "chrome://browser/content/preferences/preferences.xul", vimperator.NEW_TAB);
+                }
+                else
+                {
+                    if (special) // open firefox settings gui dialog
+                        vimperator.open("about:config", vimperator.CURRENT_TAB);
+                    else
+                        openPreferences();
+                }
+            }
+            else
+            {
+                vimperator.echoerr("E488: Trailing characters");
+            }
+        },
+        {
+            usage: [":pref[erences][!]"],
             short_help: "Show Browser Preferences",
-            help: "You can change the browser preferences from this dialog.<br/>Be aware that not all Firefox preferences work, because Vimperator overrides some keybindings and changes Firefox's GUI.<br/>" +
-                  "Works like <code class=\"command\">:set!</code>, but opens the dialog in a new window instead of a new tab. Use this, if you experience problems/crashes when using <code class=\"command\">:set!</code>"
+            help: "You can change the browser preferences from this dialog. " +
+                  "Be aware that not all Firefox preferences work, because Vimperator overrides some keybindings and changes Firefox's GUI.<br/>" +
+                  "<code class=\"command\">:prefs!</code> opens about:config in the current tab where you can change advanced Firefox preferences."
         }
     ));
     addDefaultCommand(new Command(["qma[rk]"],
@@ -1154,158 +1178,156 @@ function Commands() //{{{
     addDefaultCommand(new Command(["se[t]"],
         function(args, special, count, modifiers)
         {
+            if (special)
+            {
+                vimperator.echo("This WILL show all non-default about:config options");
+                return;
+            }
+
+            var only_non_default = false; //used for :set to print non-default options
             if (!args)
             {
-                // TODO: copy these snippets to more function which should work with :tab xxx
-                var where = vimperator.CURRENT_TAB;
-                if (arguments[3] && arguments[3].inTab)
-                    where = vimperator.NEW_TAB;
-
-                if (special) // open firefox settings gui dialog
-                    vimperator.open("chrome://browser/content/preferences/preferences.xul", where);
-                else
-                    vimperator.open("about:config", where);
+                args = "all?"
+                only_non_default = true;
             }
+
+            //                               1        2       3    4  5      6
+            var matches = args.match(/^\s*(no|inv)?([a-z]+)([?&!])?(([+-])?=(.*))?/);
+            if (!matches)
+            {
+                vimperator.echoerr("E518: Unknown option: " + args);
+                return;
+            }
+
+            var no = false;
+            if (matches[1] == "no")
+                no = true;
+
+            var opt = matches[2];
+
+            var all = false;
+            if (opt == "all")
+                all = true;
+
+            var option = vimperator.options.get(opt);
+            if (!option && !all)
+            {
+                vimperator.echoerr("E518: Unknown option: " + opt);
+                return;
+            }
+
+            var get = false;
+            if (all || matches[3] == "?" || (option.type != "boolean" && matches[4] === undefined))
+                get = true;
+
+            var reset = false;
+            if (matches[3] == "&")
+                reset = true;
+
+            var invert = false;
+            if (matches[1] == "inv" || matches[3] == "!")
+                invert = true;
+
+            var oper = matches[5];
+
+            var val = matches[6];
+            if (val === undefined)
+                val = "";
+
+            // reset a variable to its default value
+            // TODO: remove the value from about:config instead of setting it to the current default value
+            if (reset)
+            {
+                if (all)
+                {
+                    for (let opt in vimperator.options)
+                        opt.value = opt.default_value;
+                }
+                else
+                {
+                    option.value = option.default_value;
+                }
+            }
+            // read access
+            else if (get)
+            {
+                if (all)
+                {
+                    vimperator.options.list(only_non_default);
+                }
+                else
+                {
+                    if (option.type == "boolean")
+                        vimperator.echo((option.value ? "  " : "no") + option.name);
+                    else
+                        vimperator.echo("  " + option.name + "=" + option.value);
+                }
+            }
+            // write access
             else
             {
-                //                               1        2       3    4  5      6
-                var matches = args.match(/^\s*(no|inv)?([a-z_]+)([?&!])?(([+-])?=(.*))?/);
-                if (!matches)
+                var type = option.type;
+                if (type == "boolean")
                 {
-                    vimperator.echoerr("E518: Unknown option: " + args);
-                    return;
-                }
-
-                var no = false;
-                if (matches[1] == "no")
-                    no = true;
-
-                var opt = matches[2];
-
-                var all = false;
-                if (opt == "all")
-                    all = true;
-
-                var option = vimperator.options.get(opt);
-                if (!option && !all)
-                {
-                    vimperator.echoerr("E518: Unknown option: " + opt);
-                    return;
-                }
-
-                var get = false;
-                if (all || matches[3] == "?" || (option.type != "boolean" && matches[4] === undefined))
-                    get = true;
-
-                var reset = false;
-                if (matches[3] == "&")
-                    reset = true;
-
-                var invert = false;
-                if (matches[1] == "inv" || matches[3] == "!")
-                    invert = true;
-
-                var oper = matches[5];
-
-                var val = matches[6];
-                if (val === undefined)
-                    val = "";
-
-                // reset a variable to its default value
-                // TODO: remove the value from about:config instead of setting it to the current default value
-                if (reset)
-                {
-                    if (all)
-                    {
-                        for (let opt in vimperator.options)
-                            opt.value = opt.default_value;
-                    }
+                    if (matches[4])
+                        vimperator.echoerr("E474: Invalid argument: " + option.name + "=" + val);
+                    else if (invert)
+                        option.value = !option.value;
                     else
-                    {
-                        option.value = option.default_value;
-                    }
+                        option.value = !no;
                 }
-                // read access
-                else if (get)
+                else if (type == "number")
                 {
-                    if (all)
-                    {
-                        vimperator.options.list();
-                    }
+                    var num = parseInt(val, 10);
+                    if (isNaN(num))
+                        vimperator.echoerr("E521: Number required after =: " + option.name + "=" + val);
                     else
-                    {
-                        if (option.type == "boolean")
-                            vimperator.echo((option.value ? "  " : "no") + option.name);
-                        else
-                            vimperator.echo("  " + option.name + "=" + option.value);
-                    }
-                }
-                // write access
-                else
-                {
-                    var type = option.type;
-                    if (type == "boolean")
-                    {
-                        if (matches[4])
-                            vimperator.echoerr("E474: Invalid argument: " + option.name + "=" + val);
-                        else if (invert)
-                            option.value = !option.value;
-                        else
-                            option.value = !no;
-                    }
-                    else if (type == "number")
-                    {
-                        var num = parseInt(val, 10);
-                        if (isNaN(num))
-                            vimperator.echoerr("E521: Number required after =: " + option.name + "=" + val);
-                        else
-                        {
-                            var cur_val = option.value;
-                            if (oper == '+') num = cur_val + num;
-                            if (oper == '-') num = cur_val - num;
-                            // FIXME
-                            if (option.validator != null && option.validator.call(this, num) == false)
-                                vimperator.echoerr("E474: Invalid argument: " + option.name + "=" + val); // FIXME: need to be able to specify unique parse error messages
-                            else // all checks passed, execute option handler
-                                option.value = num;
-                        }
-                    }
-                    else if (type == "charlist" || type == "stringlist" || type == "string")
                     {
                         var cur_val = option.value;
-                        if (type == "charlist" || type == "string")
-                        {
-                            if (oper == '+' && !cur_val.match(val))
-                                val = cur_val + val;
-                            if (oper == '-') val = cur_val.replace(val, '');
-                        }
-                        else
-                        {
-                            if (oper == '+' && !cur_val.match(val) && cur_val.length > 0)
-                                    val = cur_val + ',' + val;
-                            if (oper == '-')
-                            {
-                                val = cur_val.replace(new RegExp(',?' + val), '');
-                                val = val.replace(/^,?/, '');
-                            }
-                        }
+                        if (oper == '+') num = cur_val + num;
+                        if (oper == '-') num = cur_val - num;
                         // FIXME
-                        if (option.validator != null && option.validator.call(this, val) == false)
-                            vimperator.echoerr("E474: Invalid argument: " + option.name + "=" + val);
+                        if (option.validator != null && option.validator.call(this, num) == false)
+                            vimperator.echoerr("E474: Invalid argument: " + option.name + "=" + val); // FIXME: need to be able to specify unique parse error messages
                         else // all checks passed, execute option handler
-                            option.value = val;
+                            option.value = num;
+                    }
+                }
+                else if (type == "charlist" || type == "stringlist" || type == "string")
+                {
+                    var cur_val = option.value;
+                    if (type == "charlist" || type == "string")
+                    {
+                        if (oper == '+' && !cur_val.match(val))
+                            val = cur_val + val;
+                        if (oper == '-') val = cur_val.replace(val, '');
                     }
                     else
-                        vimperator.echoerr("E685: Internal error: option format `" + type + "' not supported");
+                    {
+                        if (oper == '+' && !cur_val.match(val) && cur_val.length > 0)
+                                val = cur_val + ',' + val;
+                        if (oper == '-')
+                        {
+                            val = cur_val.replace(new RegExp(',?' + val), '');
+                            val = val.replace(/^,?/, '');
+                        }
+                    }
+                    // FIXME
+                    if (option.validator != null && option.validator.call(this, val) == false)
+                        vimperator.echoerr("E474: Invalid argument: " + option.name + "=" + val);
+                    else // all checks passed, execute option handler
+                        option.value = val;
                 }
+                else
+                    vimperator.echoerr("E685: Internal error: option format `" + type + "' not supported");
             }
         },
         {
             usage: ["se[t][!]", "se[t] {option}?", "se[t] [no]{option}", "se[t] {option}[+-]={value}", "se[t] {option}! | inv{option}", "se[t] {option}&"],
             short_help: "Set an option",
-            help: "Permanently change an option. In contrast to Vim options are stored throughout sessions.<br/>" +
-                  "<code class=\"command\">:set</code> without an argument opens <code>about:config</code> in a new tab to change advanced Firefox options.<br/>" +
-                  "<code class=\"command\">:set!</code> opens the GUI preference panel from Firefox in a new tab.<br/>" +
+            help: "Permanently change an option. In contrast to Vim options are currently stored throughout sessions.<br/>" +
+                  "<code class=\"command\">:set</code> without an argument shows all Vimperator options which differ from their default values.<br/>" +
+                  "<code class=\"command\">:set!</code> without an argument shows all about:config preferences which differ from their default values.<br/>" +
                   "There are three types of options: boolean, number and string. " +
                   "Boolean options must be set with <code class=\"command\">:set option</code> and <code class=\"command\">:set nooption</code>. " +
                   "Number and string option types must be set with <code class=\"command\">:set option={value}</code>.<br/>" +
@@ -1407,8 +1429,9 @@ function Commands() //{{{
         {
             usage: ["tab {cmd}"],
             short_help: "Execute {cmd} and tell it to output in a new tab",
-            help: "Works only for commands that support it.<br/>" +
-                  "Example: <code class=\"command\">:tab help tab</code> opens the help in a new tab.",
+            help: "Works only for commands that support it, currently:" +
+                  "<ul><li>:tab help</li>" +
+                  "<li>:tab prefs[!]</li></ul>",
             completer: function(filter) { return vimperator.completion.get_command_completions(filter); }
         }
     ));
diff --git a/content/options.js b/content/options.js
index 6fc6c922..2e6b14bb 100644
--- a/content/options.js
+++ b/content/options.js
@@ -301,25 +301,39 @@ function Options() //{{{
             storePreference('dom.popup_allowed_events', popup_allowed_events);
     }
 
-    this.list = function()
+    this.list = function(only_non_default)
     {
         // TODO: columns like Vim?
         var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
                    "<table><tr align=\"left\" class=\"hl-Title\"><th>--- Options ---</th></tr>";
-        var name, value;
+        var name, value, def;
 
         for (var i = 0; i < options.length; i++)
         {
             name  = options[i].name;
             value = options[i].value;
+            def   = options[i].default_value;
+
+            if (only_non_default && value == def)
+                continue;
 
             if (options[i].type == "boolean")
             {
                 name = value ? "  " + name : "no" + name;
+                if (value != def)
+                    name = "<span style=\"font-weight: bold\">" + name + "</span><span style=\"color: gray\">  (default: " + (def ? "" : "no") + options[i].name + ")</span>";
                 list += "<tr><td>" + name + "</td></tr>";
             }
             else
             {
+                if (value != def)
+                {
+                    name  = "<span style=\"font-weight: bold\">" + name + "</span>";
+                    value = vimperator.util.colorize(value, false) + "<span style=\"color: gray\">  (default: " + def + ")</span>";
+                }
+                else
+                    value = vimperator.util.colorize(value, false);
+
                 list += "<tr><td>" + "  " + name + "=" + value + "</td></tr>";
             }
         }
diff --git a/content/util.js b/content/util.js
index b6572d04..f095a95b 100644
--- a/content/util.js
+++ b/content/util.js
@@ -32,6 +32,49 @@ vimperator.util = {
         var e = window.content.document.createElement("div");
         e.appendChild(window.content.document.createTextNode(str));
         return e.innerHTML;
+    },
+
+    // TODO: use :highlight color groups
+    // if "process_strings" is true, any passed strings will be surrounded by " and
+    // any line breaks are displayed as \n
+    colorize: function(arg, process_strings)
+    {
+        var type = typeof(arg);
+
+        if (type == "number")
+        {
+            return "<span style=\"color: red;\">" + arg + "</span>";
+        }
+        else if (type == "string")
+        {
+            if (process_strings)
+                arg = '"' + vimperator.util.escapeHTML(arg.replace(/\n/, "\\n")) + '"';
+
+            return "<span style=\"color: green;\">" + arg + "</span>";
+        }           
+        else if (type == "boolean")
+        {
+            return "<span style=\"color: blue;\">" + arg + "</span>";
+        }
+        else if (arg == null || arg == "undefined")
+        {
+            return "<span style=\"color: blue;\">" + arg + "</span>";
+        }
+        else if (type == "object" || type == "function")
+        {
+            // for java packages value.toString() would crash so badly 
+            // that we cannot even try/catch it
+            if (/^\[JavaPackage.*\]$/.test(arg)) 
+                return "[JavaPackage]";
+
+            var str = arg.toString();
+            if (typeof str == "string")  // can be "undefined"
+                return vimperator.util.escapeHTML(str);
+            else
+                return "undefined";
+        }
+
+        return arg;
     }
 }
 
diff --git a/content/vimperator.js b/content/vimperator.js
index 4ee726fd..6bd29a86 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -434,11 +434,13 @@ const vimperator = (function() //{{{
             }
         },
 
+        // TODO: move to vimp.util.? --mst
         // if color = true it uses HTML markup to color certain items
         objectToString: function(object, color)
         {
             if (object === null)
                 return "null";
+
             if (typeof object != "object")
                 return false;
 
@@ -472,32 +474,7 @@ const vimperator = (function() //{{{
 
                 if (color)
                 {
-                    // syntax highlighting for special items
-                    if (typeof value === "number")
-                        value = "<span style=\"color: red;\">" + value + "</span>";
-                    else if (typeof value === "string")
-                    {
-                        value = value.replace(/\n/, "\\n").replace(/</, "&lt;");
-                        value = "<span style=\"color: green;\">\"" + value + "\"</span>";
-                    }
-                    else if (typeof value === "boolean")
-                        value = "<span style=\"color: blue;\">" + value + "</span>";
-                    else if (value == null || value == "undefined")
-                        value = "<span style=\"color: blue;\">" + value + "</span>";
-                    else if (typeof value === "object" || typeof value === "function")
-                    {
-                        // for java packages value.toString() would crash so badly 
-                        // that we cannot even try/catch it
-                        if (/^\[JavaPackage.*\]$/.test(value)) 
-                            value = "[JavaPackage]";
-                        else
-                        {
-                            var str = value.toString();
-                            if (typeof str == "string")  // can be "undefined"
-                                value = vimperator.util.escapeHTML(str);
-                        }
-                    }
-                    
+                    value = vimperator.util.colorize(value, true);
                     string += "<span style=\"font-weight: bold;\">" + i + "</span>: " + value + "\n";
                 }
                 else

From 8419c25be6a5268d63e9c0f32ea0ba34e8e644e5 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 10 Oct 2007 05:32:33 +0000
Subject: [PATCH 121/224] minor improvement to :sbclose help

---
 ChangeLog           | 2228 ++++++++-----------------------------------
 content/commands.js |    2 +-
 2 files changed, 382 insertions(+), 1848 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 587232b3..2190d43b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,90 +1,289 @@
-2007-09-03 14:48  dougkearns
+2007-10-10 02:54  dougkearns
 
-	* chrome/content/vimperator/vimperator.js: remove CVS from version
-	  string for release
+	* content/: commands.js, options.js, util.js, vimperator.js: new
+	  :set and :prefs commands, tweaked :set output to use colors
 
-2007-09-03 12:46  dougkearns
+2007-10-10 02:46  dougkearns
 
-	* chrome/content/vimperator/mappings.js: add usage and long help
-	  for / and ? mappings
+	* NEWS, TODO: update NEWS and TODO
 
-2007-09-03 10:18  dougkearns
+2007-10-10 00:39  dougkearns
 
-	* chrome/content/vimperator/help.js: remove extra blank lines from
-	  help page
+	* content/: commands.js, vimperator.js: add :!! support and don't
+	  show error on :!non-existing-command (as the non-existing-command
+	  can't be known if it really does not exist)
 
-2007-09-03 05:26  dougkearns
+2007-10-09 23:21  dougkearns
 
-	* chrome/content/vimperator/options.js: whitespace formatting
+	* skin/vimperator.css: allow the sidebar width to range from 10% -
+	  90%
+
+2007-10-09 13:50  dougkearns
+
+	* NEWS, TODO, content/commands.js, content/mappings.js,
+	  content/tabs.js: merge count support for deleting buffers
+
+2007-10-09 13:34  dougkearns
+
+	* NEWS, TODO, content/commands.js, content/completion.js:
+	  back/:forward has tab completion, slightly broken for
+	  wildmode=longest for now, as we need to refactor g_substrings
+	  later
+
+2007-10-09 13:19  dougkearns
+
+	* NEWS, content/commands.js: :undoall + :undo tab-completion
+
+2007-10-09 12:51  dougkearns
+
+	* NEWS, content/hints.js, content/mappings.js: add "s" and "a"
+	  mappings to extended hints mode for saving hint targets
+
+2007-10-09 06:40  dougkearns
+
+	* content/mappings.js: update / and ? help for changed 'linksearch'
+	  modifiers
+
+2007-10-09 06:38  dougkearns
+
+	* Donators, NEWS, content/commands.js, content/find.js,
+	  content/mappings.js: merge new :redraw command and changed
+	  'linksearch' pattern modifiers
+
+2007-10-09 05:44  dougkearns
+
+	* content/: ui.js, vimperator.xul: merge MOW improvements
+
+2007-10-09 05:13  dougkearns
+
+	* content/: help.js, ui.js: merge use of "[Help]" and "[No Name]"
+	  in the status line for the internal help page and about:blank
+
+2007-10-08 01:36  dougkearns
+
+	* content/vimperator.xul: sst default highlight group class to
+	  hl-Normal for #status-bar and #vimperator-commandline
+
+2007-10-08 00:44  dougkearns
+
+	* content/ui.js, skin/vimperator.css: use standard-ish Vim
+	  highlight group names for the statusline styling
+
+2007-10-07 23:08  dougkearns
+
+	* content/commands.js: close :time MOW output table element
+
+2007-10-07 21:19  dougkearns
+
+	* content/events.js: clear the commandline when changing tabs
+
+2007-10-06 14:40  dougkearns
+
+	* NEWS, content/commands.js, content/vimperator.js: merge :! es
+	  command
+
+2007-10-06 13:18  dougkearns
+
+	* vimperatorrc.example: update vimperatorrc.example - 'beep' is now
+	  'visualbell'
+
+2007-10-06 13:17  dougkearns
+
+	* content/commands.js: display an error message if :buffers is
+	  given an argument
+
+2007-10-06 13:16  dougkearns
+
+	* content/bookmarks.js, content/buffers.js, content/commands.js,
+	  content/find.js, content/mappings.js, content/options.js,
+	  content/ui.js, content/util.js, content/vimperator.js,
+	  content/vimperator.xul, skin/vimperator.css: merge MOW
 	  improvements
 
+2007-10-06 01:58  dougkearns
+
+	* content/util.js: add vimperator.util.escapeHTML
+
+2007-10-04 19:10  dougkearns
+
+	* content/vimperator.xul: allow the Console to be opened by
+	  :sidebar
+
+2007-10-04 13:59  dougkearns
+
+	* content/vimperator.xul: move the completion widget beneath the
+	  MOW
+
+2007-10-04 13:29  dougkearns
+
+	* content/completion.js: add fold markers
+
+2007-10-04 11:45  dougkearns
+
+	* vimperator.vim: update RC file highlighting
+
+2007-10-04 10:53  dougkearns
+
+	* content/events.js: don't call focusContent() on page load since
+	  it causes window map events to be fired
+
+2007-10-01 19:13  dougkearns
+
+	* NEWS: update NEWS
+
+2007-10-01 19:10  dougkearns
+
+	* content/: commands.js, completion.js, vimperator.js: merge
+	  improved :echo, :echoerr and :javascript commands
+
+2007-10-01 19:04  dougkearns
+
+	* content/completion.js: merge completion refactoring
+
+2007-10-01 18:48  dougkearns
+
+	* content/help.js: close help logo img element
+
+2007-10-01 17:38  dougkearns
+
+	* Makefile: don't run the binary files through sed when replacing
+	  the VERSION token
+
+2007-10-01 13:31  dougkearns
+
+	* NEWS, vimperator.vim, content/options.js: merge new 'laststatus'
+	  option
+
+2007-10-01 10:28  dougkearns
+
+	* install.rdf, skin/icon.png: add icon for addons dialog
+
+2007-10-01 10:23  dougkearns
+
+	* Makefile, chrome.manifest, content/bookmarks.js,
+	  content/buffers.js, content/commands.js, content/completion.js,
+	  content/events.js, content/file.js, content/find.js,
+	  content/help.css, content/help.js, content/hints.js,
+	  content/logo_white.png, content/mappings.js, content/modes.js,
+	  content/options.js, content/tabs.js, content/test.js,
+	  content/ui.js, content/vimperator.js, content/vimperator.xul,
+	  skin/vimperator.css: change directory structure to follow the
+	  more standard package hierarchy
+
+2007-10-01 10:08  dougkearns
+
+	* content/vimperator.xul: remove invalid comment
+
+2007-10-01 07:02  dougkearns
+
+	* content/options.js: change short version of 'linksearch' to 'lks'
+	  since 'ls' is used by 'laststatus'
+
+2007-09-30 17:08  dougkearns
+
+	* content/options.js: add 'laststatus' option
+
+2007-09-30 16:41  dougkearns
+
+	* content/bookmarks.js, content/buffers.js, content/commands.js,
+	  content/completion.js, content/events.js, content/file.js,
+	  content/find.js, content/help.css, content/help.js,
+	  content/hints.js, content/logo_white.png, content/mappings.js,
+	  content/modes.js, content/options.js, content/tabs.js,
+	  content/ui.js, content/vimperator.js, content/vimperator.xul,
+	  skin/icon.png, skin/vimperator.css: change directory structure to
+	  follow the more standard package hierarchy
+
+2007-09-25 19:37  dougkearns
+
+	* AUTHORS: merge new VIMPERATOR_HOME env variable support
+
+2007-09-25 18:42  dougkearns
+
+	* NEWS: merge new :let and :unlet commands and support for <Leader>
+	  in mappings
+
+2007-09-23 14:14  dougkearns
+
+	* NEWS: separate Ex command and search commandline history
+
+2007-09-23 10:21  dougkearns
+
+	* NEWS: merge new :time command
+
+2007-09-22 15:44  dougkearns
+
+	* NEWS: add a new 'visualbellstyle' option
+
+2007-09-22 14:50  dougkearns
+
+	* NEWS: process link text only find modifiers \[uU] before looking
+	  for capitalized letters when 'smartcase' is set
+
+2007-09-22 14:29  dougkearns
+
+	* NEWS: merge the existing status bar with the standard FF status
+	  bar
+
+2007-09-18 08:49  dougkearns
+
+	* NEWS, TODO: merge :sbclose and viewSidebarMenu menuitem additions
+
+2007-09-17 13:26  dougkearns
+
+	* NEWS: add an initial implementation of :sidebar
+
+2007-09-17 05:49  dougkearns
+
+	* NEWS: merge new 'more' option and more-prompt improvements
+
+2007-09-14 13:38  dougkearns
+
+	* NEWS: add a 'hlsearchstyle' option to allow for match styling and
+	  a 'linksearch' option to restrict page searches to link text
+
+2007-09-08 09:50  dougkearns
+
+	* NEWS: added a visual bell and replaced the 'beep' option with
+	  'visualbell'
+
+2007-09-08 09:41  dougkearns
+
+	* Makefile: use preX.X for development version numbers
+
+2007-09-06 00:04  dougkearns
+
+	* NEWS, vimperator.vim: merge new 'incsearch', 'ignorecase',
+	  'smartcase', 'hlsearch' options from MAIN
+
+2007-09-05 11:45  dougkearns
+
+	* Makefile: use preX.X for development version numbers
+
+2007-09-04 08:08  dougkearns
+
+	* Makefile: add logo to help page
+
+2007-09-04 02:50  dougkearns
+
+	* Makefile, NEWS: update version to 0.5.2dev
+
+2007-09-03 15:14  dougkearns
+
+	* ChangeLog, NEWS: update NEWS and ChangeLog for release
+
 2007-09-03 05:12  dougkearns
 
-	* NEWS, vimperator.vim, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/find.js,
-	  chrome/content/vimperator/mappings.js,
-	  chrome/content/vimperator/options.js,
-	  chrome/content/vimperator/ui.js: merge native / and ? search
-
-2007-09-01 15:57  dougkearns
-
-	* chrome/content/vimperator/buffers.js: use document.location.href
-	  for buffer.URL rather than document.URL since the latter is
-	  undefined for XUL documents
+	* NEWS, vimperator.vim: merge native / and ? search
 
 2007-09-01 11:49  dougkearns
 
 	* vimperatorrc.example: remove outdated :js examples
 
-2007-09-01 11:39  dougkearns
-
-	* chrome/content/vimperator/: completion.js, help.js: add
-	  initialization section to help
-
-2007-08-31 06:54  dougkearns
-
-	* chrome/content/vimperator/events.js: comment out currently unused
-	  DOMTitleChanged event handler
-
-2007-08-31 06:53  dougkearns
-
-	* chrome/content/vimperator/vimperator.js: don't indicate menu mode
-	  when 'smd' is set
-
-2007-08-29 15:55  dougkearns
-
-	* chrome/content/vimperator/events.js: use gContextMenu and the
-	  menubar events for controlling menu mode
-
-2007-08-29 13:20  dougkearns
-
-	* chrome/content/vimperator/events.js: don't enter menu mode when
-	  tooltip popups are shown
-
 2007-08-28 12:16  dougkearns
 
 	* NEWS: update NEWS
 
-2007-08-28 12:14  dougkearns
-
-	* chrome/content/vimperator/commands.js: minor help highlighting
-	  improvments
-
-2007-08-28 09:55  dougkearns
-
-	* chrome/content/vimperator/vimperator.xul: allow text in the
-	  status line URL field to be selected
-
-2007-08-27 17:35  dougkearns
-
-	* chrome/content/vimperator/events.js: fix typo in
-	  removeEventListener call
-
-2007-08-27 14:26  dougkearns
-
-	* chrome/content/vimperator/: events.js, vimperator.js: add menu
-	  mode
-
 2007-08-27 14:19  dougkearns
 
 	* Makefile: update Makefile version to 0.5.1
@@ -93,603 +292,100 @@
 
 	* Makefile: GNU make 3.80 can't parse "else ifeq"
 
-2007-08-27 11:44  dougkearns
-
-	* chrome/content/vimperator/commands.js: use the coerced boolean
-	  value of args rather than testing for 0 string length when
-	  determining if an arg was passed to an ex command
-
-2007-08-27 07:07  dougkearns
-
-	* chrome/content/vimperator/commands.js: if no argument is given to
-	  :winopen open about:blank in the new window
-
-2007-08-26 15:12  dougkearns
-
-	* chrome/content/vimperator/completion.js: complete ':set inv' with
-	  boolean options
-
 2007-08-26 14:27  dougkearns
 
-	* NEWS, chrome/content/vimperator/ui.js: fix commandline history on
-	  Windows - prevent the default cmd_charPrevious action from being
-	  invoked for <Up
+	* NEWS: fix commandline history on Windows - prevent the default
+	  cmd_charPrevious action from being invoked for <Up
 
 2007-08-26 12:05  dougkearns
 
 	* NEWS: update NEWS
 
-2007-08-26 11:57  dougkearns
-
-	* chrome/content/vimperator/completion.js: add filename completion
-	  for Windows
-
-2007-08-25 15:48  dougkearns
-
-	* chrome/content/vimperator/bookmarks.js: read the Bookmarks
-	  Toolbar Folder when loading bookmarks - it has previously been
-	  skipped since BookmarksUtils.getAllChildren(root) doesn't read it
-
-2007-08-24 16:37  dougkearns
-
-	* chrome/content/vimperator/bookmarks.js: make sure search engine
-	  aliases are properly initialized
-
-2007-08-24 11:13  dougkearns
-
-	* chrome/content/vimperator/ui.js: remove unnecessary temp variable
-
-2007-08-24 11:10  dougkearns
-
-	* chrome/content/vimperator/: default.css, vimperator.xul: make
-	  sure the active listcell in the second column of the preview
-	  window uses HighlightText as the CSS color value and move the
-	  #vimperator-multiline-output styles to default.css
-
-2007-08-23 14:07  dougkearns
-
-	* chrome/content/vimperator/vimperator.js: allow ~/_vimperatorrc as
-	  the RC file and ~/vimperator/plugin as the plugin directory on
-	  Windows
-
 2007-08-23 13:38  dougkearns
 
 	* Makefile: use 0.5 for the version strings
 
 2007-08-21 21:54  dougkearns
 
-	* Makefile, NEWS, TODO, chrome/content/vimperator/bookmarks.js,
-	  chrome/content/vimperator/buffers.js,
-	  chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/completion.js,
-	  chrome/content/vimperator/events.js,
-	  chrome/content/vimperator/file.js,
-	  chrome/content/vimperator/find.js,
-	  chrome/content/vimperator/help.js,
-	  chrome/content/vimperator/mappings.js,
-	  chrome/content/vimperator/options.js,
-	  chrome/content/vimperator/tabs.js,
-	  chrome/content/vimperator/ui.js,
-	  chrome/content/vimperator/vimperator.js: merge HEAD
-
-2007-08-16 16:54  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, ui.js: fixed :map x
-	  :<cr> problem
+	* Makefile, NEWS, TODO: merge HEAD
 
 2007-08-16 16:18  stubenschrott
 
 	* ChangeLog, NEWS: last commit before 0.5 is tagged
 
-2007-08-16 16:01  dougkearns
-
-	* chrome/content/vimperator/events.js: reset
-	  vimperator.input.buffer before executing mappings that may add
-	  more key events to the event buffer
-
-2007-08-16 15:56  dougkearns
-
-	* chrome/content/vimperator/commands.js: revert changes to :map arg
-	  parsing regexp in 1.190
-
-2007-08-16 15:51  dougkearns
-
-	* chrome/content/vimperator/help.js: fix help typo
-
-2007-08-16 15:49  dougkearns
-
-	* chrome/content/vimperator/commands.js: make sure URLs processed
-	  as a result of "gu" don't have //../ (the double forward slash)
-	  at the end
-
-2007-08-16 14:19  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, help.js, vimperator.js:
-	  Fixed :map partly, still cannot cope with :map commans, where lhs
-	  is a 2-char string
-
-2007-08-16 12:25  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js: fix some
-	  trivial capitalization errors in help
-
-2007-08-16 11:21  dougkearns
-
-	* chrome/content/vimperator/mappings.js: replace '<' and '>' with
-	  HTML entities in help for n and N mappings
-
-2007-08-16 11:14  dougkearns
-
-	* chrome/content/vimperator/: buffers.js, commands.js, help.js,
-	  hints.js: move the global evaluateXPath() function to
-	  vimperator.buffer
-
-2007-08-16 10:58  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js, events.js,
-	  hints.js, mappings.js, options.js: fix some help typos
-
-2007-08-16 09:31  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, default.css, help.js,
-	  mappings.js, options.js: many small help fixes
-
-2007-08-15 18:49  dougkearns
-
-	* chrome/content/vimperator/commands.js: remove half-baked guard
-	  clauses for unimplemented bookmark commands
-
 2007-08-15 18:27  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/bookmarks.js: added colors
-	  to :ls
-
-2007-08-15 17:47  stubenschrott
-
-	* chrome/content/vimperator/ui.js: fixed focusing the MOW
-
-2007-08-15 17:45  stubenschrott
-
-	* chrome/content/vimperator/vimperator.xul: overflow: hidden for
-	  the MOW
-
-2007-08-15 17:31  stubenschrott
-
-	* chrome/content/vimperator/buffers.js: added colors to :ls
-
-2007-08-15 17:21  dougkearns
-
-	* chrome/content/vimperator/commands.js: use
-	  vimperator.events.feedkeys() for :map
-
-2007-08-15 16:45  dougkearns
-
-	* chrome/content/vimperator/: buffers.js, commands.js, mappings.js,
-	  tabs.js: use the multiline output window for :buffers and move
-	  the existing persistent window functionality to :buffers!
+	* ChangeLog: added colors to :ls
 
 2007-08-15 15:32  dougkearns
 
-	* NEWS, chrome/content/vimperator/commands.js: update NEWS to
-	  mention the renaming of bookmark related commands and fix some
-	  trivial help typos
-
-2007-08-15 13:24  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js: rename
-	  :bm, :bmadd, :bmdel to :bmarks, :bmark, :delbmarks respectively
-	  and use the multiline output window for :bmarks and :history
-
-2007-08-15 00:08  stubenschrott
-
-	* chrome/content/vimperator/: buffers.js, mappings.js:
-	  australian/british english -> american english in comments added
-	  more help
-
-2007-08-14 16:16  dougkearns
-
-	* chrome/content/vimperator/bookmarks.js: use TH to markup the
-	  table headers in :marks/:qmarks output
-
-2007-08-14 15:32  dougkearns
-
-	* chrome/content/vimperator/: buffers.js, events.js, mappings.js,
-	  options.js: break up buffer.scrollAbsolute and
-	  buffer.scrollRelative into smaller, more specific, methods
-
-2007-08-14 15:24  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js,
-	  completion.js, default.css, events.js, file.js, find.js, ui.js,
-	  vimperator.js: some trivial formatting fixes
-
-2007-08-14 15:23  dougkearns
-
-	* chrome/content/vimperator/vimperator.js: don't echo an error
-	  message if no plugin directory is found
+	* NEWS: update NEWS to mention the renaming of bookmark related
+	  commands and fix some trivial help typos
 
 2007-08-13 18:12  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/mappings.js,
-	  chrome/content/vimperator/ui.js,
-	  chrome/content/vimperator/vimperator.xul: hopefully made the MOW
-	  hack better, so that it doesn't show during startup fixed
-	  wildoptions=sort
-
-2007-08-13 09:29  dougkearns
-
-	* chrome/content/vimperator/vimperator.js: fix plugin directory
-	  sourcing so it works on Windows - don't attempt to open the
-	  directory as an input stream
-
-2007-08-12 16:39  dougkearns
-
-	* chrome/content/vimperator/: commands.js, vimperator.js: expand
-	  environment variables in the filename argument to :source
-
-2007-08-12 13:20  dougkearns
-
-	* chrome/content/vimperator/mappings.js: don't echo text after
-	  copying it to the clipboard with "Y"
-
-2007-08-12 10:30  dougkearns
-
-	* chrome/content/vimperator/buffers.js: display an informational
-	  message when the text zoom value is changed
+	* ChangeLog: hopefully made the MOW hack better, so that it doesn't
+	  show during startup fixed wildoptions=sort
 
 2007-08-12 06:48  dougkearns
 
-	* NEWS, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/ui.js: add initial implementation of
-	  :normal command
+	* NEWS: add initial implementation of :normal command
 
 2007-08-12 00:03  stubenschrott
 
-	* NEWS, chrome/content/vimperator/events.js,
-	  chrome/content/vimperator/ui.js,
-	  chrome/content/vimperator/vimperator.js,
-	  chrome/content/vimperator/vimperator.xul: commandline and MIW try
-	  to keep focus now changed commandline handling in general
-	  autosize MIW on new content new handling should be more robust,
-	  but there may be bugs, please report
-
-2007-08-11 20:05  stubenschrott
-
-	* chrome/content/vimperator/: events.js, ui.js: fixed/renamed
-	  vimperator.events.toString(event); v.e.is{Accept,Cancel}Key(key)
-	  helper functions
-
-2007-08-11 19:20  stubenschrott
-
-	* chrome/content/vimperator/: events.js, vimperator.xul: added
-	  <space>-support for feedkeys() moved
-	  KeyboardEvent.prototype.toString() ->
-	  vimperator.events.eventToString()
+	* NEWS: commandline and MIW try to keep focus now changed
+	  commandline handling in general autosize MIW on new content new
+	  handling should be more robust, but there may be bugs, please
+	  report
 
 2007-08-11 17:08  stubenschrott
 
 	* ChangeLog, NEWS: changelog->NEWS, ChangeLog autogenerated now
 
-2007-08-11 16:26  dougkearns
-
-	* chrome/content/vimperator/commands.js: only allow :source to
-	  accept a single filename
-
-2007-08-11 14:49  dougkearns
-
-	* chrome/content/vimperator/buffers.js: change the bounds checking
-	  in scrollAbsolute() to allow for the fact scrollY can be larger
-	  than scrollMaxY
-
-2007-08-11 13:18  dougkearns
-
-	* chrome/content/vimperator/commands.js: allow multiple ranges to
-	  be specified to :delmarks - missing global regexp flag
-
-2007-08-11 13:07  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js: add
-	  support for the special version of :delqmarks!
-
-2007-08-11 12:46  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, completion.js,
-	  events.js, find.js, hints.js, ui.js: change remaining uses of the
-	  Array() constructor in array initializations to literals
-
-2007-08-11 11:53  dougkearns
-
-	* chrome/content/vimperator/buffers.js: beep when frame motion
-	  bounds are exceeded
-
 2007-08-11 09:28  dougkearns
 
-	* ChangeLog, chrome/content/vimperator/bookmarks.js,
-	  chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/mappings.js: rename :qmarkadd :qmark
-	  and :qmarkdel :delqmarks, sort :qmarks list output and limit
-	  buffer marks to [a-zA-Z]
+	* ChangeLog: rename :qmarkadd :qmark and :qmarkdel :delqmarks, sort
+	  :qmarks list output and limit buffer marks to [a-zA-Z]
 
 2007-08-10 18:30  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/events.js: "enter" is an
-	  alias for "return" or "cr"
-
-2007-08-10 17:52  stubenschrott
-
-	* chrome/content/vimperator/events.js: some whitespace formatting
-
-2007-08-10 17:48  stubenschrott
-
-	* chrome/content/vimperator/: events.js, hints.js: feedkeys()
-	  support!! Some bugs may remain, please test thorougly escaping
-	  the < char not yet done, as the semantics is not clear yet
-
-2007-08-10 12:57  dougkearns
-
-	* chrome/content/vimperator/mappings.js: allow the Ctrl-U/Ctrl-D
-	  scroll count to be >= 1
-
-2007-08-10 11:58  dougkearns
-
-	* chrome/content/vimperator/hints.js: declare loop counter in
-	  yankUrlHints() and yankTextHints() and reverse rev 1.27
-
-2007-08-10 11:14  dougkearns
-
-	* chrome/content/vimperator/hints.js: move win.res guard clause
-	  after initialisation of win in loadCoord()
-
-2007-08-10 02:36  stubenschrott
-
-	* chrome/content/vimperator/ui.js: fixed first use of
-	  setMultiline() with an ugly (but working) hack
-
-2007-08-10 01:38  stubenschrott
-
-	* chrome/content/vimperator/hints.js: attempt to fix problems with
-	  hints on not finished page load, should fix messages to the error
-	  console
+	* ChangeLog: "enter" is an alias for "return" or "cr"
 
 2007-08-09 22:41  stubenschrott
 
-	* ChangeLog, TODO, chrome/content/vimperator/mappings.js,
-	  chrome/content/vimperator/options.js: - Fixed gn command - added
-	  gH to activate option
-
-2007-08-09 15:32  dougkearns
-
-	* chrome/content/vimperator/mappings.js: use
-	  vimperator.buffer.location rather than replaced
-	  getCurrentLocation() for "y" mapping
-
-2007-08-09 14:42  dougkearns
-
-	* chrome/content/vimperator/contents.rdf: whitespace formatting fix
-
-2007-08-09 14:25  dougkearns
-
-	* chrome/content/vimperator/bookmarks.js: don't output status
-	  messages when history bounds are exceeded - just beep
-
-2007-08-09 12:26  dougkearns
-
-	* chrome/content/vimperator/hints.js: don't add a trailing '\n'
-	  when yanking a single line of text in extended hints mode
-
-2007-08-09 12:15  dougkearns
-
-	* chrome/content/vimperator/: commands.js, hints.js: remove the
-	  word "version" from the :version output string
+	* ChangeLog, TODO: - Fixed gn command - added gH to activate option
 
 2007-08-09 04:29  dougkearns
 
 	* vimperator.vim: reorder vimperatorCommand highlight group so that
 	  :map is highlighted
 
-2007-08-08 16:47  dougkearns
-
-	* chrome/content/vimperator/: buffers.js, commands.js,
-	  completion.js, ui.js, vimperator.js: move global completion
-	  functions into a vimperator.completion module
-
-2007-08-08 10:19  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js: move global
-	  isDirectory() to Commands()
-
-2007-08-08 05:46  dougkearns
-
-	* chrome/content/vimperator/: commands.js, help.js, mappings.js:
-	  change {count} to [count] in the usage strings since specifying a
-	  count is always optional
-
 2007-08-08 05:27  dougkearns
 
-	* ChangeLog, chrome/content/vimperator/buffers.js,
-	  chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/mappings.js,
-	  chrome/content/vimperator/options.js: add C-u/C-d mappings and
-	  the associated 'scroll' option
-
-2007-08-07 14:19  dougkearns
-
-	* chrome/content/vimperator/: buffers.js, commands.js, events.js,
-	  mappings.js, tabs.js, ui.js, vimperator.js, vimperator.xul:
-	  initial buffer implementation
-
-2007-08-07 12:57  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js: fix typo -
-	  using quickmark value from 'activate' rather than tabopen for
-	  :tabopen
-
-2007-08-07 12:14  dougkearns
-
-	* chrome/content/vimperator/: options.js, vimperator.js: move
-	  remaining preference setting from vimperator.startup to Options()
-
-2007-08-06 13:45  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, options.js, ui.js,
-	  vimperator.js: reverse last commit
-
-2007-08-06 12:52  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, options.js, ui.js,
-	  vimperator.js: move Option constructor to Options, move
-	  Options.{getPref,setPref,getFirefoxPref,setFirefoxPref} to a slot
-	  in vimperator.options and move all option initialisation to
-	  Options()
-
-2007-08-06 11:04  dougkearns
-
-	* chrome/content/vimperator/vimperator.js: don't emit an error
-	  message when ~/.vimperatorrc doesn't exist
-
-2007-08-05 14:12  dougkearns
-
-	* chrome/content/vimperator/: options.js, vimperator.js: use an
-	  unordered list rather than a table in the 'activate' help
-
-2007-08-05 06:43  dougkearns
-
-	* chrome/content/vimperator/: commands.js, hints.js, mappings.js,
-	  vimperator.js: move the global copyToClipboard() to a slot in
-	  vimperator
-
-2007-08-05 06:29  dougkearns
-
-	* chrome/content/vimperator/: commands.js, events.js, ui.js: move
-	  the global isFormElemFocused() to Events
-
-2007-08-04 13:38  dougkearns
-
-	* chrome/content/vimperator/: ui.js, vimperator.xul: add
-	  onMultilineOutputEvent for handling more-prompt keypress events
-
-2007-08-04 12:40  dougkearns
-
-	* chrome/content/vimperator/: commands.js, completion.js, file.js,
-	  vimperator.js: move global fopen() to a slot in vimperator
-
-2007-08-04 12:35  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js, options.js:
-	  remove debug toString() methods now we have vimperator.logObject
-
-2007-08-04 12:33  dougkearns
-
-	* chrome/content/vimperator/ui.js: remove more unnecessary
-	  toString() calls
-
-2007-08-04 12:18  dougkearns
-
-	* chrome/content/vimperator/bookmarks.js: remove unnecessary
-	  toString() call
-
-2007-08-04 03:22  dougkearns
-
-	* chrome/content/vimperator/: find.js, hints.js: replace references
-	  to deprecated window._content with window.content
-
-2007-08-03 02:45  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, events.js, hints.js,
-	  mappings.js, vimperator.js: - code cleanup by removing old
-	  commented code - merged zoom_in/to into vimperator.zoom()
-
-2007-08-02 15:43  dougkearns
-
-	* chrome/content/vimperator/: commands.js, completion.js, ui.js,
-	  vimperator.js: merge vimperator.execute and the execute_command()
-	  global function
-
-2007-08-02 05:10  dougkearns
-
-	* chrome/content/vimperator/: commands.js, vimperator.js: move the
-	  execute() global function to a slot of vimperator
-
-2007-08-01 12:29  stubenschrott
-
-	* chrome/content/vimperator/default.css: changed listitem selection
-	  color to be the normal selection color of the system theme
-
-2007-08-01 04:13  stubenschrott
-
-	* chrome/content/vimperator/default.css: finally found the CSS code
-	  to make the selection of listboxes better readable Putting it in
-	  default.css instead of my own userChrome.css, because also others
-	  have mentioned the hard readability.
+	* ChangeLog: add C-u/C-d mappings and the associated 'scroll'
+	  option
 
 2007-08-01 02:51  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/completion.js,
-	  chrome/content/vimperator/default.css,
-	  chrome/content/vimperator/ui.js,
-	  chrome/content/vimperator/vimperator.js: couldn't resist, had to
-	  add support for auto-sourcing ~/.vimperator/plugin/ before we
-	  release 0.5
+	* ChangeLog: couldn't resist, had to add support for auto-sourcing
+	  ~/.vimperator/plugin/ before we release 0.5
 
 2007-08-01 01:17  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/bookmarks.js,
-	  chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/mappings.js,
-	  chrome/content/vimperator/options.js,
-	  chrome/content/vimperator/vimperator.js: winopen support
-
-2007-07-31 23:44  stubenschrott
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js,
-	  vimperator.js: changed vimperator.open() to accept postdata,
-	  makes the design a little uncleaner, but supports _all_ firefox
-	  search engines now.
-
-2007-07-31 16:15  dougkearns
-
-	* chrome/content/vimperator/: mappings.js, vimperator.xul: add
-	  missing crop attribute to #vimperator-statusline-field-url label
-	  use "end" value for crop attributes rather than the deprecated
-	  "right"
-
-2007-07-31 16:02  stubenschrott
-
-	* chrome/content/vimperator/commands.js: he is called linus
-	  torvalds
+	* ChangeLog: winopen support
 
 2007-07-31 15:41  stubenschrott
 
-	* TODO, chrome/content/vimperator/bookmarks.js,
-	  chrome/content/vimperator/commands.js: Make sure, search engine
-	  aliases are unique
+	* TODO: Make sure, search engine aliases are unique
 
 2007-07-29 03:48  stubenschrott
 
-	* ChangeLog, TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/ui.js,
-	  chrome/content/vimperator/vimperator.js,
-	  chrome/content/vimperator/vimperator.xul: inputMultiline method
-	  finished (some display bug may remain) :js <<EOF support is back,
-	  better than ever (TM)
-
-2007-07-27 18:49  stubenschrott
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js, help.js,
-	  hints.js, mappings.js, ui.js, vimperator.js: openURLs ->
-	  vimperator.open(...) Support for adding bookmark groups to
-	  QuickMarks
-
-2007-07-27 10:24  stubenschrott
-
-	* chrome/content/vimperator/mappings.js: added <Nop> support
+	* ChangeLog, TODO: inputMultiline method finished (some display bug
+	  may remain) :js <<EOF support is back, better than ever (TM)
 
 2007-07-27 00:01  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/hints.js: stringToURLs ->
-	  String.prototype.toURLArray
+	* ChangeLog: stringToURLs -> String.prototype.toURLArray
 
 2007-07-26 13:39  dougkearns
 
@@ -697,1101 +393,161 @@
 
 2007-07-25 15:55  dougkearns
 
-	* TODO, chrome/content/vimperator/mappings.js: fix infinite loop
-	  when calling "gu" with a {count}
-
-2007-07-25 14:09  dougkearns
-
-	* chrome/content/vimperator/default.css: make sure the first status
-	  bar label is flush left
-
-2007-07-25 13:33  dougkearns
-
-	* chrome/content/vimperator/: commands.js, find.js, help.js,
-	  mappings.js, vimperator.js: intialize the vimperator global
-	  constant with an object literal rather than via a constructor
-	  function; move the init() and unload() global functions to
-	  startup and shutdown slots of vimperator
-
-2007-07-25 07:46  dougkearns
-
-	* chrome/content/vimperator/mappings.js: fix gH mapping so that it
-	  opens in a new tab - a regression
+	* TODO: fix infinite loop when calling "gu" with a {count}
 
 2007-07-22 15:15  dougkearns
 
 	* vimperator.vim: add map, mapclear, noremap and unmap commands to
 	  the vimperatorCommand highlight group
 
-2007-07-22 14:59  dougkearns
-
-	* chrome/content/vimperator/mappings.js: initial mapping tables for
-	  all modes at startup
-
-2007-07-22 12:59  dougkearns
-
-	* chrome/content/vimperator/mappings.js: restore guard clause to
-	  the head of getMap() to test for uninitialized stacks
-
 2007-07-22 11:44  dougkearns
 
-	* ChangeLog, chrome/content/vimperator/commands.js: allow :noremap
-	  name abbreviations
-
-2007-07-22 11:36  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js: add initial
-	  (very rough) implementation of :noremap
-
-2007-07-22 07:18  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js: allow
-	  {count}, and other flags, to be passed to e user mapping's action
-
-2007-07-21 16:42  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js: add initial
-	  (very rough) implementations of :map, :mapclear and :unmap
-
-2007-07-21 14:19  dougkearns
-
-	* chrome/content/vimperator/commands.js: add missing :javascript[!]
-	  variant to the command's usage synopsis
-
-2007-07-21 14:12  dougkearns
-
-	* chrome/content/vimperator/: commands.js, help.js: make sure [!]
-	  is highlighted properly in the help page for all command usage
-	  synopses
-
-2007-07-21 09:25  dougkearns
-
-	* chrome/content/vimperator/help.js: fix typo in introductory help
-	  text
-
-2007-07-19 16:58  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, mappings.js: fix
-	  trivial help text typos
-
-2007-07-19 15:23  dougkearns
-
-	* chrome/content/vimperator/commands.js: don't specify Command
-	  usage strings when they match the default
-
-2007-07-19 05:56  dougkearns
-
-	* chrome/content/vimperator/commands.js: fix trivial help text
-	  typos
-
-2007-07-18 10:12  dougkearns
-
-	* chrome/content/vimperator/mappings.js: fix some comment typos
+	* ChangeLog: allow :noremap name abbreviations
 
 2007-07-17 14:55  dougkearns
 
-	* ChangeLog, TODO, chrome/content/vimperator/bookmarks.js,
-	  chrome/content/vimperator/default.css,
-	  chrome/content/vimperator/vimperator.js,
-	  chrome/content/vimperator/vimperator.xul: replace readonly
-	  textboxes in the commandline and statusbar with labels and
-	  simplify the skin styling
-
-2007-07-13 16:40  dougkearns
-
-	* chrome/content/vimperator/help.js: remove the trailing HR from
-	  the help tables
-
-2007-07-13 15:01  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js: always
-	  construct a default usage string for mappings and commands
-
-2007-07-13 14:11  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, completion.js,
-	  events.js, mappings.js, options.js, tabs.js, ui.js,
-	  vimperator.js, vimperator.xul: move the Events and Tabs objects
-	  to files of their own and add a license header to files without
-	  one
-
-2007-07-12 07:48  dougkearns
-
-	* chrome/content/vimperator/vimperator.js: move initialisation of
-	  vimperator.input to the constructor function
-
-2007-07-11 17:10  dougkearns
-
-	* chrome/content/vimperator/vimperator.js: remove unused local
-	  variables in Vimperator()
-
-2007-07-11 08:35  dougkearns
-
-	* chrome/content/vimperator/: commands.js, vimperator.js: don't
-	  update the alternate tab list on TabOpen events
-
-2007-07-11 05:04  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js: move the
-	  global function focusNextFrame to a slot on vimperator -
-	  vimperator.shiftFrameFocus
-
-2007-07-10 15:02  dougkearns
-
-	* chrome/content/vimperator/vimperator.js: add KeyEvent -> String
-	  mappings for DOM_VK_LEFT_SHIFT, DOM_VK_LEFT_SHIFT and
-	  DOM_VK_F13-24
-
-2007-07-10 13:39  dougkearns
-
-	* chrome/content/vimperator/options.js: make sure input fields
-	  without an explicit 'type' attribute are matched by hinttags and
-	  extendedhintags
-
-2007-07-10 10:25  dougkearns
-
-	* chrome/content/vimperator/default.css: fix typo
-
-2007-07-10 10:07  dougkearns
-
-	* chrome/content/vimperator/: mappings.js, ui.js: limit the size of
-	  the multiline output window to the size of the browser panel
-
-2007-07-09 23:55  stubenschrott
-
-	* chrome/content/vimperator/vimperator.js: changed shift-insert
-	  patch
+	* ChangeLog, TODO: replace readonly textboxes in the commandline
+	  and statusbar with labels and simplify the skin styling
 
 2007-07-09 23:12  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/commands.js: :saveas works
-	  now
+	* ChangeLog: :saveas works now
 
 2007-07-09 13:27  stubenschrott
 
-	* AUTHORS, chrome/content/vimperator/commands.js: reverted scroll
-	  window.content patch for now (untested)
-
-2007-07-09 06:47  dougkearns
-
-	* chrome/content/vimperator/: default.css, vimperator.xul: move all
-	  XUL styling to default.css
-
-2007-07-08 20:38  stubenschrott
-
-	* chrome/content/vimperator/vimperator.js: applied shift-insert
-	  patch
-
-2007-07-05 13:02  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js, options.js:
-	  use 'web page' rather than 'webpage' in the help text
-
-2007-07-05 06:52  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js: inline
-	  yankCurrentSelection(), yankCurrentLocation(), goUp()
-
-2007-07-05 06:48  dougkearns
-
-	* chrome/content/vimperator/: mappings.js, vimperator.js: reformat
-	  hints mode mapping definitions
-
-2007-07-05 06:14  dougkearns
-
-	* chrome/content/vimperator/: commands.js, options.js,
-	  vimperator.js: move the global function updateBufferList() to
-	  vimperator.tabs until we have real buffers
-
-2007-07-04 17:32  stubenschrott
-
-	* chrome/content/vimperator/vimperator.js: applied the hintchar
-	  patch from calmar
+	* AUTHORS: reverted scroll window.content patch for now (untested)
 
 2007-07-04 13:32  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/vimperator.js,
-	  chrome/content/vimperator/vimperator.xul: changed '|' to ', ' as
-	  a url separator
-
-2007-07-04 11:59  dougkearns
-
-	* chrome/content/vimperator/commands.js: move the bmadd() and
-	  bmdel() global functions into the corresponding command
-	  definitions
-
-2007-07-04 10:58  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js: move
-	  global function bmshow() to vimperator.bookmarks.list
-
-2007-07-04 10:31  dougkearns
-
-	* chrome/content/vimperator/commands.js: move tab() global function
-	  into :tab command definition
-
-2007-07-04 10:18  dougkearns
-
-	* chrome/content/vimperator/commands.js: complete :tab with command
-	  completions
-
-2007-07-04 10:11  dougkearns
-
-	* chrome/content/vimperator/: commands.js, help.js, mappings.js,
-	  vimperator.js, vimperator.xul: move global help() command to a
-	  vimperator slot
-
-2007-07-03 12:46  dougkearns
-
-	* chrome/content/vimperator/: mappings.js, vimperator.js: remove
-	  g_hint_mappings - initialise hint mappings in vimperator.mappings
-
-2007-07-03 11:37  dougkearns
-
-	* chrome/content/vimperator/mappings.js: change last references to
-	  stepInHistory() to vimperator.history.stepTo
+	* ChangeLog: changed '|' to ', ' as a url separator
 
 2007-07-03 09:04  stubenschrott
 
-	* TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/ui.js,
-	  chrome/content/vimperator/vimperator.js,
-	  chrome/content/vimperator/vimperator.xul: Fixed some focus issues
-	  First (non-working) readMultiline implementation
-
-2007-07-03 06:49  dougkearns
-
-	* chrome/content/vimperator/mappings.js: update old references to
-	  g_inputbuffer and g_count to vimperator.input.buffer and
-	  vimperator.input.count respectively
-
-2007-07-03 05:41  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js: move
-	  g_hint_mappings to mappings.js
-
-2007-07-03 05:30  dougkearns
-
-	* chrome/content/vimperator/: commands.js, help.js, mappings.js,
-	  options.js, vimperator.js: move buffer_switch and
-	  toggleBufferList to the :buffer and :buffers ex-commands; make
-	  the "u" normal mode command call vimperator.commands.undo rather
-	  than execute_command() directly
-
-2007-07-02 15:06  dougkearns
-
-	* chrome/content/vimperator/commands.js: delete unused
-	  getCurrentLinkLocation() - moved to wiki
-
-2007-07-02 14:48  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js: move the
-	  hsshow(), stepInHistory(), historyGoToBeginning(), and
-	  historyGoToStart() global functions to vimperator.history
-
-2007-07-02 12:40  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js,
-	  vimperator.js: move reload() and reload_all() global functions to
-	  vimperator.tabs
-
-2007-07-02 12:15  dougkearns
-
-	* chrome/content/vimperator/commands.js: don't prefix false boolean
-	  option values with whitespace when reporting the value
-
-2007-07-02 11:59  dougkearns
-
-	* chrome/content/vimperator/commands.js: move the global set()
-	  command to the ex-command definition and return "name|noname' for
-	  boolean option queries rather than "name=value"
-
-2007-07-02 11:40  dougkearns
-
-	* chrome/content/vimperator/commands.js: remove template
-	  *_url_mark() functions now QuickMarks has been implemented
-
-2007-07-02 11:34  dougkearns
-
-	* chrome/content/vimperator/commands.js: move global restart()
-	  command to a vimperator slot
-
-2007-07-02 11:17  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js,
-	  vimperator.js: move global quit() command to a vimperator slot
-
-2007-07-02 10:29  dougkearns
-
-	* chrome/content/vimperator/: commands.js, hints.js, ui.js,
-	  vimperator.js: move global beep() command to a vimperator slot
-
-2007-07-02 09:43  dougkearns
-
-	* chrome/content/vimperator/: commands.js, vimperator.js: move
-	  global source() command to a vimperator slot
-
-2007-07-02 07:55  dougkearns
-
-	* chrome/content/vimperator/mappings.js: fix typo in help for 'M'
-	  mapping
-
-2007-07-02 07:40  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js: allow
-	  :marks to take an argument and sort its output properly
+	* TODO: Fixed some focus issues First (non-working) readMultiline
+	  implementation
 
 2007-07-02 06:57  dougkearns
 
-	* ChangeLog, chrome/content/vimperator/mappings.js,
-	  chrome/content/vimperator/vimperator.js: add new Ctrl-^ mapping
-	  for selecting the alternate tab
-
-2007-07-01 13:04  dougkearns
-
-	* chrome/content/vimperator/commands.js: declare undeclared
-	  variable url
-
-2007-07-01 11:04  stubenschrott
-
-	* chrome/content/vimperator/: hints.js, ui.js: autosize multiline
-	  widget
+	* ChangeLog: add new Ctrl-^ mapping for selecting the alternate tab
 
 2007-06-30 13:14  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/mappings.js: changed gO to
-	  gn
-
-2007-06-30 10:37  dougkearns
-
-	* chrome/content/vimperator/mappings.js: allow multi-character
-	  normal mode user mappings
-
-2007-06-29 11:45  stubenschrott
-
-	* chrome/content/vimperator/bookmarks.js: fixed :qmarks output
-
-2007-06-29 11:44  stubenschrott
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js,
-	  mappings.js, vimperator.js: added QuickMarks
-
-2007-06-29 06:29  dougkearns
-
-	* chrome/content/vimperator/: hints.js, vimperator.js: rename the
-	  hints constructor hit_a_hint() to Hints()
-
-2007-06-29 04:30  dougkearns
-
-	* chrome/content/vimperator/help.js: declare undeclared variable
-	  'element'
+	* ChangeLog: changed gO to gn
 
 2007-06-28 02:16  dougkearns
 
-	* TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/hints.js,
-	  chrome/content/vimperator/mappings.js,
-	  chrome/content/vimperator/vimperator.js: move the global variable
-	  hah to vimperator.hints and fix bug #17254
-
-2007-06-27 14:45  stubenschrott
-
-	* chrome/content/vimperator/bookmarks.js: small display fixes in
-	  :marks
-
-2007-06-27 14:35  stubenschrott
-
-	* chrome/content/vimperator/: bookmarks.js, ui.js: :marks support
-
-2007-06-27 13:10  stubenschrott
-
-	* chrome/content/vimperator/: ui.js, vimperator.js, vimperator.xul:
-	  initial commit of multiline echo()
-
-2007-06-27 11:22  dougkearns
-
-	* chrome/content/vimperator/ui.js: declare loop counter in
-	  InformationList#fill
-
-2007-06-26 14:45  dougkearns
-
-	* chrome/content/vimperator/completion.js: remove unused var in
-	  exTabCompletion()
-
-2007-06-26 13:11  dougkearns
-
-	* chrome/content/vimperator/ui.js: rename StatusLine#setClass's
-	  parameter to 'type' since 'class' is a reserved word
-
-2007-06-26 12:50  dougkearns
-
-	* chrome/content/vimperator/find.js: comment out unused :nohlsearch
-	  for now
-
-2007-06-26 12:32  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js: don't
-	  bother returning a status value in Marks#jumpTo and remove
-	  trailing comma in :mark help propery assignment
-
-2007-06-26 12:19  dougkearns
-
-	* chrome/content/vimperator/commands.js: remove trailing comma in
-	  :delmarks help propery assignment
-
-2007-06-26 05:07  dougkearns
-
-	* chrome/content/vimperator/help.js: remove FIXME comment
-
-2007-06-26 04:44  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js,
-	  vimperator.js: fix :mark and :delmarks (AKA return of the marks)
-	  and add range support to :delmarks
+	* TODO: move the global variable hah to vimperator.hints and fix
+	  bug #17254
 
 2007-06-25 21:23  stubenschrott
 
 	* vimperator.vim: verbosity -> verbose
 
-2007-06-25 15:57  dougkearns
-
-	* chrome/content/vimperator/options.js: remove unnecessarily
-	  defined getters for the go, stal, titlestring options
-
 2007-06-25 15:54  dougkearns
 
 	* vimperator.vim: add verbosity and vbs to options syntax group
 
-2007-06-25 15:37  dougkearns
-
-	* chrome/content/vimperator/: completion.js, options.js: add basic
-	  validators for the cpt, go, ssli, vbs, wim, and wop options
-
-2007-06-25 12:53  dougkearns
-
-	* chrome/content/vimperator/commands.js: make :set display an error
-	  message and abort if an explicit value is specified for a boolean
-	  option
-
-2007-06-25 12:06  dougkearns
-
-	* chrome/content/vimperator/commands.js: make error messages
-	  generated by :set more Vim-like
-
 2007-06-23 11:08  dougkearns
 
 	* vimperator.vim: link vimperatorTodo to the Todo highlight group
 
-2007-06-22 11:00  dougkearns
-
-	* chrome/content/vimperator/vimperator.js: move hrist's incomplete
-	  tab numbering patch to the Wiki for now
-
-2007-06-22 10:42  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js,
-	  completion.js, file.js, find.js, help.js, hints.js, mappings.js,
-	  options.js, ui.js, vimperator.js: normalise fold markers
-
-2007-06-21 16:13  dougkearns
-
-	* chrome/content/vimperator/completion.js: remove FIXME comment
-
-2007-06-21 14:29  dougkearns
-
-	* chrome/content/vimperator/bookmarks.js: add fold markers
-
-2007-06-21 11:45  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js: improve the
-	  frame motion command - add [f to the existing ]f and support
-	  {count} for both
-
-2007-06-20 14:07  stubenschrott
-
-	* chrome/content/vimperator/: ui.js, vimperator.js: keyToString ->
-	  event.toString()
-
-2007-06-19 23:01  stubenschrott
-
-	* chrome/content/vimperator/: bookmarks.js, find.js, hints.js,
-	  options.js, ui.js, vimperator.js: moved log and logObject into
-	  the vimperator object
-
-2007-06-19 14:57  dougkearns
-
-	* chrome/content/vimperator/commands.js: remove unused functions
-	  outputAddonsList, selectInput, and toggle_image
-
-2007-06-19 14:34  dougkearns
-
-	* chrome/content/vimperator/bookmarks.js: declare title temporary
-	  variable
-
-2007-06-19 13:42  dougkearns
-
-	* chrome/content/vimperator/vimperator.js: remove unused prev_match
-	  and heredoc global variables
-
-2007-06-19 12:37  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js: make the
-	  global function parseBookmarkString a static function of
-	  Bookmarks
-
-2007-06-19 06:27  dougkearns
-
-	* chrome/content/vimperator/commands.js: add all commands by name
-	  as properties of vimperator.commands
-
-2007-06-19 06:22  dougkearns
-
-	* chrome/content/vimperator/commands.js: output "not implemented
-	  yet" messages for all unimplemented commands
-
 2007-06-19 04:40  dougkearns
 
 	* vimperator.vim: update vimperator.vim with new commands
 
-2007-06-19 04:18  dougkearns
-
-	* chrome/content/vimperator/commands.js: make sure Command.names
-	  includes unabbreviatable names
-
-2007-06-18 14:34  dougkearns
-
-	* chrome/content/vimperator/: commands.js, help.js, vimperator.js:
-	  rename vimperator.ver to vimperator.version
-
-2007-06-18 07:59  dougkearns
-
-	* chrome/content/vimperator/options.js: don't include "no" prefixed
-	  variants of boolean option names in the usage
-
-2007-06-18 07:31  dougkearns
-
-	* chrome/content/vimperator/commands.js: fix typo in :bdelete help
-
-2007-06-18 06:28  dougkearns
-
-	* chrome/content/vimperator/: commands.js, completion.js: remove
-	  COMMANDS, USAGE, SHORTHELP and HELP global constants
-
-2007-06-18 05:37  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js: improve
-	  whitespace formatting of Command.toString
-
-2007-06-17 11:56  dougkearns
-
-	* chrome/content/vimperator/help.js: fix typo in previous commit
-
-2007-06-17 09:34  stubenschrott
-
-	* chrome/content/vimperator/help.js: made default value in help
-	  monospace again
-
-2007-06-16 11:36  dougkearns
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js,
-	  completion.js, help.js, hints.js, mappings.js, options.js, ui.js,
-	  vimperator.js: initial Option/Options implementation - replacing
-	  g_options
-
-2007-06-15 11:08  dougkearns
-
-	* chrome/content/vimperator/completion.js: allow :set no<TAB> to be
-	  completed with the "no"-prefix version of all boolean options
-
-2007-06-15 10:37  dougkearns
-
-	* chrome/content/vimperator/commands.js: reorder Command.names as
-	  longname1, shortname1, longname2, shortname2
-
-2007-06-14 04:11  dougkearns
-
-	* chrome/content/vimperator/: commands.js, options.js, ui.js,
-	  vimperator.js: remove unnecessary parentheses from typeof
-	  operands
-
-2007-06-13 07:53  dougkearns
-
-	* chrome/content/vimperator/default.css: don't specify a font-size
-	  for the help page
-
-2007-06-13 07:17  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js: remove some
-	  unnecessary guard clauses
-
-2007-06-13 07:14  dougkearns
-
-	* chrome/content/vimperator/: commands.js, vimperator.js: prefer
-	  comparison with the undefined literal rather than using typeof
-	  and comparing against "undefined"
-
 2007-06-12 10:48  stubenschrott
 
-	* ChangeLog, TODO, chrome/content/vimperator/find.js,
-	  chrome/content/vimperator/ui.js,
-	  chrome/content/vimperator/vimperator.js,
-	  chrome/content/vimperator/vimperator.xul: - fixed commandline
-	  focus/blur behavior - could be buggy, so please report any bugs -
-	  text selection is not possible anymore for :echo'ed things,
-	  should come later when holding shift - cleared commandline on
-	  scroll events
-
-2007-06-12 06:21  vkojouharov
-
-	* chrome/content/vimperator/bookmarks.js: uppercase marks work once
-	  again
-
-2007-06-11 12:51  dougkearns
-
-	* chrome/content/vimperator/: completion.js, default.css, help.js:
-	  use code.tag element's text content to anchor the help 'section'
-	  location rather than code.id
-
-2007-06-10 16:03  dougkearns
-
-	* chrome/content/vimperator/commands.js: remove unused var
-	  declaration in commandsIterator()
-
-2007-06-10 11:16  dougkearns
-
-	* chrome/content/vimperator/commands.js: translate ~ to HOME on
-	  Windows for use with :source
-
-2007-06-09 14:06  stubenschrott
-
-	* chrome/content/vimperator/: mappings.js, vimperator.js: Final
-	  commit for the weekend: moved onKeyPress -> vimperator.events;
+	* ChangeLog, TODO: - fixed commandline focus/blur behavior - could
+	  be buggy, so please report any bugs - text selection is not
+	  possible anymore for :echo'ed things, should come later when
+	  holding shift - cleared commandline on scroll events
 
 2007-06-09 13:39  stubenschrott
 
-	* ChangeLog, TODO, chrome/content/vimperator/mappings.js,
-	  chrome/content/vimperator/vimperator.js,
-	  chrome/content/vimperator/vimperator.xul: now we have a Events()
-	  class Please report all bugs which arised because of these
-	  changes Still not sure, if we should put that into an event.js
-
-2007-06-09 13:20  vkojouharov
-
-	* chrome/content/vimperator/bookmarks.js: The global marks
-	  correctly jump to their stored position, once the page has been
-	  loaded
-
-2007-06-09 13:05  stubenschrott
-
-	* chrome/content/vimperator/vimperator.js: Finally made event
-	  handling sane, creating an Events object will come soon.  This
-	  fixed many bugs like the reload/stop buttons being correctly
-	  updated now, while getting rid of lots of old code.
+	* ChangeLog, TODO: now we have a Events() class Please report all
+	  bugs which arised because of these changes Still not sure, if we
+	  should put that into an event.js
 
 2007-06-08 17:21  stubenschrott
 
 	* mozunit.js: added preliminary unit tests, not working yet,
 	  because the vimperator object cannot be found in this context.
 
-2007-06-08 15:33  dougkearns
-
-	* chrome/content/vimperator/: default.css, help.js: make sure the
-	  help text is using a fixed-pitch font
-
-2007-06-08 15:16  dougkearns
-
-	* chrome/content/vimperator/: commands.js, mappings.js: use ||
-	  short-circuit initialization idiom when processing Command and
-	  Map constructor args
-
-2007-06-08 06:48  dougkearns
-
-	* chrome/content/vimperator/commands.js: markup the ex-command
-	  special flag '!' with code.command in help text
-
-2007-06-08 00:46  dougkearns
-
-	* chrome/content/vimperator/commands.js: remove old/disabled
-	  :addons command
-
-2007-06-08 00:06  stubenschrott
-
-	* chrome/content/vimperator/vimperator.js: small fixes to the input
-	  handling
-
 2007-06-07 23:33  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/bookmarks.js,
-	  chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/find.js,
-	  chrome/content/vimperator/mappings.js,
-	  chrome/content/vimperator/vimperator.js: marks support (thanks
-	  viktor)
-
-2007-06-07 12:53  stubenschrott
-
-	* chrome/content/vimperator/commands.js: added back zoom_to
-	  function
-
-2007-06-07 06:54  dougkearns
-
-	* chrome/content/vimperator/commands.js: markup 'activate' option
-	  as such in :tabopen help text
-
-2007-06-07 06:45  dougkearns
-
-	* chrome/content/vimperator/: commands.js, help.js, mappings.js,
-	  options.js: fix some help text typos
-
-2007-06-07 04:40  stubenschrott
-
-	* chrome/content/vimperator/default.css: changed the colors back to
-	  green/red.
-
-2007-06-06 16:01  dougkearns
-
-	* chrome/content/vimperator/commands.js: remove unused global
-	  constants FUNCTION and COMPLETEFUNC
-
-2007-06-06 15:32  dougkearns
-
-	* chrome/content/vimperator/: commands.js, completion.js,
-	  default.css, help.js, mappings.js, options.js, vimperator.xul:
-	  change all references to "settings" to "options"
-
-2007-06-06 13:52  dougkearns
-
-	* chrome/content/vimperator/: commands.js, completion.js,
-	  default.css, help.js, mappings.js, vimperator.xul: convert help
-	  page to XHTML Strict (excepting the id values) and add initial
-	  implementations for the :viusage and :exusage commands
-
-2007-06-06 06:42  dougkearns
-
-	* chrome/content/vimperator/: commands.js, completion.js, find.js,
-	  help.js, mappings.js: initial Command/Commands implementation -
-	  replacing g_commands
-
-2007-06-05 14:05  dougkearns
-
-	* chrome/content/vimperator/bookmarks.js: comment out debugging log
-	  message
+	* ChangeLog: marks support (thanks viktor)
 
 2007-06-05 05:22  dougkearns
 
 	* TODO: add <ESC> closes :addons window bug to TODO
 
-2007-06-03 16:12  dougkearns
-
-	* chrome/content/vimperator/: mappings.js, vimperator.js: fix
-	  missing [count] functionality in normal mode commands
-
-2007-05-31 17:58  stubenschrott
-
-	* chrome/content/vimperator/mappings.js: made action public to
-	  change .execute() to be a prototype
-
-2007-05-31 11:02  dougkearns
-
-	* chrome/content/vimperator/: completion.js, help.js: add missing
-	  var declarations
-
-2007-05-31 09:11  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, completion.js, help.js,
-	  mappings.js, vimperator.js, vimperator.xul: merged the new
-	  mappings code, all glory goes to Doug!
-
-2007-05-31 06:45  dougkearns
-
-	* chrome/content/vimperator/mappings.js: fix the mapping usage
-	  string to only show the primary command
-
-2007-05-30 13:03  dougkearns
-
-	* chrome/content/vimperator/ui.js: fix typo in bufferposition_str
-	  variable declaration
-
-2007-05-30 11:58  dougkearns
-
-	* chrome/content/vimperator/mappings.js: remove a trailing , and
-	  :retab the file
-
-2007-05-30 09:35  dougkearns
-
-	* chrome/content/vimperator/mappings.js: change references to
-	  vimperator.mode to vimperator.modes
-
-2007-05-30 07:22  dougkearns
-
-	* chrome/content/vimperator/mappings.js: fix extra_info processing
-	  in Map() and other minor typos
-
-2007-05-30 04:25  stubenschrott
-
-	* chrome/content/vimperator/mappings.js: cleaned up mappings code,
-	  should be feature complete now (apart from the non-implemented
-	  getAll() method.
-
-2007-05-29 10:42  stubenschrott
-
-	* chrome/content/vimperator/vimperator.js: Added (outcommented
-	  because too slow) 'numbertabs' option (by hrist).
-
-2007-05-29 06:38  vkojouharov
-
-	* chrome/content/vimperator/mappings.js: changed the flags back.
-	  don't use 1 << 0 for any of the flags, since the 'default' one is
-	  0
-
-2007-05-29 01:55  dougkearns
-
-	* chrome/content/vimperator/mappings.js: fix some minor,
-	  reintroduced, typos and add missing help line for <ESC> map
-
-2007-05-28 22:46  stubenschrott
-
-	* chrome/content/vimperator/mappings.js: changed coding style,
-	  commented things which should be changed with XXX:
-
-2007-05-28 17:09  dougkearns
-
-	* chrome/content/vimperator/commands.js: add missing var
-	  declaration to urls in openURLs*()
-
-2007-05-28 16:49  dougkearns
-
-	* chrome/content/vimperator/mappings.js: finish converting the
-	  mappings to the new Map() format
-
-2007-05-28 07:22  dougkearns
-
-	* chrome/content/vimperator/vimperator.js: add missing variable
-	  declaration for thistype, thismode, thisfunc in triggerCallBack()
-
-2007-05-28 01:06  dougkearns
-
-	* chrome/content/vimperator/: find.js, vimperator.js: remove last
-	  references to command_line and status_line
-
-2007-05-27 15:48  stubenschrott
-
-	* chrome/content/vimperator/: vimperator.js, vimperator.xul:
-	  explicitly set JS version to 1.7
-
-2007-05-27 15:20  vkojouharov
-
-	* chrome/content/vimperator/mappings.js: RFC: the api for the new
-	  mappings
-
-2007-05-25 13:11  stubenschrott
-
-	* chrome/content/vimperator/find.js: removed 'noh'
-
-2007-05-25 11:13  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, find.js: changed
-	  nohlsearch to the new spec
-
-2007-05-25 06:59  dougkearns
-
-	* chrome/content/vimperator/commands.js: fix accidental regression
-	  in :tabmove name specification
-
 2007-05-24 21:57  stubenschrott
 
-	* AUTHORS, ChangeLog, TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/vimperator.js: added Y command
-
-2007-05-24 16:54  dougkearns
-
-	* chrome/content/vimperator/vimperator.js: update the buffer list
-	  on page load completion (the non-existant showBufferList() was
-	  being called rather than updateBufferList())
-
-2007-05-24 11:49  dougkearns
-
-	* chrome/content/vimperator/commands.js: fix typo in :open
-	  command's short help description
+	* AUTHORS, ChangeLog, TODO: added Y command
 
 2007-05-24 10:47  stubenschrott
 
-	* AUTHORS, ChangeLog, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/vimperator.js: flashing frame works now
+	* AUTHORS, ChangeLog: flashing frame works now
 
 2007-05-23 01:18  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/vimperator.js,
-	  chrome/content/vimperator/vimperator.xul: moved tab related
-	  functions to the Tabs class
+	* ChangeLog: moved tab related functions to the Tabs class
 
 2007-05-22 09:13  stubenschrott
 
-	* ChangeLog, TODO, chrome/content/vimperator/bookmarks.js,
-	  chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/ui.js,
-	  chrome/content/vimperator/vimperator.js,
-	  chrome/content/vimperator/vimperator.xul: many help fixes moved
-	  echo() -> vimperator.echo() and removed old XUL entries.
+	* ChangeLog, TODO: many help fixes moved echo() ->
+	  vimperator.echo() and removed old XUL entries.
 
 2007-05-21 09:35  stubenschrott
 
-	* ChangeLog, TODO, vimperator.vim,
-	  chrome/content/vimperator/commands.js: "R" -> reload without
-	  cache
+	* ChangeLog, TODO, vimperator.vim: "R" -> reload without cache
 
 2007-05-20 16:01  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/default.css,
-	  chrome/content/vimperator/vimperator.js: changed colors
-
-2007-05-20 15:52  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, completion.js, help.js,
-	  vimperator.js: commited help typos
-
-2007-05-20 13:53  vkojouharov
-
-	* chrome/content/vimperator/: default.css, ui.js, vimperator.js:
-	  move the statusbar color handling to the css file. for the
-	  future, whenever a background color is set, the foreground color
-	  should also be set, otherwise text might be unreadable in dark
-	  themes (or light themes, depending on what theme the user has)
-
-2007-05-20 11:05  stubenschrott
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js,
-	  contents.rdf, vimperator.js: commited pending changes, nothing
-	  big
-
-2007-05-18 15:43  stubenschrott
-
-	* chrome/content/vimperator/completion.js: one less global variable
-	  (g_completions)
-
-2007-05-18 15:36  stubenschrott
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js,
-	  completion.js, ui.js, vimperator.js: fully objectized History()
-	  and Bookmarks()
-
-2007-05-18 04:13  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, find.js, hints.js,
-	  ui.js, vimperator.js: rewrote mode-handling
+	* ChangeLog: changed colors
 
 2007-05-17 18:48  stubenschrott
 
-	* AUTHORS, ChangeLog, TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/vimperator.js: Added "titlestring"
-	  setting
-
-2007-05-16 15:31  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, find.js, ui.js,
-	  vimperator.js, vimperator.xul: renamed commandline.js -> ui.js
-	  moved all statusbar code to the StatusLine() class
-
-2007-05-15 04:50  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, completion.js,
-	  vimperator.js, vimperator.xul: renamed CompletionList ->
-	  InformationList which is now a common class for the completion
-	  window, for the preview window and the buffer window ("B").  Only
-	  the StatusLine class to go...
-
-2007-05-14 13:51  stubenschrott
-
-	* chrome/content/vimperator/: default.css, find.js: small CSS fixes
-	  by Doug and added modelines to find.js and commandline.js
+	* AUTHORS, ChangeLog, TODO: Added "titlestring" setting
 
 2007-05-14 13:24  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/commands.js: initial
-	  :tabmove command
-
-2007-05-13 22:29  vkojouharov
-
-	* chrome/content/vimperator/help.js: The Help Strikes Back
-
-2007-05-13 21:36  vkojouharov
-
-	* chrome/content/vimperator/vimperator.js: The Return of the Link
-
-2007-05-12 15:27  stubenschrott
-
-	* chrome/content/vimperator/find.js: add forgotten files
+	* ChangeLog: initial :tabmove command
 
 2007-05-11 12:42  stubenschrott
 
-	* Makefile, chrome/content/vimperator/bookmarks.js,
-	  chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/completion.js,
-	  chrome/content/vimperator/help.js,
-	  chrome/content/vimperator/hints.js,
-	  chrome/content/vimperator/vimperator.js,
-	  chrome/content/vimperator/vimperator.xul: First attempt in making
-	  vimperator object orietened.	For now only the CommandLine widget
-	  was made a real encapsulated object.
+	* Makefile: First attempt in making vimperator object orietened.
+	  For now only the CommandLine widget was made a real encapsulated
+	  object.
 
 2007-05-09 11:56  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/vimperator.js: final commit before
-	  trying to integrate the search patch
-
-2007-05-09 01:44  stubenschrott
-
-	* chrome/content/vimperator/vimperator.js: changed setOverLink back
-	  to echo() as I really couldn't stand it anymore in the statusbar
-	  Mail me if you really want it in the statusbar, and come up with
-	  a good setting name for this preference
+	* ChangeLog: final commit before trying to integrate the search
+	  patch
 
 2007-05-09 00:31  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/help.js,
-	  chrome/content/vimperator/vimperator.js: cleaned up html code for
-	  :help to make it more xhtml compatible :help now opens in the
-	  current tab even when current tab is a xhtml document
+	* ChangeLog: cleaned up html code for :help to make it more xhtml
+	  compatible :help now opens in the current tab even when current
+	  tab is a xhtml document
 
 2007-05-08 21:21  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/hints.js: hint work on xhtml pages now
-	  (slight problem with not disapperaring them still open)
+	* ChangeLog: hint work on xhtml pages now (slight problem with not
+	  disapperaring them still open)
 
 2007-05-08 16:57  stubenschrott
 
-	* AUTHORS, ChangeLog, TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/completion.js,
-	  chrome/content/vimperator/help.js: added :tablast etc. commands
-
-2007-05-08 15:04  vkojouharov
-
-	* chrome/content/vimperator/completion.js: the substrings shouldn't
-	  be cleared in this particular case
+	* AUTHORS, ChangeLog, TODO: added :tablast etc. commands
 
 2007-05-04 22:48  stubenschrott
 
-	* AUTHORS, ChangeLog, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/completion.js: fixed :dl command
+	* AUTHORS, ChangeLog: fixed :dl command
 
 2007-05-04 18:04  stubenschrott
 
 	* ChangeLog, Donators, Makefile, vimperator.vim,
-	  vimperatorrc.example, chrome/content/vimperator/bookmarks.js,
-	  chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/completion.js,
-	  chrome/content/vimperator/help.js,
-	  chrome/content/vimperator/vimperator.js: keyword support for
-	  bookmarks
-
-2007-05-03 13:27  stubenschrott
-
-	* chrome/content/vimperator/help.js: fixed \\n in help files
+	  vimperatorrc.example: keyword support for bookmarks
 
 2007-05-02 12:59  stubenschrott
 
@@ -1799,58 +555,28 @@
 
 2007-05-02 12:55  stubenschrott
 
-	* ChangeLog, Makefile, chrome/content/vimperator/bookmarks.js: bug
-	  fix release
+	* ChangeLog, Makefile: bug fix release
 
 2007-05-02 12:47  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/commands.js: fixed :open
-	  google.com opening google for searching ".com"
-
-2007-05-02 12:28  stubenschrott
-
-	* chrome/content/vimperator/: default.css, help.js, vimperator.js:
-	  pass <enter> <space> <tab> etc. to vimperator now, so that they
-	  can perform their default action without beeping.  Quite hacky so
-	  far, should be cleaned up.
-
-2007-05-02 04:18  stubenschrott
-
-	* chrome/content/vimperator/: default.css, help.js: added version
-	  info to help file, fixed font size for tables
+	* ChangeLog: fixed :open google.com opening google for searching
+	  ".com"
 
 2007-05-01 17:29  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/bookmarks.js,
-	  chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/vimperator.js: added 'defsearch'
-	  setting
-
-2007-05-01 15:31  vkojouharov
-
-	* chrome/content/vimperator/help.js: scroll to the proper location
-	  without the need of an offset
+	* ChangeLog: added 'defsearch' setting
 
 2007-05-01 11:23  stubenschrott
 
-	* ChangeLog, TODO, install.rdf,
-	  chrome/content/vimperator/commands.js: [no log message]
+	* ChangeLog, TODO, install.rdf: [no log message]
 
 2007-05-01 00:19  stubenschrott
 
-	* Makefile, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/completion.js: fixed gu and gU
+	* Makefile: fixed gu and gU
 
 2007-04-30 10:59  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/commands.js: fixed :o
-	  http://www.url.com
-
-2007-04-30 03:15  stubenschrott
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js,
-	  completion.js: - use default firefox engines :qsadd, :qsdel
-	  commands not yet done
+	* ChangeLog: fixed :o http://www.url.com
 
 2007-04-29 19:13  stubenschrott
 
@@ -1864,137 +590,51 @@
 
 	* Makefile: [no log message]
 
-2007-04-29 17:51  stubenschrott
-
-	* chrome/content/vimperator/default.css: add
-
 2007-04-29 16:31  stubenschrott
 
 	* ChangeLog, install.rdf: website updates
 
 2007-04-29 15:04  stubenschrott
 
-	* ChangeLog, TODO, chrome/content/vimperator/bookmarks.js,
-	  chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/completion.js,
-	  chrome/content/vimperator/vimperator.js: Many small bugfixes
-	  changed wildsort -> wildoptions=sort added completion for
-	  filenames
-
-2007-04-29 03:35  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, completion.js, help.js,
-	  vimperator.js: changed ":help open" to ":help :open"
-
-2007-04-29 02:18  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, help.js: fixed display
-	  of <> in help
-
-2007-04-29 01:48  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, help.js: experimental
-	  new help design
+	* ChangeLog, TODO: Many small bugfixes changed wildsort ->
+	  wildoptions=sort added completion for filenames
 
 2007-04-29 00:26  stubenschrott
 
-	* Makefile, TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/help.js,
-	  chrome/content/vimperator/hints.js,
-	  chrome/content/vimperator/vimperator.xul: Makefile fixes and much
-	  sexier help file
-
-2007-04-28 18:08  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, help.js: added
-	  update.rdf.in changed help file to look much more vim like (with
-	  monospaced font)
-
-2007-04-28 17:18  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, help.js, vimperator.js:
-	  fixed :q command
+	* Makefile, TODO: Makefile fixes and much sexier help file
 
 2007-04-28 16:05  stubenschrott
 
-	* chrome/content/vimperator/vimperator.js: typo
-
-2007-04-28 16:05  stubenschrott
-
-	* install.rdf, chrome/content/vimperator/help.js,
-	  chrome/content/vimperator/vimperator.js: added ###VERSION### and
-	  ###DATE### for being seded in the Makefile
-
-2007-04-28 15:39  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, help.js, hints.js,
-	  vimperator.js: fixed hints
+	* install.rdf: added ###VERSION### and ###DATE### for being seded
+	  in the Makefile
 
 2007-04-28 12:14  stubenschrott
 
-	* ChangeLog, TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/help.js: added goUp() and
-	  isDirectory(uri) functions gu and gU mappings for going up
-
-2007-04-28 10:15  vkojouharov
-
-	* chrome/content/vimperator/vimperator.js: delay sourcing of the rc
-	  file so that commands that open new tabs (like js!) can work
-
-2007-04-28 09:52  vkojouharov
-
-	* chrome/content/vimperator/: commands.js, completion.js, file.js,
-	  help.js: fixes:   'tag' command works once more   'source ~/'
-	  shows the matches   fdopen checks whether the file exists, and
-	  throws a more-readable error if it doesn't   'help' work if the
-	  current document is a XULDocument (it shows the help in a new
-	  tab)
+	* ChangeLog, TODO: added goUp() and isDirectory(uri) functions gu
+	  and gU mappings for going up
 
 2007-04-28 01:56  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/completion.js,
-	  chrome/content/vimperator/help.js,
-	  chrome/content/vimperator/vimperator.js: major code cleanup by
-	  using constants instead of indices, small bugs still may occur
-	  due to this change
+	* ChangeLog: major code cleanup by using constants instead of
+	  indices, small bugs still may occur due to this change
 
 2007-04-27 19:06  stubenschrott
 
-	* TODO, install.rdf, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/completion.js,
-	  chrome/content/vimperator/vimperator.js: wildmode and wildsort
-	  support :open . and .. and .../ supported
-
-2007-04-25 23:49  stubenschrott
-
-	* chrome/content/vimperator/commands.js: small changes
+	* TODO, install.rdf: wildmode and wildsort support :open . and ..
+	  and .../ supported
 
 2007-04-25 17:11  stubenschrott
 
 	* Makefile, TODO, vimperatorrc.example: Makefile changes for
 	  missing chrome/ dir
 
-2007-04-25 09:30  stubenschrott
-
-	* chrome/content/vimperator/vimperator.js: changed version number
-	  for now a little
-
 2007-04-25 09:20  stubenschrott
 
-	* TODO, chrome/content/vimperator/commands.js: added feeling lucky
-	  'lucky' quick search
+	* TODO: added feeling lucky 'lucky' quick search
 
 2007-04-24 21:06  stubenschrott
 
-	* ChangeLog, TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/vimperator.js: esc -> C-c to stop page
-	  :stop command added
-
-2007-04-24 19:47  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, vimperator.js: 'B' works
-	  now as it is supposed to do
+	* ChangeLog, TODO: esc -> C-c to stop page :stop command added
 
 2007-04-24 14:10  stubenschrott
 
@@ -2003,56 +643,22 @@
 
 2007-04-24 12:12  stubenschrott
 
-	* AUTHORS, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/completion.js,
-	  chrome/content/vimperator/vimperator.js: applied 'B' patch from
-	  Lars (not working fully) cleaned up init() and moved all
-	  eventlisteneres code to addEventListeners()
-
-2007-04-23 18:46  vkojouharov
-
-	* chrome/content/vimperator/: commands.js, help.js: removed the
-	  command wrapping in the help output
-
-2007-04-23 18:23  vkojouharov
-
-	* chrome/content/vimperator/: commands.js, vimperator.xul: fix the
-	  :help command
-
-2007-04-23 11:14  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, completion.js, help.js,
-	  vimperator.xul: make help.js a seperate file, small indention
-	  fixes
-
-2007-04-22 23:56  vkojouharov
-
-	* chrome/content/vimperator/completion.js: file completion now
-	  works for the path '/' also
+	* AUTHORS: applied 'B' patch from Lars (not working fully) cleaned
+	  up init() and moved all eventlisteneres code to
+	  addEventListeners()
 
 2007-04-22 23:21  vkojouharov
 
-	* Makefile, install.rdf, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/vimperator.js: redesing of the help
-	  page to be more like vim's help. :tab command like in vim.  the
-	  extension id has changed to a more readable string. any older
-	  versions of vimperator MUST be uninstalled, otherwise there will
-	  be 2 versions of the extension in the addons list.
+	* Makefile, install.rdf: redesing of the help page to be more like
+	  vim's help. :tab command like in vim.  the extension id has
+	  changed to a more readable string. any older versions of
+	  vimperator MUST be uninstalled, otherwise there will be 2
+	  versions of the extension in the addons list.
 
 2007-04-22 17:50  stubenschrott
 
 	* Donators: update
 
-2007-04-22 14:17  vkojouharov
-
-	* chrome/content/vimperator/: commands.js, completion.js, file.js,
-	  vimperator.js, vimperator.xul: ex parser for use with
-	  .vimperatorrc, the command line and other sourced files. sourced
-	  files are no longer javascript code, but can use the new
-	  :javascript ex command to execute javascript. :javascript also
-	  supports multiline with heredocs (:js <<EOF). File completion for
-	  the :source command.
-
 2007-04-22 14:10  vkojouharov
 
 	* TODO: bug--
@@ -2063,29 +669,15 @@
 
 2007-04-21 18:06  stubenschrott
 
-	* ChangeLog, chrome/content/vimperator/commands.js: :back! and
-	  :forward! support
+	* ChangeLog: :back! and :forward! support
 
 2007-04-21 11:18  stubenschrott
 
-	* Donators, chrome/content/vimperator/commands.js: set horizontal
-	  offset to 0
-
-2007-04-21 02:08  stubenschrott
-
-	* chrome/content/vimperator/commands.js: coding style fixes
-
-2007-04-21 02:05  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, hints.js, vimperator.js:
-	  valign=top for cells
+	* Donators: set horizontal offset to 0
 
 2007-04-20 21:25  stubenschrott
 
-	* ChangeLog, Donators, TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/completion.js,
-	  chrome/content/vimperator/vimperator.js: added section support
-	  for :help
+	* ChangeLog, Donators, TODO: added section support for :help
 
 2007-04-20 15:23  stubenschrott
 
@@ -2097,92 +689,45 @@
 
 2007-04-20 15:03  stubenschrott
 
-	* ChangeLog, Makefile, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/vimperator.js: :source support
+	* ChangeLog, Makefile: :source support
 
 2007-04-20 14:46  stubenschrott
 
-	* ChangeLog, Makefile, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/file.js,
-	  chrome/content/vimperator/vimperator.js,
-	  chrome/content/vimperator/vimperator.xul: now we have a new build
-	  Makefile also added file.js which is responsible for file
-	  writing/loading in future
+	* ChangeLog, Makefile: now we have a new build Makefile also added
+	  file.js which is responsible for file writing/loading in future
 
 2007-04-20 13:33  stubenschrott
 
-	* ChangeLog, TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/hints.js,
-	  chrome/content/vimperator/vimperator.js: - fixed hints display on
-	  zoom - fixed n and N commands (don't use closures)
+	* ChangeLog, TODO: - fixed hints display on zoom - fixed n and N
+	  commands (don't use closures)
 
 2007-04-20 03:01  stubenschrott
 
-	* ChangeLog, TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/completion.js,
-	  chrome/content/vimperator/vimperator.js: hmm, forgot what I
-	  changed :)
-
-2007-04-19 23:35  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, completion.js, hints.js,
-	  vimperator.js: added showmode setting
-
-2007-04-19 16:21  stubenschrott
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js,
-	  completion.js, hints.js, vimperator.js: change tabs->4 spaces
+	* ChangeLog, TODO: hmm, forgot what I changed :)
 
 2007-04-19 16:09  stubenschrott
 
-	* ChangeLog, Donators, TODO,
-	  chrome/content/vimperator/bookmarks.js,
-	  chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/completion.js,
-	  chrome/content/vimperator/hints.js,
-	  chrome/content/vimperator/vimperator.js: added modelines
-	  everywhere
-
-2007-04-19 14:00  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, completion.js: added
-	  :buffer(s) commands
+	* ChangeLog, Donators, TODO: added modelines everywhere
 
 2007-04-19 13:29  stubenschrott
 
-	* TODO, chrome/content/vimperator/commands.js: restart command
+	* TODO: restart command
 
 2007-04-18 13:33  stubenschrott
 
-	* TODO, chrome/content/vimperator/commands.js: added contact
-	  section to homepage
+	* TODO: added contact section to homepage
 
 2007-04-18 11:42  stubenschrott
 
-	* ChangeLog, TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/hints.js,
-	  chrome/content/vimperator/vimperator.js: support for space and
-	  alt-left/right keys
+	* ChangeLog, TODO: support for space and alt-left/right keys
 
 2007-04-18 11:06  stubenschrott
 
-	* ChangeLog, TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/vimperator.js: [+-] support for
-	  settings
-
-2007-04-18 01:18  stubenschrott
-
-	* chrome/content/vimperator/: commands.js, vimperator.xul: added
-	  counter to web site
-
-2007-04-17 22:44  stubenschrott
-
-	* chrome/content/vimperator/commands.js: Changed wiki search engine
+	* ChangeLog, TODO: [+-] support for settings
 
 2007-04-17 20:07  stubenschrott
 
-	* ChangeLog, Donators, TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/hints.js: Added n and N commands
+	* ChangeLog, Donators, TODO: Added n and N commands
 
 2007-04-17 17:34  stubenschrott
 
@@ -2190,21 +735,16 @@
 
 2007-04-17 16:44  stubenschrott
 
-	* ChangeLog, Donators, TODO, install.rdf,
-	  chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/vimperator.js: version 0.3, added
+	* ChangeLog, Donators, TODO, install.rdf: version 0.3, added
 	  ignorekeys support
 
 2007-04-16 23:31  stubenschrott
 
-	* ChangeLog, Donators, TODO, chrome/content/vimperator/commands.js,
-	  chrome/content/vimperator/vimperator.js,
-	  chrome/content/vimperator/vimperator.xul: Added Ctrl-[ alias, and
-	  's' guioption
+	* ChangeLog, Donators, TODO: Added Ctrl-[ alias, and 's' guioption
 
 2007-04-11 18:38  stubenschrott
 
-	* TODO, chrome/content/vimperator/commands.js: go_tab -> tab_go
+	* TODO: go_tab -> tab_go
 
 2007-04-11 03:15  stubenschrott
 
@@ -2214,12 +754,6 @@
 
 	* ChangeLog, TODO: [no log message]
 
-2007-04-10 19:43  stubenschrott
-
-	* chrome/content/vimperator/: bookmarks.js, commands.js,
-	  completion.js, contents.rdf, hints.js, vimperator.js,
-	  vimperator.xul: Initial import
-
 2007-04-10 19:32  stubenschrott
 
 	* ChangeLog, TODO, chrome.manifest, install.rdf:
diff --git a/content/commands.js b/content/commands.js
index aeb5e819..5c4850c7 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1353,7 +1353,7 @@ function Commands() //{{{
                 toggleSidebar();
         },
         {
-            short_help: "Close the sidebar"
+            short_help: "Close the sidebar window"
         }
     ));
     // TODO: sopen instead? Separate :sidebar from :sbopen and make them behave

From aec5bda926968c42e38c22f16c76690ed1b9a7f0 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 10 Oct 2007 06:03:13 +0000
Subject: [PATCH 122/224] mention $VIMPERATOR_HOME in the help

---
 content/help.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/content/help.js b/content/help.js
index bc0cc989..7854d3c4 100644
--- a/content/help.js
+++ b/content/help.js
@@ -179,7 +179,8 @@ vimperator.help = function(section, easter) //{{{
         '<ul>' +
         '<li>Unix and Mac - $HOME is used.</li>' +
         '<li>Windows - if $HOME is set then this is used, otherwise $USERPROFILE or finally $HOMEDRIVE$HOMEPATH.</li>' +
-        '</ul>';
+        '</ul>' +
+        '$VIMPERATOR_HOME can be used to override the calculated $HOME directory.';
 
     var mappings = '<span style="float: right"><code class="tag">mappings</code></span><h2 id="mappings">Mappings</h2>' +
         '<p>The denotion of modifier keys is like in Vim, so C- means the Control key, M- the Meta key, A- the Alt key and S- the Shift key.</p>'+

From a28bf350774654ca3348e103cb6ae50a6db2e8e7 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 10 Oct 2007 11:52:20 +0000
Subject: [PATCH 123/224] update ChangeLog

---
 ChangeLog | 4059 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 3428 insertions(+), 631 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2190d43b..ba6ba753 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,761 +1,3558 @@
-2007-10-10 02:54  dougkearns
+2007-10-10  dougkearns  <dougkearns>
+
+	* src/content/commands.js, src/content/options.js,
+	src/content/util.js, src/content/vimperator.js:
+	new :set and :prefs commands, tweaked :set output to use colors
+	[0794539f1ab5] [tip]
 
-	* content/: commands.js, options.js, util.js, vimperator.js: new
-	  :set and :prefs commands, tweaked :set output to use colors
+	* src/NEWS, src/TODO:
+	update NEWS and TODO
+	[db18232e0378]
 
-2007-10-10 02:46  dougkearns
+	* src/content/commands.js, src/content/vimperator.js:
+	add :!! support and don't show error on :!non-existing-command (as
+	the non-existing-command can't be known if it really does not exist)
+	[9382220a294e]
+
+	* src/skin/vimperator.css:
+	allow the sidebar width to range from 10% - 90%
+	[866121d6e836]
+
+2007-10-09  dougkearns  <dougkearns>
 
-	* NEWS, TODO: update NEWS and TODO
+	* src/NEWS, src/TODO, src/content/commands.js,
+	src/content/mappings.js, src/content/tabs.js:
+	merge count support for deleting buffers
+	[47359fc09b9e]
 
-2007-10-10 00:39  dougkearns
+	* src/NEWS, src/TODO, src/content/commands.js,
+	src/content/completion.js:
+	back/:forward has tab completion, slightly broken for
+	wildmode=longest for now, as we need to refactor g_substrings later
+	[7d93627d0776]
 
-	* content/: commands.js, vimperator.js: add :!! support and don't
-	  show error on :!non-existing-command (as the non-existing-command
-	  can't be known if it really does not exist)
+	* src/NEWS, src/content/commands.js:
+	:undoall + :undo tab-completion
+	[56df9419cd42]
+
+	* src/NEWS, src/content/hints.js, src/content/mappings.js:
+	add "s" and "a" mappings to extended hints mode for saving hint
+	targets
+	[ac52153f53f1]
 
-2007-10-09 23:21  dougkearns
+	* src/content/mappings.js:
+	update / and ? help for changed 'linksearch' modifiers
+	[7bce55c4d6ce]
 
-	* skin/vimperator.css: allow the sidebar width to range from 10% -
-	  90%
+	* src/Donators, src/NEWS, src/content/commands.js,
+	src/content/find.js, src/content/mappings.js:
+	merge new :redraw command and changed 'linksearch' pattern modifiers
+	[72188ac54c23]
 
-2007-10-09 13:50  dougkearns
+	* src/content/ui.js, src/content/vimperator.xul:
+	merge MOW improvements
+	[30d96e40480e]
 
-	* NEWS, TODO, content/commands.js, content/mappings.js,
-	  content/tabs.js: merge count support for deleting buffers
+	* src/content/help.js, src/content/ui.js:
+	merge use of "[Help]" and "[No Name]" in the status line for the
+	internal help page and about:blank
+	[506479a63f0e]
+
+2007-10-08  dougkearns  <dougkearns>
+
+	* src/content/vimperator.xul:
+	sst default highlight group class to hl-Normal for #status-bar and
+	#vimperator-commandline
+	[b9a11bf9afe2]
+
+	* src/content/ui.js, src/skin/vimperator.css:
+	use standard-ish Vim highlight group names for the statusline
+	styling
+	[d689957a932a]
+
+	* src/content/commands.js:
+	close :time MOW output table element
+	[768947ea8550]
+
+2007-10-07  dougkearns  <dougkearns>
+
+	* src/content/events.js:
+	clear the commandline when changing tabs
+	[586150e169e0]
+
+2007-10-06  dougkearns  <dougkearns>
+
+	* src/NEWS, src/content/commands.js, src/content/vimperator.js:
+	merge :! es command
+	[3390858f1822]
+
+	* src/vimperatorrc.example:
+	update vimperatorrc.example - 'beep' is now 'visualbell'
+	[256a1c301e3e]
+
+	* src/content/commands.js:
+	display an error message if :buffers is given an argument
+	[e90f33fc2360]
+
+	* src/content/bookmarks.js, src/content/buffers.js,
+	src/content/commands.js, src/content/find.js,
+	src/content/mappings.js, src/content/options.js, src/content/ui.js,
+	src/content/util.js, src/content/vimperator.js,
+	src/content/vimperator.xul, src/skin/vimperator.css:
+	merge MOW improvements
+	[c615687be9be]
+
+2007-10-04  dougkearns  <dougkearns>
+
+	* src/content/vimperator.xul:
+	allow the Console to be opened by :sidebar
+	[e6842f04d647]
+
+	* src/content/vimperator.xul:
+	move the completion widget beneath the MOW
+	[c9c720740574]
+
+	* src/content/completion.js:
+	add fold markers
+	[a8fc3344e22f]
+
+	* src/vimperator.vim:
+	update RC file highlighting
+	[470b072f0750]
+
+	* src/content/events.js:
+	don't call focusContent() on page load since it causes window map
+	events to be fired
+	[ff0aa0ef75ea]
+
+2007-10-01  dougkearns  <dougkearns>
+
+	* src/NEWS:
+	update NEWS
+	[4ab33e71bbd5]
+
+	* src/content/commands.js, src/content/completion.js,
+	src/content/vimperator.js:
+	merge improved :echo, :echoerr and :javascript commands
+	[a61be7d01dbf]
+
+	* src/content/completion.js:
+	merge completion refactoring
+	[d5c8b2b19919]
+
+	* src/content/help.js:
+	close help logo img element
+	[01a4b480d28b]
+
+	* src/Makefile:
+	don't run the binary files through sed when replacing the VERSION
+	token
+	[4a7e41a841ac]
+
+	* src/NEWS, src/content/options.js, src/vimperator.vim:
+	merge new 'laststatus' option
+	[925532740ca5]
+
+	* src/install.rdf, src/skin/icon.png:
+	add icon for addons dialog
+	[3bace0a8a4d6]
+
+	* src/Makefile, src/chrome.manifest,
+	src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/buffers.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/contents.rdf,
+	src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/file.js,
+	src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/logo_white.png,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/tabs.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul,
+	src/content/bookmarks.js, src/content/buffers.js,
+	src/content/commands.js, src/content/completion.js,
+	src/content/events.js, src/content/file.js, src/content/find.js,
+	src/content/help.css, src/content/help.js, src/content/hints.js,
+	src/content/logo_white.png, src/content/mappings.js,
+	src/content/modes.js, src/content/options.js, src/content/tabs.js,
+	src/content/test.js, src/content/ui.js, src/content/vimperator.js,
+	src/content/vimperator.xul, src/skin/vimperator.css:
+	change directory structure to follow the more standard package
+	hierarchy
+	[38c9a90b2030]
+
+2007-09-28  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js:
+	:let shows all defined (global) variables now
+	[6244e30f7f5b]
+
+	* src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/ui.js:
+	move commandline styling to the CSS file and remove white border
+	around error messages
+	[cdb305e5d187]
+
+	* src/chrome/content/vimperator/commands.js:
+	allow for option names with underscores
+	[d45fb657cc38]
+
+	* src/chrome/content/vimperator/find.js:
+	apply 'hlsearchstyle' to frame documents
+	[3b5409c6c608]
+
+2007-09-26  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/events.js:
+	return true from onKeyPress when in MENU mode
+	[a9ad9f603f50]
+
+	* src/chrome/content/vimperator/commands.js:
+	add full help for :sidebar and :nohlsearch
+	[1bd45f2dbacc]
+
+	* src/chrome/content/vimperator/default.css:
+	force #vimperator-statusline-field-url to inherit status bar colors
+	[deae12ecb597]
+
+	* src/chrome/content/vimperator/options.js:
+	add 't_vb' as an alias for 'visualbellstyle'
+	[497794c168bd]
+
+	* src/chrome/content/vimperator/default.css:
+	prevent the statusbar URL text field from flashing a white
+	background color upon restarts
+	[5ae75cfeaed3]
+
+2007-09-25  dougkearns  <dougkearns>
+
+	* src/AUTHORS, src/chrome/content/vimperator/vimperator.js:
+	merge new VIMPERATOR_HOME env variable support
+	[334143082509]
+
+	* src/chrome/content/vimperator/ui.js:
+	merge minor fixes to Commandline echo/echoerr/clear
+	[ff569e19ef87]
+
+	* src/chrome/content/vimperator/options.js:
+	merge refactored loadPreference()
+	[cc3a7a2b2227]
+
+	* src/chrome/content/vimperator/help.js:
+	allow hidden help messages to be found
+	[b19da244a6f5]
+
+	* src/chrome/content/vimperator/bookmarks.js:
+	merge updated QuickMarks error message
+	[f4e01edf02f7]
+
+	* src/NEWS, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js:
+	merge new :let and :unlet commands and support for <Leader> in
+	mappings
+	[c7ca8f3dfe9c]
+
+	* src/chrome/content/vimperator/help.js:
+	remove whitehart them references in help page
+	[41c1a762d844]
+
+	* src/chrome/content/vimperator/default.css:
+	hide the statusbar-progresspanel in CSS too since some extensions
+	hide/reshow it
+	[362f796b651f]
+
+	* src/chrome/content/vimperator/default.css:
+	fix statusbar colours again, again, again - broken by typo
+	[547d15f77c83]
+
+2007-09-24  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/default.css:
+	merge CSS improvements to the statusbar and preview window
+	[f625ba86ada5]
+
+2007-09-23  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/find.js:
+	prevent the failed find error message from being cleared
+	[e2148fe19e1b]
+
+	* src/NEWS, src/chrome/content/vimperator/ui.js:
+	separate Ex command and search commandline history
+	[1a2d1dae51bc]
+
+	* src/chrome/content/vimperator/events.js:
+	allow all unknown key mappings to be passed through to FF
+	[d06ca9a9b053]
+
+	* src/NEWS, src/chrome/content/vimperator/commands.js:
+	merge new :time command
+	[bdaf84d1ad5f]
+
+2007-09-22  dougkearns  <dougkearns>
+
+	* src/NEWS, src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/vimperator.js:
+	add a new 'visualbellstyle' option
+	[2a88c587bec6]
 
-2007-10-09 13:34  dougkearns
+	* src/chrome/content/vimperator/commands.js:
+	don't close the sidebar if it is already open with the requested
+	type
+	[d49d71448ac6]
+
+	* src/NEWS, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/find.js:
+	process link text only find modifiers \[uU] before looking for
+	capitalized letters when 'smartcase' is set
+	[5e8877b21ef5]
+
+	* src/NEWS, src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	merge the existing status bar with the standard FF status bar
+	[9af4aa18f363]
+
+2007-09-19  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/vimperator.js:
+	merge refactored key event handlers
+	[d23cc0457980]
+
+2007-09-18  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/completion.js:
+	use build_longest_common_substring rather than
+	build_longest_starting_substring for :sidebar completion
+	[58b4b885360e]
+
+	* src/chrome/content/vimperator/commands.js:
+	use toggleSidebar for closing the sidebar so that the menu state is
+	properly updated
+	[138f1562d6b5]
+
+	* src/NEWS, src/TODO, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	merge :sbclose and viewSidebarMenu menuitem additions
+	[381ff4f76d01]
+
+2007-09-17  dougkearns  <dougkearns>
+
+	* src/NEWS, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js:
+	add an initial implementation of :sidebar
+	[a9a28f657b6a]
+
+	* src/NEWS, src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	merge new 'more' option and more-prompt improvements
+	[cb152e77e7a4]
+
+	* src/chrome/content/vimperator/events.js:
+	fix onKeyDown handler to use 0.5 style mode handling - bad merge
+	[2fc011354659]
+
+2007-09-14  dougkearns  <dougkearns>
+
+	* src/NEWS, src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js:
+	add a 'hlsearchstyle' option to allow for match styling and a
+	'linksearch' option to restrict page searches to link text
+	[b944ccdf5591]
+
+	* src/chrome/content/vimperator/events.js:
+	merge keyDown event handling from MAIN - helps with sites such as
+	yahoo.com which trap all keyDown events
+	[b70a1c81db83]
+
+	* src/chrome/content/vimperator/vimperator.js:
+	allow single line :js commands to be source from RC files
+	[44e8a53a5a42]
+
+2007-09-11  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/options.js:
+	merge new 'popups' option
+	[7133698aed2e]
+
+	* src/chrome/content/vimperator/options.js:
+	fix 'cpt' help typo
+	[ba7c05d3308c]
+
+2007-09-09  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/find.js:
+	fix case sensitivity of search highlighting -
+	gFindBar.setCaseSensitivity() in FF2 does not set the preference as
+	_setCaseSensitivity() does in FF3
+	[273f9e107c9a]
+
+2007-09-08  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/ui.js:
+	fixed multiline input widget
+	[66436cb02500]
+
+	* src/chrome/content/vimperator/commands.js:
+	added :w -> :saveas alias, and changed :w[open] to :wo[pen]
+	[08fd8ace74e1]
+
+	* src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/vimperator.js:
+	fixed saving qmarks
+	[5723389fc5a7]
+
+	* src/chrome/content/vimperator/options.js:
+	merge improved setTitleString() from MAIN
+	[aa3994ac9097]
+
+	* src/chrome/content/vimperator/options.js:
+	use true as the default value of 'hlsearch' and 'ignorecase' and
+	store 'hlsearch' as a preference
+	[9604f752c480]
+
+	* src/NEWS, src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	added a visual bell and replaced the 'beep' option with 'visualbell'
+	[51b8b03dd53c]
+
+	* src/chrome/content/vimperator/find.js:
+	merge minor Search#find refactoring from MAIN
+	[1ef3b23003c6]
+
+	* src/Makefile:
+	use preX.X for development version numbers
+	[ad11c62c4f77]
 
-	* NEWS, TODO, content/commands.js, content/completion.js:
-	  back/:forward has tab completion, slightly broken for
-	  wildmode=longest for now, as we need to refactor g_substrings
-	  later
+2007-09-06  dougkearns  <dougkearns>
+
+	* src/NEWS, src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js, src/vimperator.vim:
+	merge new 'incsearch', 'ignorecase', 'smartcase', 'hlsearch' options
+	from MAIN
+	[ce0a111fb47f]
 
-2007-10-09 13:19  dougkearns
+2007-09-05  dougkearns  <dougkearns>
 
-	* NEWS, content/commands.js: :undoall + :undo tab-completion
+	* src/Makefile:
+	use preX.X for development version numbers
+	[11458a6c9cf6]
 
-2007-10-09 12:51  dougkearns
+	* src/chrome/content/vimperator/default.css:
+	remove some redundant help page CSS properties
+	[169841845848]
 
-	* NEWS, content/hints.js, content/mappings.js: add "s" and "a"
-	  mappings to extended hints mode for saving hint targets
+2007-09-04  dougkearns  <dougkearns>
 
-2007-10-09 06:40  dougkearns
+	* src/Makefile, src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/logo_white.png:
+	add logo to help page
+	[b3526137c840]
 
-	* content/mappings.js: update / and ? help for changed 'linksearch'
-	  modifiers
+	* src/Makefile, src/NEWS:
+	update version to 0.5.2dev
+	[832fdce54792]
 
-2007-10-09 06:38  dougkearns
+	* src/chrome/content/vimperator/options.js:
+	fix typo in 'scroll' validator - incorrectly restricting value to
+	0-2
+	[01f94a858fca]
 
-	* Donators, NEWS, content/commands.js, content/find.js,
-	  content/mappings.js: merge new :redraw command and changed
-	  'linksearch' pattern modifiers
+2007-09-03  convert-repo  <convert-repo>
 
-2007-10-09 05:44  dougkearns
+	* .hgtags:
+	update tags
+	[c79e0b687496]
 
-	* content/: ui.js, vimperator.xul: merge MOW improvements
+2007-09-03  dougkearns  <dougkearns>
 
-2007-10-09 05:13  dougkearns
+	* src/ChangeLog, src/NEWS:
+	update NEWS and ChangeLog for release
+	[08ea2749242d] [RELEASE_0_5_1]
 
-	* content/: help.js, ui.js: merge use of "[Help]" and "[No Name]"
-	  in the status line for the internal help page and about:blank
+	* src/chrome/content/vimperator/vimperator.js:
+	remove CVS from version string for release
+	[1e637f79b2d5]
 
-2007-10-08 01:36  dougkearns
+	* src/chrome/content/vimperator/mappings.js:
+	add usage and long help for / and ? mappings
+	[81d2c5eca89c]
 
-	* content/vimperator.xul: sst default highlight group class to
-	  hl-Normal for #status-bar and #vimperator-commandline
+	* src/chrome/content/vimperator/help.js:
+	remove extra blank lines from help page
+	[afce66a7e1f9]
 
-2007-10-08 00:44  dougkearns
+	* src/chrome/content/vimperator/options.js:
+	whitespace formatting improvements
+	[13e1d7dcb9f2]
 
-	* content/ui.js, skin/vimperator.css: use standard-ish Vim
-	  highlight group names for the statusline styling
+	* src/NEWS, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/ui.js, src/vimperator.vim:
+	merge native / and ? search
+	[e40147ee4c46]
 
-2007-10-07 23:08  dougkearns
+2007-09-01  dougkearns  <dougkearns>
 
-	* content/commands.js: close :time MOW output table element
+	* src/chrome/content/vimperator/buffers.js:
+	use document.location.href for buffer.URL rather than document.URL
+	since the latter is undefined for XUL documents
+	[270fd0761cb5]
 
-2007-10-07 21:19  dougkearns
+	* src/vimperatorrc.example:
+	remove outdated :js examples
+	[940e4f114f53]
 
-	* content/events.js: clear the commandline when changing tabs
+	* src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/help.js:
+	add initialization section to help
+	[205a303b105b]
 
-2007-10-06 14:40  dougkearns
+2007-08-31  dougkearns  <dougkearns>
 
-	* NEWS, content/commands.js, content/vimperator.js: merge :! es
-	  command
+	* src/chrome/content/vimperator/events.js:
+	comment out currently unused DOMTitleChanged event handler
+	[29029b337f82]
 
-2007-10-06 13:18  dougkearns
+	* src/chrome/content/vimperator/vimperator.js:
+	don't indicate menu mode when 'smd' is set
+	[d84103df20c0]
 
-	* vimperatorrc.example: update vimperatorrc.example - 'beep' is now
-	  'visualbell'
+2007-08-29  dougkearns  <dougkearns>
 
-2007-10-06 13:17  dougkearns
+	* src/chrome/content/vimperator/events.js:
+	use gContextMenu and the menubar events for controlling menu mode
+	[d2e760c700ba]
 
-	* content/commands.js: display an error message if :buffers is
-	  given an argument
+	* src/chrome/content/vimperator/events.js:
+	don't enter menu mode when tooltip popups are shown
+	[5a8b0e9f59a8]
 
-2007-10-06 13:16  dougkearns
+2007-08-28  dougkearns  <dougkearns>
 
-	* content/bookmarks.js, content/buffers.js, content/commands.js,
-	  content/find.js, content/mappings.js, content/options.js,
-	  content/ui.js, content/util.js, content/vimperator.js,
-	  content/vimperator.xul, skin/vimperator.css: merge MOW
-	  improvements
+	* src/NEWS:
+	update NEWS
+	[f0dc8e01aaae]
 
-2007-10-06 01:58  dougkearns
+	* src/chrome/content/vimperator/commands.js:
+	minor help highlighting improvments
+	[0424066a4d4e]
 
-	* content/util.js: add vimperator.util.escapeHTML
+	* src/chrome/content/vimperator/vimperator.xul:
+	allow text in the status line URL field to be selected
+	[906e6c5c7bcb]
 
-2007-10-04 19:10  dougkearns
+2007-08-27  dougkearns  <dougkearns>
 
-	* content/vimperator.xul: allow the Console to be opened by
-	  :sidebar
+	* src/chrome/content/vimperator/events.js:
+	fix typo in removeEventListener call
+	[e1a5a99038e8]
 
-2007-10-04 13:59  dougkearns
+	* src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/vimperator.js:
+	add menu mode
+	[20db7ab87806]
 
-	* content/vimperator.xul: move the completion widget beneath the
-	  MOW
+	* src/Makefile:
+	update Makefile version to 0.5.1
+	[3caf83922080]
 
-2007-10-04 13:29  dougkearns
+	* src/Makefile:
+	GNU make 3.80 can't parse "else ifeq"
+	[f237aa3cc182]
 
-	* content/completion.js: add fold markers
+	* src/chrome/content/vimperator/commands.js:
+	use the coerced boolean value of args rather than testing for 0
+	string length when determining if an arg was passed to an ex command
+	[181c75e2bb14]
 
-2007-10-04 11:45  dougkearns
+	* src/chrome/content/vimperator/commands.js:
+	if no argument is given to :winopen open about:blank in the new
+	window
+	[e92d9c88bebb]
 
-	* vimperator.vim: update RC file highlighting
+2007-08-26  dougkearns  <dougkearns>
 
-2007-10-04 10:53  dougkearns
+	* src/chrome/content/vimperator/completion.js:
+	complete ':set inv' with boolean options
+	[33745073d4f7]
 
-	* content/events.js: don't call focusContent() on page load since
-	  it causes window map events to be fired
+	* src/NEWS, src/chrome/content/vimperator/ui.js:
+	fix commandline history on Windows - prevent the default
+	cmd_charPrevious action from being invoked for <Up
+	[6078453e37a4]
 
-2007-10-01 19:13  dougkearns
+	* src/NEWS:
+	update NEWS
+	[d9667cd8089b]
 
-	* NEWS: update NEWS
+	* src/chrome/content/vimperator/completion.js:
+	add filename completion for Windows
+	[d115e7125d4a]
 
-2007-10-01 19:10  dougkearns
+2007-08-25  dougkearns  <dougkearns>
 
-	* content/: commands.js, completion.js, vimperator.js: merge
-	  improved :echo, :echoerr and :javascript commands
+	* src/chrome/content/vimperator/bookmarks.js:
+	read the Bookmarks Toolbar Folder when loading bookmarks - it has
+	previously been skipped since BookmarksUtils.getAllChildren(root)
+	doesn't read it
+	[a68935fdd3e6]
 
-2007-10-01 19:04  dougkearns
+2007-08-24  dougkearns  <dougkearns>
 
-	* content/completion.js: merge completion refactoring
+	* src/chrome/content/vimperator/bookmarks.js:
+	make sure search engine aliases are properly initialized
+	[9ccf5ae16c31]
 
-2007-10-01 18:48  dougkearns
+	* src/chrome/content/vimperator/ui.js:
+	remove unnecessary temp variable
+	[17c26bc30d58]
 
-	* content/help.js: close help logo img element
+	* src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/vimperator.xul:
+	make sure the active listcell in the second column of the preview
+	window uses HighlightText as the CSS color value and move the
+	#vimperator-multiline-output styles to default.css
+	[a6f25a350c7e]
 
-2007-10-01 17:38  dougkearns
+2007-08-23  dougkearns  <dougkearns>
 
-	* Makefile: don't run the binary files through sed when replacing
-	  the VERSION token
+	* src/chrome/content/vimperator/vimperator.js:
+	allow ~/_vimperatorrc as the RC file and ~/vimperator/plugin as the
+	plugin directory on Windows
+	[b553a7ee2776]
 
-2007-10-01 13:31  dougkearns
+2007-08-23  convert-repo  <convert-repo>
 
-	* NEWS, vimperator.vim, content/options.js: merge new 'laststatus'
-	  option
+	* .hgtags:
+	update tags
+	[bca75e1711cc]
 
-2007-10-01 10:28  dougkearns
+2007-08-23  dougkearns  <dougkearns>
 
-	* install.rdf, skin/icon.png: add icon for addons dialog
+	* src/Makefile:
+	use 0.5 for the version strings
+	[4e87887cfa3e]
 
-2007-10-01 10:23  dougkearns
+2007-08-22  convert-repo  <convert-repo>
 
-	* Makefile, chrome.manifest, content/bookmarks.js,
-	  content/buffers.js, content/commands.js, content/completion.js,
-	  content/events.js, content/file.js, content/find.js,
-	  content/help.css, content/help.js, content/hints.js,
-	  content/logo_white.png, content/mappings.js, content/modes.js,
-	  content/options.js, content/tabs.js, content/test.js,
-	  content/ui.js, content/vimperator.js, content/vimperator.xul,
-	  skin/vimperator.css: change directory structure to follow the
-	  more standard package hierarchy
+	* .hgtags:
+	update tags
+	[9f9196800c87] [vimperator-0_5-branch-HEAD-merge-1]
 
-2007-10-01 10:08  dougkearns
+2007-08-21  dougkearns  <dougkearns>
 
-	* content/vimperator.xul: remove invalid comment
+	* merge HEAD
+	[2636865b5856]
 
-2007-10-01 07:02  dougkearns
+	* src/NEWS:
+	mention the new :set all and :set all& commands in NEWS
+	[e1cd391b94c4]
 
-	* content/options.js: change short version of 'linksearch' to 'lks'
-	  since 'ls' is used by 'laststatus'
+	* src/chrome/content/vimperator/options.js:
+	fix typos in short_help of 'go' and 'fs' options
+	[64f74e673553]
 
-2007-09-30 17:08  dougkearns
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js:
+	fix some trivial help typos
+	[9d89817b01af]
 
-	* content/options.js: add 'laststatus' option
+	* src/chrome/content/vimperator/help.js:
+	perform the & -> &amp; HTML entity replacement before replacing
+	other characters
+	[2f164daa5c9d]
 
-2007-09-30 16:41  dougkearns
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js:
+	escape literal & with the HTML entity in :set help string
+	[ae004af1a0e7]
 
-	* content/bookmarks.js, content/buffers.js, content/commands.js,
-	  content/completion.js, content/events.js, content/file.js,
-	  content/find.js, content/help.css, content/help.js,
-	  content/hints.js, content/logo_white.png, content/mappings.js,
-	  content/modes.js, content/options.js, content/tabs.js,
-	  content/ui.js, content/vimperator.js, content/vimperator.xul,
-	  skin/icon.png, skin/vimperator.css: change directory structure to
-	  follow the more standard package hierarchy
+	* src/chrome/content/vimperator/options.js:
+	make sure the usage property of an Option is always set
+	[0b506dbb6373]
 
-2007-09-25 19:37  dougkearns
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/options.js:
+	add support for :set all and :set all& to list and reset all options
+	[726f5fed0674]
 
-	* AUTHORS: merge new VIMPERATOR_HOME env variable support
+2007-08-20  dougkearns  <dougkearns>
 
-2007-09-25 18:42  dougkearns
+	* src/chrome/content/vimperator/commands.js:
+	mention numerical options in :set option+={value} documentation
+	[419e21a4b622]
 
-	* NEWS: merge new :let and :unlet commands and support for <Leader>
-	  in mappings
+	* src/NEWS, src/TODO:
+	remove :set {option}! support from the TODO - now implemented
+	[701b48cc862f]
 
-2007-09-23 14:14  dougkearns
+	* src/chrome/content/vimperator/commands.js:
+	add support for :set {option}! to toggle a boolean option's value
+	[5b6dd65e37bb]
 
-	* NEWS: separate Ex command and search commandline history
+2007-08-19  dougkearns  <dougkearns>
 
-2007-09-23 10:21  dougkearns
+	* src/chrome/content/vimperator/mappings.js:
+	fix typo in "T" mappings help
+	[d01c3dbc88b0]
 
-	* NEWS: merge new :time command
+	* src/chrome/content/vimperator/bookmarks.js:
+	use TH to markup the table headers in :marks/:qmarks output...again
+	[6f1dbffcba6f]
+
+	* src/chrome/content/vimperator/commands.js:
+	minor improvements to search string heuristic regexps in toURLArray
+	[af8661b1a205]
+
+	* src/chrome/content/vimperator/mappings.js:
+	remove FIXME comment - allowing the "zz" mapping to use its count as
+	the zoom value rather than an arg is the same as "gg", "G" and
+	others in Vim
+	[ddd6736f3539]
 
-2007-09-22 15:44  dougkearns
+2007-08-18  dougkearns  <dougkearns>
 
-	* NEWS: add a new 'visualbellstyle' option
+	* src/chrome/content/vimperator/commands.js:
+	improve toURLArray so that it can handle trailing /'s in its args -
+	"gu" and :open should now behave as specified
+	[1648597ca1dc]
 
-2007-09-22 14:50  dougkearns
+	* src/chrome/content/vimperator/buffers.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/ui.js:
+	rename the 'location' property of vimperator.buffer to 'URL'
+	[e2270cc0374e]
 
-	* NEWS: process link text only find modifiers \[uU] before looking
-	  for capitalized letters when 'smartcase' is set
+2007-08-17  dougkearns  <dougkearns>
 
-2007-09-22 14:29  dougkearns
+	* src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/file.js,
+	src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/vimperator.js:
+	fix whitespace formatting - remove leading tab characters with
+	:retab
+	[c80c2ec2754f]
+
+	* src/chrome/content/vimperator/tabs.js:
+	fix broken :tabmove wrapping
+	[346def8749a2]
+
+	* src/chrome/content/vimperator/default.css, www/help.css:
+	revert mozdev style override
+	[dec8faa316f4]
+
+	* src/chrome/content/vimperator/default.css, www/help.css:
+	explictitly set list-style-* properties to override the default
+	mozdev styles when viewing the help page at vimperator.mozdev.org
+	[866f7afcc3e9]
+
+	* www/ChangeLog.html:
+	remove duplicated mention of new :map support
+	[81d5139ca263]
+
+	* src/Makefile:
+	find the correct FIREFOX_DEFAULT extensions directory path when run
+	on Cygwin
+	[657f72e984bd]
+
+	* www/ChangeLog.html:
+	replace literal < characters with HTML entities
+	[58b3faac3074]
+
+2007-08-17  stubenschrott  <stubenschrott>
+
+	* src/TODO:
+	updated TODO for 0.6
+	[f4336744636e]
+
+	* www/ChangeLog.html, www/index.html:
+	added another warning
+	[500c4672a558]
+
+	* src/Makefile, src/NEWS, src/chrome/content/vimperator/vimperator.js:
+	Changed version number to 0.6 CVS
+	[3dc6ab8fb69d]
+
+2007-08-16  stubenschrott  <stubenschrott>
+
+	* src/Makefile, src/TODO, src/chrome/content/vimperator/help.js:
+	only add NEWS instead of ChangeLog in .xpi, to dramatically reduce
+	size for future releases
+	[a6ab60b85272]
+
+	* www/TODO.html:
+	updated TODO to display better in a browser
+	[025e3a69d408]
+
+	* www/index.html:
+	added stylesheet to index.html
+	[24fd4a9054b2]
+
+	* downloads/vimperator_0.5.xpi:
+	forgot the xpi
+	[5960a302e014]
+
+	* downloads/update.rdf, www/AUTHORS.html, www/ChangeLog.html,
+	www/TODO.html, www/help.css, www/help.html, www/index.html,
+	www/installation.html, www/project_nav.html, www/source.html,
+	www/vimperator.vim:
+	uploaded 0.5 to the website
+	[cb92b6058ddb]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/ui.js:
+	fixed :map x :<cr> problem
+	[2b4694739421] [RELEASE_0_5]
+
+	* src/ChangeLog, src/NEWS:
+	last commit before 0.5 is tagged
+	[3314aed3a368]
+
+2007-08-16  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/events.js:
+	reset vimperator.input.buffer before executing mappings that may add
+	more key events to the event buffer
+	[5fc71cd694f2]
+
+	* src/chrome/content/vimperator/commands.js:
+	revert changes to :map arg parsing regexp in 1.190
+	[ebecea95cf6b]
+
+	* src/chrome/content/vimperator/help.js:
+	fix help typo
+	[55fcffc15091]
+
+	* src/chrome/content/vimperator/commands.js:
+	make sure URLs processed as a result of "gu" don't have //../ (the
+	double forward slash) at the end
+	[fa113f289eae]
+
+2007-08-16  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/vimperator.js:
+	Fixed :map partly, still cannot cope with :map commans, where lhs is
+	a 2-char string
+	[b02fdd1ed78b]
+
+2007-08-16  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js:
+	fix some trivial capitalization errors in help
+	[88ffd850b5d4]
+
+	* src/chrome/content/vimperator/mappings.js:
+	replace '<' and '>' with HTML entities in help for n and N mappings
+	[95392f385ca1]
+
+	* src/chrome/content/vimperator/buffers.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/hints.js:
+	move the global evaluateXPath() function to vimperator.buffer
+	[7ca8e2b90705]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js:
+	fix some help typos
+	[66cf147b0ec1]
+
+2007-08-16  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js:
+	many small help fixes
+	[e2146e91f12d]
+
+2007-08-15  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js:
+	remove half-baked guard clauses for unimplemented bookmark commands
+	[cccb08957f81]
+
+2007-08-15  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/chrome/content/vimperator/bookmarks.js:
+	added colors to :ls
+	[fafa4e4cb4d0]
+
+	* src/chrome/content/vimperator/ui.js:
+	fixed focusing the MOW
+	[5769fbee4226]
+
+	* src/chrome/content/vimperator/vimperator.xul:
+	overflow: hidden for the MOW
+	[0d9747ba1595]
+
+	* src/chrome/content/vimperator/buffers.js:
+	added colors to :ls
+	[f311e1caa112]
+
+2007-08-15  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js:
+	use vimperator.events.feedkeys() for :map
+	[5b4f9c23af50]
+
+	* src/chrome/content/vimperator/buffers.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/tabs.js:
+	use the multiline output window for :buffers and move the existing
+	persistent window functionality to :buffers!
+	[4ef5856ae0e9]
+
+	* src/NEWS, src/chrome/content/vimperator/commands.js:
+	update NEWS to mention the renaming of bookmark related commands and
+	fix some trivial help typos
+	[ce48f132b4e8]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js:
+	rename :bm, :bmadd, :bmdel to :bmarks, :bmark, :delbmarks
+	respectively and use the multiline output window for :bmarks and
+	:history
+	[618804670b41]
+
+2007-08-15  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/buffers.js,
+	src/chrome/content/vimperator/mappings.js:
+	australian/british english -> american english in comments added
+	more help
+	[8e4c80b96090]
+
+2007-08-14  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/bookmarks.js:
+	use TH to markup the table headers in :marks/:qmarks output
+	[eb2f8899e44b]
+
+	* src/chrome/content/vimperator/buffers.js,
+	src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js:
+	break up buffer.scrollAbsolute and buffer.scrollRelative into
+	smaller, more specific, methods
+	[be1b855ddb2e]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/file.js,
+	src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js:
+	some trivial formatting fixes
+	[e3ea43276d80]
+
+	* src/chrome/content/vimperator/vimperator.js:
+	don't echo an error message if no plugin directory is found
+	[5ca9f0bbfcbf]
+
+2007-08-14  stubenschrott  <stubenschrott>
+
+	* www/source.html:
+	<code> -> <pre>
+	[d9246e2d59ca]
+
+	* www/source.html:
+	added RSS link
+	[549b5a739f80]
+
+2007-08-13  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	hopefully made the MOW hack better, so that it doesn't show during
+	startup fixed wildoptions=sort
+	[b6650f7de3a9]
+
+	* www/source.html:
+	added links to daily snapshots
+	[ae62703b1f08]
+
+2007-08-13  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/vimperator.js:
+	fix plugin directory sourcing so it works on Windows - don't attempt
+	to open the directory as an input stream
+	[14811989d95a]
+
+2007-08-12  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js:
+	expand environment variables in the filename argument to :source
+	[636057cacf9a]
+
+	* src/chrome/content/vimperator/mappings.js:
+	don't echo text after copying it to the clipboard with "Y"
+	[1df546dcb879]
+
+	* src/chrome/content/vimperator/buffers.js:
+	display an informational message when the text zoom value is changed
+	[59a4aa86aa9b]
+
+	* src/NEWS, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/ui.js:
+	add initial implementation of :normal command
+	[d7c33732fd47]
+
+2007-08-12  stubenschrott  <stubenschrott>
+
+	* src/NEWS, src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	commandline and MIW try to keep focus now changed commandline
+	handling in general autosize MIW on new content new handling should
+	be more robust, but there may be bugs, please report
+	[a89badc5f0bd]
+
+2007-08-11  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/ui.js:
+	fixed/renamed vimperator.events.toString(event);
+	v.e.is{Accept,Cancel}Key(key) helper functions
+	[8f87a94be296]
+
+	* src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	added <space>-support for feedkeys() moved
+	KeyboardEvent.prototype.toString() ->
+	vimperator.events.eventToString()
+	[c99f8bc9eef1]
+
+	* src/ChangeLog, src/NEWS:
+	changelog->NEWS, ChangeLog autogenerated now
+	[ff6fd77a7cae]
+
+2007-08-11  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js:
+	only allow :source to accept a single filename
+	[fccae2817043]
+
+	* src/chrome/content/vimperator/buffers.js:
+	change the bounds checking in scrollAbsolute() to allow for the fact
+	scrollY can be larger than scrollMaxY
+	[3ac55be1c914]
+
+	* src/chrome/content/vimperator/commands.js:
+	allow multiple ranges to be specified to :delmarks - missing global
+	regexp flag
+	[9b116236e93f]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js:
+	add support for the special version of :delqmarks!
+	[8c67a1a07869]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/ui.js:
+	change remaining uses of the Array() constructor in array
+	initializations to literals
+	[3db7e0685f6b]
+
+	* src/chrome/content/vimperator/buffers.js:
+	beep when frame motion bounds are exceeded
+	[f3681ea39d35]
+
+	* src/ChangeLog, src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js:
+	rename :qmarkadd :qmark and :qmarkdel :delqmarks, sort :qmarks list
+	output and limit buffer marks to [a-zA-Z]
+	[3a8c0f55d240]
+
+2007-08-10  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/chrome/content/vimperator/events.js:
+	"enter" is an alias for "return" or "cr"
+	[6929fdd61108]
+
+	* src/chrome/content/vimperator/events.js:
+	some whitespace formatting
+	[6d314d70cd4c]
+
+	* src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/hints.js:
+	feedkeys() support!! Some bugs may remain, please test thorougly
+	escaping the < char not yet done, as the semantics is not clear yet
+	[71d0d92a130f]
+
+2007-08-10  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/mappings.js:
+	allow the Ctrl-U/Ctrl-D scroll count to be >= 1
+	[919c7fc83703]
+
+	* src/chrome/content/vimperator/hints.js:
+	declare loop counter in yankUrlHints() and yankTextHints() and
+	reverse rev 1.27
+	[a5b3aa075369]
+
+	* src/chrome/content/vimperator/hints.js:
+	move win.res guard clause after initialisation of win in loadCoord()
+	[cfefb6e94459]
+
+2007-08-10  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/ui.js:
+	fixed first use of setMultiline() with an ugly (but working) hack
+	[aa3a2eb66e98]
+
+	* src/chrome/content/vimperator/hints.js:
+	attempt to fix problems with hints on not finished page load, should
+	fix messages to the error console
+	[ebe529c0553d]
+
+	* src/ChangeLog, src/TODO, src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js:
+	- Fixed gn command
+	- added gH to activate option
+	[411d4609eb46]
+
+2007-08-09  stubenschrott  <stubenschrott>
+
+	* www/source.html:
+	added note about hg log
+	[bf2eecc42c6f]
+
+	* www/source.html:
+	that was too much whitespace
+	[595e964e0334]
+
+	* www/source.html:
+	added whitespace
+	[298a05ecf070]
+
+	* www/source.html:
+	added mercurial link
+	[11edf0898f7f]
+
+2007-08-09  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/mappings.js:
+	use vimperator.buffer.location rather than replaced
+	getCurrentLocation() for "y" mapping
+	[ba7c972f1d0d]
+
+	* src/chrome/content/vimperator/contents.rdf:
+	whitespace formatting fix
+	[0092dc861832]
+
+	* src/chrome/content/vimperator/bookmarks.js:
+	don't output status messages when history bounds are exceeded - just
+	beep
+	[8c5e6e0d32e5]
+
+	* src/chrome/content/vimperator/hints.js:
+	don't add a trailing '\n' when yanking a single line of text in
+	extended hints mode
+	[de3486205e5a]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/hints.js:
+	remove the word "version" from the :version output string
+	[ec6689bd54bc]
+
+	* src/vimperator.vim:
+	reorder vimperatorCommand highlight group so that :map is
+	highlighted
+	[2c53c4c4ef24]
+
+2007-08-08  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/buffers.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js:
+	move global completion functions into a vimperator.completion module
+	[3496b71905d0]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js:
+	move global isDirectory() to Commands()
+	[483871aca5ba]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/mappings.js:
+	change {count} to [count] in the usage strings since specifying a
+	count is always optional
+	[96445c000b91]
+
+	* src/ChangeLog, src/chrome/content/vimperator/buffers.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js:
+	add C-u/C-d mappings and the associated 'scroll' option
+	[fc537592af5c]
+
+2007-08-07  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/buffers.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/tabs.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	initial buffer implementation
+	[648470b17c06]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js:
+	fix typo - using quickmark value from 'activate' rather than tabopen
+	for :tabopen
+	[3bc88610d92b]
+
+	* src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/vimperator.js:
+	move remaining preference setting from vimperator.startup to
+	Options()
+	[896a97dd5eda]
+
+2007-08-06  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js:
+	reverse last commit
+	[b3041b8610f0]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js:
+	move Option constructor to Options, move
+	Options.{getPref,setPref,getFirefoxPref,setFirefoxPref} to a slot in
+	vimperator.options and move all option initialisation to Options()
+	[f833175f31c1]
+
+	* src/chrome/content/vimperator/vimperator.js:
+	don't emit an error message when ~/.vimperatorrc doesn't exist
+	[c9cd69386859]
+
+2007-08-05  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/vimperator.js:
+	use an unordered list rather than a table in the 'activate' help
+	[739f03e6f4a2]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	move the global copyToClipboard() to a slot in vimperator
+	[c9a0ed3e4a0d]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/ui.js:
+	move the global isFormElemFocused() to Events
+	[1b6c848ed343]
+
+2007-08-04  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	add onMultilineOutputEvent for handling more-prompt keypress events
+	[75f2844ddc0c]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/file.js,
+	src/chrome/content/vimperator/vimperator.js:
+	move global fopen() to a slot in vimperator
+	[5ace2fa0664c]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js:
+	remove debug toString() methods now we have vimperator.logObject
+	[9ef11441c30f]
+
+	* src/chrome/content/vimperator/ui.js:
+	remove more unnecessary toString() calls
+	[82e12e1e9a6d]
+
+	* src/chrome/content/vimperator/bookmarks.js:
+	remove unnecessary toString() call
+	[adf754c3c552]
+
+	* src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/hints.js:
+	replace references to deprecated window._content with window.content
+	[e35ee7cb9601]
+
+2007-08-03  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	- code cleanup by removing old commented code
+	- merged zoom_in/to into vimperator.zoom()
+	[9fac325e6006]
+
+2007-08-02  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js:
+	merge vimperator.execute and the execute_command() global function
+	[f8604a001cd2]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js:
+	move the execute() global function to a slot of vimperator
+	[1ea2017d2c26]
+
+2007-08-01  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/default.css:
+	changed listitem selection color to be the normal selection color of
+	the system theme
+	[525ca3d41209]
+
+	* src/chrome/content/vimperator/default.css:
+	finally found the CSS code to make the selection of listboxes better
+	readable Putting it in default.css instead of my own userChrome.css,
+	because also others have mentioned the hard readability.
+	[9f3c2c69942d]
+
+	* src/ChangeLog, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js:
+	couldn't resist, had to add support for auto-sourcing
+	~/.vimperator/plugin/ before we release 0.5
+	[d2170c18bc47]
+
+	* src/ChangeLog, src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/vimperator.js:
+	winopen support
+	[0a65124f7ae7]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js:
+	changed vimperator.open() to accept postdata, makes the design a
+	little uncleaner, but supports _all_ firefox search engines now.
+	[1b9f6d3d711b]
+
+2007-07-31  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	add missing crop attribute to #vimperator-statusline-field-url label
+	use "end" value for crop attributes rather than the deprecated
+	"right"
+	[7f04a3dbbd67]
+
+2007-07-31  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/commands.js:
+	he is called linus torvalds
+	[71a7131daaeb]
+
+	* src/TODO, src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js:
+	Make sure, search engine aliases are unique
+	[34ab050f7ca3]
+
+2007-07-29  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/TODO, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	inputMultiline method finished (some display bug may remain) :js
+	<<EOF support is back, better than ever (TM)
+	[32c413a1ebe4]
+
+2007-07-27  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js:
+	openURLs -> vimperator.open(...) Support for adding bookmark groups
+	to QuickMarks
+	[ca57be5adcdc]
+
+	* src/chrome/content/vimperator/mappings.js:
+	added <Nop> support
+	[b790f769cb81]
+
+	* src/ChangeLog, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/hints.js:
+	stringToURLs -> String.prototype.toURLArray
+	[b53ada866848]
+
+2007-07-26  dougkearns  <dougkearns>
+
+	* src/Makefile:
+	fix bug #17377 - Unable to build sources on Mac OS X
+	[2ea83cc65260]
+
+2007-07-25  dougkearns  <dougkearns>
+
+	* src/TODO, src/chrome/content/vimperator/mappings.js:
+	fix infinite loop when calling "gu" with a {count}
+	[a9ac8c967f0a]
+
+	* src/chrome/content/vimperator/default.css:
+	make sure the first status bar label is flush left
+	[c915860d8081]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	intialize the vimperator global constant with an object literal
+	rather than via a constructor function; move the init() and unload()
+	global functions to startup and shutdown slots of vimperator
+	[ad3646cdcad6]
+
+	* src/chrome/content/vimperator/mappings.js:
+	fix gH mapping so that it opens in a new tab - a regression
+	[6a84e8cffdb5]
+
+2007-07-22  dougkearns  <dougkearns>
+
+	* src/vimperator.vim:
+	add map, mapclear, noremap and unmap commands to the
+	vimperatorCommand highlight group
+	[7ce7f1dc0d85]
+
+	* src/chrome/content/vimperator/mappings.js:
+	initial mapping tables for all modes at startup
+	[37c18533c01b]
+
+	* src/chrome/content/vimperator/mappings.js:
+	restore guard clause to the head of getMap() to test for
+	uninitialized stacks
+	[f2ebaa1c0c5e]
+
+	* src/ChangeLog, src/chrome/content/vimperator/commands.js:
+	allow :noremap name abbreviations
+	[ecdd59dba619]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js:
+	add initial (very rough) implementation of :noremap
+	[2e883f972516]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js:
+	allow {count}, and other flags, to be passed to e user mapping's
+	action
+	[cf91a75b05c4]
+
+2007-07-21  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js:
+	add initial (very rough) implementations of :map, :mapclear and
+	:unmap
+	[b0cfc69cf92b]
+
+	* src/chrome/content/vimperator/commands.js:
+	add missing :javascript[!] variant to the command's usage synopsis
+	[8c2a56728f2e]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js:
+	make sure [!] is highlighted properly in the help page for all
+	command usage synopses
+	[793786dca0d1]
+
+	* src/chrome/content/vimperator/help.js:
+	fix typo in introductory help text
+	[ae999e71da7a]
+
+2007-07-19  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/mappings.js:
+	fix trivial help text typos
+	[76cea154f465]
+
+	* src/chrome/content/vimperator/commands.js:
+	don't specify Command usage strings when they match the default
+	[540acdf0cfa0]
+
+	* src/chrome/content/vimperator/commands.js:
+	fix trivial help text typos
+	[8ef3b02f9186]
+
+2007-07-18  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/mappings.js:
+	fix some comment typos
+	[3b34f4d0c19c]
+
+2007-07-17  dougkearns  <dougkearns>
+
+	* src/ChangeLog, src/TODO, src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	replace readonly textboxes in the commandline and statusbar with
+	labels and simplify the skin styling
+	[9bba7bfe51ad]
+
+2007-07-13  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/help.js:
+	remove the trailing HR from the help tables
+	[c3a8d0979f08]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js:
+	always construct a default usage string for mappings and commands
+	[93224759205a]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/events.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/tabs.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	move the Events and Tabs objects to files of their own and add a
+	license header to files without one
+	[ceb967f8ec3f]
+
+2007-07-12  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/vimperator.js:
+	move initialisation of vimperator.input to the constructor function
+	[c92dff30772d]
+
+2007-07-11  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/vimperator.js:
+	remove unused local variables in Vimperator()
+	[d4e914ed942b]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js:
+	don't update the alternate tab list on TabOpen events
+	[165492cbb8e4]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js:
+	move the global function focusNextFrame to a slot on vimperator -
+	vimperator.shiftFrameFocus
+	[f5ef3b36ca06]
+
+2007-07-10  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/vimperator.js:
+	add KeyEvent -> String mappings for DOM_VK_LEFT_SHIFT,
+	DOM_VK_LEFT_SHIFT and DOM_VK_F13-24
+	[c4fb571ecf2a]
+
+	* src/chrome/content/vimperator/options.js:
+	make sure input fields without an explicit 'type' attribute are
+	matched by hinttags and extendedhintags
+	[7b9816128391]
+
+	* src/chrome/content/vimperator/default.css:
+	fix typo
+	[1a6d8f9010d0]
+
+	* src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/ui.js:
+	limit the size of the multiline output window to the size of the
+	browser panel
+	[a96a9a20436e]
+
+2007-07-10  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/vimperator.js:
+	changed shift-insert patch
+	[4469322fc29e]
+
+	* src/ChangeLog, src/chrome/content/vimperator/commands.js:
+	:saveas works now
+	[9fc7a7aca41d]
+
+2007-07-09  stubenschrott  <stubenschrott>
+
+	* src/AUTHORS, src/chrome/content/vimperator/commands.js:
+	reverted scroll window.content patch for now (untested)
+	[8f0342edb99f]
+
+2007-07-09  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/vimperator.xul:
+	move all XUL styling to default.css
+	[155bc85e9642]
+
+2007-07-08  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/vimperator.js:
+	applied shift-insert patch
+	[970cdeab5aba]
+
+2007-07-05  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js:
+	use 'web page' rather than 'webpage' in the help text
+	[900d8b7ae4b2]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js:
+	inline yankCurrentSelection(), yankCurrentLocation(), goUp()
+	[cc6decf93440]
+
+	* src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	reformat hints mode mapping definitions
+	[ae8d52ec8e13]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/vimperator.js:
+	move the global function updateBufferList() to vimperator.tabs until
+	we have real buffers
+	[077e066125c6]
+
+2007-07-04  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/vimperator.js:
+	applied the hintchar patch from calmar
+	[3ad1d92655be]
+
+	* src/ChangeLog, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	changed '|' to ', ' as a url separator
+	[af81687b87d1]
+
+2007-07-04  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js:
+	move the bmadd() and bmdel() global functions into the corresponding
+	command definitions
+	[02b743b79c74]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js:
+	move global function bmshow() to vimperator.bookmarks.list
+	[a3a74dfe5f09]
+
+	* src/chrome/content/vimperator/commands.js:
+	move tab() global function into :tab command definition
+	[522585099f98]
+
+	* src/chrome/content/vimperator/commands.js:
+	complete :tab with command completions
+	[8afa040d6290]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	move global help() command to a vimperator slot
+	[80dae20d98c5]
+
+2007-07-03  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	remove g_hint_mappings - initialise hint mappings in
+	vimperator.mappings
+	[0c9474334786]
+
+	* src/chrome/content/vimperator/mappings.js:
+	change last references to stepInHistory() to
+	vimperator.history.stepTo
+	[69b24f7b9d3e]
+
+2007-07-03  stubenschrott  <stubenschrott>
+
+	* src/TODO, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	Fixed some focus issues First (non-working) readMultiline
+	implementation
+	[2175218afc30]
+
+2007-07-03  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/mappings.js:
+	update old references to g_inputbuffer and g_count to
+	vimperator.input.buffer and vimperator.input.count respectively
+	[01daeb448d4a]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js:
+	move g_hint_mappings to mappings.js
+	[e72aec135923]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/vimperator.js:
+	move buffer_switch and toggleBufferList to the :buffer and :buffers
+	ex-commands; make the "u" normal mode command call
+	vimperator.commands.undo rather than execute_command() directly
+	[2b3d70274c96]
+
+2007-07-02  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js:
+	delete unused getCurrentLinkLocation() - moved to wiki
+	[3df9efe14085]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js:
+	move the hsshow(), stepInHistory(), historyGoToBeginning(), and
+	historyGoToStart() global functions to vimperator.history
+	[60cbb244c4eb]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	move reload() and reload_all() global functions to vimperator.tabs
+	[8ede9e16f4b1]
+
+	* src/chrome/content/vimperator/commands.js:
+	don't prefix false boolean option values with whitespace when
+	reporting the value
+	[e86f2fc5a096]
+
+	* src/chrome/content/vimperator/commands.js:
+	move the global set() command to the ex-command definition and
+	return "name|noname' for boolean option queries rather than
+	"name=value"
+	[058848e76b87]
+
+	* src/chrome/content/vimperator/commands.js:
+	remove template *_url_mark() functions now QuickMarks has been
+	implemented
+	[a971622303b1]
+
+	* src/chrome/content/vimperator/commands.js:
+	move global restart() command to a vimperator slot
+	[4160911f4fb6]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	move global quit() command to a vimperator slot
+	[9d99f2f16c87]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js:
+	move global beep() command to a vimperator slot
+	[a2e31c8c71cf]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js:
+	move global source() command to a vimperator slot
+	[4a41e0457c23]
+
+	* src/chrome/content/vimperator/mappings.js:
+	fix typo in help for 'M' mapping
+	[12d2703b9a6d]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js:
+	allow :marks to take an argument and sort its output properly
+	[860d93203356]
+
+	* src/ChangeLog, src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	add new Ctrl-^ mapping for selecting the alternate tab
+	[c6cd4010d199]
+
+2007-07-01  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js:
+	declare undeclared variable url
+	[635a97a26fd1]
+
+2007-07-01  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/ui.js:
+	autosize multiline widget
+	[37e084f35a4d]
+
+2007-06-30  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/chrome/content/vimperator/mappings.js:
+	changed gO to gn
+	[5d9a2de9562f]
+
+2007-06-30  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/mappings.js:
+	allow multi-character normal mode user mappings
+	[a1148d129ce4]
+
+2007-06-29  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/bookmarks.js:
+	fixed :qmarks output
+	[d8243e2d4add]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	added QuickMarks
+	[34a85b075e52]
+
+2007-06-29  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/vimperator.js:
+	rename the hints constructor hit_a_hint() to Hints()
+	[e3d315fcd2b2]
+
+	* src/chrome/content/vimperator/help.js:
+	declare undeclared variable 'element'
+	[d6c19199ef6a]
+
+2007-06-28  dougkearns  <dougkearns>
+
+	* src/TODO, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	move the global variable hah to vimperator.hints and fix bug #17254
+	[510d5fd4e274]
 
-	* NEWS: merge the existing status bar with the standard FF status
-	  bar
+2007-06-27  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/bookmarks.js:
+	small display fixes in :marks
+	[ced2a2ec9d1c]
 
-2007-09-18 08:49  dougkearns
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/ui.js:
+	:marks support
+	[9b57c0916d8a]
+
+	* src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	initial commit of multiline echo()
+	[9fccfdebe88d]
+
+2007-06-27  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/ui.js:
+	declare loop counter in InformationList#fill
+	[0a928d5c95e4]
 
-	* NEWS, TODO: merge :sbclose and viewSidebarMenu menuitem additions
+2007-06-26  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/completion.js:
+	remove unused var in exTabCompletion()
+	[6a10b2da4d61]
+
+	* src/chrome/content/vimperator/ui.js:
+	rename StatusLine#setClass's parameter to 'type' since 'class' is a
+	reserved word
+	[1b3324d40f5a]
+
+	* src/chrome/content/vimperator/find.js:
+	comment out unused :nohlsearch for now
+	[bff87c3f4740]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js:
+	don't bother returning a status value in Marks#jumpTo and remove
+	trailing comma in :mark help propery assignment
+	[76a720c31239]
+
+	* src/chrome/content/vimperator/commands.js:
+	remove trailing comma in :delmarks help propery assignment
+	[b3509ab44d19]
+
+	* src/chrome/content/vimperator/help.js:
+	remove FIXME comment
+	[bc12ce2a0c07]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js:
+	fix :mark and :delmarks (AKA return of the marks) and add range
+	support to :delmarks
+	[fc77fc12a995]
+
+2007-06-25  stubenschrott  <stubenschrott>
+
+	* src/vimperator.vim:
+	verbosity -> verbose
+	[d6a7be57302d]
+
+2007-06-25  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/options.js:
+	remove unnecessarily defined getters for the go, stal, titlestring
+	options
+	[5ca3bfce31e0]
+
+	* src/vimperator.vim:
+	add verbosity and vbs to options syntax group
+	[17203da5f772]
+
+	* src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/options.js:
+	add basic validators for the cpt, go, ssli, vbs, wim, and wop
+	options
+	[0c71c61a42d6]
+
+	* src/chrome/content/vimperator/commands.js:
+	make :set display an error message and abort if an explicit value is
+	specified for a boolean option
+	[76c021e35b5e]
+
+	* src/chrome/content/vimperator/commands.js:
+	make error messages generated by :set more Vim-like
+	[56ab15f4d2cc]
+
+2007-06-23  dougkearns  <dougkearns>
+
+	* src/vimperator.vim:
+	link vimperatorTodo to the Todo highlight group
+	[124a831a2545]
+
+2007-06-22  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/vimperator.js:
+	move hrist's incomplete tab numbering patch to the Wiki for now
+	[6efd6e4b6efd]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/file.js,
+	src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js:
+	normalise fold markers
+	[2ce707ceb3f4]
+
+2007-06-21  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/completion.js:
+	remove FIXME comment
+	[efd58cae3a16]
+
+	* src/chrome/content/vimperator/bookmarks.js:
+	add fold markers
+	[366cf1ad2470]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js:
+	improve the frame motion command - add [f to the existing ]f and
+	support {count} for both
+	[a502cc698fb4]
+
+2007-06-20  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js:
+	keyToString -> event.toString()
+	[df93680cec6a]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js:
+	moved log and logObject into the vimperator object
+	[e0939301c39b]
+
+2007-06-19  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js:
+	remove unused functions outputAddonsList, selectInput, and
+	toggle_image
+	[e7c2e5f7964f]
+
+	* src/chrome/content/vimperator/bookmarks.js:
+	declare title temporary variable
+	[eb7bff116368]
+
+	* src/chrome/content/vimperator/vimperator.js:
+	remove unused prev_match and heredoc global variables
+	[f9caf1c8d05d]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js:
+	make the global function parseBookmarkString a static function of
+	Bookmarks
+	[c086c0d32372]
+
+2007-06-19  stubenschrott  <stubenschrott>
+
+	* www/index.html:
+	Hopefully IE7 doesn't show notes now.
+	[22515a660f62]
+
+2007-06-19  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js:
+	add all commands by name as properties of vimperator.commands
+	[a245e0d2bf5e]
+
+	* src/chrome/content/vimperator/commands.js:
+	output "not implemented yet" messages for all unimplemented commands
+	[60d5c9801ed3]
+
+	* src/vimperator.vim:
+	update vimperator.vim with new commands
+	[020be10b0a21]
+
+	* src/chrome/content/vimperator/commands.js:
+	make sure Command.names includes unabbreviatable names
+	[b75b79623b20]
+
+2007-06-18  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/vimperator.js:
+	rename vimperator.ver to vimperator.version
+	[d16c79595e3f]
+
+	* src/chrome/content/vimperator/options.js:
+	don't include "no" prefixed variants of boolean option names in the
+	usage
+	[2e782255b671]
+
+	* src/chrome/content/vimperator/commands.js:
+	fix typo in :bdelete help
+	[cf02ee6637ba]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js:
+	remove COMMANDS, USAGE, SHORTHELP and HELP global constants
+	[bc4cfc7a5bf3]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js:
+	improve whitespace formatting of Command.toString
+	[20fc41a2b510]
+
+2007-06-17  dougkearns  <dougkearns>
+
+	* www/help.html:
+	fix typo
+	[50ee64c12c34]
+
+	* www/help.css, www/help.html:
+	fix minor help formatting issues
+	[e812d32ae6d9]
+
+	* www/help.css:
+	override mozdev's default list item style for our help page
+	[0039966e0243]
+
+	* src/chrome/content/vimperator/help.js:
+	fix typo in previous commit
+	[1060173eaade]
+
+2007-06-17  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/help.js:
+	made default value in help monospace again
+	[b4ea40bb3b1a]
+
+2007-06-16  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js:
+	initial Option/Options implementation - replacing g_options
+	[33c87e5dec20]
+
+2007-06-15  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/completion.js:
+	allow :set no<TAB> to be completed with the "no"-prefix version of
+	all boolean options
+	[c4d87961c108]
+
+	* src/chrome/content/vimperator/commands.js:
+	reorder Command.names as longname1, shortname1, longname2,
+	shortname2
+	[56a02434f1aa]
+
+2007-06-14  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js:
+	remove unnecessary parentheses from typeof operands
+	[64524b4c43ab]
+
+2007-06-13  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/default.css:
+	don't specify a font-size for the help page
+	[f86299cc497d]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js:
+	remove some unnecessary guard clauses
+	[32cb823cab28]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js:
+	prefer comparison with the undefined literal rather than using
+	typeof and comparing against "undefined"
+	[a0df21518bc5]
+
+2007-06-12  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/TODO, src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	- fixed commandline focus/blur behavior
+	- could be buggy, so please report any bugs
+	- text selection is not possible anymore for :echo'ed things, should
+	come later when holding shift
+	- cleared commandline on scroll events
+	[1e5ae9bfdc38]
+
+2007-06-12  vkojouharov  <vkojouharov>
+
+	* src/chrome/content/vimperator/bookmarks.js:
+	uppercase marks work once again
+	[758900480907]
+
+2007-06-11  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/help.js:
+	use code.tag element's text content to anchor the help 'section'
+	location rather than code.id
+	[330cf4340745]
+
+2007-06-10  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js:
+	remove unused var declaration in commandsIterator()
+	[7c6b5105cf78]
+
+	* src/chrome/content/vimperator/commands.js:
+	translate ~ to HOME on Windows for use with :source
+	[e91503f637af]
+
+2007-06-09  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	Final commit for the weekend: moved onKeyPress -> vimperator.events;
+	[319a7e7bdf59]
+
+	* src/ChangeLog, src/TODO, src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	now we have a Events() class Please report all bugs which arised
+	because of these changes Still not sure, if we should put that into
+	an event.js
+	[37e7277c701c]
+
+2007-06-09  vkojouharov  <vkojouharov>
+
+	* src/chrome/content/vimperator/bookmarks.js:
+	The global marks correctly jump to their stored position, once the
+	page has been loaded
+	[a1f40cf4a6ae]
+
+2007-06-09  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/vimperator.js:
+	Finally made event handling sane, creating an Events object will
+	come soon. This fixed many bugs like the reload/stop buttons being
+	correctly updated now, while getting rid of lots of old code.
+	[a57883a01d3f]
+
+2007-06-08  stubenschrott  <stubenschrott>
+
+	* src/mozunit.js:
+	added preliminary unit tests, not working yet, because the
+	vimperator object cannot be found in this context.
+	[d59b75908b59]
+
+2007-06-08  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/help.js:
+	make sure the help text is using a fixed-pitch font
+	[b931a7689e1b]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/mappings.js:
+	use || short-circuit initialization idiom when processing Command
+	and Map constructor args
+	[ca411ab2d060]
+
+	* src/chrome/content/vimperator/commands.js:
+	markup the ex-command special flag '!' with code.command in help
+	text
+	[50edf8952b43]
+
+	* src/chrome/content/vimperator/commands.js:
+	remove old/disabled :addons command
+	[e730496c596f]
+
+2007-06-08  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/vimperator.js:
+	small fixes to the input handling
+	[79981bc9416f]
+
+	* src/ChangeLog, src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	marks support (thanks viktor)
+	[01b008927404]
+
+2007-06-07  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/commands.js:
+	added back zoom_to function
+	[bbb7d0e9af68]
+
+2007-06-07  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js:
+	markup 'activate' option as such in :tabopen help text
+	[a28f638a5a1a]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js:
+	fix some help text typos
+	[94704efeaac0]
+
+2007-06-07  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/default.css:
+	changed the colors back to green/red.
+	[151e2a29209f]
+
+2007-06-06  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/commands.js:
+	remove unused global constants FUNCTION and COMPLETEFUNC
+	[bcf2731ff44e]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/options.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	change all references to "settings" to "options"
+	[40b3a9d72a2a]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	convert help page to XHTML Strict (excepting the id values) and add
+	initial implementations for the :viusage and :exusage commands
+	[450dbe81a68e]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/mappings.js:
+	initial Command/Commands implementation - replacing g_commands
+	[79078dd5951e]
+
+2007-06-05  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/bookmarks.js:
+	comment out debugging log message
+	[5b44efb96621]
+
+	* src/TODO:
+	add <ESC> closes :addons window bug to TODO
+	[4a1652ff4e44]
+
+2007-06-03  dougkearns  <dougkearns>
+
+	* src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	fix missing [count] functionality in normal mode commands
+	[90c4c31e0317]
+
+2007-05-31  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/mappings.js:
+	made action public to change .execute() to be a prototype
+	[9ad6c8dde77c]
 
-2007-09-17 13:26  dougkearns
+2007-05-31  dougkearns  <dougkearns>
 
-	* NEWS: add an initial implementation of :sidebar
+	* src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/help.js:
+	add missing var declarations
+	[6852747bc5ca]
 
-2007-09-17 05:49  dougkearns
+2007-05-31  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/mappings.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	merged the new mappings code, all glory goes to Doug!
+	[6ccf5d065239]
 
-	* NEWS: merge new 'more' option and more-prompt improvements
+2007-05-31  dougkearns  <dougkearns>
 
-2007-09-14 13:38  dougkearns
+	* src/chrome/content/vimperator/mappings.js:
+	fix the mapping usage string to only show the primary command
+	[a4601880a187]
 
-	* NEWS: add a 'hlsearchstyle' option to allow for match styling and
-	  a 'linksearch' option to restrict page searches to link text
+2007-05-30  dougkearns  <dougkearns>
 
-2007-09-08 09:50  dougkearns
+	* src/chrome/content/vimperator/ui.js:
+	fix typo in bufferposition_str variable declaration
+	[20478d5fb0e7]
 
-	* NEWS: added a visual bell and replaced the 'beep' option with
-	  'visualbell'
+	* src/chrome/content/vimperator/mappings.js:
+	remove a trailing , and :retab the file
+	[34e7e7a45d16]
 
-2007-09-08 09:41  dougkearns
+	* src/chrome/content/vimperator/mappings.js:
+	change references to vimperator.mode to vimperator.modes
+	[752bb8fd837f]
 
-	* Makefile: use preX.X for development version numbers
+	* src/chrome/content/vimperator/mappings.js:
+	fix extra_info processing in Map() and other minor typos
+	[7124670ce5ff]
 
-2007-09-06 00:04  dougkearns
+2007-05-30  stubenschrott  <stubenschrott>
 
-	* NEWS, vimperator.vim: merge new 'incsearch', 'ignorecase',
-	  'smartcase', 'hlsearch' options from MAIN
+	* src/chrome/content/vimperator/mappings.js:
+	cleaned up mappings code, should be feature complete now (apart from
+	the non-implemented getAll() method.
+	[1a29c4325603]
 
-2007-09-05 11:45  dougkearns
+2007-05-29  stubenschrott  <stubenschrott>
 
-	* Makefile: use preX.X for development version numbers
+	* src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	Added (outcommented because too slow) 'numbertabs' option (by
+	hrist).
+	[c509ac031674]
 
-2007-09-04 08:08  dougkearns
+2007-05-29  vkojouharov  <vkojouharov>
 
-	* Makefile: add logo to help page
+	* src/chrome/content/vimperator/mappings.js:
+	changed the flags back. don't use 1 << 0 for any of the flags, since
+	the 'default' one is 0
+	[2d5e07faaca9]
 
-2007-09-04 02:50  dougkearns
+2007-05-29  dougkearns  <dougkearns>
 
-	* Makefile, NEWS: update version to 0.5.2dev
+	* src/chrome/content/vimperator/mappings.js:
+	fix some minor, reintroduced, typos and add missing help line for
+	<ESC> map
+	[1b54d5d40722]
 
-2007-09-03 15:14  dougkearns
+2007-05-29  stubenschrott  <stubenschrott>
 
-	* ChangeLog, NEWS: update NEWS and ChangeLog for release
+	* src/chrome/content/vimperator/mappings.js:
+	changed coding style, commented things which should be changed with
+	XXX:
+	[e964368388c8]
 
-2007-09-03 05:12  dougkearns
+2007-05-28  dougkearns  <dougkearns>
 
-	* NEWS, vimperator.vim: merge native / and ? search
+	* src/chrome/content/vimperator/commands.js:
+	add missing var declaration to urls in openURLs*()
+	[1f675f638ccf]
 
-2007-09-01 11:49  dougkearns
+	* src/chrome/content/vimperator/mappings.js:
+	finish converting the mappings to the new Map() format
+	[e1e58826c002]
 
-	* vimperatorrc.example: remove outdated :js examples
+	* src/chrome/content/vimperator/vimperator.js:
+	add missing variable declaration for thistype, thismode, thisfunc in
+	triggerCallBack()
+	[795a2ef5c9aa]
 
-2007-08-28 12:16  dougkearns
+	* src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/vimperator.js:
+	remove last references to command_line and status_line
+	[0a6eff4c1f82]
 
-	* NEWS: update NEWS
+2007-05-27  stubenschrott  <stubenschrott>
 
-2007-08-27 14:19  dougkearns
+	* src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	explicitly set JS version to 1.7
+	[d3762691557f]
 
-	* Makefile: update Makefile version to 0.5.1
+2007-05-27  vkojouharov  <vkojouharov>
 
-2007-08-27 12:08  dougkearns
+	* src/chrome/content/vimperator/mappings.js:
+	RFC: the api for the new mappings
+	[f04b82512e9f]
 
-	* Makefile: GNU make 3.80 can't parse "else ifeq"
+2007-05-25  stubenschrott  <stubenschrott>
 
-2007-08-26 14:27  dougkearns
+	* src/chrome/content/vimperator/find.js:
+	removed 'noh'
+	[ed24ba4f9882]
 
-	* NEWS: fix commandline history on Windows - prevent the default
-	  cmd_charPrevious action from being invoked for <Up
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/find.js:
+	changed nohlsearch to the new spec
+	[43ae46ff0362]
 
-2007-08-26 12:05  dougkearns
+2007-05-25  dougkearns  <dougkearns>
 
-	* NEWS: update NEWS
+	* src/chrome/content/vimperator/commands.js:
+	fix accidental regression in :tabmove name specification
+	[1e7ba41f3279]
 
-2007-08-23 13:38  dougkearns
+2007-05-24  stubenschrott  <stubenschrott>
 
-	* Makefile: use 0.5 for the version strings
+	* src/AUTHORS, src/ChangeLog, src/TODO,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js:
+	added Y command
+	[9281045ed254]
+
+2007-05-24  dougkearns  <dougkearns>
 
-2007-08-21 21:54  dougkearns
+	* src/chrome/content/vimperator/vimperator.js:
+	update the buffer list on page load completion (the non-existant
+	showBufferList() was being called rather than updateBufferList())
+	[b1ca0b8d4cac]
+
+	* src/chrome/content/vimperator/commands.js:
+	fix typo in :open command's short help description
+	[7868e8847ba4]
+
+2007-05-24  stubenschrott  <stubenschrott>
 
-	* Makefile, NEWS, TODO: merge HEAD
-
-2007-08-16 16:18  stubenschrott
-
-	* ChangeLog, NEWS: last commit before 0.5 is tagged
-
-2007-08-15 18:27  stubenschrott
-
-	* ChangeLog: added colors to :ls
-
-2007-08-15 15:32  dougkearns
-
-	* NEWS: update NEWS to mention the renaming of bookmark related
-	  commands and fix some trivial help typos
-
-2007-08-13 18:12  stubenschrott
-
-	* ChangeLog: hopefully made the MOW hack better, so that it doesn't
-	  show during startup fixed wildoptions=sort
-
-2007-08-12 06:48  dougkearns
-
-	* NEWS: add initial implementation of :normal command
-
-2007-08-12 00:03  stubenschrott
-
-	* NEWS: commandline and MIW try to keep focus now changed
-	  commandline handling in general autosize MIW on new content new
-	  handling should be more robust, but there may be bugs, please
-	  report
-
-2007-08-11 17:08  stubenschrott
-
-	* ChangeLog, NEWS: changelog->NEWS, ChangeLog autogenerated now
-
-2007-08-11 09:28  dougkearns
-
-	* ChangeLog: rename :qmarkadd :qmark and :qmarkdel :delqmarks, sort
-	  :qmarks list output and limit buffer marks to [a-zA-Z]
-
-2007-08-10 18:30  stubenschrott
-
-	* ChangeLog: "enter" is an alias for "return" or "cr"
-
-2007-08-09 22:41  stubenschrott
-
-	* ChangeLog, TODO: - Fixed gn command - added gH to activate option
-
-2007-08-09 04:29  dougkearns
-
-	* vimperator.vim: reorder vimperatorCommand highlight group so that
-	  :map is highlighted
-
-2007-08-08 05:27  dougkearns
-
-	* ChangeLog: add C-u/C-d mappings and the associated 'scroll'
-	  option
-
-2007-08-01 02:51  stubenschrott
-
-	* ChangeLog: couldn't resist, had to add support for auto-sourcing
-	  ~/.vimperator/plugin/ before we release 0.5
-
-2007-08-01 01:17  stubenschrott
-
-	* ChangeLog: winopen support
-
-2007-07-31 15:41  stubenschrott
-
-	* TODO: Make sure, search engine aliases are unique
-
-2007-07-29 03:48  stubenschrott
-
-	* ChangeLog, TODO: inputMultiline method finished (some display bug
-	  may remain) :js <<EOF support is back, better than ever (TM)
-
-2007-07-27 00:01  stubenschrott
-
-	* ChangeLog: stringToURLs -> String.prototype.toURLArray
-
-2007-07-26 13:39  dougkearns
-
-	* Makefile: fix bug #17377 - Unable to build sources on Mac OS X
-
-2007-07-25 15:55  dougkearns
-
-	* TODO: fix infinite loop when calling "gu" with a {count}
-
-2007-07-22 15:15  dougkearns
-
-	* vimperator.vim: add map, mapclear, noremap and unmap commands to
-	  the vimperatorCommand highlight group
-
-2007-07-22 11:44  dougkearns
-
-	* ChangeLog: allow :noremap name abbreviations
-
-2007-07-17 14:55  dougkearns
-
-	* ChangeLog, TODO: replace readonly textboxes in the commandline
-	  and statusbar with labels and simplify the skin styling
-
-2007-07-09 23:12  stubenschrott
-
-	* ChangeLog: :saveas works now
-
-2007-07-09 13:27  stubenschrott
-
-	* AUTHORS: reverted scroll window.content patch for now (untested)
-
-2007-07-04 13:32  stubenschrott
-
-	* ChangeLog: changed '|' to ', ' as a url separator
-
-2007-07-03 09:04  stubenschrott
-
-	* TODO: Fixed some focus issues First (non-working) readMultiline
-	  implementation
-
-2007-07-02 06:57  dougkearns
-
-	* ChangeLog: add new Ctrl-^ mapping for selecting the alternate tab
-
-2007-06-30 13:14  stubenschrott
-
-	* ChangeLog: changed gO to gn
-
-2007-06-28 02:16  dougkearns
-
-	* TODO: move the global variable hah to vimperator.hints and fix
-	  bug #17254
-
-2007-06-25 21:23  stubenschrott
-
-	* vimperator.vim: verbosity -> verbose
-
-2007-06-25 15:54  dougkearns
-
-	* vimperator.vim: add verbosity and vbs to options syntax group
-
-2007-06-23 11:08  dougkearns
-
-	* vimperator.vim: link vimperatorTodo to the Todo highlight group
-
-2007-06-19 04:40  dougkearns
-
-	* vimperator.vim: update vimperator.vim with new commands
-
-2007-06-12 10:48  stubenschrott
-
-	* ChangeLog, TODO: - fixed commandline focus/blur behavior - could
-	  be buggy, so please report any bugs - text selection is not
-	  possible anymore for :echo'ed things, should come later when
-	  holding shift - cleared commandline on scroll events
-
-2007-06-09 13:39  stubenschrott
-
-	* ChangeLog, TODO: now we have a Events() class Please report all
-	  bugs which arised because of these changes Still not sure, if we
-	  should put that into an event.js
-
-2007-06-08 17:21  stubenschrott
-
-	* mozunit.js: added preliminary unit tests, not working yet,
-	  because the vimperator object cannot be found in this context.
-
-2007-06-07 23:33  stubenschrott
-
-	* ChangeLog: marks support (thanks viktor)
-
-2007-06-05 05:22  dougkearns
-
-	* TODO: add <ESC> closes :addons window bug to TODO
-
-2007-05-24 21:57  stubenschrott
-
-	* AUTHORS, ChangeLog, TODO: added Y command
-
-2007-05-24 10:47  stubenschrott
-
-	* AUTHORS, ChangeLog: flashing frame works now
-
-2007-05-23 01:18  stubenschrott
-
-	* ChangeLog: moved tab related functions to the Tabs class
-
-2007-05-22 09:13  stubenschrott
-
-	* ChangeLog, TODO: many help fixes moved echo() ->
-	  vimperator.echo() and removed old XUL entries.
-
-2007-05-21 09:35  stubenschrott
-
-	* ChangeLog, TODO, vimperator.vim: "R" -> reload without cache
-
-2007-05-20 16:01  stubenschrott
-
-	* ChangeLog: changed colors
-
-2007-05-17 18:48  stubenschrott
-
-	* AUTHORS, ChangeLog, TODO: Added "titlestring" setting
-
-2007-05-14 13:24  stubenschrott
-
-	* ChangeLog: initial :tabmove command
-
-2007-05-11 12:42  stubenschrott
-
-	* Makefile: First attempt in making vimperator object orietened.
-	  For now only the CommandLine widget was made a real encapsulated
-	  object.
-
-2007-05-09 11:56  stubenschrott
-
-	* ChangeLog: final commit before trying to integrate the search
-	  patch
-
-2007-05-09 00:31  stubenschrott
-
-	* ChangeLog: cleaned up html code for :help to make it more xhtml
-	  compatible :help now opens in the current tab even when current
-	  tab is a xhtml document
-
-2007-05-08 21:21  stubenschrott
-
-	* ChangeLog: hint work on xhtml pages now (slight problem with not
-	  disapperaring them still open)
-
-2007-05-08 16:57  stubenschrott
-
-	* AUTHORS, ChangeLog, TODO: added :tablast etc. commands
-
-2007-05-04 22:48  stubenschrott
-
-	* AUTHORS, ChangeLog: fixed :dl command
-
-2007-05-04 18:04  stubenschrott
-
-	* ChangeLog, Donators, Makefile, vimperator.vim,
-	  vimperatorrc.example: keyword support for bookmarks
-
-2007-05-02 12:59  stubenschrott
-
-	* ChangeLog: [no log message]
-
-2007-05-02 12:55  stubenschrott
-
-	* ChangeLog, Makefile: bug fix release
-
-2007-05-02 12:47  stubenschrott
-
-	* ChangeLog: fixed :open google.com opening google for searching
-	  ".com"
-
-2007-05-01 17:29  stubenschrott
-
-	* ChangeLog: added 'defsearch' setting
-
-2007-05-01 11:23  stubenschrott
-
-	* ChangeLog, TODO, install.rdf: [no log message]
-
-2007-05-01 00:19  stubenschrott
-
-	* Makefile: fixed gu and gU
-
-2007-04-30 10:59  stubenschrott
-
-	* ChangeLog: fixed :o http://www.url.com
-
-2007-04-29 19:13  stubenschrott
-
-	* Makefile: new make release command
-
-2007-04-29 18:55  stubenschrott
-
-	* Makefile: more makefile fixes by Bart
-
-2007-04-29 18:50  stubenschrott
-
-	* Makefile: [no log message]
-
-2007-04-29 16:31  stubenschrott
-
-	* ChangeLog, install.rdf: website updates
-
-2007-04-29 15:04  stubenschrott
-
-	* ChangeLog, TODO: Many small bugfixes changed wildsort ->
-	  wildoptions=sort added completion for filenames
-
-2007-04-29 00:26  stubenschrott
-
-	* Makefile, TODO: Makefile fixes and much sexier help file
-
-2007-04-28 16:05  stubenschrott
-
-	* install.rdf: added ###VERSION### and ###DATE### for being seded
-	  in the Makefile
-
-2007-04-28 12:14  stubenschrott
-
-	* ChangeLog, TODO: added goUp() and isDirectory(uri) functions gu
-	  and gU mappings for going up
-
-2007-04-28 01:56  stubenschrott
-
-	* ChangeLog: major code cleanup by using constants instead of
-	  indices, small bugs still may occur due to this change
-
-2007-04-27 19:06  stubenschrott
-
-	* TODO, install.rdf: wildmode and wildsort support :open . and ..
-	  and .../ supported
-
-2007-04-25 17:11  stubenschrott
-
-	* Makefile, TODO, vimperatorrc.example: Makefile changes for
-	  missing chrome/ dir
-
-2007-04-25 09:20  stubenschrott
-
-	* TODO: added feeling lucky 'lucky' quick search
-
-2007-04-24 21:06  stubenschrott
-
-	* ChangeLog, TODO: esc -> C-c to stop page :stop command added
-
-2007-04-24 14:10  stubenschrott
-
-	* vimperatorrc.example: added sample vimperatorrc, not really
-	  useful yet
-
-2007-04-24 12:12  stubenschrott
-
-	* AUTHORS: applied 'B' patch from Lars (not working fully) cleaned
-	  up init() and moved all eventlisteneres code to
-	  addEventListeners()
-
-2007-04-22 23:21  vkojouharov
-
-	* Makefile, install.rdf: redesing of the help page to be more like
-	  vim's help. :tab command like in vim.  the extension id has
-	  changed to a more readable string. any older versions of
-	  vimperator MUST be uninstalled, otherwise there will be 2
-	  versions of the extension in the addons list.
-
-2007-04-22 17:50  stubenschrott
-
-	* Donators: update
-
-2007-04-22 14:10  vkojouharov
-
-	* TODO: bug--
-
-2007-04-22 13:00  stubenschrott
-
-	* AUTHORS: updated AUTHORS file
-
-2007-04-21 18:06  stubenschrott
-
-	* ChangeLog: :back! and :forward! support
-
-2007-04-21 11:18  stubenschrott
-
-	* Donators: set horizontal offset to 0
-
-2007-04-20 21:25  stubenschrott
-
-	* ChangeLog, Donators, TODO: added section support for :help
-
-2007-04-20 15:23  stubenschrott
-
-	* AUTHORS: forgot this file
-
-2007-04-20 15:07  stubenschrott
-
-	* Makefile: small changes
-
-2007-04-20 15:03  stubenschrott
-
-	* ChangeLog, Makefile: :source support
-
-2007-04-20 14:46  stubenschrott
-
-	* ChangeLog, Makefile: now we have a new build Makefile also added
-	  file.js which is responsible for file writing/loading in future
-
-2007-04-20 13:33  stubenschrott
-
-	* ChangeLog, TODO: - fixed hints display on zoom - fixed n and N
-	  commands (don't use closures)
-
-2007-04-20 03:01  stubenschrott
-
-	* ChangeLog, TODO: hmm, forgot what I changed :)
-
-2007-04-19 16:09  stubenschrott
-
-	* ChangeLog, Donators, TODO: added modelines everywhere
-
-2007-04-19 13:29  stubenschrott
-
-	* TODO: restart command
-
-2007-04-18 13:33  stubenschrott
-
-	* TODO: added contact section to homepage
-
-2007-04-18 11:42  stubenschrott
-
-	* ChangeLog, TODO: support for space and alt-left/right keys
-
-2007-04-18 11:06  stubenschrott
-
-	* ChangeLog, TODO: [+-] support for settings
-
-2007-04-17 20:07  stubenschrott
-
-	* ChangeLog, Donators, TODO: Added n and N commands
-
-2007-04-17 17:34  stubenschrott
-
-	* ChangeLog: removed < and >
-
-2007-04-17 16:44  stubenschrott
-
-	* ChangeLog, Donators, TODO, install.rdf: version 0.3, added
-	  ignorekeys support
-
-2007-04-16 23:31  stubenschrott
-
-	* ChangeLog, Donators, TODO: Added Ctrl-[ alias, and 's' guioption
-
-2007-04-11 18:38  stubenschrott
-
-	* TODO: go_tab -> tab_go
-
-2007-04-11 03:15  stubenschrott
-
-	* TODO: updated TODO file
-
-2007-04-11 02:04  stubenschrott
-
-	* ChangeLog, TODO: [no log message]
-
-2007-04-10 19:32  stubenschrott
-
-	* ChangeLog, TODO, chrome.manifest, install.rdf:
-	  Initial import
+	* src/AUTHORS, src/ChangeLog,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js:
+	flashing frame works now
+	[42c2e9da431a]
+
+2007-05-23  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	moved tab related functions to the Tabs class
+	[95842607333a]
+
+2007-05-22  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/TODO, src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	many help fixes moved echo() -> vimperator.echo() and removed old
+	XUL entries.
+	[a3151f6c8ee7]
+
+2007-05-21  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/TODO, src/chrome/content/vimperator/commands.js,
+	src/vimperator.vim:
+	"R" -> reload without cache
+	[1e1066a0d60b]
+
+2007-05-20  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/vimperator.js:
+	changed colors
+	[6336a0e02089]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/vimperator.js:
+	commited help typos
+	[3021dc0f4875]
+
+2007-05-20  vkojouharov  <vkojouharov>
+
+	* src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js:
+	move the statusbar color handling to the css file. for the future,
+	whenever a background color is set, the foreground color should also
+	be set, otherwise text might be unreadable in dark themes (or light
+	themes, depending on what theme the user has)
+	[46648e39d1a4]
+
+2007-05-20  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/contents.rdf,
+	src/chrome/content/vimperator/vimperator.js:
+	commited pending changes, nothing big
+	[72abcb21a25e]
+
+2007-05-18  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/completion.js:
+	one less global variable (g_completions)
+	[0bf067cc7bb4]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js:
+	fully objectized History() and Bookmarks()
+	[4ee5c529a7f6]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js:
+	rewrote mode-handling
+	[49956245a441]
+
+2007-05-17  stubenschrott  <stubenschrott>
+
+	* src/AUTHORS, src/ChangeLog, src/TODO,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	Added "titlestring" setting
+	[8ab354642b2e]
+
+2007-05-16  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/commandline.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/find.js,
+	src/chrome/content/vimperator/ui.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	renamed commandline.js -> ui.js moved all statusbar code to the
+	StatusLine() class
+	[f274b836bf00]
+
+2007-05-15  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/commandline.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/tags,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	renamed CompletionList -> InformationList which is now a common
+	class for the completion window, for the preview window and the
+	buffer window ("B"). Only the StatusLine class to go...
+	[0de11ead1a6e]
+
+2007-05-14  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/commandline.js,
+	src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/find.js:
+	small CSS fixes by Doug and added modelines to find.js and
+	commandline.js
+	[6aa3a6e7646a]
+
+	* src/ChangeLog, src/chrome/content/vimperator/commands.js:
+	initial :tabmove command
+	[086926fbee25]
+
+2007-05-14  vkojouharov  <vkojouharov>
+
+	* src/chrome/content/vimperator/help.js:
+	The Help Strikes Back
+	[6dfeaba5bcf8]
+
+2007-05-13  vkojouharov  <vkojouharov>
+
+	* src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	The Return of the Link
+	[43ed543b619c]
+
+	* src/chrome/content/vimperator/commandline.js:
+	fixed the indentation and and command line completion
+	[b22c01c87afc]
+
+2007-05-12  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/commandline.js,
+	src/chrome/content/vimperator/find.js:
+	add forgotten files
+	[3489fe6d5357]
+
+2007-05-11  stubenschrott  <stubenschrott>
+
+	* src/Makefile, src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/tags,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	First attempt in making vimperator object orietened. For now only
+	the CommandLine widget was made a real encapsulated object.
+	[28036b24e0ee]
+
+2007-05-09  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js:
+	final commit before trying to integrate the search patch
+	[baf5d6a29c86]
+
+	* src/chrome/content/vimperator/vimperator.js:
+	changed setOverLink back to echo() as I really couldn't stand it
+	anymore in the statusbar Mail me if you really want it in the
+	statusbar, and come up with a good setting name for this preference
+	[5fc080a9e1c5]
+
+	* src/ChangeLog, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	cleaned up html code for :help to make it more xhtml compatible
+	:help now opens in the current tab even when current tab is a xhtml
+	document
+	[08a04871681d]
+
+2007-05-08  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/settings.js:
+	hint work on xhtml pages now (slight problem with not disapperaring
+	them still open)
+	[dbc98ca1118f]
+
+	* src/AUTHORS, src/ChangeLog, src/TODO,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/help.js:
+	added :tablast etc. commands
+	[b2be82b8dd93]
+
+2007-05-08  vkojouharov  <vkojouharov>
+
+	* src/chrome/content/vimperator/completion.js:
+	the substrings shouldn't be cleared in this particular case
+	[ed630419c49c]
+
+2007-05-05  stubenschrott  <stubenschrott>
+
+	* src/AUTHORS, src/ChangeLog,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js:
+	fixed :dl command
+	[0a520b755ef9]
+
+2007-05-04  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/Donators, src/Makefile,
+	src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/tags,
+	src/chrome/content/vimperator/vimperator.js, src/vimperator.vim,
+	src/vimperatorrc.example:
+	keyword support for bookmarks
+	[fbed7759dd77]
+
+	* www/Donators.html, www/index.html, www/vimperator.vim:
+	added vimperator.vim file
+	[d824909bfd29]
+
+2007-05-03  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/help.js:
+	fixed \\n in help files
+	[e8003d8375bb]
+
+2007-05-02  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, www/ChangeLog.html, www/index.html:
+	*** empty log message ***
+	[1de5a666faa1]
+
+	* downloads/update.rdf, downloads/vimperator_0.4.1.xpi, src/ChangeLog,
+	src/Makefile, src/chrome/content/vimperator/bookmarks.js,
+	www/ChangeLog.html, www/index.html:
+	bug fix release
+	[c0db5dc9029b] [RELEASE_0_4_1]
+
+	* src/ChangeLog, src/chrome/content/vimperator/commands.js:
+	fixed :open google.com opening google for searching ".com"
+	[b08385e2a56b]
+
+	* src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/vimperator.js:
+	pass <enter> <space> <tab> etc. to vimperator now, so that they can
+	perform their default action without beeping. Quite hacky so far,
+	should be cleaned up.
+	[e0cf7a80c56a]
+
+	* www/ChangeLog.html, www/help.css, www/screenshot_winxp.png,
+	www/screenshots.html:
+	added winxp screenshot
+	[4d23e0992a56]
+
+	* src/chrome/content/vimperator/default.css,
+	src/chrome/content/vimperator/help.js:
+	added version info to help file, fixed font size for tables
+	[ef9d5e6eee11]
+
+2007-05-01  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/tags,
+	src/chrome/content/vimperator/vimperator.js:
+	added 'defsearch' setting
+	[ec74f3b6270f]
+
+2007-05-01  vkojouharov  <vkojouharov>
+
+	* src/chrome/content/vimperator/help.js:
+	scroll to the proper location without the need of an offset
+	[6d56dae43b82]
+
+2007-05-01  stubenschrott  <stubenschrott>
+
+	* www/index.html:
+	typo in d/l url
+	[60975a8a6ef2]
+
+	* www/index.html:
+	added wiki link
+	[4c3821ba8dc8]
+
+	* src/ChangeLog, src/TODO, src/chrome/content/vimperator/commands.js,
+	src/install.rdf:
+	*** empty log message ***
+	[a6a9d7f8c182]
+
+	* www/index.html, www/project_nav.html:
+	final website fixes
+	[a3b45eb9a353]
+
+	* www/help.css, www/help.html:
+	*** empty log message ***
+	[f2e5210a27e5]
+
+	* www/help.html:
+	css
+	[c46aefe467b9]
+
+	* www/help.html:
+	*** empty log message ***
+	[a5c895db9ca9]
+
+	* www/help.html:
+	*** empty log message ***
+	[a1809a4476f9]
+
+	* www/help.html:
+	*** empty log message ***
+	[c74e50b8d999]
+
+	* www/index.html:
+	*** empty log message ***
+	[27634ce96fb5]
+
+	* www/index.html:
+	*** empty log message ***
+	[b040d2123e00]
+
+	* www/index.html:
+	*** empty log message ***
+	[aaca349d84c1]
+
+	* www/index.html:
+	*** empty log message ***
+	[1d3919106de9]
+
+	* www/index.html:
+	*** empty log message ***
+	[2f7f049fd57b]
+
+	* www/ChangeLog.html, www/TODO.html, www/index.html,
+	www/project_nav.html:
+	added warning for uninstalling old vimperator versions first
+	[10dfb148d038]
+
+	* downloads/update.rdf, downloads/update.rdf.in,
+	downloads/vimperator_0.2.xpi, downloads/vimperator_0.4.xpi:
+	new vimperator release
+	[ab12b1156efa]
+
+	* src/Makefile, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js:
+	fixed gu and gU
+	[6a5912e040f9]
+
+2007-04-30  stubenschrott  <stubenschrott>
+
+	* downloads/update.rdf:
+	manually set to version 0.3 for now, so that users wont be notified
+	of the new version.
+	[1839dc1babff]
+
+	* src/ChangeLog, src/chrome/content/vimperator/commands.js:
+	fixed :o http://www.url.com
+	[1d9938ce6bc9]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js:
+	- use default firefox engines :qsadd, :qsdel commands not yet done
+	[231fe8d2f5a5]
+
+	* www/screenshot_macos.png:
+	cropped screenshot
+	[d6dbe7ded3b0]
+
+2007-04-29  stubenschrott  <stubenschrott>
+
+	* downloads/update.rdf, downloads/update.rdf.in, src/Makefile,
+	src/update.rdf.in:
+	new make release command
+	[2bbeb7270b58]
+
+	* www/screenshots.html:
+	website fix
+	[38f539bfdf7e]
+
+	* src/Makefile:
+	more makefile fixes by Bart
+	[4fe92e18512e]
+
+	* src/Makefile:
+	*** empty log message ***
+	[dc06a0962f1c]
+
+	* www/list.html, www/screenshot_macos.png, www/screenshots.html:
+	added link to gmane archives on webpage
+	[b41601f8c963]
+
+	* src/chrome/content/vimperator/default.css:
+	add
+	[2e0a0d1edaac]
+
+	* www/screenshot.png, www/screenshot_linux.png, www/screenshots.html:
+	updated screenshot
+	[672afa0b2ca9]
+
+	* src/ChangeLog, src/install.rdf, www/ChangeLog.html, www/TODO.html,
+	www/source.html:
+	website updates
+	[b354e9ae5b03]
+
+	* src/ChangeLog, src/TODO, src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	Many small bugfixes changed wildsort -> wildoptions=sort added
+	completion for filenames
+	[ace169b463a9]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/tags,
+	src/chrome/content/vimperator/vimperator.js:
+	changed ":help open" to ":help :open"
+	[231a33ee96fd]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js:
+	fixed display of <> in help
+	[5fec2bfdc56f]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js:
+	experimental new help design
+	[47c82c944309]
+
+	* src/Makefile, src/TODO, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	Makefile fixes and much sexier help file
+	[4bd72842a26e]
+
+2007-04-28  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/settings.js, src/update.rdf.in:
+	added update.rdf.in changed help file to look much more vim like
+	(with monospaced font)
+	[d14860babb0f]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	fixed :q command
+	[5278a2f49cfb]
+
+	* src/chrome/content/vimperator/vimperator.js:
+	typo
+	[a506fa7c33da]
+
+	* downloads/update.rdf, src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.js, src/install.rdf,
+	www/AUTHORS.html, www/ChangeLog.html, www/TODO.html:
+	added ###VERSION### and ###DATE### for being seded in the Makefile
+	[e5a939f0337c]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	fixed hints
+	[c5ebe260a8a8]
+
+	* src/ChangeLog, src/TODO, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js:
+	added goUp() and isDirectory(uri) functions gu and gU mappings for
+	going up
+	[f6bafb55dfbb]
+
+2007-04-28  vkojouharov  <vkojouharov>
+
+	* src/chrome/content/vimperator/vimperator.js:
+	delay sourcing of the rc file so that commands that open new tabs
+	(like js!) can work
+	[da032e889a8e]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/file.js,
+	src/chrome/content/vimperator/help.js:
+	fixes: 'tag' command works once more 'source ~/' shows the
+	matches fdopen checks whether the file exists, and throws a more-
+	readable error if it doesn't 'help' work if the current document
+	is a XULDocument (it shows the help in a new tab)
+	[8c3bdacb9796]
+
+2007-04-28  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	major code cleanup by using constants instead of indices, small bugs
+	still may occur due to this change
+	[66b7a228b3dd]
+
+2007-04-27  stubenschrott  <stubenschrott>
+
+	* src/TODO, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/tags,
+	src/chrome/content/vimperator/vimperator.js, src/install.rdf:
+	wildmode and wildsort support :open . and .. and .../ supported
+	[fbf793feb1b1]
+
+2007-04-26  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/commands.js:
+	small changes
+	[408d62666089]
+
+2007-04-25  stubenschrott  <stubenschrott>
+
+	* src/Makefile, src/TODO, src/vimperatorrc.example:
+	Makefile changes for missing chrome/ dir
+	[b025a13e344a]
+
+	* src/chrome/content/vimperator/vimperator.js:
+	changed version number for now a little
+	[824a17254e8a]
+
+	* src/TODO, src/chrome/content/vimperator/commands.js:
+	added feeling lucky 'lucky' quick search
+	[133eb1264d0f]
+
+2007-04-24  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/TODO, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js:
+	esc -> C-c to stop page :stop command added
+	[8967c7081456]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js:
+	'B' works now as it is supposed to do
+	[bd9f935f463c]
+
+	* src/chrome/content/vimperator/settings.js:
+	hinttags fixes
+	[d3afc06b51dc]
+
+	* src/vimperatorrc.example:
+	added sample vimperatorrc, not really useful yet
+	[3ebcbe34eec3]
+
+	* src/AUTHORS, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/vimperator.js:
+	applied 'B' patch from Lars (not working fully) cleaned up init()
+	and moved all eventlisteneres code to addEventListeners()
+	[9b0716ad675c]
+
+	* www/AUTHORS.html, www/ChangeLog.html, www/Donators.html,
+	www/TODO.html:
+	website updates
+	[8df74928e8d5]
+
+2007-04-23  vkojouharov  <vkojouharov>
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/help.js:
+	removed the command wrapping in the help output
+	[3b5e512a84a4]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	fix the :help command
+	[fe8d9db4ba38]
+
+2007-04-23  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/help.js,
+	src/chrome/content/vimperator/tags,
+	src/chrome/content/vimperator/vimperator.xul:
+	make help.js a seperate file, small indention fixes
+	[3632a14fdf39]
+
+2007-04-23  vkojouharov  <vkojouharov>
+
+	* src/chrome/content/vimperator/completion.js:
+	file completion now works for the path '/' also
+	[f5975de6cdf7]
+
+	* src/Makefile, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.js, src/install.rdf:
+	redesing of the help page to be more like vim's help. :tab command
+	like in vim. the extension id has changed to a more readable string.
+	any older versions of vimperator MUST be uninstalled, otherwise
+	there will be 2 versions of the extension in the addons list.
+	[3719dd0ec1a0]
+
+2007-04-22  stubenschrott  <stubenschrott>
+
+	* src/Donators:
+	update
+	[c31d3c507bfa]
+
+2007-04-22  vkojouharov  <vkojouharov>
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/file.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	ex parser for use with .vimperatorrc, the command line and other
+	sourced files. sourced files are no longer javascript code, but can
+	use the new :javascript ex command to execute javascript.
+	:javascript also supports multiline with heredocs (:js <<EOF). File
+	completion for the :source command.
+	[81d42510619c]
+
+	* src/TODO:
+	bug--
+	[7ef6ade58d22]
+
+2007-04-22  stubenschrott  <stubenschrott>
+
+	* src/AUTHORS:
+	updated AUTHORS file
+	[1d86ab8d5947]
+
+2007-04-21  stubenschrott  <stubenschrott>
+
+	* src/Contributors, src/vimperator_0.1.xpi, src/vimperator_0.2.xpi:
+	removed old files
+	[9184692faede]
+
+	* src/ChangeLog, src/chrome/content/vimperator/commands.js:
+	:back! and :forward! support
+	[5bd84aa78a54]
+
+	* src/Donators, src/chrome/content/vimperator/commands.js:
+	set horizontal offset to 0
+	[1f2585dcc874]
+
+	* www/ChangeLog.html, www/Donators.html, www/TODO.html:
+	website updates
+	[2c56ccc7b94f]
+
+	* src/chrome/content/vimperator/commands.js:
+	coding style fixes
+	[c16cb2314492]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/vimperator.js:
+	valign=top for cells
+	[c98f6fd1b126]
+
+2007-04-20  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/Donators, src/TODO,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/vimperator.js:
+	added section support for :help
+	[bf0271f9c455]
+
+	* src/AUTHORS:
+	forgot this file
+	[441f319f2c12]
+
+	* src/Makefile:
+	small changes
+	[65914009da07]
+
+	* downloads/update.rdf, src/ChangeLog, src/Makefile,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js, www/AUTHORS.html,
+	www/ChangeLog.html, www/TODO.html, www/index.html:
+	:source support
+	[51d8b5641201]
+
+	* src/ChangeLog, src/Makefile, src/build.sh,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/file.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	now we have a new build Makefile also added file.js which is
+	responsible for file writing/loading in future
+	[c8c3f02c5c22]
+
+	* src/ChangeLog, src/TODO, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/tags,
+	src/chrome/content/vimperator/vimperator.js:
+	- fixed hints display on zoom
+	- fixed n and N commands (don't use closures)
+	[d985c62a1a34]
+
+	* src/ChangeLog, src/TODO, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	hmm, forgot what I changed :)
+	[ed56d752881f]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	added showmode setting
+	[f43417ef004b]
+
+2007-04-19  stubenschrott  <stubenschrott>
+
+	* www/AUTHORS.html, www/ChangeLog.html, www/Donators.html,
+	www/TODO.html:
+	*** empty log message ***
+	[be5b31743a7f]
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.js:
+	change tabs->4 spaces
+	[9b19d1d26629]
+
+	* src/ChangeLog, src/Donators, src/TODO,
+	src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/tags,
+	src/chrome/content/vimperator/vimperator.js:
+	added modelines everywhere
+	[d3748baef3c5]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js:
+	added :buffer(s) commands
+	[06656e71058d]
+
+	* src/TODO, src/chrome/content/vimperator/commands.js:
+	restart command
+	[53652931a71e]
+
+2007-04-18  stubenschrott  <stubenschrott>
+
+	* src/TODO, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/settings.js, www/TODO.html,
+	www/index.html:
+	added contact section to homepage
+	[e69c88693e7b]
+
+	* www/ChangeLog.html, www/TODO.html, www/index.html:
+	added IRC link
+	[e6f5b0d1d47b]
+
+	* src/ChangeLog, src/TODO, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/vimperator.js:
+	support for space and alt-left/right keys
+	[c478f27e1d22]
+
+	* src/ChangeLog, src/TODO, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js, www/AUTHORS.html,
+	www/ChangeLog.html, www/TODO.html, www/index.html:
+	[+-] support for settings
+	[6afd65bdaf8f]
+
+	* www/index.html:
+	aligned!
+	[31f35d1a2bbc]
+
+	* www/index.html:
+	next try
+	[7ecb7e01bd3c]
+
+	* www/index.html:
+	oops
+	[c3cd4b5c2afb]
+
+	* src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.xul, www/index.html:
+	added counter to web site
+	[afd271f12ff1]
+
+	* downloads/update.rdf, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/settings.js:
+	Changed wiki search engine
+	[456ce083a03b]
+
+2007-04-17  stubenschrott  <stubenschrott>
+
+	* src/ChangeLog, src/Donators, src/TODO,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/hints.js, www/ChangeLog.html,
+	www/Donators.html, www/TODO.html, www/index.html:
+	Added n and N commands
+	[99415f6998bf]
+
+	* www/index.html:
+	fix webpage
+	[6b46d6683e73]
+
+	* src/ChangeLog, www/ChangeLog.html:
+	removed < and >
+	[784fd3dc3a6e]
+
+	* www/installation.html:
+	note to older version
+	[cfe906d43488]
+
+	* www/installation.html:
+	fixed download link
+	[c3dce0f0abb0]
+
+	* www/index.html:
+	removed quick changelog
+	[daef529c5965]
+
+	* www/index.html:
+	added <pre> tag
+	[8ffcec711eb6]
+
+	* downloads/update.rdf, downloads/vimperator_0.2.xpi,
+	downloads/vimperator_0.3.xpi, src/ChangeLog, src/Donators, src/TODO,
+	src/build.sh, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/vimperator.js, src/install.rdf,
+	www/AUTHORS.html, www/ChangeLog.html, www/Donators.html,
+	www/TODO.html, www/index.html:
+	version 0.3, added ignorekeys support
+	[8efcc1b1734d]
+
+	* downloads/update.rdf:
+	First attempt to make auto-update work
+	[f6bdd0d7ea66]
+
+	* www/ChangeLog.html, www/index.html:
+	added: read TODO on homepage
+	[8cf0a2e91edd]
+
+	* www/index.html:
+	removed notes function from web page
+	[a1da9e30e2de]
+
+	* src/ChangeLog, src/Contributors, src/Donators, src/TODO,
+	src/build.sh, src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul, www/ChangeLog.html,
+	www/TODO.html, www/index.html:
+	Added Ctrl-[ alias, and 's' guioption
+	[48bdc0a81c54]
+
+2007-04-11  stubenschrott  <stubenschrott>
+
+	* src/TODO, src/chrome/content/vimperator/commands.js, www/TODO.html:
+	go_tab -> tab_go
+	[deb96be730f1]
+
+	* src/TODO, www/TODO.html:
+	updated TODO file
+	[0468cbfcfc93]
+
+	* www/help.html:
+	a ) too much
+	[357f72a34a34]
+
+	* www/help.html:
+	changed encoding to latin1
+	[84d8bc9f658d]
+
+	* www/help.html, www/index.html:
+	*** empty log message ***
+	[797fb4560abe]
+
+	* www/index.html:
+	*** empty log message ***
+	[3a86cda65002]
+
+	* www/help.html:
+	changed encoding to utf8
+	[6b2273d77a61]
+
+	* www/help.html, www/index.html:
+	*** empty log message ***
+	[f5b191a715d7]
+
+	* www/help.html:
+	*** empty log message ***
+	[c0f793964e96]
+
+	* www/help.html, www/index.html:
+	added help.html
+	[64f047b5f6e4]
+
+	* src/ChangeLog, src/TODO:
+	*** empty log message ***
+	[87b7c3a25b07]
+
+	* www/ChangeLog.html, www/index.html:
+	finally it should work
+	[512a66ae09e1]
+
+	* www/TODO.html:
+	added <pre>-tags
+	[6a59d2281ce1]
+
+	* www/TODO.html, www/index.html:
+	*** empty log message ***
+	[958435d772ea]
+
+	* www/ChangeLog, www/ChangeLog.html, www/TODO, www/TODO.html,
+	www/project_nav.html:
+	fix ChangeLog and TODO (finally?)
+	[01869049644a]
+
+	* www/ChangeLog, www/TODO:
+	also add the files
+	[ff0916ba65ed]
+
+	* www/project_nav.html:
+	Added changelog and todo
+	[c5bc427108a0]
+
+	* www/index.html, www/installation.html, www/screenshot.png:
+	Fixed download link
+	[f1e009f8ffce]
+
+	* www/index.html:
+	Features added
+	[f1bb6ac1ac36]
+
+	* www/index.html, www/screenshots.html:
+	Added screenshot
+	[76184b5afd32]
+
+	* downloads/vimperator_0.2.xpi:
+	Release
+	[a3a38c67aba8]
+
+	* www/index.html, www/local.conf:
+	Test
+	[2d2a250f5309]
+
+2007-04-10  stubenschrott  <stubenschrott>
+
+	* src/chrome/content/vimperator/bookmarks.js,
+	src/chrome/content/vimperator/commands.js,
+	src/chrome/content/vimperator/completion.js,
+	src/chrome/content/vimperator/contents.rdf,
+	src/chrome/content/vimperator/hints.js,
+	src/chrome/content/vimperator/settings.js,
+	src/chrome/content/vimperator/tags,
+	src/chrome/content/vimperator/vimperator.js,
+	src/chrome/content/vimperator/vimperator.xul:
+	Initial import
+	[54f6290491fa]
+
+	* src/ChangeLog, src/TODO, src/build.sh, src/chrome.manifest,
+	src/install.rdf, src/vimperator_0.1.xpi, src/vimperator_0.2.xpi:
+	Initial import
+	[1e5f1b491e38]
+
+2007-04-06  petejc  <petejc>
+
+	* downloads/README.downloads, www/README.downloads, www/bugs.html,
+	www/error/404.html, www/footer.html, www/head.txt,
+	www/hide_from_ns4.css, www/html_body.html, www/index.html,
+	www/installation.html, www/local.conf, www/notes.html,
+	www/project.css, www/project_nav.html, www/protected/edit.html,
+	www/screenshots.html, www/source.html:
+	adding templates
+	[8b1023ca1b53]
 

From 5a83a74199a312ee0be8b109e396da69b24c76c8 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 11 Oct 2007 01:07:16 +0000
Subject: [PATCH 124/224] fix typo in :preferences usage

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

diff --git a/content/commands.js b/content/commands.js
index 5c4850c7..9178fd59 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1066,7 +1066,7 @@ function Commands() //{{{
             }
         },
         {
-            usage: [":pref[erences][!]"],
+            usage: ["pref[erences][!]"],
             short_help: "Show Browser Preferences",
             help: "You can change the browser preferences from this dialog. " +
                   "Be aware that not all Firefox preferences work, because Vimperator overrides some keybindings and changes Firefox's GUI.<br/>" +

From 4360662aa2a177325c80bf3866c55312602cde4a Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 11 Oct 2007 01:26:40 +0000
Subject: [PATCH 125/224] put the help section locating block in a timeout to
 sure the first call to :help {arg} works

---
 content/help.js | 64 ++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/content/help.js b/content/help.js
index 7854d3c4..8c8f6ef9 100644
--- a/content/help.js
+++ b/content/help.js
@@ -59,9 +59,7 @@ vimperator.help = function(section, easter) //{{{
                 // keep <br/>
                 //usage = usage.replace(/<([^b][^r].*>)/g, "&lt;$1");
                 //usage = usage.replace(/[^b][^r][^\/]>/g, "&gt;");
-                usage = usage.replace(/&/g, "&amp;");
-                usage = usage.replace(/</g, "&lt;");
-                usage = usage.replace(/>/g, "&gt;");
+                usage = vimperator.util.escapeHTML(usage);
                 usage = usage.replace(/\\n/g, "<br/>");
                 // color [count], [!], {arg} and [arg] in the usage, not nice and error prone but the regexp work (for now)
                 usage = usage.replace(/({[^}]+})/g, "<span class=\"argument\">$1</span>");                    // required args
@@ -98,11 +96,7 @@ vimperator.help = function(section, easter) //{{{
             for (var j=0; j < names.length; j++)
             {
                 var cmd_name = names[j];
-                cmd_name = cmd_name.replace(/</g, "&lt;");
-                cmd_name = cmd_name.replace(/>/g, "&gt;");
-                // cmd_name = cmd_name.replace(/"/g, "&quot;");
-                // cmd_name = cmd_name.replace(/'/g, "&apos;");
-                // cmd_name = cmd_name.replace(/&/g, "&amp;");
+                cmd_name = vimperator.util.escapeHTML(cmd_name);
                 ret += '<code class="tag">' + beg + cmd_name + end + '</code><br/>';
             }
             ret += '</td></tr>';
@@ -228,6 +222,7 @@ vimperator.help = function(section, easter) //{{{
     }
     catch(e)
     {
+        // FIXME: what's this all about then, eh? Works the same for if it's removed. -- djk
         // when the url is "about:" or any other xhtml page the doc is not open
         // then retry again in 250ms but just once
         if (arguments[3] && arguments[3].recursive)
@@ -259,35 +254,38 @@ vimperator.help = function(section, easter) //{{{
         return [valueL, valueT];
     }
 
-    if (section)
-    {
-        function findSectionElement(section)
+    // FIXME
+    setTimeout(function() {
+        if (section)
         {
-            return vimperator.buffer.evaluateXPath('//code[@class="tag" and text()="' + section + '"] | id("' + section + '")')
-                .snapshotItem(0);
-        }
-
-        var element = findSectionElement(section);
-        if (!element)
-        {
-            var firstChar = section.charAt(0);
-            if (firstChar != ':' && firstChar != "'")
+            function findSectionElement(section)
             {
-                element = findSectionElement(':' + section);
-                if (!element)
-                    element = findSectionElement("'" + section + "'");
+                return vimperator.buffer.evaluateXPath('//code[@class="tag" and text()="' + section + '"] | id("' + section + '")')
+                    .snapshotItem(0);
             }
+
+            var element = findSectionElement(section);
+            if (!element)
+            {
+                var firstChar = section.charAt(0);
+                if (firstChar != ':' && firstChar != "'")
+                {
+                    element = findSectionElement(':' + section);
+                    if (!element)
+                        element = findSectionElement("'" + section + "'");
+                }
+            }
+            if (!element)
+            {
+                vimperator.echoerr("E149: Sorry, no help for " + section);
+                return;
+            }
+            // FIXME: H2 elements are currently wrapped in DIVs so this works
+            var pos = cumulativeOffset(element.parentNode);
+            // horizontal offset is annoying, set it to 0 (use pos[0] if you want horizontal offset)
+            window.content.scrollTo(0, pos[1]);
         }
-        if (!element)
-        {
-            vimperator.echoerr("E149: Sorry, no help for " + section);
-            return;
-        }
-        // FIXME: H2 elements are currently wrapped in DIVs so this works
-        var pos = cumulativeOffset(element.parentNode);
-        // horizontal offset is annoying, set it to 0 (use pos[0] if you want horizontal offset)
-        window.content.scrollTo(0, pos[1]);
-    }
+    }, 0);
 } //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:

From 363b0a45dc81cb86d8cf325ca9d449fc10124d40 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 11 Oct 2007 02:06:21 +0000
Subject: [PATCH 126/224] remove unused keyword and tag columns from :bmark
 output

---
 content/bookmarks.js | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/content/bookmarks.js b/content/bookmarks.js
index 8ce25daa..cf04000b 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -272,21 +272,14 @@ function Bookmarks() //{{{
             for (var i = 0; i < items.length; i++)
             {
                 var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
-                           "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>keyword</th><th>URL</th><th align=\"right\">tags</th></tr>";
+                           "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>URL</th></tr>";
                 for (var i = 0; i < items.length; i++)
                 {
                     var title = vimperator.util.escapeHTML(items[i][1]);
                     if (title.length > 50)
                         title = title.substr(0, 47) + "...";
-                    var keyword = "".substr(0,12); // maximum 12 chars
                     var url = vimperator.util.escapeHTML(items[i][0]);
-                    var tags = "tag1, tag2";
-                    list += "<tr><td>" + title + "</td><td style=\"color: blue\" align=\"center\">" + keyword +
-                            "</td><td style=\"color: green; width: 100%\">" + url +
-                            "</td><td style=\"color: red;\" align=\"right\">" + tags + "</td></tr>";
-                    // TODO: change that list to something like this when we have keywords
-                    //list += "<tr><td width=\"30%\"><span style=\"font-weight: bold\">" + items[i][1].substr(0,20) + "</span></td><td width=\"70%\"><span style=\"color: green\">" + items[i][0] + "</span><br/>" + "Keyword: <span style=\"color: blue\">foo</span> Tags: <span style=\"color: red\">computer, news</span>" + "</td></tr>";
-
+                    list += "<tr><td>" + title + "</td><td style=\"color: green; width: 100%\">" + url + "</td></tr>";
                 }
                 list += "</table>";
 

From 7edd1a6d824c4e8c93c4f07522c6895ff3824477 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 11 Oct 2007 03:19:56 +0000
Subject: [PATCH 127/224] update version number for pending release

---
 ChangeLog | 25 ++++++++++++++++++++++++-
 Makefile  |  2 +-
 NEWS      |  4 ++--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ba6ba753..53fe237f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,32 @@
+2007-10-11  dougkearns  <dougkearns>
+
+	* src/content/help.js:
+	put the help section locating block in a timeout to sure the first
+	call to :help {arg} works
+	[cd30327a351c] [tip]
+
+	* src/content/commands.js:
+	fix typo in :preferences usage
+	[08e0e10caeea]
+
 2007-10-10  dougkearns  <dougkearns>
 
+	* src/ChangeLog:
+	update ChangeLog
+	[4b187f1ad250]
+
+	* src/content/help.js:
+	mention $VIMPERATOR_HOME in the help
+	[29c45e9edaba]
+
+	* src/ChangeLog, src/content/commands.js:
+	minor improvement to :sbclose help
+	[5f66f17c4a5c]
+
 	* src/content/commands.js, src/content/options.js,
 	src/content/util.js, src/content/vimperator.js:
 	new :set and :prefs commands, tweaked :set output to use colors
-	[0794539f1ab5] [tip]
+	[0794539f1ab5]
 
 	* src/NEWS, src/TODO:
 	update NEWS and TODO
diff --git a/Makefile b/Makefile
index 085d6a0a..749826c8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 TOP           = $(shell pwd)
 
-VERSION       = 0.5.2pre
+VERSION       = 0.5.2
 OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 
diff --git a/NEWS b/NEWS
index eb374161..392f4d7d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 <pre>
-2007-XX-XX:
+2007-10-11:
 	* version 0.5.2
 	* changed semantics of :set[!] and :prefs[!] a little, :set shows now all non-default
 	  options, use :prefs! to get the about:config window
@@ -134,7 +134,7 @@
 	* :help section supported, :help :set will show help for the :set command
 	  (patch from Viktor Kojouharov)
 	* :source support, and auto-sourcing ~/.vimperatorrc on startup
-	* :javascript &lt;&lt;EOF support to execute multiline javascript code
+	* :javascript <<EOF support to execute multiline javascript code
 	  also changed :exec to behave more vim like
 	* fixed saving of session
 	* fixed hints display when zooming in/out of a web page

From 2ad902937b7a75ab54f6084ea9378682dd6a273b Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 11 Oct 2007 04:02:55 +0000
Subject: [PATCH 128/224] bump version number

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 749826c8..6771c4e2 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 TOP           = $(shell pwd)
 
-VERSION       = 0.5.2
+VERSION       = 0.5.3pre
 OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 

From 24179d1f917463fec56a76c7df013c8913d832b9 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 11 Oct 2007 12:01:02 +0000
Subject: [PATCH 129/224] update vimperator.vim

---
 NEWS           | 3 +++
 vimperator.vim | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 392f4d7d..60d75a83 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,7 @@
 <pre>
+2007-XX-XX:
+	* version 0.5.3
+
 2007-10-11:
 	* version 0.5.2
 	* changed semantics of :set[!] and :prefs[!] a little, :set shows now all non-default
diff --git a/vimperator.vim b/vimperator.vim
index 649b7c7d..08486490 100644
--- a/vimperator.vim
+++ b/vimperator.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	    VIMperator configuration file
 " Maintainer:	    Doug Kearns <dougkearns@gmail.com>
-" Latest Revision:  2007 July 22
+" Latest Revision:  2007 October 11
 
 if exists("b:current_syntax")
   finish
@@ -25,8 +25,10 @@ syn keyword vimperatorCommand addo[ns] b[uffer] ba[ck] bd[elete] beep bma[rk] bm
 	\ ve[rsion] viu[sage] w[rite] win[open] wine[dit] wo[pen] wq wqa[ll] xa[ll] zo[om] run
 	\ contained
 
+syn match vimperatorCommand "!" contained
+
 " FIXME
-syn match vimperatorCommandWrapper "\<\h\w*\>" contains=vimperatorCommand
+syn match vimperatorCommandWrapper "\%(!\|\<\h\w*\>\)" contains=vimperatorCommand
 
 syn region vimperatorSet matchgroup=vimperatorCommand start="\<set\=\>" end="$" keepend oneline contains=vimperatorOption
 syn keyword vimperatorOption activate act complete cpt defsearch ds extendedhinttags eht focusedhintstyle fhs fullscreen fs

From f9cb9e3ddb1ee142dd3dd182879e9fc1fedb3983 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 11 Oct 2007 12:10:10 +0000
Subject: [PATCH 130/224] pass all key events through to FF when in designMode

---
 content/events.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/content/events.js b/content/events.js
index 31b60cb6..1922b831 100644
--- a/content/events.js
+++ b/content/events.js
@@ -428,6 +428,10 @@ function Events() //{{{
 
         var stop = true; // set to false if we should NOT consume this event but let also firefox handle it
 
+        var win =  document.commandDispatcher.focusedWindow;
+        if (win && win.document.designMode == "on")
+            return true;
+
         if (vimperator.hasMode(vimperator.modes.MENU))
             return true;
 

From d0b7732d82280b45f31d9da233828da78a1da570 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 12 Oct 2007 04:09:16 +0000
Subject: [PATCH 131/224] enforce our status bar styles

---
 skin/vimperator.css | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/skin/vimperator.css b/skin/vimperator.css
index c076ae97..884e12b5 100644
--- a/skin/vimperator.css
+++ b/skin/vimperator.css
@@ -98,16 +98,19 @@
     color: red;
 }
 .hl-StatusLine {
-    background-color: black;
-    color: white;
+    background: none !important;
+    background-color: black !important;
+    color: white !important;
 }
 .hl-StatusLineSecure {
-    background-color: #B0FF00; / * light green * /
-    color: black;
+    background: none !important;
+    background-color: #B0FF00 !important; /* light green */
+    color: black !important;
 }
 .hl-StatusLineBroken {
-    background-color: #FF6060; / * light red * /
-    color: black;
+    background: none !important;
+    background-color: #FF6060 !important; /* light red */
+    color: black !important;
 }
 
 /* MOW */

From 8e2271c183c19d2c7e1bd9f8fa32b85d4908ec31 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 14 Oct 2007 22:21:38 +0000
Subject: [PATCH 132/224] working showtabline!

---
 NEWS               |  1 +
 content/options.js | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index 60d75a83..f5e69650 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.3
+	* :set showtabline now finally works as expected for all values
 
 2007-10-11:
 	* version 0.5.2
diff --git a/content/options.js b/content/options.js
index 2e6b14bb..2db9f6d6 100644
--- a/content/options.js
+++ b/content/options.js
@@ -221,20 +221,23 @@ function Options() //{{{
 
     function setShowTabline(value)
     {
-        // hide tabbar
+        var tabs = getBrowser().mStrip.getElementsByClassName("tabbrowser-tabs")[0];
+        if (!tabs)
+            return;
+
         if (value == 0)
         {
-            getBrowser().mStrip.collapsed = true;
-            getBrowser().mStrip.hidden = true;
+            tabs.collapsed = true;
         }
         else if (value == 1)
         {
-            vimperator.echo("show tabline only with > 1 page open not implemented yet");
+            storePreference("browser.tabs.autoHide", true);
+            tabs.collapsed = false;
         }
         else
         {
-            getBrowser().mStrip.collapsed = false;
-            getBrowser().mStrip.hidden = false;
+            storePreference("browser.tabs.autoHide", false);
+            tabs.collapsed = false;
         }
     }
 
@@ -602,8 +605,7 @@ function Options() //{{{
                   "<li><b>0</b>: Never show tab bar</li>" +
                   "<li><b>1</b>: Show tab bar only if more than one tab is open</li>" +
                   "<li><b>2</b>: Always show tab bar</li>" +
-                  "</ul>" +
-                  "NOTE: showtabline=1 not implemented yet and buggy with showtabline=0",
+                  "</ul>",
             setter: function(value) { Options.setPref("showtabline", value); setShowTabline(value); },
             default_value: 2,
             validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }

From 46f8507c9cdb6223df161b0db1cb1df2cabc070c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 14 Oct 2007 22:39:08 +0000
Subject: [PATCH 133/224] [+] marker in the statusline

---
 NEWS          |  1 +
 content/ui.js | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index f5e69650..55362cdf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.3
+	* [+], [-] and [+-] in the statusline, whether we can go back, forward, or both
 	* :set showtabline now finally works as expected for all values
 
 2007-10-11:
diff --git a/content/ui.js b/content/ui.js
index a97293e4..b687e4b2 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -1069,10 +1069,16 @@ function StatusLine() //{{{
         status_bar.setAttribute("class", "chromeclass-status " + highlight_group);
     };
 
+    // if "url" is ommited, build a usable string for the URL
     this.updateUrl = function(url)
     {
-        if (!url || typeof url != "string")
-            url = vimperator.buffer.URL;
+        if (typeof url == "string")
+        {
+            url_widget.value = url;
+            return;
+        }
+
+        url = vimperator.buffer.URL;
 
         // make it even more vim-like
         if (url == "about:blank")
@@ -1085,6 +1091,16 @@ function StatusLine() //{{{
                 url = "[No Name]";
         }
 
+        var sh = getWebNavigation().sessionHistory;
+        var modified = "";
+        if (sh.index > 0)
+            modified += "+";
+        if (sh.index < sh.count -1)
+            modified += "-";
+
+        if (modified)
+            url += " [" + modified + "]"
+
         url_widget.value = url;
     };
 

From 2e1499d9c10251dfa46cdfc2c17a88c15765619c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 14 Oct 2007 22:47:45 +0000
Subject: [PATCH 134/224] beep if trying to delete the last tab which is
 already an empty tab

---
 content/events.js |  4 +++-
 content/tabs.js   | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/content/events.js b/content/events.js
index 1922b831..b0cb8c39 100644
--- a/content/events.js
+++ b/content/events.js
@@ -661,8 +661,10 @@ function Events() //{{{
             vimperator.input.pendingArgMap = null;
             vimperator.input.pendingMotionMap = null;
 
-            stop = false; // command was not a vimperator command, maybe it is a firefox command
+            // allow key to be passed to firefox if we can't handle it
+            stop = false;
 
+            // TODO: see if this check is needed or are all motion commands already mapped in these modes?
             if (!vimperator.hasMode(vimperator.modes.COMMAND_LINE))
                 vimperator.beep();
         }
diff --git a/content/tabs.js b/content/tabs.js
index 37b75f78..e0e25d7c 100644
--- a/content/tabs.js
+++ b/content/tabs.js
@@ -157,8 +157,14 @@ function Tabs() //{{{
                 getBrowser().removeTab(tab);
             else
             {
-                vimperator.open("about:blank", vimperator.NEW_BACKGROUND_TAB);
-                getBrowser().removeTab(tab);
+                if (vimperator.buffer.URL != "about:blank" ||
+                    getWebNavigation().sessionHistory.count > 0)
+                {
+                    vimperator.open("about:blank", vimperator.NEW_BACKGROUND_TAB);
+                    getBrowser().removeTab(tab);
+                }
+                else
+                    vimperator.beep();
             }
         }
 

From a3bd35b787463aa1d3a17a816dbd864ee1b8b810 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 15 Oct 2007 00:22:39 +0000
Subject: [PATCH 135/224] allow Vimperator to run directly from an unpackaged
 development directory

---
 Makefile        | 3 +++
 chrome.manifest | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6771c4e2..f744e9e2 100644
--- a/Makefile
+++ b/Makefile
@@ -145,6 +145,9 @@ ${XPI}: ${BUILD_XPI_SUBDIRS} ${XPI_FILES}
 		( echo "modified: $$f" ; \
 		  diff -u $$f ${BUILD_XPI_DIR}/$$f | grep '^[-+][^-+]' ) ; \
 	    done
+	# FIXME: VERSION and DATE tokens not replaced
+	${Q}${SED} -e 's,\(skin\|content\)/$$,jar:chrome/vimperator.jar!/\1/,' \
+	           < chrome.manifest > ${BUILD_XPI_DIR}/chrome.manifest
 	${Q}( cd ${BUILD_XPI_DIR} && ${ZIP} -r ${TOP}/${XPI} ${XPI_FILES} )
 	@echo "SUCCESS: $@"
 
diff --git a/chrome.manifest b/chrome.manifest
index 73afa673..881c9687 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,3 +1,3 @@
-content	vimperator jar:chrome/vimperator.jar!/content/
-skin vimperator classic/1.0 jar:chrome/vimperator.jar!/skin/
+content	vimperator content/
+skin vimperator classic/1.0 skin/
 overlay chrome://browser/content/browser.xul chrome://vimperator/content/vimperator.xul

From e96c63723d6b592c8cbd7e82f88cd4f38f364791 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 15 Oct 2007 14:18:42 +0000
Subject: [PATCH 136/224] use getAnonymousElementByAttribute to find
 tabbrowser-tabs since FF2 doesn't have getElementsByClassName

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

diff --git a/content/options.js b/content/options.js
index 2db9f6d6..0a4b31af 100644
--- a/content/options.js
+++ b/content/options.js
@@ -221,7 +221,7 @@ function Options() //{{{
 
     function setShowTabline(value)
     {
-        var tabs = getBrowser().mStrip.getElementsByClassName("tabbrowser-tabs")[0];
+        var tabs = document.getAnonymousElementByAttribute(getBrowser(), "class", "tabbrowser-tabs");
         if (!tabs)
             return;
 

From 540273c6c7b495e815320b95db7fd258f9465898 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 16 Oct 2007 00:06:45 +0000
Subject: [PATCH 137/224] merge reshowing of the mode after a TabSelect event

---
 content/events.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/content/events.js b/content/events.js
index b0cb8c39..92e8d70d 100644
--- a/content/events.js
+++ b/content/events.js
@@ -53,6 +53,7 @@ function Events() //{{{
     }, false);
     tabcontainer.addEventListener("TabSelect", function(event) {
         vimperator.commandline.clear();
+        vimperator.setMode(); // trick to reshow the mode in the command line
         vimperator.statusline.updateTabCount();
         vimperator.buffer.updateBufferList();
         vimperator.tabs.updateSelectionHistory();

From bfebe774262c670a56564168ef2a4597b30698db Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 16 Oct 2007 00:15:09 +0000
Subject: [PATCH 138/224] merged change of "b" mapping to :buffer!

---
 NEWS                | 1 +
 content/mappings.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 55362cdf..47897e26 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.3
+	* b calls :buffer! now instead of :buffer
 	* [+], [-] and [+-] in the statusline, whether we can go back, forward, or both
 	* :set showtabline now finally works as expected for all values
 
diff --git a/content/mappings.js b/content/mappings.js
index 80c3100a..a09414f0 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -368,7 +368,7 @@ function Mappings() //{{{
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["b"],
-        function() { vimperator.commandline.open(":", "buffer ", vimperator.modes.EX); },
+        function() { vimperator.commandline.open(":", "buffer! ", vimperator.modes.EX); },
         {
             short_help: "Open a prompt to switch buffers",
             help: "Typing the corresponding number switches to this buffer."

From 140d9ef26e795e046a62420dd3c9f3b43fc22513 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 16 Oct 2007 01:55:22 +0000
Subject: [PATCH 139/224] move LocalFile and fopen to a vimperator.io namespace

---
 content/completion.js |  2 +-
 content/file.js       | 41 +++++++++++++++++++++++------------------
 content/mappings.js   |  2 +-
 content/vimperator.js | 13 ++++---------
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/content/completion.js b/content/completion.js
index c1372f96..fccc6b64 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -254,7 +254,7 @@ vimperator.completion = (function() // {{{
 
             try
             {
-                var fd = vimperator.fopen(dir);
+                var fd = vimperator.io.fopen(dir);
             }
             catch (e)
             {
diff --git a/content/file.js b/content/file.js
index 5295be3e..9f4e2cac 100644
--- a/content/file.js
+++ b/content/file.js
@@ -27,22 +27,27 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
+vimperator.io = {};
 
-const PERM_IWOTH = 00002;  /* write permission, others */
-const PERM_IWGRP = 00020;  /* write permission, group */
-
-const MODE_RDONLY   = 0x01;
-const MODE_WRONLY   = 0x02;
-const MODE_RDWR     = 0x04;
-const MODE_CREATE   = 0x08;
-const MODE_APPEND   = 0x10;
-const MODE_TRUNCATE = 0x20;
-const MODE_SYNC     = 0x40;
-const MODE_EXCL     = 0x80;
-
-
-function LocalFile(file, mode, perms, tmp) // {{{
+vimperator.io.fopen = function(path, mode, perms, tmp)
 {
+    return new vimperator.io.LocalFile(path, mode, perms, tmp);
+}
+
+vimperator.io.LocalFile = function(file, mode, perms, tmp) // {{{
+{
+    const PERM_IWOTH = 00002;  /* write permission, others */
+    const PERM_IWGRP = 00020;  /* write permission, group */
+
+    const MODE_RDONLY   = 0x01;
+    const MODE_WRONLY   = 0x02;
+    const MODE_RDWR     = 0x04;
+    const MODE_CREATE   = 0x08;
+    const MODE_APPEND   = 0x10;
+    const MODE_TRUNCATE = 0x20;
+    const MODE_SYNC     = 0x40;
+    const MODE_EXCL     = 0x80;
+
     const classes = Components.classes;
     const interfaces = Components.interfaces;
 
@@ -116,7 +121,7 @@ function LocalFile(file, mode, perms, tmp) // {{{
 }
 
 
-LocalFile.prototype.write =
+vimperator.io.LocalFile.prototype.write =
 function fo_write(buf)
 {
     if (!("outputStream" in this))
@@ -125,7 +130,7 @@ function fo_write(buf)
     return this.outputStream.write(buf, buf.length);
 }
 
-LocalFile.prototype.read =
+vimperator.io.LocalFile.prototype.read =
 function fo_read(max)
 {
     if (this.localFile.isDirectory())
@@ -155,7 +160,7 @@ function fo_read(max)
     return rv;
 }
 
-LocalFile.prototype.close =
+vimperator.io.LocalFile.prototype.close =
 function fo_close()
 {
     if ("outputStream" in this)
@@ -164,7 +169,7 @@ function fo_close()
         this.inputStream.close();
 }
 
-LocalFile.prototype.flush =
+vimperator.io.LocalFile.prototype.flush =
 function fo_close()
 {
     return this.outputStream.flush();
diff --git a/content/mappings.js b/content/mappings.js
index a09414f0..8defcd2b 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -856,7 +856,7 @@ function Mappings() //{{{
         if (url.match(/^file:\/\//) || url.match(/^\//))
         {
             var stripedFilename = url.replace(/^(file:\/\/)?(.*)/, "$2");
-            var file = vimperator.fopen(stripedFilename, '<');
+            var file = vimperator.io.fopen(stripedFilename, '<');
             if (!file)
                 return false;
 
diff --git a/content/vimperator.js b/content/vimperator.js
index 6bd29a86..c2f623b4 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -357,11 +357,6 @@ const vimperator = (function() //{{{
             content.focus(); // FIXME: shouldn't be window.document.content?
         },
 
-        fopen: function(path, mode, perms, tmp)
-        {
-            return new LocalFile(path, mode, perms, tmp);
-        },
-
         // partial sixth level expression evaluation
         eval: function(string)
         {
@@ -670,7 +665,7 @@ const vimperator = (function() //{{{
             if (input)
             {
                 filein = getTempFile();
-                var fdin = vimperator.fopen(filein, ">");
+                var fdin = vimperator.io.fopen(filein, ">");
                 fdin.write(input);
                 fdin.close();
                 command += " < \"" + filein.path.replace('"', '\\"') + "\"";
@@ -682,7 +677,7 @@ const vimperator = (function() //{{{
             else
                 res = this.run("sh", ["-c", command], true);
 
-            var fd = vimperator.fopen(fileout, "<");
+            var fd = vimperator.io.fopen(fileout, "<");
             if (!fd)
                 return "";
 
@@ -707,7 +702,7 @@ const vimperator = (function() //{{{
 
             try
             {
-                var fd = vimperator.fopen(filename, "<");
+                var fd = vimperator.io.fopen(filename, "<");
                 if (!fd)
                     return;
 
@@ -854,7 +849,7 @@ const vimperator = (function() //{{{
 
                     if (plugin_dir)
                     {
-                        var fd = vimperator.fopen(plugin_dir);
+                        var fd = vimperator.io.fopen(plugin_dir);
                         var entries = fd.read();
                         fd.close();
                         vimperator.log("Sourcing plugin directory...", 3);

From c1f8c573960e62d45aa70c823c79c5c1e780e5bd Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 17 Oct 2007 00:34:08 +0000
Subject: [PATCH 140/224] further limit where vimperatorCommandWrapper matches

---
 vimperator.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vimperator.vim b/vimperator.vim
index 08486490..1f64819b 100644
--- a/vimperator.vim
+++ b/vimperator.vim
@@ -28,7 +28,7 @@ syn keyword vimperatorCommand addo[ns] b[uffer] ba[ck] bd[elete] beep bma[rk] bm
 syn match vimperatorCommand "!" contained
 
 " FIXME
-syn match vimperatorCommandWrapper "\%(!\|\<\h\w*\>\)" contains=vimperatorCommand
+syn match vimperatorCommandWrapper "\%(^\|:\|\s\)\@<=\%(!\|\h\w*\>\)" contains=vimperatorCommand
 
 syn region vimperatorSet matchgroup=vimperatorCommand start="\<set\=\>" end="$" keepend oneline contains=vimperatorOption
 syn keyword vimperatorOption activate act complete cpt defsearch ds extendedhinttags eht focusedhintstyle fhs fullscreen fs

From 4104006cf1eb93d81151d63c9b0caa489b8d092d Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 17 Oct 2007 00:36:01 +0000
Subject: [PATCH 141/224] update vimperator.vim revision date

---
 vimperator.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vimperator.vim b/vimperator.vim
index 1f64819b..e4685c58 100644
--- a/vimperator.vim
+++ b/vimperator.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	    VIMperator configuration file
 " Maintainer:	    Doug Kearns <dougkearns@gmail.com>
-" Latest Revision:  2007 October 11
+" Latest Revision:  2007 October 17
 
 if exists("b:current_syntax")
   finish

From 39e31084d48d46606c64d93d6d5a2654c117587f Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 18 Oct 2007 03:46:08 +0000
Subject: [PATCH 142/224] merge update statusline on browser start

---
 content/ui.js         | 10 ++++++++++
 content/vimperator.js |  1 +
 2 files changed, 11 insertions(+)

diff --git a/content/ui.js b/content/ui.js
index b687e4b2..f73d6316 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -1069,6 +1069,16 @@ function StatusLine() //{{{
         status_bar.setAttribute("class", "chromeclass-status " + highlight_group);
     };
 
+    // update all fields of the statusline
+    this.update = function()
+    {
+        this.updateUrl();
+        this.updateInputBuffer();
+        this.updateProgress();
+        this.updateTabCount();
+        this.updateBufferPosition();
+    }
+
     // if "url" is ommited, build a usable string for the URL
     this.updateUrl = function(url)
     {
diff --git a/content/vimperator.js b/content/vimperator.js
index c2f623b4..e7e98a12 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -870,6 +870,7 @@ const vimperator = (function() //{{{
                 }
             }, 50);
 
+            vimperator.statusline.update();
             vimperator.log("Vimperator fully initialized", 1);
         },
 

From cdced340787f3c42fecad1a53e18925a068d2596 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 18 Oct 2007 03:53:43 +0000
Subject: [PATCH 143/224] merge new :winclose command

---
 NEWS                |  1 +
 TODO                |  9 ++++-----
 content/commands.js | 12 +++++++++++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 47897e26..be012fd9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.3
+	* new :winclose command
 	* b calls :buffer! now instead of :buffer
 	* [+], [-] and [+-] in the statusline, whether we can go back, forward, or both
 	* :set showtabline now finally works as expected for all values
diff --git a/TODO b/TODO
index 30e9643b..fbe31823 100644
--- a/TODO
+++ b/TODO
@@ -3,7 +3,6 @@ Priority list:
 1-9 as in vim (9=required for next release, 5=would be nice, 1=probably not)
 
 BUGS:
-- multiple windows do not work at all, so :q will close the whole browser session, even when there are other windows which has tabs
 - http://en.wikipedia.org/wiki/Portal:Current_events - 'f' shows more hints than 'F' (on left side of nav bar)
 - dpb| 09:09:56  dpb :: when I save a page with vimperator, it adds <hints
      id="hah_hints"></hints> near the end of it.. kinda annoying
@@ -24,6 +23,9 @@ FEATURES:
 7 use ctrl-n/p in insert mode for word completion
 7 [ctrl-o/i] to Go back to a Previous Position (done partly, however currenty does not use a per tab jumplist)
 7 whereever possible: get rid of dialogs and ask console-like dialog questions or write error prompts directly on the webpage or with :echo()
+7 :set! should also set about:config options (with autocomplete)
+7 edit textareas with an external editor (https://addons.mozilla.org/en-US/firefox/addon/4125)
+6 use '' to jump between marks like vim
 6 downloading of links to filesystem (:save <filename>)
 6 autocommands (BrowserStart, BrowserQuit, TabClose, TabOpen, TabChanged, PageLoaded, any more?)
 6 vim like mappings for caret mode and textboxes (i to start caret mode?)
@@ -33,18 +35,15 @@ FEATURES:
 6 gf = view source?
 6 page info support (ctrl-g, g<C-g>)
 5 Use arrow keys in preview window, and ctrl-w+j/k to switch to from preview window
-5 Sort :open completion by date? (use 'wildsort')
+5 Favicons in completion windows and some other places?
 5 make use of the ] and [ keys to e.g. jump to the next heading ]], next image ]i, previous textbox [t and so on
 5 add tag and keyword support to adding/deleting bookmarks
-4 Support multiple top-level windows?
 3 Splitting Windows with [:sp :vsp ctrl-w,s ctrl-w,v] and closing with [ctrl-w,q], moving with [ctrl-w,w or tab]
   have a look into the split browser extension
-3 :set! should also set about:config options (with autocomplete)
 - many other ideas are listed in the wiki
 
 RANDOM IDEAS:
 * numbered tabs
-* https://addons.mozilla.org/en-US/firefox/addon/4125 - use vim to edit text fields
 * Would it be possible to add a setting "maxcompletionsshown" and 
   "maxpreviewwindowheight" or something like this?
 * 16:06:04       bartman| maxauthority: feature idea: what if :n and :N searched the 
diff --git a/content/commands.js b/content/commands.js
index 9178fd59..260aed67 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1714,6 +1714,16 @@ function Commands() //{{{
             short_help: "Show help for normal mode commands"
         }
     ));
+    addDefaultCommand(new Command(["winc[lose]", "wc[lose]"],
+        function(args)
+        {
+            window.close();
+        },
+        {
+            usage: ["winc[ose] [url] [, url]"],
+            short_help: "Close window",
+        }
+    ));
     addDefaultCommand(new Command(["wino[pen]", "wo[pen]", "wine[dit]"],
         function(args)
         {
@@ -1725,7 +1735,7 @@ function Commands() //{{{
         {
             usage: ["wino[pen] [url] [, url]"],
             short_help: "Open one or more URLs in a new window",
-            help: "NOTE: Multiple windows are not really supported by Vimperator, use at your own risk!"
+            help: "Like <code class=\"command\">:open</code> but open URLs in a new window.<br/>"
         }
     ));
     addDefaultCommand(new Command(["wqa[ll]", "wq", "xa[ll]"],

From 1e367ddad7eadc50f38cf0f1c1e6b06b41f4cbc2 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 18 Oct 2007 03:57:17 +0000
Subject: [PATCH 144/224] merge better :q

---
 NEWS                  |  1 +
 content/commands.js   |  5 +++--
 content/tabs.js       |  8 +++++++-
 content/vimperator.js | 11 ++++++++++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index be012fd9..14f40802 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.3
+	* :q doesn't close the whole browser, if there are more than one windows
 	* new :winclose command
 	* b calls :buffer! now instead of :buffer
 	* [+], [-] and [+-] in the statusline, whether we can go back, forward, or both
diff --git a/content/commands.js b/content/commands.js
index 260aed67..6aa954b8 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1121,8 +1121,9 @@ function Commands() //{{{
     addDefaultCommand(new Command(["q[uit]"],
         function() { vimperator.tabs.remove(getBrowser().mCurrentTab, 1, false, 1); },
         {
-            short_help: "Quit current tab or quit Vimperator if this was the last tab",
-            help: "When quitting Vimperator, the session is not stored."
+            short_help: "Quit current tab",
+            help: "If this is the last tab in the window, close the window. If this was the " +
+                  "last window, close Vimperator. When quitting Vimperator, the session is not stored."
         }
     ));
     addDefaultCommand(new Command(["quita[ll]", "qa[ll]"],
diff --git a/content/tabs.js b/content/tabs.js
index e0e25d7c..95c84841 100644
--- a/content/tabs.js
+++ b/content/tabs.js
@@ -172,8 +172,14 @@ function Tabs() //{{{
             count = 1;
 
         if (quit_on_last_tab >= 1 && getBrowser().mTabs.length <= count)
-            vimperator.quit(quit_on_last_tab == 2);
+        {
+            if (vimperator.windows.length > 1)
+                window.close();
+            else
+                vimperator.quit(quit_on_last_tab == 2);
 
+            return;
+        }
 
         var index = this.index(tab);
         if (focus_left_tab)
diff --git a/content/vimperator.js b/content/vimperator.js
index e7e98a12..a334bd63 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -896,8 +896,17 @@ const vimperator = (function() //{{{
             for (; now - then < ms; now = new Date().getTime()) { 
                 mainThread.processNextEvent(true); 
             } 
-        } 
+        },
 
+        get windows() 
+        {
+            var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService(Components.interfaces.nsIWindowMediator);
+            var wa = [];
+            var enumerator = wm.getEnumerator("navigator:browser");
+            while (enumerator.hasMoreElements())
+                wa.push(enumerator.getNext());
+            return wa;
+        }
     } //}}}
 })(); //}}}
 

From b509c91405f87a1fff9612911d9df2fc1bc3af56 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 18 Oct 2007 04:01:18 +0000
Subject: [PATCH 145/224] update AUTHORS and Donators

---
 AUTHORS  |  1 +
 Donators | 32 ++++++++++++++++++--------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2f7b69c4..659ca289 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,4 +14,5 @@ Patches:
   * Hannes Rist (:set titlestring support)
   * Marco Candrian (shift-insert patch)
   * Nikolai Weibull ($VIMPERATOR_HOME)
+  * Joseph Xu (supporting multiple top level windows better)
 </pre>
diff --git a/Donators b/Donators
index cc072a07..556f8736 100644
--- a/Donators
+++ b/Donators
@@ -1,22 +1,26 @@
 <pre>
 <b>Note:</b> If you don't wish to appear on this list when making a donation, please tell me.
 
-* Andrew Pantyukhin
-* Ben Klemens
-* Sjoerd Siebinga
-* Cillian de Roiste
-* Miron Tewfik
+2007 (most recent donators first):
+
+* Ivo-Jose Jimenez-Ramos
 * Robert Heckel
-* Stefan Krauth
-* Giuseppe Guida
-* Richard Dooling
-* Nigel McNie
-* Paulo Tanimoto
-* Nathan Saper
-* Albert Menkveld
-* Ian Taylor
-* Thomas Svensen
 * Ramana Kumar
+* Thomas Svensen
+* Ian Taylor
+* Albert Menkveld
+* Nathan Saper
+* Paulo Tanimoto
+* Nigel McNie
+* Richard Dooling
+* Giuseppe Guida
+* Stefan Krauth
+* Robert Heckel
+* Miron Tewfik
+* Cillian de Roiste
+* Sjoerd Siebinga
+* Ben Klemens
+* Andrew Pantyukhin
 
 I want to say a big <b>THANK YOU</b> for all people which supported this project in this way.
 </pre>

From d0e7ffe22dd8a519546432ff6c2952cf7a2e3b03 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 18 Oct 2007 05:26:53 +0000
Subject: [PATCH 146/224] merge new gb and gB commands

---
 NEWS                |  1 +
 content/buffers.js  | 64 ++++++++++++++++++++++++++++++++++++++++++++-
 content/commands.js | 29 +-------------------
 content/mappings.js | 16 ++++++++++++
 4 files changed, 81 insertions(+), 29 deletions(-)

diff --git a/NEWS b/NEWS
index 14f40802..1a21de7c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.3
+	* new gb and gB mappings to repeat the last :buffer[!] command,
 	* :q doesn't close the whole browser, if there are more than one windows
 	* new :winclose command
 	* b calls :buffer! now instead of :buffer
diff --git a/content/buffers.js b/content/buffers.js
index 07facc69..8d6288f6 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -31,6 +31,9 @@ function Buffer() //{{{
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
+    // used for the "B" mapping to remember the last :buffer[!] command
+    var lastBufferSwitchArgs = ""; 
+    var lastBufferSwitchSpecial = true;
 
     var zoom_manager = ZoomManager.prototype.getInstance();
     const ZOOM_INTERVAL = 25;
@@ -162,7 +165,6 @@ function Buffer() //{{{
         return result;
     }
 
-    // TODO: move to v.buffers.list()
     this.list = function(fullmode)
     {
         if (fullmode)
@@ -373,6 +375,66 @@ function Buffer() //{{{
         vimperator.bufferwindow.selectItem(getBrowser().mTabContainer.selectedIndex);
     }
 
+    // XXX: should this be in v.buffers. or v.tabs.?
+    // "buffer" is a string which matches the URL or title of a buffer, if it
+    // is null, the last used string is used again
+    this.switchTo = function(buffer, allowNonUnique, count, reverse)
+    {
+        if (buffer != null)
+        {
+            // store this command, so it can be repeated with "B"
+            lastBufferSwitchArgs = buffer;
+            lastBufferSwitchSpecial = allowNonUnique;
+        }
+        else
+        {
+            buffer = lastBufferSwitchArgs;
+            if (typeof allowNonUnique == "undefined" || allowNonUnique == null)
+                allowNonUnique = lastBufferSwitchSpecial;
+        }
+
+        if (!count || count < 1)
+            count = 1;
+        if (typeof reverse != "boolean")
+            reverse = false;
+
+        var match;
+        if (match = buffer.match(/^(\d+):?/))
+            return vimperator.tabs.select(parseInt(match[1]) - 1, false); // make it zero-based
+
+        var matches = [];
+        var lower_buffer = buffer.toLowerCase();
+        var first = vimperator.tabs.index() + (reverse ? 0 : 1);
+        for (var i = 0; i < getBrowser().browsers.length; i++)
+        {
+            var index = (i + first) % getBrowser().browsers.length;
+            var url = getBrowser().getBrowserAtIndex(index).contentDocument.location.href;
+            var title = getBrowser().getBrowserAtIndex(index).contentDocument.title.toLowerCase();
+            if (url == buffer)
+                return vimperator.tabs.select(index, false);
+
+            if (url.indexOf(buffer) >= 0 || title.indexOf(lower_buffer) >= 0)
+                matches.push(index);
+        }
+        if (matches.length == 0)
+            vimperator.echoerr("E94: No matching buffer for " + buffer);
+        else if (matches.length > 1 && !allowNonUnique)
+            vimperator.echoerr("E93: More than one match for " + buffer);
+        else
+        {
+            if (reverse)
+            {
+                index = matches.length - count;
+                while (index < 0)
+                    index += matches.length;
+            }
+            else
+                index = (count-1) % matches.length;
+
+            vimperator.tabs.select(matches[index], false);
+        }
+    };
+
     this.zoomIn = function(steps)
     {
         bumpZoomLevel(steps);
diff --git a/content/commands.js b/content/commands.js
index 6aa954b8..c73b11cd 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -346,34 +346,7 @@ function Commands() //{{{
         }
     ));
     addDefaultCommand(new Command(["b[uffer]"],
-        // TODO: move to v.tabs/buffers
-        function(args, special)
-        {
-            var match;
-            if (match = args.match(/^(\d+):?/))
-                return vimperator.tabs.select(parseInt(match[1]) - 1, false); // make it zero-based
-
-            var matches = [];
-            var lower_args = args.toLowerCase();
-            var first = vimperator.tabs.index() + 1;
-            for (var i = 0; i < getBrowser().browsers.length; i++)
-            {
-                var index = (i + first) % getBrowser().browsers.length;
-                var url = getBrowser().getBrowserAtIndex(index).contentDocument.location.href;
-                var title = getBrowser().getBrowserAtIndex(index).contentDocument.title.toLowerCase();
-                if (url == args)
-                    return vimperator.tabs.select(index, false);
-
-                if (url.indexOf(args) >= 0 || title.indexOf(lower_args) >= 0)
-                    matches.push(index);
-            }
-            if (matches.length == 0)
-                vimperator.echoerr("E94: No matching buffer for " + args);
-            else if (matches.length > 1 && !special)
-                vimperator.echoerr("E93: More than one match for " + args);
-            else
-                vimperator.tabs.select(matches[0], false);
-        },
+        function(args, special) { vimperator.buffer.switchTo(args, special); },
         {
             usage: ["b[uffer][!] {url|index}"],
             short_help: "Go to buffer from buffer list",
diff --git a/content/mappings.js b/content/mappings.js
index 8defcd2b..927fc32e 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -382,6 +382,22 @@ function Mappings() //{{{
                   "WARNING: This mapping may be removed/changed in future."
         }
     ));
+    addDefaultMap(new Map(vimperator.modes.NORMAL, ["gb"],
+        function(count) { vimperator.buffer.switchTo(null, null, count, false); },
+        {
+            short_help: "Repeat last :buffer[!] command",
+            help: "This is useful to quickly jump between buffers which have a similar URL or title.",
+            flags: Mappings.flags.COUNT
+        }
+    ));
+    addDefaultMap(new Map(vimperator.modes.NORMAL, ["gB"],
+        function(count) { vimperator.buffer.switchTo(null, null, count, true); },
+        {
+            short_help: "Repeat last :buffer[!] command in reverse direction",
+            help: "Just like <code class=\"mapping\">gb</code> but in the other direction.",
+            flags: Mappings.flags.COUNT
+        }
+    ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["d"],
         function(count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count, false, 0); },
         {

From 16752d5da7a6e9538179fafe7eda406c67e3637e Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 18 Oct 2007 11:32:08 +0000
Subject: [PATCH 147/224] allow _ in option names

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

diff --git a/content/commands.js b/content/commands.js
index c73b11cd..24ac8959 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1166,7 +1166,7 @@ function Commands() //{{{
             }
 
             //                               1        2       3    4  5      6
-            var matches = args.match(/^\s*(no|inv)?([a-z]+)([?&!])?(([+-])?=(.*))?/);
+            var matches = args.match(/^\s*(no|inv)?([a-z_]+)([?&!])?(([+-])?=(.*))?/);
             if (!matches)
             {
                 vimperator.echoerr("E518: Unknown option: " + args);

From 232cd05f4accd493c8d71635e561f2ce4e590795 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 19 Oct 2007 11:22:31 +0000
Subject: [PATCH 148/224] add basic string highlighting for the Vim RC file

---
 vimperator.vim | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vimperator.vim b/vimperator.vim
index e4685c58..b2fb3c5e 100644
--- a/vimperator.vim
+++ b/vimperator.vim
@@ -16,6 +16,8 @@ unlet b:current_syntax
 syn keyword vimperatorTodo    FIXME NOTE TODO XXX contained
 syn match   vimperatorComment +".*$+ contains=vimperatorTodo,@Spell
 
+syn region vimperatorString  start="\z(["']\)" end="\z1" skip="\\\\\|\\\z1" oneline
+
 syn keyword vimperatorCommand addo[ns] b[uffer] ba[ck] bd[elete] beep bma[rk] bmarks buffers bun[load] bw[ipeout] delbm[arks]
 	\ delm[arks] delqm[arks] dl downl[oads] e[dit] ec[ho] echoe[rr] exe[cute] exu[sage] files fo[rward] fw h[elp] ha[rdcopy]
 	\ hist[ory] hs javas[cript] js ls ma[rk] map mapc[lear] marks no[remap] noh[lsearch] norm[al] o[pen] pc[lose]
@@ -49,6 +51,7 @@ hi def link vimperatorTodo			Todo
 hi def link vimperatorComment			Comment
 hi def link vimperatorJavascriptDelimiter	Delimiter
 hi def link vimperatorOption			PreProc
+hi def link vimperatorString			String 
 
 let b:current_syntax = "vimperator"
 

From 2929c39484fab86920b14f0a1a2ad68f0a92da43 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 19 Oct 2007 15:20:55 +0000
Subject: [PATCH 149/224] merge hyperlinked MOW URLs feature

---
 content/bookmarks.js | 45 +++++++++++++++++++-------------------------
 content/buffers.js   |  2 +-
 content/ui.js        | 28 ++++++++++++++++++++++++++-
 skin/vimperator.css  | 16 +++++++++++++++-
 4 files changed, 62 insertions(+), 29 deletions(-)

diff --git a/content/bookmarks.js b/content/bookmarks.js
index cf04000b..0319e532 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -269,22 +269,19 @@ function Bookmarks() //{{{
                 return;
             }
 
+            var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                       "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>URL</th></tr>";
             for (var i = 0; i < items.length; i++)
             {
-                var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
-                           "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>URL</th></tr>";
-                for (var i = 0; i < items.length; i++)
-                {
-                    var title = vimperator.util.escapeHTML(items[i][1]);
-                    if (title.length > 50)
-                        title = title.substr(0, 47) + "...";
-                    var url = vimperator.util.escapeHTML(items[i][0]);
-                    list += "<tr><td>" + title + "</td><td style=\"color: green; width: 100%\">" + url + "</td></tr>";
-                }
-                list += "</table>";
-
-                vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
+                var title = vimperator.util.escapeHTML(items[i][1]);
+                if (title.length > 50)
+                    title = title.substr(0, 47) + "...";
+                var url = vimperator.util.escapeHTML(items[i][0]);
+                list += "<tr><td>" + title + "</td><td style=\"width: 100%\"><a href=\"#\" class=\"hl-URL\">" + url + "</a></td></tr>";
             }
+            list += "</table>";
+
+            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
         }
     }
 
@@ -505,22 +502,18 @@ function History() //{{{
                 return;
             }
 
+            var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                       "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>URL</th></tr>";
             for (var i = 0; i < items.length; i++)
             {
-                var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
-                           "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>URL</th></tr>";
-                for (var i = 0; i < items.length; i++)
-                {
-                    var title = vimperator.util.escapeHTML(items[i][1]);
-                    if (title.length > 50)
-                        title = title.substr(0, 47) + "...";
-                    var url = vimperator.util.escapeHTML(items[i][0]);
-                    list += "<tr><td>" + title + "</td><td style=\"color: green;\">" + url + "</td></tr>";
-                }
-                list += "</table>";
-
-                vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
+                var title = vimperator.util.escapeHTML(items[i][1]);
+                if (title.length > 50)
+                    title = title.substr(0, 47) + "...";
+                var url = vimperator.util.escapeHTML(items[i][0]);
+                list += "<tr><td>" + title + "</td><td><a href=\"#\" class=\"hl-URL\">" + url + "</a></td></tr>";
             }
+            list += "</table>";
+            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
         }
     }
     //}}}
diff --git a/content/buffers.js b/content/buffers.js
index 8d6288f6..3a51251c 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -204,7 +204,7 @@ function Buffer() //{{{
 
                 list += "<tr><td align=\"right\">  " + number + "</td><td>" + indicator +
                         "</td><td style=\"width: 250px; max-width: 500px; overflow: hidden;\">" + title +
-                        "</td><td><span style=\"color: green\">" + url + "</span></td></tr>";
+                        "</td><td><a href=\"#\" class=\"hl-URL buffer-list\">" + url + "</a></td></tr>";
             }
             list += "</table>";
 
diff --git a/content/ui.js b/content/ui.js
index f73d6316..9504be97 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -706,8 +706,34 @@ function CommandLine() //{{{
                 break;
 
             case "<LeftMouse>":
-            case "<A-LeftMouse>":
+                if (event.originalTarget.className == "hl-URL buffer-list")
+                {
+                    vimperator.tabs.select(parseInt(event.originalTarget.parentNode.parentNode.firstChild.textContent) - 1);
+                    close_window = true;
+                    break;
+                }
+                else if (event.originalTarget.localName.toLowerCase() == "a")
+                {
+                    vimperator.open(event.originalTarget.textContent);
+                    break;
+                }
+            case "<A-LeftMouse>": // for those not owning a 3-button mouse
+            case "<MiddleMouse>":
+                if (event.originalTarget.localName.toLowerCase() == "a")
+                {
+                    var where = /\btabopen\b/.test(vimperator.options["activate"]) ?
+                                vimperator.NEW_TAB : vimperator.NEW_BACKGROUND_TAB;
+                    vimperator.open(event.originalTarget.textContent, where);
+                }
+                break;
+
+            // let firefox handle those to select table cells or show a context menu
             case "<C-LeftMouse>":
+            case "<RightMouse>":
+            case "<C-S-LeftMouse>":
+                break;
+
+            // XXX: what's that for? --mst
             case "<S-LeftMouse>":
                 if (/^(end|more(-help)?)-prompt$/.test(event.target.id))
                     ; // fall through
diff --git a/skin/vimperator.css b/skin/vimperator.css
index 884e12b5..c4812b2d 100644
--- a/skin/vimperator.css
+++ b/skin/vimperator.css
@@ -4,7 +4,7 @@
 
 #vimperator-bufferwindow, #vimperator-completion, #vimperator-previewwindow {
     -moz-user-focus: ignore;
-    overflow: -moz-scrollbars-none;
+    overflow: -moz-scrollbars-none !important; /* does not seem to work fully */
     border-width: 0px !important;
     -moz-appearance: none !important; /* prevent an ugly 3D border */
 }
@@ -112,11 +112,21 @@
     background-color: #FF6060 !important; /* light red */
     color: black !important;
 }
+.hl-URL {
+    background-color: white;
+    color: green;
+    text-decoration: none;
+}
+a.hl-URL:hover {
+    text-decoration: underline;
+}
 
 /* MOW */
 
 #vimperator-multiline-output {
     overflow: hidden;
+    background-color: white;
+    color: black;
 }
 
 #vimperator-multiline-output-content {
@@ -139,4 +149,8 @@
     padding: 0px 2px;
 }
 
+#vimperator-multiline-output-content a {
+    cursor: pointer;
+}
+
 /* vim: set fdm=marker sw=4 ts=4 et: */

From d24624c367c24fa9f0d659942dae3c5c7cb83123 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 19 Oct 2007 15:23:12 +0000
Subject: [PATCH 150/224] update NEWS for MOW hyperlinking

---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index 1a21de7c..aa7c1d23 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.3
+	* :ls, :history and :bmarks output is now hyperlinked
 	* new gb and gB mappings to repeat the last :buffer[!] command,
 	* :q doesn't close the whole browser, if there are more than one windows
 	* new :winclose command

From bb7becfe4114e5735e29163cd945d75b24eb5eab Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 19 Oct 2007 15:27:29 +0000
Subject: [PATCH 151/224] move cursor property assignment to .hl-URL

---
 skin/vimperator.css | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/skin/vimperator.css b/skin/vimperator.css
index c4812b2d..ebfe9f86 100644
--- a/skin/vimperator.css
+++ b/skin/vimperator.css
@@ -119,6 +119,7 @@
 }
 a.hl-URL:hover {
     text-decoration: underline;
+    cursor: pointer;
 }
 
 /* MOW */
@@ -149,8 +150,4 @@ a.hl-URL:hover {
     padding: 0px 2px;
 }
 
-#vimperator-multiline-output-content a {
-    cursor: pointer;
-}
-
 /* vim: set fdm=marker sw=4 ts=4 et: */

From 774f52064e142cbca565b7fc2732680334829703 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 19 Oct 2007 15:54:12 +0000
Subject: [PATCH 152/224] merge some minor documentation improvements

---
 content/commands.js | 54 ++++++++++++++++++++++-----------------------
 content/help.js     |  8 +++----
 content/mappings.js |  4 ++--
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index 24ac8959..13966d87 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -324,7 +324,7 @@ function Commands() //{{{
         {
             usage: ["bma[rk] [-t {title}] [url]"],
             short_help: "Add a bookmark",
-            help: "If you don't add a custom title, either the title of the web page or the URL will be taken as the title.<br/>" +
+            help: "If you don't add a custom title, either the title of the web page or the URL is taken as the title.<br/>" +
                   "You can omit the optional <code class=\"argument\">[url]</code> argument, so just do <code class=\"command\">:bmark</code> to bookmark the currently loaded web page with a default title and without any tags.<br/>" +
                   " -t \"custom title\"<br/>" +
                   "The following options will be interpreted in the future:<br/>" +
@@ -339,7 +339,7 @@ function Commands() //{{{
             usage: ["bmarks [filter]", "bmarks!"],
             short_help: "Show bookmarks",
             help: "Open the message window at the bottom of the screen with all bookmarks which match <code class=\"argument\">[filter]</code> either in the title or URL.<br/>" +
-                  "The special version <code class=\"command\">:bmarks!</code> will open the default Firefox bookmarks window.<br/>" +
+                  "The special version <code class=\"command\">:bmarks!</code> opens the default Firefox bookmarks window.<br/>" +
                   "The following options WILL be interpreted in the future:<br/>" +
                   " -T comma,separated,tag,list<br/>",
             completer: function(filter) { return vimperator.completion.get_bookmark_completions(filter); }
@@ -451,9 +451,9 @@ function Commands() //{{{
             usage: ["delm[arks] {marks}", "delm[arks]!"],
             short_help: "Delete the specified marks",
             help: "Marks are presented as a list. Example:<br/>" +
-                "<code class=\"command\">:delmarks Aa b p</code> will delete marks A, a, b and p<br/>" +
-                "<code class=\"command\">:delmarks b-p</code> will delete all marks in the range b to p<br/>" +
-                "<code class=\"command\">:delmarks!</code> will delete all marks for the current buffer"
+                "<code class=\"command\">:delmarks Aa b p</code> deletes marks A, a, b and p<br/>" +
+                "<code class=\"command\">:delmarks b-p</code> deletes all marks in the range b to p<br/>" +
+                "<code class=\"command\">:delmarks!</code> deletes all marks for the current buffer"
         }
 
     ));
@@ -481,9 +481,9 @@ function Commands() //{{{
             usage: ["delqm[arks] {marks}", "delqm[arks]!"],
             short_help: "Delete the specified QuickMarks",
             help: "QuickMarks are presented as a list. Example:<br/>" +
-                "<code class=\"command\">:delqmarks Aa b p</code> will delete QuickMarks A, a, b and p<br/>" +
-                "<code class=\"command\">:delqmarks b-p</code> will delete all QuickMarks in the range b to p<br/>" +
-                "<code class=\"command\">:delqmarks!</code> will delete all QuickMarks"
+                "<code class=\"command\">:delqmarks Aa b p</code> deletes QuickMarks A, a, b and p<br/>" +
+                "<code class=\"command\">:delqmarks b-p</code> deletes all QuickMarks in the range b to p<br/>" +
+                "<code class=\"command\">:delqmarks!</code> deletes all QuickMarks"
         }
     ));
     addDefaultCommand(new Command(["downl[oads]", "dl"],
@@ -557,7 +557,7 @@ function Commands() //{{{
         {
             usage: ["exe[cute] {expr1} [ ... ]"],
             short_help: "Execute the string that results from the evaluation of {expr1} as an Ex command.",
-            help: "<code class=\"command\">:execute echo test</code> would show a message with the text &#34;test&#34;.<br/>"
+            help: "Example: <code class=\"command\">:execute echo test</code> shows a message with the text &#34;test&#34;.<br/>"
         }
     ));
     addDefaultCommand(new Command(["exu[sage]"],
@@ -628,7 +628,7 @@ function Commands() //{{{
                   "<li><code class=\"command\">:help 'complete'</code> for options (surrounded by ' and ')</li>" +
                   "<li><code class=\"command\">:help o</code> for mappings (no pre- or postfix)</li>" +
                   "</ul>" +
-                  "You can however use partial stings in the tab completion, so <code class=\"command\">:help he&lt;Tab&gt;</code> will complete <code class=\"command\">:help :help</code>.",
+                  "You can however use partial stings in the tab completion, so <code class=\"command\">:help he&lt;Tab&gt;</code> completes <code class=\"command\">:help :help</code>.",
             completer: function(filter) { return vimperator.completion.get_help_completions(filter); }
         }
     ));
@@ -638,7 +638,7 @@ function Commands() //{{{
             usage: ["hist[ory] [filter]", "history!"],
             short_help: "Show recently visited URLs",
             help: "Open the message window at the bottom of the screen with all history items which match <code class=\"argument\">[filter]</code> either in the title or URL.<br/>" +
-                  "The special version <code class=\"command\">:history!</code> will open the default Firefox history window.",
+                  "The special version <code class=\"command\">:history!</code> opens the default Firefox history window.",
             completer: function(filter) { return vimperator.completion.get_history_completions(filter); }
         }
     ));
@@ -682,9 +682,9 @@ function Commands() //{{{
             usage: ["javas[cript] {cmd}", "javascript <<{endpattern}\\n{script}\\n{endpattern}", "javascript[!]"], // \\n is changed to <br/> in the help.js code
             short_help: "Run any JavaScript command through eval()",
             help: "Acts as a JavaScript interpreter by passing the argument to <code>eval()</code>.<br/>" +
-                  "<code class=\"command\">:javascript alert('Hello world')</code> would show a dialog box with the text \"Hello world\".<br/>" +
-                  "<code class=\"command\">:javascript &lt;&lt;EOF</code> would read all the lines until a line starting with 'EOF' is found, and will <code>eval()</code> them.<br/>" +
-                  "The special version <code class=\"command\">:javascript!</code> will open the JavaScript console of Firefox.<br/>" +
+                  "<code class=\"command\">:javascript alert('Hello world')</code> shows a dialog box with the text \"Hello world\".<br/>" +
+                  "<code class=\"command\">:javascript &lt;&lt;EOF</code> reads all the lines until a line starting with 'EOF' is found, and interpret them with the JavaScript <code>eval()</code> function.<br/>" +
+                  "The special version <code class=\"command\">:javascript!</code> opens the JavaScript console of Firefox.<br/>" +
                   "Rudimentary <code class=\"mapping\">&lt;Tab&gt;</code> completion is available for <code class=\"command\">:javascript {cmd}&lt;Tab&gt;</code> (but not yet for the " +
                   "<code class=\"command\">:js &lt;&lt;EOF</code> multiline widget). Be aware that Vimperator needs to run {cmd} through eval() " +
                   "to get the completions, which could have unwanted side effects.",
@@ -908,7 +908,7 @@ function Commands() //{{{
         {
             usage: ["norm[al][!] {commands}"],
             short_help: "Execute Normal mode commands",
-            help: "<code class=\"command\">:normal 20j</code> would scroll 20 lines down."
+            help: "Example: <code class=\"command\">:normal 20j</code> scrolls 20 lines down."
         }
     ));
     // TODO: remove duplication in :map
@@ -988,20 +988,20 @@ function Commands() //{{{
                   "<ol>" +
                   "<li>Transformed to a relative URL of the current location if it starts with . or .. or ...;<br/>" +
                   "... is special and moves up the directory hierarchy as far as possible." +
-                  "<ul><li><code class=\"command\">:open ...</code> with current location <code>\"http://www.example.com/dir1/dir2/file.html\"</code> will open <code>\"http://www.example.com\"</code></li>" +
-                  "<li><code class=\"command\">:open ./foo.html</code> with current location <code>\"http://www.example.com/dir1/dir2/file.html\"</code> will open <code>\"http://www.example.com/dir1/dir2/foo.html\"</code></li></ul></li>" +
+                  "<ul><li><code class=\"command\">:open ...</code> with current location <code>\"http://www.example.com/dir1/dir2/file.html\"</code> opens <code>\"http://www.example.com\"</code></li>" +
+                  "<li><code class=\"command\">:open ./foo.html</code> with current location <code>\"http://www.example.com/dir1/dir2/file.html\"</code> opens <code>\"http://www.example.com/dir1/dir2/foo.html\"</code></li></ul></li>" +
                   "<li>Opened with the specified search engine if the token looks like a search string " +
                   "and the first word is the name of a search engine (<code class=\"command\">:open wikipedia linus torvalds</code> " +
-                  "will open the wikipedia entry for linus torvalds). The short name of a search engine is automatically guessed from its name. " +
-                  "If you want to set a custom name, open the $FIREFOX_PROFILE/searchplugins/*.xml file of the search engine, and add/change " +
+                  "opens the wikipedia entry for linus torvalds). The short name of a search engine is automatically guessed from its name. " +
+                  "If you want to set a custom name, open the <var>$FIREFOX_PROFILE</var>/searchplugins/*.xml file of the search engine, and add/change " +
                   "&lt;Alias&gt;myalias&lt;/Alias&gt;</li>" +
                   "<li>Opened with the default search engine or keyword (specified with the <code class=\"option\">'defsearch'</code> option) " +
-                  "if the first word is no search engine (<code class=\"command\">:open linus torvalds</code> will open a Google search for linux torvalds).</li>" +
-                  "<li>Passed directly to Firefox in all other cases (<code class=\"command\">:open www.osnews.com, www.slashdot.org</code> will " +
-                  "open OSNews in the current, and Slashdot in a new background tab).</li>" +
+                  "if the first word is no search engine (<code class=\"command\">:open linus torvalds</code> opens a Google search for linux torvalds).</li>" +
+                  "<li>Passed directly to Firefox in all other cases (<code class=\"command\">:open www.osnews.com, www.slashdot.org</code> " +
+                  "opens OSNews in the current, and Slashdot in a new background tab).</li>" +
                   "</ol>" +
-                  "You WILL be able to use <code class=\"command\">:open [-T \"linux\"] torvalds&lt;Tab&gt;</code> to complete bookmarks " +
-                  "with tag \"linux\" and which contain \"torvalds\". Note that -T support is only available for tab completion, not for the actual command.<br/>" +
+                  "You can use <code class=\"command\">:open -tags linux torvalds&lt;Tab&gt;</code> to complete bookmarks " +
+                  "with tag \"linux\" and which contain \"torvalds\". Note that -tags support is only available for tab completion, not for the actual command.<br/>" +
                   "The items which are completed on <code class=\"mapping\">&lt;Tab&gt;</code> are specified in the <code class=\"option\">'complete'</code> option.<br/>" +
                   "Without argument, reloads the current page.<br/>" +
                   "Without argument but with <code class=\"command\">!</code>, reloads the current page skipping the cache.",
@@ -1308,8 +1308,8 @@ function Commands() //{{{
                   "<code class=\"command\">:set option!</code> and <code class=\"command\">:set invoption</code> invert the value of a boolean option.<br/>" +
                   "<code class=\"command\">:set option?</code> or <code class=\"command\">:set option</code>(for string and list options) shows the current value of an option.<br/>" +
                   "<code class=\"command\">:set option&amp;</code> resets an option to its default value.<br/>" +
-                  "<code class=\"command\">:set option+={value}</code> and <code class=\"command\">:set option-={value}</code> will add/subtract {value} to a number option and append/remove {value} to a string option.<br/>" +
-                  "<code class=\"command\">:set all</code> will show the current value of all options and <code class=\"command\">:set all&amp;</code> will reset all options to their default values.<br/>",
+                  "<code class=\"command\">:set option+={value}</code> and <code class=\"command\">:set option-={value}</code> adds/subtracts {value} to a number option and append/remove {value} to a string option.<br/>" +
+                  "<code class=\"command\">:set all</code> shows the current value of all options and <code class=\"command\">:set all&amp;</code> resets all options to their default values.<br/>",
             completer: function(filter) { return vimperator.completion.get_options_completions(filter); }
         }
     ));
@@ -1386,7 +1386,7 @@ function Commands() //{{{
                   "NOTE: In both cases you must add functions to the global window object like shown above, functions written as:<br/>" +
                   "<code class=\"code\">function hello2() {<br/>&nbsp;&nbsp;alert(\"Hello world\");<br/>}<br/></code>are only available within the scope of the script. <br/><br/>" +
                   "The .vimperatorrc file in your home directory and any files in ~/.vimperator/plugin/ are always sourced at startup.<br/>" +
-                  "~ is supported as a shortcut for the $HOME directory.<br/>" +
+                  "~ is supported as a shortcut for the <var>$HOME</var> directory.<br/>" +
                   "If <code class=\"command\">!</code> is specified, errors are not printed.",
             completer: function(filter) { return vimperator.completion.get_file_completions(filter); }
         }
diff --git a/content/help.js b/content/help.js
index 8c8f6ef9..45e054ac 100644
--- a/content/help.js
+++ b/content/help.js
@@ -169,12 +169,12 @@ vimperator.help = function(section, easter) //{{{
         '<li>Unix and Mac - ~/.vimperator/plugin</li>' +
         '<li>Windows - ~/vimperator/plugin</li>' +
         '</ul>' +
-        '<p>The user\'s $HOME(~) directory is determined as follows:</p>' +
+        '<p>The user\'s <var>$HOME</var>(~) directory is determined as follows:</p>' +
         '<ul>' +
-        '<li>Unix and Mac - $HOME is used.</li>' +
-        '<li>Windows - if $HOME is set then this is used, otherwise $USERPROFILE or finally $HOMEDRIVE$HOMEPATH.</li>' +
+        '<li>Unix and Mac - <var>$HOME</var> is used.</li>' +
+        '<li>Windows - if <var>$HOME</var> is set then this is used, otherwise <var>$USERPROFILE</var> or finally <var>$HOMEDRIVE</var><var>$HOMEPATH</var>.</li>' +
         '</ul>' +
-        '$VIMPERATOR_HOME can be used to override the calculated $HOME directory.';
+        '<var>$VIMPERATOR_HOME</var> can be used to override the calculated <var>$HOME</var> directory.';
 
     var mappings = '<span style="float: right"><code class="tag">mappings</code></span><h2 id="mappings">Mappings</h2>' +
         '<p>The denotion of modifier keys is like in Vim, so C- means the Control key, M- the Meta key, A- the Alt key and S- the Shift key.</p>'+
diff --git a/content/mappings.js b/content/mappings.js
index 927fc32e..8ac77dc4 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -970,7 +970,7 @@ function Mappings() //{{{
             short_help: "Search forward for a pattern",
             usage: ["/{pattern}[/]<CR>"],
             help: "Search forward for the first occurance of <code class=\"argument\">{pattern}</code>.<br/>" +
-                  "When \"\\c\" appears anywhere in the pattern the whole pattern is handled as though <code class=\"option\">'ignorecase'</code> is on. " +
+                  "If \"\\c\" appears anywhere in the pattern the whole pattern is handled as though <code class=\"option\">'ignorecase'</code> is on. " +
                   "\"\\C\" forces case-sensitive matching for the whole pattern.<br/>" +
                   "If \"\\l\" appears in the pattern only the text of links is searched for a match as though <code class=\"option\">'linksearch'</code> is on. " +
                   "\"\\L\" forces the entire page to be searched for a match."
@@ -982,7 +982,7 @@ function Mappings() //{{{
             short_help: "Search backwards for a pattern",
             usage: ["?{pattern}[?]<CR>"],
             help: "Search backward for the first occurance of <code class=\"argument\">{pattern}</code>.<br/>" +
-                  "When \"\\c\" appears anywhere in the pattern the whole pattern is handled as though <code class=\"option\">'ignorecase'</code> is on. " +
+                  "If \"\\c\" appears anywhere in the pattern the whole pattern is handled as though <code class=\"option\">'ignorecase'</code> is on. " +
                   "\"\\C\" forces case-sensitive matching for the whole pattern.<br/>" +
                   "If \"\\l\" appears in the pattern only the text of links is searched for a match as though <code class=\"option\">'linksearch'</code> is on. " +
                   "\"\\L\" forces the entire page to be searched for a match.<br/>" +

From 7f3f2eac56d6ef7cf7c2f22603297ba8bef616f2 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 21 Oct 2007 02:00:10 +0000
Subject: [PATCH 153/224] remove modes.js - accidentally included during the
 directory structure change

---
 content/modes.js | 184 -----------------------------------------------
 1 file changed, 184 deletions(-)
 delete mode 100644 content/modes.js

diff --git a/content/modes.js b/content/modes.js
deleted file mode 100644
index a64af728..00000000
--- a/content/modes.js
+++ /dev/null
@@ -1,184 +0,0 @@
-/***** BEGIN LICENSE BLOCK ***** {{{
-Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
-The contents of this file are subject to the Mozilla Public License Version
-1.1 (the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an "AS IS" basis,
-WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-for the specific language governing rights and limitations under the
-License.
-
-(c) 2006-2007: Martin Stubenschrott <stubenschrott@gmx.net>
-
-Alternatively, the contents of this file may be used under the terms of
-either the GNU General Public License Version 2 or later (the "GPL"), or
-the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-in which case the provisions of the GPL or the LGPL are applicable instead
-of those above. If you wish to allow use of your version of this file only
-under the terms of either the GPL or the LGPL, and not to allow others to
-use your version of this file under the terms of the MPL, indicate your
-decision by deleting the provisions above and replace them with the notice
-and other provisions required by the GPL or the LGPL. If you do not delete
-the provisions above, a recipient may use your version of this file under
-the terms of any one of the MPL, the GPL or the LGPL.
-}}} ***** END LICENSE BLOCK *****/
-
-vimperator.modes = (function()
-{
-    var main = 1;     // NORMAL
-    var extended = 0; // NONE
-
-    var passNextKey = false;
-    var passAllKeys = false;
-
-    function getModeMessage()
-    {
-        if (passNextKey && !passAllKeys)
-            return "PASS THROUGH (next)";
-        else if (passAllKeys && !passNextKey)
-            return "PASS THROUGH";
-
-        var ext = "";
-        switch (extended)
-        {
-            case vimperator.modes.QUICK_HINT:
-                ext = " (quick)"; break;
-            case vimperator.modes.EXTENDED_HINT:
-                ext = " (extended)"; break;
-            case vimperator.modes.ALWAYS_HINT:
-                ext = " (always)"; break;
-            case vimperator.modes.MENU: // TODO: desirable?
-                ext = " (menu)"; break;
-        }
-
-        switch (main)
-        {
-            case vimperator.modes.HINTS:
-                return "HINTS" + ext;
-            default:
-                return null;
-        }
-    }
-
-    function handleModeChange(oldmode, newmode)
-    {
-        vimperator.log("switching from mode " + oldmode + " to mode " + newmode, 7);
-
-        switch (oldmode)
-        {
-            case vimperator.modes.HINTS:
-                // XXX: for now this does not work, but later it should be here
-                // vimperator.hints.disableHahMode();
-                break;
-        }
-
-        if (newmode == vimperator.modes.NORMAL)
-        {
-            var value = Options.getFirefoxPref("accessibility.browsewithcaret", false);
-            if (value)
-                Options.setFirefoxPref("accessibility.browsewithcaret", false);
-
-            vimperator.statusline.updateUrl();
-            vimperator.focusContent();
-        }
-    }
-
-    return {
-        // main modes, only one should ever be active
-        NONE:             0,
-        NORMAL:           1 << 0,
-        HINTS:            1 << 1,
-        COMMAND_LINE:     1 << 2,
-        // extended modes, can include multiple modes, and even main modes
-        EX:               1 << 10,
-        INPUT_MULTILINE:  1 << 11,
-        OUTPUT_MULTILINE: 1 << 12,
-        SEARCH_FORWARD:   1 << 13,
-        SEARCH_BACKWARD:  1 << 14,
-        QUICK_HINT:       1 << 15,
-        EXTENDED_HINT:    1 << 16,
-        ALWAYS_HINT:      1 << 17,
-        MENU:             1 << 18, // a popupmenu is active
-
-        reset: function(silent)
-        {
-            this.set(vimperator.modes.NORMAL, vimperator.modes.NONE, silent);
-        },
-
-        show: function()
-        {
-            if (!vimperator.options["showmode"])
-                return;
-
-            // never show mode messages if we are in command line mode
-            if (main == vimperator.modes.COMMAND_LINE)
-                return;
-
-            var msg = getModeMessage();
-            if (msg)
-                vimperator.commandline.echo("-- " + getModeMessage() + " --");
-            else
-                vimperator.commandline.echo("");
-        },
-
-        // helper function to set both modes in one go
-        set: function(main_mode, extended_mode, silent)
-        {
-            // if a main mode is set, the extended is always cleared
-            if (typeof main_mode === "number")
-            {
-                if (main_mode != main)
-                    handleModeChange(main, main_mode);
-
-                main = main_mode;
-                if (!extended_mode)
-                    extended = vimperator.modes.NONE;
-
-            }
-            if (typeof extended_mode === "number")
-                extended = extended_mode;
-
-            if (!silent)
-                this.show();
-        },
-
-        // add/remove always work on the extended mode only
-        add: function(mode)
-        {
-            extended |= mode;
-            this.show();
-        },
-        remove: function(mode)
-        {
-            extended = (extended | mode) ^ mode;
-            this.show();
-        },
-
-        get passNextKey() { return passNextKey; },
-        set passNextKey(value) { passNextKey = value; this.show(); },
-
-        get passAllKeys() { return passAllKeys; },
-        set passAllKeys(value) { passAllKeys = value; this.show(); },
-
-        get main()      { return main; },
-        set main(value) {
-            if (value != main)
-                handleModeChange(main, value);
-
-            main = value;
-            // setting the main mode always resets any extended mode
-            extended = vimperator.modes.NONE;
-            this.show();
-        },
-
-        get extended()      { return extended; },
-        set extended(value) {
-            extended = value; this.show();
-        }
-    }
-})();
-
-// vim: set fdm=marker sw=4 ts=4 et:

From 0263e25443b9868d02675240a3f56cbabcf9cea6 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 22 Oct 2007 01:37:18 +0000
Subject: [PATCH 154/224] remove :redraw as it relys on a FF3 only feature

---
 NEWS                |  1 +
 content/commands.js | 12 ------------
 content/mappings.js |  8 --------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/NEWS b/NEWS
index aa7c1d23..8ad8eba9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.3
+	* remove :redraw and Ctrl-L commands as they rely on FF3 features
 	* :ls, :history and :bmarks output is now hyperlinked
 	* new gb and gB mappings to repeat the last :buffer[!] command,
 	* :q doesn't close the whole browser, if there are more than one windows
diff --git a/content/commands.js b/content/commands.js
index 13966d87..0fd7c8d3 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1106,18 +1106,6 @@ function Commands() //{{{
             help: "Quit Vimperator, no matter how many tabs/windows are open. The session is not stored."
         }
     ));
-    addDefaultCommand(new Command(["redr[aw]"],
-        function()
-        {
-            var wu = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
-                            getInterface(Components.interfaces.nsIDOMWindowUtils);
-            wu.redraw();
-        },
-        {
-            short_help: "Redraw the screen",
-            help: "Useful to update the screen halfway executing a script or function."
-        }
-    ));
     addDefaultCommand(new Command(["re[load]"],
         function(args, special) { vimperator.tabs.reload(getBrowser().mCurrentTab, special); },
         {
diff --git a/content/mappings.js b/content/mappings.js
index 8ac77dc4..011ffaa0 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -597,14 +597,6 @@ function Mappings() //{{{
                   "Whether the new buffer is activated, depends on the <code class=\"option\">'activate'</code> option."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["<C-l>"],
-        function(count) { vimperator.commands.redraw(); },
-        {
-            short_help: "Redraw the screen",
-            help: "Works like <code class=\"command\">:redraw</code>.",
-            flags: Mappings.flags.COUNT
-        }
-    ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["r"],
         function() { vimperator.tabs.reload(getBrowser().mCurrentTab, false); },
         {

From dd3196f0b4b45af2d5cec887e7ea19dd952ca2f5 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 22 Oct 2007 02:19:13 +0000
Subject: [PATCH 155/224] rename file.js to io.js

---
 content/{file.js => io.js} | 0
 content/vimperator.xul     | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename content/{file.js => io.js} (100%)

diff --git a/content/file.js b/content/io.js
similarity index 100%
rename from content/file.js
rename to content/io.js
diff --git a/content/vimperator.xul b/content/vimperator.xul
index dc16e8d9..b92efef6 100644
--- a/content/vimperator.xul
+++ b/content/vimperator.xul
@@ -43,11 +43,11 @@ the terms of any one of the MPL, the GPL or the LGPL.
     <script type="application/x-javascript;version=1.7" src="commands.js"/>
     <script type="application/x-javascript;version=1.7" src="completion.js"/>
     <script type="application/x-javascript;version=1.7" src="events.js"/>
-    <script type="application/x-javascript;version=1.7" src="file.js"/>
     <script type="application/x-javascript;version=1.7" src="find.js"/>
     <script type="application/x-javascript;version=1.7" src="help.js"/>
     <script type="application/x-javascript;version=1.7" src="hints.js"/>
     <script type="application/x-javascript;version=1.7" src="mappings.js"/>
+    <script type="application/x-javascript;version=1.7" src="io.js"/>
     <script type="application/x-javascript;version=1.7" src="options.js"/>
     <script type="application/x-javascript;version=1.7" src="tabs.js"/>
     <script type="application/x-javascript;version=1.7" src="ui.js"/>

From 05ab0347534641820ae6c0c19d9d0c213eab42d9 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 22 Oct 2007 02:55:52 +0000
Subject: [PATCH 156/224] merge new vimperator.io object

---
 content/completion.js |  38 +----
 content/io.js         | 343 +++++++++++++++++++++++++-----------------
 content/mappings.js   |   9 +-
 content/vimperator.js | 127 ++--------------
 4 files changed, 230 insertions(+), 287 deletions(-)

diff --git a/content/completion.js b/content/completion.js
index fccc6b64..2d64d8c8 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -237,7 +237,7 @@ vimperator.completion = (function() // {{{
         }, //}}}
 
         // TODO: support file:// and \ or / path separators on both platforms
-        get_file_completions: function(filter) //{{{
+        get_file_completions: function(filter)
         {
             // this is now also used as part of the url completion, so the
             // substrings shouldn't be cleared for that case
@@ -252,35 +252,12 @@ vimperator.completion = (function() // {{{
 
             var compl = matches[2] || "";
 
+            var files = [], mapped = [];
             try
             {
-                var fd = vimperator.io.fopen(dir);
-            }
-            catch (e)
-            {
-                // thrown if file does not exist
-                return [];
-            }
-
-            if (!fd)
-                return [];
-
-            try
-            {
-                var entries = fd.read();
-                var separator = fd.path.length == 1 ? "" : /\\/.test(fd.path) ? "\\" : "/";
-                var new_filter = fd.path + separator + compl;
-                if (!filter) return entries.map(function(file) {
-                    var path = file.path;
-                    if (file.isDirectory())
-                        path += separator;
-                    return [path, ""];
-                });
-                var mapped = entries.map(function(file) {
-                    var path = file.path;
-                    if (file.isDirectory())
-                        path += separator;
-                    return [[path], ""];
+                files = vimperator.io.readDirectory(dir);
+                mapped = files.map(function(file) {
+                    return [[file.path], file.isDirectory() ? "Directory" : "File"];
                 });
             }
             catch (e)
@@ -288,8 +265,9 @@ vimperator.completion = (function() // {{{
                 return [];
             }
 
-            return build_longest_starting_substring(mapped, new_filter);
-        }, //}}}
+
+            return build_longest_starting_substring(mapped, filter);
+        },
 
         get_help_completions: function(filter) //{{{
         {
diff --git a/content/io.js b/content/io.js
index 9f4e2cac..84fe8118 100644
--- a/content/io.js
+++ b/content/io.js
@@ -27,153 +27,216 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.io = {};
-
-vimperator.io.fopen = function(path, mode, perms, tmp)
+vimperator.io = (function() 
 {
-    return new vimperator.io.LocalFile(path, mode, perms, tmp);
-}
+    var environment_service = Components.classes["@mozilla.org/process/environment;1"]
+        .getService(Components.interfaces.nsIEnvironment);
 
-vimperator.io.LocalFile = function(file, mode, perms, tmp) // {{{
-{
-    const PERM_IWOTH = 00002;  /* write permission, others */
-    const PERM_IWGRP = 00020;  /* write permission, group */
+    vimperator.log("Loading vimperator.io");
 
-    const MODE_RDONLY   = 0x01;
-    const MODE_WRONLY   = 0x02;
-    const MODE_RDWR     = 0x04;
-    const MODE_CREATE   = 0x08;
-    const MODE_APPEND   = 0x10;
-    const MODE_TRUNCATE = 0x20;
-    const MODE_SYNC     = 0x40;
-    const MODE_EXCL     = 0x80;
+    return {
 
-    const classes = Components.classes;
-    const interfaces = Components.interfaces;
+        MODE_RDONLY: 0x01,
+        MODE_WRONLY: 0x02,
+        MODE_RDWR: 0x04,
+        MODE_CREATE: 0x08,
+        MODE_APPEND: 0x10,
+        MODE_TRUNCATE: 0x20,
+        MODE_SYNC: 0x40,
+        MODE_EXCL: 0x80,
 
-    const LOCALFILE_CTRID = "@mozilla.org/file/local;1";
-    const FILEIN_CTRID = "@mozilla.org/network/file-input-stream;1";
-    const FILEOUT_CTRID = "@mozilla.org/network/file-output-stream;1";
-    const SCRIPTSTREAM_CTRID = "@mozilla.org/scriptableinputstream;1";
-
-    const nsIFile = interfaces.nsIFile;
-    const nsILocalFile = interfaces.nsILocalFile;
-    const nsIFileOutputStream = interfaces.nsIFileOutputStream;
-    const nsIFileInputStream = interfaces.nsIFileInputStream;
-    const nsIScriptableInputStream = interfaces.nsIScriptableInputStream;
-
-    if (typeof perms == "undefined")
-        perms = 0666 & ~(PERM_IWOTH | PERM_IWGRP);
-
-    if (typeof mode == "string")
-    {
-        switch (mode)
+        expandPath: function(path)
         {
-            case ">":
-                mode = MODE_WRONLY | MODE_CREATE | MODE_TRUNCATE;
-                break;
-            case ">>":
-                mode = MODE_WRONLY | MODE_CREATE | MODE_APPEND;
-                break;
-            case "<":
-                mode = MODE_RDONLY;
-                break;
-            default:
-                throw "Invalid mode ``" + mode + "''";
+            const WINDOWS = navigator.platform == "Win32";
+
+            // TODO: proper pathname separator translation like Vim
+            if (WINDOWS)
+                path = path.replace('/', '\\', 'g');
+
+            // expand "~" to VIMPERATOR_HOME or HOME (USERPROFILE or HOMEDRIVE\HOMEPATH on Windows if HOME is not set)
+            if (/^~/.test(path))
+            {
+                var home = environment_service.get("VIMPERATOR_HOME");
+
+                if (!home)
+                    home = environment_service.get("HOME");
+
+                if (WINDOWS && !home)
+                    home = environment_service.get("USERPROFILE") ||
+                           environment_service.get("HOMEDRIVE") + environment_service.get("HOMEPATH");
+
+                path = path.replace("~", home);
+            }
+
+            // expand any $ENV vars
+            var env_vars = path.match(/\$\w+\b/g); // this is naive but so is Vim and we like to be compatible
+
+            if (env_vars)
+            {
+                var expansion;
+
+                for (var i = 0; i < env_vars.length; i++)
+                {
+                    expansion = environment_service.get(env_vars[i].replace("$", ""));
+                    if (expansion)
+                        path = path.replace(env_vars[i], expansion);
+                }
+            }
+
+            return path;
+        },
+
+        getPluginDir: function()
+        {
+            var plugin_dir;
+
+            if (navigator.platform == "Win32")
+                plugin_dir = "~/vimperator/plugin";
+            else
+                plugin_dir = "~/.vimperator/plugin";
+
+            plugin_dir = this.getFile(this.expandPath(plugin_dir));
+
+            return plugin_dir.exists() && plugin_dir.isDirectory() ? plugin_dir : null;
+        },
+
+        getRCFile: function()
+        {
+            var rc_file1 = this.getFile(this.expandPath("~/.vimperatorrc"));
+            var rc_file2 = this.getFile(this.expandPath("~/_vimperatorrc"));
+
+            if (navigator.platform == "Win32")
+                [rc_file1, rc_file2] = [rc_file2, rc_file1]
+
+            if (rc_file1.exists() && rc_file1.isFile())
+                return rc_file1;
+            else if (rc_file2.exists() && rc_file2.isFile())
+                return rc_file2;
+            else
+                return null;
+        },
+
+        // return a nsILocalFile for path where you can call isDirectory(), etc. on
+        // caller must check with .exists() if the returned file really exists
+        getFile: function(path)
+        {
+            var file = Components.classes["@mozilla.org/file/local;1"].
+                                  createInstance(Components.interfaces.nsILocalFile);
+
+            file.initWithPath(this.expandPath(path));
+            return file;
+        },
+
+        // TODO: make secure
+        // returns a nsILocalFile or null if it could not be created
+        createTempFile: function()
+        {
+            var file = Components.classes["@mozilla.org/file/local;1"].
+                                  createInstance(Components.interfaces.nsILocalFile);
+            if (navigator.platform == "Win32")
+            {
+                var dir = environment_service.get("TMP") || environment_service.get("TEMP") || "C:\\";
+                file.initWithPath(dir + "\\vimperator.tmp");
+            }
+            else
+            {
+                var dir = environment_service.get("TMP") || environment_service.get("TEMP") || "/tmp/";
+                file.initWithPath(dir + "/vimperator.tmp");
+            }
+
+            file.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0600);
+            if (!file.exists())
+                return null;
+
+            return file;
+        },
+
+        // file is either a full pathname or an instance of file instanceof nsILocalFile
+        readDirectory: function(file)
+        {
+            if (typeof file == "string")
+                file = this.getFile(file);
+            else if (!(file instanceof Components.interfaces.nsILocalFile))
+                throw Components.results.NS_ERROR_INVALID_ARG; // FIXME: does not work as expected, just shows undefined: undefined
+
+            if (file.isDirectory())
+            {
+                var entries = file.directoryEntries;
+                var array = [];
+                while (entries.hasMoreElements())
+                {
+                    var entry = entries.getNext();
+                    entry.QueryInterface(Components.interfaces.nsIFile);
+                    array.push(entry);
+                }
+                return array;
+            }
+            else
+                return []; // XXX: or should it throw an error, probably yes?
+        },
+
+        // file is either a full pathname or an instance of file instanceof nsILocalFile
+        // reads a file in "text" mode and returns the string
+        readFile: function(file)
+        {
+            var ifstream = Components.classes["@mozilla.org/network/file-input-stream;1"]
+                           .createInstance(Components.interfaces.nsIFileInputStream);
+            var icstream = Components.classes["@mozilla.org/intl/converter-input-stream;1"]
+                           .createInstance(Components.interfaces.nsIConverterInputStream);
+
+            var charset = "UTF-8";
+            if (typeof file == "string")
+                file = this.getFile(file);
+            else if (!(file instanceof Components.interfaces.nsILocalFile))
+                throw Components.results.NS_ERROR_INVALID_ARG; // FIXME: does not work as expected, just shows undefined: undefined
+
+            ifstream.init(file, -1, 0, 0);
+            const replacementChar = Components.interfaces.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER;
+            icstream.init(ifstream, charset, 4096, replacementChar); // 4096 bytes buffering
+
+            var buffer = "";
+            var str = {};
+            while (icstream.readString(4096, str) != 0)
+                buffer += str.value;
+
+            icstream.close();
+            ifstream.close();
+
+            return buffer;
+        },
+
+        // file is either a full pathname or an instance of file instanceof nsILocalFile
+        // default permission = 0644, only used when creating a new file, does not change permissions if the file exists
+        // mode can be ">" or ">>" in addition to the normal MODE_* flags
+        writeFile: function(file, buf, mode, perms)
+        {
+            var ofstream = Components.classes["@mozilla.org/network/file-output-stream;1"]
+                           .createInstance(Components.interfaces.nsIFileOutputStream);
+            var ocstream = Components.classes["@mozilla.org/intl/converter-output-stream;1"]
+                           .createInstance(Components.interfaces.nsIConverterOutputStream);
+
+            var charset = "UTF-8"; // Can be any character encoding name that Mozilla supports
+            if (typeof file == "string")
+                file = this.getFile(file);
+            else if (!(file instanceof Components.interfaces.nsILocalFile))
+                throw Components.results.NS_ERROR_INVALID_ARG; // FIXME: does not work as expected, just shows undefined: undefined
+
+            if (mode == ">>")
+                mode = this.MODE_WRONLY | this.MODE_CREATE | this.MODE_APPEND;
+            else if (!mode || mode == ">")
+                mode = this.MODE_WRONLY | this.MODE_CREATE | this.MODE_TRUNCATE;
+
+            if (!perms)
+                perms = 0644;
+
+            ofstream.init(file, mode, perms, 0);
+            ocstream.init(ofstream, charset, 0, 0x0000);
+            ocstream.writeString(buf);
+
+            ocstream.close();
+            ofstream.close();
         }
     }
-
-    if (typeof file == "string")
-    {
-        this.localFile = classes[LOCALFILE_CTRID].createInstance(nsILocalFile);
-        this.localFile.initWithPath(file);
-        if (!this.localFile.exists())
-            throw "No such file or directory";
-    }
-    else if (file instanceof nsILocalFile)
-    {
-        this.localFile = file;
-        if (!this.localFile.exists())
-            throw "No such file or directory";
-    }
-    else
-    {
-        throw "bad type for argument |file|.";
-    }
-
-    this.path = this.localFile.path;
-
-    if (mode & (MODE_WRONLY | MODE_RDWR))
-    {
-        this.outputStream =
-            classes[FILEOUT_CTRID].createInstance(nsIFileOutputStream);
-        this.outputStream.init(this.localFile, mode, perms, 0);
-    }
-
-    if (mode & (MODE_RDONLY | MODE_RDWR))
-    {
-        var is = classes[FILEIN_CTRID].createInstance(nsIFileInputStream);
-        is.init(this.localFile, mode, perms, tmp);
-        this.inputStream =
-            classes[SCRIPTSTREAM_CTRID].createInstance(nsIScriptableInputStream);
-        this.inputStream.init(is);
-    }
-}
-
-
-vimperator.io.LocalFile.prototype.write =
-function fo_write(buf)
-{
-    if (!("outputStream" in this))
-        throw "file not open for writing.";
-
-    return this.outputStream.write(buf, buf.length);
-}
-
-vimperator.io.LocalFile.prototype.read =
-function fo_read(max)
-{
-    if (this.localFile.isDirectory())
-    {
-        var entries = this.localFile.directoryEntries;
-        var array = [];
-        while (entries.hasMoreElements())
-        {
-            var entry = entries.getNext();
-            entry.QueryInterface(Components.interfaces.nsIFile);
-            array.push(entry);
-        }
-        return array;
-    }
-
-    if (!("inputStream" in this))
-        throw "file not open for reading.";
-
-    var av = this.inputStream.available();
-    if (typeof max == "undefined")
-        max = av;
-
-    if (!av)
-        return null;
-
-    var rv = this.inputStream.read(max);
-    return rv;
-}
-
-vimperator.io.LocalFile.prototype.close =
-function fo_close()
-{
-    if ("outputStream" in this)
-        this.outputStream.close();
-    if ("inputStream" in this)
-        this.inputStream.close();
-}
-
-vimperator.io.LocalFile.prototype.flush =
-function fo_close()
-{
-    return this.outputStream.flush();
-}
-//}}}
+})();
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/mappings.js b/content/mappings.js
index 011ffaa0..90368d80 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -864,14 +864,11 @@ function Mappings() //{{{
         if (url.match(/^file:\/\//) || url.match(/^\//))
         {
             var stripedFilename = url.replace(/^(file:\/\/)?(.*)/, "$2");
-            var file = vimperator.io.fopen(stripedFilename, '<');
-            if (!file)
+            var file = vimperator.io.getFile(stripedFilename);
+            if (!file || !file.isDirectory())
                 return false;
-
-            if (file.localFile.isDirectory())
-                return true;
             else
-                return false;
+                return true;
         }
         // for all other locations just check if the URL ends with /
         if (url.match(/\/$/))
diff --git a/content/vimperator.js b/content/vimperator.js
index a334bd63..1f51caea 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -104,87 +104,6 @@ const vimperator = (function() //{{{
         vimperator.echo("-- " + str_mode + str_extended + " --");
     }
 
-    function expandPath(path)
-    {
-        const WINDOWS = navigator.platform == "Win32";
-
-        // TODO: proper pathname separator translation like Vim
-        if (WINDOWS)
-            path = path.replace('/', '\\', 'g');
-
-        // expand "~" to VIMPERATOR_HOME or HOME (USERPROFILE or HOMEDRIVE\HOMEPATH on Windows if HOME is not set)
-        if (/^~/.test(path))
-        {
-            var home = environment_service.get("VIMPERATOR_HOME");
-
-            if (!home)
-                home = environment_service.get("HOME");
-
-            if (WINDOWS && !home)
-                home = environment_service.get("USERPROFILE") ||
-                       environment_service.get("HOMEDRIVE") + environment_service.get("HOMEPATH");
-
-            path = path.replace("~", home);
-        }
-
-        // expand any $ENV vars
-        var env_vars = path.match(/\$\w+\b/g); // this is naive but so is Vim and we like to be compatible
-
-        if (env_vars)
-        {
-            var expansion;
-
-            for (var i = 0; i < env_vars.length; i++)
-            {
-                expansion = environment_service.get(env_vars[i].replace("$", ""));
-                if (expansion)
-                    path = path.replace(env_vars[i], expansion);
-            }
-        }
-
-        return path;
-    }
-
-    // TODO: add this functionality to LocalFile or wait for Scriptable I/O in FUEL
-    function pathExists(path)
-    {
-        var p = Components.classes["@mozilla.org/file/local;1"]
-            .createInstance(Components.interfaces.nsILocalFile);
-        p.initWithPath(expandPath(path));
-
-        return p.exists();
-    }
-
-    function getPluginDir()
-    {
-        var plugin_dir;
-
-        if (navigator.platform == "Win32")
-            plugin_dir = "~/vimperator/plugin";
-        else
-            plugin_dir = "~/.vimperator/plugin";
-
-        plugin_dir = expandPath(plugin_dir);
-
-        return pathExists(plugin_dir) ? plugin_dir : null;
-    }
-
-    function getRCFile()
-    {
-        var rc_file1 = expandPath("~/.vimperatorrc");
-        var rc_file2 = expandPath("~/_vimperatorrc");
-
-        if (navigator.platform == "Win32")
-            [rc_file1, rc_file2] = [rc_file2, rc_file1]
-
-        if (pathExists(rc_file1))
-            return rc_file1;
-        else if (pathExists(rc_file2))
-            return rc_file2;
-        else
-            return null;
-    }
-
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
@@ -652,7 +571,7 @@ const vimperator = (function() //{{{
         {
             const WINDOWS = navigator.platform == "Win32"; // FIXME: duplicated everywhere
 
-            var fileout = getTempFile();
+            var fileout = vimperator.io.createTempFile();
             if (!fileout)
                 return "";
 
@@ -664,10 +583,8 @@ const vimperator = (function() //{{{
             var filein = null;
             if (input)
             {
-                filein = getTempFile();
-                var fdin = vimperator.io.fopen(filein, ">");
-                fdin.write(input);
-                fdin.close();
+                filein = vimperator.io.createTempFile();
+                vimperator.io.writeFile(filein, input);
                 command += " < \"" + filein.path.replace('"', '\\"') + "\"";
             }
 
@@ -677,48 +594,38 @@ const vimperator = (function() //{{{
             else
                 res = this.run("sh", ["-c", command], true);
 
-            var fd = vimperator.io.fopen(fileout, "<");
-            if (!fd)
-                return "";
-
-            var s = fd.read();
-            fd.close();
+            var output = vimperator.io.readFile(fileout);
             fileout.remove(false);
             if (filein)
                 filein.remove(false);
 
             // if there is only one \n at the end, chop it off
-            if (s && s.indexOf("\n") == s.length-1)
-                s = s.substr(0, s.length-1);
+            if (output && output.indexOf("\n") == output.length-1)
+                output = output.substr(0, output.length-1);
 
-            return s;
+            return output;
         },
 
         // files which end in .js are sourced as pure javascript files,
         // no need (actually forbidden) to add: js <<EOF ... EOF around those files
         source: function(filename, silent)
         {
-            filename = expandPath(filename);
+            filename = vimperator.io.expandPath(filename);
 
             try
             {
-                var fd = vimperator.io.fopen(filename, "<");
-                if (!fd)
-                    return;
-
-                var s = fd.read();
-                fd.close();
+                var str = vimperator.io.readFile(filename);
 
                 // handle pure javascript files specially
                 if (filename.search("\.js$") != -1)
                 {
-                    eval(s);
+                    eval(str);
                 }
                 else
                 {
                     var heredoc = "";
                     var heredoc_end = null; // the string which ends the heredoc
-                    s.split("\n").forEach(function(line)
+                    str.split("\n").forEach(function(line)
                     {
                         if (heredoc_end) // we already are in a heredoc
                         {
@@ -834,10 +741,10 @@ const vimperator = (function() //{{{
             // make sourcing asynchronous, otherwise commands that open new tabs won't work
             setTimeout(function() {
 
-                var rc_file = getRCFile();
+                var rc_file = vimperator.io.getRCFile();
 
                 if (rc_file)
-                    vimperator.source(rc_file, true);
+                    vimperator.source(rc_file.path, true);
                 else
                     vimperator.log("No user RC file found", 3);
 
@@ -845,15 +752,13 @@ const vimperator = (function() //{{{
                 var entries = [];
                 try
                 {
-                    var plugin_dir = getPluginDir();
+                    var plugin_dir = vimperator.io.getPluginDir();
 
                     if (plugin_dir)
                     {
-                        var fd = vimperator.io.fopen(plugin_dir);
-                        var entries = fd.read();
-                        fd.close();
+                        var files = vimperator.io.readDirectory(plugin_dir.path);
                         vimperator.log("Sourcing plugin directory...", 3);
-                        entries.forEach(function(file) {
+                        files.forEach(function(file) {
                             if (!file.isDirectory())
                                 vimperator.source(file.path, false);
                         });

From 16614c637bdfa92db9240dec62c60fc4b0560d4c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 22 Oct 2007 03:13:33 +0000
Subject: [PATCH 157/224] add new :mkvimperatorrc command

---
 NEWS                |  3 ++-
 content/commands.js | 51 +++++++++++++++++++++++++++++++++++++++++++++
 content/mappings.js | 15 +++++++++----
 3 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 8ad8eba9..4db4ae28 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.3
+	* added new :mkvimperatorc command
 	* remove :redraw and Ctrl-L commands as they rely on FF3 features
 	* :ls, :history and :bmarks output is now hyperlinked
 	* new gb and gB mappings to repeat the last :buffer[!] command,
@@ -33,7 +34,7 @@
 	* added 'visualbellstyle' for styling/hiding the visual bell
 	* merge the existing status bar with the standard FF status bar so that
 	  security information and extension buttons are included
-  	* :buffer partial_string works now as in vim, and with ! even better
+	* :buffer partial_string works now as in vim, and with ! even better
 	* new :time command for profiling
 	* added new :sidebar and :sbclose commands
 	* added 'more' and standard more-prompt key mappings to control
diff --git a/content/commands.js b/content/commands.js
index 0fd7c8d3..e6b2f7ab 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -883,6 +883,57 @@ function Commands() //{{{
             help: "If <code class=\"argument\">[arg]</code> is specified then limit the list to those marks mentioned."
         }
     ));
+    addDefaultCommand(new Command(["mkv[imperatorrc]"],
+        function(args, special)
+        {   
+            var filename;
+            
+            // TODO: "E172: Only one file name allowed"
+            if (args)
+                filename = args;
+            else
+                filename = vimperator.io.expandPath(navigator.platform == "Win32" ? "~/_vimperatorrc" : "~/.vimperatorrc");
+            
+            var file = vimperator.io.getFile(filename);
+            if (file.exists() && !special)
+            {
+                vimperator.echoerr("E189: \".vimperatorrc\" exists (add ! to override)");
+                return
+            }
+
+            var line = "\" " + vimperator.version + "\n";
+
+            // TODO: write user maps for all modes when we have mode dependant map support
+            for (var map in vimperator.mappings.getUserIterator(vimperator.modes.NORMAL))
+            {
+                for (var i = 0; i < map.names.length; i++)
+                    line += "map " + map.names[i] + " " + map.rhs + "\n";
+            }
+
+            for (var option in vimperator.options)
+            {   
+                // TODO: options should be queried for this info
+                if (!/fullscreen|usermode/.test(option.name) && option.value != option.default_value)
+                {
+                    if (option.type == "boolean")
+                        line += "set " + (option.value ? option.name : "no" + option.name) + "\n";
+                    else
+                        line += "set " + option.name + "=" + option.value + "\n";
+                }
+            }
+
+            line += "\" vim: set ft=vimperator:";
+
+            vimperator.io.writeFile(file, line);
+        },
+        {   
+            usage: ["mkv[imperatorrc] [file]"],
+            short_help: "Write current keymappings and changed options to [file]",
+            help: "If no <code class=\"argument\">[file]</code> is specified then ~/.vimperatorrc is written unless this file already exists. " +
+                  "The special version will overwrite <code class=\"argument\">[file]</code> if it exists.<br/>" +
+                  "WARNING: this differs from Vim's behaviour which defaults to writing the file in the current directory."
+        }
+    ));
     addDefaultCommand(new Command(["noh[lsearch]"],
         function(args)
         {
diff --git a/content/mappings.js b/content/mappings.js
index 90368d80..dabb58de 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -156,9 +156,9 @@ function Mappings() //{{{
         }
     }
 
-    function mappingsIterator(mode)
+    function mappingsIterator(mode, stack)
     {
-        var mappings = main[mode];
+        var mappings = stack[mode];
 
         //// FIXME: do we want to document user commands by default?
         //mappings = user[mode].concat(main[mode]);
@@ -182,12 +182,19 @@ function Mappings() //{{{
     // NOTE: just normal mode for now
     this.__iterator__ = function()
     {
-        return mappingsIterator(vimperator.modes.NORMAL);
+        return mappingsIterator(vimperator.modes.NORMAL, main);
     }
 
+    // FIXME
     this.getIterator = function(mode)
     {
-        return mappingsIterator(mode);
+        return mappingsIterator(mode, main);
+    }
+
+    // FIXME
+    this.getUserIterator = function(mode)
+    {
+        return mappingsIterator(mode, user);
     }
 
     this.hasMap = function(mode, cmd)

From 64e462e6d72b86d744e79944fa2851fff4c43129 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 22 Oct 2007 03:35:30 +0000
Subject: [PATCH 158/224] don't store options as preferences anymore

---
 NEWS               |  1 +
 content/options.js | 39 +++++++++++++++++++++++++++------------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/NEWS b/NEWS
index 4db4ae28..1ccc1aea 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.3
+	* options are no longer stored in preferences - use the RC file instead
 	* added new :mkvimperatorc command
 	* remove :redraw and Ctrl-L commands as they rely on FF3 features
 	* :ls, :history and :bmarks output is now hyperlinked
diff --git a/content/options.js b/content/options.js
index 0a4b31af..e2be66e7 100644
--- a/content/options.js
+++ b/content/options.js
@@ -31,14 +31,13 @@ function Option(names, type, extra_info) //{{{
     if (!names || !type)
         return null;
 
+    var value = null;
+
     this.name = names[0];
     this.names = names;
     this.usage = this.names;
     this.type = type;
 
-    this.setter = function(value) { Options.setPref(this.name, value); };
-    this.getter = function() { return Options.getPref(this.name); };
-
     if (extra_info)
     {
         if (extra_info.usage)
@@ -53,6 +52,8 @@ function Option(names, type, extra_info) //{{{
         else
             this.default_value = null;
 
+        value = this.default_value;
+
         if (extra_info.setter)
             this.setter = extra_info.setter;
         if (extra_info.getter)
@@ -75,8 +76,22 @@ function Option(names, type, extra_info) //{{{
     }
 
     // NOTE: forced defaults need to use Options.getPref
-    Option.prototype.__defineGetter__("value", function() { return this.getter.call(this); });
-    Option.prototype.__defineSetter__("value", function(value) { this.setter.call(this, value); });
+    this.__defineGetter__("value",
+        function()
+        {
+            if (this.getter)
+                this.getter.call(this);
+            return value;
+        }
+    );
+    this.__defineSetter__("value",
+        function(new_value)
+        {
+            value = new_value;
+            if (this.setter)
+                this.setter.call(this, value);
+        }
+    );
 
     // TODO: add is[Type]() queries for use in set()?
     //     : add isValid() or just throw an exception?
@@ -445,7 +460,7 @@ function Options() //{{{
                   "<li><b>T</b>: toolbar</li>" +
                   "<li><b>b</b>: bookmark bar</li>" +
                   "</ul>",
-            setter: function(value) { Options.setPref("guioptions", value); setGuiOptions(value); },
+            setter: function(value) { setGuiOptions(value); },
             default_value: "",
             validator: function (value) { if (/[^mTb]/.test(value)) return false; else return true; }
         }
@@ -472,7 +487,7 @@ function Options() //{{{
     addOption(new Option(["hlsearch", "hls"], "boolean",
         {
             short_help: "Highlight previous search pattern matches",
-            setter: function(value) { Options.setPref("hlsearch", value); if (value) vimperator.search.highlight(); else vimperator.search.clear(); },
+            setter: function(value) { if (value) vimperator.search.highlight(); else vimperator.search.clear(); },
             default_value: false
         }
     ));
@@ -507,7 +522,7 @@ function Options() //{{{
                   "</ul>" +
                   "NOTE: laststatus=1 not implemented yet.",
             default_value: 2,
-            setter: function(value) { Options.setPref("laststatus", value); setStatusLine(value); },
+            setter: function(value) { setStatusLine(value); },
             validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
         }
     ));
@@ -545,7 +560,7 @@ function Options() //{{{
                   "</ul>" +
                   "NOTE: This option does not change the popup blocker of Firefox in any way.",
             default_value: 1,
-            setter: function(value) { Options.setPref("popups", value); setPopups(value); },
+            setter: function(value) { setPopups(value); },
             validator: function (value) { if (value >= 0 && value <= 3) return true; else return false; }
         }
     ));
@@ -606,7 +621,7 @@ function Options() //{{{
                   "<li><b>1</b>: Show tab bar only if more than one tab is open</li>" +
                   "<li><b>2</b>: Always show tab bar</li>" +
                   "</ul>",
-            setter: function(value) { Options.setPref("showtabline", value); setShowTabline(value); },
+            setter: function(value) { setShowTabline(value); },
             default_value: 2,
             validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
         }
@@ -624,7 +639,7 @@ function Options() //{{{
             help: "Vimperator changes the browser title from \"Title of web page - Mozilla Firefox\" to " +
                   "\"Title of web page - Vimperator\".<br/>If you don't like that, you can restore it with: " +
                   "<code class=\"command\">:set titlestring=Mozilla Firefox</code>.",
-            setter: function(value) { Options.setPref("titlestring", value); setTitleString(value); },
+            setter: function(value) { setTitleString(value); },
             default_value: "Vimperator"
         }
     ));
@@ -649,7 +664,7 @@ function Options() //{{{
     addOption(new Option(["visualbell", "vb"], "boolean",
         {
             short_help: "Use visual bell instead of beeping on errors",
-            setter: function(value) { Options.setPref("visualbell", value); Options.setFirefoxPref("accessibility.typeaheadfind.enablesound", !value); },
+            setter: function(value) { Options.setFirefoxPref("accessibility.typeaheadfind.enablesound", !value); },
             default_value: false
         }
     ));

From 4caa2a262fee80ea8982f93fa11b673c74ace9e4 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 22 Oct 2007 03:37:02 +0000
Subject: [PATCH 159/224] add :mkvimperatorrc to RC file highlighter

---
 vimperator.vim | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/vimperator.vim b/vimperator.vim
index b2fb3c5e..bbb4920b 100644
--- a/vimperator.vim
+++ b/vimperator.vim
@@ -20,11 +20,11 @@ syn region vimperatorString  start="\z(["']\)" end="\z1" skip="\\\\\|\\\z1" onel
 
 syn keyword vimperatorCommand addo[ns] b[uffer] ba[ck] bd[elete] beep bma[rk] bmarks buffers bun[load] bw[ipeout] delbm[arks]
 	\ delm[arks] delqm[arks] dl downl[oads] e[dit] ec[ho] echoe[rr] exe[cute] exu[sage] files fo[rward] fw h[elp] ha[rdcopy]
-	\ hist[ory] hs javas[cript] js ls ma[rk] map mapc[lear] marks no[remap] noh[lsearch] norm[al] o[pen] pc[lose]
-	\ let pref[erences] prefs q[uit] qa[ll] qma[rk] qmarks quita[ll] re[load] reloada[ll] res[tart] sav[eas] sideb[ar] sb[ar]
-	\ sbcl[ose] sb[open] se[t] so[urce] st[op] time tN[ext] t[open] tab tabN[ext] tabc[lose] tabe[dit] tabfir[st] tabl[ast]
-	\ tabm[ove] tabn[ext] tabnew tabo[nly] tabopen tabp[revious] tabr[ewind] tabs tn[ext] tp[revious] u[ndo] unl[et] unm[ap]
-	\ ve[rsion] viu[sage] w[rite] win[open] wine[dit] wo[pen] wq wqa[ll] xa[ll] zo[om] run
+	\ hist[ory] hs javas[cript] js ls ma[rk] map mapc[lear] marks mkv[imperatorrc] no[remap] noh[lsearch] norm[al] o[pen]
+	\ pc[lose] let pref[erences] prefs q[uit] qa[ll] qma[rk] qmarks quita[ll] re[load] reloada[ll] res[tart] sav[eas]
+	\ sideb[ar] sb[ar] sbcl[ose] sb[open] se[t] so[urce] st[op] time tN[ext] t[open] tab tabN[ext] tabc[lose] tabe[dit]
+	\ tabfir[st] tabl[ast] tabm[ove] tabn[ext] tabnew tabo[nly] tabopen tabp[revious] tabr[ewind] tabs tn[ext] tp[revious]
+	\ u[ndo] unl[et] unm[ap] ve[rsion] viu[sage] w[rite] win[open] wine[dit] wo[pen] wq wqa[ll] xa[ll] zo[om] run
 	\ contained
 
 syn match vimperatorCommand "!" contained

From 25b9bcbc337fd6a5adbfe61aad6945356cc7f5a9 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 22 Oct 2007 03:38:05 +0000
Subject: [PATCH 160/224] reduced timeout of asynchronous vimperatorrc loading

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

diff --git a/content/vimperator.js b/content/vimperator.js
index 1f51caea..e13b2b39 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -773,7 +773,7 @@ const vimperator = (function() //{{{
                     // thrown if directory does not exist
                     //vimperator.log("Error sourcing plugin directory: " + e);
                 }
-            }, 50);
+            }, 0);
 
             vimperator.statusline.update();
             vimperator.log("Vimperator fully initialized", 1);

From 55c8cb6ec563495e8719c22eb04a0594ede2c91a Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 22 Oct 2007 03:47:19 +0000
Subject: [PATCH 161/224] merge relocation of
 Options.{setPref,getPref,setFirefoxPref,getFirefoxPref} to slots of
 vimperator.options

---
 content/bookmarks.js  |  4 ++--
 content/options.js    | 14 +++++++-------
 content/ui.js         |  8 ++++----
 content/vimperator.js | 10 +++++-----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/content/bookmarks.js b/content/bookmarks.js
index 0319e532..23eb7a06 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -781,7 +781,7 @@ function QuickMarks() //{{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     var qmarks = {};
-    var saved_marks = Options.getPref("quickmarks", "").split("\n");
+    var saved_marks = vimperator.options.getPref("quickmarks", "").split("\n");
 
     // load the saved quickmarks -- TODO: change to sqlite
     for (var i = 0; i < saved_marks.length - 1; i += 2)
@@ -875,7 +875,7 @@ function QuickMarks() //{{{
             saved_qmarks += qmarks[i] + "\n";
         }
 
-        Options.setPref("quickmarks", saved_qmarks);
+        vimperator.options.setPref("quickmarks", saved_qmarks);
     }
     //}}}
 } //}}}
diff --git a/content/options.js b/content/options.js
index e2be66e7..1e76fa63 100644
--- a/content/options.js
+++ b/content/options.js
@@ -75,7 +75,7 @@ function Option(names, type, extra_info) //{{{
         }
     }
 
-    // NOTE: forced defaults need to use Options.getPref
+    // NOTE: forced defaults need to use vimperator.options.getPref
     this.__defineGetter__("value",
         function()
         {
@@ -363,22 +363,22 @@ function Options() //{{{
 
     // TODO: separate Preferences from Options? Would these utility functions
     // be better placed in the 'core' vimperator namespace somewhere?
-    Options.setPref = function(name, value)
+    this.setPref = function(name, value)
     {
         return storePreference(name, value, true);
     }
 
-    Options.getPref = function(name, forced_default)
+    this.getPref = function(name, forced_default)
     {
         return loadPreference(name, forced_default, true);
     }
 
-    Options.setFirefoxPref = function(name, value)
+    this.setFirefoxPref = function(name, value)
     {
         return storePreference(name, value);
     }
 
-    Options.getFirefoxPref = function(name, forced_default)
+    this.getFirefoxPref = function(name, forced_default)
     {
         return loadPreference(name, forced_default);
     }
@@ -664,7 +664,7 @@ function Options() //{{{
     addOption(new Option(["visualbell", "vb"], "boolean",
         {
             short_help: "Use visual bell instead of beeping on errors",
-            setter: function(value) { Options.setFirefoxPref("accessibility.typeaheadfind.enablesound", !value); },
+            setter: function(value) { vimperator.options.setFirefoxPref("accessibility.typeaheadfind.enablesound", !value); },
             default_value: false
         }
     ));
@@ -672,7 +672,7 @@ function Options() //{{{
         {
             short_help: "CSS specification of the visual bell",
             help: "To hide the visual bell use a value of \"display: none;\" or unset it with <code class=\"command\">:set t_vb=</code>",
-            setter: function(value) { if (!value) value = "display: none;"; Options.setPref("visualbellstyle", value); },
+            setter: function(value) { if (!value) value = "display: none;"; },
             default_value: "background-color: black; color: black;"
         }
     ));
diff --git a/content/ui.js b/content/ui.js
index 9504be97..346a24f7 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -57,14 +57,14 @@ function CommandLine() //{{{
 
         load: function()
         {
-            this.cmd = Options.getPref("commandline_cmd_history", "").split("\n");
-            this.search = Options.getPref("commandline_search_history", "").split("\n");
+            this.cmd = vimperator.options.getPref("commandline_cmd_history", "").split("\n");
+            this.search = vimperator.options.getPref("commandline_search_history", "").split("\n");
         },
 
         save: function()
         {
-            Options.setPref("commandline_cmd_history", this.cmd.join("\n"));
-            Options.setPref("commandline_search_history", this.search.join("\n"));
+            vimperator.options.setPref("commandline_cmd_history", this.cmd.join("\n"));
+            vimperator.options.setPref("commandline_search_history", this.search.join("\n"));
         },
 
         add: function(str)
diff --git a/content/vimperator.js b/content/vimperator.js
index e13b2b39..282c7135 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -401,7 +401,7 @@ const vimperator = (function() //{{{
         // if msg is an object, it is beautified
         log: function(msg, level)
         {
-            //if (Options.getPref("verbose") >= level) // FIXME: hangs vimperator, probably timing issue --mst
+            //if (vimperator.options.getPref("verbose") >= level) // FIXME: hangs vimperator, probably timing issue --mst
             if (typeof msg == "object")
                 msg = this.objectToString(msg, false);
 
@@ -481,9 +481,9 @@ const vimperator = (function() //{{{
         quit: function(save_session)
         {
             if (save_session)
-                Options.setFirefoxPref("browser.startup.page", 3); // start with saved session
+                vimperator.options.setFirefoxPref("browser.startup.page", 3); // start with saved session
             else
-                Options.setFirefoxPref("browser.startup.page", 1); // start with default homepage session
+                vimperator.options.setFirefoxPref("browser.startup.page", 1); // start with default homepage session
 
             goQuitApplication();
         },
@@ -727,11 +727,11 @@ const vimperator = (function() //{{{
             vimperator.registerCallback("complete", vimperator.modes.EX, function(str) { return vimperator.completion.exTabCompletion(str); } );
 
             // first time intro message
-            if (Options.getPref("firsttime", true))
+            if (vimperator.options.getPref("firsttime", true))
             {
                 setTimeout(function() {
                     vimperator.help(null, null, null, { inTab: true });
-                    Options.setPref("firsttime", false);
+                    vimperator.options.setPref("firsttime", false);
                 }, 1000);
             }
 

From 160035e9eebb1e5c4e09bf25f8f72f8fd346e13e Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 22 Oct 2007 06:09:16 +0000
Subject: [PATCH 162/224] merge moving global constructor functions to the
 vimperator namespace

---
 content/bookmarks.js  |  10 +--
 content/buffers.js    |   2 +-
 content/commands.js   | 154 +++++++++++++++----------------
 content/completion.js |   4 +-
 content/events.js     |   2 +-
 content/find.js       |   2 +-
 content/hints.js      |   2 +-
 content/io.js         |   6 +-
 content/mappings.js   | 204 +++++++++++++++++++++---------------------
 content/options.js    |  88 +++++++++---------
 content/tabs.js       |   2 +-
 content/ui.js         |   8 +-
 content/vimperator.js |  34 +++----
 13 files changed, 260 insertions(+), 258 deletions(-)

diff --git a/content/bookmarks.js b/content/bookmarks.js
index 23eb7a06..20116991 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -27,7 +27,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
 // also includes methods for dealing with keywords and search engines
-function Bookmarks() //{{{
+vimperator.Bookmarks = function() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -290,7 +290,7 @@ function Bookmarks() //{{{
     //  res.title is the title or "" if no one was given
     //  res.url is the url as a string
     //  returns null, if parsing failed
-    Bookmarks.parseBookmarkString = function(str)
+    this.parseBookmarkString = function(str)
     {
         var res = {};
         res.tags = [];
@@ -356,7 +356,7 @@ function Bookmarks() //{{{
     //}}}
 } //}}}
 
-function History() //{{{
+vimperator.History = function() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -519,7 +519,7 @@ function History() //{{{
     //}}}
 } //}}}
 
-function Marks() //{{{
+vimperator.Marks = function() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -774,7 +774,7 @@ function Marks() //{{{
     //}}}
 } //}}}
 
-function QuickMarks() //{{{
+vimperator.QuickMarks = function() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
diff --git a/content/buffers.js b/content/buffers.js
index 3a51251c..8e7389a7 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-function Buffer() //{{{
+vimperator.Buffer = function() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
diff --git a/content/commands.js b/content/commands.js
index e6b2f7ab..adcd7ba2 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-function Command(specs, action, extra_info) //{{{
+vimperator.Command = function(specs, action, extra_info) //{{{
 {
     if (!specs || !action)
         return null;
@@ -89,14 +89,14 @@ function Command(specs, action, extra_info) //{{{
 
 }
 
-Command.prototype.execute = function(args, special, count, modifiers)
+vimperator.Command.prototype.execute = function(args, special, count, modifiers)
 {
     this.action.call(this, args, special, count, modifiers);
 }
 
 // return true if the candidate name matches one of the command's aliases
 // (including all acceptable abbreviations)
-Command.prototype.hasName = function(name)
+vimperator.Command.prototype.hasName = function(name)
 {
     // match a candidate name against a command name abbreviation spec - returning
     // true if the candidate matches unambiguously
@@ -122,7 +122,7 @@ Command.prototype.hasName = function(name)
 }
 //}}}
 
-function Commands() //{{{
+vimperator.Commands = function() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -134,7 +134,7 @@ function Commands() //{{{
     function addDefaultCommand(command)
     {
         ex_commands.push(command);
-        Commands.prototype[command.name] = function(args, special, count, modifiers)
+        vimperator.Commands.prototype[command.name] = function(args, special, count, modifiers)
         {
             command.execute(args, special, count, modifiers);
         }
@@ -227,14 +227,14 @@ function Commands() //{{{
     ////////////////////// DEFAULT COMMANDS ////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    addDefaultCommand(new Command(["addo[ns]"],
+    addDefaultCommand(new vimperator.Command(["addo[ns]"],
         function() { vimperator.open("chrome://mozapps/content/extensions/extensions.xul", vimperator.NEW_TAB); },
         {
             short_help: "Show available Browser Extensions and Themes",
             help: "You can add/remove/disable browser extensions from this dialog.<br/>Be aware that not all Firefox extensions work, because Vimperator overrides some keybindings and changes Firefox's GUI."
         }
     ));
-    addDefaultCommand(new Command(["ba[ck]"],
+    addDefaultCommand(new vimperator.Command(["ba[ck]"],
         function(args, special, count)
         {
             if (special)
@@ -277,7 +277,7 @@ function Commands() //{{{
             }
         }
     ));
-    addDefaultCommand(new Command(["bd[elete]", "bw[ipeout]", "bun[load]", "tabc[lose]"],
+    addDefaultCommand(new vimperator.Command(["bd[elete]", "bw[ipeout]", "bun[load]", "tabc[lose]"],
         function(args, special, count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count, special, 0); },
         {
             usage: ["[count]bd[elete][!]"],
@@ -286,18 +286,18 @@ function Commands() //{{{
                   "Do <code class=\"command\">:bdelete!</code> to select the tab to the left after removing the current tab."
         }
     ));
-    addDefaultCommand(new Command(["beep"],
+    addDefaultCommand(new vimperator.Command(["beep"],
         function() { vimperator.beep(); },
         {
             short_help: "Play a system beep"
         }
     ));
-    addDefaultCommand(new Command(["bma[rk]"],
+    addDefaultCommand(new vimperator.Command(["bma[rk]"],
         // takes: -t "foo" myurl
         // converts that string to a useful url and title, and calls addBookmark
         function(args)
         {
-            var result = Bookmarks.parseBookmarkString(args);
+            var result = vimperator.bookmarks.parseBookmarkString(args);
 
             if (result)
             {
@@ -333,7 +333,7 @@ function Commands() //{{{
                   "Tags WILL be some mechanism to classify bookmarks. Assume, you tag a URL with the tags \"linux\" and \"computer\" you'll be able to search for bookmarks containing these tags."
         }
     ));
-    addDefaultCommand(new Command(["bmarks"],
+    addDefaultCommand(new vimperator.Command(["bmarks"],
         function(args, special) { vimperator.bookmarks.list(args, special); },
         {
             usage: ["bmarks [filter]", "bmarks!"],
@@ -345,7 +345,7 @@ function Commands() //{{{
             completer: function(filter) { return vimperator.completion.get_bookmark_completions(filter); }
         }
     ));
-    addDefaultCommand(new Command(["b[uffer]"],
+    addDefaultCommand(new vimperator.Command(["b[uffer]"],
         function(args, special) { vimperator.buffer.switchTo(args, special); },
         {
             usage: ["b[uffer][!] {url|index}"],
@@ -358,7 +358,7 @@ function Commands() //{{{
             completer: function(filter) { return vimperator.completion.get_buffer_completions(filter); }
         }
     ));
-    addDefaultCommand(new Command(["buffers", "files", "ls", "tabs"],
+    addDefaultCommand(new vimperator.Command(["buffers", "files", "ls", "tabs"],
         function(args, special)
         {
             if (args)
@@ -376,10 +376,10 @@ function Commands() //{{{
                   "Call the special version of this command again to close the window."
         }
     ));
-    addDefaultCommand(new Command(["delbm[arks]"],
+    addDefaultCommand(new vimperator.Command(["delbm[arks]"],
         function(args, special)
         {
-            var result = Bookmarks.parseBookmarkString(args);
+            var result = vimperator.bookmarks.parseBookmarkString(args);
 
             if (result)
             {
@@ -404,7 +404,7 @@ function Commands() //{{{
             completer: function(filter) { return vimperator.completion.get_bookmark_completions(filter); }
         }
     ));
-    addDefaultCommand(new Command(["delm[arks]"],
+    addDefaultCommand(new vimperator.Command(["delm[arks]"],
         function(args, special)
         {
             if (!special && !args)
@@ -457,7 +457,7 @@ function Commands() //{{{
         }
 
     ));
-    addDefaultCommand(new Command(["delqm[arks]"],
+    addDefaultCommand(new vimperator.Command(["delqm[arks]"],
         function(args, special)
         {
             // TODO: finish arg parsing - we really need a proper way to do this. :)
@@ -486,7 +486,7 @@ function Commands() //{{{
                 "<code class=\"command\">:delqmarks!</code> deletes all QuickMarks"
         }
     ));
-    addDefaultCommand(new Command(["downl[oads]", "dl"],
+    addDefaultCommand(new vimperator.Command(["downl[oads]", "dl"],
         function() { vimperator.open("chrome://mozapps/content/downloads/downloads.xul", vimperator.NEW_TAB); },
         {
             short_help: "Show progress of current downloads",
@@ -522,7 +522,7 @@ function Commands() //{{{
 
         return arg;
     }
-    addDefaultCommand(new Command(["ec[ho]"],
+    addDefaultCommand(new vimperator.Command(["ec[ho]"],
         function(args)
         {
             var res = argToString(args, true);
@@ -538,7 +538,7 @@ function Commands() //{{{
             completer: function(filter) { return vimperator.completion.javascript(filter); }
         }
     ));
-    addDefaultCommand(new Command(["echoe[rr]"],
+    addDefaultCommand(new vimperator.Command(["echoe[rr]"],
         function(args)
         {
             var res = argToString(args, false);
@@ -552,7 +552,7 @@ function Commands() //{{{
             completer: function(filter) { return vimperator.completion.javascript(filter); }
         }
     ));
-    addDefaultCommand(new Command(["exe[cute]"],
+    addDefaultCommand(new vimperator.Command(["exe[cute]"],
         function(args) { vimperator.execute(args) },
         {
             usage: ["exe[cute] {expr1} [ ... ]"],
@@ -560,13 +560,13 @@ function Commands() //{{{
             help: "Example: <code class=\"command\">:execute echo test</code> shows a message with the text &#34;test&#34;.<br/>"
         }
     ));
-    addDefaultCommand(new Command(["exu[sage]"],
+    addDefaultCommand(new vimperator.Command(["exu[sage]"],
         function(args, special, count, modifiers) { vimperator.help("commands", special, null, modifiers); },
         {
             short_help: "Show help for Ex commands"
         }
     ));
-    addDefaultCommand(new Command(["fo[rward]", "fw"],
+    addDefaultCommand(new vimperator.Command(["fo[rward]", "fw"],
         function(args, special, count)
         {
             if (special)
@@ -609,14 +609,14 @@ function Commands() //{{{
             }
         }
     ));
-    addDefaultCommand(new Command(["ha[rdcopy]"],
+    addDefaultCommand(new vimperator.Command(["ha[rdcopy]"],
         function() { getBrowser().contentWindow.print(); },
         {
             short_help: "Print current document",
             help: "Open a GUI dialog where you can select the printer, number of copies, orientation, etc."
         }
     ));
-    addDefaultCommand(new Command(["h[elp]"],
+    addDefaultCommand(new vimperator.Command(["h[elp]"],
         function(args, special, count, modifiers) { vimperator.help(args, special, null, modifiers); },
         {
             usage: ["h[elp] {subject}"],
@@ -632,7 +632,7 @@ function Commands() //{{{
             completer: function(filter) { return vimperator.completion.get_help_completions(filter); }
         }
     ));
-    addDefaultCommand(new Command(["hist[ory]", "hs"],
+    addDefaultCommand(new vimperator.Command(["hist[ory]", "hs"],
         function(args, special) { vimperator.history.list(args, special); },
         {
             usage: ["hist[ory] [filter]", "history!"],
@@ -642,7 +642,7 @@ function Commands() //{{{
             completer: function(filter) { return vimperator.completion.get_history_completions(filter); }
         }
     ));
-    addDefaultCommand(new Command(["javas[cript]", "js"],
+    addDefaultCommand(new vimperator.Command(["javas[cript]", "js"],
         function(args, special)
         {
             if (special) // open javascript console
@@ -691,7 +691,7 @@ function Commands() //{{{
             completer: function(filter) { return vimperator.completion.javascript(filter); }
         }
     ));
-    addDefaultCommand(new Command(["let"],
+    addDefaultCommand(new vimperator.Command(["let"],
         function(args)
         {
             if (!args)
@@ -778,7 +778,7 @@ function Commands() //{{{
                   "Without arguments, displays a list of all variables."
         }
     ));
-    addDefaultCommand(new Command(["map"],
+    addDefaultCommand(new vimperator.Command(["map"],
         // 0 args -> list all maps
         // 1 arg  -> list the maps starting with args
         // 2 args -> map arg1 to arg*
@@ -804,7 +804,7 @@ function Commands() //{{{
 
             if (rhs)
             {
-                vimperator.mappings.add(new Map(vimperator.modes.NORMAL, [lhs],
+                vimperator.mappings.add(new vimperator.Map(vimperator.modes.NORMAL, [lhs],
                     function() { vimperator.events.feedkeys(rhs); }, { rhs: rhs }
                 ));
             }
@@ -821,7 +821,7 @@ function Commands() //{{{
                   "Mappings are NOT saved during sessions, make sure you put them in your vimperatorrc file!"
         }
     ));
-    addDefaultCommand(new Command(["mapc[lear]"],
+    addDefaultCommand(new vimperator.Command(["mapc[lear]"],
         function(args)
         {
             if (args)
@@ -838,7 +838,7 @@ function Commands() //{{{
                   "<code class=\"command\">:map</code> or <code class=\"command\">:noremap</code> are cleared."
         }
     ));
-    addDefaultCommand(new Command(["ma[rk]"],
+    addDefaultCommand(new vimperator.Command(["ma[rk]"],
         function(args)
         {
             if (!args)
@@ -864,7 +864,7 @@ function Commands() //{{{
             short_help: "Mark current location within the web page"
         }
     ));
-    addDefaultCommand(new Command(["marks"],
+    addDefaultCommand(new vimperator.Command(["marks"],
         function(args)
         {
             // ignore invalid mark characters unless there are no valid mark chars
@@ -883,7 +883,7 @@ function Commands() //{{{
             help: "If <code class=\"argument\">[arg]</code> is specified then limit the list to those marks mentioned."
         }
     ));
-    addDefaultCommand(new Command(["mkv[imperatorrc]"],
+    addDefaultCommand(new vimperator.Command(["mkv[imperatorrc]"],
         function(args, special)
         {   
             var filename;
@@ -934,7 +934,7 @@ function Commands() //{{{
                   "WARNING: this differs from Vim's behaviour which defaults to writing the file in the current directory."
         }
     ));
-    addDefaultCommand(new Command(["noh[lsearch]"],
+    addDefaultCommand(new vimperator.Command(["noh[lsearch]"],
         function(args)
         {
             vimperator.search.clear();
@@ -945,7 +945,7 @@ function Commands() //{{{
                   "<code class=\"option\">'hlsearch'</code> option is set."
         }
     ));
-    addDefaultCommand(new Command(["norm[al]"],
+    addDefaultCommand(new vimperator.Command(["norm[al]"],
         function(args)
         {
             if (!args)
@@ -963,7 +963,7 @@ function Commands() //{{{
         }
     ));
     // TODO: remove duplication in :map
-    addDefaultCommand(new Command(["no[remap]"],
+    addDefaultCommand(new vimperator.Command(["no[remap]"],
         // 0 args -> list all maps
         // 1 arg  -> list the maps starting with args
         // 2 args -> map arg1 to arg*
@@ -983,7 +983,7 @@ function Commands() //{{{
                 if (/^:/.test(rhs))
                 {
                     vimperator.mappings.add(
-                        new Map(vimperator.modes.NORMAL, [lhs], function() { vimperator.execute(rhs); }, { rhs: rhs })
+                        new vimperator.Map(vimperator.modes.NORMAL, [lhs], function() { vimperator.execute(rhs); }, { rhs: rhs })
                     );
                 }
                 else
@@ -991,14 +991,14 @@ function Commands() //{{{
                     // NOTE: we currently only allow one normal mode command in {rhs}
                     var map = vimperator.mappings.getDefaultMap(vimperator.modes.NORMAL, rhs);
 
-                    // create a new Map for {lhs} with the same action as
+                    // create a Map for {lhs} with the same action as
                     // {rhs}...until we have feedkeys().
                     // NOTE: Currently only really intended for static use (e.g.
                     // from the RC file) since {rhs} is evaluated when the map
                     // is created not at runtime
                     if (map)
                         vimperator.mappings.add(
-                            new Map(vimperator.modes.NORMAL, [lhs], map.action, { flags: map.flags, rhs: rhs })
+                            new vimperator.Map(vimperator.modes.NORMAL, [lhs], map.action, { flags: map.flags, rhs: rhs })
                         );
                     else
                         vimperator.echoerr("E475: Invalid argument: " + "{rhs} must be a existing singular mapping");
@@ -1016,7 +1016,7 @@ function Commands() //{{{
             help: "No remapping of the <code class=\"argument\">{rhs}</code> is performed.<br/>NOTE: :noremap does not yet work as reliably as :map."
         }
     ));
-    addDefaultCommand(new Command(["o[pen]", "e[dit]"],
+    addDefaultCommand(new vimperator.Command(["o[pen]", "e[dit]"],
         function(args, special)
         {
             if (args)
@@ -1059,13 +1059,13 @@ function Commands() //{{{
             completer: function(filter) { return vimperator.completion.get_url_completions(filter); }
         }
     ));
-    addDefaultCommand(new Command(["pc[lose]"],
+    addDefaultCommand(new vimperator.Command(["pc[lose]"],
         function() { vimperator.previewwindow.hide(); },
         {
             short_help: "Close preview window on bottom of screen"
         }
     ));
-    addDefaultCommand(new Command(["pref[erences]", "prefs"],
+    addDefaultCommand(new vimperator.Command(["pref[erences]", "prefs"],
         function(args, special, count, modifiers)
         {
             if (!args)
@@ -1097,7 +1097,7 @@ function Commands() //{{{
                   "<code class=\"command\">:prefs!</code> opens about:config in the current tab where you can change advanced Firefox preferences."
         }
     ));
-    addDefaultCommand(new Command(["qma[rk]"],
+    addDefaultCommand(new vimperator.Command(["qma[rk]"],
         function(args)
         {
             if (!args)
@@ -1123,7 +1123,7 @@ function Commands() //{{{
                   "<code class=\"command\">:qmark f http://forum1.com, http://forum2.com, imdb some artist</code>"
         }
     ));
-    addDefaultCommand(new Command(["qmarks"],
+    addDefaultCommand(new vimperator.Command(["qmarks"],
         function(args)
         {
             // ignore invalid mark characters unless there are no valid mark chars
@@ -1142,7 +1142,7 @@ function Commands() //{{{
             help: "If <code class=\"argument\">[arg]</code> is specified then limit the list to those QuickMarks mentioned."
         }
     ));
-    addDefaultCommand(new Command(["q[uit]"],
+    addDefaultCommand(new vimperator.Command(["q[uit]"],
         function() { vimperator.tabs.remove(getBrowser().mCurrentTab, 1, false, 1); },
         {
             short_help: "Quit current tab",
@@ -1150,14 +1150,14 @@ function Commands() //{{{
                   "last window, close Vimperator. When quitting Vimperator, the session is not stored."
         }
     ));
-    addDefaultCommand(new Command(["quita[ll]", "qa[ll]"],
+    addDefaultCommand(new vimperator.Command(["quita[ll]", "qa[ll]"],
         function() { vimperator.quit(false); },
         {
             short_help: "Quit Vimperator",
             help: "Quit Vimperator, no matter how many tabs/windows are open. The session is not stored."
         }
     ));
-    addDefaultCommand(new Command(["re[load]"],
+    addDefaultCommand(new vimperator.Command(["re[load]"],
         function(args, special) { vimperator.tabs.reload(getBrowser().mCurrentTab, special); },
         {
             usage: ["re[load][!]"],
@@ -1165,7 +1165,7 @@ function Commands() //{{{
             help: "Forces reloading of the current page. If <code class=\"command\">!</code> is given, skip the cache."
         }
     ));
-    addDefaultCommand(new Command(["reloada[ll]"],
+    addDefaultCommand(new vimperator.Command(["reloada[ll]"],
         function(args, special) { vimperator.tabs.reloadAll(special); },
         {
             usage: ["reloada[ll][!]"],
@@ -1173,14 +1173,14 @@ function Commands() //{{{
             help: "Forces reloading of all pages. If <code class=\"command\">!</code> is given, skip the cache."
         }
     ));
-    addDefaultCommand(new Command(["res[tart]"],
+    addDefaultCommand(new vimperator.Command(["res[tart]"],
         function() { vimperator.restart(); },
         {
             short_help: "Force the browser to restart",
             help: "Useful when installing extensions."
         }
     ));
-    addDefaultCommand(new Command(["sav[eas]", "w[rite]"],
+    addDefaultCommand(new vimperator.Command(["sav[eas]", "w[rite]"],
         function() { saveDocument(window.content.document); },
         {
             short_help: "Save current web page to disk",
@@ -1188,7 +1188,7 @@ function Commands() //{{{
                   "There, you can save the current web page to disk with various options."
         }
     ));
-    addDefaultCommand(new Command(["se[t]"],
+    addDefaultCommand(new vimperator.Command(["se[t]"],
         function(args, special, count, modifiers)
         {
             if (special)
@@ -1353,7 +1353,7 @@ function Commands() //{{{
         }
     ));
     // TODO: sclose instead?
-    addDefaultCommand(new Command(["sbcl[ose]"],
+    addDefaultCommand(new vimperator.Command(["sbcl[ose]"],
         function(args)
         {
             if (args)
@@ -1371,7 +1371,7 @@ function Commands() //{{{
     ));
     // TODO: sopen instead? Separate :sidebar from :sbopen and make them behave
     // more like :cw, :cope etc
-    addDefaultCommand(new Command(["sideb[ar]", "sb[ar]", "sbope[n]"],
+    addDefaultCommand(new vimperator.Command(["sideb[ar]", "sb[ar]", "sbope[n]"],
         function(args)
         {
             if (!args)
@@ -1403,7 +1403,7 @@ function Commands() //{{{
             completer: function(filter) { return vimperator.completion.get_sidebar_completions(filter); }
         }
     ));
-    addDefaultCommand(new Command(["so[urce]"],
+    addDefaultCommand(new vimperator.Command(["so[urce]"],
         function(args)
         {
             // FIXME: implement proper filename quoting
@@ -1430,14 +1430,14 @@ function Commands() //{{{
             completer: function(filter) { return vimperator.completion.get_file_completions(filter); }
         }
     ));
-    addDefaultCommand(new Command(["st[op]"],
+    addDefaultCommand(new vimperator.Command(["st[op]"],
         BrowserStop,
         {
             short_help: "Stop loading",
             help: "Stop loading current web page."
         }
     ));
-    addDefaultCommand(new Command(["tab"],
+    addDefaultCommand(new vimperator.Command(["tab"],
         function(args) { vimperator.execute(args, { inTab: true }); },
         {
             usage: ["tab {cmd}"],
@@ -1448,13 +1448,13 @@ function Commands() //{{{
             completer: function(filter) { return vimperator.completion.get_command_completions(filter); }
         }
     ));
-    addDefaultCommand(new Command(["tabl[ast]"],
+    addDefaultCommand(new vimperator.Command(["tabl[ast]"],
         function() { vimperator.tabs.select("$", false); },
         {
             short_help: "Switch to the last tab"
         }
     ));
-    addDefaultCommand(new Command(["tabm[ove]"],
+    addDefaultCommand(new vimperator.Command(["tabm[ove]"],
         function(args, special) { vimperator.tabs.move(getBrowser().mCurrentTab, args, special); },
         {
             usage: ["tabm[ove] [N]", "tabm[ove][!] +N | -N"],
@@ -1463,20 +1463,20 @@ function Commands() //{{{
                   "N can also be prefixed with '+' or '-' to indicate a relative movement. If <code class=\"command\">!</code> is specified the movement wraps around the start or end of the tab list."
         }
     ));
-    addDefaultCommand(new Command(["tabn[ext]", "tn[ext]"],
+    addDefaultCommand(new vimperator.Command(["tabn[ext]", "tn[ext]"],
         function() { vimperator.tabs.select("+1", true); },
         {
             short_help: "Switch to the next tab",
             help: "Cycles to the first tab, when the last is selected."
         }
     ));
-    addDefaultCommand(new Command(["tabo[nly]"],
+    addDefaultCommand(new vimperator.Command(["tabo[nly]"],
         function() { vimperator.tabs.keepOnly(getBrowser().mCurrentTab); },
         {
             short_help: "Close all other tabs"
         }
     ));
-    addDefaultCommand(new Command(["tabopen", "t[open]", "tabnew", "tabe[dit]"],
+    addDefaultCommand(new vimperator.Command(["tabopen", "t[open]", "tabnew", "tabe[dit]"],
         function(args, special)
         {
             var where = special ? vimperator.NEW_TAB : vimperator.NEW_BACKGROUND_TAB;
@@ -1496,7 +1496,7 @@ function Commands() //{{{
             completer: function(filter) { return vimperator.completion.get_url_completions(filter); }
         }
     ));
-    addDefaultCommand(new Command(["tabp[revious]", "tp[revious]", "tabN[ext]", "tN[ext]"],
+    addDefaultCommand(new vimperator.Command(["tabp[revious]", "tp[revious]", "tabN[ext]", "tN[ext]"],
         function() { vimperator.tabs.select("-1", true); },
         {
             usage: ["tabp[revious]", "tabN[ext]"],
@@ -1504,14 +1504,14 @@ function Commands() //{{{
             help: "Cycles to the last tab, when the first is selected."
         }
     ));
-    addDefaultCommand(new Command(["tabr[ewind]", "tabfir[st]"],
+    addDefaultCommand(new vimperator.Command(["tabr[ewind]", "tabfir[st]"],
         function() { vimperator.tabs.select(0, false); },
         {
             usage: ["tabr[ewind]", "tabfir[st]"],
             short_help: "Switch to the first tab"
         }
     ));
-    addDefaultCommand(new Command(["time"],
+    addDefaultCommand(new vimperator.Command(["time"],
         function(args, special, count)
         {
             if (!count || count < 1)
@@ -1596,7 +1596,7 @@ function Commands() //{{{
                   "Use the special version with [!] if you just want to run any command multiple times without showing profiling statistics."
         }
     ));
-    addDefaultCommand(new Command(["u[ndo]"],
+    addDefaultCommand(new vimperator.Command(["u[ndo]"],
         function(args, special, count)
         {
             if (count < 1)
@@ -1640,7 +1640,7 @@ function Commands() //{{{
             }
         }
     ));
-    addDefaultCommand(new Command(["undoa[ll]"],
+    addDefaultCommand(new vimperator.Command(["undoa[ll]"],
         function(args, special, count)
         {
             if (count || special)
@@ -1656,7 +1656,7 @@ function Commands() //{{{
             help: "Firefox stores up to 10 closed tabs, even after a browser restart."
         }
     )),
-    addDefaultCommand(new Command(["unl[et]"],
+    addDefaultCommand(new vimperator.Command(["unl[et]"],
         function(args, special)
         {
             if (!args)
@@ -1685,7 +1685,7 @@ function Commands() //{{{
                   "Several variable names can be given."
         }
     ));
-    addDefaultCommand(new Command(["unm[ap]"],
+    addDefaultCommand(new vimperator.Command(["unm[ap]"],
         function(args)
         {
             if (!args)
@@ -1707,7 +1707,7 @@ function Commands() //{{{
             help: ""
         }
     ));
-    addDefaultCommand(new Command(["ve[rsion]"],
+    addDefaultCommand(new vimperator.Command(["ve[rsion]"],
         function(args, special)
         {
             if (special)
@@ -1721,13 +1721,13 @@ function Commands() //{{{
             help: "You can show the Firefox version page with <code class=\"command\">:version!</code>."
         }
     ));
-    addDefaultCommand(new Command(["viu[sage]"],
+    addDefaultCommand(new vimperator.Command(["viu[sage]"],
         function(args, special, count, modifiers) { vimperator.help("mappings", special, null, modifiers); },
         {
             short_help: "Show help for normal mode commands"
         }
     ));
-    addDefaultCommand(new Command(["winc[lose]", "wc[lose]"],
+    addDefaultCommand(new vimperator.Command(["winc[lose]", "wc[lose]"],
         function(args)
         {
             window.close();
@@ -1737,7 +1737,7 @@ function Commands() //{{{
             short_help: "Close window",
         }
     ));
-    addDefaultCommand(new Command(["wino[pen]", "wo[pen]", "wine[dit]"],
+    addDefaultCommand(new vimperator.Command(["wino[pen]", "wo[pen]", "wine[dit]"],
         function(args)
         {
             if (args)
@@ -1751,7 +1751,7 @@ function Commands() //{{{
             help: "Like <code class=\"command\">:open</code> but open URLs in a new window.<br/>"
         }
     ));
-    addDefaultCommand(new Command(["wqa[ll]", "wq", "xa[ll]"],
+    addDefaultCommand(new vimperator.Command(["wqa[ll]", "wq", "xa[ll]"],
         function() { vimperator.quit(true); },
         {
             usage: ["wqa[ll]", "xa[ll]"],
@@ -1760,7 +1760,7 @@ function Commands() //{{{
                   "<code class=\"command\">:wq</code> is different as in Vim, as it closes the window instead of just one tab by popular demand. Complain on the mailing list, if you want to change that."
         }
     ));
-    addDefaultCommand(new Command(["zo[om]"],
+    addDefaultCommand(new vimperator.Command(["zo[om]"],
         function(args)
         {
             var level;
@@ -1805,7 +1805,7 @@ function Commands() //{{{
                   "Normally this command operates on the text zoom, if used with <code class=\"argument\">[!]</code> it operates on full zoom."
         }
     ));
-    addDefaultCommand(new Command(["!", "run"],
+    addDefaultCommand(new vimperator.Command(["!", "run"],
         function(args, special)
         {
             // :!! needs to be treated specially as the command parser sets the special flag but removes the ! from args
diff --git a/content/completion.js b/content/completion.js
index 2d64d8c8..5121594d 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.completion = (function() // {{{
+vimperator.Completion = function() // {{{
 {
     // The completion substrings, used for showing the longest common match
     var g_substrings = [];
@@ -591,6 +591,6 @@ vimperator.completion = (function() // {{{
         } //}}}
 
     }
-})(); // }}}
+} // }}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/events.js b/content/events.js
index 92e8d70d..d41a379e 100644
--- a/content/events.js
+++ b/content/events.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-function Events() //{{{
+vimperator.Events = function() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
diff --git a/content/find.js b/content/find.js
index d99a4d27..fa51bd8a 100644
--- a/content/find.js
+++ b/content/find.js
@@ -37,7 +37,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 //     : incremental searches shouldn't permanently update search modifiers
 
 // make sure you only create this object when the "vimperator" object is ready
-function Search() //{{{
+vimperator.Search = function() //{{{
 {
     var self = this;                   // needed for callbacks since "this" is the "vimperator" object in a callback
     var found = false;                 // true if the last search was successful
diff --git a/content/hints.js b/content/hints.js
index 6d68e4d8..7b514107 100644
--- a/content/hints.js
+++ b/content/hints.js
@@ -22,7 +22,7 @@
  *
 }}} ***** END LICENSE BLOCK *****/
 
-function Hints() //{{{
+vimperator.Hints = function() //{{{
 {
     const HINT_PREFIX = 'hah_hint_'; // prefix for the hint id
 
diff --git a/content/io.js b/content/io.js
index 84fe8118..b861652a 100644
--- a/content/io.js
+++ b/content/io.js
@@ -27,13 +27,11 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.io = (function() 
+vimperator.IO = function() 
 {
     var environment_service = Components.classes["@mozilla.org/process/environment;1"]
         .getService(Components.interfaces.nsIEnvironment);
 
-    vimperator.log("Loading vimperator.io");
-
     return {
 
         MODE_RDONLY: 0x01,
@@ -237,6 +235,6 @@ vimperator.io = (function()
             ofstream.close();
         }
     }
-})();
+}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/mappings.js b/content/mappings.js
index dabb58de..14291b21 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-function Map(mode, cmds, action, extra_info) //{{{
+vimperator.Map = function(mode, cmds, action, extra_info) //{{{
 {
     if (!mode || (!cmds || !cmds.length) || !action)
         return null;
@@ -65,7 +65,7 @@ function Map(mode, cmds, action, extra_info) //{{{
     }
 }
 
-Map.prototype.hasName = function(name)
+vimperator.Map.prototype.hasName = function(name)
 {
     for (var i = 0; i < this.names.length; i++)
     {
@@ -78,7 +78,7 @@ Map.prototype.hasName = function(name)
 
 // Since we will add many Map-objects, we add some functions as prototypes
 // this will ensure we only have one copy of each function, not one for each object
-Map.prototype.execute = function(motion, count, argument)
+vimperator.Map.prototype.execute = function(motion, count, argument)
 {
     var args = [];
     if (this.flags & Mappings.flags.MOTION)
@@ -301,21 +301,21 @@ function Mappings() //{{{
     // Normal mode
     // {{{
     // vimperator management
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["<F1>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<F1>"],
         function() { vimperator.help(null); },
         {
             short_help: "Open help window",
             help: "The default section is shown, if you need help for a specific topic, try <code class=\"command\">:help &lt;F1&gt;</code>."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, [":"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, [":"],
         function() { vimperator.commandline.open(":", "", vimperator.modes.EX); },
         {
             short_help: "Start command line mode",
             help: "In command line mode, you can perform extended commands, which may require arguments."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["I"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["I"],
         function() { vimperator.addMode(null, vimperator.modes.ESCAPE_ALL_KEYS); },
         {
             short_help: "Disable Vimperator keys",
@@ -325,7 +325,7 @@ function Mappings() //{{{
                   "in this mode to the web page, prepend it with <code class=\"mapping\">&lt;C-v&gt;</code>."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["<C-v>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-v>"],
         function() { vimperator.addMode(null, vimperator.modes.ESCAPE_ONE_KEY); },
         {
             short_help: "Escape next key",
@@ -334,14 +334,14 @@ function Mappings() //{{{
                   "When in 'ignorekeys' mode (activated by <code class=\"mapping\">&lt;I&gt;</code>), <code class=\"mapping\">&lt;C-v&gt;</code> will pass the next key to Vimperator instead of the web page."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["<C-c>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-c>"],
         BrowserStop,
         {
             short_help: "Stop loading",
             help: "Stops loading the current web page."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["<Nop>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<Nop>"],
         function() { return; },
         {
             short_help: "Do nothing",
@@ -349,7 +349,7 @@ function Mappings() //{{{
                   "<code class=\"command\">:map &lt;C-n&gt; &lt;Nop&gt;</code> will prevent <code class=\"mapping\">&lt;C-n&gt;</code> from doing anything."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["<Esc>", "<C-[>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<Esc>", "<C-[>"],
         vimperator.events.onEscape,
         {
             short_help: "Focus content",
@@ -358,7 +358,7 @@ function Mappings() //{{{
         }
     ));
 
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["]f"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["]f"],
         function(count) { vimperator.buffer.shiftFrameFocus(count > 1 ? count : 1, true); },
         {
             short_help: "Focus next frame",
@@ -366,7 +366,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["[f"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["[f"],
         function(count) { vimperator.buffer.shiftFrameFocus(count > 1 ? count : 1, false); },
         {
             short_help: "Focus previous frame",
@@ -374,14 +374,14 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["b"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["b"],
         function() { vimperator.commandline.open(":", "buffer! ", vimperator.modes.EX); },
         {
             short_help: "Open a prompt to switch buffers",
             help: "Typing the corresponding number switches to this buffer."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["B"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["B"],
         function() { vimperator.buffer.list(true); },
         {
             short_help: "Toggle buffer list",
@@ -389,7 +389,7 @@ function Mappings() //{{{
                   "WARNING: This mapping may be removed/changed in future."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["gb"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gb"],
         function(count) { vimperator.buffer.switchTo(null, null, count, false); },
         {
             short_help: "Repeat last :buffer[!] command",
@@ -397,7 +397,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["gB"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gB"],
         function(count) { vimperator.buffer.switchTo(null, null, count, true); },
         {
             short_help: "Repeat last :buffer[!] command in reverse direction",
@@ -405,7 +405,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["d"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["d"],
         function(count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count, false, 0); },
         {
             short_help: "Delete current buffer (=tab)",
@@ -414,7 +414,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["D"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["D"],
         function(count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count, true, 0); },
         {
             short_help: "Delete current buffer (=tab)",
@@ -423,14 +423,14 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["gh"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gh"],
         BrowserHome,
         {
             short_help: "Go home",
             help: "Opens the homepage in the current tab."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["gH"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gH"],
         function()
         {
             var homepages = gHomeButton.getHomePage();
@@ -443,7 +443,7 @@ function Mappings() //{{{
                   "Whether the new tab is activated or not depends on the <code class=\"option\">'activate'</code> option.<br/>"
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["go"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["go"],
         function(arg) { vimperator.quickmarks.jumpTo(arg, vimperator.CURRENT_TAB) },
         {
             short_help: "Jump to a QuickMark in the current tab",
@@ -453,7 +453,7 @@ function Mappings() //{{{
             flags: Mappings.flags.ARGUMENT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["gn"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gn"],
         function(arg)
         {
             vimperator.quickmarks.jumpTo(arg,
@@ -469,7 +469,7 @@ function Mappings() //{{{
             flags: Mappings.flags.ARGUMENT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["gP"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gP"],
         function()
         {
             vimperator.open(readFromClipboard(),
@@ -481,7 +481,7 @@ function Mappings() //{{{
             help: "Works like <code class=\"mapping\">P</code>, but inverts the <code class=\"option\">'activate'</code> option."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["gt", "<C-n>", "<C-Tab>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gt", "<C-n>", "<C-Tab>"],
         function(count) { vimperator.tabs.select(count > 0 ? count -1: "+1", count > 0 ? false : true); },
         {
             short_help: "Go to the next tab",
@@ -489,7 +489,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["gT", "<C-p>", "<C-S-Tab>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gT", "<C-p>", "<C-S-Tab>"],
         function(count) { vimperator.tabs.select(count > 0 ? count -1: "-1", count > 0 ? false : true); },
         {
             short_help: "Go to the previous tab",
@@ -497,7 +497,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ['<C-^>', '<C-6>'],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ['<C-^>', '<C-6>'],
         function()
         {
             if (vimperator.tabs.getTab() == vimperator.tabs.alternate)
@@ -524,7 +524,7 @@ function Mappings() //{{{
             help: "The alternate tab is the last selected tab. This provides a quick method of toggling between two tabs."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["m"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["m"],
         function(arg)
         {
             if (/[^a-zA-Z]/.test(arg))
@@ -542,7 +542,7 @@ function Mappings() //{{{
             flags: Mappings.flags.ARGUMENT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["'", "`"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["'", "`"],
         function(arg) { vimperator.marks.jumpTo(arg) },
         {
             short_help: "Jump to the mark in the current buffer",
@@ -551,7 +551,7 @@ function Mappings() //{{{
             flags: Mappings.flags.ARGUMENT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["M"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["M"],
         function(arg)
         {
             if (/[^a-zA-Z0-9]/.test(arg))
@@ -570,28 +570,28 @@ function Mappings() //{{{
             flags: Mappings.flags.ARGUMENT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["o"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["o"],
         function() { vimperator.commandline.open(":", "open ", vimperator.modes.EX); },
         {
             short_help: "Open one or more URLs in the current tab",
             help: "See <code class=\"command\">:open</code> for more details."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["O"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["O"],
         function() { vimperator.commandline.open(":", "open " + vimperator.buffer.URL, vimperator.modes.EX); },
         {
             short_help: "Open one or more URLs in the current tab, based on current location",
             help: "Works like <code class=\"mapping\">o</code>, but preselects current URL in the <code class=\"command\">:open</code> query."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["p", "<MiddleMouse>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["p", "<MiddleMouse>"],
         function() { vimperator.open(readFromClipboard()); },
         {
             short_help: "Open (put) a URL based on the current clipboard contents in the current buffer",
             help: "You can also just select (for non-X11 users: copy) some non-URL text, and search for it with the default search engine or keyword (specified by the <code class=\"option\">'defsearch'</code> option) with <code class=\"mapping\">p</code>."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["P"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["P"],
         function()
         {
             vimperator.open(readFromClipboard(),
@@ -604,21 +604,21 @@ function Mappings() //{{{
                   "Whether the new buffer is activated, depends on the <code class=\"option\">'activate'</code> option."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["r"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["r"],
         function() { vimperator.tabs.reload(getBrowser().mCurrentTab, false); },
         {
             short_help: "Reload",
             help: "Forces reloading of the current page."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["R"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["R"],
         function() { vimperator.tabs.reload(getBrowser().mCurrentTab, true); },
         {
             short_help: "Reload while skipping the cache",
             help: "Forces reloading of the current page skipping the cache."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["t"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["t"],
         function() { vimperator.commandline.open(":", "tabopen ", vimperator.modes.EX); },
         {
             short_help: "Open one or more URLs in a new tab",
@@ -626,14 +626,14 @@ function Mappings() //{{{
                   "See <code class=\"command\">:tabopen</code> for more details."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["T"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["T"],
         function() { vimperator.commandline.open(":", "tabopen " + vimperator.buffer.URL, vimperator.modes.EX); },
         {
             short_help: "Open one or more URLs in a new tab, based on current location",
             help: "Works like <code class=\"mapping\">t</code>, but preselects current URL in the <code class=\"command\">:tabopen</code> query."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["u"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["u"],
         function(count) { vimperator.commands.undo("", false, count); },
         {
             short_help: "Undo closing of a tab",
@@ -641,7 +641,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["y"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["y"],
         function()
         {
             var url = vimperator.buffer.URL;
@@ -653,7 +653,7 @@ function Mappings() //{{{
             help: "When running in X11 the location is also put into the selection, which can be pasted with the middle mouse button."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["Y"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["Y"],
         function()
         {
             var sel = window.content.document.getSelection();
@@ -664,35 +664,35 @@ function Mappings() //{{{
             help: "The currently selected text is copied to the system clipboard."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["zi", "+"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zi", "+"],
         function(count) { vimperator.buffer.zoomIn(count > 1 ? count : 1); },
         {
             short_help: "Zoom in current web page by 25%",
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["zI"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zI"],
         function(count) { vimperator.buffer.zoomIn((count > 1 ? count : 1) * 4); },
         {
             short_help: "Zoom in current web page by 100%",
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["zo", "-"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zo", "-"],
         function(count) { vimperator.buffer.zoomOut(count > 1 ? count : 1); },
         {
             short_help: "Zoom out current web page by 25%",
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["zO"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zO"],
         function(count) { vimperator.buffer.zoomOut((count > 1 ? count : 1) * 4); },
         {
             short_help: "Zoom out current web page by 100%",
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["zz"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zz"],
         function(count) { vimperator.buffer.textZoom = count > 1 ? count : 100; },
         {
             short_help: "Set zoom value of the web page",
@@ -700,14 +700,14 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["ZQ"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["ZQ"],
         function() { vimperator.quit(false); },
         {
             short_help: "Quit and don't save the session",
             help: "Works like <code class=\"command\">:qall</code>."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["ZZ"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["ZZ"],
         function() { vimperator.quit(true); },
         {
             short_help: "Quit and save the session",
@@ -717,20 +717,20 @@ function Mappings() //{{{
     ));
 
     // scrolling commands
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["0", "^"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["0", "^"],
         function() { vimperator.buffer.scrollStart(); },
         {
             short_help: "Scroll to the absolute left of the document",
             help: "Unlike in Vim, <code class=\"mapping\">0</code> and <code class=\"mapping\">^</code> work exactly the same way."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["$"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["$"],
         function() { vimperator.buffer.scrollEnd(); },
         {
             short_help: "Scroll to the absolute right of the document"
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["gg", "<Home>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gg", "<Home>"],
         function(count) { vimperator.buffer.scrollToPercentile(count >  0 ? count : 0); },
         {
             short_help: "Goto the top of the document",
@@ -738,7 +738,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["G", "<End>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["G", "<End>"],
         function(count) { vimperator.buffer.scrollToPercentile(count >= 0 ? count : 100); },
         {
             short_help: "Goto the end of the document",
@@ -746,7 +746,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["h", "<Left>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["h", "<Left>"],
         function(count) { vimperator.buffer.scrollColumns(-(count > 1 ? count : 1)); },
         {
             short_help: "Scroll document to the left",
@@ -755,7 +755,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["j", "<Down>", "<C-e>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["j", "<Down>", "<C-e>"],
         function(count) { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
         {
             short_help: "Scroll document down",
@@ -764,7 +764,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["k", "<Up>", "<C-y>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["k", "<Up>", "<C-y>"],
         function(count) { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
         {
             short_help: "Scroll document up",
@@ -789,7 +789,7 @@ function Mappings() //{{{
             win.scrollBy(0, vimperator.buffer.pageHeight / 2 * direction);
         }
     }
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["<C-d>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-d>"],
         function(count) { scrollByScrollSize(count, 1); },
         {
             short_help: "Scroll window downwards in the buffer",
@@ -798,7 +798,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["<C-u>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-u>"],
         function(count) { scrollByScrollSize(count, -1); },
         {
             short_help: "Scroll window upwards in the buffer",
@@ -807,7 +807,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["l", "<Right>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["l", "<Right>"],
         function(count) { vimperator.buffer.scrollColumns(count > 1 ? count : 1); },
         {
             short_help: "Scroll document to the right",
@@ -816,7 +816,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["<C-b>", "<PageUp>", "<S-Space>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-b>", "<PageUp>", "<S-Space>"],
         function(count) { vimperator.buffer.scrollPages(-(count > 1 ? count : 1)); },
         {
             short_help: "Scroll up a full page",
@@ -824,7 +824,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["<C-f>", "<PageDown>", "<Space>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-f>", "<PageDown>", "<Space>"],
         function(count) { vimperator.buffer.scrollPages(count > 1 ? count : 1); },
         {
             short_help: "Scroll down a full page",
@@ -834,7 +834,7 @@ function Mappings() //{{{
     ));
 
     // history manipulation and jumplist
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["<C-o>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-o>"],
         function(count) { vimperator.history.stepTo(-(count > 1 ? count : 1)); },
         {
             short_help: "Go to an older position in the jump list",
@@ -842,7 +842,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["<C-i>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-i>"],
         function(count) { vimperator.history.stepTo(count > 1 ? count : 1); },
         {
             short_help: "Go to a newer position in the jump list",
@@ -850,7 +850,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["H", "<A-Left>", "<M-Left>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["H", "<A-Left>", "<M-Left>"],
         function(count) { vimperator.history.stepTo(-(count > 1 ? count : 1)); },
         {
             short_help: "Go back in the browser history",
@@ -858,7 +858,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["L", "<A-Right>", "<M-Right>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["L", "<A-Right>", "<M-Right>"],
         function(count) { vimperator.history.stepTo(count > 1 ? count : 1); },
         {
             short_help: "Go forward in the browser history",
@@ -883,7 +883,7 @@ function Mappings() //{{{
         else
             return false;
     }
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["gu", "<BS>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gu", "<BS>"],
         function(count)
         {
             var gocmd = "";
@@ -906,7 +906,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["gU", "<C-BS>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gU", "<C-BS>"],
         function() { vimperator.open("..."); },
         {
             short_help: "Go to the root of the website",
@@ -916,7 +916,7 @@ function Mappings() //{{{
     ));
 
     // hint managment
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["f"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["f"],
         function() { vimperator.hints.enableHahMode(vimperator.modes.QUICK_HINT); },
         {
             short_help: "Start QuickHint mode",
@@ -925,7 +925,7 @@ function Mappings() //{{{
                   "If you write the hint in ALLCAPS, the hint is followed in a background tab."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["F"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["F"],
         function() { vimperator.hints.enableHahMode(vimperator.modes.ALWAYS_HINT); },
         {
             short_help: "Start AlwaysHint mode",
@@ -935,7 +935,7 @@ function Mappings() //{{{
                   "Also, most <code class=\"mapping\">Ctrl</code>-prefixed shortcut keys are available in this mode for navigation."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, [";"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, [";"],
         function() { vimperator.hints.enableHahMode(vimperator.modes.EXTENDED_HINT); },
         {
             short_help: "Start ExtendedHint mode",
@@ -960,7 +960,7 @@ function Mappings() //{{{
     ));
 
     // search management
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["/"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["/"],
         function() { vimperator.search.openSearchDialog(vimperator.modes.SEARCH_FORWARD); },
         {
             short_help: "Search forward for a pattern",
@@ -972,7 +972,7 @@ function Mappings() //{{{
                   "\"\\L\" forces the entire page to be searched for a match."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["?"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["?"],
         function() { vimperator.search.openSearchDialog(vimperator.modes.SEARCH_BACKWARD); },
         {
             short_help: "Search backwards for a pattern",
@@ -985,14 +985,14 @@ function Mappings() //{{{
                   "NOTE: incremental searching currently only works in the forward direction."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["n"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["n"],
         function() { vimperator.search.findAgain(false); },
         {
             short_help: "Find next",
             help: "Repeat the last search 1 time (until count is supported)."
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.NORMAL, ["N"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["N"],
         function() { vimperator.search.findAgain(true); },
         {
             short_help: "Find previous",
@@ -1006,63 +1006,63 @@ function Mappings() //{{{
     // {{{
 
     // action keys
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["o"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["o"],
         function() { vimperator.hints.openHints(false, false); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["t"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["t"],
         function() { vimperator.hints.openHints(true,  false); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-w>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-w>"],
         function() { vimperator.hints.openHints(false, true ); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["s"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["s"],
         function() { vimperator.hints.saveHints(true); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["a"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["a"],
         function() { vimperator.hints.saveHints(false); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["y"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["y"],
         function() { vimperator.hints.yankUrlHints(); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["Y"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["Y"],
         function() { vimperator.hints.yankTextHints(); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, [","],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, [","],
         function() { vimperator.input.buffer += ','; vimperator.hints.setCurrentState(0); },
         {
             cancel_mode: false,
             always_active: true
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, [":"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, [":"],
         function() { vimperator.commandline.open(':', '', vimperator.modes.EX); },
         {
             cancel_mode: false,
@@ -1071,7 +1071,7 @@ function Mappings() //{{{
     ));
 
     // movement keys
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-e>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-e>"],
         function(count) { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
         {
             cancel_mode: false,
@@ -1079,7 +1079,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-y>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-y>"],
         function(count) { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
         {
             cancel_mode: false,
@@ -1087,21 +1087,21 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<Home>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Home>"],
         function() { vimperator.buffer.scrollTop(); },
         {
             cancel_mode: false,
             always_active: true
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<End>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<End>"],
         function() { vimperator.buffer.scrollBottom(); },
         {
             cancel_mode: false,
             always_active: true
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<PageUp>", "<C-b>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<PageUp>", "<C-b>"],
         function(count) { vimperator.buffer.scrollPages(-(count > 1 ? count : 1)); },
         {
             cancel_mode: false,
@@ -1109,7 +1109,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<PageDown>", "<C-f>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<PageDown>", "<C-f>"],
         function(count) { vimperator.buffer.scrollPages(count > 1 ? count : 1); },
         {
             cancel_mode: false,
@@ -1117,7 +1117,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<Left>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Left>"],
         function() { vimperator.buffer.scrollColumns(-(count > 1 ? count : 1)); },
         {
             cancel_mode: false,
@@ -1125,7 +1125,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<Down>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Down>"],
         function() { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
         {
             cancel_mode: false,
@@ -1133,7 +1133,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<Up>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Up>"],
         function() { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
         {
             cancel_mode: false,
@@ -1141,7 +1141,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<Right>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Right>"],
         function() { vimperator.buffer.scrollColumns(count > 1 ? count : 1); },
         {
             cancel_mode: false,
@@ -1151,14 +1151,14 @@ function Mappings() //{{{
     ));
 
     // tab management
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-n>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-n>"],
         function() { vimperator.tabs.select('+1', true); },
         {
             cancel_mode: true,
             always_active: true
         }
     )); // same as gt, but no count supported
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-p>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-p>"],
         function() { vimperator.tabs.select('-1', true); },
         {
             cancel_mode: true,
@@ -1167,7 +1167,7 @@ function Mappings() //{{{
     ));
 
     // navigation
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-o>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-o>"],
         function(count) { vimperator.history.stepTo(count > 0 ? -count : -1); },
         {
             cancel_mode: false,
@@ -1175,7 +1175,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-i>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-i>"],
         function(count) { vimperator.history.stepTo(count > 1 ? count : 1); },
         {
             cancel_mode: false,
@@ -1183,7 +1183,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-h>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-h>"],
         function(count) { vimperator.history.stepTo(count > 0 ? -count : -1); },
         {
             cancel_mode: false,
@@ -1191,7 +1191,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-l>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-l>"],
         function(count) { vimperator.history.stepTo(count > 1 ? count : 1); },
         {
             cancel_mode: false,
@@ -1199,7 +1199,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-d>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-d>"],
         function() { vimperator.tabs.remove(getBrowser().mCurrentTab, vimperator.input.count, false, 0); },
         {
             cancel_mode: true,
@@ -1208,28 +1208,28 @@ function Mappings() //{{{
     ));
 
     // cancel_mode hint mode keys
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-c>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-c>"],
         function() { ; },
         {
             cancel_mode: true,
             always_active: true
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-g>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-g>"],
         function() { ; },
         {
             cancel_mode: true,
             always_active: true
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-[>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-[>"],
         function() { ; },
         {
             cancel_mode: true,
             always_active: true
         }
     ));
-    addDefaultMap(new Map(vimperator.modes.HINTS, ["<Esc>"],
+    addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Esc>"],
         function() { ; },
         {
             cancel_mode: true,
diff --git a/content/options.js b/content/options.js
index 1e76fa63..042a62b8 100644
--- a/content/options.js
+++ b/content/options.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-function Option(names, type, extra_info) //{{{
+vimperator.Option = function(names, type, extra_info) //{{{
 {
     if (!names || !type)
         return null;
@@ -107,7 +107,7 @@ function Option(names, type, extra_info) //{{{
     }
 } //}}}
 
-function Options() //{{{
+vimperator.Options = function() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -118,13 +118,6 @@ function Options() //{{{
     var vimperator_prefs = firefox_prefs.getBranch("extensions.vimperator.");
     var options = [];
 
-    function addOption(option)
-    {
-        Options.prototype.__defineGetter__(option.name, function() { return option.value; });
-        Options.prototype.__defineSetter__(option.name, function(value) { option.value = value; });
-        options.push(option);
-    }
-
     function optionsIterator()
     {
         for (var i = 0; i < options.length; i++)
@@ -206,8 +199,8 @@ function Options() //{{{
     function setGuiOptions(value)
     {
         // hide menubar
-        document.getElementById("toolbar-menubar").collapsed = value.indexOf("m") > -1 ? false : true;
-        document.getElementById("toolbar-menubar").hidden = value.indexOf("m") > -1 ? false : true;
+        //document.getElementById("toolbar-menubar").collapsed = value.indexOf("m") > -1 ? false : true;
+        //document.getElementById("toolbar-menubar").hidden = value.indexOf("m") > -1 ? false : true;
         // and main toolbar
         document.getElementById("nav-bar").collapsed = value.indexOf("T") > -1 ? false : true;
         document.getElementById("nav-bar").hidden = value.indexOf("T") > -1 ? false : true;
@@ -311,6 +304,13 @@ function Options() //{{{
         return null;
     }
 
+    this.add = function(option)
+    {
+        this.__defineGetter__(option.name, function() { return option.value; });
+        this.__defineSetter__(option.name, function(value) { option.value = value; });
+        options.push(option);
+    }
+
     this.destroy = function()
     {
         // reset some modified firefox prefs
@@ -392,7 +392,7 @@ function Options() //{{{
                              "//xhtml:*[@onclick or @onmouseover or @onmousedown or @onmouseup or @oncommand or @class='lk' or @class='s'] | " +
                              "//xhtml:input[not(@type='hidden')] | //xhtml:a | //xhtml:area | //xhtml:iframe | //xhtml:textarea | //xhtml:button | //xhtml:select"
 
-    addOption(new Option(["activate", "act"], "stringlist",
+    this.add(new vimperator.Option(["activate", "act"], "stringlist",
         {
             short_help: "Define when tabs are automatically activated",
             help: "Available items:<br/>" +
@@ -405,7 +405,7 @@ function Options() //{{{
             default_value: "homepage,quickmark,tabopen,paste"
         }
     ));
-    addOption(new Option(["complete", "cpt"], "charlist",
+    this.add(new vimperator.Option(["complete", "cpt"], "charlist",
         {
             short_help: "Items which are completed at the :[tab]open prompt",
             help: "Available items:<br/>" +
@@ -421,7 +421,7 @@ function Options() //{{{
             validator: function (value) { if (/[^sfbh]/.test(value)) return false; else return true; }
         }
     ));
-    addOption(new Option(["defsearch", "ds"], "string",
+    this.add(new vimperator.Option(["defsearch", "ds"], "string",
         {
             short_help: "Set the default search engine",
             help: "The default search engine is used in the <code class=\"command\">:[tab]open [arg]</code> command " +
@@ -430,20 +430,20 @@ function Options() //{{{
             default_value: "google"
         }
     ));
-    addOption(new Option(["extendedhinttags", "eht"], "string",
+    this.add(new vimperator.Option(["extendedhinttags", "eht"], "string",
         {
             short_help: "XPath string of hintable elements activated by ';'",
             default_value: DEFAULT_HINTTAGS
         }
     ));
-    addOption(new Option(["focusedhintstyle", "fhs"], "string",
+    this.add(new vimperator.Option(["focusedhintstyle", "fhs"], "string",
         {
             short_help: "CSS specification of focused hints",
             default_value: "z-index:5000; font-family:monospace; font-size:12px; color:ButtonText; background-color:ButtonShadow; " +
                            "border-color:ButtonShadow; border-width:1px; border-style:solid; padding:0px 1px 0px 1px; position:absolute;"
         }
     ));
-    addOption(new Option(["fullscreen", "fs"], "boolean",
+    this.add(new vimperator.Option(["fullscreen", "fs"], "boolean",
         {
             short_help: "Show the current window fullscreen",
             setter: function(value) { window.fullScreen = value; },
@@ -451,7 +451,7 @@ function Options() //{{{
             default_value: false
         }
     ));
-    addOption(new Option(["guioptions", "go"], "charlist",
+    this.add(new vimperator.Option(["guioptions", "go"], "charlist",
         {
             short_help: "Show or hide the menu, toolbar and scrollbars",
             help: "Supported characters:<br/>" +
@@ -465,52 +465,52 @@ function Options() //{{{
             validator: function (value) { if (/[^mTb]/.test(value)) return false; else return true; }
         }
     ));
-    addOption(new Option(["hintchars", "hc"], "charlist",
+    this.add(new vimperator.Option(["hintchars", "hc"], "charlist",
         {
             short_help: "String of single characters which can be used to follow hints",
             default_value: "hjklasdfgyuiopqwertnmzxcvb"
         }
     ));
-    addOption(new Option(["hintstyle", "hs"], "string",
+    this.add(new vimperator.Option(["hintstyle", "hs"], "string",
         {
             short_help: "CSS specification of unfocused hints",
             default_value: "z-index:5000; font-family:monospace; font-size:12px; color:white; background-color:red; " +
                            "border-color:ButtonShadow; border-width:0px; border-style:solid; padding:0px 1px 0px 1px; position:absolute;"
         }
     ));
-    addOption(new Option(["hinttags", "ht"], "string",
+    this.add(new vimperator.Option(["hinttags", "ht"], "string",
         {
             short_help: "XPath string of hintable elements activated by <code class=\"mapping\">'f'</code> and <code class=\"mapping\">'F'</code>",
             default_value: DEFAULT_HINTTAGS
         }
     ));
-    addOption(new Option(["hlsearch", "hls"], "boolean",
+    this.add(new vimperator.Option(["hlsearch", "hls"], "boolean",
         {
             short_help: "Highlight previous search pattern matches",
             setter: function(value) { if (value) vimperator.search.highlight(); else vimperator.search.clear(); },
             default_value: false
         }
     ));
-    addOption(new Option(["hlsearchstyle", "hlss"], "string",
+    this.add(new vimperator.Option(["hlsearchstyle", "hlss"], "string",
         {
             short_help: "CSS specification of highlighted search items",
             default_value: "color: black; background-color: yellow; padding: 0; display: inline;"
         }
     ));
-    addOption(new Option(["ignorecase", "ic"], "boolean",
+    this.add(new vimperator.Option(["ignorecase", "ic"], "boolean",
         {
             short_help: "Ignore case in search patterns",
             default_value: true
         }
     ));
-    addOption(new Option(["incsearch", "is"], "boolean",
+    this.add(new vimperator.Option(["incsearch", "is"], "boolean",
         {
             short_help: "Show where the search pattern matches as it is typed",
             help: "NOTE: Incremental searching currently only works in the forward direction.",
             default_value: true
         }
     ));
-    addOption(new Option(["laststatus", "ls"], "number",
+    this.add(new vimperator.Option(["laststatus", "ls"], "number",
         {
             short_help: "Show the status line",
             help: "Determines when the last window will have a status line. " +
@@ -526,20 +526,20 @@ function Options() //{{{
             validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
         }
     ));
-    addOption(new Option(["linksearch", "lks"], "boolean",
+    this.add(new vimperator.Option(["linksearch", "lks"], "boolean",
         {
             short_help: "Limit the search to hyperlink text",
             help: "This includes (X)HTML elements with an \"href\" atrribute and XLink \"simple\" links.",
             default_value: false
         }
     ));
-    addOption(new Option(["more"], "boolean",
+    this.add(new vimperator.Option(["more"], "boolean",
         {
             short_help: "Pause the message list window when more than one screen of listings is displayed",
             default_value: true
         }
     ));
-    addOption(new Option(["maxhints", "mh"], "number",
+    this.add(new vimperator.Option(["maxhints", "mh"], "number",
         {
             short_help: "Maximum number of simultaneously shown hints",
             help: "If you want to speed up display of hints, choose a smaller value",
@@ -547,7 +547,7 @@ function Options() //{{{
             validator: function (value) { if (value >= 1 && value <= 1000) return true; else return false; }
         }
     ));
-    addOption(new Option(["popups", "pps"], "number",
+    this.add(new vimperator.Option(["popups", "pps"], "number",
         {
             short_help: "Where to show requested popup windows",
             help: "Define where to show requested popup windows. Does not apply to windows which are opened by middle clicking a link, they always open in a new tab. " +
@@ -564,7 +564,7 @@ function Options() //{{{
             validator: function (value) { if (value >= 0 && value <= 3) return true; else return false; }
         }
     ));
-    addOption(new Option(["preload"], "boolean",
+    this.add(new vimperator.Option(["preload"], "boolean",
         {
             short_help: "Speed up first time history/bookmark completion",
             help: "History access can be quite slow for a large history. Vimperator maintains a cache to speed it up significantly on subsequent access.<br/>" +
@@ -572,7 +572,7 @@ function Options() //{{{
             default_value: true
         }
     ));
-    addOption(new Option(["previewheight", "pvh"], "number",
+    this.add(new vimperator.Option(["previewheight", "pvh"], "number",
         {
             short_help: "Default height for preview window",
             help: "Value must be between 1 and 50. If the value is too high, completions may cover the command-line. " +
@@ -582,7 +582,7 @@ function Options() //{{{
             validator: function (value) { if (value >= 1 && value <= 50) return true; else return false; }
         }
     ));
-    addOption(new Option(["scroll", "scr"], "number",
+    this.add(new vimperator.Option(["scroll", "scr"], "number",
         {
             short_help: "Number of lines to scroll with <code class=\"mapping\">C-u</code> and <code class=\"mapping\">C-d</code> commands",
             help: "The number of lines scrolled defaults to half the window size. " +
@@ -592,13 +592,13 @@ function Options() //{{{
             validator: function (value) { if (value >= 0) return true; else return false; }
         }
     ));
-    addOption(new Option(["showmode", "smd"], "boolean",
+    this.add(new vimperator.Option(["showmode", "smd"], "boolean",
         {
             short_help: "Show the current mode in the command line",
             default_value: true
         }
     ));
-    addOption(new Option(["showstatuslinks", "ssli"], "number",
+    this.add(new vimperator.Option(["showstatuslinks", "ssli"], "number",
         {
             short_help: "Show the destination of the link under the cursor in the status bar",
             help: "Also links which are focused by keyboard commands like <code class=\"mapping\">&lt;Tab&gt;</code> are shown. " +
@@ -612,7 +612,7 @@ function Options() //{{{
             validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
         }
     ));
-    addOption(new Option(["showtabline", "stal"], "number",
+    this.add(new vimperator.Option(["showtabline", "stal"], "number",
         {
             short_help: "Control when to show the tab bar of opened web pages",
             help: "Possible values:<br/>" +
@@ -626,14 +626,14 @@ function Options() //{{{
             validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
         }
     ));
-    addOption(new Option(["smartcase", "scs"], "boolean",
+    this.add(new vimperator.Option(["smartcase", "scs"], "boolean",
         {
             short_help: "Override the 'ignorecase' option if the pattern contains uppercase characters",
             help: "This is only used if the <code class=\"option\">'ignorecase'</code> option is set.",
             default_value: true
         }
     ));
-    addOption(new Option(["titlestring"], "string",
+    this.add(new vimperator.Option(["titlestring"], "string",
         {
             short_help: "Change the title of the browser window",
             help: "Vimperator changes the browser title from \"Title of web page - Mozilla Firefox\" to " +
@@ -643,7 +643,7 @@ function Options() //{{{
             default_value: "Vimperator"
         }
     ));
-    addOption(new Option(["usermode", "um"], "boolean",
+    this.add(new vimperator.Option(["usermode", "um"], "boolean",
         {
             short_help: "Show current website with a minimal style sheet to make it easily accessible",
             help: "Note that this is a local option for now, later it may be split into a global and <code class=\"command\">:setlocal</code> part",
@@ -652,7 +652,7 @@ function Options() //{{{
             default_value: false
         }
     ));
-    addOption(new Option(["verbose", "vbs"], "number",
+    this.add(new vimperator.Option(["verbose", "vbs"], "number",
         {
             short_help: "Define which type of messages are logged",
             help: "When bigger than zero, Vimperator will give messages about what it is doing. They are printed to the error console which can be shown with <code class=\"command\">:javascript!</code>.<br/>" +
@@ -661,14 +661,14 @@ function Options() //{{{
             validator: function (value) { if (value >= 0 && value <= 9) return true; else return false; }
         }
     ));
-    addOption(new Option(["visualbell", "vb"], "boolean",
+    this.add(new vimperator.Option(["visualbell", "vb"], "boolean",
         {
             short_help: "Use visual bell instead of beeping on errors",
             setter: function(value) { vimperator.options.setFirefoxPref("accessibility.typeaheadfind.enablesound", !value); },
             default_value: false
         }
     ));
-    addOption(new Option(["visualbellstyle", "t_vb"], "string",
+    this.add(new vimperator.Option(["visualbellstyle", "t_vb"], "string",
         {
             short_help: "CSS specification of the visual bell",
             help: "To hide the visual bell use a value of \"display: none;\" or unset it with <code class=\"command\">:set t_vb=</code>",
@@ -676,7 +676,7 @@ function Options() //{{{
             default_value: "background-color: black; color: black;"
         }
     ));
-    addOption(new Option(["wildmode", "wim"], "stringlist",
+    this.add(new vimperator.Option(["wildmode", "wim"], "stringlist",
         {
             short_help: "Define how command line completion works",
             help: "It is a comma-separated list of parts, where each part specifies " +
@@ -703,7 +703,7 @@ function Options() //{{{
             }
         }
     ));
-    addOption(new Option(["wildoptions", "wop"], "stringlist",
+    this.add(new vimperator.Option(["wildoptions", "wop"], "stringlist",
         {
             short_help: "Change how command line completion is done",
             help: "A list of words that change how command line completion is done.<br/>" +
diff --git a/content/tabs.js b/content/tabs.js
index 95c84841..220523d3 100644
--- a/content/tabs.js
+++ b/content/tabs.js
@@ -32,7 +32,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
  * Firefox 3.0, then this class should go away and their tab methods should be used
  * @deprecated
  */
-function Tabs() //{{{
+vimperator.Tabs = function() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
diff --git a/content/ui.js b/content/ui.js
index 346a24f7..864999ac 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -32,7 +32,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
  * it consists of a prompt and command field
  * be sure to only create objects of this class when the chrome is ready
  */
-function CommandLine() //{{{
+vimperator.CommandLine = function() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -40,7 +40,7 @@ function CommandLine() //{{{
 
     const UNINITIALIZED = -2; // notifies us, if we need to start history/tab-completion from the beginning
 
-    var completionlist = new InformationList("vimperator-completion", { min_items: 2, max_items: 10 });
+    var completionlist = new vimperator.InformationList("vimperator-completion", { min_items: 2, max_items: 10 });
     var completions = [];
 
     // TODO: clean this up when it's not 3am...
@@ -852,7 +852,7 @@ function CommandLine() //{{{
  * @param id: the id of the the XUL widget which we want to fill
  * @param options: an optional hash which modifies the behavior of the list
  */
-function InformationList(id, options) //{{{
+vimperator.InformationList = function(id, options) //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -1055,7 +1055,7 @@ function InformationList(id, options) //{{{
     //}}}
 } //}}}
 
-function StatusLine() //{{{
+vimperator.StatusLine = function() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
diff --git a/content/vimperator.js b/content/vimperator.js
index 282c7135..b2559661 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -684,37 +684,41 @@ const vimperator = (function() //{{{
 
             // these objects are created here only after the chrome is ready
             vimperator.log("Loading module options...", 3);
-            vimperator.options       = new Options();
+            vimperator.options       = new vimperator.Options();
             vimperator.log("Loading module events...", 3);
-            vimperator.events        = new Events();
+            vimperator.events        = new vimperator.Events();
             vimperator.log("Loading module commands...", 3);
-            vimperator.commands      = new Commands();
+            vimperator.commands      = new vimperator.Commands();
             vimperator.log("Loading module bookmarks...", 3);
-            vimperator.bookmarks     = new Bookmarks();
+            vimperator.bookmarks     = new vimperator.Bookmarks();
             vimperator.log("Loading module history...", 3);
-            vimperator.history       = new History();
+            vimperator.history       = new vimperator.History();
             vimperator.log("Loading module commandline...", 3);
-            vimperator.commandline   = new CommandLine();
+            vimperator.commandline   = new vimperator.CommandLine();
             vimperator.log("Loading module search...", 3);
-            vimperator.search        = new Search();
+            vimperator.search        = new vimperator.Search();
             vimperator.log("Loading module preview window...", 3);
-            vimperator.previewwindow = new InformationList("vimperator-previewwindow", { incremental_fill: false, max_items: 10 });
+            vimperator.previewwindow = new vimperator.InformationList("vimperator-previewwindow", { incremental_fill: false, max_items: 10 });
             vimperator.log("Loading module buffer window...", 3);
-            vimperator.bufferwindow  = new InformationList("vimperator-bufferwindow", { incremental_fill: false, max_items: 10 });
+            vimperator.bufferwindow  = new vimperator.InformationList("vimperator-bufferwindow", { incremental_fill: false, max_items: 10 });
             vimperator.log("Loading module mappings...", 3);
             vimperator.mappings      = new Mappings();
             vimperator.log("Loading module statusline...", 3);
-            vimperator.statusline    = new StatusLine();
+            vimperator.statusline    = new vimperator.StatusLine();
             vimperator.log("Loading module buffer...", 3);
-            vimperator.buffer        = new Buffer();
+            vimperator.buffer        = new vimperator.Buffer();
             vimperator.log("Loading module tabs...", 3);
-            vimperator.tabs          = new Tabs();
+            vimperator.tabs          = new vimperator.Tabs();
             vimperator.log("Loading module marks...", 3);
-            vimperator.marks         = new Marks();
+            vimperator.marks         = new vimperator.Marks();
             vimperator.log("Loading module quickmarks...", 3);
-            vimperator.quickmarks    = new QuickMarks();
+            vimperator.quickmarks    = new vimperator.QuickMarks();
             vimperator.log("Loading module hints...", 3);
-            vimperator.hints         = new Hints();
+            vimperator.hints         = new vimperator.Hints();
+            vimperator.log("Loading module io...", 3);
+            vimperator.io            = new vimperator.IO();
+            vimperator.log("Loading module completion...", 3);
+            vimperator.completion    = new vimperator.Completion();
             vimperator.log("All modules loaded", 3);
 
             vimperator.echo    = function(str) { vimperator.commandline.echo(str); }

From af360fbc77736e11e4ea04bd3c253dfe9025280c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 22 Oct 2007 06:38:07 +0000
Subject: [PATCH 163/224] move Mappings() to the vimperator namespace

---
 content/events.js     |   4 +-
 content/mappings.js   | 106 +++++++++++++++++++++---------------------
 content/vimperator.js |   2 +-
 3 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/content/events.js b/content/events.js
index d41a379e..609b60a1 100644
--- a/content/events.js
+++ b/content/events.js
@@ -625,7 +625,7 @@ vimperator.Events = function() //{{{
             vimperator.input.count = parseInt(count_str, 10);
             if (isNaN(vimperator.input.count))
                 vimperator.input.count = -1;
-            if (map.flags & Mappings.flags.ARGUMENT)
+            if (map.flags & vimperator.Mappings.flags.ARGUMENT)
             {
                 vimperator.input.pendingArgMap = map;
                 vimperator.input.buffer += key;
@@ -640,7 +640,7 @@ vimperator.Events = function() //{{{
                 vimperator.input.buffer = "";
             }
             // no count support for these commands yet
-            else if (map.flags & Mappings.flags.MOTION)
+            else if (map.flags & vimperator.Mappings.flags.MOTION)
             {
                 vimperator.input.pendingMotionMap = map;
                 vimperator.input.buffer = "";
diff --git a/content/mappings.js b/content/mappings.js
index 14291b21..c898aa63 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -46,9 +46,9 @@ vimperator.Map = function(mode, cmds, action, extra_info) //{{{
         else
         {
             this.usage = this.names[0]; // only the first command name
-            if (this.flags & Mappings.flags.COUNT)
+            if (this.flags & vimperator.Mappings.flags.COUNT)
                 this.usage = "[count]" + this.usage;
-            if (this.flags & Mappings.flags.ARGUMENT)
+            if (this.flags & vimperator.Mappings.flags.ARGUMENT)
                 this.usage += " {arg}";
             this.usage = [this.usage]; // FIXME: usage an array - needed for the help
         }
@@ -81,17 +81,17 @@ vimperator.Map.prototype.hasName = function(name)
 vimperator.Map.prototype.execute = function(motion, count, argument)
 {
     var args = [];
-    if (this.flags & Mappings.flags.MOTION)
+    if (this.flags & vimperator.Mappings.flags.MOTION)
         args.push(motion);
-    if (this.flags & Mappings.flags.COUNT)
+    if (this.flags & vimperator.Mappings.flags.COUNT)
         args.push(count);
-    if (this.flags & Mappings.flags.ARGUMENT)
+    if (this.flags & vimperator.Mappings.flags.ARGUMENT)
         args.push(argument);
     this.action.apply(this, args);
 }
 //}}}
 
-function Mappings() //{{{
+vimperator.Mappings = function() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -173,7 +173,7 @@ function Mappings() //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    Mappings.flags = {
+    vimperator.Mappings.flags = {
         MOTION:     1 << 0,
         COUNT:      1 << 1,
         ARGUMENT:   1 << 2
@@ -363,7 +363,7 @@ function Mappings() //{{{
         {
             short_help: "Focus next frame",
             help: "Transfers keyboard focus to the <code class=\"argument\">[count]</code>th next frame in order. The newly focused frame is briefly colored red. Does not wrap.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["[f"],
@@ -371,7 +371,7 @@ function Mappings() //{{{
         {
             short_help: "Focus previous frame",
             help: "Transfers keyboard focus to the <code class=\"argument\">[count]</code>th previous frame in order. The newly focused frame is briefly colored red. Does not wrap.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["b"],
@@ -394,7 +394,7 @@ function Mappings() //{{{
         {
             short_help: "Repeat last :buffer[!] command",
             help: "This is useful to quickly jump between buffers which have a similar URL or title.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gB"],
@@ -402,7 +402,7 @@ function Mappings() //{{{
         {
             short_help: "Repeat last :buffer[!] command in reverse direction",
             help: "Just like <code class=\"mapping\">gb</code> but in the other direction.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["d"],
@@ -411,7 +411,7 @@ function Mappings() //{{{
             short_help: "Delete current buffer (=tab)",
             help: "Count is supported, <code class=\"mapping\">2d</code> removes the current and next tab and the one to the right is selected. " +
                   "Does not wrap if <code class=\"argument\">[count]</code> is larger than available tabs to the right.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["D"],
@@ -420,7 +420,7 @@ function Mappings() //{{{
             short_help: "Delete current buffer (=tab)",
             help: "Count is supported, <code class=\"mapping\">2D</code> removes the current and previous tab and the one to the left is selected. " +
                   "Does not wrap if <code class=\"argument\">[count]</code> is larger than available tabs to the left.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gh"],
@@ -450,7 +450,7 @@ function Mappings() //{{{
             usage: ["go{a-zA-Z0-9}"],
             help: "Open any QuickMark in the current tab. You can mark any URLs with <code class=\"mapping\">M{a-zA-Z0-9}</code>. " +
                   "These QuickMarks are persistent across browser sessions.",
-            flags: Mappings.flags.ARGUMENT
+            flags: vimperator.Mappings.flags.ARGUMENT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gn"],
@@ -466,7 +466,7 @@ function Mappings() //{{{
             help: "Works like <code class=\"mapping\">go{a-zA-Z0-9}</code> but opens the QuickMark in a new tab. " +
                    "Whether the new tab is activated or not depends on the <code class=\"option\">'activate'</code> option.<br/>" +
                    "Mnemonic: Go in a new tab. <code class=\"mapping\">gt</code> would make more sense but is already taken.",
-            flags: Mappings.flags.ARGUMENT
+            flags: vimperator.Mappings.flags.ARGUMENT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gP"],
@@ -486,7 +486,7 @@ function Mappings() //{{{
         {
             short_help: "Go to the next tab",
             help: "Cycles to the first tab, when the last is selected.<br/>Count is supported: <code class=\"mapping\">3gt</code> goes to the third tab.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gT", "<C-p>", "<C-S-Tab>"],
@@ -494,7 +494,7 @@ function Mappings() //{{{
         {
             short_help: "Go to the previous tab",
             help: "Cycles to the last tab, when the first is selected.<br/>Count is supported: <code class=\"mapping\">3gT</code> goes to the third tab.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ['<C-^>', '<C-6>'],
@@ -539,7 +539,7 @@ function Mappings() //{{{
             short_help: "Set mark at the cursor position",
             usage: ["m{a-zA-Z}"],
             help: "Marks a-z are local to the buffer, whereas A-Z are valid between buffers.",
-            flags: Mappings.flags.ARGUMENT
+            flags: vimperator.Mappings.flags.ARGUMENT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["'", "`"],
@@ -548,7 +548,7 @@ function Mappings() //{{{
             short_help: "Jump to the mark in the current buffer",
             usage: ["'{a-zA-Z}"],
             help: "Marks a-z are local to the buffer, whereas A-Z are valid between buffers.",
-            flags: Mappings.flags.ARGUMENT
+            flags: vimperator.Mappings.flags.ARGUMENT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["M"],
@@ -567,7 +567,7 @@ function Mappings() //{{{
             usage: ["M{a-zA-Z0-9}"],
             help: "You can go to a marked URL in the current tab with <code class=\"mapping\">go{a-zA-Z0-9}</code> or in a new tab with <code class=\"mapping\">gn{a-zA-Z0-9}</code>. " +
                   "These QuickMarks are persistent across browser sessions.",
-            flags: Mappings.flags.ARGUMENT
+            flags: vimperator.Mappings.flags.ARGUMENT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["o"],
@@ -638,7 +638,7 @@ function Mappings() //{{{
         {
             short_help: "Undo closing of a tab",
             help: "If a count is given, don't close the last but the <code class=\"argument\">[count]</code>th last tab.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["y"],
@@ -668,28 +668,28 @@ function Mappings() //{{{
         function(count) { vimperator.buffer.zoomIn(count > 1 ? count : 1); },
         {
             short_help: "Zoom in current web page by 25%",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zI"],
         function(count) { vimperator.buffer.zoomIn((count > 1 ? count : 1) * 4); },
         {
             short_help: "Zoom in current web page by 100%",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zo", "-"],
         function(count) { vimperator.buffer.zoomOut(count > 1 ? count : 1); },
         {
             short_help: "Zoom out current web page by 25%",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zO"],
         function(count) { vimperator.buffer.zoomOut((count > 1 ? count : 1) * 4); },
         {
             short_help: "Zoom out current web page by 100%",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zz"],
@@ -697,7 +697,7 @@ function Mappings() //{{{
         {
             short_help: "Set zoom value of the web page",
             help: "Zoom value can be between 1 and 2000%. If it is omitted, zoom is reset to 100%.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["ZQ"],
@@ -735,7 +735,7 @@ function Mappings() //{{{
         {
             short_help: "Goto the top of the document",
             help: "When used with <code class=\"argument\">[count]</code> like in <code class=\"mapping\">35gg</code>, it scrolls to 35% of the document.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["G", "<End>"],
@@ -743,7 +743,7 @@ function Mappings() //{{{
         {
             short_help: "Goto the end of the document",
             help: "When used with <code class=\"argument\">[count]</code> like in <code class=\"mapping\">35G</code>, it scrolls to 35% of the document.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["h", "<Left>"],
@@ -752,7 +752,7 @@ function Mappings() //{{{
             short_help: "Scroll document to the left",
             help: "Count is supported: <code class=\"mapping\">10h</code> will move 10 times as much to the left.<br/>" +
                   "If the document cannot scroll more, a beep is emitted (unless <code class=\"option\">'beep'</code> is turned off).",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["j", "<Down>", "<C-e>"],
@@ -761,7 +761,7 @@ function Mappings() //{{{
             short_help: "Scroll document down",
             help: "Count is supported: <code class=\"mapping\">10j</code> will move 10 times as much down.<br/>" +
                   "If the document cannot scroll more, a beep is emitted (unless <code class=\"option\">'beep'</code> is turned off).",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["k", "<Up>", "<C-y>"],
@@ -770,7 +770,7 @@ function Mappings() //{{{
             short_help: "Scroll document up",
             help: "Count is supported: <code class=\"mapping\">10k</code> will move 10 times as much up.<br/>" +
                   "If the document cannot scroll more, a beep is emitted (unless <code class=\"option\">'beep'</code> is turned off).",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     function scrollByScrollSize(count, direction)
@@ -795,7 +795,7 @@ function Mappings() //{{{
             short_help: "Scroll window downwards in the buffer",
             help: "The number of lines is set by the <code class=\"option\">'scroll'</code> option which defaults to half a page. " +
                   "If <code class=\"argument\">[count]</code> is given <code class=\"option\">'scroll'</code> is first set to this value.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-u>"],
@@ -804,7 +804,7 @@ function Mappings() //{{{
             short_help: "Scroll window upwards in the buffer",
             help: "The number of lines is set by the <code class=\"option\">'scroll'</code> option which defaults to half a page. " +
                   "If <code class=\"argument\">[count]</code> is given <code class=\"option\">'scroll'</code> is first set to this value.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["l", "<Right>"],
@@ -813,7 +813,7 @@ function Mappings() //{{{
             short_help: "Scroll document to the right",
             help: "Count is supported: <code class=\"mapping\">10l</code> will move 10 times as much to the right.<br/>" +
                   "If the document cannot scroll more, a beep is emitted (unless <code class=\"option\">'beep'</code> is turned off).",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-b>", "<PageUp>", "<S-Space>"],
@@ -821,7 +821,7 @@ function Mappings() //{{{
         {
             short_help: "Scroll up a full page",
             help: "Scroll window <code class=\"argument\">[count]</code> pages Backwards (upwards) in the buffer.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-f>", "<PageDown>", "<Space>"],
@@ -829,7 +829,7 @@ function Mappings() //{{{
         {
             short_help: "Scroll down a full page",
             help: "Scroll window <code class=\"argument\">[count]</code> pages Forwards (downwards) in the buffer.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
 
@@ -839,7 +839,7 @@ function Mappings() //{{{
         {
             short_help: "Go to an older position in the jump list",
             help: "The jump list is just the browser history for now.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-i>"],
@@ -847,7 +847,7 @@ function Mappings() //{{{
         {
             short_help: "Go to a newer position in the jump list",
             help: "The jump list is just the browser history for now.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["H", "<A-Left>", "<M-Left>"],
@@ -855,7 +855,7 @@ function Mappings() //{{{
         {
             short_help: "Go back in the browser history",
             help: "Count is supported: <code class=\"mapping\">3H</code> goes back 3 steps.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["L", "<A-Right>", "<M-Right>"],
@@ -863,7 +863,7 @@ function Mappings() //{{{
         {
             short_help: "Go forward in the browser history",
             help: "Count is supported: <code class=\"mapping\">3L</code> goes forward 3 steps.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     function isDirectory(url)
@@ -903,7 +903,7 @@ function Mappings() //{{{
         {
             short_help: "Go to parent directory",
             help: "Count is supported: <code class=\"mapping\">2gu</code> on <code>http://www.example.com/dir1/dir2/file.htm</code> would open <code>http://www.example.com/dir1/</code>.",
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gU", "<C-BS>"],
@@ -1076,7 +1076,7 @@ function Mappings() //{{{
         {
             cancel_mode: false,
             always_active: true,
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-y>"],
@@ -1084,7 +1084,7 @@ function Mappings() //{{{
         {
             cancel_mode: false,
             always_active: true,
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Home>"],
@@ -1106,7 +1106,7 @@ function Mappings() //{{{
         {
             cancel_mode: false,
             always_active: true,
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<PageDown>", "<C-f>"],
@@ -1114,7 +1114,7 @@ function Mappings() //{{{
         {
             cancel_mode: false,
             always_active: true,
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Left>"],
@@ -1122,7 +1122,7 @@ function Mappings() //{{{
         {
             cancel_mode: false,
             always_active: true,
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Down>"],
@@ -1130,7 +1130,7 @@ function Mappings() //{{{
         {
             cancel_mode: false,
             always_active: true,
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Up>"],
@@ -1138,7 +1138,7 @@ function Mappings() //{{{
         {
             cancel_mode: false,
             always_active: true,
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Right>"],
@@ -1146,7 +1146,7 @@ function Mappings() //{{{
         {
             cancel_mode: false,
             always_active: true,
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
 
@@ -1172,7 +1172,7 @@ function Mappings() //{{{
         {
             cancel_mode: false,
             always_active: true,
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-i>"],
@@ -1180,7 +1180,7 @@ function Mappings() //{{{
         {
             cancel_mode: false,
             always_active: true,
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-h>"],
@@ -1188,7 +1188,7 @@ function Mappings() //{{{
         {
             cancel_mode: false,
             always_active: true,
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-l>"],
@@ -1196,7 +1196,7 @@ function Mappings() //{{{
         {
             cancel_mode: false,
             always_active: true,
-            flags: Mappings.flags.COUNT
+            flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-d>"],
diff --git a/content/vimperator.js b/content/vimperator.js
index b2559661..564f6006 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -702,7 +702,7 @@ const vimperator = (function() //{{{
             vimperator.log("Loading module buffer window...", 3);
             vimperator.bufferwindow  = new vimperator.InformationList("vimperator-bufferwindow", { incremental_fill: false, max_items: 10 });
             vimperator.log("Loading module mappings...", 3);
-            vimperator.mappings      = new Mappings();
+            vimperator.mappings      = new vimperator.Mappings();
             vimperator.log("Loading module statusline...", 3);
             vimperator.statusline    = new vimperator.StatusLine();
             vimperator.log("Loading module buffer...", 3);

From fe2986bf703c41e772e8bc97018a9f45d30c37fd Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 22 Oct 2007 06:39:59 +0000
Subject: [PATCH 164/224] use a regexp literal for matching the leader token in
 :map

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

diff --git a/content/commands.js b/content/commands.js
index adcd7ba2..f6012119 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -792,7 +792,7 @@ vimperator.Commands = function() //{{{
 
             var matches = args.match(/^([^\s]+)(?:\s+(.+))?$/)
             var [lhs, rhs] = [matches[1], matches[2]];
-            var leader_reg = new RegExp('<Leader>', 'i');
+            var leader_reg = /<Leader>/i;
 
             if (leader_reg.test(lhs))
             {

From c222232df48723d122fc1d549f749384ab6d76ee Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 26 Oct 2007 14:39:51 +0000
Subject: [PATCH 165/224] prepend the count specified to a user mapping to the
 map's RHS

---
 content/commands.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/content/commands.js b/content/commands.js
index f6012119..a0240cd7 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -805,7 +805,8 @@ vimperator.Commands = function() //{{{
             if (rhs)
             {
                 vimperator.mappings.add(new vimperator.Map(vimperator.modes.NORMAL, [lhs],
-                    function() { vimperator.events.feedkeys(rhs); }, { rhs: rhs }
+                    function(count) { vimperator.events.feedkeys((count > 1 ? count : "") + rhs); },
+                    { flags: vimperator.Mappings.flags.COUNT, rhs: rhs }
                 ));
             }
             else

From 63df7e8ba24b75d3a262fdf564e49b3f350f8f2f Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 27 Oct 2007 01:44:20 +0000
Subject: [PATCH 166/224] merge faster initial setting of gui options

---
 content/commands.js   |  8 ++++----
 content/options.js    | 46 ++++++++++++++++++++++++++++++++++---------
 content/vimperator.js |  7 +++++--
 3 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index a0240cd7..0d15f1c8 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -914,6 +914,7 @@ vimperator.Commands = function() //{{{
             for (var option in vimperator.options)
             {   
                 // TODO: options should be queried for this info
+                // TODO: string/list options might need escaping in future
                 if (!/fullscreen|usermode/.test(option.name) && option.value != option.default_value)
                 {
                     if (option.type == "boolean")
@@ -932,7 +933,7 @@ vimperator.Commands = function() //{{{
             short_help: "Write current keymappings and changed options to [file]",
             help: "If no <code class=\"argument\">[file]</code> is specified then ~/.vimperatorrc is written unless this file already exists. " +
                   "The special version will overwrite <code class=\"argument\">[file]</code> if it exists.<br/>" +
-                  "WARNING: this differs from Vim's behaviour which defaults to writing the file in the current directory."
+                  "WARNING: this differs from Vim's behavior which defaults to writing the file in the current directory."
         }
     ));
     addDefaultCommand(new vimperator.Command(["noh[lsearch]"],
@@ -1249,17 +1250,16 @@ vimperator.Commands = function() //{{{
                 val = "";
 
             // reset a variable to its default value
-            // TODO: remove the value from about:config instead of setting it to the current default value
             if (reset)
             {
                 if (all)
                 {
                     for (let opt in vimperator.options)
-                        opt.value = opt.default_value;
+                        opt.reset();
                 }
                 else
                 {
-                    option.value = option.default_value;
+                    option.reset();
                 }
             }
             // read access
diff --git a/content/options.js b/content/options.js
index 042a62b8..eaa94a50 100644
--- a/content/options.js
+++ b/content/options.js
@@ -105,6 +105,11 @@ vimperator.Option = function(names, type, extra_info) //{{{
         }
         return false;
     }
+
+    this.reset = function()
+    {
+        this.value = this.default_value;
+    }
 } //}}}
 
 vimperator.Options = function() //{{{
@@ -112,12 +117,14 @@ vimperator.Options = function() //{{{
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
-
     var firefox_prefs = Components.classes["@mozilla.org/preferences-service;1"]
         .getService(Components.interfaces.nsIPrefBranch);
     var vimperator_prefs = firefox_prefs.getBranch("extensions.vimperator.");
     var options = [];
 
+    // save if we already changed a GUI related option, used for setInitialGUI
+    var guioptions_done = false, showtabline_done = false, laststatus_done = false;
+
     function optionsIterator()
     {
         for (var i = 0; i < options.length; i++)
@@ -199,17 +206,19 @@ vimperator.Options = function() //{{{
     function setGuiOptions(value)
     {
         // hide menubar
-        //document.getElementById("toolbar-menubar").collapsed = value.indexOf("m") > -1 ? false : true;
-        //document.getElementById("toolbar-menubar").hidden = value.indexOf("m") > -1 ? false : true;
+        document.getElementById("toolbar-menubar").collapsed = value.indexOf("m") > -1 ? false : true;
+        document.getElementById("toolbar-menubar").hidden = value.indexOf("m") > -1 ? false : true;
         // and main toolbar
         document.getElementById("nav-bar").collapsed = value.indexOf("T") > -1 ? false : true;
         document.getElementById("nav-bar").hidden = value.indexOf("T") > -1 ? false : true;
         // and bookmarks toolbar
         document.getElementById("PersonalToolbar").collapsed = value.indexOf("b") > -1 ? false : true;
         document.getElementById("PersonalToolbar").hidden = value.indexOf("b") > -1 ? false : true;
+
+        guioptions_done = true;
     }
 
-    function setStatusLine(value)
+    function setLastStatus(value)
     {
         if (value == 0)
         {
@@ -225,6 +234,8 @@ vimperator.Options = function() //{{{
             document.getElementById("status-bar").collapsed = false;
             document.getElementById("status-bar").hidden = false;
         }
+
+        laststatus_done = true;
     }
 
     function setShowTabline(value)
@@ -247,6 +258,8 @@ vimperator.Options = function() //{{{
             storePreference("browser.tabs.autoHide", false);
             tabs.collapsed = false;
         }
+
+        showtabline_done = true;
     }
 
     function setTitleString(value)
@@ -358,7 +371,18 @@ vimperator.Options = function() //{{{
 
         list += "</table>";
 
-        vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
+        vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
+    }
+
+    // this hack is only needed, because we need to do asynchronous loading of the .vimperatorrc
+    this.setInitialGUI = function()
+    {
+        if (!guioptions_done)
+            this.get("guioptions").reset();
+        if (!laststatus_done)
+            this.get("laststatus").reset();
+        if (!showtabline_done)
+            this.get("showtabline").reset();
     }
 
     // TODO: separate Preferences from Options? Would these utility functions
@@ -522,7 +546,7 @@ vimperator.Options = function() //{{{
                   "</ul>" +
                   "NOTE: laststatus=1 not implemented yet.",
             default_value: 2,
-            setter: function(value) { setStatusLine(value); },
+            setter: function(value) { setLastStatus(value); },
             validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
         }
     ));
@@ -717,9 +741,13 @@ vimperator.Options = function() //{{{
     ));
     //}}}
 
-    setShowTabline(this.showtabline);
-    setGuiOptions(this.guioptions);
-    setStatusLine(this.laststatus);
+    // we start with an "empty" GUI so that no toolbars or tabbar is shown if the user
+    // sets them to empty in the .vimperatorrc, which is sourced asynchronously
+    setShowTabline(0);
+    setGuiOptions("");
+    setLastStatus(0);
+    guioptions_done = showtabline_done = laststatus_done = false;
+
     setTitleString(this.titlestring);
     setPopups(this.popups);
 } //}}}
diff --git a/content/vimperator.js b/content/vimperator.js
index 564f6006..0a3c85f2 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -753,11 +753,9 @@ const vimperator = (function() //{{{
                     vimperator.log("No user RC file found", 3);
 
                 // also source plugins in ~/.vimperator/plugin/
-                var entries = [];
                 try
                 {
                     var plugin_dir = vimperator.io.getPluginDir();
-
                     if (plugin_dir)
                     {
                         var files = vimperator.io.readDirectory(plugin_dir.path);
@@ -777,6 +775,11 @@ const vimperator = (function() //{{{
                     // thrown if directory does not exist
                     //vimperator.log("Error sourcing plugin directory: " + e);
                 }
+
+                // after sourcing the initialization files, this function will set
+                // all gui options to their default values, if they have not been
+                // set before by any rc file
+                vimperator.options.setInitialGUI();
             }, 0);
 
             vimperator.statusline.update();

From 9e78aa5f8e7ed1c09037288acc0004d0a55256ea Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 27 Oct 2007 01:57:50 +0000
Subject: [PATCH 167/224] merge new :pageinfo command

---
 NEWS                |   4 +-
 content/buffers.js  | 130 ++++++++++++++++++++++++++++++++++++++++++++
 content/commands.js |   8 +++
 content/options.js  |  14 +++++
 4 files changed, 155 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 1ccc1aea..fdbcba63 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,9 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.3
-	* options are no longer stored in preferences - use the RC file instead
+	* new :pa[geinfo] command (thanks Marco Candrian)
+	* IMPORTANT! options are no longer automatically stored - use the
+	  ~/.vimperatorrc file instead for persistent options
 	* added new :mkvimperatorc command
 	* remove :redraw and Ctrl-L commands as they rely on FF3 features
 	* :ls, :history and :bmarks output is now hyperlinked
diff --git a/content/buffers.js b/content/buffers.js
index 8e7389a7..4d585cfd 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -444,6 +444,136 @@ vimperator.Buffer = function() //{{{
     {
         bumpZoomLevel(-steps);
     }
+
+    this.pageInfo = function(verbose) 
+    {  
+        // to get the file size later (from pageInfo.js) (setup cacheEntryDescriptor)
+        const nsICacheService = Components.interfaces.nsICacheService;
+        const ACCESS_READ = Components.interfaces.nsICache.ACCESS_READ;
+        const cacheService = Components.classes["@mozilla.org/network/cache-service;1"].getService(nsICacheService);
+        var httpCacheSession = cacheService.createSession("HTTP", 0, true);
+        httpCacheSession.doomEntriesIfExpired = false;
+        var ftpCacheSession = cacheService.createSession("FTP", 0, true);
+        ftpCacheSession.doomEntriesIfExpired = false;
+        var cacheKey = window.content.document.location.toString().replace(/#.*$/, "");
+        try
+        {
+            var cacheEntryDescriptor = httpCacheSession.openCacheEntry(cacheKey, ACCESS_READ, false);
+        }
+        catch (ex)
+        {
+            try
+            {
+                cacheEntryDescriptor = ftpCacheSession.openCacheEntry(cacheKey, ACCESS_READ, false);
+            }
+            catch (ex2) { }
+        }
+
+        if (!verbose) 
+        {
+            // TODO: strip off any component after &
+            var file = window.content.document.location.pathname.split('/').pop();
+            if (!file)
+                file = "[No Name]";
+
+            var title = window.content.document.title; 
+            if (title.length > 60)
+                title = title.substr(0,57) + "... "; 
+            else if (!title.length)
+                title = "[No Title]";
+
+            if (cacheEntryDescriptor) 
+                var pageSize = Math.round(cacheEntryDescriptor.dataSize / 1024 * 100) / 100 + "KB";
+
+            var pageInfoText = "" + file + ": " + title  + "  (" + pageSize + ", other cool things)";
+
+            vimperator.echo(pageInfoText, vimperator.commandline.FORCE_SINGLELINE);
+            return;
+        }
+
+        var pageGeneral = [];       // keeps general infos
+        var pageMeta = [];          // keeps meta infos
+
+        // get general infos
+        pageGeneral.push(["Title", window.content.document.title]); 
+        pageGeneral.push(["URL", '<a class="hl-URL" href="' + window.content.document.location.toString() + '">' + 
+                window.content.document.location.toString() + '</a>']);
+        pageGeneral.push(["Referrer",  ("referrer" in window.content.document && window.content.document.referrer)]);
+        pageGeneral.push(["Mime-Type", window.content.document.contentType]);
+        pageGeneral.push(["Encoding",  window.content.document.characterSet]);
+
+
+        if (cacheEntryDescriptor) {
+            var pageSize = cacheEntryDescriptor.dataSize;
+            pageGeneral.push(["File Size", (Math.round(pageSize / 1024 * 100) / 100) + "KB (" + pageSize + " bytes)"]);
+        }
+
+        pageGeneral.push(["Compatibility", content.document.compatMode == "BackCompat" ? 
+                "Quirks Mode" : "Full/Almost Standard Mode"]);
+        pageGeneral.push(["Last Modified", window.content.document.lastModified]);
+
+        // get meta tag infos info and sort and put into pageMeta[]
+        var metaNodes = window.content.document.getElementsByTagName("meta");
+        var length = metaNodes.length;
+        if (length) 
+        {           
+            var tmpSort = [];
+            var tmpDict = [];
+
+            for (var i = 0; i < length; i++)
+            {
+                var tmpTag = metaNodes[i].name || metaNodes[i].httpEquiv;// + 
+                    //'<span style="font-weight: normal; font-size: 90%;">-eq</span>'; // XXX: really important?
+                var tmpTagNr = tmpTag + "-" + i;     // allows multiple (identical) meta names
+                tmpDict[tmpTagNr] = [tmpTag, metaNodes[i].content];
+                tmpSort.push(tmpTagNr);      // array for sorting
+            }
+
+            // sort: ignore-case                        
+            tmpSort.sort(function (a,b){return a.toLowerCase() > b.toLowerCase() ? 1 : -1;}); 
+
+            for (var i=0; i < tmpSort.length; i++)
+            {
+                pageMeta.push([tmpDict[tmpSort[i]][0], tmpDict[tmpSort[i]][1]]);
+            }
+        }
+
+        var pageInfoText = "";
+        var option = vimperator.options["pageinfo"];
+
+        for (var z = 0; z < option.length; z++)
+        {
+            var newLine = z > 0 ? "<br/>" : "";
+            switch (option[z])
+            {
+                case "g": pageInfoText += newLine + "<table><tr><td class='hl-Title' style='font-weight: bold;' colspan='2'>General</td></tr>";
+                    for (var i = 0; i < pageGeneral.length; i++)
+                    {
+                        if (pageGeneral[i][1])
+                            pageInfoText += "<tr><td style='font-weight: bold;'>  " + pageGeneral[i][0] + ":&nbsp;</td><td>" + pageGeneral[i][1] + "</td></tr>";
+                    }
+                    pageInfoText += "</table>";
+                    break;
+
+                case "m": pageInfoText += newLine + "<table><tr><td class='hl-Title' style='font-weight: bold;' colspan='2'>Meta Tags</td></tr>";
+                    if (pageMeta.length)
+                    {
+                        for (var i = 0; i < pageMeta.length; i++)
+                        {
+                            pageInfoText += "<tr><td style='font-weight: bold;'>  " + pageMeta[i][0] + ":&nbsp;</td><td>" + pageMeta[i][1] + "</td></tr>";
+                        }
+                    }
+                    else
+                    {
+                        pageInfoText += "<tr><td colspan='2'>(no Meta-Tags on this page)</td></tr>";
+                    }
+                    pageInfoText += "</table>";
+                    break;
+            }
+        }
+
+        vimperator.echo(pageInfoText, vimperator.commandline.FORCE_MULTILINE);
+    }
     //}}}
 } //}}}
 
diff --git a/content/commands.js b/content/commands.js
index 0d15f1c8..e5525b98 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -227,6 +227,14 @@ vimperator.Commands = function() //{{{
     ////////////////////// DEFAULT COMMANDS ////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
+    addDefaultCommand(new vimperator.Command(["pa[geinfo]"],
+        function () { vimperator.buffer.pageInfo(true); },
+        {
+            short_help: "Show general and/or meta-content site informations",
+            help: "Show general and/or meta-content site informations"
+        }
+    ));
+
     addDefaultCommand(new vimperator.Command(["addo[ns]"],
         function() { vimperator.open("chrome://mozapps/content/extensions/extensions.xul", vimperator.NEW_TAB); },
         {
diff --git a/content/options.js b/content/options.js
index eaa94a50..449af7bf 100644
--- a/content/options.js
+++ b/content/options.js
@@ -429,6 +429,20 @@ vimperator.Options = function() //{{{
             default_value: "homepage,quickmark,tabopen,paste"
         }
     ));
+    this.add(new vimperator.Option(["pageinfo", "pa"], "charlist",
+        {
+            short_help: "Desired info on :pa[geinfo]",
+            help: "Available items:<br/>" +
+                  "<ul>" +
+                  "<li><b>g</b>: general info</li>" +
+                  "<li><b>m</b>: meta tags</li>" +
+                  "</ul>" +
+                  "The order matters",
+            default_value: "gm",
+            validator: function (value) { if (/[^gm]/.test(value) || value.length > 2 || 
+                    value.length < 1) return false; else return true; }
+        }
+    ));
     this.add(new vimperator.Option(["complete", "cpt"], "charlist",
         {
             short_help: "Items which are completed at the :[tab]open prompt",

From 810cec5f71c713c768cff1a9e528f98c565a1305 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 27 Oct 2007 01:59:40 +0000
Subject: [PATCH 168/224] replace references to 'beep' in the help with
 'visualbell'

---
 content/mappings.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/mappings.js b/content/mappings.js
index c898aa63..e5317603 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -751,7 +751,7 @@ vimperator.Mappings = function() //{{{
         {
             short_help: "Scroll document to the left",
             help: "Count is supported: <code class=\"mapping\">10h</code> will move 10 times as much to the left.<br/>" +
-                  "If the document cannot scroll more, a beep is emitted (unless <code class=\"option\">'beep'</code> is turned off).",
+                  "If the document cannot scroll more, a beep is emitted (unless <code class=\"option\">'visualbell'</code> is set).",
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
@@ -760,7 +760,7 @@ vimperator.Mappings = function() //{{{
         {
             short_help: "Scroll document down",
             help: "Count is supported: <code class=\"mapping\">10j</code> will move 10 times as much down.<br/>" +
-                  "If the document cannot scroll more, a beep is emitted (unless <code class=\"option\">'beep'</code> is turned off).",
+                  "If the document cannot scroll more, a beep is emitted (unless <code class=\"option\">'visualbell'</code> is set).",
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
@@ -769,7 +769,7 @@ vimperator.Mappings = function() //{{{
         {
             short_help: "Scroll document up",
             help: "Count is supported: <code class=\"mapping\">10k</code> will move 10 times as much up.<br/>" +
-                  "If the document cannot scroll more, a beep is emitted (unless <code class=\"option\">'beep'</code> is turned off).",
+                  "If the document cannot scroll more, a beep is emitted (unless <code class=\"option\">'visualbell'</code> is set).",
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
@@ -812,7 +812,7 @@ vimperator.Mappings = function() //{{{
         {
             short_help: "Scroll document to the right",
             help: "Count is supported: <code class=\"mapping\">10l</code> will move 10 times as much to the right.<br/>" +
-                  "If the document cannot scroll more, a beep is emitted (unless <code class=\"option\">'beep'</code> is turned off).",
+                  "If the document cannot scroll more, a beep is emitted (unless <code class=\"option\">'visualbell'</code> is set).",
             flags: vimperator.Mappings.flags.COUNT
         }
     ));

From 58e72b41f989a21113a28cc02b7b13564ce4b12c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 27 Oct 2007 05:45:51 +0000
Subject: [PATCH 169/224] allow lowercase modifier chars in the {lhs} arg of
 :map and related commands

---
 content/mappings.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/content/mappings.js b/content/mappings.js
index e5317603..859a06ca 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -124,10 +124,8 @@ vimperator.Mappings = function() //{{{
 
         for (var i = 0; i < maps.length; i++)
         {
-            names = maps[i].names;
-            for (var j = 0; j < names.length; j++)
-                if (names[j] == cmd)
-                    return maps[i];
+            if (maps[i].hasName(cmd))
+                return maps[i];
         }
 
         return null;
@@ -213,7 +211,11 @@ vimperator.Mappings = function() //{{{
     this.add = function(map)
     {
         for (var i = 0; i < map.names.length; i++)
+        {
+            // only store keysyms with uppercase modifier strings
+            map.names[i] = map.names[i].replace(/[casm]-/g, function($0) { return $0.toUpperCase(); });
             removeMap(map.mode, map.names[i]);
+        }
 
         user[map.mode].push(map);
     }

From 70f8717976475bb043959cee0945a935c69c6e58 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 30 Oct 2007 08:40:09 +0000
Subject: [PATCH 170/224] display a better error message for invalid ex
 commands

---
 content/vimperator.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/vimperator.js b/content/vimperator.js
index 0a3c85f2..73a96392 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -234,21 +234,21 @@ const vimperator = (function() //{{{
             clipboardHelper.copyString(str);
         },
 
-        execute: function(string, modifiers)
+        execute: function(str, modifiers)
         {
             // skip comments and blank lines
-            if (/^\s*("|$)/.test(string))
+            if (/^\s*("|$)/.test(str))
                 return;
 
             if (!modifiers)
                 modifiers = {};
 
-            var [count, cmd, special, args] = vimperator.commands.parseCommand(string.replace(/^'(.*)'$/, '$1'));
+            var [count, cmd, special, args] = vimperator.commands.parseCommand(str.replace(/^'(.*)'$/, '$1'));
             var command = vimperator.commands.get(cmd);
 
             if (command === null)
             {
-                vimperator.echoerr("E492: Not an editor command: " + cmd);
+                vimperator.echoerr("E492: Not an editor command: " + str);
                 vimperator.focusContent();
                 return;
             }

From a712bf01eaa647bcfe42f882c94f96767a75be72 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 30 Oct 2007 08:42:19 +0000
Subject: [PATCH 171/224] use -1 as the default value for the ex command count

---
 content/commands.js | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index e5525b98..f3def65e 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -181,33 +181,30 @@ vimperator.Commands = function() //{{{
     // FIXME: doesn't really belong here...
     // return [null, null, null, null, heredoc_tag || false];
     //        [count, cmd, special, args] = match;
-    this.parseCommand = function(string, tag)
+    this.parseCommand = function(str, tag)
     {
-        // removing comments
-        string.replace(/\s*".*$/, '');
+        // remove comments
+        str.replace(/\s*".*$/, '');
+
         if (tag) // we already have a multiline heredoc construct
         {
-            if (string == tag)
+            if (str == tag)
                 return [null, null, null, null, false];
             else
-                return [null, null, null, string, tag];
+                return [null, null, null, str, tag];
         }
 
         // 0 - count, 1 - cmd, 2 - special, 3 - args, 4 - heredoc tag
-        var matches = string.match(/^:*(\d+)?([a-zA-Z]+|!)(!)?(?:\s*(.*?)\s*)?$/);
+        var matches = str.match(/^:*(\d+)?([a-zA-Z]+|!)(!)?(?:\s*(.*?)\s*)?$/);
         if (!matches)
             return [null, null, null, null, null];
         matches.shift();
 
         // parse count
         if (matches[0])
-        {
             matches[0] = parseInt(matches[0]);
-            if (isNaN(matches[0]))
-                matches[0] = 0; // 0 is the default if no count given
-        }
         else
-            matches[0] = 0;
+            matches[0] = -1;
 
         matches[2] = !!matches[2];
         matches.push(null);
@@ -286,7 +283,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["bd[elete]", "bw[ipeout]", "bun[load]", "tabc[lose]"],
-        function(args, special, count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count, special, 0); },
+        function(args, special, count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count > 0 ? count : 1, special, 0); },
         {
             usage: ["[count]bd[elete][!]"],
             short_help: "Delete current buffer (=tab)",
@@ -1523,9 +1520,6 @@ vimperator.Commands = function() //{{{
     addDefaultCommand(new vimperator.Command(["time"],
         function(args, special, count)
         {
-            if (!count || count < 1)
-                count = 1;
-
             try
             {
                 if (count > 1)
@@ -1619,12 +1613,12 @@ vimperator.Commands = function() //{{{
                 {
                     if (undoItems[i].state.entries[0].url == args)
                     {
-                        count = i+1;
+                        count = i + 1;
                         break;
                     }
                 }
             }
-            undoCloseTab(count-1);
+            undoCloseTab(count - 1);
         },
         {
             usage: ["[count]u[ndo][!] [url]"],
@@ -1652,8 +1646,16 @@ vimperator.Commands = function() //{{{
     addDefaultCommand(new vimperator.Command(["undoa[ll]"],
         function(args, special, count)
         {
-            if (count || special)
-                return vimperator.echoerr("E488: Trailing characters");
+            if (count > -1)
+            {
+                vimperator.echoerr("E481: No range allowed");
+                return;
+            }
+            if (special)
+            {
+                vimperator.echoerr("E477: No ! allowed");
+                return;
+            }
 
             var ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
             var undoItems = eval("(" + ss.getClosedTabData(window) + ")");

From 4c799598a4cb1d743ca0d5320b5232779584d04a Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 30 Oct 2007 08:48:09 +0000
Subject: [PATCH 172/224] merge new <C-g> and g<C-g> mappings and improved
 :pageinfo

---
 NEWS                |  2 +-
 content/buffers.js  | 51 +++++++++++++++++++++++----------------------
 content/mappings.js | 19 +++++++++++++++++
 3 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/NEWS b/NEWS
index fdbcba63..0f12f958 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.3
-	* new :pa[geinfo] command (thanks Marco Candrian)
+	* new :pa[geinfo] command, and ctrl-g and g, ctrl-g mappings (thanks Marco Candrian)
 	* IMPORTANT! options are no longer automatically stored - use the
 	  ~/.vimperatorrc file instead for persistent options
 	* added new :mkvimperatorc command
diff --git a/content/buffers.js b/content/buffers.js
index 4d585cfd..885e539b 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -445,8 +445,8 @@ vimperator.Buffer = function() //{{{
         bumpZoomLevel(-steps);
     }
 
-    this.pageInfo = function(verbose) 
-    {  
+    this.pageInfo = function(verbose)
+    {
         // to get the file size later (from pageInfo.js) (setup cacheEntryDescriptor)
         const nsICacheService = Components.interfaces.nsICacheService;
         const ACCESS_READ = Components.interfaces.nsICache.ACCESS_READ;
@@ -469,23 +469,21 @@ vimperator.Buffer = function() //{{{
             catch (ex2) { }
         }
 
-        if (!verbose) 
+        if (!verbose)
         {
             // TODO: strip off any component after &
             var file = window.content.document.location.pathname.split('/').pop();
             if (!file)
                 file = "[No Name]";
 
-            var title = window.content.document.title; 
-            if (title.length > 60)
-                title = title.substr(0,57) + "... "; 
-            else if (!title.length)
-                title = "[No Title]";
+            var title = window.content.document.title || "[No Title]";
 
-            if (cacheEntryDescriptor) 
+            if (cacheEntryDescriptor)
                 var pageSize = Math.round(cacheEntryDescriptor.dataSize / 1024 * 100) / 100 + "KB";
 
-            var pageInfoText = "" + file + ": " + title  + "  (" + pageSize + ", other cool things)";
+            var lastmod = window.content.document.lastModified.slice(0, -3);
+
+            var pageInfoText = '"' + file + '" [' + pageSize + ", " + lastmod + "] " + title;
 
             vimperator.echo(pageInfoText, vimperator.commandline.FORCE_SINGLELINE);
             return;
@@ -495,42 +493,45 @@ vimperator.Buffer = function() //{{{
         var pageMeta = [];          // keeps meta infos
 
         // get general infos
-        pageGeneral.push(["Title", window.content.document.title]); 
-        pageGeneral.push(["URL", '<a class="hl-URL" href="' + window.content.document.location.toString() + '">' + 
+        pageGeneral.push(["Title", window.content.document.title]);
+        pageGeneral.push(["URL", '<a class="hl-URL" href="' + window.content.document.location.toString() + '">' +
                 window.content.document.location.toString() + '</a>']);
         pageGeneral.push(["Referrer",  ("referrer" in window.content.document && window.content.document.referrer)]);
         pageGeneral.push(["Mime-Type", window.content.document.contentType]);
         pageGeneral.push(["Encoding",  window.content.document.characterSet]);
 
-
-        if (cacheEntryDescriptor) {
+        if (cacheEntryDescriptor)
+        {
             var pageSize = cacheEntryDescriptor.dataSize;
-            pageGeneral.push(["File Size", (Math.round(pageSize / 1024 * 100) / 100) + "KB (" + pageSize + " bytes)"]);
+            var bytes = pageSize + '';
+            for (var u = bytes.length - 3; u > 0; u -= 3)        // make a 1400 -> 1'400
+                bytes = bytes.slice(0, u) + "," + bytes.slice(u, bytes.length);
+            pageGeneral.push(["File Size", (Math.round(pageSize / 1024 * 100) / 100) + "KB (" + bytes + " bytes)"]);
         }
 
-        pageGeneral.push(["Compatibility", content.document.compatMode == "BackCompat" ? 
-                "Quirks Mode" : "Full/Almost Standard Mode"]);
+        pageGeneral.push(["Compatibility", content.document.compatMode == "BackCompat" ?
+                "Quirks Mode" : "Full/Almost Standards Mode"]);
         pageGeneral.push(["Last Modified", window.content.document.lastModified]);
 
-        // get meta tag infos info and sort and put into pageMeta[]
+        // get meta tag data, sort and put into pageMeta[]
         var metaNodes = window.content.document.getElementsByTagName("meta");
         var length = metaNodes.length;
-        if (length) 
-        {           
+        if (length)
+        {
             var tmpSort = [];
             var tmpDict = [];
 
             for (var i = 0; i < length; i++)
             {
-                var tmpTag = metaNodes[i].name || metaNodes[i].httpEquiv;// + 
+                var tmpTag = metaNodes[i].name || metaNodes[i].httpEquiv;// +
                     //'<span style="font-weight: normal; font-size: 90%;">-eq</span>'; // XXX: really important?
                 var tmpTagNr = tmpTag + "-" + i;     // allows multiple (identical) meta names
                 tmpDict[tmpTagNr] = [tmpTag, metaNodes[i].content];
                 tmpSort.push(tmpTagNr);      // array for sorting
             }
 
-            // sort: ignore-case                        
-            tmpSort.sort(function (a,b){return a.toLowerCase() > b.toLowerCase() ? 1 : -1;}); 
+            // sort: ignore-case
+            tmpSort.sort(function (a,b){return a.toLowerCase() > b.toLowerCase() ? 1 : -1;});
 
             for (var i=0; i < tmpSort.length; i++)
             {
@@ -550,7 +551,7 @@ vimperator.Buffer = function() //{{{
                     for (var i = 0; i < pageGeneral.length; i++)
                     {
                         if (pageGeneral[i][1])
-                            pageInfoText += "<tr><td style='font-weight: bold;'>  " + pageGeneral[i][0] + ":&nbsp;</td><td>" + pageGeneral[i][1] + "</td></tr>";
+                            pageInfoText += "<tr><td style='font-weight: bold;'>  " + pageGeneral[i][0] + ": </td><td>" + pageGeneral[i][1] + "</td></tr>";
                     }
                     pageInfoText += "</table>";
                     break;
@@ -560,7 +561,7 @@ vimperator.Buffer = function() //{{{
                     {
                         for (var i = 0; i < pageMeta.length; i++)
                         {
-                            pageInfoText += "<tr><td style='font-weight: bold;'>  " + pageMeta[i][0] + ":&nbsp;</td><td>" + pageMeta[i][1] + "</td></tr>";
+                            pageInfoText += "<tr><td style='font-weight: bold;'>  " + pageMeta[i][0] + ": </td><td>" + pageMeta[i][1] + "</td></tr>";
                         }
                     }
                     else
diff --git a/content/mappings.js b/content/mappings.js
index 859a06ca..e1f5ba11 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -835,6 +835,25 @@ vimperator.Mappings = function() //{{{
         }
     ));
 
+    // page info
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["<C-g>"],
+        function(count) { vimperator.buffer.pageInfo(false); },
+        {
+            short_help: "Print the current file name",
+            help: "Also shows some additional file information like file size or the last modified date. " +
+                  "If <code class='argument'>{count}</code> is given print the current file name with full path.",
+            flags: vimperator.Mappings.flags.COUNT
+        }
+    ));
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["g<C-g>"],
+        function(count) { vimperator.buffer.pageInfo(true); },
+        {
+            short_help: "Print file information",
+            help: "Same as <code class='command'>:pa[geinfo]</code>."
+        }
+    ));
+
+
     // history manipulation and jumplist
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-o>"],
         function(count) { vimperator.history.stepTo(-(count > 1 ? count : 1)); },

From 6bc2054ce2e4a0aee189c6304f255b1105b681be Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 30 Oct 2007 09:03:53 +0000
Subject: [PATCH 173/224] allow :tabnext and :tabprevious to accept an arg and
 make gT use its count for relative tab motion

---
 NEWS                |  4 +++-
 content/commands.js | 44 +++++++++++++++++++++++++++++++++++++-------
 content/mappings.js | 12 ++++++------
 3 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/NEWS b/NEWS
index 0f12f958..718c0582 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,11 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.3
-	* new :pa[geinfo] command, and ctrl-g and g, ctrl-g mappings (thanks Marco Candrian)
 	* IMPORTANT! options are no longer automatically stored - use the
 	  ~/.vimperatorrc file instead for persistent options
+	* :tabnext and :tabprevious now accept an argument
+	* the count to gT now specifies a relative tab motion like Vim
+	* new :pa[geinfo] command, and ctrl-g and g, ctrl-g mappings (thanks Marco Candrian)
 	* added new :mkvimperatorc command
 	* remove :redraw and Ctrl-L commands as they rely on FF3 features
 	* :ls, :history and :bmarks output is now hyperlinked
diff --git a/content/commands.js b/content/commands.js
index f3def65e..f1af7797 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -178,6 +178,7 @@ vimperator.Commands = function() //{{{
         return null;
     }
 
+    // TODO: generalized 0 count handling -> "Zero count"
     // FIXME: doesn't really belong here...
     // return [null, null, null, null, heredoc_tag || false];
     //        [count, cmd, special, args] = match;
@@ -1470,10 +1471,30 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["tabn[ext]", "tn[ext]"],
-        function() { vimperator.tabs.select("+1", true); },
+        // TODO: count support
+        function(args)
         {
-            short_help: "Switch to the next tab",
-            help: "Cycles to the first tab, when the last is selected."
+            if (!args)
+            {
+                vimperator.tabs.select("+1", true);
+            }
+            else if (/^\d+$/.test(args))
+            {
+                var index = parseInt(args) - 1;
+                if (index < vimperator.tabs.count())
+                    vimperator.tabs.select(index, true);
+                else
+                    vimperator.beep();
+            }
+            else
+            {
+                vimperator.echoerr("E488: Trailing characters");
+            }
+        },
+        {
+            usage: ["tabn[ext] {count}"],
+            short_help: "Switch to the next or [count]th tab",
+            help: "Cycles to the first tab when the last is selected and <code class=\"argument\">{count}</code> is not specified."
         }
     ));
     addDefaultCommand(new vimperator.Command(["tabo[nly]"],
@@ -1503,11 +1524,20 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["tabp[revious]", "tp[revious]", "tabN[ext]", "tN[ext]"],
-        function() { vimperator.tabs.select("-1", true); },
+        // TODO: count support
+        function(args)
         {
-            usage: ["tabp[revious]", "tabN[ext]"],
-            short_help: "Switch to the previous tab",
-            help: "Cycles to the last tab, when the first is selected."
+            if (!args)
+                vimperator.tabs.select("-1", true);
+            else if (/^\d+$/.test(args))
+                vimperator.tabs.select("-" + args, true); // FIXME: urgh!
+            else
+                vimperator.echoerr("E488: Trailing characters");
+        },
+        {
+            usage: ["tabp[revious] {count}"],
+            short_help: "Switch to the previous tab or go [count] tabs back",
+            help: "Wraps around from the first tab to the last tab."
         }
     ));
     addDefaultCommand(new vimperator.Command(["tabr[ewind]", "tabfir[st]"],
diff --git a/content/mappings.js b/content/mappings.js
index e1f5ba11..d57493fd 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -483,19 +483,19 @@ vimperator.Mappings = function() //{{{
             help: "Works like <code class=\"mapping\">P</code>, but inverts the <code class=\"option\">'activate'</code> option."
         }
     ));
-    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gt", "<C-n>", "<C-Tab>"],
-        function(count) { vimperator.tabs.select(count > 0 ? count -1: "+1", count > 0 ? false : true); },
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gt", "<C-n>", "<C-Tab>", "<C-PageDown>"],
+        function(count) { vimperator.tabs.select(count > 0 ? count - 1: "+1", count > 0 ? false : true); },
         {
             short_help: "Go to the next tab",
             help: "Cycles to the first tab, when the last is selected.<br/>Count is supported: <code class=\"mapping\">3gt</code> goes to the third tab.",
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gT", "<C-p>", "<C-S-Tab>"],
-        function(count) { vimperator.tabs.select(count > 0 ? count -1: "-1", count > 0 ? false : true); },
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gT", "<C-p>", "<C-S-Tab>", "<C-PageUp>"],
+        function(count) { vimperator.tabs.select("-" + (count < 1 ? 1 : count), true); },
         {
-            short_help: "Go to the previous tab",
-            help: "Cycles to the last tab, when the first is selected.<br/>Count is supported: <code class=\"mapping\">3gT</code> goes to the third tab.",
+            short_help: "Go {count} pages back",
+            help: "Wraps around from the first tab to the last tab.<br/>Count is supported: <code class=\"mapping\">3gT</code> goes three tabs back.",
             flags: vimperator.Mappings.flags.COUNT
         }
     ));

From 6db70d9852f406ed99d672a16d62464ea2797b74 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 30 Oct 2007 09:04:31 +0000
Subject: [PATCH 174/224] only source JavaScript files (*.js) from the plugin
 directory on startup

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

diff --git a/content/vimperator.js b/content/vimperator.js
index 73a96392..1debbba0 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -761,7 +761,7 @@ const vimperator = (function() //{{{
                         var files = vimperator.io.readDirectory(plugin_dir.path);
                         vimperator.log("Sourcing plugin directory...", 3);
                         files.forEach(function(file) {
-                            if (!file.isDirectory())
+                            if (!file.isDirectory() && /\.js$/.test(file.path))
                                 vimperator.source(file.path, false);
                         });
                     }

From f2f6969fdbfa8aee3d518c3a4a34eeab0ce231be Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 30 Oct 2007 09:05:21 +0000
Subject: [PATCH 175/224] round the output times of :time to 2 decimal places

---
 content/commands.js | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index f1af7797..4ed16299 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1570,28 +1570,33 @@ vimperator.Commands = function() //{{{
                     var after_time = Date.now();
                 
                     if ((after_time - before_time) / count >= 100)
-                        var each = "<td>  Each time:</td><td align=\"right\"><span style=\"color: green\">" +
-                            ((after_time - before_time) / 1000.0 / count) +
-                            "</span></td><td>sec</td>";
+                    {
+                        var each = ((after_time - before_time) / 1000.0 / count);
+                        var each_units = "sec";
+                    }
                     else
-                        var each = "<td>  Each time:</td><td align=\"right\"><span style=\"color: green\">" +
-                            ((after_time - before_time) / count) +
-                            "</span></td><td>msec</td>";
+                    {
+                        var each = ((after_time - before_time) / count);
+                        var each_units = "msec";
+                    }
 
                     if (after_time - before_time >= 100)
-                        var total = "<td>  Total time:</td><td align=\"right\"><span style=\"color: red\">" +
-                            ((after_time - before_time) / 1000.0) +
-                            "</span></td><td>sec</td>";
+                    {
+                        var total = ((after_time - before_time) / 1000.0);
+                        var total_units = "sec";
+                    }
                     else
-                        var total = "<td>  Total time:</td><td align=\"right\"><span style=\"color: red\">" +
-                            (after_time - before_time) + "</span></td><td>msec</td>";
+                    {
+                        var total = (after_time - before_time);
+                        var total_units = "msec";
+                    }
 
                     var str = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
                               "<table>" +
                               "<tr align=\"left\" class=\"hl-Title\"><th colspan=\"3\">Code execution summary</th></tr>" +
                               "<tr><td>  Executed:</td><td align=\"right\"><span style=\"color: green\">" + count + "</span></td><td>times</td></tr>" +
-                              "<tr>" + each + "</tr>" +
-                              "<tr>" + total + "</tr>" +
+                              "<tr><td>  Each time:</td><td align=\"right\"><span style=\"color: green\">" + each.toFixed(2) + "</span></td><td>" + each_units + "</td></tr>" +
+                              "<tr><td>  Total time:</td><td align=\"right\"><span style=\"color: red\">" + total.toFixed(2) + "</span></td><td>" + total_units + "</td></tr>" +
                               "</table>";
 
                     vimperator.commandline.echo(str, vimperator.commandline.HL_NORMAL, true);
@@ -1610,7 +1615,7 @@ vimperator.Commands = function() //{{{
                     var after_time = Date.now();
                     
                     if (after_time - before_time >= 100)
-                        vimperator.echo("Total time: " + ((after_time - before_time) / 1000.0) + " sec");
+                        vimperator.echo("Total time: " + ((after_time - before_time) / 1000.0).toFixed(2) + " sec");
                     else
                         vimperator.echo("Total time: " + (after_time - before_time) + " msec");
                 }

From 8f064618648ea2ff0c6e8e77e6a9983a802f22cc Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 30 Oct 2007 09:20:36 +0000
Subject: [PATCH 176/224] make use of v.commandline.FORCE_MULTILINE in
 multiline echo calls

---
 content/bookmarks.js | 8 ++++----
 content/buffers.js   | 2 +-
 content/commands.js  | 2 +-
 content/mappings.js  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/content/bookmarks.js b/content/bookmarks.js
index 20116991..d502e512 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -281,7 +281,7 @@ vimperator.Bookmarks = function() //{{{
             }
             list += "</table>";
 
-            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
+            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
         }
     }
 
@@ -513,7 +513,7 @@ vimperator.History = function() //{{{
                 list += "<tr><td>" + title + "</td><td><a href=\"#\" class=\"hl-URL\">" + url + "</a></td></tr>";
             }
             list += "</table>";
-            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
+            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
         }
     }
     //}}}
@@ -769,7 +769,7 @@ vimperator.Marks = function() //{{{
         }
         list += "</table>";
 
-        vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true); // TODO: force of multiline widget a better way
+        vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
     }
     //}}}
 } //}}}
@@ -861,7 +861,7 @@ vimperator.QuickMarks = function() //{{{
         }
         list += "</table>";
 
-        vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true); // TODO: force of multiline widget a better way
+        vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
     }
 
     this.destroy = function()
diff --git a/content/buffers.js b/content/buffers.js
index 885e539b..b45f234e 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -208,7 +208,7 @@ vimperator.Buffer = function() //{{{
             }
             list += "</table>";
 
-            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
+            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
         }
     }
 
diff --git a/content/commands.js b/content/commands.js
index 4ed16299..521830d3 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1599,7 +1599,7 @@ vimperator.Commands = function() //{{{
                               "<tr><td>  Total time:</td><td align=\"right\"><span style=\"color: red\">" + total.toFixed(2) + "</span></td><td>" + total_units + "</td></tr>" +
                               "</table>";
 
-                    vimperator.commandline.echo(str, vimperator.commandline.HL_NORMAL, true);
+                    vimperator.commandline.echo(str, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
                 }
                 else
                 {
diff --git a/content/mappings.js b/content/mappings.js
index d57493fd..c6d48f84 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -292,7 +292,7 @@ vimperator.Mappings = function() //{{{
         }
         list += "</table>";
 
-        vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true); // TODO: force of multiline widget a better way
+        vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
     }
 
     /////////////////////////////////////////////////////////////////////////////}}}

From 60f6b623d84015457c3707535bb54a1941451190 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 30 Oct 2007 09:24:51 +0000
Subject: [PATCH 177/224] merge improved v.buffer.evaluateXPath

---
 content/buffers.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/content/buffers.js b/content/buffers.js
index b45f234e..85320fff 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -144,12 +144,14 @@ vimperator.Buffer = function() //{{{
     });
 
     // returns an XPathResult object
-    this.evaluateXPath = function(expression, doc, ordered)
+    this.evaluateXPath = function(expression, doc, elem, ordered)
     {
         if (!doc)
             doc = window.content.document;
+        if (!elem)
+            elem = doc;
 
-        var result = doc.evaluate(expression, doc,
+        var result = doc.evaluate(expression, elem,
             function lookupNamespaceURI(prefix) {
               switch (prefix) {
                 case 'xhtml':

From 8cbaaf1c441d6e12fd11c520b0a38ce4c5e05e52 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 30 Oct 2007 09:30:23 +0000
Subject: [PATCH 178/224] move :pageinfo command definition to its proper
 alphabetical position

---
 content/commands.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index 521830d3..a5b72c98 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -225,14 +225,6 @@ vimperator.Commands = function() //{{{
     ////////////////////// DEFAULT COMMANDS ////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    addDefaultCommand(new vimperator.Command(["pa[geinfo]"],
-        function () { vimperator.buffer.pageInfo(true); },
-        {
-            short_help: "Show general and/or meta-content site informations",
-            help: "Show general and/or meta-content site informations"
-        }
-    ));
-
     addDefaultCommand(new vimperator.Command(["addo[ns]"],
         function() { vimperator.open("chrome://mozapps/content/extensions/extensions.xul", vimperator.NEW_TAB); },
         {
@@ -1067,6 +1059,13 @@ vimperator.Commands = function() //{{{
             completer: function(filter) { return vimperator.completion.get_url_completions(filter); }
         }
     ));
+    addDefaultCommand(new vimperator.Command(["pa[geinfo]"],
+        function () { vimperator.buffer.pageInfo(true); },
+        {
+            short_help: "Show general and/or meta-content site informations",
+            help: "Show general and/or meta-content site informations"
+        }
+    ));
     addDefaultCommand(new vimperator.Command(["pc[lose]"],
         function() { vimperator.previewwindow.hide(); },
         {
@@ -1568,7 +1567,7 @@ vimperator.Commands = function() //{{{
                         return;
 
                     var after_time = Date.now();
-                
+
                     if ((after_time - before_time) / count >= 100)
                     {
                         var each = ((after_time - before_time) / 1000.0 / count);
@@ -1613,7 +1612,7 @@ vimperator.Commands = function() //{{{
                         return;
 
                     var after_time = Date.now();
-                    
+
                     if (after_time - before_time >= 100)
                         vimperator.echo("Total time: " + ((after_time - before_time) / 1000.0).toFixed(2) + " sec");
                     else

From 323a5f5e33eddd264e512c9ffa3a1aa1bc499746 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 30 Oct 2007 09:33:51 +0000
Subject: [PATCH 179/224] merge improved :version command

---
 content/commands.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/content/commands.js b/content/commands.js
index a5b72c98..c2067057 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1758,7 +1758,8 @@ vimperator.Commands = function() //{{{
             if (special)
                 vimperator.open("about:");
             else
-                vimperator.echo("Vimperator " + vimperator.version);
+                vimperator.echo(":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) +
+                                "\nVimperator " + vimperator.version + " running on:\n" + navigator.userAgent);
         },
         {
             usage: ["ve[rsion][!]"],

From 86d147da74cb375f3ff581269a46fe577d445a06 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 30 Oct 2007 09:44:30 +0000
Subject: [PATCH 180/224] make sure the MOW is not used when 'ssli' is set to 2

---
 content/events.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/content/events.js b/content/events.js
index 609b60a1..3896f259 100644
--- a/content/events.js
+++ b/content/events.js
@@ -597,7 +597,6 @@ vimperator.Events = function() //{{{
             return true;
         }
 
-
         var count_str = vimperator.input.buffer.match(/^[0-9]*/)[0];
         var candidate_command = (vimperator.input.buffer + key).replace(count_str, '');
         var map;
@@ -648,7 +647,6 @@ vimperator.Events = function() //{{{
             else
             {
                 vimperator.input.buffer = "";
-                // vimperator.log("executed: " + candidate_command + " in mode: " + mode, 8);
                 map.execute(null, vimperator.input.count);
             }
         }
@@ -763,7 +761,7 @@ vimperator.Events = function() //{{{
                 if (ssli == 1)
                     vimperator.statusline.updateUrl("Link: " + link);
                 else if (ssli == 2)
-                    vimperator.echo("Link: " + link);
+                    vimperator.echo("Link: " + link, vimperator.commandline.DISALLOW_MULTILINE);
             }
 
             if (link == "")

From 9f46180257995bf4fb04491ca77fbb4e7a6bb26b Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 30 Oct 2007 12:34:59 +0000
Subject: [PATCH 181/224] make sure frame, iframe and area elements are
 properly hinted on XHTML pages

---
 content/hints.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/content/hints.js b/content/hints.js
index 7b514107..2d4a625b 100644
--- a/content/hints.js
+++ b/content/hints.js
@@ -483,14 +483,14 @@ vimperator.Hints = function() //{{{
 
             setHintStyle(elem, vimperator.options["hintstyle"]);
             elem = elem.refElem;
-            var elemTagName = elem.tagName;
+            var elemTagName = elem.localName.toLowerCase();
             elem.focus();
 
-            if (elemTagName == 'FRAME' || elemTagName == 'IFRAME')
+            if (elemTagName == 'frame' || elemTagName == 'iframe')
                 return 0;
 
             // for imagemap
-            if (elemTagName == 'AREA')
+            if (elemTagName == 'area')
             {
                 var coords = elem.getAttribute("coords").split(",");
                 x = Number(coords[0]);
@@ -588,8 +588,9 @@ vimperator.Hints = function() //{{{
     function setMouseOverElement(elem)
     {
         var doc = window.document;
+        var elemTagName = elem.localName.toLowerCase();
 
-        if (elem.tagName == 'FRAME' || elem.tagName == 'IFRAME')
+        if (elemTagName == 'frame' || elemTagName == 'iframe')
         {
             elem.contentWindow.focus();
             return;
@@ -603,7 +604,7 @@ vimperator.Hints = function() //{{{
         var x = 0;
         var y = 0;
         // for imagemap
-        if (elem.tagName == 'AREA')
+        if (elemTagName == 'area')
         {
             var coords = elem.getAttribute("coords").split(",");
             x = Number(coords[0]);

From 14e4cf2f56d3dc0f9d34b1accb3318240d4bfa16 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 1 Nov 2007 09:56:33 +0000
Subject: [PATCH 182/224] merge those pesky missing semicolons

---
 content/buffers.js    |  2 +-
 content/commands.js   | 46 +++++++++++++++++++++++++------------------
 content/completion.js | 25 +++++++++++------------
 content/events.js     | 18 ++++++++---------
 content/find.js       | 10 +++++-----
 content/help.js       |  6 +++---
 content/hints.js      |  2 +-
 content/io.js         |  2 +-
 content/mappings.js   | 16 +++++++--------
 content/options.js    |  2 +-
 content/tabs.js       |  3 ++-
 content/ui.js         |  6 +++---
 content/util.js       |  8 ++++----
 content/vimperator.js | 18 ++++++++---------
 14 files changed, 86 insertions(+), 78 deletions(-)

diff --git a/content/buffers.js b/content/buffers.js
index 85320fff..958ac412 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -32,7 +32,7 @@ vimperator.Buffer = function() //{{{
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
     // used for the "B" mapping to remember the last :buffer[!] command
-    var lastBufferSwitchArgs = ""; 
+    var lastBufferSwitchArgs = "";
     var lastBufferSwitchSpecial = true;
 
     var zoom_manager = ZoomManager.prototype.getInstance();
diff --git a/content/commands.js b/content/commands.js
index c2067057..462a56d6 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -113,10 +113,14 @@ vimperator.Command.prototype.hasName = function(name)
     for (var i = 0; i < this.specs.length; i++)
     {
         if (this.specs[i] == name)                    // literal command name
+        {
             return true;
+        }
         else if (this.specs[i].match(/^(\w+|!)\[\w+\]$/)) // abbreviation spec
+        {
             if (matchAbbreviation(name, this.specs[i]))
                 return true;
+        }
     }
     return false;
 }
@@ -413,7 +417,7 @@ vimperator.Commands = function() //{{{
             if (special && args)
             {
                 vimperator.echoerr("E474: Invalid argument");
-                return
+                return;
             }
             var matches;
             if (matches = args.match(/(?:(?:^|[^a-zA-Z0-9])-|-(?:$|[^a-zA-Z0-9])|[^a-zA-Z0-9 -]).*/))
@@ -467,7 +471,7 @@ vimperator.Commands = function() //{{{
             if (special && args)
             {
                 vimperator.echoerr("E474: Invalid argument");
-                return
+                return;
             }
 
             if (special)
@@ -788,7 +792,7 @@ vimperator.Commands = function() //{{{
                 return;
             }
 
-            var matches = args.match(/^([^\s]+)(?:\s+(.+))?$/)
+            var matches = args.match(/^([^\s]+)(?:\s+(.+))?$/);
             var [lhs, rhs] = [matches[1], matches[2]];
             var leader_reg = /<Leader>/i;
 
@@ -874,7 +878,7 @@ vimperator.Commands = function() //{{{
             }
 
             var filter = args.replace(/[^a-zA-Z]/g, '');
-            vimperator.marks.list(filter)
+            vimperator.marks.list(filter);
         },
         {
             usage: ["marks [arg]"],
@@ -884,20 +888,20 @@ vimperator.Commands = function() //{{{
     ));
     addDefaultCommand(new vimperator.Command(["mkv[imperatorrc]"],
         function(args, special)
-        {   
+        {
             var filename;
-            
+
             // TODO: "E172: Only one file name allowed"
             if (args)
                 filename = args;
             else
                 filename = vimperator.io.expandPath(navigator.platform == "Win32" ? "~/_vimperatorrc" : "~/.vimperatorrc");
-            
+
             var file = vimperator.io.getFile(filename);
             if (file.exists() && !special)
             {
                 vimperator.echoerr("E189: \".vimperatorrc\" exists (add ! to override)");
-                return
+                return;
             }
 
             var line = "\" " + vimperator.version + "\n";
@@ -910,7 +914,7 @@ vimperator.Commands = function() //{{{
             }
 
             for (var option in vimperator.options)
-            {   
+            {
                 // TODO: options should be queried for this info
                 // TODO: string/list options might need escaping in future
                 if (!/fullscreen|usermode/.test(option.name) && option.value != option.default_value)
@@ -926,7 +930,7 @@ vimperator.Commands = function() //{{{
 
             vimperator.io.writeFile(file, line);
         },
-        {   
+        {
             usage: ["mkv[imperatorrc] [file]"],
             short_help: "Write current keymappings and changed options to [file]",
             help: "If no <code class=\"argument\">[file]</code> is specified then ~/.vimperatorrc is written unless this file already exists. " +
@@ -1207,7 +1211,7 @@ vimperator.Commands = function() //{{{
             var only_non_default = false; //used for :set to print non-default options
             if (!args)
             {
-                args = "all?"
+                args = "all?";
                 only_non_default = true;
             }
 
@@ -1389,14 +1393,14 @@ vimperator.Commands = function() //{{{
             // do nothing if the requested sidebar is already open
             if (document.getElementById("sidebar-title").value == args)
                 return;
-            
-            var menu = document.getElementById("viewSidebarMenu")
+
+            var menu = document.getElementById("viewSidebarMenu");
 
             for (var i = 0; i < menu.childNodes.length; i++)
             {
                 if (menu.childNodes[i].label == args)
                 {
-                    eval(menu.childNodes[i].getAttribute('oncommand'))
+                    eval(menu.childNodes[i].getAttribute('oncommand'));
                     break;
                 }
             }
@@ -1557,11 +1561,15 @@ vimperator.Commands = function() //{{{
                     var before_time = Date.now();
 
                     if (args && args[0] == ":")
+                    {
                         while (i--)
                             vimperator.execute(args);
+                    }
                     else
+                    {
                         while (i--)
                             eval(args);
+                    }
 
                     if (special)
                         return;
@@ -1700,7 +1708,7 @@ vimperator.Commands = function() //{{{
             short_help: "Undo closing of all closed tabs",
             help: "Firefox stores up to 10 closed tabs, even after a browser restart."
         }
-    )),
+    ));
     addDefaultCommand(new vimperator.Command(["unl[et]"],
         function(args, special)
         {
@@ -1780,7 +1788,7 @@ vimperator.Commands = function() //{{{
         },
         {
             usage: ["winc[ose] [url] [, url]"],
-            short_help: "Close window",
+            short_help: "Close window"
         }
     ));
     addDefaultCommand(new vimperator.Command(["wino[pen]", "wo[pen]", "wine[dit]"],
@@ -1862,7 +1870,7 @@ vimperator.Commands = function() //{{{
             args = args.replace(/(^|[^\\])!/g, "$1" + last_run_command);
             last_run_command = args;
 
-            var output = vimperator.system(args)
+            var output = vimperator.system(args);
             if (output)
                 vimperator.echo(vimperator.util.escapeHTML(output));
         },
@@ -1910,7 +1918,7 @@ String.prototype.toURLArray = function() // {{{
         {
             var location = window.content.document.location;
             var tail = matches[1] ? matches[1] : "";
-            urls[url] = location.protocol + "//" + location.host + "/" + tail
+            urls[url] = location.protocol + "//" + location.host + "/" + tail;
             continue;
         }
 
@@ -1919,7 +1927,7 @@ String.prototype.toURLArray = function() // {{{
         // or keyword bookmark
         if (/\s/.test(urls[url]) || !/[.:\/]/.test(urls[url]))
         {
-            matches = urls[url].match(/^(\S+)(?:\s+(.+))?$/)
+            matches = urls[url].match(/^(\S+)(?:\s+(.+))?$/);
 
             var alias = matches[1];
             var text = matches[2] ? matches[2] : null;
diff --git a/content/completion.js b/content/completion.js
index 5121594d..9534900d 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -278,12 +278,7 @@ vimperator.Completion = function() // {{{
                               [["options"], "Configuration options"]]; // TODO: hardcoded until we have proper 'pages'
             g_substrings = [];
             for (var command in vimperator.commands)
-            {
-                help_array.push([command.long_names.map(function($_) {
-                                                            return ":" + $_;
-                                                        }),
-                                command.short_help])
-            }
+                help_array.push([command.long_names.map(function($_) { return ":" + $_; }), command.short_help]);
             options = this.get_options_completions(filter, true);
             help_array = help_array.concat(options.map(function($_) {
                 return [
@@ -292,7 +287,7 @@ vimperator.Completion = function() // {{{
                     ];
             }));
             for (var map in vimperator.mappings)
-                help_array.push([map.names, map.short_help])
+                help_array.push([map.names, map.short_help]);
 
             if (!filter) return help_array.map(function($_) {
                 return [$_[0][0], $_[1]]; // unfiltered, use the first command
@@ -304,7 +299,7 @@ vimperator.Completion = function() // {{{
         get_command_completions: function(filter) //{{{
         {
             g_substrings = [];
-            var completions = []
+            var completions = [];
             if (!filter)
             {
                 for (var command in vimperator.commands)
@@ -333,7 +328,7 @@ vimperator.Completion = function() // {{{
                 {
                     if (prefix && option.type != "boolean")
                         continue;
-                    options.push([option.names, option.short_help])
+                    options.push([option.names, option.short_help]);
                 }
                 return options;
             }
@@ -345,7 +340,7 @@ vimperator.Completion = function() // {{{
                 {
                     if (prefix && option.type != "boolean")
                         continue;
-                    options.push([prefix + option.name, option.short_help])
+                    options.push([prefix + option.name, option.short_help]);
                 }
                 return options;
             }
@@ -447,7 +442,7 @@ vimperator.Completion = function() // {{{
             var mapped = nodes.map(function(node) {
                 return [[node[0]], node[1]];
             });
-            
+
             return build_longest_common_substring(mapped, filter);
         }, //}}}
 
@@ -489,7 +484,7 @@ vimperator.Completion = function() // {{{
             }
             object = matches[1].substr(start+1) || "window";
 
-            var completions = []; 
+            var completions = [];
             try
             {
                 completions = eval(
@@ -513,7 +508,11 @@ vimperator.Completion = function() // {{{
                     "     else {" +
                     "          comp.push([[i], type]); }" +
                     "} comp;");
-            } catch (e) { completions = []; };
+            }
+            catch (e)
+            {
+                completions = [];
+            }
 
             return build_longest_starting_substring(completions, filter);
         }, // }}}
diff --git a/content/events.js b/content/events.js
index 3896f259..c00e00f3 100644
--- a/content/events.js
+++ b/content/events.js
@@ -40,7 +40,7 @@ vimperator.Events = function() //{{{
     // any tab related events
     var tabcontainer = getBrowser().tabContainer;
     tabcontainer.addEventListener("TabMove",   function(event) {
-        vimperator.statusline.updateTabCount()
+        vimperator.statusline.updateTabCount();
         vimperator.buffer.updateBufferList();
     }, false);
     tabcontainer.addEventListener("TabOpen",   function(event) {
@@ -48,7 +48,7 @@ vimperator.Events = function() //{{{
         vimperator.buffer.updateBufferList();
     }, false);
     tabcontainer.addEventListener("TabClose",  function(event) {
-        vimperator.statusline.updateTabCount()
+        vimperator.statusline.updateTabCount();
         vimperator.buffer.updateBufferList();
     }, false);
     tabcontainer.addEventListener("TabSelect", function(event) {
@@ -152,7 +152,7 @@ vimperator.Events = function() //{{{
         [ KeyEvent.DOM_VK_F21, ["F21"] ],
         [ KeyEvent.DOM_VK_F22, ["F22"] ],
         [ KeyEvent.DOM_VK_F23, ["F23"] ],
-        [ KeyEvent.DOM_VK_F24, ["F24"] ],
+        [ KeyEvent.DOM_VK_F24, ["F24"] ]
     ];
 
     function getKeyCode(str)
@@ -372,13 +372,13 @@ vimperator.Events = function() //{{{
             switch (event.button)
             {
                 case 0:
-                    key = "LeftMouse"
+                    key = "LeftMouse";
                     break;
                 case 1:
-                    key = "MiddleMouse"
+                    key = "MiddleMouse";
                     break;
                 case 2:
-                    key = "RightMouse"
+                    key = "RightMouse";
                     break;
             }
         }
@@ -774,9 +774,9 @@ vimperator.Events = function() //{{{
         },
 
         // stub functions for the interfaces
-        setJSStatus : function(status) { ; },
-        setJSDefaultStatus : function(status) { ; },
-        setDefaultStatus : function(status) { ; },
+        setJSStatus: function(status) { ; },
+        setJSDefaultStatus: function(status) { ; },
+        setDefaultStatus: function(status) { ; },
         onLinkIconAvailable: function() { ; }
     };
 
diff --git a/content/find.js b/content/find.js
index fa51bd8a..712d8e91 100644
--- a/content/find.js
+++ b/content/find.js
@@ -81,7 +81,7 @@ vimperator.Search = function() //{{{
             links_only = false;
 
         // strip links-only modifiers
-        pattern = pattern.replace(/(\\)?\\[uU]/g, function($0, $1) { return $1 ? $0 : "" });
+        pattern = pattern.replace(/(\\)?\\[uU]/g, function($0, $1) { return $1 ? $0 : ""; });
 
         // case sensitivity - \c wins if both modifiers specified
         if (/\c/.test(pattern))
@@ -96,10 +96,10 @@ vimperator.Search = function() //{{{
             case_sensitive = true;
 
         // strip case-sensitive modifiers
-        pattern = pattern.replace(/(\\)?\\[cC]/g, function($0, $1) { return $1 ? $0 : "" });
+        pattern = pattern.replace(/(\\)?\\[cC]/g, function($0, $1) { return $1 ? $0 : ""; });
 
         // remove any modifer escape \
-        pattern = pattern.replace(/\\(\\[cCuU])/g, '$1')
+        pattern = pattern.replace(/\\(\\[cCuU])/g, '$1');
 
         search_string = pattern;
     }
@@ -246,8 +246,8 @@ vimperator.Search = function() //{{{
         (function(win)
         {
             for (var i = 0; i < win.frames.length; i++)
-                arguments.callee(win.frames[i])
-            var spans = vimperator.buffer.evaluateXPath('//span[@id="__firefox-findbar-search-id"]', win.document)
+                arguments.callee(win.frames[i]);
+            var spans = vimperator.buffer.evaluateXPath('//span[@id="__firefox-findbar-search-id"]', win.document);
             for (var i = 0; i < spans.snapshotLength; i++)
                 spans.snapshotItem(i).setAttribute("style", vimperator.options["hlsearchstyle"]);
         })(window.content);
diff --git a/content/help.js b/content/help.js
index 45e054ac..c10fdf78 100644
--- a/content/help.js
+++ b/content/help.js
@@ -131,7 +131,7 @@ vimperator.help = function(section, easter) //{{{
         return ret;
     }
 
-    var header = '<h1><img src="chrome://vimperator/content/logo_white.png" alt="Vimperator"/></h1>' + 
+    var header = '<h1><img src="chrome://vimperator/content/logo_white.png" alt="Vimperator"/></h1>' +
         '<p class="tagline">First there was a Navigator, then there was an Explorer.\n' +
         'Later it was time for a Konqueror. Now it\'s time for an Imperator, the VIMperator :)</p>';
 
@@ -155,7 +155,7 @@ vimperator.help = function(section, easter) //{{{
         '<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHPwYJKoZIhvcNAQcEoIIHMDCCBywCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYBDDJfc+lXLBSAM9XSWv/ebzG/L7PTqYiIXaWVg8pfinDsfYaAcifcgCTuApg4v/VaZIQ/hLODzQu2EvmjGXP0twErA/Q8G5gx0l197PJSyVXb1sLwd1mgOdLF4t0HmDCdEI9z3H6CMhsb3xVwlfpzllSfCIqzlSpx4QtdzEZGzLDELMAkGBSsOAwIaBQAwgbwGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQI8ZOwn5QkHgaAgZjjtPQxB7Vw2rS7Voap9y+xdVLoczUQ97hw+bOdZLcGykBtfoVjdn76MS51QKjGp1fEmxkqTuQ+Fxv8+OVtHu0QF/qlrhmC3fJBRJ0IFWxKdXS+Wod4615BDaG2X1hzvCL443ffka8XlLSiFTuW43BumQs/O+6Jqsk2hcReP3FIQOvtWMSgGTALnZx7x5c60u/3NSKW5qvyWKCCA4cwggODMIIC7KADAgECAgEAMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTAeFw0wNDAyMTMxMDEzMTVaFw0zNTAyMTMxMDEzMTVaMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwUdO3fxEzEtcnI7ZKZL412XvZPugoni7i7D7prCe0AtaHTc97CYgm7NsAtJyxNLixmhLV8pyIEaiHXWAh8fPKW+R017+EmXrr9EaquPmsVvTywAAE1PMNOKqo2kl4Gxiz9zZqIajOm1fZGWcGS0f5JQ2kBqNbvbg2/Za+GJ/qwUCAwEAAaOB7jCB6zAdBgNVHQ4EFgQUlp98u8ZvF71ZP1LXChvsENZklGswgbsGA1UdIwSBszCBsIAUlp98u8ZvF71ZP1LXChvsENZklGuhgZSkgZEwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAgV86VpqAWuXvX6Oro4qJ1tYVIT5DgWpE692Ag422H7yRIr/9j/iKG4Thia/Oflx4TdL+IFJBAyPK9v6zZNZtBgPBynXb048hsP16l2vi0k5Q2JKiPDsEfBhGI+HnxLXEaUWAcVfCsQFvd2A1sxRr67ip5y2wwBelUecP3AjJ+YcxggGaMIIBlgIBATCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwCQYFKw4DAhoFAKBdMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTA3MDMyMTIyMzI1OFowIwYJKoZIhvcNAQkEMRYEFCirrvlwYVHQiNEEbM6ikfx9+Dm5MA0GCSqGSIb3DQEBAQUABIGAtbsR8GdCdURLziozXLSdtY+zJZUPPeQFXXy2V1S/3ldiN+pRvd4HI7xz8mOY1UaKJZpwZnOosy9MflL1/hbiEtEyQ2Dm/s4jnTcJng/NjLIZu+0NYxXRJhB+zMJubnMMMjzNrGlqI4F2HAB/bCA1eOJ5B83Of3dA4rk/T/8GoSQ=-----END PKCS7-----"/>' +
         '</fieldset></form>' +
 
-        '<p>Of course as a believer in free open source software, only make a donation if you really like Vimperator and the money doesn\'t hurt - otherwise just use it, recommend it and like it :)</p>'
+        '<p>Of course as a believer in free open source software, only make a donation if you really like Vimperator and the money doesn\'t hurt - otherwise just use it, recommend it and like it :)</p>';
 
     var initialization = '<span style="float: right"><code class="tag">initialization</code></span><h2 id="initialization">Initialization</h2>' +
         '<p>At startup Vimperator sources a user RC file, containing Ex commands, and any JavaScript files found in the plugin directory.</p>' +
@@ -178,7 +178,7 @@ vimperator.help = function(section, easter) //{{{
 
     var mappings = '<span style="float: right"><code class="tag">mappings</code></span><h2 id="mappings">Mappings</h2>' +
         '<p>The denotion of modifier keys is like in Vim, so C- means the Control key, M- the Meta key, A- the Alt key and S- the Shift key.</p>'+
-        '<table class="vimperator mappings">'
+        '<table class="vimperator mappings">';
     mappings += makeHelpString(vimperator.mappings, "", "", null);
     mappings += '</table>';
     if (section && section == 'holy-grail')
diff --git a/content/hints.js b/content/hints.js
index 2d4a625b..034cf83a 100644
--- a/content/hints.js
+++ b/content/hints.js
@@ -412,7 +412,7 @@ vimperator.Hints = function() //{{{
         showHints(null, 0);
 
         return true;
-    };
+    }
 
     /**
      * Disables the HaH-mode by hiding the hints and disabling the input mode
diff --git a/content/io.js b/content/io.js
index b861652a..54d58e27 100644
--- a/content/io.js
+++ b/content/io.js
@@ -27,7 +27,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.IO = function() 
+vimperator.IO = function()
 {
     var environment_service = Components.classes["@mozilla.org/process/environment;1"]
         .getService(Components.interfaces.nsIEnvironment);
diff --git a/content/mappings.js b/content/mappings.js
index c6d48f84..4738adb6 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -143,7 +143,7 @@ vimperator.Mappings = function() //{{{
             {
                 if (names[j] == cmd)
                 {
-                    names.splice(j, 1)
+                    names.splice(j, 1);
 
                     if (names.length == 0)
                         maps.splice(i, 1);
@@ -260,7 +260,7 @@ vimperator.Mappings = function() //{{{
             for (var j = 0; j < map.names.length; j++)
             {
                 if (map.names[j].indexOf(cmd) == 0)
-                    matches.push(map)
+                    matches.push(map);
             }
         }
 
@@ -284,7 +284,7 @@ vimperator.Mappings = function() //{{{
             for (var j = 0; j < maps[i].names.length; j++)
             {
                 list += "<tr>";
-                list += "<td> " + vimperator.util.escapeHTML(maps[i].names[j]) + "</td>"
+                list += "<td> " + vimperator.util.escapeHTML(maps[i].names[j]) + "</td>";
                 if (maps[i].rhs)
                     list += "<td> " + vimperator.util.escapeHTML(maps[i].rhs) + "</td>"
                 list += "</tr>";
@@ -446,7 +446,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["go"],
-        function(arg) { vimperator.quickmarks.jumpTo(arg, vimperator.CURRENT_TAB) },
+        function(arg) { vimperator.quickmarks.jumpTo(arg, vimperator.CURRENT_TAB); },
         {
             short_help: "Jump to a QuickMark in the current tab",
             usage: ["go{a-zA-Z0-9}"],
@@ -516,7 +516,7 @@ vimperator.Mappings = function() //{{{
             // should probably reopen the closed tab when a 'deleted'
             // alternate is selected
             if (index == -1)
-                vimperator.echoerr("E86: Buffer does not exist")  // TODO: This should read "Buffer N does not exist"
+                vimperator.echoerr("E86: Buffer does not exist");  // TODO: This should read "Buffer N does not exist"
             else
                 vimperator.tabs.select(index);
         },
@@ -535,7 +535,7 @@ vimperator.Mappings = function() //{{{
                 return;
             }
 
-            vimperator.marks.add(arg)
+            vimperator.marks.add(arg);
         },
         {
             short_help: "Set mark at the cursor position",
@@ -545,7 +545,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["'", "`"],
-        function(arg) { vimperator.marks.jumpTo(arg) },
+        function(arg) { vimperator.marks.jumpTo(arg); },
         {
             short_help: "Jump to the mark in the current buffer",
             usage: ["'{a-zA-Z}"],
@@ -562,7 +562,7 @@ vimperator.Mappings = function() //{{{
                 return;
             }
 
-            vimperator.quickmarks.add(arg, vimperator.buffer.URL)
+            vimperator.quickmarks.add(arg, vimperator.buffer.URL);
         },
         {
             short_help: "Add new QuickMark for current URL",
diff --git a/content/options.js b/content/options.js
index 449af7bf..8005274f 100644
--- a/content/options.js
+++ b/content/options.js
@@ -439,7 +439,7 @@ vimperator.Options = function() //{{{
                   "</ul>" +
                   "The order matters",
             default_value: "gm",
-            validator: function (value) { if (/[^gm]/.test(value) || value.length > 2 || 
+            validator: function (value) { if (/[^gm]/.test(value) || value.length > 2 ||
                     value.length < 1) return false; else return true; }
         }
     ));
diff --git a/content/tabs.js b/content/tabs.js
index 220523d3..f2a85ead 100644
--- a/content/tabs.js
+++ b/content/tabs.js
@@ -256,7 +256,8 @@ vimperator.Tabs = function() //{{{
                 {
                     this.reload(getBrowser().mTabs[i], bypass_cache)
                 }
-                catch (e) {
+                catch (e)
+                {
                     // FIXME: can we do anything useful here without stopping the
                     //        other tabs from reloading?
                 }
diff --git a/content/ui.js b/content/ui.js
index 864999ac..a7ff62d0 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -93,7 +93,7 @@ vimperator.CommandLine = function() //{{{
 
     // for the example command "open sometext| othertext" (| is the cursor pos):
     var completion_start_index = 0;  // will be 5 because we want to complete arguments for the :open command
-    var completion_prefix = ""       // will be: "open sometext"
+    var completion_prefix = "";      // will be: "open sometext"
     var completion_postfix = "";     // will be: " othertext"
 
     var wild_index = 0;  // keep track how often we press <Tab> in a row
@@ -682,7 +682,7 @@ vimperator.CommandLine = function() //{{{
                 if (vimperator.options["more"] && isScrollable() && !atEnd())
                     win.scrollByLines(1);
                 else
-                    close_window = true;; // don't propagate the event for accept keys
+                    close_window = true; // don't propagate the event for accept keys
                 break;
 
             // up a line
@@ -807,7 +807,7 @@ vimperator.CommandLine = function() //{{{
 
             // close the window
             case "q":
-                close_window = true;;
+                close_window = true;
                 break;
 
             // unmapped key
diff --git a/content/util.js b/content/util.js
index f095a95b..203543fd 100644
--- a/content/util.js
+++ b/content/util.js
@@ -28,7 +28,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 
 vimperator.util = {
     escapeHTML: function(str)
-    {   
+    {
         var e = window.content.document.createElement("div");
         e.appendChild(window.content.document.createTextNode(str));
         return e.innerHTML;
@@ -51,7 +51,7 @@ vimperator.util = {
                 arg = '"' + vimperator.util.escapeHTML(arg.replace(/\n/, "\\n")) + '"';
 
             return "<span style=\"color: green;\">" + arg + "</span>";
-        }           
+        }
         else if (type == "boolean")
         {
             return "<span style=\"color: blue;\">" + arg + "</span>";
@@ -62,9 +62,9 @@ vimperator.util = {
         }
         else if (type == "object" || type == "function")
         {
-            // for java packages value.toString() would crash so badly 
+            // for java packages value.toString() would crash so badly
             // that we cannot even try/catch it
-            if (/^\[JavaPackage.*\]$/.test(arg)) 
+            if (/^\[JavaPackage.*\]$/.test(arg))
                 return "[JavaPackage]";
 
             var str = arg.toString();
diff --git a/content/vimperator.js b/content/vimperator.js
index 1debbba0..27f94a28 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -456,7 +456,7 @@ const vimperator = (function() //{{{
                     var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
                                .getService(Components.interfaces.nsIWindowMediator);
                     whichwindow = wm.getMostRecentWindow("navigator:browser");
-                    whichwindow.loadURI(url, null, postdata)
+                    whichwindow.loadURI(url, null, postdata);
                     break;
 
                 default:
@@ -559,7 +559,7 @@ const vimperator = (function() //{{{
 
             var process = Cc["@mozilla.org/process/util;1"].createInstance(Ci.nsIProcess);
             process.init(file);
-             
+
             var ec = process.run(blocking, args, args.length);
             return ec;
         },
@@ -801,16 +801,16 @@ const vimperator = (function() //{{{
 
         sleep: function(ms)
         {
-            var threadManager = Cc["@mozilla.org/thread-manager;1"].getService(Ci.nsIThreadManager); 
-            var mainThread = threadManager.mainThread; 
+            var threadManager = Cc["@mozilla.org/thread-manager;1"].getService(Ci.nsIThreadManager);
+            var mainThread = threadManager.mainThread;
 
-            var then = new Date().getTime(), now = then; 
-            for (; now - then < ms; now = new Date().getTime()) { 
-                mainThread.processNextEvent(true); 
-            } 
+            var then = new Date().getTime(), now = then;
+            for (; now - then < ms; now = new Date().getTime()) {
+                mainThread.processNextEvent(true);
+            }
         },
 
-        get windows() 
+        get windows()
         {
             var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService(Components.interfaces.nsIWindowMediator);
             var wa = [];

From 18f6f3e8c6217d5ea98f93cfac2c26a5b4c3d822 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 7 Nov 2007 11:16:53 +0000
Subject: [PATCH 183/224] always specify the radix arg when calling parseInt
 rather than rely on it 'guessing' correctly

---
 content/buffers.js    | 2 +-
 content/commands.js   | 6 +++---
 content/tabs.js       | 4 ++--
 content/ui.js         | 2 +-
 content/vimperator.js | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/content/buffers.js b/content/buffers.js
index 958ac412..1d423fde 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -402,7 +402,7 @@ vimperator.Buffer = function() //{{{
 
         var match;
         if (match = buffer.match(/^(\d+):?/))
-            return vimperator.tabs.select(parseInt(match[1]) - 1, false); // make it zero-based
+            return vimperator.tabs.select(parseInt(match[1], 10) - 1, false); // make it zero-based
 
         var matches = [];
         var lower_buffer = buffer.toLowerCase();
diff --git a/content/commands.js b/content/commands.js
index 462a56d6..a53d858e 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -207,7 +207,7 @@ vimperator.Commands = function() //{{{
 
         // parse count
         if (matches[0])
-            matches[0] = parseInt(matches[0]);
+            matches[0] = parseInt(matches[0], 10);
         else
             matches[0] = -1;
 
@@ -1301,7 +1301,7 @@ vimperator.Commands = function() //{{{
                 }
                 else if (type == "number")
                 {
-                    var num = parseInt(val, 10);
+                    var num = parseInt(val);
                     if (isNaN(num))
                         vimperator.echoerr("E521: Number required after =: " + option.name + "=" + val);
                     else
@@ -1483,7 +1483,7 @@ vimperator.Commands = function() //{{{
             }
             else if (/^\d+$/.test(args))
             {
-                var index = parseInt(args) - 1;
+                var index = parseInt(args, 10) - 1;
                 if (index < vimperator.tabs.count())
                     vimperator.tabs.select(index, true);
                 else
diff --git a/content/tabs.js b/content/tabs.js
index f2a85ead..8016fb8a 100644
--- a/content/tabs.js
+++ b/content/tabs.js
@@ -67,9 +67,9 @@ vimperator.Tabs = function() //{{{
         else
         {
             if (spec.match(/^([+-]\d+)$/)) // relative position +/-N
-                position += parseInt(spec);
+                position += parseInt(spec, 10);
             else                           // absolute position
-                position = parseInt(spec);
+                position = parseInt(spec, 10);
         }
 
         if (position > last)
diff --git a/content/ui.js b/content/ui.js
index a7ff62d0..c7f4414b 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -708,7 +708,7 @@ vimperator.CommandLine = function() //{{{
             case "<LeftMouse>":
                 if (event.originalTarget.className == "hl-URL buffer-list")
                 {
-                    vimperator.tabs.select(parseInt(event.originalTarget.parentNode.parentNode.firstChild.textContent) - 1);
+                    vimperator.tabs.select(parseInt(event.originalTarget.parentNode.parentNode.firstChild.textContent, 10) - 1);
                     close_window = true;
                     break;
                 }
diff --git a/content/vimperator.js b/content/vimperator.js
index 27f94a28..25e86a95 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -311,7 +311,7 @@ const vimperator = (function() //{{{
             // Number
             else if (match = string.match(/^(\d+)$/))
             {
-                return parseInt(match[1]);
+                return parseInt(match[1], 10);
             }
 
             var reference = this.variableReference(string);

From f1b878a1cc6b6fd8a33a3382f69a9d1d3f09d2b3 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 7 Nov 2007 11:21:12 +0000
Subject: [PATCH 184/224] remove redundant equality test for engine_name in
 v.bookmarks.getSearchURL

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

diff --git a/content/bookmarks.js b/content/bookmarks.js
index d502e512..32729060 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -205,7 +205,7 @@ vimperator.Bookmarks = function() //{{{
     {
         var url = null;
         var postdata = null;
-        if (!engine_name || engine_name == "")
+        if (!engine_name)
             engine_name = vimperator.options["defsearch"];
 
         // we need to make sure our custom alias have been set, even if the user

From 38696c37bb36a4dee126e1412d2434c5abf8fc2d Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 7 Nov 2007 11:31:37 +0000
Subject: [PATCH 185/224] merge new support for feeds in :pageinfo

---
 content/buffers.js | 212 +++++++++++++++++++++++++++++++++------------
 content/options.js |  28 +++---
 content/util.js    |  21 +++++
 3 files changed, 193 insertions(+), 68 deletions(-)

diff --git a/content/buffers.js b/content/buffers.js
index 1d423fde..a40e1c7c 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -449,13 +449,83 @@ vimperator.Buffer = function() //{{{
 
     this.pageInfo = function(verbose)
     {
-        // to get the file size later (from pageInfo.js) (setup cacheEntryDescriptor)
+        // TODO: copied from firefox. Needs some review/work...
+        //    const feedTypes = {
+        //        "application/rss+xml": gBundle.getString("feedRss"),
+        //        "application/atom+xml": gBundle.getString("feedAtom"),
+        //        "text/xml": gBundle.getString("feedXML"),
+        //        "application/xml": gBundle.getString("feedXML"),
+        //        "application/rdf+xml": gBundle.getString("feedXML")
+        //    };
+        function isValidFeed(aData, aPrincipal, aIsFeed)
+        {
+            if (!aData || !aPrincipal)
+                return false;
+
+            if (!aIsFeed)
+            {
+                var type = aData.type && aData.type.toLowerCase();
+                type = type.replace(/^\s+|\s*(?:;.*)?$/g, "");
+
+                aIsFeed = (type == "application/rss+xml" || type == "application/atom+xml");
+                if (!aIsFeed)
+                {
+                    // really slimy: general XML types with magic letters in the title
+                    const titleRegex = /(^|\s)rss($|\s)/i;
+                    aIsFeed = ((type == "text/xml" || type == "application/rdf+xml" ||
+                                type == "application/xml") && titleRegex.test(aData.title));
+                }
+            }
+
+            if (aIsFeed)
+            {
+                try
+                {
+                    urlSecurityCheck(aData.href, aPrincipal,
+                            Components.interfaces.nsIScriptSecurityManager.DISALLOW_INHERIT_PRINCIPAL);
+                }
+                catch(ex)
+                {
+                    aIsFeed = false;
+                }
+            }
+
+            if (type)
+                aData.type = type;
+
+            return aIsFeed;
+        }
+
+        // TODO: could this be useful for other commands?
+        function createTable(data)
+        {
+            var ret = "<table><tr><th class='hl-Title' style='font-weight: bold;' align='left' colspan='2'>" +
+                      data[data.length -1][0] + "</th></tr>";
+
+            if (data.length - 1)
+            {
+                for (var i = 0; i < data.length - 1 ; i++)
+                    ret += "<tr><td style='font-weight: bold; min-width: 150px'>  " + data[i][0] + ": </td><td>" + data[i][1] + "</td></tr>";
+            }
+            else
+            {
+                ret += "<tr><td colspan='2'>  (" + data[data.length - 1][1] + ")</td></tr>";
+            }
+
+            return ret + "</table>";
+        }
+
+        var pageGeneral = [];
+        var pageFeeds = [];
+        var pageMeta = [];
+
+        // get file size
         const nsICacheService = Components.interfaces.nsICacheService;
         const ACCESS_READ = Components.interfaces.nsICache.ACCESS_READ;
         const cacheService = Components.classes["@mozilla.org/network/cache-service;1"].getService(nsICacheService);
         var httpCacheSession = cacheService.createSession("HTTP", 0, true);
-        httpCacheSession.doomEntriesIfExpired = false;
         var ftpCacheSession = cacheService.createSession("FTP", 0, true);
+        httpCacheSession.doomEntriesIfExpired = false;
         ftpCacheSession.doomEntriesIfExpired = false;
         var cacheKey = window.content.document.location.toString().replace(/#.*$/, "");
         try
@@ -471,49 +541,83 @@ vimperator.Buffer = function() //{{{
             catch (ex2) { }
         }
 
+        var pageSize = []; // [0] bytes; [1] kbytes
+        if (cacheEntryDescriptor)
+        {
+            pageSize[0] = vimperator.util.formatNumber(cacheEntryDescriptor.dataSize);
+            pageSize[1] = vimperator.util.formatNumber(Math.round(cacheEntryDescriptor.dataSize / 1024 * 100) / 100);
+        }
+
+        // put feeds rss into pageFeeds[]
+        var linkNodes = window.content.document.getElementsByTagName("link");
+        var length = linkNodes.length;
+        for (var i = 0; i < length; i++)
+        {
+            var link = linkNodes[i];
+            if (!link.href)
+                continue;
+
+            var rel = link.rel && link.rel.toLowerCase();
+            var rels = {};
+            if (rel)
+            {
+                for each (let relVal in rel.split(/\s+/))
+                    rels[relVal] = true;
+            }
+
+            if (rels.feed || (link.type && rels.alternate && !rels.stylesheet))
+            {
+                var feed = { title: link.title, href: link.href, type: link.type || "" };
+                if (isValidFeed(feed, window.content.document.nodePrincipal, rels.feed))
+                {
+//                    var type = feedTypes[feed.type] || feedTypes["application/rss+xml"]; // TODO: dig into that.. --calmar
+                    var type = feed.type || "application/rss+xml";
+                    pageFeeds.push([feed.title, vimperator.util.highlightURL(feed.href, true)]);
+                }
+            }
+        }
+
+        // Ctrl-g single line output
         if (!verbose)
         {
-            // TODO: strip off any component after &
-            var file = window.content.document.location.pathname.split('/').pop();
-            if (!file)
-                file = "[No Name]";
-
+            var info = []; // tmp array for joining later
+            var file = window.content.document.location.pathname.split("/").pop() || "[No Name]";
             var title = window.content.document.title || "[No Title]";
 
-            if (cacheEntryDescriptor)
-                var pageSize = Math.round(cacheEntryDescriptor.dataSize / 1024 * 100) / 100 + "KB";
+            if (pageSize[1])
+                info.push(pageSize[1] + "KiB");
 
-            var lastmod = window.content.document.lastModified.slice(0, -3);
+            var lastMod = window.content.document.lastModified.slice(0, -3);
+            if (lastMod)
+                info.push(lastMod);
 
-            var pageInfoText = '"' + file + '" [' + pageSize + ", " + lastmod + "] " + title;
+            var countFeeds = "";
+            if (pageFeeds.length)
+                countFeeds = pageFeeds.length + (pageFeeds.length == 1 ? " feed" : " feeds");
 
+            if (countFeeds)
+                info.push(countFeeds);
+
+            var pageInfoText = '"' + file + '" [' + info.join(", ") + "] " + title;
             vimperator.echo(pageInfoText, vimperator.commandline.FORCE_SINGLELINE);
             return;
         }
 
-        var pageGeneral = [];       // keeps general infos
-        var pageMeta = [];          // keeps meta infos
-
         // get general infos
         pageGeneral.push(["Title", window.content.document.title]);
-        pageGeneral.push(["URL", '<a class="hl-URL" href="' + window.content.document.location.toString() + '">' +
-                window.content.document.location.toString() + '</a>']);
-        pageGeneral.push(["Referrer",  ("referrer" in window.content.document && window.content.document.referrer)]);
+        pageGeneral.push(["URL", vimperator.util.highlightURL(window.content.document.location.toString(), true)]);
+
+        var ref = "referrer" in window.content.document && window.content.document.referrer;
+        if (ref)
+            pageGeneral.push(["Referrer", vimperator.util.highlightURL(ref, true)]);
+
+        if (pageSize[0])
+            pageGeneral.push(["File Size", pageSize[1] + "KiB (" + pageSize[0] + " bytes)"]);
+
         pageGeneral.push(["Mime-Type", window.content.document.contentType]);
         pageGeneral.push(["Encoding",  window.content.document.characterSet]);
-
-        if (cacheEntryDescriptor)
-        {
-            var pageSize = cacheEntryDescriptor.dataSize;
-            var bytes = pageSize + '';
-            for (var u = bytes.length - 3; u > 0; u -= 3)        // make a 1400 -> 1'400
-                bytes = bytes.slice(0, u) + "," + bytes.slice(u, bytes.length);
-            pageGeneral.push(["File Size", (Math.round(pageSize / 1024 * 100) / 100) + "KB (" + bytes + " bytes)"]);
-        }
-
-        pageGeneral.push(["Compatibility", content.document.compatMode == "BackCompat" ?
-                "Quirks Mode" : "Full/Almost Standards Mode"]);
-        pageGeneral.push(["Last Modified", window.content.document.lastModified]);
+        pageGeneral.push(["Compatibility", content.document.compatMode == "BackCompat" ?  "Quirks Mode" : "Full/Almost Standards Mode"]);
+        pageGeneral.push(["Last Modified", window.content.document.lastModified]); //TODO: do not show bogus times (=current time)
 
         // get meta tag data, sort and put into pageMeta[]
         var metaNodes = window.content.document.getElementsByTagName("meta");
@@ -526,55 +630,55 @@ vimperator.Buffer = function() //{{{
             for (var i = 0; i < length; i++)
             {
                 var tmpTag = metaNodes[i].name || metaNodes[i].httpEquiv;// +
-                    //'<span style="font-weight: normal; font-size: 90%;">-eq</span>'; // XXX: really important?
-                var tmpTagNr = tmpTag + "-" + i;     // allows multiple (identical) meta names
+                var tmpTagNr = tmpTag + "-" + i; // allows multiple (identical) meta names
                 tmpDict[tmpTagNr] = [tmpTag, metaNodes[i].content];
-                tmpSort.push(tmpTagNr);      // array for sorting
+                tmpSort.push(tmpTagNr); // array for sorting
             }
 
             // sort: ignore-case
             tmpSort.sort(function (a,b){return a.toLowerCase() > b.toLowerCase() ? 1 : -1;});
-
             for (var i=0; i < tmpSort.length; i++)
-            {
-                pageMeta.push([tmpDict[tmpSort[i]][0], tmpDict[tmpSort[i]][1]]);
-            }
+                pageMeta.push([tmpDict[tmpSort[i]][0], vimperator.util.highlightURL(tmpDict[tmpSort[i]][1], false)]);
         }
 
+        pageMeta.push(["Meta Tags", ""]); // add extra text to the end
+        pageGeneral.push(["General Info", ""]);
+        pageFeeds.push(["Feeds", ""]);
+
         var pageInfoText = "";
         var option = vimperator.options["pageinfo"];
+        var br = "";
 
         for (var z = 0; z < option.length; z++)
         {
-            var newLine = z > 0 ? "<br/>" : "";
             switch (option[z])
             {
-                case "g": pageInfoText += newLine + "<table><tr><td class='hl-Title' style='font-weight: bold;' colspan='2'>General</td></tr>";
-                    for (var i = 0; i < pageGeneral.length; i++)
+                case "g":
+                    if (pageGeneral.length > 1)
                     {
-                        if (pageGeneral[i][1])
-                            pageInfoText += "<tr><td style='font-weight: bold;'>  " + pageGeneral[i][0] + ": </td><td>" + pageGeneral[i][1] + "</td></tr>";
+                        pageInfoText += br + createTable(pageGeneral);
+                        if (!br)
+                            br = "<br/>";
                     }
-                    pageInfoText += "</table>";
                     break;
-
-                case "m": pageInfoText += newLine + "<table><tr><td class='hl-Title' style='font-weight: bold;' colspan='2'>Meta Tags</td></tr>";
-                    if (pageMeta.length)
+                case "f":
+                    if (pageFeeds.length > 1)
                     {
-                        for (var i = 0; i < pageMeta.length; i++)
-                        {
-                            pageInfoText += "<tr><td style='font-weight: bold;'>  " + pageMeta[i][0] + ": </td><td>" + pageMeta[i][1] + "</td></tr>";
-                        }
+                        pageInfoText += br + createTable(pageFeeds);
+                        if (!br)
+                            br = "<br/>";
                     }
-                    else
+                    break;
+                case "m":
+                    if (pageMeta.length > 1)
                     {
-                        pageInfoText += "<tr><td colspan='2'>(no Meta-Tags on this page)</td></tr>";
+                        pageInfoText += br + createTable(pageMeta);
+                        if (!br)
+                            br = "<br/>";
                     }
-                    pageInfoText += "</table>";
                     break;
             }
         }
-
         vimperator.echo(pageInfoText, vimperator.commandline.FORCE_MULTILINE);
     }
     //}}}
diff --git a/content/options.js b/content/options.js
index 8005274f..d330fd94 100644
--- a/content/options.js
+++ b/content/options.js
@@ -429,20 +429,6 @@ vimperator.Options = function() //{{{
             default_value: "homepage,quickmark,tabopen,paste"
         }
     ));
-    this.add(new vimperator.Option(["pageinfo", "pa"], "charlist",
-        {
-            short_help: "Desired info on :pa[geinfo]",
-            help: "Available items:<br/>" +
-                  "<ul>" +
-                  "<li><b>g</b>: general info</li>" +
-                  "<li><b>m</b>: meta tags</li>" +
-                  "</ul>" +
-                  "The order matters",
-            default_value: "gm",
-            validator: function (value) { if (/[^gm]/.test(value) || value.length > 2 ||
-                    value.length < 1) return false; else return true; }
-        }
-    ));
     this.add(new vimperator.Option(["complete", "cpt"], "charlist",
         {
             short_help: "Items which are completed at the :[tab]open prompt",
@@ -585,6 +571,20 @@ vimperator.Options = function() //{{{
             validator: function (value) { if (value >= 1 && value <= 1000) return true; else return false; }
         }
     ));
+    this.add(new vimperator.Option(["pageinfo", "pa"], "charlist",
+        {
+            short_help: "Desired info on :pa[geinfo]",
+            help: "Available items:<br/>" +
+                  "<ul>" +
+                  "<li><b>g</b>: general info</li>" +
+                  "<li><b>f</b>: feeds</li>" +
+                  "<li><b>m</b>: meta tags</li>" +
+                  "</ul>" +
+                  "The order matters",
+            default_value: "gfm",
+            validator: function (value) { return !(/[^gfm]/.test(value) || value.length > 3 || value.length < 1) }
+        }
+    ));
     this.add(new vimperator.Option(["popups", "pps"], "number",
         {
             short_help: "Where to show requested popup windows",
diff --git a/content/util.js b/content/util.js
index 203543fd..2eab352b 100644
--- a/content/util.js
+++ b/content/util.js
@@ -75,6 +75,27 @@ vimperator.util = {
         }
 
         return arg;
+    },
+
+    highlightURL: function(str, force)
+    {
+        if (force || /^[a-zA-Z]+:\/\/.*\//.test(str))
+            return "<a class='hl-URL' href='" + str + "'>" + vimperator.util.escapeHTML(str) + "</a>";
+        else 
+            return str;
+    },
+
+    formatNumber: function(num)
+    {
+        var strNum = (num + "").split(".", 2);
+
+        for (var u = strNum[0].length - 3; u > 0; u -= 3)
+            strNum[0] = strNum[0].substring(0, u) + "," + strNum[0].substring(u, strNum[0].length);
+
+        if (strNum[1])
+            strNum[0] += "." + strNum[1]
+
+        return strNum[0];
     }
 }
 

From fe15ee93479eb5684b513c1286561d70f003b14e Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 7 Nov 2007 11:33:01 +0000
Subject: [PATCH 186/224] remove empty statement

---
 content/events.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/content/events.js b/content/events.js
index c00e00f3..89503940 100644
--- a/content/events.js
+++ b/content/events.js
@@ -221,12 +221,12 @@ vimperator.Events = function() //{{{
             vimperator.history.add(url, title);
 
             // code which is only relevant if the page load is the current tab goes here:
-            if (doc == getBrowser().selectedBrowser.contentDocument)
-            {
-                // FIXME: this currently causes window map events which is _very_ annoying
-                // we want to stay in command mode after a page has loaded
-                //setTimeout(vimperator.focusContent, 10);
-            }
+            //if (doc == getBrowser().selectedBrowser.contentDocument)
+            //{
+            //    // FIXME: this currently causes window map events which is _very_ annoying
+            //    // we want to stay in command mode after a page has loaded
+            //    //setTimeout(vimperator.focusContent, 10);
+            //}
         }
     }
 

From b71c48a7aa78ab0cd1b2537228f31f2d1d51fe8c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 7 Nov 2007 11:38:20 +0000
Subject: [PATCH 187/224] move concatenation operator to end of continued lines
 in v.marks.list

---
 content/bookmarks.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/content/bookmarks.js b/content/bookmarks.js
index 32729060..cc9e7563 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -760,12 +760,12 @@ vimperator.Marks = function() //{{{
                    "<table><tr align=\"left\" class=\"hl-Title\"><th>mark</th><th>line</th><th>col</th><th>file</th></tr>";
         for (var i = 0; i < marks.length; i++)
         {
-            list += "<tr>"
-                  + "<td> "                        + marks[i][0]                              +  "</td>"
-                  + "<td align=\"right\">"         + Math.round(marks[i][1].position.y * 100) + "%</td>"
-                  + "<td align=\"right\">"         + Math.round(marks[i][1].position.x * 100) + "%</td>"
-                  + "<td style=\"color: green;\">" + vimperator.util.escapeHTML(marks[i][1].location) +  "</td>"
-                  + "</tr>";
+            list += "<tr>" +
+                    "<td> "                        + marks[i][0]                              +  "</td>" +
+                    "<td align=\"right\">"         + Math.round(marks[i][1].position.y * 100) + "%</td>" +
+                    "<td align=\"right\">"         + Math.round(marks[i][1].position.x * 100) + "%</td>" +
+                    "<td style=\"color: green;\">" + vimperator.util.escapeHTML(marks[i][1].location) + "</td>" +
+                    "</tr>";
         }
         list += "</table>";
 

From 9755294141059f34ba7718f8f5c6e9f2f5c4996a Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 7 Nov 2007 11:51:34 +0000
Subject: [PATCH 188/224] also prevent websites from catching keyup keys (fixes
 dict.leo.org)

---
 content/events.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/content/events.js b/content/events.js
index 89503940..be815d61 100644
--- a/content/events.js
+++ b/content/events.js
@@ -681,7 +681,7 @@ vimperator.Events = function() //{{{
     window.addEventListener("keypress", this.onKeyPress, true);
 
     // this is need for sites like msn.com which focus the input field on keydown
-    this.onKeyDown = function(event)
+    this.onKeyUpOrDown = function(event)
     {
         if (vimperator.hasMode(vimperator.modes.ESCAPE_ONE_KEY) || vimperator.hasMode(vimperator.modes.ESCAPE_ALL_KEYS) || isFormElemFocused())
             return true;
@@ -689,7 +689,8 @@ vimperator.Events = function() //{{{
         event.stopPropagation();
         return false;
     }
-    window.addEventListener("keydown", this.onKeyDown, true);
+    window.addEventListener("keydown", this.onKeyUpOrDown, true);
+    window.addEventListener("keyup", this.onKeyUpOrDown, true);
 
     this.progressListener =
     {

From a4131d64dff457b5c18da460d2a140318250a95f Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 7 Nov 2007 11:53:26 +0000
Subject: [PATCH 189/224] merge faster replace() based v.util.escapeHTML

---
 content/util.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/content/util.js b/content/util.js
index 2eab352b..7f45e386 100644
--- a/content/util.js
+++ b/content/util.js
@@ -29,9 +29,13 @@ the terms of any one of the MPL, the GPL or the LGPL.
 vimperator.util = {
     escapeHTML: function(str)
     {
-        var e = window.content.document.createElement("div");
-        e.appendChild(window.content.document.createTextNode(str));
-        return e.innerHTML;
+        // XXX: the following code is _much_ slower than a simple .replace()
+        // :history display went down from 2 to 1 second after changing
+        //
+        // var e = window.content.document.createElement("div");
+        // e.appendChild(window.content.document.createTextNode(str));
+        // return e.innerHTML;
+        return str.replace("&", "&amp;", "g").replace("<", "&lt;", "g").replace(">", "&gt;", "g");
     },
 
     // TODO: use :highlight color groups
@@ -81,7 +85,7 @@ vimperator.util = {
     {
         if (force || /^[a-zA-Z]+:\/\/.*\//.test(str))
             return "<a class='hl-URL' href='" + str + "'>" + vimperator.util.escapeHTML(str) + "</a>";
-        else 
+        else
             return str;
     },
 

From 8457cfdf3391385c9434c2d9f96e89b200da1279 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 7 Nov 2007 12:00:34 +0000
Subject: [PATCH 190/224] move String#toURLArray to v.util.stringToURLArray -
 think of the kittens!

---
 content/commands.js   | 77 -------------------------------------------
 content/util.js       | 77 +++++++++++++++++++++++++++++++++++++++++++
 content/vimperator.js |  2 +-
 3 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index a53d858e..a9c4035b 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1886,81 +1886,4 @@ vimperator.Commands = function() //{{{
     //}}}
 } //}}}
 
-// takes a string like 'google bla, www.osnews.com'
-// and returns an array ['www.google.com/search?q=bla', 'www.osnews.com']
-String.prototype.toURLArray = function() // {{{
-{
-    var urls = this.split(/\s*\,\s+/);
-
-    begin: for (var url = 0; url < urls.length; url++)
-    {
-        var new_url = vimperator.buffer.URL;
-        var matches;
-
-        // strip each 'URL' - makes things simpler later on
-        urls[url] = urls[url].replace(/^\s+/, '').replace(/\s+$/, '');
-
-        // FIXME: not really that good (doesn't handle .. in the middle)
-        // check for ./ and ../ (or even .../) to go to a file in the upper directory
-        if (matches = urls[url].match(/^(?:\.$|\.\/(\S*))/))
-        {
-            var tail = matches[1] ? matches[1] : "";
-            urls[url] = new_url.replace(/(.+\/)[^\/]*/, "$1" + tail);  // NOTE: escape / in character sets so as not to break Vim syntax highlighting
-            continue;
-        }
-        else if (matches = urls[url].match(/^(?:\.\.$|\.\.\/(\S*))/))
-        {
-            var tail = matches[1] ? matches[1] : "";
-            urls[url] = new_url.replace(/(.+\/)[^\/]*/, "$1../" + tail);
-            continue;
-        }
-        else if (matches = urls[url].match(/^(?:\.\.\.$|\.\.\.\/(\S*))/))
-        {
-            var location = window.content.document.location;
-            var tail = matches[1] ? matches[1] : "";
-            urls[url] = location.protocol + "//" + location.host + "/" + tail;
-            continue;
-        }
-
-        // if the string doesn't look like a valid URL (i.e. contains a space
-        // or does not contain any of: .:/) try opening it with a search engine
-        // or keyword bookmark
-        if (/\s/.test(urls[url]) || !/[.:\/]/.test(urls[url]))
-        {
-            matches = urls[url].match(/^(\S+)(?:\s+(.+))?$/);
-
-            var alias = matches[1];
-            var text = matches[2] ? matches[2] : null;
-
-            // TODO: it would be clearer if the appropriate call to
-            // getSearchURL was made based on whether or not the first word was
-            // indeed an SE alias rather than seeing if getSearchURL can
-            // process the call usefully and trying again if it fails - much
-            // like the comments below ;-)
-
-            // check if the first word is a search engine
-            var search_url = vimperator.bookmarks.getSearchURL(text, alias);
-            if (search_url/* && search_url.length >= 1*/)
-            {
-                urls[url] = search_url;
-                continue;
-            }
-            else // the first word was not a search engine, search for the whole string in the default engine
-            {
-                search_url = vimperator.bookmarks.getSearchURL(urls[url], null);
-                if (search_url/* && search_url.length >= 1*/)
-                {
-                    urls[url] = search_url;
-                    continue;
-                }
-            }
-        }
-
-        // if we are here let Firefox handle the url and hope it does
-        // something useful with it :)
-    }
-
-    return urls;
-} // }}}
-
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/util.js b/content/util.js
index 7f45e386..4327d47c 100644
--- a/content/util.js
+++ b/content/util.js
@@ -81,6 +81,83 @@ vimperator.util = {
         return arg;
     },
 
+    // takes a string like 'google bla, www.osnews.com'
+    // and returns an array ['www.google.com/search?q=bla', 'www.osnews.com']
+    stringToURLArray: function(str)
+    {
+        var urls = str.split(/\s*\,\s+/);
+
+        begin: for (var url = 0; url < urls.length; url++)
+        {
+            var new_url = vimperator.buffer.URL;
+            var matches;
+
+            // strip each 'URL' - makes things simpler later on
+            urls[url] = urls[url].replace(/^\s+/, '').replace(/\s+$/, '');
+
+            // FIXME: not really that good (doesn't handle .. in the middle)
+            // check for ./ and ../ (or even .../) to go to a file in the upper directory
+            if (matches = urls[url].match(/^(?:\.$|\.\/(\S*))/))
+            {
+                var tail = matches[1] || "";
+                urls[url] = new_url.replace(/(.+\/)[^\/]*/, "$1" + tail);  // NOTE: escape / in character sets so as not to break Vim syntax highlighting
+                continue;
+            }
+            else if (matches = urls[url].match(/^(?:\.\.$|\.\.\/(\S*))/))
+            {
+                var tail = matches[1] || "";
+                urls[url] = new_url.replace(/(.+\/)[^\/]*/, "$1../" + tail);
+                continue;
+            }
+            else if (matches = urls[url].match(/^(?:\.\.\.$|\.\.\.\/(\S*))/))
+            {
+                var location = window.content.document.location;
+                var tail = matches[1] || "";
+                urls[url] = location.protocol + "//" + location.host + "/" + tail;
+                continue;
+            }
+
+            // if the string doesn't look like a valid URL (i.e. contains a space
+            // or does not contain any of: .:/) try opening it with a search engine
+            // or keyword bookmark
+            if (/\s/.test(urls[url]) || !/[.:\/]/.test(urls[url]))
+            {
+                matches = urls[url].match(/^(\S+)(?:\s+(.+))?$/);
+
+                var alias = matches[1];
+                var text = matches[2] || null;
+
+                // TODO: it would be clearer if the appropriate call to
+                // getSearchURL was made based on whether or not the first word was
+                // indeed an SE alias rather than seeing if getSearchURL can
+                // process the call usefully and trying again if it fails - much
+                // like the comments below ;-)
+
+                // check if the first word is a search engine
+                var search_url = vimperator.bookmarks.getSearchURL(text, alias);
+                if (search_url/* && search_url.length >= 1*/)
+                {
+                    urls[url] = search_url;
+                    continue;
+                }
+                else // the first word was not a search engine, search for the whole string in the default engine
+                {
+                    search_url = vimperator.bookmarks.getSearchURL(urls[url], null);
+                    if (search_url/* && search_url.length >= 1*/)
+                    {
+                        urls[url] = search_url;
+                        continue;
+                    }
+                }
+            }
+
+            // if we are here let Firefox handle the url and hope it does
+            // something useful with it :)
+        }
+
+        return urls;
+    },
+
     highlightURL: function(str, force)
     {
         if (force || /^[a-zA-Z]+:\/\/.*\//.test(str))
diff --git a/content/vimperator.js b/content/vimperator.js
index 25e86a95..c72123fc 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -423,7 +423,7 @@ const vimperator = (function() //{{{
             // convert the string to an array of converted URLs
             // -> see String.prototype.toURLArray for more details
             if (typeof urls == "string")
-                urls = urls.toURLArray();
+                urls = vimperator.util.stringToURLArray(urls);
 
             if (urls.length == 0)
                 return false;

From 2b60f1a26d11084ab8e6f0ab11236d3b38778073 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 9 Nov 2007 05:15:17 +0000
Subject: [PATCH 191/224] fix some help typos

---
 content/commands.js   | 10 +++++-----
 content/mappings.js   |  4 ++--
 content/vimperator.js |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index a9c4035b..2027b2fa 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -233,7 +233,7 @@ vimperator.Commands = function() //{{{
         function() { vimperator.open("chrome://mozapps/content/extensions/extensions.xul", vimperator.NEW_TAB); },
         {
             short_help: "Show available Browser Extensions and Themes",
-            help: "You can add/remove/disable browser extensions from this dialog.<br/>Be aware that not all Firefox extensions work, because Vimperator overrides some keybindings and changes Firefox's GUI."
+            help: "You can add/remove/disable browser extensions from this dialog.<br/>Be aware that not all Firefox extensions work, because Vimperator overrides some key bindings and changes Firefox's GUI."
         }
     ));
     addDefaultCommand(new vimperator.Command(["ba[ck]"],
@@ -624,7 +624,7 @@ vimperator.Commands = function() //{{{
             usage: ["h[elp] {subject}"],
             short_help: "Open the help window",
             help: "You can jump to the specified <code class=\"argument\">{subject}</code> with <code class=\"command\">:help {subject}</code>.<br/>" +
-                  "Make sure you use the full vim notation when jumping to <code class=\"argument\">{subject}</code>. This means:<br/>" +
+                  "Make sure you use the full Vim notation when jumping to <code class=\"argument\">{subject}</code>. This means:<br/>" +
                   "<ul>" +
                   "<li><code class=\"command\">:help :help</code> for commands (: prefix)</li>" +
                   "<li><code class=\"command\">:help 'complete'</code> for options (surrounded by ' and ')</li>" +
@@ -932,7 +932,7 @@ vimperator.Commands = function() //{{{
         },
         {
             usage: ["mkv[imperatorrc] [file]"],
-            short_help: "Write current keymappings and changed options to [file]",
+            short_help: "Write current key mappings and changed options to [file]",
             help: "If no <code class=\"argument\">[file]</code> is specified then ~/.vimperatorrc is written unless this file already exists. " +
                   "The special version will overwrite <code class=\"argument\">[file]</code> if it exists.<br/>" +
                   "WARNING: this differs from Vim's behavior which defaults to writing the file in the current directory."
@@ -1104,7 +1104,7 @@ vimperator.Commands = function() //{{{
             usage: ["pref[erences][!]"],
             short_help: "Show Browser Preferences",
             help: "You can change the browser preferences from this dialog. " +
-                  "Be aware that not all Firefox preferences work, because Vimperator overrides some keybindings and changes Firefox's GUI.<br/>" +
+                  "Be aware that not all Firefox preferences work, because Vimperator overrides some key bindings and changes Firefox's GUI.<br/>" +
                   "<code class=\"command\">:prefs!</code> opens about:config in the current tab where you can change advanced Firefox preferences."
         }
     ));
@@ -1637,7 +1637,7 @@ vimperator.Commands = function() //{{{
             short_help: "Profile a piece of code or a command",
             help: "Runs <code class=\"argument\">{code} {count}</code> times (default 1) and returns the elapsed time. " +
                   "<code class=\"argument\">{code}</code> is always passed to JavaScript's eval(), which might be slow, so take the results with a grain of salt.<br/>" +
-                  "If <code class=\"argument\">{code}</code> starts with a :, it is executed as a vimperator command.<br/>" +
+                  "If <code class=\"argument\">{code}</code> starts with a :, it is executed as a Vimperator command.<br/>" +
                   "Use the special version with [!] if you just want to run any command multiple times without showing profiling statistics."
         }
     ));
diff --git a/content/mappings.js b/content/mappings.js
index 4738adb6..b0d0ec9e 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -986,7 +986,7 @@ vimperator.Mappings = function() //{{{
         {
             short_help: "Search forward for a pattern",
             usage: ["/{pattern}[/]<CR>"],
-            help: "Search forward for the first occurance of <code class=\"argument\">{pattern}</code>.<br/>" +
+            help: "Search forward for the first occurrence of <code class=\"argument\">{pattern}</code>.<br/>" +
                   "If \"\\c\" appears anywhere in the pattern the whole pattern is handled as though <code class=\"option\">'ignorecase'</code> is on. " +
                   "\"\\C\" forces case-sensitive matching for the whole pattern.<br/>" +
                   "If \"\\l\" appears in the pattern only the text of links is searched for a match as though <code class=\"option\">'linksearch'</code> is on. " +
@@ -998,7 +998,7 @@ vimperator.Mappings = function() //{{{
         {
             short_help: "Search backwards for a pattern",
             usage: ["?{pattern}[?]<CR>"],
-            help: "Search backward for the first occurance of <code class=\"argument\">{pattern}</code>.<br/>" +
+            help: "Search backward for the first occurrence of <code class=\"argument\">{pattern}</code>.<br/>" +
                   "If \"\\c\" appears anywhere in the pattern the whole pattern is handled as though <code class=\"option\">'ignorecase'</code> is on. " +
                   "\"\\C\" forces case-sensitive matching for the whole pattern.<br/>" +
                   "If \"\\l\" appears in the pattern only the text of links is searched for a match as though <code class=\"option\">'linksearch'</code> is on. " +
diff --git a/content/vimperator.js b/content/vimperator.js
index c72123fc..fe6093c6 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -421,7 +421,7 @@ const vimperator = (function() //{{{
         open: function(urls, where, callback)
         {
             // convert the string to an array of converted URLs
-            // -> see String.prototype.toURLArray for more details
+            // -> see vimperator.util.stringToURLArray for more details
             if (typeof urls == "string")
                 urls = vimperator.util.stringToURLArray(urls);
 

From 9fa91be129e4c18159cb62cd6b39bfbb6bd37bbe Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 9 Nov 2007 05:30:33 +0000
Subject: [PATCH 192/224] declare some accidentally global vars

---
 content/hints.js      | 8 ++++----
 content/options.js    | 2 ++
 content/ui.js         | 4 ++--
 content/vimperator.js | 3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/content/hints.js b/content/hints.js
index 034cf83a..93f2d9f7 100644
--- a/content/hints.js
+++ b/content/hints.js
@@ -496,15 +496,15 @@ vimperator.Hints = function() //{{{
                 x = Number(coords[0]);
                 y = Number(coords[1]);
             }
-            doc = window.content.document;
-            view = window.document.defaultView;
+            var doc = window.content.document;
+            var view = window.document.defaultView;
 
             var evt = doc.createEvent('MouseEvents');
-            evt.initMouseEvent('mousedown', true, true, view, 1, x+1, y+1, 0, 0, /*ctrl*/ new_tab, /*event.altKey*/0, /*event.shiftKey*/ new_window, /*event.metaKey*/ new_tab, 0, null);
+            evt.initMouseEvent('mousedown', true, true, view, 1, x + 1, y + 1, 0, 0, /*ctrl*/ new_tab, /*event.altKey*/0, /*event.shiftKey*/ new_window, /*event.metaKey*/ new_tab, 0, null);
             elem.dispatchEvent(evt);
 
             var evt = doc.createEvent('MouseEvents');
-            evt.initMouseEvent('click', true, true, view, 1, x+1, y+1, 0, 0, /*ctrl*/ new_tab, /*event.altKey*/0, /*event.shiftKey*/ new_window, /*event.metaKey*/ new_tab, 0, null);
+            evt.initMouseEvent('click', true, true, view, 1, x + 1, y + 1, 0, 0, /*ctrl*/ new_tab, /*event.altKey*/0, /*event.shiftKey*/ new_window, /*event.metaKey*/ new_tab, 0, null);
             elem.dispatchEvent(evt);
 
             // for 'pure' open calls without a new tab or window it doesn't
diff --git a/content/options.js b/content/options.js
index d330fd94..5863bb98 100644
--- a/content/options.js
+++ b/content/options.js
@@ -135,6 +135,8 @@ vimperator.Options = function() //{{{
 
     function storePreference(name, value, vimperator_branch)
     {
+        var branch;
+
         if (vimperator_branch)
             branch = vimperator_prefs;
         else
diff --git a/content/ui.js b/content/ui.js
index c7f4414b..91a851eb 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -1164,12 +1164,12 @@ vimperator.StatusLine = function() //{{{
             {
                 progress_str = "[";
                 var done = Math.floor(progress * 20);
-                for (i=0; i < done; i++)
+                for (var i = 0; i < done; i++)
                     progress_str += "=";
 
                 progress_str += ">";
 
-                for (i=19; i > done; i--)
+                for (var i = 19; i > done; i--)
                     progress_str += " ";
 
                 progress_str += "]";
diff --git a/content/vimperator.js b/content/vimperator.js
index fe6093c6..1a4fa6a4 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -328,7 +328,8 @@ const vimperator = (function() //{{{
             if (!string)
                 return [null, null, null];
 
-            if (match = string.match(/^([bwtglsv]):(\w+)/)) // Variable
+            var match = string.match(/^([bwtglsv]):(\w+)/);
+            if (match) // Variable
             {
                 // Other variables should be implemented
                 if (match[1] == "g")

From 857af21fa61f93b75fae5e69b69be32a4d6f3789 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 9 Nov 2007 05:31:28 +0000
Subject: [PATCH 193/224] remove mozunit.js

---
 mozunit.js | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 mozunit.js

diff --git a/mozunit.js b/mozunit.js
deleted file mode 100644
index 8947f8f3..00000000
--- a/mozunit.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var TestCase = mozlab.mozunit.TestCase;
-var assert = mozlab.mozunit.assertions;
-
-var tc = new TestCase('vimperator testcase description here');
-
-//var vimperator = new Vimperator();
-
-tc.tests = {
-    'First test is successful': function() {
-        assert.isTrue(true);
-    },
-
-	'Checking a working echo()': function() {
-		assert.isTrue(vimperator.echo("test"));
-	},
-	'Checking the non working ex.echo()': function() {
-		assert.isTrue(vimperator.ex.echo("test"));
-	}
-}

From 93348b6956b1dcfb3e44855502234cc7a34d26ec Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 9 Nov 2007 06:06:04 +0000
Subject: [PATCH 194/224] update vimperator.vim and vimperatorrc.example

---
 vimperator.vim       | 28 ++++++++++++++++------------
 vimperatorrc.example |  3 ++-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/vimperator.vim b/vimperator.vim
index bbb4920b..c933d983 100644
--- a/vimperator.vim
+++ b/vimperator.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	    VIMperator configuration file
 " Maintainer:	    Doug Kearns <dougkearns@gmail.com>
-" Latest Revision:  2007 October 17
+" Latest Revision:  2007 November 9
 
 if exists("b:current_syntax")
   finish
@@ -13,18 +13,21 @@ set cpo&vim
 syn include @javascriptTop syntax/javascript.vim
 unlet b:current_syntax
 
-syn keyword vimperatorTodo    FIXME NOTE TODO XXX contained
-syn match   vimperatorComment +".*$+ contains=vimperatorTodo,@Spell
+syn keyword vimperatorTodo FIXME NOTE TODO XXX contained
+syn match   vimperatorComment     +".*$+     contains=vimperatorTodo,@Spell
 
-syn region vimperatorString  start="\z(["']\)" end="\z1" skip="\\\\\|\\\z1" oneline
+syn region  vimperatorString  start="\z(["']\)" end="\z1" skip="\\\\\|\\\z1" oneline
+
+syn match   vimperatorLineComment +^\s*".*$+ contains=vimperatorTodo,@Spell
 
 syn keyword vimperatorCommand addo[ns] b[uffer] ba[ck] bd[elete] beep bma[rk] bmarks buffers bun[load] bw[ipeout] delbm[arks]
 	\ delm[arks] delqm[arks] dl downl[oads] e[dit] ec[ho] echoe[rr] exe[cute] exu[sage] files fo[rward] fw h[elp] ha[rdcopy]
-	\ hist[ory] hs javas[cript] js ls ma[rk] map mapc[lear] marks mkv[imperatorrc] no[remap] noh[lsearch] norm[al] o[pen]
-	\ pc[lose] let pref[erences] prefs q[uit] qa[ll] qma[rk] qmarks quita[ll] re[load] reloada[ll] res[tart] sav[eas]
-	\ sideb[ar] sb[ar] sbcl[ose] sb[open] se[t] so[urce] st[op] time tN[ext] t[open] tab tabN[ext] tabc[lose] tabe[dit]
-	\ tabfir[st] tabl[ast] tabm[ove] tabn[ext] tabnew tabo[nly] tabopen tabp[revious] tabr[ewind] tabs tn[ext] tp[revious]
-	\ u[ndo] unl[et] unm[ap] ve[rsion] viu[sage] w[rite] win[open] wine[dit] wo[pen] wq wqa[ll] xa[ll] zo[om] run
+	\ hist[ory] hs javas[cript] js let ls ma[rk] map mapc[lear] marks mkv[imperatorrc] no[remap] noh[lsearch] norm[al] o[pen]
+	\ pa[geinfo] pc[lose] pref[erences] prefs q[uit] qa[ll] qma[rk] qmarks quita[ll] re[load] reloada[ll] res[tart] run
+	\ sav[eas] sb[ar] sb[open] sbcl[ose] se[t] sideb[ar] so[urce] st[op] tN[ext] t[open] tab tabN[ext] tabc[lose] tabe[dit]
+	\ tabfir[st] tabl[ast] tabm[ove] tabn[ext] tabnew tabo[nly] tabopen tabp[revious] tabr[ewind] tabs time tn[ext]
+	\ tp[revious] u[ndo] undoa[ll] unl[et] unm[ap] ve[rsion] viu[sage] w[rite] wc[lose] win[open] winc[lose] wine[dit] wo[pen]
+	\ wq wqa[ll] xa[ll] zo[om]
 	\ contained
 
 syn match vimperatorCommand "!" contained
@@ -36,9 +39,9 @@ syn region vimperatorSet matchgroup=vimperatorCommand start="\<set\=\>" end="$"
 syn keyword vimperatorOption activate act complete cpt defsearch ds extendedhinttags eht focusedhintstyle fhs fullscreen fs
 	\ nofullscreen nofs guioptions go hintchars hc hintstyle hs hinttags ht hlsearch nohlsearch hls nohls hlsearchstyle hlss
 	\ incsearch is noincsearch nois ignorecase ic noignorecase noic laststatus ls linksearch nolinksearch lks nolks maxhints
-	\ mh more nomore preload nopreload popups pps previewheight pvh scroll scr showmode smd noshowmode nosmd showstatuslinks
-	\ ssli showtabline stal smartcase scs nosmartcase noscs titlestring usermode um nousermode noum verbose vbs visualbell vb
-	\ novisualbell novb visualbellstyle visualbellstyle t_vb wildmode wim wildoptions wop
+	\ mh more nomore pa pageinfo preload nopreload popups pps previewheight pvh scroll scr showmode smd noshowmode nosmd
+	\ showstatuslinks ssli showtabline stal smartcase scs nosmartcase noscs titlestring usermode um nousermode noum verbose
+	\ vbs visualbell vb novisualbell novb visualbellstyle visualbellstyle t_vb wildmode wim wildoptions wop
 	\ contained
 
 syn region vimperatorJavascript start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=" end="$" contains=@javascriptTop keepend oneline
@@ -49,6 +52,7 @@ syn region vimperatorJavascript matchgroup=vimperatorJavascriptDelimiter
 hi def link vimperatorCommand			Statement
 hi def link vimperatorTodo			Todo
 hi def link vimperatorComment			Comment
+hi def link vimperatorLineComment		Comment
 hi def link vimperatorJavascriptDelimiter	Delimiter
 hi def link vimperatorOption			PreProc
 hi def link vimperatorString			String 
diff --git a/vimperatorrc.example b/vimperatorrc.example
index 1438e94e..be208ee3 100644
--- a/vimperatorrc.example
+++ b/vimperatorrc.example
@@ -2,7 +2,6 @@
 
 " I don't like beeps
 set visualbell
-echo vimperatorrc found
 
 " embedded javascript is possible
 " You can even add new functions which are then available in the :js command
@@ -13,4 +12,6 @@ hello = function(name)
 }
 EOF
 
+echo "vimperatorrc sourced"
+
 " vim: ft=vimperator:

From f2df0725ff5c7aff89d1e02a0efd435f674fa054 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 9 Nov 2007 11:17:47 +0000
Subject: [PATCH 195/224] allow ^= to be used for prepending values to string
 options and for multiplying number options

---
 content/commands.js | 193 ++++++++++++++++++++++++++++----------------
 content/options.js  |   8 ++
 2 files changed, 130 insertions(+), 71 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index 2027b2fa..5a217c37 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1200,6 +1200,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["se[t]"],
+        // TODO: support setting multiple options at once
         function(args, special, count, modifiers)
         {
             if (special)
@@ -1208,63 +1209,64 @@ vimperator.Commands = function() //{{{
                 return;
             }
 
-            var only_non_default = false; //used for :set to print non-default options
+            var only_non_default = false; // used for :set to print non-default options
             if (!args)
             {
-                args = "all?";
+                args = "all";
                 only_non_default = true;
             }
 
-            //                               1        2       3    4  5      6
-            var matches = args.match(/^\s*(no|inv)?([a-z_]+)([?&!])?(([+-])?=(.*))?/);
+            //                               1        2       3       4  5       6
+            var matches = args.match(/^\s*(no|inv)?([a-z]+)([?&!])?\s*(([+-^]?)=(.*))?\s*$/);
             if (!matches)
             {
                 vimperator.echoerr("E518: Unknown option: " + args);
                 return;
             }
 
-            var no = false;
+            var unset_boolean = false;
             if (matches[1] == "no")
-                no = true;
-
-            var opt = matches[2];
+                unset_boolean = true;
 
+            var name = matches[2];
             var all = false;
-            if (opt == "all")
+            if (name == "all")
                 all = true;
 
-            var option = vimperator.options.get(opt);
+            var option = vimperator.options.get(name);
             if (!option && !all)
             {
-                vimperator.echoerr("E518: Unknown option: " + opt);
+                vimperator.echoerr("E518: Unknown option: " + args);
                 return;
             }
 
+            var value_given = !!matches[4];
+
             var get = false;
-            if (all || matches[3] == "?" || (option.type != "boolean" && matches[4] === undefined))
+            if (all || matches[3] == "?" || (option.type != "boolean" && !value_given))
                 get = true;
 
             var reset = false;
             if (matches[3] == "&")
                 reset = true;
 
-            var invert = false;
+            var invert_boolean = false;
             if (matches[1] == "inv" || matches[3] == "!")
-                invert = true;
+                invert_boolean = true;
 
-            var oper = matches[5];
+            var operator = matches[5];
 
-            var val = matches[6];
-            if (val === undefined)
-                val = "";
+            var value = matches[6];
+            if (value === undefined)
+                value = "";
 
             // reset a variable to its default value
             if (reset)
             {
                 if (all)
                 {
-                    for (let opt in vimperator.options)
-                        opt.reset();
+                    for (let option in vimperator.options)
+                        option.reset();
                 }
                 else
                 {
@@ -1287,68 +1289,116 @@ vimperator.Commands = function() //{{{
                 }
             }
             // write access
+            // NOTE: the behaviour is generally Vim compatible but could be
+            // improved. i.e. Vim's behaviour is pretty sloppy to no real
+            // benefit
             else
             {
-                var type = option.type;
-                if (type == "boolean")
+                var current_value = option.value;
+                var new_value;
+
+                switch (option.type)
                 {
-                    if (matches[4])
-                        vimperator.echoerr("E474: Invalid argument: " + option.name + "=" + val);
-                    else if (invert)
-                        option.value = !option.value;
-                    else
-                        option.value = !no;
-                }
-                else if (type == "number")
-                {
-                    var num = parseInt(val);
-                    if (isNaN(num))
-                        vimperator.echoerr("E521: Number required after =: " + option.name + "=" + val);
-                    else
-                    {
-                        var cur_val = option.value;
-                        if (oper == '+') num = cur_val + num;
-                        if (oper == '-') num = cur_val - num;
-                        // FIXME
-                        if (option.validator != null && option.validator.call(this, num) == false)
-                            vimperator.echoerr("E474: Invalid argument: " + option.name + "=" + val); // FIXME: need to be able to specify unique parse error messages
-                        else // all checks passed, execute option handler
-                            option.value = num;
-                    }
-                }
-                else if (type == "charlist" || type == "stringlist" || type == "string")
-                {
-                    var cur_val = option.value;
-                    if (type == "charlist" || type == "string")
-                    {
-                        if (oper == '+' && !cur_val.match(val))
-                            val = cur_val + val;
-                        if (oper == '-') val = cur_val.replace(val, '');
-                    }
-                    else
-                    {
-                        if (oper == '+' && !cur_val.match(val) && cur_val.length > 0)
-                                val = cur_val + ',' + val;
-                        if (oper == '-')
+                    case "boolean":
+                        if (value_given)
                         {
-                            val = cur_val.replace(new RegExp(',?' + val), '');
-                            val = val.replace(/^,?/, '');
+                            vimperator.echoerr("E474: Invalid argument: " + args);
+                            return;
                         }
-                    }
-                    // FIXME
-                    if (option.validator != null && option.validator.call(this, val) == false)
-                        vimperator.echoerr("E474: Invalid argument: " + option.name + "=" + val);
-                    else // all checks passed, execute option handler
-                        option.value = val;
+
+                        if (invert_boolean)
+                            new_value = !option.value;
+                        else
+                            new_value = !unset_boolean;
+
+                        break;
+
+                    case "number":
+                        value = parseInt(value);
+
+                        if (isNaN(value))
+                        {
+                            vimperator.echoerr("E521: Number required after =: " + args);
+                            return;
+                        }
+
+                        if (operator == "+")
+                            new_value = current_value + value;
+                        else if (operator == "-")
+                            new_value = current_value - value;
+                        else if (operator == "^")
+                            new_value = current_value * value;
+                        else
+                            new_value = value;
+
+                        break;
+
+                    case "charlist":
+                        if (operator == "+")
+                            new_value = current_value.replace(new RegExp("[" + value + "]", "g"), "") + value;
+                        else if (operator == "-")
+                            new_value = current_value.replace(value, "");
+                        else if (operator == "^")
+                            // NOTE: Vim doesn't prepend if there's a match in the current value
+                            new_value = value + current_value.replace(new RegExp("[" + value + "]", "g"), "");
+                        else
+                            new_value = value;
+
+                        break;
+
+                    case "stringlist":
+                        if (operator == "+")
+                        {
+                            if (!current_value.match(value))
+                                new_value = (current_value ? current_value + "," : "") + value;
+                            else
+                                new_value = current_value;
+                        }
+                        else if (operator == "-")
+                        {
+                            new_value = current_value.replace(new RegExp("^" + value + ",?|," + value), "");
+                        }
+                        else if (operator == "^")
+                        {
+                            if (!current_value.match(value))
+                                new_value = value + (current_value ? "," : "") + current_value;
+                            else
+                                new_value = current_value;
+                        }
+                        else
+                        {
+                            new_value = value;
+                        }
+
+                        break;
+
+                    case "string":
+                        if (operator == "+")
+                            new_value = current_value + value;
+                        else if (operator == "-")
+                            new_value = current_value.replace(value, "");
+                        else if (operator == "^")
+                            new_value = value + current_value;
+                        else
+                            new_value = value;
+
+                        break;
+
+                    default:
+                        vimperator.echoerr("E685: Internal error: option type `" + option.type + "' not supported");
                 }
+
+                if (option.isValidValue(new_value))
+                    option.value = new_value;
                 else
-                    vimperator.echoerr("E685: Internal error: option format `" + type + "' not supported");
+                    // FIXME: need to be able to specify more specific errors
+                    vimperator.echoerr("E474: Invalid argument: " + args);
             }
         },
         {
             usage: ["se[t][!]", "se[t] {option}?", "se[t] [no]{option}", "se[t] {option}[+-]={value}", "se[t] {option}! | inv{option}", "se[t] {option}&"],
             short_help: "Set an option",
-            help: "Permanently change an option. In contrast to Vim options are currently stored throughout sessions.<br/>" +
+            help: "Permanently change an option.<br/>" +
                   "<code class=\"command\">:set</code> without an argument shows all Vimperator options which differ from their default values.<br/>" +
                   "<code class=\"command\">:set!</code> without an argument shows all about:config preferences which differ from their default values.<br/>" +
                   "There are three types of options: boolean, number and string. " +
@@ -1357,7 +1407,8 @@ vimperator.Commands = function() //{{{
                   "<code class=\"command\">:set option!</code> and <code class=\"command\">:set invoption</code> invert the value of a boolean option.<br/>" +
                   "<code class=\"command\">:set option?</code> or <code class=\"command\">:set option</code>(for string and list options) shows the current value of an option.<br/>" +
                   "<code class=\"command\">:set option&amp;</code> resets an option to its default value.<br/>" +
-                  "<code class=\"command\">:set option+={value}</code> and <code class=\"command\">:set option-={value}</code> adds/subtracts {value} to a number option and append/remove {value} to a string option.<br/>" +
+                  "<code class=\"command\">:set option+={value}</code>, <code class=\"command\">:set option^={value}</code> and <code class=\"command\">:set option-={value}</code> " +
+                  "adds/multiplies/subtracts <code class=\"argument\">{value}</code> from a number option and appends/prepends/removes <code class=\"argument\">{value}</code> from a string option.<br/>" +
                   "<code class=\"command\">:set all</code> shows the current value of all options and <code class=\"command\">:set all&amp;</code> resets all options to their default values.<br/>",
             completer: function(filter) { return vimperator.completion.get_options_completions(filter); }
         }
diff --git a/content/options.js b/content/options.js
index 5863bb98..4d680485 100644
--- a/content/options.js
+++ b/content/options.js
@@ -106,6 +106,14 @@ vimperator.Option = function(names, type, extra_info) //{{{
         return false;
     }
 
+    this.isValidValue = function(value)
+    {
+        if (this.validator)
+            return this.validator(value);
+        else
+            return true;
+    }
+
     this.reset = function()
     {
         this.value = this.default_value;

From 3d9c6c09308d25938ce9fd9f07f82584ae4b097e Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 9 Nov 2007 11:21:28 +0000
Subject: [PATCH 196/224] simplify the implementation of :qmark

---
 content/commands.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index 5a217c37..cde5fda5 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1117,15 +1117,13 @@ vimperator.Commands = function() //{{{
                 return;
             }
 
-            var matches1 = args.match(/([a-zA-Z0-9])\s+(.+)/);
-            var matches2 = args.match(/([a-zA-Z0-9])\s*$/);
-
-            if (matches1 && matches1[1])
-                vimperator.quickmarks.add(matches1[1], matches1[2]);
-            else if (matches2 && matches2)
-                vimperator.quickmarks.add(matches2[1], vimperator.buffer.URL);
-            else
+            var matches = args.match(/^([a-zA-Z0-9])(?:\s+(.+))?$/);
+            if (!matches)
                 vimperator.echoerr("E488: Trailing characters");
+            else if (!matches[2])
+                vimperator.quickmarks.add(matches[1], vimperator.buffer.URL);
+            else
+                vimperator.quickmarks.add(matches[1], matches[2]);
         },
         {
             usage: ["qma[rk] {a-zA-Z0-9} [url]"],

From 2cf6003d0f6f848ed14381346982240a518f3b83 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 9 Nov 2007 11:23:43 +0000
Subject: [PATCH 197/224] add a validator for the 'activate' option

---
 content/options.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/content/options.js b/content/options.js
index 4d680485..cce3b61c 100644
--- a/content/options.js
+++ b/content/options.js
@@ -436,7 +436,8 @@ vimperator.Options = function() //{{{
                   "<li><b>tabopen</b>:   <code class=\"command\">:tabopen[!]</code> command</li>" +
                   "<li><b>paste</b>:     <code class=\"mapping\">P</code> and <code class=\"mapping\">gP</code> mappings</li>" +
                   "</ul>",
-            default_value: "homepage,quickmark,tabopen,paste"
+            default_value: "homepage,quickmark,tabopen,paste",
+            validator: function(value) { return value.split(",").every(function(item) { return /^(homepage|quickmark|tabopen|paste|)$/.test(item); }); }
         }
     ));
     this.add(new vimperator.Option(["complete", "cpt"], "charlist",

From d97b2bf942833f4cabcd53e432ddb5eb9621df7d Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 9 Nov 2007 11:26:28 +0000
Subject: [PATCH 198/224] return the boolean expression directly from option
 validators since nothing is done in the conditionals

---
 content/options.js | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/content/options.js b/content/options.js
index cce3b61c..fbd5aee0 100644
--- a/content/options.js
+++ b/content/options.js
@@ -437,7 +437,10 @@ vimperator.Options = function() //{{{
                   "<li><b>paste</b>:     <code class=\"mapping\">P</code> and <code class=\"mapping\">gP</code> mappings</li>" +
                   "</ul>",
             default_value: "homepage,quickmark,tabopen,paste",
-            validator: function(value) { return value.split(",").every(function(item) { return /^(homepage|quickmark|tabopen|paste|)$/.test(item); }); }
+            validator: function(value)
+            {
+                return value.split(",").every(function(item) { return /^(homepage|quickmark|tabopen|paste|)$/.test(item); });
+            }
         }
     ));
     this.add(new vimperator.Option(["complete", "cpt"], "charlist",
@@ -453,7 +456,7 @@ vimperator.Options = function() //{{{
                   "The order is important, so <code class=\"command\">:set complete=bs</code> would list bookmarks first, and then any available quick searches.<br/>" +
                   "Add <code class=\"option\">'sort'</code> to the <code class=\"option\">'wildoptions'</code> option if you want all entries sorted.",
             default_value: "sfbh",
-            validator: function (value) { if (/[^sfbh]/.test(value)) return false; else return true; }
+            validator: function(value) { return !/[^sfbh]/.test(value); }
         }
     ));
     this.add(new vimperator.Option(["defsearch", "ds"], "string",
@@ -497,7 +500,7 @@ vimperator.Options = function() //{{{
                   "</ul>",
             setter: function(value) { setGuiOptions(value); },
             default_value: "",
-            validator: function (value) { if (/[^mTb]/.test(value)) return false; else return true; }
+            validator: function(value) { return !/[^mTb]/.test(value); }
         }
     ));
     this.add(new vimperator.Option(["hintchars", "hc"], "charlist",
@@ -558,7 +561,7 @@ vimperator.Options = function() //{{{
                   "NOTE: laststatus=1 not implemented yet.",
             default_value: 2,
             setter: function(value) { setLastStatus(value); },
-            validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
+            validator: function(value) { return (value >= 0 && value <= 2); }
         }
     ));
     this.add(new vimperator.Option(["linksearch", "lks"], "boolean",
@@ -610,7 +613,7 @@ vimperator.Options = function() //{{{
                   "NOTE: This option does not change the popup blocker of Firefox in any way.",
             default_value: 1,
             setter: function(value) { setPopups(value); },
-            validator: function (value) { if (value >= 0 && value <= 3) return true; else return false; }
+            validator: function(value) { return (value >= 0 && value <= 3); }
         }
     ));
     this.add(new vimperator.Option(["preload"], "boolean",
@@ -628,7 +631,7 @@ vimperator.Options = function() //{{{
                   "Close the preview window with <code class=\"command\">:pclose</code>.<br/>" +
                   "NOTE: Option currently disabled",
             default_value: 10,
-            validator: function (value) { if (value >= 1 && value <= 50) return true; else return false; }
+            validator: function(value) { return (value >= 1 && value <= 50); }
         }
     ));
     this.add(new vimperator.Option(["scroll", "scr"], "number",
@@ -638,7 +641,7 @@ vimperator.Options = function() //{{{
                   "When a <code class=\"argument\">{count}</code> is specified to the <code class=\"mapping\">&lt;C-u&gt;</code> or <code class=\"mapping\">&lt;C-d&gt;</code> commands this is used to set the value of <code class=\"option\">'scroll'</code> and also used for the current command. " +
                   "The value can be reset to half the window height with <code class=\"command\">:set scroll=0</code>.",
             default_value: 0,
-            validator: function (value) { if (value >= 0) return true; else return false; }
+            validator: function(value) { return value >= 0; }
         }
     ));
     this.add(new vimperator.Option(["showmode", "smd"], "boolean",
@@ -658,7 +661,7 @@ vimperator.Options = function() //{{{
                   "<li><b>2</b>: Show the link in the command line</li>" +
                   "</ul>",
             default_value: 1,
-            validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
+            validator: function(value) { return (value >= 0 && value <= 2); }
         }
     ));
     this.add(new vimperator.Option(["showtabline", "stal"], "number",
@@ -672,7 +675,7 @@ vimperator.Options = function() //{{{
                   "</ul>",
             setter: function(value) { setShowTabline(value); },
             default_value: 2,
-            validator: function (value) { if (value >= 0 && value <= 2) return true; else return false; }
+            validator: function(value) { return (value >= 0 && value <= 2); }
         }
     ));
     this.add(new vimperator.Option(["smartcase", "scs"], "boolean",
@@ -707,7 +710,7 @@ vimperator.Options = function() //{{{
             help: "When bigger than zero, Vimperator will give messages about what it is doing. They are printed to the error console which can be shown with <code class=\"command\">:javascript!</code>.<br/>" +
                   "The highest value is 9, being the most verbose mode.",
             default_value: 0,
-            validator: function (value) { if (value >= 0 && value <= 9) return true; else return false; }
+            validator: function(value) { return (value >= 0 && value <= 9); }
         }
     ));
     this.add(new vimperator.Option(["visualbell", "vb"], "boolean",
@@ -743,12 +746,9 @@ vimperator.Options = function() //{{{
                   "</table>" +
                   "When there is only a single match, it is fully completed regardless of the case.",
             default_value: "list:full",
-            validator: function (value)
+            validator: function(value)
             {
-                if (/^(?:(?:full|longest|list|list:full|list:longest)(?:,(?!,))?){0,3}(?:full|longest|list|list:full|list:longest)?$/.test(value))
-                    return true;
-                else
-                    return false;
+                return value.split(",").every(function(item) { return /^(full|longest|list|list:full|list:longest|)$/.test(item); });
             }
         }
     ));
@@ -761,7 +761,7 @@ vimperator.Options = function() //{{{
                   "<tr><td><b>sort</b></td><td>Always sorts completion list, overriding the <code class=\"option\">'complete'</code> option.</td></tr>" +
                   "</table>",
             default_value: "",
-            validator: function (value) { if (/^sort$/.test(value)) return true; else return false; }
+            validator: function(value) { return /^sort$/.test(value); }
         }
     ));
     //}}}

From 9dc9b7e49c3a0016a309ad70029485f3114e5e5f Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 9 Nov 2007 11:46:40 +0000
Subject: [PATCH 199/224] convert single quotes to double quotes

---
 content/bookmarks.js  |  4 +--
 content/buffers.js    |  4 +--
 content/commands.js   | 40 +++++++++++++--------------
 content/completion.js | 12 ++++----
 content/events.js     |  2 +-
 content/find.js       |  4 +--
 content/help.js       | 12 ++++----
 content/hints.js      | 64 +++++++++++++++++++++----------------------
 content/io.js         |  2 +-
 content/mappings.js   | 12 ++++----
 content/options.js    | 12 ++++----
 content/ui.js         | 12 ++++----
 content/util.js       |  2 +-
 content/vimperator.js |  8 +++---
 14 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/content/bookmarks.js b/content/bookmarks.js
index cc9e7563..6c9cb994 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -665,7 +665,7 @@ vimperator.Marks = function() //{{{
         }
         else
         {
-            var pattern = new RegExp("[" + filter.replace(/\s+/g, '') + "]");
+            var pattern = new RegExp("[" + filter.replace(/\s+/g, "") + "]");
             for (var mark in url_marks)
             {
                 if (pattern.test(mark))
@@ -800,7 +800,7 @@ vimperator.QuickMarks = function() //{{{
 
     this.remove = function(filter)
     {
-        var pattern = new RegExp("[" + filter.replace(/\s+/g, '') + "]");
+        var pattern = new RegExp("[" + filter.replace(/\s+/g, "") + "]");
 
         for (var qmark in qmarks)
         {
diff --git a/content/buffers.js b/content/buffers.js
index a40e1c7c..7ebebb31 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -154,8 +154,8 @@ vimperator.Buffer = function() //{{{
         var result = doc.evaluate(expression, elem,
             function lookupNamespaceURI(prefix) {
               switch (prefix) {
-                case 'xhtml':
-                  return 'http://www.w3.org/1999/xhtml';
+                case "xhtml":
+                  return "http://www.w3.org/1999/xhtml";
                 default:
                   return null;
               }
diff --git a/content/commands.js b/content/commands.js
index cde5fda5..5c736b9a 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -102,8 +102,8 @@ vimperator.Command.prototype.hasName = function(name)
     // true if the candidate matches unambiguously
     function matchAbbreviation(name, format)
     {
-        var minimum = format.indexOf('[');                    // minumum number of characters for a command name match
-        var fullname = format.replace(/\[(\w+)\]$/, '$1');    // full command name
+        var minimum = format.indexOf("[");                    // minumum number of characters for a command name match
+        var fullname = format.replace(/\[(\w+)\]$/, "$1");    // full command name
         if (fullname.indexOf(name) == 0 && name.length >= minimum)
             return true;
         else
@@ -189,7 +189,7 @@ vimperator.Commands = function() //{{{
     this.parseCommand = function(str, tag)
     {
         // remove comments
-        str.replace(/\s*".*$/, '');
+        str.replace(/\s*".*$/, "");
 
         if (tag) // we already have a multiline heredoc construct
         {
@@ -220,7 +220,7 @@ vimperator.Commands = function() //{{{
                 matches[4] = tag[1];
         }
         else
-            matches[3] = '';
+            matches[3] = "";
 
         return matches;
     }
@@ -734,7 +734,7 @@ vimperator.Commands = function() //{{{
                     else
                     {
                         if (!reference[0]) {
-                            if (reference[2] == 'g')
+                            if (reference[2] == "g")
                                 reference[0] = vimperator.globalVariables;
                             else
                                 return; // for now
@@ -742,11 +742,11 @@ vimperator.Commands = function() //{{{
 
                         if (match[3])
                         {
-                            if (match[3] == '+')
+                            if (match[3] == "+")
                                 reference[0][reference[1]] += expr;
-                            else if (match[3] == '-')
+                            else if (match[3] == "-")
                                 reference[0][reference[1]] -= expr;
-                            else if (match[3] == '.')
+                            else if (match[3] == ".")
                                 reference[0][reference[1]] += expr.toString();
                         }
                         else
@@ -762,13 +762,13 @@ vimperator.Commands = function() //{{{
                     return vimperator.echoerr("E121: Undefined variable: " + match[1]);
 
                 var value = reference[0][reference[1]];
-                if (typeof value == 'number')
-                    var prefix = '#';
-                else if (typeof value == 'function')
-                    var prefix = '*';
+                if (typeof value == "number")
+                    var prefix = "#";
+                else if (typeof value == "function")
+                    var prefix = "*";
                 else
-                    var prefix = '';
-                vimperator.echo(reference[1] + '\t\t' + prefix + value);
+                    var prefix = "";
+                vimperator.echo(reference[1] + "\t\t" + prefix + value);
             }
         },
         {
@@ -798,8 +798,8 @@ vimperator.Commands = function() //{{{
 
             if (leader_reg.test(lhs))
             {
-                var leader_ref = vimperator.variableReference('mapleader');
-                var leader = leader_ref[0] ? leader_ref[0][leader_ref[1]] : '\\';
+                var leader_ref = vimperator.variableReference("mapleader");
+                var leader = leader_ref[0] ? leader_ref[0][leader_ref[1]] : "\\";
 
                 lhs = lhs.replace(leader_reg, leader);
             }
@@ -877,7 +877,7 @@ vimperator.Commands = function() //{{{
                 return;
             }
 
-            var filter = args.replace(/[^a-zA-Z]/g, '');
+            var filter = args.replace(/[^a-zA-Z]/g, "");
             vimperator.marks.list(filter);
         },
         {
@@ -1142,7 +1142,7 @@ vimperator.Commands = function() //{{{
                 return;
             }
 
-            var filter = args.replace(/[^a-zA-Z0-9]/g, '');
+            var filter = args.replace(/[^a-zA-Z0-9]/g, "");
             vimperator.quickmarks.list(filter);
         },
         {
@@ -1449,7 +1449,7 @@ vimperator.Commands = function() //{{{
             {
                 if (menu.childNodes[i].label == args)
                 {
-                    eval(menu.childNodes[i].getAttribute('oncommand'));
+                    eval(menu.childNodes[i].getAttribute("oncommand"));
                     break;
                 }
             }
@@ -1765,7 +1765,7 @@ vimperator.Commands = function() //{{{
                 return vimperator.echoerr("E471: Argument required");
 
             var names = args.split(/ /);
-            if (typeof names == 'string') names = [names];
+            if (typeof names == "string") names = [names];
             var length = names.length;
             for (var i = 0, name = names[i]; i < length; name = names[++i])
             {
diff --git a/content/completion.js b/content/completion.js
index 9534900d..384ea1cd 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -171,7 +171,7 @@ vimperator.Completion = function() // {{{
         get_longest_substring: function() //{{{
         {
             if (g_substrings.length == 0)
-                return '';
+                return "";
 
             var longest = g_substrings[0];
             for (var i = 1; i < g_substrings.length; i++)
@@ -198,13 +198,13 @@ vimperator.Completion = function() // {{{
             // join all completion arrays together
             for (var i = 0; i < cpt.length; i++)
             {
-                if (cpt[i] == 's')
+                if (cpt[i] == "s")
                     completions = completions.concat(this.get_search_completions(filter));
-                else if (cpt[i] == 'b')
+                else if (cpt[i] == "b")
                     completions = completions.concat(this.get_bookmark_completions(filter));
-                else if (cpt[i] == 'h')
+                else if (cpt[i] == "h")
                     completions = completions.concat(this.get_history_completions(filter));
-                else if (cpt[i] == 'f')
+                else if (cpt[i] == "f")
                     completions = completions.concat(this.get_file_completions(filter, true));
             }
 
@@ -402,7 +402,7 @@ vimperator.Completion = function() // {{{
             {
                 try
                 {
-                    title = getBrowser().getBrowserAtIndex(i).contentDocument.getElementsByTagName('title')[0].text;
+                    title = getBrowser().getBrowserAtIndex(i).contentDocument.getElementsByTagName("title")[0].text;
                 }
                 catch (e)
                 {
diff --git a/content/events.js b/content/events.js
index be815d61..6e6fc0d4 100644
--- a/content/events.js
+++ b/content/events.js
@@ -598,7 +598,7 @@ vimperator.Events = function() //{{{
         }
 
         var count_str = vimperator.input.buffer.match(/^[0-9]*/)[0];
-        var candidate_command = (vimperator.input.buffer + key).replace(count_str, '');
+        var candidate_command = (vimperator.input.buffer + key).replace(count_str, "");
         var map;
 
         // counts must be at the start of a complete mapping (10j -> go 10 lines down)
diff --git a/content/find.js b/content/find.js
index 712d8e91..4cebdf33 100644
--- a/content/find.js
+++ b/content/find.js
@@ -99,7 +99,7 @@ vimperator.Search = function() //{{{
         pattern = pattern.replace(/(\\)?\\[cC]/g, function($0, $1) { return $1 ? $0 : ""; });
 
         // remove any modifer escape \
-        pattern = pattern.replace(/\\(\\[cCuU])/g, '$1');
+        pattern = pattern.replace(/\\(\\[cCuU])/g, "$1");
 
         search_string = pattern;
     }
@@ -247,7 +247,7 @@ vimperator.Search = function() //{{{
         {
             for (var i = 0; i < win.frames.length; i++)
                 arguments.callee(win.frames[i]);
-            var spans = vimperator.buffer.evaluateXPath('//span[@id="__firefox-findbar-search-id"]', win.document);
+            var spans = vimperator.buffer.evaluateXPath("//span[@id='__firefox-findbar-search-id']", win.document);
             for (var i = 0; i < spans.snapshotLength; i++)
                 spans.snapshotItem(i).setAttribute("style", vimperator.options["hlsearchstyle"]);
         })(window.content);
diff --git a/content/help.js b/content/help.js
index c10fdf78..30650b02 100644
--- a/content/help.js
+++ b/content/help.js
@@ -104,7 +104,7 @@ vimperator.help = function(section, easter) //{{{
             // add more space between entries
             ret += separator;
         }
-        ret = ret.replace(new RegExp(separator + '$'), ''); // FIXME: far too tasty!
+        ret = ret.replace(new RegExp(separator + "$"), ""); // FIXME: far too tasty!
         return ret;
     }
 
@@ -121,7 +121,7 @@ vimperator.help = function(section, easter) //{{{
         }
         else
         {
-            if (typeof command.default_value == 'string' && command.default_value.length == 0)
+            if (typeof command.default_value == "string" && command.default_value.length == 0)
                 ret += "''";
             else
                 ret += command.default_value;
@@ -181,14 +181,14 @@ vimperator.help = function(section, easter) //{{{
         '<table class="vimperator mappings">';
     mappings += makeHelpString(vimperator.mappings, "", "", null);
     mappings += '</table>';
-    if (section && section == 'holy-grail')
+    if (section && section == "holy-grail")
         mappings += '<div><p id="holy-grail">You found it, Arthur!</p></div>\n';
 
     var commands = '<span style="float: right"><code class="tag">commands</code></span><h2 id="commands">Commands</h2>' +
         '<table class="vimperator commands">\n';
     commands += makeHelpString(vimperator.commands, ":", "", null);
     commands += '</table>';
-    if (section && section == '42')
+    if (section && section == "42")
         commands += '<div><p id="42">What is the meaning of life, the universe and everything?<br/>' +
                     'Douglas Adams, the only person who knew what this question really was about is<br/>' +
                     'now dead, unfortunately.  So now you might wonder what the meaning of death<br/>' +
@@ -268,9 +268,9 @@ vimperator.help = function(section, easter) //{{{
             if (!element)
             {
                 var firstChar = section.charAt(0);
-                if (firstChar != ':' && firstChar != "'")
+                if (firstChar != ":" && firstChar != "'")
                 {
-                    element = findSectionElement(':' + section);
+                    element = findSectionElement(":" + section);
                     if (!element)
                         element = findSectionElement("'" + section + "'");
                 }
diff --git a/content/hints.js b/content/hints.js
index 93f2d9f7..d6dc04c3 100644
--- a/content/hints.js
+++ b/content/hints.js
@@ -24,7 +24,7 @@
 
 vimperator.Hints = function() //{{{
 {
-    const HINT_PREFIX = 'hah_hint_'; // prefix for the hint id
+    const HINT_PREFIX = "hah_hint_"; // prefix for the hint id
 
     this.hintedElements = function() { return hintedElems; };
     this.currentState = function() { return state;};
@@ -145,15 +145,15 @@ vimperator.Hints = function() //{{{
 
         var elem, i;
 
-        hintElemSpan = doc.createElement('SPAN');
+        hintElemSpan = doc.createElement("SPAN");
         hintElemSpan.style.cssText = vimperator.options["hintstyle"];
-        hintElemSpan.setAttribute('name', 'hah_hint');
+        hintElemSpan.setAttribute("name", "hah_hint");
 
-        var hintContainer = doc.getElementById('hah_hints');
+        var hintContainer = doc.getElementById("hah_hints");
         if (hintContainer == null)
         {
             genHintContainer(doc);
-            hintContainer = doc.getElementById('hah_hints');
+            hintContainer = doc.getElementById("hah_hints");
             if (!hintContainer)
                 return false;
         }
@@ -192,7 +192,7 @@ vimperator.Hints = function() //{{{
                 hintContainer.appendChild(hintElem);
             }
 
-            hintElem.style.display = 'none';
+            hintElem.style.display = "none";
             hintElem.style.top = elem.absoTop + "px";
             hintElem.style.left = elem.absoLeft + "px";
             hintElem.refElem = elem;
@@ -223,7 +223,7 @@ vimperator.Hints = function() //{{{
             // FIXME: this.disableHahMode(win);
             vimperator.setMode(vimperator.modes.NORMAL);
             isHahModeEnabled = false;
-            linkNumString = '';
+            linkNumString = "";
             hintedElems = [];
 
             return;
@@ -231,7 +231,7 @@ vimperator.Hints = function() //{{{
 
         var doc = win.document;
         var hintElem = null;
-        var hintContainer = doc.getElementById('hah_hints');
+        var hintContainer = doc.getElementById("hah_hints");
         var hints = hintContainer.childNodes;
         var i, j;
 
@@ -239,8 +239,8 @@ vimperator.Hints = function() //{{{
         {
             hintText = formatHint(offset+i);
             hintElem = hints[i];
-            hintElem.style.display = 'inline';
-            //hintElem.style.position = 'absolute';
+            hintElem.style.display = "inline";
+            //hintElem.style.position = "absolute";
             hintElem.innerHTML = hintText;
             hintElem.id = HINT_PREFIX + hintText;
         }
@@ -267,7 +267,7 @@ vimperator.Hints = function() //{{{
         {
             elem = res.snapshotItem(i);
             setHintStyle(elem, vimperator.options["hintstyle"]);
-            elem.style.display = 'none';
+            elem.style.display = "none";
         }
 
         for (i = 0; i < win.frames.length; i++)
@@ -337,7 +337,7 @@ vimperator.Hints = function() //{{{
         var str = hintNum.toString(hintCharacters.length); // turn hintNum into a base(length) number
 
         // map the number onto the chars in the numbers string
-        var result = '';
+        var result = "";
         // make all links the same length
         var hintLength = 1;
         var tmp = linkCount;
@@ -405,7 +405,7 @@ vimperator.Hints = function() //{{{
         vimperator.setMode(vimperator.modes.HINTS, mode);
         state = 0;
         linkCount = 0;
-        linkNumString = '';
+        linkNumString = "";
         isHahModeEnabled = true;
 
         createHints();
@@ -431,7 +431,7 @@ vimperator.Hints = function() //{{{
 
         vimperator.setMode(vimperator.modes.NORMAL);
         isHahModeEnabled = false;
-        linkNumString = '';
+        linkNumString = "";
         hintedElems = [];
 
         removeHints(win);
@@ -440,7 +440,7 @@ vimperator.Hints = function() //{{{
 
     this.resetHintedElements = function()
     {
-        linkNumString = '';
+        linkNumString = "";
         state = 0;
 
         while (hintedElems.length > 0)
@@ -486,11 +486,11 @@ vimperator.Hints = function() //{{{
             var elemTagName = elem.localName.toLowerCase();
             elem.focus();
 
-            if (elemTagName == 'frame' || elemTagName == 'iframe')
+            if (elemTagName == "frame" || elemTagName == "iframe")
                 return 0;
 
             // for imagemap
-            if (elemTagName == 'area')
+            if (elemTagName == "area")
             {
                 var coords = elem.getAttribute("coords").split(",");
                 x = Number(coords[0]);
@@ -499,12 +499,12 @@ vimperator.Hints = function() //{{{
             var doc = window.content.document;
             var view = window.document.defaultView;
 
-            var evt = doc.createEvent('MouseEvents');
-            evt.initMouseEvent('mousedown', true, true, view, 1, x + 1, y + 1, 0, 0, /*ctrl*/ new_tab, /*event.altKey*/0, /*event.shiftKey*/ new_window, /*event.metaKey*/ new_tab, 0, null);
+            var evt = doc.createEvent("MouseEvents");
+            evt.initMouseEvent("mousedown", true, true, view, 1, x + 1, y + 1, 0, 0, /*ctrl*/ new_tab, /*event.altKey*/0, /*event.shiftKey*/ new_window, /*event.metaKey*/ new_tab, 0, null);
             elem.dispatchEvent(evt);
 
-            var evt = doc.createEvent('MouseEvents');
-            evt.initMouseEvent('click', true, true, view, 1, x + 1, y + 1, 0, 0, /*ctrl*/ new_tab, /*event.altKey*/0, /*event.shiftKey*/ new_window, /*event.metaKey*/ new_tab, 0, null);
+            var evt = doc.createEvent("MouseEvents");
+            evt.initMouseEvent("click", true, true, view, 1, x + 1, y + 1, 0, 0, /*ctrl*/ new_tab, /*event.altKey*/0, /*event.shiftKey*/ new_window, /*event.metaKey*/ new_tab, 0, null);
             elem.dispatchEvent(evt);
 
             // for 'pure' open calls without a new tab or window it doesn't
@@ -525,7 +525,7 @@ vimperator.Hints = function() //{{{
         for (var i = 0; i < elems.length; i++)
         {
             tmp = elems[i].refElem.href;
-            if (typeof(tmp) != 'undefined' && tmp.length > 0)
+            if (typeof(tmp) != "undefined" && tmp.length > 0)
             {
                 if (i > 0)
                     loc += "\n";
@@ -548,7 +548,7 @@ vimperator.Hints = function() //{{{
         for (var i = 0; i < elems.length; i++)
         {
             tmp = elems[i].refElem.textContent;
-            if (typeof(tmp) != 'undefined' && tmp.length > 0)
+            if (typeof(tmp) != "undefined" && tmp.length > 0)
             {
                 if (i > 0)
                     loc += "\n";
@@ -590,7 +590,7 @@ vimperator.Hints = function() //{{{
         var doc = window.document;
         var elemTagName = elem.localName.toLowerCase();
 
-        if (elemTagName == 'frame' || elemTagName == 'iframe')
+        if (elemTagName == "frame" || elemTagName == "iframe")
         {
             elem.contentWindow.focus();
             return;
@@ -600,18 +600,18 @@ vimperator.Hints = function() //{{{
         //    elem.focus();
         //}
 
-        var evt = doc.createEvent('MouseEvents');
+        var evt = doc.createEvent("MouseEvents");
         var x = 0;
         var y = 0;
         // for imagemap
-        if (elemTagName == 'area')
+        if (elemTagName == "area")
         {
             var coords = elem.getAttribute("coords").split(",");
             x = Number(coords[0]);
             y = Number(coords[1]);
         }
 
-        evt.initMouseEvent('mouseover', true, true, doc.defaultView, 1, x, y, 0, 0, 0, 0, 0, 0, 0, null);
+        evt.initMouseEvent("mouseover", true, true, doc.defaultView, 1, x, y, 0, 0, 0, 0, 0, 0, 0, null);
         elem.dispatchEvent(evt);
     }
 
@@ -635,7 +635,7 @@ vimperator.Hints = function() //{{{
         if (num != null && hintCharacters.toUpperCase().indexOf(num) > -1)
         {
             var oldLinkNumString = linkNumString;
-            linkNumString += '' + num;
+            linkNumString += "" + num;
             // update reference to currently selected node;
             var elem = getHintById(linkNumString);
             changeHintFocus(linkNumString, oldLinkNumString);
@@ -644,7 +644,7 @@ vimperator.Hints = function() //{{{
             if (elem)
             {
                 hintedElems.push(elem);
-                linkNumString = '';
+                linkNumString = "";
                 state = 1;
                 return hintedElems.length;
             }
@@ -666,10 +666,10 @@ vimperator.Hints = function() //{{{
 
     function genHintContainer(doc)
     {
-        if (doc.getElementsByTagName('HINTS').length > 0)
+        if (doc.getElementsByTagName("HINTS").length > 0)
             return;
 
-        hints = doc.createElement('HINTS');
+        hints = doc.createElement("HINTS");
         hints.id = "hah_hints";
         hints.valid_hint_count = 0; // initially 0 elements are usable as hints
 
@@ -703,7 +703,7 @@ vimperator.Hints = function() //{{{
         {
             state = 0;
             linkCount = 0;
-            linkNumString = '';
+            linkNumString = "";
             isHahModeEnabled = true;
 
             setTimeout( function() {
diff --git a/content/io.js b/content/io.js
index 54d58e27..9161155e 100644
--- a/content/io.js
+++ b/content/io.js
@@ -49,7 +49,7 @@ vimperator.IO = function()
 
             // TODO: proper pathname separator translation like Vim
             if (WINDOWS)
-                path = path.replace('/', '\\', 'g');
+                path = path.replace("/", "\\", "g");
 
             // expand "~" to VIMPERATOR_HOME or HOME (USERPROFILE or HOMEDRIVE\HOMEPATH on Windows if HOME is not set)
             if (/^~/.test(path))
diff --git a/content/mappings.js b/content/mappings.js
index b0d0ec9e..1a50321d 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -499,7 +499,7 @@ vimperator.Mappings = function() //{{{
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ['<C-^>', '<C-6>'],
+    addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-^>", "<C-6>"],
         function()
         {
             if (vimperator.tabs.getTab() == vimperator.tabs.alternate)
@@ -522,7 +522,7 @@ vimperator.Mappings = function() //{{{
         },
         {
             short_help: "Select the alternate tab",
-            usage: ['<C-^>'],
+            usage: ["<C-^>"],
             help: "The alternate tab is the last selected tab. This provides a quick method of toggling between two tabs."
         }
     ));
@@ -1077,14 +1077,14 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, [","],
-        function() { vimperator.input.buffer += ','; vimperator.hints.setCurrentState(0); },
+        function() { vimperator.input.buffer += ","; vimperator.hints.setCurrentState(0); },
         {
             cancel_mode: false,
             always_active: true
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, [":"],
-        function() { vimperator.commandline.open(':', '', vimperator.modes.EX); },
+        function() { vimperator.commandline.open(":", "", vimperator.modes.EX); },
         {
             cancel_mode: false,
             always_active: true
@@ -1173,14 +1173,14 @@ vimperator.Mappings = function() //{{{
 
     // tab management
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-n>"],
-        function() { vimperator.tabs.select('+1', true); },
+        function() { vimperator.tabs.select("+1", true); },
         {
             cancel_mode: true,
             always_active: true
         }
     )); // same as gt, but no count supported
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-p>"],
-        function() { vimperator.tabs.select('-1', true); },
+        function() { vimperator.tabs.select("-1", true); },
         {
             cancel_mode: true,
             always_active: true
diff --git a/content/options.js b/content/options.js
index fbd5aee0..d9226b02 100644
--- a/content/options.js
+++ b/content/options.js
@@ -296,14 +296,14 @@ vimperator.Options = function() //{{{
     //
 
     // work around firefox popup blocker
-    var popup_allowed_events = loadPreference('dom.popup_allowed_events', 'change click dblclick mouseup reset submit');
+    var popup_allowed_events = loadPreference("dom.popup_allowed_events", "change click dblclick mouseup reset submit");
     if (!popup_allowed_events.match("keypress"))
-        storePreference('dom.popup_allowed_events', popup_allowed_events + " keypress");
+        storePreference("dom.popup_allowed_events", popup_allowed_events + " keypress");
 
     // TODO: shouldn't we be resetting these in destroy() as well?
     // we have our own typeahead find implementation
-    storePreference('accessibility.typeaheadfind.autostart', false);
-    storePreference('accessibility.typeaheadfind', false); // actually the above setting should do it, but has no effect in firefox
+    storePreference("accessibility.typeaheadfind.autostart", false);
+    storePreference("accessibility.typeaheadfind", false); // actually the above setting should do it, but has no effect in firefox
 
     // start with saved session
     storePreference("browser.startup.page", 3);
@@ -337,9 +337,9 @@ vimperator.Options = function() //{{{
     this.destroy = function()
     {
         // reset some modified firefox prefs
-        if (loadPreference('dom.popup_allowed_events', 'change click dblclick mouseup reset submit')
+        if (loadPreference("dom.popup_allowed_events", "change click dblclick mouseup reset submit")
                 == popup_allowed_events + " keypress")
-            storePreference('dom.popup_allowed_events', popup_allowed_events);
+            storePreference("dom.popup_allowed_events", popup_allowed_events);
     }
 
     this.list = function(only_non_default)
diff --git a/content/ui.js b/content/ui.js
index 91a851eb..0f7d49e0 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -100,11 +100,11 @@ vimperator.CommandLine = function() //{{{
     var completion_index = UNINITIALIZED;
 
     // the containing box for the prompt_widget and command_widget
-    var commandline_widget = document.getElementById('vimperator-commandline');
+    var commandline_widget = document.getElementById("vimperator-commandline");
     // the prompt for the current command, for example : or /. Can be blank
-    var prompt_widget = document.getElementById('vimperator-commandline-prompt');
+    var prompt_widget = document.getElementById("vimperator-commandline-prompt");
     // the command bar which contains the current command
-    var command_widget = document.getElementById('vimperator-commandline-command');
+    var command_widget = document.getElementById("vimperator-commandline-command");
 
     // the widget used for multiline output
     var multiline_output_widget = document.getElementById("vimperator-multiline-output");
@@ -520,11 +520,11 @@ vimperator.CommandLine = function() //{{{
                 var longest = false;
                 var full = false;
                 var wildtype = wim[wild_index++] || wim[wim.length - 1];
-                if (wildtype == 'list' || wildtype == 'list:full' || wildtype == 'list:longest')
+                if (wildtype == "list" || wildtype == "list:full" || wildtype == "list:longest")
                     has_list = true;
-                if (wildtype == 'longest' || wildtype == 'list:longest')
+                if (wildtype == "longest" || wildtype == "list:longest")
                     longest = true;
-                else if (wildtype == 'full' || wildtype == 'list:full')
+                else if (wildtype == "full" || wildtype == "list:full")
                     full = true;
 
                 // show the list
diff --git a/content/util.js b/content/util.js
index 4327d47c..c81fb159 100644
--- a/content/util.js
+++ b/content/util.js
@@ -93,7 +93,7 @@ vimperator.util = {
             var matches;
 
             // strip each 'URL' - makes things simpler later on
-            urls[url] = urls[url].replace(/^\s+/, '').replace(/\s+$/, '');
+            urls[url] = urls[url].replace(/^\s+/, "").replace(/\s+$/, "");
 
             // FIXME: not really that good (doesn't handle .. in the middle)
             // check for ./ and ../ (or even .../) to go to a file in the upper directory
diff --git a/content/vimperator.js b/content/vimperator.js
index 1a4fa6a4..bd32f6cd 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -73,9 +73,9 @@ const vimperator = (function() //{{{
     var callbacks = [];
 
     // our services
-    var sound_service = Components.classes['@mozilla.org/sound;1']
+    var sound_service = Components.classes["@mozilla.org/sound;1"]
         .getService(Components.interfaces.nsISound);
-    var console_service = Components.classes['@mozilla.org/consoleservice;1']
+    var console_service = Components.classes["@mozilla.org/consoleservice;1"]
         .getService(Components.interfaces.nsIConsoleService);
     var environment_service = Components.classes["@mozilla.org/process/environment;1"]
         .getService(Components.interfaces.nsIEnvironment);
@@ -243,7 +243,7 @@ const vimperator = (function() //{{{
             if (!modifiers)
                 modifiers = {};
 
-            var [count, cmd, special, args] = vimperator.commands.parseCommand(str.replace(/^'(.*)'$/, '$1'));
+            var [count, cmd, special, args] = vimperator.commands.parseCommand(str.replace(/^'(.*)'$/, "$1"));
             var command = vimperator.commands.get(cmd);
 
             if (command === null)
@@ -406,7 +406,7 @@ const vimperator = (function() //{{{
             if (typeof msg == "object")
                 msg = this.objectToString(msg, false);
 
-            console_service.logStringMessage('vimperator: ' + msg);
+            console_service.logStringMessage("vimperator: " + msg);
         },
 
         // open one or more URLs

From 9ca8bb2cc77d37771a59eb921675505859f8f292 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 9 Nov 2007 11:48:41 +0000
Subject: [PATCH 200/224] use the innerHeight property of window rather than
 mPanelContainer's box object for calculating v.buffer.pageHeight

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

diff --git a/content/buffers.js b/content/buffers.js
index 7ebebb31..945f01cc 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -125,7 +125,7 @@ vimperator.Buffer = function() //{{{
 
     this.__defineGetter__("pageHeight", function()
     {
-        return getBrowser().mPanelContainer.boxObject.height; // FIXME: best way to do this?
+        return window.content.innerHeight;
     });
 
     this.__defineGetter__("textZoom", function()

From 61c55f6f1dc8f2cf146af8302135d83b185f88c2 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 9 Nov 2007 11:56:14 +0000
Subject: [PATCH 201/224] don't attempt to add the frame indicator if
 v.buffer.shiftFrameFocus is called on a non-HTML document

---
 content/buffers.js | 167 ++++++++++++++++++++++-----------------------
 1 file changed, 82 insertions(+), 85 deletions(-)

diff --git a/content/buffers.js b/content/buffers.js
index 945f01cc..b7269632 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -267,103 +267,100 @@ vimperator.Buffer = function() //{{{
     // TODO: allow callback for filtering out unwanted frames? User defined?
     this.shiftFrameFocus = function(count, forward)
     {
-        try
+        if (!window.content.document instanceof HTMLDocument)
+            return;
+
+        var frames = [];
+
+        // find all frames - depth-first search
+        (function(frame)
         {
-            var frames = [];
+            if (frame.document.body.localName.toLowerCase() == "body")
+                frames.push(frame);
+            for (var i = 0; i < frame.frames.length; i++)
+                arguments.callee(frame.frames[i])
+        })(window.content);
 
-            // find all frames - depth-first search
-            (function(frame)
+        if (frames.length == 0) // currently top is always included
+            return;
+
+        // remove all unfocusable frames
+        // TODO: find a better way to do this - walking the tree is too slow
+        var start = document.commandDispatcher.focusedWindow;
+        frames = frames.filter(function(frame) {
+                frame.focus();
+                if (document.commandDispatcher.focusedWindow == frame)
+                    return frame;
+        });
+        start.focus();
+
+        // find the currently focused frame index
+        // TODO: If the window is a frameset then the first _frame_ should be
+        //       focused.  Since this is not the current FF behaviour,
+        //       we initalize current to -1 so the first call takes us to the
+        //       first frame.
+        var current = -1;
+        for (var i = 0; i < frames.length; i++)
+        {
+            if (frames[i] == document.commandDispatcher.focusedWindow)
             {
-                if (frame.document.body.localName.toLowerCase() == "body")
-                    frames.push(frame);
-                for (var i = 0; i < frame.frames.length; i++)
-                    arguments.callee(frame.frames[i])
-            })(window.content);
-
-            if (frames.length == 0) // currently top is always included
-                return;
-
-            // remove all unfocusable frames
-            // TODO: find a better way to do this
-            var start = document.commandDispatcher.focusedWindow;
-            frames = frames.filter(function(frame) {
-                    frame.focus();
-                    if (document.commandDispatcher.focusedWindow == frame)
-                        return frame;
-            });
-            start.focus();
-
-            // find the currently focused frame index
-            // TODO: If the window is a frameset then the first _frame_ should be
-            //       focused.  Since this is not the current FF behaviour,
-            //       we initalize current to -1 so the first call takes us to the
-            //       first frame.
-            var current = -1;
-            for (var i = 0; i < frames.length; i++)
-            {
-                if (frames[i] == document.commandDispatcher.focusedWindow)
-                {
-                    var current = i;
-                    break;
-                }
+                var current = i;
+                break;
             }
+        }
 
-            // calculate the next frame to focus
-            var next = current;
-            if (forward)
-            {
-                if (count > 1)
-                    next = current + count;
-                else
-                    next++;
-
-                if (next > frames.length - 1)
-                {
-                    if (current == frames.length - 1)
-                        vimperator.beep(); // still allow the frame indicator to be activated
-
-                    next = frames.length - 1;
-                }
-            }
+        // calculate the next frame to focus
+        var next = current;
+        if (forward)
+        {
+            if (count > 1)
+                next = current + count;
             else
+                next++;
+
+            if (next > frames.length - 1)
             {
-                if (count > 1)
-                    next = current - count;
-                else
-                    next--;
+                if (current == frames.length - 1)
+                    vimperator.beep(); // still allow the frame indicator to be activated
 
-                if (next < 0)
-                {
-                    if (current == 0)
-                        vimperator.beep(); // still allow the frame indicator to be activated
-
-                    next = 0;
-                }
+                next = frames.length - 1;
             }
-
-            // focus next frame and scroll into view
-            frames[next].focus();
-            if (frames[next] != window.content)
-                frames[next].frameElement.scrollIntoView(false);
-
-            // add the frame indicator
-            var doc = frames[next].document;
-            var indicator = doc.createElement("div");
-            indicator.id = "vimperator-frame-indicator";
-            // NOTE: need to set a high z-index - it's a crapshoot!
-            var style = "background-color: red; opacity: 0.5; z-index: 999;" +
-                        "position: fixed; top: 0; bottom: 0; left: 0; right: 0;";
-            indicator.setAttribute("style", style);
-            doc.body.appendChild(indicator);
-
-            // remove the frame indicator
-            setTimeout(function() { doc.body.removeChild(indicator); }, 500);
         }
-        catch (e)
+        else
         {
-            // FIXME: fail silently here for now
-            //vimperator.log(e);
+            if (count > 1)
+                next = current - count;
+            else
+                next--;
+
+            if (next < 0)
+            {
+                if (current == 0)
+                    vimperator.beep(); // still allow the frame indicator to be activated
+
+                next = 0;
+            }
         }
+
+        // focus next frame and scroll into view
+        frames[next].focus();
+        if (frames[next] != window.content)
+            frames[next].frameElement.scrollIntoView(false);
+
+        // add the frame indicator
+        // TODO: make this an XBL element rather than messing with the content
+        // document
+        var doc = frames[next].document;
+        var indicator = doc.createElement("div");
+        indicator.id = "vimperator-frame-indicator";
+        // NOTE: need to set a high z-index - it's a crapshoot!
+        var style = "background-color: red; opacity: 0.5; z-index: 999;" +
+                    "position: fixed; top: 0; bottom: 0; left: 0; right: 0;";
+        indicator.setAttribute("style", style);
+        doc.body.appendChild(indicator);
+
+        // remove the frame indicator
+        setTimeout(function() { doc.body.removeChild(indicator); }, 500);
     }
 
     // updates the buffer preview in place only if list is visible

From 8a218d19e386821353118ccb9a77c37a7b4a369a Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 9 Nov 2007 12:58:22 +0000
Subject: [PATCH 202/224] merge improved :noremap

---
 content/commands.js | 111 +++++++++++++-------------------------------
 content/events.js   |  19 ++++++--
 2 files changed, 46 insertions(+), 84 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index 5c736b9a..f0fdebdb 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -780,43 +780,41 @@ vimperator.Commands = function() //{{{
                   "Without arguments, displays a list of all variables."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["map"],
-        // 0 args -> list all maps
-        // 1 arg  -> list the maps starting with args
-        // 2 args -> map arg1 to arg*
-        function(args)
+    function map(args, noremap)
+    {
+        if (!args)
         {
-            if (!args)
-            {
-                vimperator.mappings.list(vimperator.modes.NORMAL);
-                return;
-            }
+            vimperator.mappings.list(vimperator.modes.NORMAL);
+            return;
+        }
 
-            var matches = args.match(/^([^\s]+)(?:\s+(.+))?$/);
-            var [lhs, rhs] = [matches[1], matches[2]];
-            var leader_reg = /<Leader>/i;
+        var matches = args.match(/^([^\s]+)(?:\s+(.+))?$/);
+        var [lhs, rhs] = [matches[1], matches[2]];
+        var leader_reg = /<Leader>/i;
 
-            if (leader_reg.test(lhs))
-            {
-                var leader_ref = vimperator.variableReference("mapleader");
-                var leader = leader_ref[0] ? leader_ref[0][leader_ref[1]] : "\\";
+        if (leader_reg.test(lhs))
+        {
+            var leader_ref = vimperator.variableReference("mapleader");
+            var leader = leader_ref[0] ? leader_ref[0][leader_ref[1]] : "\\";
 
-                lhs = lhs.replace(leader_reg, leader);
-            }
+            lhs = lhs.replace(leader_reg, leader);
+        }
 
-            if (rhs)
-            {
-                vimperator.mappings.add(new vimperator.Map(vimperator.modes.NORMAL, [lhs],
-                    function(count) { vimperator.events.feedkeys((count > 1 ? count : "") + rhs); },
-                    { flags: vimperator.Mappings.flags.COUNT, rhs: rhs }
-                ));
-            }
-            else
-            {
-                // FIXME: no filtering for now
-                vimperator.mappings.list(vimperator.modes.NORMAL, lhs);
-            }
-        },
+        if (rhs)
+        {
+            vimperator.mappings.add(new vimperator.Map(vimperator.modes.NORMAL, [lhs],
+                function(count) { vimperator.events.feedkeys((count > 1 ? count : "") + rhs, noremap); },
+                { flags: vimperator.Mappings.flags.COUNT, rhs: rhs }
+            ));
+        }
+        else
+        {
+            // FIXME: no filtering for now
+            vimperator.mappings.list(vimperator.modes.NORMAL, lhs);
+        }
+    }
+    addDefaultCommand(new vimperator.Command(["map"],
+        function(args) { map(args, false) },
         {
             usage: ["map {lhs} {rhs}", "map {lhs}", "map"],
             short_help: "Map the key sequence {lhs} to {rhs}",
@@ -968,56 +966,11 @@ vimperator.Commands = function() //{{{
     ));
     // TODO: remove duplication in :map
     addDefaultCommand(new vimperator.Command(["no[remap]"],
-        // 0 args -> list all maps
-        // 1 arg  -> list the maps starting with args
-        // 2 args -> map arg1 to arg*
-        function(args)
-        {
-            if (!args)
-            {
-                vimperator.mappings.list(vimperator.modes.NORMAL);
-                return;
-            }
-
-            var matches = args.match(/^([^ ]+)(?:\s+(.+))?$/);
-            var [lhs, rhs] = [matches[1], matches[2]];
-
-            if (rhs)
-            {
-                if (/^:/.test(rhs))
-                {
-                    vimperator.mappings.add(
-                        new vimperator.Map(vimperator.modes.NORMAL, [lhs], function() { vimperator.execute(rhs); }, { rhs: rhs })
-                    );
-                }
-                else
-                {
-                    // NOTE: we currently only allow one normal mode command in {rhs}
-                    var map = vimperator.mappings.getDefaultMap(vimperator.modes.NORMAL, rhs);
-
-                    // create a Map for {lhs} with the same action as
-                    // {rhs}...until we have feedkeys().
-                    // NOTE: Currently only really intended for static use (e.g.
-                    // from the RC file) since {rhs} is evaluated when the map
-                    // is created not at runtime
-                    if (map)
-                        vimperator.mappings.add(
-                            new vimperator.Map(vimperator.modes.NORMAL, [lhs], map.action, { flags: map.flags, rhs: rhs })
-                        );
-                    else
-                        vimperator.echoerr("E475: Invalid argument: " + "{rhs} must be a existing singular mapping");
-                }
-            }
-            else
-            {
-                // FIXME: no filtering for now
-                vimperator.mappings.list(vimperator.modes.NORMAL, lhs);
-            }
-        },
+        function(args) { map(args, true) },
         {
             usage: ["no[remap] {lhs} {rhs}", "no[remap] {lhs}", "no[remap]"],
             short_help: "Map the key sequence {lhs} to {rhs}",
-            help: "No remapping of the <code class=\"argument\">{rhs}</code> is performed.<br/>NOTE: :noremap does not yet work as reliably as :map."
+            help: "No remapping of the <code class=\"argument\">{rhs}</code> is performed."
         }
     ));
     addDefaultCommand(new vimperator.Command(["o[pen]", "e[dit]"],
diff --git a/content/events.js b/content/events.js
index 6e6fc0d4..9c0c4101 100644
--- a/content/events.js
+++ b/content/events.js
@@ -256,12 +256,14 @@ vimperator.Events = function() //{{{
     //
     // @param keys: a string like "2<C-f>" to pass
     //              if you want < to be taken literally, prepend it with a \\
-    this.feedkeys = function(keys)
+    this.feedkeys = function(keys, noremap)
     {
         var doc = window.document;
         var view = window.document.defaultView;
         var escapeKey = false; // \ to escape some special keys
 
+        noremap = !!noremap;
+
         for (var i = 0; i < keys.length; i++)
         {
             var charCode = keys.charCodeAt(i);
@@ -270,7 +272,7 @@ vimperator.Events = function() //{{{
             //if (charCode == 92) // the '\' key FIXME: support the escape key
             if (charCode == 60 && !escapeKey) // the '<' key starts a complex key
             {
-                var matches = keys.substr(i+1).match(/([CSMAcsma]-)*([^>]+)/);
+                var matches = keys.substr(i + 1).match(/([CSMAcsma]-)*([^>]+)/);
                 if (matches && matches[2])
                 {
                     if (matches[1]) // check for modifiers
@@ -294,8 +296,10 @@ vimperator.Events = function() //{{{
                     {
                         charCode = 0;
                     }
-                    else //an invalid key like <A-xxx> was found, stop propagation here (like vim)
+                    else //an invalid key like <A-xxx> was found, stop propagation here (like Vim)
+                    {
                         return;
+                    }
 
                     i += matches[0].length + 1;
                 }
@@ -306,7 +310,8 @@ vimperator.Events = function() //{{{
                 elem = window.content;
 
             var evt = doc.createEvent("KeyEvents");
-            evt.initKeyEvent("keypress", true, true, view, ctrl, alt, shift, meta, keyCode, charCode );
+            evt.initKeyEvent("keypress", true, true, view, ctrl, alt, shift, meta, keyCode, charCode);
+            evt.noremap = noremap;
             elem.dispatchEvent(evt);
         }
     }
@@ -600,6 +605,10 @@ vimperator.Events = function() //{{{
         var count_str = vimperator.input.buffer.match(/^[0-9]*/)[0];
         var candidate_command = (vimperator.input.buffer + key).replace(count_str, "");
         var map;
+        if (event.noremap)
+            map = vimperator.mappings.getDefaultMap(vimperator.modes.NORMAL, candidate_command);
+        else
+            map = vimperator.mappings.get(vimperator.modes.NORMAL, candidate_command);
 
         // counts must be at the start of a complete mapping (10j -> go 10 lines down)
         if ((vimperator.input.buffer + key).match(/^[1-9][0-9]*$/))
@@ -619,7 +628,7 @@ vimperator.Events = function() //{{{
 
             vimperator.input.pendingArgMap = null;
         }
-        else if (map = vimperator.mappings.get(vimperator.modes.NORMAL, candidate_command))
+        else if (map)
         {
             vimperator.input.count = parseInt(count_str, 10);
             if (isNaN(vimperator.input.count))

From 9bdc1cc490fd93c8671b5c23ff3aea34f4228136 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 11 Nov 2007 03:01:12 +0000
Subject: [PATCH 203/224] make it clear that the arg is optional for :tabnext
 and :tabprevious

---
 content/commands.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index f0fdebdb..bfb79600 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1497,7 +1497,7 @@ vimperator.Commands = function() //{{{
             }
         },
         {
-            usage: ["tabn[ext] {count}"],
+            usage: ["tabn[ext] [count]"],
             short_help: "Switch to the next or [count]th tab",
             help: "Cycles to the first tab when the last is selected and <code class=\"argument\">{count}</code> is not specified."
         }
@@ -1540,7 +1540,7 @@ vimperator.Commands = function() //{{{
                 vimperator.echoerr("E488: Trailing characters");
         },
         {
-            usage: ["tabp[revious] {count}"],
+            usage: ["tabp[revious] [count]"],
             short_help: "Switch to the previous tab or go [count] tabs back",
             help: "Wraps around from the first tab to the last tab."
         }

From 9427e2cc5dc271b6cee898621393a3b5a910b604 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 11 Nov 2007 03:02:19 +0000
Subject: [PATCH 204/224] ignore mappings if :normal is called with the !

---
 content/commands.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index bfb79600..99140a66 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -948,7 +948,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["norm[al]"],
-        function(args)
+        function(args, special)
         {
             if (!args)
             {
@@ -956,12 +956,13 @@ vimperator.Commands = function() //{{{
                 return;
             }
 
-            vimperator.events.feedkeys(args);
+            vimperator.events.feedkeys(args, special);
         },
         {
             usage: ["norm[al][!] {commands}"],
             short_help: "Execute Normal mode commands",
-            help: "Example: <code class=\"command\">:normal 20j</code> scrolls 20 lines down."
+            help: "Example: <code class=\"command\">:normal 20j</code> scrolls 20 lines down. " + 
+                  "If the <code class=\"argument\">[!]</code> is specified mappings will not be used."
         }
     ));
     // TODO: remove duplication in :map

From 1bd4543ea36b7022bc18ce7a62e49db1aa7ae4ab Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 11 Nov 2007 03:21:27 +0000
Subject: [PATCH 205/224] whitespace formatting fixes

---
 content/bookmarks.js  |  66 ++++++------
 content/buffers.js    |  56 +++++------
 content/commands.js   | 192 +++++++++++++++++------------------
 content/completion.js |  60 +++++------
 content/events.js     |  54 +++++-----
 content/find.js       |  42 ++++----
 content/help.js       |   6 +-
 content/hints.js      |  30 +++---
 content/io.js         |  18 ++--
 content/mappings.js   | 228 +++++++++++++++++++++---------------------
 content/options.js    |  92 ++++++++---------
 content/tabs.js       |  24 ++---
 content/test.js       |   2 +-
 content/ui.js         |  72 ++++++-------
 content/util.js       |  10 +-
 content/vimperator.js |  73 +++++++-------
 16 files changed, 514 insertions(+), 511 deletions(-)

diff --git a/content/bookmarks.js b/content/bookmarks.js
index 6c9cb994..9d473305 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -27,7 +27,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
 // also includes methods for dealing with keywords and search engines
-vimperator.Bookmarks = function() //{{{
+vimperator.Bookmarks = function () //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -42,7 +42,7 @@ vimperator.Bookmarks = function() //{{{
     var keywords = null;
 
     if (vimperator.options["preload"])
-        setTimeout(function() { load(); } , 100);
+        setTimeout(function () { load(); } , 100);
 
     function load()
     {
@@ -78,7 +78,7 @@ vimperator.Bookmarks = function() //{{{
 
     // FIXME: add filtering here rather than having to calling
     // get_bookmark_completions()
-    this.get = function()
+    this.get = function ()
     {
         if (!bookmarks)
             load();
@@ -105,7 +105,7 @@ vimperator.Bookmarks = function() //{{{
 
     // NOTE: no idea what it does, it Just Works (TM)
     // returns number of deleted bookmarks
-    this.remove = function(url)
+    this.remove = function (url)
     {
         var deleted = 0;
         if (!url)
@@ -157,7 +157,7 @@ vimperator.Bookmarks = function() //{{{
     }
 
     // also ensures that each search engine has a Vimperator-friendly alias
-    this.getSearchEngines = function()
+    this.getSearchEngines = function ()
     {
         var search_engines = [];
         var firefox_engines = search_service.getVisibleEngines({ });
@@ -173,7 +173,7 @@ vimperator.Bookmarks = function() //{{{
             var newalias = alias;
             for (var j = 1; j <= 10; j++) // <=10 is intentional
             {
-                if (!search_engines.some(function(item) { return (item[0] == newalias); }))
+                if (!search_engines.some(function (item) { return (item[0] == newalias); }))
                     break;
 
                 newalias = alias + j;
@@ -190,7 +190,7 @@ vimperator.Bookmarks = function() //{{{
 
     // format of returned array:
     // [keyword, helptext, url]
-    this.getKeywords = function()
+    this.getKeywords = function ()
     {
         if (!keywords)
             load();
@@ -201,7 +201,7 @@ vimperator.Bookmarks = function() //{{{
     // if @param engine_name is null, it uses the default search engine
     // @returns the url for the search string
     //          if the search also requires a postdata, [url, postdata] is returned
-    this.getSearchURL = function(text, engine_name)
+    this.getSearchURL = function (text, engine_name)
     {
         var url = null;
         var postdata = null;
@@ -249,7 +249,7 @@ vimperator.Bookmarks = function() //{{{
             return url; // can be null
     }
 
-    this.list = function(filter, fullmode)
+    this.list = function (filter, fullmode)
     {
         if (fullmode)
         {
@@ -290,7 +290,7 @@ vimperator.Bookmarks = function() //{{{
     //  res.title is the title or "" if no one was given
     //  res.url is the url as a string
     //  returns null, if parsing failed
-    this.parseBookmarkString = function(str)
+    this.parseBookmarkString = function (str)
     {
         var res = {};
         res.tags = [];
@@ -356,7 +356,7 @@ vimperator.Bookmarks = function() //{{{
     //}}}
 } //}}}
 
-vimperator.History = function() //{{{
+vimperator.History = function () //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -370,7 +370,7 @@ vimperator.History = function() //{{{
     var history = null;
 
     if (vimperator.options["preload"])
-        setTimeout(function() { load(); } , 100);
+        setTimeout(function () { load(); } , 100);
 
     function load()
     {
@@ -418,7 +418,7 @@ vimperator.History = function() //{{{
 
     // FIXME: add filtering here rather than having to call
     // get_bookmark_completions()
-    this.get = function()
+    this.get = function ()
     {
         if (!history)
             load();
@@ -431,7 +431,7 @@ vimperator.History = function() //{{{
         if (!history)
             load();
 
-        history = history.filter(function(elem) {
+        history = history.filter(function (elem) {
             return elem[0] != url;
         });
 
@@ -441,7 +441,7 @@ vimperator.History = function() //{{{
 
     // TODO: better names?
     //       and move to vimperator.buffer.?
-    this.stepTo = function(steps)
+    this.stepTo = function (steps)
     {
         var index = getWebNavigation().sessionHistory.index + steps;
 
@@ -455,7 +455,7 @@ vimperator.History = function() //{{{
         }
     }
 
-    this.goToStart = function()
+    this.goToStart = function ()
     {
         var index = getWebNavigation().sessionHistory.index;
 
@@ -468,7 +468,7 @@ vimperator.History = function() //{{{
         getWebNavigation().gotoIndex(0);
     }
 
-    this.goToEnd = function()
+    this.goToEnd = function ()
     {
         var index = getWebNavigation().sessionHistory.index;
         var max = getWebNavigation().sessionHistory.count - 1;
@@ -482,7 +482,7 @@ vimperator.History = function() //{{{
         getWebNavigation().gotoIndex(max);
     }
 
-    this.list = function(filter, fullmode)
+    this.list = function (filter, fullmode)
     {
         if (fullmode)
         {
@@ -519,7 +519,7 @@ vimperator.History = function() //{{{
     //}}}
 } //}}}
 
-vimperator.Marks = function() //{{{
+vimperator.Marks = function () //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -608,7 +608,7 @@ vimperator.Marks = function() //{{{
             umarks.push([mark, url_marks[mark]]);
         // FIXME: why does umarks.sort() cause a "Component is not available =
         // NS_ERROR_NOT_AVAILABLE" exception when used here?
-        umarks.sort(function(a, b) {
+        umarks.sort(function (a, b) {
             if (a[0] < b[0])
                 return -1;
             else if (a[0] > b[0])
@@ -625,7 +625,7 @@ vimperator.Marks = function() //{{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     // TODO: add support for frameset pages
-    this.add = function(mark)
+    this.add = function (mark)
     {
         var win = window.content;
 
@@ -655,7 +655,7 @@ vimperator.Marks = function() //{{{
         }
     }
 
-    this.remove = function(filter, special)
+    this.remove = function (filter, special)
     {
         if (special)
         {
@@ -679,7 +679,7 @@ vimperator.Marks = function() //{{{
         }
     }
 
-    this.jumpTo = function(mark)
+    this.jumpTo = function (mark)
     {
         var ok = false;
 
@@ -733,7 +733,7 @@ vimperator.Marks = function() //{{{
             vimperator.echoerr("E20: Mark not set"); // FIXME: move up?
     }
 
-    this.list = function(filter)
+    this.list = function (filter)
     {
         var marks = getSortedMarks();
 
@@ -745,7 +745,7 @@ vimperator.Marks = function() //{{{
 
         if (filter.length > 0)
         {
-            marks = marks.filter(function(mark) {
+            marks = marks.filter(function (mark) {
                     if (filter.indexOf(mark[0]) > -1)
                         return mark;
             });
@@ -774,7 +774,7 @@ vimperator.Marks = function() //{{{
     //}}}
 } //}}}
 
-vimperator.QuickMarks = function() //{{{
+vimperator.QuickMarks = function () //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -793,12 +793,12 @@ vimperator.QuickMarks = function() //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    this.add = function(qmark, location)
+    this.add = function (qmark, location)
     {
         qmarks[qmark] = location;
     }
 
-    this.remove = function(filter)
+    this.remove = function (filter)
     {
         var pattern = new RegExp("[" + filter.replace(/\s+/g, "") + "]");
 
@@ -809,12 +809,12 @@ vimperator.QuickMarks = function() //{{{
         }
     }
 
-    this.removeAll = function()
+    this.removeAll = function ()
     {
         qmarks = {};
     }
 
-    this.jumpTo = function(qmark, where)
+    this.jumpTo = function (qmark, where)
     {
         var url = qmarks[qmark];
 
@@ -824,7 +824,7 @@ vimperator.QuickMarks = function() //{{{
             vimperator.echoerr("E20: QuickMark not set");
     }
 
-    this.list = function(filter)
+    this.list = function (filter)
     {
         var marks = [];
 
@@ -841,7 +841,7 @@ vimperator.QuickMarks = function() //{{{
 
         if (filter.length > 0)
         {
-            marks = marks.filter(function(mark) {
+            marks = marks.filter(function (mark) {
                     if (filter.indexOf(mark[0]) > -1)
                         return mark;
             });
@@ -864,7 +864,7 @@ vimperator.QuickMarks = function() //{{{
         vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
     }
 
-    this.destroy = function()
+    this.destroy = function ()
     {
         // save the quickmarks
         var saved_qmarks = "";
diff --git a/content/buffers.js b/content/buffers.js
index b7269632..f09331bf 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.Buffer = function() //{{{
+vimperator.Buffer = function () //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -116,35 +116,35 @@ vimperator.Buffer = function() //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    this.__defineGetter__("URL", function()
+    this.__defineGetter__("URL", function ()
     {
         // TODO: .URL is not defined for XUL documents
         //return window.content.document.URL;
         return window.content.document.location.href;
     });
 
-    this.__defineGetter__("pageHeight", function()
+    this.__defineGetter__("pageHeight", function ()
     {
         return window.content.innerHeight;
     });
 
-    this.__defineGetter__("textZoom", function()
+    this.__defineGetter__("textZoom", function ()
     {
         return zoom_manager.textZoom;
     });
 
-    this.__defineSetter__("textZoom", function(value)
+    this.__defineSetter__("textZoom", function (value)
     {
         setZoom(value);
     });
 
-    this.__defineGetter__("title", function()
+    this.__defineGetter__("title", function ()
     {
         return window.content.document.title;
     });
 
     // returns an XPathResult object
-    this.evaluateXPath = function(expression, doc, elem, ordered)
+    this.evaluateXPath = function (expression, doc, elem, ordered)
     {
         if (!doc)
             doc = window.content.document;
@@ -167,7 +167,7 @@ vimperator.Buffer = function() //{{{
         return result;
     }
 
-    this.list = function(fullmode)
+    this.list = function (fullmode)
     {
         if (fullmode)
         {
@@ -214,12 +214,12 @@ vimperator.Buffer = function() //{{{
         }
     }
 
-    this.scrollBottom = function()
+    this.scrollBottom = function ()
     {
         scrollToPercentiles(-1, 100);
     }
 
-    this.scrollColumns = function(cols)
+    this.scrollColumns = function (cols)
     {
         var win = window.document.commandDispatcher.focusedWindow;
         const COL_WIDTH = 20;
@@ -230,42 +230,42 @@ vimperator.Buffer = function() //{{{
         win.scrollBy(COL_WIDTH * cols, 0);
     }
 
-    this.scrollEnd = function()
+    this.scrollEnd = function ()
     {
         scrollToPercentiles(100, -1);
     }
 
-    this.scrollLines = function(lines)
+    this.scrollLines = function (lines)
     {
         var win = window.document.commandDispatcher.focusedWindow;
         checkScrollYBounds(win, lines);
         win.scrollByLines(lines);
     }
 
-    this.scrollPages = function(pages)
+    this.scrollPages = function (pages)
     {
         var win = window.document.commandDispatcher.focusedWindow;
         checkScrollYBounds(win, pages);
         win.scrollByPages(pages);
     }
 
-    this.scrollToPercentile = function(percentage)
+    this.scrollToPercentile = function (percentage)
     {
         scrollToPercentiles(-1, percentage);
     }
 
-    this.scrollStart = function()
+    this.scrollStart = function ()
     {
         scrollToPercentiles(0, -1);
     }
 
-    this.scrollTop = function()
+    this.scrollTop = function ()
     {
         scrollToPercentiles(-1, 0);
     }
 
     // TODO: allow callback for filtering out unwanted frames? User defined?
-    this.shiftFrameFocus = function(count, forward)
+    this.shiftFrameFocus = function (count, forward)
     {
         if (!window.content.document instanceof HTMLDocument)
             return;
@@ -273,7 +273,7 @@ vimperator.Buffer = function() //{{{
         var frames = [];
 
         // find all frames - depth-first search
-        (function(frame)
+        (function (frame)
         {
             if (frame.document.body.localName.toLowerCase() == "body")
                 frames.push(frame);
@@ -287,7 +287,7 @@ vimperator.Buffer = function() //{{{
         // remove all unfocusable frames
         // TODO: find a better way to do this - walking the tree is too slow
         var start = document.commandDispatcher.focusedWindow;
-        frames = frames.filter(function(frame) {
+        frames = frames.filter(function (frame) {
                 frame.focus();
                 if (document.commandDispatcher.focusedWindow == frame)
                     return frame;
@@ -360,11 +360,11 @@ vimperator.Buffer = function() //{{{
         doc.body.appendChild(indicator);
 
         // remove the frame indicator
-        setTimeout(function() { doc.body.removeChild(indicator); }, 500);
+        setTimeout(function () { doc.body.removeChild(indicator); }, 500);
     }
 
     // updates the buffer preview in place only if list is visible
-    this.updateBufferList = function()
+    this.updateBufferList = function ()
     {
         if (!vimperator.bufferwindow.visible())
             return false;
@@ -377,7 +377,7 @@ vimperator.Buffer = function() //{{{
     // XXX: should this be in v.buffers. or v.tabs.?
     // "buffer" is a string which matches the URL or title of a buffer, if it
     // is null, the last used string is used again
-    this.switchTo = function(buffer, allowNonUnique, count, reverse)
+    this.switchTo = function (buffer, allowNonUnique, count, reverse)
     {
         if (buffer != null)
         {
@@ -428,23 +428,23 @@ vimperator.Buffer = function() //{{{
                     index += matches.length;
             }
             else
-                index = (count-1) % matches.length;
+                index = (count - 1) % matches.length;
 
             vimperator.tabs.select(matches[index], false);
         }
     };
 
-    this.zoomIn = function(steps)
+    this.zoomIn = function (steps)
     {
         bumpZoomLevel(steps);
     }
 
-    this.zoomOut = function(steps)
+    this.zoomOut = function (steps)
     {
         bumpZoomLevel(-steps);
     }
 
-    this.pageInfo = function(verbose)
+    this.pageInfo = function (verbose)
     {
         // TODO: copied from firefox. Needs some review/work...
         //    const feedTypes = {
@@ -481,7 +481,7 @@ vimperator.Buffer = function() //{{{
                     urlSecurityCheck(aData.href, aPrincipal,
                             Components.interfaces.nsIScriptSecurityManager.DISALLOW_INHERIT_PRINCIPAL);
                 }
-                catch(ex)
+                catch (ex)
                 {
                     aIsFeed = false;
                 }
@@ -497,7 +497,7 @@ vimperator.Buffer = function() //{{{
         function createTable(data)
         {
             var ret = "<table><tr><th class='hl-Title' style='font-weight: bold;' align='left' colspan='2'>" +
-                      data[data.length -1][0] + "</th></tr>";
+                      data[data.length - 1][0] + "</th></tr>";
 
             if (data.length - 1)
             {
diff --git a/content/commands.js b/content/commands.js
index 99140a66..1f1a6f9e 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.Command = function(specs, action, extra_info) //{{{
+vimperator.Command = function (specs, action, extra_info) //{{{
 {
     if (!specs || !action)
         return null;
@@ -34,7 +34,7 @@ vimperator.Command = function(specs, action, extra_info) //{{{
     // convert command name abbreviation specs of the form
     // 'shortname[optional-tail]' to short and long versions Eg. 'abc[def]' ->
     // 'abc', 'abcdef'
-    var parseSpecs = function(specs)
+    var parseSpecs = function (specs)
     {
         var short_names = [];
         var long_names  = [];
@@ -89,14 +89,14 @@ vimperator.Command = function(specs, action, extra_info) //{{{
 
 }
 
-vimperator.Command.prototype.execute = function(args, special, count, modifiers)
+vimperator.Command.prototype.execute = function (args, special, count, modifiers)
 {
     this.action.call(this, args, special, count, modifiers);
 }
 
 // return true if the candidate name matches one of the command's aliases
 // (including all acceptable abbreviations)
-vimperator.Command.prototype.hasName = function(name)
+vimperator.Command.prototype.hasName = function (name)
 {
     // match a candidate name against a command name abbreviation spec - returning
     // true if the candidate matches unambiguously
@@ -126,7 +126,7 @@ vimperator.Command.prototype.hasName = function(name)
 }
 //}}}
 
-vimperator.Commands = function() //{{{
+vimperator.Commands = function () //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -138,7 +138,7 @@ vimperator.Commands = function() //{{{
     function addDefaultCommand(command)
     {
         ex_commands.push(command);
-        vimperator.Commands.prototype[command.name] = function(args, special, count, modifiers)
+        vimperator.Commands.prototype[command.name] = function (args, special, count, modifiers)
         {
             command.execute(args, special, count, modifiers);
         }
@@ -156,12 +156,12 @@ vimperator.Commands = function() //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    this.__iterator__ = function()
+    this.__iterator__ = function ()
     {
         return commandsIterator();
     }
 
-    this.add = function(command)
+    this.add = function (command)
     {
         if (!command)
             return false;
@@ -171,7 +171,7 @@ vimperator.Commands = function() //{{{
         return true;
     }
 
-    this.get = function(name)
+    this.get = function (name)
     {
         for (var i = 0; i < ex_commands.length; i++)
         {
@@ -186,7 +186,7 @@ vimperator.Commands = function() //{{{
     // FIXME: doesn't really belong here...
     // return [null, null, null, null, heredoc_tag || false];
     //        [count, cmd, special, args] = match;
-    this.parseCommand = function(str, tag)
+    this.parseCommand = function (str, tag)
     {
         // remove comments
         str.replace(/\s*".*$/, "");
@@ -230,14 +230,14 @@ vimperator.Commands = function() //{{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     addDefaultCommand(new vimperator.Command(["addo[ns]"],
-        function() { vimperator.open("chrome://mozapps/content/extensions/extensions.xul", vimperator.NEW_TAB); },
+        function () { vimperator.open("chrome://mozapps/content/extensions/extensions.xul", vimperator.NEW_TAB); },
         {
             short_help: "Show available Browser Extensions and Themes",
             help: "You can add/remove/disable browser extensions from this dialog.<br/>Be aware that not all Firefox extensions work, because Vimperator overrides some key bindings and changes Firefox's GUI."
         }
     ));
     addDefaultCommand(new vimperator.Command(["ba[ck]"],
-        function(args, special, count)
+        function (args, special, count)
         {
             if (special)
                 vimperator.history.goToStart();
@@ -263,7 +263,7 @@ vimperator.Commands = function() //{{{
             short_help: "Go back in the browser history",
             help: "Count is supported, <code class=\"command\">:3back</code> goes back 3 pages in the browser history.<br/>" +
                   "The special version <code class=\"command\">:back!</code> goes to the beginning of the browser history.",
-            completer: function(filter)
+            completer: function (filter)
             {
                 var sh = getWebNavigation().sessionHistory;
                 var completions = [];
@@ -280,7 +280,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["bd[elete]", "bw[ipeout]", "bun[load]", "tabc[lose]"],
-        function(args, special, count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count > 0 ? count : 1, special, 0); },
+        function (args, special, count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count > 0 ? count : 1, special, 0); },
         {
             usage: ["[count]bd[elete][!]"],
             short_help: "Delete current buffer (=tab)",
@@ -289,7 +289,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["beep"],
-        function() { vimperator.beep(); },
+        function () { vimperator.beep(); },
         {
             short_help: "Play a system beep"
         }
@@ -297,7 +297,7 @@ vimperator.Commands = function() //{{{
     addDefaultCommand(new vimperator.Command(["bma[rk]"],
         // takes: -t "foo" myurl
         // converts that string to a useful url and title, and calls addBookmark
-        function(args)
+        function (args)
         {
             var result = vimperator.bookmarks.parseBookmarkString(args);
 
@@ -336,7 +336,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["bmarks"],
-        function(args, special) { vimperator.bookmarks.list(args, special); },
+        function (args, special) { vimperator.bookmarks.list(args, special); },
         {
             usage: ["bmarks [filter]", "bmarks!"],
             short_help: "Show bookmarks",
@@ -344,11 +344,11 @@ vimperator.Commands = function() //{{{
                   "The special version <code class=\"command\">:bmarks!</code> opens the default Firefox bookmarks window.<br/>" +
                   "The following options WILL be interpreted in the future:<br/>" +
                   " -T comma,separated,tag,list<br/>",
-            completer: function(filter) { return vimperator.completion.get_bookmark_completions(filter); }
+            completer: function (filter) { return vimperator.completion.get_bookmark_completions(filter); }
         }
     ));
     addDefaultCommand(new vimperator.Command(["b[uffer]"],
-        function(args, special) { vimperator.buffer.switchTo(args, special); },
+        function (args, special) { vimperator.buffer.switchTo(args, special); },
         {
             usage: ["b[uffer][!] {url|index}"],
             short_help: "Go to buffer from buffer list",
@@ -357,11 +357,11 @@ vimperator.Commands = function() //{{{
                   "it is selected. With <code class=\"argument\">[!]</code> the next buffer matching the argument " +
                   "is selected, even if it cannot be identified uniquely.<br/>" +
                   "Use <code class=\"mapping\">b</code> as a shortcut to open this prompt.",
-            completer: function(filter) { return vimperator.completion.get_buffer_completions(filter); }
+            completer: function (filter) { return vimperator.completion.get_buffer_completions(filter); }
         }
     ));
     addDefaultCommand(new vimperator.Command(["buffers", "files", "ls", "tabs"],
-        function(args, special)
+        function (args, special)
         {
             if (args)
             {
@@ -379,7 +379,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["delbm[arks]"],
-        function(args, special)
+        function (args, special)
         {
             var result = vimperator.bookmarks.parseBookmarkString(args);
 
@@ -403,11 +403,11 @@ vimperator.Commands = function() //{{{
                   "The following options WILL be interpreted in the future:<br/>" +
                   " [!] a special version to delete ALL bookmarks <br/>" +
                   " -T comma,separated,tag,list <br/>",
-            completer: function(filter) { return vimperator.completion.get_bookmark_completions(filter); }
+            completer: function (filter) { return vimperator.completion.get_bookmark_completions(filter); }
         }
     ));
     addDefaultCommand(new vimperator.Command(["delm[arks]"],
-        function(args, special)
+        function (args, special)
         {
             if (!special && !args)
             {
@@ -460,7 +460,7 @@ vimperator.Commands = function() //{{{
 
     ));
     addDefaultCommand(new vimperator.Command(["delqm[arks]"],
-        function(args, special)
+        function (args, special)
         {
             // TODO: finish arg parsing - we really need a proper way to do this. :)
             if (!special && !args)
@@ -489,7 +489,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["downl[oads]", "dl"],
-        function() { vimperator.open("chrome://mozapps/content/downloads/downloads.xul", vimperator.NEW_TAB); },
+        function () { vimperator.open("chrome://mozapps/content/downloads/downloads.xul", vimperator.NEW_TAB); },
         {
             short_help: "Show progress of current downloads",
             help: "Open the original Firefox download dialog in a new tab.<br/>" +
@@ -525,7 +525,7 @@ vimperator.Commands = function() //{{{
         return arg;
     }
     addDefaultCommand(new vimperator.Command(["ec[ho]"],
-        function(args)
+        function (args)
         {
             var res = argToString(args, true);
             if (res != null)
@@ -537,11 +537,11 @@ vimperator.Commands = function() //{{{
             help: "Useful for showing informational messages. Multiple lines can be separated by \\n.<br/>" +
                   "<code class=\"argument\">{expr}</code> can either be a quoted string, or any expression which can be fed to eval() like 4+5. " +
                   "You can also view the source code of objects and functions if the return value of <code class=\"argument\">{expr}</code> is an object or function.",
-            completer: function(filter) { return vimperator.completion.javascript(filter); }
+            completer: function (filter) { return vimperator.completion.javascript(filter); }
         }
     ));
     addDefaultCommand(new vimperator.Command(["echoe[rr]"],
-        function(args)
+        function (args)
         {
             var res = argToString(args, false);
             if (res != null)
@@ -551,11 +551,11 @@ vimperator.Commands = function() //{{{
             usage: ["echoe[rr] {expr}"],
             short_help: "Display an error string at the bottom of the window",
             help: "Just like <code class=\"command\">:ec[ho]</code>, but echoes the result highlighted in red. Useful for showing important messages.",
-            completer: function(filter) { return vimperator.completion.javascript(filter); }
+            completer: function (filter) { return vimperator.completion.javascript(filter); }
         }
     ));
     addDefaultCommand(new vimperator.Command(["exe[cute]"],
-        function(args) { vimperator.execute(args) },
+        function (args) { vimperator.execute(args) },
         {
             usage: ["exe[cute] {expr1} [ ... ]"],
             short_help: "Execute the string that results from the evaluation of {expr1} as an Ex command.",
@@ -563,13 +563,13 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["exu[sage]"],
-        function(args, special, count, modifiers) { vimperator.help("commands", special, null, modifiers); },
+        function (args, special, count, modifiers) { vimperator.help("commands", special, null, modifiers); },
         {
             short_help: "Show help for Ex commands"
         }
     ));
     addDefaultCommand(new vimperator.Command(["fo[rward]", "fw"],
-        function(args, special, count)
+        function (args, special, count)
         {
             if (special)
                 vimperator.history.goToEnd();
@@ -595,7 +595,7 @@ vimperator.Commands = function() //{{{
             short_help: "Go forward in the browser history",
             help: "Count is supported, <code class=\"command\">:3forward</code> goes forward 3 pages in the browser history.<br/>" +
                   "The special version <code class=\"command\">:forward!</code> goes to the end of the browser history.",
-            completer: function(filter)
+            completer: function (filter)
             {
                 var sh = getWebNavigation().sessionHistory;
                 var completions = [];
@@ -612,14 +612,14 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["ha[rdcopy]"],
-        function() { getBrowser().contentWindow.print(); },
+        function () { getBrowser().contentWindow.print(); },
         {
             short_help: "Print current document",
             help: "Open a GUI dialog where you can select the printer, number of copies, orientation, etc."
         }
     ));
     addDefaultCommand(new vimperator.Command(["h[elp]"],
-        function(args, special, count, modifiers) { vimperator.help(args, special, null, modifiers); },
+        function (args, special, count, modifiers) { vimperator.help(args, special, null, modifiers); },
         {
             usage: ["h[elp] {subject}"],
             short_help: "Open the help window",
@@ -631,21 +631,21 @@ vimperator.Commands = function() //{{{
                   "<li><code class=\"command\">:help o</code> for mappings (no pre- or postfix)</li>" +
                   "</ul>" +
                   "You can however use partial stings in the tab completion, so <code class=\"command\">:help he&lt;Tab&gt;</code> completes <code class=\"command\">:help :help</code>.",
-            completer: function(filter) { return vimperator.completion.get_help_completions(filter); }
+            completer: function (filter) { return vimperator.completion.get_help_completions(filter); }
         }
     ));
     addDefaultCommand(new vimperator.Command(["hist[ory]", "hs"],
-        function(args, special) { vimperator.history.list(args, special); },
+        function (args, special) { vimperator.history.list(args, special); },
         {
             usage: ["hist[ory] [filter]", "history!"],
             short_help: "Show recently visited URLs",
             help: "Open the message window at the bottom of the screen with all history items which match <code class=\"argument\">[filter]</code> either in the title or URL.<br/>" +
                   "The special version <code class=\"command\">:history!</code> opens the default Firefox history window.",
-            completer: function(filter) { return vimperator.completion.get_history_completions(filter); }
+            completer: function (filter) { return vimperator.completion.get_history_completions(filter); }
         }
     ));
     addDefaultCommand(new vimperator.Command(["javas[cript]", "js"],
-        function(args, special)
+        function (args, special)
         {
             if (special) // open javascript console
                 vimperator.open("chrome://global/content/console.xul", vimperator.NEW_TAB);
@@ -656,7 +656,7 @@ vimperator.Commands = function() //{{{
                 if (matches && matches[2])
                 {
                     vimperator.commandline.inputMultiline(new RegExp("^" + matches[2] + "$", "m"),
-                        function(code) {
+                        function (code) {
                             try
                             {
                                 eval(matches[1] + "\n" + code);
@@ -690,11 +690,11 @@ vimperator.Commands = function() //{{{
                   "Rudimentary <code class=\"mapping\">&lt;Tab&gt;</code> completion is available for <code class=\"command\">:javascript {cmd}&lt;Tab&gt;</code> (but not yet for the " +
                   "<code class=\"command\">:js &lt;&lt;EOF</code> multiline widget). Be aware that Vimperator needs to run {cmd} through eval() " +
                   "to get the completions, which could have unwanted side effects.",
-            completer: function(filter) { return vimperator.completion.javascript(filter); }
+            completer: function (filter) { return vimperator.completion.javascript(filter); }
         }
     ));
     addDefaultCommand(new vimperator.Command(["let"],
-        function(args)
+        function (args)
         {
             if (!args)
             {
@@ -803,7 +803,7 @@ vimperator.Commands = function() //{{{
         if (rhs)
         {
             vimperator.mappings.add(new vimperator.Map(vimperator.modes.NORMAL, [lhs],
-                function(count) { vimperator.events.feedkeys((count > 1 ? count : "") + rhs, noremap); },
+                function (count) { vimperator.events.feedkeys((count > 1 ? count : "") + rhs, noremap); },
                 { flags: vimperator.Mappings.flags.COUNT, rhs: rhs }
             ));
         }
@@ -814,7 +814,7 @@ vimperator.Commands = function() //{{{
         }
     }
     addDefaultCommand(new vimperator.Command(["map"],
-        function(args) { map(args, false) },
+        function (args) { map(args, false) },
         {
             usage: ["map {lhs} {rhs}", "map {lhs}", "map"],
             short_help: "Map the key sequence {lhs} to {rhs}",
@@ -823,7 +823,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["mapc[lear]"],
-        function(args)
+        function (args)
         {
             if (args)
             {
@@ -840,7 +840,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["ma[rk]"],
-        function(args)
+        function (args)
         {
             if (!args)
             {
@@ -866,7 +866,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["marks"],
-        function(args)
+        function (args)
         {
             // ignore invalid mark characters unless there are no valid mark chars
             if (args && !/[a-zA-Z]/.test(args))
@@ -885,7 +885,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["mkv[imperatorrc]"],
-        function(args, special)
+        function (args, special)
         {
             var filename;
 
@@ -937,7 +937,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["noh[lsearch]"],
-        function(args)
+        function (args)
         {
             vimperator.search.clear();
         },
@@ -948,7 +948,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["norm[al]"],
-        function(args, special)
+        function (args, special)
         {
             if (!args)
             {
@@ -961,13 +961,13 @@ vimperator.Commands = function() //{{{
         {
             usage: ["norm[al][!] {commands}"],
             short_help: "Execute Normal mode commands",
-            help: "Example: <code class=\"command\">:normal 20j</code> scrolls 20 lines down. " + 
+            help: "Example: <code class=\"command\">:normal 20j</code> scrolls 20 lines down. " +
                   "If the <code class=\"argument\">[!]</code> is specified mappings will not be used."
         }
     ));
     // TODO: remove duplication in :map
     addDefaultCommand(new vimperator.Command(["no[remap]"],
-        function(args) { map(args, true) },
+        function (args) { map(args, true) },
         {
             usage: ["no[remap] {lhs} {rhs}", "no[remap] {lhs}", "no[remap]"],
             short_help: "Map the key sequence {lhs} to {rhs}",
@@ -975,7 +975,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["o[pen]", "e[dit]"],
-        function(args, special)
+        function (args, special)
         {
             if (args)
             {
@@ -1014,7 +1014,7 @@ vimperator.Commands = function() //{{{
                   "The items which are completed on <code class=\"mapping\">&lt;Tab&gt;</code> are specified in the <code class=\"option\">'complete'</code> option.<br/>" +
                   "Without argument, reloads the current page.<br/>" +
                   "Without argument but with <code class=\"command\">!</code>, reloads the current page skipping the cache.",
-            completer: function(filter) { return vimperator.completion.get_url_completions(filter); }
+            completer: function (filter) { return vimperator.completion.get_url_completions(filter); }
         }
     ));
     addDefaultCommand(new vimperator.Command(["pa[geinfo]"],
@@ -1025,13 +1025,13 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["pc[lose]"],
-        function() { vimperator.previewwindow.hide(); },
+        function () { vimperator.previewwindow.hide(); },
         {
             short_help: "Close preview window on bottom of screen"
         }
     ));
     addDefaultCommand(new vimperator.Command(["pref[erences]", "prefs"],
-        function(args, special, count, modifiers)
+        function (args, special, count, modifiers)
         {
             if (!args)
             {
@@ -1063,7 +1063,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["qma[rk]"],
-        function(args)
+        function (args)
         {
             if (!args)
             {
@@ -1087,7 +1087,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["qmarks"],
-        function(args)
+        function (args)
         {
             // ignore invalid mark characters unless there are no valid mark chars
             if (args && !/[a-zA-Z0-9]/.test(args))
@@ -1106,7 +1106,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["q[uit]"],
-        function() { vimperator.tabs.remove(getBrowser().mCurrentTab, 1, false, 1); },
+        function () { vimperator.tabs.remove(getBrowser().mCurrentTab, 1, false, 1); },
         {
             short_help: "Quit current tab",
             help: "If this is the last tab in the window, close the window. If this was the " +
@@ -1114,14 +1114,14 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["quita[ll]", "qa[ll]"],
-        function() { vimperator.quit(false); },
+        function () { vimperator.quit(false); },
         {
             short_help: "Quit Vimperator",
             help: "Quit Vimperator, no matter how many tabs/windows are open. The session is not stored."
         }
     ));
     addDefaultCommand(new vimperator.Command(["re[load]"],
-        function(args, special) { vimperator.tabs.reload(getBrowser().mCurrentTab, special); },
+        function (args, special) { vimperator.tabs.reload(getBrowser().mCurrentTab, special); },
         {
             usage: ["re[load][!]"],
             short_help: "Reload current page",
@@ -1129,7 +1129,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["reloada[ll]"],
-        function(args, special) { vimperator.tabs.reloadAll(special); },
+        function (args, special) { vimperator.tabs.reloadAll(special); },
         {
             usage: ["reloada[ll][!]"],
             short_help: "Reload all pages",
@@ -1137,14 +1137,14 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["res[tart]"],
-        function() { vimperator.restart(); },
+        function () { vimperator.restart(); },
         {
             short_help: "Force the browser to restart",
             help: "Useful when installing extensions."
         }
     ));
     addDefaultCommand(new vimperator.Command(["sav[eas]", "w[rite]"],
-        function() { saveDocument(window.content.document); },
+        function () { saveDocument(window.content.document); },
         {
             short_help: "Save current web page to disk",
             help: "Opens the original Firefox \"Save page as...\" dialog.<br/>" +
@@ -1153,7 +1153,7 @@ vimperator.Commands = function() //{{{
     ));
     addDefaultCommand(new vimperator.Command(["se[t]"],
         // TODO: support setting multiple options at once
-        function(args, special, count, modifiers)
+        function (args, special, count, modifiers)
         {
             if (special)
             {
@@ -1362,12 +1362,12 @@ vimperator.Commands = function() //{{{
                   "<code class=\"command\">:set option+={value}</code>, <code class=\"command\">:set option^={value}</code> and <code class=\"command\">:set option-={value}</code> " +
                   "adds/multiplies/subtracts <code class=\"argument\">{value}</code> from a number option and appends/prepends/removes <code class=\"argument\">{value}</code> from a string option.<br/>" +
                   "<code class=\"command\">:set all</code> shows the current value of all options and <code class=\"command\">:set all&amp;</code> resets all options to their default values.<br/>",
-            completer: function(filter) { return vimperator.completion.get_options_completions(filter); }
+            completer: function (filter) { return vimperator.completion.get_options_completions(filter); }
         }
     ));
     // TODO: sclose instead?
     addDefaultCommand(new vimperator.Command(["sbcl[ose]"],
-        function(args)
+        function (args)
         {
             if (args)
             {
@@ -1385,7 +1385,7 @@ vimperator.Commands = function() //{{{
     // TODO: sopen instead? Separate :sidebar from :sbopen and make them behave
     // more like :cw, :cope etc
     addDefaultCommand(new vimperator.Command(["sideb[ar]", "sb[ar]", "sbope[n]"],
-        function(args)
+        function (args)
         {
             if (!args)
             {
@@ -1413,11 +1413,11 @@ vimperator.Commands = function() //{{{
             short_help: "Open the sidebar window",
             help: "<code class=\"argument\">{name}</code> is any of the menu items listed under the standard Firefox View->Sidebar " +
                   "menu. Add-ons, Preferences and Downloads are also available in the sidebar.",
-            completer: function(filter) { return vimperator.completion.get_sidebar_completions(filter); }
+            completer: function (filter) { return vimperator.completion.get_sidebar_completions(filter); }
         }
     ));
     addDefaultCommand(new vimperator.Command(["so[urce]"],
-        function(args)
+        function (args)
         {
             // FIXME: implement proper filename quoting
             //if (/[^\\]\s/.test(args))
@@ -1433,14 +1433,14 @@ vimperator.Commands = function() //{{{
             short_help: "Read Ex commands from {file}",
             help: "You can either source files which mostly contain Ex commands like <code class=\"command\">map &lt; gt</code> " +
                   "and put JavaScript code within a:<br/><code class=\"code\">" +
-                  "js &lt;&lt;EOF<br/>hello = function() {<br/>&nbsp;&nbsp;alert(\"Hello world\");<br/>}<br/>EOF<br/></code> section.<br/>" +
+                  "js &lt;&lt;EOF<br/>hello = function () {<br/>&nbsp;&nbsp;alert(\"Hello world\");<br/>}<br/>EOF<br/></code> section.<br/>" +
                   "Or you can alternatively source a file which ends in .js, these files are automatically sourced as pure JavaScript files.<br/>" +
                   "NOTE: In both cases you must add functions to the global window object like shown above, functions written as:<br/>" +
                   "<code class=\"code\">function hello2() {<br/>&nbsp;&nbsp;alert(\"Hello world\");<br/>}<br/></code>are only available within the scope of the script. <br/><br/>" +
                   "The .vimperatorrc file in your home directory and any files in ~/.vimperator/plugin/ are always sourced at startup.<br/>" +
                   "~ is supported as a shortcut for the <var>$HOME</var> directory.<br/>" +
                   "If <code class=\"command\">!</code> is specified, errors are not printed.",
-            completer: function(filter) { return vimperator.completion.get_file_completions(filter); }
+            completer: function (filter) { return vimperator.completion.get_file_completions(filter); }
         }
     ));
     addDefaultCommand(new vimperator.Command(["st[op]"],
@@ -1451,24 +1451,24 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["tab"],
-        function(args) { vimperator.execute(args, { inTab: true }); },
+        function (args) { vimperator.execute(args, { inTab: true }); },
         {
             usage: ["tab {cmd}"],
             short_help: "Execute {cmd} and tell it to output in a new tab",
             help: "Works only for commands that support it, currently:" +
                   "<ul><li>:tab help</li>" +
                   "<li>:tab prefs[!]</li></ul>",
-            completer: function(filter) { return vimperator.completion.get_command_completions(filter); }
+            completer: function (filter) { return vimperator.completion.get_command_completions(filter); }
         }
     ));
     addDefaultCommand(new vimperator.Command(["tabl[ast]"],
-        function() { vimperator.tabs.select("$", false); },
+        function () { vimperator.tabs.select("$", false); },
         {
             short_help: "Switch to the last tab"
         }
     ));
     addDefaultCommand(new vimperator.Command(["tabm[ove]"],
-        function(args, special) { vimperator.tabs.move(getBrowser().mCurrentTab, args, special); },
+        function (args, special) { vimperator.tabs.move(getBrowser().mCurrentTab, args, special); },
         {
             usage: ["tabm[ove] [N]", "tabm[ove][!] +N | -N"],
             short_help: "Move the current tab after tab N",
@@ -1478,7 +1478,7 @@ vimperator.Commands = function() //{{{
     ));
     addDefaultCommand(new vimperator.Command(["tabn[ext]", "tn[ext]"],
         // TODO: count support
-        function(args)
+        function (args)
         {
             if (!args)
             {
@@ -1504,13 +1504,13 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["tabo[nly]"],
-        function() { vimperator.tabs.keepOnly(getBrowser().mCurrentTab); },
+        function () { vimperator.tabs.keepOnly(getBrowser().mCurrentTab); },
         {
             short_help: "Close all other tabs"
         }
     ));
     addDefaultCommand(new vimperator.Command(["tabopen", "t[open]", "tabnew", "tabe[dit]"],
-        function(args, special)
+        function (args, special)
         {
             var where = special ? vimperator.NEW_TAB : vimperator.NEW_BACKGROUND_TAB;
             if (/\btabopen\b/.test(vimperator.options["activate"]))
@@ -1526,12 +1526,12 @@ vimperator.Commands = function() //{{{
             short_help: "Open one or more URLs in a new tab",
             help: "Like <code class=\"command\">:open</code> but open URLs in a new tab.<br/>" +
                   "If used with <code class=\"command\">!</code>, the 'tabopen' value of the <code class=\"option\">'activate'</code> option is negated.",
-            completer: function(filter) { return vimperator.completion.get_url_completions(filter); }
+            completer: function (filter) { return vimperator.completion.get_url_completions(filter); }
         }
     ));
     addDefaultCommand(new vimperator.Command(["tabp[revious]", "tp[revious]", "tabN[ext]", "tN[ext]"],
         // TODO: count support
-        function(args)
+        function (args)
         {
             if (!args)
                 vimperator.tabs.select("-1", true);
@@ -1547,14 +1547,14 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["tabr[ewind]", "tabfir[st]"],
-        function() { vimperator.tabs.select(0, false); },
+        function () { vimperator.tabs.select(0, false); },
         {
             usage: ["tabr[ewind]", "tabfir[st]"],
             short_help: "Switch to the first tab"
         }
     ));
     addDefaultCommand(new vimperator.Command(["time"],
-        function(args, special, count)
+        function (args, special, count)
         {
             try
             {
@@ -1645,7 +1645,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["u[ndo]"],
-        function(args, special, count)
+        function (args, special, count)
         {
             if (count < 1)
                 count = 1;
@@ -1670,7 +1670,7 @@ vimperator.Commands = function() //{{{
             short_help: "Undo closing of a tab",
             help: "If a count is given, don't close the last but the <code class=\"argument\">[count]</code>th last tab. " +
                   "With <code class=\"argument\">[url]</code> restores the tab matching the url.",
-            completer: function(filter)
+            completer: function (filter)
             {
                 // get closed-tabs from nsSessionStore
                 var ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
@@ -1689,7 +1689,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["undoa[ll]"],
-        function(args, special, count)
+        function (args, special, count)
         {
             if (count > -1)
             {
@@ -1713,7 +1713,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["unl[et]"],
-        function(args, special)
+        function (args, special)
         {
             if (!args)
                 return vimperator.echoerr("E471: Argument required");
@@ -1742,7 +1742,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["unm[ap]"],
-        function(args)
+        function (args)
         {
             if (!args)
             {
@@ -1764,7 +1764,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["ve[rsion]"],
-        function(args, special)
+        function (args, special)
         {
             if (special)
                 vimperator.open("about:");
@@ -1779,13 +1779,13 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["viu[sage]"],
-        function(args, special, count, modifiers) { vimperator.help("mappings", special, null, modifiers); },
+        function (args, special, count, modifiers) { vimperator.help("mappings", special, null, modifiers); },
         {
             short_help: "Show help for normal mode commands"
         }
     ));
     addDefaultCommand(new vimperator.Command(["winc[lose]", "wc[lose]"],
-        function(args)
+        function (args)
         {
             window.close();
         },
@@ -1795,7 +1795,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["wino[pen]", "wo[pen]", "wine[dit]"],
-        function(args)
+        function (args)
         {
             if (args)
                 vimperator.open(args, vimperator.NEW_WINDOW);
@@ -1809,7 +1809,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["wqa[ll]", "wq", "xa[ll]"],
-        function() { vimperator.quit(true); },
+        function () { vimperator.quit(true); },
         {
             usage: ["wqa[ll]", "xa[ll]"],
             short_help: "Save the session and quit",
@@ -1818,7 +1818,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["zo[om]"],
-        function(args)
+        function (args)
         {
             var level;
 
@@ -1863,7 +1863,7 @@ vimperator.Commands = function() //{{{
         }
     ));
     addDefaultCommand(new vimperator.Command(["!", "run"],
-        function(args, special)
+        function (args, special)
         {
             // :!! needs to be treated specially as the command parser sets the special flag but removes the ! from args
             if (special)
diff --git a/content/completion.js b/content/completion.js
index 384ea1cd..7e49f4fd 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.Completion = function() // {{{
+vimperator.Completion = function () // {{{
 {
     // The completion substrings, used for showing the longest common match
     var g_substrings = [];
@@ -63,7 +63,7 @@ vimperator.Completion = function() // {{{
                 }
                 else
                 {
-                    g_substrings = g_substrings.filter(function($_) {
+                    g_substrings = g_substrings.filter(function ($_) {
                         return list[i][0][j].indexOf($_) >= 0;
                     });
                 }
@@ -93,7 +93,7 @@ vimperator.Completion = function() // {{{
                 }
                 else
                 {
-                    g_substrings = g_substrings.filter(function($_) {
+                    g_substrings = g_substrings.filter(function ($_) {
                         return list[i][0][j].indexOf($_) == 0;
                     });
                 }
@@ -112,7 +112,7 @@ vimperator.Completion = function() // {{{
         // list them add the end of the array
         var additional_completions = [];
 
-        if (!filter) return urls.map(function($_) {
+        if (!filter) return urls.map(function ($_) {
             return [$_[0], $_[1]]
         });
 
@@ -153,7 +153,7 @@ vimperator.Completion = function() // {{{
             }
             else
             {
-                g_substrings = g_substrings.filter(function($_) {
+                g_substrings = g_substrings.filter(function ($_) {
                     return url.indexOf($_) >= 0;
                 });
             }
@@ -168,7 +168,7 @@ vimperator.Completion = function() // {{{
          * returns the longest common substring
          * used for the 'longest' setting for wildmode
          */
-        get_longest_substring: function() //{{{
+        get_longest_substring: function () //{{{
         {
             if (g_substrings.length == 0)
                 return "";
@@ -189,7 +189,7 @@ vimperator.Completion = function() // {{{
          * depending on the 'complete' option
          * if the 'complete' argument is passed like "h", it temporarily overrides the complete option
          */
-        get_url_completions: function(filter, complete) //{{{
+        get_url_completions: function (filter, complete) //{{{
         {
             var completions = [];
             g_substrings = [];
@@ -211,33 +211,33 @@ vimperator.Completion = function() // {{{
             return completions;
         }, //}}}
 
-        get_search_completions: function(filter) //{{{
+        get_search_completions: function (filter) //{{{
         {
             var engines = vimperator.bookmarks.getSearchEngines().concat(vimperator.bookmarks.getKeywords());
 
-            if (!filter) return engines.map(function(engine) {
+            if (!filter) return engines.map(function (engine) {
                 return [engine[0], engine[1]];
             });
-            var mapped = engines.map(function(engine) {
+            var mapped = engines.map(function (engine) {
                 return [[engine[0]], engine[1]];
             });
             return build_longest_common_substring(mapped, filter);
         }, //}}}
 
-        get_history_completions: function(filter) //{{{
+        get_history_completions: function (filter) //{{{
         {
             var items = vimperator.history.get();
             return filter_url_array(items, filter);
         }, //}}}
 
-        get_bookmark_completions: function(filter) //{{{
+        get_bookmark_completions: function (filter) //{{{
         {
             var bookmarks = vimperator.bookmarks.get();
             return filter_url_array(bookmarks, filter);
         }, //}}}
 
         // TODO: support file:// and \ or / path separators on both platforms
-        get_file_completions: function(filter)
+        get_file_completions: function (filter)
         {
             // this is now also used as part of the url completion, so the
             // substrings shouldn't be cleared for that case
@@ -256,7 +256,7 @@ vimperator.Completion = function() // {{{
             try
             {
                 files = vimperator.io.readDirectory(dir);
-                mapped = files.map(function(file) {
+                mapped = files.map(function (file) {
                     return [[file.path], file.isDirectory() ? "Directory" : "File"];
                 });
             }
@@ -269,7 +269,7 @@ vimperator.Completion = function() // {{{
             return build_longest_starting_substring(mapped, filter);
         },
 
-        get_help_completions: function(filter) //{{{
+        get_help_completions: function (filter) //{{{
         {
             var help_array = [[["introduction"], "Introductory text"],
                               [["initialization"], "Initialization and startup"],
@@ -278,25 +278,25 @@ vimperator.Completion = function() // {{{
                               [["options"], "Configuration options"]]; // TODO: hardcoded until we have proper 'pages'
             g_substrings = [];
             for (var command in vimperator.commands)
-                help_array.push([command.long_names.map(function($_) { return ":" + $_; }), command.short_help]);
+                help_array.push([command.long_names.map(function ($_) { return ":" + $_; }), command.short_help]);
             options = this.get_options_completions(filter, true);
-            help_array = help_array.concat(options.map(function($_) {
+            help_array = help_array.concat(options.map(function ($_) {
                 return [
-                        $_[0].map(function($_) { return "'" + $_ + "'"; }),
+                        $_[0].map(function ($_) { return "'" + $_ + "'"; }),
                         $_[1]
                     ];
             }));
             for (var map in vimperator.mappings)
                 help_array.push([map.names, map.short_help]);
 
-            if (!filter) return help_array.map(function($_) {
+            if (!filter) return help_array.map(function ($_) {
                 return [$_[0][0], $_[1]]; // unfiltered, use the first command
             });
 
             return build_longest_common_substring(help_array, filter);
         }, //}}}
 
-        get_command_completions: function(filter) //{{{
+        get_command_completions: function (filter) //{{{
         {
             g_substrings = [];
             var completions = [];
@@ -312,7 +312,7 @@ vimperator.Completion = function() // {{{
             return build_longest_starting_substring(completions, filter);
         }, //}}}
 
-        get_options_completions: function(filter, unfiltered) //{{{
+        get_options_completions: function (filter, unfiltered) //{{{
         {
             g_substrings = [];
             var options_completions = [];
@@ -379,7 +379,7 @@ vimperator.Completion = function() // {{{
                     }
                     else
                     {
-                        g_substrings = g_substrings.filter(function($_) {
+                        g_substrings = g_substrings.filter(function ($_) {
                             return option.names[j].indexOf($_) == 0;
                         });
                     }
@@ -391,7 +391,7 @@ vimperator.Completion = function() // {{{
             return options_completions;
         }, //}}}
 
-        get_buffer_completions: function(filter) //{{{
+        get_buffer_completions: function (filter) //{{{
         {
             g_substrings = [];
             var items = [];
@@ -421,13 +421,13 @@ vimperator.Completion = function() // {{{
                     items.push([[(i + 1) + ": " + title, (i + 1) + ": " + url], url]);
                 }
             }
-            if (!filter) return items.map(function($_) {
+            if (!filter) return items.map(function ($_) {
                 return [$_[0][0], $_[1]];
             });
             return build_longest_common_substring(items, filter);
         }, //}}}
 
-        get_sidebar_completions: function(filter) //{{{
+        get_sidebar_completions: function (filter) //{{{
         {
             g_substrings = [];
             var menu = document.getElementById("viewSidebarMenu")
@@ -439,20 +439,20 @@ vimperator.Completion = function() // {{{
             if (!filter)
                 return nodes;
 
-            var mapped = nodes.map(function(node) {
+            var mapped = nodes.map(function (node) {
                 return [[node[0]], node[1]];
             });
 
             return build_longest_common_substring(mapped, filter);
         }, //}}}
 
-        javascript: function(str) // {{{
+        javascript: function (str) // {{{
         {
             g_substrings = [];
             var matches = str.match(/^(.*?)(\s*\.\s*)?(\w*)$/);
             var object = "window";
             var filter = matches[3] || "";
-            var start = matches[1].length-1;
+            var start = matches[1].length - 1;
             if (matches[2])
             {
                 var brackets = 0, parentheses = 0;
@@ -520,7 +520,7 @@ vimperator.Completion = function() // {{{
         // helper function which checks if the given arguments pass "filter"
         // items must be an array of strings
         // if case_sensitive == true, be sure to pass filter already in lowercased version
-        match: function(filter, items, case_sensitive)
+        match: function (filter, items, case_sensitive)
         {
             if (typeof(filter) != "string" || !items)
                 return false;
@@ -544,7 +544,7 @@ vimperator.Completion = function() // {{{
             return false;
         },
 
-        exTabCompletion: function(str) //{{{
+        exTabCompletion: function (str) //{{{
         {
             var [count, cmd, special, args] = vimperator.commands.parseCommand(str);
             var completions = [];
diff --git a/content/events.js b/content/events.js
index 9c0c4101..bf1a7d3c 100644
--- a/content/events.js
+++ b/content/events.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.Events = function() //{{{
+vimperator.Events = function () //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -35,23 +35,23 @@ vimperator.Events = function() //{{{
     // this handler is for middle click only in the content
     //window.addEventListener("mousedown", onVimperatorKeypress, true);
     //content.mPanelContainer.addEventListener("mousedown", onVimperatorKeypress, true);
-    //document.getElementById("content").onclick = function(event) { alert("foo"); };
+    //document.getElementById("content").onclick = function (event) { alert("foo"); };
 
     // any tab related events
     var tabcontainer = getBrowser().tabContainer;
-    tabcontainer.addEventListener("TabMove",   function(event) {
+    tabcontainer.addEventListener("TabMove",   function (event) {
         vimperator.statusline.updateTabCount();
         vimperator.buffer.updateBufferList();
     }, false);
-    tabcontainer.addEventListener("TabOpen",   function(event) {
+    tabcontainer.addEventListener("TabOpen",   function (event) {
         vimperator.statusline.updateTabCount();
         vimperator.buffer.updateBufferList();
     }, false);
-    tabcontainer.addEventListener("TabClose",  function(event) {
+    tabcontainer.addEventListener("TabClose",  function (event) {
         vimperator.statusline.updateTabCount();
         vimperator.buffer.updateBufferList();
     }, false);
-    tabcontainer.addEventListener("TabSelect", function(event) {
+    tabcontainer.addEventListener("TabSelect", function (event) {
         vimperator.commandline.clear();
         vimperator.setMode(); // trick to reshow the mode in the command line
         vimperator.statusline.updateTabCount();
@@ -103,7 +103,7 @@ vimperator.Events = function() //{{{
     window.addEventListener("DOMMenuBarActive", enterMenuMode, true);
     window.addEventListener("DOMMenuBarInactive", exitMenuMode, true);
 
-    // window.document.addEventListener("DOMTitleChanged", function(event)
+    // window.document.addEventListener("DOMTitleChanged", function (event)
     // {
     //     vimperator.log("titlechanged");
     // }, null);
@@ -234,7 +234,7 @@ vimperator.Events = function() //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    this.destroy = function()
+    this.destroy = function ()
     {
         // removeEventListeners() to avoid mem leaks
         window.dump("TODO: remove all eventlisteners\n");
@@ -256,7 +256,7 @@ vimperator.Events = function() //{{{
     //
     // @param keys: a string like "2<C-f>" to pass
     //              if you want < to be taken literally, prepend it with a \\
-    this.feedkeys = function(keys, noremap)
+    this.feedkeys = function (keys, noremap)
     {
         var doc = window.document;
         var view = window.document.defaultView;
@@ -320,7 +320,7 @@ vimperator.Events = function() //{{{
     // a keycode which can be used in mappings
     // e.g. pressing ctrl+n would result in the string "<C-n>"
     // null if unknown key
-    this.toString = function(event) //{{{
+    this.toString = function (event) //{{{
     {
         if (!event)
             return;
@@ -396,17 +396,17 @@ vimperator.Events = function() //{{{
 
     } //}}}
 
-    this.isAcceptKey = function(key)
+    this.isAcceptKey = function (key)
     {
         return (key == "<Return>" || key == "<C-j>" || key == "<C-m>");
     }
-    this.isCancelKey = function(key)
+    this.isCancelKey = function (key)
     {
         return (key == "<Esc>" || key == "<C-[>" || key == "<C-c>");
     }
 
     // global escape handler, is called in ALL modes
-    this.onEscape = function()
+    this.onEscape = function ()
     {
         if (!vimperator.hasMode(vimperator.modes.ESCAPE_ONE_KEY))
         {
@@ -426,7 +426,7 @@ vimperator.Events = function() //{{{
 
     // this keypress handler gets always called first, even if e.g.
     // the commandline has focus
-    this.onKeyPress = function(event)
+    this.onKeyPress = function (event)
     {
         var key = vimperator.events.toString(event);
         if (!key)
@@ -690,7 +690,7 @@ vimperator.Events = function() //{{{
     window.addEventListener("keypress", this.onKeyPress, true);
 
     // this is need for sites like msn.com which focus the input field on keydown
-    this.onKeyUpOrDown = function(event)
+    this.onKeyUpOrDown = function (event)
     {
         if (vimperator.hasMode(vimperator.modes.ESCAPE_ONE_KEY) || vimperator.hasMode(vimperator.modes.ESCAPE_ALL_KEYS) || isFormElemFocused())
             return true;
@@ -703,7 +703,7 @@ vimperator.Events = function() //{{{
 
     this.progressListener =
     {
-        QueryInterface: function(aIID)
+        QueryInterface: function (aIID)
         {
             if (aIID.equals(Components.interfaces.nsIWebProgressListener) ||
                     aIID.equals(Components.interfaces.nsIXULBrowserWindow) || // for setOverLink();
@@ -714,7 +714,7 @@ vimperator.Events = function() //{{{
         },
 
         // XXX: function may later be needed to detect a canceled synchronous openURL()
-        onStateChange: function(webProgress, aRequest, flags, aStatus)
+        onStateChange: function (webProgress, aRequest, flags, aStatus)
         {
             // STATE_IS_DOCUMENT | STATE_IS_WINDOW is important, because we also
             // receive statechange events for loading images and other parts of the web page
@@ -741,29 +741,29 @@ vimperator.Events = function() //{{{
             else if (aState & nsIWebProgressListener.STATE_IS_SECURE)
                 vimperator.statusline.setClass("secure");
         },
-        onStatusChange: function(webProgress, request, status, message)
+        onStatusChange: function (webProgress, request, status, message)
         {
             vimperator.statusline.updateUrl(message);
         },
-        onProgressChange: function(webProgress, request, curSelfProgress, maxSelfProgress, curTotalProgress, maxTotalProgress)
+        onProgressChange: function (webProgress, request, curSelfProgress, maxSelfProgress, curTotalProgress, maxTotalProgress)
         {
             vimperator.statusline.updateProgress(curTotalProgress/maxTotalProgress);
         },
         // happens when the users switches tabs
-        onLocationChange: function()
+        onLocationChange: function ()
         {
             vimperator.statusline.updateUrl();
             vimperator.statusline.updateProgress();
 
             // if this is not delayed we get the position of the old buffer
-            setTimeout(function() { vimperator.statusline.updateBufferPosition(); }, 100);
+            setTimeout(function () { vimperator.statusline.updateBufferPosition(); }, 100);
         },
         // called at the very end of a page load
-        asyncUpdateUI: function()
+        asyncUpdateUI: function ()
         {
             setTimeout(vimperator.statusline.updateUrl, 100);
         },
-        setOverLink : function(link, b)
+        setOverLink : function (link, b)
         {
             var ssli = vimperator.options["showstatuslinks"];
             if (link && ssli)
@@ -784,10 +784,10 @@ vimperator.Events = function() //{{{
         },
 
         // stub functions for the interfaces
-        setJSStatus: function(status) { ; },
-        setJSDefaultStatus: function(status) { ; },
-        setDefaultStatus: function(status) { ; },
-        onLinkIconAvailable: function() { ; }
+        setJSStatus: function (status) { ; },
+        setJSDefaultStatus: function (status) { ; },
+        setDefaultStatus: function (status) { ; },
+        onLinkIconAvailable: function () { ; }
     };
 
     window.XULBrowserWindow = this.progressListener;
diff --git a/content/find.js b/content/find.js
index 4cebdf33..67ec7ce3 100644
--- a/content/find.js
+++ b/content/find.js
@@ -37,7 +37,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 //     : incremental searches shouldn't permanently update search modifiers
 
 // make sure you only create this object when the "vimperator" object is ready
-vimperator.Search = function() //{{{
+vimperator.Search = function () //{{{
 {
     var self = this;                   // needed for callbacks since "this" is the "vimperator" object in a callback
     var found = false;                 // true if the last search was successful
@@ -51,13 +51,13 @@ vimperator.Search = function() //{{{
     var links_only = false;            // search is limited to link text only
 
     // Event handlers for search - closure is needed
-    vimperator.registerCallback("change", vimperator.modes.SEARCH_FORWARD, function(command) { self.searchKeyPressed(command); });
-    vimperator.registerCallback("submit", vimperator.modes.SEARCH_FORWARD, function(command) { self.searchSubmitted(command); });
-    vimperator.registerCallback("cancel", vimperator.modes.SEARCH_FORWARD, function() { self.searchCanceled(); });
+    vimperator.registerCallback("change", vimperator.modes.SEARCH_FORWARD, function (command) { self.searchKeyPressed(command); });
+    vimperator.registerCallback("submit", vimperator.modes.SEARCH_FORWARD, function (command) { self.searchSubmitted(command); });
+    vimperator.registerCallback("cancel", vimperator.modes.SEARCH_FORWARD, function () { self.searchCanceled(); });
     // TODO: allow advanced modes in register/triggerCallback
-    vimperator.registerCallback("change", vimperator.modes.SEARCH_BACKWARD, function(command) { self.searchKeyPressed(command); });
-    vimperator.registerCallback("submit", vimperator.modes.SEARCH_BACKWARD, function(command) { self.searchSubmitted(command); });
-    vimperator.registerCallback("cancel", vimperator.modes.SEARCH_BACKWARD, function() { self.searchCanceled(); });
+    vimperator.registerCallback("change", vimperator.modes.SEARCH_BACKWARD, function (command) { self.searchKeyPressed(command); });
+    vimperator.registerCallback("submit", vimperator.modes.SEARCH_BACKWARD, function (command) { self.searchSubmitted(command); });
+    vimperator.registerCallback("cancel", vimperator.modes.SEARCH_BACKWARD, function () { self.searchCanceled(); });
 
     // set search_string, search_pattern, case_sensitive, links_only
     function processUserPattern(pattern)
@@ -81,7 +81,7 @@ vimperator.Search = function() //{{{
             links_only = false;
 
         // strip links-only modifiers
-        pattern = pattern.replace(/(\\)?\\[uU]/g, function($0, $1) { return $1 ? $0 : ""; });
+        pattern = pattern.replace(/(\\)?\\[uU]/g, function ($0, $1) { return $1 ? $0 : ""; });
 
         // case sensitivity - \c wins if both modifiers specified
         if (/\c/.test(pattern))
@@ -96,7 +96,7 @@ vimperator.Search = function() //{{{
             case_sensitive = true;
 
         // strip case-sensitive modifiers
-        pattern = pattern.replace(/(\\)?\\[cC]/g, function($0, $1) { return $1 ? $0 : ""; });
+        pattern = pattern.replace(/(\\)?\\[cC]/g, function ($0, $1) { return $1 ? $0 : ""; });
 
         // remove any modifer escape \
         pattern = pattern.replace(/\\(\\[cCuU])/g, "$1");
@@ -106,7 +106,7 @@ vimperator.Search = function() //{{{
 
     // Called when the search dialog is asked for
     // If you omit "mode", it will default to forward searching
-    this.openSearchDialog = function(mode)
+    this.openSearchDialog = function (mode)
     {
         if (mode == vimperator.modes.SEARCH_BACKWARD)
         {
@@ -124,7 +124,7 @@ vimperator.Search = function() //{{{
 
     // Finds text in a page
     // TODO: backwards seems impossible i fear :(
-    this.find = function(str, backwards)
+    this.find = function (str, backwards)
     {
         var fastFind = getBrowser().fastFind;
 
@@ -134,13 +134,13 @@ vimperator.Search = function() //{{{
         found = fastFind.find(search_string, links_only) != Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND;
 
         if (!found)
-            setTimeout(function() { vimperator.echoerr("E486: Pattern not found: " + search_pattern); }, 0);
+            setTimeout(function () { vimperator.echoerr("E486: Pattern not found: " + search_pattern); }, 0);
 
         return found;
     }
 
     // Called when the current search needs to be repeated
-    this.findAgain = function(reverse)
+    this.findAgain = function (reverse)
     {
         // this hack is needed to make n/N work with the correct string, if
         // we typed /foo<esc> after the original search.  Since searchString is
@@ -164,7 +164,7 @@ vimperator.Search = function() //{{{
         {
             // hack needed, because wrapping causes a "scroll" event which clears
             // our command line
-            setTimeout(function() {
+            setTimeout(function () {
                 if (up)
                     vimperator.commandline.echo("search hit TOP, continuing at BOTTOM", vimperator.commandline.HL_WARNING);
                 else
@@ -181,7 +181,7 @@ vimperator.Search = function() //{{{
     }
 
     // Called when the user types a key in the search dialog. Triggers a find attempt if 'incsearch' is set
-    this.searchKeyPressed = function(command)
+    this.searchKeyPressed = function (command)
     {
         if (vimperator.options["incsearch"])
             this.find(command, backwards);
@@ -189,7 +189,7 @@ vimperator.Search = function() //{{{
 
     // Called when the enter key is pressed to trigger a search
     // use forced_direction if you call this function directly
-    this.searchSubmitted = function(command, forced_backward)
+    this.searchSubmitted = function (command, forced_backward)
     {
         if (typeof forced_backward === "boolean")
             backwards = forced_backward;
@@ -208,7 +208,7 @@ vimperator.Search = function() //{{{
         // TODO: move to find() when reverse incremental searching is kludged in
         // need to find again for reverse searching
         if (backwards)
-            setTimeout(function() { self.findAgain(false); }, 0);
+            setTimeout(function () { self.findAgain(false); }, 0);
 
         if (vimperator.options["hlsearch"])
             this.highlight(search_string);
@@ -219,14 +219,14 @@ vimperator.Search = function() //{{{
 
     // Called when the search is cancelled - for example if someone presses
     // escape while typing a search
-    this.searchCanceled = function()
+    this.searchCanceled = function ()
     {
         //removeMode(MODE_SEARCH);
         vimperator.setMode(vimperator.modes.NORMAL);
         vimperator.focusContent();
     }
 
-    this.highlight = function(text)
+    this.highlight = function (text)
     {
         // already highlighted?
         if (window.content.document.getElementById("__firefox-findbar-search-id"))
@@ -243,7 +243,7 @@ vimperator.Search = function() //{{{
 
         // TODO: seems fast enough for now...just
         // NOTE: FF2 highlighting spans all have the same id rather than a class attribute
-        (function(win)
+        (function (win)
         {
             for (var i = 0; i < win.frames.length; i++)
                 arguments.callee(win.frames[i]);
@@ -258,7 +258,7 @@ vimperator.Search = function() //{{{
         // TODO: remove highlighting from non-link matches (HTML - A/AREA with href attribute; XML - Xlink [@type="simple"])
     }
 
-    this.clear = function()
+    this.clear = function ()
     {
         gFindBar.highlightDoc();
         // need to manually collapse the selection if the document is not
diff --git a/content/help.js b/content/help.js
index 30650b02..e5aa4e67 100644
--- a/content/help.js
+++ b/content/help.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.help = function(section, easter) //{{{
+vimperator.help = function (section, easter) //{{{
 {
     if (easter)
     {
@@ -220,7 +220,7 @@ vimperator.help = function(section, easter) //{{{
     {
         doc.open();
     }
-    catch(e)
+    catch (e)
     {
         // FIXME: what's this all about then, eh? Works the same for if it's removed. -- djk
         // when the url is "about:" or any other xhtml page the doc is not open
@@ -255,7 +255,7 @@ vimperator.help = function(section, easter) //{{{
     }
 
     // FIXME
-    setTimeout(function() {
+    setTimeout(function () {
         if (section)
         {
             function findSectionElement(section)
diff --git a/content/hints.js b/content/hints.js
index d6dc04c3..bc887304 100644
--- a/content/hints.js
+++ b/content/hints.js
@@ -22,13 +22,13 @@
  *
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.Hints = function() //{{{
+vimperator.Hints = function () //{{{
 {
     const HINT_PREFIX = "hah_hint_"; // prefix for the hint id
 
-    this.hintedElements = function() { return hintedElems; };
-    this.currentState = function() { return state;};
-    this.setCurrentState = function(s) { state = s;};
+    this.hintedElements = function () { return hintedElems; };
+    this.currentState = function () { return state;};
+    this.setCurrentState = function (s) { state = s;};
 
     var isHahModeEnabled = false; // is typing mode on
     var hintedElems = [];
@@ -68,7 +68,7 @@ vimperator.Hints = function() //{{{
         win.coordLoaderId = window.setTimeout("vimperator.hints.loadCoord(" + win.winId + ", 0);", 1);
     }
 
-    this.loadCoord = function(winId, i)
+    this.loadCoord = function (winId, i)
     {
         win = wins[winId];
 
@@ -400,7 +400,7 @@ vimperator.Hints = function() //{{{
      * @return -1 if already enabled
      */
     //function enableHahMode(event, mode)
-    this.enableHahMode = function(mode)
+    this.enableHahMode = function (mode)
     {
         vimperator.setMode(vimperator.modes.HINTS, mode);
         state = 0;
@@ -424,7 +424,7 @@ vimperator.Hints = function() //{{{
      * @return -1 if already disabled
      */
     //function disableHahMode(event)
-    this.disableHahMode = function(win)
+    this.disableHahMode = function (win)
     {
         if (!isHahModeEnabled)
             return;
@@ -438,7 +438,7 @@ vimperator.Hints = function() //{{{
         return 0;
     };
 
-    this.resetHintedElements = function()
+    this.resetHintedElements = function ()
     {
         linkNumString = "";
         state = 0;
@@ -454,7 +454,7 @@ vimperator.Hints = function() //{{{
     };
 
 
-    this.reshowHints = function()
+    this.reshowHints = function ()
     {
         onResize(null);
 
@@ -471,7 +471,7 @@ vimperator.Hints = function() //{{{
 
     // this function 'click' an element, which also works
     // for javascript links
-    this.openHints = function(new_tab, new_window)
+    this.openHints = function (new_tab, new_window)
     {
         var x = 0, y = 0;
 
@@ -517,7 +517,7 @@ vimperator.Hints = function() //{{{
         return 0;
     };
 
-    this.yankUrlHints = function()
+    this.yankUrlHints = function ()
     {
         var loc = "";
         var elems = this.hintedElements();
@@ -540,7 +540,7 @@ vimperator.Hints = function() //{{{
         vimperator.echo("Yanked " + loc);
     };
 
-    this.yankTextHints = function()
+    this.yankTextHints = function ()
     {
         var loc = "";
         var elems = this.hintedElements();
@@ -563,7 +563,7 @@ vimperator.Hints = function() //{{{
         vimperator.echo("Yanked " + loc);
     };
 
-    this.saveHints = function(skip_prompt)
+    this.saveHints = function (skip_prompt)
     {
         var elems = this.hintedElements();
 
@@ -622,7 +622,7 @@ vimperator.Hints = function() //{{{
     // returns nr. of fully parsed links when a new hint has been found,
     // otherwise 0 if current state is part of a hint, or -1 if an error occured
     // (like we have typed keys which never can become a hint
-    this.processEvent = function(event)
+    this.processEvent = function (event)
     {
         if (!isHahModeEnabled)
             return -1;
@@ -706,7 +706,7 @@ vimperator.Hints = function() //{{{
             linkNumString = "";
             isHahModeEnabled = true;
 
-            setTimeout( function() {
+            setTimeout( function () {
                 createHints();
                 showHints(null, 0);
             }, 100);
diff --git a/content/io.js b/content/io.js
index 9161155e..3c641a74 100644
--- a/content/io.js
+++ b/content/io.js
@@ -27,7 +27,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.IO = function()
+vimperator.IO = function ()
 {
     var environment_service = Components.classes["@mozilla.org/process/environment;1"]
         .getService(Components.interfaces.nsIEnvironment);
@@ -43,7 +43,7 @@ vimperator.IO = function()
         MODE_SYNC: 0x40,
         MODE_EXCL: 0x80,
 
-        expandPath: function(path)
+        expandPath: function (path)
         {
             const WINDOWS = navigator.platform == "Win32";
 
@@ -84,7 +84,7 @@ vimperator.IO = function()
             return path;
         },
 
-        getPluginDir: function()
+        getPluginDir: function ()
         {
             var plugin_dir;
 
@@ -98,7 +98,7 @@ vimperator.IO = function()
             return plugin_dir.exists() && plugin_dir.isDirectory() ? plugin_dir : null;
         },
 
-        getRCFile: function()
+        getRCFile: function ()
         {
             var rc_file1 = this.getFile(this.expandPath("~/.vimperatorrc"));
             var rc_file2 = this.getFile(this.expandPath("~/_vimperatorrc"));
@@ -116,7 +116,7 @@ vimperator.IO = function()
 
         // return a nsILocalFile for path where you can call isDirectory(), etc. on
         // caller must check with .exists() if the returned file really exists
-        getFile: function(path)
+        getFile: function (path)
         {
             var file = Components.classes["@mozilla.org/file/local;1"].
                                   createInstance(Components.interfaces.nsILocalFile);
@@ -127,7 +127,7 @@ vimperator.IO = function()
 
         // TODO: make secure
         // returns a nsILocalFile or null if it could not be created
-        createTempFile: function()
+        createTempFile: function ()
         {
             var file = Components.classes["@mozilla.org/file/local;1"].
                                   createInstance(Components.interfaces.nsILocalFile);
@@ -150,7 +150,7 @@ vimperator.IO = function()
         },
 
         // file is either a full pathname or an instance of file instanceof nsILocalFile
-        readDirectory: function(file)
+        readDirectory: function (file)
         {
             if (typeof file == "string")
                 file = this.getFile(file);
@@ -175,7 +175,7 @@ vimperator.IO = function()
 
         // file is either a full pathname or an instance of file instanceof nsILocalFile
         // reads a file in "text" mode and returns the string
-        readFile: function(file)
+        readFile: function (file)
         {
             var ifstream = Components.classes["@mozilla.org/network/file-input-stream;1"]
                            .createInstance(Components.interfaces.nsIFileInputStream);
@@ -206,7 +206,7 @@ vimperator.IO = function()
         // file is either a full pathname or an instance of file instanceof nsILocalFile
         // default permission = 0644, only used when creating a new file, does not change permissions if the file exists
         // mode can be ">" or ">>" in addition to the normal MODE_* flags
-        writeFile: function(file, buf, mode, perms)
+        writeFile: function (file, buf, mode, perms)
         {
             var ofstream = Components.classes["@mozilla.org/network/file-output-stream;1"]
                            .createInstance(Components.interfaces.nsIFileOutputStream);
diff --git a/content/mappings.js b/content/mappings.js
index 1a50321d..d46f4bce 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.Map = function(mode, cmds, action, extra_info) //{{{
+vimperator.Map = function (mode, cmds, action, extra_info) //{{{
 {
     if (!mode || (!cmds || !cmds.length) || !action)
         return null;
@@ -65,7 +65,7 @@ vimperator.Map = function(mode, cmds, action, extra_info) //{{{
     }
 }
 
-vimperator.Map.prototype.hasName = function(name)
+vimperator.Map.prototype.hasName = function (name)
 {
     for (var i = 0; i < this.names.length; i++)
     {
@@ -78,7 +78,7 @@ vimperator.Map.prototype.hasName = function(name)
 
 // Since we will add many Map-objects, we add some functions as prototypes
 // this will ensure we only have one copy of each function, not one for each object
-vimperator.Map.prototype.execute = function(motion, count, argument)
+vimperator.Map.prototype.execute = function (motion, count, argument)
 {
     var args = [];
     if (this.flags & vimperator.Mappings.flags.MOTION)
@@ -91,7 +91,7 @@ vimperator.Map.prototype.execute = function(motion, count, argument)
 }
 //}}}
 
-vimperator.Mappings = function() //{{{
+vimperator.Mappings = function () //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -178,24 +178,24 @@ vimperator.Mappings = function() //{{{
     };
 
     // NOTE: just normal mode for now
-    this.__iterator__ = function()
+    this.__iterator__ = function ()
     {
         return mappingsIterator(vimperator.modes.NORMAL, main);
     }
 
     // FIXME
-    this.getIterator = function(mode)
+    this.getIterator = function (mode)
     {
         return mappingsIterator(mode, main);
     }
 
     // FIXME
-    this.getUserIterator = function(mode)
+    this.getUserIterator = function (mode)
     {
         return mappingsIterator(mode, user);
     }
 
-    this.hasMap = function(mode, cmd)
+    this.hasMap = function (mode, cmd)
     {
         var user_maps = user[mode];
 
@@ -208,29 +208,29 @@ vimperator.Mappings = function() //{{{
         return false;
     }
 
-    this.add = function(map)
+    this.add = function (map)
     {
         for (var i = 0; i < map.names.length; i++)
         {
             // only store keysyms with uppercase modifier strings
-            map.names[i] = map.names[i].replace(/[casm]-/g, function($0) { return $0.toUpperCase(); });
+            map.names[i] = map.names[i].replace(/[casm]-/g, function ($0) { return $0.toUpperCase(); });
             removeMap(map.mode, map.names[i]);
         }
 
         user[map.mode].push(map);
     }
 
-    this.remove = function(mode, cmd)
+    this.remove = function (mode, cmd)
     {
         removeMap(mode, cmd);
     }
 
-    this.removeAll = function(mode)
+    this.removeAll = function (mode)
     {
         user[mode] = [];
     }
 
-    this.get = function(mode, cmd)
+    this.get = function (mode, cmd)
     {
         var map = getMap(mode, cmd, user);
 
@@ -241,13 +241,13 @@ vimperator.Mappings = function() //{{{
     }
 
     // TODO: move default maps to their own v.normal namespace
-    this.getDefaultMap = function(mode, cmd)
+    this.getDefaultMap = function (mode, cmd)
     {
         return getMap(mode, cmd, main);
     }
 
     // returns an array of mappings with names which start with "cmd"
-    this.getCandidates = function(mode, cmd)
+    this.getCandidates = function (mode, cmd)
     {
         var mappings = [];
         var matches = [];
@@ -268,7 +268,7 @@ vimperator.Mappings = function() //{{{
     }
 
     // TODO: implement filtering
-    this.list = function(mode, filter)
+    this.list = function (mode, filter)
     {
         var maps = user[mode];
 
@@ -304,21 +304,21 @@ vimperator.Mappings = function() //{{{
     // {{{
     // vimperator management
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<F1>"],
-        function() { vimperator.help(null); },
+        function () { vimperator.help(null); },
         {
             short_help: "Open help window",
             help: "The default section is shown, if you need help for a specific topic, try <code class=\"command\">:help &lt;F1&gt;</code>."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, [":"],
-        function() { vimperator.commandline.open(":", "", vimperator.modes.EX); },
+        function () { vimperator.commandline.open(":", "", vimperator.modes.EX); },
         {
             short_help: "Start command line mode",
             help: "In command line mode, you can perform extended commands, which may require arguments."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["I"],
-        function() { vimperator.addMode(null, vimperator.modes.ESCAPE_ALL_KEYS); },
+        function () { vimperator.addMode(null, vimperator.modes.ESCAPE_ALL_KEYS); },
         {
             short_help: "Disable Vimperator keys",
             help: "Starts an 'ignorekeys' mode, where all keys except <code class=\"mapping\">&lt;Esc&gt;</code> are passed to the next event handler.<br/>" +
@@ -328,7 +328,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-v>"],
-        function() { vimperator.addMode(null, vimperator.modes.ESCAPE_ONE_KEY); },
+        function () { vimperator.addMode(null, vimperator.modes.ESCAPE_ONE_KEY); },
         {
             short_help: "Escape next key",
             help: "If you need to pass a certain key to a JavaScript form field or another extension prefix the key with <code class=\"mapping\">&lt;C-v&gt;</code>.<br/>" +
@@ -344,7 +344,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<Nop>"],
-        function() { return; },
+        function () { return; },
         {
             short_help: "Do nothing",
             help: "This command is useful for disabling a specific mapping. " +
@@ -361,7 +361,7 @@ vimperator.Mappings = function() //{{{
     ));
 
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["]f"],
-        function(count) { vimperator.buffer.shiftFrameFocus(count > 1 ? count : 1, true); },
+        function (count) { vimperator.buffer.shiftFrameFocus(count > 1 ? count : 1, true); },
         {
             short_help: "Focus next frame",
             help: "Transfers keyboard focus to the <code class=\"argument\">[count]</code>th next frame in order. The newly focused frame is briefly colored red. Does not wrap.",
@@ -369,7 +369,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["[f"],
-        function(count) { vimperator.buffer.shiftFrameFocus(count > 1 ? count : 1, false); },
+        function (count) { vimperator.buffer.shiftFrameFocus(count > 1 ? count : 1, false); },
         {
             short_help: "Focus previous frame",
             help: "Transfers keyboard focus to the <code class=\"argument\">[count]</code>th previous frame in order. The newly focused frame is briefly colored red. Does not wrap.",
@@ -377,14 +377,14 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["b"],
-        function() { vimperator.commandline.open(":", "buffer! ", vimperator.modes.EX); },
+        function () { vimperator.commandline.open(":", "buffer! ", vimperator.modes.EX); },
         {
             short_help: "Open a prompt to switch buffers",
             help: "Typing the corresponding number switches to this buffer."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["B"],
-        function() { vimperator.buffer.list(true); },
+        function () { vimperator.buffer.list(true); },
         {
             short_help: "Toggle buffer list",
             help: "Toggles the display of the buffer list which shows all opened tabs.<br/>" +
@@ -392,7 +392,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gb"],
-        function(count) { vimperator.buffer.switchTo(null, null, count, false); },
+        function (count) { vimperator.buffer.switchTo(null, null, count, false); },
         {
             short_help: "Repeat last :buffer[!] command",
             help: "This is useful to quickly jump between buffers which have a similar URL or title.",
@@ -400,7 +400,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gB"],
-        function(count) { vimperator.buffer.switchTo(null, null, count, true); },
+        function (count) { vimperator.buffer.switchTo(null, null, count, true); },
         {
             short_help: "Repeat last :buffer[!] command in reverse direction",
             help: "Just like <code class=\"mapping\">gb</code> but in the other direction.",
@@ -408,7 +408,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["d"],
-        function(count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count, false, 0); },
+        function (count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count, false, 0); },
         {
             short_help: "Delete current buffer (=tab)",
             help: "Count is supported, <code class=\"mapping\">2d</code> removes the current and next tab and the one to the right is selected. " +
@@ -417,7 +417,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["D"],
-        function(count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count, true, 0); },
+        function (count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count, true, 0); },
         {
             short_help: "Delete current buffer (=tab)",
             help: "Count is supported, <code class=\"mapping\">2D</code> removes the current and previous tab and the one to the left is selected. " +
@@ -433,7 +433,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gH"],
-        function()
+        function ()
         {
             var homepages = gHomeButton.getHomePage();
             vimperator.open(homepages, /\bhomepage\b/.test(vimperator.options["activate"]) ?
@@ -446,7 +446,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["go"],
-        function(arg) { vimperator.quickmarks.jumpTo(arg, vimperator.CURRENT_TAB); },
+        function (arg) { vimperator.quickmarks.jumpTo(arg, vimperator.CURRENT_TAB); },
         {
             short_help: "Jump to a QuickMark in the current tab",
             usage: ["go{a-zA-Z0-9}"],
@@ -456,7 +456,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gn"],
-        function(arg)
+        function (arg)
         {
             vimperator.quickmarks.jumpTo(arg,
                 /\bquickmark\b/.test(vimperator.options["activate"]) ?
@@ -472,7 +472,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gP"],
-        function()
+        function ()
         {
             vimperator.open(readFromClipboard(),
                 /\bpaste\b/.test(vimperator.options["activate"]) ?
@@ -484,7 +484,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gt", "<C-n>", "<C-Tab>", "<C-PageDown>"],
-        function(count) { vimperator.tabs.select(count > 0 ? count - 1: "+1", count > 0 ? false : true); },
+        function (count) { vimperator.tabs.select(count > 0 ? count - 1: "+1", count > 0 ? false : true); },
         {
             short_help: "Go to the next tab",
             help: "Cycles to the first tab, when the last is selected.<br/>Count is supported: <code class=\"mapping\">3gt</code> goes to the third tab.",
@@ -492,7 +492,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gT", "<C-p>", "<C-S-Tab>", "<C-PageUp>"],
-        function(count) { vimperator.tabs.select("-" + (count < 1 ? 1 : count), true); },
+        function (count) { vimperator.tabs.select("-" + (count < 1 ? 1 : count), true); },
         {
             short_help: "Go {count} pages back",
             help: "Wraps around from the first tab to the last tab.<br/>Count is supported: <code class=\"mapping\">3gT</code> goes three tabs back.",
@@ -500,7 +500,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-^>", "<C-6>"],
-        function()
+        function ()
         {
             if (vimperator.tabs.getTab() == vimperator.tabs.alternate)
             {
@@ -527,7 +527,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["m"],
-        function(arg)
+        function (arg)
         {
             if (/[^a-zA-Z]/.test(arg))
             {
@@ -545,7 +545,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["'", "`"],
-        function(arg) { vimperator.marks.jumpTo(arg); },
+        function (arg) { vimperator.marks.jumpTo(arg); },
         {
             short_help: "Jump to the mark in the current buffer",
             usage: ["'{a-zA-Z}"],
@@ -554,7 +554,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["M"],
-        function(arg)
+        function (arg)
         {
             if (/[^a-zA-Z0-9]/.test(arg))
             {
@@ -573,28 +573,28 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["o"],
-        function() { vimperator.commandline.open(":", "open ", vimperator.modes.EX); },
+        function () { vimperator.commandline.open(":", "open ", vimperator.modes.EX); },
         {
             short_help: "Open one or more URLs in the current tab",
             help: "See <code class=\"command\">:open</code> for more details."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["O"],
-        function() { vimperator.commandline.open(":", "open " + vimperator.buffer.URL, vimperator.modes.EX); },
+        function () { vimperator.commandline.open(":", "open " + vimperator.buffer.URL, vimperator.modes.EX); },
         {
             short_help: "Open one or more URLs in the current tab, based on current location",
             help: "Works like <code class=\"mapping\">o</code>, but preselects current URL in the <code class=\"command\">:open</code> query."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["p", "<MiddleMouse>"],
-        function() { vimperator.open(readFromClipboard()); },
+        function () { vimperator.open(readFromClipboard()); },
         {
             short_help: "Open (put) a URL based on the current clipboard contents in the current buffer",
             help: "You can also just select (for non-X11 users: copy) some non-URL text, and search for it with the default search engine or keyword (specified by the <code class=\"option\">'defsearch'</code> option) with <code class=\"mapping\">p</code>."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["P"],
-        function()
+        function ()
         {
             vimperator.open(readFromClipboard(),
                 /\bpaste\b/.test(vimperator.options["activate"]) ?
@@ -607,21 +607,21 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["r"],
-        function() { vimperator.tabs.reload(getBrowser().mCurrentTab, false); },
+        function () { vimperator.tabs.reload(getBrowser().mCurrentTab, false); },
         {
             short_help: "Reload",
             help: "Forces reloading of the current page."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["R"],
-        function() { vimperator.tabs.reload(getBrowser().mCurrentTab, true); },
+        function () { vimperator.tabs.reload(getBrowser().mCurrentTab, true); },
         {
             short_help: "Reload while skipping the cache",
             help: "Forces reloading of the current page skipping the cache."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["t"],
-        function() { vimperator.commandline.open(":", "tabopen ", vimperator.modes.EX); },
+        function () { vimperator.commandline.open(":", "tabopen ", vimperator.modes.EX); },
         {
             short_help: "Open one or more URLs in a new tab",
             help: "Like <code class=\"mapping\">o</code> but open URLs in a new tab.<br/>" +
@@ -629,14 +629,14 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["T"],
-        function() { vimperator.commandline.open(":", "tabopen " + vimperator.buffer.URL, vimperator.modes.EX); },
+        function () { vimperator.commandline.open(":", "tabopen " + vimperator.buffer.URL, vimperator.modes.EX); },
         {
             short_help: "Open one or more URLs in a new tab, based on current location",
             help: "Works like <code class=\"mapping\">t</code>, but preselects current URL in the <code class=\"command\">:tabopen</code> query."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["u"],
-        function(count) { vimperator.commands.undo("", false, count); },
+        function (count) { vimperator.commands.undo("", false, count); },
         {
             short_help: "Undo closing of a tab",
             help: "If a count is given, don't close the last but the <code class=\"argument\">[count]</code>th last tab.",
@@ -644,7 +644,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["y"],
-        function()
+        function ()
         {
             var url = vimperator.buffer.URL;
             vimperator.copyToClipboard(url);
@@ -656,7 +656,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["Y"],
-        function()
+        function ()
         {
             var sel = window.content.document.getSelection();
             vimperator.copyToClipboard(sel);
@@ -667,35 +667,35 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zi", "+"],
-        function(count) { vimperator.buffer.zoomIn(count > 1 ? count : 1); },
+        function (count) { vimperator.buffer.zoomIn(count > 1 ? count : 1); },
         {
             short_help: "Zoom in current web page by 25%",
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zI"],
-        function(count) { vimperator.buffer.zoomIn((count > 1 ? count : 1) * 4); },
+        function (count) { vimperator.buffer.zoomIn((count > 1 ? count : 1) * 4); },
         {
             short_help: "Zoom in current web page by 100%",
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zo", "-"],
-        function(count) { vimperator.buffer.zoomOut(count > 1 ? count : 1); },
+        function (count) { vimperator.buffer.zoomOut(count > 1 ? count : 1); },
         {
             short_help: "Zoom out current web page by 25%",
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zO"],
-        function(count) { vimperator.buffer.zoomOut((count > 1 ? count : 1) * 4); },
+        function (count) { vimperator.buffer.zoomOut((count > 1 ? count : 1) * 4); },
         {
             short_help: "Zoom out current web page by 100%",
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zz"],
-        function(count) { vimperator.buffer.textZoom = count > 1 ? count : 100; },
+        function (count) { vimperator.buffer.textZoom = count > 1 ? count : 100; },
         {
             short_help: "Set zoom value of the web page",
             help: "Zoom value can be between 1 and 2000%. If it is omitted, zoom is reset to 100%.",
@@ -703,14 +703,14 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["ZQ"],
-        function() { vimperator.quit(false); },
+        function () { vimperator.quit(false); },
         {
             short_help: "Quit and don't save the session",
             help: "Works like <code class=\"command\">:qall</code>."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["ZZ"],
-        function() { vimperator.quit(true); },
+        function () { vimperator.quit(true); },
         {
             short_help: "Quit and save the session",
             help: "Quit Vimperator, no matter how many tabs/windows are open. The session is stored.<br/>" +
@@ -720,20 +720,20 @@ vimperator.Mappings = function() //{{{
 
     // scrolling commands
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["0", "^"],
-        function() { vimperator.buffer.scrollStart(); },
+        function () { vimperator.buffer.scrollStart(); },
         {
             short_help: "Scroll to the absolute left of the document",
             help: "Unlike in Vim, <code class=\"mapping\">0</code> and <code class=\"mapping\">^</code> work exactly the same way."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["$"],
-        function() { vimperator.buffer.scrollEnd(); },
+        function () { vimperator.buffer.scrollEnd(); },
         {
             short_help: "Scroll to the absolute right of the document"
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gg", "<Home>"],
-        function(count) { vimperator.buffer.scrollToPercentile(count >  0 ? count : 0); },
+        function (count) { vimperator.buffer.scrollToPercentile(count >  0 ? count : 0); },
         {
             short_help: "Goto the top of the document",
             help: "When used with <code class=\"argument\">[count]</code> like in <code class=\"mapping\">35gg</code>, it scrolls to 35% of the document.",
@@ -741,7 +741,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["G", "<End>"],
-        function(count) { vimperator.buffer.scrollToPercentile(count >= 0 ? count : 100); },
+        function (count) { vimperator.buffer.scrollToPercentile(count >= 0 ? count : 100); },
         {
             short_help: "Goto the end of the document",
             help: "When used with <code class=\"argument\">[count]</code> like in <code class=\"mapping\">35G</code>, it scrolls to 35% of the document.",
@@ -749,7 +749,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["h", "<Left>"],
-        function(count) { vimperator.buffer.scrollColumns(-(count > 1 ? count : 1)); },
+        function (count) { vimperator.buffer.scrollColumns(-(count > 1 ? count : 1)); },
         {
             short_help: "Scroll document to the left",
             help: "Count is supported: <code class=\"mapping\">10h</code> will move 10 times as much to the left.<br/>" +
@@ -758,7 +758,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["j", "<Down>", "<C-e>"],
-        function(count) { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
+        function (count) { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
         {
             short_help: "Scroll document down",
             help: "Count is supported: <code class=\"mapping\">10j</code> will move 10 times as much down.<br/>" +
@@ -767,7 +767,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["k", "<Up>", "<C-y>"],
-        function(count) { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
+        function (count) { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
         {
             short_help: "Scroll document up",
             help: "Count is supported: <code class=\"mapping\">10k</code> will move 10 times as much up.<br/>" +
@@ -792,7 +792,7 @@ vimperator.Mappings = function() //{{{
         }
     }
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-d>"],
-        function(count) { scrollByScrollSize(count, 1); },
+        function (count) { scrollByScrollSize(count, 1); },
         {
             short_help: "Scroll window downwards in the buffer",
             help: "The number of lines is set by the <code class=\"option\">'scroll'</code> option which defaults to half a page. " +
@@ -801,7 +801,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-u>"],
-        function(count) { scrollByScrollSize(count, -1); },
+        function (count) { scrollByScrollSize(count, -1); },
         {
             short_help: "Scroll window upwards in the buffer",
             help: "The number of lines is set by the <code class=\"option\">'scroll'</code> option which defaults to half a page. " +
@@ -810,7 +810,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["l", "<Right>"],
-        function(count) { vimperator.buffer.scrollColumns(count > 1 ? count : 1); },
+        function (count) { vimperator.buffer.scrollColumns(count > 1 ? count : 1); },
         {
             short_help: "Scroll document to the right",
             help: "Count is supported: <code class=\"mapping\">10l</code> will move 10 times as much to the right.<br/>" +
@@ -819,7 +819,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-b>", "<PageUp>", "<S-Space>"],
-        function(count) { vimperator.buffer.scrollPages(-(count > 1 ? count : 1)); },
+        function (count) { vimperator.buffer.scrollPages(-(count > 1 ? count : 1)); },
         {
             short_help: "Scroll up a full page",
             help: "Scroll window <code class=\"argument\">[count]</code> pages Backwards (upwards) in the buffer.",
@@ -827,7 +827,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-f>", "<PageDown>", "<Space>"],
-        function(count) { vimperator.buffer.scrollPages(count > 1 ? count : 1); },
+        function (count) { vimperator.buffer.scrollPages(count > 1 ? count : 1); },
         {
             short_help: "Scroll down a full page",
             help: "Scroll window <code class=\"argument\">[count]</code> pages Forwards (downwards) in the buffer.",
@@ -837,7 +837,7 @@ vimperator.Mappings = function() //{{{
 
     // page info
     addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["<C-g>"],
-        function(count) { vimperator.buffer.pageInfo(false); },
+        function (count) { vimperator.buffer.pageInfo(false); },
         {
             short_help: "Print the current file name",
             help: "Also shows some additional file information like file size or the last modified date. " +
@@ -846,7 +846,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["g<C-g>"],
-        function(count) { vimperator.buffer.pageInfo(true); },
+        function (count) { vimperator.buffer.pageInfo(true); },
         {
             short_help: "Print file information",
             help: "Same as <code class='command'>:pa[geinfo]</code>."
@@ -856,7 +856,7 @@ vimperator.Mappings = function() //{{{
 
     // history manipulation and jumplist
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-o>"],
-        function(count) { vimperator.history.stepTo(-(count > 1 ? count : 1)); },
+        function (count) { vimperator.history.stepTo(-(count > 1 ? count : 1)); },
         {
             short_help: "Go to an older position in the jump list",
             help: "The jump list is just the browser history for now.",
@@ -864,7 +864,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-i>"],
-        function(count) { vimperator.history.stepTo(count > 1 ? count : 1); },
+        function (count) { vimperator.history.stepTo(count > 1 ? count : 1); },
         {
             short_help: "Go to a newer position in the jump list",
             help: "The jump list is just the browser history for now.",
@@ -872,7 +872,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["H", "<A-Left>", "<M-Left>"],
-        function(count) { vimperator.history.stepTo(-(count > 1 ? count : 1)); },
+        function (count) { vimperator.history.stepTo(-(count > 1 ? count : 1)); },
         {
             short_help: "Go back in the browser history",
             help: "Count is supported: <code class=\"mapping\">3H</code> goes back 3 steps.",
@@ -880,7 +880,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["L", "<A-Right>", "<M-Right>"],
-        function(count) { vimperator.history.stepTo(count > 1 ? count : 1); },
+        function (count) { vimperator.history.stepTo(count > 1 ? count : 1); },
         {
             short_help: "Go forward in the browser history",
             help: "Count is supported: <code class=\"mapping\">3L</code> goes forward 3 steps.",
@@ -905,7 +905,7 @@ vimperator.Mappings = function() //{{{
             return false;
     }
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gu", "<BS>"],
-        function(count)
+        function (count)
         {
             var gocmd = "";
             if (isDirectory(vimperator.buffer.URL))
@@ -928,7 +928,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gU", "<C-BS>"],
-        function() { vimperator.open("..."); },
+        function () { vimperator.open("..."); },
         {
             short_help: "Go to the root of the website",
             help: "<code class=\"mapping\">gU</code> on <code>http://www.example.com/dir1/dir2/file.htm</code> opens <code>http://www.example.com/</code>.<br/>" +
@@ -938,7 +938,7 @@ vimperator.Mappings = function() //{{{
 
     // hint managment
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["f"],
-        function() { vimperator.hints.enableHahMode(vimperator.modes.QUICK_HINT); },
+        function () { vimperator.hints.enableHahMode(vimperator.modes.QUICK_HINT); },
         {
             short_help: "Start QuickHint mode",
             help: "In QuickHint mode, every hintable item (according to the <code class=\"option\">'hinttags'</code> XPath query) is assigned a label.<br/>" +
@@ -947,7 +947,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["F"],
-        function() { vimperator.hints.enableHahMode(vimperator.modes.ALWAYS_HINT); },
+        function () { vimperator.hints.enableHahMode(vimperator.modes.ALWAYS_HINT); },
         {
             short_help: "Start AlwaysHint mode",
             help: "In AlwaysHint mode, every hintable item (according to the <code class=\"option\">'hinttags'</code> XPath query) is assigned a label.<br/>" +
@@ -957,7 +957,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, [";"],
-        function() { vimperator.hints.enableHahMode(vimperator.modes.EXTENDED_HINT); },
+        function () { vimperator.hints.enableHahMode(vimperator.modes.EXTENDED_HINT); },
         {
             short_help: "Start ExtendedHint mode",
             help: "ExtendedHint mode is useful, since in this mode you can yank link locations, or open them in a new window.<br/>" +
@@ -982,7 +982,7 @@ vimperator.Mappings = function() //{{{
 
     // search management
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["/"],
-        function() { vimperator.search.openSearchDialog(vimperator.modes.SEARCH_FORWARD); },
+        function () { vimperator.search.openSearchDialog(vimperator.modes.SEARCH_FORWARD); },
         {
             short_help: "Search forward for a pattern",
             usage: ["/{pattern}[/]<CR>"],
@@ -994,7 +994,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["?"],
-        function() { vimperator.search.openSearchDialog(vimperator.modes.SEARCH_BACKWARD); },
+        function () { vimperator.search.openSearchDialog(vimperator.modes.SEARCH_BACKWARD); },
         {
             short_help: "Search backwards for a pattern",
             usage: ["?{pattern}[?]<CR>"],
@@ -1007,14 +1007,14 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["n"],
-        function() { vimperator.search.findAgain(false); },
+        function () { vimperator.search.findAgain(false); },
         {
             short_help: "Find next",
             help: "Repeat the last search 1 time (until count is supported)."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["N"],
-        function() { vimperator.search.findAgain(true); },
+        function () { vimperator.search.findAgain(true); },
         {
             short_help: "Find previous",
             help: "Repeat the last search 1 time (until count is supported) in the opposite direction."
@@ -1028,63 +1028,63 @@ vimperator.Mappings = function() //{{{
 
     // action keys
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["o"],
-        function() { vimperator.hints.openHints(false, false); },
+        function () { vimperator.hints.openHints(false, false); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["t"],
-        function() { vimperator.hints.openHints(true,  false); },
+        function () { vimperator.hints.openHints(true,  false); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-w>"],
-        function() { vimperator.hints.openHints(false, true ); },
+        function () { vimperator.hints.openHints(false, true ); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["s"],
-        function() { vimperator.hints.saveHints(true); },
+        function () { vimperator.hints.saveHints(true); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
     addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["a"],
-        function() { vimperator.hints.saveHints(false); },
+        function () { vimperator.hints.saveHints(false); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["y"],
-        function() { vimperator.hints.yankUrlHints(); },
+        function () { vimperator.hints.yankUrlHints(); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["Y"],
-        function() { vimperator.hints.yankTextHints(); },
+        function () { vimperator.hints.yankTextHints(); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, [","],
-        function() { vimperator.input.buffer += ","; vimperator.hints.setCurrentState(0); },
+        function () { vimperator.input.buffer += ","; vimperator.hints.setCurrentState(0); },
         {
             cancel_mode: false,
             always_active: true
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, [":"],
-        function() { vimperator.commandline.open(":", "", vimperator.modes.EX); },
+        function () { vimperator.commandline.open(":", "", vimperator.modes.EX); },
         {
             cancel_mode: false,
             always_active: true
@@ -1093,7 +1093,7 @@ vimperator.Mappings = function() //{{{
 
     // movement keys
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-e>"],
-        function(count) { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
+        function (count) { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
         {
             cancel_mode: false,
             always_active: true,
@@ -1101,7 +1101,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-y>"],
-        function(count) { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
+        function (count) { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
         {
             cancel_mode: false,
             always_active: true,
@@ -1109,21 +1109,21 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Home>"],
-        function() { vimperator.buffer.scrollTop(); },
+        function () { vimperator.buffer.scrollTop(); },
         {
             cancel_mode: false,
             always_active: true
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<End>"],
-        function() { vimperator.buffer.scrollBottom(); },
+        function () { vimperator.buffer.scrollBottom(); },
         {
             cancel_mode: false,
             always_active: true
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<PageUp>", "<C-b>"],
-        function(count) { vimperator.buffer.scrollPages(-(count > 1 ? count : 1)); },
+        function (count) { vimperator.buffer.scrollPages(-(count > 1 ? count : 1)); },
         {
             cancel_mode: false,
             always_active: true,
@@ -1131,7 +1131,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<PageDown>", "<C-f>"],
-        function(count) { vimperator.buffer.scrollPages(count > 1 ? count : 1); },
+        function (count) { vimperator.buffer.scrollPages(count > 1 ? count : 1); },
         {
             cancel_mode: false,
             always_active: true,
@@ -1139,7 +1139,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Left>"],
-        function() { vimperator.buffer.scrollColumns(-(count > 1 ? count : 1)); },
+        function () { vimperator.buffer.scrollColumns(-(count > 1 ? count : 1)); },
         {
             cancel_mode: false,
             always_active: true,
@@ -1147,7 +1147,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Down>"],
-        function() { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
+        function () { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
         {
             cancel_mode: false,
             always_active: true,
@@ -1155,7 +1155,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Up>"],
-        function() { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
+        function () { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
         {
             cancel_mode: false,
             always_active: true,
@@ -1163,7 +1163,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Right>"],
-        function() { vimperator.buffer.scrollColumns(count > 1 ? count : 1); },
+        function () { vimperator.buffer.scrollColumns(count > 1 ? count : 1); },
         {
             cancel_mode: false,
             always_active: true,
@@ -1173,14 +1173,14 @@ vimperator.Mappings = function() //{{{
 
     // tab management
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-n>"],
-        function() { vimperator.tabs.select("+1", true); },
+        function () { vimperator.tabs.select("+1", true); },
         {
             cancel_mode: true,
             always_active: true
         }
     )); // same as gt, but no count supported
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-p>"],
-        function() { vimperator.tabs.select("-1", true); },
+        function () { vimperator.tabs.select("-1", true); },
         {
             cancel_mode: true,
             always_active: true
@@ -1189,7 +1189,7 @@ vimperator.Mappings = function() //{{{
 
     // navigation
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-o>"],
-        function(count) { vimperator.history.stepTo(count > 0 ? -count : -1); },
+        function (count) { vimperator.history.stepTo(count > 0 ? -count : -1); },
         {
             cancel_mode: false,
             always_active: true,
@@ -1197,7 +1197,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-i>"],
-        function(count) { vimperator.history.stepTo(count > 1 ? count : 1); },
+        function (count) { vimperator.history.stepTo(count > 1 ? count : 1); },
         {
             cancel_mode: false,
             always_active: true,
@@ -1205,7 +1205,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-h>"],
-        function(count) { vimperator.history.stepTo(count > 0 ? -count : -1); },
+        function (count) { vimperator.history.stepTo(count > 0 ? -count : -1); },
         {
             cancel_mode: false,
             always_active: true,
@@ -1213,7 +1213,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-l>"],
-        function(count) { vimperator.history.stepTo(count > 1 ? count : 1); },
+        function (count) { vimperator.history.stepTo(count > 1 ? count : 1); },
         {
             cancel_mode: false,
             always_active: true,
@@ -1221,7 +1221,7 @@ vimperator.Mappings = function() //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-d>"],
-        function() { vimperator.tabs.remove(getBrowser().mCurrentTab, vimperator.input.count, false, 0); },
+        function () { vimperator.tabs.remove(getBrowser().mCurrentTab, vimperator.input.count, false, 0); },
         {
             cancel_mode: true,
             always_active: true
@@ -1230,28 +1230,28 @@ vimperator.Mappings = function() //{{{
 
     // cancel_mode hint mode keys
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-c>"],
-        function() { ; },
+        function () { ; },
         {
             cancel_mode: true,
             always_active: true
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-g>"],
-        function() { ; },
+        function () { ; },
         {
             cancel_mode: true,
             always_active: true
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-[>"],
-        function() { ; },
+        function () { ; },
         {
             cancel_mode: true,
             always_active: true
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Esc>"],
-        function() { ; },
+        function () { ; },
         {
             cancel_mode: true,
             always_active: true
diff --git a/content/options.js b/content/options.js
index d9226b02..de441c41 100644
--- a/content/options.js
+++ b/content/options.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.Option = function(names, type, extra_info) //{{{
+vimperator.Option = function (names, type, extra_info) //{{{
 {
     if (!names || !type)
         return null;
@@ -77,7 +77,7 @@ vimperator.Option = function(names, type, extra_info) //{{{
 
     // NOTE: forced defaults need to use vimperator.options.getPref
     this.__defineGetter__("value",
-        function()
+        function ()
         {
             if (this.getter)
                 this.getter.call(this);
@@ -85,7 +85,7 @@ vimperator.Option = function(names, type, extra_info) //{{{
         }
     );
     this.__defineSetter__("value",
-        function(new_value)
+        function (new_value)
         {
             value = new_value;
             if (this.setter)
@@ -96,7 +96,7 @@ vimperator.Option = function(names, type, extra_info) //{{{
     // TODO: add is[Type]() queries for use in set()?
     //     : add isValid() or just throw an exception?
 
-    this.hasName = function(name)
+    this.hasName = function (name)
     {
         for (var i = 0; i < this.names.length; i++)
         {
@@ -106,7 +106,7 @@ vimperator.Option = function(names, type, extra_info) //{{{
         return false;
     }
 
-    this.isValidValue = function(value)
+    this.isValidValue = function (value)
     {
         if (this.validator)
             return this.validator(value);
@@ -114,13 +114,13 @@ vimperator.Option = function(names, type, extra_info) //{{{
             return true;
     }
 
-    this.reset = function()
+    this.reset = function ()
     {
         this.value = this.default_value;
     }
 } //}}}
 
-vimperator.Options = function() //{{{
+vimperator.Options = function () //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -312,12 +312,12 @@ vimperator.Options = function() //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    this.__iterator__ = function()
+    this.__iterator__ = function ()
     {
         return optionsIterator();
     }
 
-    this.get = function(name)
+    this.get = function (name)
     {
         for (var i = 0; i < options.length; i++)
         {
@@ -327,14 +327,14 @@ vimperator.Options = function() //{{{
         return null;
     }
 
-    this.add = function(option)
+    this.add = function (option)
     {
-        this.__defineGetter__(option.name, function() { return option.value; });
-        this.__defineSetter__(option.name, function(value) { option.value = value; });
+        this.__defineGetter__(option.name, function () { return option.value; });
+        this.__defineSetter__(option.name, function (value) { option.value = value; });
         options.push(option);
     }
 
-    this.destroy = function()
+    this.destroy = function ()
     {
         // reset some modified firefox prefs
         if (loadPreference("dom.popup_allowed_events", "change click dblclick mouseup reset submit")
@@ -342,7 +342,7 @@ vimperator.Options = function() //{{{
             storePreference("dom.popup_allowed_events", popup_allowed_events);
     }
 
-    this.list = function(only_non_default)
+    this.list = function (only_non_default)
     {
         // TODO: columns like Vim?
         var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
@@ -385,7 +385,7 @@ vimperator.Options = function() //{{{
     }
 
     // this hack is only needed, because we need to do asynchronous loading of the .vimperatorrc
-    this.setInitialGUI = function()
+    this.setInitialGUI = function ()
     {
         if (!guioptions_done)
             this.get("guioptions").reset();
@@ -397,22 +397,22 @@ vimperator.Options = function() //{{{
 
     // TODO: separate Preferences from Options? Would these utility functions
     // be better placed in the 'core' vimperator namespace somewhere?
-    this.setPref = function(name, value)
+    this.setPref = function (name, value)
     {
         return storePreference(name, value, true);
     }
 
-    this.getPref = function(name, forced_default)
+    this.getPref = function (name, forced_default)
     {
         return loadPreference(name, forced_default, true);
     }
 
-    this.setFirefoxPref = function(name, value)
+    this.setFirefoxPref = function (name, value)
     {
         return storePreference(name, value);
     }
 
-    this.getFirefoxPref = function(name, forced_default)
+    this.getFirefoxPref = function (name, forced_default)
     {
         return loadPreference(name, forced_default);
     }
@@ -437,9 +437,9 @@ vimperator.Options = function() //{{{
                   "<li><b>paste</b>:     <code class=\"mapping\">P</code> and <code class=\"mapping\">gP</code> mappings</li>" +
                   "</ul>",
             default_value: "homepage,quickmark,tabopen,paste",
-            validator: function(value)
+            validator: function (value)
             {
-                return value.split(",").every(function(item) { return /^(homepage|quickmark|tabopen|paste|)$/.test(item); });
+                return value.split(",").every(function (item) { return /^(homepage|quickmark|tabopen|paste|)$/.test(item); });
             }
         }
     ));
@@ -456,7 +456,7 @@ vimperator.Options = function() //{{{
                   "The order is important, so <code class=\"command\">:set complete=bs</code> would list bookmarks first, and then any available quick searches.<br/>" +
                   "Add <code class=\"option\">'sort'</code> to the <code class=\"option\">'wildoptions'</code> option if you want all entries sorted.",
             default_value: "sfbh",
-            validator: function(value) { return !/[^sfbh]/.test(value); }
+            validator: function (value) { return !/[^sfbh]/.test(value); }
         }
     ));
     this.add(new vimperator.Option(["defsearch", "ds"], "string",
@@ -464,7 +464,7 @@ vimperator.Options = function() //{{{
             short_help: "Set the default search engine",
             help: "The default search engine is used in the <code class=\"command\">:[tab]open [arg]</code> command " +
                   "if [arg] neither looks like a URL or like a specified search engine/keyword.",
-            completer: function() { return [["foo", "bar"], ["shit", "blub"]]; },
+            completer: function () { return [["foo", "bar"], ["shit", "blub"]]; },
             default_value: "google"
         }
     ));
@@ -484,8 +484,8 @@ vimperator.Options = function() //{{{
     this.add(new vimperator.Option(["fullscreen", "fs"], "boolean",
         {
             short_help: "Show the current window fullscreen",
-            setter: function(value) { window.fullScreen = value; },
-            getter: function() { return window.fullScreen; },
+            setter: function (value) { window.fullScreen = value; },
+            getter: function () { return window.fullScreen; },
             default_value: false
         }
     ));
@@ -498,9 +498,9 @@ vimperator.Options = function() //{{{
                   "<li><b>T</b>: toolbar</li>" +
                   "<li><b>b</b>: bookmark bar</li>" +
                   "</ul>",
-            setter: function(value) { setGuiOptions(value); },
+            setter: function (value) { setGuiOptions(value); },
             default_value: "",
-            validator: function(value) { return !/[^mTb]/.test(value); }
+            validator: function (value) { return !/[^mTb]/.test(value); }
         }
     ));
     this.add(new vimperator.Option(["hintchars", "hc"], "charlist",
@@ -525,7 +525,7 @@ vimperator.Options = function() //{{{
     this.add(new vimperator.Option(["hlsearch", "hls"], "boolean",
         {
             short_help: "Highlight previous search pattern matches",
-            setter: function(value) { if (value) vimperator.search.highlight(); else vimperator.search.clear(); },
+            setter: function (value) { if (value) vimperator.search.highlight(); else vimperator.search.clear(); },
             default_value: false
         }
     ));
@@ -560,8 +560,8 @@ vimperator.Options = function() //{{{
                   "</ul>" +
                   "NOTE: laststatus=1 not implemented yet.",
             default_value: 2,
-            setter: function(value) { setLastStatus(value); },
-            validator: function(value) { return (value >= 0 && value <= 2); }
+            setter: function (value) { setLastStatus(value); },
+            validator: function (value) { return (value >= 0 && value <= 2); }
         }
     ));
     this.add(new vimperator.Option(["linksearch", "lks"], "boolean",
@@ -612,8 +612,8 @@ vimperator.Options = function() //{{{
                   "</ul>" +
                   "NOTE: This option does not change the popup blocker of Firefox in any way.",
             default_value: 1,
-            setter: function(value) { setPopups(value); },
-            validator: function(value) { return (value >= 0 && value <= 3); }
+            setter: function (value) { setPopups(value); },
+            validator: function (value) { return (value >= 0 && value <= 3); }
         }
     ));
     this.add(new vimperator.Option(["preload"], "boolean",
@@ -631,7 +631,7 @@ vimperator.Options = function() //{{{
                   "Close the preview window with <code class=\"command\">:pclose</code>.<br/>" +
                   "NOTE: Option currently disabled",
             default_value: 10,
-            validator: function(value) { return (value >= 1 && value <= 50); }
+            validator: function (value) { return (value >= 1 && value <= 50); }
         }
     ));
     this.add(new vimperator.Option(["scroll", "scr"], "number",
@@ -641,7 +641,7 @@ vimperator.Options = function() //{{{
                   "When a <code class=\"argument\">{count}</code> is specified to the <code class=\"mapping\">&lt;C-u&gt;</code> or <code class=\"mapping\">&lt;C-d&gt;</code> commands this is used to set the value of <code class=\"option\">'scroll'</code> and also used for the current command. " +
                   "The value can be reset to half the window height with <code class=\"command\">:set scroll=0</code>.",
             default_value: 0,
-            validator: function(value) { return value >= 0; }
+            validator: function (value) { return value >= 0; }
         }
     ));
     this.add(new vimperator.Option(["showmode", "smd"], "boolean",
@@ -661,7 +661,7 @@ vimperator.Options = function() //{{{
                   "<li><b>2</b>: Show the link in the command line</li>" +
                   "</ul>",
             default_value: 1,
-            validator: function(value) { return (value >= 0 && value <= 2); }
+            validator: function (value) { return (value >= 0 && value <= 2); }
         }
     ));
     this.add(new vimperator.Option(["showtabline", "stal"], "number",
@@ -673,9 +673,9 @@ vimperator.Options = function() //{{{
                   "<li><b>1</b>: Show tab bar only if more than one tab is open</li>" +
                   "<li><b>2</b>: Always show tab bar</li>" +
                   "</ul>",
-            setter: function(value) { setShowTabline(value); },
+            setter: function (value) { setShowTabline(value); },
             default_value: 2,
-            validator: function(value) { return (value >= 0 && value <= 2); }
+            validator: function (value) { return (value >= 0 && value <= 2); }
         }
     ));
     this.add(new vimperator.Option(["smartcase", "scs"], "boolean",
@@ -691,7 +691,7 @@ vimperator.Options = function() //{{{
             help: "Vimperator changes the browser title from \"Title of web page - Mozilla Firefox\" to " +
                   "\"Title of web page - Vimperator\".<br/>If you don't like that, you can restore it with: " +
                   "<code class=\"command\">:set titlestring=Mozilla Firefox</code>.",
-            setter: function(value) { setTitleString(value); },
+            setter: function (value) { setTitleString(value); },
             default_value: "Vimperator"
         }
     ));
@@ -699,8 +699,8 @@ vimperator.Options = function() //{{{
         {
             short_help: "Show current website with a minimal style sheet to make it easily accessible",
             help: "Note that this is a local option for now, later it may be split into a global and <code class=\"command\">:setlocal</code> part",
-            setter: function(value) { getMarkupDocumentViewer().authorStyleDisabled = value; },
-            getter: function() { return getMarkupDocumentViewer().authorStyleDisabled; },
+            setter: function (value) { getMarkupDocumentViewer().authorStyleDisabled = value; },
+            getter: function () { return getMarkupDocumentViewer().authorStyleDisabled; },
             default_value: false
         }
     ));
@@ -710,13 +710,13 @@ vimperator.Options = function() //{{{
             help: "When bigger than zero, Vimperator will give messages about what it is doing. They are printed to the error console which can be shown with <code class=\"command\">:javascript!</code>.<br/>" +
                   "The highest value is 9, being the most verbose mode.",
             default_value: 0,
-            validator: function(value) { return (value >= 0 && value <= 9); }
+            validator: function (value) { return (value >= 0 && value <= 9); }
         }
     ));
     this.add(new vimperator.Option(["visualbell", "vb"], "boolean",
         {
             short_help: "Use visual bell instead of beeping on errors",
-            setter: function(value) { vimperator.options.setFirefoxPref("accessibility.typeaheadfind.enablesound", !value); },
+            setter: function (value) { vimperator.options.setFirefoxPref("accessibility.typeaheadfind.enablesound", !value); },
             default_value: false
         }
     ));
@@ -724,7 +724,7 @@ vimperator.Options = function() //{{{
         {
             short_help: "CSS specification of the visual bell",
             help: "To hide the visual bell use a value of \"display: none;\" or unset it with <code class=\"command\">:set t_vb=</code>",
-            setter: function(value) { if (!value) value = "display: none;"; },
+            setter: function (value) { if (!value) value = "display: none;"; },
             default_value: "background-color: black; color: black;"
         }
     ));
@@ -746,9 +746,9 @@ vimperator.Options = function() //{{{
                   "</table>" +
                   "When there is only a single match, it is fully completed regardless of the case.",
             default_value: "list:full",
-            validator: function(value)
+            validator: function (value)
             {
-                return value.split(",").every(function(item) { return /^(full|longest|list|list:full|list:longest|)$/.test(item); });
+                return value.split(",").every(function (item) { return /^(full|longest|list|list:full|list:longest|)$/.test(item); });
             }
         }
     ));
@@ -761,7 +761,7 @@ vimperator.Options = function() //{{{
                   "<tr><td><b>sort</b></td><td>Always sorts completion list, overriding the <code class=\"option\">'complete'</code> option.</td></tr>" +
                   "</table>",
             default_value: "",
-            validator: function(value) { return /^sort$/.test(value); }
+            validator: function (value) { return /^sort$/.test(value); }
         }
     ));
     //}}}
diff --git a/content/tabs.js b/content/tabs.js
index 8016fb8a..3e761fae 100644
--- a/content/tabs.js
+++ b/content/tabs.js
@@ -32,7 +32,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
  * Firefox 3.0, then this class should go away and their tab methods should be used
  * @deprecated
  */
-vimperator.Tabs = function() //{{{
+vimperator.Tabs = function () //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -87,7 +87,7 @@ vimperator.Tabs = function() //{{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     // @returns the index of the currently selected tab starting with 0
-    this.index = function(tab)
+    this.index = function (tab)
     {
         if (tab)
         {
@@ -103,14 +103,14 @@ vimperator.Tabs = function() //{{{
         return getBrowser().tabContainer.selectedIndex;
     }
 
-    this.count = function()
+    this.count = function ()
     {
         return getBrowser().mTabs.length;
     }
 
     // TODO: implement filter
     // @returns an array of tabs which match filter
-    this.get = function(filter)
+    this.get = function (filter)
     {
         var buffers = [];
         var browsers = getBrowser().browsers;
@@ -124,7 +124,7 @@ vimperator.Tabs = function() //{{{
         return buffers;
     }
 
-    this.getTab = function(index)
+    this.getTab = function (index)
     {
         if (index)
             return getBrowser().mTabs[index];
@@ -137,7 +137,7 @@ vimperator.Tabs = function() //{{{
      *  NOTE: position is a 0 based index
      *  FIXME: tabmove! N should probably produce an error
      */
-    this.move = function(tab, spec, wrap)
+    this.move = function (tab, spec, wrap)
     {
         if (spec === "")
             spec = "$"; // if not specified, move to the last tab -> XXX: move to ex handling?
@@ -149,7 +149,7 @@ vimperator.Tabs = function() //{{{
     /* quit_on_last_tab = 1: quit without saving session
      * quit_on_last_tab = 2: quit and save session
      */
-    this.remove = function(tab, count, focus_left_tab, quit_on_last_tab)
+    this.remove = function (tab, count, focus_left_tab, quit_on_last_tab)
     {
         function removeOrBlankTab (tab)
         {
@@ -203,12 +203,12 @@ vimperator.Tabs = function() //{{{
         }
     }
 
-    this.keepOnly = function(tab)
+    this.keepOnly = function (tab)
     {
         getBrowser().removeAllTabsBut(tab);
     }
 
-    this.select = function(spec, wrap)
+    this.select = function (spec, wrap)
     {
         var index = indexFromSpec(spec, wrap);
         if (index === false)
@@ -223,7 +223,7 @@ vimperator.Tabs = function() //{{{
     // tab that was selected when the session was created.  As a result the
     // alternate after a restart is often incorrectly tab 1 when there
     // shouldn't be one yet.
-    this.updateSelectionHistory = function()
+    this.updateSelectionHistory = function ()
     {
         alternates = [this.getTab(), alternates[0]];
         this.alternate = alternates[1];
@@ -232,7 +232,7 @@ vimperator.Tabs = function() //{{{
     // TODO: move to v.buffers
     this.alternate = this.getTab();
 
-    this.reload = function(tab, bypass_cache)
+    this.reload = function (tab, bypass_cache)
     {
         if (bypass_cache)
         {
@@ -246,7 +246,7 @@ vimperator.Tabs = function() //{{{
         }
     }
 
-    this.reloadAll = function(bypass_cache)
+    this.reloadAll = function (bypass_cache)
     {
         if (bypass_cache)
         {
diff --git a/content/test.js b/content/test.js
index a09ce39e..80f6fc61 100755
--- a/content/test.js
+++ b/content/test.js
@@ -4,7 +4,7 @@ var assert = mozlab.mozunit.assertions;
 var tc = new TestCase('testcase description here');
 
 tc.tests = {
-    'First test is successful': function() {
+    'First test is successful': function () {
         var vimperator = new Vimperator();
         assert.isDefined(vimperator);
         assert.isTrue(true);
diff --git a/content/ui.js b/content/ui.js
index 0f7d49e0..993e2c7b 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -32,7 +32,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
  * it consists of a prompt and command field
  * be sure to only create objects of this class when the chrome is ready
  */
-vimperator.CommandLine = function() //{{{
+vimperator.CommandLine = function () //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -52,22 +52,22 @@ vimperator.CommandLine = function() //{{{
         cmd: null,    // ex command history
         search: null, // text search history
 
-        get: function() { return this[this._mode]; },
-        set: function(lines) { this[this._mode] = lines; },
+        get: function () { return this[this._mode]; },
+        set: function (lines) { this[this._mode] = lines; },
 
-        load: function()
+        load: function ()
         {
             this.cmd = vimperator.options.getPref("commandline_cmd_history", "").split("\n");
             this.search = vimperator.options.getPref("commandline_search_history", "").split("\n");
         },
 
-        save: function()
+        save: function ()
         {
             vimperator.options.setPref("commandline_cmd_history", this.cmd.join("\n"));
             vimperator.options.setPref("commandline_search_history", this.search.join("\n"));
         },
 
-        add: function(str)
+        add: function (str)
         {
             if (!str)
                 return;
@@ -75,7 +75,7 @@ vimperator.CommandLine = function() //{{{
             var lines = this.get();
 
             // remove all old history lines which have this string
-            lines = lines.filter(function(line) {
+            lines = lines.filter(function (line) {
                     return line != str;
             });
 
@@ -254,12 +254,12 @@ vimperator.CommandLine = function() //{{{
                                        // FORCE_MULTILINE is given, FORCE_MULTILINE takes precedence
     this.APPEND_TO_MESSAGES  = 1 << 3; // will show the string in :messages
 
-    this.getCommand = function()
+    this.getCommand = function ()
     {
         return command_widget.value;
     };
 
-    this.open = function(prompt, cmd, ext_mode)
+    this.open = function (prompt, cmd, ext_mode)
     {
         // save the current prompts, we need it later if the command widget
         // receives focus without calling the this.open() method
@@ -281,7 +281,7 @@ vimperator.CommandLine = function() //{{{
     };
 
     // normally used when pressing esc, does not execute a command
-    this.close = function()
+    this.close = function ()
     {
         var res = vimperator.triggerCallback("cancel", cur_extended_mode);
         history.add(this.getCommand());
@@ -292,7 +292,7 @@ vimperator.CommandLine = function() //{{{
 
     // TODO: add :messages entry
     // vimperator.echo uses different order of flags as it omits the hightlight group, change v.commandline.echo argument order? --mst
-    this.echo = function(str, highlight_group, flags)
+    this.echo = function (str, highlight_group, flags)
     {
         var focused = document.commandDispatcher.focusedElement;
         if (focused && focused == command_widget.inputField || focused == multiline_input_widget.inputField)
@@ -325,7 +325,7 @@ vimperator.CommandLine = function() //{{{
 
     // this will prompt the user for a string
     // vimperator.commandline.input("(s)ave or (o)pen the file?")
-    this.input = function(str)
+    this.input = function (str)
     {
         // TODO: unfinished, need to find out how/if we can block the execution of code
         // to make this code synchronous or at least use a callback
@@ -336,7 +336,7 @@ vimperator.CommandLine = function() //{{{
 
     // reads a multi line input and returns the string once the last line matches
     // @param until_regexp
-    this.inputMultiline = function(until_regexp, callback_func)
+    this.inputMultiline = function (until_regexp, callback_func)
     {
         // save the mode, because we need to restore it on blur()
         [old_mode, old_extended_mode] = vimperator.getMode();
@@ -350,12 +350,12 @@ vimperator.CommandLine = function() //{{{
         multiline_input_widget.value = "";
         autosizeMultilineInputWidget();
 
-        setTimeout(function() {
+        setTimeout(function () {
             multiline_input_widget.focus();
         }, 10);
     };
 
-    this.clear = function()
+    this.clear = function ()
     {
         multiline_input_widget.collapsed = true;
         multiline_output_widget.collapsed = true;
@@ -364,14 +364,14 @@ vimperator.CommandLine = function() //{{{
         setLine("", this.HL_NORMAL);
     };
 
-    this.onEvent = function(event)
+    this.onEvent = function (event)
     {
         var command = this.getCommand();
 
         if (event.type == "blur")
         {
             // prevent losing focus, there should be a better way, but it just didn't work otherwise
-            setTimeout(function() {
+            setTimeout(function () {
                 if (vimperator.hasMode(vimperator.modes.COMMAND_LINE) &&
                     !vimperator.hasMode(vimperator.modes.READ_MULTILINE) &&
                     !vimperator.hasMode(vimperator.modes.WRITE_MULTILINE))
@@ -495,7 +495,7 @@ vimperator.CommandLine = function() //{{{
                     // sort the completion list
                     if (vimperator.options["wildoptions"].search(/\bsort\b/) > -1)
                     {
-                        completions.sort(function(a, b) {
+                        completions.sort(function (a, b) {
                                 if (a[0] < b[0])
                                     return -1;
                                 else if (a[0] > b[0])
@@ -611,7 +611,7 @@ vimperator.CommandLine = function() //{{{
         }
     }
 
-    this.onMultilineInputEvent = function(event)
+    this.onMultilineInputEvent = function (event)
     {
         if (event.type == "keypress")
         {
@@ -636,7 +636,7 @@ vimperator.CommandLine = function() //{{{
         else if (event.type == "blur")
         {
             if (vimperator.hasMode(vimperator.modes.READ_MULTILINE))
-                setTimeout(function() { multiline_input_widget.inputField.focus(); }, 0);
+                setTimeout(function () { multiline_input_widget.inputField.focus(); }, 0);
         }
         else if (event.type == "input")
         {
@@ -646,7 +646,7 @@ vimperator.CommandLine = function() //{{{
 
     // FIXME: if 'more' is set and the MOW is not scrollable we should still
     // allow a down motion after an up rather than closing
-    this.onMultilineOutputEvent = function(event)
+    this.onMultilineOutputEvent = function (event)
     {
         var win = multiline_output_widget.contentWindow;
 
@@ -839,7 +839,7 @@ vimperator.CommandLine = function() //{{{
     }
 
     // it would be better if we had a destructor in javascript ...
-    this.destroy = function()
+    this.destroy = function ()
     {
         history.save();
     }
@@ -852,7 +852,7 @@ vimperator.CommandLine = function() //{{{
  * @param id: the id of the the XUL widget which we want to fill
  * @param options: an optional hash which modifies the behavior of the list
  */
-vimperator.InformationList = function(id, options) //{{{
+vimperator.InformationList = function (id, options) //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -952,7 +952,7 @@ vimperator.InformationList = function(id, options) //{{{
      *          use entries of 'compl' to fill the list.
      *          Required format: [["left", "right"], ["another"], ["completion"]]
      */
-    this.show = function(compl)
+    this.show = function (compl)
     {
         //max_items = vimperator.options["previewheight"];
 
@@ -978,12 +978,12 @@ vimperator.InformationList = function(id, options) //{{{
         }
     }
 
-    this.hide = function()
+    this.hide = function ()
     {
         widget.hidden = true;
     }
 
-    this.visible = function()
+    this.visible = function ()
     {
         return !widget.hidden;
     }
@@ -991,7 +991,7 @@ vimperator.InformationList = function(id, options) //{{{
     /**
      * select index, refill list if necessary
      */
-    this.selectItem = function(index)
+    this.selectItem = function (index)
     {
         if (widget.hidden)
             return;
@@ -1039,7 +1039,7 @@ vimperator.InformationList = function(id, options) //{{{
         widget.selectedIndex = index - list_offset;
     }
 
-    this.onEvent = function(event)
+    this.onEvent = function (event)
     {
         var listcells = document.getElementsByTagName("listcell");
         // 2 columns for now, use the first column
@@ -1055,7 +1055,7 @@ vimperator.InformationList = function(id, options) //{{{
     //}}}
 } //}}}
 
-vimperator.StatusLine = function() //{{{
+vimperator.StatusLine = function () //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -1075,7 +1075,7 @@ vimperator.StatusLine = function() //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    this.setClass = function(type)
+    this.setClass = function (type)
     {
         var highlight_group;
 
@@ -1096,7 +1096,7 @@ vimperator.StatusLine = function() //{{{
     };
 
     // update all fields of the statusline
-    this.update = function()
+    this.update = function ()
     {
         this.updateUrl();
         this.updateInputBuffer();
@@ -1106,7 +1106,7 @@ vimperator.StatusLine = function() //{{{
     }
 
     // if "url" is ommited, build a usable string for the URL
-    this.updateUrl = function(url)
+    this.updateUrl = function (url)
     {
         if (typeof url == "string")
         {
@@ -1140,7 +1140,7 @@ vimperator.StatusLine = function() //{{{
         url_widget.value = url;
     };
 
-    this.updateInputBuffer = function(buffer)
+    this.updateInputBuffer = function (buffer)
     {
         if (!buffer || typeof buffer != "string")
             buffer = "";
@@ -1148,7 +1148,7 @@ vimperator.StatusLine = function() //{{{
         inputbuffer_widget.value = buffer;
     };
 
-    this.updateProgress = function(progress)
+    this.updateProgress = function (progress)
     {
         if (!progress)
             progress = "";
@@ -1179,7 +1179,7 @@ vimperator.StatusLine = function() //{{{
     };
 
     // you can omit either of the 2 arguments
-    this.updateTabCount = function(cur_index, total_tabs)
+    this.updateTabCount = function (cur_index, total_tabs)
     {
         if (!cur_index || typeof cur_index != "number")
             cur_index = vimperator.tabs.index() + 1;
@@ -1190,7 +1190,7 @@ vimperator.StatusLine = function() //{{{
     };
 
     // percent is given between 0 and 1
-    this.updateBufferPosition = function(percent)
+    this.updateBufferPosition = function (percent)
     {
         if (!percent || typeof percent != "number")
         {
diff --git a/content/util.js b/content/util.js
index c81fb159..f67f5c5f 100644
--- a/content/util.js
+++ b/content/util.js
@@ -27,7 +27,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
 vimperator.util = {
-    escapeHTML: function(str)
+    escapeHTML: function (str)
     {
         // XXX: the following code is _much_ slower than a simple .replace()
         // :history display went down from 2 to 1 second after changing
@@ -41,7 +41,7 @@ vimperator.util = {
     // TODO: use :highlight color groups
     // if "process_strings" is true, any passed strings will be surrounded by " and
     // any line breaks are displayed as \n
-    colorize: function(arg, process_strings)
+    colorize: function (arg, process_strings)
     {
         var type = typeof(arg);
 
@@ -83,7 +83,7 @@ vimperator.util = {
 
     // takes a string like 'google bla, www.osnews.com'
     // and returns an array ['www.google.com/search?q=bla', 'www.osnews.com']
-    stringToURLArray: function(str)
+    stringToURLArray: function (str)
     {
         var urls = str.split(/\s*\,\s+/);
 
@@ -158,7 +158,7 @@ vimperator.util = {
         return urls;
     },
 
-    highlightURL: function(str, force)
+    highlightURL: function (str, force)
     {
         if (force || /^[a-zA-Z]+:\/\/.*\//.test(str))
             return "<a class='hl-URL' href='" + str + "'>" + vimperator.util.escapeHTML(str) + "</a>";
@@ -166,7 +166,7 @@ vimperator.util = {
             return str;
     },
 
-    formatNumber: function(num)
+    formatNumber: function (num)
     {
         var strNum = (num + "").split(".", 2);
 
diff --git a/content/vimperator.js b/content/vimperator.js
index bd32f6cd..d28d5d9e 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-const vimperator = (function() //{{{
+const vimperator = (function () //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
@@ -135,13 +135,13 @@ const vimperator = (function() //{{{
         //  "cancel"
         //  "complete"
         //  TODO: "zoom": if the zoom value of the current buffer changed
-        registerCallback: function(type, mode, func)
+        registerCallback: function (type, mode, func)
         {
             // TODO: check if callback is already registered
             callbacks.push([type, mode, func]);
         },
 
-        triggerCallback: function(type, mode, data)
+        triggerCallback: function (type, mode, data)
         {
             for (var i in callbacks)
             {
@@ -152,14 +152,14 @@ const vimperator = (function() //{{{
             return false;
         },
 
-        getMode: function()
+        getMode: function ()
         {
             return [mode, extended_mode];
         },
 
         // set current mode
         // use "null" if you only want to set one of those modes
-        setMode: function(main, extended, silent)
+        setMode: function (main, extended, silent)
         {
             // if a main mode is set, the extended is always cleared
             if (main)
@@ -176,12 +176,12 @@ const vimperator = (function() //{{{
 
         // returns true if "whichmode" is found in either the main or
         // extended mode
-        hasMode: function(whichmode)
+        hasMode: function (whichmode)
         {
             return ((mode & whichmode) || (extended_mode & whichmode) > 0) ? true : false;
         },
 
-        addMode: function(main, extended)
+        addMode: function (main, extended)
         {
             if (main)
                 mode |= main;
@@ -192,7 +192,7 @@ const vimperator = (function() //{{{
         },
 
         // always show the new mode in the statusline
-        removeMode: function(main, extended)
+        removeMode: function (main, extended)
         {
             if (main)
                 mode = (mode | main) ^ main;
@@ -202,7 +202,7 @@ const vimperator = (function() //{{{
             showMode();
         },
 
-        beep: function()
+        beep: function ()
         {
             if (vimperator.options["visualbell"])
             {
@@ -219,7 +219,7 @@ const vimperator = (function() //{{{
 
                 vbell.hidden = false
 
-                setTimeout(function() { vbell.hidden = true; }, 50); // may as well be 0 ;-)
+                setTimeout(function () { vbell.hidden = true; }, 50); // may as well be 0 ;-)
             }
             else
             {
@@ -227,14 +227,14 @@ const vimperator = (function() //{{{
             }
         },
 
-        copyToClipboard: function(str)
+        copyToClipboard: function (str)
         {
             var clipboardHelper = Components.classes["@mozilla.org/widget/clipboardhelper;1"]
                 .getService(Components.interfaces.nsIClipboardHelper);
             clipboardHelper.copyString(str);
         },
 
-        execute: function(str, modifiers)
+        execute: function (str, modifiers)
         {
             // skip comments and blank lines
             if (/^\s*("|$)/.test(str))
@@ -265,7 +265,7 @@ const vimperator = (function() //{{{
         },
 
         // after pressing Escape, put focus on a non-input field of the browser document
-        focusContent: function()
+        focusContent: function ()
         {
             var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"].
                      getService(Components.interfaces.nsIWindowWatcher);
@@ -277,7 +277,7 @@ const vimperator = (function() //{{{
         },
 
         // partial sixth level expression evaluation
-        eval: function(string)
+        eval: function (string)
         {
             string = string.toString().replace(/^\s*/, "").replace(/\s*$/, "");
             var match = string.match(/^&(\w+)/);
@@ -323,7 +323,7 @@ const vimperator = (function() //{{{
             return;
         },
 
-        variableReference: function(string)
+        variableReference: function (string)
         {
             if (!string)
                 return [null, null, null];
@@ -351,7 +351,7 @@ const vimperator = (function() //{{{
 
         // TODO: move to vimp.util.? --mst
         // if color = true it uses HTML markup to color certain items
-        objectToString: function(object, color)
+        objectToString: function (object, color)
         {
             if (object === null)
                 return "null";
@@ -361,9 +361,12 @@ const vimperator = (function() //{{{
 
             var string = "";
             var obj = "";
-            try { // for window.JSON
+            try
+            { // for window.JSON
                 obj = object.toString();
-            } catch (e) {
+            }
+            catch (e)
+            {
                 obj = "&lt;Object&gt;";
             }
 
@@ -400,7 +403,7 @@ const vimperator = (function() //{{{
 
         // logs a message to the javascript error console
         // if msg is an object, it is beautified
-        log: function(msg, level)
+        log: function (msg, level)
         {
             //if (vimperator.options.getPref("verbose") >= level) // FIXME: hangs vimperator, probably timing issue --mst
             if (typeof msg == "object")
@@ -419,7 +422,7 @@ const vimperator = (function() //{{{
         // @param callback: not implemented, will be allowed to specify a callback function
         //                  which is called, when the page finished loading
         // @returns true when load was initiated, or false on error
-        open: function(urls, where, callback)
+        open: function (urls, where, callback)
         {
             // convert the string to an array of converted URLs
             // -> see vimperator.util.stringToURLArray for more details
@@ -479,7 +482,7 @@ const vimperator = (function() //{{{
         },
 
         // quit vimperator, no matter how many tabs/windows are open
-        quit: function(save_session)
+        quit: function (save_session)
         {
             if (save_session)
                 vimperator.options.setFirefoxPref("browser.startup.page", 3); // start with saved session
@@ -489,7 +492,7 @@ const vimperator = (function() //{{{
             goQuitApplication();
         },
 
-        restart: function()
+        restart: function ()
         {
             const nsIAppStartup = Components.interfaces.nsIAppStartup;
 
@@ -521,7 +524,7 @@ const vimperator = (function() //{{{
                 .quit(nsIAppStartup.eRestart | nsIAppStartup.eAttemptQuit);
         },
 
-        run: function(program, args, blocking)
+        run: function (program, args, blocking)
         {
             var file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
             const WINDOWS = navigator.platform == "Win32";
@@ -609,7 +612,7 @@ const vimperator = (function() //{{{
 
         // files which end in .js are sourced as pure javascript files,
         // no need (actually forbidden) to add: js <<EOF ... EOF around those files
-        source: function(filename, silent)
+        source: function (filename, silent)
         {
             filename = vimperator.io.expandPath(filename);
 
@@ -626,7 +629,7 @@ const vimperator = (function() //{{{
                 {
                     var heredoc = "";
                     var heredoc_end = null; // the string which ends the heredoc
-                    str.split("\n").forEach(function(line)
+                    str.split("\n").forEach(function (line)
                     {
                         if (heredoc_end) // we already are in a heredoc
                         {
@@ -678,7 +681,7 @@ const vimperator = (function() //{{{
             }
         },
 
-        startup: function()
+        startup: function ()
         {
             window.dump("Vimperator startup\n");
             vimperator.log("Initializing vimperator object...", 1);
@@ -722,19 +725,19 @@ const vimperator = (function() //{{{
             vimperator.completion    = new vimperator.Completion();
             vimperator.log("All modules loaded", 3);
 
-            vimperator.echo    = function(str) { vimperator.commandline.echo(str); }
-            vimperator.echoerr = function(str) { vimperator.commandline.echo(str, vimperator.commandline.HL_ERRORMSG); }
+            vimperator.echo    = function (str) { vimperator.commandline.echo(str); }
+            vimperator.echoerr = function (str) { vimperator.commandline.echo(str, vimperator.commandline.HL_ERRORMSG); }
 
             vimperator.globalVariables = {};
 
             // TODO: move elsewhere
-            vimperator.registerCallback("submit", vimperator.modes.EX, function(command) { vimperator.execute(command); } );
-            vimperator.registerCallback("complete", vimperator.modes.EX, function(str) { return vimperator.completion.exTabCompletion(str); } );
+            vimperator.registerCallback("submit", vimperator.modes.EX, function (command) { vimperator.execute(command); } );
+            vimperator.registerCallback("complete", vimperator.modes.EX, function (str) { return vimperator.completion.exTabCompletion(str); } );
 
             // first time intro message
             if (vimperator.options.getPref("firsttime", true))
             {
-                setTimeout(function() {
+                setTimeout(function () {
                     vimperator.help(null, null, null, { inTab: true });
                     vimperator.options.setPref("firsttime", false);
                 }, 1000);
@@ -744,7 +747,7 @@ const vimperator = (function() //{{{
 
             // finally, read a ~/.vimperatorrc
             // make sourcing asynchronous, otherwise commands that open new tabs won't work
-            setTimeout(function() {
+            setTimeout(function () {
 
                 var rc_file = vimperator.io.getRCFile();
 
@@ -761,7 +764,7 @@ const vimperator = (function() //{{{
                     {
                         var files = vimperator.io.readDirectory(plugin_dir.path);
                         vimperator.log("Sourcing plugin directory...", 3);
-                        files.forEach(function(file) {
+                        files.forEach(function (file) {
                             if (!file.isDirectory() && /\.js$/.test(file.path))
                                 vimperator.source(file.path, false);
                         });
@@ -787,7 +790,7 @@ const vimperator = (function() //{{{
             vimperator.log("Vimperator fully initialized", 1);
         },
 
-        shutdown: function()
+        shutdown: function ()
         {
             window.dump("Vimperator shutdown\n");
 
@@ -800,7 +803,7 @@ const vimperator = (function() //{{{
             window.dump("All vimperator modules destroyed\n");
         },
 
-        sleep: function(ms)
+        sleep: function (ms)
         {
             var threadManager = Cc["@mozilla.org/thread-manager;1"].getService(Ci.nsIThreadManager);
             var mainThread = threadManager.mainThread;

From c6132049a34660455679be72c0511e12b19c8340 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 11 Nov 2007 10:03:11 +0000
Subject: [PATCH 206/224] finish changing linksearch to work with \[lL] rather
 than \[uU] modifiers

---
 content/find.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/find.js b/content/find.js
index 67ec7ce3..ed0ad6fc 100644
--- a/content/find.js
+++ b/content/find.js
@@ -81,7 +81,7 @@ vimperator.Search = function () //{{{
             links_only = false;
 
         // strip links-only modifiers
-        pattern = pattern.replace(/(\\)?\\[uU]/g, function ($0, $1) { return $1 ? $0 : ""; });
+        pattern = pattern.replace(/(\\)?\\[lL]/g, function ($0, $1) { return $1 ? $0 : ""; });
 
         // case sensitivity - \c wins if both modifiers specified
         if (/\c/.test(pattern))
@@ -99,7 +99,7 @@ vimperator.Search = function () //{{{
         pattern = pattern.replace(/(\\)?\\[cC]/g, function ($0, $1) { return $1 ? $0 : ""; });
 
         // remove any modifer escape \
-        pattern = pattern.replace(/\\(\\[cCuU])/g, "$1");
+        pattern = pattern.replace(/\\(\\[cClL])/g, "$1");
 
         search_string = pattern;
     }

From b204ef96f1f38713066f51e7d3c982b794021626 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 13 Nov 2007 05:45:44 +0000
Subject: [PATCH 207/224] allow :set wildoptions=

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

diff --git a/content/options.js b/content/options.js
index de441c41..5ee4ab1b 100644
--- a/content/options.js
+++ b/content/options.js
@@ -761,7 +761,7 @@ vimperator.Options = function () //{{{
                   "<tr><td><b>sort</b></td><td>Always sorts completion list, overriding the <code class=\"option\">'complete'</code> option.</td></tr>" +
                   "</table>",
             default_value: "",
-            validator: function (value) { return /^sort$/.test(value); }
+            validator: function (value) { return /^(sort|)$/.test(value); }
         }
     ));
     //}}}

From 0f9951e048c6821f7890f44b974407a483042e90 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 13 Nov 2007 05:58:05 +0000
Subject: [PATCH 208/224] merge :paginfo output refinements

---
 content/buffers.js | 82 ++++++++++++++++++++++++++--------------------
 content/util.js    | 34 +++++++++++++++----
 2 files changed, 74 insertions(+), 42 deletions(-)

diff --git a/content/buffers.js b/content/buffers.js
index f09331bf..44caa372 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -165,7 +165,7 @@ vimperator.Buffer = function () //{{{
         );
 
         return result;
-    }
+    };
 
     this.list = function (fullmode)
     {
@@ -212,12 +212,12 @@ vimperator.Buffer = function () //{{{
 
             vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
         }
-    }
+    };
 
     this.scrollBottom = function ()
     {
         scrollToPercentiles(-1, 100);
-    }
+    };
 
     this.scrollColumns = function (cols)
     {
@@ -228,41 +228,41 @@ vimperator.Buffer = function () //{{{
             vimperator.beep();
 
         win.scrollBy(COL_WIDTH * cols, 0);
-    }
+    };
 
     this.scrollEnd = function ()
     {
         scrollToPercentiles(100, -1);
-    }
+    };
 
     this.scrollLines = function (lines)
     {
         var win = window.document.commandDispatcher.focusedWindow;
         checkScrollYBounds(win, lines);
         win.scrollByLines(lines);
-    }
+    };
 
     this.scrollPages = function (pages)
     {
         var win = window.document.commandDispatcher.focusedWindow;
         checkScrollYBounds(win, pages);
         win.scrollByPages(pages);
-    }
+    };
 
     this.scrollToPercentile = function (percentage)
     {
         scrollToPercentiles(-1, percentage);
-    }
+    };
 
     this.scrollStart = function ()
     {
         scrollToPercentiles(0, -1);
-    }
+    };
 
     this.scrollTop = function ()
     {
         scrollToPercentiles(-1, 0);
-    }
+    };
 
     // TODO: allow callback for filtering out unwanted frames? User defined?
     this.shiftFrameFocus = function (count, forward)
@@ -361,7 +361,7 @@ vimperator.Buffer = function () //{{{
 
         // remove the frame indicator
         setTimeout(function () { doc.body.removeChild(indicator); }, 500);
-    }
+    };
 
     // updates the buffer preview in place only if list is visible
     this.updateBufferList = function ()
@@ -372,7 +372,7 @@ vimperator.Buffer = function () //{{{
         var items = vimperator.completion.get_buffer_completions("");
         vimperator.bufferwindow.show(items);
         vimperator.bufferwindow.selectItem(getBrowser().mTabContainer.selectedIndex);
-    }
+    };
 
     // XXX: should this be in v.buffers. or v.tabs.?
     // "buffer" is a string which matches the URL or title of a buffer, if it
@@ -437,23 +437,23 @@ vimperator.Buffer = function () //{{{
     this.zoomIn = function (steps)
     {
         bumpZoomLevel(steps);
-    }
+    };
 
     this.zoomOut = function (steps)
     {
         bumpZoomLevel(-steps);
-    }
+    };
 
     this.pageInfo = function (verbose)
     {
-        // TODO: copied from firefox. Needs some review/work...
-        //    const feedTypes = {
-        //        "application/rss+xml": gBundle.getString("feedRss"),
-        //        "application/atom+xml": gBundle.getString("feedAtom"),
-        //        "text/xml": gBundle.getString("feedXML"),
-        //        "application/xml": gBundle.getString("feedXML"),
-        //        "application/rdf+xml": gBundle.getString("feedXML")
-        //    };
+        const feedTypes = {
+            "application/rss+xml": "RSS",
+            "application/atom+xml": "Atom",
+            "text/xml": "XML",
+            "application/xml": "XML",
+            "application/rdf+xml": "XML"
+        };
+
         function isValidFeed(aData, aPrincipal, aIsFeed)
         {
             if (!aData || !aPrincipal)
@@ -541,8 +541,10 @@ vimperator.Buffer = function () //{{{
         var pageSize = []; // [0] bytes; [1] kbytes
         if (cacheEntryDescriptor)
         {
-            pageSize[0] = vimperator.util.formatNumber(cacheEntryDescriptor.dataSize);
-            pageSize[1] = vimperator.util.formatNumber(Math.round(cacheEntryDescriptor.dataSize / 1024 * 100) / 100);
+            pageSize[0] = vimperator.util.formatBytes(cacheEntryDescriptor.dataSize, 0, false);
+            pageSize[1] = vimperator.util.formatBytes(cacheEntryDescriptor.dataSize, 2, true);
+            if (pageSize[1] == pageSize[0])
+                pageSize[1] = null; // don't output "xx Bytes" twice
         }
 
         // put feeds rss into pageFeeds[]
@@ -567,13 +569,18 @@ vimperator.Buffer = function () //{{{
                 var feed = { title: link.title, href: link.href, type: link.type || "" };
                 if (isValidFeed(feed, window.content.document.nodePrincipal, rels.feed))
                 {
-//                    var type = feedTypes[feed.type] || feedTypes["application/rss+xml"]; // TODO: dig into that.. --calmar
-                    var type = feed.type || "application/rss+xml";
-                    pageFeeds.push([feed.title, vimperator.util.highlightURL(feed.href, true)]);
+                    var type = feedTypes[feed.type] || feedTypes["application/rss+xml"];
+                    pageFeeds.push([feed.title, vimperator.util.highlightURL(feed.href, true) + "  (" + type + ")"]);
                 }
             }
         }
 
+        var lastModVerbose = new Date(window.content.document.lastModified).toLocaleString();
+        var lastMod = new Date(window.content.document.lastModified).toLocaleFormat("%x %X");
+        // FIXME: probably unportable across differnet language versions
+        if (lastModVerbose == "Invalid Date")
+            lastModVerbose = lastMod = null;
+
         // Ctrl-g single line output
         if (!verbose)
         {
@@ -581,10 +588,9 @@ vimperator.Buffer = function () //{{{
             var file = window.content.document.location.pathname.split("/").pop() || "[No Name]";
             var title = window.content.document.title || "[No Title]";
 
-            if (pageSize[1])
-                info.push(pageSize[1] + "KiB");
+            if (pageSize[0])
+                info.push(pageSize[1] || pageSize[0]);
 
-            var lastMod = window.content.document.lastModified.slice(0, -3);
             if (lastMod)
                 info.push(lastMod);
 
@@ -609,12 +615,18 @@ vimperator.Buffer = function () //{{{
             pageGeneral.push(["Referrer", vimperator.util.highlightURL(ref, true)]);
 
         if (pageSize[0])
-            pageGeneral.push(["File Size", pageSize[1] + "KiB (" + pageSize[0] + " bytes)"]);
+        {
+            if (pageSize[1])
+                pageGeneral.push(["File Size", pageSize[1] + " (" + pageSize[0] + ")"]);
+            else
+                pageGeneral.push(["File Size", pageSize[0]]);
+        }
 
-        pageGeneral.push(["Mime-Type", window.content.document.contentType]);
-        pageGeneral.push(["Encoding",  window.content.document.characterSet]);
+        pageGeneral.push(["Mime-Type", content.document.contentType]);
+        pageGeneral.push(["Encoding",  content.document.characterSet]);
         pageGeneral.push(["Compatibility", content.document.compatMode == "BackCompat" ?  "Quirks Mode" : "Full/Almost Standards Mode"]);
-        pageGeneral.push(["Last Modified", window.content.document.lastModified]); //TODO: do not show bogus times (=current time)
+        if (lastModVerbose)
+            pageGeneral.push(["Last Modified", lastModVerbose]);
 
         // get meta tag data, sort and put into pageMeta[]
         var metaNodes = window.content.document.getElementsByTagName("meta");
@@ -677,7 +689,7 @@ vimperator.Buffer = function () //{{{
             }
         }
         vimperator.echo(pageInfoText, vimperator.commandline.FORCE_MULTILINE);
-    }
+    };
     //}}}
 } //}}}
 
diff --git a/content/util.js b/content/util.js
index f67f5c5f..e6cae247 100644
--- a/content/util.js
+++ b/content/util.js
@@ -166,18 +166,38 @@ vimperator.util = {
             return str;
     },
 
-    formatNumber: function (num)
+    formatBytes: function (num, decimalPlaces, humanReadable)
     {
-        var strNum = (num + "").split(".", 2);
+        const unitVal = ["Bytes", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"];
+        var unitIndex = 0;
+        var tmpNum = parseInt(num) || 0;
+        var strNum = [tmpNum + ""];
 
-        for (var u = strNum[0].length - 3; u > 0; u -= 3)
+        if (humanReadable)
+        {
+            while (tmpNum >= 1024)
+            {
+                tmpNum /= 1024;
+                if (++unitIndex > (unitVal.length - 1))
+                    break;
+            }
+            let decPower = Math.pow(10, decimalPlaces);
+            strNum = ((Math.round(tmpNum * decPower) / decPower) + "").split(".", 2);
+
+            if (!strNum[1])
+                strNum[1] = "";
+            while (strNum[1].length < decimalPlaces) // padd with "0" to the desired decimalPlaces)
+                strNum[1] += "0";
+        }
+
+        for (var u = strNum[0].length - 3; u > 0; u -= 3) // make a 10000 a 10,000
             strNum[0] = strNum[0].substring(0, u) + "," + strNum[0].substring(u, strNum[0].length);
 
-        if (strNum[1])
-            strNum[0] += "." + strNum[1]
+        if (unitIndex) // decimalPlaces only when > Bytes
+            strNum[0] += "." + strNum[1];
 
-        return strNum[0];
+        return strNum[0] + " " + unitVal[unitIndex];
     }
-}
+};
 
 // vim: set fdm=marker sw=4 ts=4 et:

From 2985555caa9e58e7d651d5f15984d6879f3d924f Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 13 Nov 2007 06:00:32 +0000
Subject: [PATCH 209/224] merge improvements in :echo object

---
 content/util.js | 68 +++++++++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/content/util.js b/content/util.js
index e6cae247..2fb5f167 100644
--- a/content/util.js
+++ b/content/util.js
@@ -45,40 +45,48 @@ vimperator.util = {
     {
         var type = typeof(arg);
 
-        if (type == "number")
+        // some objects like window.JSON or getBrowsers()._browsers need the try/catch
+        try
         {
-            return "<span style=\"color: red;\">" + arg + "</span>";
-        }
-        else if (type == "string")
-        {
-            if (process_strings)
-                arg = '"' + vimperator.util.escapeHTML(arg.replace(/\n/, "\\n")) + '"';
+            if (type == "number")
+            {
+                return "<span style=\"color: red;\">" + arg + "</span>";
+            }
+            else if (type == "string")
+            {
+                if (process_strings)
+                    arg = '"' + vimperator.util.escapeHTML(arg.replace(/\n/, "\\n")) + '"';
 
-            return "<span style=\"color: green;\">" + arg + "</span>";
-        }
-        else if (type == "boolean")
-        {
-            return "<span style=\"color: blue;\">" + arg + "</span>";
-        }
-        else if (arg == null || arg == "undefined")
-        {
-            return "<span style=\"color: blue;\">" + arg + "</span>";
-        }
-        else if (type == "object" || type == "function")
-        {
-            // for java packages value.toString() would crash so badly
-            // that we cannot even try/catch it
-            if (/^\[JavaPackage.*\]$/.test(arg))
-                return "[JavaPackage]";
+                return "<span style=\"color: green;\">" + arg + "</span>";
+            }
+            else if (type == "boolean")
+            {
+                return "<span style=\"color: blue;\">" + arg + "</span>";
+            }
+            else if (arg == null || arg == "undefined")
+            {
+                return "<span style=\"color: blue;\">" + arg + "</span>";
+            }
+            else if (type == "object" || type == "function")
+            {
+                // for java packages value.toString() would crash so badly
+                // that we cannot even try/catch it
+                if (/^\[JavaPackage.*\]$/.test(arg))
+                    return "[JavaPackage]";
 
-            var str = arg.toString();
-            if (typeof str == "string")  // can be "undefined"
-                return vimperator.util.escapeHTML(str);
-            else
-                return "undefined";
+                var str = arg.toString();
+                if (typeof str == "string")  // can be "undefined"
+                    return vimperator.util.escapeHTML(str);
+                else
+                    return "undefined";
+            }
+        }
+        catch (e)
+        {
+            return "&lt;unknown&gt;";
         }
 
-        return arg;
+        return "&lt;unknown type&gt;";
     },
 
     // takes a string like 'google bla, www.osnews.com'
@@ -160,7 +168,7 @@ vimperator.util = {
 
     highlightURL: function (str, force)
     {
-        if (force || /^[a-zA-Z]+:\/\/.*\//.test(str))
+        if (force || /^[a-zA-Z]+:\/\//.test(str))
             return "<a class='hl-URL' href='" + str + "'>" + vimperator.util.escapeHTML(str) + "</a>";
         else
             return str;

From 5a47828aea89ed3c7a76cc1507a3eb3c7334c611 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 16 Nov 2007 05:27:13 +0000
Subject: [PATCH 210/224] update AUTHORS

---
 AUTHORS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 659ca289..3d73d4e0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,6 +5,7 @@ Main developer:
 Developers:
   * Viktor Kojouharov (Виктор Кожухаров)
   * Doug Kearns (dougkearns@gmail.com)
+  * Marco Candrian (mac@calmar.ws)
  
 Patches:
   * Muthu Kannan (ctrl-v support)
@@ -12,7 +13,7 @@ Patches:
   * Lee Hinman (:open ./.. support)
   * Bart Trojanowski (Makefile)
   * Hannes Rist (:set titlestring support)
-  * Marco Candrian (shift-insert patch)
   * Nikolai Weibull ($VIMPERATOR_HOME)
   * Joseph Xu (supporting multiple top level windows better)
+  * Raimon Grau Cuscó (document relationship navigation - ]n, ]p)
 </pre>

From 2efad6186e66b39ca91a1b90b12452d030c6640a Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 16 Nov 2007 12:06:31 +0000
Subject: [PATCH 211/224] add KeySym highlighting to RC file highlighter

---
 vimperator.vim | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/vimperator.vim b/vimperator.vim
index c933d983..c5a7f7ef 100644
--- a/vimperator.vim
+++ b/vimperator.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	    VIMperator configuration file
 " Maintainer:	    Doug Kearns <dougkearns@gmail.com>
-" Latest Revision:  2007 November 9
+" Latest Revision:  2007 November 16
 
 if exists("b:current_syntax")
   finish
@@ -33,7 +33,7 @@ syn keyword vimperatorCommand addo[ns] b[uffer] ba[ck] bd[elete] beep bma[rk] bm
 syn match vimperatorCommand "!" contained
 
 " FIXME
-syn match vimperatorCommandWrapper "\%(^\|:\|\s\)\@<=\%(!\|\h\w*\>\)" contains=vimperatorCommand
+syn match vimperatorCommandWrapper "\%(^\s*:\=\)\@<=\%(!\|\h\w*\>\)" contains=vimperatorCommand
 
 syn region vimperatorSet matchgroup=vimperatorCommand start="\<set\=\>" end="$" keepend oneline contains=vimperatorOption
 syn keyword vimperatorOption activate act complete cpt defsearch ds extendedhinttags eht focusedhintstyle fhs fullscreen fs
@@ -48,14 +48,19 @@ syn region vimperatorJavascript start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=" end
 syn region vimperatorJavascript matchgroup=vimperatorJavascriptDelimiter
 	\ start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=<<\z(\h\w*\)"hs=s+2 end="^\z1$" contains=@javascriptTop fold
 
+syn region vimperatorMap matchgroup=vimperatorCommand start="\%(^\s*:\=\)\@<=\<map\>" end="$" keepend oneline contains=vimperatorKeySym
+
+syn match vimperatorKeySym "<[0-9A-Za-z-]\+>"
+
 " Note: match vim.vim highlighting groups
 hi def link vimperatorCommand			Statement
-hi def link vimperatorTodo			Todo
 hi def link vimperatorComment			Comment
-hi def link vimperatorLineComment		Comment
 hi def link vimperatorJavascriptDelimiter	Delimiter
+hi def link vimperatorKeySym			Special
+hi def link vimperatorLineComment		Comment
 hi def link vimperatorOption			PreProc
 hi def link vimperatorString			String 
+hi def link vimperatorTodo			Todo
 
 let b:current_syntax = "vimperator"
 

From d5c5869d56b2282ac8a840bd1e3dc4421b8e16bb Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 22 Nov 2007 11:30:12 +0000
Subject: [PATCH 212/224] use the singleton construction idiom for all top
 level modules and convert all identifiers to camel case

---
 NEWS                  |    2 +-
 content/bookmarks.js  | 1173 ++++++++++++++--------------
 content/buffers.js    | 1111 ++++++++++++++-------------
 content/commands.js   |  634 ++++++++-------
 content/completion.js |  234 +++---
 content/events.js     | 1034 ++++++++++++-------------
 content/find.js       |  357 ++++-----
 content/help.js       |   22 +-
 content/hints.js      |  637 +++++++--------
 content/io.js         |   54 +-
 content/mappings.js   |  506 ++++++------
 content/options.js    |  500 ++++++------
 content/tabs.js       |  344 ++++-----
 content/ui.js         | 1704 +++++++++++++++++++++--------------------
 content/util.js       |   32 +-
 content/vimperator.js |  155 ++--
 16 files changed, 4295 insertions(+), 4204 deletions(-)

diff --git a/NEWS b/NEWS
index 718c0582..15e9f5f0 100644
--- a/NEWS
+++ b/NEWS
@@ -53,7 +53,7 @@
 	* added a visual bell and replaced 'beep' with 'visualbell'
 	* added vimperator logo (can be seen in the addons manager)
 	* added 'hlsearch','incsearch', 'ignorecase' and 'smartcase' options
-	* many small bug fixes and enhancments
+	* many small bug fixes and enhancements
 
 2007-09-03:
 	* version 0.5.1
diff --git a/content/bookmarks.js b/content/bookmarks.js
index 9d473305..a25e36e8 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -33,21 +33,21 @@ vimperator.Bookmarks = function () //{{{
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    const search_service = Components.classes["@mozilla.org/browser/search-service;1"].
+    const searchService = Components.classes["@mozilla.org/browser/search-service;1"].
                            getService(Components.interfaces.nsIBrowserSearchService);
-    const rdf_service    = Components.classes["@mozilla.org/rdf/rdf-service;1"].
-                           getService( Components.interfaces.nsIRDFService );
+    const rdfService    = Components.classes["@mozilla.org/rdf/rdf-service;1"].
+                           getService(Components.interfaces.nsIRDFService);
 
     var bookmarks = null;
     var keywords = null;
 
     if (vimperator.options["preload"])
-        setTimeout(function () { load(); } , 100);
+        setTimeout(function () { load(); }, 100);
 
     function load()
     {
         // update our bookmark cache
-        var root = rdf_service.GetResource("NC:BookmarksRoot");
+        var root = rdfService.GetResource("NC:BookmarksRoot");
         bookmarks = []; // also clear our bookmark cache
         keywords  = [];
 
@@ -56,15 +56,15 @@ vimperator.Bookmarks = function () //{{{
 
         // getAllChildren(root) ignores the BTF
         // NOTE: there's probably a better way to do this...
-        var btf_bmarks = [];
-        BookmarksUtils.getAllChildren(BMSVC.getBookmarksToolbarFolder(), btf_bmarks);
+        var btfBmarks = [];
+        BookmarksUtils.getAllChildren(BMSVC.getBookmarksToolbarFolder(), btfBmarks);
 
-        bmarks = bmarks.concat(btf_bmarks);
+        bmarks = bmarks.concat(btfBmarks);
 
         for (var i = 0; i < bmarks.length; i++)
         {
             if (bmarks[i][0] && bmarks[i][1])
-                bookmarks.push([bmarks[i][1].Value, bmarks[i][0].Value ]);
+                bookmarks.push([bmarks[i][1].Value, bmarks[i][0].Value]);
 
             // keyword
             if (bmarks[i][1] && bmarks[i][2])
@@ -76,285 +76,290 @@ vimperator.Bookmarks = function () //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    // FIXME: add filtering here rather than having to calling
-    // get_bookmark_completions()
-    this.get = function ()
-    {
-        if (!bookmarks)
-            load();
+    return {
 
-        return bookmarks;
-    }
-
-    // TODO: keyword support
-    this.add = function (title, uri, keyword)
-    {
-        if (!bookmarks)
-            load();
-
-        folder = rdf_service.GetResource("NC:BookmarksRoot");
-        var rSource = BookmarksUtils.createBookmark(title, uri, keyword, title);
-        var selection = BookmarksUtils.getSelectionFromResource(rSource);
-        var target = BookmarksUtils.getTargetFromFolder(folder);
-        BookmarksUtils.insertAndCheckSelection("newbookmark", selection, target);
-
-        //also update bookmark cache
-        bookmarks.unshift([uri, title]);
-        return true;
-    }
-
-    // NOTE: no idea what it does, it Just Works (TM)
-    // returns number of deleted bookmarks
-    this.remove = function (url)
-    {
-        var deleted = 0;
-        if (!url)
-            return 0;
-
-        // gNC_NS for trunk, NC_NS for 1.X
-        //try { var pNC_NS; pNC_NS = gNC_NS;} catch (err) { pNC_NS = NC_NS;}
-        if (!BMSVC || !BMDS || !RDF || !gNC_NS) // defined from firefox
-            return 0;
-
-        var curfolder = RDF.GetResource("NC:BookmarksRoot");
-        var urlArc = RDF.GetResource(gNC_NS + "URL");
-        var urlLiteral = RDF.GetLiteral(url);
-        if (BMDS.hasArcIn(urlLiteral, urlArc))
+        // FIXME: add filtering here rather than having to calling
+        // v.completion.bookmark()
+        get: function ()
         {
-            var bmResources, bmResource, title, uri, type, ptype;
-            bmResources = BMSVC.GetSources(urlArc, urlLiteral, true);
-            while (bmResources.hasMoreElements())
-            {
-                bmResource = bmResources.getNext();
-                type = BookmarksUtils.resolveType(bmResource);
-                if (type != "ImmutableBookmark")
-                {
-                    ptype = BookmarksUtils.resolveType(BMSVC.getParent(bmResource));
-                    //              alert(type);
-                    //              if ( type == "Folder")  // store the current folder
-                    //                  curfolder = bmResource;
-                    if ( (type == "Bookmark" || type == "IEFavorite") && ptype != "Livemark")
-                    {
-                        title = BookmarksUtils.getProperty(bmResource, gNC_NS + "Name");
-                        uri = BookmarksUtils.getProperty(bmResource, gNC_NS + "URL");
+            if (!bookmarks)
+                load();
 
-                        if (uri == url)
+            return bookmarks;
+        },
+
+        // TODO: keyword support
+        add: function (title, uri, keyword)
+        {
+            if (!bookmarks)
+                load();
+
+            folder = rdfService.GetResource("NC:BookmarksRoot");
+            var rSource = BookmarksUtils.createBookmark(title, uri, keyword, title);
+            var selection = BookmarksUtils.getSelectionFromResource(rSource);
+            var target = BookmarksUtils.getTargetFromFolder(folder);
+            BookmarksUtils.insertAndCheckSelection("newbookmark", selection, target);
+
+            //also update bookmark cache
+            bookmarks.unshift([uri, title]);
+            return true;
+        },
+
+        // NOTE: no idea what it does, it Just Works (TM)
+        // returns number of deleted bookmarks
+        remove: function (url)
+        {
+            var deleted = 0;
+            if (!url)
+                return 0;
+
+            // gNC_NS for trunk, NC_NS for 1.X
+            //try { var pNC_NS; pNC_NS = gNC_NS;} catch (err) { pNC_NS = NC_NS;}
+            if (!BMSVC || !BMDS || !RDF || !gNC_NS) // defined from firefox
+                return 0;
+
+            var curfolder = RDF.GetResource("NC:BookmarksRoot");
+            var urlArc = RDF.GetResource(gNC_NS + "URL");
+            var urlLiteral = RDF.GetLiteral(url);
+            if (BMDS.hasArcIn(urlLiteral, urlArc))
+            {
+                var bmResources, bmResource, title, uri, type, ptype;
+                bmResources = BMSVC.GetSources(urlArc, urlLiteral, true);
+                while (bmResources.hasMoreElements())
+                {
+                    bmResource = bmResources.getNext();
+                    type = BookmarksUtils.resolveType(bmResource);
+                    if (type != "ImmutableBookmark")
+                    {
+                        ptype = BookmarksUtils.resolveType(BMSVC.getParent(bmResource));
+                        //              alert(type);
+                        //              if (type == "Folder")  // store the current folder
+                        //                  curfolder = bmResource;
+                        if ((type == "Bookmark" || type == "IEFavorite") && ptype != "Livemark")
                         {
-                            RDFC.Init(BMDS, BMSVC.getParent(bmResource));
-                            RDFC.RemoveElement(bmResource, true);
-                            deleted++;
+                            title = BookmarksUtils.getProperty(bmResource, gNC_NS + "Name");
+                            uri = BookmarksUtils.getProperty(bmResource, gNC_NS + "URL");
+
+                            if (uri == url)
+                            {
+                                RDFC.Init(BMDS, BMSVC.getParent(bmResource));
+                                RDFC.RemoveElement(bmResource, true);
+                                deleted++;
+                            }
                         }
                     }
                 }
             }
-        }
 
-        // also update bookmark cache, if we removed at least one bookmark
-        if (deleted > 0)
-            load();
+            // also update bookmark cache, if we removed at least one bookmark
+            if (deleted > 0)
+                load();
 
-        return deleted;
-    }
+            return deleted;
+        },
 
-    // also ensures that each search engine has a Vimperator-friendly alias
-    this.getSearchEngines = function ()
-    {
-        var search_engines = [];
-        var firefox_engines = search_service.getVisibleEngines({ });
-        for (var i in firefox_engines)
+        // also ensures that each search engine has a Vimperator-friendly alias
+        getSearchEngines: function ()
         {
-            var alias = firefox_engines[i].alias;
-            if (!alias || !alias.match(/^[a-z0-9_-]+$/))
-                alias = firefox_engines[i].name.replace(/^\W*([a-zA-Z_-]+).*/, "$1").toLowerCase();
-            if (!alias)
-                alias = "search"; // for search engines which we can't find a suitable alias
-
-            // make sure we can use search engines which would have the same alias (add numbers at the end)
-            var newalias = alias;
-            for (var j = 1; j <= 10; j++) // <=10 is intentional
+            var searchEngines = [];
+            var firefoxEngines = searchService.getVisibleEngines({ });
+            for (var i in firefoxEngines)
             {
-                if (!search_engines.some(function (item) { return (item[0] == newalias); }))
-                    break;
+                var alias = firefoxEngines[i].alias;
+                if (!alias || !alias.match(/^[a-z0-9_-]+$/))
+                    alias = firefoxEngines[i].name.replace(/^\W*([a-zA-Z_-]+).*/, "$1").toLowerCase();
+                if (!alias)
+                    alias = "search"; // for search engines which we can't find a suitable alias
 
-                newalias = alias + j;
+                // make sure we can use search engines which would have the same alias (add numbers at the end)
+                var newAlias = alias;
+                for (var j = 1; j <= 10; j++) // <=10 is intentional
+                {
+                    if (!searchEngines.some(function (item) { return (item[0] == newAlias); }))
+                        break;
+
+                    newAlias = alias + j;
+                }
+                // only write when it changed, writes are really slow
+                if (firefoxEngines[i].alias != newAlias)
+                    firefoxEngines[i].alias = newAlias;
+
+                searchEngines.push([firefoxEngines[i].alias, firefoxEngines[i].description]);
             }
-            // only write when it changed, writes are really slow
-            if (firefox_engines[i].alias != newalias)
-                firefox_engines[i].alias = newalias;
 
-            search_engines.push([firefox_engines[i].alias, firefox_engines[i].description]);
-        }
+            return searchEngines;
+        },
 
-        return search_engines;
-    }
-
-    // format of returned array:
-    // [keyword, helptext, url]
-    this.getKeywords = function ()
-    {
-        if (!keywords)
-            load();
-
-        return keywords;
-    }
-
-    // if @param engine_name is null, it uses the default search engine
-    // @returns the url for the search string
-    //          if the search also requires a postdata, [url, postdata] is returned
-    this.getSearchURL = function (text, engine_name)
-    {
-        var url = null;
-        var postdata = null;
-        if (!engine_name)
-            engine_name = vimperator.options["defsearch"];
-
-        // we need to make sure our custom alias have been set, even if the user
-        // did not :open <tab> once before
-        this.getSearchEngines();
-
-        // first checks the search engines for a match
-        var engine = search_service.getEngineByAlias(engine_name);
-        if (engine)
-        {
-            if (text)
-            {
-                var submission = engine.getSubmission(text, null);
-                url = submission.uri.spec;
-                postdata = submission.postData;
-            }
-            else
-                url = engine.searchForm;
-        }
-        else // check for keyword urls
+        // TODO: add filtering
+        // format of returned array:
+        // [keyword, helptext, url]
+        getKeywords: function ()
         {
             if (!keywords)
                 load();
 
-            for (var i in keywords)
+            return keywords;
+        },
+
+        // if @param engineName is null, it uses the default search engine
+        // @returns the url for the search string
+        //          if the search also requires a postData, [url, postData] is returned
+        getSearchURL: function (text, engineName)
+        {
+            var url = null;
+            var postData = null;
+            if (!engineName)
+                engineName = vimperator.options["defsearch"];
+
+            // we need to make sure our custom alias have been set, even if the user
+            // did not :open <tab> once before
+            this.getSearchEngines();
+
+            // first checks the search engines for a match
+            var engine = searchService.getEngineByAlias(engineName);
+            if (engine)
             {
-                if (keywords[i][0] == engine_name)
+                if (text)
                 {
-                    if (text == null)
-                        text = "";
-                    url = keywords[i][2].replace(/%s/g, encodeURIComponent(text));
-                    break;
+                    var submission = engine.getSubmission(text, null);
+                    url = submission.uri.spec;
+                    postData = submission.postData;
                 }
-            }
-        }
-
-        // if we came here, the engine_name is neither a search engine or URL
-        if (postdata)
-            return [url, postdata];
-        else
-            return url; // can be null
-    }
-
-    this.list = function (filter, fullmode)
-    {
-        if (fullmode)
-        {
-            vimperator.open("chrome://browser/content/bookmarks/bookmarksPanel.xul", vimperator.NEW_TAB);
-        }
-        else
-        {
-            var items = vimperator.completion.get_bookmark_completions(filter);
-
-            if (items.length == 0)
-            {
-                if (filter.length > 0)
-                    vimperator.echoerr("E283: No bookmarks matching \"" + filter + "\"");
                 else
-                    vimperator.echoerr("No bookmarks set");
-
-                return;
+                    url = engine.searchForm;
             }
-
-            var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
-                       "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>URL</th></tr>";
-            for (var i = 0; i < items.length; i++)
+            else // check for keyword urls
             {
-                var title = vimperator.util.escapeHTML(items[i][1]);
-                if (title.length > 50)
-                    title = title.substr(0, 47) + "...";
-                var url = vimperator.util.escapeHTML(items[i][0]);
-                list += "<tr><td>" + title + "</td><td style=\"width: 100%\"><a href=\"#\" class=\"hl-URL\">" + url + "</a></td></tr>";
-            }
-            list += "</table>";
+                if (!keywords)
+                    load();
 
-            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
-        }
-    }
-
-    //  res = parseBookmarkString("-t tag1,tag2 -T title http://www.orf.at");
-    //  res.tags is an array of tags
-    //  res.title is the title or "" if no one was given
-    //  res.url is the url as a string
-    //  returns null, if parsing failed
-    this.parseBookmarkString = function (str)
-    {
-        var res = {};
-        res.tags = [];
-        res.title = null;
-        res.url = null;
-
-        var re_title = /^\s*((-t|--title)\s+(\w+|\".*\"))(.*)/;
-        var re_tags = /^\s*((-T|--tags)\s+((\w+)(,\w+)*))(.*)/;
-        var re_url = /^\s*(\".+\"|\S+)(.*)/;
-
-        var match_tags = null;
-        var match_title = null;
-        var match_url = null;
-
-        while (!str.match(/^\s*$/))
-        {
-            // first check for --tags
-            match_tags = str.match(re_tags);
-            if (match_tags != null)
-            {
-                str = match_tags[match_tags.length - 1]; // the last captured parenthesis is the rest of the string
-                tags = match_tags[3].split(",");
-                res.tags = res.tags.concat(tags);
-            }
-            else // then for --titles
-            {
-
-                match_title = str.match(re_title);
-                if (match_title != null)
+                for (var i in keywords)
                 {
-                    // only one title allowed
-                    if (res.title != null)
-                        return null;
-
-                    str = match_title[match_title.length - 1]; // the last captured parenthesis is the rest of the string
-                    var title = match_title[3];
-                    if (title.charAt(0) == '"')
-                        title = title.substring(1, title.length - 1);
-                    res.title = title;
-                }
-                else // at last check for a URL
-                {
-                    match_url = str.match(re_url);
-                    if (match_url != null)
+                    if (keywords[i][0] == engineName)
                     {
-                        // only one url allowed
-                        if (res.url != null)
+                        if (text == null)
+                            text = "";
+                        url = keywords[i][2].replace(/%s/g, encodeURIComponent(text));
+                        break;
+                    }
+                }
+            }
+
+            // if we came here, the engineName is neither a search engine or URL
+            if (postData)
+                return [url, postData];
+            else
+                return url; // can be null
+        },
+
+        list: function (filter, fullmode)
+        {
+            if (fullmode)
+            {
+                vimperator.open("chrome://browser/content/bookmarks/bookmarksPanel.xul", vimperator.NEW_TAB);
+            }
+            else
+            {
+                var items = vimperator.completion.bookmark(filter);
+
+                if (items.length == 0)
+                {
+                    if (filter.length > 0)
+                        vimperator.echoerr("E283: No bookmarks matching \"" + filter + "\"");
+                    else
+                        vimperator.echoerr("No bookmarks set");
+
+                    return;
+                }
+
+                var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                           "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>URL</th></tr>";
+                for (var i = 0; i < items.length; i++)
+                {
+                    var title = vimperator.util.escapeHTML(items[i][1]);
+                    if (title.length > 50)
+                        title = title.substr(0, 47) + "...";
+                    var url = vimperator.util.escapeHTML(items[i][0]);
+                    list += "<tr><td>" + title + "</td><td style=\"width: 100%\"><a href=\"#\" class=\"hl-URL\">" + url + "</a></td></tr>";
+                }
+                list += "</table>";
+
+                vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
+            }
+        },
+
+        //  res = parseBookmarkString("-t tag1,tag2 -T title http://www.orf.at");
+        //  res.tags is an array of tags
+        //  res.title is the title or "" if no one was given
+        //  res.url is the url as a string
+        //  returns null, if parsing failed
+        parseBookmarkString: function (str)
+        {
+            var res = {};
+            res.tags = [];
+            res.title = null;
+            res.url = null;
+
+            var reTitle = /^\s*((-t|--title)\s+(\w+|\".*\"))(.*)/;
+            var reTags = /^\s*((-T|--tags)\s+((\w+)(,\w+)*))(.*)/;
+            var reUrl = /^\s*(\".+\"|\S+)(.*)/;
+
+            var matchTags = null;
+            var matchTitle = null;
+            var matchUrl = null;
+
+            while (!str.match(/^\s*$/))
+            {
+                // first check for --tags
+                matchTags = str.match(reTags);
+                if (matchTags != null)
+                {
+                    str = matchTags[matchTags.length - 1]; // the last captured parenthesis is the rest of the string
+                    tags = matchTags[3].split(",");
+                    res.tags = res.tags.concat(tags);
+                }
+                else // then for --titles
+                {
+
+                    matchTitle = str.match(reTitle);
+                    if (matchTitle != null)
+                    {
+                        // only one title allowed
+                        if (res.title != null)
                             return null;
 
-                        str = match_url[match_url.length - 1]; // the last captured parenthesis is the rest of the string
-                        url = match_url[1];
-                        if (url.charAt(0) == '"')
-                            url = url.substring(1, url.length - 1);
-                        res.url = url;
+                        str = matchTitle[matchTitle.length - 1]; // the last captured parenthesis is the rest of the string
+                        var title = matchTitle[3];
+                        if (title.charAt(0) == '"')
+                            title = title.substring(1, title.length - 1);
+                        res.title = title;
+                    }
+                    else // at last check for a URL
+                    {
+                        matchUrl = str.match(reUrl);
+                        if (matchUrl != null)
+                        {
+                            // only one url allowed
+                            if (res.url != null)
+                                return null;
+
+                            str = matchUrl[matchUrl.length - 1]; // the last captured parenthesis is the rest of the string
+                            url = matchUrl[1];
+                            if (url.charAt(0) == '"')
+                                url = url.substring(1, url.length - 1);
+                            res.url = url;
+                        }
+                        else
+                            return null; // no url, tag or title found but still text left, abort
                     }
-                    else
-                        return null; // no url, tag or title found but still text left, abort
                 }
             }
+            return res;
         }
-        return res;
-    }
+
+    };
     //}}}
-} //}}}
+}; //}}}
 
 vimperator.History = function () //{{{
 {
@@ -362,15 +367,15 @@ vimperator.History = function () //{{{
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    const rdf_service    = Components.classes["@mozilla.org/rdf/rdf-service;1"].
-                           getService( Components.interfaces.nsIRDFService );
-    const global_history_service = Components.classes["@mozilla.org/browser/global-history;2"].
+    const rdfService    = Components.classes["@mozilla.org/rdf/rdf-service;1"].
+                           getService(Components.interfaces.nsIRDFService);
+    const globalHistoryService = Components.classes["@mozilla.org/browser/global-history;2"].
                            getService(Components.interfaces.nsIRDFDataSource);
 
     var history = null;
 
     if (vimperator.options["preload"])
-        setTimeout(function () { load(); } , 100);
+        setTimeout(function () { load(); }, 100);
 
     function load()
     {
@@ -383,13 +388,13 @@ vimperator.History = function () //{{{
         if (historytree.hidden)
         {
             historytree.hidden = false;
-            historytree.database.AddDataSource(global_history_service);
+            historytree.database.AddDataSource(globalHistoryService);
         }
 
         if (!historytree.ref)
             historytree.ref = "NC:HistoryRoot";
 
-        var nameResource = rdf_service.GetResource(gNC_NS + "Name");
+        var nameResource = rdfService.GetResource(gNC_NS + "Name");
         var builder = historytree.builder.QueryInterface(Components.interfaces.nsIXULTreeBuilder);
 
         var count = historytree.view.rowCount;
@@ -416,108 +421,112 @@ vimperator.History = function () //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    // FIXME: add filtering here rather than having to call
-    // get_bookmark_completions()
-    this.get = function ()
-    {
-        if (!history)
-            load();
+    return {
 
-        return history;
-    }
-
-    this.add = function (url, title)
-    {
-        if (!history)
-            load();
-
-        history = history.filter(function (elem) {
-            return elem[0] != url;
-        });
-
-        history.unshift([url, title]);
-        return true;
-    };
-
-    // TODO: better names?
-    //       and move to vimperator.buffer.?
-    this.stepTo = function (steps)
-    {
-        var index = getWebNavigation().sessionHistory.index + steps;
-
-        if (index >= 0 && index < getWebNavigation().sessionHistory.count)
+        // FIXME: add filtering here rather than having to call
+        // v.completion.history()
+        get: function ()
         {
-            getWebNavigation().gotoIndex(index);
-        }
-        else
+            if (!history)
+                load();
+
+            return history;
+        },
+
+        add: function (url, title)
         {
-            vimperator.beep();
-        }
-    }
+            if (!history)
+                load();
 
-    this.goToStart = function ()
-    {
-        var index = getWebNavigation().sessionHistory.index;
+            history = history.filter(function (elem) {
+                return elem[0] != url;
+            });
 
-        if (index == 0)
+            history.unshift([url, title]);
+            return true;
+        },
+
+        // TODO: better names?
+        //       and move to vimperator.buffer.?
+        stepTo: function (steps)
         {
-            vimperator.beep();
-            return;
-        }
+            var index = getWebNavigation().sessionHistory.index + steps;
 
-        getWebNavigation().gotoIndex(0);
-    }
-
-    this.goToEnd = function ()
-    {
-        var index = getWebNavigation().sessionHistory.index;
-        var max = getWebNavigation().sessionHistory.count - 1;
-
-        if (index == max)
-        {
-            vimperator.beep();
-            return;
-        }
-
-        getWebNavigation().gotoIndex(max);
-    }
-
-    this.list = function (filter, fullmode)
-    {
-        if (fullmode)
-        {
-            vimperator.open("chrome://browser/content/history/history-panel.xul", vimperator.NEW_TAB);
-        }
-        else
-        {
-            var items = vimperator.completion.get_history_completions(filter);
-
-            if (items.length == 0)
+            if (index >= 0 && index < getWebNavigation().sessionHistory.count)
             {
-                if (filter.length > 0)
-                    vimperator.echoerr("E283: No history matching \"" + filter + "\"");
-                else
-                    vimperator.echoerr("No history set");
+                getWebNavigation().gotoIndex(index);
+            }
+            else
+            {
+                vimperator.beep();
+            }
+        },
 
+        goToStart: function ()
+        {
+            var index = getWebNavigation().sessionHistory.index;
+
+            if (index == 0)
+            {
+                vimperator.beep();
                 return;
             }
 
-            var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
-                       "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>URL</th></tr>";
-            for (var i = 0; i < items.length; i++)
+            getWebNavigation().gotoIndex(0);
+        },
+
+        goToEnd: function ()
+        {
+            var index = getWebNavigation().sessionHistory.index;
+            var max = getWebNavigation().sessionHistory.count - 1;
+
+            if (index == max)
             {
-                var title = vimperator.util.escapeHTML(items[i][1]);
-                if (title.length > 50)
-                    title = title.substr(0, 47) + "...";
-                var url = vimperator.util.escapeHTML(items[i][0]);
-                list += "<tr><td>" + title + "</td><td><a href=\"#\" class=\"hl-URL\">" + url + "</a></td></tr>";
+                vimperator.beep();
+                return;
+            }
+
+            getWebNavigation().gotoIndex(max);
+        },
+
+        list: function (filter, fullmode)
+        {
+            if (fullmode)
+            {
+                vimperator.open("chrome://browser/content/history/history-panel.xul", vimperator.NEW_TAB);
+            }
+            else
+            {
+                var items = vimperator.completion.history(filter);
+
+                if (items.length == 0)
+                {
+                    if (filter.length > 0)
+                        vimperator.echoerr("E283: No history matching \"" + filter + "\"");
+                    else
+                        vimperator.echoerr("No history set");
+
+                    return;
+                }
+
+                var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                           "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>URL</th></tr>";
+                for (var i = 0; i < items.length; i++)
+                {
+                    var title = vimperator.util.escapeHTML(items[i][1]);
+                    if (title.length > 50)
+                        title = title.substr(0, 47) + "...";
+                    var url = vimperator.util.escapeHTML(items[i][0]);
+                    list += "<tr><td>" + title + "</td><td><a href=\"#\" class=\"hl-URL\">" + url + "</a></td></tr>";
+                }
+                list += "</table>";
+                vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
             }
-            list += "</table>";
-            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
         }
-    }
+
+    };
     //}}}
-} //}}}
+}; //}}}
 
 vimperator.Marks = function () //{{{
 {
@@ -525,24 +534,24 @@ vimperator.Marks = function () //{{{
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    var local_marks = {};
-    var url_marks = {};
-    var pending_jumps = [];
-    var appcontent = document.getElementById("appcontent");
+    var localMarks = {};
+    var urlMarks = {};
+    var pendingJumps = [];
+    var appContent = document.getElementById("appcontent");
 
-    if (appcontent)
-        appcontent.addEventListener("load", onPageLoad, true);
+    if (appContent)
+        appContent.addEventListener("load", onPageLoad, true);
 
     function onPageLoad(event)
     {
         var win = event.originalTarget.defaultView;
-        for (var i = 0, length = pending_jumps.length; i < length; i++)
+        for (var i = 0, length = pendingJumps.length; i < length; i++)
         {
-            var mark = pending_jumps[i];
+            var mark = pendingJumps[i];
             if (win.location.href == mark.location)
             {
                 win.scrollTo(mark.position.x * win.scrollMaxX, mark.position.y * win.scrollMaxY);
-                pending_jumps.splice(i, 1);
+                pendingJumps.splice(i, 1);
                 return;
             }
         }
@@ -550,17 +559,17 @@ vimperator.Marks = function () //{{{
 
     function removeLocalMark(mark)
     {
-        if (mark in local_marks)
+        if (mark in localMarks)
         {
             var win = window.content;
-            for (var i = 0; i < local_marks[mark].length; i++)
+            for (var i = 0; i < localMarks[mark].length; i++)
             {
-                if (local_marks[mark][i].location == win.location.href)
+                if (localMarks[mark][i].location == win.location.href)
                 {
-                    vimperator.log("Deleting local mark: " + mark + " | " + local_marks[mark][i].location + " | (" + local_marks[mark][i].position.x + ", " + local_marks[mark][i].position.y + ") | tab: " + vimperator.tabs.index(local_marks[mark][i].tab), 5);
-                    local_marks[mark].splice(i, 1);
-                    if (local_marks[mark].length == 0)
-                        delete local_marks[mark];
+                    vimperator.log("Deleting local mark: " + mark + " | " + localMarks[mark][i].location + " | (" + localMarks[mark][i].position.x + ", " + localMarks[mark][i].position.y + ") | tab: " + vimperator.tabs.index(localMarks[mark][i].tab), 5);
+                    localMarks[mark].splice(i, 1);
+                    if (localMarks[mark].length == 0)
+                        delete localMarks[mark];
                     break;
                 }
             }
@@ -569,10 +578,10 @@ vimperator.Marks = function () //{{{
 
     function removeURLMark(mark)
     {
-        if (mark in url_marks)
+        if (mark in urlMarks)
         {
-            vimperator.log("Deleting URL mark: " + mark + " | " + url_marks[mark].location + " | (" + url_marks[mark].position.x + ", " + url_marks[mark].position.y + ") | tab: " + vimperator.tabs.index(url_marks[mark].tab), 5);
-            delete url_marks[mark];
+            vimperator.log("Deleting URL mark: " + mark + " | " + urlMarks[mark].location + " | (" + urlMarks[mark].position.x + ", " + urlMarks[mark].position.y + ") | tab: " + vimperator.tabs.index(urlMarks[mark].tab), 5);
+            delete urlMarks[mark];
         }
     }
 
@@ -591,12 +600,12 @@ vimperator.Marks = function () //{{{
         // local marks
         var lmarks = [];
 
-        for (var mark in local_marks)
+        for (var mark in localMarks)
         {
-            for (var i = 0; i < local_marks[mark].length; i++)
+            for (var i = 0; i < localMarks[mark].length; i++)
             {
-                if (local_marks[mark][i].location == window.content.location.href)
-                    lmarks.push([mark, local_marks[mark][i]]);
+                if (localMarks[mark][i].location == window.content.location.href)
+                    lmarks.push([mark, localMarks[mark][i]]);
             }
         }
         lmarks.sort();
@@ -604,8 +613,8 @@ vimperator.Marks = function () //{{{
         // URL marks
         var umarks = [];
 
-        for (var mark in url_marks)
-            umarks.push([mark, url_marks[mark]]);
+        for (var mark in urlMarks)
+            umarks.push([mark, urlMarks[mark]]);
         // FIXME: why does umarks.sort() cause a "Component is not available =
         // NS_ERROR_NOT_AVAILABLE" exception when used here?
         umarks.sort(function (a, b) {
@@ -624,155 +633,159 @@ vimperator.Marks = function () //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    // TODO: add support for frameset pages
-    this.add = function (mark)
-    {
-        var win = window.content;
+    return {
 
-        if (win.document.body.localName.toLowerCase() == "frameset")
-        {
-            vimperator.echoerr("marks support for frameset pages not implemented yet");
-            return;
-        }
-
-        var x = win.scrollMaxX ? win.pageXOffset / win.scrollMaxX : 0;
-        var y = win.scrollMaxY ? win.pageYOffset / win.scrollMaxY : 0;
-        var position = { x: x, y: y };
-
-        if (isURLMark(mark))
-        {
-            vimperator.log("Adding URL mark: " + mark + " | " + win.location.href + " | (" + position.x + ", " + position.y + ") | tab: " + vimperator.tabs.index(vimperator.tabs.getTab()), 5);
-            url_marks[mark] = { location: win.location.href, position: position, tab: vimperator.tabs.getTab() };
-        }
-        else if (isLocalMark(mark))
-        {
-            // remove any previous mark of the same name for this location
-            removeLocalMark(mark);
-            if (!local_marks[mark])
-                local_marks[mark] = [];
-            vimperator.log("Adding local mark: " + mark + " | " + win.location.href + " | (" + position.x + ", " + position.y + ")", 5);
-            local_marks[mark].push({ location: win.location.href, position: position });
-        }
-    }
-
-    this.remove = function (filter, special)
-    {
-        if (special)
-        {
-            // :delmarks! only deletes a-z marks
-            for (var mark in local_marks)
-                removeLocalMark(mark);
-        }
-        else
-        {
-            var pattern = new RegExp("[" + filter.replace(/\s+/g, "") + "]");
-            for (var mark in url_marks)
-            {
-                if (pattern.test(mark))
-                    removeURLMark(mark);
-            }
-            for (var mark in local_marks)
-            {
-                if (pattern.test(mark))
-                    removeLocalMark(mark);
-            }
-        }
-    }
-
-    this.jumpTo = function (mark)
-    {
-        var ok = false;
-
-        if (isURLMark(mark))
-        {
-            var slice = url_marks[mark];
-            if (slice && slice.tab && slice.tab.linkedBrowser)
-            {
-                if (!slice.tab.parentNode)
-                {
-                    pending_jumps.push(slice);
-                    // NOTE: this obviously won't work on generated pages using
-                    // non-unique URLs, like Vimperator's help :(
-                    vimperator.open(slice.location, vimperator.NEW_TAB);
-                    return;
-                }
-                var index = vimperator.tabs.index(slice.tab);
-                if (index != -1)
-                {
-                    vimperator.tabs.select(index);
-                    var win = slice.tab.linkedBrowser.contentWindow;
-                    if (win.location.href != slice.location)
-                    {
-                        pending_jumps.push(slice);
-                        win.location.href = slice.location;
-                        return;
-                    }
-                    vimperator.log("Jumping to URL mark: " + mark + " | " + slice.location + " | (" + slice.position.x + ", " + slice.position.y + ") | tab: " + vimperator.tabs.index(slice.tab), 5);
-                    win.scrollTo(slice.position.x * win.scrollMaxX, slice.position.y * win.scrollMaxY);
-                    ok = true;
-                }
-            }
-        }
-        else if (isLocalMark(mark))
+        // TODO: add support for frameset pages
+        add: function (mark)
         {
             var win = window.content;
-            var slice = local_marks[mark] || [];
 
-            for (var i = 0; i < slice.length; i++)
+            if (win.document.body.localName.toLowerCase() == "frameset")
             {
-                if (win.location.href == slice[i].location)
-                {
-                    vimperator.log("Jumping to local mark: " + mark + " | " + slice[i].location + " | (" + slice[i].position.x + ", " + slice[i].position.y + ")", 5);
-                    win.scrollTo(slice[i].position.x * win.scrollMaxX, slice[i].position.y * win.scrollMaxY);
-                    ok = true;
-                }
-            }
-        }
-
-        if (!ok)
-            vimperator.echoerr("E20: Mark not set"); // FIXME: move up?
-    }
-
-    this.list = function (filter)
-    {
-        var marks = getSortedMarks();
-
-        if (marks.length == 0)
-        {
-            vimperator.echoerr("No marks set");
-            return;
-        }
-
-        if (filter.length > 0)
-        {
-            marks = marks.filter(function (mark) {
-                    if (filter.indexOf(mark[0]) > -1)
-                        return mark;
-            });
-            if (marks.length == 0)
-            {
-                vimperator.echoerr("E283: No marks matching \"" + filter + "\"");
+                vimperator.echoerr("marks support for frameset pages not implemented yet");
                 return;
             }
-        }
 
-        var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
-                   "<table><tr align=\"left\" class=\"hl-Title\"><th>mark</th><th>line</th><th>col</th><th>file</th></tr>";
-        for (var i = 0; i < marks.length; i++)
+            var x = win.scrollMaxX ? win.pageXOffset / win.scrollMaxX : 0;
+            var y = win.scrollMaxY ? win.pageYOffset / win.scrollMaxY : 0;
+            var position = { x: x, y: y };
+
+            if (isURLMark(mark))
+            {
+                vimperator.log("Adding URL mark: " + mark + " | " + win.location.href + " | (" + position.x + ", " + position.y + ") | tab: " + vimperator.tabs.index(vimperator.tabs.getTab()), 5);
+                urlMarks[mark] = { location: win.location.href, position: position, tab: vimperator.tabs.getTab() };
+            }
+            else if (isLocalMark(mark))
+            {
+                // remove any previous mark of the same name for this location
+                removeLocalMark(mark);
+                if (!localMarks[mark])
+                    localMarks[mark] = [];
+                vimperator.log("Adding local mark: " + mark + " | " + win.location.href + " | (" + position.x + ", " + position.y + ")", 5);
+                localMarks[mark].push({ location: win.location.href, position: position });
+            }
+        },
+
+        remove: function (filter, special)
         {
-            list += "<tr>" +
-                    "<td> "                        + marks[i][0]                              +  "</td>" +
-                    "<td align=\"right\">"         + Math.round(marks[i][1].position.y * 100) + "%</td>" +
-                    "<td align=\"right\">"         + Math.round(marks[i][1].position.x * 100) + "%</td>" +
-                    "<td style=\"color: green;\">" + vimperator.util.escapeHTML(marks[i][1].location) + "</td>" +
-                    "</tr>";
-        }
-        list += "</table>";
+            if (special)
+            {
+                // :delmarks! only deletes a-z marks
+                for (var mark in localMarks)
+                    removeLocalMark(mark);
+            }
+            else
+            {
+                var pattern = new RegExp("[" + filter.replace(/\s+/g, "") + "]");
+                for (var mark in urlMarks)
+                {
+                    if (pattern.test(mark))
+                        removeURLMark(mark);
+                }
+                for (var mark in localMarks)
+                {
+                    if (pattern.test(mark))
+                        removeLocalMark(mark);
+                }
+            }
+        },
 
-        vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
-    }
+        jumpTo: function (mark)
+        {
+            var ok = false;
+
+            if (isURLMark(mark))
+            {
+                var slice = urlMarks[mark];
+                if (slice && slice.tab && slice.tab.linkedBrowser)
+                {
+                    if (!slice.tab.parentNode)
+                    {
+                        pendingJumps.push(slice);
+                        // NOTE: this obviously won't work on generated pages using
+                        // non-unique URLs, like Vimperator's help :(
+                        vimperator.open(slice.location, vimperator.NEW_TAB);
+                        return;
+                    }
+                    var index = vimperator.tabs.index(slice.tab);
+                    if (index != -1)
+                    {
+                        vimperator.tabs.select(index);
+                        var win = slice.tab.linkedBrowser.contentWindow;
+                        if (win.location.href != slice.location)
+                        {
+                            pendingJumps.push(slice);
+                            win.location.href = slice.location;
+                            return;
+                        }
+                        vimperator.log("Jumping to URL mark: " + mark + " | " + slice.location + " | (" + slice.position.x + ", " + slice.position.y + ") | tab: " + vimperator.tabs.index(slice.tab), 5);
+                        win.scrollTo(slice.position.x * win.scrollMaxX, slice.position.y * win.scrollMaxY);
+                        ok = true;
+                    }
+                }
+            }
+            else if (isLocalMark(mark))
+            {
+                var win = window.content;
+                var slice = localMarks[mark] || [];
+
+                for (var i = 0; i < slice.length; i++)
+                {
+                    if (win.location.href == slice[i].location)
+                    {
+                        vimperator.log("Jumping to local mark: " + mark + " | " + slice[i].location + " | (" + slice[i].position.x + ", " + slice[i].position.y + ")", 5);
+                        win.scrollTo(slice[i].position.x * win.scrollMaxX, slice[i].position.y * win.scrollMaxY);
+                        ok = true;
+                    }
+                }
+            }
+
+            if (!ok)
+                vimperator.echoerr("E20: Mark not set"); // FIXME: move up?
+        },
+
+        list: function (filter)
+        {
+            var marks = getSortedMarks();
+
+            if (marks.length == 0)
+            {
+                vimperator.echoerr("No marks set");
+                return;
+            }
+
+            if (filter.length > 0)
+            {
+                marks = marks.filter(function (mark) {
+                        if (filter.indexOf(mark[0]) > -1)
+                            return mark;
+                });
+                if (marks.length == 0)
+                {
+                    vimperator.echoerr("E283: No marks matching \"" + filter + "\"");
+                    return;
+                }
+            }
+
+            var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                       "<table><tr align=\"left\" class=\"hl-Title\"><th>mark</th><th>line</th><th>col</th><th>file</th></tr>";
+            for (var i = 0; i < marks.length; i++)
+            {
+                list += "<tr>" +
+                        "<td> "                        + marks[i][0]                              +  "</td>" +
+                        "<td align=\"right\">"         + Math.round(marks[i][1].position.y * 100) + "%</td>" +
+                        "<td align=\"right\">"         + Math.round(marks[i][1].position.x * 100) + "%</td>" +
+                        "<td style=\"color: green;\">" + vimperator.util.escapeHTML(marks[i][1].location) + "</td>" +
+                        "</tr>";
+            }
+            list += "</table>";
+
+            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
+        }
+
+    };
     //}}}
-} //}}}
+}; //}}}
 
 vimperator.QuickMarks = function () //{{{
 {
@@ -781,103 +794,107 @@ vimperator.QuickMarks = function () //{{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     var qmarks = {};
-    var saved_marks = vimperator.options.getPref("quickmarks", "").split("\n");
+    var savedMarks = vimperator.options.getPref("quickmarks", "").split("\n");
 
     // load the saved quickmarks -- TODO: change to sqlite
-    for (var i = 0; i < saved_marks.length - 1; i += 2)
+    for (var i = 0; i < savedMarks.length - 1; i += 2)
     {
-        qmarks[saved_marks[i]] = saved_marks[i + 1];
+        qmarks[savedMarks[i]] = savedMarks[i + 1];
     }
 
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    this.add = function (qmark, location)
-    {
-        qmarks[qmark] = location;
-    }
+    return {
 
-    this.remove = function (filter)
-    {
-        var pattern = new RegExp("[" + filter.replace(/\s+/g, "") + "]");
-
-        for (var qmark in qmarks)
+        add: function (qmark, location)
         {
-            if (pattern.test(qmark))
-                delete qmarks[qmark];
-        }
-    }
+            qmarks[qmark] = location;
+        },
 
-    this.removeAll = function ()
-    {
-        qmarks = {};
-    }
-
-    this.jumpTo = function (qmark, where)
-    {
-        var url = qmarks[qmark];
-
-        if (url)
-            vimperator.open(url, where);
-        else
-            vimperator.echoerr("E20: QuickMark not set");
-    }
-
-    this.list = function (filter)
-    {
-        var marks = [];
-
-        // TODO: should we sort these in a-zA-Z0-9 order?
-        for (var mark in qmarks)
-            marks.push([mark, qmarks[mark]]);
-        marks.sort();
-
-        if (marks.length == 0)
+        remove: function (filter)
         {
-            vimperator.echoerr("No QuickMarks set");
-            return;
-        }
+            var pattern = new RegExp("[" + filter.replace(/\s+/g, "") + "]");
 
-        if (filter.length > 0)
+            for (var qmark in qmarks)
+            {
+                if (pattern.test(qmark))
+                    delete qmarks[qmark];
+            }
+        },
+
+        removeAll: function ()
         {
-            marks = marks.filter(function (mark) {
-                    if (filter.indexOf(mark[0]) > -1)
-                        return mark;
-            });
+            qmarks = {};
+        },
+
+        jumpTo: function (qmark, where)
+        {
+            var url = qmarks[qmark];
+
+            if (url)
+                vimperator.open(url, where);
+            else
+                vimperator.echoerr("E20: QuickMark not set");
+        },
+
+        list: function (filter)
+        {
+            var marks = [];
+
+            // TODO: should we sort these in a-zA-Z0-9 order?
+            for (var mark in qmarks)
+                marks.push([mark, qmarks[mark]]);
+            marks.sort();
+
             if (marks.length == 0)
             {
-                vimperator.echoerr("E283: No QuickMarks matching \"" + filter + "\"");
+                vimperator.echoerr("No QuickMarks set");
                 return;
             }
-        }
 
-        var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
-                   "<table><tr align=\"left\" class=\"hl-Title\"><th>QuickMark</th><th>URL</th></tr>";
-        for (var i = 0; i < marks.length; i++)
+            if (filter.length > 0)
+            {
+                marks = marks.filter(function (mark) {
+                        if (filter.indexOf(mark[0]) > -1)
+                            return mark;
+                });
+                if (marks.length == 0)
+                {
+                    vimperator.echoerr("E283: No QuickMarks matching \"" + filter + "\"");
+                    return;
+                }
+            }
+
+            var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                       "<table><tr align=\"left\" class=\"hl-Title\"><th>QuickMark</th><th>URL</th></tr>";
+            for (var i = 0; i < marks.length; i++)
+            {
+                list += "<tr><td>    " + marks[i][0] +
+                        "</td><td style=\"color: green;\">" + vimperator.util.escapeHTML(marks[i][1]) + "</td></tr>";
+            }
+            list += "</table>";
+
+            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
+        },
+
+        destroy: function ()
         {
-            list += "<tr><td>    " + marks[i][0] +
-                    "</td><td style=\"color: green;\">" + vimperator.util.escapeHTML(marks[i][1]) + "</td></tr>";
-        }
-        list += "</table>";
+            // save the quickmarks
+            var savedQuickMarks = "";
 
-        vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
-    }
+            for (var i in qmarks)
+            {
+                savedQuickMarks += i + "\n";
+                savedQuickMarks += qmarks[i] + "\n";
+            }
 
-    this.destroy = function ()
-    {
-        // save the quickmarks
-        var saved_qmarks = "";
-
-        for (var i in qmarks)
-        {
-            saved_qmarks += i + "\n";
-            saved_qmarks += qmarks[i] + "\n";
+            vimperator.options.setPref("quickmarks", savedQuickMarks);
         }
 
-        vimperator.options.setPref("quickmarks", saved_qmarks);
-    }
+    };
     //}}}
-} //}}}
+}; //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/buffers.js b/content/buffers.js
index 44caa372..165649cb 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -31,24 +31,25 @@ vimperator.Buffer = function () //{{{
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
+
     // used for the "B" mapping to remember the last :buffer[!] command
     var lastBufferSwitchArgs = "";
     var lastBufferSwitchSpecial = true;
 
-    var zoom_manager = ZoomManager.prototype.getInstance();
+    var zoomManager = ZoomManager.prototype.getInstance();
     const ZOOM_INTERVAL = 25;
 
     // initialize the zoom levels
-    zoom_manager.zoomFactors = [zoom_manager.MIN];
-    for (var i = ZOOM_INTERVAL; i <= zoom_manager.MAX; i += ZOOM_INTERVAL)
-        zoom_manager.zoomFactors.push(i);
+    zoomManager.zoomFactors = [zoomManager.MIN];
+    for (var i = ZOOM_INTERVAL; i <= zoomManager.MAX; i += ZOOM_INTERVAL)
+        zoomManager.zoomFactors.push(i);
 
     function setZoom(value)
     {
         try
         {
-            zoom_manager.textZoom = value;
-            vimperator.echo("Text zoom: " + zoom_manager.textZoom + "%");
+            zoomManager.textZoom = value;
+            vimperator.echo("Text zoom: " + zoomManager.textZoom + "%");
             // TODO: shouldn't this just recalculate hint coords, rather than
             // unsuccessfully attempt to reshow hints?  i.e. isn't it just relying
             // on the recalculation side effect? -- djk
@@ -57,7 +58,7 @@ vimperator.Buffer = function () //{{{
         }
         catch (e) // Components.results.NS_ERROR_INVALID_ARG
         {
-            vimperator.echoerr("Zoom value out of range (" + zoom_manager.MIN + "-" + zoom_manager.MAX + ")");
+            vimperator.echoerr("Zoom value out of range (" + zoomManager.MIN + "-" + zoomManager.MAX + ")");
         }
     }
 
@@ -66,11 +67,11 @@ vimperator.Buffer = function () //{{{
     // get this added to ZoomManager
     function bumpZoomLevel(steps)
     {
-        var adjusted_zoom = zoom_manager.snap(zoom_manager.textZoom);
-        var current = zoom_manager.indexOf(adjusted_zoom);
+        var adjustedZoom = zoomManager.snap(zoomManager.textZoom);
+        var current = zoomManager.indexOf(adjustedZoom);
         var next = current + steps;
 
-        var start = 0, end = zoom_manager.zoomFactors.length - 1;
+        var start = 0, end = zoomManager.zoomFactors.length - 1;
 
         if ((current == start && steps < 0) || (current == end && steps > 0))
         {
@@ -83,7 +84,7 @@ vimperator.Buffer = function () //{{{
         else if (next > end)
             next = end;
 
-        setZoom(zoom_manager.zoomFactors[next]);
+        setZoom(zoomManager.zoomFactors[next]);
     }
 
     function checkScrollYBounds(win, direction)
@@ -116,581 +117,587 @@ vimperator.Buffer = function () //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    this.__defineGetter__("URL", function ()
-    {
-        // TODO: .URL is not defined for XUL documents
-        //return window.content.document.URL;
-        return window.content.document.location.href;
-    });
+    return {
 
-    this.__defineGetter__("pageHeight", function ()
-    {
-        return window.content.innerHeight;
-    });
-
-    this.__defineGetter__("textZoom", function ()
-    {
-        return zoom_manager.textZoom;
-    });
-
-    this.__defineSetter__("textZoom", function (value)
-    {
-        setZoom(value);
-    });
-
-    this.__defineGetter__("title", function ()
-    {
-        return window.content.document.title;
-    });
-
-    // returns an XPathResult object
-    this.evaluateXPath = function (expression, doc, elem, ordered)
-    {
-        if (!doc)
-            doc = window.content.document;
-        if (!elem)
-            elem = doc;
-
-        var result = doc.evaluate(expression, elem,
-            function lookupNamespaceURI(prefix) {
-              switch (prefix) {
-                case "xhtml":
-                  return "http://www.w3.org/1999/xhtml";
-                default:
-                  return null;
-              }
-            },
-            ordered ? XPathResult.ORDERED_NODE_SNAPSHOT_TYPE : XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE,
-            null
-        );
-
-        return result;
-    };
-
-    this.list = function (fullmode)
-    {
-        if (fullmode)
+        get URL()
         {
-            // toggle the special buffer previw window
-            if (vimperator.bufferwindow.visible())
-            {
-                vimperator.bufferwindow.hide();
-            }
-            else
-            {
-                var items = vimperator.completion.get_buffer_completions("");
-                vimperator.bufferwindow.show(items);
-                vimperator.bufferwindow.selectItem(getBrowser().mTabContainer.selectedIndex);
-            }
-        }
-        else
+            // TODO: .URL is not defined for XUL documents
+            //return window.content.document.URL;
+            return window.content.document.location.href;
+        },
+
+        get pageHeight()
         {
-            // TODO: move this to vimperator.buffers.get()
-            var items = vimperator.completion.get_buffer_completions("");
-            var number, indicator, title, url;
+            return window.content.innerHeight;
+        },
 
-            var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" + "<table>";
-            for (var i = 0; i < items.length; i++)
-            {
-                if (i == vimperator.tabs.index())
-                   indicator = " <span style=\"color: blue\">%</span> ";
-                else if (i == vimperator.tabs.index(vimperator.tabs.alternate))
-                   indicator = " <span style=\"color: blue\">#</span> ";
-                else
-                   indicator = "   ";
-
-                [number, title] = items[i][0].split(/:\s+/, 2);
-                url = items[i][1];
-                url = vimperator.util.escapeHTML(url);
-                title = vimperator.util.escapeHTML(title);
-
-                list += "<tr><td align=\"right\">  " + number + "</td><td>" + indicator +
-                        "</td><td style=\"width: 250px; max-width: 500px; overflow: hidden;\">" + title +
-                        "</td><td><a href=\"#\" class=\"hl-URL buffer-list\">" + url + "</a></td></tr>";
-            }
-            list += "</table>";
-
-            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
-        }
-    };
-
-    this.scrollBottom = function ()
-    {
-        scrollToPercentiles(-1, 100);
-    };
-
-    this.scrollColumns = function (cols)
-    {
-        var win = window.document.commandDispatcher.focusedWindow;
-        const COL_WIDTH = 20;
-
-        if (cols > 0 && win.scrollX >= win.scrollMaxX || cols < 0 && win.scrollX == 0)
-            vimperator.beep();
-
-        win.scrollBy(COL_WIDTH * cols, 0);
-    };
-
-    this.scrollEnd = function ()
-    {
-        scrollToPercentiles(100, -1);
-    };
-
-    this.scrollLines = function (lines)
-    {
-        var win = window.document.commandDispatcher.focusedWindow;
-        checkScrollYBounds(win, lines);
-        win.scrollByLines(lines);
-    };
-
-    this.scrollPages = function (pages)
-    {
-        var win = window.document.commandDispatcher.focusedWindow;
-        checkScrollYBounds(win, pages);
-        win.scrollByPages(pages);
-    };
-
-    this.scrollToPercentile = function (percentage)
-    {
-        scrollToPercentiles(-1, percentage);
-    };
-
-    this.scrollStart = function ()
-    {
-        scrollToPercentiles(0, -1);
-    };
-
-    this.scrollTop = function ()
-    {
-        scrollToPercentiles(-1, 0);
-    };
-
-    // TODO: allow callback for filtering out unwanted frames? User defined?
-    this.shiftFrameFocus = function (count, forward)
-    {
-        if (!window.content.document instanceof HTMLDocument)
-            return;
-
-        var frames = [];
-
-        // find all frames - depth-first search
-        (function (frame)
+        get textZoom()
         {
-            if (frame.document.body.localName.toLowerCase() == "body")
-                frames.push(frame);
-            for (var i = 0; i < frame.frames.length; i++)
-                arguments.callee(frame.frames[i])
-        })(window.content);
+            return zoomManager.textZoom;
+        },
 
-        if (frames.length == 0) // currently top is always included
-            return;
-
-        // remove all unfocusable frames
-        // TODO: find a better way to do this - walking the tree is too slow
-        var start = document.commandDispatcher.focusedWindow;
-        frames = frames.filter(function (frame) {
-                frame.focus();
-                if (document.commandDispatcher.focusedWindow == frame)
-                    return frame;
-        });
-        start.focus();
-
-        // find the currently focused frame index
-        // TODO: If the window is a frameset then the first _frame_ should be
-        //       focused.  Since this is not the current FF behaviour,
-        //       we initalize current to -1 so the first call takes us to the
-        //       first frame.
-        var current = -1;
-        for (var i = 0; i < frames.length; i++)
+        get textZoom(value)
         {
-            if (frames[i] == document.commandDispatcher.focusedWindow)
-            {
-                var current = i;
-                break;
-            }
-        }
+            setZoom(value);
+        },
 
-        // calculate the next frame to focus
-        var next = current;
-        if (forward)
+        get title()
         {
-            if (count > 1)
-                next = current + count;
-            else
-                next++;
+            return window.content.document.title;
+        },
 
-            if (next > frames.length - 1)
-            {
-                if (current == frames.length - 1)
-                    vimperator.beep(); // still allow the frame indicator to be activated
-
-                next = frames.length - 1;
-            }
-        }
-        else
+        // returns an XPathResult object
+        evaluateXPath: function (expression, doc, elem, ordered)
         {
-            if (count > 1)
-                next = current - count;
-            else
-                next--;
+            if (!doc)
+                doc = window.content.document;
+            if (!elem)
+                elem = doc;
 
-            if (next < 0)
-            {
-                if (current == 0)
-                    vimperator.beep(); // still allow the frame indicator to be activated
-
-                next = 0;
-            }
-        }
-
-        // focus next frame and scroll into view
-        frames[next].focus();
-        if (frames[next] != window.content)
-            frames[next].frameElement.scrollIntoView(false);
-
-        // add the frame indicator
-        // TODO: make this an XBL element rather than messing with the content
-        // document
-        var doc = frames[next].document;
-        var indicator = doc.createElement("div");
-        indicator.id = "vimperator-frame-indicator";
-        // NOTE: need to set a high z-index - it's a crapshoot!
-        var style = "background-color: red; opacity: 0.5; z-index: 999;" +
-                    "position: fixed; top: 0; bottom: 0; left: 0; right: 0;";
-        indicator.setAttribute("style", style);
-        doc.body.appendChild(indicator);
-
-        // remove the frame indicator
-        setTimeout(function () { doc.body.removeChild(indicator); }, 500);
-    };
-
-    // updates the buffer preview in place only if list is visible
-    this.updateBufferList = function ()
-    {
-        if (!vimperator.bufferwindow.visible())
-            return false;
-
-        var items = vimperator.completion.get_buffer_completions("");
-        vimperator.bufferwindow.show(items);
-        vimperator.bufferwindow.selectItem(getBrowser().mTabContainer.selectedIndex);
-    };
-
-    // XXX: should this be in v.buffers. or v.tabs.?
-    // "buffer" is a string which matches the URL or title of a buffer, if it
-    // is null, the last used string is used again
-    this.switchTo = function (buffer, allowNonUnique, count, reverse)
-    {
-        if (buffer != null)
-        {
-            // store this command, so it can be repeated with "B"
-            lastBufferSwitchArgs = buffer;
-            lastBufferSwitchSpecial = allowNonUnique;
-        }
-        else
-        {
-            buffer = lastBufferSwitchArgs;
-            if (typeof allowNonUnique == "undefined" || allowNonUnique == null)
-                allowNonUnique = lastBufferSwitchSpecial;
-        }
-
-        if (!count || count < 1)
-            count = 1;
-        if (typeof reverse != "boolean")
-            reverse = false;
-
-        var match;
-        if (match = buffer.match(/^(\d+):?/))
-            return vimperator.tabs.select(parseInt(match[1], 10) - 1, false); // make it zero-based
-
-        var matches = [];
-        var lower_buffer = buffer.toLowerCase();
-        var first = vimperator.tabs.index() + (reverse ? 0 : 1);
-        for (var i = 0; i < getBrowser().browsers.length; i++)
-        {
-            var index = (i + first) % getBrowser().browsers.length;
-            var url = getBrowser().getBrowserAtIndex(index).contentDocument.location.href;
-            var title = getBrowser().getBrowserAtIndex(index).contentDocument.title.toLowerCase();
-            if (url == buffer)
-                return vimperator.tabs.select(index, false);
-
-            if (url.indexOf(buffer) >= 0 || title.indexOf(lower_buffer) >= 0)
-                matches.push(index);
-        }
-        if (matches.length == 0)
-            vimperator.echoerr("E94: No matching buffer for " + buffer);
-        else if (matches.length > 1 && !allowNonUnique)
-            vimperator.echoerr("E93: More than one match for " + buffer);
-        else
-        {
-            if (reverse)
-            {
-                index = matches.length - count;
-                while (index < 0)
-                    index += matches.length;
-            }
-            else
-                index = (count - 1) % matches.length;
-
-            vimperator.tabs.select(matches[index], false);
-        }
-    };
-
-    this.zoomIn = function (steps)
-    {
-        bumpZoomLevel(steps);
-    };
-
-    this.zoomOut = function (steps)
-    {
-        bumpZoomLevel(-steps);
-    };
-
-    this.pageInfo = function (verbose)
-    {
-        const feedTypes = {
-            "application/rss+xml": "RSS",
-            "application/atom+xml": "Atom",
-            "text/xml": "XML",
-            "application/xml": "XML",
-            "application/rdf+xml": "XML"
-        };
-
-        function isValidFeed(aData, aPrincipal, aIsFeed)
-        {
-            if (!aData || !aPrincipal)
-                return false;
-
-            if (!aIsFeed)
-            {
-                var type = aData.type && aData.type.toLowerCase();
-                type = type.replace(/^\s+|\s*(?:;.*)?$/g, "");
-
-                aIsFeed = (type == "application/rss+xml" || type == "application/atom+xml");
-                if (!aIsFeed)
+            var result = doc.evaluate(expression, elem,
+                function lookupNamespaceURI(prefix)
                 {
-                    // really slimy: general XML types with magic letters in the title
-                    const titleRegex = /(^|\s)rss($|\s)/i;
-                    aIsFeed = ((type == "text/xml" || type == "application/rdf+xml" ||
-                                type == "application/xml") && titleRegex.test(aData.title));
+                  switch (prefix)
+                  {
+                    case "xhtml":
+                      return "http://www.w3.org/1999/xhtml";
+                    default:
+                      return null;
+                  }
+                },
+                ordered ? XPathResult.ORDERED_NODE_SNAPSHOT_TYPE : XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE,
+                null
+            );
+
+            return result;
+        },
+
+        list: function (fullmode)
+        {
+            if (fullmode)
+            {
+                // toggle the special buffer previw window
+                if (vimperator.bufferwindow.visible())
+                {
+                    vimperator.bufferwindow.hide();
+                }
+                else
+                {
+                    var items = vimperator.completion.buffer("");
+                    vimperator.bufferwindow.show(items);
+                    vimperator.bufferwindow.selectItem(getBrowser().mTabContainer.selectedIndex);
+                }
+            }
+            else
+            {
+                // TODO: move this to vimperator.buffers.get()
+                var items = vimperator.completion.buffer("");
+                var number, indicator, title, url;
+
+                var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" + "<table>";
+                for (var i = 0; i < items.length; i++)
+                {
+                    if (i == vimperator.tabs.index())
+                       indicator = " <span style=\"color: blue\">%</span> ";
+                    else if (i == vimperator.tabs.index(vimperator.tabs.alternate))
+                       indicator = " <span style=\"color: blue\">#</span> ";
+                    else
+                       indicator = "   ";
+
+                    [number, title] = items[i][0].split(/:\s+/, 2);
+                    url = items[i][1];
+                    url = vimperator.util.escapeHTML(url);
+                    title = vimperator.util.escapeHTML(title);
+
+                    list += "<tr><td align=\"right\">  " + number + "</td><td>" + indicator +
+                            "</td><td style=\"width: 250px; max-width: 500px; overflow: hidden;\">" + title +
+                            "</td><td><a href=\"#\" class=\"hl-URL buffer-list\">" + url + "</a></td></tr>";
+                }
+                list += "</table>";
+
+                vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
+            }
+        },
+
+        scrollBottom: function ()
+        {
+            scrollToPercentiles(-1, 100);
+        },
+
+        scrollColumns: function (cols)
+        {
+            var win = window.document.commandDispatcher.focusedWindow;
+            const COL_WIDTH = 20;
+
+            if (cols > 0 && win.scrollX >= win.scrollMaxX || cols < 0 && win.scrollX == 0)
+                vimperator.beep();
+
+            win.scrollBy(COL_WIDTH * cols, 0);
+        },
+
+        scrollEnd: function ()
+        {
+            scrollToPercentiles(100, -1);
+        },
+
+        scrollLines: function (lines)
+        {
+            var win = window.document.commandDispatcher.focusedWindow;
+            checkScrollYBounds(win, lines);
+            win.scrollByLines(lines);
+        },
+
+        scrollPages: function (pages)
+        {
+            var win = window.document.commandDispatcher.focusedWindow;
+            checkScrollYBounds(win, pages);
+            win.scrollByPages(pages);
+        },
+
+        scrollToPercentile: function (percentage)
+        {
+            scrollToPercentiles(-1, percentage);
+        },
+
+        scrollStart: function ()
+        {
+            scrollToPercentiles(0, -1);
+        },
+
+        scrollTop: function ()
+        {
+            scrollToPercentiles(-1, 0);
+        },
+
+        // TODO: allow callback for filtering out unwanted frames? User defined?
+        shiftFrameFocus: function (count, forward)
+        {
+            if (!window.content.document instanceof HTMLDocument)
+                return;
+
+            var frames = [];
+
+            // find all frames - depth-first search
+            (function (frame)
+            {
+                if (frame.document.body.localName.toLowerCase() == "body")
+                    frames.push(frame);
+                for (var i = 0; i < frame.frames.length; i++)
+                    arguments.callee(frame.frames[i]);
+            })(window.content);
+
+            if (frames.length == 0) // currently top is always included
+                return;
+
+            // remove all unfocusable frames
+            // TODO: find a better way to do this - walking the tree is too slow
+            var start = document.commandDispatcher.focusedWindow;
+            frames = frames.filter(function (frame) {
+                    frame.focus();
+                    if (document.commandDispatcher.focusedWindow == frame)
+                        return frame;
+            });
+            start.focus();
+
+            // find the currently focused frame index
+            // TODO: If the window is a frameset then the first _frame_ should be
+            //       focused.  Since this is not the current FF behaviour,
+            //       we initalize current to -1 so the first call takes us to the
+            //       first frame.
+            var current = -1;
+            for (var i = 0; i < frames.length; i++)
+            {
+                if (frames[i] == document.commandDispatcher.focusedWindow)
+                {
+                    var current = i;
+                    break;
                 }
             }
 
-            if (aIsFeed)
+            // calculate the next frame to focus
+            var next = current;
+            if (forward)
+            {
+                if (count > 1)
+                    next = current + count;
+                else
+                    next++;
+
+                if (next > frames.length - 1)
+                {
+                    if (current == frames.length - 1)
+                        vimperator.beep(); // still allow the frame indicator to be activated
+
+                    next = frames.length - 1;
+                }
+            }
+            else
+            {
+                if (count > 1)
+                    next = current - count;
+                else
+                    next--;
+
+                if (next < 0)
+                {
+                    if (current == 0)
+                        vimperator.beep(); // still allow the frame indicator to be activated
+
+                    next = 0;
+                }
+            }
+
+            // focus next frame and scroll into view
+            frames[next].focus();
+            if (frames[next] != window.content)
+                frames[next].frameElement.scrollIntoView(false);
+
+            // add the frame indicator
+            // TODO: make this an XBL element rather than messing with the content
+            // document
+            var doc = frames[next].document;
+            var indicator = doc.createElement("div");
+            indicator.id = "vimperator-frame-indicator";
+            // NOTE: need to set a high z-index - it's a crapshoot!
+            var style = "background-color: red; opacity: 0.5; z-index: 999;" +
+                        "position: fixed; top: 0; bottom: 0; left: 0; right: 0;";
+            indicator.setAttribute("style", style);
+            doc.body.appendChild(indicator);
+
+            // remove the frame indicator
+            setTimeout(function () { doc.body.removeChild(indicator); }, 500);
+        },
+
+        // updates the buffer preview in place only if list is visible
+        updateBufferList: function ()
+        {
+            if (!vimperator.bufferwindow.visible())
+                return false;
+
+            var items = vimperator.completion.buffer("");
+            vimperator.bufferwindow.show(items);
+            vimperator.bufferwindow.selectItem(getBrowser().mTabContainer.selectedIndex);
+        },
+
+        // XXX: should this be in v.buffers. or v.tabs.?
+        // "buffer" is a string which matches the URL or title of a buffer, if it
+        // is null, the last used string is used again
+        switchTo: function (buffer, allowNonUnique, count, reverse)
+        {
+            if (buffer != null)
+            {
+                // store this command, so it can be repeated with "B"
+                lastBufferSwitchArgs = buffer;
+                lastBufferSwitchSpecial = allowNonUnique;
+            }
+            else
+            {
+                buffer = lastBufferSwitchArgs;
+                if (typeof allowNonUnique == "undefined" || allowNonUnique == null)
+                    allowNonUnique = lastBufferSwitchSpecial;
+            }
+
+            if (!count || count < 1)
+                count = 1;
+            if (typeof reverse != "boolean")
+                reverse = false;
+
+            var match;
+            if (match = buffer.match(/^(\d+):?/))
+                return vimperator.tabs.select(parseInt(match[1], 10) - 1, false); // make it zero-based
+
+            var matches = [];
+            var lowerBuffer = buffer.toLowerCase();
+            var first = vimperator.tabs.index() + (reverse ? 0 : 1);
+            for (var i = 0; i < getBrowser().browsers.length; i++)
+            {
+                var index = (i + first) % getBrowser().browsers.length;
+                var url = getBrowser().getBrowserAtIndex(index).contentDocument.location.href;
+                var title = getBrowser().getBrowserAtIndex(index).contentDocument.title.toLowerCase();
+                if (url == buffer)
+                    return vimperator.tabs.select(index, false);
+
+                if (url.indexOf(buffer) >= 0 || title.indexOf(lowerBuffer) >= 0)
+                    matches.push(index);
+            }
+            if (matches.length == 0)
+                vimperator.echoerr("E94: No matching buffer for " + buffer);
+            else if (matches.length > 1 && !allowNonUnique)
+                vimperator.echoerr("E93: More than one match for " + buffer);
+            else
+            {
+                if (reverse)
+                {
+                    index = matches.length - count;
+                    while (index < 0)
+                        index += matches.length;
+                }
+                else
+                    index = (count - 1) % matches.length;
+
+                vimperator.tabs.select(matches[index], false);
+            }
+        },
+
+        zoomIn: function (steps)
+        {
+            bumpZoomLevel(steps);
+        },
+
+        zoomOut: function (steps)
+        {
+            bumpZoomLevel(-steps);
+        },
+
+        pageInfo: function (verbose)
+        {
+            const feedTypes = {
+                "application/rss+xml": "RSS",
+                "application/atom+xml": "Atom",
+                "text/xml": "XML",
+                "application/xml": "XML",
+                "application/rdf+xml": "XML"
+            };
+
+            function isValidFeed(aData, aPrincipal, aIsFeed)
+            {
+                if (!aData || !aPrincipal)
+                    return false;
+
+                if (!aIsFeed)
+                {
+                    var type = aData.type && aData.type.toLowerCase();
+                    type = type.replace(/^\s+|\s*(?:;.*)?$/g, "");
+
+                    aIsFeed = (type == "application/rss+xml" || type == "application/atom+xml");
+                    if (!aIsFeed)
+                    {
+                        // really slimy: general XML types with magic letters in the title
+                        const titleRegex = /(^|\s)rss($|\s)/i;
+                        aIsFeed = ((type == "text/xml" || type == "application/rdf+xml" ||
+                                    type == "application/xml") && titleRegex.test(aData.title));
+                    }
+                }
+
+                if (aIsFeed)
+                {
+                    try
+                    {
+                        urlSecurityCheck(aData.href, aPrincipal,
+                                Components.interfaces.nsIScriptSecurityManager.DISALLOW_INHERIT_PRINCIPAL);
+                    }
+                    catch (ex)
+                    {
+                        aIsFeed = false;
+                    }
+                }
+
+                if (type)
+                    aData.type = type;
+
+                return aIsFeed;
+            }
+
+            // TODO: could this be useful for other commands?
+            function createTable(data)
+            {
+                var ret = "<table><tr><th class='hl-Title' style='font-weight: bold;' align='left' colspan='2'>" +
+                          data[data.length - 1][0] + "</th></tr>";
+
+                if (data.length - 1)
+                {
+                    for (var i = 0; i < data.length - 1 ; i++)
+                        ret += "<tr><td style='font-weight: bold; min-width: 150px'>  " + data[i][0] + ": </td><td>" + data[i][1] + "</td></tr>";
+                }
+                else
+                {
+                    ret += "<tr><td colspan='2'>  (" + data[data.length - 1][1] + ")</td></tr>";
+                }
+
+                return ret + "</table>";
+            }
+
+            var pageGeneral = [];
+            var pageFeeds = [];
+            var pageMeta = [];
+
+            // get file size
+            const nsICacheService = Components.interfaces.nsICacheService;
+            const ACCESS_READ = Components.interfaces.nsICache.ACCESS_READ;
+            const cacheService = Components.classes["@mozilla.org/network/cache-service;1"].getService(nsICacheService);
+            var httpCacheSession = cacheService.createSession("HTTP", 0, true);
+            var ftpCacheSession = cacheService.createSession("FTP", 0, true);
+            httpCacheSession.doomEntriesIfExpired = false;
+            ftpCacheSession.doomEntriesIfExpired = false;
+            var cacheKey = window.content.document.location.toString().replace(/#.*$/, "");
+            try
+            {
+                var cacheEntryDescriptor = httpCacheSession.openCacheEntry(cacheKey, ACCESS_READ, false);
+            }
+            catch (ex)
             {
                 try
                 {
-                    urlSecurityCheck(aData.href, aPrincipal,
-                            Components.interfaces.nsIScriptSecurityManager.DISALLOW_INHERIT_PRINCIPAL);
-                }
-                catch (ex)
-                {
-                    aIsFeed = false;
+                    cacheEntryDescriptor = ftpCacheSession.openCacheEntry(cacheKey, ACCESS_READ, false);
                 }
+                catch (ex2) { }
             }
 
-            if (type)
-                aData.type = type;
-
-            return aIsFeed;
-        }
-
-        // TODO: could this be useful for other commands?
-        function createTable(data)
-        {
-            var ret = "<table><tr><th class='hl-Title' style='font-weight: bold;' align='left' colspan='2'>" +
-                      data[data.length - 1][0] + "</th></tr>";
-
-            if (data.length - 1)
+            var pageSize = []; // [0] bytes; [1] kbytes
+            if (cacheEntryDescriptor)
             {
-                for (var i = 0; i < data.length - 1 ; i++)
-                    ret += "<tr><td style='font-weight: bold; min-width: 150px'>  " + data[i][0] + ": </td><td>" + data[i][1] + "</td></tr>";
-            }
-            else
-            {
-                ret += "<tr><td colspan='2'>  (" + data[data.length - 1][1] + ")</td></tr>";
+                pageSize[0] = vimperator.util.formatBytes(cacheEntryDescriptor.dataSize, 0, false);
+                pageSize[1] = vimperator.util.formatBytes(cacheEntryDescriptor.dataSize, 2, true);
+                if (pageSize[1] == pageSize[0])
+                    pageSize[1] = null; // don't output "xx Bytes" twice
             }
 
-            return ret + "</table>";
-        }
-
-        var pageGeneral = [];
-        var pageFeeds = [];
-        var pageMeta = [];
-
-        // get file size
-        const nsICacheService = Components.interfaces.nsICacheService;
-        const ACCESS_READ = Components.interfaces.nsICache.ACCESS_READ;
-        const cacheService = Components.classes["@mozilla.org/network/cache-service;1"].getService(nsICacheService);
-        var httpCacheSession = cacheService.createSession("HTTP", 0, true);
-        var ftpCacheSession = cacheService.createSession("FTP", 0, true);
-        httpCacheSession.doomEntriesIfExpired = false;
-        ftpCacheSession.doomEntriesIfExpired = false;
-        var cacheKey = window.content.document.location.toString().replace(/#.*$/, "");
-        try
-        {
-            var cacheEntryDescriptor = httpCacheSession.openCacheEntry(cacheKey, ACCESS_READ, false);
-        }
-        catch (ex)
-        {
-            try
-            {
-                cacheEntryDescriptor = ftpCacheSession.openCacheEntry(cacheKey, ACCESS_READ, false);
-            }
-            catch (ex2) { }
-        }
-
-        var pageSize = []; // [0] bytes; [1] kbytes
-        if (cacheEntryDescriptor)
-        {
-            pageSize[0] = vimperator.util.formatBytes(cacheEntryDescriptor.dataSize, 0, false);
-            pageSize[1] = vimperator.util.formatBytes(cacheEntryDescriptor.dataSize, 2, true);
-            if (pageSize[1] == pageSize[0])
-                pageSize[1] = null; // don't output "xx Bytes" twice
-        }
-
-        // put feeds rss into pageFeeds[]
-        var linkNodes = window.content.document.getElementsByTagName("link");
-        var length = linkNodes.length;
-        for (var i = 0; i < length; i++)
-        {
-            var link = linkNodes[i];
-            if (!link.href)
-                continue;
-
-            var rel = link.rel && link.rel.toLowerCase();
-            var rels = {};
-            if (rel)
-            {
-                for each (let relVal in rel.split(/\s+/))
-                    rels[relVal] = true;
-            }
-
-            if (rels.feed || (link.type && rels.alternate && !rels.stylesheet))
-            {
-                var feed = { title: link.title, href: link.href, type: link.type || "" };
-                if (isValidFeed(feed, window.content.document.nodePrincipal, rels.feed))
-                {
-                    var type = feedTypes[feed.type] || feedTypes["application/rss+xml"];
-                    pageFeeds.push([feed.title, vimperator.util.highlightURL(feed.href, true) + "  (" + type + ")"]);
-                }
-            }
-        }
-
-        var lastModVerbose = new Date(window.content.document.lastModified).toLocaleString();
-        var lastMod = new Date(window.content.document.lastModified).toLocaleFormat("%x %X");
-        // FIXME: probably unportable across differnet language versions
-        if (lastModVerbose == "Invalid Date")
-            lastModVerbose = lastMod = null;
-
-        // Ctrl-g single line output
-        if (!verbose)
-        {
-            var info = []; // tmp array for joining later
-            var file = window.content.document.location.pathname.split("/").pop() || "[No Name]";
-            var title = window.content.document.title || "[No Title]";
-
-            if (pageSize[0])
-                info.push(pageSize[1] || pageSize[0]);
-
-            if (lastMod)
-                info.push(lastMod);
-
-            var countFeeds = "";
-            if (pageFeeds.length)
-                countFeeds = pageFeeds.length + (pageFeeds.length == 1 ? " feed" : " feeds");
-
-            if (countFeeds)
-                info.push(countFeeds);
-
-            var pageInfoText = '"' + file + '" [' + info.join(", ") + "] " + title;
-            vimperator.echo(pageInfoText, vimperator.commandline.FORCE_SINGLELINE);
-            return;
-        }
-
-        // get general infos
-        pageGeneral.push(["Title", window.content.document.title]);
-        pageGeneral.push(["URL", vimperator.util.highlightURL(window.content.document.location.toString(), true)]);
-
-        var ref = "referrer" in window.content.document && window.content.document.referrer;
-        if (ref)
-            pageGeneral.push(["Referrer", vimperator.util.highlightURL(ref, true)]);
-
-        if (pageSize[0])
-        {
-            if (pageSize[1])
-                pageGeneral.push(["File Size", pageSize[1] + " (" + pageSize[0] + ")"]);
-            else
-                pageGeneral.push(["File Size", pageSize[0]]);
-        }
-
-        pageGeneral.push(["Mime-Type", content.document.contentType]);
-        pageGeneral.push(["Encoding",  content.document.characterSet]);
-        pageGeneral.push(["Compatibility", content.document.compatMode == "BackCompat" ?  "Quirks Mode" : "Full/Almost Standards Mode"]);
-        if (lastModVerbose)
-            pageGeneral.push(["Last Modified", lastModVerbose]);
-
-        // get meta tag data, sort and put into pageMeta[]
-        var metaNodes = window.content.document.getElementsByTagName("meta");
-        var length = metaNodes.length;
-        if (length)
-        {
-            var tmpSort = [];
-            var tmpDict = [];
-
+            // put feeds rss into pageFeeds[]
+            var linkNodes = window.content.document.getElementsByTagName("link");
+            var length = linkNodes.length;
             for (var i = 0; i < length; i++)
             {
-                var tmpTag = metaNodes[i].name || metaNodes[i].httpEquiv;// +
-                var tmpTagNr = tmpTag + "-" + i; // allows multiple (identical) meta names
-                tmpDict[tmpTagNr] = [tmpTag, metaNodes[i].content];
-                tmpSort.push(tmpTagNr); // array for sorting
+                var link = linkNodes[i];
+                if (!link.href)
+                    continue;
+
+                var rel = link.rel && link.rel.toLowerCase();
+                var rels = {};
+                if (rel)
+                {
+                    for each (let relVal in rel.split(/\s+/))
+                        rels[relVal] = true;
+                }
+
+                if (rels.feed || (link.type && rels.alternate && !rels.stylesheet))
+                {
+                    var feed = { title: link.title, href: link.href, type: link.type || "" };
+                    if (isValidFeed(feed, window.content.document.nodePrincipal, rels.feed))
+                    {
+                        var type = feedTypes[feed.type] || feedTypes["application/rss+xml"];
+                        pageFeeds.push([feed.title, vimperator.util.highlightURL(feed.href, true) + "  (" + type + ")"]);
+                    }
+                }
             }
 
-            // sort: ignore-case
-            tmpSort.sort(function (a,b){return a.toLowerCase() > b.toLowerCase() ? 1 : -1;});
-            for (var i=0; i < tmpSort.length; i++)
-                pageMeta.push([tmpDict[tmpSort[i]][0], vimperator.util.highlightURL(tmpDict[tmpSort[i]][1], false)]);
-        }
+            var lastModVerbose = new Date(window.content.document.lastModified).toLocaleString();
+            var lastMod = new Date(window.content.document.lastModified).toLocaleFormat("%x %X");
+            // FIXME: probably unportable across differnet language versions
+            if (lastModVerbose == "Invalid Date")
+                lastModVerbose = lastMod = null;
 
-        pageMeta.push(["Meta Tags", ""]); // add extra text to the end
-        pageGeneral.push(["General Info", ""]);
-        pageFeeds.push(["Feeds", ""]);
-
-        var pageInfoText = "";
-        var option = vimperator.options["pageinfo"];
-        var br = "";
-
-        for (var z = 0; z < option.length; z++)
-        {
-            switch (option[z])
+            // Ctrl-g single line output
+            if (!verbose)
             {
-                case "g":
-                    if (pageGeneral.length > 1)
-                    {
-                        pageInfoText += br + createTable(pageGeneral);
-                        if (!br)
-                            br = "<br/>";
-                    }
-                    break;
-                case "f":
-                    if (pageFeeds.length > 1)
-                    {
-                        pageInfoText += br + createTable(pageFeeds);
-                        if (!br)
-                            br = "<br/>";
-                    }
-                    break;
-                case "m":
-                    if (pageMeta.length > 1)
-                    {
-                        pageInfoText += br + createTable(pageMeta);
-                        if (!br)
-                            br = "<br/>";
-                    }
-                    break;
+                var info = []; // tmp array for joining later
+                var file = window.content.document.location.pathname.split("/").pop() || "[No Name]";
+                var title = window.content.document.title || "[No Title]";
+
+                if (pageSize[0])
+                    info.push(pageSize[1] || pageSize[0]);
+
+                if (lastMod)
+                    info.push(lastMod);
+
+                var countFeeds = "";
+                if (pageFeeds.length)
+                    countFeeds = pageFeeds.length + (pageFeeds.length == 1 ? " feed" : " feeds");
+
+                if (countFeeds)
+                    info.push(countFeeds);
+
+                var pageInfoText = '"' + file + '" [' + info.join(", ") + "] " + title;
+                vimperator.echo(pageInfoText, vimperator.commandline.FORCE_SINGLELINE);
+                return;
             }
+
+            // get general infos
+            pageGeneral.push(["Title", window.content.document.title]);
+            pageGeneral.push(["URL", vimperator.util.highlightURL(window.content.document.location.toString(), true)]);
+
+            var ref = "referrer" in window.content.document && window.content.document.referrer;
+            if (ref)
+                pageGeneral.push(["Referrer", vimperator.util.highlightURL(ref, true)]);
+
+            if (pageSize[0])
+            {
+                if (pageSize[1])
+                    pageGeneral.push(["File Size", pageSize[1] + " (" + pageSize[0] + ")"]);
+                else
+                    pageGeneral.push(["File Size", pageSize[0]]);
+            }
+
+            pageGeneral.push(["Mime-Type", content.document.contentType]);
+            pageGeneral.push(["Encoding",  content.document.characterSet]);
+            pageGeneral.push(["Compatibility", content.document.compatMode == "BackCompat" ?  "Quirks Mode" : "Full/Almost Standards Mode"]);
+            if (lastModVerbose)
+                pageGeneral.push(["Last Modified", lastModVerbose]);
+
+            // get meta tag data, sort and put into pageMeta[]
+            var metaNodes = window.content.document.getElementsByTagName("meta");
+            var length = metaNodes.length;
+            if (length)
+            {
+                var tmpSort = [];
+                var tmpDict = [];
+
+                for (var i = 0; i < length; i++)
+                {
+                    var tmpTag = metaNodes[i].name || metaNodes[i].httpEquiv;// +
+                    var tmpTagNr = tmpTag + "-" + i; // allows multiple (identical) meta names
+                    tmpDict[tmpTagNr] = [tmpTag, metaNodes[i].content];
+                    tmpSort.push(tmpTagNr); // array for sorting
+                }
+
+                // sort: ignore-case
+                tmpSort.sort(function (a,b){return a.toLowerCase() > b.toLowerCase() ? 1 : -1;});
+                for (var i = 0; i < tmpSort.length; i++)
+                    pageMeta.push([tmpDict[tmpSort[i]][0], vimperator.util.highlightURL(tmpDict[tmpSort[i]][1], false)]);
+            }
+
+            pageMeta.push(["Meta Tags", ""]); // add extra text to the end
+            pageGeneral.push(["General Info", ""]);
+            pageFeeds.push(["Feeds", ""]);
+
+            var pageInfoText = "";
+            var option = vimperator.options["pageinfo"];
+            var br = "";
+
+            for (var z = 0; z < option.length; z++)
+            {
+                switch (option[z])
+                {
+                    case "g":
+                        if (pageGeneral.length > 1)
+                        {
+                            pageInfoText += br + createTable(pageGeneral);
+                            if (!br)
+                                br = "<br/>";
+                        }
+                        break;
+                    case "f":
+                        if (pageFeeds.length > 1)
+                        {
+                            pageInfoText += br + createTable(pageFeeds);
+                            if (!br)
+                                br = "<br/>";
+                        }
+                        break;
+                    case "m":
+                        if (pageMeta.length > 1)
+                        {
+                            pageInfoText += br + createTable(pageMeta);
+                            if (!br)
+                                br = "<br/>";
+                        }
+                        break;
+                }
+            }
+            vimperator.echo(pageInfoText, vimperator.commandline.FORCE_MULTILINE);
         }
-        vimperator.echo(pageInfoText, vimperator.commandline.FORCE_MULTILINE);
+
     };
     //}}}
-} //}}}
+}; //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/commands.js b/content/commands.js
index 1f1a6f9e..d9126474 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.Command = function (specs, action, extra_info) //{{{
+vimperator.Command = function (specs, action, extraInfo) //{{{
 {
     if (!specs || !action)
         return null;
@@ -36,63 +36,63 @@ vimperator.Command = function (specs, action, extra_info) //{{{
     // 'abc', 'abcdef'
     var parseSpecs = function (specs)
     {
-        var short_names = [];
-        var long_names  = [];
+        var shortNames = [];
+        var longNames  = [];
         var names = [];
         for (var i = 0; i < specs.length; i++)
         {
             var match;
             if (match = specs[i].match(/(\w+|!)\[(\w+)\]/))
             {
-                short_names.push(match[1]);
-                long_names.push(match[1] + match[2]);
+                shortNames.push(match[1]);
+                longNames.push(match[1] + match[2]);
                 // order as long1, short1, long2, short2
                 names.push(match[1] + match[2]);
                 names.push(match[1]);
             }
             else
             {
-                long_names.push(specs[i]);
+                longNames.push(specs[i]);
                 names.push(specs[i]);
             }
         }
-        return { names: names, long_names: long_names, short_names: short_names };
-    }
+        return { names: names, longNames: longNames, shortNames: shortNames };
+    };
 
     this.specs = specs;
-    var expanded_specs = parseSpecs(specs);
-    this.short_names = expanded_specs.short_names;
-    this.long_names = expanded_specs.long_names;
+    var expandedSpecs = parseSpecs(specs);
+    this.shortNames = expandedSpecs.shortNames;
+    this.longNames = expandedSpecs.longNames;
 
     // return the primary command name (the long name of the first spec listed)
-    this.name = this.long_names[0];
+    this.name = this.longNames[0];
 
     // return all command name aliases
-    this.names = expanded_specs.names;
+    this.names = expandedSpecs.names;
 
     this.action = action;
 
     // TODO: build a better default usage string
     this.usage = [this.specs[0]];
 
-    if (extra_info)
+    if (extraInfo)
     {
-        //var flags = extra_info.flags || 0;
+        //var flags = extraInfo.flags || 0;
 
-        if (extra_info.usage)
-            this.usage = extra_info.usage;
+        if (extraInfo.usage)
+            this.usage = extraInfo.usage;
 
-        this.help = extra_info.help || null;
-        this.short_help = extra_info.short_help || null;
-        this.completer = extra_info.completer || null;
+        this.help      = extraInfo.help || null;
+        this.shortHelp = extraInfo.shortHelp || null;
+        this.completer = extraInfo.completer || null;
     }
 
-}
+};
 
 vimperator.Command.prototype.execute = function (args, special, count, modifiers)
 {
     this.action.call(this, args, special, count, modifiers);
-}
+};
 
 // return true if the candidate name matches one of the command's aliases
 // (including all acceptable abbreviations)
@@ -123,7 +123,7 @@ vimperator.Command.prototype.hasName = function (name)
         }
     }
     return false;
-}
+};
 //}}}
 
 vimperator.Commands = function () //{{{
@@ -132,22 +132,13 @@ vimperator.Commands = function () //{{{
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    var ex_commands = [];
-    var last_run_command = ""; // updated whenever the users runs a command with :!
-
-    function addDefaultCommand(command)
-    {
-        ex_commands.push(command);
-        vimperator.Commands.prototype[command.name] = function (args, special, count, modifiers)
-        {
-            command.execute(args, special, count, modifiers);
-        }
-    }
+    var exCommands = [];
+    var lastRunCommand = ""; // updated whenever the users runs a command with :!
 
     function commandsIterator()
     {
-        for (var i = 0; i < ex_commands.length; i++)
-            yield ex_commands[i];
+        for (var i = 0; i < exCommands.length; i++)
+            yield exCommands[i];
 
         throw StopIteration;
     }
@@ -156,87 +147,90 @@ vimperator.Commands = function () //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    this.__iterator__ = function ()
-    {
-        return commandsIterator();
-    }
+    var commandManager = {
 
-    this.add = function (command)
-    {
-        if (!command)
-            return false;
-
-        ex_commands.push(command);
-
-        return true;
-    }
-
-    this.get = function (name)
-    {
-        for (var i = 0; i < ex_commands.length; i++)
+        __iterator__: function ()
         {
-            if (ex_commands[i].hasName(name))
-                return ex_commands[i];
-        }
+            return commandsIterator();
+        },
 
-        return null;
-    }
-
-    // TODO: generalized 0 count handling -> "Zero count"
-    // FIXME: doesn't really belong here...
-    // return [null, null, null, null, heredoc_tag || false];
-    //        [count, cmd, special, args] = match;
-    this.parseCommand = function (str, tag)
-    {
-        // remove comments
-        str.replace(/\s*".*$/, "");
-
-        if (tag) // we already have a multiline heredoc construct
+        add: function (command)
         {
-            if (str == tag)
-                return [null, null, null, null, false];
+            this[command.name] = function (args, special, count, modifiers)
+            {
+                command.execute(args, special, count, modifiers);
+            };
+            exCommands.push(command);
+        },
+
+        get: function (name)
+        {
+            for (var i = 0; i < exCommands.length; i++)
+            {
+                if (exCommands[i].hasName(name))
+                    return exCommands[i];
+            }
+
+            return null;
+        },
+
+        // TODO: generalized 0 count handling -> "Zero count"
+        // FIXME: doesn't really belong here...
+        // return [null, null, null, null, heredoc_tag || false];
+        //        [count, cmd, special, args] = match;
+        parseCommand: function (str, tag)
+        {
+            // remove comments
+            str.replace(/\s*".*$/, "");
+
+            if (tag) // we already have a multiline heredoc construct
+            {
+                if (str == tag)
+                    return [null, null, null, null, false];
+                else
+                    return [null, null, null, str, tag];
+            }
+
+            // 0 - count, 1 - cmd, 2 - special, 3 - args, 4 - heredoc tag
+            var matches = str.match(/^:*(\d+)?([a-zA-Z]+|!)(!)?(?:\s*(.*?)\s*)?$/);
+            if (!matches)
+                return [null, null, null, null, null];
+            matches.shift();
+
+            // parse count
+            if (matches[0])
+                matches[0] = parseInt(matches[0], 10);
             else
-                return [null, null, null, str, tag];
+                matches[0] = -1;
+
+            matches[2] = !!matches[2];
+            matches.push(null);
+            if (matches[3])
+            {
+                tag = matches[3].match(/<<\s*(\w+)\s*$/);
+                if (tag && tag[1])
+                    matches[4] = tag[1];
+            }
+            else
+                matches[3] = "";
+
+            return matches;
         }
 
-        // 0 - count, 1 - cmd, 2 - special, 3 - args, 4 - heredoc tag
-        var matches = str.match(/^:*(\d+)?([a-zA-Z]+|!)(!)?(?:\s*(.*?)\s*)?$/);
-        if (!matches)
-            return [null, null, null, null, null];
-        matches.shift();
-
-        // parse count
-        if (matches[0])
-            matches[0] = parseInt(matches[0], 10);
-        else
-            matches[0] = -1;
-
-        matches[2] = !!matches[2];
-        matches.push(null);
-        if (matches[3])
-        {
-            tag = matches[3].match(/<<\s*(\w+)\s*$/);
-            if (tag && tag[1])
-                matches[4] = tag[1];
-        }
-        else
-            matches[3] = "";
-
-        return matches;
-    }
+    };
 
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// DEFAULT COMMANDS ////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    addDefaultCommand(new vimperator.Command(["addo[ns]"],
+    commandManager.add(new vimperator.Command(["addo[ns]"],
         function () { vimperator.open("chrome://mozapps/content/extensions/extensions.xul", vimperator.NEW_TAB); },
         {
-            short_help: "Show available Browser Extensions and Themes",
+            shortHelp: "Show available Browser Extensions and Themes",
             help: "You can add/remove/disable browser extensions from this dialog.<br/>Be aware that not all Firefox extensions work, because Vimperator overrides some key bindings and changes Firefox's GUI."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["ba[ck]"],
+    commandManager.add(new vimperator.Command(["ba[ck]"],
         function (args, special, count)
         {
             if (special)
@@ -260,7 +254,7 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["[count]ba[ck][!] [url]"],
-            short_help: "Go back in the browser history",
+            shortHelp: "Go back in the browser history",
             help: "Count is supported, <code class=\"command\">:3back</code> goes back 3 pages in the browser history.<br/>" +
                   "The special version <code class=\"command\">:back!</code> goes to the beginning of the browser history.",
             completer: function (filter)
@@ -279,22 +273,22 @@ vimperator.Commands = function () //{{{
             }
         }
     ));
-    addDefaultCommand(new vimperator.Command(["bd[elete]", "bw[ipeout]", "bun[load]", "tabc[lose]"],
+    commandManager.add(new vimperator.Command(["bd[elete]", "bw[ipeout]", "bun[load]", "tabc[lose]"],
         function (args, special, count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count > 0 ? count : 1, special, 0); },
         {
             usage: ["[count]bd[elete][!]"],
-            short_help: "Delete current buffer (=tab)",
+            shortHelp: "Delete current buffer (=tab)",
             help: "Count is supported, <code class=\"command\">:2bd</code> removes two tabs and the one to the right is selected. " +
                   "Do <code class=\"command\">:bdelete!</code> to select the tab to the left after removing the current tab."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["beep"],
+    commandManager.add(new vimperator.Command(["beep"],
         function () { vimperator.beep(); },
         {
-            short_help: "Play a system beep"
+            shortHelp: "Play a system beep"
         }
     ));
-    addDefaultCommand(new vimperator.Command(["bma[rk]"],
+    commandManager.add(new vimperator.Command(["bma[rk]"],
         // takes: -t "foo" myurl
         // converts that string to a useful url and title, and calls addBookmark
         function (args)
@@ -325,7 +319,7 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["bma[rk] [-t {title}] [url]"],
-            short_help: "Add a bookmark",
+            shortHelp: "Add a bookmark",
             help: "If you don't add a custom title, either the title of the web page or the URL is taken as the title.<br/>" +
                   "You can omit the optional <code class=\"argument\">[url]</code> argument, so just do <code class=\"command\">:bmark</code> to bookmark the currently loaded web page with a default title and without any tags.<br/>" +
                   " -t \"custom title\"<br/>" +
@@ -335,32 +329,32 @@ vimperator.Commands = function () //{{{
                   "Tags WILL be some mechanism to classify bookmarks. Assume, you tag a URL with the tags \"linux\" and \"computer\" you'll be able to search for bookmarks containing these tags."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["bmarks"],
+    commandManager.add(new vimperator.Command(["bmarks"],
         function (args, special) { vimperator.bookmarks.list(args, special); },
         {
             usage: ["bmarks [filter]", "bmarks!"],
-            short_help: "Show bookmarks",
+            shortHelp: "Show bookmarks",
             help: "Open the message window at the bottom of the screen with all bookmarks which match <code class=\"argument\">[filter]</code> either in the title or URL.<br/>" +
                   "The special version <code class=\"command\">:bmarks!</code> opens the default Firefox bookmarks window.<br/>" +
                   "The following options WILL be interpreted in the future:<br/>" +
                   " -T comma,separated,tag,list<br/>",
-            completer: function (filter) { return vimperator.completion.get_bookmark_completions(filter); }
+            completer: function (filter) { return vimperator.completion.bookmark(filter); }
         }
     ));
-    addDefaultCommand(new vimperator.Command(["b[uffer]"],
+    commandManager.add(new vimperator.Command(["b[uffer]"],
         function (args, special) { vimperator.buffer.switchTo(args, special); },
         {
             usage: ["b[uffer][!] {url|index}"],
-            short_help: "Go to buffer from buffer list",
+            shortHelp: "Go to buffer from buffer list",
             help: "Argument can be either the buffer index or the full URL.<br/>" +
                   "If argument is neither a full URL nor an index but uniquely identifies a buffer, " +
                   "it is selected. With <code class=\"argument\">[!]</code> the next buffer matching the argument " +
                   "is selected, even if it cannot be identified uniquely.<br/>" +
                   "Use <code class=\"mapping\">b</code> as a shortcut to open this prompt.",
-            completer: function (filter) { return vimperator.completion.get_buffer_completions(filter); }
+            completer: function (filter) { return vimperator.completion.buffer(filter); }
         }
     ));
-    addDefaultCommand(new vimperator.Command(["buffers", "files", "ls", "tabs"],
+    commandManager.add(new vimperator.Command(["buffers", "files", "ls", "tabs"],
         function (args, special)
         {
             if (args)
@@ -373,12 +367,12 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["buffers[!]"],
-            short_help: "Show a list of all buffers (=tabs)",
+            shortHelp: "Show a list of all buffers (=tabs)",
             help: "The special version <code class=\"command\">:buffers!</code> opens the buffer list in a persistent preview window. " +
                   "Call the special version of this command again to close the window."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["delbm[arks]"],
+    commandManager.add(new vimperator.Command(["delbm[arks]"],
         function (args, special)
         {
             var result = vimperator.bookmarks.parseBookmarkString(args);
@@ -388,8 +382,8 @@ vimperator.Commands = function () //{{{
                 if (result.url == null)
                     result.url = vimperator.buffer.URL;
 
-                var deleted_count = vimperator.bookmarks.remove(result.url);
-                vimperator.echo(deleted_count + " bookmark(s) with url `" + result.url + "' deleted");
+                var deletedCount = vimperator.bookmarks.remove(result.url);
+                vimperator.echo(deletedCount + " bookmark(s) with url `" + result.url + "' deleted");
             }
             else
             {
@@ -398,15 +392,15 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["delbm[arks] {url}"],
-            short_help: "Delete a bookmark",
+            shortHelp: "Delete a bookmark",
             help: "Deletes <b>all</b> bookmarks which match the <code class=\"argument\">{url}</code>. Use <code>&lt;Tab&gt;</code> key on a string to complete the URL which you want to delete.<br/>" +
                   "The following options WILL be interpreted in the future:<br/>" +
                   " [!] a special version to delete ALL bookmarks <br/>" +
                   " -T comma,separated,tag,list <br/>",
-            completer: function (filter) { return vimperator.completion.get_bookmark_completions(filter); }
+            completer: function (filter) { return vimperator.completion.bookmark(filter); }
         }
     ));
-    addDefaultCommand(new vimperator.Command(["delm[arks]"],
+    commandManager.add(new vimperator.Command(["delm[arks]"],
         function (args, special)
         {
             if (!special && !args)
@@ -451,7 +445,7 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["delm[arks] {marks}", "delm[arks]!"],
-            short_help: "Delete the specified marks",
+            shortHelp: "Delete the specified marks",
             help: "Marks are presented as a list. Example:<br/>" +
                 "<code class=\"command\">:delmarks Aa b p</code> deletes marks A, a, b and p<br/>" +
                 "<code class=\"command\">:delmarks b-p</code> deletes all marks in the range b to p<br/>" +
@@ -459,7 +453,7 @@ vimperator.Commands = function () //{{{
         }
 
     ));
-    addDefaultCommand(new vimperator.Command(["delqm[arks]"],
+    commandManager.add(new vimperator.Command(["delqm[arks]"],
         function (args, special)
         {
             // TODO: finish arg parsing - we really need a proper way to do this. :)
@@ -481,17 +475,17 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["delqm[arks] {marks}", "delqm[arks]!"],
-            short_help: "Delete the specified QuickMarks",
+            shortHelp: "Delete the specified QuickMarks",
             help: "QuickMarks are presented as a list. Example:<br/>" +
                 "<code class=\"command\">:delqmarks Aa b p</code> deletes QuickMarks A, a, b and p<br/>" +
                 "<code class=\"command\">:delqmarks b-p</code> deletes all QuickMarks in the range b to p<br/>" +
                 "<code class=\"command\">:delqmarks!</code> deletes all QuickMarks"
         }
     ));
-    addDefaultCommand(new vimperator.Command(["downl[oads]", "dl"],
+    commandManager.add(new vimperator.Command(["downl[oads]", "dl"],
         function () { vimperator.open("chrome://mozapps/content/downloads/downloads.xul", vimperator.NEW_TAB); },
         {
-            short_help: "Show progress of current downloads",
+            shortHelp: "Show progress of current downloads",
             help: "Open the original Firefox download dialog in a new tab.<br/>" +
                   "Here, downloads can be paused, canceled and resumed."
         }
@@ -524,7 +518,7 @@ vimperator.Commands = function () //{{{
 
         return arg;
     }
-    addDefaultCommand(new vimperator.Command(["ec[ho]"],
+    commandManager.add(new vimperator.Command(["ec[ho]"],
         function (args)
         {
             var res = argToString(args, true);
@@ -533,14 +527,14 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["ec[ho] {expr}"],
-            short_help: "Display a string at the bottom of the window",
+            shortHelp: "Display a string at the bottom of the window",
             help: "Useful for showing informational messages. Multiple lines can be separated by \\n.<br/>" +
                   "<code class=\"argument\">{expr}</code> can either be a quoted string, or any expression which can be fed to eval() like 4+5. " +
                   "You can also view the source code of objects and functions if the return value of <code class=\"argument\">{expr}</code> is an object or function.",
             completer: function (filter) { return vimperator.completion.javascript(filter); }
         }
     ));
-    addDefaultCommand(new vimperator.Command(["echoe[rr]"],
+    commandManager.add(new vimperator.Command(["echoe[rr]"],
         function (args)
         {
             var res = argToString(args, false);
@@ -549,26 +543,26 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["echoe[rr] {expr}"],
-            short_help: "Display an error string at the bottom of the window",
+            shortHelp: "Display an error string at the bottom of the window",
             help: "Just like <code class=\"command\">:ec[ho]</code>, but echoes the result highlighted in red. Useful for showing important messages.",
             completer: function (filter) { return vimperator.completion.javascript(filter); }
         }
     ));
-    addDefaultCommand(new vimperator.Command(["exe[cute]"],
-        function (args) { vimperator.execute(args) },
+    commandManager.add(new vimperator.Command(["exe[cute]"],
+        function (args) { vimperator.execute(args); },
         {
             usage: ["exe[cute] {expr1} [ ... ]"],
-            short_help: "Execute the string that results from the evaluation of {expr1} as an Ex command.",
+            shortHelp: "Execute the string that results from the evaluation of {expr1} as an Ex command.",
             help: "Example: <code class=\"command\">:execute echo test</code> shows a message with the text &#34;test&#34;.<br/>"
         }
     ));
-    addDefaultCommand(new vimperator.Command(["exu[sage]"],
+    commandManager.add(new vimperator.Command(["exu[sage]"],
         function (args, special, count, modifiers) { vimperator.help("commands", special, null, modifiers); },
         {
-            short_help: "Show help for Ex commands"
+            shortHelp: "Show help for Ex commands"
         }
     ));
-    addDefaultCommand(new vimperator.Command(["fo[rward]", "fw"],
+    commandManager.add(new vimperator.Command(["fo[rward]", "fw"],
         function (args, special, count)
         {
             if (special)
@@ -592,7 +586,7 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["[count]fo[rward][!] [url]"],
-            short_help: "Go forward in the browser history",
+            shortHelp: "Go forward in the browser history",
             help: "Count is supported, <code class=\"command\">:3forward</code> goes forward 3 pages in the browser history.<br/>" +
                   "The special version <code class=\"command\">:forward!</code> goes to the end of the browser history.",
             completer: function (filter)
@@ -611,18 +605,18 @@ vimperator.Commands = function () //{{{
             }
         }
     ));
-    addDefaultCommand(new vimperator.Command(["ha[rdcopy]"],
+    commandManager.add(new vimperator.Command(["ha[rdcopy]"],
         function () { getBrowser().contentWindow.print(); },
         {
-            short_help: "Print current document",
+            shortHelp: "Print current document",
             help: "Open a GUI dialog where you can select the printer, number of copies, orientation, etc."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["h[elp]"],
+    commandManager.add(new vimperator.Command(["h[elp]"],
         function (args, special, count, modifiers) { vimperator.help(args, special, null, modifiers); },
         {
             usage: ["h[elp] {subject}"],
-            short_help: "Open the help window",
+            shortHelp: "Open the help window",
             help: "You can jump to the specified <code class=\"argument\">{subject}</code> with <code class=\"command\">:help {subject}</code>.<br/>" +
                   "Make sure you use the full Vim notation when jumping to <code class=\"argument\">{subject}</code>. This means:<br/>" +
                   "<ul>" +
@@ -631,20 +625,20 @@ vimperator.Commands = function () //{{{
                   "<li><code class=\"command\">:help o</code> for mappings (no pre- or postfix)</li>" +
                   "</ul>" +
                   "You can however use partial stings in the tab completion, so <code class=\"command\">:help he&lt;Tab&gt;</code> completes <code class=\"command\">:help :help</code>.",
-            completer: function (filter) { return vimperator.completion.get_help_completions(filter); }
+            completer: function (filter) { return vimperator.completion.help(filter); }
         }
     ));
-    addDefaultCommand(new vimperator.Command(["hist[ory]", "hs"],
+    commandManager.add(new vimperator.Command(["hist[ory]", "hs"],
         function (args, special) { vimperator.history.list(args, special); },
         {
             usage: ["hist[ory] [filter]", "history!"],
-            short_help: "Show recently visited URLs",
+            shortHelp: "Show recently visited URLs",
             help: "Open the message window at the bottom of the screen with all history items which match <code class=\"argument\">[filter]</code> either in the title or URL.<br/>" +
                   "The special version <code class=\"command\">:history!</code> opens the default Firefox history window.",
-            completer: function (filter) { return vimperator.completion.get_history_completions(filter); }
+            completer: function (filter) { return vimperator.completion.history(filter); }
         }
     ));
-    addDefaultCommand(new vimperator.Command(["javas[cript]", "js"],
+    commandManager.add(new vimperator.Command(["javas[cript]", "js"],
         function (args, special)
         {
             if (special) // open javascript console
@@ -656,7 +650,8 @@ vimperator.Commands = function () //{{{
                 if (matches && matches[2])
                 {
                     vimperator.commandline.inputMultiline(new RegExp("^" + matches[2] + "$", "m"),
-                        function (code) {
+                        function (code)
+                        {
                             try
                             {
                                 eval(matches[1] + "\n" + code);
@@ -682,7 +677,7 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["javas[cript] {cmd}", "javascript <<{endpattern}\\n{script}\\n{endpattern}", "javascript[!]"], // \\n is changed to <br/> in the help.js code
-            short_help: "Run any JavaScript command through eval()",
+            shortHelp: "Run any JavaScript command through eval()",
             help: "Acts as a JavaScript interpreter by passing the argument to <code>eval()</code>.<br/>" +
                   "<code class=\"command\">:javascript alert('Hello world')</code> shows a dialog box with the text \"Hello world\".<br/>" +
                   "<code class=\"command\">:javascript &lt;&lt;EOF</code> reads all the lines until a line starting with 'EOF' is found, and interpret them with the JavaScript <code>eval()</code> function.<br/>" +
@@ -693,7 +688,7 @@ vimperator.Commands = function () //{{{
             completer: function (filter) { return vimperator.completion.javascript(filter); }
         }
     ));
-    addDefaultCommand(new vimperator.Command(["let"],
+    commandManager.add(new vimperator.Command(["let"],
         function (args)
         {
             if (!args)
@@ -733,7 +728,8 @@ vimperator.Commands = function () //{{{
                         return vimperator.echoerr("E15: Invalid expression: " + match[4]);
                     else
                     {
-                        if (!reference[0]) {
+                        if (!reference[0])
+                        {
                             if (reference[2] == "g")
                                 reference[0] = vimperator.globalVariables;
                             else
@@ -773,7 +769,7 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["let {var-name} [+-.]= {expr1}", "let {var-name}", "let"],
-            short_help: "Sets or lists a variable",
+            shortHelp: "Sets or lists a variable",
             help: "Sets the variable <code class=\"argument\">{var-name}</code> " +
                   "to the value of the expression <code class=\"argument\">{expr1}</code>." +
                   "If no expression is given, the value of the variable is displayed." +
@@ -790,14 +786,14 @@ vimperator.Commands = function () //{{{
 
         var matches = args.match(/^([^\s]+)(?:\s+(.+))?$/);
         var [lhs, rhs] = [matches[1], matches[2]];
-        var leader_reg = /<Leader>/i;
+        var leaderRegexp = /<Leader>/i;
 
-        if (leader_reg.test(lhs))
+        if (leaderRegexp.test(lhs))
         {
-            var leader_ref = vimperator.variableReference("mapleader");
-            var leader = leader_ref[0] ? leader_ref[0][leader_ref[1]] : "\\";
+            var leaderRef = vimperator.variableReference("mapleader");
+            var leader = leaderRef[0] ? leaderRef[0][leaderRef[1]] : "\\";
 
-            lhs = lhs.replace(leader_reg, leader);
+            lhs = lhs.replace(leaderRegexp, leader);
         }
 
         if (rhs)
@@ -813,16 +809,16 @@ vimperator.Commands = function () //{{{
             vimperator.mappings.list(vimperator.modes.NORMAL, lhs);
         }
     }
-    addDefaultCommand(new vimperator.Command(["map"],
-        function (args) { map(args, false) },
+    commandManager.add(new vimperator.Command(["map"],
+        function (args) { map(args, false); },
         {
             usage: ["map {lhs} {rhs}", "map {lhs}", "map"],
-            short_help: "Map the key sequence {lhs} to {rhs}",
+            shortHelp: "Map the key sequence {lhs} to {rhs}",
             help: "The <code class=\"argument\">{rhs}</code> is remapped, allowing for nested and recursive mappings.<br/>" +
                   "Mappings are NOT saved during sessions, make sure you put them in your vimperatorrc file!"
         }
     ));
-    addDefaultCommand(new vimperator.Command(["mapc[lear]"],
+    commandManager.add(new vimperator.Command(["mapc[lear]"],
         function (args)
         {
             if (args)
@@ -834,12 +830,12 @@ vimperator.Commands = function () //{{{
             vimperator.mappings.removeAll(vimperator.modes.NORMAL);
         },
         {
-            short_help: "Remove all mappings",
+            shortHelp: "Remove all mappings",
             help: "All user-defined mappings which were set by " +
                   "<code class=\"command\">:map</code> or <code class=\"command\">:noremap</code> are cleared."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["ma[rk]"],
+    commandManager.add(new vimperator.Command(["ma[rk]"],
         function (args)
         {
             if (!args)
@@ -862,10 +858,10 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["ma[rk] {a-zA-Z}"],
-            short_help: "Mark current location within the web page"
+            shortHelp: "Mark current location within the web page"
         }
     ));
-    addDefaultCommand(new vimperator.Command(["marks"],
+    commandManager.add(new vimperator.Command(["marks"],
         function (args)
         {
             // ignore invalid mark characters unless there are no valid mark chars
@@ -880,11 +876,11 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["marks [arg]"],
-            short_help: "Show all location marks of current web page",
+            shortHelp: "Show all location marks of current web page",
             help: "If <code class=\"argument\">[arg]</code> is specified then limit the list to those marks mentioned."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["mkv[imperatorrc]"],
+    commandManager.add(new vimperator.Command(["mkv[imperatorrc]"],
         function (args, special)
         {
             var filename;
@@ -915,7 +911,7 @@ vimperator.Commands = function () //{{{
             {
                 // TODO: options should be queried for this info
                 // TODO: string/list options might need escaping in future
-                if (!/fullscreen|usermode/.test(option.name) && option.value != option.default_value)
+                if (!/fullscreen|usermode/.test(option.name) && option.value != option.defaultValue)
                 {
                     if (option.type == "boolean")
                         line += "set " + (option.value ? option.name : "no" + option.name) + "\n";
@@ -930,24 +926,24 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["mkv[imperatorrc] [file]"],
-            short_help: "Write current key mappings and changed options to [file]",
+            shortHelp: "Write current key mappings and changed options to [file]",
             help: "If no <code class=\"argument\">[file]</code> is specified then ~/.vimperatorrc is written unless this file already exists. " +
                   "The special version will overwrite <code class=\"argument\">[file]</code> if it exists.<br/>" +
                   "WARNING: this differs from Vim's behavior which defaults to writing the file in the current directory."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["noh[lsearch]"],
+    commandManager.add(new vimperator.Command(["noh[lsearch]"],
         function (args)
         {
             vimperator.search.clear();
         },
         {
-            short_help: "Remove the search highlighting",
+            shortHelp: "Remove the search highlighting",
             help: "The document highlighting is turned back on when another search command is used or the " +
                   "<code class=\"option\">'hlsearch'</code> option is set."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["norm[al]"],
+    commandManager.add(new vimperator.Command(["norm[al]"],
         function (args, special)
         {
             if (!args)
@@ -960,21 +956,21 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["norm[al][!] {commands}"],
-            short_help: "Execute Normal mode commands",
+            shortHelp: "Execute Normal mode commands",
             help: "Example: <code class=\"command\">:normal 20j</code> scrolls 20 lines down. " +
                   "If the <code class=\"argument\">[!]</code> is specified mappings will not be used."
         }
     ));
     // TODO: remove duplication in :map
-    addDefaultCommand(new vimperator.Command(["no[remap]"],
-        function (args) { map(args, true) },
+    commandManager.add(new vimperator.Command(["no[remap]"],
+        function (args) { map(args, true); },
         {
             usage: ["no[remap] {lhs} {rhs}", "no[remap] {lhs}", "no[remap]"],
-            short_help: "Map the key sequence {lhs} to {rhs}",
+            shortHelp: "Map the key sequence {lhs} to {rhs}",
             help: "No remapping of the <code class=\"argument\">{rhs}</code> is performed."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["o[pen]", "e[dit]"],
+    commandManager.add(new vimperator.Command(["o[pen]", "e[dit]"],
         function (args, special)
         {
             if (args)
@@ -991,7 +987,7 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["o[pen] [url] [, url]"],
-            short_help: "Open one or more URLs in the current tab",
+            shortHelp: "Open one or more URLs in the current tab",
             help: "Multiple URLs can be separated with \", \". Note that the space after the comma is required.<br/>" +
                   "Each token is analyzed and in this order:<br/>" +
                   "<ol>" +
@@ -1014,23 +1010,23 @@ vimperator.Commands = function () //{{{
                   "The items which are completed on <code class=\"mapping\">&lt;Tab&gt;</code> are specified in the <code class=\"option\">'complete'</code> option.<br/>" +
                   "Without argument, reloads the current page.<br/>" +
                   "Without argument but with <code class=\"command\">!</code>, reloads the current page skipping the cache.",
-            completer: function (filter) { return vimperator.completion.get_url_completions(filter); }
+            completer: function (filter) { return vimperator.completion.url(filter); }
         }
     ));
-    addDefaultCommand(new vimperator.Command(["pa[geinfo]"],
+    commandManager.add(new vimperator.Command(["pa[geinfo]"],
         function () { vimperator.buffer.pageInfo(true); },
         {
-            short_help: "Show general and/or meta-content site informations",
+            shortHelp: "Show general and/or meta-content site informations",
             help: "Show general and/or meta-content site informations"
         }
     ));
-    addDefaultCommand(new vimperator.Command(["pc[lose]"],
+    commandManager.add(new vimperator.Command(["pc[lose]"],
         function () { vimperator.previewwindow.hide(); },
         {
-            short_help: "Close preview window on bottom of screen"
+            shortHelp: "Close preview window on bottom of screen"
         }
     ));
-    addDefaultCommand(new vimperator.Command(["pref[erences]", "prefs"],
+    commandManager.add(new vimperator.Command(["pref[erences]", "prefs"],
         function (args, special, count, modifiers)
         {
             if (!args)
@@ -1056,13 +1052,13 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["pref[erences][!]"],
-            short_help: "Show Browser Preferences",
+            shortHelp: "Show Browser Preferences",
             help: "You can change the browser preferences from this dialog. " +
                   "Be aware that not all Firefox preferences work, because Vimperator overrides some key bindings and changes Firefox's GUI.<br/>" +
                   "<code class=\"command\">:prefs!</code> opens about:config in the current tab where you can change advanced Firefox preferences."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["qma[rk]"],
+    commandManager.add(new vimperator.Command(["qma[rk]"],
         function (args)
         {
             if (!args)
@@ -1081,12 +1077,12 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["qma[rk] {a-zA-Z0-9} [url]"],
-            short_help: "Mark a URL with a letter for quick access",
+            shortHelp: "Mark a URL with a letter for quick access",
             help: "You can also mark whole groups like this: <br/>"+
                   "<code class=\"command\">:qmark f http://forum1.com, http://forum2.com, imdb some artist</code>"
         }
     ));
-    addDefaultCommand(new vimperator.Command(["qmarks"],
+    commandManager.add(new vimperator.Command(["qmarks"],
         function (args)
         {
             // ignore invalid mark characters unless there are no valid mark chars
@@ -1101,57 +1097,57 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["qmarks [arg]"],
-            short_help: "Show all QuickMarks",
+            shortHelp: "Show all QuickMarks",
             help: "If <code class=\"argument\">[arg]</code> is specified then limit the list to those QuickMarks mentioned."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["q[uit]"],
+    commandManager.add(new vimperator.Command(["q[uit]"],
         function () { vimperator.tabs.remove(getBrowser().mCurrentTab, 1, false, 1); },
         {
-            short_help: "Quit current tab",
+            shortHelp: "Quit current tab",
             help: "If this is the last tab in the window, close the window. If this was the " +
                   "last window, close Vimperator. When quitting Vimperator, the session is not stored."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["quita[ll]", "qa[ll]"],
+    commandManager.add(new vimperator.Command(["quita[ll]", "qa[ll]"],
         function () { vimperator.quit(false); },
         {
-            short_help: "Quit Vimperator",
+            shortHelp: "Quit Vimperator",
             help: "Quit Vimperator, no matter how many tabs/windows are open. The session is not stored."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["re[load]"],
+    commandManager.add(new vimperator.Command(["re[load]"],
         function (args, special) { vimperator.tabs.reload(getBrowser().mCurrentTab, special); },
         {
             usage: ["re[load][!]"],
-            short_help: "Reload current page",
+            shortHelp: "Reload current page",
             help: "Forces reloading of the current page. If <code class=\"command\">!</code> is given, skip the cache."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["reloada[ll]"],
+    commandManager.add(new vimperator.Command(["reloada[ll]"],
         function (args, special) { vimperator.tabs.reloadAll(special); },
         {
             usage: ["reloada[ll][!]"],
-            short_help: "Reload all pages",
+            shortHelp: "Reload all pages",
             help: "Forces reloading of all pages. If <code class=\"command\">!</code> is given, skip the cache."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["res[tart]"],
+    commandManager.add(new vimperator.Command(["res[tart]"],
         function () { vimperator.restart(); },
         {
-            short_help: "Force the browser to restart",
+            shortHelp: "Force the browser to restart",
             help: "Useful when installing extensions."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["sav[eas]", "w[rite]"],
+    commandManager.add(new vimperator.Command(["sav[eas]", "w[rite]"],
         function () { saveDocument(window.content.document); },
         {
-            short_help: "Save current web page to disk",
+            shortHelp: "Save current web page to disk",
             help: "Opens the original Firefox \"Save page as...\" dialog.<br/>" +
                   "There, you can save the current web page to disk with various options."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["se[t]"],
+    commandManager.add(new vimperator.Command(["se[t]"],
         // TODO: support setting multiple options at once
         function (args, special, count, modifiers)
         {
@@ -1161,11 +1157,11 @@ vimperator.Commands = function () //{{{
                 return;
             }
 
-            var only_non_default = false; // used for :set to print non-default options
+            var onlyNondefault = false; // used for :set to print non-default options
             if (!args)
             {
                 args = "all";
-                only_non_default = true;
+                onlyNondefault = true;
             }
 
             //                               1        2       3       4  5       6
@@ -1176,9 +1172,9 @@ vimperator.Commands = function () //{{{
                 return;
             }
 
-            var unset_boolean = false;
+            var unsetBoolean = false;
             if (matches[1] == "no")
-                unset_boolean = true;
+                unsetBoolean = true;
 
             var name = matches[2];
             var all = false;
@@ -1192,19 +1188,19 @@ vimperator.Commands = function () //{{{
                 return;
             }
 
-            var value_given = !!matches[4];
+            var valueGiven = !!matches[4];
 
             var get = false;
-            if (all || matches[3] == "?" || (option.type != "boolean" && !value_given))
+            if (all || matches[3] == "?" || (option.type != "boolean" && !valueGiven))
                 get = true;
 
             var reset = false;
             if (matches[3] == "&")
                 reset = true;
 
-            var invert_boolean = false;
+            var invertBoolean = false;
             if (matches[1] == "inv" || matches[3] == "!")
-                invert_boolean = true;
+                invertBoolean = true;
 
             var operator = matches[5];
 
@@ -1230,7 +1226,7 @@ vimperator.Commands = function () //{{{
             {
                 if (all)
                 {
-                    vimperator.options.list(only_non_default);
+                    vimperator.options.list(onlyNondefault);
                 }
                 else
                 {
@@ -1246,22 +1242,22 @@ vimperator.Commands = function () //{{{
             // benefit
             else
             {
-                var current_value = option.value;
-                var new_value;
+                var currentValue = option.value;
+                var newValue;
 
                 switch (option.type)
                 {
                     case "boolean":
-                        if (value_given)
+                        if (valueGiven)
                         {
                             vimperator.echoerr("E474: Invalid argument: " + args);
                             return;
                         }
 
-                        if (invert_boolean)
-                            new_value = !option.value;
+                        if (invertBoolean)
+                            newValue = !option.value;
                         else
-                            new_value = !unset_boolean;
+                            newValue = !unsetBoolean;
 
                         break;
 
@@ -1275,64 +1271,64 @@ vimperator.Commands = function () //{{{
                         }
 
                         if (operator == "+")
-                            new_value = current_value + value;
+                            newValue = currentValue + value;
                         else if (operator == "-")
-                            new_value = current_value - value;
+                            newValue = currentValue - value;
                         else if (operator == "^")
-                            new_value = current_value * value;
+                            newValue = currentValue * value;
                         else
-                            new_value = value;
+                            newValue = value;
 
                         break;
 
                     case "charlist":
                         if (operator == "+")
-                            new_value = current_value.replace(new RegExp("[" + value + "]", "g"), "") + value;
+                            newValue = currentValue.replace(new RegExp("[" + value + "]", "g"), "") + value;
                         else if (operator == "-")
-                            new_value = current_value.replace(value, "");
+                            newValue = currentValue.replace(value, "");
                         else if (operator == "^")
                             // NOTE: Vim doesn't prepend if there's a match in the current value
-                            new_value = value + current_value.replace(new RegExp("[" + value + "]", "g"), "");
+                            newValue = value + currentValue.replace(new RegExp("[" + value + "]", "g"), "");
                         else
-                            new_value = value;
+                            newValue = value;
 
                         break;
 
                     case "stringlist":
                         if (operator == "+")
                         {
-                            if (!current_value.match(value))
-                                new_value = (current_value ? current_value + "," : "") + value;
+                            if (!currentValue.match(value))
+                                newValue = (currentValue ? currentValue + "," : "") + value;
                             else
-                                new_value = current_value;
+                                newValue = currentValue;
                         }
                         else if (operator == "-")
                         {
-                            new_value = current_value.replace(new RegExp("^" + value + ",?|," + value), "");
+                            newValue = currentValue.replace(new RegExp("^" + value + ",?|," + value), "");
                         }
                         else if (operator == "^")
                         {
-                            if (!current_value.match(value))
-                                new_value = value + (current_value ? "," : "") + current_value;
+                            if (!currentValue.match(value))
+                                newValue = value + (currentValue ? "," : "") + currentValue;
                             else
-                                new_value = current_value;
+                                newValue = currentValue;
                         }
                         else
                         {
-                            new_value = value;
+                            newValue = value;
                         }
 
                         break;
 
                     case "string":
                         if (operator == "+")
-                            new_value = current_value + value;
+                            newValue = currentValue + value;
                         else if (operator == "-")
-                            new_value = current_value.replace(value, "");
+                            newValue = currentValue.replace(value, "");
                         else if (operator == "^")
-                            new_value = value + current_value;
+                            newValue = value + currentValue;
                         else
-                            new_value = value;
+                            newValue = value;
 
                         break;
 
@@ -1340,8 +1336,8 @@ vimperator.Commands = function () //{{{
                         vimperator.echoerr("E685: Internal error: option type `" + option.type + "' not supported");
                 }
 
-                if (option.isValidValue(new_value))
-                    option.value = new_value;
+                if (option.isValidValue(newValue))
+                    option.value = newValue;
                 else
                     // FIXME: need to be able to specify more specific errors
                     vimperator.echoerr("E474: Invalid argument: " + args);
@@ -1349,7 +1345,7 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["se[t][!]", "se[t] {option}?", "se[t] [no]{option}", "se[t] {option}[+-]={value}", "se[t] {option}! | inv{option}", "se[t] {option}&"],
-            short_help: "Set an option",
+            shortHelp: "Set an option",
             help: "Permanently change an option.<br/>" +
                   "<code class=\"command\">:set</code> without an argument shows all Vimperator options which differ from their default values.<br/>" +
                   "<code class=\"command\">:set!</code> without an argument shows all about:config preferences which differ from their default values.<br/>" +
@@ -1362,11 +1358,11 @@ vimperator.Commands = function () //{{{
                   "<code class=\"command\">:set option+={value}</code>, <code class=\"command\">:set option^={value}</code> and <code class=\"command\">:set option-={value}</code> " +
                   "adds/multiplies/subtracts <code class=\"argument\">{value}</code> from a number option and appends/prepends/removes <code class=\"argument\">{value}</code> from a string option.<br/>" +
                   "<code class=\"command\">:set all</code> shows the current value of all options and <code class=\"command\">:set all&amp;</code> resets all options to their default values.<br/>",
-            completer: function (filter) { return vimperator.completion.get_options_completions(filter); }
+            completer: function (filter) { return vimperator.completion.option(filter); }
         }
     ));
     // TODO: sclose instead?
-    addDefaultCommand(new vimperator.Command(["sbcl[ose]"],
+    commandManager.add(new vimperator.Command(["sbcl[ose]"],
         function (args)
         {
             if (args)
@@ -1379,12 +1375,12 @@ vimperator.Commands = function () //{{{
                 toggleSidebar();
         },
         {
-            short_help: "Close the sidebar window"
+            shortHelp: "Close the sidebar window"
         }
     ));
     // TODO: sopen instead? Separate :sidebar from :sbopen and make them behave
     // more like :cw, :cope etc
-    addDefaultCommand(new vimperator.Command(["sideb[ar]", "sb[ar]", "sbope[n]"],
+    commandManager.add(new vimperator.Command(["sideb[ar]", "sb[ar]", "sbope[n]"],
         function (args)
         {
             if (!args)
@@ -1410,14 +1406,14 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["sidebar {name}"],
-            short_help: "Open the sidebar window",
+            shortHelp: "Open the sidebar window",
             help: "<code class=\"argument\">{name}</code> is any of the menu items listed under the standard Firefox View->Sidebar " +
                   "menu. Add-ons, Preferences and Downloads are also available in the sidebar.",
-            completer: function (filter) { return vimperator.completion.get_sidebar_completions(filter); }
+            completer: function (filter) { return vimperator.completion.sidebar(filter); }
         }
     ));
-    addDefaultCommand(new vimperator.Command(["so[urce]"],
-        function (args)
+    commandManager.add(new vimperator.Command(["so[urce]"],
+        function (args, special)
         {
             // FIXME: implement proper filename quoting
             //if (/[^\\]\s/.test(args))
@@ -1426,11 +1422,11 @@ vimperator.Commands = function () //{{{
             //    return;
             //}
 
-            vimperator.source(args);
+            vimperator.source(args, special);
         },
         {
             usage: ["so[urce][!] {file}"],
-            short_help: "Read Ex commands from {file}",
+            shortHelp: "Read Ex commands from {file}",
             help: "You can either source files which mostly contain Ex commands like <code class=\"command\">map &lt; gt</code> " +
                   "and put JavaScript code within a:<br/><code class=\"code\">" +
                   "js &lt;&lt;EOF<br/>hello = function () {<br/>&nbsp;&nbsp;alert(\"Hello world\");<br/>}<br/>EOF<br/></code> section.<br/>" +
@@ -1440,43 +1436,43 @@ vimperator.Commands = function () //{{{
                   "The .vimperatorrc file in your home directory and any files in ~/.vimperator/plugin/ are always sourced at startup.<br/>" +
                   "~ is supported as a shortcut for the <var>$HOME</var> directory.<br/>" +
                   "If <code class=\"command\">!</code> is specified, errors are not printed.",
-            completer: function (filter) { return vimperator.completion.get_file_completions(filter); }
+            completer: function (filter) { return vimperator.completion.file(filter); }
         }
     ));
-    addDefaultCommand(new vimperator.Command(["st[op]"],
+    commandManager.add(new vimperator.Command(["st[op]"],
         BrowserStop,
         {
-            short_help: "Stop loading",
+            shortHelp: "Stop loading",
             help: "Stop loading current web page."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["tab"],
+    commandManager.add(new vimperator.Command(["tab"],
         function (args) { vimperator.execute(args, { inTab: true }); },
         {
             usage: ["tab {cmd}"],
-            short_help: "Execute {cmd} and tell it to output in a new tab",
+            shortHelp: "Execute {cmd} and tell it to output in a new tab",
             help: "Works only for commands that support it, currently:" +
                   "<ul><li>:tab help</li>" +
                   "<li>:tab prefs[!]</li></ul>",
-            completer: function (filter) { return vimperator.completion.get_command_completions(filter); }
+            completer: function (filter) { return vimperator.completion.command(filter); }
         }
     ));
-    addDefaultCommand(new vimperator.Command(["tabl[ast]"],
+    commandManager.add(new vimperator.Command(["tabl[ast]"],
         function () { vimperator.tabs.select("$", false); },
         {
-            short_help: "Switch to the last tab"
+            shortHelp: "Switch to the last tab"
         }
     ));
-    addDefaultCommand(new vimperator.Command(["tabm[ove]"],
+    commandManager.add(new vimperator.Command(["tabm[ove]"],
         function (args, special) { vimperator.tabs.move(getBrowser().mCurrentTab, args, special); },
         {
             usage: ["tabm[ove] [N]", "tabm[ove][!] +N | -N"],
-            short_help: "Move the current tab after tab N",
+            shortHelp: "Move the current tab after tab N",
             help: "When N is 0 the current tab is made the first one.  Without N the current tab is made the last one. " +
                   "N can also be prefixed with '+' or '-' to indicate a relative movement. If <code class=\"command\">!</code> is specified the movement wraps around the start or end of the tab list."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["tabn[ext]", "tn[ext]"],
+    commandManager.add(new vimperator.Command(["tabn[ext]", "tn[ext]"],
         // TODO: count support
         function (args)
         {
@@ -1487,7 +1483,7 @@ vimperator.Commands = function () //{{{
             else if (/^\d+$/.test(args))
             {
                 var index = parseInt(args, 10) - 1;
-                if (index < vimperator.tabs.count())
+                if (index < vimperator.tabs.count)
                     vimperator.tabs.select(index, true);
                 else
                     vimperator.beep();
@@ -1499,17 +1495,17 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["tabn[ext] [count]"],
-            short_help: "Switch to the next or [count]th tab",
+            shortHelp: "Switch to the next or [count]th tab",
             help: "Cycles to the first tab when the last is selected and <code class=\"argument\">{count}</code> is not specified."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["tabo[nly]"],
+    commandManager.add(new vimperator.Command(["tabo[nly]"],
         function () { vimperator.tabs.keepOnly(getBrowser().mCurrentTab); },
         {
-            short_help: "Close all other tabs"
+            shortHelp: "Close all other tabs"
         }
     ));
-    addDefaultCommand(new vimperator.Command(["tabopen", "t[open]", "tabnew", "tabe[dit]"],
+    commandManager.add(new vimperator.Command(["tabopen", "t[open]", "tabnew", "tabe[dit]"],
         function (args, special)
         {
             var where = special ? vimperator.NEW_TAB : vimperator.NEW_BACKGROUND_TAB;
@@ -1523,13 +1519,13 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["tabopen [url] [, url]"],
-            short_help: "Open one or more URLs in a new tab",
+            shortHelp: "Open one or more URLs in a new tab",
             help: "Like <code class=\"command\">:open</code> but open URLs in a new tab.<br/>" +
                   "If used with <code class=\"command\">!</code>, the 'tabopen' value of the <code class=\"option\">'activate'</code> option is negated.",
-            completer: function (filter) { return vimperator.completion.get_url_completions(filter); }
+            completer: function (filter) { return vimperator.completion.url(filter); }
         }
     ));
-    addDefaultCommand(new vimperator.Command(["tabp[revious]", "tp[revious]", "tabN[ext]", "tN[ext]"],
+    commandManager.add(new vimperator.Command(["tabp[revious]", "tp[revious]", "tabN[ext]", "tN[ext]"],
         // TODO: count support
         function (args)
         {
@@ -1542,18 +1538,18 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["tabp[revious] [count]"],
-            short_help: "Switch to the previous tab or go [count] tabs back",
+            shortHelp: "Switch to the previous tab or go [count] tabs back",
             help: "Wraps around from the first tab to the last tab."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["tabr[ewind]", "tabfir[st]"],
+    commandManager.add(new vimperator.Command(["tabr[ewind]", "tabfir[st]"],
         function () { vimperator.tabs.select(0, false); },
         {
             usage: ["tabr[ewind]", "tabfir[st]"],
-            short_help: "Switch to the first tab"
+            shortHelp: "Switch to the first tab"
         }
     ));
-    addDefaultCommand(new vimperator.Command(["time"],
+    commandManager.add(new vimperator.Command(["time"],
         function (args, special, count)
         {
             try
@@ -1561,7 +1557,7 @@ vimperator.Commands = function () //{{{
                 if (count > 1)
                 {
                     var i = count;
-                    var before_time = Date.now();
+                    var beforeTime = Date.now();
 
                     if (args && args[0] == ":")
                     {
@@ -1577,43 +1573,43 @@ vimperator.Commands = function () //{{{
                     if (special)
                         return;
 
-                    var after_time = Date.now();
+                    var afterTime = Date.now();
 
-                    if ((after_time - before_time) / count >= 100)
+                    if ((afterTime - beforeTime) / count >= 100)
                     {
-                        var each = ((after_time - before_time) / 1000.0 / count);
-                        var each_units = "sec";
+                        var each = ((afterTime - beforeTime) / 1000.0 / count);
+                        var eachUnits = "sec";
                     }
                     else
                     {
-                        var each = ((after_time - before_time) / count);
-                        var each_units = "msec";
+                        var each = ((afterTime - beforeTime) / count);
+                        var eachUnits = "msec";
                     }
 
-                    if (after_time - before_time >= 100)
+                    if (afterTime - beforeTime >= 100)
                     {
-                        var total = ((after_time - before_time) / 1000.0);
-                        var total_units = "sec";
+                        var total = ((afterTime - beforeTime) / 1000.0);
+                        var totalUnits = "sec";
                     }
                     else
                     {
-                        var total = (after_time - before_time);
-                        var total_units = "msec";
+                        var total = (afterTime - beforeTime);
+                        var totalUnits = "msec";
                     }
 
                     var str = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
                               "<table>" +
                               "<tr align=\"left\" class=\"hl-Title\"><th colspan=\"3\">Code execution summary</th></tr>" +
                               "<tr><td>  Executed:</td><td align=\"right\"><span style=\"color: green\">" + count + "</span></td><td>times</td></tr>" +
-                              "<tr><td>  Each time:</td><td align=\"right\"><span style=\"color: green\">" + each.toFixed(2) + "</span></td><td>" + each_units + "</td></tr>" +
-                              "<tr><td>  Total time:</td><td align=\"right\"><span style=\"color: red\">" + total.toFixed(2) + "</span></td><td>" + total_units + "</td></tr>" +
+                              "<tr><td>  Each time:</td><td align=\"right\"><span style=\"color: green\">" + each.toFixed(2) + "</span></td><td>" + eachUnits + "</td></tr>" +
+                              "<tr><td>  Total time:</td><td align=\"right\"><span style=\"color: red\">" + total.toFixed(2) + "</span></td><td>" + totalUnits + "</td></tr>" +
                               "</table>";
 
                     vimperator.commandline.echo(str, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
                 }
                 else
                 {
-                    var before_time = Date.now();
+                    var beforeTime = Date.now();
                     if (args && args[0] == ":")
                         vimperator.execute(args);
                     else
@@ -1622,12 +1618,12 @@ vimperator.Commands = function () //{{{
                     if (special)
                         return;
 
-                    var after_time = Date.now();
+                    var afterTime = Date.now();
 
-                    if (after_time - before_time >= 100)
-                        vimperator.echo("Total time: " + ((after_time - before_time) / 1000.0).toFixed(2) + " sec");
+                    if (afterTime - beforeTime >= 100)
+                        vimperator.echo("Total time: " + ((afterTime - beforeTime) / 1000.0).toFixed(2) + " sec");
                     else
-                        vimperator.echo("Total time: " + (after_time - before_time) + " msec");
+                        vimperator.echo("Total time: " + (afterTime - beforeTime) + " msec");
                 }
             }
             catch (e)
@@ -1637,14 +1633,14 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["{count}time[!] {code|:command}"],
-            short_help: "Profile a piece of code or a command",
+            shortHelp: "Profile a piece of code or a command",
             help: "Runs <code class=\"argument\">{code} {count}</code> times (default 1) and returns the elapsed time. " +
                   "<code class=\"argument\">{code}</code> is always passed to JavaScript's eval(), which might be slow, so take the results with a grain of salt.<br/>" +
                   "If <code class=\"argument\">{code}</code> starts with a :, it is executed as a Vimperator command.<br/>" +
                   "Use the special version with [!] if you just want to run any command multiple times without showing profiling statistics."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["u[ndo]"],
+    commandManager.add(new vimperator.Command(["u[ndo]"],
         function (args, special, count)
         {
             if (count < 1)
@@ -1667,7 +1663,7 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["[count]u[ndo][!] [url]"],
-            short_help: "Undo closing of a tab",
+            shortHelp: "Undo closing of a tab",
             help: "If a count is given, don't close the last but the <code class=\"argument\">[count]</code>th last tab. " +
                   "With <code class=\"argument\">[url]</code> restores the tab matching the url.",
             completer: function (filter)
@@ -1688,7 +1684,7 @@ vimperator.Commands = function () //{{{
             }
         }
     ));
-    addDefaultCommand(new vimperator.Command(["undoa[ll]"],
+    commandManager.add(new vimperator.Command(["undoa[ll]"],
         function (args, special, count)
         {
             if (count > -1)
@@ -1708,11 +1704,11 @@ vimperator.Commands = function () //{{{
                 undoCloseTab(); // doesn't work with i as the index to undoCloseTab
         },
         {
-            short_help: "Undo closing of all closed tabs",
+            shortHelp: "Undo closing of all closed tabs",
             help: "Firefox stores up to 10 closed tabs, even after a browser restart."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["unl[et]"],
+    commandManager.add(new vimperator.Command(["unl[et]"],
         function (args, special)
         {
             if (!args)
@@ -1736,12 +1732,12 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["unl[et][!] {name} ..."],
-            short_help: "Deletes a variable.",
+            shortHelp: "Deletes a variable.",
             help: "Deletes the variable <code class=\"argument\">{name}</code>." +
                   "Several variable names can be given."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["unm[ap]"],
+    commandManager.add(new vimperator.Command(["unm[ap]"],
         function (args)
         {
             if (!args)
@@ -1759,11 +1755,11 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["unm[ap] {lhs}"],
-            short_help: "Remove the mapping of {lhs}",
+            shortHelp: "Remove the mapping of {lhs}",
             help: ""
         }
     ));
-    addDefaultCommand(new vimperator.Command(["ve[rsion]"],
+    commandManager.add(new vimperator.Command(["ve[rsion]"],
         function (args, special)
         {
             if (special)
@@ -1774,27 +1770,27 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["ve[rsion][!]"],
-            short_help: "Show version information",
+            shortHelp: "Show version information",
             help: "You can show the Firefox version page with <code class=\"command\">:version!</code>."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["viu[sage]"],
+    commandManager.add(new vimperator.Command(["viu[sage]"],
         function (args, special, count, modifiers) { vimperator.help("mappings", special, null, modifiers); },
         {
-            short_help: "Show help for normal mode commands"
+            shortHelp: "Show help for normal mode commands"
         }
     ));
-    addDefaultCommand(new vimperator.Command(["winc[lose]", "wc[lose]"],
+    commandManager.add(new vimperator.Command(["winc[lose]", "wc[lose]"],
         function (args)
         {
             window.close();
         },
         {
             usage: ["winc[ose] [url] [, url]"],
-            short_help: "Close window"
+            shortHelp: "Close window"
         }
     ));
-    addDefaultCommand(new vimperator.Command(["wino[pen]", "wo[pen]", "wine[dit]"],
+    commandManager.add(new vimperator.Command(["wino[pen]", "wo[pen]", "wine[dit]"],
         function (args)
         {
             if (args)
@@ -1804,20 +1800,20 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["wino[pen] [url] [, url]"],
-            short_help: "Open one or more URLs in a new window",
+            shortHelp: "Open one or more URLs in a new window",
             help: "Like <code class=\"command\">:open</code> but open URLs in a new window.<br/>"
         }
     ));
-    addDefaultCommand(new vimperator.Command(["wqa[ll]", "wq", "xa[ll]"],
+    commandManager.add(new vimperator.Command(["wqa[ll]", "wq", "xa[ll]"],
         function () { vimperator.quit(true); },
         {
             usage: ["wqa[ll]", "xa[ll]"],
-            short_help: "Save the session and quit",
+            shortHelp: "Save the session and quit",
             help: "Quit Vimperator, no matter how many tabs/windows are open. The session is stored.<br/>" +
                   "<code class=\"command\">:wq</code> is different as in Vim, as it closes the window instead of just one tab by popular demand. Complain on the mailing list, if you want to change that."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["zo[om]"],
+    commandManager.add(new vimperator.Command(["zo[om]"],
         function (args)
         {
             var level;
@@ -1850,19 +1846,19 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["zo[om] [value]", "zo[om] +{value} | -{value}"],
-            short_help: "Set zoom value of the web page",
+            shortHelp: "Set zoom value of the web page",
             help: "If <code class=\"argument\">{value}</code> can be an absolute value between 1 and 2000% or a relative value if prefixed with - or +. " +
                   "If <code class=\"argument\">{value}</code> is omitted, zoom is reset to 100%."
         },
         {
             usage: ["zo[om][!] [value]", "zo[om][!] +{value} | -{value}"],
-            short_help: "Set zoom value of current web page",
+            shortHelp: "Set zoom value of current web page",
             help: "If <code class=\"argument\">{value}</code> can be an absolute value between 1 and 2000% or a relative value if prefixed with - or +. " +
                   "If <code class=\"argument\">{value}</code> is omitted, zoom is reset to 100%.<br/>" +
                   "Normally this command operates on the text zoom, if used with <code class=\"argument\">[!]</code> it operates on full zoom."
         }
     ));
-    addDefaultCommand(new vimperator.Command(["!", "run"],
+    commandManager.add(new vimperator.Command(["!", "run"],
         function (args, special)
         {
             // :!! needs to be treated specially as the command parser sets the special flag but removes the ! from args
@@ -1870,8 +1866,8 @@ vimperator.Commands = function () //{{{
                 args = "!" + (args || "");
 
             // TODO: better escaping of ! to also substitute \\! correctly
-            args = args.replace(/(^|[^\\])!/g, "$1" + last_run_command);
-            last_run_command = args;
+            args = args.replace(/(^|[^\\])!/g, "$1" + lastRunCommand);
+            lastRunCommand = args;
 
             var output = vimperator.system(args);
             if (output)
@@ -1879,7 +1875,7 @@ vimperator.Commands = function () //{{{
         },
         {
             usage: ["!{cmd}"],
-            short_help: "Run a command",
+            shortHelp: "Run a command",
             help: "Runs <code class=\"argument\">{cmd}</code> through system() and displays its output. " +
                   "Any '!' in <code class=\"argument\">{cmd}</code> is replaced with the previous external command. " +
                   "But not when there is a backslash before the '!', then that backslash is removed.<br/>" +
@@ -1887,6 +1883,8 @@ vimperator.Commands = function () //{{{
         }
     ));
     //}}}
-} //}}}
+
+    return commandManager;
+}; //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/completion.js b/content/completion.js
index 7e49f4fd..d5b34c78 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -26,14 +26,18 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.Completion = function () // {{{
+vimperator.Completion = function () //{{{
 {
-    // The completion substrings, used for showing the longest common match
-    var g_substrings = [];
+    ////////////////////////////////////////////////////////////////////////////////
+    ////////////////////// PRIVATE SECTION /////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////{{{
+
+    // the completion substrings, used for showing the longest common match
+    var substrings = [];
 
     // function uses smartcase
     // list = [ [['com1', 'com2'], 'text'], [['com3', 'com4'], 'text'] ]
-    function build_longest_common_substring(list, filter) //{{{
+    function buildLongestCommonSubstring(list, filter)
     {
         var filtered = [];
         var ignorecase = false;
@@ -51,19 +55,19 @@ vimperator.Completion = function () // {{{
                 if (item.indexOf(filter) == -1)
                     continue;
 
-                if (g_substrings.length == 0)
+                if (substrings.length == 0)
                 {
-                    var last_index = item.lastIndexOf(filter);
+                    var lastIndex = item.lastIndexOf(filter);
                     var length = item.length;
-                    for (var k = item.indexOf(filter); k != -1 && k <= last_index; k = item.indexOf(filter, k + 1))
+                    for (var k = item.indexOf(filter); k != -1 && k <= lastIndex; k = item.indexOf(filter, k + 1))
                     {
                         for (var l = k + filter.length; l <= length; l++)
-                            g_substrings.push(list[i][0][j].substring(k, l));
+                            substrings.push(list[i][0][j].substring(k, l));
                     }
                 }
                 else
                 {
-                    g_substrings = g_substrings.filter(function ($_) {
+                    substrings = substrings.filter(function ($_) {
                         return list[i][0][j].indexOf($_) >= 0;
                     });
                 }
@@ -72,10 +76,10 @@ vimperator.Completion = function () // {{{
             }
         }
         return filtered;
-    } //}}}
+    }
 
-    /* this function is case sensitive and should be documented about input and output ;) */
-    function build_longest_starting_substring(list, filter) //{{{
+    // this function is case sensitive and should be documented about input and output ;)
+    function buildLongestStartingSubstring(list, filter)
     {
         var filtered = [];
         for (var i = 0; i < list.length; i++)
@@ -85,15 +89,15 @@ vimperator.Completion = function () // {{{
                 if (list[i][0][j].indexOf(filter) != 0)
                     continue;
 
-                if (g_substrings.length == 0)
+                if (substrings.length == 0)
                 {
                     var length = list[i][0][j].length;
                     for (var k = filter.length; k <= length; k++)
-                        g_substrings.push(list[i][0][j].substring(0, k));
+                        substrings.push(list[i][0][j].substring(0, k));
                 }
                 else
                 {
-                    g_substrings = g_substrings.filter(function ($_) {
+                    substrings = substrings.filter(function ($_) {
                         return list[i][0][j].indexOf($_) == 0;
                     });
                 }
@@ -102,18 +106,18 @@ vimperator.Completion = function () // {{{
             }
         }
         return filtered;
-    } //}}}
+    }
 
     /* discard all entries in the 'urls' array, which don't match 'filter */
-    function filter_url_array(urls, filter) //{{{
+    function filterUrlArray(urls, filter)
     {
         var filtered = [];
         // completions which don't match the url but just the description
         // list them add the end of the array
-        var additional_completions = [];
+        var additionalCompletions = [];
 
         if (!filter) return urls.map(function ($_) {
-            return [$_[0], $_[1]]
+            return [$_[0], $_[1]];
         });
 
         var ignorecase = false;
@@ -122,7 +126,7 @@ vimperator.Completion = function () // {{{
 
         /*
          * Longest Common Subsequence
-         * This shouldn't use build_longest_common_substring
+         * This shouldn't use buildLongestCommonSubstring
          * for performance reasons, so as not to cycle through the urls twice
          */
         for (var i = 0; i < urls.length; i++)
@@ -138,49 +142,54 @@ vimperator.Completion = function () // {{{
             if (url.indexOf(filter) == -1)
             {
                 if (title.indexOf(filter) != -1)
-                    additional_completions.push([ urls[i][0], urls[i][1] ]);
+                    additionalCompletions.push([ urls[i][0], urls[i][1] ]);
                 continue;
             }
-            if (g_substrings.length == 0)   // Build the substrings
+            if (substrings.length == 0)   // Build the substrings
             {
-                var last_index = url.lastIndexOf(filter);
-                var url_length = url.length;
-                for (var k = url.indexOf(filter); k != -1 && k <= last_index; k = url.indexOf(filter, k + 1))
+                var lastIndex = url.lastIndexOf(filter);
+                var urlLength = url.length;
+                for (var k = url.indexOf(filter); k != -1 && k <= lastIndex; k = url.indexOf(filter, k + 1))
                 {
-                    for (var l = k + filter.length; l <= url_length; l++)
-                        g_substrings.push(url.substring(k, l));
+                    for (var l = k + filter.length; l <= urlLength; l++)
+                        substrings.push(url.substring(k, l));
                 }
             }
             else
             {
-                g_substrings = g_substrings.filter(function ($_) {
+                substrings = substrings.filter(function ($_) {
                     return url.indexOf($_) >= 0;
                 });
             }
             filtered.push([urls[i][0], urls[i][1]]);
         }
 
-        return filtered.concat(additional_completions);
-    } //}}}
+        return filtered.concat(additionalCompletions);
+    }
+
+    /////////////////////////////////////////////////////////////////////////////}}}
+    ////////////////////// PUBLIC SECTION //////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////{{{
 
     return {
+
         /*
          * returns the longest common substring
          * used for the 'longest' setting for wildmode
          */
-        get_longest_substring: function () //{{{
+        getLongestSubstring: function ()
         {
-            if (g_substrings.length == 0)
+            if (substrings.length == 0)
                 return "";
 
-            var longest = g_substrings[0];
-            for (var i = 1; i < g_substrings.length; i++)
+            var longest = substrings[0];
+            for (var i = 1; i < substrings.length; i++)
             {
-                if (g_substrings[i].length > longest.length)
-                    longest = g_substrings[i];
+                if (substrings[i].length > longest.length)
+                    longest = substrings[i];
             }
             return longest;
-        }, //}}}
+        },
 
         /*
          * filter a list of urls
@@ -189,29 +198,29 @@ vimperator.Completion = function () // {{{
          * depending on the 'complete' option
          * if the 'complete' argument is passed like "h", it temporarily overrides the complete option
          */
-        get_url_completions: function (filter, complete) //{{{
+        url: function (filter, complete)
         {
             var completions = [];
-            g_substrings = [];
+            substrings = [];
 
             var cpt = complete || vimperator.options["complete"];
             // join all completion arrays together
             for (var i = 0; i < cpt.length; i++)
             {
                 if (cpt[i] == "s")
-                    completions = completions.concat(this.get_search_completions(filter));
+                    completions = completions.concat(this.search(filter));
                 else if (cpt[i] == "b")
-                    completions = completions.concat(this.get_bookmark_completions(filter));
+                    completions = completions.concat(this.bookmark(filter));
                 else if (cpt[i] == "h")
-                    completions = completions.concat(this.get_history_completions(filter));
+                    completions = completions.concat(this.history(filter));
                 else if (cpt[i] == "f")
-                    completions = completions.concat(this.get_file_completions(filter, true));
+                    completions = completions.concat(this.file(filter, true));
             }
 
             return completions;
-        }, //}}}
+        },
 
-        get_search_completions: function (filter) //{{{
+        search: function (filter)
         {
             var engines = vimperator.bookmarks.getSearchEngines().concat(vimperator.bookmarks.getKeywords());
 
@@ -221,28 +230,28 @@ vimperator.Completion = function () // {{{
             var mapped = engines.map(function (engine) {
                 return [[engine[0]], engine[1]];
             });
-            return build_longest_common_substring(mapped, filter);
-        }, //}}}
+            return buildLongestCommonSubstring(mapped, filter);
+        },
 
-        get_history_completions: function (filter) //{{{
+        history: function (filter)
         {
             var items = vimperator.history.get();
-            return filter_url_array(items, filter);
-        }, //}}}
+            return filterUrlArray(items, filter);
+        },
 
-        get_bookmark_completions: function (filter) //{{{
+        bookmark: function (filter)
         {
             var bookmarks = vimperator.bookmarks.get();
-            return filter_url_array(bookmarks, filter);
-        }, //}}}
+            return filterUrlArray(bookmarks, filter);
+        },
 
         // TODO: support file:// and \ or / path separators on both platforms
-        get_file_completions: function (filter)
+        file: function (filter)
         {
             // this is now also used as part of the url completion, so the
             // substrings shouldn't be cleared for that case
             if (!arguments[1])
-                g_substrings = [];
+                substrings = [];
 
             var matches = filter.match(/^(.*[\/\\])(.*?)$/);
             var dir;
@@ -266,56 +275,56 @@ vimperator.Completion = function () // {{{
             }
 
 
-            return build_longest_starting_substring(mapped, filter);
+            return buildLongestStartingSubstring(mapped, filter);
         },
 
-        get_help_completions: function (filter) //{{{
+        help: function (filter)
         {
-            var help_array = [[["introduction"], "Introductory text"],
-                              [["initialization"], "Initialization and startup"],
-                              [["mappings"], "Normal mode commands"],
-                              [["commands"], "Ex commands"],
-                              [["options"], "Configuration options"]]; // TODO: hardcoded until we have proper 'pages'
-            g_substrings = [];
+            var helpArray = [[["introduction"], "Introductory text"],
+                             [["initialization"], "Initialization and startup"],
+                             [["mappings"], "Normal mode commands"],
+                             [["commands"], "Ex commands"],
+                             [["options"], "Configuration options"]]; // TODO: hardcoded until we have proper 'pages'
+            substrings = [];
             for (var command in vimperator.commands)
-                help_array.push([command.long_names.map(function ($_) { return ":" + $_; }), command.short_help]);
-            options = this.get_options_completions(filter, true);
-            help_array = help_array.concat(options.map(function ($_) {
+                helpArray.push([command.longNames.map(function ($_) { return ":" + $_; }), command.shortHelp]);
+            options = this.option(filter, true);
+            helpArray = helpArray.concat(options.map(function ($_) {
                 return [
                         $_[0].map(function ($_) { return "'" + $_ + "'"; }),
                         $_[1]
                     ];
             }));
             for (var map in vimperator.mappings)
-                help_array.push([map.names, map.short_help]);
+                helpArray.push([map.names, map.shortHelp]);
 
-            if (!filter) return help_array.map(function ($_) {
+            if (!filter) return helpArray.map(function ($_) {
                 return [$_[0][0], $_[1]]; // unfiltered, use the first command
             });
 
-            return build_longest_common_substring(help_array, filter);
-        }, //}}}
+            return buildLongestCommonSubstring(helpArray, filter);
+        },
 
-        get_command_completions: function (filter) //{{{
+        command: function (filter)
         {
-            g_substrings = [];
+            substrings = [];
             var completions = [];
             if (!filter)
             {
                 for (var command in vimperator.commands)
-                    completions.push([command.name, command.short_help]);
+                    completions.push([command.name, command.shortHelp]);
                 return completions;
             }
 
             for (var command in vimperator.commands)
-                completions.push([command.long_names, command.short_help]);
-            return build_longest_starting_substring(completions, filter);
-        }, //}}}
+                completions.push([command.longNames, command.shortHelp]);
+            return buildLongestStartingSubstring(completions, filter);
+        },
 
-        get_options_completions: function (filter, unfiltered) //{{{
+        option: function (filter, unfiltered)
         {
-            g_substrings = [];
-            var options_completions = [];
+            substrings = [];
+            var optionsCompletions = [];
             var prefix = filter.match(/^no|inv/) || "";
 
             if (prefix)
@@ -328,7 +337,7 @@ vimperator.Completion = function () // {{{
                 {
                     if (prefix && option.type != "boolean")
                         continue;
-                    options.push([option.names, option.short_help]);
+                    options.push([option.names, option.shortHelp]);
                 }
                 return options;
             }
@@ -340,7 +349,7 @@ vimperator.Completion = function () // {{{
                 {
                     if (prefix && option.type != "boolean")
                         continue;
-                    options.push([prefix + option.name, option.short_help]);
+                    options.push([prefix + option.name, option.shortHelp]);
                 }
                 return options;
             }
@@ -352,15 +361,15 @@ vimperator.Completion = function () // {{{
                 {
                     if (option.hasName(filter))
                     {
-                            options_completions.push([filter + "=" + option.value, ""]);
-                            return options_completions;
+                            optionsCompletions.push([filter + "=" + option.value, ""]);
+                            return optionsCompletions;
                     }
                 }
-                return options_completions;
+                return optionsCompletions;
             }
 
             // can't use b_l_s_s, since this has special requirements (the prefix)
-            var filter_length = filter.length;
+            var filterLength = filter.length;
             for (var option in vimperator.options)
             {
                 if (prefix && option.type != "boolean")
@@ -371,29 +380,29 @@ vimperator.Completion = function () // {{{
                     if (option.names[j].indexOf(filter) != 0)
                         continue;
 
-                    if (g_substrings.length == 0)
+                    if (substrings.length == 0)
                     {
                         var length = option.names[j].length;
-                        for (var k = filter_length; k <= length; k++)
-                            g_substrings.push(prefix + option.names[j].substring(0, k));
+                        for (var k = filterLength; k <= length; k++)
+                            substrings.push(prefix + option.names[j].substring(0, k));
                     }
                     else
                     {
-                        g_substrings = g_substrings.filter(function ($_) {
+                        substrings = substrings.filter(function ($_) {
                             return option.names[j].indexOf($_) == 0;
                         });
                     }
-                    options_completions.push([prefix + option.names[j], option.short_help]);
+                    optionsCompletions.push([prefix + option.names[j], option.shortHelp]);
                     break;
                 }
             }
 
-            return options_completions;
-        }, //}}}
+            return optionsCompletions;
+        },
 
-        get_buffer_completions: function (filter) //{{{
+        buffer: function (filter)
         {
-            g_substrings = [];
+            substrings = [];
             var items = [];
             var num = getBrowser().browsers.length;
             var title, url;
@@ -424,13 +433,13 @@ vimperator.Completion = function () // {{{
             if (!filter) return items.map(function ($_) {
                 return [$_[0][0], $_[1]];
             });
-            return build_longest_common_substring(items, filter);
-        }, //}}}
+            return buildLongestCommonSubstring(items, filter);
+        },
 
-        get_sidebar_completions: function (filter) //{{{
+        sidebar: function (filter)
         {
-            g_substrings = [];
-            var menu = document.getElementById("viewSidebarMenu")
+            substrings = [];
+            var menu = document.getElementById("viewSidebarMenu");
             var nodes = [];
 
             for (var i = 0; i < menu.childNodes.length; i++)
@@ -443,12 +452,12 @@ vimperator.Completion = function () // {{{
                 return [[node[0]], node[1]];
             });
 
-            return build_longest_common_substring(mapped, filter);
-        }, //}}}
+            return buildLongestCommonSubstring(mapped, filter);
+        },
 
         javascript: function (str) // {{{
         {
-            g_substrings = [];
+            substrings = [];
             var matches = str.match(/^(.*?)(\s*\.\s*)?(\w*)$/);
             var object = "window";
             var filter = matches[3] || "";
@@ -514,18 +523,18 @@ vimperator.Completion = function () // {{{
                 completions = [];
             }
 
-            return build_longest_starting_substring(completions, filter);
+            return buildLongestStartingSubstring(completions, filter);
         }, // }}}
 
         // helper function which checks if the given arguments pass "filter"
         // items must be an array of strings
-        // if case_sensitive == true, be sure to pass filter already in lowercased version
-        match: function (filter, items, case_sensitive)
+        // if caseSensitive == true, be sure to pass filter already in lowercased version
+        match: function (filter, items, caseSensitive)
         {
-            if (typeof(filter) != "string" || !items)
+            if (typeof filter != "string" || !items)
                 return false;
 
-            if (case_sensitive)
+            if (caseSensitive)
             {
                 for (var i = 0; i < items.length; i++)
                 {
@@ -544,7 +553,7 @@ vimperator.Completion = function () // {{{
             return false;
         },
 
-        exTabCompletion: function (str) //{{{
+        exTabCompletion: function (str)
         {
             var [count, cmd, special, args] = vimperator.commands.parseCommand(str);
             var completions = [];
@@ -555,7 +564,7 @@ vimperator.Completion = function () // {{{
             var matches = str.match(/^(:*\d*)\w*$/);
             if (matches)
             {
-                completions = this.get_command_completions(cmd);
+                completions = this.command(cmd);
                 start = matches[1].length;
             }
             else // dynamically get completions as specified with the command's completer function
@@ -587,9 +596,10 @@ vimperator.Completion = function () // {{{
                 }
             }
             return [start, completions];
-        } //}}}
+        }
 
-    }
-} // }}}
+    };
+    //}}}
+}; //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/events.js b/content/events.js
index bf1a7d3c..7519c9e4 100644
--- a/content/events.js
+++ b/content/events.js
@@ -74,7 +74,7 @@ vimperator.Events = function () //{{{
 
     /////////////////////////////////////////////////////////
     // track if a popup is open or the menubar is active
-    var active_menubar = false;
+    var activeMenubar = false;
     function enterPopupMode(event)
     {
         if (event.originalTarget.localName == "tooltip" || event.originalTarget.id == "vimperator-visualbell")
@@ -85,17 +85,17 @@ vimperator.Events = function () //{{{
     function exitPopupMode()
     {
         // gContextMenu is set to NULL by firefox, when a context menu is closed
-        if (!gContextMenu && !active_menubar)
+        if (!gContextMenu && !activeMenubar)
             vimperator.removeMode(null, vimperator.modes.MENU);
     }
     function enterMenuMode()
     {
-        active_menubar = true;
-        vimperator.addMode(null, vimperator.modes.MENU)
+        activeMenubar = true;
+        vimperator.addMode(null, vimperator.modes.MENU);
     }
     function exitMenuMode()
     {
-        active_menubar = false;
+        activeMenubar = false;
         vimperator.removeMode(null, vimperator.modes.MENU);
     }
     window.addEventListener("popupshown", enterPopupMode, true);
@@ -182,7 +182,7 @@ vimperator.Events = function () //{{{
             var tagname = elt.localName.toLowerCase();
             var type = elt.type.toLowerCase();
 
-            if ( (tagname == "input" && (type != "image")) ||
+            if ((tagname == "input" && (type != "image")) ||
                     tagname == "textarea" ||
                     //            tagName == "SELECT" ||
                     //            tagName == "BUTTON" ||
@@ -234,571 +234,579 @@ vimperator.Events = function () //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    this.destroy = function ()
-    {
-        // removeEventListeners() to avoid mem leaks
-        window.dump("TODO: remove all eventlisteners\n");
+    var eventManager = {
 
-        getBrowser().removeProgressListener(this.progressListener);
-
-        window.removeEventListener("popupshown", enterPopupMode, true);
-        window.removeEventListener("popuphidden", exitPopupMode, true);
-        window.removeEventListener("DOMMenuBarActive", enterMenuMode, true);
-        window.removeEventListener("DOMMenuBarInactive", exitMenuMode, true);
-
-        window.removeEventListener("keypress", this.onKeyPress, true);
-        window.removeEventListener("keydown", this.onKeyDown, true);
-    }
-
-    // This method pushes keys into the event queue from vimperator
-    // it is similar to vim's feedkeys() method, but cannot cope with
-    // 2 partially feeded strings, you have to feed one parsable string
-    //
-    // @param keys: a string like "2<C-f>" to pass
-    //              if you want < to be taken literally, prepend it with a \\
-    this.feedkeys = function (keys, noremap)
-    {
-        var doc = window.document;
-        var view = window.document.defaultView;
-        var escapeKey = false; // \ to escape some special keys
-
-        noremap = !!noremap;
-
-        for (var i = 0; i < keys.length; i++)
+        destroy: function ()
         {
-            var charCode = keys.charCodeAt(i);
-            var keyCode = 0;
-            var shift = false, ctrl = false, alt = false, meta = false;
-            //if (charCode == 92) // the '\' key FIXME: support the escape key
-            if (charCode == 60 && !escapeKey) // the '<' key starts a complex key
-            {
-                var matches = keys.substr(i + 1).match(/([CSMAcsma]-)*([^>]+)/);
-                if (matches && matches[2])
-                {
-                    if (matches[1]) // check for modifiers
-                    {
-                        ctrl  = /[cC]-/.test(matches[1]);
-                        alt   = /[aA]-/.test(matches[1]);
-                        shift = /[sS]-/.test(matches[1]);
-                        meta  = /[mM]-/.test(matches[1]);
-                    }
-                    if (matches[2].length == 1)
-                    {
-                        if (!ctrl && !alt && !shift && !meta)
-                            return; // an invalid key like <a>
-                        charCode = matches[2].charCodeAt(0);
-                    }
-                    else if (matches[2].toLowerCase() == "space")
-                    {
-                        charCode = 32;
-                    }
-                    else if (keyCode = getKeyCode(matches[2]))
-                    {
-                        charCode = 0;
-                    }
-                    else //an invalid key like <A-xxx> was found, stop propagation here (like Vim)
-                    {
-                        return;
-                    }
+            // removeEventListeners() to avoid mem leaks
+            window.dump("TODO: remove all eventlisteners\n");
 
-                    i += matches[0].length + 1;
+            getBrowser().removeProgressListener(this.progressListener);
+
+            window.removeEventListener("popupshown", enterPopupMode, true);
+            window.removeEventListener("popuphidden", exitPopupMode, true);
+            window.removeEventListener("DOMMenuBarActive", enterMenuMode, true);
+            window.removeEventListener("DOMMenuBarInactive", exitMenuMode, true);
+
+            window.removeEventListener("keypress", this.onKeyPress, true);
+            window.removeEventListener("keydown", this.onKeyDown, true);
+        },
+
+        // This method pushes keys into the event queue from vimperator
+        // it is similar to vim's feedkeys() method, but cannot cope with
+        // 2 partially feeded strings, you have to feed one parsable string
+        //
+        // @param keys: a string like "2<C-f>" to pass
+        //              if you want < to be taken literally, prepend it with a \\
+        feedkeys: function (keys, noremap)
+        {
+            var doc = window.document;
+            var view = window.document.defaultView;
+            var escapeKey = false; // \ to escape some special keys
+
+            noremap = !!noremap;
+
+            for (var i = 0; i < keys.length; i++)
+            {
+                var charCode = keys.charCodeAt(i);
+                var keyCode = 0;
+                var shift = false, ctrl = false, alt = false, meta = false;
+                //if (charCode == 92) // the '\' key FIXME: support the escape key
+                if (charCode == 60 && !escapeKey) // the '<' key starts a complex key
+                {
+                    var matches = keys.substr(i + 1).match(/([CSMAcsma]-)*([^>]+)/);
+                    if (matches && matches[2])
+                    {
+                        if (matches[1]) // check for modifiers
+                        {
+                            ctrl  = /[cC]-/.test(matches[1]);
+                            alt   = /[aA]-/.test(matches[1]);
+                            shift = /[sS]-/.test(matches[1]);
+                            meta  = /[mM]-/.test(matches[1]);
+                        }
+                        if (matches[2].length == 1)
+                        {
+                            if (!ctrl && !alt && !shift && !meta)
+                                return; // an invalid key like <a>
+                            charCode = matches[2].charCodeAt(0);
+                        }
+                        else if (matches[2].toLowerCase() == "space")
+                        {
+                            charCode = 32;
+                        }
+                        else if (keyCode = getKeyCode(matches[2]))
+                        {
+                            charCode = 0;
+                        }
+                        else //an invalid key like <A-xxx> was found, stop propagation here (like Vim)
+                        {
+                            return;
+                        }
+
+                        i += matches[0].length + 1;
+                    }
+                }
+
+                var elem = window.document.commandDispatcher.focusedElement;
+                if (!elem)
+                    elem = window.content;
+
+                var evt = doc.createEvent("KeyEvents");
+                evt.initKeyEvent("keypress", true, true, view, ctrl, alt, shift, meta, keyCode, charCode);
+                evt.noremap = noremap;
+                elem.dispatchEvent(evt);
+            }
+        },
+
+        // this function converts the given event to
+        // a keycode which can be used in mappings
+        // e.g. pressing ctrl+n would result in the string "<C-n>"
+        // null if unknown key
+        toString: function (event)
+        {
+            if (!event)
+                return;
+
+            var key = null;
+            var modifier = "";
+
+            if (event.ctrlKey)
+                modifier += "C-";
+            if (event.altKey)
+                modifier += "A-";
+            if (event.metaKey)
+                modifier += "M-";
+
+            if (event.type == "keypress")
+            {
+                if (event.charCode == 0)
+                {
+                    if (event.shiftKey)
+                        modifier += "S-";
+
+                    for (var i in keyTable)
+                    {
+                        if (keyTable[i][0] == event.keyCode)
+                        {
+                            key = keyTable[i][1][0];
+                            break;
+                        }
+                    }
+                }
+                // special handling of the Space key
+                else if (event.charCode == 32)
+                {
+                    if (event.shiftKey)
+                        modifier += "S-";
+                    key = "Space";
+                }
+                // a normal key like a, b, c, 0, etc.
+                else if (event.charCode > 0)
+                {
+                    key = String.fromCharCode(event.charCode);
+                    if (modifier.length == 0)
+                        return key;
                 }
             }
-
-            var elem = window.document.commandDispatcher.focusedElement;
-            if (!elem)
-                elem = window.content;
-
-            var evt = doc.createEvent("KeyEvents");
-            evt.initKeyEvent("keypress", true, true, view, ctrl, alt, shift, meta, keyCode, charCode);
-            evt.noremap = noremap;
-            elem.dispatchEvent(evt);
-        }
-    }
-
-    // this function converts the given event to
-    // a keycode which can be used in mappings
-    // e.g. pressing ctrl+n would result in the string "<C-n>"
-    // null if unknown key
-    this.toString = function (event) //{{{
-    {
-        if (!event)
-            return;
-
-        var key = null;
-        var modifier = "";
-
-        if (event.ctrlKey)
-            modifier += "C-";
-        if (event.altKey)
-            modifier += "A-";
-        if (event.metaKey)
-            modifier += "M-";
-
-        if (event.type == "keypress")
-        {
-            if (event.charCode == 0)
+            else if (event.type == "click" || event.type == "dblclick")
             {
                 if (event.shiftKey)
                     modifier += "S-";
+                if (event.type == "dblclick")
+                    modifier += "2-";
+                // TODO: triple and quadruple click
 
-                for (var i in keyTable)
+                switch (event.button)
                 {
-                    if (keyTable[i][0] == event.keyCode)
-                    {
-                        key = keyTable[i][1][0];
+                    case 0:
+                        key = "LeftMouse";
+                        break;
+                    case 1:
+                        key = "MiddleMouse";
+                        break;
+                    case 2:
+                        key = "RightMouse";
                         break;
-                    }
                 }
             }
-            // special handling of the Space key
-            else if (event.charCode == 32)
-            {
-                if (event.shiftKey)
-                    modifier += "S-";
-                key = "Space";
-            }
-            // a normal key like a, b, c, 0, etc.
-            else if (event.charCode > 0)
-            {
-                key = String.fromCharCode(event.charCode);
-                if (modifier.length == 0)
-                    return key;
-            }
-        }
-        else if (event.type == "click" || event.type == "dblclick")
+
+            if (key == null)
+                return null;
+
+            // a key like F1 is always enclosed in < and >
+            return "<" + modifier + key + ">";
+
+        },
+
+        isAcceptKey: function (key)
         {
-            if (event.shiftKey)
-                modifier += "S-";
-            if (event.type == "dblclick")
-                modifier += "2-";
-            // TODO: triple and quadruple click
+            return (key == "<Return>" || key == "<C-j>" || key == "<C-m>");
+        },
 
-            switch (event.button)
-            {
-                case 0:
-                    key = "LeftMouse";
-                    break;
-                case 1:
-                    key = "MiddleMouse";
-                    break;
-                case 2:
-                    key = "RightMouse";
-                    break;
-            }
-        }
-
-        if (key == null)
-            return null;
-
-        // a key like F1 is always enclosed in < and >
-        return "<" + modifier + key + ">";
-
-    } //}}}
-
-    this.isAcceptKey = function (key)
-    {
-        return (key == "<Return>" || key == "<C-j>" || key == "<C-m>");
-    }
-    this.isCancelKey = function (key)
-    {
-        return (key == "<Esc>" || key == "<C-[>" || key == "<C-c>");
-    }
-
-    // global escape handler, is called in ALL modes
-    this.onEscape = function ()
-    {
-        if (!vimperator.hasMode(vimperator.modes.ESCAPE_ONE_KEY))
+        isCancelKey: function (key)
         {
+            return (key == "<Esc>" || key == "<C-[>" || key == "<C-c>");
+        },
+
+        // global escape handler, is called in ALL modes
+        onEscape: function ()
+        {
+            if (!vimperator.hasMode(vimperator.modes.ESCAPE_ONE_KEY))
+            {
+                if (vimperator.hasMode(vimperator.modes.ESCAPE_ALL_KEYS))
+                {
+                    vimperator.removeMode(null, vimperator.modes.ESCAPE_ALL_KEYS);
+                    return;
+                }
+
+                vimperator.setMode(vimperator.modes.NORMAL);
+                vimperator.commandline.clear();
+                vimperator.hints.disableHahMode();
+                vimperator.statusline.updateUrl();
+                vimperator.focusContent();
+            }
+        },
+
+        // this keypress handler gets always called first, even if e.g.
+        // the commandline has focus
+        onKeyPress: function (event)
+        {
+            var key = vimperator.events.toString(event);
+            if (!key)
+                 return true;
+
+            var stop = true; // set to false if we should NOT consume this event but let also firefox handle it
+
+            var win =  document.commandDispatcher.focusedWindow;
+            if (win && win.document.designMode == "on")
+                return true;
+
+            // menus have their own command handlers
+            if (vimperator.hasMode(vimperator.modes.MENU))
+                return true;
+
+            // XXX: for now only, later: input mappings if form element focused
+            if (isFormElemFocused())
+            {
+                if (key == "<S-Insert>")
+                {
+                    var elt = window.document.commandDispatcher.focusedElement;
+
+                    if (elt.setSelectionRange && readFromClipboard())
+                        // readFromClipboard would return 'undefined' if not checked
+                        // dunno about .setSelectionRange
+                    {
+                        var rangeStart = elt.selectionStart; // caret position
+                        var rangeEnd = elt.selectionEnd;
+                        var tempStr1 = elt.value.substring(0,rangeStart);
+                        var tempStr2 = readFromClipboard();
+                        var tempStr3 = elt.value.substring(rangeEnd);
+                        elt.value = tempStr1 + tempStr2  + tempStr3;
+                        elt.selectionStart = rangeStart + tempStr2.length;
+                        elt.selectionEnd = elt.selectionStart;
+                        event.preventDefault();
+                        // prevents additional firefox-clipboard pasting
+                    }
+                }
+                return false;
+            }
+
+            // handle Escape-one-key mode (Ctrl-v)
+            if (vimperator.hasMode(vimperator.modes.ESCAPE_ONE_KEY) && !vimperator.hasMode(vimperator.modes.ESCAPE_ALL_KEYS))
+            {
+                vimperator.removeMode(null, vimperator.modes.ESCAPE_ONE_KEY);
+                return true;
+            }
+            // handle Escape-all-keys mode (I)
             if (vimperator.hasMode(vimperator.modes.ESCAPE_ALL_KEYS))
             {
-                vimperator.removeMode(null, vimperator.modes.ESCAPE_ALL_KEYS);
-                return;
+                if (vimperator.hasMode(vimperator.modes.ESCAPE_ONE_KEY))
+                    vimperator.removeMode(null, vimperator.modes.ESCAPE_ONE_KEY); // and then let flow continue
+                else if (key == "<Esc>" || key == "<C-[>" || key == "<C-v>")
+                    ; // let flow continue to handle these keys
+                else
+                    return true;
             }
 
-            vimperator.setMode(vimperator.modes.NORMAL);
-            vimperator.commandline.clear();
-            vimperator.hints.disableHahMode();
-            vimperator.statusline.updateUrl();
-            vimperator.focusContent();
-        }
-    }
+            // FIXME: proper way is to have a better onFocus handler which also handles events for the XUL
+            if (!vimperator.hasMode(vimperator.modes.COMMAND_LINE) &&
+                        isFormElemFocused()) // non insert mode, but e.g. the location bar has focus
+                    return true;
 
-    // this keypress handler gets always called first, even if e.g.
-    // the commandline has focus
-    this.onKeyPress = function (event)
-    {
-        var key = vimperator.events.toString(event);
-        if (!key)
-             return true;
-
-        var stop = true; // set to false if we should NOT consume this event but let also firefox handle it
-
-        var win =  document.commandDispatcher.focusedWindow;
-        if (win && win.document.designMode == "on")
-            return true;
-
-        if (vimperator.hasMode(vimperator.modes.MENU))
-            return true;
-
-        // XXX: for now only, later: input mappings if form element focused
-        if (isFormElemFocused())
-        {
-            if (key == "<S-Insert>")
+            if (vimperator.hasMode(vimperator.modes.COMMAND_LINE) &&
+                vimperator.hasMode(vimperator.modes.WRITE_MULTILINE))
             {
-                var elt = window.document.commandDispatcher.focusedElement;
-
-                if (elt.setSelectionRange && readFromClipboard())
-                    // readFromClipboard would return 'undefined' if not checked
-                    // dunno about .setSelectionRange
-                {
-                    var rangeStart = elt.selectionStart; // caret position
-                    var rangeEnd = elt.selectionEnd;
-                    var tempStr1 = elt.value.substring(0,rangeStart);
-                    var tempStr2 = readFromClipboard();
-                    var tempStr3 = elt.value.substring(rangeEnd);
-                    elt.value = tempStr1 + tempStr2  + tempStr3;
-                    elt.selectionStart = rangeStart + tempStr2.length;
-                    elt.selectionEnd = elt.selectionStart;
-                    event.preventDefault();
-                    // prevents additional firefox-clipboard pasting
-                }
-            }
-            return false;
-        }
-
-        // handle Escape-one-key mode (Ctrl-v)
-        if (vimperator.hasMode(vimperator.modes.ESCAPE_ONE_KEY) && !vimperator.hasMode(vimperator.modes.ESCAPE_ALL_KEYS))
-        {
-            vimperator.removeMode(null, vimperator.modes.ESCAPE_ONE_KEY);
-            return true;
-        }
-        // handle Escape-all-keys mode (I)
-        if (vimperator.hasMode(vimperator.modes.ESCAPE_ALL_KEYS))
-        {
-            if (vimperator.hasMode(vimperator.modes.ESCAPE_ONE_KEY))
-                vimperator.removeMode(null, vimperator.modes.ESCAPE_ONE_KEY); // and then let flow continue
-            else if (key == "<Esc>" || key == "<C-[>" || key == "<C-v>")
-                ; // let flow continue to handle these keys
-            else
-                return true;
-        }
-
-        // FIXME: proper way is to have a better onFocus handler which also handles events for the XUL
-        if (!vimperator.hasMode(vimperator.modes.COMMAND_LINE) &&
-                    isFormElemFocused()) // non insert mode, but e.g. the location bar has focus
-                return true;
-
-        if (vimperator.hasMode(vimperator.modes.COMMAND_LINE) &&
-            vimperator.hasMode(vimperator.modes.WRITE_MULTILINE))
-        {
-            vimperator.commandline.onMultilineOutputEvent(event);
-            return false;
-        }
-
-        // XXX: ugly hack for now pass certain keys to firefox as they are without beeping
-        // also fixes key navigation in combo boxes, etc.
-        if (vimperator.hasMode(vimperator.modes.NORMAL))
-        {
-            if (key == "<Tab>" || key == "<S-Tab>" || key == "<Return>" || key == "<Space>" || key == "<Up>" || key == "<Down>")
+                vimperator.commandline.onMultilineOutputEvent(event);
                 return false;
-        }
-
-
-    //  // FIXME: handle middle click in content area {{{
-    //  //     alert(event.target.id);
-    //  if (/*event.type == 'mousedown' && */event.button == 1 && event.target.id == 'content')
-    //  {
-    //      //echo("foo " + event.target.id);
-    //      //if (document.commandDispatcher.focusedElement == command_line.inputField)
-    //      {
-    //      //alert(command_line.value.substring(0, command_line.selectionStart));
-    //          command_line.value = command_line.value.substring(0, command_line.selectionStart) +
-    //                               readFromClipboard() +
-    //                               command_line.value.substring(command_line.selectionEnd, command_line.value.length);
-    //         alert(command_line.value);
-    //      }
-    //      //else
-    // //       {
-    // //           openURLs(readFromClipboard());
-    // //       }
-    //      return true;
-    //  } }}}
-
-
-        // if Hit-a-hint mode is on, special handling of keys is required
-        // FIXME: total mess
-        if (vimperator.hasMode(vimperator.modes.HINTS))
-        {
-            // never propagate this key to firefox, when hints are visible
-            //event.preventDefault();
-            //event.stopPropagation();
-
-            var map = vimperator.mappings.get(vimperator.modes.HINTS, key);
-            if (map)
-            {
-                if (map.always_active || vimperator.hints.currentState() == 1)
-                {
-                    map.execute(null, vimperator.input.count);
-                    if (map.cancel_mode) // stop processing this event
-                    {
-                        vimperator.hints.disableHahMode();
-                        vimperator.input.buffer = "";
-                        vimperator.statusline.updateInputBuffer("");
-                        return false;
-                    }
-                    else
-                    {
-                        // FIXME: make sure that YOU update the statusbar message yourself
-                        // first in g_hint_mappings when in this mode!
-                        vimperator.statusline.updateInputBuffer(vimperator.input.buffer);
-                        return false;
-                    }
-                }
             }
 
-            // no mapping found, beep()
-            if (vimperator.hints.currentState() == 1)
+            // XXX: ugly hack for now pass certain keys to firefox as they are without beeping
+            // also fixes key navigation in combo boxes, etc.
+            if (vimperator.hasMode(vimperator.modes.NORMAL))
             {
-                vimperator.beep();
-                vimperator.hints.disableHahMode();
-                vimperator.input.buffer = "";
+                if (key == "<Tab>" || key == "<S-Tab>" || key == "<Return>" || key == "<Space>" || key == "<Up>" || key == "<Down>")
+                    return false;
+            }
+
+
+        //  // FIXME: handle middle click in content area {{{
+        //  //     alert(event.target.id);
+        //  if (/*event.type == 'mousedown' && */event.button == 1 && event.target.id == 'content')
+        //  {
+        //      //echo("foo " + event.target.id);
+        //      //if (document.commandDispatcher.focusedElement == command_line.inputField)
+        //      {
+        //      //alert(command_line.value.substring(0, command_line.selectionStart));
+        //          command_line.value = command_line.value.substring(0, command_line.selectionStart) +
+        //                               readFromClipboard() +
+        //                               command_line.value.substring(command_line.selectionEnd, command_line.value.length);
+        //         alert(command_line.value);
+        //      }
+        //      //else
+        // //       {
+        // //           openURLs(readFromClipboard());
+        // //       }
+        //      return true;
+        //  } }}}
+
+
+            // if Hit-a-hint mode is on, special handling of keys is required
+            // FIXME: total mess
+            if (vimperator.hasMode(vimperator.modes.HINTS))
+            {
+                // never propagate this key to firefox, when hints are visible
+                //event.preventDefault();
+                //event.stopPropagation();
+
+                var map = vimperator.mappings.get(vimperator.modes.HINTS, key);
+                if (map)
+                {
+                    if (map.alwaysActive || vimperator.hints.currentState() == 1)
+                    {
+                        map.execute(null, vimperator.input.count);
+                        if (map.cancelMode) // stop processing this event
+                        {
+                            vimperator.hints.disableHahMode();
+                            vimperator.input.buffer = "";
+                            vimperator.statusline.updateInputBuffer("");
+                            return false;
+                        }
+                        else
+                        {
+                            // FIXME: make sure that YOU update the statusbar message yourself
+                            // first in g_hint_mappings when in this mode!
+                            vimperator.statusline.updateInputBuffer(vimperator.input.buffer);
+                            return false;
+                        }
+                    }
+                }
+
+                // no mapping found, beep()
+                if (vimperator.hints.currentState() == 1)
+                {
+                    vimperator.beep();
+                    vimperator.hints.disableHahMode();
+                    vimperator.input.buffer = "";
+                    vimperator.statusline.updateInputBuffer(vimperator.input.buffer);
+                    return true;
+                }
+
+                // if we came here, let hit-a-hint process the key as it is part
+                // of a partial link
+                var res = vimperator.hints.processEvent(event);
+                if (res < 0) // error occured processing this key
+                {
+                    vimperator.beep();
+                    if (vimperator.hasMode(vimperator.modes.QUICK_HINT))
+                        vimperator.hints.disableHahMode();
+                    else // ALWAYS mode
+                        vimperator.hints.resetHintedElements();
+                    vimperator.input.buffer = "";
+                }
+                else if (res == 0 || vimperator.hasMode(vimperator.modes.EXTENDED_HINT)) // key processed, part of a larger hint
+                    vimperator.input.buffer += key;
+                else // this key completed a quick hint
+                {
+                    // if the hint is all in UPPERCASE, open it in new tab
+                    vimperator.input.buffer += key;
+                    if (/[A-Za-z]/.test(vimperator.input.buffer) && vimperator.input.buffer.toUpperCase() == vimperator.input.buffer)
+                        vimperator.hints.openHints(true, false);
+                    else // open in current window
+                        vimperator.hints.openHints(false, false);
+
+                    if (vimperator.hasMode(vimperator.modes.QUICK_HINT))
+                        vimperator.hints.disableHahMode();
+                    else // ALWAYS mode
+                        vimperator.hints.resetHintedElements();
+
+                    vimperator.input.buffer = "";
+                }
+
                 vimperator.statusline.updateInputBuffer(vimperator.input.buffer);
                 return true;
             }
 
-            // if we came here, let hit-a-hint process the key as it is part
-            // of a partial link
-            var res = vimperator.hints.processEvent(event);
-            if (res < 0) // error occured processing this key
-            {
-                vimperator.beep();
-                if (vimperator.hasMode(vimperator.modes.QUICK_HINT))
-                    vimperator.hints.disableHahMode();
-                else // ALWAYS mode
-                    vimperator.hints.resetHintedElements();
-                vimperator.input.buffer = "";
-            }
-            else if (res == 0 || vimperator.hasMode(vimperator.modes.EXTENDED_HINT)) // key processed, part of a larger hint
-                vimperator.input.buffer += key;
-            else // this key completed a quick hint
-            {
-                // if the hint is all in UPPERCASE, open it in new tab
-                vimperator.input.buffer += key;
-                if (/[A-Za-z]/.test(vimperator.input.buffer) && vimperator.input.buffer.toUpperCase() == vimperator.input.buffer)
-                    vimperator.hints.openHints(true, false);
-                else // open in current window
-                    vimperator.hints.openHints(false, false);
-
-                if (vimperator.hasMode(vimperator.modes.QUICK_HINT))
-                    vimperator.hints.disableHahMode();
-                else // ALWAYS mode
-                    vimperator.hints.resetHintedElements();
-
-                vimperator.input.buffer = "";
-            }
-
-            vimperator.statusline.updateInputBuffer(vimperator.input.buffer);
-            return true;
-        }
-
-        var count_str = vimperator.input.buffer.match(/^[0-9]*/)[0];
-        var candidate_command = (vimperator.input.buffer + key).replace(count_str, "");
-        var map;
-        if (event.noremap)
-            map = vimperator.mappings.getDefaultMap(vimperator.modes.NORMAL, candidate_command);
-        else
-            map = vimperator.mappings.get(vimperator.modes.NORMAL, candidate_command);
-
-        // counts must be at the start of a complete mapping (10j -> go 10 lines down)
-        if ((vimperator.input.buffer + key).match(/^[1-9][0-9]*$/))
-        {
-            // no count for insert mode mappings
-            if (vimperator.hasMode(vimperator.modes.COMMAND_LINE))
-                stop = false;
+            var countStr = vimperator.input.buffer.match(/^[0-9]*/)[0];
+            var candidateCommand = (vimperator.input.buffer + key).replace(countStr, "");
+            var map;
+            if (event.noremap)
+                map = vimperator.mappings.getDefaultMap(vimperator.modes.NORMAL, candidateCommand);
             else
-                vimperator.input.buffer += key;
-        }
-        else if (vimperator.input.pendingArgMap)
-        {
-            vimperator.input.buffer = "";
+                map = vimperator.mappings.get(vimperator.modes.NORMAL, candidateCommand);
 
-            if (key != "<Esc>" && key != "<C-[>")
-                vimperator.input.pendingArgMap.execute(null, vimperator.input.count, key);
-
-            vimperator.input.pendingArgMap = null;
-        }
-        else if (map)
-        {
-            vimperator.input.count = parseInt(count_str, 10);
-            if (isNaN(vimperator.input.count))
-                vimperator.input.count = -1;
-            if (map.flags & vimperator.Mappings.flags.ARGUMENT)
+            // counts must be at the start of a complete mapping (10j -> go 10 lines down)
+            if ((vimperator.input.buffer + key).match(/^[1-9][0-9]*$/))
             {
-                vimperator.input.pendingArgMap = map;
-                vimperator.input.buffer += key;
+                // no count for insert mode mappings
+                if (vimperator.hasMode(vimperator.modes.COMMAND_LINE))
+                    stop = false;
+                else
+                    vimperator.input.buffer += key;
             }
-            else if (vimperator.input.pendingMotionMap)
+            else if (vimperator.input.pendingArgMap)
             {
+                vimperator.input.buffer = "";
+
                 if (key != "<Esc>" && key != "<C-[>")
-                {
-                    vimperator.input.pendingMotionMap.execute(candidate_command, vimperator.input.count, null);
-                }
-                vimperator.input.pendingMotionMap = null;
-                vimperator.input.buffer = "";
+                    vimperator.input.pendingArgMap.execute(null, vimperator.input.count, key);
+
+                vimperator.input.pendingArgMap = null;
             }
-            // no count support for these commands yet
-            else if (map.flags & vimperator.Mappings.flags.MOTION)
+            else if (map)
             {
-                vimperator.input.pendingMotionMap = map;
-                vimperator.input.buffer = "";
+                vimperator.input.count = parseInt(countStr, 10);
+                if (isNaN(vimperator.input.count))
+                    vimperator.input.count = -1;
+                if (map.flags & vimperator.Mappings.flags.ARGUMENT)
+                {
+                    vimperator.input.pendingArgMap = map;
+                    vimperator.input.buffer += key;
+                }
+                else if (vimperator.input.pendingMotionMap)
+                {
+                    if (key != "<Esc>" && key != "<C-[>")
+                    {
+                        vimperator.input.pendingMotionMap.execute(candidateCommand, vimperator.input.count, null);
+                    }
+                    vimperator.input.pendingMotionMap = null;
+                    vimperator.input.buffer = "";
+                }
+                // no count support for these commands yet
+                else if (map.flags & vimperator.Mappings.flags.MOTION)
+                {
+                    vimperator.input.pendingMotionMap = map;
+                    vimperator.input.buffer = "";
+                }
+                else
+                {
+                    vimperator.input.buffer = "";
+                    map.execute(null, vimperator.input.count);
+                }
+            }
+            else if (vimperator.mappings.getCandidates(vimperator.modes.NORMAL, candidateCommand).length > 0)
+            {
+                vimperator.input.buffer += key;
             }
             else
             {
                 vimperator.input.buffer = "";
-                map.execute(null, vimperator.input.count);
+                vimperator.input.pendingArgMap = null;
+                vimperator.input.pendingMotionMap = null;
+
+                // allow key to be passed to firefox if we can't handle it
+                stop = false;
+
+                // TODO: see if this check is needed or are all motion commands already mapped in these modes?
+                if (!vimperator.hasMode(vimperator.modes.COMMAND_LINE))
+                    vimperator.beep();
             }
-        }
-        else if (vimperator.mappings.getCandidates(vimperator.modes.NORMAL, candidate_command).length > 0)
-        {
-            vimperator.input.buffer += key;
-        }
-        else
-        {
-            vimperator.input.buffer = "";
-            vimperator.input.pendingArgMap = null;
-            vimperator.input.pendingMotionMap = null;
 
-            // allow key to be passed to firefox if we can't handle it
-            stop = false;
+            if (stop)
+            {
+                event.preventDefault();
+                event.stopPropagation();
+            }
 
-            // TODO: see if this check is needed or are all motion commands already mapped in these modes?
-            if (!vimperator.hasMode(vimperator.modes.COMMAND_LINE))
-                vimperator.beep();
-        }
+            var motionMap = (vimperator.input.pendingMotionMap && vimperator.input.pendingMotionMap.names[0]) || "";
+            vimperator.statusline.updateInputBuffer(motionMap + vimperator.input.buffer);
+            return false;
+        },
 
-        if (stop)
+        // this is need for sites like msn.com which focus the input field on keydown
+        onKeyUpOrDown: function (event)
         {
-            event.preventDefault();
+            if (vimperator.hasMode(vimperator.modes.ESCAPE_ONE_KEY) || vimperator.hasMode(vimperator.modes.ESCAPE_ALL_KEYS) || isFormElemFocused())
+                return true;
+
             event.stopPropagation();
+            return false;
+        },
+
+        progressListener: {
+            QueryInterface: function (aIID)
+            {
+                if (aIID.equals(Components.interfaces.nsIWebProgressListener) ||
+                        aIID.equals(Components.interfaces.nsIXULBrowserWindow) || // for setOverLink();
+                        aIID.equals(Components.interfaces.nsISupportsWeakReference) ||
+                        aIID.equals(Components.interfaces.nsISupports))
+                    return this;
+                throw Components.results.NS_NOINTERFACE;
+            },
+
+            // XXX: function may later be needed to detect a canceled synchronous openURL()
+            onStateChange: function (webProgress, aRequest, flags, aStatus)
+            {
+                // STATE_IS_DOCUMENT | STATE_IS_WINDOW is important, because we also
+                // receive statechange events for loading images and other parts of the web page
+                if (flags & (Components.interfaces.nsIWebProgressListener.STATE_IS_DOCUMENT |
+                            Components.interfaces.nsIWebProgressListener.STATE_IS_WINDOW))
+                {
+                    // This fires when the load event is initiated
+                    if (flags & Components.interfaces.nsIWebProgressListener.STATE_START)
+                    {
+                        vimperator.statusline.updateProgress(0);
+                    }
+                    else if (flags & Components.interfaces.nsIWebProgressListener.STATE_STOP)
+                        ;// vimperator.statusline.updateUrl();
+                }
+            },
+            // for notifying the user about secure web pages
+            onSecurityChange: function (webProgress, aRequest, aState)
+            {
+                const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
+                if (aState & nsIWebProgressListener.STATE_IS_INSECURE)
+                    vimperator.statusline.setClass("insecure");
+                else if (aState & nsIWebProgressListener.STATE_IS_BROKEN)
+                    vimperator.statusline.setClass("broken");
+                else if (aState & nsIWebProgressListener.STATE_IS_SECURE)
+                    vimperator.statusline.setClass("secure");
+            },
+            onStatusChange: function (webProgress, request, status, message)
+            {
+                vimperator.statusline.updateUrl(message);
+            },
+            onProgressChange: function (webProgress, request, curSelfProgress, maxSelfProgress, curTotalProgress, maxTotalProgress)
+            {
+                vimperator.statusline.updateProgress(curTotalProgress/maxTotalProgress);
+            },
+            // happens when the users switches tabs
+            onLocationChange: function ()
+            {
+                vimperator.statusline.updateUrl();
+                vimperator.statusline.updateProgress();
+
+                // if this is not delayed we get the position of the old buffer
+                setTimeout(function () { vimperator.statusline.updateBufferPosition(); }, 100);
+            },
+            // called at the very end of a page load
+            asyncUpdateUI: function ()
+            {
+                setTimeout(vimperator.statusline.updateUrl, 100);
+            },
+            setOverLink : function (link, b)
+            {
+                var ssli = vimperator.options["showstatuslinks"];
+                if (link && ssli)
+                {
+                    if (ssli == 1)
+                        vimperator.statusline.updateUrl("Link: " + link);
+                    else if (ssli == 2)
+                        vimperator.echo("Link: " + link, vimperator.commandline.DISALLOW_MULTILINE);
+                }
+
+                if (link == "")
+                {
+                    if (ssli == 1)
+                        vimperator.statusline.updateUrl();
+                    else if (ssli == 2)
+                        vimperator.setMode(); // trick to reshow the mode in the command line
+                }
+            },
+
+            // stub functions for the interfaces
+            setJSStatus: function (status) { ; },
+            setJSDefaultStatus: function (status) { ; },
+            setDefaultStatus: function (status) { ; },
+            onLinkIconAvailable: function () { ; }
         }
 
-        var motion_map = (vimperator.input.pendingMotionMap && vimperator.input.pendingMotionMap.names[0]) || "";
-        vimperator.statusline.updateInputBuffer(motion_map + vimperator.input.buffer);
-        return false;
-    }
-    window.addEventListener("keypress", this.onKeyPress, true);
-
-    // this is need for sites like msn.com which focus the input field on keydown
-    this.onKeyUpOrDown = function (event)
-    {
-        if (vimperator.hasMode(vimperator.modes.ESCAPE_ONE_KEY) || vimperator.hasMode(vimperator.modes.ESCAPE_ALL_KEYS) || isFormElemFocused())
-            return true;
-
-        event.stopPropagation();
-        return false;
-    }
-    window.addEventListener("keydown", this.onKeyUpOrDown, true);
-    window.addEventListener("keyup", this.onKeyUpOrDown, true);
-
-    this.progressListener =
-    {
-        QueryInterface: function (aIID)
-        {
-            if (aIID.equals(Components.interfaces.nsIWebProgressListener) ||
-                    aIID.equals(Components.interfaces.nsIXULBrowserWindow) || // for setOverLink();
-                    aIID.equals(Components.interfaces.nsISupportsWeakReference) ||
-                    aIID.equals(Components.interfaces.nsISupports))
-                return this;
-            throw Components.results.NS_NOINTERFACE;
-        },
-
-        // XXX: function may later be needed to detect a canceled synchronous openURL()
-        onStateChange: function (webProgress, aRequest, flags, aStatus)
-        {
-            // STATE_IS_DOCUMENT | STATE_IS_WINDOW is important, because we also
-            // receive statechange events for loading images and other parts of the web page
-            if (flags & (Components.interfaces.nsIWebProgressListener.STATE_IS_DOCUMENT |
-                        Components.interfaces.nsIWebProgressListener.STATE_IS_WINDOW))
-            {
-                // This fires when the load event is initiated
-                if (flags & Components.interfaces.nsIWebProgressListener.STATE_START)
-                {
-                    vimperator.statusline.updateProgress(0);
-                }
-                else if (flags & Components.interfaces.nsIWebProgressListener.STATE_STOP)
-                    ;// vimperator.statusline.updateUrl();
-            }
-        },
-        // for notifying the user about secure web pages
-        onSecurityChange: function (webProgress, aRequest, aState)
-        {
-            const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
-            if (aState & nsIWebProgressListener.STATE_IS_INSECURE)
-                vimperator.statusline.setClass("insecure");
-            else if (aState & nsIWebProgressListener.STATE_IS_BROKEN)
-                vimperator.statusline.setClass("broken");
-            else if (aState & nsIWebProgressListener.STATE_IS_SECURE)
-                vimperator.statusline.setClass("secure");
-        },
-        onStatusChange: function (webProgress, request, status, message)
-        {
-            vimperator.statusline.updateUrl(message);
-        },
-        onProgressChange: function (webProgress, request, curSelfProgress, maxSelfProgress, curTotalProgress, maxTotalProgress)
-        {
-            vimperator.statusline.updateProgress(curTotalProgress/maxTotalProgress);
-        },
-        // happens when the users switches tabs
-        onLocationChange: function ()
-        {
-            vimperator.statusline.updateUrl();
-            vimperator.statusline.updateProgress();
-
-            // if this is not delayed we get the position of the old buffer
-            setTimeout(function () { vimperator.statusline.updateBufferPosition(); }, 100);
-        },
-        // called at the very end of a page load
-        asyncUpdateUI: function ()
-        {
-            setTimeout(vimperator.statusline.updateUrl, 100);
-        },
-        setOverLink : function (link, b)
-        {
-            var ssli = vimperator.options["showstatuslinks"];
-            if (link && ssli)
-            {
-                if (ssli == 1)
-                    vimperator.statusline.updateUrl("Link: " + link);
-                else if (ssli == 2)
-                    vimperator.echo("Link: " + link, vimperator.commandline.DISALLOW_MULTILINE);
-            }
-
-            if (link == "")
-            {
-                if (ssli == 1)
-                    vimperator.statusline.updateUrl();
-                else if (ssli == 2)
-                    vimperator.setMode(); // trick to reshow the mode in the command line
-            }
-        },
-
-        // stub functions for the interfaces
-        setJSStatus: function (status) { ; },
-        setJSDefaultStatus: function (status) { ; },
-        setDefaultStatus: function (status) { ; },
-        onLinkIconAvailable: function () { ; }
     };
 
-    window.XULBrowserWindow = this.progressListener;
+    window.XULBrowserWindow = eventManager.progressListener;
     window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
         .getInterface(Components.interfaces.nsIWebNavigation)
         .QueryInterface(Components.interfaces.nsIDocShellTreeItem).treeOwner
         .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
         .getInterface(Components.interfaces.nsIXULWindow)
         .XULBrowserWindow = window.XULBrowserWindow;
-    getBrowser().addProgressListener(this.progressListener, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
+    getBrowser().addProgressListener(eventManager.progressListener, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
+
+    window.addEventListener("keypress", eventManager.onKeyPress,    true);
+    window.addEventListener("keydown",  eventManager.onKeyUpOrDown, true);
+    window.addEventListener("keyup",    eventManager.onKeyUpOrDown, true);
+
+    return eventManager;
     //}}}
-} //}}}
+}; //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/find.js b/content/find.js
index ed0ad6fc..ecc4c24e 100644
--- a/content/find.js
+++ b/content/find.js
@@ -39,27 +39,32 @@ the terms of any one of the MPL, the GPL or the LGPL.
 // make sure you only create this object when the "vimperator" object is ready
 vimperator.Search = function () //{{{
 {
-    var self = this;                   // needed for callbacks since "this" is the "vimperator" object in a callback
-    var found = false;                 // true if the last search was successful
-    var backwards = false;             // currently searching backwards
-    var search_string = "";            // current search string (without modifiers)
-    var search_pattern = "";           // current search string (includes modifiers)
-    var last_search_pattern = "";      // the last searched pattern (includes modifiers)
-    var last_search_string = "";       // the last searched string (without modifiers)
-    var last_search_backwards = false; // like "backwards", but for the last search, so if you cancel a search with <esc> this is not set
-    var case_sensitive = false;        // search string is case sensitive
-    var links_only = false;            // search is limited to link text only
+    ////////////////////////////////////////////////////////////////////////////////
+    ////////////////////// PRIVATE SECTION /////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////{{{
+
+    // FIXME:
+    //var self = this;               // needed for callbacks since "this" is the "vimperator" object in a callback
+    var found = false;               // true if the last search was successful
+    var backwards = false;           // currently searching backwards
+    var searchString = "";           // current search string (without modifiers)
+    var searchPattern = "";          // current search string (includes modifiers)
+    var lastSearchPattern = "";      // the last searched pattern (includes modifiers)
+    var lastSearchString = "";       // the last searched string (without modifiers)
+    var lastSearchBackwards = false; // like "backwards", but for the last search, so if you cancel a search with <esc> this is not set
+    var caseSensitive = false;       // search string is case sensitive
+    var linksOnly = false;           // search is limited to link text only
 
     // Event handlers for search - closure is needed
-    vimperator.registerCallback("change", vimperator.modes.SEARCH_FORWARD, function (command) { self.searchKeyPressed(command); });
-    vimperator.registerCallback("submit", vimperator.modes.SEARCH_FORWARD, function (command) { self.searchSubmitted(command); });
-    vimperator.registerCallback("cancel", vimperator.modes.SEARCH_FORWARD, function () { self.searchCanceled(); });
+    vimperator.registerCallback("change", vimperator.modes.SEARCH_FORWARD, function (command) { vimperator.search.searchKeyPressed(command); });
+    vimperator.registerCallback("submit", vimperator.modes.SEARCH_FORWARD, function (command) { vimperator.search.searchSubmitted(command); });
+    vimperator.registerCallback("cancel", vimperator.modes.SEARCH_FORWARD, function () { vimperator.search.searchCanceled(); });
     // TODO: allow advanced modes in register/triggerCallback
-    vimperator.registerCallback("change", vimperator.modes.SEARCH_BACKWARD, function (command) { self.searchKeyPressed(command); });
-    vimperator.registerCallback("submit", vimperator.modes.SEARCH_BACKWARD, function (command) { self.searchSubmitted(command); });
-    vimperator.registerCallback("cancel", vimperator.modes.SEARCH_BACKWARD, function () { self.searchCanceled(); });
+    vimperator.registerCallback("change", vimperator.modes.SEARCH_BACKWARD, function (command) { vimperator.search.searchKeyPressed(command); });
+    vimperator.registerCallback("submit", vimperator.modes.SEARCH_BACKWARD, function (command) { vimperator.search.searchSubmitted(command); });
+    vimperator.registerCallback("cancel", vimperator.modes.SEARCH_BACKWARD, function () { vimperator.search.searchCanceled(); });
 
-    // set search_string, search_pattern, case_sensitive, links_only
+    // set searchString, searchPattern, caseSensitive, linksOnly
     function processUserPattern(pattern)
     {
         // strip off pattern terminator and offset
@@ -68,32 +73,32 @@ vimperator.Search = function () //{{{
         else
             pattern = pattern.replace(/\/.*/, "");
 
-        search_pattern = pattern;
+        searchPattern = pattern;
 
         // links only search - \l wins if both modifiers specified
         if (/\\l/.test(pattern))
-            links_only = false;
+            linksOnly = false;
         else if (/\L/.test(pattern))
-            links_only = true;
+            linksOnly = true;
         else if (vimperator.options["linksearch"])
-            links_only = true;
+            linksOnly = true;
         else
-            links_only = false;
+            linksOnly = false;
 
         // strip links-only modifiers
         pattern = pattern.replace(/(\\)?\\[lL]/g, function ($0, $1) { return $1 ? $0 : ""; });
 
         // case sensitivity - \c wins if both modifiers specified
         if (/\c/.test(pattern))
-            case_sensitive = false;
+            caseSensitive = false;
         else if (/\C/.test(pattern))
-            case_sensitive = true;
+            caseSensitive = true;
         else if (vimperator.options["ignorecase"] && vimperator.options["smartcase"] && /[A-Z]/.test(pattern))
-            case_sensitive = true;
+            caseSensitive = true;
         else if (vimperator.options["ignorecase"])
-            case_sensitive = false;
+            caseSensitive = false;
         else
-            case_sensitive = true;
+            caseSensitive = true;
 
         // strip case-sensitive modifiers
         pattern = pattern.replace(/(\\)?\\[cC]/g, function ($0, $1) { return $1 ? $0 : ""; });
@@ -101,171 +106,179 @@ vimperator.Search = function () //{{{
         // remove any modifer escape \
         pattern = pattern.replace(/\\(\\[cClL])/g, "$1");
 
-        search_string = pattern;
+        searchString = pattern;
     }
 
-    // Called when the search dialog is asked for
-    // If you omit "mode", it will default to forward searching
-    this.openSearchDialog = function (mode)
-    {
-        if (mode == vimperator.modes.SEARCH_BACKWARD)
+    /////////////////////////////////////////////////////////////////////////////}}}
+    ////////////////////// PUBLIC SECTION //////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////{{{
+
+    return {
+
+        // Called when the search dialog is asked for
+        // If you omit "mode", it will default to forward searching
+        openSearchDialog: function (mode)
         {
-            vimperator.commandline.open("?", "", vimperator.modes.SEARCH_BACKWARD);
-            backwards = true;
-        }
-        else
+            if (mode == vimperator.modes.SEARCH_BACKWARD)
+            {
+                vimperator.commandline.open("?", "", vimperator.modes.SEARCH_BACKWARD);
+                backwards = true;
+            }
+            else
+            {
+                vimperator.commandline.open("/", "", vimperator.modes.SEARCH_FORWARD);
+                backwards = false;
+            }
+
+            // TODO: focus the top of the currently visible screen
+        },
+
+        // Finds text in a page
+        // TODO: backwards seems impossible i fear :(
+        find: function (str, backwards)
         {
-            vimperator.commandline.open("/", "", vimperator.modes.SEARCH_FORWARD);
-            backwards = false;
-        }
+            var fastFind = getBrowser().fastFind;
 
-        // TODO: focus the top of the currently visible screen
-    }
+            processUserPattern(str);
 
-    // Finds text in a page
-    // TODO: backwards seems impossible i fear :(
-    this.find = function (str, backwards)
-    {
-        var fastFind = getBrowser().fastFind;
+            fastFind.caseSensitive = caseSensitive;
+            found = fastFind.find(searchString, linksOnly) != Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND;
 
-        processUserPattern(str);
+            if (!found)
+                setTimeout(function () { vimperator.echoerr("E486: Pattern not found: " + searchPattern); }, 0);
 
-        fastFind.caseSensitive = case_sensitive;
-        found = fastFind.find(search_string, links_only) != Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND;
+            return found;
+        },
 
-        if (!found)
-            setTimeout(function () { vimperator.echoerr("E486: Pattern not found: " + search_pattern); }, 0);
-
-        return found;
-    }
-
-    // Called when the current search needs to be repeated
-    this.findAgain = function (reverse)
-    {
-        // this hack is needed to make n/N work with the correct string, if
-        // we typed /foo<esc> after the original search.  Since searchString is
-        // readonly we have to call find() again to update it.
-        if (getBrowser().fastFind.searchString != last_search_string)
-            this.find(last_search_string, false);
-
-        var up = reverse ? !last_search_backwards : last_search_backwards;
-        var result;
-
-        if (up)
-            result = getBrowser().fastFind.findPrevious();
-        else
-            result = getBrowser().fastFind.findNext();
-
-        if (result == Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND)
+        // Called when the current search needs to be repeated
+        findAgain: function (reverse)
         {
-            vimperator.echoerr("E486: Pattern not found: " + last_search_pattern);
-        }
-        else if (result == Components.interfaces.nsITypeAheadFind.FIND_WRAPPED)
+            // this hack is needed to make n/N work with the correct string, if
+            // we typed /foo<esc> after the original search.  Since searchString is
+            // readonly we have to call find() again to update it.
+            if (getBrowser().fastFind.searchString != lastSearchString)
+                this.find(lastSearchString, false);
+
+            var up = reverse ? !lastSearchBackwards : lastSearchBackwards;
+            var result;
+
+            if (up)
+                result = getBrowser().fastFind.findPrevious();
+            else
+                result = getBrowser().fastFind.findNext();
+
+            if (result == Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND)
+            {
+                vimperator.echoerr("E486: Pattern not found: " + lastSearchPattern);
+            }
+            else if (result == Components.interfaces.nsITypeAheadFind.FIND_WRAPPED)
+            {
+                // hack needed, because wrapping causes a "scroll" event which clears
+                // our command line
+                setTimeout(function () {
+                    if (up)
+                        vimperator.commandline.echo("search hit TOP, continuing at BOTTOM", vimperator.commandline.HL_WARNING);
+                    else
+                        vimperator.commandline.echo("search hit BOTTOM, continuing at TOP", vimperator.commandline.HL_WARNING);
+                }, 0);
+            }
+            else
+            {
+                vimperator.echo((up ? "?" : "/") + lastSearchPattern);
+
+                if (vimperator.options["hlsearch"])
+                    this.highlight(lastSearchString);
+            }
+        },
+
+        // Called when the user types a key in the search dialog. Triggers a find attempt if 'incsearch' is set
+        searchKeyPressed: function (command)
         {
-            // hack needed, because wrapping causes a "scroll" event which clears
-            // our command line
-            setTimeout(function () {
-                if (up)
-                    vimperator.commandline.echo("search hit TOP, continuing at BOTTOM", vimperator.commandline.HL_WARNING);
-                else
-                    vimperator.commandline.echo("search hit BOTTOM, continuing at TOP", vimperator.commandline.HL_WARNING);
-            }, 0);
-        }
-        else
+            if (vimperator.options["incsearch"])
+                this.find(command, backwards);
+        },
+
+        // Called when the enter key is pressed to trigger a search
+        // use forcedBackward if you call this function directly
+        searchSubmitted: function (command, forcedBackward)
         {
-            vimperator.echo((up ? "?" : "/") + last_search_pattern);
+            if (typeof forcedBackward === "boolean")
+                backwards = forcedBackward;
+
+            // use the last pattern if none specified
+            if (!command)
+                command = lastSearchPattern;
+
+            this.clear();
+            this.find(command, backwards);
+
+            lastSearchBackwards = backwards;
+            lastSearchPattern = command.replace(backwards ? /\?.*/ : /\/.*/, ""); // XXX
+            lastSearchString = searchString;
+
+            // TODO: move to find() when reverse incremental searching is kludged in
+            // need to find again for reverse searching
+            if (backwards)
+                setTimeout(function () { vimperator.search.findAgain(false); }, 0);
 
             if (vimperator.options["hlsearch"])
-                this.highlight(last_search_string);
-        }
-    }
+                this.highlight(searchString);
 
-    // Called when the user types a key in the search dialog. Triggers a find attempt if 'incsearch' is set
-    this.searchKeyPressed = function (command)
-    {
-        if (vimperator.options["incsearch"])
-            this.find(command, backwards);
-    }
+            vimperator.setMode(vimperator.modes.NORMAL);
+            vimperator.focusContent();
+        },
 
-    // Called when the enter key is pressed to trigger a search
-    // use forced_direction if you call this function directly
-    this.searchSubmitted = function (command, forced_backward)
-    {
-        if (typeof forced_backward === "boolean")
-            backwards = forced_backward;
-
-        // use the last pattern if none specified
-        if (!command)
-            command = last_search_pattern;
-
-        this.clear();
-        this.find(command, backwards);
-
-        last_search_backwards = backwards;
-        last_search_pattern = command.replace(backwards ? /\?.*/ : /\/.*/, ""); // XXX
-        last_search_string = search_string;
-
-        // TODO: move to find() when reverse incremental searching is kludged in
-        // need to find again for reverse searching
-        if (backwards)
-            setTimeout(function () { self.findAgain(false); }, 0);
-
-        if (vimperator.options["hlsearch"])
-            this.highlight(search_string);
-
-        vimperator.setMode(vimperator.modes.NORMAL);
-        vimperator.focusContent();
-    }
-
-    // Called when the search is cancelled - for example if someone presses
-    // escape while typing a search
-    this.searchCanceled = function ()
-    {
-        //removeMode(MODE_SEARCH);
-        vimperator.setMode(vimperator.modes.NORMAL);
-        vimperator.focusContent();
-    }
-
-    this.highlight = function (text)
-    {
-        // already highlighted?
-        if (window.content.document.getElementById("__firefox-findbar-search-id"))
-            return;
-
-        if (!text)
-            text = last_search_string;
-
-        // NOTE: gFindBar.setCaseSensitivity() in FF2 does NOT set the
-        // accessibility.typeaheadfind.casesensitive pref as needed by
-        // highlightDoc()
-        gFindBar.mTypeAheadCaseSensitive = case_sensitive ? 1 : 0;
-        gFindBar.highlightDoc("white", "black", text);
-
-        // TODO: seems fast enough for now...just
-        // NOTE: FF2 highlighting spans all have the same id rather than a class attribute
-        (function (win)
+        // Called when the search is cancelled - for example if someone presses
+        // escape while typing a search
+        searchCanceled: function ()
         {
-            for (var i = 0; i < win.frames.length; i++)
-                arguments.callee(win.frames[i]);
-            var spans = vimperator.buffer.evaluateXPath("//span[@id='__firefox-findbar-search-id']", win.document);
-            for (var i = 0; i < spans.snapshotLength; i++)
-                spans.snapshotItem(i).setAttribute("style", vimperator.options["hlsearchstyle"]);
-        })(window.content);
+            //removeMode(MODE_SEARCH);
+            vimperator.setMode(vimperator.modes.NORMAL);
+            vimperator.focusContent();
+        },
 
-        // recreate selection since _highlightDoc collapses the selection backwards
-        getBrowser().fastFind.findNext();
+        highlight: function (text)
+        {
+            // already highlighted?
+            if (window.content.document.getElementById("__firefox-findbar-search-id"))
+                return;
 
-        // TODO: remove highlighting from non-link matches (HTML - A/AREA with href attribute; XML - Xlink [@type="simple"])
-    }
+            if (!text)
+                text = lastSearchString;
 
-    this.clear = function ()
-    {
-        gFindBar.highlightDoc();
-        // need to manually collapse the selection if the document is not
-        // highlighted
-        getBrowser().fastFind.collapseSelection();
-    }
+            // NOTE: gFindBar.setCaseSensitivity() in FF2 does NOT set the
+            // accessibility.typeaheadfind.casesensitive pref as needed by
+            // highlightDoc()
+            gFindBar.mTypeAheadCaseSensitive = caseSensitive ? 1 : 0;
+            gFindBar.highlightDoc("white", "black", text);
 
-} //}}}
+            // TODO: seems fast enough for now...just
+            // NOTE: FF2 highlighting spans all have the same id rather than a class attribute
+            (function (win)
+            {
+                for (var i = 0; i < win.frames.length; i++)
+                    arguments.callee(win.frames[i]);
+                var spans = vimperator.buffer.evaluateXPath("//span[@id='__firefox-findbar-search-id']", win.document);
+                for (var i = 0; i < spans.snapshotLength; i++)
+                    spans.snapshotItem(i).setAttribute("style", vimperator.options["hlsearchstyle"]);
+            })(window.content);
+
+            // recreate selection since _highlightDoc collapses the selection backwards
+            getBrowser().fastFind.findNext();
+
+            // TODO: remove highlighting from non-link matches (HTML - A/AREA with href attribute; XML - Xlink [@type="simple"])
+        },
+
+        clear: function ()
+        {
+            gFindBar.highlightDoc();
+            // need to manually collapse the selection if the document is not
+            // highlighted
+            getBrowser().fastFind.collapseSelection();
+        }
+
+    };
+    //}}}
+}; //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/help.js b/content/help.js
index e5aa4e67..754bb9e3 100644
--- a/content/help.js
+++ b/content/help.js
@@ -52,7 +52,7 @@ vimperator.help = function (section, easter) //{{{
         {
             // the usage information for the command
             ret += '<tr class="description"><td class="usage" valign="top">';
-            for (var j=0; j < command.usage.length; j++)
+            for (var j = 0; j < command.usage.length; j++)
             {
                 var usage = command.usage[j];
 
@@ -72,10 +72,10 @@ vimperator.help = function (section, easter) //{{{
             ret += '</td><td valign="top">';
 
             // the actual help text with the first line in bold
-            if (command.short_help)
+            if (command.shortHelp)
             {
                 ret += '<span class="shorthelp">';
-                ret += command.short_help; // the help description
+                ret += command.shortHelp; // the help description
                 ret += "</span><br/>";
                 if (func) // for options we print default values here, e.g.
                 {
@@ -93,11 +93,11 @@ vimperator.help = function (section, easter) //{{{
             // the tags which are printed on the top right
             ret += '</td><td class="taglist" valign="top">';
             var names = command.names;
-            for (var j=0; j < names.length; j++)
+            for (var j = 0; j < names.length; j++)
             {
-                var cmd_name = names[j];
-                cmd_name = vimperator.util.escapeHTML(cmd_name);
-                ret += '<code class="tag">' + beg + cmd_name + end + '</code><br/>';
+                var cmdName = names[j];
+                cmdName = vimperator.util.escapeHTML(cmdName);
+                ret += '<code class="tag">' + beg + cmdName + end + '</code><br/>';
             }
             ret += '</td></tr>';
 
@@ -114,17 +114,17 @@ vimperator.help = function (section, easter) //{{{
         ret = command.type + ' (default: ';
         if (command.type == "boolean")
         {
-            if (command.default_value == true)
+            if (command.defaultValue == true)
                 ret += "on";
             else
                 ret += "off";
         }
         else
         {
-            if (typeof command.default_value == "string" && command.default_value.length == 0)
+            if (typeof command.defaultValue == "string" && command.defaultValue.length == 0)
                 ret += "''";
             else
-                ret += command.default_value;
+                ret += command.defaultValue;
         }
 
         ret += ")<br/>";
@@ -286,6 +286,6 @@ vimperator.help = function (section, easter) //{{{
             window.content.scrollTo(0, pos[1]);
         }
     }, 0);
-} //}}}
+}; //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/hints.js b/content/hints.js
index bc887304..cbaad1ee 100644
--- a/content/hints.js
+++ b/content/hints.js
@@ -24,11 +24,11 @@
 
 vimperator.Hints = function () //{{{
 {
-    const HINT_PREFIX = "hah_hint_"; // prefix for the hint id
+    ////////////////////////////////////////////////////////////////////////////////
+    ////////////////////// PRIVATE SECTION /////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////{{{
 
-    this.hintedElements = function () { return hintedElems; };
-    this.currentState = function () { return state;};
-    this.setCurrentState = function (s) { state = s;};
+    const HINT_PREFIX = "hah_hint_"; // prefix for the hint id
 
     var isHahModeEnabled = false; // is typing mode on
     var hintedElems = [];
@@ -68,27 +68,6 @@ vimperator.Hints = function () //{{{
         win.coordLoaderId = window.setTimeout("vimperator.hints.loadCoord(" + win.winId + ", 0);", 1);
     }
 
-    this.loadCoord = function (winId, i)
-    {
-        win = wins[winId];
-
-        // win.res is not ready when loading has not finished yet
-        if (!win.res)
-            return;
-
-        var elem = win.res.snapshotItem(i);
-
-        if (elem)
-            genElemCoords(elem);
-
-        i++;
-
-        if (i < win.res.snapshotLength && !isHahModeEnabled)
-            window.setTimeout("vimperator.hints.loadCoord(" + winId + ", "+ i +");", 1);
-        else
-            win.coordLoaderId = null;
-    };
-
     function genElemCoords(elem)
     {
         // NOTE: experiment for making the function faster, report problems
@@ -101,7 +80,7 @@ vimperator.Hints = function () //{{{
         //}
         //return;
 
-        if (typeof(elem.validCoord) != "undefined")
+        if (typeof elem.validCoord != "undefined")
         {
             if (elem.validCoord == elem.ownerDocument.validCoords)
                 return;
@@ -157,7 +136,7 @@ vimperator.Hints = function () //{{{
             if (!hintContainer)
                 return false;
         }
-        hintContainer.valid_hint_count = 0; // none of these hints should be visible initially
+        hintContainer.validHintCount = 0; // none of these hints should be visible initially
 
         var hints = hintContainer.childNodes;
         var maxhints = vimperator.options["maxhints"];
@@ -197,7 +176,7 @@ vimperator.Hints = function () //{{{
             hintElem.style.left = elem.absoLeft + "px";
             hintElem.refElem = elem;
 
-            hintContainer.valid_hint_count++; // one more visible hint in this frame
+            hintContainer.validHintCount++; // one more visible hint in this frame
             linkCount++;                      // and one more total hint
         }
 
@@ -235,7 +214,7 @@ vimperator.Hints = function () //{{{
         var hints = hintContainer.childNodes;
         var i, j;
 
-        for (i = 0; i < hintContainer.valid_hint_count; i++)
+        for (i = 0; i < hintContainer.validHintCount; i++)
         {
             hintText = formatHint(offset+i);
             hintElem = hints[i];
@@ -244,7 +223,7 @@ vimperator.Hints = function () //{{{
             hintElem.innerHTML = hintText;
             hintElem.id = HINT_PREFIX + hintText;
         }
-        offset += hintContainer.valid_hint_count;
+        offset += hintContainer.validHintCount;
 
         // recursively show hints
         for (j = 0; j < win.frames.length; j++)
@@ -260,7 +239,7 @@ vimperator.Hints = function () //{{{
             win = window.content;
 
         var doc = win.document;
-        var res = vimperator.buffer.evaluateXPath("//HINTS/SPAN", doc)
+        var res = vimperator.buffer.evaluateXPath("//HINTS/SPAN", doc);
         var elem, i;
 
         for (i = 0; i < res.snapshotLength; i++)
@@ -387,283 +366,6 @@ vimperator.Hints = function () //{{{
         }
     }
 
-    ////////////////////////////////////////////////////////////////////////////////
-    // basic functionality
-    ////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Enables the HaH-mode by showing the hints and prepare to input the
-     * hint numbers
-     *
-     * @author Pekka Sillanpaa
-     * @param event that caused the mode to change
-     * @return -1 if already enabled
-     */
-    //function enableHahMode(event, mode)
-    this.enableHahMode = function (mode)
-    {
-        vimperator.setMode(vimperator.modes.HINTS, mode);
-        state = 0;
-        linkCount = 0;
-        linkNumString = "";
-        isHahModeEnabled = true;
-
-        createHints();
-        showHints(null, 0);
-
-        return true;
-    }
-
-    /**
-     * Disables the HaH-mode by hiding the hints and disabling the input mode
-     *
-     * @author Pekka Sillanpaa
-     * @param event that caused the mode to change
-     * @param action = true if something is to be clicked
-     *                 false if cancel
-     * @return -1 if already disabled
-     */
-    //function disableHahMode(event)
-    this.disableHahMode = function (win)
-    {
-        if (!isHahModeEnabled)
-            return;
-
-        vimperator.setMode(vimperator.modes.NORMAL);
-        isHahModeEnabled = false;
-        linkNumString = "";
-        hintedElems = [];
-
-        removeHints(win);
-        return 0;
-    };
-
-    this.resetHintedElements = function ()
-    {
-        linkNumString = "";
-        state = 0;
-
-        while (hintedElems.length > 0)
-        {
-            var elem = hintedElems.pop();
-            if (!elem)
-                return 0;
-            // reset style attribute
-            setHintStyle(elem, vimperator.options["hintstyle"]);
-        }
-    };
-
-
-    this.reshowHints = function ()
-    {
-        onResize(null);
-
-        if (isHahModeEnabled)
-        {
-            removeHints();
-            createHints();
-            showHints(null, 0);
-        }
-    };
-
-
-    // TODO: move these functions somewhere more general
-
-    // this function 'click' an element, which also works
-    // for javascript links
-    this.openHints = function (new_tab, new_window)
-    {
-        var x = 0, y = 0;
-
-        while (hintedElems.length > 0)
-        {
-            var elem = hintedElems.pop();
-            if (!elem)
-                return 0;
-
-            setHintStyle(elem, vimperator.options["hintstyle"]);
-            elem = elem.refElem;
-            var elemTagName = elem.localName.toLowerCase();
-            elem.focus();
-
-            if (elemTagName == "frame" || elemTagName == "iframe")
-                return 0;
-
-            // for imagemap
-            if (elemTagName == "area")
-            {
-                var coords = elem.getAttribute("coords").split(",");
-                x = Number(coords[0]);
-                y = Number(coords[1]);
-            }
-            var doc = window.content.document;
-            var view = window.document.defaultView;
-
-            var evt = doc.createEvent("MouseEvents");
-            evt.initMouseEvent("mousedown", true, true, view, 1, x + 1, y + 1, 0, 0, /*ctrl*/ new_tab, /*event.altKey*/0, /*event.shiftKey*/ new_window, /*event.metaKey*/ new_tab, 0, null);
-            elem.dispatchEvent(evt);
-
-            var evt = doc.createEvent("MouseEvents");
-            evt.initMouseEvent("click", true, true, view, 1, x + 1, y + 1, 0, 0, /*ctrl*/ new_tab, /*event.altKey*/0, /*event.shiftKey*/ new_window, /*event.metaKey*/ new_tab, 0, null);
-            elem.dispatchEvent(evt);
-
-            // for 'pure' open calls without a new tab or window it doesn't
-            // make sense to open more hints in the current tab, open new tabs
-            // for it
-            if (!new_tab && !new_window)
-                new_tab = true;
-        }
-
-        return 0;
-    };
-
-    this.yankUrlHints = function ()
-    {
-        var loc = "";
-        var elems = this.hintedElements();
-        var tmp = "";
-        for (var i = 0; i < elems.length; i++)
-        {
-            tmp = elems[i].refElem.href;
-            if (typeof(tmp) != "undefined" && tmp.length > 0)
-            {
-                if (i > 0)
-                    loc += "\n";
-                loc += tmp;
-            }
-        }
-
-        // disable the hints before we can echo() an information
-        this.disableHahMode(null, true);
-
-        vimperator.copyToClipboard(loc);
-        vimperator.echo("Yanked " + loc);
-    };
-
-    this.yankTextHints = function ()
-    {
-        var loc = "";
-        var elems = this.hintedElements();
-        var tmp = "";
-        for (var i = 0; i < elems.length; i++)
-        {
-            tmp = elems[i].refElem.textContent;
-            if (typeof(tmp) != "undefined" && tmp.length > 0)
-            {
-                if (i > 0)
-                    loc += "\n";
-                loc += tmp;
-            }
-        }
-
-        // disable the hints before we can echo() an information
-        this.disableHahMode(null, true);
-
-        vimperator.copyToClipboard(loc);
-        vimperator.echo("Yanked " + loc);
-    };
-
-    this.saveHints = function (skip_prompt)
-    {
-        var elems = this.hintedElements();
-
-        for (var i = 0; i < elems.length; i++)
-        {
-            var doc  = elems[i].ownerDocument;
-            var url = makeURLAbsolute(elems[i].refElem.baseURI, elems[i].refElem.href);
-            var text = elems[i].refElem.textContent;
-
-            try
-            {
-                urlSecurityCheck(url, doc.location.href);
-                saveURL(url, text, null, true, skip_prompt, makeURI(url, doc.characterSet));
-            }
-            catch (e)
-            {
-                vimperator.echoerr(e);
-            }
-        }
-    }
-
-    function setMouseOverElement(elem)
-    {
-        var doc = window.document;
-        var elemTagName = elem.localName.toLowerCase();
-
-        if (elemTagName == "frame" || elemTagName == "iframe")
-        {
-            elem.contentWindow.focus();
-            return;
-        }
-        //else
-        //{
-        //    elem.focus();
-        //}
-
-        var evt = doc.createEvent("MouseEvents");
-        var x = 0;
-        var y = 0;
-        // for imagemap
-        if (elemTagName == "area")
-        {
-            var coords = elem.getAttribute("coords").split(",");
-            x = Number(coords[0]);
-            y = Number(coords[1]);
-        }
-
-        evt.initMouseEvent("mouseover", true, true, doc.defaultView, 1, x, y, 0, 0, 0, 0, 0, 0, 0, null);
-        elem.dispatchEvent(evt);
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // event handlers
-    ////////////////////////////////////////////////////////////////////////////////
-
-    // returns nr. of fully parsed links when a new hint has been found,
-    // otherwise 0 if current state is part of a hint, or -1 if an error occured
-    // (like we have typed keys which never can become a hint
-    this.processEvent = function (event)
-    {
-        if (!isHahModeEnabled)
-            return -1;
-
-        // reset state to show that we are in processing mode
-        state = 0;
-
-        var num = String.fromCharCode(event.charCode).toUpperCase();
-        var hintCharacters = vimperator.options["hintchars"];
-        if (num != null && hintCharacters.toUpperCase().indexOf(num) > -1)
-        {
-            var oldLinkNumString = linkNumString;
-            linkNumString += "" + num;
-            // update reference to currently selected node;
-            var elem = getHintById(linkNumString);
-            changeHintFocus(linkNumString, oldLinkNumString);
-
-            // if we found the hint, fine just return it
-            if (elem)
-            {
-                hintedElems.push(elem);
-                linkNumString = "";
-                state = 1;
-                return hintedElems.length;
-            }
-
-            //calculate how many characters a hint must have
-            var hintLength = 1;
-            var tmp = linkCount;
-            while ((tmp /= hintCharacters.length) > 1.0)
-                hintLength++;
-
-            if (linkNumString.length >= hintLength)
-                return -1;
-            else
-                return 0;
-        }
-        // an unparseable or wrong key
-        return -1;
-    }
-
     function genHintContainer(doc)
     {
         if (doc.getElementsByTagName("HINTS").length > 0)
@@ -671,7 +373,7 @@ vimperator.Hints = function () //{{{
 
         hints = doc.createElement("HINTS");
         hints.id = "hah_hints";
-        hints.valid_hint_count = 0; // initially 0 elements are usable as hints
+        hints.validHintCount = 0; // initially 0 elements are usable as hints
 
         if (doc.body)
             doc.body.appendChild(hints);
@@ -706,16 +408,329 @@ vimperator.Hints = function () //{{{
             linkNumString = "";
             isHahModeEnabled = true;
 
-            setTimeout( function () {
+            setTimeout(function () {
                 createHints();
                 showHints(null, 0);
             }, 100);
         }
     }
 
+    function setMouseOverElement(elem)
+    {
+        var doc = window.document;
+        var elemTagName = elem.localName.toLowerCase();
+
+        if (elemTagName == "frame" || elemTagName == "iframe")
+        {
+            elem.contentWindow.focus();
+            return;
+        }
+        //else
+        //{
+        //    elem.focus();
+        //}
+
+        var evt = doc.createEvent("MouseEvents");
+        var x = 0;
+        var y = 0;
+        // for imagemap
+        if (elemTagName == "area")
+        {
+            var coords = elem.getAttribute("coords").split(",");
+            x = Number(coords[0]);
+            y = Number(coords[1]);
+        }
+
+        evt.initMouseEvent("mouseover", true, true, doc.defaultView, 1, x, y, 0, 0, 0, 0, 0, 0, 0, null);
+        elem.dispatchEvent(evt);
+    }
+
+    /////////////////////////////////////////////////////////////////////////////}}}
+    ////////////////////// PUBLIC SECTION //////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////{{{
+
+    var hintManager = {
+
+        get hintedElements() { return hintedElems; },
+        get currentState() { return state; },
+        get setCurrentState(s) { state = s; },
+
+        loadCoord: function (winId, i)
+        {
+            win = wins[winId];
+
+            // win.res is not ready when loading has not finished yet
+            if (!win.res)
+                return;
+
+            var elem = win.res.snapshotItem(i);
+
+            if (elem)
+                genElemCoords(elem);
+
+            i++;
+
+            if (i < win.res.snapshotLength && !isHahModeEnabled)
+                window.setTimeout("vimperator.hints.loadCoord(" + winId + ", "+ i +");", 1);
+            else
+                win.coordLoaderId = null;
+        },
+
+        ////////////////////////////////////////////////////////////////////////////////
+        // basic functionality
+        ////////////////////////////////////////////////////////////////////////////////
+
+        /**
+         * Enables the HaH-mode by showing the hints and prepare to input the
+         * hint numbers
+         *
+         * @author Pekka Sillanpaa
+         * @param event that caused the mode to change
+         * @return -1 if already enabled
+         */
+        //function enableHahMode(event, mode)
+        enableHahMode: function (mode)
+        {
+            vimperator.setMode(vimperator.modes.HINTS, mode);
+            state = 0;
+            linkCount = 0;
+            linkNumString = "";
+            isHahModeEnabled = true;
+
+            createHints();
+            showHints(null, 0);
+
+            return true;
+        },
+
+        /**
+         * Disables the HaH-mode by hiding the hints and disabling the input mode
+         *
+         * @author Pekka Sillanpaa
+         * @param event that caused the mode to change
+         * @param action = true if something is to be clicked
+         *                 false if cancel
+         * @return -1 if already disabled
+         */
+        //function disableHahMode(event)
+        disableHahMode: function (win)
+        {
+            if (!isHahModeEnabled)
+                return;
+
+            vimperator.setMode(vimperator.modes.NORMAL);
+            isHahModeEnabled = false;
+            linkNumString = "";
+            hintedElems = [];
+
+            removeHints(win);
+            return 0;
+        },
+
+        resetHintedElements: function ()
+        {
+            linkNumString = "";
+            state = 0;
+
+            while (hintedElems.length > 0)
+            {
+                var elem = hintedElems.pop();
+                if (!elem)
+                    return 0;
+                // reset style attribute
+                setHintStyle(elem, vimperator.options["hintstyle"]);
+            }
+        },
+
+
+        reshowHints: function ()
+        {
+            onResize(null);
+
+            if (isHahModeEnabled)
+            {
+                removeHints();
+                createHints();
+                showHints(null, 0);
+            }
+        },
+
+
+        // TODO: move these functions somewhere more general
+
+        // this function 'click' an element, which also works
+        // for javascript links
+        openHints: function (newTab, newWindow)
+        {
+            var x = 0, y = 0;
+
+            while (hintedElems.length > 0)
+            {
+                var elem = hintedElems.pop();
+                if (!elem)
+                    return 0;
+
+                setHintStyle(elem, vimperator.options["hintstyle"]);
+                elem = elem.refElem;
+                var elemTagName = elem.localName.toLowerCase();
+                elem.focus();
+
+                if (elemTagName == "frame" || elemTagName == "iframe")
+                    return 0;
+
+                // for imagemap
+                if (elemTagName == "area")
+                {
+                    var coords = elem.getAttribute("coords").split(",");
+                    x = Number(coords[0]);
+                    y = Number(coords[1]);
+                }
+                var doc = window.content.document;
+                var view = window.document.defaultView;
+
+                var evt = doc.createEvent("MouseEvents");
+                evt.initMouseEvent("mousedown", true, true, view, 1, x + 1, y + 1, 0, 0, /*ctrl*/ newTab, /*event.altKey*/0, /*event.shiftKey*/ newWindow, /*event.metaKey*/ newTab, 0, null);
+                elem.dispatchEvent(evt);
+
+                var evt = doc.createEvent("MouseEvents");
+                evt.initMouseEvent("click", true, true, view, 1, x + 1, y + 1, 0, 0, /*ctrl*/ newTab, /*event.altKey*/0, /*event.shiftKey*/ newWindow, /*event.metaKey*/ newTab, 0, null);
+                elem.dispatchEvent(evt);
+
+                // for 'pure' open calls without a new tab or window it doesn't
+                // make sense to open more hints in the current tab, open new tabs
+                // for it
+                if (!newTab && !newWindow)
+                    newTab = true;
+            }
+
+            return 0;
+        },
+
+        yankUrlHints: function ()
+        {
+            var loc = "";
+            var elems = this.hintedElements();
+            var tmp = "";
+            for (var i = 0; i < elems.length; i++)
+            {
+                tmp = elems[i].refElem.href;
+                if (typeof tmp != "undefined" && tmp.length > 0)
+                {
+                    if (i > 0)
+                        loc += "\n";
+                    loc += tmp;
+                }
+            }
+
+            // disable the hints before we can echo() an information
+            this.disableHahMode(null, true);
+
+            vimperator.copyToClipboard(loc);
+            vimperator.echo("Yanked " + loc);
+        },
+
+        yankTextHints: function ()
+        {
+            var loc = "";
+            var elems = this.hintedElements();
+            var tmp = "";
+            for (var i = 0; i < elems.length; i++)
+            {
+                tmp = elems[i].refElem.textContent;
+                if (typeof tmp != "undefined" && tmp.length > 0)
+                {
+                    if (i > 0)
+                        loc += "\n";
+                    loc += tmp;
+                }
+            }
+
+            // disable the hints before we can echo() an information
+            this.disableHahMode(null, true);
+
+            vimperator.copyToClipboard(loc);
+            vimperator.echo("Yanked " + loc);
+        },
+
+        saveHints: function (skipPrompt)
+        {
+            var elems = this.hintedElements();
+
+            for (var i = 0; i < elems.length; i++)
+            {
+                var doc  = elems[i].ownerDocument;
+                var url = makeURLAbsolute(elems[i].refElem.baseURI, elems[i].refElem.href);
+                var text = elems[i].refElem.textContent;
+
+                try
+                {
+                    urlSecurityCheck(url, doc.location.href);
+                    saveURL(url, text, null, true, skipPrompt, makeURI(url, doc.characterSet));
+                }
+                catch (e)
+                {
+                    vimperator.echoerr(e);
+                }
+            }
+        },
+
+        ////////////////////////////////////////////////////////////////////////////////
+        // event handlers
+        ////////////////////////////////////////////////////////////////////////////////
+
+        // returns nr. of fully parsed links when a new hint has been found,
+        // otherwise 0 if current state is part of a hint, or -1 if an error occured
+        // (like we have typed keys which never can become a hint
+        processEvent: function (event)
+        {
+            if (!isHahModeEnabled)
+                return -1;
+
+            // reset state to show that we are in processing mode
+            state = 0;
+
+            var num = String.fromCharCode(event.charCode).toUpperCase();
+            var hintCharacters = vimperator.options["hintchars"];
+            if (num != null && hintCharacters.toUpperCase().indexOf(num) > -1)
+            {
+                var oldLinkNumString = linkNumString;
+                linkNumString += "" + num;
+                // update reference to currently selected node;
+                var elem = getHintById(linkNumString);
+                changeHintFocus(linkNumString, oldLinkNumString);
+
+                // if we found the hint, fine just return it
+                if (elem)
+                {
+                    hintedElems.push(elem);
+                    linkNumString = "";
+                    state = 1;
+                    return hintedElems.length;
+                }
+
+                //calculate how many characters a hint must have
+                var hintLength = 1;
+                var tmp = linkCount;
+                while ((tmp /= hintCharacters.length) > 1.0)
+                    hintLength++;
+
+                if (linkNumString.length >= hintLength)
+                    return -1;
+                else
+                    return 0;
+            }
+            // an unparseable or wrong key
+            return -1;
+        }
+
+    };
+
     window.document.addEventListener("DOMContentLoaded", initDoc, null);
     // FIXME: add resize support
     //window.addEventListener("resize", onResize, null);
-} //}}}
+
+    return hintManager;
+    //}}}
+}; //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/io.js b/content/io.js
index 3c641a74..fa6462f0 100644
--- a/content/io.js
+++ b/content/io.js
@@ -27,9 +27,9 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.IO = function ()
+vimperator.IO = function () //{{{
 {
-    var environment_service = Components.classes["@mozilla.org/process/environment;1"]
+    var environmentService = Components.classes["@mozilla.org/process/environment;1"]
         .getService(Components.interfaces.nsIEnvironment);
 
     return {
@@ -54,30 +54,30 @@ vimperator.IO = function ()
             // expand "~" to VIMPERATOR_HOME or HOME (USERPROFILE or HOMEDRIVE\HOMEPATH on Windows if HOME is not set)
             if (/^~/.test(path))
             {
-                var home = environment_service.get("VIMPERATOR_HOME");
+                var home = environmentService.get("VIMPERATOR_HOME");
 
                 if (!home)
-                    home = environment_service.get("HOME");
+                    home = environmentService.get("HOME");
 
                 if (WINDOWS && !home)
-                    home = environment_service.get("USERPROFILE") ||
-                           environment_service.get("HOMEDRIVE") + environment_service.get("HOMEPATH");
+                    home = environmentService.get("USERPROFILE") ||
+                           environmentService.get("HOMEDRIVE") + environmentService.get("HOMEPATH");
 
                 path = path.replace("~", home);
             }
 
             // expand any $ENV vars
-            var env_vars = path.match(/\$\w+\b/g); // this is naive but so is Vim and we like to be compatible
+            var envVars = path.match(/\$\w+\b/g); // this is naive but so is Vim and we like to be compatible
 
-            if (env_vars)
+            if (envVars)
             {
                 var expansion;
 
-                for (var i = 0; i < env_vars.length; i++)
+                for (var i = 0; i < envVars.length; i++)
                 {
-                    expansion = environment_service.get(env_vars[i].replace("$", ""));
+                    expansion = environmentService.get(envVars[i].replace("$", ""));
                     if (expansion)
-                        path = path.replace(env_vars[i], expansion);
+                        path = path.replace(envVars[i], expansion);
                 }
             }
 
@@ -86,30 +86,30 @@ vimperator.IO = function ()
 
         getPluginDir: function ()
         {
-            var plugin_dir;
+            var pluginDir;
 
             if (navigator.platform == "Win32")
-                plugin_dir = "~/vimperator/plugin";
+                pluginDir = "~/vimperator/plugin";
             else
-                plugin_dir = "~/.vimperator/plugin";
+                pluginDir = "~/.vimperator/plugin";
 
-            plugin_dir = this.getFile(this.expandPath(plugin_dir));
+            pluginDir = this.getFile(this.expandPath(pluginDir));
 
-            return plugin_dir.exists() && plugin_dir.isDirectory() ? plugin_dir : null;
+            return pluginDir.exists() && pluginDir.isDirectory() ? pluginDir : null;
         },
 
         getRCFile: function ()
         {
-            var rc_file1 = this.getFile(this.expandPath("~/.vimperatorrc"));
-            var rc_file2 = this.getFile(this.expandPath("~/_vimperatorrc"));
+            var rcFile1 = this.getFile(this.expandPath("~/.vimperatorrc"));
+            var rcFile2 = this.getFile(this.expandPath("~/_vimperatorrc"));
 
             if (navigator.platform == "Win32")
-                [rc_file1, rc_file2] = [rc_file2, rc_file1]
+                [rcFile1, rcFile2] = [rcFile2, rcFile1]
 
-            if (rc_file1.exists() && rc_file1.isFile())
-                return rc_file1;
-            else if (rc_file2.exists() && rc_file2.isFile())
-                return rc_file2;
+            if (rcFile1.exists() && rcFile1.isFile())
+                return rcFile1;
+            else if (rcFile2.exists() && rcFile2.isFile())
+                return rcFile2;
             else
                 return null;
         },
@@ -133,12 +133,12 @@ vimperator.IO = function ()
                                   createInstance(Components.interfaces.nsILocalFile);
             if (navigator.platform == "Win32")
             {
-                var dir = environment_service.get("TMP") || environment_service.get("TEMP") || "C:\\";
+                var dir = environmentService.get("TMP") || environmentService.get("TEMP") || "C:\\";
                 file.initWithPath(dir + "\\vimperator.tmp");
             }
             else
             {
-                var dir = environment_service.get("TMP") || environment_service.get("TEMP") || "/tmp/";
+                var dir = environmentService.get("TMP") || environmentService.get("TEMP") || "/tmp/";
                 file.initWithPath(dir + "/vimperator.tmp");
             }
 
@@ -234,7 +234,7 @@ vimperator.IO = function ()
             ocstream.close();
             ofstream.close();
         }
-    }
-}
+    };
+}; //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/mappings.js b/content/mappings.js
index d46f4bce..aac00a20 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.Map = function (mode, cmds, action, extra_info) //{{{
+vimperator.Map = function (mode, cmds, action, extraInfo) //{{{
 {
     if (!mode || (!cmds || !cmds.length) || !action)
         return null;
@@ -37,12 +37,12 @@ vimperator.Map = function (mode, cmds, action, extra_info) //{{{
 
     this.usage = [this.names[0]];
 
-    if (extra_info)
+    if (extraInfo)
     {
-        this.flags = extra_info.flags || 0;
+        this.flags = extraInfo.flags || 0;
 
-        if (extra_info.usage)
-            this.usage = extra_info.usage;
+        if (extraInfo.usage)
+            this.usage = extraInfo.usage;
         else
         {
             this.usage = this.names[0]; // only the first command name
@@ -53,17 +53,17 @@ vimperator.Map = function (mode, cmds, action, extra_info) //{{{
             this.usage = [this.usage]; // FIXME: usage an array - needed for the help
         }
 
-        this.help = extra_info.help || null;
-        this.short_help = extra_info.short_help || null;
+        this.help = extraInfo.help || null;
+        this.shortHelp = extraInfo.shortHelp || null;
 
-        this.rhs = extra_info.rhs || null;
+        this.rhs = extraInfo.rhs || null;
 
         // TODO: are these limited to HINTS mode?
         // Only set for hints maps
-        this.cancel_mode = extra_info.cancel_mode || false;
-        this.always_active = extra_info.always_active || false;
+        this.cancelMode = extraInfo.cancelMode || false;
+        this.alwaysActive = extraInfo.alwaysActive || false;
     }
-}
+};
 
 vimperator.Map.prototype.hasName = function (name)
 {
@@ -74,7 +74,7 @@ vimperator.Map.prototype.hasName = function (name)
     }
 
     return false;
-}
+};
 
 // Since we will add many Map-objects, we add some functions as prototypes
 // this will ensure we only have one copy of each function, not one for each object
@@ -88,7 +88,7 @@ vimperator.Map.prototype.execute = function (motion, count, argument)
     if (this.flags & vimperator.Mappings.flags.ARGUMENT)
         args.push(argument);
     this.action.apply(this, args);
-}
+};
 //}}}
 
 vimperator.Mappings = function () //{{{
@@ -177,123 +177,127 @@ vimperator.Mappings = function () //{{{
         ARGUMENT:   1 << 2
     };
 
-    // NOTE: just normal mode for now
-    this.__iterator__ = function ()
-    {
-        return mappingsIterator(vimperator.modes.NORMAL, main);
-    }
+    var mappingManager = {
 
-    // FIXME
-    this.getIterator = function (mode)
-    {
-        return mappingsIterator(mode, main);
-    }
-
-    // FIXME
-    this.getUserIterator = function (mode)
-    {
-        return mappingsIterator(mode, user);
-    }
-
-    this.hasMap = function (mode, cmd)
-    {
-        var user_maps = user[mode];
-
-        for (var i = 0; i < user_maps.length; i++)
+        // NOTE: just normal mode for now
+        __iterator__: function ()
         {
-            if (user_maps[i].names.indexOf(cmd) != -1)
-                return true;
-        }
+            return mappingsIterator(vimperator.modes.NORMAL, main);
+        },
 
-        return false;
-    }
-
-    this.add = function (map)
-    {
-        for (var i = 0; i < map.names.length; i++)
+        // FIXME
+        getIterator: function (mode)
         {
-            // only store keysyms with uppercase modifier strings
-            map.names[i] = map.names[i].replace(/[casm]-/g, function ($0) { return $0.toUpperCase(); });
-            removeMap(map.mode, map.names[i]);
-        }
+            return mappingsIterator(mode, main);
+        },
 
-        user[map.mode].push(map);
-    }
-
-    this.remove = function (mode, cmd)
-    {
-        removeMap(mode, cmd);
-    }
-
-    this.removeAll = function (mode)
-    {
-        user[mode] = [];
-    }
-
-    this.get = function (mode, cmd)
-    {
-        var map = getMap(mode, cmd, user);
-
-        if (!map)
-            map = getMap(mode, cmd, main);
-
-        return map;
-    }
-
-    // TODO: move default maps to their own v.normal namespace
-    this.getDefaultMap = function (mode, cmd)
-    {
-        return getMap(mode, cmd, main);
-    }
-
-    // returns an array of mappings with names which start with "cmd"
-    this.getCandidates = function (mode, cmd)
-    {
-        var mappings = [];
-        var matches = [];
-
-        mappings = user[mode].concat(main[mode]);
-
-        for (var i = 0; i < mappings.length; i++)
+        // FIXME
+        getUserIterator: function (mode)
         {
-            var map = mappings[i];
-            for (var j = 0; j < map.names.length; j++)
+            return mappingsIterator(mode, user);
+        },
+
+        hasMap: function (mode, cmd)
+        {
+            var userMaps = user[mode];
+
+            for (var i = 0; i < userMaps.length; i++)
             {
-                if (map.names[j].indexOf(cmd) == 0)
-                    matches.push(map);
+                if (userMaps[i].names.indexOf(cmd) != -1)
+                    return true;
             }
-        }
 
-        return matches;
-    }
+            return false;
+        },
 
-    // TODO: implement filtering
-    this.list = function (mode, filter)
-    {
-        var maps = user[mode];
-
-        if (!maps || maps.length == 0)
+        add: function (map)
         {
-            vimperator.echo("No mappings found");
-            return;
-        }
-
-        var list = "<table>";
-        for (var i = 0; i < maps.length; i++)
-        {
-            for (var j = 0; j < maps[i].names.length; j++)
+            for (var i = 0; i < map.names.length; i++)
             {
-                list += "<tr>";
-                list += "<td> " + vimperator.util.escapeHTML(maps[i].names[j]) + "</td>";
-                if (maps[i].rhs)
-                    list += "<td> " + vimperator.util.escapeHTML(maps[i].rhs) + "</td>"
-                list += "</tr>";
+                // only store keysyms with uppercase modifier strings
+                map.names[i] = map.names[i].replace(/[casm]-/g, function ($0) { return $0.toUpperCase(); });
+                removeMap(map.mode, map.names[i]);
             }
-        }
-        list += "</table>";
 
-        vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
-    }
+            user[map.mode].push(map);
+        },
+
+        remove: function (mode, cmd)
+        {
+            removeMap(mode, cmd);
+        },
+
+        removeAll: function (mode)
+        {
+            user[mode] = [];
+        },
+
+        get: function (mode, cmd)
+        {
+            var map = getMap(mode, cmd, user);
+
+            if (!map)
+                map = getMap(mode, cmd, main);
+
+            return map;
+        },
+
+        // TODO: move default maps to their own v.normal namespace
+        getDefaultMap: function (mode, cmd)
+        {
+            return getMap(mode, cmd, main);
+        },
+
+        // returns an array of mappings with names which start with "cmd"
+        getCandidates: function (mode, cmd)
+        {
+            var mappings = [];
+            var matches = [];
+
+            mappings = user[mode].concat(main[mode]);
+
+            for (var i = 0; i < mappings.length; i++)
+            {
+                var map = mappings[i];
+                for (var j = 0; j < map.names.length; j++)
+                {
+                    if (map.names[j].indexOf(cmd) == 0)
+                        matches.push(map);
+                }
+            }
+
+            return matches;
+        },
+
+        // TODO: implement filtering
+        list: function (mode, filter)
+        {
+            var maps = user[mode];
+
+            if (!maps || maps.length == 0)
+            {
+                vimperator.echo("No mappings found");
+                return;
+            }
+
+            var list = "<table>";
+            for (var i = 0; i < maps.length; i++)
+            {
+                for (var j = 0; j < maps[i].names.length; j++)
+                {
+                    list += "<tr>";
+                    list += "<td> " + vimperator.util.escapeHTML(maps[i].names[j]) + "</td>";
+                    if (maps[i].rhs)
+                        list += "<td> " + vimperator.util.escapeHTML(maps[i].rhs) + "</td>";
+                    list += "</tr>";
+                }
+            }
+            list += "</table>";
+
+            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
+        }
+
+    };
 
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// DEFAULT MAPPINGS ////////////////////////////////////////
@@ -306,21 +310,21 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<F1>"],
         function () { vimperator.help(null); },
         {
-            short_help: "Open help window",
+            shortHelp: "Open help window",
             help: "The default section is shown, if you need help for a specific topic, try <code class=\"command\">:help &lt;F1&gt;</code>."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, [":"],
         function () { vimperator.commandline.open(":", "", vimperator.modes.EX); },
         {
-            short_help: "Start command line mode",
+            shortHelp: "Start command line mode",
             help: "In command line mode, you can perform extended commands, which may require arguments."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["I"],
         function () { vimperator.addMode(null, vimperator.modes.ESCAPE_ALL_KEYS); },
         {
-            short_help: "Disable Vimperator keys",
+            shortHelp: "Disable Vimperator keys",
             help: "Starts an 'ignorekeys' mode, where all keys except <code class=\"mapping\">&lt;Esc&gt;</code> are passed to the next event handler.<br/>" +
                   "This is especially useful, if JavaScript controlled forms like the RichEdit form fields of GMail don't work anymore.<br/>"  +
                   "To exit this mode, press <code class=\"mapping\">&lt;Esc&gt;</code>. If you also need to pass <code class=\"mapping\">&lt;Esc&gt;</code>" +
@@ -330,7 +334,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-v>"],
         function () { vimperator.addMode(null, vimperator.modes.ESCAPE_ONE_KEY); },
         {
-            short_help: "Escape next key",
+            shortHelp: "Escape next key",
             help: "If you need to pass a certain key to a JavaScript form field or another extension prefix the key with <code class=\"mapping\">&lt;C-v&gt;</code>.<br/>" +
                   "Also works to unshadow Firefox shortcuts like <code class=\"mapping\">&lt;C-o&gt;</code> which are otherwise hidden in Vimperator.<br/>" +
                   "When in 'ignorekeys' mode (activated by <code class=\"mapping\">&lt;I&gt;</code>), <code class=\"mapping\">&lt;C-v&gt;</code> will pass the next key to Vimperator instead of the web page."
@@ -339,14 +343,14 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-c>"],
         BrowserStop,
         {
-            short_help: "Stop loading",
+            shortHelp: "Stop loading",
             help: "Stops loading the current web page."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<Nop>"],
         function () { return; },
         {
-            short_help: "Do nothing",
+            shortHelp: "Do nothing",
             help: "This command is useful for disabling a specific mapping. " +
                   "<code class=\"command\">:map &lt;C-n&gt; &lt;Nop&gt;</code> will prevent <code class=\"mapping\">&lt;C-n&gt;</code> from doing anything."
         }
@@ -354,7 +358,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<Esc>", "<C-[>"],
         vimperator.events.onEscape,
         {
-            short_help: "Focus content",
+            shortHelp: "Focus content",
             help: "Exits any command line or hint mode and returns to browser mode.<br/>" +
                   "Also focuses the web page, in case a form field has focus and eats our key presses."
         }
@@ -363,7 +367,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["]f"],
         function (count) { vimperator.buffer.shiftFrameFocus(count > 1 ? count : 1, true); },
         {
-            short_help: "Focus next frame",
+            shortHelp: "Focus next frame",
             help: "Transfers keyboard focus to the <code class=\"argument\">[count]</code>th next frame in order. The newly focused frame is briefly colored red. Does not wrap.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -371,7 +375,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["[f"],
         function (count) { vimperator.buffer.shiftFrameFocus(count > 1 ? count : 1, false); },
         {
-            short_help: "Focus previous frame",
+            shortHelp: "Focus previous frame",
             help: "Transfers keyboard focus to the <code class=\"argument\">[count]</code>th previous frame in order. The newly focused frame is briefly colored red. Does not wrap.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -379,14 +383,14 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["b"],
         function () { vimperator.commandline.open(":", "buffer! ", vimperator.modes.EX); },
         {
-            short_help: "Open a prompt to switch buffers",
+            shortHelp: "Open a prompt to switch buffers",
             help: "Typing the corresponding number switches to this buffer."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["B"],
         function () { vimperator.buffer.list(true); },
         {
-            short_help: "Toggle buffer list",
+            shortHelp: "Toggle buffer list",
             help: "Toggles the display of the buffer list which shows all opened tabs.<br/>" +
                   "WARNING: This mapping may be removed/changed in future."
         }
@@ -394,7 +398,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gb"],
         function (count) { vimperator.buffer.switchTo(null, null, count, false); },
         {
-            short_help: "Repeat last :buffer[!] command",
+            shortHelp: "Repeat last :buffer[!] command",
             help: "This is useful to quickly jump between buffers which have a similar URL or title.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -402,7 +406,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gB"],
         function (count) { vimperator.buffer.switchTo(null, null, count, true); },
         {
-            short_help: "Repeat last :buffer[!] command in reverse direction",
+            shortHelp: "Repeat last :buffer[!] command in reverse direction",
             help: "Just like <code class=\"mapping\">gb</code> but in the other direction.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -410,7 +414,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["d"],
         function (count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count, false, 0); },
         {
-            short_help: "Delete current buffer (=tab)",
+            shortHelp: "Delete current buffer (=tab)",
             help: "Count is supported, <code class=\"mapping\">2d</code> removes the current and next tab and the one to the right is selected. " +
                   "Does not wrap if <code class=\"argument\">[count]</code> is larger than available tabs to the right.",
             flags: vimperator.Mappings.flags.COUNT
@@ -419,7 +423,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["D"],
         function (count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count, true, 0); },
         {
-            short_help: "Delete current buffer (=tab)",
+            shortHelp: "Delete current buffer (=tab)",
             help: "Count is supported, <code class=\"mapping\">2D</code> removes the current and previous tab and the one to the left is selected. " +
                   "Does not wrap if <code class=\"argument\">[count]</code> is larger than available tabs to the left.",
             flags: vimperator.Mappings.flags.COUNT
@@ -428,7 +432,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gh"],
         BrowserHome,
         {
-            short_help: "Go home",
+            shortHelp: "Go home",
             help: "Opens the homepage in the current tab."
         }
     ));
@@ -440,7 +444,7 @@ vimperator.Mappings = function () //{{{
                     vimperator.NEW_TAB : vimperator.NEW_BACKGROUND_TAB);
         },
         {
-            short_help: "Go home in a new tab",
+            shortHelp: "Go home in a new tab",
             help: "Opens the homepage in a new tab. " +
                   "Whether the new tab is activated or not depends on the <code class=\"option\">'activate'</code> option.<br/>"
         }
@@ -448,7 +452,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["go"],
         function (arg) { vimperator.quickmarks.jumpTo(arg, vimperator.CURRENT_TAB); },
         {
-            short_help: "Jump to a QuickMark in the current tab",
+            shortHelp: "Jump to a QuickMark in the current tab",
             usage: ["go{a-zA-Z0-9}"],
             help: "Open any QuickMark in the current tab. You can mark any URLs with <code class=\"mapping\">M{a-zA-Z0-9}</code>. " +
                   "These QuickMarks are persistent across browser sessions.",
@@ -463,7 +467,7 @@ vimperator.Mappings = function () //{{{
                 vimperator.NEW_TAB : vimperator.NEW_BACKGROUND_TAB);
         },
         {
-            short_help: "Jump to a QuickMark in a new tab",
+            shortHelp: "Jump to a QuickMark in a new tab",
             usage: ["gn{a-zA-Z0-9}"],
             help: "Works like <code class=\"mapping\">go{a-zA-Z0-9}</code> but opens the QuickMark in a new tab. " +
                    "Whether the new tab is activated or not depends on the <code class=\"option\">'activate'</code> option.<br/>" +
@@ -479,14 +483,14 @@ vimperator.Mappings = function () //{{{
                 vimperator.NEW_BACKGROUND_TAB : vimperator.NEW_TAB);
         },
         {
-            short_help: "Open (put) a URL based on the current clipboard contents in a new buffer",
+            shortHelp: "Open (put) a URL based on the current clipboard contents in a new buffer",
             help: "Works like <code class=\"mapping\">P</code>, but inverts the <code class=\"option\">'activate'</code> option."
         }
     ));
     addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gt", "<C-n>", "<C-Tab>", "<C-PageDown>"],
         function (count) { vimperator.tabs.select(count > 0 ? count - 1: "+1", count > 0 ? false : true); },
         {
-            short_help: "Go to the next tab",
+            shortHelp: "Go to the next tab",
             help: "Cycles to the first tab, when the last is selected.<br/>Count is supported: <code class=\"mapping\">3gt</code> goes to the third tab.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -494,7 +498,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gT", "<C-p>", "<C-S-Tab>", "<C-PageUp>"],
         function (count) { vimperator.tabs.select("-" + (count < 1 ? 1 : count), true); },
         {
-            short_help: "Go {count} pages back",
+            shortHelp: "Go {count} pages back",
             help: "Wraps around from the first tab to the last tab.<br/>Count is supported: <code class=\"mapping\">3gT</code> goes three tabs back.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -521,7 +525,7 @@ vimperator.Mappings = function () //{{{
                 vimperator.tabs.select(index);
         },
         {
-            short_help: "Select the alternate tab",
+            shortHelp: "Select the alternate tab",
             usage: ["<C-^>"],
             help: "The alternate tab is the last selected tab. This provides a quick method of toggling between two tabs."
         }
@@ -538,7 +542,7 @@ vimperator.Mappings = function () //{{{
             vimperator.marks.add(arg);
         },
         {
-            short_help: "Set mark at the cursor position",
+            shortHelp: "Set mark at the cursor position",
             usage: ["m{a-zA-Z}"],
             help: "Marks a-z are local to the buffer, whereas A-Z are valid between buffers.",
             flags: vimperator.Mappings.flags.ARGUMENT
@@ -547,7 +551,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["'", "`"],
         function (arg) { vimperator.marks.jumpTo(arg); },
         {
-            short_help: "Jump to the mark in the current buffer",
+            shortHelp: "Jump to the mark in the current buffer",
             usage: ["'{a-zA-Z}"],
             help: "Marks a-z are local to the buffer, whereas A-Z are valid between buffers.",
             flags: vimperator.Mappings.flags.ARGUMENT
@@ -565,7 +569,7 @@ vimperator.Mappings = function () //{{{
             vimperator.quickmarks.add(arg, vimperator.buffer.URL);
         },
         {
-            short_help: "Add new QuickMark for current URL",
+            shortHelp: "Add new QuickMark for current URL",
             usage: ["M{a-zA-Z0-9}"],
             help: "You can go to a marked URL in the current tab with <code class=\"mapping\">go{a-zA-Z0-9}</code> or in a new tab with <code class=\"mapping\">gn{a-zA-Z0-9}</code>. " +
                   "These QuickMarks are persistent across browser sessions.",
@@ -575,21 +579,21 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["o"],
         function () { vimperator.commandline.open(":", "open ", vimperator.modes.EX); },
         {
-            short_help: "Open one or more URLs in the current tab",
+            shortHelp: "Open one or more URLs in the current tab",
             help: "See <code class=\"command\">:open</code> for more details."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["O"],
         function () { vimperator.commandline.open(":", "open " + vimperator.buffer.URL, vimperator.modes.EX); },
         {
-            short_help: "Open one or more URLs in the current tab, based on current location",
+            shortHelp: "Open one or more URLs in the current tab, based on current location",
             help: "Works like <code class=\"mapping\">o</code>, but preselects current URL in the <code class=\"command\">:open</code> query."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["p", "<MiddleMouse>"],
         function () { vimperator.open(readFromClipboard()); },
         {
-            short_help: "Open (put) a URL based on the current clipboard contents in the current buffer",
+            shortHelp: "Open (put) a URL based on the current clipboard contents in the current buffer",
             help: "You can also just select (for non-X11 users: copy) some non-URL text, and search for it with the default search engine or keyword (specified by the <code class=\"option\">'defsearch'</code> option) with <code class=\"mapping\">p</code>."
         }
     ));
@@ -601,7 +605,7 @@ vimperator.Mappings = function () //{{{
                 vimperator.NEW_TAB : vimperator.NEW_BACKGROUND_TAB);
         },
         {
-            short_help: "Open (put) a URL based on the current clipboard contents in a new buffer",
+            shortHelp: "Open (put) a URL based on the current clipboard contents in a new buffer",
             help: "Works like <code class=\"mapping\">p</code>, but opens a new tab.<br/>" +
                   "Whether the new buffer is activated, depends on the <code class=\"option\">'activate'</code> option."
         }
@@ -609,21 +613,21 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["r"],
         function () { vimperator.tabs.reload(getBrowser().mCurrentTab, false); },
         {
-            short_help: "Reload",
+            shortHelp: "Reload",
             help: "Forces reloading of the current page."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["R"],
         function () { vimperator.tabs.reload(getBrowser().mCurrentTab, true); },
         {
-            short_help: "Reload while skipping the cache",
+            shortHelp: "Reload while skipping the cache",
             help: "Forces reloading of the current page skipping the cache."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["t"],
         function () { vimperator.commandline.open(":", "tabopen ", vimperator.modes.EX); },
         {
-            short_help: "Open one or more URLs in a new tab",
+            shortHelp: "Open one or more URLs in a new tab",
             help: "Like <code class=\"mapping\">o</code> but open URLs in a new tab.<br/>" +
                   "See <code class=\"command\">:tabopen</code> for more details."
         }
@@ -631,14 +635,14 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["T"],
         function () { vimperator.commandline.open(":", "tabopen " + vimperator.buffer.URL, vimperator.modes.EX); },
         {
-            short_help: "Open one or more URLs in a new tab, based on current location",
+            shortHelp: "Open one or more URLs in a new tab, based on current location",
             help: "Works like <code class=\"mapping\">t</code>, but preselects current URL in the <code class=\"command\">:tabopen</code> query."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["u"],
         function (count) { vimperator.commands.undo("", false, count); },
         {
-            short_help: "Undo closing of a tab",
+            shortHelp: "Undo closing of a tab",
             help: "If a count is given, don't close the last but the <code class=\"argument\">[count]</code>th last tab.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -651,7 +655,7 @@ vimperator.Mappings = function () //{{{
             vimperator.echo("Yanked " + url);
         },
         {
-            short_help: "Yank current location to the clipboard",
+            shortHelp: "Yank current location to the clipboard",
             help: "When running in X11 the location is also put into the selection, which can be pasted with the middle mouse button."
         }
     ));
@@ -662,42 +666,42 @@ vimperator.Mappings = function () //{{{
             vimperator.copyToClipboard(sel);
         },
         {
-            short_help: "Copy selected text",
+            shortHelp: "Copy selected text",
             help: "The currently selected text is copied to the system clipboard."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zi", "+"],
         function (count) { vimperator.buffer.zoomIn(count > 1 ? count : 1); },
         {
-            short_help: "Zoom in current web page by 25%",
+            shortHelp: "Zoom in current web page by 25%",
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zI"],
         function (count) { vimperator.buffer.zoomIn((count > 1 ? count : 1) * 4); },
         {
-            short_help: "Zoom in current web page by 100%",
+            shortHelp: "Zoom in current web page by 100%",
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zo", "-"],
         function (count) { vimperator.buffer.zoomOut(count > 1 ? count : 1); },
         {
-            short_help: "Zoom out current web page by 25%",
+            shortHelp: "Zoom out current web page by 25%",
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zO"],
         function (count) { vimperator.buffer.zoomOut((count > 1 ? count : 1) * 4); },
         {
-            short_help: "Zoom out current web page by 100%",
+            shortHelp: "Zoom out current web page by 100%",
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["zz"],
         function (count) { vimperator.buffer.textZoom = count > 1 ? count : 100; },
         {
-            short_help: "Set zoom value of the web page",
+            shortHelp: "Set zoom value of the web page",
             help: "Zoom value can be between 1 and 2000%. If it is omitted, zoom is reset to 100%.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -705,14 +709,14 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["ZQ"],
         function () { vimperator.quit(false); },
         {
-            short_help: "Quit and don't save the session",
+            shortHelp: "Quit and don't save the session",
             help: "Works like <code class=\"command\">:qall</code>."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["ZZ"],
         function () { vimperator.quit(true); },
         {
-            short_help: "Quit and save the session",
+            shortHelp: "Quit and save the session",
             help: "Quit Vimperator, no matter how many tabs/windows are open. The session is stored.<br/>" +
                   "Works like <code class=\"command\">:xall</code>."
         }
@@ -722,20 +726,20 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["0", "^"],
         function () { vimperator.buffer.scrollStart(); },
         {
-            short_help: "Scroll to the absolute left of the document",
+            shortHelp: "Scroll to the absolute left of the document",
             help: "Unlike in Vim, <code class=\"mapping\">0</code> and <code class=\"mapping\">^</code> work exactly the same way."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["$"],
         function () { vimperator.buffer.scrollEnd(); },
         {
-            short_help: "Scroll to the absolute right of the document"
+            shortHelp: "Scroll to the absolute right of the document"
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gg", "<Home>"],
         function (count) { vimperator.buffer.scrollToPercentile(count >  0 ? count : 0); },
         {
-            short_help: "Goto the top of the document",
+            shortHelp: "Goto the top of the document",
             help: "When used with <code class=\"argument\">[count]</code> like in <code class=\"mapping\">35gg</code>, it scrolls to 35% of the document.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -743,7 +747,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["G", "<End>"],
         function (count) { vimperator.buffer.scrollToPercentile(count >= 0 ? count : 100); },
         {
-            short_help: "Goto the end of the document",
+            shortHelp: "Goto the end of the document",
             help: "When used with <code class=\"argument\">[count]</code> like in <code class=\"mapping\">35G</code>, it scrolls to 35% of the document.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -751,7 +755,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["h", "<Left>"],
         function (count) { vimperator.buffer.scrollColumns(-(count > 1 ? count : 1)); },
         {
-            short_help: "Scroll document to the left",
+            shortHelp: "Scroll document to the left",
             help: "Count is supported: <code class=\"mapping\">10h</code> will move 10 times as much to the left.<br/>" +
                   "If the document cannot scroll more, a beep is emitted (unless <code class=\"option\">'visualbell'</code> is set).",
             flags: vimperator.Mappings.flags.COUNT
@@ -760,7 +764,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["j", "<Down>", "<C-e>"],
         function (count) { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
         {
-            short_help: "Scroll document down",
+            shortHelp: "Scroll document down",
             help: "Count is supported: <code class=\"mapping\">10j</code> will move 10 times as much down.<br/>" +
                   "If the document cannot scroll more, a beep is emitted (unless <code class=\"option\">'visualbell'</code> is set).",
             flags: vimperator.Mappings.flags.COUNT
@@ -769,7 +773,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["k", "<Up>", "<C-y>"],
         function (count) { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
         {
-            short_help: "Scroll document up",
+            shortHelp: "Scroll document up",
             help: "Count is supported: <code class=\"mapping\">10k</code> will move 10 times as much up.<br/>" +
                   "If the document cannot scroll more, a beep is emitted (unless <code class=\"option\">'visualbell'</code> is set).",
             flags: vimperator.Mappings.flags.COUNT
@@ -794,7 +798,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-d>"],
         function (count) { scrollByScrollSize(count, 1); },
         {
-            short_help: "Scroll window downwards in the buffer",
+            shortHelp: "Scroll window downwards in the buffer",
             help: "The number of lines is set by the <code class=\"option\">'scroll'</code> option which defaults to half a page. " +
                   "If <code class=\"argument\">[count]</code> is given <code class=\"option\">'scroll'</code> is first set to this value.",
             flags: vimperator.Mappings.flags.COUNT
@@ -803,7 +807,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-u>"],
         function (count) { scrollByScrollSize(count, -1); },
         {
-            short_help: "Scroll window upwards in the buffer",
+            shortHelp: "Scroll window upwards in the buffer",
             help: "The number of lines is set by the <code class=\"option\">'scroll'</code> option which defaults to half a page. " +
                   "If <code class=\"argument\">[count]</code> is given <code class=\"option\">'scroll'</code> is first set to this value.",
             flags: vimperator.Mappings.flags.COUNT
@@ -812,7 +816,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["l", "<Right>"],
         function (count) { vimperator.buffer.scrollColumns(count > 1 ? count : 1); },
         {
-            short_help: "Scroll document to the right",
+            shortHelp: "Scroll document to the right",
             help: "Count is supported: <code class=\"mapping\">10l</code> will move 10 times as much to the right.<br/>" +
                   "If the document cannot scroll more, a beep is emitted (unless <code class=\"option\">'visualbell'</code> is set).",
             flags: vimperator.Mappings.flags.COUNT
@@ -821,7 +825,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-b>", "<PageUp>", "<S-Space>"],
         function (count) { vimperator.buffer.scrollPages(-(count > 1 ? count : 1)); },
         {
-            short_help: "Scroll up a full page",
+            shortHelp: "Scroll up a full page",
             help: "Scroll window <code class=\"argument\">[count]</code> pages Backwards (upwards) in the buffer.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -829,7 +833,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-f>", "<PageDown>", "<Space>"],
         function (count) { vimperator.buffer.scrollPages(count > 1 ? count : 1); },
         {
-            short_help: "Scroll down a full page",
+            shortHelp: "Scroll down a full page",
             help: "Scroll window <code class=\"argument\">[count]</code> pages Forwards (downwards) in the buffer.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -839,7 +843,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["<C-g>"],
         function (count) { vimperator.buffer.pageInfo(false); },
         {
-            short_help: "Print the current file name",
+            shortHelp: "Print the current file name",
             help: "Also shows some additional file information like file size or the last modified date. " +
                   "If <code class='argument'>{count}</code> is given print the current file name with full path.",
             flags: vimperator.Mappings.flags.COUNT
@@ -848,7 +852,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["g<C-g>"],
         function (count) { vimperator.buffer.pageInfo(true); },
         {
-            short_help: "Print file information",
+            shortHelp: "Print file information",
             help: "Same as <code class='command'>:pa[geinfo]</code>."
         }
     ));
@@ -858,7 +862,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-o>"],
         function (count) { vimperator.history.stepTo(-(count > 1 ? count : 1)); },
         {
-            short_help: "Go to an older position in the jump list",
+            shortHelp: "Go to an older position in the jump list",
             help: "The jump list is just the browser history for now.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -866,7 +870,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["<C-i>"],
         function (count) { vimperator.history.stepTo(count > 1 ? count : 1); },
         {
-            short_help: "Go to a newer position in the jump list",
+            shortHelp: "Go to a newer position in the jump list",
             help: "The jump list is just the browser history for now.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -874,7 +878,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["H", "<A-Left>", "<M-Left>"],
         function (count) { vimperator.history.stepTo(-(count > 1 ? count : 1)); },
         {
-            short_help: "Go back in the browser history",
+            shortHelp: "Go back in the browser history",
             help: "Count is supported: <code class=\"mapping\">3H</code> goes back 3 steps.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -882,7 +886,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["L", "<A-Right>", "<M-Right>"],
         function (count) { vimperator.history.stepTo(count > 1 ? count : 1); },
         {
-            short_help: "Go forward in the browser history",
+            shortHelp: "Go forward in the browser history",
             help: "Count is supported: <code class=\"mapping\">3L</code> goes forward 3 steps.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -922,7 +926,7 @@ vimperator.Mappings = function () //{{{
             vimperator.open(gocmd);
         },
         {
-            short_help: "Go to parent directory",
+            shortHelp: "Go to parent directory",
             help: "Count is supported: <code class=\"mapping\">2gu</code> on <code>http://www.example.com/dir1/dir2/file.htm</code> would open <code>http://www.example.com/dir1/</code>.",
             flags: vimperator.Mappings.flags.COUNT
         }
@@ -930,7 +934,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gU", "<C-BS>"],
         function () { vimperator.open("..."); },
         {
-            short_help: "Go to the root of the website",
+            shortHelp: "Go to the root of the website",
             help: "<code class=\"mapping\">gU</code> on <code>http://www.example.com/dir1/dir2/file.htm</code> opens <code>http://www.example.com/</code>.<br/>" +
                   "When browsing a local directory, it goes to the root document."
         }
@@ -940,7 +944,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["f"],
         function () { vimperator.hints.enableHahMode(vimperator.modes.QUICK_HINT); },
         {
-            short_help: "Start QuickHint mode",
+            shortHelp: "Start QuickHint mode",
             help: "In QuickHint mode, every hintable item (according to the <code class=\"option\">'hinttags'</code> XPath query) is assigned a label.<br/>" +
                   "If you then press the keys for a label, it is followed as soon as it can be uniquely identified and this mode is stopped. Or press <code class=\"mapping\">&lt;Esc&gt;</code> to stop this mode.<br/>" +
                   "If you write the hint in ALLCAPS, the hint is followed in a background tab."
@@ -949,7 +953,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["F"],
         function () { vimperator.hints.enableHahMode(vimperator.modes.ALWAYS_HINT); },
         {
-            short_help: "Start AlwaysHint mode",
+            shortHelp: "Start AlwaysHint mode",
             help: "In AlwaysHint mode, every hintable item (according to the <code class=\"option\">'hinttags'</code> XPath query) is assigned a label.<br/>" +
                   "If you then press the keys for a label, it is followed as soon as it can be uniquely identified. Labels stay active after following a hint in this mode, press <code class=\"mapping\">&lt;Esc&gt;</code> to stop this mode.<br/>" +
                   "This hint mode is especially useful for browsing large sites like Forums as hints are automatically regenerated when switching to a new document.<br/>" +
@@ -959,7 +963,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, [";"],
         function () { vimperator.hints.enableHahMode(vimperator.modes.EXTENDED_HINT); },
         {
-            short_help: "Start ExtendedHint mode",
+            shortHelp: "Start ExtendedHint mode",
             help: "ExtendedHint mode is useful, since in this mode you can yank link locations, or open them in a new window.<br/>" +
                   "E.g., if you want to yank the location of hint <code>AB</code>, press <code class=\"mapping\">;</code> to start this hint mode.<br/>" +
                   "Then press <code>AB</code> to select the hint. Now press <code class=\"mapping\">y</code> to yank its location.<br/>" +
@@ -984,7 +988,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["/"],
         function () { vimperator.search.openSearchDialog(vimperator.modes.SEARCH_FORWARD); },
         {
-            short_help: "Search forward for a pattern",
+            shortHelp: "Search forward for a pattern",
             usage: ["/{pattern}[/]<CR>"],
             help: "Search forward for the first occurrence of <code class=\"argument\">{pattern}</code>.<br/>" +
                   "If \"\\c\" appears anywhere in the pattern the whole pattern is handled as though <code class=\"option\">'ignorecase'</code> is on. " +
@@ -996,7 +1000,7 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["?"],
         function () { vimperator.search.openSearchDialog(vimperator.modes.SEARCH_BACKWARD); },
         {
-            short_help: "Search backwards for a pattern",
+            shortHelp: "Search backwards for a pattern",
             usage: ["?{pattern}[?]<CR>"],
             help: "Search backward for the first occurrence of <code class=\"argument\">{pattern}</code>.<br/>" +
                   "If \"\\c\" appears anywhere in the pattern the whole pattern is handled as though <code class=\"option\">'ignorecase'</code> is on. " +
@@ -1009,14 +1013,14 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["n"],
         function () { vimperator.search.findAgain(false); },
         {
-            short_help: "Find next",
+            shortHelp: "Find next",
             help: "Repeat the last search 1 time (until count is supported)."
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["N"],
         function () { vimperator.search.findAgain(true); },
         {
-            short_help: "Find previous",
+            shortHelp: "Find previous",
             help: "Repeat the last search 1 time (until count is supported) in the opposite direction."
         }
     ));
@@ -1030,64 +1034,64 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["o"],
         function () { vimperator.hints.openHints(false, false); },
         {
-            cancel_mode: true,
-            always_active: false
+            cancelMode: true,
+            alwaysActive: false
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["t"],
         function () { vimperator.hints.openHints(true,  false); },
         {
-            cancel_mode: true,
-            always_active: false
+            cancelMode: true,
+            alwaysActive: false
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-w>"],
-        function () { vimperator.hints.openHints(false, true ); },
+        function () { vimperator.hints.openHints(false, true); },
         {
-            cancel_mode: true,
-            always_active: false
+            cancelMode: true,
+            alwaysActive: false
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["s"],
         function () { vimperator.hints.saveHints(true); },
         {
-            cancel_mode: true,
-            always_active: false
+            cancelMode: true,
+            alwaysActive: false
         }
     ));
     addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["a"],
         function () { vimperator.hints.saveHints(false); },
         {
-            cancel_mode: true,
-            always_active: false
+            cancelMode: true,
+            alwaysActive: false
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["y"],
         function () { vimperator.hints.yankUrlHints(); },
         {
-            cancel_mode: true,
-            always_active: false
+            cancelMode: true,
+            alwaysActive: false
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["Y"],
         function () { vimperator.hints.yankTextHints(); },
         {
-            cancel_mode: true,
-            always_active: false
+            cancelMode: true,
+            alwaysActive: false
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, [","],
         function () { vimperator.input.buffer += ","; vimperator.hints.setCurrentState(0); },
         {
-            cancel_mode: false,
-            always_active: true
+            cancelMode: false,
+            alwaysActive: true
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, [":"],
         function () { vimperator.commandline.open(":", "", vimperator.modes.EX); },
         {
-            cancel_mode: false,
-            always_active: true
+            cancelMode: false,
+            alwaysActive: true
         }
     ));
 
@@ -1095,78 +1099,78 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-e>"],
         function (count) { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
         {
-            cancel_mode: false,
-            always_active: true,
+            cancelMode: false,
+            alwaysActive: true,
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-y>"],
         function (count) { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
         {
-            cancel_mode: false,
-            always_active: true,
+            cancelMode: false,
+            alwaysActive: true,
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Home>"],
         function () { vimperator.buffer.scrollTop(); },
         {
-            cancel_mode: false,
-            always_active: true
+            cancelMode: false,
+            alwaysActive: true
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<End>"],
         function () { vimperator.buffer.scrollBottom(); },
         {
-            cancel_mode: false,
-            always_active: true
+            cancelMode: false,
+            alwaysActive: true
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<PageUp>", "<C-b>"],
         function (count) { vimperator.buffer.scrollPages(-(count > 1 ? count : 1)); },
         {
-            cancel_mode: false,
-            always_active: true,
+            cancelMode: false,
+            alwaysActive: true,
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<PageDown>", "<C-f>"],
         function (count) { vimperator.buffer.scrollPages(count > 1 ? count : 1); },
         {
-            cancel_mode: false,
-            always_active: true,
+            cancelMode: false,
+            alwaysActive: true,
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Left>"],
         function () { vimperator.buffer.scrollColumns(-(count > 1 ? count : 1)); },
         {
-            cancel_mode: false,
-            always_active: true,
+            cancelMode: false,
+            alwaysActive: true,
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Down>"],
         function () { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
         {
-            cancel_mode: false,
-            always_active: true,
+            cancelMode: false,
+            alwaysActive: true,
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Up>"],
         function () { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
         {
-            cancel_mode: false,
-            always_active: true,
+            cancelMode: false,
+            alwaysActive: true,
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Right>"],
         function () { vimperator.buffer.scrollColumns(count > 1 ? count : 1); },
         {
-            cancel_mode: false,
-            always_active: true,
+            cancelMode: false,
+            alwaysActive: true,
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
@@ -1175,15 +1179,15 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-n>"],
         function () { vimperator.tabs.select("+1", true); },
         {
-            cancel_mode: true,
-            always_active: true
+            cancelMode: true,
+            alwaysActive: true
         }
     )); // same as gt, but no count supported
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-p>"],
         function () { vimperator.tabs.select("-1", true); },
         {
-            cancel_mode: true,
-            always_active: true
+            cancelMode: true,
+            alwaysActive: true
         }
     ));
 
@@ -1191,74 +1195,76 @@ vimperator.Mappings = function () //{{{
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-o>"],
         function (count) { vimperator.history.stepTo(count > 0 ? -count : -1); },
         {
-            cancel_mode: false,
-            always_active: true,
+            cancelMode: false,
+            alwaysActive: true,
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-i>"],
         function (count) { vimperator.history.stepTo(count > 1 ? count : 1); },
         {
-            cancel_mode: false,
-            always_active: true,
+            cancelMode: false,
+            alwaysActive: true,
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-h>"],
         function (count) { vimperator.history.stepTo(count > 0 ? -count : -1); },
         {
-            cancel_mode: false,
-            always_active: true,
+            cancelMode: false,
+            alwaysActive: true,
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-l>"],
         function (count) { vimperator.history.stepTo(count > 1 ? count : 1); },
         {
-            cancel_mode: false,
-            always_active: true,
+            cancelMode: false,
+            alwaysActive: true,
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-d>"],
         function () { vimperator.tabs.remove(getBrowser().mCurrentTab, vimperator.input.count, false, 0); },
         {
-            cancel_mode: true,
-            always_active: true
+            cancelMode: true,
+            alwaysActive: true
         }
     ));
 
-    // cancel_mode hint mode keys
+    // cancelMode hint mode keys
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-c>"],
         function () { ; },
         {
-            cancel_mode: true,
-            always_active: true
+            cancelMode: true,
+            alwaysActive: true
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-g>"],
         function () { ; },
         {
-            cancel_mode: true,
-            always_active: true
+            cancelMode: true,
+            alwaysActive: true
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<C-[>"],
         function () { ; },
         {
-            cancel_mode: true,
-            always_active: true
+            cancelMode: true,
+            alwaysActive: true
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, ["<Esc>"],
         function () { ; },
         {
-            cancel_mode: true,
-            always_active: true
+            cancelMode: true,
+            alwaysActive: true
         }
     ));
     //}}}
     //}}}
-} //}}}
+
+    return mappingManager;
+}; //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/options.js b/content/options.js
index 5ee4ab1b..149e122e 100644
--- a/content/options.js
+++ b/content/options.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.Option = function (names, type, extra_info) //{{{
+vimperator.Option = function (names, type, extraInfo) //{{{
 {
     if (!names || !type)
         return null;
@@ -38,29 +38,29 @@ vimperator.Option = function (names, type, extra_info) //{{{
     this.usage = this.names;
     this.type = type;
 
-    if (extra_info)
+    if (extraInfo)
     {
-        if (extra_info.usage)
-            this.usage = extra_info.usage;
+        if (extraInfo.usage)
+            this.usage = extraInfo.usage;
 
-        this.help = extra_info.help || null;
-        this.short_help = extra_info.short_help || null;
+        this.help = extraInfo.help || null;
+        this.shortHelp = extraInfo.shortHelp || null;
 
         // "", 0 are valid default values
-        if (extra_info.default_value !== undefined)
-            this.default_value = extra_info.default_value;
+        if (extraInfo.defaultValue !== undefined)
+            this.defaultValue = extraInfo.defaultValue;
         else
-            this.default_value = null;
+            this.defaultValue = null;
 
-        value = this.default_value;
+        value = this.defaultValue;
 
-        if (extra_info.setter)
-            this.setter = extra_info.setter;
-        if (extra_info.getter)
-            this.getter = extra_info.getter;
+        if (extraInfo.setter)
+            this.setter = extraInfo.setter;
+        if (extraInfo.getter)
+            this.getter = extraInfo.getter;
 
-        this.completer = extra_info.completer || null;
-        this.validator = extra_info.validator || null;
+        this.completer = extraInfo.completer || null;
+        this.validator = extraInfo.validator || null;
     }
 
     // add noOPTION variant of boolean OPTION to this.names
@@ -85,9 +85,9 @@ vimperator.Option = function (names, type, extra_info) //{{{
         }
     );
     this.__defineSetter__("value",
-        function (new_value)
+        function (newValue)
         {
-            value = new_value;
+            value = newValue;
             if (this.setter)
                 this.setter.call(this, value);
         }
@@ -104,7 +104,7 @@ vimperator.Option = function (names, type, extra_info) //{{{
                 return true;
         }
         return false;
-    }
+    };
 
     this.isValidValue = function (value)
     {
@@ -112,26 +112,27 @@ vimperator.Option = function (names, type, extra_info) //{{{
             return this.validator(value);
         else
             return true;
-    }
+    };
 
     this.reset = function ()
     {
-        this.value = this.default_value;
-    }
-} //}}}
+        this.value = this.defaultValue;
+    };
+}; //}}}
 
 vimperator.Options = function () //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
-    var firefox_prefs = Components.classes["@mozilla.org/preferences-service;1"]
+
+    var firefoxPrefs = Components.classes["@mozilla.org/preferences-service;1"]
         .getService(Components.interfaces.nsIPrefBranch);
-    var vimperator_prefs = firefox_prefs.getBranch("extensions.vimperator.");
+    var vimperatorPrefs = firefoxPrefs.getBranch("extensions.vimperator.");
     var options = [];
 
     // save if we already changed a GUI related option, used for setInitialGUI
-    var guioptions_done = false, showtabline_done = false, laststatus_done = false;
+    var guioptionsDone = false, showtablineDone = false, laststatusDone = false;
 
     function optionsIterator()
     {
@@ -141,14 +142,14 @@ vimperator.Options = function () //{{{
         throw StopIteration;
     }
 
-    function storePreference(name, value, vimperator_branch)
+    function storePreference(name, value, vimperatorBranch)
     {
         var branch;
 
-        if (vimperator_branch)
-            branch = vimperator_prefs;
+        if (vimperatorBranch)
+            branch = vimperatorPrefs;
         else
-            branch = firefox_prefs;
+            branch = firefoxPrefs;
 
         switch (typeof value)
         {
@@ -166,23 +167,23 @@ vimperator.Options = function () //{{{
         }
     }
 
-    function loadPreference(name, forced_default, vimperator_branch)
+    function loadPreference(name, forcedDefault, vimperatorBranch)
     {
-        var default_value = null;
-        if (forced_default != null)  // this argument sets defaults for non-user settable options (like comp_history)
-            default_value = forced_default;
+        var defaultValue = null;
+        if (forcedDefault != null)  // this argument sets defaults for non-user settable options (like comp_history)
+            defaultValue = forcedDefault;
 
-        if (vimperator_branch)
+        if (vimperatorBranch)
         {
-            branch = vimperator_prefs;
+            branch = vimperatorPrefs;
 
-            if (!forced_default)  // this argument sets defaults for non-user settable options (like comp_history)
+            if (!forcedDefault)  // this argument sets defaults for non-user settable options (like comp_history)
             {
                 for (var i = 0; i < options.length; i++)
                 {
                     if (options[i].name == name) // only first name is searched
                     {
-                        default_value = options[i].default_value;
+                        defaultValue = options[i].defaultValue;
                         break;
                     }
                 }
@@ -190,12 +191,12 @@ vimperator.Options = function () //{{{
         }
         else
         {
-            branch = firefox_prefs;
+            branch = firefoxPrefs;
         }
 
         try
         {
-            switch (typeof default_value)
+            switch (typeof defaultValue)
             {
                 case "string":
                     return branch.getCharPref(name);
@@ -204,12 +205,12 @@ vimperator.Options = function () //{{{
                 case "boolean":
                     return branch.getBoolPref(name);
                 default:
-                    return default_value;
+                    return defaultValue;
             }
         }
         catch (e)
         {
-            return default_value;
+            return defaultValue;
         }
     }
 
@@ -225,7 +226,7 @@ vimperator.Options = function () //{{{
         document.getElementById("PersonalToolbar").collapsed = value.indexOf("b") > -1 ? false : true;
         document.getElementById("PersonalToolbar").hidden = value.indexOf("b") > -1 ? false : true;
 
-        guioptions_done = true;
+        guioptionsDone = true;
     }
 
     function setLastStatus(value)
@@ -245,7 +246,7 @@ vimperator.Options = function () //{{{
             document.getElementById("status-bar").hidden = false;
         }
 
-        laststatus_done = true;
+        laststatusDone = true;
     }
 
     function setShowTabline(value)
@@ -269,7 +270,7 @@ vimperator.Options = function () //{{{
             tabs.collapsed = false;
         }
 
-        showtabline_done = true;
+        showtablineDone = true;
     }
 
     function setTitleString(value)
@@ -296,9 +297,9 @@ vimperator.Options = function () //{{{
     //
 
     // work around firefox popup blocker
-    var popup_allowed_events = loadPreference("dom.popup_allowed_events", "change click dblclick mouseup reset submit");
-    if (!popup_allowed_events.match("keypress"))
-        storePreference("dom.popup_allowed_events", popup_allowed_events + " keypress");
+    var popupAllowedEvents = loadPreference("dom.popup_allowed_events", "change click dblclick mouseup reset submit");
+    if (!popupAllowedEvents.match("keypress"))
+        storePreference("dom.popup_allowed_events", popupAllowedEvents + " keypress");
 
     // TODO: shouldn't we be resetting these in destroy() as well?
     // we have our own typeahead find implementation
@@ -312,110 +313,114 @@ vimperator.Options = function () //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    this.__iterator__ = function ()
-    {
-        return optionsIterator();
-    }
+    var optionManager = {
 
-    this.get = function (name)
-    {
-        for (var i = 0; i < options.length; i++)
+        __iterator__: function ()
         {
-            if (options[i].hasName(name))
-                return options[i];
-        }
-        return null;
-    }
+            return optionsIterator();
+        },
 
-    this.add = function (option)
-    {
-        this.__defineGetter__(option.name, function () { return option.value; });
-        this.__defineSetter__(option.name, function (value) { option.value = value; });
-        options.push(option);
-    }
-
-    this.destroy = function ()
-    {
-        // reset some modified firefox prefs
-        if (loadPreference("dom.popup_allowed_events", "change click dblclick mouseup reset submit")
-                == popup_allowed_events + " keypress")
-            storePreference("dom.popup_allowed_events", popup_allowed_events);
-    }
-
-    this.list = function (only_non_default)
-    {
-        // TODO: columns like Vim?
-        var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
-                   "<table><tr align=\"left\" class=\"hl-Title\"><th>--- Options ---</th></tr>";
-        var name, value, def;
-
-        for (var i = 0; i < options.length; i++)
+        get: function (name)
         {
-            name  = options[i].name;
-            value = options[i].value;
-            def   = options[i].default_value;
-
-            if (only_non_default && value == def)
-                continue;
-
-            if (options[i].type == "boolean")
+            for (var i = 0; i < options.length; i++)
             {
-                name = value ? "  " + name : "no" + name;
-                if (value != def)
-                    name = "<span style=\"font-weight: bold\">" + name + "</span><span style=\"color: gray\">  (default: " + (def ? "" : "no") + options[i].name + ")</span>";
-                list += "<tr><td>" + name + "</td></tr>";
+                if (options[i].hasName(name))
+                    return options[i];
             }
-            else
+            return null;
+        },
+
+        add: function (option)
+        {
+            this.__defineGetter__(option.name, function () { return option.value; });
+            this.__defineSetter__(option.name, function (value) { option.value = value; });
+            options.push(option);
+        },
+
+        destroy: function ()
+        {
+            // reset some modified firefox prefs
+            if (loadPreference("dom.popup_allowed_events", "change click dblclick mouseup reset submit")
+                    == popupAllowedEvents + " keypress")
+                storePreference("dom.popup_allowed_events", popupAllowedEvents);
+        },
+
+        list: function (onlyNondefault)
+        {
+            // TODO: columns like Vim?
+            var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                       "<table><tr align=\"left\" class=\"hl-Title\"><th>--- Options ---</th></tr>";
+            var name, value, def;
+
+            for (var i = 0; i < options.length; i++)
             {
-                if (value != def)
+                name  = options[i].name;
+                value = options[i].value;
+                def   = options[i].defaultValue;
+
+                if (onlyNondefault && value == def)
+                    continue;
+
+                if (options[i].type == "boolean")
                 {
-                    name  = "<span style=\"font-weight: bold\">" + name + "</span>";
-                    value = vimperator.util.colorize(value, false) + "<span style=\"color: gray\">  (default: " + def + ")</span>";
+                    name = value ? "  " + name : "no" + name;
+                    if (value != def)
+                        name = "<span style=\"font-weight: bold\">" + name + "</span><span style=\"color: gray\">  (default: " + (def ? "" : "no") + options[i].name + ")</span>";
+                    list += "<tr><td>" + name + "</td></tr>";
                 }
                 else
-                    value = vimperator.util.colorize(value, false);
+                {
+                    if (value != def)
+                    {
+                        name  = "<span style=\"font-weight: bold\">" + name + "</span>";
+                        value = vimperator.util.colorize(value, false) + "<span style=\"color: gray\">  (default: " + def + ")</span>";
+                    }
+                    else
+                        value = vimperator.util.colorize(value, false);
 
-                list += "<tr><td>" + "  " + name + "=" + value + "</td></tr>";
+                    list += "<tr><td>" + "  " + name + "=" + value + "</td></tr>";
+                }
             }
+
+            list += "</table>";
+
+            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
+        },
+
+        // this hack is only needed, because we need to do asynchronous loading of the .vimperatorrc
+        setInitialGUI: function ()
+        {
+            if (!guioptionsDone)
+                this.get("guioptions").reset();
+            if (!laststatusDone)
+                this.get("laststatus").reset();
+            if (!showtablineDone)
+                this.get("showtabline").reset();
+        },
+
+        // TODO: separate Preferences from Options? Would these utility functions
+        // be better placed in the 'core' vimperator namespace somewhere?
+        setPref: function (name, value)
+        {
+            return storePreference(name, value, true);
+        },
+
+        getPref: function (name, forcedDefault)
+        {
+            return loadPreference(name, forcedDefault, true);
+        },
+
+        setFirefoxPref: function (name, value)
+        {
+            return storePreference(name, value);
+        },
+
+        getFirefoxPref: function (name, forcedDefault)
+        {
+            return loadPreference(name, forcedDefault);
         }
 
-        list += "</table>";
-
-        vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
-    }
-
-    // this hack is only needed, because we need to do asynchronous loading of the .vimperatorrc
-    this.setInitialGUI = function ()
-    {
-        if (!guioptions_done)
-            this.get("guioptions").reset();
-        if (!laststatus_done)
-            this.get("laststatus").reset();
-        if (!showtabline_done)
-            this.get("showtabline").reset();
-    }
-
-    // TODO: separate Preferences from Options? Would these utility functions
-    // be better placed in the 'core' vimperator namespace somewhere?
-    this.setPref = function (name, value)
-    {
-        return storePreference(name, value, true);
-    }
-
-    this.getPref = function (name, forced_default)
-    {
-        return loadPreference(name, forced_default, true);
-    }
-
-    this.setFirefoxPref = function (name, value)
-    {
-        return storePreference(name, value);
-    }
-
-    this.getFirefoxPref = function (name, forced_default)
-    {
-        return loadPreference(name, forced_default);
-    }
+    };
 
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// DEFAULT OPTIONS /////////////////////////////////////////
@@ -424,11 +429,11 @@ vimperator.Options = function () //{{{
     const DEFAULT_HINTTAGS = "//*[@onclick or @onmouseover or @onmousedown or @onmouseup or @oncommand or @class='lk' or @class='s'] | " +
                              "//input[not(@type='hidden')] | //a | //area | //iframe | //textarea | //button | //select | " +
                              "//xhtml:*[@onclick or @onmouseover or @onmousedown or @onmouseup or @oncommand or @class='lk' or @class='s'] | " +
-                             "//xhtml:input[not(@type='hidden')] | //xhtml:a | //xhtml:area | //xhtml:iframe | //xhtml:textarea | //xhtml:button | //xhtml:select"
+                             "//xhtml:input[not(@type='hidden')] | //xhtml:a | //xhtml:area | //xhtml:iframe | //xhtml:textarea | //xhtml:button | //xhtml:select";
 
-    this.add(new vimperator.Option(["activate", "act"], "stringlist",
+    optionManager.add(new vimperator.Option(["activate", "act"], "stringlist",
         {
-            short_help: "Define when tabs are automatically activated",
+            shortHelp: "Define when tabs are automatically activated",
             help: "Available items:<br/>" +
                   "<ul>" +
                   "<li><b>homepage</b>:  <code class=\"mapping\">gH</code> mapping</li>" +
@@ -436,16 +441,16 @@ vimperator.Options = function () //{{{
                   "<li><b>tabopen</b>:   <code class=\"command\">:tabopen[!]</code> command</li>" +
                   "<li><b>paste</b>:     <code class=\"mapping\">P</code> and <code class=\"mapping\">gP</code> mappings</li>" +
                   "</ul>",
-            default_value: "homepage,quickmark,tabopen,paste",
+            defaultValue: "homepage,quickmark,tabopen,paste",
             validator: function (value)
             {
                 return value.split(",").every(function (item) { return /^(homepage|quickmark|tabopen|paste|)$/.test(item); });
             }
         }
     ));
-    this.add(new vimperator.Option(["complete", "cpt"], "charlist",
+    optionManager.add(new vimperator.Option(["complete", "cpt"], "charlist",
         {
-            short_help: "Items which are completed at the :[tab]open prompt",
+            shortHelp: "Items which are completed at the :[tab]open prompt",
             help: "Available items:<br/>" +
                   "<ul>" +
                   "<li><b>s</b>: Search engines and keyword URLs</li>" +
@@ -455,43 +460,42 @@ vimperator.Options = function () //{{{
                   "</ul>" +
                   "The order is important, so <code class=\"command\">:set complete=bs</code> would list bookmarks first, and then any available quick searches.<br/>" +
                   "Add <code class=\"option\">'sort'</code> to the <code class=\"option\">'wildoptions'</code> option if you want all entries sorted.",
-            default_value: "sfbh",
+            defaultValue: "sfbh",
             validator: function (value) { return !/[^sfbh]/.test(value); }
         }
     ));
-    this.add(new vimperator.Option(["defsearch", "ds"], "string",
+    optionManager.add(new vimperator.Option(["defsearch", "ds"], "string",
         {
-            short_help: "Set the default search engine",
+            shortHelp: "Set the default search engine",
             help: "The default search engine is used in the <code class=\"command\">:[tab]open [arg]</code> command " +
                   "if [arg] neither looks like a URL or like a specified search engine/keyword.",
-            completer: function () { return [["foo", "bar"], ["shit", "blub"]]; },
-            default_value: "google"
+            defaultValue: "google"
         }
     ));
-    this.add(new vimperator.Option(["extendedhinttags", "eht"], "string",
+    optionManager.add(new vimperator.Option(["extendedhinttags", "eht"], "string",
         {
-            short_help: "XPath string of hintable elements activated by ';'",
-            default_value: DEFAULT_HINTTAGS
+            shortHelp: "XPath string of hintable elements activated by ';'",
+            defaultValue: DEFAULT_HINTTAGS
         }
     ));
-    this.add(new vimperator.Option(["focusedhintstyle", "fhs"], "string",
+    optionManager.add(new vimperator.Option(["focusedhintstyle", "fhs"], "string",
         {
-            short_help: "CSS specification of focused hints",
-            default_value: "z-index:5000; font-family:monospace; font-size:12px; color:ButtonText; background-color:ButtonShadow; " +
+            shortHelp: "CSS specification of focused hints",
+            defaultValue: "z-index:5000; font-family:monospace; font-size:12px; color:ButtonText; background-color:ButtonShadow; " +
                            "border-color:ButtonShadow; border-width:1px; border-style:solid; padding:0px 1px 0px 1px; position:absolute;"
         }
     ));
-    this.add(new vimperator.Option(["fullscreen", "fs"], "boolean",
+    optionManager.add(new vimperator.Option(["fullscreen", "fs"], "boolean",
         {
-            short_help: "Show the current window fullscreen",
+            shortHelp: "Show the current window fullscreen",
             setter: function (value) { window.fullScreen = value; },
             getter: function () { return window.fullScreen; },
-            default_value: false
+            defaultValue: false
         }
     ));
-    this.add(new vimperator.Option(["guioptions", "go"], "charlist",
+    optionManager.add(new vimperator.Option(["guioptions", "go"], "charlist",
         {
-            short_help: "Show or hide the menu, toolbar and scrollbars",
+            shortHelp: "Show or hide the menu, toolbar and scrollbars",
             help: "Supported characters:<br/>" +
                   "<ul>" +
                   "<li><b>m</b>: menubar</li>" +
@@ -499,58 +503,58 @@ vimperator.Options = function () //{{{
                   "<li><b>b</b>: bookmark bar</li>" +
                   "</ul>",
             setter: function (value) { setGuiOptions(value); },
-            default_value: "",
+            defaultValue: "",
             validator: function (value) { return !/[^mTb]/.test(value); }
         }
     ));
-    this.add(new vimperator.Option(["hintchars", "hc"], "charlist",
+    optionManager.add(new vimperator.Option(["hintchars", "hc"], "charlist",
         {
-            short_help: "String of single characters which can be used to follow hints",
-            default_value: "hjklasdfgyuiopqwertnmzxcvb"
+            shortHelp: "String of single characters which can be used to follow hints",
+            defaultValue: "hjklasdfgyuiopqwertnmzxcvb"
         }
     ));
-    this.add(new vimperator.Option(["hintstyle", "hs"], "string",
+    optionManager.add(new vimperator.Option(["hintstyle", "hs"], "string",
         {
-            short_help: "CSS specification of unfocused hints",
-            default_value: "z-index:5000; font-family:monospace; font-size:12px; color:white; background-color:red; " +
+            shortHelp: "CSS specification of unfocused hints",
+            defaultValue: "z-index:5000; font-family:monospace; font-size:12px; color:white; background-color:red; " +
                            "border-color:ButtonShadow; border-width:0px; border-style:solid; padding:0px 1px 0px 1px; position:absolute;"
         }
     ));
-    this.add(new vimperator.Option(["hinttags", "ht"], "string",
+    optionManager.add(new vimperator.Option(["hinttags", "ht"], "string",
         {
-            short_help: "XPath string of hintable elements activated by <code class=\"mapping\">'f'</code> and <code class=\"mapping\">'F'</code>",
-            default_value: DEFAULT_HINTTAGS
+            shortHelp: "XPath string of hintable elements activated by <code class=\"mapping\">'f'</code> and <code class=\"mapping\">'F'</code>",
+            defaultValue: DEFAULT_HINTTAGS
         }
     ));
-    this.add(new vimperator.Option(["hlsearch", "hls"], "boolean",
+    optionManager.add(new vimperator.Option(["hlsearch", "hls"], "boolean",
         {
-            short_help: "Highlight previous search pattern matches",
+            shortHelp: "Highlight previous search pattern matches",
             setter: function (value) { if (value) vimperator.search.highlight(); else vimperator.search.clear(); },
-            default_value: false
+            defaultValue: false
         }
     ));
-    this.add(new vimperator.Option(["hlsearchstyle", "hlss"], "string",
+    optionManager.add(new vimperator.Option(["hlsearchstyle", "hlss"], "string",
         {
-            short_help: "CSS specification of highlighted search items",
-            default_value: "color: black; background-color: yellow; padding: 0; display: inline;"
+            shortHelp: "CSS specification of highlighted search items",
+            defaultValue: "color: black; background-color: yellow; padding: 0; display: inline;"
         }
     ));
-    this.add(new vimperator.Option(["ignorecase", "ic"], "boolean",
+    optionManager.add(new vimperator.Option(["ignorecase", "ic"], "boolean",
         {
-            short_help: "Ignore case in search patterns",
-            default_value: true
+            shortHelp: "Ignore case in search patterns",
+            defaultValue: true
         }
     ));
-    this.add(new vimperator.Option(["incsearch", "is"], "boolean",
+    optionManager.add(new vimperator.Option(["incsearch", "is"], "boolean",
         {
-            short_help: "Show where the search pattern matches as it is typed",
+            shortHelp: "Show where the search pattern matches as it is typed",
             help: "NOTE: Incremental searching currently only works in the forward direction.",
-            default_value: true
+            defaultValue: true
         }
     ));
-    this.add(new vimperator.Option(["laststatus", "ls"], "number",
+    optionManager.add(new vimperator.Option(["laststatus", "ls"], "number",
         {
-            short_help: "Show the status line",
+            shortHelp: "Show the status line",
             help: "Determines when the last window will have a status line. " +
                   "Possible values:<br/>" +
                   "<ul>" +
@@ -559,35 +563,35 @@ vimperator.Options = function () //{{{
                   "<li><b>2</b>: always</li>" +
                   "</ul>" +
                   "NOTE: laststatus=1 not implemented yet.",
-            default_value: 2,
+            defaultValue: 2,
             setter: function (value) { setLastStatus(value); },
             validator: function (value) { return (value >= 0 && value <= 2); }
         }
     ));
-    this.add(new vimperator.Option(["linksearch", "lks"], "boolean",
+    optionManager.add(new vimperator.Option(["linksearch", "lks"], "boolean",
         {
-            short_help: "Limit the search to hyperlink text",
+            shortHelp: "Limit the search to hyperlink text",
             help: "This includes (X)HTML elements with an \"href\" atrribute and XLink \"simple\" links.",
-            default_value: false
+            defaultValue: false
         }
     ));
-    this.add(new vimperator.Option(["more"], "boolean",
+    optionManager.add(new vimperator.Option(["more"], "boolean",
         {
-            short_help: "Pause the message list window when more than one screen of listings is displayed",
-            default_value: true
+            shortHelp: "Pause the message list window when more than one screen of listings is displayed",
+            defaultValue: true
         }
     ));
-    this.add(new vimperator.Option(["maxhints", "mh"], "number",
+    optionManager.add(new vimperator.Option(["maxhints", "mh"], "number",
         {
-            short_help: "Maximum number of simultaneously shown hints",
+            shortHelp: "Maximum number of simultaneously shown hints",
             help: "If you want to speed up display of hints, choose a smaller value",
-            default_value: 250,
+            defaultValue: 250,
             validator: function (value) { if (value >= 1 && value <= 1000) return true; else return false; }
         }
     ));
-    this.add(new vimperator.Option(["pageinfo", "pa"], "charlist",
+    optionManager.add(new vimperator.Option(["pageinfo", "pa"], "charlist",
         {
-            short_help: "Desired info on :pa[geinfo]",
+            shortHelp: "Desired info on :pa[geinfo]",
             help: "Available items:<br/>" +
                   "<ul>" +
                   "<li><b>g</b>: general info</li>" +
@@ -595,13 +599,13 @@ vimperator.Options = function () //{{{
                   "<li><b>m</b>: meta tags</li>" +
                   "</ul>" +
                   "The order matters",
-            default_value: "gfm",
-            validator: function (value) { return !(/[^gfm]/.test(value) || value.length > 3 || value.length < 1) }
+            defaultValue: "gfm",
+            validator: function (value) { return !(/[^gfm]/.test(value) || value.length > 3 || value.length < 1); }
         }
     ));
-    this.add(new vimperator.Option(["popups", "pps"], "number",
+    optionManager.add(new vimperator.Option(["popups", "pps"], "number",
         {
-            short_help: "Where to show requested popup windows",
+            shortHelp: "Where to show requested popup windows",
             help: "Define where to show requested popup windows. Does not apply to windows which are opened by middle clicking a link, they always open in a new tab. " +
                   "Possible values:<br/>" +
                   "<ul>" +
@@ -611,48 +615,48 @@ vimperator.Options = function () //{{{
                   "<li><b>3</b>: Always open in a new window</li>" +
                   "</ul>" +
                   "NOTE: This option does not change the popup blocker of Firefox in any way.",
-            default_value: 1,
+            defaultValue: 1,
             setter: function (value) { setPopups(value); },
             validator: function (value) { return (value >= 0 && value <= 3); }
         }
     ));
-    this.add(new vimperator.Option(["preload"], "boolean",
+    optionManager.add(new vimperator.Option(["preload"], "boolean",
         {
-            short_help: "Speed up first time history/bookmark completion",
+            shortHelp: "Speed up first time history/bookmark completion",
             help: "History access can be quite slow for a large history. Vimperator maintains a cache to speed it up significantly on subsequent access.<br/>" +
                   "In order to also speed up first time access, it is cached at startup, if this option is set (recommended).",
-            default_value: true
+            defaultValue: true
         }
     ));
-    this.add(new vimperator.Option(["previewheight", "pvh"], "number",
+    optionManager.add(new vimperator.Option(["previewheight", "pvh"], "number",
         {
-            short_help: "Default height for preview window",
+            shortHelp: "Default height for preview window",
             help: "Value must be between 1 and 50. If the value is too high, completions may cover the command-line. " +
                   "Close the preview window with <code class=\"command\">:pclose</code>.<br/>" +
                   "NOTE: Option currently disabled",
-            default_value: 10,
+            defaultValue: 10,
             validator: function (value) { return (value >= 1 && value <= 50); }
         }
     ));
-    this.add(new vimperator.Option(["scroll", "scr"], "number",
+    optionManager.add(new vimperator.Option(["scroll", "scr"], "number",
         {
-            short_help: "Number of lines to scroll with <code class=\"mapping\">C-u</code> and <code class=\"mapping\">C-d</code> commands",
+            shortHelp: "Number of lines to scroll with <code class=\"mapping\">C-u</code> and <code class=\"mapping\">C-d</code> commands",
             help: "The number of lines scrolled defaults to half the window size. " +
                   "When a <code class=\"argument\">{count}</code> is specified to the <code class=\"mapping\">&lt;C-u&gt;</code> or <code class=\"mapping\">&lt;C-d&gt;</code> commands this is used to set the value of <code class=\"option\">'scroll'</code> and also used for the current command. " +
                   "The value can be reset to half the window height with <code class=\"command\">:set scroll=0</code>.",
-            default_value: 0,
+            defaultValue: 0,
             validator: function (value) { return value >= 0; }
         }
     ));
-    this.add(new vimperator.Option(["showmode", "smd"], "boolean",
+    optionManager.add(new vimperator.Option(["showmode", "smd"], "boolean",
         {
-            short_help: "Show the current mode in the command line",
-            default_value: true
+            shortHelp: "Show the current mode in the command line",
+            defaultValue: true
         }
     ));
-    this.add(new vimperator.Option(["showstatuslinks", "ssli"], "number",
+    optionManager.add(new vimperator.Option(["showstatuslinks", "ssli"], "number",
         {
-            short_help: "Show the destination of the link under the cursor in the status bar",
+            shortHelp: "Show the destination of the link under the cursor in the status bar",
             help: "Also links which are focused by keyboard commands like <code class=\"mapping\">&lt;Tab&gt;</code> are shown. " +
                   "Possible values:<br/>" +
                   "<ul>" +
@@ -660,13 +664,13 @@ vimperator.Options = function () //{{{
                   "<li><b>1</b>: Show the link in the status line</li>" +
                   "<li><b>2</b>: Show the link in the command line</li>" +
                   "</ul>",
-            default_value: 1,
+            defaultValue: 1,
             validator: function (value) { return (value >= 0 && value <= 2); }
         }
     ));
-    this.add(new vimperator.Option(["showtabline", "stal"], "number",
+    optionManager.add(new vimperator.Option(["showtabline", "stal"], "number",
         {
-            short_help: "Control when to show the tab bar of opened web pages",
+            shortHelp: "Control when to show the tab bar of opened web pages",
             help: "Possible values:<br/>" +
                   "<ul>" +
                   "<li><b>0</b>: Never show tab bar</li>" +
@@ -674,63 +678,63 @@ vimperator.Options = function () //{{{
                   "<li><b>2</b>: Always show tab bar</li>" +
                   "</ul>",
             setter: function (value) { setShowTabline(value); },
-            default_value: 2,
+            defaultValue: 2,
             validator: function (value) { return (value >= 0 && value <= 2); }
         }
     ));
-    this.add(new vimperator.Option(["smartcase", "scs"], "boolean",
+    optionManager.add(new vimperator.Option(["smartcase", "scs"], "boolean",
         {
-            short_help: "Override the 'ignorecase' option if the pattern contains uppercase characters",
+            shortHelp: "Override the 'ignorecase' option if the pattern contains uppercase characters",
             help: "This is only used if the <code class=\"option\">'ignorecase'</code> option is set.",
-            default_value: true
+            defaultValue: true
         }
     ));
-    this.add(new vimperator.Option(["titlestring"], "string",
+    optionManager.add(new vimperator.Option(["titlestring"], "string",
         {
-            short_help: "Change the title of the browser window",
+            shortHelp: "Change the title of the browser window",
             help: "Vimperator changes the browser title from \"Title of web page - Mozilla Firefox\" to " +
                   "\"Title of web page - Vimperator\".<br/>If you don't like that, you can restore it with: " +
                   "<code class=\"command\">:set titlestring=Mozilla Firefox</code>.",
             setter: function (value) { setTitleString(value); },
-            default_value: "Vimperator"
+            defaultValue: "Vimperator"
         }
     ));
-    this.add(new vimperator.Option(["usermode", "um"], "boolean",
+    optionManager.add(new vimperator.Option(["usermode", "um"], "boolean",
         {
-            short_help: "Show current website with a minimal style sheet to make it easily accessible",
+            shortHelp: "Show current website with a minimal style sheet to make it easily accessible",
             help: "Note that this is a local option for now, later it may be split into a global and <code class=\"command\">:setlocal</code> part",
             setter: function (value) { getMarkupDocumentViewer().authorStyleDisabled = value; },
             getter: function () { return getMarkupDocumentViewer().authorStyleDisabled; },
-            default_value: false
+            defaultValue: false
         }
     ));
-    this.add(new vimperator.Option(["verbose", "vbs"], "number",
+    optionManager.add(new vimperator.Option(["verbose", "vbs"], "number",
         {
-            short_help: "Define which type of messages are logged",
+            shortHelp: "Define which type of messages are logged",
             help: "When bigger than zero, Vimperator will give messages about what it is doing. They are printed to the error console which can be shown with <code class=\"command\">:javascript!</code>.<br/>" +
                   "The highest value is 9, being the most verbose mode.",
-            default_value: 0,
+            defaultValue: 0,
             validator: function (value) { return (value >= 0 && value <= 9); }
         }
     ));
-    this.add(new vimperator.Option(["visualbell", "vb"], "boolean",
+    optionManager.add(new vimperator.Option(["visualbell", "vb"], "boolean",
         {
-            short_help: "Use visual bell instead of beeping on errors",
+            shortHelp: "Use visual bell instead of beeping on errors",
             setter: function (value) { vimperator.options.setFirefoxPref("accessibility.typeaheadfind.enablesound", !value); },
-            default_value: false
+            defaultValue: false
         }
     ));
-    this.add(new vimperator.Option(["visualbellstyle", "t_vb"], "string",
+    optionManager.add(new vimperator.Option(["visualbellstyle", "t_vb"], "string",
         {
-            short_help: "CSS specification of the visual bell",
+            shortHelp: "CSS specification of the visual bell",
             help: "To hide the visual bell use a value of \"display: none;\" or unset it with <code class=\"command\">:set t_vb=</code>",
             setter: function (value) { if (!value) value = "display: none;"; },
-            default_value: "background-color: black; color: black;"
+            defaultValue: "background-color: black; color: black;"
         }
     ));
-    this.add(new vimperator.Option(["wildmode", "wim"], "stringlist",
+    optionManager.add(new vimperator.Option(["wildmode", "wim"], "stringlist",
         {
-            short_help: "Define how command line completion works",
+            shortHelp: "Define how command line completion works",
             help: "It is a comma-separated list of parts, where each part specifies " +
                   "what to do for each consecutive use of the completion key. The first part " +
                   "specifies the behavior for the first use of the completion key, the second part " +
@@ -745,22 +749,22 @@ vimperator.Options = function () //{{{
                   "<tr><td><b>'list:longest'</b></td><td>When more than one match, list all matches and complete till the longest common string.</td></tr>" +
                   "</table>" +
                   "When there is only a single match, it is fully completed regardless of the case.",
-            default_value: "list:full",
+            defaultValue: "list:full",
             validator: function (value)
             {
                 return value.split(",").every(function (item) { return /^(full|longest|list|list:full|list:longest|)$/.test(item); });
             }
         }
     ));
-    this.add(new vimperator.Option(["wildoptions", "wop"], "stringlist",
+    optionManager.add(new vimperator.Option(["wildoptions", "wop"], "stringlist",
         {
-            short_help: "Change how command line completion is done",
+            shortHelp: "Change how command line completion is done",
             help: "A list of words that change how command line completion is done.<br/>" +
                   "Currently only one word is allowed:<br/>" +
                   "<table>" +
                   "<tr><td><b>sort</b></td><td>Always sorts completion list, overriding the <code class=\"option\">'complete'</code> option.</td></tr>" +
                   "</table>",
-            default_value: "",
+            defaultValue: "",
             validator: function (value) { return /^(sort|)$/.test(value); }
         }
     ));
@@ -771,10 +775,12 @@ vimperator.Options = function () //{{{
     setShowTabline(0);
     setGuiOptions("");
     setLastStatus(0);
-    guioptions_done = showtabline_done = laststatus_done = false;
+    guioptionsDone = showtablineDone = laststatusDone = false;
 
-    setTitleString(this.titlestring);
-    setPopups(this.popups);
-} //}}}
+    setTitleString(optionManager.titlestring);
+    setPopups(optionManager.popups);
+
+    return optionManager;
+}; //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/tabs.js b/content/tabs.js
index 3e761fae..cb5ef4e5 100644
--- a/content/tabs.js
+++ b/content/tabs.js
@@ -38,13 +38,12 @@ vimperator.Tabs = function () //{{{
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    /** @param spec can either be:
-     * - an absolute integer
-     * - "" for the current tab
-     * - "+1" for the next tab
-     * - "-3" for the tab, which is 3 positions left of the current
-     * - "$" for the last tab
-     */
+    // @param spec can either be:
+    // - an absolute integer
+    // - "" for the current tab
+    // - "+1" for the next tab
+    // - "-3" for the tab, which is 3 positions left of the current
+    // - "$" for the last tab
     function indexFromSpec(spec, wrap)
     {
         var position = getBrowser().tabContainer.selectedIndex;
@@ -58,7 +57,7 @@ vimperator.Tabs = function () //{{{
             position = spec;
         else if (spec === "$")
             return last;
-        else if (!spec.match(/^([+-]?\d+|)$/))
+        else if (!/^([+-]?\d+|)$/.test(spec))
         {
             // TODO: move error reporting to ex-command?
             vimperator.echoerr("E488: Trailing characters");
@@ -66,7 +65,7 @@ vimperator.Tabs = function () //{{{
         }
         else
         {
-            if (spec.match(/^([+-]\d+)$/)) // relative position +/-N
+            if (/^([+-]\d+)$/.test(spec)) // relative position +/-N
                 position += parseInt(spec, 10);
             else                           // absolute position
                 position = parseInt(spec, 10);
@@ -80,195 +79,192 @@ vimperator.Tabs = function () //{{{
         return position;
     }
 
-    var alternates = [null, null];
+    var alternates = [getBrowser().mCurrentTab, null];
 
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    // @returns the index of the currently selected tab starting with 0
-    this.index = function (tab)
-    {
-        if (tab)
+    return {
+
+        get alternate() { return alternates[1]; },
+
+        get count() { return getBrowser().mTabs.length; },
+
+        // @returns the index of the currently selected tab starting with 0
+        index: function (tab)
         {
-            var length = getBrowser().mTabs.length;
-            for (var i = 0; i < length; i++)
+            if (tab)
             {
-                if (getBrowser().mTabs[i] == tab)
-                    return i;
-            }
-            return -1;
-        }
-
-        return getBrowser().tabContainer.selectedIndex;
-    }
-
-    this.count = function ()
-    {
-        return getBrowser().mTabs.length;
-    }
-
-    // TODO: implement filter
-    // @returns an array of tabs which match filter
-    this.get = function (filter)
-    {
-        var buffers = [];
-        var browsers = getBrowser().browsers;
-        for (var i in browsers)
-        {
-            var title = browsers[i].contentTitle || "(Untitled)";
-            var uri = browsers[i].currentURI.spec;
-            var number = i + 1;
-            buffers.push([number, title, uri]);
-        }
-        return buffers;
-    }
-
-    this.getTab = function (index)
-    {
-        if (index)
-            return getBrowser().mTabs[index];
-
-        return getBrowser().tabContainer.selectedItem;
-    }
-
-    /*  spec == "" moves the tab to the last position as per Vim
-     *  wrap causes the movement to wrap around the start and end of the tab list
-     *  NOTE: position is a 0 based index
-     *  FIXME: tabmove! N should probably produce an error
-     */
-    this.move = function (tab, spec, wrap)
-    {
-        if (spec === "")
-            spec = "$"; // if not specified, move to the last tab -> XXX: move to ex handling?
-
-        var index = indexFromSpec(spec, wrap);
-        getBrowser().moveTabTo(tab, index);
-    }
-
-    /* quit_on_last_tab = 1: quit without saving session
-     * quit_on_last_tab = 2: quit and save session
-     */
-    this.remove = function (tab, count, focus_left_tab, quit_on_last_tab)
-    {
-        function removeOrBlankTab (tab)
-        {
-            if (getBrowser().mTabs.length > 1)
-                getBrowser().removeTab(tab);
-            else
-            {
-                if (vimperator.buffer.URL != "about:blank" ||
-                    getWebNavigation().sessionHistory.count > 0)
+                var length = getBrowser().mTabs.length;
+                for (var i = 0; i < length; i++)
                 {
-                    vimperator.open("about:blank", vimperator.NEW_BACKGROUND_TAB);
+                    if (getBrowser().mTabs[i] == tab)
+                        return i;
+                }
+                return -1;
+            }
+
+            return getBrowser().tabContainer.selectedIndex;
+        },
+
+        // TODO: implement filter
+        // @returns an array of tabs which match filter
+        get: function (filter)
+        {
+            var buffers = [];
+            var browsers = getBrowser().browsers;
+            for (var i in browsers)
+            {
+                var title = browsers[i].contentTitle || "(Untitled)";
+                var uri = browsers[i].currentURI.spec;
+                var number = i + 1;
+                buffers.push([number, title, uri]);
+            }
+            return buffers;
+        },
+
+        getTab: function (index)
+        {
+            if (index)
+                return getBrowser().mTabs[index];
+
+            return getBrowser().tabContainer.selectedItem;
+        },
+
+        // spec == "" moves the tab to the last position as per Vim
+        // wrap causes the movement to wrap around the start and end of the tab list
+        // NOTE: position is a 0 based index
+        // FIXME: tabmove! N should probably produce an error
+        move: function (tab, spec, wrap)
+        {
+            if (spec === "")
+                spec = "$"; // if not specified, move to the last tab -> XXX: move to ex handling?
+
+            var index = indexFromSpec(spec, wrap);
+            getBrowser().moveTabTo(tab, index);
+        },
+
+        // quitOnLastTab = 1: quit without saving session
+        // quitOnLastTab = 2: quit and save session
+        remove: function (tab, count, focusLeftTab, quitOnLastTab)
+        {
+            function removeOrBlankTab (tab)
+            {
+                if (getBrowser().mTabs.length > 1)
                     getBrowser().removeTab(tab);
-                }
                 else
-                    vimperator.beep();
+                {
+                    if (vimperator.buffer.URL != "about:blank" ||
+                        getWebNavigation().sessionHistory.count > 0)
+                    {
+                        vimperator.open("about:blank", vimperator.NEW_BACKGROUND_TAB);
+                        getBrowser().removeTab(tab);
+                    }
+                    else
+                        vimperator.beep();
+                }
             }
-        }
 
-        if (count < 1)
-            count = 1;
+            if (count < 1)
+                count = 1;
 
-        if (quit_on_last_tab >= 1 && getBrowser().mTabs.length <= count)
-        {
-            if (vimperator.windows.length > 1)
-                window.close();
+            if (quitOnLastTab >= 1 && getBrowser().mTabs.length <= count)
+            {
+                if (vimperator.windows.length > 1)
+                    window.close();
+                else
+                    vimperator.quit(quitOnLastTab == 2);
+
+                return;
+            }
+
+            var index = this.index(tab);
+            if (focusLeftTab)
+            {
+                var lastRemovedTab = 0;
+                for (var i = index; i > index - count && i >= 0; i--)
+                {
+                    removeOrBlankTab(this.getTab(i));
+                    lastRemovedTab = i > 0 ? i : 1;
+                }
+                getBrowser().mTabContainer.selectedIndex = lastRemovedTab - 1;
+            }
             else
-                vimperator.quit(quit_on_last_tab == 2);
-
-            return;
-        }
-
-        var index = this.index(tab);
-        if (focus_left_tab)
-        {
-            var last_removed_tab = 0;
-            for (var i = index; i > index - count && i >= 0; i--)
             {
-                removeOrBlankTab(this.getTab(i));
-                last_removed_tab = i > 0 ? i : 1;
+                var i = index + count - 1;
+                if (i >= this.count)
+                    i = this.count - 1;
+
+                for (; i >= index; i--)
+                    removeOrBlankTab(this.getTab(i));
             }
-            getBrowser().mTabContainer.selectedIndex = last_removed_tab - 1;
-        }
-        else
+        },
+
+        keepOnly: function (tab)
         {
-            var i = index + count - 1;
-            if (i >= this.count())
-                i = this.count() - 1;
+            getBrowser().removeAllTabsBut(tab);
+        },
 
-            for (; i >= index; i--)
-                removeOrBlankTab(this.getTab(i));
-        }
-    }
-
-    this.keepOnly = function (tab)
-    {
-        getBrowser().removeAllTabsBut(tab);
-    }
-
-    this.select = function (spec, wrap)
-    {
-        var index = indexFromSpec(spec, wrap);
-        if (index === false)
+        select: function (spec, wrap)
         {
-            vimperator.beep(); // XXX: move to ex-handling?
-            return false;
-        }
-        getBrowser().mTabContainer.selectedIndex = index;
-    }
-
-    // TODO: when restarting a session FF selects the first tab and then the
-    // tab that was selected when the session was created.  As a result the
-    // alternate after a restart is often incorrectly tab 1 when there
-    // shouldn't be one yet.
-    this.updateSelectionHistory = function ()
-    {
-        alternates = [this.getTab(), alternates[0]];
-        this.alternate = alternates[1];
-    }
-
-    // TODO: move to v.buffers
-    this.alternate = this.getTab();
-
-    this.reload = function (tab, bypass_cache)
-    {
-        if (bypass_cache)
-        {
-            const nsIWebNavigation = Components.interfaces.nsIWebNavigation;
-            const flags = nsIWebNavigation.LOAD_FLAGS_BYPASS_PROXY | nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE;
-            getBrowser().getBrowserForTab(tab).reloadWithFlags(flags);
-        }
-        else
-        {
-            getBrowser().reloadTab(tab);
-        }
-    }
-
-    this.reloadAll = function (bypass_cache)
-    {
-        if (bypass_cache)
-        {
-            for (var i = 0; i < getBrowser().mTabs.length; i++)
+            var index = indexFromSpec(spec, wrap);
+            if (index === false)
             {
-                try
+                vimperator.beep(); // XXX: move to ex-handling?
+                return false;
+            }
+            getBrowser().mTabContainer.selectedIndex = index;
+        },
+
+        // TODO: when restarting a session FF selects the first tab and then the
+        // tab that was selected when the session was created.  As a result the
+        // alternate after a restart is often incorrectly tab 1 when there
+        // shouldn't be one yet.
+        updateSelectionHistory: function ()
+        {
+            alternates = [this.getTab(), alternates[0]];
+        },
+
+        reload: function (tab, bypassCache)
+        {
+            if (bypassCache)
+            {
+                const nsIWebNavigation = Components.interfaces.nsIWebNavigation;
+                const flags = nsIWebNavigation.LOAD_FLAGS_BYPASS_PROXY | nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE;
+                getBrowser().getBrowserForTab(tab).reloadWithFlags(flags);
+            }
+            else
+            {
+                getBrowser().reloadTab(tab);
+            }
+        },
+
+        reloadAll: function (bypassCache)
+        {
+            if (bypassCache)
+            {
+                for (var i = 0; i < getBrowser().mTabs.length; i++)
                 {
-                    this.reload(getBrowser().mTabs[i], bypass_cache)
-                }
-                catch (e)
-                {
-                    // FIXME: can we do anything useful here without stopping the
-                    //        other tabs from reloading?
+                    try
+                    {
+                        this.reload(getBrowser().mTabs[i], bypassCache);
+                    }
+                    catch (e)
+                    {
+                        // FIXME: can we do anything useful here without stopping the
+                        //        other tabs from reloading?
+                    }
                 }
             }
+            else
+            {
+                getBrowser().reloadAllTabs();
+            }
         }
-        else
-        {
-            getBrowser().reloadAllTabs();
-        }
-    }
+
+    };
     //}}}
-} //}}}
+}; //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/ui.js b/content/ui.js
index 993e2c7b..c7f24753 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -40,7 +40,7 @@ vimperator.CommandLine = function () //{{{
 
     const UNINITIALIZED = -2; // notifies us, if we need to start history/tab-completion from the beginning
 
-    var completionlist = new vimperator.InformationList("vimperator-completion", { min_items: 2, max_items: 10 });
+    var completionlist = new vimperator.InformationList("vimperator-completion", { minItems: 2, maxItems: 10 });
     var completions = [];
 
     // TODO: clean this up when it's not 3am...
@@ -88,75 +88,75 @@ vimperator.CommandLine = function () //{{{
     };
     history.load();
 
-    var history_index = UNINITIALIZED;
-    var history_start = "";
+    var historyIndex = UNINITIALIZED;
+    var historyStart = "";
 
     // for the example command "open sometext| othertext" (| is the cursor pos):
-    var completion_start_index = 0;  // will be 5 because we want to complete arguments for the :open command
-    var completion_prefix = "";      // will be: "open sometext"
-    var completion_postfix = "";     // will be: " othertext"
+    var completionStartIndex = 0;  // will be 5 because we want to complete arguments for the :open command
+    var completionPrefix = "";      // will be: "open sometext"
+    var completionPostfix = "";     // will be: " othertext"
 
-    var wild_index = 0;  // keep track how often we press <Tab> in a row
-    var completion_index = UNINITIALIZED;
+    var wildIndex = 0;  // keep track how often we press <Tab> in a row
+    var completionIndex = UNINITIALIZED;
 
-    // the containing box for the prompt_widget and command_widget
-    var commandline_widget = document.getElementById("vimperator-commandline");
+    // the containing box for the promptWidget and commandWidget
+    var commandlineWidget = document.getElementById("vimperator-commandline");
     // the prompt for the current command, for example : or /. Can be blank
-    var prompt_widget = document.getElementById("vimperator-commandline-prompt");
+    var promptWidget = document.getElementById("vimperator-commandline-prompt");
     // the command bar which contains the current command
-    var command_widget = document.getElementById("vimperator-commandline-command");
+    var commandWidget = document.getElementById("vimperator-commandline-command");
 
     // the widget used for multiline output
-    var multiline_output_widget = document.getElementById("vimperator-multiline-output");
-    multiline_output_widget.contentDocument.body.setAttribute("style", "margin: 0px; font-family: -moz-fixed;"); // get rid of the default border
-    multiline_output_widget.contentDocument.body.innerHTML = "";
+    var multilineOutputWidget = document.getElementById("vimperator-multiline-output");
+    multilineOutputWidget.contentDocument.body.setAttribute("style", "margin: 0px; font-family: -moz-fixed;"); // get rid of the default border
+    multilineOutputWidget.contentDocument.body.innerHTML = "";
 
     // the widget used for multiline intput
-    var multiline_input_widget = document.getElementById("vimperator-multiline-input");
+    var multilineInputWidget = document.getElementById("vimperator-multiline-input");
 
     // we need to save the mode which were in before opening the command line
     // this is then used if we focus the command line again without the "official"
     // way of calling "open"
-    var cur_extended_mode = null;     // the extended mode which we last openend the command line for
-    var cur_prompt = null;
-    var cur_command = null;
-    var old_mode = null; // when we leave the command prompt this mode is restored
-    var old_extended_mode = null;
+    var currentExtendedMode = null;     // the extended mode which we last openend the command line for
+    var currentPrompt = null;
+    var currentCommand = null;
+    var oldMode = null; // when we leave the command prompt this mode is restored
+    var oldExtendedMode = null;
 
     // save the arguments for the inputMultiline method which are needed in the event handler
-    var multiline_regexp = null;
-    var multiline_callback = null;
+    var multilineRegexp = null;
+    var multilineCallback = null;
 
     function setHighlightGroup(group)
     {
-        commandline_widget.setAttribute("class", group);
+        commandlineWidget.setAttribute("class", group);
     }
 
     // sets the prompt - for example, : or /
     function setPrompt(pmt)
     {
-        prompt_widget.value = pmt;
+        promptWidget.value = pmt;
 
         if (pmt)
         {
-            prompt_widget.size = pmt.length;
-            prompt_widget.collapsed = false;
+            promptWidget.size = pmt.length;
+            promptWidget.collapsed = false;
         }
         else
         {
-            prompt_widget.collapsed = true;
+            promptWidget.collapsed = true;
         }
     }
 
     // sets the command - e.g. 'tabopen', 'open http://example.com/'
     function setCommand(cmd)
     {
-        command_widget.value = cmd;
+        commandWidget.value = cmd;
     }
 
-    function setLine(str, highlight_group)
+    function setLine(str, highlightGroup)
     {
-        setHighlightGroup(highlight_group);
+        setHighlightGroup(highlightGroup);
         setPrompt("");
         setCommand(str);
     }
@@ -164,58 +164,58 @@ vimperator.CommandLine = function () //{{{
     // TODO: extract CSS
     //     : resize upon a window resize
     //     : echoed lines longer than v-c-c.width should wrap and use MOW
-    function setMultiline(str, highlight_group)
+    function setMultiline(str, highlightGroup)
     {
-        multiline_input_widget.collapsed = true;
+        multilineInputWidget.collapsed = true;
 
-        var output = "<div class=\"ex-command-output " + highlight_group + "\">" + str + "</div>";
-        if (!multiline_output_widget.collapsed)
+        var output = "<div class=\"ex-command-output " + highlightGroup + "\">" + str + "</div>";
+        if (!multilineOutputWidget.collapsed)
         {
             // FIXME: need to make sure an open MOW is closed when commands
             //        that don't generate output are executed
-            output = multiline_output_widget.contentDocument.body.innerHTML + output;
-            multiline_output_widget.collapsed = true;
+            output = multilineOutputWidget.contentDocument.body.innerHTML + output;
+            multilineOutputWidget.collapsed = true;
         }
 
-        var font_size = document.defaultView.getComputedStyle(document.getElementById("main-window"), null).getPropertyValue("font-size");
-        multiline_output_widget.contentDocument.body.setAttribute("style", "font-size: " + font_size);
+        var fontSize = document.defaultView.getComputedStyle(document.getElementById("main-window"), null).getPropertyValue("font-size");
+        multilineOutputWidget.contentDocument.body.setAttribute("style", "font-size: " + fontSize);
 
-        multiline_output_widget.contentDocument.body.innerHTML = output;
-        multiline_output_widget.contentDocument.body.id = "vimperator-multiline-output-content";
+        multilineOutputWidget.contentDocument.body.innerHTML = output;
+        multilineOutputWidget.contentDocument.body.id = "vimperator-multiline-output-content";
 
-        var stylesheet = multiline_output_widget.contentDocument.createElement("link");
+        var stylesheet = multilineOutputWidget.contentDocument.createElement("link");
         stylesheet.setAttribute("rel", "Stylesheet");
         stylesheet.setAttribute("href", "chrome://vimperator/skin/vimperator.css");
-        multiline_output_widget.contentDocument.getElementsByTagName("head")[0].appendChild(stylesheet);
+        multilineOutputWidget.contentDocument.getElementsByTagName("head")[0].appendChild(stylesheet);
 
-        var available_height = getBrowser().mPanelContainer.boxObject.height;
-        var content_height = multiline_output_widget.contentDocument.height;
-        var height = content_height < available_height ? content_height : available_height;
+        var availableHeight = getBrowser().mPanelContainer.boxObject.height;
+        var contentHeight = multilineOutputWidget.contentDocument.height;
+        var height = contentHeight < availableHeight ? contentHeight : availableHeight;
 
-        multiline_output_widget.height = height + "px";
-        multiline_output_widget.collapsed = false;
+        multilineOutputWidget.height = height + "px";
+        multilineOutputWidget.collapsed = false;
 
-        if (vimperator.options["more"] && multiline_output_widget.contentWindow.scrollMaxY > 0)
+        if (vimperator.options["more"] && multilineOutputWidget.contentWindow.scrollMaxY > 0)
         {
             // start the last executed command's output at the top of the screen
-            var elements = vimperator.buffer.evaluateXPath("//div[contains(@class, 'ex-command-output')]", multiline_output_widget.contentDocument);
+            var elements = vimperator.buffer.evaluateXPath("//div[contains(@class, 'ex-command-output')]", multilineOutputWidget.contentDocument);
             elements.snapshotItem(elements.snapshotLength - 1).scrollIntoView(true);
 
-            if (multiline_output_widget.contentWindow.scrollY >= multiline_output_widget.contentWindow.scrollMaxY)
+            if (multilineOutputWidget.contentWindow.scrollY >= multilineOutputWidget.contentWindow.scrollMaxY)
                 setLine("Press ENTER or type command to continue", vimperator.commandline.HL_QUESTION);
             else
                 setLine("-- More --", vimperator.commandline.HL_QUESTION);
         }
         else
         {
-            multiline_output_widget.contentWindow.scrollTo(0, content_height);
+            multilineOutputWidget.contentWindow.scrollTo(0, contentHeight);
             setLine("Press ENTER or type command to continue", vimperator.commandline.HL_QUESTION);
         }
 
-        multiline_output_widget.contentWindow.focus();
+        multilineOutputWidget.contentWindow.focus();
 
         // save the mode, because we need to restore it on blur()
-        [old_mode, old_extended_mode] = vimperator.getMode();
+        [oldMode, oldExtendedMode] = vimperator.getMode();
         vimperator.setMode(vimperator.modes.COMMAND_LINE, vimperator.modes.WRITE_MULTILINE, true);
     }
 
@@ -224,7 +224,7 @@ vimperator.CommandLine = function () //{{{
         // XXX: faster/better method?
 
         var lines = 0;
-        var str = multiline_input_widget.value;
+        var str = multilineInputWidget.value;
         for (var i = 0; i < str.length; i++)
         {
             if (str[i] == "\n")
@@ -232,619 +232,623 @@ vimperator.CommandLine = function () //{{{
         }
         if (lines == 0)
             lines = 1;
-        multiline_input_widget.setAttribute("rows", lines.toString());
+        multilineInputWidget.setAttribute("rows", lines.toString());
     }
 
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    this.HL_NORMAL   = "hl-Normal";
-    this.HL_ERRORMSG = "hl-ErrorMsg";
-    this.HL_MODEMSG  = "hl-ModeMsg";
-    this.HL_MOREMSG  = "hl-MoreMsg";
-    this.HL_QUESTION = "hl-Question";
-    this.HL_WARNING  = "hl-Warning";
+    return {
 
-    // not yet used
-    this.FORCE_MULTILINE     = 1 << 0;
-    this.FORCE_SINGLELINE    = 1 << 1;
-    this.DISALLOW_MULTILINE  = 1 << 2; // if an echo() should try to use the single line,
-                                       // but output nothing when the MOW is open; when also
-                                       // FORCE_MULTILINE is given, FORCE_MULTILINE takes precedence
-    this.APPEND_TO_MESSAGES  = 1 << 3; // will show the string in :messages
+        HL_NORMAL  : "hl-Normal",
+        HL_ERRORMSG: "hl-ErrorMsg",
+        HL_MODEMSG : "hl-ModeMsg",
+        HL_MOREMSG : "hl-MoreMsg",
+        HL_QUESTION: "hl-Question",
+        HL_WARNING : "hl-Warning",
 
-    this.getCommand = function ()
-    {
-        return command_widget.value;
-    };
+        // not yet used
+        FORCE_MULTILINE    : 1 << 0,
+        FORCE_SINGLELINE   : 1 << 1,
+        DISALLOW_MULTILINE : 1 << 2, // if an echo() should try to use the single line,
+                                           // but output nothing when the MOW is open; when also
+                                           // FORCE_MULTILINE is given, FORCE_MULTILINE takes precedence
+        APPEND_TO_MESSAGES : 1 << 3, // will show the string in :messages
 
-    this.open = function (prompt, cmd, ext_mode)
-    {
-        // save the current prompts, we need it later if the command widget
-        // receives focus without calling the this.open() method
-        cur_prompt = prompt || "";
-        cur_command = cmd || "";
-        cur_extended_mode = ext_mode || null;
-
-        history_index = UNINITIALIZED;
-        completion_index = UNINITIALIZED;
-
-        // save the mode, because we need to restore it
-        [old_mode, old_extended_mode] = vimperator.getMode();
-        vimperator.setMode(vimperator.modes.COMMAND_LINE, cur_extended_mode, true);
-        setHighlightGroup(this.HL_NORMAL);
-        setPrompt(cur_prompt);
-        setCommand(cur_command);
-
-        command_widget.focus();
-    };
-
-    // normally used when pressing esc, does not execute a command
-    this.close = function ()
-    {
-        var res = vimperator.triggerCallback("cancel", cur_extended_mode);
-        history.add(this.getCommand());
-        //vimperator.modes.set(old_mode, old_extended_mode);
-        vimperator.statusline.updateProgress(""); // we may have a "match x of y" visible
-        this.clear();
-    }
-
-    // TODO: add :messages entry
-    // vimperator.echo uses different order of flags as it omits the hightlight group, change v.commandline.echo argument order? --mst
-    this.echo = function (str, highlight_group, flags)
-    {
-        var focused = document.commandDispatcher.focusedElement;
-        if (focused && focused == command_widget.inputField || focused == multiline_input_widget.inputField)
-            return false;
-
-        highlight_group = highlight_group || this.HL_NORMAL;
-
-        var where = setLine;
-        if (flags & this.FORCE_MULTILINE)
-            where = setMultiline;
-        else if (flags & this.FORCE_SINGLELINE)
-            where = setLine;
-        else if (!multiline_output_widget.collapsed)
+        getCommand: function ()
         {
-            if (flags & this.DISALLOW_MULTILINE)
-                where = null;
-            else
+            return commandWidget.value;
+        },
+
+        open: function (prompt, cmd, extendedMode)
+        {
+            // save the current prompts, we need it later if the command widget
+            // receives focus without calling the this.open() method
+            currentPrompt = prompt || "";
+            currentCommand = cmd || "";
+            currentExtendedMode = extendedMode || null;
+
+            historyIndex = UNINITIALIZED;
+            completionIndex = UNINITIALIZED;
+
+            // save the mode, because we need to restore it
+            [oldMode, oldExtendedMode] = vimperator.getMode();
+            vimperator.setMode(vimperator.modes.COMMAND_LINE, currentExtendedMode, true);
+            setHighlightGroup(this.HL_NORMAL);
+            setPrompt(currentPrompt);
+            setCommand(currentCommand);
+
+            commandWidget.focus();
+        },
+
+        // normally used when pressing esc, does not execute a command
+        close: function ()
+        {
+            var res = vimperator.triggerCallback("cancel", currentExtendedMode);
+            history.add(this.getCommand());
+            //vimperator.modes.set(oldMode, oldExtendedMode);
+            vimperator.statusline.updateProgress(""); // we may have a "match x of y" visible
+            this.clear();
+        },
+
+        // TODO: add :messages entry
+        // vimperator.echo uses different order of flags as it omits the hightlight group, change v.commandline.echo argument order? --mst
+        echo: function (str, highlightGroup, flags)
+        {
+            var focused = document.commandDispatcher.focusedElement;
+            if (focused && focused == commandWidget.inputField || focused == multilineInputWidget.inputField)
+                return false;
+
+            highlightGroup = highlightGroup || this.HL_NORMAL;
+
+            var where = setLine;
+            if (flags & this.FORCE_MULTILINE)
+                where = setMultiline;
+            else if (flags & this.FORCE_SINGLELINE)
+                where = setLine;
+            else if (!multilineOutputWidget.collapsed)
+            {
+                if (flags & this.DISALLOW_MULTILINE)
+                    where = null;
+                else
+                    where = setMultiline;
+            }
+            else if (/\n|<br\/?>/.test(str))
                 where = setMultiline;
-        }
-        else if (/\n|<br\/?>/.test(str))
-            where = setMultiline;
 
-        if (where)
-            where(str, highlight_group);
+            if (where)
+                where(str, highlightGroup);
 
-        cur_extended_mode = null;
+            currentExtendedMode = null;
 
-        return true;
-    };
+            return true;
+        },
 
-    // this will prompt the user for a string
-    // vimperator.commandline.input("(s)ave or (o)pen the file?")
-    this.input = function (str)
-    {
-        // TODO: unfinished, need to find out how/if we can block the execution of code
-        // to make this code synchronous or at least use a callback
-        setLine(str, this.HL_QUESTION);
-        command_widget.focus();
-        return "not implemented";
-    };
-
-    // reads a multi line input and returns the string once the last line matches
-    // @param until_regexp
-    this.inputMultiline = function (until_regexp, callback_func)
-    {
-        // save the mode, because we need to restore it on blur()
-        [old_mode, old_extended_mode] = vimperator.getMode();
-        vimperator.setMode(vimperator.modes.COMMAND_LINE, vimperator.modes.READ_MULTILINE, true);
-
-        // save the arguments, they are needed in the event handler onEvent
-        multiline_regexp = until_regexp;
-        multiline_callback = callback_func;
-
-        multiline_input_widget.collapsed = false;
-        multiline_input_widget.value = "";
-        autosizeMultilineInputWidget();
-
-        setTimeout(function () {
-            multiline_input_widget.focus();
-        }, 10);
-    };
-
-    this.clear = function ()
-    {
-        multiline_input_widget.collapsed = true;
-        multiline_output_widget.collapsed = true;
-        completionlist.hide();
-
-        setLine("", this.HL_NORMAL);
-    };
-
-    this.onEvent = function (event)
-    {
-        var command = this.getCommand();
-
-        if (event.type == "blur")
+        // this will prompt the user for a string
+        // vimperator.commandline.input("(s)ave or (o)pen the file?")
+        input: function (str)
         {
-            // prevent losing focus, there should be a better way, but it just didn't work otherwise
+            // TODO: unfinished, need to find out how/if we can block the execution of code
+            // to make this code synchronous or at least use a callback
+            setLine(str, this.HL_QUESTION);
+            commandWidget.focus();
+            return "not implemented";
+        },
+
+        // reads a multi line input and returns the string once the last line matches
+        // @param untilRegexp
+        inputMultiline: function (untilRegexp, callbackFunc)
+        {
+            // save the mode, because we need to restore it on blur()
+            [oldMode, oldExtendedMode] = vimperator.getMode();
+            vimperator.setMode(vimperator.modes.COMMAND_LINE, vimperator.modes.READ_MULTILINE, true);
+
+            // save the arguments, they are needed in the event handler onEvent
+            multilineRegexp = untilRegexp;
+            multilineCallback = callbackFunc;
+
+            multilineInputWidget.collapsed = false;
+            multilineInputWidget.value = "";
+            autosizeMultilineInputWidget();
+
             setTimeout(function () {
-                if (vimperator.hasMode(vimperator.modes.COMMAND_LINE) &&
-                    !vimperator.hasMode(vimperator.modes.READ_MULTILINE) &&
-                    !vimperator.hasMode(vimperator.modes.WRITE_MULTILINE))
-                        command_widget.inputField.focus();
-            }, 0);
-        }
-        else if (event.type == "focus")
-        {
-            if (!cur_extended_mode && event.target == command_widget.inputField)
-                event.target.blur();
-        }
-        else if (event.type == "input")
-        {
-            vimperator.triggerCallback("change", cur_extended_mode, command);
-        }
-        else if (event.type == "keypress")
-        {
-            if (!cur_extended_mode)
-                return;
+                multilineInputWidget.focus();
+            }, 10);
+        },
 
-            var key = vimperator.events.toString(event);
+        clear: function ()
+        {
+            multilineInputWidget.collapsed = true;
+            multilineOutputWidget.collapsed = true;
+            completionlist.hide();
 
-            // user pressed ENTER to carry out a command
-            if (vimperator.events.isAcceptKey(key))
+            setLine("", this.HL_NORMAL);
+        },
+
+        onEvent: function (event)
+        {
+            var command = this.getCommand();
+
+            if (event.type == "blur")
             {
-                var mode = cur_extended_mode; // save it here, as setMode() resets it
-                history.add(command);
-                vimperator.setMode(old_mode, old_extended_mode);
-                vimperator.focusContent();
-                completionlist.hide();
-                vimperator.statusline.updateProgress(""); // we may have a "match x of y" visible
-                return vimperator.triggerCallback("submit", mode, command);
+                // prevent losing focus, there should be a better way, but it just didn't work otherwise
+                setTimeout(function () {
+                    if (vimperator.hasMode(vimperator.modes.COMMAND_LINE) &&
+                        !vimperator.hasMode(vimperator.modes.READ_MULTILINE) &&
+                        !vimperator.hasMode(vimperator.modes.WRITE_MULTILINE))
+                            commandWidget.inputField.focus();
+                }, 0);
             }
-
-            // user pressed ESCAPE to cancel this prompt
-            else if (vimperator.events.isCancelKey(key))
+            else if (event.type == "focus")
             {
-                var res = vimperator.triggerCallback("cancel", cur_extended_mode);
-                history.add(command);
-                vimperator.setMode(old_mode, old_extended_mode);
-                vimperator.focusContent();
-                completionlist.hide();
-                vimperator.statusline.updateProgress(""); // we may have a "match x of y" visible
-                this.clear();
-                return res;
+                if (!currentExtendedMode && event.target == commandWidget.inputField)
+                    event.target.blur();
             }
-
-            // user pressed UP or DOWN arrow to cycle history completion
-            else if (key == "<Up>" || key == "<Down>")
+            else if (event.type == "input")
             {
-                var lines = history.get();
+                vimperator.triggerCallback("change", currentExtendedMode, command);
+            }
+            else if (event.type == "keypress")
+            {
+                if (!currentExtendedMode)
+                    return;
 
-                event.preventDefault();
-                event.stopPropagation();
+                var key = vimperator.events.toString(event);
 
-                // always reset the tab completion if we use up/down keys
-                completion_index = UNINITIALIZED;
-
-                // save 'start' position for iterating through the history
-                if (history_index == UNINITIALIZED)
+                // user pressed ENTER to carry out a command
+                if (vimperator.events.isAcceptKey(key))
                 {
-                    history_index = lines.length;
-                    history_start = command;
+                    var mode = currentExtendedMode; // save it here, as setMode() resets it
+                    history.add(command);
+                    vimperator.setMode(oldMode, oldExtendedMode);
+                    vimperator.focusContent();
+                    completionlist.hide();
+                    vimperator.statusline.updateProgress(""); // we may have a "match x of y" visible
+                    return vimperator.triggerCallback("submit", mode, command);
                 }
 
-                // search the history for the first item matching the current
-                // commandline string
-                while (history_index >= -1 && history_index <= lines.length)
+                // user pressed ESCAPE to cancel this prompt
+                else if (vimperator.events.isCancelKey(key))
                 {
-                    key == "<Up>" ? history_index-- : history_index++;
+                    var res = vimperator.triggerCallback("cancel", currentExtendedMode);
+                    history.add(command);
+                    vimperator.setMode(oldMode, oldExtendedMode);
+                    vimperator.focusContent();
+                    completionlist.hide();
+                    vimperator.statusline.updateProgress(""); // we may have a "match x of y" visible
+                    this.clear();
+                    return res;
+                }
 
-                    // user pressed DOWN when there is no newer history item
-                    if (history_index == lines.length)
+                // user pressed UP or DOWN arrow to cycle history completion
+                else if (key == "<Up>" || key == "<Down>")
+                {
+                    var lines = history.get();
+
+                    event.preventDefault();
+                    event.stopPropagation();
+
+                    // always reset the tab completion if we use up/down keys
+                    completionIndex = UNINITIALIZED;
+
+                    // save 'start' position for iterating through the history
+                    if (historyIndex == UNINITIALIZED)
                     {
-                        setCommand(history_start);
+                        historyIndex = lines.length;
+                        historyStart = command;
+                    }
+
+                    // search the history for the first item matching the current
+                    // commandline string
+                    while (historyIndex >= -1 && historyIndex <= lines.length)
+                    {
+                        key == "<Up>" ? historyIndex-- : historyIndex++;
+
+                        // user pressed DOWN when there is no newer history item
+                        if (historyIndex == lines.length)
+                        {
+                            setCommand(historyStart);
+                            return;
+                        }
+
+                        // cannot go past history start/end
+                        if (historyIndex <= -1)
+                        {
+                            historyIndex = 0;
+                            vimperator.beep();
+                            break;
+                        }
+                        if (historyIndex >= lines.length + 1)
+                        {
+                            historyIndex = lines.length;
+                            vimperator.beep();
+                            break;
+                        }
+
+                        if (lines[historyIndex].indexOf(historyStart) == 0)
+                        {
+                            setCommand(lines[historyIndex]);
+                            return;
+                        }
+                    }
+                }
+
+                // user pressed TAB to get completions of a command
+                else if (key == "<Tab>" || key == "<S-Tab>")
+                {
+                    //always reset our completion history so up/down keys will start with new values
+                    historyIndex = UNINITIALIZED;
+
+                    // we need to build our completion list first
+                    if (completionIndex == UNINITIALIZED)
+                    {
+                        completionStartIndex = 0;
+
+                        completionIndex = -1;
+                        wildIndex = 0;
+
+                        completionPrefix = command.substring(0, commandWidget.selectionStart);
+                        completionPostfix = command.substring(commandWidget.selectionStart);
+                        var res = vimperator.triggerCallback("complete", currentExtendedMode, completionPrefix);
+                        if (res)
+                            [completionStartIndex, completions] = res;
+
+                        // sort the completion list
+                        if (vimperator.options["wildoptions"].search(/\bsort\b/) > -1)
+                        {
+                            completions.sort(function (a, b) {
+                                    if (a[0] < b[0])
+                                        return -1;
+                                    else if (a[0] > b[0])
+                                        return 1;
+                                    else
+                                        return 0;
+                            });
+                        }
+                    }
+
+                    if (completions.length == 0)
+                    {
+                        vimperator.beep();
+                        // prevent tab from moving to the next field
+                        event.preventDefault();
+                        event.stopPropagation();
                         return;
                     }
 
-                    // cannot go past history start/end
-                    if (history_index <= -1)
+                    var wim = vimperator.options["wildmode"].split(/,/);
+                    var hasList = false;
+                    var longest = false;
+                    var full = false;
+                    var wildType = wim[wildIndex++] || wim[wim.length - 1];
+                    if (wildType == "list" || wildType == "list:full" || wildType == "list:longest")
+                        hasList = true;
+                    if (wildType == "longest" || wildType == "list:longest")
+                        longest = true;
+                    else if (wildType == "full" || wildType == "list:full")
+                        full = true;
+
+                    // show the list
+                    if (hasList)
                     {
-                        history_index = 0;
-                        vimperator.beep();
-                        break;
-                    }
-                    if (history_index >= lines.length + 1)
-                    {
-                        history_index = lines.length;
-                        vimperator.beep();
-                        break;
+                        if (completionIndex < 0)
+                            completionlist.show(completions);
+                        else
+                            completionlist.show();
                     }
 
-                    if (lines[history_index].indexOf(history_start) == 0)
+                    if (full)
                     {
-                        setCommand(lines[history_index]);
-                        return;
+                        if (event.shiftKey)
+                        {
+                            completionIndex--;
+                            if (completionIndex < -1)
+                                completionIndex = completions.length -1;
+                        }
+                        else
+                        {
+                            completionIndex++;
+                            if (completionIndex >= completions.length)
+                                completionIndex = -1;
+                        }
+
+                        vimperator.statusline.updateProgress("match " + (completionIndex + 1) + " of " + completions.length);
+                        // if the list is hidden, this function does nothing
+                        completionlist.selectItem(completionIndex);
                     }
-                }
-            }
 
-            // user pressed TAB to get completions of a command
-            else if (key == "<Tab>" || key == "<S-Tab>")
-            {
-                //always reset our completion history so up/down keys will start with new values
-                history_index = UNINITIALIZED;
 
-                // we need to build our completion list first
-                if (completion_index == UNINITIALIZED)
-                {
-                    completion_start_index = 0;
-
-                    completion_index = -1;
-                    wild_index = 0;
-
-                    completion_prefix = command.substring(0, command_widget.selectionStart);
-                    completion_postfix = command.substring(command_widget.selectionStart);
-                    var res = vimperator.triggerCallback("complete", cur_extended_mode, completion_prefix);
-                    if (res)
-                        [completion_start_index, completions] = res;
-
-                    // sort the completion list
-                    if (vimperator.options["wildoptions"].search(/\bsort\b/) > -1)
+                    if (completionIndex == -1 && !longest) // wrapped around matches, reset command line
                     {
-                        completions.sort(function (a, b) {
-                                if (a[0] < b[0])
-                                    return -1;
-                                else if (a[0] > b[0])
-                                    return 1;
-                                else
-                                    return 0;
-                        });
+                        if (full && completions.length > 1)
+                        {
+                            setCommand(completionPrefix + completionPostfix);
+                        }
+                    }
+                    else
+                    {
+                        if (longest && completions.length > 1)
+                            var compl = vimperator.completion.getLongestSubstring();
+                        else if (full)
+                            var compl = completions[completionIndex][0];
+                        else if (completions.length == 1)
+                            var compl = completions[0][0];
+                        if (compl)
+                        {
+                            setCommand(command.substring(0, completionStartIndex) + compl + completionPostfix);
+                            commandWidget.selectionStart = commandWidget.selectionEnd = completionStartIndex + compl.length;
+
+                            // Start a new completion in the next iteration. Useful for commands like :source
+                            // RFC: perhaps the command can indicate whether the completion should be restarted
+                            // Needed for :source to grab another set of completions after a file/directory has been filled out
+                            if (completions.length == 1 && !full)
+                                completionIndex = UNINITIALIZED;
+                        }
                     }
-                }
 
-                if (completions.length == 0)
-                {
-                    vimperator.beep();
                     // prevent tab from moving to the next field
                     event.preventDefault();
                     event.stopPropagation();
-                    return;
                 }
-
-                var wim = vimperator.options["wildmode"].split(/,/);
-                var has_list = false;
-                var longest = false;
-                var full = false;
-                var wildtype = wim[wild_index++] || wim[wim.length - 1];
-                if (wildtype == "list" || wildtype == "list:full" || wildtype == "list:longest")
-                    has_list = true;
-                if (wildtype == "longest" || wildtype == "list:longest")
-                    longest = true;
-                else if (wildtype == "full" || wildtype == "list:full")
-                    full = true;
-
-                // show the list
-                if (has_list)
+                else if (key == "<BS>")
                 {
-                    if (completion_index < 0)
-                        completionlist.show(completions);
-                    else
-                        completionlist.show();
-                }
+                    // reset the tab completion
+                    completionIndex = historyIndex = UNINITIALIZED;
 
-                if (full)
-                {
-                    if (event.shiftKey)
+                    // and blur the command line if there is no text left
+                    if (command.length == 0)
                     {
-                        completion_index--;
-                        if (completion_index < -1)
-                            completion_index = completions.length -1;
-                    }
-                    else
-                    {
-                        completion_index++;
-                        if (completion_index >= completions.length)
-                            completion_index = -1;
-                    }
-
-                    vimperator.statusline.updateProgress("match " + (completion_index + 1) + " of " + completions.length);
-                    // if the list is hidden, this function does nothing
-                    completionlist.selectItem(completion_index);
-                }
-
-
-                if (completion_index == -1 && !longest) // wrapped around matches, reset command line
-                {
-                    if (full && completions.length > 1)
-                    {
-                        setCommand(completion_prefix + completion_postfix);
+                        vimperator.triggerCallback("cancel", currentExtendedMode);
+                        vimperator.setMode(oldMode, oldExtendedMode);
+                        vimperator.focusContent();
+                        this.clear();
                     }
                 }
-                else
+                else // any other key
                 {
-                    if (longest && completions.length > 1)
-                        var compl = vimperator.completion.get_longest_substring();
-                    else if (full)
-                        var compl = completions[completion_index][0];
-                    else if (completions.length == 1)
-                        var compl = completions[0][0];
-                    if (compl)
-                    {
-                        setCommand(command.substring(0, completion_start_index) + compl + completion_postfix);
-                        command_widget.selectionStart = command_widget.selectionEnd = completion_start_index + compl.length;
-
-                        // Start a new completion in the next iteration. Useful for commands like :source
-                        // RFC: perhaps the command can indicate whether the completion should be restarted
-                        // Needed for :source to grab another set of completions after a file/directory has been filled out
-                        if (completions.length == 1 && !full)
-                            completion_index = UNINITIALIZED;
-                    }
-                }
-
-                // prevent tab from moving to the next field
-                event.preventDefault();
-                event.stopPropagation();
-            }
-            else if (key == "<BS>")
-            {
-                // reset the tab completion
-                completion_index = history_index = UNINITIALIZED;
-
-                // and blur the command line if there is no text left
-                if (command.length == 0)
-                {
-                    vimperator.triggerCallback("cancel", cur_extended_mode);
-                    vimperator.setMode(old_mode, old_extended_mode);
-                    vimperator.focusContent();
-                    this.clear();
+                    // reset the tab completion
+                    completionIndex = historyIndex = UNINITIALIZED;
                 }
             }
-            else // any other key
-            {
-                // reset the tab completion
-                completion_index = history_index = UNINITIALIZED;
-            }
-        }
-    }
+        },
 
-    this.onMultilineInputEvent = function (event)
-    {
-        if (event.type == "keypress")
+        onMultilineInputEvent: function (event)
         {
+            if (event.type == "keypress")
+            {
+                var key = vimperator.events.toString(event);
+                if (vimperator.events.isAcceptKey(key))
+                {
+                    var text = multilineInputWidget.value.substr(0, multilineInputWidget.selectionStart);
+                    if (text.match(multilineRegexp))
+                    {
+                        text = text.replace(multilineRegexp, "");
+                        vimperator.setMode(oldMode, oldExtendedMode);
+                        multilineInputWidget.collapsed = true;
+                        multilineCallback.call(this, text);
+                    }
+                }
+                else if (vimperator.events.isCancelKey(key))
+                {
+                    vimperator.setMode(oldMode, oldExtendedMode);
+                    multilineInputWidget.collapsed = true;
+                }
+            }
+            else if (event.type == "blur")
+            {
+                if (vimperator.hasMode(vimperator.modes.READ_MULTILINE))
+                    setTimeout(function () { multilineInputWidget.inputField.focus(); }, 0);
+            }
+            else if (event.type == "input")
+            {
+                autosizeMultilineInputWidget();
+            }
+        },
+
+        // FIXME: if 'more' is set and the MOW is not scrollable we should still
+        // allow a down motion after an up rather than closing
+        onMultilineOutputEvent: function (event)
+        {
+            var win = multilineOutputWidget.contentWindow;
+
+            var showMoreHelpPrompt = false;
+            var showMorePrompt = false;
+            var closeWindow = false;
+            var passEvent = false;
+
+            function isScrollable() { return !win.scrollMaxY == 0; }
+
+            function atEnd() { return win.scrollY / win.scrollMaxY >= 1; }
+
             var key = vimperator.events.toString(event);
-            if (vimperator.events.isAcceptKey(key))
+
+            switch (key)
             {
-                var text = multiline_input_widget.value.substr(0, multiline_input_widget.selectionStart);
-                if (text.match(multiline_regexp))
-                {
-                    text = text.replace(multiline_regexp, "");
-                    vimperator.setMode(old_mode, old_extended_mode);
-                    multiline_input_widget.collapsed = true;
-                    multiline_callback.call(this, text);
-                }
+                case ":":
+                    vimperator.commandline.open(":", "", vimperator.modes.EX);
+                    return;
+
+                // down a line
+                case "j":
+                case "<Down>":
+                    if (vimperator.options["more"] && isScrollable())
+                        win.scrollByLines(1);
+                    else
+                        passEvent = true;
+                    break;
+
+                case "<C-j>":
+                case "<C-m>":
+                case "<Return>":
+                    if (vimperator.options["more"] && isScrollable() && !atEnd())
+                        win.scrollByLines(1);
+                    else
+                        closeWindow = true; // don't propagate the event for accept keys
+                    break;
+
+                // up a line
+                case "k":
+                case "<Up>":
+                case "<BS>":
+                    if (vimperator.options["more"] && isScrollable())
+                        win.scrollByLines(-1);
+                    else if (vimperator.options["more"] && !isScrollable())
+                        showMorePrompt = true;
+                    else
+                        passEvent = true;
+                    break;
+
+                // half page down
+                case "d":
+                    if (vimperator.options["more"] && isScrollable())
+                        win.scrollBy(0, win.innerHeight / 2);
+                    else
+                        passEvent = true;
+                    break;
+
+                case "<LeftMouse>":
+                    if (event.originalTarget.className == "hl-URL buffer-list")
+                    {
+                        vimperator.tabs.select(parseInt(event.originalTarget.parentNode.parentNode.firstChild.textContent, 10) - 1);
+                        closeWindow = true;
+                        break;
+                    }
+                    else if (event.originalTarget.localName.toLowerCase() == "a")
+                    {
+                        vimperator.open(event.originalTarget.textContent);
+                        break;
+                    }
+                case "<A-LeftMouse>": // for those not owning a 3-button mouse
+                case "<MiddleMouse>":
+                    if (event.originalTarget.localName.toLowerCase() == "a")
+                    {
+                        var where = /\btabopen\b/.test(vimperator.options["activate"]) ?
+                                    vimperator.NEW_TAB : vimperator.NEW_BACKGROUND_TAB;
+                        vimperator.open(event.originalTarget.textContent, where);
+                    }
+                    break;
+
+                // let firefox handle those to select table cells or show a context menu
+                case "<C-LeftMouse>":
+                case "<RightMouse>":
+                case "<C-S-LeftMouse>":
+                    break;
+
+                // XXX: what's that for? --mst
+                case "<S-LeftMouse>":
+                    if (/^(end|more(-help)?)-prompt$/.test(event.target.id))
+                        ; // fall through
+                    else
+                        break;
+
+                // page down
+                case "f":
+                    if (vimperator.options["more"] && isScrollable())
+                        win.scrollByPages(1);
+                    else
+                        passEvent = true;
+                    break;
+
+                case "<Space>":
+                case "<PageDown>":
+                    if (vimperator.options["more"] && isScrollable() && !atEnd())
+                        win.scrollByPages(1);
+                    else
+                        passEvent = true;
+                    break;
+
+                // half page up
+                case "u":
+                    // if (more and scrollable)
+                    if (vimperator.options["more"] && isScrollable())
+                        win.scrollBy(0, -(win.innerHeight / 2));
+                    else
+                        passEvent = true;
+                    break;
+
+                // page up
+                case "b":
+                    if (vimperator.options["more"] && isScrollable())
+                        win.scrollByPages(-1);
+                    else if (vimperator.options["more"] && !isScrollable())
+                        showMorePrompt = true;
+                    else
+                        passEvent = true;
+                    break;
+
+                case "<PageUp>":
+                    if (vimperator.options["more"] && isScrollable())
+                        win.scrollByPages(-1);
+                    else
+                        passEvent = true;
+                    break;
+
+                // top of page
+                case "g":
+                    if (vimperator.options["more"] && isScrollable())
+                        win.scrollTo(0, 0);
+                    else if (vimperator.options["more"] && !isScrollable())
+                        showMorePrompt = true;
+                    else
+                        passEvent = true;
+                    break;
+
+                // bottom of page
+                case "G":
+                    if (vimperator.options["more"] && isScrollable() && !atEnd())
+                        win.scrollTo(0, win.scrollMaxY);
+                    else
+                        passEvent = true;
+                    break;
+
+                // copy text to clipboard
+                case "<C-y>":
+                    vimperator.copyToClipboard(win.getSelection());
+                    break;
+
+                // close the window
+                case "q":
+                    closeWindow = true;
+                    break;
+
+                // unmapped key
+                default:
+                    if (!vimperator.options["more"] || !isScrollable() || atEnd() || vimperator.events.isCancelKey(key))
+                        passEvent = true;
+                    else
+                        showMoreHelpPrompt = true;
             }
-            else if (vimperator.events.isCancelKey(key))
+
+            if (passEvent || closeWindow)
             {
-                vimperator.setMode(old_mode, old_extended_mode);
-                multiline_input_widget.collapsed = true;
+                vimperator.setMode(vimperator.modes.NORMAL);
+                vimperator.focusContent();
+                this.clear();
+
+                if (passEvent)
+                    vimperator.events.onKeyPress(event);
             }
-        }
-        else if (event.type == "blur")
+            else // set update the prompt string
+            {
+                if (showMoreHelpPrompt)
+                    setLine("-- More -- SPACE/d/j: screen/page/line down, b/u/k: up, q: quit", this.HL_MOREMSG);
+                else if (showMorePrompt || (vimperator.options["more"] && isScrollable() && !atEnd()))
+                    setLine("-- More --", this.HL_MOREMSG);
+                else
+                    setLine("Press ENTER or type command to continue", this.HL_QUESTION);
+            }
+        },
+
+        // it would be better if we had a destructor in javascript ...
+        destroy: function ()
         {
-            if (vimperator.hasMode(vimperator.modes.READ_MULTILINE))
-                setTimeout(function () { multiline_input_widget.inputField.focus(); }, 0);
-        }
-        else if (event.type == "input")
-        {
-            autosizeMultilineInputWidget();
-        }
-    }
-
-    // FIXME: if 'more' is set and the MOW is not scrollable we should still
-    // allow a down motion after an up rather than closing
-    this.onMultilineOutputEvent = function (event)
-    {
-        var win = multiline_output_widget.contentWindow;
-
-        var show_more_help_prompt = false;
-        var show_more_prompt = false;
-        var close_window = false;
-        var pass_event = false;
-
-        function isScrollable() { return !win.scrollMaxY == 0; }
-
-        function atEnd() { return win.scrollY / win.scrollMaxY >= 1; }
-
-        var key = vimperator.events.toString(event);
-
-        switch (key)
-        {
-            case ":":
-                vimperator.commandline.open(":", "", vimperator.modes.EX);
-                return;
-
-            // down a line
-            case "j":
-            case "<Down>":
-                if (vimperator.options["more"] && isScrollable())
-                    win.scrollByLines(1);
-                else
-                    pass_event = true;
-                break;
-
-            case "<C-j>":
-            case "<C-m>":
-            case "<Return>":
-                if (vimperator.options["more"] && isScrollable() && !atEnd())
-                    win.scrollByLines(1);
-                else
-                    close_window = true; // don't propagate the event for accept keys
-                break;
-
-            // up a line
-            case "k":
-            case "<Up>":
-            case "<BS>":
-                if (vimperator.options["more"] && isScrollable())
-                    win.scrollByLines(-1);
-                else if (vimperator.options["more"] && !isScrollable())
-                    show_more_prompt = true;
-                else
-                    pass_event = true;
-                break;
-
-            // half page down
-            case "d":
-                if (vimperator.options["more"] && isScrollable())
-                    win.scrollBy(0, win.innerHeight / 2);
-                else
-                    pass_event = true;
-                break;
-
-            case "<LeftMouse>":
-                if (event.originalTarget.className == "hl-URL buffer-list")
-                {
-                    vimperator.tabs.select(parseInt(event.originalTarget.parentNode.parentNode.firstChild.textContent, 10) - 1);
-                    close_window = true;
-                    break;
-                }
-                else if (event.originalTarget.localName.toLowerCase() == "a")
-                {
-                    vimperator.open(event.originalTarget.textContent);
-                    break;
-                }
-            case "<A-LeftMouse>": // for those not owning a 3-button mouse
-            case "<MiddleMouse>":
-                if (event.originalTarget.localName.toLowerCase() == "a")
-                {
-                    var where = /\btabopen\b/.test(vimperator.options["activate"]) ?
-                                vimperator.NEW_TAB : vimperator.NEW_BACKGROUND_TAB;
-                    vimperator.open(event.originalTarget.textContent, where);
-                }
-                break;
-
-            // let firefox handle those to select table cells or show a context menu
-            case "<C-LeftMouse>":
-            case "<RightMouse>":
-            case "<C-S-LeftMouse>":
-                break;
-
-            // XXX: what's that for? --mst
-            case "<S-LeftMouse>":
-                if (/^(end|more(-help)?)-prompt$/.test(event.target.id))
-                    ; // fall through
-                else
-                    break;
-
-            // page down
-            case "f":
-                if (vimperator.options["more"] && isScrollable())
-                    win.scrollByPages(1);
-                else
-                    pass_event = true;
-                break;
-
-            case "<Space>":
-            case "<PageDown>":
-                if (vimperator.options["more"] && isScrollable() && !atEnd())
-                    win.scrollByPages(1);
-                else
-                    pass_event = true;
-                break;
-
-            // half page up
-            case "u":
-                // if (more and scrollable)
-                if (vimperator.options["more"] && isScrollable())
-                    win.scrollBy(0, -(win.innerHeight / 2));
-                else
-                    pass_event = true;
-                break;
-
-            // page up
-            case "b":
-                if (vimperator.options["more"] && isScrollable())
-                    win.scrollByPages(-1);
-                else if (vimperator.options["more"] && !isScrollable())
-                    show_more_prompt = true;
-                else
-                    pass_event = true;
-                break;
-
-            case "<PageUp>":
-                if (vimperator.options["more"] && isScrollable())
-                    win.scrollByPages(-1);
-                else
-                    pass_event = true;
-                break;
-
-            // top of page
-            case "g":
-                if (vimperator.options["more"] && isScrollable())
-                    win.scrollTo(0, 0);
-                else if (vimperator.options["more"] && !isScrollable())
-                    show_more_prompt = true;
-                else
-                    pass_event = true;
-                break;
-
-            // bottom of page
-            case "G":
-                if (vimperator.options["more"] && isScrollable() && !atEnd())
-                    win.scrollTo(0, win.scrollMaxY);
-                else
-                    pass_event = true;
-                break;
-
-            // copy text to clipboard
-            case "<C-y>":
-                vimperator.copyToClipboard(win.getSelection());
-                break;
-
-            // close the window
-            case "q":
-                close_window = true;
-                break;
-
-            // unmapped key
-            default:
-                if (!vimperator.options["more"] || !isScrollable() || atEnd() || vimperator.events.isCancelKey(key))
-                    pass_event = true;
-                else
-                    show_more_help_prompt = true;
+            history.save();
         }
 
-        if (pass_event || close_window)
-        {
-            vimperator.setMode(vimperator.modes.NORMAL);
-            vimperator.focusContent();
-            this.clear();
-
-            if (pass_event)
-                vimperator.events.onKeyPress(event);
-        }
-        else // set update the prompt string
-        {
-            if (show_more_help_prompt)
-                setLine("-- More -- SPACE/d/j: screen/page/line down, b/u/k: up, q: quit", this.HL_MOREMSG);
-            else if (show_more_prompt || (vimperator.options["more"] && isScrollable() && !atEnd()))
-                setLine("-- More --", this.HL_MOREMSG);
-            else
-                setLine("Press ENTER or type command to continue", this.HL_QUESTION);
-        }
-    }
-
-    // it would be better if we had a destructor in javascript ...
-    this.destroy = function ()
-    {
-        history.save();
-    }
+    };
     //}}}
-} //}}}
+}; //}}}
 
 /**
  * The list which is used for the completion box, the preview window and the buffer preview window
@@ -859,36 +863,36 @@ vimperator.InformationList = function (id, options) //{{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     const CONTEXT_LINES = 3;
-    var max_items = 10;
-    var min_items = 1;
-    var incremental_fill = true; // make display faster, but does not show scrollbar
+    var maxItems = 10;
+    var minItems = 1;
+    var incrementalFill = true; // make display faster, but does not show scrollbar
 
     if (options)
     {
-        if (options.max_items) max_items = options.max_items;
-        if (options.min_items) min_items = options.min_items;
-        if (options.incremental_fill) incremental_fill = options.incremental_fill;
+        if (options.maxItems) maxItems = options.maxItems;
+        if (options.minItems) minItems = options.minItems;
+        if (options.incrementalFill) incrementalFill = options.incrementalFill;
     }
 
     var widget = document.getElementById(id);
     var completions = null; // a reference to the Array of completions
-    var list_offset = 0; // how many items is the displayed list shifted from the internal tab index
-    var list_index = 0;  // list_offset + list_index = completions[item]
+    var listOffset = 0; // how many items is the displayed list shifted from the internal tab index
+    var listIndex = 0;  // listOffset + listIndex = completions[item]
 
     // add a single completion item to the list
-    function addItem(completion_item, at_beginning)
+    function addItem(completionItem, atBeginning)
     {
         var item  = document.createElement("listitem");
         var cell1 = document.createElement("listcell");
         var cell2 = document.createElement("listcell");
 
-        cell1.setAttribute("label", completion_item[0]);
-        cell2.setAttribute("label", completion_item[1]);
+        cell1.setAttribute("label", completionItem[0]);
+        cell2.setAttribute("label", completionItem[1]);
         cell2.setAttribute("style", "color:green; font-family: sans");
 
         item.appendChild(cell1);
         item.appendChild(cell2);
-        if (at_beginning == true)
+        if (atBeginning == true)
         {
             var items = widget.getElementsByTagName("listitem");
             if (items.length > 0)
@@ -903,7 +907,7 @@ vimperator.InformationList = function (id, options) //{{{
     /**
      * uses the entries in completions to fill the listbox
      *
-     * @param startindex: start at this index and show max_items
+     * @param startindex: start at this index and show maxItems
      * @returns the number of items
      */
     function fill(startindex)
@@ -917,7 +921,7 @@ vimperator.InformationList = function (id, options) //{{{
             widget.removeChild(items[0]);
         }
 
-        if (!incremental_fill)
+        if (!incrementalFill)
         {
             for (i in completions)
                 addItem(completions[i], false);
@@ -925,15 +929,15 @@ vimperator.InformationList = function (id, options) //{{{
         }
 
         // find start index
-        if (startindex + max_items > complength)
-            startindex = complength - max_items;
+        if (startindex + maxItems > complength)
+            startindex = complength - maxItems;
         if (startindex < 0)
             startindex = 0;
 
-        list_offset = startindex;
-        list_index = -1;
+        listOffset = startindex;
+        listIndex = -1;
 
-        for (var i = startindex; i < complength && i < startindex + max_items; i++)
+        for (var i = startindex; i < complength && i < startindex + maxItems; i++)
         {
             addItem(completions[i], false);
         }
@@ -945,115 +949,119 @@ vimperator.InformationList = function (id, options) //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    /**
-     * Show the completion list window
-     *
-     * @param compl: if null, only show the list with current entries, otherwise
-     *          use entries of 'compl' to fill the list.
-     *          Required format: [["left", "right"], ["another"], ["completion"]]
-     */
-    this.show = function (compl)
-    {
-        //max_items = vimperator.options["previewheight"];
+    return {
 
-        if (compl)
+        /**
+         * Show the completion list window
+         *
+         * @param compl: if null, only show the list with current entries, otherwise
+         *          use entries of 'compl' to fill the list.
+         *          Required format: [["left", "right"], ["another"], ["completion"]]
+         */
+        show: function (compl)
         {
-            completions = compl;
-            fill(0);
-        }
+            //maxItems = vimperator.options["previewheight"];
 
-        var length = completions.length;
-        if (length > max_items)
-            length = max_items;
-        if (length >= min_items)
-        {
-            widget.setAttribute("rows", length.toString());
-            widget.hidden = false;
-            return true;
-        }
-        else
+            if (compl)
+            {
+                completions = compl;
+                fill(0);
+            }
+
+            var length = completions.length;
+            if (length > maxItems)
+                length = maxItems;
+            if (length >= minItems)
+            {
+                widget.setAttribute("rows", length.toString());
+                widget.hidden = false;
+                return true;
+            }
+            else
+            {
+                widget.hidden = true;
+                return false;
+            }
+        },
+
+        hide: function ()
         {
             widget.hidden = true;
-            return false;
-        }
-    }
+        },
 
-    this.hide = function ()
-    {
-        widget.hidden = true;
-    }
-
-    this.visible = function ()
-    {
-        return !widget.hidden;
-    }
-
-    /**
-     * select index, refill list if necessary
-     */
-    this.selectItem = function (index)
-    {
-        if (widget.hidden)
-            return;
-
-        if (!incremental_fill)
+        visible: function ()
         {
-            widget.selectedIndex = index;
-            return;
-        }
+            return !widget.hidden;
+        },
 
-        // find start index
-        var new_offset = 0;
-        if (index >= list_offset + max_items - CONTEXT_LINES)
-            new_offset = index - max_items + CONTEXT_LINES + 1;
-        else if (index <= list_offset + CONTEXT_LINES)
-            new_offset = index - CONTEXT_LINES;
-        else
-            new_offset = list_offset;
-
-        if (new_offset + max_items > completions.length)
-            new_offset = completions.length - max_items;
-        if (new_offset < 0)
-            new_offset = 0;
-
-        // for speed reason: just remove old item, and add the new one at the end of the list
-        var items = widget.getElementsByTagName("listitem");
-        if (new_offset == list_offset + 1)
+        /**
+         * select index, refill list if necessary
+         */
+        selectItem: function (index)
         {
-            widget.removeChild(items[0]);
-            addItem(completions[index + CONTEXT_LINES], false);
-        }
-        else if (new_offset == list_offset - 1)
-        {
-            widget.removeChild(items[items.length-1]);
-            addItem(completions[index - CONTEXT_LINES], true);
-        }
-        else if (new_offset == list_offset)
-        {
-            // do nothing
-        }
-        else
-            fill(new_offset);
+            if (widget.hidden)
+                return;
 
-        list_offset = new_offset;
-        widget.selectedIndex = index - list_offset;
-    }
+            if (!incrementalFill)
+            {
+                widget.selectedIndex = index;
+                return;
+            }
 
-    this.onEvent = function (event)
-    {
-        var listcells = document.getElementsByTagName("listcell");
-        // 2 columns for now, use the first column
-        var index = (widget.selectedIndex * 2) + 0;
-        var val = listcells[index].getAttribute("label");
-        if (val && event.button == 0 && event.type == "dblclick") // left double click
-            vimperator.open(val);
-        else if (val && event.button == 1) // middle click
-            vimperator.open(val, vimperator.NEW_TAB);
-        else
-            return false;
-    }
+            // find start index
+            var newOffset = 0;
+            if (index >= listOffset + maxItems - CONTEXT_LINES)
+                newOffset = index - maxItems + CONTEXT_LINES + 1;
+            else if (index <= listOffset + CONTEXT_LINES)
+                newOffset = index - CONTEXT_LINES;
+            else
+                newOffset = listOffset;
+
+            if (newOffset + maxItems > completions.length)
+                newOffset = completions.length - maxItems;
+            if (newOffset < 0)
+                newOffset = 0;
+
+            // for speed reason: just remove old item, and add the new one at the end of the list
+            var items = widget.getElementsByTagName("listitem");
+            if (newOffset == listOffset + 1)
+            {
+                widget.removeChild(items[0]);
+                addItem(completions[index + CONTEXT_LINES], false);
+            }
+            else if (newOffset == listOffset - 1)
+            {
+                widget.removeChild(items[items.length-1]);
+                addItem(completions[index - CONTEXT_LINES], true);
+            }
+            else if (newOffset == listOffset)
+            {
+                // do nothing
+            }
+            else
+                fill(newOffset);
+
+            listOffset = newOffset;
+            widget.selectedIndex = index - listOffset;
+        },
+
+        onEvent: function (event)
+        {
+            var listcells = document.getElementsByTagName("listcell");
+            // 2 columns for now, use the first column
+            var index = (widget.selectedIndex * 2) + 0;
+            var val = listcells[index].getAttribute("label");
+            if (val && event.button == 0 && event.type == "dblclick") // left double click
+                vimperator.open(val);
+            else if (val && event.button == 1) // middle click
+                vimperator.open(val, vimperator.NEW_TAB);
+            else
+                return false;
+        }
+
+    };
     //}}}
-} //}}}
+}; //}}}
 
 vimperator.StatusLine = function () //{{{
 {
@@ -1061,154 +1069,158 @@ vimperator.StatusLine = function () //{{{
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    var status_bar = document.getElementById("status-bar");
+    var statusBar = document.getElementById("status-bar");
 
     // our status bar fields
-    var statusline_widget     = document.getElementById("vimperator-statusline");
-    var url_widget            = document.getElementById("vimperator-statusline-field-url");
-    var inputbuffer_widget    = document.getElementById("vimperator-statusline-field-inputbuffer");
-    var progress_widget       = document.getElementById("vimperator-statusline-field-progress");
-    var tabcount_widget       = document.getElementById("vimperator-statusline-field-tabcount");
-    var bufferposition_widget = document.getElementById("vimperator-statusline-field-bufferposition");
+    var statuslineWidget     = document.getElementById("vimperator-statusline");
+    var urlWidget            = document.getElementById("vimperator-statusline-field-url");
+    var inputBufferWidget    = document.getElementById("vimperator-statusline-field-inputbuffer");
+    var progressWidget       = document.getElementById("vimperator-statusline-field-progress");
+    var tabCountWidget       = document.getElementById("vimperator-statusline-field-tabcount");
+    var bufferPositionWidget = document.getElementById("vimperator-statusline-field-bufferposition");
 
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    this.setClass = function (type)
-    {
-        var highlight_group;
+    return {
 
-        switch (type)
+        setClass: function (type)
         {
-            case "secure":
-                highlight_group = "hl-StatusLineSecure";
-                break;
-            case "broken":
-                highlight_group = "hl-StatusLineBroken";
-                break;
-            case "insecure":
-                highlight_group = "hl-StatusLine";
-                break;
-        }
+            var highlightGroup;
 
-        status_bar.setAttribute("class", "chromeclass-status " + highlight_group);
-    };
-
-    // update all fields of the statusline
-    this.update = function ()
-    {
-        this.updateUrl();
-        this.updateInputBuffer();
-        this.updateProgress();
-        this.updateTabCount();
-        this.updateBufferPosition();
-    }
-
-    // if "url" is ommited, build a usable string for the URL
-    this.updateUrl = function (url)
-    {
-        if (typeof url == "string")
-        {
-            url_widget.value = url;
-            return;
-        }
-
-        url = vimperator.buffer.URL;
-
-        // make it even more vim-like
-        if (url == "about:blank")
-        {
-            var title = vimperator.buffer.title;
-
-            if (title == "Vimperator Help")
-                url = "[Help]";
-            else if (!title)
-                url = "[No Name]";
-        }
-
-        var sh = getWebNavigation().sessionHistory;
-        var modified = "";
-        if (sh.index > 0)
-            modified += "+";
-        if (sh.index < sh.count -1)
-            modified += "-";
-
-        if (modified)
-            url += " [" + modified + "]"
-
-        url_widget.value = url;
-    };
-
-    this.updateInputBuffer = function (buffer)
-    {
-        if (!buffer || typeof buffer != "string")
-            buffer = "";
-
-        inputbuffer_widget.value = buffer;
-    };
-
-    this.updateProgress = function (progress)
-    {
-        if (!progress)
-            progress = "";
-
-        if (typeof progress == "string")
-            progress_widget.value = progress;
-        else if (typeof progress == "number")
-        {
-            var progress_str = "";
-            if (progress <= 0)
-                progress_str = "[ Loading...         ]";
-            else if (progress < 1)
+            switch (type)
             {
-                progress_str = "[";
-                var done = Math.floor(progress * 20);
-                for (var i = 0; i < done; i++)
-                    progress_str += "=";
-
-                progress_str += ">";
-
-                for (var i = 19; i > done; i--)
-                    progress_str += " ";
-
-                progress_str += "]";
+                case "secure":
+                    highlightGroup = "hl-StatusLineSecure";
+                    break;
+                case "broken":
+                    highlightGroup = "hl-StatusLineBroken";
+                    break;
+                case "insecure":
+                    highlightGroup = "hl-StatusLine";
+                    break;
             }
-            progress_widget.value = progress_str;
-        }
-    };
 
-    // you can omit either of the 2 arguments
-    this.updateTabCount = function (cur_index, total_tabs)
-    {
-        if (!cur_index || typeof cur_index != "number")
-            cur_index = vimperator.tabs.index() + 1;
-        if (!total_tabs || typeof cur_index != "number")
-            total_tabs = vimperator.tabs.count();
+            statusBar.setAttribute("class", "chromeclass-status " + highlightGroup);
+        },
 
-        tabcount_widget.value = "[" + cur_index + "/" + total_tabs + "]";
-    };
-
-    // percent is given between 0 and 1
-    this.updateBufferPosition = function (percent)
-    {
-        if (!percent || typeof percent != "number")
+        // update all fields of the statusline
+        update: function ()
         {
-            var win = document.commandDispatcher.focusedWindow;
-            percent = win.scrollMaxY == 0 ? -1 : win.scrollY / win.scrollMaxY;
+            this.updateUrl();
+            this.updateInputBuffer();
+            this.updateProgress();
+            this.updateTabCount();
+            this.updateBufferPosition();
+        },
+
+        // if "url" is ommited, build a usable string for the URL
+        updateUrl: function (url)
+        {
+            if (typeof url == "string")
+            {
+                urlWidget.value = url;
+                return;
+            }
+
+            url = vimperator.buffer.URL;
+
+            // make it even more vim-like
+            if (url == "about:blank")
+            {
+                var title = vimperator.buffer.title;
+
+                if (title == "Vimperator Help")
+                    url = "[Help]";
+                else if (!title)
+                    url = "[No Name]";
+            }
+
+            var sh = getWebNavigation().sessionHistory;
+            var modified = "";
+            if (sh.index > 0)
+                modified += "+";
+            if (sh.index < sh.count -1)
+                modified += "-";
+
+            if (modified)
+                url += " [" + modified + "]";
+
+            urlWidget.value = url;
+        },
+
+        updateInputBuffer: function (buffer)
+        {
+            if (!buffer || typeof buffer != "string")
+                buffer = "";
+
+            inputBufferWidget.value = buffer;
+        },
+
+        updateProgress: function (progress)
+        {
+            if (!progress)
+                progress = "";
+
+            if (typeof progress == "string")
+                progressWidget.value = progress;
+            else if (typeof progress == "number")
+            {
+                var progressStr = "";
+                if (progress <= 0)
+                    progressStr = "[ Loading...         ]";
+                else if (progress < 1)
+                {
+                    progressStr = "[";
+                    var done = Math.floor(progress * 20);
+                    for (var i = 0; i < done; i++)
+                        progressStr += "=";
+
+                    progressStr += ">";
+
+                    for (var i = 19; i > done; i--)
+                        progressStr += " ";
+
+                    progressStr += "]";
+                }
+                progressWidget.value = progressStr;
+            }
+        },
+
+        // you can omit either of the 2 arguments
+        updateTabCount: function (currentIndex, totalTabs)
+        {
+            if (!currentIndex || typeof currentIndex != "number")
+                currentIndex = vimperator.tabs.index() + 1;
+            if (!totalTabs || typeof currentIndex != "number")
+                totalTabs = vimperator.tabs.count;
+
+            tabCountWidget.value = "[" + currentIndex + "/" + totalTabs + "]";
+        },
+
+        // percent is given between 0 and 1
+        updateBufferPosition: function (percent)
+        {
+            if (!percent || typeof percent != "number")
+            {
+                var win = document.commandDispatcher.focusedWindow;
+                percent = win.scrollMaxY == 0 ? -1 : win.scrollY / win.scrollMaxY;
+            }
+
+            var bufferPositionStr = "";
+            percent = Math.round(percent * 100);
+            if (percent < 0)          bufferPositionStr = "All";
+            else if (percent == 0)    bufferPositionStr = "Top";
+            else if (percent < 10)    bufferPositionStr = " " + percent + "%";
+            else if (percent >= 100)  bufferPositionStr = "Bot";
+            else                      bufferPositionStr = percent + "%";
+
+            bufferPositionWidget.value = bufferPositionStr;
         }
 
-        var bufferposition_str = "";
-        percent = Math.round(percent*100);
-        if (percent < 0)          bufferposition_str = "All";
-        else if (percent == 0)    bufferposition_str = "Top";
-        else if (percent < 10)    bufferposition_str = " " + percent + "%";
-        else if (percent >= 100)  bufferposition_str = "Bot";
-        else                      bufferposition_str = percent + "%";
-
-        bufferposition_widget.value = bufferposition_str;
     };
     //}}}
-} //}}}
+}; //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/util.js b/content/util.js
index 2fb5f167..1eee1f1c 100644
--- a/content/util.js
+++ b/content/util.js
@@ -26,7 +26,8 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-vimperator.util = {
+vimperator.util = { //{{{
+
     escapeHTML: function (str)
     {
         // XXX: the following code is _much_ slower than a simple .replace()
@@ -39,11 +40,11 @@ vimperator.util = {
     },
 
     // TODO: use :highlight color groups
-    // if "process_strings" is true, any passed strings will be surrounded by " and
+    // if "processStrings" is true, any passed strings will be surrounded by " and
     // any line breaks are displayed as \n
-    colorize: function (arg, process_strings)
+    colorize: function (arg, processStrings)
     {
-        var type = typeof(arg);
+        var type = typeof arg;
 
         // some objects like window.JSON or getBrowsers()._browsers need the try/catch
         try
@@ -54,7 +55,7 @@ vimperator.util = {
             }
             else if (type == "string")
             {
-                if (process_strings)
+                if (processStrings)
                     arg = '"' + vimperator.util.escapeHTML(arg.replace(/\n/, "\\n")) + '"';
 
                 return "<span style=\"color: green;\">" + arg + "</span>";
@@ -97,7 +98,7 @@ vimperator.util = {
 
         begin: for (var url = 0; url < urls.length; url++)
         {
-            var new_url = vimperator.buffer.URL;
+            var newURL = vimperator.buffer.URL;
             var matches;
 
             // strip each 'URL' - makes things simpler later on
@@ -108,13 +109,13 @@ vimperator.util = {
             if (matches = urls[url].match(/^(?:\.$|\.\/(\S*))/))
             {
                 var tail = matches[1] || "";
-                urls[url] = new_url.replace(/(.+\/)[^\/]*/, "$1" + tail);  // NOTE: escape / in character sets so as not to break Vim syntax highlighting
+                urls[url] = newURL.replace(/(.+\/)[^\/]*/, "$1" + tail);  // NOTE: escape / in character sets so as not to break Vim syntax highlighting
                 continue;
             }
             else if (matches = urls[url].match(/^(?:\.\.$|\.\.\/(\S*))/))
             {
                 var tail = matches[1] || "";
-                urls[url] = new_url.replace(/(.+\/)[^\/]*/, "$1../" + tail);
+                urls[url] = newURL.replace(/(.+\/)[^\/]*/, "$1../" + tail);
                 continue;
             }
             else if (matches = urls[url].match(/^(?:\.\.\.$|\.\.\.\/(\S*))/))
@@ -142,18 +143,18 @@ vimperator.util = {
                 // like the comments below ;-)
 
                 // check if the first word is a search engine
-                var search_url = vimperator.bookmarks.getSearchURL(text, alias);
-                if (search_url/* && search_url.length >= 1*/)
+                var searchURL = vimperator.bookmarks.getSearchURL(text, alias);
+                if (searchURL/* && searchURL.length >= 1*/)
                 {
-                    urls[url] = search_url;
+                    urls[url] = searchURL;
                     continue;
                 }
                 else // the first word was not a search engine, search for the whole string in the default engine
                 {
-                    search_url = vimperator.bookmarks.getSearchURL(urls[url], null);
-                    if (search_url/* && search_url.length >= 1*/)
+                    searchURL = vimperator.bookmarks.getSearchURL(urls[url], null);
+                    if (searchURL/* && searchURL.length >= 1*/)
                     {
-                        urls[url] = search_url;
+                        urls[url] = searchURL;
                         continue;
                     }
                 }
@@ -206,6 +207,7 @@ vimperator.util = {
 
         return strNum[0] + " " + unitVal[unitIndex];
     }
-};
+
+}; //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/vimperator.js b/content/vimperator.js
index d28d5d9e..77a589a5 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -52,32 +52,32 @@ const vimperator = (function () //{{{
         EXTENDED_HINT:    1 << 18,
         ALWAYS_HINT:      1 << 19,
         MENU:             1 << 20 // a popupmenu is active
-    }
+    };
 
-    var mode_messages = {};
-    mode_messages[modes.NORMAL]          = "";
-    mode_messages[modes.INSERT]          = "INSERT";
-    mode_messages[modes.VISUAL]          = "VISUAL";
-    mode_messages[modes.HINTS]           = "HINTS";
-    mode_messages[modes.ESCAPE_ONE_KEY]  = "escape one key";
-    mode_messages[modes.ESCAPE_ALL_KEYS] = "escape all keys";
-    mode_messages[modes.ESCAPE_ONE_KEY | modes.ESCAPE_ALL_KEYS] = "pass one key";
-    mode_messages[modes.QUICK_HINT]      = "quick";
-    mode_messages[modes.EXTENDED_HINT]   = "extended";
-    mode_messages[modes.ALWAYS_HINT]     = "always";
-    //mode_messages[modes.MENU]            = "menu"; // not a user visible mode
+    var modeMessages = {};
+    modeMessages[modes.NORMAL]          = "";
+    modeMessages[modes.INSERT]          = "INSERT";
+    modeMessages[modes.VISUAL]          = "VISUAL";
+    modeMessages[modes.HINTS]           = "HINTS";
+    modeMessages[modes.ESCAPE_ONE_KEY]  = "escape one key";
+    modeMessages[modes.ESCAPE_ALL_KEYS] = "escape all keys";
+    modeMessages[modes.ESCAPE_ONE_KEY | modes.ESCAPE_ALL_KEYS] = "pass one key";
+    modeMessages[modes.QUICK_HINT]      = "quick";
+    modeMessages[modes.EXTENDED_HINT]   = "extended";
+    modeMessages[modes.ALWAYS_HINT]     = "always";
+    //modeMessages[modes.MENU]            = "menu"; // not a user visible mode
 
     var mode = modes.NORMAL;
-    var extended_mode = modes.NONE;
+    var extendedMode = modes.NONE;
 
     var callbacks = [];
 
     // our services
-    var sound_service = Components.classes["@mozilla.org/sound;1"]
+    var soundService = Components.classes["@mozilla.org/sound;1"]
         .getService(Components.interfaces.nsISound);
-    var console_service = Components.classes["@mozilla.org/consoleservice;1"]
+    var consoleService = Components.classes["@mozilla.org/consoleservice;1"]
         .getService(Components.interfaces.nsIConsoleService);
-    var environment_service = Components.classes["@mozilla.org/process/environment;1"]
+    var environmentService = Components.classes["@mozilla.org/process/environment;1"]
         .getService(Components.interfaces.nsIEnvironment);
 
     function showMode()
@@ -85,23 +85,23 @@ const vimperator = (function () //{{{
         if (!vimperator.options["showmode"])
             return;
 
-        var str_mode = mode_messages[mode];
-        var str_extended = mode_messages[extended_mode];
-        if (!str_mode && !str_extended)
+        var strMode = modeMessages[mode];
+        var strExtended = modeMessages[extendedMode];
+        if (!strMode && !strExtended)
         {
             vimperator.echo("");
             return;
         }
 
-        if (str_mode && str_extended)
-            str_extended = " (" + str_extended + ")";
+        if (strMode && strExtended)
+            strExtended = " (" + strExtended + ")";
         else
         {
-            str_extended = "(" + str_extended + ")";
-            str_mode = "";
+            strExtended = "(" + strExtended + ")";
+            strMode = "";
         }
 
-        vimperator.echo("-- " + str_mode + str_extended + " --");
+        vimperator.echo("-- " + strMode + strExtended + " --");
     }
 
     /////////////////////////////////////////////////////////////////////////////}}}
@@ -154,7 +154,7 @@ const vimperator = (function () //{{{
 
         getMode: function ()
         {
-            return [mode, extended_mode];
+            return [mode, extendedMode];
         },
 
         // set current mode
@@ -165,10 +165,10 @@ const vimperator = (function () //{{{
             if (main)
             {
                 mode = main;
-                extended_mode = vimperator.modes.NONE;
+                extendedMode = vimperator.modes.NONE;
             }
             if (typeof extended === "number")
-                extended_mode = extended;
+                extendedMode = extended;
 
             if (!silent)
                 showMode();
@@ -178,7 +178,7 @@ const vimperator = (function () //{{{
         // extended mode
         hasMode: function (whichmode)
         {
-            return ((mode & whichmode) || (extended_mode & whichmode) > 0) ? true : false;
+            return ((mode & whichmode) || (extendedMode & whichmode) > 0) ? true : false;
         },
 
         addMode: function (main, extended)
@@ -186,7 +186,7 @@ const vimperator = (function () //{{{
             if (main)
                 mode |= main;
             if (extended)
-                extended_mode |= extended;
+                extendedMode |= extended;
 
             showMode();
         },
@@ -197,7 +197,7 @@ const vimperator = (function () //{{{
             if (main)
                 mode = (mode | main) ^ main;
             if (extended)
-                extended_mode = (extended_mode | extended) ^ extended;
+                extendedMode = (extendedMode | extended) ^ extended;
 
             showMode();
         },
@@ -217,13 +217,13 @@ const vimperator = (function () //{{{
                 vbell.style.left = box.x + "px";
                 vbell.style.top = box.y + "px";
 
-                vbell.hidden = false
+                vbell.hidden = false;
 
                 setTimeout(function () { vbell.hidden = true; }, 50); // may as well be 0 ;-)
             }
             else
             {
-                sound_service.beep();
+                soundService.beep();
             }
         },
 
@@ -409,7 +409,7 @@ const vimperator = (function () //{{{
             if (typeof msg == "object")
                 msg = this.objectToString(msg, false);
 
-            console_service.logStringMessage("vimperator: " + msg);
+            consoleService.logStringMessage("vimperator: " + msg);
         },
 
         // open one or more URLs
@@ -482,9 +482,9 @@ const vimperator = (function () //{{{
         },
 
         // quit vimperator, no matter how many tabs/windows are open
-        quit: function (save_session)
+        quit: function (saveSession)
         {
-            if (save_session)
+            if (saveSession)
                 vimperator.options.setFirefoxPref("browser.startup.page", 3); // start with saved session
             else
                 vimperator.options.setFirefoxPref("browser.startup.page", 1); // start with default homepage session
@@ -532,7 +532,7 @@ const vimperator = (function () //{{{
             if (!args)
                 args = [];
 
-            if (typeof(blocking) != "boolean")
+            if (typeof blocking != "boolean")
                 blocking = false;
 
             try
@@ -541,7 +541,7 @@ const vimperator = (function () //{{{
             }
             catch (e)
             {
-                var dirs = environment_service.get("PATH").split(WINDOWS ? ";" : ":");
+                var dirs = environmentService.get("PATH").split(WINDOWS ? ";" : ":");
                 for (var i = 0; i < dirs.length; i++)
                 {
                     var path = dirs[i] + (WINDOWS ? "\\" : "/") + program;
@@ -604,8 +604,8 @@ const vimperator = (function () //{{{
                 filein.remove(false);
 
             // if there is only one \n at the end, chop it off
-            if (output && output.indexOf("\n") == output.length-1)
-                output = output.substr(0, output.length-1);
+            if (output && output.indexOf("\n") == output.length - 1)
+                output = output.substr(0, output.length - 1);
 
             return output;
         },
@@ -628,16 +628,16 @@ const vimperator = (function () //{{{
                 else
                 {
                     var heredoc = "";
-                    var heredoc_end = null; // the string which ends the heredoc
+                    var heredocEnd = null; // the string which ends the heredoc
                     str.split("\n").forEach(function (line)
                     {
-                        if (heredoc_end) // we already are in a heredoc
+                        if (heredocEnd) // we already are in a heredoc
                         {
-                            if (heredoc_end.test(line))
+                            if (heredocEnd.test(line))
                             {
                                 eval(heredoc);
                                 heredoc = "";
-                                heredoc_end = null;
+                                heredocEnd = null;
                             }
                             else
                             {
@@ -654,7 +654,7 @@ const vimperator = (function () //{{{
                                 var matches = args.match(/(.*)<<\s*([^\s]+)$/);
                                 if (matches)
                                 {
-                                    heredoc_end = new RegExp("^" + matches[2] + "$", "m");
+                                    heredocEnd = new RegExp("^" + matches[2] + "$", "m");
                                     if (matches[1])
                                         heredoc = matches[1] + "\n";
                                 }
@@ -688,51 +688,51 @@ const vimperator = (function () //{{{
 
             // these objects are created here only after the chrome is ready
             vimperator.log("Loading module options...", 3);
-            vimperator.options       = new vimperator.Options();
+            vimperator.options       = vimperator.Options();
             vimperator.log("Loading module events...", 3);
-            vimperator.events        = new vimperator.Events();
+            vimperator.events        = vimperator.Events();
             vimperator.log("Loading module commands...", 3);
-            vimperator.commands      = new vimperator.Commands();
+            vimperator.commands      = vimperator.Commands();
             vimperator.log("Loading module bookmarks...", 3);
-            vimperator.bookmarks     = new vimperator.Bookmarks();
+            vimperator.bookmarks     = vimperator.Bookmarks();
             vimperator.log("Loading module history...", 3);
-            vimperator.history       = new vimperator.History();
+            vimperator.history       = vimperator.History();
             vimperator.log("Loading module commandline...", 3);
-            vimperator.commandline   = new vimperator.CommandLine();
+            vimperator.commandline   = vimperator.CommandLine();
             vimperator.log("Loading module search...", 3);
-            vimperator.search        = new vimperator.Search();
+            vimperator.search        = vimperator.Search();
             vimperator.log("Loading module preview window...", 3);
-            vimperator.previewwindow = new vimperator.InformationList("vimperator-previewwindow", { incremental_fill: false, max_items: 10 });
+            vimperator.previewwindow = vimperator.InformationList("vimperator-previewwindow", { incrementalFill: false, maxItems: 10 });
             vimperator.log("Loading module buffer window...", 3);
-            vimperator.bufferwindow  = new vimperator.InformationList("vimperator-bufferwindow", { incremental_fill: false, max_items: 10 });
+            vimperator.bufferwindow  = vimperator.InformationList("vimperator-bufferwindow", { incrementalFill: false, maxItems: 10 });
             vimperator.log("Loading module mappings...", 3);
-            vimperator.mappings      = new vimperator.Mappings();
+            vimperator.mappings      = vimperator.Mappings();
             vimperator.log("Loading module statusline...", 3);
-            vimperator.statusline    = new vimperator.StatusLine();
+            vimperator.statusline    = vimperator.StatusLine();
             vimperator.log("Loading module buffer...", 3);
-            vimperator.buffer        = new vimperator.Buffer();
+            vimperator.buffer        = vimperator.Buffer();
             vimperator.log("Loading module tabs...", 3);
-            vimperator.tabs          = new vimperator.Tabs();
+            vimperator.tabs          = vimperator.Tabs();
             vimperator.log("Loading module marks...", 3);
-            vimperator.marks         = new vimperator.Marks();
+            vimperator.marks         = vimperator.Marks();
             vimperator.log("Loading module quickmarks...", 3);
-            vimperator.quickmarks    = new vimperator.QuickMarks();
+            vimperator.quickmarks    = vimperator.QuickMarks();
             vimperator.log("Loading module hints...", 3);
-            vimperator.hints         = new vimperator.Hints();
+            vimperator.hints         = vimperator.Hints();
             vimperator.log("Loading module io...", 3);
-            vimperator.io            = new vimperator.IO();
+            vimperator.io            = vimperator.IO();
             vimperator.log("Loading module completion...", 3);
-            vimperator.completion    = new vimperator.Completion();
+            vimperator.completion    = vimperator.Completion();
             vimperator.log("All modules loaded", 3);
 
-            vimperator.echo    = function (str) { vimperator.commandline.echo(str); }
-            vimperator.echoerr = function (str) { vimperator.commandline.echo(str, vimperator.commandline.HL_ERRORMSG); }
+            vimperator.echo    = function (str, flags) { vimperator.commandline.echo(str, vimperator.commandline.HL_NORMAL, flags); };
+            vimperator.echoerr = function (str, flags) { vimperator.commandline.echo(str, vimperator.commandline.HL_ERRORMSG, flags); };
 
             vimperator.globalVariables = {};
 
             // TODO: move elsewhere
-            vimperator.registerCallback("submit", vimperator.modes.EX, function (command) { vimperator.execute(command); } );
-            vimperator.registerCallback("complete", vimperator.modes.EX, function (str) { return vimperator.completion.exTabCompletion(str); } );
+            vimperator.registerCallback("submit", vimperator.modes.EX, function (command) { vimperator.execute(command); });
+            vimperator.registerCallback("complete", vimperator.modes.EX, function (str) { return vimperator.completion.exTabCompletion(str); });
 
             // first time intro message
             if (vimperator.options.getPref("firsttime", true))
@@ -749,20 +749,20 @@ const vimperator = (function () //{{{
             // make sourcing asynchronous, otherwise commands that open new tabs won't work
             setTimeout(function () {
 
-                var rc_file = vimperator.io.getRCFile();
+                var rcFile = vimperator.io.getRCFile();
 
-                if (rc_file)
-                    vimperator.source(rc_file.path, true);
+                if (rcFile)
+                    vimperator.source(rcFile.path, true);
                 else
                     vimperator.log("No user RC file found", 3);
 
                 // also source plugins in ~/.vimperator/plugin/
                 try
                 {
-                    var plugin_dir = vimperator.io.getPluginDir();
-                    if (plugin_dir)
+                    var pluginDir = vimperator.io.getPluginDir();
+                    if (pluginDir)
                     {
-                        var files = vimperator.io.readDirectory(plugin_dir.path);
+                        var files = vimperator.io.readDirectory(pluginDir.path);
                         vimperator.log("Sourcing plugin directory...", 3);
                         files.forEach(function (file) {
                             if (!file.isDirectory() && /\.js$/.test(file.path))
@@ -809,21 +809,22 @@ const vimperator = (function () //{{{
             var mainThread = threadManager.mainThread;
 
             var then = new Date().getTime(), now = then;
-            for (; now - then < ms; now = new Date().getTime()) {
+            for (; now - then < ms; now = new Date().getTime())
                 mainThread.processNextEvent(true);
-            }
         },
 
         get windows()
         {
-            var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService(Components.interfaces.nsIWindowMediator);
+            var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                     .getService(Components.interfaces.nsIWindowMediator);
             var wa = [];
             var enumerator = wm.getEnumerator("navigator:browser");
             while (enumerator.hasMoreElements())
                 wa.push(enumerator.getNext());
             return wa;
         }
-    } //}}}
+
+    }; //}}}
 })(); //}}}
 
 // called when the chrome is fully loaded and before the main window is shown

From 708fafe4a6ac5aa89ebad2ca0ac20935835d0061 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 22 Nov 2007 11:46:49 +0000
Subject: [PATCH 213/224] use RegExp#test in preference to String#match

---
 content/bookmarks.js  |  2 +-
 content/commands.js   | 32 ++++++++++++++++----------------
 content/events.js     |  2 +-
 content/mappings.js   | 12 +++++-------
 content/options.js    |  2 +-
 content/ui.js         |  2 +-
 content/vimperator.js | 28 ++++++++++++++--------------
 7 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/content/bookmarks.js b/content/bookmarks.js
index a25e36e8..45142666 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -166,7 +166,7 @@ vimperator.Bookmarks = function () //{{{
             for (var i in firefoxEngines)
             {
                 var alias = firefoxEngines[i].alias;
-                if (!alias || !alias.match(/^[a-z0-9_-]+$/))
+                if (!alias || !/^[a-z0-9_-]+$/.test(alias))
                     alias = firefoxEngines[i].name.replace(/^\W*([a-zA-Z_-]+).*/, "$1").toLowerCase();
                 if (!alias)
                     alias = "search"; // for search engines which we can't find a suitable alias
diff --git a/content/commands.js b/content/commands.js
index d9126474..2e869167 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -116,7 +116,7 @@ vimperator.Command.prototype.hasName = function (name)
         {
             return true;
         }
-        else if (this.specs[i].match(/^(\w+|!)\[\w+\]$/)) // abbreviation spec
+        else if (/^(\w+|!)\[\w+\]$/.test(this.specs[i])) // abbreviation spec
         {
             if (matchAbbreviation(name, this.specs[i]))
                 return true;
@@ -713,19 +713,19 @@ vimperator.Commands = function () //{{{
                 return;
             }
 
-            var match;
+            var matches;
             // 1 - type, 2 - name, 3 - +-., 4 - expr
-            if (match = args.match(/([$@&])?([\w:]+)\s*([+-.])?=\s*(.+)/))
+            if (matches = args.match(/([$@&])?([\w:]+)\s*([+-.])?=\s*(.+)/))
             {
-                if (!match[1])
+                if (!matches[1])
                 {
-                    var reference = vimperator.variableReference(match[2]);
-                    if (!reference[0] && match[3])
-                        return vimperator.echoerr("E121: Undefined variable: " + match[2]);
+                    var reference = vimperator.variableReference(matches[2]);
+                    if (!reference[0] && matches[3])
+                        return vimperator.echoerr("E121: Undefined variable: " + matches[2]);
 
-                    var expr = vimperator.eval(match[4]);
+                    var expr = vimperator.eval(matches[4]);
                     if (typeof expr === undefined)
-                        return vimperator.echoerr("E15: Invalid expression: " + match[4]);
+                        return vimperator.echoerr("E15: Invalid expression: " + matches[4]);
                     else
                     {
                         if (!reference[0])
@@ -736,13 +736,13 @@ vimperator.Commands = function () //{{{
                                 return; // for now
                         }
 
-                        if (match[3])
+                        if (matches[3])
                         {
-                            if (match[3] == "+")
+                            if (matches[3] == "+")
                                 reference[0][reference[1]] += expr;
-                            else if (match[3] == "-")
+                            else if (matches[3] == "-")
                                 reference[0][reference[1]] -= expr;
-                            else if (match[3] == ".")
+                            else if (matches[3] == ".")
                                 reference[0][reference[1]] += expr.toString();
                         }
                         else
@@ -751,11 +751,11 @@ vimperator.Commands = function () //{{{
                 }
             }
             // 1 - name
-            else if (match = args.match(/^\s*([\w:]+)\s*$/))
+            else if (matches = args.match(/^\s*([\w:]+)\s*$/))
             {
-                var reference = vimperator.variableReference(match[1]);
+                var reference = vimperator.variableReference(matches[1]);
                 if (!reference[0])
-                    return vimperator.echoerr("E121: Undefined variable: " + match[1]);
+                    return vimperator.echoerr("E121: Undefined variable: " + matches[1]);
 
                 var value = reference[0][reference[1]];
                 if (typeof value == "number")
diff --git a/content/events.js b/content/events.js
index 7519c9e4..235a458d 100644
--- a/content/events.js
+++ b/content/events.js
@@ -615,7 +615,7 @@ vimperator.Events = function () //{{{
                 map = vimperator.mappings.get(vimperator.modes.NORMAL, candidateCommand);
 
             // counts must be at the start of a complete mapping (10j -> go 10 lines down)
-            if ((vimperator.input.buffer + key).match(/^[1-9][0-9]*$/))
+            if (/^[1-9][0-9]*$/.test(vimperator.input.buffer + key))
             {
                 // no count for insert mode mappings
                 if (vimperator.hasMode(vimperator.modes.COMMAND_LINE))
diff --git a/content/mappings.js b/content/mappings.js
index aac00a20..ca82161a 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -893,20 +893,18 @@ vimperator.Mappings = function () //{{{
     ));
     function isDirectory(url)
     {
-        if (url.match(/^file:\/\//) || url.match(/^\//))
+        if (/^file:\/\/|^\//.test(url))
         {
-            var stripedFilename = url.replace(/^(file:\/\/)?(.*)/, "$2");
-            var file = vimperator.io.getFile(stripedFilename);
+            var strippedFilename = url.replace(/^(file:\/\/)?(.*)/, "$2");
+            var file = vimperator.io.getFile(strippedFilename);
             if (!file || !file.isDirectory())
                 return false;
             else
                 return true;
         }
+
         // for all other locations just check if the URL ends with /
-        if (url.match(/\/$/))
-            return true;
-        else
-            return false;
+        return /\/$/.test(url);
     }
     addDefaultMap(new vimperator.Map(vimperator.modes.NORMAL, ["gu", "<BS>"],
         function (count)
diff --git a/content/options.js b/content/options.js
index 149e122e..d82db98f 100644
--- a/content/options.js
+++ b/content/options.js
@@ -298,7 +298,7 @@ vimperator.Options = function () //{{{
 
     // work around firefox popup blocker
     var popupAllowedEvents = loadPreference("dom.popup_allowed_events", "change click dblclick mouseup reset submit");
-    if (!popupAllowedEvents.match("keypress"))
+    if (!/keypress/.test(popupAllowedEvents))
         storePreference("dom.popup_allowed_events", popupAllowedEvents + " keypress");
 
     // TODO: shouldn't we be resetting these in destroy() as well?
diff --git a/content/ui.js b/content/ui.js
index c7f24753..78e53466 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -495,7 +495,7 @@ vimperator.CommandLine = function () //{{{
                             [completionStartIndex, completions] = res;
 
                         // sort the completion list
-                        if (vimperator.options["wildoptions"].search(/\bsort\b/) > -1)
+                        if (/\bsort\b/.test(vimperator.options["wildoptions"]))
                         {
                             completions.sort(function (a, b) {
                                     if (a[0] < b[0])
diff --git a/content/vimperator.js b/content/vimperator.js
index 77a589a5..b6a7bbdb 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -280,13 +280,13 @@ const vimperator = (function () //{{{
         eval: function (string)
         {
             string = string.toString().replace(/^\s*/, "").replace(/\s*$/, "");
-            var match = string.match(/^&(\w+)/);
-            if (match)
+            var matches = string.match(/^&(\w+)/);
+            if (matches)
             {
-                var opt = this.options.get(match[1]);
+                var opt = this.options.get(matches[1]);
                 if (!opt)
                 {
-                    this.echoerr("E113: Unknown option: " + match[1]);
+                    this.echoerr("E113: Unknown option: " + matches[1]);
                     return;
                 }
                 var type = opt.type;
@@ -297,10 +297,10 @@ const vimperator = (function () //{{{
             }
 
             // String
-            else if (match = string.match(/^(['"])([^\1]*?[^\\]?)\1/))
+            else if (matches = string.match(/^(['"])([^\1]*?[^\\]?)\1/))
             {
-                if (match)
-                    return match[2].toString();
+                if (matches)
+                    return matches[2].toString();
                 else
                 {
                     this.echoerr("E115: Missing quote: " + string);
@@ -309,7 +309,7 @@ const vimperator = (function () //{{{
             }
 
             // Number
-            else if (match = string.match(/^(\d+)$/))
+            else if (matches = string.match(/^(\d+)$/))
             {
                 return parseInt(match[1], 10);
             }
@@ -328,16 +328,16 @@ const vimperator = (function () //{{{
             if (!string)
                 return [null, null, null];
 
-            var match = string.match(/^([bwtglsv]):(\w+)/);
-            if (match) // Variable
+            var matches = string.match(/^([bwtglsv]):(\w+)/);
+            if (matches) // Variable
             {
                 // Other variables should be implemented
-                if (match[1] == "g")
+                if (matches[1] == "g")
                 {
-                    if (match[2] in this.globalVariables)
-                        return [this.globalVariables, match[2], match[1]];
+                    if (matches[2] in this.globalVariables)
+                        return [this.globalVariables, matches[2], matches[1]];
                     else
-                        return [null, match[2], match[1]];
+                        return [null, matches[2], matches[1]];
                 }
             }
             else // Global variable

From d15c85be046d69e50611fcbc7f69826492d89f30 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 22 Nov 2007 11:50:23 +0000
Subject: [PATCH 214/224] specify the radix arg to parseInt

---
 content/commands.js | 4 ++--
 content/hints.js    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index 2e869167..3ad24409 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1824,11 +1824,11 @@ vimperator.Commands = function () //{{{
             }
             else if (/^\d+$/.test(args))
             {
-                level = parseInt(args);
+                level = parseInt(args, 10);
             }
             else if (/^[+-]\d+$/.test(args))
             {
-                level = vimperator.buffer.textZoom + parseInt(args);
+                level = vimperator.buffer.textZoom + parseInt(args, 10);
 
                 // relative args shouldn't take us out of range
                 if (level < 1)
diff --git a/content/hints.js b/content/hints.js
index cbaad1ee..7a3a6742 100644
--- a/content/hints.js
+++ b/content/hints.js
@@ -290,7 +290,7 @@ vimperator.Hints = function () //{{{
         var doc = win.document;
         var elem, i;
 
-        //var hintId = parseInt(id, nums.length);
+        //var hintId = parseInt(id, nums.length, 10);
         //elem = doc.getElementById(prefix + hintId);
         elem = doc.getElementById(HINT_PREFIX + id);
 
@@ -329,7 +329,7 @@ vimperator.Hints = function () //{{{
         }
 
         for (var i = 0; i < str.length; i++)
-            result += (hintCharacters.charAt(parseInt(str[i], hintCharacters.length))).toUpperCase();
+            result += (hintCharacters.charAt(parseInt(str[i], hintCharacters.length, 10))).toUpperCase();
 
         return result;
     }

From 0eeeec421ee2c4bfce8b3afc715c20551d0d4a7c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 22 Nov 2007 12:01:35 +0000
Subject: [PATCH 215/224] merge improvements to :pageinfo

---
 content/buffers.js  | 38 +++++++++++++++++++-------------------
 content/commands.js |  4 ++--
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/content/buffers.js b/content/buffers.js
index 165649cb..30427250 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -147,7 +147,7 @@ vimperator.Buffer = function () //{{{
         },
 
         // returns an XPathResult object
-        evaluateXPath: function (expression, doc, elem, ordered)
+        evaluateXPath: function (expression, doc, elem, asIterator)
         {
             if (!doc)
                 doc = window.content.document;
@@ -165,7 +165,7 @@ vimperator.Buffer = function () //{{{
                       return null;
                   }
                 },
-                ordered ? XPathResult.ORDERED_NODE_SNAPSHOT_TYPE : XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE,
+                asIterator ? XPathResult.UNORDERED_NODE_ITERATOR_TYPE : XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE,
                 null
             );
 
@@ -459,43 +459,43 @@ vimperator.Buffer = function () //{{{
                 "application/rdf+xml": "XML"
             };
 
-            function isValidFeed(aData, aPrincipal, aIsFeed)
+            function isValidFeed(data, principal, isFeed)
             {
-                if (!aData || !aPrincipal)
+                if (!data || !principal)
                     return false;
 
-                if (!aIsFeed)
+                if (!isFeed)
                 {
-                    var type = aData.type && aData.type.toLowerCase();
+                    var type = data.type && data.type.toLowerCase();
                     type = type.replace(/^\s+|\s*(?:;.*)?$/g, "");
 
-                    aIsFeed = (type == "application/rss+xml" || type == "application/atom+xml");
-                    if (!aIsFeed)
+                    isFeed = (type == "application/rss+xml" || type == "application/atom+xml");
+                    if (!isFeed)
                     {
                         // really slimy: general XML types with magic letters in the title
                         const titleRegex = /(^|\s)rss($|\s)/i;
-                        aIsFeed = ((type == "text/xml" || type == "application/rdf+xml" ||
-                                    type == "application/xml") && titleRegex.test(aData.title));
+                        isFeed = ((type == "text/xml" || type == "application/rdf+xml" ||
+                                    type == "application/xml") && titleRegex.test(data.title));
                     }
                 }
 
-                if (aIsFeed)
+                if (isFeed)
                 {
                     try
                     {
-                        urlSecurityCheck(aData.href, aPrincipal,
+                        urlSecurityCheck(data.href, principal,
                                 Components.interfaces.nsIScriptSecurityManager.DISALLOW_INHERIT_PRINCIPAL);
                     }
                     catch (ex)
                     {
-                        aIsFeed = false;
+                        isFeed = false;
                     }
                 }
 
                 if (type)
-                    aData.type = type;
+                    data.type = type;
 
-                return aIsFeed;
+                return isFeed;
             }
 
             // TODO: could this be useful for other commands?
@@ -506,7 +506,7 @@ vimperator.Buffer = function () //{{{
 
                 if (data.length - 1)
                 {
-                    for (var i = 0; i < data.length - 1 ; i++)
+                    for (var i = 0; i < data.length - 1; i++)
                         ret += "<tr><td style='font-weight: bold; min-width: 150px'>  " + data[i][0] + ": </td><td>" + data[i][1] + "</td></tr>";
                 }
                 else
@@ -575,7 +575,7 @@ vimperator.Buffer = function () //{{{
                     if (isValidFeed(feed, window.content.document.nodePrincipal, rels.feed))
                     {
                         var type = feedTypes[feed.type] || feedTypes["application/rss+xml"];
-                        pageFeeds.push([feed.title, vimperator.util.highlightURL(feed.href, true) + "  (" + type + ")"]);
+                        pageFeeds.push([feed.title, vimperator.util.highlightURL(feed.href, true) + " <span style='color: gray;'>(" + type + ")</span>"]);
                     }
                 }
             }
@@ -583,7 +583,7 @@ vimperator.Buffer = function () //{{{
             var lastModVerbose = new Date(window.content.document.lastModified).toLocaleString();
             var lastMod = new Date(window.content.document.lastModified).toLocaleFormat("%x %X");
             // FIXME: probably unportable across differnet language versions
-            if (lastModVerbose == "Invalid Date")
+            if (lastModVerbose == "Invalid Date" || new Date(window.content.document.lastModified).getFullYear() == 1970)
                 lastModVerbose = lastMod = null;
 
             // Ctrl-g single line output
@@ -650,7 +650,7 @@ vimperator.Buffer = function () //{{{
                 }
 
                 // sort: ignore-case
-                tmpSort.sort(function (a,b){return a.toLowerCase() > b.toLowerCase() ? 1 : -1;});
+                tmpSort.sort(function (a, b) { return a.toLowerCase() > b.toLowerCase() ? 1 : -1; });
                 for (var i = 0; i < tmpSort.length; i++)
                     pageMeta.push([tmpDict[tmpSort[i]][0], vimperator.util.highlightURL(tmpDict[tmpSort[i]][1], false)]);
             }
diff --git a/content/commands.js b/content/commands.js
index 3ad24409..c85f68e6 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1016,8 +1016,8 @@ vimperator.Commands = function () //{{{
     commandManager.add(new vimperator.Command(["pa[geinfo]"],
         function () { vimperator.buffer.pageInfo(true); },
         {
-            shortHelp: "Show general and/or meta-content site informations",
-            help: "Show general and/or meta-content site informations"
+            shortHelp: "Show various page information",
+            help: "See :help 'pageinfo' for available options",
         }
     ));
     commandManager.add(new vimperator.Command(["pc[lose]"],

From 1236da4b4cad707862b751209e9938371d194a74 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 22 Nov 2007 12:02:47 +0000
Subject: [PATCH 216/224] use regexps as args to replace in escapeHTML() as
 they appear to be about 10% faster

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

diff --git a/content/util.js b/content/util.js
index 1eee1f1c..7599d158 100644
--- a/content/util.js
+++ b/content/util.js
@@ -36,7 +36,7 @@ vimperator.util = { //{{{
         // var e = window.content.document.createElement("div");
         // e.appendChild(window.content.document.createTextNode(str));
         // return e.innerHTML;
-        return str.replace("&", "&amp;", "g").replace("<", "&lt;", "g").replace(">", "&gt;", "g");
+        return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
     },
 
     // TODO: use :highlight color groups

From dbc37525e6b3b37e0c3810e54dde297215e84ef4 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 22 Nov 2007 15:10:59 +0000
Subject: [PATCH 217/224] whitespace fixes

---
 content/commands.js | 2 +-
 content/help.js     | 2 +-
 content/options.js  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index c85f68e6..58834b55 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1078,7 +1078,7 @@ vimperator.Commands = function () //{{{
         {
             usage: ["qma[rk] {a-zA-Z0-9} [url]"],
             shortHelp: "Mark a URL with a letter for quick access",
-            help: "You can also mark whole groups like this: <br/>"+
+            help: "You can also mark whole groups like this: <br/>" +
                   "<code class=\"command\">:qmark f http://forum1.com, http://forum2.com, imdb some artist</code>"
         }
     ));
diff --git a/content/help.js b/content/help.js
index 754bb9e3..be26d1d9 100644
--- a/content/help.js
+++ b/content/help.js
@@ -177,7 +177,7 @@ vimperator.help = function (section, easter) //{{{
         '<var>$VIMPERATOR_HOME</var> can be used to override the calculated <var>$HOME</var> directory.';
 
     var mappings = '<span style="float: right"><code class="tag">mappings</code></span><h2 id="mappings">Mappings</h2>' +
-        '<p>The denotion of modifier keys is like in Vim, so C- means the Control key, M- the Meta key, A- the Alt key and S- the Shift key.</p>'+
+        '<p>The denotion of modifier keys is like in Vim, so C- means the Control key, M- the Meta key, A- the Alt key and S- the Shift key.</p>' +
         '<table class="vimperator mappings">';
     mappings += makeHelpString(vimperator.mappings, "", "", null);
     mappings += '</table>';
diff --git a/content/options.js b/content/options.js
index d82db98f..58e3f1de 100644
--- a/content/options.js
+++ b/content/options.js
@@ -611,7 +611,7 @@ vimperator.Options = function () //{{{
                   "<ul>" +
                   "<li><b>0</b>: Force to open in the current tab (NOTE: this can stop some web sites from working correctly!)</li>" +
                   "<li><b>1</b>: Always open in a new tab</li>" +
-                  "<li><b>2</b>: Open in a new window if it has a specific requested size (default in Firefox)</li>"+
+                  "<li><b>2</b>: Open in a new window if it has a specific requested size (default in Firefox)</li>" +
                   "<li><b>3</b>: Always open in a new window</li>" +
                   "</ul>" +
                   "NOTE: This option does not change the popup blocker of Firefox in any way.",

From 591b606b5c3d5d715e0de84452d57b46fa214da2 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 22 Nov 2007 15:13:03 +0000
Subject: [PATCH 218/224] vimperator is default namespace for scripts, :echo,
 :js and :time now, so if (options["visualbell"]) ... works there

---
 content/commands.js   |  9 ++++----
 content/completion.js | 51 ++++++++++++++++++++++++-------------------
 content/vimperator.js |  4 ++--
 3 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/content/commands.js b/content/commands.js
index 58834b55..94176fff 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -499,7 +499,8 @@ vimperator.Commands = function () //{{{
         try
         {
             // TODO: move to vimperator.eval()?
-            arg = eval(arg);
+            // with (vimperator) means, vimperator is the default namespace "inside" eval
+            arg = eval("with(vimperator){" + arg + "}");
         }
         catch (e)
         {
@@ -666,7 +667,7 @@ vimperator.Commands = function () //{{{
                 {
                     try
                     {
-                        eval(args);
+                        eval("with(vimperator){" + args + "}");
                     }
                     catch (e)
                     {
@@ -1567,7 +1568,7 @@ vimperator.Commands = function () //{{{
                     else
                     {
                         while (i--)
-                            eval(args);
+                            eval("with(vimperator){" + args + "}");
                     }
 
                     if (special)
@@ -1613,7 +1614,7 @@ vimperator.Commands = function () //{{{
                     if (args && args[0] == ":")
                         vimperator.execute(args);
                     else
-                        eval(args);
+                        eval("with(vimperator){" + args + "}");
 
                     if (special)
                         return;
diff --git a/content/completion.js b/content/completion.js
index d5b34c78..315c1279 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -459,7 +459,7 @@ vimperator.Completion = function () //{{{
         {
             substrings = [];
             var matches = str.match(/^(.*?)(\s*\.\s*)?(\w*)$/);
-            var object = "window";
+            var objects = [];
             var filter = matches[3] || "";
             var start = matches[1].length - 1;
             if (matches[2])
@@ -491,32 +491,37 @@ vimperator.Completion = function () //{{{
                         break outer;
                 }
             }
-            object = matches[1].substr(start+1) || "window";
+
+            if (matches[1].substr(start+1))
+            {
+                objects.push(matches[1].substr(start+1));
+            }
+            else
+            {
+                objects.push("vimperator");
+                objects.push("window");
+            }
 
             var completions = [];
             try
             {
-                completions = eval(
-                    "var comp = [];" +
-                    "var type = '';" +
-                    "var value = '';" +
-                    "var obj = eval(" + object + ");" +
-                    "for (var i in obj) {" +
-                    "     try { type = typeof(obj[i]); } catch (e) { type = 'unknown type'; };" +
-                    "     if (type == 'number' || type == 'string' || type == 'boolean') {" +
-                    "          value = obj[i];" +
-                    "          comp.push([[i], type + ': ' + value]); }" +
-                    // The problem with that is that you complete vimperator.
-                    // but can't press <Tab> to complete sub items
-                    // so it's better to complete vimperator and the user can do
-                    // .<tab> to get the sub items
-                    //"     else if (type == 'function') {" +
-                    //"          comp.push([[i+'('], type]); }" +
-                    //"     else if (type == 'object') {" +
-                    //"          comp.push([[i+'.'], type]); }" +
-                    "     else {" +
-                    "          comp.push([[i], type]); }" +
-                    "} comp;");
+                for (var o = 0; o < objects.length; o++)
+                {
+                    completions = completions.concat(eval(
+                        "var comp = [];" +
+                        "var type = '';" +
+                        "var value = '';" +
+                        "var obj = eval('with(vimperator){" + objects[o] + "}');" +
+                        "for (var i in obj) {" +
+                        "     try { type = typeof(obj[i]); } catch (e) { type = 'unknown type'; };" +
+                        "     if (type == 'number' || type == 'string' || type == 'boolean') {" +
+                        "          value = obj[i];" +
+                        "          comp.push([[i], type + ': ' + value]); }" +
+                        "     else {" +
+                        "          comp.push([[i], type]); }" +
+                        "} comp;"
+                    ));
+                }
             }
             catch (e)
             {
diff --git a/content/vimperator.js b/content/vimperator.js
index b6a7bbdb..48257a76 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -623,7 +623,7 @@ const vimperator = (function () //{{{
                 // handle pure javascript files specially
                 if (filename.search("\.js$") != -1)
                 {
-                    eval(str);
+                    eval("with(vimperator){" + str + "}");
                 }
                 else
                 {
@@ -635,7 +635,7 @@ const vimperator = (function () //{{{
                         {
                             if (heredocEnd.test(line))
                             {
-                                eval(heredoc);
+                                eval("with(vimperator){" + heredoc + "}");
                                 heredoc = "";
                                 heredocEnd = null;
                             }

From 035ff4b12e72faf92e9a183618a46c2c04e13bf6 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 24 Nov 2007 13:37:02 +0000
Subject: [PATCH 219/224] fix v.hints.currentState and hintedElements
 properties being called as functions

---
 content/events.js   | 4 ++--
 content/hints.js    | 8 ++++----
 content/mappings.js | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/content/events.js b/content/events.js
index 235a458d..49af5b23 100644
--- a/content/events.js
+++ b/content/events.js
@@ -541,7 +541,7 @@ vimperator.Events = function () //{{{
                 var map = vimperator.mappings.get(vimperator.modes.HINTS, key);
                 if (map)
                 {
-                    if (map.alwaysActive || vimperator.hints.currentState() == 1)
+                    if (map.alwaysActive || vimperator.hints.currentState == 1)
                     {
                         map.execute(null, vimperator.input.count);
                         if (map.cancelMode) // stop processing this event
@@ -562,7 +562,7 @@ vimperator.Events = function () //{{{
                 }
 
                 // no mapping found, beep()
-                if (vimperator.hints.currentState() == 1)
+                if (vimperator.hints.currentState == 1)
                 {
                     vimperator.beep();
                     vimperator.hints.disableHahMode();
diff --git a/content/hints.js b/content/hints.js
index 7a3a6742..7e130d07 100644
--- a/content/hints.js
+++ b/content/hints.js
@@ -453,7 +453,7 @@ vimperator.Hints = function () //{{{
 
         get hintedElements() { return hintedElems; },
         get currentState() { return state; },
-        get setCurrentState(s) { state = s; },
+        set currentState(s) { state = s; },
 
         loadCoord: function (winId, i)
         {
@@ -609,7 +609,7 @@ vimperator.Hints = function () //{{{
         yankUrlHints: function ()
         {
             var loc = "";
-            var elems = this.hintedElements();
+            var elems = this.hintedElements;
             var tmp = "";
             for (var i = 0; i < elems.length; i++)
             {
@@ -632,7 +632,7 @@ vimperator.Hints = function () //{{{
         yankTextHints: function ()
         {
             var loc = "";
-            var elems = this.hintedElements();
+            var elems = this.hintedElements;
             var tmp = "";
             for (var i = 0; i < elems.length; i++)
             {
@@ -654,7 +654,7 @@ vimperator.Hints = function () //{{{
 
         saveHints: function (skipPrompt)
         {
-            var elems = this.hintedElements();
+            var elems = this.hintedElements;
 
             for (var i = 0; i < elems.length; i++)
             {
diff --git a/content/mappings.js b/content/mappings.js
index ca82161a..4b01dd97 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -1079,7 +1079,7 @@ vimperator.Mappings = function () //{{{
         }
     ));
     addDefaultMap(new vimperator.Map(vimperator.modes.HINTS, [","],
-        function () { vimperator.input.buffer += ","; vimperator.hints.setCurrentState(0); },
+        function () { vimperator.input.buffer += ","; vimperator.hints.currentState = 0; },
         {
             cancelMode: false,
             alwaysActive: true

From 488bb5678299919d6a72a7faf9bbe170ee1b7ce1 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 27 Nov 2007 04:56:24 +0000
Subject: [PATCH 220/224] remove mozunit.js

---
 content/test.js | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100755 content/test.js

diff --git a/content/test.js b/content/test.js
deleted file mode 100755
index 80f6fc61..00000000
--- a/content/test.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var TestCase = mozlab.mozunit.TestCase;
-var assert = mozlab.mozunit.assertions;
-
-var tc = new TestCase('testcase description here');
-
-tc.tests = {
-    'First test is successful': function () {
-        var vimperator = new Vimperator();
-        assert.isDefined(vimperator);
-        assert.isTrue(true);
-    }
-}
-tc.run()

From 49d7cc87bec2bb446cb4f30d7c532ec03f20a130 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 6 Dec 2007 03:16:03 +0000
Subject: [PATCH 221/224] use FF2 urlSecurityCheck so that :pageinfo lists
 feeds properly

---
 content/buffers.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/content/buffers.js b/content/buffers.js
index 30427250..466d6fb4 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -459,9 +459,9 @@ vimperator.Buffer = function () //{{{
                 "application/rdf+xml": "XML"
             };
 
-            function isValidFeed(data, principal, isFeed)
+            function isValidFeed(data, isFeed)
             {
-                if (!data || !principal)
+                if (!data)
                     return false;
 
                 if (!isFeed)
@@ -483,8 +483,8 @@ vimperator.Buffer = function () //{{{
                 {
                     try
                     {
-                        urlSecurityCheck(data.href, principal,
-                                Components.interfaces.nsIScriptSecurityManager.DISALLOW_INHERIT_PRINCIPAL);
+                        urlSecurityCheck(data.href, getBrowser().currentURI.spec,
+                                         Ci.nsIScriptSecurityManager.DISALLOW_SCRIPT_OR_DATA);
                     }
                     catch (ex)
                     {
@@ -572,7 +572,7 @@ vimperator.Buffer = function () //{{{
                 if (rels.feed || (link.type && rels.alternate && !rels.stylesheet))
                 {
                     var feed = { title: link.title, href: link.href, type: link.type || "" };
-                    if (isValidFeed(feed, window.content.document.nodePrincipal, rels.feed))
+                    if (isValidFeed(feed, rels.feed))
                     {
                         var type = feedTypes[feed.type] || feedTypes["application/rss+xml"];
                         pageFeeds.push([feed.title, vimperator.util.highlightURL(feed.href, true) + " <span style='color: gray;'>(" + type + ")</span>"]);

From 835570125b51c6c1955a3ef81b6a1e8af44122d5 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 9 Dec 2007 10:31:35 +0000
Subject: [PATCH 222/224] fix util.highlightURL to use the unnamed anchor for
 link href values to prevent :pageinfo links from being loaded in the MOW

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

diff --git a/content/util.js b/content/util.js
index 7599d158..a433d3de 100644
--- a/content/util.js
+++ b/content/util.js
@@ -170,7 +170,7 @@ vimperator.util = { //{{{
     highlightURL: function (str, force)
     {
         if (force || /^[a-zA-Z]+:\/\//.test(str))
-            return "<a class='hl-URL' href='" + str + "'>" + vimperator.util.escapeHTML(str) + "</a>";
+            return "<a class='hl-URL' href='#'>" + vimperator.util.escapeHTML(str) + "</a>";
         else
             return str;
     },

From 056de2a02451629664d5b585d7ecbb2c9464e7b4 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 26 Dec 2007 12:25:04 +0000
Subject: [PATCH 223/224] bump version number

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f744e9e2..3d45e4b0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 TOP           = $(shell pwd)
 
-VERSION       = 0.5.3pre
+VERSION       = 0.5.4pre
 OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 

From ebb1e2ebb72f0a7858164358764def95c0ef815f Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 1 Jan 2008 00:20:10 +0000
Subject: [PATCH 224/224] fix v.buffer.textZoom setter - accidently marked as
 getter

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

diff --git a/content/buffers.js b/content/buffers.js
index 466d6fb4..57c31314 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -136,7 +136,7 @@ vimperator.Buffer = function () //{{{
             return zoomManager.textZoom;
         },
 
-        get textZoom(value)
+        set textZoom(value)
         {
             setZoom(value);
         },